Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

232 files changed, 3578 insertions, 127795 deletions

diff --git a/drivers/char/.gitignore b/drivers/char/.gitignore
deleted file mode 100644
index 83683a2d8e6a..000000000000
--- a/drivers/char/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-consolemap_deftbl.c
-defkeymap.c
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 3d44ec724c17..49502bc5360a 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -4,89 +4,7 @@
 
 menu "Character devices"
 
-config VT
-        bool "Virtual terminal" if EMBEDDED
-        depends on !S390
-        select INPUT
-        default y
-        ---help---
-          If you say Y here, you will get support for terminal devices with
-          display and keyboard devices. These are called "virtual" because you
-          can run several virtual terminals (also called virtual consoles) on
-          one physical terminal. This is rather useful, for example one
-          virtual terminal can collect system messages and warnings, another
-          one can be used for a text-mode user session, and a third could run
-          an X session, all in parallel. Switching between virtual terminals
-          is done with certain key combinations, usually Alt-<function key>.
-
-          The setterm command ("man setterm") can be used to change the
-          properties (such as colors or beeping) of a virtual terminal. The
-          man page console_codes(4) ("man console_codes") contains the special
-          character sequences that can be used to change those properties
-          directly. The fonts used on virtual terminals can be changed with
-          the setfont ("man setfont") command and the key bindings are defined
-          with the loadkeys ("man loadkeys") command.
-
-          You need at least one virtual terminal device in order to make use
-          of your keyboard and monitor. Therefore, only people configuring an
-          embedded system would want to say N here in order to save some
-          memory; the only way to log into such a system is then via a serial
-          or network connection.
-
-          If unsure, say Y, or else you won't be able to do much with your new
-          shiny Linux system :-)
-
-config CONSOLE_TRANSLATIONS
-        depends on VT
-        default y
-        bool "Enable character translations in console" if EMBEDDED
-        ---help---
-          This enables support for font mapping and Unicode translation
-          on virtual consoles.
-
-config VT_CONSOLE
-        bool "Support for console on virtual terminal" if EMBEDDED
-        depends on VT
-        default y
-        ---help---
-          The system console is the device which receives all kernel messages
-          and warnings and which allows logins in single user mode. If you
-          answer Y here, a virtual terminal (the device used to interact with
-          a physical terminal) can be used as system console. This is the most
-          common mode of operations, so you should say Y here unless you want
-          the kernel messages be output only to a serial port (in which case
-          you should say Y to "Console on serial port", below).
-
-          If you do say Y here, by default the currently visible virtual
-          terminal (/dev/tty0) will be used as system console. You can change
-          that with a kernel command line option such as "console=tty3" which
-          would use the third virtual terminal as system console. (Try "man
-          bootparam" or see the documentation of your boot loader (lilo or
-          loadlin) about how to pass options to the kernel at boot time.)
-
-          If unsure, say Y.
-
-config HW_CONSOLE
-        bool
-        depends on VT && !S390 && !UML
-        default y
-
-config VT_HW_CONSOLE_BINDING
-       bool "Support for binding and unbinding console drivers"
-       depends on HW_CONSOLE
-       default n
-       ---help---
-         The virtual terminal is the device that interacts with the physical
-         terminal through console drivers. On these systems, at least one
-         console driver is loaded. In other configurations, additional console
-         drivers may be enabled, such as the framebuffer console. If more than
-         1 console driver is enabled, setting this to 'y' will allow you to
-         select the console driver that will serve as the backend for the
-         virtual terminals.
-
-         See <file:Documentation/console/console.txt> for more
-         information. For framebuffer console users, please refer to
-         <file:Documentation/fb/fbcon.txt>.
+source "drivers/tty/Kconfig"
 
 config DEVKMEM
         bool "/dev/kmem virtual device support"
@@ -97,253 +15,6 @@ config DEVKMEM
           kind of kernel debugging operations.
           When in doubt, say "N".
 
-config BFIN_JTAG_COMM
-        tristate "Blackfin JTAG Communication"
-        depends on BLACKFIN
-        help
-          Add support for emulating a TTY device over the Blackfin JTAG.
-
-          To compile this driver as a module, choose M here: the
-          module will be called bfin_jtag_comm.
-
-config BFIN_JTAG_COMM_CONSOLE
-        bool "Console on Blackfin JTAG"
-        depends on BFIN_JTAG_COMM=y
-
-config SERIAL_NONSTANDARD
-        bool "Non-standard serial port support"
-        depends on HAS_IOMEM
-        ---help---
-          Say Y here if you have any non-standard serial boards -- boards
-          which aren't supported using the standard "dumb" serial driver.
-          This includes intelligent serial boards such as Cyclades,
-          Digiboards, etc. These are usually used for systems that need many
-          serial ports because they serve many terminals or dial-in
-          connections.
-
-          Note that the answer to this question won't directly affect the
-          kernel: saying N will just cause the configurator to skip all
-          the questions about non-standard serial boards.
-
-          Most people can say N here.
-
-config COMPUTONE
-        tristate "Computone IntelliPort Plus serial support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        ---help---
-          This driver supports the entire family of Intelliport II/Plus
-          controllers with the exception of the MicroChannel controllers and
-          products previous to the Intelliport II. These are multiport cards,
-          which give you many serial ports. You would need something like this
-          to connect more than two modems to your Linux box, for instance in
-          order to become a dial-in server. If you have a card like that, say
-          Y here and read <file:Documentation/serial/computone.txt>.
-
-          To compile this driver as module, choose M here: the
-          module will be called ip2.
-
-config ROCKETPORT
-        tristate "Comtrol RocketPort support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        help
-          This driver supports Comtrol RocketPort and RocketModem PCI boards.   
-          These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
-          modems.  For information about the RocketPort/RocketModem  boards
-          and this driver read <file:Documentation/serial/rocket.txt>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called rocket.
-
-          If you want to compile this driver into the kernel, say Y here.  If
-          you don't have a Comtrol RocketPort/RocketModem card installed, say N.
-
-config CYCLADES
-        tristate "Cyclades async mux support"
-        depends on SERIAL_NONSTANDARD && (PCI || ISA)
-        select FW_LOADER
-        ---help---
-          This driver supports Cyclades Z and Y multiserial boards.
-          You would need something like this to connect more than two modems to
-          your Linux box, for instance in order to become a dial-in server.
-
-          For information about the Cyclades-Z card, read
-          <file:Documentation/serial/README.cycladesZ>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called cyclades.
-
-          If you haven't heard about it, it's safe to say N.
-
-config CYZ_INTR
-        bool "Cyclades-Z interrupt mode operation (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && CYCLADES
-        help
-          The Cyclades-Z family of multiport cards allows 2 (two) driver op
-          modes: polling and interrupt. In polling mode, the driver will check
-          the status of the Cyclades-Z ports every certain amount of time
-          (which is called polling cycle and is configurable). In interrupt
-          mode, it will use an interrupt line (IRQ) in order to check the
-          status of the Cyclades-Z ports. The default op mode is polling. If
-          unsure, say N.
-
-config DIGIEPCA
-        tristate "Digiboard Intelligent Async Support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        ---help---
-          This is a driver for Digi International's Xx, Xeve, and Xem series
-          of cards which provide multiple serial ports. You would need
-          something like this to connect more than two modems to your Linux
-          box, for instance in order to become a dial-in server. This driver
-          supports the original PC (ISA) boards as well as PCI, and EISA. If
-          you have a card like this, say Y here and read the file
-          <file:Documentation/serial/digiepca.txt>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called epca.
-
-config MOXA_INTELLIO
-        tristate "Moxa Intellio support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        select FW_LOADER
-        help
-          Say Y here if you have a Moxa Intellio multiport serial card.
-
-          To compile this driver as a module, choose M here: the
-          module will be called moxa.
-
-config MOXA_SMARTIO
-        tristate "Moxa SmartIO support v. 2.0"
-        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
-        help
-          Say Y here if you have a Moxa SmartIO multiport serial card and/or
-          want to help develop a new version of this driver.
-
-          This is upgraded (1.9.1) driver from original Moxa drivers with
-          changes finally resulting in PCI probing.
-
-          This driver can also be built as a module. The module will be called
-          mxser. If you want to do that, say M here.
-
-config ISI
-        tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
-        depends on SERIAL_NONSTANDARD && PCI
-        select FW_LOADER
-        help
-          This is a driver for the Multi-Tech cards which provide several
-          serial ports.  The driver is experimental and can currently only be
-          built as a module. The module will be called isicom.
-          If you want to do that, choose M here.
-
-config SYNCLINK
-        tristate "Microgate SyncLink card support"
-        depends on SERIAL_NONSTANDARD && PCI && ISA_DMA_API
-        help
-          Provides support for the SyncLink ISA and PCI multiprotocol serial
-          adapters. These adapters support asynchronous and HDLC bit
-          synchronous communication up to 10Mbps (PCI adapter).
-
-          This driver can only be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called synclink.  If you want to do that, say M
-          here.
-
-config SYNCLINKMP
-        tristate "SyncLink Multiport support"
-        depends on SERIAL_NONSTANDARD && PCI
-        help
-          Enable support for the SyncLink Multiport (2 or 4 ports)
-          serial adapter, running asynchronous and HDLC communications up
-          to 2.048Mbps. Each ports is independently selectable for
-          RS-232, V.35, RS-449, RS-530, and X.21
-
-          This driver may be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called synclinkmp.  If you want to do that, say M
-          here.
-
-config SYNCLINK_GT
-        tristate "SyncLink GT/AC support"
-        depends on SERIAL_NONSTANDARD && PCI
-        help
-          Support for SyncLink GT and SyncLink AC families of
-          synchronous and asynchronous serial adapters
-          manufactured by Microgate Systems, Ltd. (www.microgate.com)
-
-config N_HDLC
-        tristate "HDLC line discipline support"
-        depends on SERIAL_NONSTANDARD
-        help
-          Allows synchronous HDLC communications with tty device drivers that
-          support synchronous HDLC such as the Microgate SyncLink adapter.
-
-          This driver can be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called n_hdlc. If you want to do that, say M
-          here.
-
-config N_GSM
-        tristate "GSM MUX line discipline support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
-        depends on NET
-        help
-          This line discipline provides support for the GSM MUX protocol and
-          presents the mux as a set of 61 individual tty devices.
-
-config RISCOM8
-        tristate "SDL RISCom/8 card support"
-        depends on SERIAL_NONSTANDARD
-        help
-          This is a driver for the SDL Communications RISCom/8 multiport card,
-          which gives you many serial ports. You would need something like
-          this to connect more than two modems to your Linux box, for instance
-          in order to become a dial-in server. If you have a card like that,
-          say Y here and read the file <file:Documentation/serial/riscom8.txt>.
-
-          Also it's possible to say M here and compile this driver as kernel
-          loadable module; the module will be called riscom8.
-
-config SPECIALIX
-        tristate "Specialix IO8+ card support"
-        depends on SERIAL_NONSTANDARD
-        help
-          This is a driver for the Specialix IO8+ multiport card (both the
-          ISA and the PCI version) which gives you many serial ports. You
-          would need something like this to connect more than two modems to
-          your Linux box, for instance in order to become a dial-in server.
-
-          If you have a card like that, say Y here and read the file
-          <file:Documentation/serial/specialix.txt>. Also it's possible to say
-          M here and compile this driver as kernel loadable module which will be
-          called specialix.
-
-config SX
-        tristate "Specialix SX (and SI) card support"
-        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
-        help
-          This is a driver for the SX and SI multiport serial cards.
-          Please read the file <file:Documentation/serial/sx.txt> for details.
-
-          This driver can only be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called sx. If you want to do that, say M here.
-
-config RIO
-        tristate "Specialix RIO system support"
-        depends on SERIAL_NONSTANDARD && BROKEN
-        help
-          This is a driver for the Specialix RIO, a smart serial card which
-          drives an outboard box that can support up to 128 ports.  Product
-          information is at <http://www.perle.com/support/documentation.html#multiport>.
-          There are both ISA and PCI versions.
-
-config RIO_OLDPCI
-        bool "Support really old RIO/PCI cards"
-        depends on RIO
-        help
-          Older RIO PCI cards need some initialization-time configuration to
-          determine the IRQ and some control addresses.  If you have a RIO and
-          this doesn't seem to work, try setting this to Y.
-
 config STALDRV
         bool "Stallion multiport serial support"
         depends on SERIAL_NONSTANDARD
@@ -356,54 +27,6 @@ config STALDRV
           in this case.  If you have never heard about all this, it's safe to
           say N.
 
-config STALLION
-        tristate "Stallion EasyIO or EC8/32 support"
-        depends on STALDRV && (ISA || EISA || PCI)
-        help
-          If you have an EasyIO or EasyConnection 8/32 multiport Stallion
-          card, then this is for you; say Y.  Make sure to read
-          <file:Documentation/serial/stallion.txt>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called stallion.
-
-config ISTALLION
-        tristate "Stallion EC8/64, ONboard, Brumby support"
-        depends on STALDRV && (ISA || EISA || PCI)
-        help
-          If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
-          serial multiport card, say Y here. Make sure to read
-          <file:Documentation/serial/stallion.txt>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called istallion.
-
-config NOZOMI
-        tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
-        depends on PCI && EXPERIMENTAL
-        help
-          If you have a HSDPA driver Broadband Wireless Data Card -
-          Globe Trotter PCMCIA card, say Y here.
-
-          To compile this driver as a module, choose M here, the module
-          will be called nozomi.
-
-config A2232
-        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && ZORRO && BROKEN
-        ---help---
-          This option supports the 2232 7-port serial card shipped with the
-          Amiga 2000 and other Zorro-bus machines, dating from 1989.  At
-          a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
-          each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
-          ports were connected with 8 pin DIN connectors on the card bracket,
-          for which 8 pin to DB25 adapters were supplied. The card also had
-          jumpers internally to toggle various pinning configurations.
-
-          This driver can be built as a module; but then "generic_serial"
-          will also be built as a module. This has to be loaded before
-          "ser_a2232". If you want to do this, answer M here.
-
 config SGI_SNSC
         bool "SGI Altix system controller communication support"
         depends on (IA64_SGI_SN2 || IA64_GENERIC)
@@ -426,72 +49,22 @@ config SGI_MBCS
          If you have an SGI Altix with an attached SABrick
          say Y or M here, otherwise say N.
 
-source "drivers/serial/Kconfig"
+source "drivers/tty/serial/Kconfig"
 
-config UNIX98_PTYS
-        bool "Unix98 PTY support" if EMBEDDED
-        default y
-        ---help---
-          A pseudo terminal (PTY) is a software device consisting of two
-          halves: a master and a slave. The slave device behaves identical to
-          a physical terminal; the master device is used by a process to
-          read data from and write data to the slave, thereby emulating a
-          terminal. Typical programs for the master side are telnet servers
-          and xterms.
-
-          Linux has traditionally used the BSD-like names /dev/ptyxx for
-          masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
-          has a number of problems. The GNU C library glibc 2.1 and later,
-          however, supports the Unix98 naming standard: in order to acquire a
-          pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
-          terminal is then made available to the process and the pseudo
-          terminal slave can be accessed as /dev/pts/<number>. What was
-          traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
-
-          All modern Linux systems use the Unix98 ptys.  Say Y unless
-          you're on an embedded system and want to conserve memory.
-
-config DEVPTS_MULTIPLE_INSTANCES
-        bool "Support multiple instances of devpts"
-        depends on UNIX98_PTYS
+config TTY_PRINTK
+        bool "TTY driver to output user messages via printk"
+        depends on EXPERT
         default n
         ---help---
-          Enable support for multiple instances of devpts filesystem.
-          If you want to have isolated PTY namespaces (eg: in containers),
-          say Y here.  Otherwise, say N. If enabled, each mount of devpts
-          filesystem with the '-o newinstance' option will create an
-          independent PTY namespace.
-
-config LEGACY_PTYS
-        bool "Legacy (BSD) PTY support"
-        default y
-        ---help---
-          A pseudo terminal (PTY) is a software device consisting of two
-          halves: a master and a slave. The slave device behaves identical to
-          a physical terminal; the master device is used by a process to
-          read data from and write data to the slave, thereby emulating a
-          terminal. Typical programs for the master side are telnet servers
-          and xterms.
-
-          Linux has traditionally used the BSD-like names /dev/ptyxx
-          for masters and /dev/ttyxx for slaves of pseudo
-          terminals. This scheme has a number of problems, including
-          security.  This option enables these legacy devices; on most
-          systems, it is safe to say N.
-
-
-config LEGACY_PTY_COUNT
-        int "Maximum number of legacy PTY in use"
-        depends on LEGACY_PTYS
-        range 0 256
-        default "256"
-        ---help---
-          The maximum number of legacy PTYs that can be used at any one time.
-          The default is 256, and should be more than enough.  Embedded
-          systems may want to reduce this to save memory.
+          If you say Y here, the support for writing user messages (i.e.
+          console messages) via printk is available.
+
+          The feature is useful to inline user messages with kernel
+          messages.
+          In order to use this feature, you should output user messages
+          to /dev/ttyprintk or redirect console to this TTY.
 
-          When not in use, each legacy PTY occupies 12 bytes on 32-bit
-          architectures and 24 bytes on 64-bit architectures.
+          If unsure, say N.
 
 config BRIQ_PANEL
         tristate 'Total Impact briQ front panel driver'
@@ -597,75 +170,7 @@ config PPDEV
 
           If unsure, say N.
 
-config HVC_DRIVER
-        bool
-        help
-          Generic "hypervisor virtual console" infrastructure for various
-          hypervisors (pSeries, iSeries, Xen, lguest).
-          It will automatically be selected if one of the back-end console drivers
-          is selected.
-
-config HVC_IRQ
-        bool
-
-config HVC_CONSOLE
-        bool "pSeries Hypervisor Virtual Console support"
-        depends on PPC_PSERIES
-        select HVC_DRIVER
-        select HVC_IRQ
-        help
-          pSeries machines when partitioned support a hypervisor virtual
-          console. This driver allows each pSeries partition to have a console
-          which is accessed via the HMC.
-
-config HVC_ISERIES
-        bool "iSeries Hypervisor Virtual Console support"
-        depends on PPC_ISERIES
-        default y
-        select HVC_DRIVER
-        select HVC_IRQ
-        select VIOPATH
-        help
-          iSeries machines support a hypervisor virtual console.
-
-config HVC_RTAS
-        bool "IBM RTAS Console support"
-        depends on PPC_RTAS
-        select HVC_DRIVER
-        help
-          IBM Console device driver which makes use of RTAS
-
-config HVC_BEAT
-        bool "Toshiba's Beat Hypervisor Console support"
-        depends on PPC_CELLEB
-        select HVC_DRIVER
-        help
-          Toshiba's Cell Reference Set Beat Console device driver
-
-config HVC_IUCV
-        bool "z/VM IUCV Hypervisor console support (VM only)"
-        depends on S390
-        select HVC_DRIVER
-        select IUCV
-        default y
-        help
-          This driver provides a Hypervisor console (HVC) back-end to access
-          a Linux (console) terminal via a z/VM IUCV communication path.
-
-config HVC_XEN
-        bool "Xen Hypervisor Console support"
-        depends on XEN
-        select HVC_DRIVER
-        select HVC_IRQ
-        default y
-        help
-          Xen virtual console device driver
-
-config HVC_UDBG
-       bool "udbg based fake hypervisor console"
-       depends on PPC && EXPERIMENTAL
-       select HVC_DRIVER
-       default n
+source "drivers/tty/hvc/Kconfig"
 
 config VIRTIO_CONSOLE
         tristate "Virtio console"
@@ -683,23 +188,6 @@ config VIRTIO_CONSOLE
           the port which can be used by udev scripts to create a
           symlink to the device.
 
-config HVCS
-        tristate "IBM Hypervisor Virtual Console Server support"
-        depends on PPC_PSERIES && HVC_CONSOLE
-        help
-          Partitionable IBM Power5 ppc64 machines allow hosting of
-          firmware virtual consoles from one Linux partition by
-          another Linux partition.  This driver allows console data
-          from Linux partitions to be accessed through TTY device
-          interfaces in the device tree of a Linux partition running
-          this driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called hvcs.  Additionally, this module
-          will depend on arch specific APIs exported from hvcserver.ko
-          which will also be compiled when this driver is built as a
-          module.
-
 config IBM_BSR
         tristate "IBM POWER Barrier Synchronization Register support"
         depends on PPC_PSERIES
@@ -1023,15 +511,6 @@ config NSC_GPIO
           pc8736x_gpio drivers.  If those drivers are built as
           modules, this one will be too, named nsc_gpio
 
-config CS5535_GPIO
-        tristate "AMD CS5535/CS5536 GPIO (Geode Companion Device)"
-        depends on X86_32
-        help
-          Give userspace access to the GPIO pins on the AMD CS5535 and
-          CS5536 Geode companion devices.
-
-          If compiled as a module, it will be called cs5535_gpio.
-
 config RAW_DRIVER
         tristate "RAW driver (/dev/raw/rawN)"
         depends on BLOCK
@@ -1044,7 +523,7 @@ config RAW_DRIVER
           with the O_DIRECT flag.
 
 config MAX_RAW_DEVS
-        int "Maximum number of RAW devices to support (1-8192)"
+        int "Maximum number of RAW devices to support (1-65536)"
         depends on RAW_DRIVER
         default "256"
         help
@@ -1129,5 +608,13 @@ config RAMOOPS
           This enables panic and oops messages to be logged to a circular
           buffer in RAM where it can be read back at some later point.
 
+config MSM_SMD_PKT
+        bool "Enable device interface for some SMD packet ports"
+        default n
+        depends on MSM_SMD
+        help
+          Enables userspace clients to read and write to some packet SMD
+          ports via device interface for MSM chipset.
+
 endmenu
 
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index dc9641660605..7a00672bd85d 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -2,67 +2,18 @@
 # Makefile for the kernel character device drivers.
 #
 
-#
-# This file contains the font map for the default (hardware) font
-#
-FONTMAPFILE = cp437.uni
-
-obj-y    += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o tty_port.o
-
-obj-y                           += tty_mutex.o
-obj-$(CONFIG_LEGACY_PTYS)       += pty.o
-obj-$(CONFIG_UNIX98_PTYS)       += pty.o
+obj-y                           += mem.o random.o
+obj-$(CONFIG_TTY_PRINTK)        += ttyprintk.o
 obj-y                           += misc.o
-obj-$(CONFIG_VT)                += vt_ioctl.o vc_screen.o selection.o keyboard.o
-obj-$(CONFIG_BFIN_JTAG_COMM)    += bfin_jtag_comm.o
-obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o
-obj-$(CONFIG_HW_CONSOLE)        += vt.o defkeymap.o
-obj-$(CONFIG_AUDIT)             += tty_audit.o
-obj-$(CONFIG_MAGIC_SYSRQ)       += sysrq.o
-obj-$(CONFIG_MVME147_SCC)       += generic_serial.o vme_scc.o
-obj-$(CONFIG_MVME162_SCC)       += generic_serial.o vme_scc.o
-obj-$(CONFIG_BVME6000_SCC)      += generic_serial.o vme_scc.o
-obj-$(CONFIG_ROCKETPORT)        += rocket.o
-obj-$(CONFIG_SERIAL167)         += serial167.o
-obj-$(CONFIG_CYCLADES)          += cyclades.o
-obj-$(CONFIG_STALLION)          += stallion.o
-obj-$(CONFIG_ISTALLION)         += istallion.o
-obj-$(CONFIG_NOZOMI)            += nozomi.o
-obj-$(CONFIG_DIGIEPCA)          += epca.o
-obj-$(CONFIG_SPECIALIX)         += specialix.o
-obj-$(CONFIG_MOXA_INTELLIO)     += moxa.o
-obj-$(CONFIG_A2232)             += ser_a2232.o generic_serial.o
 obj-$(CONFIG_ATARI_DSP56K)      += dsp56k.o
-obj-$(CONFIG_MOXA_SMARTIO)      += mxser.o
-obj-$(CONFIG_COMPUTONE)         += ip2/
-obj-$(CONFIG_RISCOM8)           += riscom8.o
-obj-$(CONFIG_ISI)               += isicom.o
-obj-$(CONFIG_SYNCLINK)          += synclink.o
-obj-$(CONFIG_SYNCLINKMP)        += synclinkmp.o
-obj-$(CONFIG_SYNCLINK_GT)       += synclink_gt.o
-obj-$(CONFIG_N_HDLC)            += n_hdlc.o
-obj-$(CONFIG_N_GSM)             += n_gsm.o
-obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
-obj-$(CONFIG_SX)                += sx.o generic_serial.o
-obj-$(CONFIG_RIO)               += rio/ generic_serial.o
-obj-$(CONFIG_HVC_CONSOLE)       += hvc_vio.o hvsi.o
-obj-$(CONFIG_HVC_ISERIES)       += hvc_iseries.o
-obj-$(CONFIG_HVC_RTAS)          += hvc_rtas.o
-obj-$(CONFIG_HVC_TILE)          += hvc_tile.o
-obj-$(CONFIG_HVC_BEAT)          += hvc_beat.o
-obj-$(CONFIG_HVC_DRIVER)        += hvc_console.o
-obj-$(CONFIG_HVC_IRQ)           += hvc_irq.o
-obj-$(CONFIG_HVC_XEN)           += hvc_xen.o
-obj-$(CONFIG_HVC_IUCV)          += hvc_iucv.o
-obj-$(CONFIG_HVC_UDBG)          += hvc_udbg.o
 obj-$(CONFIG_VIRTIO_CONSOLE)    += virtio_console.o
 obj-$(CONFIG_RAW_DRIVER)        += raw.o
 obj-$(CONFIG_SGI_SNSC)          += snsc.o snsc_event.o
+obj-$(CONFIG_MSM_SMD_PKT)       += msm_smd_pkt.o
 obj-$(CONFIG_MSPEC)             += mspec.o
 obj-$(CONFIG_MMTIMER)           += mmtimer.o
 obj-$(CONFIG_UV_MMTIMER)        += uv_mmtimer.o
 obj-$(CONFIG_VIOTAPE)           += viotape.o
-obj-$(CONFIG_HVCS)              += hvcs.o
 obj-$(CONFIG_IBM_BSR)           += bsr.o
 obj-$(CONFIG_SGI_MBCS)          += mbcs.o
 obj-$(CONFIG_BRIQ_PANEL)        += briq_panel.o
@@ -73,7 +24,6 @@ obj-$(CONFIG_PRINTER)		+= lp.o
 obj-$(CONFIG_APM_EMULATION)     += apm-emulation.o
 
 obj-$(CONFIG_DTLK)              += dtlk.o
-obj-$(CONFIG_R3964)             += n_r3964.o
 obj-$(CONFIG_APPLICOM)          += applicom.o
 obj-$(CONFIG_SONYPI)            += sonypi.o
 obj-$(CONFIG_RTC)               += rtc.o
@@ -97,7 +47,6 @@ obj-$(CONFIG_NWFLASH)		+= nwflash.o
 obj-$(CONFIG_SCx200_GPIO)       += scx200_gpio.o
 obj-$(CONFIG_PC8736x_GPIO)      += pc8736x_gpio.o
 obj-$(CONFIG_NSC_GPIO)          += nsc_gpio.o
-obj-$(CONFIG_CS5535_GPIO)       += cs5535_gpio.o
 obj-$(CONFIG_GPIO_TB0219)       += tb0219.o
 obj-$(CONFIG_TELCLOCK)          += tlclk.o
 
@@ -114,28 +63,3 @@ obj-$(CONFIG_RAMOOPS)		+= ramoops.o
 
 obj-$(CONFIG_JS_RTC)            += js-rtc.o
 js-rtc-y = rtc.o
-
-# Files generated that shall be removed upon make clean
-clean-files := consolemap_deftbl.c defkeymap.c
-
-quiet_cmd_conmk = CONMK   $@
-      cmd_conmk = scripts/conmakehash $< > $@
-
-$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
-        $(call cmd,conmk)
-
-$(obj)/defkeymap.o:  $(obj)/defkeymap.c
-
-# Uncomment if you're changing the keymap and have an appropriate
-# loadkeys version for the map. By default, we'll use the shipped
-# versions.
-# GENERATE_KEYMAP := 1
-
-ifdef GENERATE_KEYMAP
-
-$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
-        loadkeys --mktable $< > $@.tmp
-        sed -e 's/^static *//' $@.tmp > $@
-        rm $@.tmp
-
-endif
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 4b66c69eaf57..d8b1b576556c 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -34,7 +34,7 @@ config AGP_ALI
           X on the following ALi chipsets.  The supported chipsets
           include M1541, M1621, M1631, M1632, M1641,M1647,and M1651.
           For the ALi-chipset question, ALi suggests you refer to
-          <http://www.ali.com.tw/eng/support/index.shtml>.
+          <http://www.ali.com.tw/>.
 
           The M1541 chipset can do AGP 1x and 2x, but note that there is an
           acknowledged incompatibility with Matrox G200 cards. Due to
@@ -50,14 +50,14 @@ config AGP_ATI
 
 config AGP_AMD
         tristate "AMD Irongate, 761, and 762 chipset support"
-        depends on AGP && (X86_32 || ALPHA)
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
           X on AMD Irongate, 761, and 762 chipsets.
 
 config AGP_AMD64
         tristate "AMD Opteron/Athlon64 on-CPU GART support"
-        depends on AGP && X86 && K8_NB
+        depends on AGP && X86 && AMD_NB
         help
           This option gives you AGP support for the GLX component of
           X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.
diff --git a/drivers/char/agp/Makefile b/drivers/char/agp/Makefile
index 627f542827c7..8eb56e273e75 100644
--- a/drivers/char/agp/Makefile
+++ b/drivers/char/agp/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_AGP_HP_ZX1)	+= hp-agp.o
 obj-$(CONFIG_AGP_PARISC)        += parisc-agp.o
 obj-$(CONFIG_AGP_I460)          += i460-agp.o
 obj-$(CONFIG_AGP_INTEL)         += intel-agp.o
+obj-$(CONFIG_AGP_INTEL)         += intel-gtt.o
 obj-$(CONFIG_AGP_NVIDIA)        += nvidia-agp.o
 obj-$(CONFIG_AGP_SGI_TIOCA)     += sgi-agp.o
 obj-$(CONFIG_AGP_SIS)           += sis-agp.o
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index 120490949997..923f99df4f1c 100644
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -120,12 +120,6 @@ struct agp_bridge_driver {
         void (*agp_destroy_page)(struct page *, int flags);
         void (*agp_destroy_pages)(struct agp_memory *);
         int (*agp_type_to_mask_type) (struct agp_bridge_data *, int);
-        void (*chipset_flush)(struct agp_bridge_data *);
-
-        int (*agp_map_page)(struct page *page, dma_addr_t *ret);
-        void (*agp_unmap_page)(struct page *page, dma_addr_t dma);
-        int (*agp_map_memory)(struct agp_memory *mem);
-        void (*agp_unmap_memory)(struct agp_memory *mem);
 };
 
 struct agp_bridge_data {
@@ -243,7 +237,7 @@ extern int agp_try_unsupported_boot;
 
 long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 
-/* Chipset independant registers (from AGP Spec) */
+/* Chipset independent registers (from AGP Spec) */
 #define AGP_APBASE      0x10
 
 #define AGPSTAT         0x4
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index b6b1568314c8..f7e88787af97 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -41,22 +41,8 @@ static int amd_create_page_map(struct amd_page_map *page_map)
         if (page_map->real == NULL)
                 return -ENOMEM;
 
-#ifndef CONFIG_X86
-        SetPageReserved(virt_to_page(page_map->real));
-        global_cache_flush();
-        page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real),
-                                            PAGE_SIZE);
-        if (page_map->remapped == NULL) {
-                ClearPageReserved(virt_to_page(page_map->real));
-                free_page((unsigned long) page_map->real);
-                page_map->real = NULL;
-                return -ENOMEM;
-        }
-        global_cache_flush();
-#else
         set_memory_uc((unsigned long)page_map->real, 1);
         page_map->remapped = page_map->real;
-#endif
 
         for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
                 writel(agp_bridge->scratch_page, page_map->remapped+i);
@@ -68,12 +54,7 @@ static int amd_create_page_map(struct amd_page_map *page_map)
 
 static void amd_free_page_map(struct amd_page_map *page_map)
 {
-#ifndef CONFIG_X86
-        iounmap(page_map->remapped);
-        ClearPageReserved(virt_to_page(page_map->real));
-#else
         set_memory_wb((unsigned long)page_map->real, 1);
-#endif
         free_page((unsigned long) page_map->real);
 }
 
@@ -291,7 +272,7 @@ static void amd_irongate_cleanup(void)
  * This routine could be implemented by taking the addresses
  * written to the GATT, and flushing them individually.  However
  * currently it just flushes the whole table.  Which is probably
- * more efficent, since agp_memory blocks can be a large number of
+ * more efficient, since agp_memory blocks can be a large number of
  * entries.
  */
 
@@ -309,7 +290,8 @@ static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
 
         num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries;
 
-        if (type != 0 || mem->type != 0)
+        if (type != mem->type ||
+            agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type))
                 return -EINVAL;
 
         if ((pg_start + mem->page_count) > num_entries)
@@ -348,7 +330,8 @@ static int amd_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
         unsigned long __iomem *cur_gatt;
         unsigned long addr;
 
-        if (type != 0 || mem->type != 0)
+        if (type != mem->type ||
+            agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type))
                 return -EINVAL;
 
         for (i = pg_start; i < (mem->page_count + pg_start); i++) {
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 70312da4c968..780498d76581 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -15,7 +15,7 @@
 #include <linux/mmzone.h>
 #include <asm/page.h>           /* PAGE_SIZE */
 #include <asm/e820.h>
-#include <asm/k8.h>
+#include <asm/amd_nb.h>
 #include <asm/gart.h>
 #include "agp.h"
 
@@ -38,7 +38,7 @@ static int agp_bridges_found;
 
 static void amd64_tlbflush(struct agp_memory *temp)
 {
-        k8_flush_garts();
+        amd_flush_garts();
 }
 
 static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
@@ -124,7 +124,7 @@ static int amd64_fetch_size(void)
         u32 temp;
         struct aper_size_info_32 *values;
 
-        dev = k8_northbridges[0];
+        dev = node_to_amd_nb(0)->misc;
         if (dev==NULL)
                 return 0;
 
@@ -181,12 +181,15 @@ static int amd_8151_configure(void)
         unsigned long gatt_bus = virt_to_phys(agp_bridge->gatt_table_real);
         int i;
 
+        if (!amd_nb_has_feature(AMD_NB_GART))
+                return 0;
+
         /* Configure AGP regs in each x86-64 host bridge. */
-        for (i = 0; i < num_k8_northbridges; i++) {
+        for (i = 0; i < amd_nb_num(); i++) {
                 agp_bridge->gart_bus_addr =
-                                amd64_configure(k8_northbridges[i], gatt_bus);
+                        amd64_configure(node_to_amd_nb(i)->misc, gatt_bus);
         }
-        k8_flush_garts();
+        amd_flush_garts();
         return 0;
 }
 
@@ -195,11 +198,15 @@ static void amd64_cleanup(void)
 {
         u32 tmp;
         int i;
-        for (i = 0; i < num_k8_northbridges; i++) {
-                struct pci_dev *dev = k8_northbridges[i];
+
+        if (!amd_nb_has_feature(AMD_NB_GART))
+                return;
+
+        for (i = 0; i < amd_nb_num(); i++) {
+                struct pci_dev *dev = node_to_amd_nb(i)->misc;
                 /* disable gart translation */
                 pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &tmp);
-                tmp &= ~AMD64_GARTEN;
+                tmp &= ~GARTEN;
                 pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, tmp);
         }
 }
@@ -313,22 +320,25 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp,
         if (order < 0 || !agp_aperture_valid(aper, (32*1024*1024)<<order))
                 return -1;
 
-        pci_write_config_dword(nb, AMD64_GARTAPERTURECTL, order << 1);
+        gart_set_size_and_enable(nb, order);
         pci_write_config_dword(nb, AMD64_GARTAPERTUREBASE, aper >> 25);
 
         return 0;
 }
 
-static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)
+static __devinit int cache_nbs(struct pci_dev *pdev, u32 cap_ptr)
 {
         int i;
 
-        if (cache_k8_northbridges() < 0)
+        if (amd_cache_northbridges() < 0)
+                return -ENODEV;
+
+        if (!amd_nb_has_feature(AMD_NB_GART))
                 return -ENODEV;
 
         i = 0;
-        for (i = 0; i < num_k8_northbridges; i++) {
-                struct pci_dev *dev = k8_northbridges[i];
+        for (i = 0; i < amd_nb_num(); i++) {
+                struct pci_dev *dev = node_to_amd_nb(i)->misc;
                 if (fix_northbridge(dev, pdev, cap_ptr) < 0) {
                         dev_err(&dev->dev, "no usable aperture found\n");
 #ifdef __x86_64__
@@ -405,7 +415,8 @@ static int __devinit uli_agp_init(struct pci_dev *pdev)
         }
 
         /* shadow x86-64 registers into ULi registers */
-        pci_read_config_dword (k8_northbridges[0], AMD64_GARTAPERTUREBASE, &httfea);
+        pci_read_config_dword (node_to_amd_nb(0)->misc, AMD64_GARTAPERTUREBASE,
+                               &httfea);
 
         /* if x86-64 aperture base is beyond 4G, exit here */
         if ((httfea & 0x7fff) >> (32 - 25)) {
@@ -472,7 +483,8 @@ static int nforce3_agp_init(struct pci_dev *pdev)
         pci_write_config_dword(dev1, NVIDIA_X86_64_1_APSIZE, tmp);
 
         /* shadow x86-64 registers into NVIDIA registers */
-        pci_read_config_dword (k8_northbridges[0], AMD64_GARTAPERTUREBASE, &apbase);
+        pci_read_config_dword (node_to_amd_nb(0)->misc, AMD64_GARTAPERTUREBASE,
+                               &apbase);
 
         /* if x86-64 aperture base is beyond 4G, exit here */
         if ( (apbase & 0x7fff) >> (32 - 25) ) {
@@ -761,18 +773,23 @@ int __init agp_amd64_init(void)
 #else
                         printk(KERN_INFO PFX "You can boot with agp=try_unsupported\n");
 #endif
+                        pci_unregister_driver(&agp_amd64_pci_driver);
                         return -ENODEV;
                 }
 
                 /* First check that we have at least one AMD64 NB */
-                if (!pci_dev_present(k8_nb_ids))
+                if (!pci_dev_present(amd_nb_misc_ids)) {
+                        pci_unregister_driver(&agp_amd64_pci_driver);
                         return -ENODEV;
+                }
 
                 /* Look for any AGP bridge */
                 agp_amd64_pci_driver.id_table = agp_amd64_pci_promisc_table;
                 err = driver_attach(&agp_amd64_pci_driver.driver);
-                if (err == 0 && agp_bridges_found == 0)
+                if (err == 0 && agp_bridges_found == 0) {
+                        pci_unregister_driver(&agp_amd64_pci_driver);
                         err = -ENODEV;
+                }
         }
         return err;
 }
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index ee4f855611b6..f27d0d0816d3 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -151,17 +151,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
                 }
 
                 bridge->scratch_page_page = page;
-                if (bridge->driver->agp_map_page) {
-                        if (bridge->driver->agp_map_page(page,
-                                                         &bridge->scratch_page_dma)) {
-                                dev_err(&bridge->dev->dev,
-                                        "unable to dma-map scratch page\n");
-                                rc = -ENOMEM;
-                                goto err_out_nounmap;
-                        }
-                } else {
-                        bridge->scratch_page_dma = page_to_phys(page);
-                }
+                bridge->scratch_page_dma = page_to_phys(page);
 
                 bridge->scratch_page = bridge->driver->mask_memory(bridge,
                                                    bridge->scratch_page_dma, 0);
@@ -204,12 +194,6 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
         return 0;
 
 err_out:
-        if (bridge->driver->needs_scratch_page &&
-            bridge->driver->agp_unmap_page) {
-                bridge->driver->agp_unmap_page(bridge->scratch_page_page,
-                                               bridge->scratch_page_dma);
-        }
-err_out_nounmap:
         if (bridge->driver->needs_scratch_page) {
                 void *va = page_address(bridge->scratch_page_page);
 
@@ -240,10 +224,6 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
             bridge->driver->needs_scratch_page) {
                 void *va = page_address(bridge->scratch_page_page);
 
-                if (bridge->driver->agp_unmap_page)
-                        bridge->driver->agp_unmap_page(bridge->scratch_page_page,
-                                                       bridge->scratch_page_dma);
-
                 bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);
                 bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);
         }
diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
index 9d2c97a69cdd..a48e05b31593 100644
--- a/drivers/char/agp/compat_ioctl.c
+++ b/drivers/char/agp/compat_ioctl.c
@@ -276,7 +276,6 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 break;
 
         case AGPIOC_CHIPSET_FLUSH32:
-                ret_val = agpioc_chipset_flush_wrap(curr_priv);
                 break;
         }
 
diff --git a/drivers/char/agp/compat_ioctl.h b/drivers/char/agp/compat_ioctl.h
index 0c9678ac0371..f30e0fd97963 100644
--- a/drivers/char/agp/compat_ioctl.h
+++ b/drivers/char/agp/compat_ioctl.h
@@ -102,6 +102,5 @@ void agp_free_memory_wrap(struct agp_memory *memory);
 struct agp_memory *agp_allocate_memory_wrap(size_t pg_count, u32 type);
 struct agp_memory *agp_find_mem_by_key(int key);
 struct agp_client *agp_find_client_by_pid(pid_t id);
-int agpioc_chipset_flush_wrap(struct agp_file_private *priv);
 
 #endif /* _AGP_COMPAT_H */
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 43412c03969e..2e044338753c 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -39,7 +39,6 @@
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include "agp.h"
@@ -958,13 +957,6 @@ static int agpioc_unbind_wrap(struct agp_file_private *priv, void __user *arg)
         return agp_unbind_memory(memory);
 }
 
-int agpioc_chipset_flush_wrap(struct agp_file_private *priv)
-{
-        DBG("");
-        agp_flush_chipset(agp_bridge);
-        return 0;
-}
-
 static long agp_ioctl(struct file *file,
                      unsigned int cmd, unsigned long arg)
 {
@@ -1040,7 +1032,6 @@ static long agp_ioctl(struct file *file,
                 break;
                
         case AGPIOC_CHIPSET_FLUSH:
-                ret_val = agpioc_chipset_flush_wrap(curr_priv);
                 break;
         }
 
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index d2abf5143983..b072648dc3f6 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -81,13 +81,6 @@ static int agp_get_key(void)
         return -1;
 }
 
-void agp_flush_chipset(struct agp_bridge_data *bridge)
-{
-        if (bridge->driver->chipset_flush)
-                bridge->driver->chipset_flush(bridge);
-}
-EXPORT_SYMBOL(agp_flush_chipset);
-
 /*
  * Use kmalloc if possible for the page list. Otherwise fall back to
  * vmalloc. This speeds things up and also saves memory for small AGP
@@ -122,6 +115,9 @@ static struct agp_memory *agp_create_user_memory(unsigned long num_agp_pages)
         struct agp_memory *new;
         unsigned long alloc_size = num_agp_pages*sizeof(struct page *);
 
+        if (INT_MAX/sizeof(struct page *) < num_agp_pages)
+                return NULL;
+
         new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL);
         if (new == NULL)
                 return NULL;
@@ -241,11 +237,14 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge,
         int scratch_pages;
         struct agp_memory *new;
         size_t i;
+        int cur_memory;
 
         if (!bridge)
                 return NULL;
 
-        if ((atomic_read(&bridge->current_memory_agp) + page_count) > bridge->max_memory_agp)
+        cur_memory = atomic_read(&bridge->current_memory_agp);
+        if ((cur_memory + page_count > bridge->max_memory_agp) ||
+            (cur_memory + page_count < page_count))
                 return NULL;
 
         if (type >= AGP_USER_TYPES) {
@@ -437,11 +436,6 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start)
                 curr->is_flushed = true;
         }
 
-        if (curr->bridge->driver->agp_map_memory) {
-                ret_val = curr->bridge->driver->agp_map_memory(curr);
-                if (ret_val)
-                        return ret_val;
-        }
         ret_val = curr->bridge->driver->insert_memory(curr, pg_start, curr->type);
 
         if (ret_val != 0)
@@ -483,9 +477,6 @@ int agp_unbind_memory(struct agp_memory *curr)
         if (ret_val != 0)
                 return ret_val;
 
-        if (curr->bridge->driver->agp_unmap_memory)
-                curr->bridge->driver->agp_unmap_memory(curr);
-
         curr->is_bound = false;
         curr->pg_start = 0;
         spin_lock(&curr->bridge->mapped_lock);
@@ -495,26 +486,6 @@ int agp_unbind_memory(struct agp_memory *curr)
 }
 EXPORT_SYMBOL(agp_unbind_memory);
 
-/**
- *      agp_rebind_emmory  -  Rewrite the entire GATT, useful on resume
- */
-int agp_rebind_memory(void)
-{
-        struct agp_memory *curr;
-        int ret_val = 0;
-
-        spin_lock(&agp_bridge->mapped_lock);
-        list_for_each_entry(curr, &agp_bridge->mapped_list, mapped_list) {
-                ret_val = curr->bridge->driver->insert_memory(curr,
-                                                              curr->pg_start,
-                                                              curr->type);
-                if (ret_val != 0)
-                        break;
-        }
-        spin_unlock(&agp_bridge->mapped_lock);
-        return ret_val;
-}
-EXPORT_SYMBOL(agp_rebind_memory);
 
 /* End - Routines for handling swapping of agp_memory into the GATT */
 
@@ -984,7 +955,9 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
 
         bridge->driver->cache_flush();
 #ifdef CONFIG_X86
-        set_memory_uc((unsigned long)table, 1 << page_order);
+        if (set_memory_uc((unsigned long)table, 1 << page_order))
+                printk(KERN_WARNING "Could not set GATT table memory to UC!");
+
         bridge->gatt_table = (void *)table;
 #else
         bridge->gatt_table = ioremap_nocache(virt_to_phys(table),
@@ -1122,8 +1095,8 @@ int agp_generic_insert_memory(struct agp_memory * mem, off_t pg_start, int type)
                 return -EINVAL;
         }
 
-        /* AK: could wrap */
-        if ((pg_start + mem->page_count) > num_entries)
+        if (((pg_start + mem->page_count) > num_entries) ||
+            ((pg_start + mem->page_count) < pg_start))
                 return -EINVAL;
 
         j = pg_start;
@@ -1157,7 +1130,7 @@ int agp_generic_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
 {
         size_t i;
         struct agp_bridge_data *bridge;
-        int mask_type;
+        int mask_type, num_entries;
 
         bridge = mem->bridge;
         if (!bridge)
@@ -1169,6 +1142,11 @@ int agp_generic_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
         if (type != mem->type)
                 return -EINVAL;
 
+        num_entries = agp_num_entries();
+        if (((pg_start + mem->page_count) > num_entries) ||
+            ((pg_start + mem->page_count) < pg_start))
+                return -EINVAL;
+
         mask_type = bridge->driver->agp_type_to_mask_type(bridge, type);
         if (mask_type != 0) {
                 /* The generic routines know nothing of memory types */
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c
index e763d3312ce7..75b763cb3ea1 100644
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
@@ -1,7 +1,7 @@
 /*
  * For documentation on the i460 AGP interface, see Chapter 7 (AGP Subsystem) of
  * the "Intel 460GTX Chipset Software Developer's Manual":
- * http://developer.intel.com/design/itanium/downloads/24870401s.htm
+ * http://www.intel.com/design/archives/itanium/downloads/248704.htm 
  */
 /*
  * 460GX support by Chris Ahna <christopher.j.ahna@intel.com>
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index cd18493c9527..b427711be4be 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -12,9 +12,6 @@
 #include <asm/smp.h>
 #include "agp.h"
 #include "intel-agp.h"
-#include <linux/intel-gtt.h>
-
-#include "intel-gtt.c"
 
 int intel_agp_enabled;
 EXPORT_SYMBOL(intel_agp_enabled);
@@ -703,179 +700,37 @@ static const struct agp_bridge_driver intel_7505_driver = {
         .agp_type_to_mask_type  = agp_generic_type_to_mask_type,
 };
 
-static int find_gmch(u16 device)
-{
-        struct pci_dev *gmch_device;
-
-        gmch_device = pci_get_device(PCI_VENDOR_ID_INTEL, device, NULL);
-        if (gmch_device && PCI_FUNC(gmch_device->devfn) != 0) {
-                gmch_device = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                             device, gmch_device);
-        }
-
-        if (!gmch_device)
-                return 0;
-
-        intel_private.pcidev = gmch_device;
-        return 1;
-}
-
 /* Table to describe Intel GMCH and AGP/PCIE GART drivers.  At least one of
  * driver and gmch_driver must be non-null, and find_gmch will determine
  * which one should be used if a gmch_chip_id is present.
  */
-static const struct intel_driver_description {
+static const struct intel_agp_driver_description {
         unsigned int chip_id;
-        unsigned int gmch_chip_id;
         char *name;
         const struct agp_bridge_driver *driver;
-        const struct agp_bridge_driver *gmch_driver;
 } intel_agp_chipsets[] = {
-        { PCI_DEVICE_ID_INTEL_82443LX_0, 0, "440LX", &intel_generic_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82443BX_0, 0, "440BX", &intel_generic_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82443GX_0, 0, "440GX", &intel_generic_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82810_MC1, PCI_DEVICE_ID_INTEL_82810_IG1, "i810",
-                NULL, &intel_810_driver },
-        { PCI_DEVICE_ID_INTEL_82810_MC3, PCI_DEVICE_ID_INTEL_82810_IG3, "i810",
-                NULL, &intel_810_driver },
-        { PCI_DEVICE_ID_INTEL_82810E_MC, PCI_DEVICE_ID_INTEL_82810E_IG, "i810",
-                NULL, &intel_810_driver },
-        { PCI_DEVICE_ID_INTEL_82815_MC, PCI_DEVICE_ID_INTEL_82815_CGC, "i815",
-                &intel_815_driver, &intel_810_driver },
-        { PCI_DEVICE_ID_INTEL_82820_HB, 0, "i820", &intel_820_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82820_UP_HB, 0, "i820", &intel_820_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82830_HB, PCI_DEVICE_ID_INTEL_82830_CGC, "830M",
-                &intel_830mp_driver, &intel_830_driver },
-        { PCI_DEVICE_ID_INTEL_82840_HB, 0, "i840", &intel_840_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82845_HB, 0, "845G", &intel_845_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82845G_HB, PCI_DEVICE_ID_INTEL_82845G_IG, "830M",
-                &intel_845_driver, &intel_830_driver },
-        { PCI_DEVICE_ID_INTEL_82850_HB, 0, "i850", &intel_850_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82854_HB, PCI_DEVICE_ID_INTEL_82854_IG, "854",
-                &intel_845_driver, &intel_830_driver },
-        { PCI_DEVICE_ID_INTEL_82855PM_HB, 0, "855PM", &intel_845_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82855GM_HB, PCI_DEVICE_ID_INTEL_82855GM_IG, "855GM",
-                &intel_845_driver, &intel_830_driver },
-        { PCI_DEVICE_ID_INTEL_82860_HB, 0, "i860", &intel_860_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_82865_HB, PCI_DEVICE_ID_INTEL_82865_IG, "865",
-                &intel_845_driver, &intel_830_driver },
-        { PCI_DEVICE_ID_INTEL_82875_HB, 0, "i875", &intel_845_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_E7221_HB, PCI_DEVICE_ID_INTEL_E7221_IG, "E7221 (i915)",
-                NULL, &intel_915_driver },
-        { PCI_DEVICE_ID_INTEL_82915G_HB, PCI_DEVICE_ID_INTEL_82915G_IG, "915G",
-                NULL, &intel_915_driver },
-        { PCI_DEVICE_ID_INTEL_82915GM_HB, PCI_DEVICE_ID_INTEL_82915GM_IG, "915GM",
-                NULL, &intel_915_driver },
-        { PCI_DEVICE_ID_INTEL_82945G_HB, PCI_DEVICE_ID_INTEL_82945G_IG, "945G",
-                NULL, &intel_915_driver },
-        { PCI_DEVICE_ID_INTEL_82945GM_HB, PCI_DEVICE_ID_INTEL_82945GM_IG, "945GM",
-                NULL, &intel_915_driver },
-        { PCI_DEVICE_ID_INTEL_82945GME_HB, PCI_DEVICE_ID_INTEL_82945GME_IG, "945GME",
-                NULL, &intel_915_driver },
-        { PCI_DEVICE_ID_INTEL_82946GZ_HB, PCI_DEVICE_ID_INTEL_82946GZ_IG, "946GZ",
-                NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_82G35_HB, PCI_DEVICE_ID_INTEL_82G35_IG, "G35",
-                NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_82965Q_HB, PCI_DEVICE_ID_INTEL_82965Q_IG, "965Q",
-                NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_82965G_HB, PCI_DEVICE_ID_INTEL_82965G_IG, "965G",
-                NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_82965GM_HB, PCI_DEVICE_ID_INTEL_82965GM_IG, "965GM",
-                NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_82965GME_HB, PCI_DEVICE_ID_INTEL_82965GME_IG, "965GME/GLE",
-                NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_7505_0, 0, "E7505", &intel_7505_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_7205_0, 0, "E7205", &intel_7505_driver, NULL },
-        { PCI_DEVICE_ID_INTEL_G33_HB, PCI_DEVICE_ID_INTEL_G33_IG, "G33",
-                NULL, &intel_g33_driver },
-        { PCI_DEVICE_ID_INTEL_Q35_HB, PCI_DEVICE_ID_INTEL_Q35_IG, "Q35",
-                NULL, &intel_g33_driver },
-        { PCI_DEVICE_ID_INTEL_Q33_HB, PCI_DEVICE_ID_INTEL_Q33_IG, "Q33",
-                NULL, &intel_g33_driver },
-        { PCI_DEVICE_ID_INTEL_PINEVIEW_M_HB, PCI_DEVICE_ID_INTEL_PINEVIEW_M_IG, "GMA3150",
-                NULL, &intel_g33_driver },
-        { PCI_DEVICE_ID_INTEL_PINEVIEW_HB, PCI_DEVICE_ID_INTEL_PINEVIEW_IG, "GMA3150",
-                NULL, &intel_g33_driver },
-        { PCI_DEVICE_ID_INTEL_GM45_HB, PCI_DEVICE_ID_INTEL_GM45_IG,
-            "GM45", NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_EAGLELAKE_HB, PCI_DEVICE_ID_INTEL_EAGLELAKE_IG,
-            "Eaglelake", NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_Q45_HB, PCI_DEVICE_ID_INTEL_Q45_IG,
-            "Q45/Q43", NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_G45_HB, PCI_DEVICE_ID_INTEL_G45_IG,
-            "G45/G43", NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_B43_HB, PCI_DEVICE_ID_INTEL_B43_IG,
-            "B43", NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_B43_1_HB, PCI_DEVICE_ID_INTEL_B43_1_IG,
-            "B43", NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_G41_HB, PCI_DEVICE_ID_INTEL_G41_IG,
-            "G41", NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB, PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG,
-            "HD Graphics", NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB, PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG,
-            "HD Graphics", NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB, PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG,
-            "HD Graphics", NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB, PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG,
-            "HD Graphics", NULL, &intel_i965_driver },
-        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT1_IG,
-            "Sandybridge", NULL, &intel_gen6_driver },
-        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_IG,
-            "Sandybridge", NULL, &intel_gen6_driver },
-        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_PLUS_IG,
-            "Sandybridge", NULL, &intel_gen6_driver },
-        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT1_IG,
-            "Sandybridge", NULL, &intel_gen6_driver },
-        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_IG,
-            "Sandybridge", NULL, &intel_gen6_driver },
-        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_PLUS_IG,
-            "Sandybridge", NULL, &intel_gen6_driver },
-        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_IG,
-            "Sandybridge", NULL, &intel_gen6_driver },
-        { 0, 0, NULL, NULL, NULL }
+        { PCI_DEVICE_ID_INTEL_82443LX_0, "440LX", &intel_generic_driver },
+        { PCI_DEVICE_ID_INTEL_82443BX_0, "440BX", &intel_generic_driver },
+        { PCI_DEVICE_ID_INTEL_82443GX_0, "440GX", &intel_generic_driver },
+        { PCI_DEVICE_ID_INTEL_82815_MC, "i815", &intel_815_driver },
+        { PCI_DEVICE_ID_INTEL_82820_HB, "i820", &intel_820_driver },
+        { PCI_DEVICE_ID_INTEL_82820_UP_HB, "i820", &intel_820_driver },
+        { PCI_DEVICE_ID_INTEL_82830_HB, "830M", &intel_830mp_driver },
+        { PCI_DEVICE_ID_INTEL_82840_HB, "i840", &intel_840_driver },
+        { PCI_DEVICE_ID_INTEL_82845_HB, "i845", &intel_845_driver },
+        { PCI_DEVICE_ID_INTEL_82845G_HB, "845G", &intel_845_driver },
+        { PCI_DEVICE_ID_INTEL_82850_HB, "i850", &intel_850_driver },
+        { PCI_DEVICE_ID_INTEL_82854_HB, "854", &intel_845_driver },
+        { PCI_DEVICE_ID_INTEL_82855PM_HB, "855PM", &intel_845_driver },
+        { PCI_DEVICE_ID_INTEL_82855GM_HB, "855GM", &intel_845_driver },
+        { PCI_DEVICE_ID_INTEL_82860_HB, "i860", &intel_860_driver },
+        { PCI_DEVICE_ID_INTEL_82865_HB, "865", &intel_845_driver },
+        { PCI_DEVICE_ID_INTEL_82875_HB, "i875", &intel_845_driver },
+        { PCI_DEVICE_ID_INTEL_7505_0, "E7505", &intel_7505_driver },
+        { PCI_DEVICE_ID_INTEL_7205_0, "E7205", &intel_7505_driver },
+        { 0, NULL, NULL }
 };
 
-static int __devinit intel_gmch_probe(struct pci_dev *pdev,
-                                      struct agp_bridge_data *bridge)
-{
-        int i, mask;
-
-        bridge->driver = NULL;
-
-        for (i = 0; intel_agp_chipsets[i].name != NULL; i++) {
-                if ((intel_agp_chipsets[i].gmch_chip_id != 0) &&
-                        find_gmch(intel_agp_chipsets[i].gmch_chip_id)) {
-                        bridge->driver =
-                                intel_agp_chipsets[i].gmch_driver;
-                        break;
-                }
-        }
-
-        if (!bridge->driver)
-                return 0;
-
-        bridge->dev_private_data = &intel_private;
-        bridge->dev = pdev;
-
-        dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name);
-
-        if (bridge->driver->mask_memory == intel_gen6_mask_memory)
-                mask = 40;
-        else if (bridge->driver->mask_memory == intel_i965_mask_memory)
-                mask = 36;
-        else
-                mask = 32;
-
-        if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(mask)))
-                dev_err(&intel_private.pcidev->dev,
-                        "set gfx device dma mask %d-bit failed!\n", mask);
-        else
-                pci_set_consistent_dma_mask(intel_private.pcidev,
-                                            DMA_BIT_MASK(mask));
-
-        return 1;
-}
-
 static int __devinit agp_intel_probe(struct pci_dev *pdev,
                                      const struct pci_device_id *ent)
 {
@@ -905,7 +760,7 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 }
         }
 
-        if (intel_agp_chipsets[i].name == NULL) {
+        if (!bridge->driver) {
                 if (cap_ptr)
                         dev_warn(&pdev->dev, "unsupported Intel chipset [%04x/%04x]\n",
                                  pdev->vendor, pdev->device);
@@ -913,34 +768,20 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 return -ENODEV;
         }
 
-        if (!bridge->driver) {
-                if (cap_ptr)
-                        dev_warn(&pdev->dev, "can't find bridge device (chip_id: %04x)\n",
-                                 intel_agp_chipsets[i].gmch_chip_id);
-                agp_put_bridge(bridge);
-                return -ENODEV;
-        }
-
         bridge->dev = pdev;
         bridge->dev_private_data = NULL;
 
         dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name);
 
         /*
-        * If the device has not been properly setup, the following will catch
-        * the problem and should stop the system from crashing.
-        * 20030610 - hamish@zot.org
-        */
-        if (pci_enable_device(pdev)) {
-                dev_err(&pdev->dev, "can't enable PCI device\n");
-                agp_put_bridge(bridge);
-                return -ENODEV;
-        }
-
-        /*
         * The following fixes the case where the BIOS has "forgotten" to
         * provide an address range for the GART.
         * 20030610 - hamish@zot.org
+        * This happens before pci_enable_device() intentionally;
+        * calling pci_enable_device() before assigning the resource
+        * will result in the GART being disabled on machines with such
+        * BIOSs (the GART ends up with a BAR starting at 0, which
+        * conflicts a lot of other devices).
         */
         r = &pdev->resource[0];
         if (!r->start && r->end) {
@@ -951,6 +792,17 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 }
         }
 
+        /*
+        * If the device has not been properly setup, the following will catch
+        * the problem and should stop the system from crashing.
+        * 20030610 - hamish@zot.org
+        */
+        if (pci_enable_device(pdev)) {
+                dev_err(&pdev->dev, "can't enable PCI device\n");
+                agp_put_bridge(bridge);
+                return -ENODEV;
+        }
+
         /* Fill in the mode register */
         if (cap_ptr) {
                 pci_read_config_dword(pdev,
@@ -972,8 +824,7 @@ static void __devexit agp_intel_remove(struct pci_dev *pdev)
 
         agp_remove_bridge(bridge);
 
-        if (intel_private.pcidev)
-                pci_dev_put(intel_private.pcidev);
+        intel_gmch_remove(pdev);
 
         agp_put_bridge(bridge);
 }
@@ -982,14 +833,9 @@ static void __devexit agp_intel_remove(struct pci_dev *pdev)
 static int agp_intel_resume(struct pci_dev *pdev)
 {
         struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
-        int ret_val;
 
         bridge->driver->configure();
 
-        ret_val = agp_rebind_memory();
-        if (ret_val != 0)
-                return ret_val;
-
         return 0;
 }
 #endif
@@ -1049,6 +895,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
         ID(PCI_DEVICE_ID_INTEL_G45_HB),
         ID(PCI_DEVICE_ID_INTEL_G41_HB),
         ID(PCI_DEVICE_ID_INTEL_B43_HB),
+        ID(PCI_DEVICE_ID_INTEL_B43_1_HB),
         ID(PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB),
         ID(PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB),
         ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB),
@@ -1056,6 +903,9 @@ static struct pci_device_id agp_intel_pci_table[] = {
         ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB),
         ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB),
         ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB),
+        ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_HB),
+        ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB),
+        ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB),
         { }
 };
 
diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index d09b1ab7e8ab..5da67f165afa 100644
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -75,6 +75,8 @@
 #define I810_GMS_DISABLE        0x00000000
 #define I810_PGETBL_CTL         0x2020
 #define I810_PGETBL_ENABLED     0x00000001
+/* Note: PGETBL_CTL2 has a different offset on G33. */
+#define I965_PGETBL_CTL2        0x20c4
 #define I965_PGETBL_SIZE_MASK   0x0000000e
 #define I965_PGETBL_SIZE_512KB  (0 << 1)
 #define I965_PGETBL_SIZE_256KB  (1 << 1)
@@ -82,9 +84,18 @@
 #define I965_PGETBL_SIZE_1MB    (3 << 1)
 #define I965_PGETBL_SIZE_2MB    (4 << 1)
 #define I965_PGETBL_SIZE_1_5MB  (5 << 1)
-#define G33_PGETBL_SIZE_MASK    (3 << 8)
-#define G33_PGETBL_SIZE_1M      (1 << 8)
-#define G33_PGETBL_SIZE_2M      (2 << 8)
+#define G33_GMCH_SIZE_MASK      (3 << 8)
+#define G33_GMCH_SIZE_1M        (1 << 8)
+#define G33_GMCH_SIZE_2M        (2 << 8)
+#define G4x_GMCH_SIZE_MASK      (0xf << 8)
+#define G4x_GMCH_SIZE_1M        (0x1 << 8)
+#define G4x_GMCH_SIZE_2M        (0x3 << 8)
+#define G4x_GMCH_SIZE_VT_EN     (0x8 << 8)
+#define G4x_GMCH_SIZE_VT_1M     (G4x_GMCH_SIZE_1M | G4x_GMCH_SIZE_VT_EN)
+#define G4x_GMCH_SIZE_VT_1_5M   ((0x2 << 8) | G4x_GMCH_SIZE_VT_EN)
+#define G4x_GMCH_SIZE_VT_2M     (G4x_GMCH_SIZE_2M | G4x_GMCH_SIZE_VT_EN)
+
+#define GFX_FLSH_CNTL           0x2170 /* 915+ */
 
 #define I810_DRAM_CTL           0x3000
 #define I810_DRAM_ROW_0         0x00000001
@@ -120,6 +131,7 @@
 #define INTEL_GMCH_GMS_STOLEN_352M      (0xd << 4)
 
 #define I915_IFPADDR    0x60
+#define I830_HIC        0x70
 
 /* Intel 965G registers */
 #define I965_MSAC 0x62
@@ -214,45 +226,16 @@
 #define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_PLUS_IG   0x0126
 #define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB            0x0108  /* Server */
 #define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_IG            0x010A
-
-/* cover 915 and 945 variants */
-#define IS_I915 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GME_HB)
-
-#define IS_I965 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82946GZ_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82G35_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965Q_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GME_HB)
-
-#define IS_G33 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G33_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q35_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q33_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_PINEVIEW_M_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_PINEVIEW_HB)
-
-#define IS_PINEVIEW (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_PINEVIEW_M_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_PINEVIEW_HB)
-
-#define IS_SNB (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB)
-
-#define IS_G4X (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_EAGLELAKE_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q45_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G41_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_B43_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB || \
-                IS_SNB)
-
+#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_HB                0x0150  /* Desktop */
+#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT1_IG            0x0152
+#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT2_IG            0x0162
+#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB              0x0154  /* Mobile */
+#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT1_IG          0x0156
+#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT2_IG          0x0166
+#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB              0x0158  /* Server */
+#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT1_IG          0x015A
+
+int intel_gmch_probe(struct pci_dev *pdev,
+                               struct agp_bridge_data *bridge);
+void intel_gmch_remove(struct pci_dev *pdev);
 #endif
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 75e0a3497888..85151019dde1 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -15,6 +15,18 @@
  * /fairy-tale-mode off
  */
 
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/pagemap.h>
+#include <linux/agp_backend.h>
+#include <linux/delay.h>
+#include <asm/smp.h>
+#include "agp.h"
+#include "intel-agp.h"
+#include <drm/intel-gtt.h>
+
 /*
  * If we have Intel graphics, we're not going to have anything other than
  * an Intel IOMMU. So make the correct use of the PCI DMA API contingent
@@ -23,121 +35,79 @@
  */
 #ifdef CONFIG_DMAR
 #define USE_PCI_DMA_API 1
+#else
+#define USE_PCI_DMA_API 0
 #endif
 
-/* Max amount of stolen space, anything above will be returned to Linux */
-int intel_max_stolen = 32 * 1024 * 1024;
-EXPORT_SYMBOL(intel_max_stolen);
-
-static const struct aper_size_info_fixed intel_i810_sizes[] =
-{
-        {64, 16384, 4},
-        /* The 32M mode still requires a 64k gatt */
-        {32, 8192, 4}
-};
-
-#define AGP_DCACHE_MEMORY       1
-#define AGP_PHYS_MEMORY         2
-#define INTEL_AGP_CACHED_MEMORY 3
-
-static struct gatt_mask intel_i810_masks[] =
-{
-        {.mask = I810_PTE_VALID, .type = 0},
-        {.mask = (I810_PTE_VALID | I810_PTE_LOCAL), .type = AGP_DCACHE_MEMORY},
-        {.mask = I810_PTE_VALID, .type = 0},
-        {.mask = I810_PTE_VALID | I830_PTE_SYSTEM_CACHED,
-         .type = INTEL_AGP_CACHED_MEMORY}
-};
-
-#define INTEL_AGP_UNCACHED_MEMORY              0
-#define INTEL_AGP_CACHED_MEMORY_LLC            1
-#define INTEL_AGP_CACHED_MEMORY_LLC_GFDT       2
-#define INTEL_AGP_CACHED_MEMORY_LLC_MLC        3
-#define INTEL_AGP_CACHED_MEMORY_LLC_MLC_GFDT   4
-
-static struct gatt_mask intel_gen6_masks[] =
-{
-        {.mask = I810_PTE_VALID | GEN6_PTE_UNCACHED,
-         .type = INTEL_AGP_UNCACHED_MEMORY },
-        {.mask = I810_PTE_VALID | GEN6_PTE_LLC,
-         .type = INTEL_AGP_CACHED_MEMORY_LLC },
-        {.mask = I810_PTE_VALID | GEN6_PTE_LLC | GEN6_PTE_GFDT,
-         .type = INTEL_AGP_CACHED_MEMORY_LLC_GFDT },
-        {.mask = I810_PTE_VALID | GEN6_PTE_LLC_MLC,
-         .type = INTEL_AGP_CACHED_MEMORY_LLC_MLC },
-        {.mask = I810_PTE_VALID | GEN6_PTE_LLC_MLC | GEN6_PTE_GFDT,
-         .type = INTEL_AGP_CACHED_MEMORY_LLC_MLC_GFDT },
+struct intel_gtt_driver {
+        unsigned int gen : 8;
+        unsigned int is_g33 : 1;
+        unsigned int is_pineview : 1;
+        unsigned int is_ironlake : 1;
+        unsigned int has_pgtbl_enable : 1;
+        unsigned int dma_mask_size : 8;
+        /* Chipset specific GTT setup */
+        int (*setup)(void);
+        /* This should undo anything done in ->setup() save the unmapping
+         * of the mmio register file, that's done in the generic code. */
+        void (*cleanup)(void);
+        void (*write_entry)(dma_addr_t addr, unsigned int entry, unsigned int flags);
+        /* Flags is a more or less chipset specific opaque value.
+         * For chipsets that need to support old ums (non-gem) code, this
+         * needs to be identical to the various supported agp memory types! */
+        bool (*check_flags)(unsigned int flags);
+        void (*chipset_flush)(void);
 };
 
 static struct _intel_private {
+        struct intel_gtt base;
+        const struct intel_gtt_driver *driver;
         struct pci_dev *pcidev; /* device one */
+        struct pci_dev *bridge_dev;
         u8 __iomem *registers;
+        phys_addr_t gtt_bus_addr;
+        phys_addr_t gma_bus_addr;
+        u32 PGETBL_save;
         u32 __iomem *gtt;               /* I915G */
+        bool clear_fake_agp; /* on first access via agp, fill with scratch */
         int num_dcache_entries;
-        /* gtt_entries is the number of gtt entries that are already mapped
-         * to stolen memory.  Stolen memory is larger than the memory mapped
-         * through gtt_entries, as it includes some reserved space for the BIOS
-         * popup and for the GTT.
-         */
-        int gtt_entries;                        /* i830+ */
-        int gtt_total_size;
-        union {
-                void __iomem *i9xx_flush_page;
-                void *i8xx_flush_page;
-        };
-        struct page *i8xx_page;
+        void __iomem *i9xx_flush_page;
+        char *i81x_gtt_table;
         struct resource ifp_resource;
         int resource_valid;
+        struct page *scratch_page;
+        dma_addr_t scratch_page_dma;
 } intel_private;
 
-#ifdef USE_PCI_DMA_API
-static int intel_agp_map_page(struct page *page, dma_addr_t *ret)
-{
-        *ret = pci_map_page(intel_private.pcidev, page, 0,
-                            PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
-        if (pci_dma_mapping_error(intel_private.pcidev, *ret))
-                return -EINVAL;
-        return 0;
-}
+#define INTEL_GTT_GEN   intel_private.driver->gen
+#define IS_G33          intel_private.driver->is_g33
+#define IS_PINEVIEW     intel_private.driver->is_pineview
+#define IS_IRONLAKE     intel_private.driver->is_ironlake
+#define HAS_PGTBL_EN    intel_private.driver->has_pgtbl_enable
 
-static void intel_agp_unmap_page(struct page *page, dma_addr_t dma)
-{
-        pci_unmap_page(intel_private.pcidev, dma,
-                       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
-}
-
-static void intel_agp_free_sglist(struct agp_memory *mem)
-{
-        struct sg_table st;
-
-        st.sgl = mem->sg_list;
-        st.orig_nents = st.nents = mem->page_count;
-
-        sg_free_table(&st);
-
-        mem->sg_list = NULL;
-        mem->num_sg = 0;
-}
-
-static int intel_agp_map_memory(struct agp_memory *mem)
+int intel_gtt_map_memory(struct page **pages, unsigned int num_entries,
+                         struct scatterlist **sg_list, int *num_sg)
 {
         struct sg_table st;
         struct scatterlist *sg;
         int i;
 
-        DBG("try mapping %lu pages\n", (unsigned long)mem->page_count);
+        if (*sg_list)
+                return 0; /* already mapped (for e.g. resume */
+
+        DBG("try mapping %lu pages\n", (unsigned long)num_entries);
 
-        if (sg_alloc_table(&st, mem->page_count, GFP_KERNEL))
+        if (sg_alloc_table(&st, num_entries, GFP_KERNEL))
                 goto err;
 
-        mem->sg_list = sg = st.sgl;
+        *sg_list = sg = st.sgl;
 
-        for (i = 0 ; i < mem->page_count; i++, sg = sg_next(sg))
-                sg_set_page(sg, mem->pages[i], PAGE_SIZE, 0);
+        for (i = 0 ; i < num_entries; i++, sg = sg_next(sg))
+                sg_set_page(sg, pages[i], PAGE_SIZE, 0);
 
-        mem->num_sg = pci_map_sg(intel_private.pcidev, mem->sg_list,
-                                 mem->page_count, PCI_DMA_BIDIRECTIONAL);
-        if (unlikely(!mem->num_sg))
+        *num_sg = pci_map_sg(intel_private.pcidev, *sg_list,
+                                 num_entries, PCI_DMA_BIDIRECTIONAL);
+        if (unlikely(!*num_sg))
                 goto err;
 
         return 0;
@@ -146,145 +116,24 @@ err:
         sg_free_table(&st);
         return -ENOMEM;
 }
+EXPORT_SYMBOL(intel_gtt_map_memory);
 
-static void intel_agp_unmap_memory(struct agp_memory *mem)
+void intel_gtt_unmap_memory(struct scatterlist *sg_list, int num_sg)
 {
+        struct sg_table st;
         DBG("try unmapping %lu pages\n", (unsigned long)mem->page_count);
 
-        pci_unmap_sg(intel_private.pcidev, mem->sg_list,
-                     mem->page_count, PCI_DMA_BIDIRECTIONAL);
-        intel_agp_free_sglist(mem);
-}
-
-static void intel_agp_insert_sg_entries(struct agp_memory *mem,
-                                        off_t pg_start, int mask_type)
-{
-        struct scatterlist *sg;
-        int i, j;
-
-        j = pg_start;
-
-        WARN_ON(!mem->num_sg);
-
-        if (mem->num_sg == mem->page_count) {
-                for_each_sg(mem->sg_list, sg, mem->page_count, i) {
-                        writel(agp_bridge->driver->mask_memory(agp_bridge,
-                                        sg_dma_address(sg), mask_type),
-                                        intel_private.gtt+j);
-                        j++;
-                }
-        } else {
-                /* sg may merge pages, but we have to separate
-                 * per-page addr for GTT */
-                unsigned int len, m;
-
-                for_each_sg(mem->sg_list, sg, mem->num_sg, i) {
-                        len = sg_dma_len(sg) / PAGE_SIZE;
-                        for (m = 0; m < len; m++) {
-                                writel(agp_bridge->driver->mask_memory(agp_bridge,
-                                                                       sg_dma_address(sg) + m * PAGE_SIZE,
-                                                                       mask_type),
-                                       intel_private.gtt+j);
-                                j++;
-                        }
-                }
-        }
-        readl(intel_private.gtt+j-1);
-}
-
-#else
-
-static void intel_agp_insert_sg_entries(struct agp_memory *mem,
-                                        off_t pg_start, int mask_type)
-{
-        int i, j;
-
-        for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
-                writel(agp_bridge->driver->mask_memory(agp_bridge,
-                                page_to_phys(mem->pages[i]), mask_type),
-                       intel_private.gtt+j);
-        }
-
-        readl(intel_private.gtt+j-1);
-}
-
-#endif
-
-static int intel_i810_fetch_size(void)
-{
-        u32 smram_miscc;
-        struct aper_size_info_fixed *values;
+        pci_unmap_sg(intel_private.pcidev, sg_list,
+                     num_sg, PCI_DMA_BIDIRECTIONAL);
 
-        pci_read_config_dword(agp_bridge->dev, I810_SMRAM_MISCC, &smram_miscc);
-        values = A_SIZE_FIX(agp_bridge->driver->aperture_sizes);
-
-        if ((smram_miscc & I810_GMS) == I810_GMS_DISABLE) {
-                dev_warn(&agp_bridge->dev->dev, "i810 is disabled\n");
-                return 0;
-        }
-        if ((smram_miscc & I810_GFX_MEM_WIN_SIZE) == I810_GFX_MEM_WIN_32M) {
-                agp_bridge->current_size = (void *) (values + 1);
-                agp_bridge->aperture_size_idx = 1;
-                return values[1].size;
-        } else {
-                agp_bridge->current_size = (void *) (values);
-                agp_bridge->aperture_size_idx = 0;
-                return values[0].size;
-        }
-
-        return 0;
-}
-
-static int intel_i810_configure(void)
-{
-        struct aper_size_info_fixed *current_size;
-        u32 temp;
-        int i;
-
-        current_size = A_SIZE_FIX(agp_bridge->current_size);
-
-        if (!intel_private.registers) {
-                pci_read_config_dword(intel_private.pcidev, I810_MMADDR, &temp);
-                temp &= 0xfff80000;
-
-                intel_private.registers = ioremap(temp, 128 * 4096);
-                if (!intel_private.registers) {
-                        dev_err(&intel_private.pcidev->dev,
-                                "can't remap memory\n");
-                        return -ENOMEM;
-                }
-        }
-
-        if ((readl(intel_private.registers+I810_DRAM_CTL)
-                & I810_DRAM_ROW_0) == I810_DRAM_ROW_0_SDRAM) {
-                /* This will need to be dynamically assigned */
-                dev_info(&intel_private.pcidev->dev,
-                         "detected 4MB dedicated video ram\n");
-                intel_private.num_dcache_entries = 1024;
-        }
-        pci_read_config_dword(intel_private.pcidev, I810_GMADDR, &temp);
-        agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
-        writel(agp_bridge->gatt_bus_addr | I810_PGETBL_ENABLED, intel_private.registers+I810_PGETBL_CTL);
-        readl(intel_private.registers+I810_PGETBL_CTL); /* PCI Posting. */
-
-        if (agp_bridge->driver->needs_scratch_page) {
-                for (i = 0; i < current_size->num_entries; i++) {
-                        writel(agp_bridge->scratch_page, intel_private.registers+I810_PTE_BASE+(i*4));
-                }
-                readl(intel_private.registers+I810_PTE_BASE+((i-1)*4)); /* PCI posting. */
-        }
-        global_cache_flush();
-        return 0;
-}
+        st.sgl = sg_list;
+        st.orig_nents = st.nents = num_sg;
 
-static void intel_i810_cleanup(void)
-{
-        writel(0, intel_private.registers+I810_PGETBL_CTL);
-        readl(intel_private.registers); /* PCI Posting. */
-        iounmap(intel_private.registers);
+        sg_free_table(&st);
 }
+EXPORT_SYMBOL(intel_gtt_unmap_memory);
 
-static void intel_i810_agp_enable(struct agp_bridge_data *bridge, u32 mode)
+static void intel_fake_agp_enable(struct agp_bridge_data *bridge, u32 mode)
 {
         return;
 }
@@ -319,108 +168,64 @@ static void i8xx_destroy_pages(struct page *page)
         atomic_dec(&agp_bridge->current_memory_agp);
 }
 
-static int intel_i830_type_to_mask_type(struct agp_bridge_data *bridge,
-                                        int type)
-{
-        if (type < AGP_USER_TYPES)
-                return type;
-        else if (type == AGP_USER_CACHED_MEMORY)
-                return INTEL_AGP_CACHED_MEMORY;
-        else
-                return 0;
-}
-
-static int intel_gen6_type_to_mask_type(struct agp_bridge_data *bridge,
-                                        int type)
+#define I810_GTT_ORDER 4
+static int i810_setup(void)
 {
-        unsigned int type_mask = type & ~AGP_USER_CACHED_MEMORY_GFDT;
-        unsigned int gfdt = type & AGP_USER_CACHED_MEMORY_GFDT;
-
-        if (type_mask == AGP_USER_UNCACHED_MEMORY)
-                return INTEL_AGP_UNCACHED_MEMORY;
-        else if (type_mask == AGP_USER_CACHED_MEMORY_LLC_MLC)
-                return gfdt ? INTEL_AGP_CACHED_MEMORY_LLC_MLC_GFDT :
-                              INTEL_AGP_CACHED_MEMORY_LLC_MLC;
-        else /* set 'normal'/'cached' to LLC by default */
-                return gfdt ? INTEL_AGP_CACHED_MEMORY_LLC_GFDT :
-                              INTEL_AGP_CACHED_MEMORY_LLC;
-}
+        u32 reg_addr;
+        char *gtt_table;
 
+        /* i81x does not preallocate the gtt. It's always 64kb in size. */
+        gtt_table = alloc_gatt_pages(I810_GTT_ORDER);
+        if (gtt_table == NULL)
+                return -ENOMEM;
+        intel_private.i81x_gtt_table = gtt_table;
 
-static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start,
-                                int type)
-{
-        int i, j, num_entries;
-        void *temp;
-        int ret = -EINVAL;
-        int mask_type;
-
-        if (mem->page_count == 0)
-                goto out;
+        pci_read_config_dword(intel_private.pcidev, I810_MMADDR, &reg_addr);
+        reg_addr &= 0xfff80000;
 
-        temp = agp_bridge->current_size;
-        num_entries = A_SIZE_FIX(temp)->num_entries;
+        intel_private.registers = ioremap(reg_addr, KB(64));
+        if (!intel_private.registers)
+                return -ENOMEM;
 
-        if ((pg_start + mem->page_count) > num_entries)
-                goto out_err;
+        writel(virt_to_phys(gtt_table) | I810_PGETBL_ENABLED,
+               intel_private.registers+I810_PGETBL_CTL);
 
+        intel_private.gtt_bus_addr = reg_addr + I810_PTE_BASE;
 
-        for (j = pg_start; j < (pg_start + mem->page_count); j++) {
-                if (!PGE_EMPTY(agp_bridge, readl(agp_bridge->gatt_table+j))) {
-                        ret = -EBUSY;
-                        goto out_err;
-                }
+        if ((readl(intel_private.registers+I810_DRAM_CTL)
+                & I810_DRAM_ROW_0) == I810_DRAM_ROW_0_SDRAM) {
+                dev_info(&intel_private.pcidev->dev,
+                         "detected 4MB dedicated video ram\n");
+                intel_private.num_dcache_entries = 1024;
         }
 
-        if (type != mem->type)
-                goto out_err;
-
-        mask_type = agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type);
-
-        switch (mask_type) {
-        case AGP_DCACHE_MEMORY:
-                if (!mem->is_flushed)
-                        global_cache_flush();
-                for (i = pg_start; i < (pg_start + mem->page_count); i++) {
-                        writel((i*4096)|I810_PTE_LOCAL|I810_PTE_VALID,
-                               intel_private.registers+I810_PTE_BASE+(i*4));
-                }
-                readl(intel_private.registers+I810_PTE_BASE+((i-1)*4));
-                break;
-        case AGP_PHYS_MEMORY:
-        case AGP_NORMAL_MEMORY:
-                if (!mem->is_flushed)
-                        global_cache_flush();
-                for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
-                        writel(agp_bridge->driver->mask_memory(agp_bridge,
-                                        page_to_phys(mem->pages[i]), mask_type),
-                               intel_private.registers+I810_PTE_BASE+(j*4));
-                }
-                readl(intel_private.registers+I810_PTE_BASE+((j-1)*4));
-                break;
-        default:
-                goto out_err;
-        }
+        return 0;
+}
 
-out:
-        ret = 0;
-out_err:
-        mem->is_flushed = true;
-        return ret;
+static void i810_cleanup(void)
+{
+        writel(0, intel_private.registers+I810_PGETBL_CTL);
+        free_gatt_pages(intel_private.i81x_gtt_table, I810_GTT_ORDER);
 }
 
-static int intel_i810_remove_entries(struct agp_memory *mem, off_t pg_start,
-                                int type)
+static int i810_insert_dcache_entries(struct agp_memory *mem, off_t pg_start,
+                                      int type)
 {
         int i;
 
-        if (mem->page_count == 0)
-                return 0;
+        if ((pg_start + mem->page_count)
+                        > intel_private.num_dcache_entries)
+                return -EINVAL;
+
+        if (!mem->is_flushed)
+                global_cache_flush();
 
-        for (i = pg_start; i < (mem->page_count + pg_start); i++) {
-                writel(agp_bridge->scratch_page, intel_private.registers+I810_PTE_BASE+(i*4));
+        for (i = pg_start; i < (pg_start + mem->page_count); i++) {
+                dma_addr_t addr = i << PAGE_SHIFT;
+                intel_private.driver->write_entry(addr,
+                                                  i, type);
         }
-        readl(intel_private.registers+I810_PTE_BASE+((i-1)*4));
+        readl(intel_private.gtt+i-1);
 
         return 0;
 }
@@ -467,29 +272,6 @@ static struct agp_memory *alloc_agpphysmem_i8xx(size_t pg_count, int type)
         return new;
 }
 
-static struct agp_memory *intel_i810_alloc_by_type(size_t pg_count, int type)
-{
-        struct agp_memory *new;
-
-        if (type == AGP_DCACHE_MEMORY) {
-                if (pg_count != intel_private.num_dcache_entries)
-                        return NULL;
-
-                new = agp_create_memory(1);
-                if (new == NULL)
-                        return NULL;
-
-                new->type = AGP_DCACHE_MEMORY;
-                new->page_count = pg_count;
-                new->num_scratch_pages = 0;
-                agp_free_page_array(new);
-                return new;
-        }
-        if (type == AGP_PHYS_MEMORY)
-                return alloc_agpphysmem_i8xx(pg_count, type);
-        return NULL;
-}
-
 static void intel_i810_free_by_type(struct agp_memory *curr)
 {
         agp_free_key(curr->key);
@@ -507,118 +289,94 @@ static void intel_i810_free_by_type(struct agp_memory *curr)
         kfree(curr);
 }
 
-static unsigned long intel_i810_mask_memory(struct agp_bridge_data *bridge,
-                                            dma_addr_t addr, int type)
+static int intel_gtt_setup_scratch_page(void)
 {
-        /* Type checking must be done elsewhere */
-        return addr | bridge->driver->masks[type].mask;
+        struct page *page;
+        dma_addr_t dma_addr;
+
+        page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
+        if (page == NULL)
+                return -ENOMEM;
+        get_page(page);
+        set_pages_uc(page, 1);
+
+        if (intel_private.base.needs_dmar) {
+                dma_addr = pci_map_page(intel_private.pcidev, page, 0,
+                                    PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+                if (pci_dma_mapping_error(intel_private.pcidev, dma_addr))
+                        return -EINVAL;
+
+                intel_private.scratch_page_dma = dma_addr;
+        } else
+                intel_private.scratch_page_dma = page_to_phys(page);
+
+        intel_private.scratch_page = page;
+
+        return 0;
 }
 
-static struct aper_size_info_fixed intel_i830_sizes[] =
+static void i810_write_entry(dma_addr_t addr, unsigned int entry,
+                             unsigned int flags)
 {
+        u32 pte_flags = I810_PTE_VALID;
+
+        switch (flags) {
+        case AGP_DCACHE_MEMORY:
+                pte_flags |= I810_PTE_LOCAL;
+                break;
+        case AGP_USER_CACHED_MEMORY:
+                pte_flags |= I830_PTE_SYSTEM_CACHED;
+                break;
+        }
+
+        writel(addr | pte_flags, intel_private.gtt + entry);
+}
+
+static const struct aper_size_info_fixed intel_fake_agp_sizes[] = {
+        {32, 8192, 3},
+        {64, 16384, 4},
         {128, 32768, 5},
-        /* The 64M mode still requires a 128k gatt */
-        {64, 16384, 5},
         {256, 65536, 6},
         {512, 131072, 7},
 };
 
-static void intel_i830_init_gtt_entries(void)
+static unsigned int intel_gtt_stolen_size(void)
 {
         u16 gmch_ctrl;
-        int gtt_entries = 0;
         u8 rdct;
         int local = 0;
         static const int ddt[4] = { 0, 16, 32, 64 };
-        int size; /* reserved space (in kb) at the top of stolen memory */
+        unsigned int stolen_size = 0;
 
-        pci_read_config_word(agp_bridge->dev, I830_GMCH_CTRL, &gmch_ctrl);
+        if (INTEL_GTT_GEN == 1)
+                return 0; /* no stolen mem on i81x */
 
-        if (IS_I965) {
-                u32 pgetbl_ctl;
-                pgetbl_ctl = readl(intel_private.registers+I810_PGETBL_CTL);
-
-                /* The 965 has a field telling us the size of the GTT,
-                 * which may be larger than what is necessary to map the
-                 * aperture.
-                 */
-                switch (pgetbl_ctl & I965_PGETBL_SIZE_MASK) {
-                case I965_PGETBL_SIZE_128KB:
-                        size = 128;
-                        break;
-                case I965_PGETBL_SIZE_256KB:
-                        size = 256;
-                        break;
-                case I965_PGETBL_SIZE_512KB:
-                        size = 512;
-                        break;
-                case I965_PGETBL_SIZE_1MB:
-                        size = 1024;
-                        break;
-                case I965_PGETBL_SIZE_2MB:
-                        size = 2048;
-                        break;
-                case I965_PGETBL_SIZE_1_5MB:
-                        size = 1024 + 512;
-                        break;
-                default:
-                        dev_info(&intel_private.pcidev->dev,
-                                 "unknown page table size, assuming 512KB\n");
-                        size = 512;
-                }
-                size += 4; /* add in BIOS popup space */
-        } else if (IS_G33 && !IS_PINEVIEW) {
-        /* G33's GTT size defined in gmch_ctrl */
-                switch (gmch_ctrl & G33_PGETBL_SIZE_MASK) {
-                case G33_PGETBL_SIZE_1M:
-                        size = 1024;
-                        break;
-                case G33_PGETBL_SIZE_2M:
-                        size = 2048;
-                        break;
-                default:
-                        dev_info(&agp_bridge->dev->dev,
-                                 "unknown page table size 0x%x, assuming 512KB\n",
-                                (gmch_ctrl & G33_PGETBL_SIZE_MASK));
-                        size = 512;
-                }
-                size += 4;
-        } else if (IS_G4X || IS_PINEVIEW) {
-                /* On 4 series hardware, GTT stolen is separate from graphics
-                 * stolen, ignore it in stolen gtt entries counting.  However,
-                 * 4KB of the stolen memory doesn't get mapped to the GTT.
-                 */
-                size = 4;
-        } else {
-                /* On previous hardware, the GTT size was just what was
-                 * required to map the aperture.
-                 */
-                size = agp_bridge->driver->fetch_size() + 4;
-        }
+        pci_read_config_word(intel_private.bridge_dev,
+                             I830_GMCH_CTRL, &gmch_ctrl);
 
-        if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82830_HB ||
-            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82845G_HB) {
+        if (intel_private.bridge_dev->device == PCI_DEVICE_ID_INTEL_82830_HB ||
+            intel_private.bridge_dev->device == PCI_DEVICE_ID_INTEL_82845G_HB) {
                 switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
                 case I830_GMCH_GMS_STOLEN_512:
-                        gtt_entries = KB(512) - KB(size);
+                        stolen_size = KB(512);
                         break;
                 case I830_GMCH_GMS_STOLEN_1024:
-                        gtt_entries = MB(1) - KB(size);
+                        stolen_size = MB(1);
                         break;
                 case I830_GMCH_GMS_STOLEN_8192:
-                        gtt_entries = MB(8) - KB(size);
+                        stolen_size = MB(8);
                         break;
                 case I830_GMCH_GMS_LOCAL:
                         rdct = readb(intel_private.registers+I830_RDRAM_CHANNEL_TYPE);
-                        gtt_entries = (I830_RDRAM_ND(rdct) + 1) *
+                        stolen_size = (I830_RDRAM_ND(rdct) + 1) *
                                         MB(ddt[I830_RDRAM_DDT(rdct)]);
                         local = 1;
                         break;
                 default:
-                        gtt_entries = 0;
+                        stolen_size = 0;
                         break;
                 }
-        } else if (IS_SNB) {
+        } else if (INTEL_GTT_GEN == 6) {
                 /*
                  * SandyBridge has new memory control reg at 0x50.w
                  */
@@ -626,167 +384,341 @@ static void intel_i830_init_gtt_entries(void)
                 pci_read_config_word(intel_private.pcidev, SNB_GMCH_CTRL, &snb_gmch_ctl);
                 switch (snb_gmch_ctl & SNB_GMCH_GMS_STOLEN_MASK) {
                 case SNB_GMCH_GMS_STOLEN_32M:
-                        gtt_entries = MB(32) - KB(size);
+                        stolen_size = MB(32);
                         break;
                 case SNB_GMCH_GMS_STOLEN_64M:
-                        gtt_entries = MB(64) - KB(size);
+                        stolen_size = MB(64);
                         break;
                 case SNB_GMCH_GMS_STOLEN_96M:
-                        gtt_entries = MB(96) - KB(size);
+                        stolen_size = MB(96);
                         break;
                 case SNB_GMCH_GMS_STOLEN_128M:
-                        gtt_entries = MB(128) - KB(size);
+                        stolen_size = MB(128);
                         break;
                 case SNB_GMCH_GMS_STOLEN_160M:
-                        gtt_entries = MB(160) - KB(size);
+                        stolen_size = MB(160);
                         break;
                 case SNB_GMCH_GMS_STOLEN_192M:
-                        gtt_entries = MB(192) - KB(size);
+                        stolen_size = MB(192);
                         break;
                 case SNB_GMCH_GMS_STOLEN_224M:
-                        gtt_entries = MB(224) - KB(size);
+                        stolen_size = MB(224);
                         break;
                 case SNB_GMCH_GMS_STOLEN_256M:
-                        gtt_entries = MB(256) - KB(size);
+                        stolen_size = MB(256);
                         break;
                 case SNB_GMCH_GMS_STOLEN_288M:
-                        gtt_entries = MB(288) - KB(size);
+                        stolen_size = MB(288);
                         break;
                 case SNB_GMCH_GMS_STOLEN_320M:
-                        gtt_entries = MB(320) - KB(size);
+                        stolen_size = MB(320);
                         break;
                 case SNB_GMCH_GMS_STOLEN_352M:
-                        gtt_entries = MB(352) - KB(size);
+                        stolen_size = MB(352);
                         break;
                 case SNB_GMCH_GMS_STOLEN_384M:
-                        gtt_entries = MB(384) - KB(size);
+                        stolen_size = MB(384);
                         break;
                 case SNB_GMCH_GMS_STOLEN_416M:
-                        gtt_entries = MB(416) - KB(size);
+                        stolen_size = MB(416);
                         break;
                 case SNB_GMCH_GMS_STOLEN_448M:
-                        gtt_entries = MB(448) - KB(size);
+                        stolen_size = MB(448);
                         break;
                 case SNB_GMCH_GMS_STOLEN_480M:
-                        gtt_entries = MB(480) - KB(size);
+                        stolen_size = MB(480);
                         break;
                 case SNB_GMCH_GMS_STOLEN_512M:
-                        gtt_entries = MB(512) - KB(size);
+                        stolen_size = MB(512);
                         break;
                 }
         } else {
                 switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
                 case I855_GMCH_GMS_STOLEN_1M:
-                        gtt_entries = MB(1) - KB(size);
+                        stolen_size = MB(1);
                         break;
                 case I855_GMCH_GMS_STOLEN_4M:
-                        gtt_entries = MB(4) - KB(size);
+                        stolen_size = MB(4);
                         break;
                 case I855_GMCH_GMS_STOLEN_8M:
-                        gtt_entries = MB(8) - KB(size);
+                        stolen_size = MB(8);
                         break;
                 case I855_GMCH_GMS_STOLEN_16M:
-                        gtt_entries = MB(16) - KB(size);
+                        stolen_size = MB(16);
                         break;
                 case I855_GMCH_GMS_STOLEN_32M:
-                        gtt_entries = MB(32) - KB(size);
+                        stolen_size = MB(32);
                         break;
                 case I915_GMCH_GMS_STOLEN_48M:
-                        /* Check it's really I915G */
-                        if (IS_I915 || IS_I965 || IS_G33 || IS_G4X)
-                                gtt_entries = MB(48) - KB(size);
-                        else
-                                gtt_entries = 0;
+                        stolen_size = MB(48);
                         break;
                 case I915_GMCH_GMS_STOLEN_64M:
-                        /* Check it's really I915G */
-                        if (IS_I915 || IS_I965 || IS_G33 || IS_G4X)
-                                gtt_entries = MB(64) - KB(size);
-                        else
-                                gtt_entries = 0;
+                        stolen_size = MB(64);
                         break;
                 case G33_GMCH_GMS_STOLEN_128M:
-                        if (IS_G33 || IS_I965 || IS_G4X)
-                                gtt_entries = MB(128) - KB(size);
-                        else
-                                gtt_entries = 0;
+                        stolen_size = MB(128);
                         break;
                 case G33_GMCH_GMS_STOLEN_256M:
-                        if (IS_G33 || IS_I965 || IS_G4X)
-                                gtt_entries = MB(256) - KB(size);
-                        else
-                                gtt_entries = 0;
+                        stolen_size = MB(256);
                         break;
                 case INTEL_GMCH_GMS_STOLEN_96M:
-                        if (IS_I965 || IS_G4X)
-                                gtt_entries = MB(96) - KB(size);
-                        else
-                                gtt_entries = 0;
+                        stolen_size = MB(96);
                         break;
                 case INTEL_GMCH_GMS_STOLEN_160M:
-                        if (IS_I965 || IS_G4X)
-                                gtt_entries = MB(160) - KB(size);
-                        else
-                                gtt_entries = 0;
+                        stolen_size = MB(160);
                         break;
                 case INTEL_GMCH_GMS_STOLEN_224M:
-                        if (IS_I965 || IS_G4X)
-                                gtt_entries = MB(224) - KB(size);
-                        else
-                                gtt_entries = 0;
+                        stolen_size = MB(224);
                         break;
                 case INTEL_GMCH_GMS_STOLEN_352M:
-                        if (IS_I965 || IS_G4X)
-                                gtt_entries = MB(352) - KB(size);
-                        else
-                                gtt_entries = 0;
+                        stolen_size = MB(352);
                         break;
                 default:
-                        gtt_entries = 0;
+                        stolen_size = 0;
                         break;
                 }
         }
-        if (!local && gtt_entries > intel_max_stolen) {
-                dev_info(&agp_bridge->dev->dev,
-                         "detected %dK stolen memory, trimming to %dK\n",
-                         gtt_entries / KB(1), intel_max_stolen / KB(1));
-                gtt_entries = intel_max_stolen / KB(4);
-        } else if (gtt_entries > 0) {
-                dev_info(&agp_bridge->dev->dev, "detected %dK %s memory\n",
-                       gtt_entries / KB(1), local ? "local" : "stolen");
-                gtt_entries /= KB(4);
+
+        if (stolen_size > 0) {
+                dev_info(&intel_private.bridge_dev->dev, "detected %dK %s memory\n",
+                       stolen_size / KB(1), local ? "local" : "stolen");
         } else {
-                dev_info(&agp_bridge->dev->dev,
+                dev_info(&intel_private.bridge_dev->dev,
                        "no pre-allocated video memory detected\n");
-                gtt_entries = 0;
+                stolen_size = 0;
         }
 
-        intel_private.gtt_entries = gtt_entries;
+        return stolen_size;
+}
+
+static void i965_adjust_pgetbl_size(unsigned int size_flag)
+{
+        u32 pgetbl_ctl, pgetbl_ctl2;
+
+        /* ensure that ppgtt is disabled */
+        pgetbl_ctl2 = readl(intel_private.registers+I965_PGETBL_CTL2);
+        pgetbl_ctl2 &= ~I810_PGETBL_ENABLED;
+        writel(pgetbl_ctl2, intel_private.registers+I965_PGETBL_CTL2);
+
+        /* write the new ggtt size */
+        pgetbl_ctl = readl(intel_private.registers+I810_PGETBL_CTL);
+        pgetbl_ctl &= ~I965_PGETBL_SIZE_MASK;
+        pgetbl_ctl |= size_flag;
+        writel(pgetbl_ctl, intel_private.registers+I810_PGETBL_CTL);
 }
 
-static void intel_i830_fini_flush(void)
+static unsigned int i965_gtt_total_entries(void)
 {
-        kunmap(intel_private.i8xx_page);
-        intel_private.i8xx_flush_page = NULL;
-        unmap_page_from_agp(intel_private.i8xx_page);
+        int size;
+        u32 pgetbl_ctl;
+        u16 gmch_ctl;
+
+        pci_read_config_word(intel_private.bridge_dev,
+                             I830_GMCH_CTRL, &gmch_ctl);
 
-        __free_page(intel_private.i8xx_page);
-        intel_private.i8xx_page = NULL;
+        if (INTEL_GTT_GEN == 5) {
+                switch (gmch_ctl & G4x_GMCH_SIZE_MASK) {
+                case G4x_GMCH_SIZE_1M:
+                case G4x_GMCH_SIZE_VT_1M:
+                        i965_adjust_pgetbl_size(I965_PGETBL_SIZE_1MB);
+                        break;
+                case G4x_GMCH_SIZE_VT_1_5M:
+                        i965_adjust_pgetbl_size(I965_PGETBL_SIZE_1_5MB);
+                        break;
+                case G4x_GMCH_SIZE_2M:
+                case G4x_GMCH_SIZE_VT_2M:
+                        i965_adjust_pgetbl_size(I965_PGETBL_SIZE_2MB);
+                        break;
+                }
+        }
+
+        pgetbl_ctl = readl(intel_private.registers+I810_PGETBL_CTL);
+
+        switch (pgetbl_ctl & I965_PGETBL_SIZE_MASK) {
+        case I965_PGETBL_SIZE_128KB:
+                size = KB(128);
+                break;
+        case I965_PGETBL_SIZE_256KB:
+                size = KB(256);
+                break;
+        case I965_PGETBL_SIZE_512KB:
+                size = KB(512);
+                break;
+        /* GTT pagetable sizes bigger than 512KB are not possible on G33! */
+        case I965_PGETBL_SIZE_1MB:
+                size = KB(1024);
+                break;
+        case I965_PGETBL_SIZE_2MB:
+                size = KB(2048);
+                break;
+        case I965_PGETBL_SIZE_1_5MB:
+                size = KB(1024 + 512);
+                break;
+        default:
+                dev_info(&intel_private.pcidev->dev,
+                         "unknown page table size, assuming 512KB\n");
+                size = KB(512);
+        }
+
+        return size/4;
 }
 
-static void intel_i830_setup_flush(void)
+static unsigned int intel_gtt_total_entries(void)
 {
-        /* return if we've already set the flush mechanism up */
-        if (intel_private.i8xx_page)
-                return;
+        int size;
 
-        intel_private.i8xx_page = alloc_page(GFP_KERNEL | __GFP_ZERO | GFP_DMA32);
-        if (!intel_private.i8xx_page)
-                return;
+        if (IS_G33 || INTEL_GTT_GEN == 4 || INTEL_GTT_GEN == 5)
+                return i965_gtt_total_entries();
+        else if (INTEL_GTT_GEN == 6) {
+                u16 snb_gmch_ctl;
+
+                pci_read_config_word(intel_private.pcidev, SNB_GMCH_CTRL, &snb_gmch_ctl);
+                switch (snb_gmch_ctl & SNB_GTT_SIZE_MASK) {
+                default:
+                case SNB_GTT_SIZE_0M:
+                        printk(KERN_ERR "Bad GTT size mask: 0x%04x.\n", snb_gmch_ctl);
+                        size = MB(0);
+                        break;
+                case SNB_GTT_SIZE_1M:
+                        size = MB(1);
+                        break;
+                case SNB_GTT_SIZE_2M:
+                        size = MB(2);
+                        break;
+                }
+                return size/4;
+        } else {
+                /* On previous hardware, the GTT size was just what was
+                 * required to map the aperture.
+                 */
+                return intel_private.base.gtt_mappable_entries;
+        }
+}
+
+static unsigned int intel_gtt_mappable_entries(void)
+{
+        unsigned int aperture_size;
+
+        if (INTEL_GTT_GEN == 1) {
+                u32 smram_miscc;
+
+                pci_read_config_dword(intel_private.bridge_dev,
+                                      I810_SMRAM_MISCC, &smram_miscc);
+
+                if ((smram_miscc & I810_GFX_MEM_WIN_SIZE)
+                                == I810_GFX_MEM_WIN_32M)
+                        aperture_size = MB(32);
+                else
+                        aperture_size = MB(64);
+        } else if (INTEL_GTT_GEN == 2) {
+                u16 gmch_ctrl;
+
+                pci_read_config_word(intel_private.bridge_dev,
+                                     I830_GMCH_CTRL, &gmch_ctrl);
+
+                if ((gmch_ctrl & I830_GMCH_MEM_MASK) == I830_GMCH_MEM_64M)
+                        aperture_size = MB(64);
+                else
+                        aperture_size = MB(128);
+        } else {
+                /* 9xx supports large sizes, just look at the length */
+                aperture_size = pci_resource_len(intel_private.pcidev, 2);
+        }
+
+        return aperture_size >> PAGE_SHIFT;
+}
+
+static void intel_gtt_teardown_scratch_page(void)
+{
+        set_pages_wb(intel_private.scratch_page, 1);
+        pci_unmap_page(intel_private.pcidev, intel_private.scratch_page_dma,
+                       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+        put_page(intel_private.scratch_page);
+        __free_page(intel_private.scratch_page);
+}
+
+static void intel_gtt_cleanup(void)
+{
+        intel_private.driver->cleanup();
+
+        iounmap(intel_private.gtt);
+        iounmap(intel_private.registers);
+
+        intel_gtt_teardown_scratch_page();
+}
+
+static int intel_gtt_init(void)
+{
+        u32 gtt_map_size;
+        int ret;
+
+        ret = intel_private.driver->setup();
+        if (ret != 0)
+                return ret;
+
+        intel_private.base.gtt_mappable_entries = intel_gtt_mappable_entries();
+        intel_private.base.gtt_total_entries = intel_gtt_total_entries();
+
+        /* save the PGETBL reg for resume */
+        intel_private.PGETBL_save =
+                readl(intel_private.registers+I810_PGETBL_CTL)
+                        & ~I810_PGETBL_ENABLED;
+        /* we only ever restore the register when enabling the PGTBL... */
+        if (HAS_PGTBL_EN)
+                intel_private.PGETBL_save |= I810_PGETBL_ENABLED;
+
+        dev_info(&intel_private.bridge_dev->dev,
+                        "detected gtt size: %dK total, %dK mappable\n",
+                        intel_private.base.gtt_total_entries * 4,
+                        intel_private.base.gtt_mappable_entries * 4);
+
+        gtt_map_size = intel_private.base.gtt_total_entries * 4;
+
+        intel_private.gtt = ioremap(intel_private.gtt_bus_addr,
+                                    gtt_map_size);
+        if (!intel_private.gtt) {
+                intel_private.driver->cleanup();
+                iounmap(intel_private.registers);
+                return -ENOMEM;
+        }
+
+        global_cache_flush();   /* FIXME: ? */
 
-        intel_private.i8xx_flush_page = kmap(intel_private.i8xx_page);
-        if (!intel_private.i8xx_flush_page)
-                intel_i830_fini_flush();
+        intel_private.base.stolen_size = intel_gtt_stolen_size();
+
+        intel_private.base.needs_dmar = USE_PCI_DMA_API && INTEL_GTT_GEN > 2;
+
+        ret = intel_gtt_setup_scratch_page();
+        if (ret != 0) {
+                intel_gtt_cleanup();
+                return ret;
+        }
+
+        return 0;
+}
+
+static int intel_fake_agp_fetch_size(void)
+{
+        int num_sizes = ARRAY_SIZE(intel_fake_agp_sizes);
+        unsigned int aper_size;
+        int i;
+
+        aper_size = (intel_private.base.gtt_mappable_entries << PAGE_SHIFT)
+                    / MB(1);
+
+        for (i = 0; i < num_sizes; i++) {
+                if (aper_size == intel_fake_agp_sizes[i].size) {
+                        agp_bridge->current_size =
+                                (void *) (intel_fake_agp_sizes + i);
+                        return aper_size;
+                }
+        }
+
+        return 0;
+}
+
+static void i830_cleanup(void)
+{
 }
 
 /* The chipset_flush interface needs to get data that has already been
@@ -799,181 +731,234 @@ static void intel_i830_setup_flush(void)
  * that buffer out, we just fill 1KB and clflush it out, on the assumption
  * that it'll push whatever was in there out.  It appears to work.
  */
-static void intel_i830_chipset_flush(struct agp_bridge_data *bridge)
+static void i830_chipset_flush(void)
 {
-        unsigned int *pg = intel_private.i8xx_flush_page;
+        unsigned long timeout = jiffies + msecs_to_jiffies(1000);
 
-        memset(pg, 0, 1024);
+        /* Forcibly evict everything from the CPU write buffers.
+         * clflush appears to be insufficient.
+         */
+        wbinvd_on_all_cpus();
 
-        if (cpu_has_clflush)
-                clflush_cache_range(pg, 1024);
-        else if (wbinvd_on_all_cpus() != 0)
-                printk(KERN_ERR "Timed out waiting for cache flush.\n");
+        /* Now we've only seen documents for this magic bit on 855GM,
+         * we hope it exists for the other gen2 chipsets...
+         *
+         * Also works as advertised on my 845G.
+         */
+        writel(readl(intel_private.registers+I830_HIC) | (1<<31),
+               intel_private.registers+I830_HIC);
+
+        while (readl(intel_private.registers+I830_HIC) & (1<<31)) {
+                if (time_after(jiffies, timeout))
+                        break;
+
+                udelay(50);
+        }
 }
 
-/* The intel i830 automatically initializes the agp aperture during POST.
- * Use the memory already set aside for in the GTT.
- */
-static int intel_i830_create_gatt_table(struct agp_bridge_data *bridge)
+static void i830_write_entry(dma_addr_t addr, unsigned int entry,
+                             unsigned int flags)
 {
-        int page_order;
-        struct aper_size_info_fixed *size;
-        int num_entries;
-        u32 temp;
+        u32 pte_flags = I810_PTE_VALID;
 
-        size = agp_bridge->current_size;
-        page_order = size->page_order;
-        num_entries = size->num_entries;
-        agp_bridge->gatt_table_real = NULL;
+        if (flags ==  AGP_USER_CACHED_MEMORY)
+                pte_flags |= I830_PTE_SYSTEM_CACHED;
 
-        pci_read_config_dword(intel_private.pcidev, I810_MMADDR, &temp);
-        temp &= 0xfff80000;
+        writel(addr | pte_flags, intel_private.gtt + entry);
+}
 
-        intel_private.registers = ioremap(temp, 128 * 4096);
-        if (!intel_private.registers)
-                return -ENOMEM;
+static bool intel_enable_gtt(void)
+{
+        u32 gma_addr;
+        u8 __iomem *reg;
 
-        temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000;
-        global_cache_flush();   /* FIXME: ?? */
+        if (INTEL_GTT_GEN <= 2)
+                pci_read_config_dword(intel_private.pcidev, I810_GMADDR,
+                                      &gma_addr);
+        else
+                pci_read_config_dword(intel_private.pcidev, I915_GMADDR,
+                                      &gma_addr);
 
-        /* we have to call this as early as possible after the MMIO base address is known */
-        intel_i830_init_gtt_entries();
-        if (intel_private.gtt_entries == 0) {
-                iounmap(intel_private.registers);
-                return -ENOMEM;
+        intel_private.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK);
+
+        if (INTEL_GTT_GEN >= 6)
+            return true;
+
+        if (INTEL_GTT_GEN == 2) {
+                u16 gmch_ctrl;
+
+                pci_read_config_word(intel_private.bridge_dev,
+                                     I830_GMCH_CTRL, &gmch_ctrl);
+                gmch_ctrl |= I830_GMCH_ENABLED;
+                pci_write_config_word(intel_private.bridge_dev,
+                                      I830_GMCH_CTRL, gmch_ctrl);
+
+                pci_read_config_word(intel_private.bridge_dev,
+                                     I830_GMCH_CTRL, &gmch_ctrl);
+                if ((gmch_ctrl & I830_GMCH_ENABLED) == 0) {
+                        dev_err(&intel_private.pcidev->dev,
+                                "failed to enable the GTT: GMCH_CTRL=%x\n",
+                                gmch_ctrl);
+                        return false;
+                }
         }
 
-        agp_bridge->gatt_table = NULL;
+        /* On the resume path we may be adjusting the PGTBL value, so
+         * be paranoid and flush all chipset write buffers...
+         */
+        if (INTEL_GTT_GEN >= 3)
+                writel(0, intel_private.registers+GFX_FLSH_CNTL);
 
-        agp_bridge->gatt_bus_addr = temp;
+        reg = intel_private.registers+I810_PGETBL_CTL;
+        writel(intel_private.PGETBL_save, reg);
+        if (HAS_PGTBL_EN && (readl(reg) & I810_PGETBL_ENABLED) == 0) {
+                dev_err(&intel_private.pcidev->dev,
+                        "failed to enable the GTT: PGETBL=%x [expected %x]\n",
+                        readl(reg), intel_private.PGETBL_save);
+                return false;
+        }
 
-        return 0;
+        if (INTEL_GTT_GEN >= 3)
+                writel(0, intel_private.registers+GFX_FLSH_CNTL);
+
+        return true;
 }
 
-/* Return the gatt table to a sane state. Use the top of stolen
- * memory for the GTT.
- */
-static int intel_i830_free_gatt_table(struct agp_bridge_data *bridge)
+static int i830_setup(void)
 {
+        u32 reg_addr;
+
+        pci_read_config_dword(intel_private.pcidev, I810_MMADDR, &reg_addr);
+        reg_addr &= 0xfff80000;
+
+        intel_private.registers = ioremap(reg_addr, KB(64));
+        if (!intel_private.registers)
+                return -ENOMEM;
+
+        intel_private.gtt_bus_addr = reg_addr + I810_PTE_BASE;
+
         return 0;
 }
 
-static int intel_i830_fetch_size(void)
+static int intel_fake_agp_create_gatt_table(struct agp_bridge_data *bridge)
 {
-        u16 gmch_ctrl;
-        struct aper_size_info_fixed *values;
+        agp_bridge->gatt_table_real = NULL;
+        agp_bridge->gatt_table = NULL;
+        agp_bridge->gatt_bus_addr = 0;
 
-        values = A_SIZE_FIX(agp_bridge->driver->aperture_sizes);
+        return 0;
+}
 
-        if (agp_bridge->dev->device != PCI_DEVICE_ID_INTEL_82830_HB &&
-            agp_bridge->dev->device != PCI_DEVICE_ID_INTEL_82845G_HB) {
-                /* 855GM/852GM/865G has 128MB aperture size */
-                agp_bridge->current_size = (void *) values;
-                agp_bridge->aperture_size_idx = 0;
-                return values[0].size;
-        }
+static int intel_fake_agp_free_gatt_table(struct agp_bridge_data *bridge)
+{
+        return 0;
+}
 
-        pci_read_config_word(agp_bridge->dev, I830_GMCH_CTRL, &gmch_ctrl);
+static int intel_fake_agp_configure(void)
+{
+        if (!intel_enable_gtt())
+            return -EIO;
 
-        if ((gmch_ctrl & I830_GMCH_MEM_MASK) == I830_GMCH_MEM_128M) {
-                agp_bridge->current_size = (void *) values;
-                agp_bridge->aperture_size_idx = 0;
-                return values[0].size;
-        } else {
-                agp_bridge->current_size = (void *) (values + 1);
-                agp_bridge->aperture_size_idx = 1;
-                return values[1].size;
-        }
+        intel_private.clear_fake_agp = true;
+        agp_bridge->gart_bus_addr = intel_private.gma_bus_addr;
 
         return 0;
 }
 
-static int intel_i830_configure(void)
+static bool i830_check_flags(unsigned int flags)
 {
-        struct aper_size_info_fixed *current_size;
-        u32 temp;
-        u16 gmch_ctrl;
-        int i;
-
-        current_size = A_SIZE_FIX(agp_bridge->current_size);
+        switch (flags) {
+        case 0:
+        case AGP_PHYS_MEMORY:
+        case AGP_USER_CACHED_MEMORY:
+        case AGP_USER_MEMORY:
+                return true;
+        }
 
-        pci_read_config_dword(intel_private.pcidev, I810_GMADDR, &temp);
-        agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
+        return false;
+}
 
-        pci_read_config_word(agp_bridge->dev, I830_GMCH_CTRL, &gmch_ctrl);
-        gmch_ctrl |= I830_GMCH_ENABLED;
-        pci_write_config_word(agp_bridge->dev, I830_GMCH_CTRL, gmch_ctrl);
+void intel_gtt_insert_sg_entries(struct scatterlist *sg_list,
+                                 unsigned int sg_len,
+                                 unsigned int pg_start,
+                                 unsigned int flags)
+{
+        struct scatterlist *sg;
+        unsigned int len, m;
+        int i, j;
 
-        writel(agp_bridge->gatt_bus_addr|I810_PGETBL_ENABLED, intel_private.registers+I810_PGETBL_CTL);
-        readl(intel_private.registers+I810_PGETBL_CTL); /* PCI Posting. */
+        j = pg_start;
 
-        if (agp_bridge->driver->needs_scratch_page) {
-                for (i = intel_private.gtt_entries; i < current_size->num_entries; i++) {
-                        writel(agp_bridge->scratch_page, intel_private.registers+I810_PTE_BASE+(i*4));
+        /* sg may merge pages, but we have to separate
+         * per-page addr for GTT */
+        for_each_sg(sg_list, sg, sg_len, i) {
+                len = sg_dma_len(sg) >> PAGE_SHIFT;
+                for (m = 0; m < len; m++) {
+                        dma_addr_t addr = sg_dma_address(sg) + (m << PAGE_SHIFT);
+                        intel_private.driver->write_entry(addr,
+                                                          j, flags);
+                        j++;
                 }
-                readl(intel_private.registers+I810_PTE_BASE+((i-1)*4)); /* PCI Posting. */
         }
-
-        global_cache_flush();
-
-        intel_i830_setup_flush();
-        return 0;
+        readl(intel_private.gtt+j-1);
 }
+EXPORT_SYMBOL(intel_gtt_insert_sg_entries);
 
-static void intel_i830_cleanup(void)
+void intel_gtt_insert_pages(unsigned int first_entry, unsigned int num_entries,
+                            struct page **pages, unsigned int flags)
 {
-        iounmap(intel_private.registers);
+        int i, j;
+
+        for (i = 0, j = first_entry; i < num_entries; i++, j++) {
+                dma_addr_t addr = page_to_phys(pages[i]);
+                intel_private.driver->write_entry(addr,
+                                                  j, flags);
+        }
+        readl(intel_private.gtt+j-1);
 }
+EXPORT_SYMBOL(intel_gtt_insert_pages);
 
-static int intel_i830_insert_entries(struct agp_memory *mem, off_t pg_start,
-                                     int type)
+static int intel_fake_agp_insert_entries(struct agp_memory *mem,
+                                         off_t pg_start, int type)
 {
-        int i, j, num_entries;
-        void *temp;
         int ret = -EINVAL;
-        int mask_type;
 
-        if (mem->page_count == 0)
-                goto out;
-
-        temp = agp_bridge->current_size;
-        num_entries = A_SIZE_FIX(temp)->num_entries;
+        if (intel_private.clear_fake_agp) {
+                int start = intel_private.base.stolen_size / PAGE_SIZE;
+                int end = intel_private.base.gtt_mappable_entries;
+                intel_gtt_clear_range(start, end - start);
+                intel_private.clear_fake_agp = false;
+        }
 
-        if (pg_start < intel_private.gtt_entries) {
-                dev_printk(KERN_DEBUG, &intel_private.pcidev->dev,
-                           "pg_start == 0x%.8lx, intel_private.gtt_entries == 0x%.8x\n",
-                           pg_start, intel_private.gtt_entries);
+        if (INTEL_GTT_GEN == 1 && type == AGP_DCACHE_MEMORY)
+                return i810_insert_dcache_entries(mem, pg_start, type);
 
-                dev_info(&intel_private.pcidev->dev,
-                         "trying to insert into local/stolen memory\n");
-                goto out_err;
-        }
+        if (mem->page_count == 0)
+                goto out;
 
-        if ((pg_start + mem->page_count) > num_entries)
+        if (pg_start + mem->page_count > intel_private.base.gtt_total_entries)
                 goto out_err;
 
-        /* The i830 can't check the GTT for entries since its read only,
-         * depend on the caller to make the correct offset decisions.
-         */
-
         if (type != mem->type)
                 goto out_err;
 
-        mask_type = agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type);
-
-        if (mask_type != 0 && mask_type != AGP_PHYS_MEMORY &&
-            mask_type != INTEL_AGP_CACHED_MEMORY)
+        if (!intel_private.driver->check_flags(type))
                 goto out_err;
 
         if (!mem->is_flushed)
                 global_cache_flush();
 
-        for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
-                writel(agp_bridge->driver->mask_memory(agp_bridge,
-                                page_to_phys(mem->pages[i]), mask_type),
-                       intel_private.registers+I810_PTE_BASE+(j*4));
-        }
-        readl(intel_private.registers+I810_PTE_BASE+((j-1)*4));
+        if (intel_private.base.needs_dmar) {
+                ret = intel_gtt_map_memory(mem->pages, mem->page_count,
+                                           &mem->sg_list, &mem->num_sg);
+                if (ret != 0)
+                        return ret;
+
+                intel_gtt_insert_sg_entries(mem->sg_list, mem->num_sg,
+                                            pg_start, type);
+        } else
+                intel_gtt_insert_pages(pg_start, mem->page_count, mem->pages,
+                                       type);
 
 out:
         ret = 0;
@@ -982,30 +967,54 @@ out_err:
         return ret;
 }
 
-static int intel_i830_remove_entries(struct agp_memory *mem, off_t pg_start,
-                                     int type)
+void intel_gtt_clear_range(unsigned int first_entry, unsigned int num_entries)
 {
-        int i;
+        unsigned int i;
+
+        for (i = first_entry; i < (first_entry + num_entries); i++) {
+                intel_private.driver->write_entry(intel_private.scratch_page_dma,
+                                                  i, 0);
+        }
+        readl(intel_private.gtt+i-1);
+}
+EXPORT_SYMBOL(intel_gtt_clear_range);
 
+static int intel_fake_agp_remove_entries(struct agp_memory *mem,
+                                         off_t pg_start, int type)
+{
         if (mem->page_count == 0)
                 return 0;
 
-        if (pg_start < intel_private.gtt_entries) {
-                dev_info(&intel_private.pcidev->dev,
-                         "trying to disable local/stolen memory\n");
-                return -EINVAL;
-        }
+        intel_gtt_clear_range(pg_start, mem->page_count);
 
-        for (i = pg_start; i < (mem->page_count + pg_start); i++) {
-                writel(agp_bridge->scratch_page, intel_private.registers+I810_PTE_BASE+(i*4));
+        if (intel_private.base.needs_dmar) {
+                intel_gtt_unmap_memory(mem->sg_list, mem->num_sg);
+                mem->sg_list = NULL;
+                mem->num_sg = 0;
         }
-        readl(intel_private.registers+I810_PTE_BASE+((i-1)*4));
 
         return 0;
 }
 
-static struct agp_memory *intel_i830_alloc_by_type(size_t pg_count, int type)
+static struct agp_memory *intel_fake_agp_alloc_by_type(size_t pg_count,
+                                                       int type)
 {
+        struct agp_memory *new;
+
+        if (type == AGP_DCACHE_MEMORY && INTEL_GTT_GEN == 1) {
+                if (pg_count != intel_private.num_dcache_entries)
+                        return NULL;
+
+                new = agp_create_memory(1);
+                if (new == NULL)
+                        return NULL;
+
+                new->type = AGP_DCACHE_MEMORY;
+                new->page_count = pg_count;
+                new->num_scratch_pages = 0;
+                agp_free_page_array(new);
+                return new;
+        }
         if (type == AGP_PHYS_MEMORY)
                 return alloc_agpphysmem_i8xx(pg_count, type);
         /* always return NULL for other allocation types for now */
@@ -1015,9 +1024,9 @@ static struct agp_memory *intel_i830_alloc_by_type(size_t pg_count, int type)
 static int intel_alloc_chipset_flush_resource(void)
 {
         int ret;
-        ret = pci_bus_alloc_resource(agp_bridge->dev->bus, &intel_private.ifp_resource, PAGE_SIZE,
+        ret = pci_bus_alloc_resource(intel_private.bridge_dev->bus, &intel_private.ifp_resource, PAGE_SIZE,
                                      PAGE_SIZE, PCIBIOS_MIN_MEM, 0,
-                                     pcibios_align_resource, agp_bridge->dev);
+                                     pcibios_align_resource, intel_private.bridge_dev);
 
         return ret;
 }
@@ -1027,11 +1036,11 @@ static void intel_i915_setup_chipset_flush(void)
         int ret;
         u32 temp;
 
-        pci_read_config_dword(agp_bridge->dev, I915_IFPADDR, &temp);
+        pci_read_config_dword(intel_private.bridge_dev, I915_IFPADDR, &temp);
         if (!(temp & 0x1)) {
                 intel_alloc_chipset_flush_resource();
                 intel_private.resource_valid = 1;
-                pci_write_config_dword(agp_bridge->dev, I915_IFPADDR, (intel_private.ifp_resource.start & 0xffffffff) | 0x1);
+                pci_write_config_dword(intel_private.bridge_dev, I915_IFPADDR, (intel_private.ifp_resource.start & 0xffffffff) | 0x1);
         } else {
                 temp &= ~1;
 
@@ -1050,17 +1059,17 @@ static void intel_i965_g33_setup_chipset_flush(void)
         u32 temp_hi, temp_lo;
         int ret;
 
-        pci_read_config_dword(agp_bridge->dev, I965_IFPADDR + 4, &temp_hi);
-        pci_read_config_dword(agp_bridge->dev, I965_IFPADDR, &temp_lo);
+        pci_read_config_dword(intel_private.bridge_dev, I965_IFPADDR + 4, &temp_hi);
+        pci_read_config_dword(intel_private.bridge_dev, I965_IFPADDR, &temp_lo);
 
         if (!(temp_lo & 0x1)) {
 
                 intel_alloc_chipset_flush_resource();
 
                 intel_private.resource_valid = 1;
-                pci_write_config_dword(agp_bridge->dev, I965_IFPADDR + 4,
+                pci_write_config_dword(intel_private.bridge_dev, I965_IFPADDR + 4,
                         upper_32_bits(intel_private.ifp_resource.start));
-                pci_write_config_dword(agp_bridge->dev, I965_IFPADDR, (intel_private.ifp_resource.start & 0xffffffff) | 0x1);
+                pci_write_config_dword(intel_private.bridge_dev, I965_IFPADDR, (intel_private.ifp_resource.start & 0xffffffff) | 0x1);
         } else {
                 u64 l64;
 
@@ -1083,7 +1092,7 @@ static void intel_i9xx_setup_flush(void)
         if (intel_private.ifp_resource.start)
                 return;
 
-        if (IS_SNB)
+        if (INTEL_GTT_GEN == 6)
                 return;
 
         /* setup a resource for this object */
@@ -1091,7 +1100,7 @@ static void intel_i9xx_setup_flush(void)
         intel_private.ifp_resource.flags = IORESOURCE_MEM;
 
         /* Setup chipset flush for 915 */
-        if (IS_I965 || IS_G33 || IS_G4X) {
+        if (IS_G33 || INTEL_GTT_GEN >= 4) {
                 intel_i965_g33_setup_chipset_flush();
         } else {
                 intel_i915_setup_chipset_flush();
@@ -1104,41 +1113,7 @@ static void intel_i9xx_setup_flush(void)
                         "can't ioremap flush page - no chipset flushing\n");
 }
 
-static int intel_i9xx_configure(void)
-{
-        struct aper_size_info_fixed *current_size;
-        u32 temp;
-        u16 gmch_ctrl;
-        int i;
-
-        current_size = A_SIZE_FIX(agp_bridge->current_size);
-
-        pci_read_config_dword(intel_private.pcidev, I915_GMADDR, &temp);
-
-        agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
-
-        pci_read_config_word(agp_bridge->dev, I830_GMCH_CTRL, &gmch_ctrl);
-        gmch_ctrl |= I830_GMCH_ENABLED;
-        pci_write_config_word(agp_bridge->dev, I830_GMCH_CTRL, gmch_ctrl);
-
-        writel(agp_bridge->gatt_bus_addr|I810_PGETBL_ENABLED, intel_private.registers+I810_PGETBL_CTL);
-        readl(intel_private.registers+I810_PGETBL_CTL); /* PCI Posting. */
-
-        if (agp_bridge->driver->needs_scratch_page) {
-                for (i = intel_private.gtt_entries; i < intel_private.gtt_total_size; i++) {
-                        writel(agp_bridge->scratch_page, intel_private.gtt+i);
-                }
-                readl(intel_private.gtt+i-1);   /* PCI Posting. */
-        }
-
-        global_cache_flush();
-
-        intel_i9xx_setup_flush();
-
-        return 0;
-}
-
-static void intel_i915_cleanup(void)
+static void i9xx_cleanup(void)
 {
         if (intel_private.i9xx_flush_page)
                 iounmap(intel_private.i9xx_flush_page);
@@ -1146,505 +1121,399 @@ static void intel_i915_cleanup(void)
                 release_resource(&intel_private.ifp_resource);
         intel_private.ifp_resource.start = 0;
         intel_private.resource_valid = 0;
-        iounmap(intel_private.gtt);
-        iounmap(intel_private.registers);
 }
 
-static void intel_i915_chipset_flush(struct agp_bridge_data *bridge)
+static void i9xx_chipset_flush(void)
 {
         if (intel_private.i9xx_flush_page)
                 writel(1, intel_private.i9xx_flush_page);
 }
 
-static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start,
-                                     int type)
+static void i965_write_entry(dma_addr_t addr,
+                             unsigned int entry,
+                             unsigned int flags)
 {
-        int num_entries;
-        void *temp;
-        int ret = -EINVAL;
-        int mask_type;
-
-        if (mem->page_count == 0)
-                goto out;
-
-        temp = agp_bridge->current_size;
-        num_entries = A_SIZE_FIX(temp)->num_entries;
-
-        if (pg_start < intel_private.gtt_entries) {
-                dev_printk(KERN_DEBUG, &intel_private.pcidev->dev,
-                           "pg_start == 0x%.8lx, intel_private.gtt_entries == 0x%.8x\n",
-                           pg_start, intel_private.gtt_entries);
-
-                dev_info(&intel_private.pcidev->dev,
-                         "trying to insert into local/stolen memory\n");
-                goto out_err;
-        }
-
-        if ((pg_start + mem->page_count) > num_entries)
-                goto out_err;
-
-        /* The i915 can't check the GTT for entries since it's read only;
-         * depend on the caller to make the correct offset decisions.
-         */
-
-        if (type != mem->type)
-                goto out_err;
-
-        mask_type = agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type);
-
-        if (!IS_SNB && mask_type != 0 && mask_type != AGP_PHYS_MEMORY &&
-            mask_type != INTEL_AGP_CACHED_MEMORY)
-                goto out_err;
+        u32 pte_flags;
 
-        if (!mem->is_flushed)
-                global_cache_flush();
+        pte_flags = I810_PTE_VALID;
+        if (flags == AGP_USER_CACHED_MEMORY)
+                pte_flags |= I830_PTE_SYSTEM_CACHED;
 
-        intel_agp_insert_sg_entries(mem, pg_start, mask_type);
-
- out:
-        ret = 0;
- out_err:
-        mem->is_flushed = true;
-        return ret;
+        /* Shift high bits down */
+        addr |= (addr >> 28) & 0xf0;
+        writel(addr | pte_flags, intel_private.gtt + entry);
 }
 
-static int intel_i915_remove_entries(struct agp_memory *mem, off_t pg_start,
-                                     int type)
+static bool gen6_check_flags(unsigned int flags)
 {
-        int i;
-
-        if (mem->page_count == 0)
-                return 0;
-
-        if (pg_start < intel_private.gtt_entries) {
-                dev_info(&intel_private.pcidev->dev,
-                         "trying to disable local/stolen memory\n");
-                return -EINVAL;
-        }
-
-        for (i = pg_start; i < (mem->page_count + pg_start); i++)
-                writel(agp_bridge->scratch_page, intel_private.gtt+i);
-
-        readl(intel_private.gtt+i-1);
-
-        return 0;
+        return true;
 }
 
-/* Return the aperture size by just checking the resource length.  The effect
- * described in the spec of the MSAC registers is just changing of the
- * resource size.
- */
-static int intel_i9xx_fetch_size(void)
+static void gen6_write_entry(dma_addr_t addr, unsigned int entry,
+                             unsigned int flags)
 {
-        int num_sizes = ARRAY_SIZE(intel_i830_sizes);
-        int aper_size; /* size in megabytes */
-        int i;
-
-        aper_size = pci_resource_len(intel_private.pcidev, 2) / MB(1);
-
-        for (i = 0; i < num_sizes; i++) {
-                if (aper_size == intel_i830_sizes[i].size) {
-                        agp_bridge->current_size = intel_i830_sizes + i;
-                        return aper_size;
-                }
+        unsigned int type_mask = flags & ~AGP_USER_CACHED_MEMORY_GFDT;
+        unsigned int gfdt = flags & AGP_USER_CACHED_MEMORY_GFDT;
+        u32 pte_flags;
+
+        if (type_mask == AGP_USER_MEMORY)
+                pte_flags = GEN6_PTE_UNCACHED | I810_PTE_VALID;
+        else if (type_mask == AGP_USER_CACHED_MEMORY_LLC_MLC) {
+                pte_flags = GEN6_PTE_LLC_MLC | I810_PTE_VALID;
+                if (gfdt)
+                        pte_flags |= GEN6_PTE_GFDT;
+        } else { /* set 'normal'/'cached' to LLC by default */
+                pte_flags = GEN6_PTE_LLC | I810_PTE_VALID;
+                if (gfdt)
+                        pte_flags |= GEN6_PTE_GFDT;
         }
 
-        return 0;
+        /* gen6 has bit11-4 for physical addr bit39-32 */
+        addr |= (addr >> 28) & 0xff0;
+        writel(addr | pte_flags, intel_private.gtt + entry);
 }
 
-static int intel_i915_get_gtt_size(void)
+static void gen6_cleanup(void)
 {
-        int size;
-
-        if (IS_G33) {
-                u16 gmch_ctrl;
-
-                /* G33's GTT size defined in gmch_ctrl */
-                pci_read_config_word(agp_bridge->dev, I830_GMCH_CTRL, &gmch_ctrl);
-                switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
-                case I830_GMCH_GMS_STOLEN_512:
-                        size = 512;
-                        break;
-                case I830_GMCH_GMS_STOLEN_1024:
-                        size = 1024;
-                        break;
-                case I830_GMCH_GMS_STOLEN_8192:
-                        size = 8*1024;
-                        break;
-                default:
-                        dev_info(&agp_bridge->dev->dev,
-                                 "unknown page table size 0x%x, assuming 512KB\n",
-                                (gmch_ctrl & I830_GMCH_GMS_MASK));
-                        size = 512;
-                }
-        } else {
-                /* On previous hardware, the GTT size was just what was
-                 * required to map the aperture.
-                 */
-                size = agp_bridge->driver->fetch_size();
-        }
-
-        return KB(size);
 }
 
-/* The intel i915 automatically initializes the agp aperture during POST.
- * Use the memory already set aside for in the GTT.
- */
-static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
+static int i9xx_setup(void)
 {
-        int page_order;
-        struct aper_size_info_fixed *size;
-        int num_entries;
-        u32 temp, temp2;
-        int gtt_map_size;
-
-        size = agp_bridge->current_size;
-        page_order = size->page_order;
-        num_entries = size->num_entries;
-        agp_bridge->gatt_table_real = NULL;
+        u32 reg_addr;
 
-        pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp);
-        pci_read_config_dword(intel_private.pcidev, I915_PTEADDR, &temp2);
+        pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &reg_addr);
 
-        gtt_map_size = intel_i915_get_gtt_size();
+        reg_addr &= 0xfff80000;
 
-        intel_private.gtt = ioremap(temp2, gtt_map_size);
-        if (!intel_private.gtt)
+        intel_private.registers = ioremap(reg_addr, 128 * 4096);
+        if (!intel_private.registers)
                 return -ENOMEM;
 
-        intel_private.gtt_total_size = gtt_map_size / 4;
+        if (INTEL_GTT_GEN == 3) {
+                u32 gtt_addr;
 
-        temp &= 0xfff80000;
-
-        intel_private.registers = ioremap(temp, 128 * 4096);
-        if (!intel_private.registers) {
-                iounmap(intel_private.gtt);
-                return -ENOMEM;
-        }
-
-        temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000;
-        global_cache_flush();   /* FIXME: ? */
+                pci_read_config_dword(intel_private.pcidev,
+                                      I915_PTEADDR, &gtt_addr);
+                intel_private.gtt_bus_addr = gtt_addr;
+        } else {
+                u32 gtt_offset;
 
-        /* we have to call this as early as possible after the MMIO base address is known */
-        intel_i830_init_gtt_entries();
-        if (intel_private.gtt_entries == 0) {
-                iounmap(intel_private.gtt);
-                iounmap(intel_private.registers);
-                return -ENOMEM;
+                switch (INTEL_GTT_GEN) {
+                case 5:
+                case 6:
+                        gtt_offset = MB(2);
+                        break;
+                case 4:
+                default:
+                        gtt_offset =  KB(512);
+                        break;
+                }
+                intel_private.gtt_bus_addr = reg_addr + gtt_offset;
         }
 
-        agp_bridge->gatt_table = NULL;
-
-        agp_bridge->gatt_bus_addr = temp;
+        intel_i9xx_setup_flush();
 
         return 0;
 }
 
-/*
- * The i965 supports 36-bit physical addresses, but to keep
- * the format of the GTT the same, the bits that don't fit
- * in a 32-bit word are shifted down to bits 4..7.
- *
- * Gcc is smart enough to notice that "(addr >> 28) & 0xf0"
- * is always zero on 32-bit architectures, so no need to make
- * this conditional.
+static const struct agp_bridge_driver intel_fake_agp_driver = {
+        .owner                  = THIS_MODULE,
+        .size_type              = FIXED_APER_SIZE,
+        .aperture_sizes         = intel_fake_agp_sizes,
+        .num_aperture_sizes     = ARRAY_SIZE(intel_fake_agp_sizes),
+        .configure              = intel_fake_agp_configure,
+        .fetch_size             = intel_fake_agp_fetch_size,
+        .cleanup                = intel_gtt_cleanup,
+        .agp_enable             = intel_fake_agp_enable,
+        .cache_flush            = global_cache_flush,
+        .create_gatt_table      = intel_fake_agp_create_gatt_table,
+        .free_gatt_table        = intel_fake_agp_free_gatt_table,
+        .insert_memory          = intel_fake_agp_insert_entries,
+        .remove_memory          = intel_fake_agp_remove_entries,
+        .alloc_by_type          = intel_fake_agp_alloc_by_type,
+        .free_by_type           = intel_i810_free_by_type,
+        .agp_alloc_page         = agp_generic_alloc_page,
+        .agp_alloc_pages        = agp_generic_alloc_pages,
+        .agp_destroy_page       = agp_generic_destroy_page,
+        .agp_destroy_pages      = agp_generic_destroy_pages,
+};
+
+static const struct intel_gtt_driver i81x_gtt_driver = {
+        .gen = 1,
+        .has_pgtbl_enable = 1,
+        .dma_mask_size = 32,
+        .setup = i810_setup,
+        .cleanup = i810_cleanup,
+        .check_flags = i830_check_flags,
+        .write_entry = i810_write_entry,
+};
+static const struct intel_gtt_driver i8xx_gtt_driver = {
+        .gen = 2,
+        .has_pgtbl_enable = 1,
+        .setup = i830_setup,
+        .cleanup = i830_cleanup,
+        .write_entry = i830_write_entry,
+        .dma_mask_size = 32,
+        .check_flags = i830_check_flags,
+        .chipset_flush = i830_chipset_flush,
+};
+static const struct intel_gtt_driver i915_gtt_driver = {
+        .gen = 3,
+        .has_pgtbl_enable = 1,
+        .setup = i9xx_setup,
+        .cleanup = i9xx_cleanup,
+        /* i945 is the last gpu to need phys mem (for overlay and cursors). */
+        .write_entry = i830_write_entry,
+        .dma_mask_size = 32,
+        .check_flags = i830_check_flags,
+        .chipset_flush = i9xx_chipset_flush,
+};
+static const struct intel_gtt_driver g33_gtt_driver = {
+        .gen = 3,
+        .is_g33 = 1,
+        .setup = i9xx_setup,
+        .cleanup = i9xx_cleanup,
+        .write_entry = i965_write_entry,
+        .dma_mask_size = 36,
+        .check_flags = i830_check_flags,
+        .chipset_flush = i9xx_chipset_flush,
+};
+static const struct intel_gtt_driver pineview_gtt_driver = {
+        .gen = 3,
+        .is_pineview = 1, .is_g33 = 1,
+        .setup = i9xx_setup,
+        .cleanup = i9xx_cleanup,
+        .write_entry = i965_write_entry,
+        .dma_mask_size = 36,
+        .check_flags = i830_check_flags,
+        .chipset_flush = i9xx_chipset_flush,
+};
+static const struct intel_gtt_driver i965_gtt_driver = {
+        .gen = 4,
+        .has_pgtbl_enable = 1,
+        .setup = i9xx_setup,
+        .cleanup = i9xx_cleanup,
+        .write_entry = i965_write_entry,
+        .dma_mask_size = 36,
+        .check_flags = i830_check_flags,
+        .chipset_flush = i9xx_chipset_flush,
+};
+static const struct intel_gtt_driver g4x_gtt_driver = {
+        .gen = 5,
+        .setup = i9xx_setup,
+        .cleanup = i9xx_cleanup,
+        .write_entry = i965_write_entry,
+        .dma_mask_size = 36,
+        .check_flags = i830_check_flags,
+        .chipset_flush = i9xx_chipset_flush,
+};
+static const struct intel_gtt_driver ironlake_gtt_driver = {
+        .gen = 5,
+        .is_ironlake = 1,
+        .setup = i9xx_setup,
+        .cleanup = i9xx_cleanup,
+        .write_entry = i965_write_entry,
+        .dma_mask_size = 36,
+        .check_flags = i830_check_flags,
+        .chipset_flush = i9xx_chipset_flush,
+};
+static const struct intel_gtt_driver sandybridge_gtt_driver = {
+        .gen = 6,
+        .setup = i9xx_setup,
+        .cleanup = gen6_cleanup,
+        .write_entry = gen6_write_entry,
+        .dma_mask_size = 40,
+        .check_flags = gen6_check_flags,
+        .chipset_flush = i9xx_chipset_flush,
+};
+
+/* Table to describe Intel GMCH and AGP/PCIE GART drivers.  At least one of
+ * driver and gmch_driver must be non-null, and find_gmch will determine
+ * which one should be used if a gmch_chip_id is present.
  */
-static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge,
-                                            dma_addr_t addr, int type)
+static const struct intel_gtt_driver_description {
+        unsigned int gmch_chip_id;
+        char *name;
+        const struct intel_gtt_driver *gtt_driver;
+} intel_gtt_chipsets[] = {
+        { PCI_DEVICE_ID_INTEL_82810_IG1, "i810",
+                &i81x_gtt_driver},
+        { PCI_DEVICE_ID_INTEL_82810_IG3, "i810",
+                &i81x_gtt_driver},
+        { PCI_DEVICE_ID_INTEL_82810E_IG, "i810",
+                &i81x_gtt_driver},
+        { PCI_DEVICE_ID_INTEL_82815_CGC, "i815",
+                &i81x_gtt_driver},
+        { PCI_DEVICE_ID_INTEL_82830_CGC, "830M",
+                &i8xx_gtt_driver},
+        { PCI_DEVICE_ID_INTEL_82845G_IG, "845G",
+                &i8xx_gtt_driver},
+        { PCI_DEVICE_ID_INTEL_82854_IG, "854",
+                &i8xx_gtt_driver},
+        { PCI_DEVICE_ID_INTEL_82855GM_IG, "855GM",
+                &i8xx_gtt_driver},
+        { PCI_DEVICE_ID_INTEL_82865_IG, "865",
+                &i8xx_gtt_driver},
+        { PCI_DEVICE_ID_INTEL_E7221_IG, "E7221 (i915)",
+                &i915_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_82915G_IG, "915G",
+                &i915_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_82915GM_IG, "915GM",
+                &i915_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_82945G_IG, "945G",
+                &i915_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_82945GM_IG, "945GM",
+                &i915_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_82945GME_IG, "945GME",
+                &i915_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_82946GZ_IG, "946GZ",
+                &i965_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_82G35_IG, "G35",
+                &i965_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_82965Q_IG, "965Q",
+                &i965_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_82965G_IG, "965G",
+                &i965_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_82965GM_IG, "965GM",
+                &i965_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_82965GME_IG, "965GME/GLE",
+                &i965_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_G33_IG, "G33",
+                &g33_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_Q35_IG, "Q35",
+                &g33_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_Q33_IG, "Q33",
+                &g33_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_PINEVIEW_M_IG, "GMA3150",
+                &pineview_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_PINEVIEW_IG, "GMA3150",
+                &pineview_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_GM45_IG, "GM45",
+                &g4x_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_EAGLELAKE_IG, "Eaglelake",
+                &g4x_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_Q45_IG, "Q45/Q43",
+                &g4x_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_G45_IG, "G45/G43",
+                &g4x_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_B43_IG, "B43",
+                &g4x_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_B43_1_IG, "B43",
+                &g4x_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_G41_IG, "G41",
+                &g4x_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG,
+            "HD Graphics", &ironlake_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG,
+            "HD Graphics", &ironlake_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT1_IG,
+            "Sandybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_IG,
+            "Sandybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_PLUS_IG,
+            "Sandybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT1_IG,
+            "Sandybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_IG,
+            "Sandybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_PLUS_IG,
+            "Sandybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_IG,
+            "Sandybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT1_IG,
+            "Ivybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT2_IG,
+            "Ivybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT1_IG,
+            "Ivybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT2_IG,
+            "Ivybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT1_IG,
+            "Ivybridge", &sandybridge_gtt_driver },
+        { 0, NULL, NULL }
+};
+
+static int find_gmch(u16 device)
 {
-        /* Shift high bits down */
-        addr |= (addr >> 28) & 0xf0;
+        struct pci_dev *gmch_device;
 
-        /* Type checking must be done elsewhere */
-        return addr | bridge->driver->masks[type].mask;
-}
+        gmch_device = pci_get_device(PCI_VENDOR_ID_INTEL, device, NULL);
+        if (gmch_device && PCI_FUNC(gmch_device->devfn) != 0) {
+                gmch_device = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                             device, gmch_device);
+        }
 
-static unsigned long intel_gen6_mask_memory(struct agp_bridge_data *bridge,
-                                            dma_addr_t addr, int type)
-{
-        /* gen6 has bit11-4 for physical addr bit39-32 */
-        addr |= (addr >> 28) & 0xff0;
+        if (!gmch_device)
+                return 0;
 
-        /* Type checking must be done elsewhere */
-        return addr | bridge->driver->masks[type].mask;
+        intel_private.pcidev = gmch_device;
+        return 1;
 }
 
-static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size)
+int intel_gmch_probe(struct pci_dev *pdev,
+                                      struct agp_bridge_data *bridge)
 {
-        u16 snb_gmch_ctl;
-
-        switch (agp_bridge->dev->device) {
-        case PCI_DEVICE_ID_INTEL_GM45_HB:
-        case PCI_DEVICE_ID_INTEL_EAGLELAKE_HB:
-        case PCI_DEVICE_ID_INTEL_Q45_HB:
-        case PCI_DEVICE_ID_INTEL_G45_HB:
-        case PCI_DEVICE_ID_INTEL_G41_HB:
-        case PCI_DEVICE_ID_INTEL_B43_HB:
-        case PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB:
-        case PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB:
-        case PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB:
-        case PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB:
-                *gtt_offset = *gtt_size = MB(2);
-                break;
-        case PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB:
-        case PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB:
-        case PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB:
-                *gtt_offset = MB(2);
+        int i, mask;
+        intel_private.driver = NULL;
 
-                pci_read_config_word(intel_private.pcidev, SNB_GMCH_CTRL, &snb_gmch_ctl);
-                switch (snb_gmch_ctl & SNB_GTT_SIZE_MASK) {
-                default:
-                case SNB_GTT_SIZE_0M:
-                        printk(KERN_ERR "Bad GTT size mask: 0x%04x.\n", snb_gmch_ctl);
-                        *gtt_size = MB(0);
-                        break;
-                case SNB_GTT_SIZE_1M:
-                        *gtt_size = MB(1);
-                        break;
-                case SNB_GTT_SIZE_2M:
-                        *gtt_size = MB(2);
+        for (i = 0; intel_gtt_chipsets[i].name != NULL; i++) {
+                if (find_gmch(intel_gtt_chipsets[i].gmch_chip_id)) {
+                        intel_private.driver =
+                                intel_gtt_chipsets[i].gtt_driver;
                         break;
                 }
-                break;
-        default:
-                *gtt_offset = *gtt_size = KB(512);
         }
-}
-
-/* The intel i965 automatically initializes the agp aperture during POST.
- * Use the memory already set aside for in the GTT.
- */
-static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge)
-{
-        int page_order;
-        struct aper_size_info_fixed *size;
-        int num_entries;
-        u32 temp;
-        int gtt_offset, gtt_size;
-
-        size = agp_bridge->current_size;
-        page_order = size->page_order;
-        num_entries = size->num_entries;
-        agp_bridge->gatt_table_real = NULL;
-
-        pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp);
 
-        temp &= 0xfff00000;
-
-        intel_i965_get_gtt_range(&gtt_offset, &gtt_size);
-
-        intel_private.gtt = ioremap((temp + gtt_offset) , gtt_size);
+        if (!intel_private.driver)
+                return 0;
 
-        if (!intel_private.gtt)
-                return -ENOMEM;
+        bridge->driver = &intel_fake_agp_driver;
+        bridge->dev_private_data = &intel_private;
+        bridge->dev = pdev;
 
-        intel_private.gtt_total_size = gtt_size / 4;
+        intel_private.bridge_dev = pci_dev_get(pdev);
 
-        intel_private.registers = ioremap(temp, 128 * 4096);
-        if (!intel_private.registers) {
-                iounmap(intel_private.gtt);
-                return -ENOMEM;
-        }
+        dev_info(&pdev->dev, "Intel %s Chipset\n", intel_gtt_chipsets[i].name);
 
-        temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000;
-        global_cache_flush();   /* FIXME: ? */
-
-        /* we have to call this as early as possible after the MMIO base address is known */
-        intel_i830_init_gtt_entries();
-        if (intel_private.gtt_entries == 0) {
-                iounmap(intel_private.gtt);
-                iounmap(intel_private.registers);
-                return -ENOMEM;
-        }
+        mask = intel_private.driver->dma_mask_size;
+        if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(mask)))
+                dev_err(&intel_private.pcidev->dev,
+                        "set gfx device dma mask %d-bit failed!\n", mask);
+        else
+                pci_set_consistent_dma_mask(intel_private.pcidev,
+                                            DMA_BIT_MASK(mask));
 
-        agp_bridge->gatt_table = NULL;
+        /*if (bridge->driver == &intel_810_driver)
+                return 1;*/
 
-        agp_bridge->gatt_bus_addr = temp;
+        if (intel_gtt_init() != 0)
+                return 0;
 
-        return 0;
+        return 1;
 }
+EXPORT_SYMBOL(intel_gmch_probe);
 
-static const struct agp_bridge_driver intel_810_driver = {
-        .owner                  = THIS_MODULE,
-        .aperture_sizes         = intel_i810_sizes,
-        .size_type              = FIXED_APER_SIZE,
-        .num_aperture_sizes     = 2,
-        .needs_scratch_page     = true,
-        .configure              = intel_i810_configure,
-        .fetch_size             = intel_i810_fetch_size,
-        .cleanup                = intel_i810_cleanup,
-        .mask_memory            = intel_i810_mask_memory,
-        .masks                  = intel_i810_masks,
-        .agp_enable             = intel_i810_agp_enable,
-        .cache_flush            = global_cache_flush,
-        .create_gatt_table      = agp_generic_create_gatt_table,
-        .free_gatt_table        = agp_generic_free_gatt_table,
-        .insert_memory          = intel_i810_insert_entries,
-        .remove_memory          = intel_i810_remove_entries,
-        .alloc_by_type          = intel_i810_alloc_by_type,
-        .free_by_type           = intel_i810_free_by_type,
-        .agp_alloc_page         = agp_generic_alloc_page,
-        .agp_alloc_pages        = agp_generic_alloc_pages,
-        .agp_destroy_page       = agp_generic_destroy_page,
-        .agp_destroy_pages      = agp_generic_destroy_pages,
-        .agp_type_to_mask_type  = agp_generic_type_to_mask_type,
-};
-
-static const struct agp_bridge_driver intel_830_driver = {
-        .owner                  = THIS_MODULE,
-        .aperture_sizes         = intel_i830_sizes,
-        .size_type              = FIXED_APER_SIZE,
-        .num_aperture_sizes     = 4,
-        .needs_scratch_page     = true,
-        .configure              = intel_i830_configure,
-        .fetch_size             = intel_i830_fetch_size,
-        .cleanup                = intel_i830_cleanup,
-        .mask_memory            = intel_i810_mask_memory,
-        .masks                  = intel_i810_masks,
-        .agp_enable             = intel_i810_agp_enable,
-        .cache_flush            = global_cache_flush,
-        .create_gatt_table      = intel_i830_create_gatt_table,
-        .free_gatt_table        = intel_i830_free_gatt_table,
-        .insert_memory          = intel_i830_insert_entries,
-        .remove_memory          = intel_i830_remove_entries,
-        .alloc_by_type          = intel_i830_alloc_by_type,
-        .free_by_type           = intel_i810_free_by_type,
-        .agp_alloc_page         = agp_generic_alloc_page,
-        .agp_alloc_pages        = agp_generic_alloc_pages,
-        .agp_destroy_page       = agp_generic_destroy_page,
-        .agp_destroy_pages      = agp_generic_destroy_pages,
-        .agp_type_to_mask_type  = intel_i830_type_to_mask_type,
-        .chipset_flush          = intel_i830_chipset_flush,
-};
-
-static const struct agp_bridge_driver intel_915_driver = {
-        .owner                  = THIS_MODULE,
-        .aperture_sizes         = intel_i830_sizes,
-        .size_type              = FIXED_APER_SIZE,
-        .num_aperture_sizes     = 4,
-        .needs_scratch_page     = true,
-        .configure              = intel_i9xx_configure,
-        .fetch_size             = intel_i9xx_fetch_size,
-        .cleanup                = intel_i915_cleanup,
-        .mask_memory            = intel_i810_mask_memory,
-        .masks                  = intel_i810_masks,
-        .agp_enable             = intel_i810_agp_enable,
-        .cache_flush            = global_cache_flush,
-        .create_gatt_table      = intel_i915_create_gatt_table,
-        .free_gatt_table        = intel_i830_free_gatt_table,
-        .insert_memory          = intel_i915_insert_entries,
-        .remove_memory          = intel_i915_remove_entries,
-        .alloc_by_type          = intel_i830_alloc_by_type,
-        .free_by_type           = intel_i810_free_by_type,
-        .agp_alloc_page         = agp_generic_alloc_page,
-        .agp_alloc_pages        = agp_generic_alloc_pages,
-        .agp_destroy_page       = agp_generic_destroy_page,
-        .agp_destroy_pages      = agp_generic_destroy_pages,
-        .agp_type_to_mask_type  = intel_i830_type_to_mask_type,
-        .chipset_flush          = intel_i915_chipset_flush,
-#ifdef USE_PCI_DMA_API
-        .agp_map_page           = intel_agp_map_page,
-        .agp_unmap_page         = intel_agp_unmap_page,
-        .agp_map_memory         = intel_agp_map_memory,
-        .agp_unmap_memory       = intel_agp_unmap_memory,
-#endif
-};
+const struct intel_gtt *intel_gtt_get(void)
+{
+        return &intel_private.base;
+}
+EXPORT_SYMBOL(intel_gtt_get);
 
-static const struct agp_bridge_driver intel_i965_driver = {
-        .owner                  = THIS_MODULE,
-        .aperture_sizes         = intel_i830_sizes,
-        .size_type              = FIXED_APER_SIZE,
-        .num_aperture_sizes     = 4,
-        .needs_scratch_page     = true,
-        .configure              = intel_i9xx_configure,
-        .fetch_size             = intel_i9xx_fetch_size,
-        .cleanup                = intel_i915_cleanup,
-        .mask_memory            = intel_i965_mask_memory,
-        .masks                  = intel_i810_masks,
-        .agp_enable             = intel_i810_agp_enable,
-        .cache_flush            = global_cache_flush,
-        .create_gatt_table      = intel_i965_create_gatt_table,
-        .free_gatt_table        = intel_i830_free_gatt_table,
-        .insert_memory          = intel_i915_insert_entries,
-        .remove_memory          = intel_i915_remove_entries,
-        .alloc_by_type          = intel_i830_alloc_by_type,
-        .free_by_type           = intel_i810_free_by_type,
-        .agp_alloc_page         = agp_generic_alloc_page,
-        .agp_alloc_pages        = agp_generic_alloc_pages,
-        .agp_destroy_page       = agp_generic_destroy_page,
-        .agp_destroy_pages      = agp_generic_destroy_pages,
-        .agp_type_to_mask_type  = intel_i830_type_to_mask_type,
-        .chipset_flush          = intel_i915_chipset_flush,
-#ifdef USE_PCI_DMA_API
-        .agp_map_page           = intel_agp_map_page,
-        .agp_unmap_page         = intel_agp_unmap_page,
-        .agp_map_memory         = intel_agp_map_memory,
-        .agp_unmap_memory       = intel_agp_unmap_memory,
-#endif
-};
+void intel_gtt_chipset_flush(void)
+{
+        if (intel_private.driver->chipset_flush)
+                intel_private.driver->chipset_flush();
+}
+EXPORT_SYMBOL(intel_gtt_chipset_flush);
 
-static const struct agp_bridge_driver intel_gen6_driver = {
-        .owner                  = THIS_MODULE,
-        .aperture_sizes         = intel_i830_sizes,
-        .size_type              = FIXED_APER_SIZE,
-        .num_aperture_sizes     = 4,
-        .needs_scratch_page     = true,
-        .configure              = intel_i9xx_configure,
-        .fetch_size             = intel_i9xx_fetch_size,
-        .cleanup                = intel_i915_cleanup,
-        .mask_memory            = intel_gen6_mask_memory,
-        .masks                  = intel_gen6_masks,
-        .agp_enable             = intel_i810_agp_enable,
-        .cache_flush            = global_cache_flush,
-        .create_gatt_table      = intel_i965_create_gatt_table,
-        .free_gatt_table        = intel_i830_free_gatt_table,
-        .insert_memory          = intel_i915_insert_entries,
-        .remove_memory          = intel_i915_remove_entries,
-        .alloc_by_type          = intel_i830_alloc_by_type,
-        .free_by_type           = intel_i810_free_by_type,
-        .agp_alloc_page         = agp_generic_alloc_page,
-        .agp_alloc_pages        = agp_generic_alloc_pages,
-        .agp_destroy_page       = agp_generic_destroy_page,
-        .agp_destroy_pages      = agp_generic_destroy_pages,
-        .agp_type_to_mask_type  = intel_gen6_type_to_mask_type,
-        .chipset_flush          = intel_i915_chipset_flush,
-#ifdef USE_PCI_DMA_API
-        .agp_map_page           = intel_agp_map_page,
-        .agp_unmap_page         = intel_agp_unmap_page,
-        .agp_map_memory         = intel_agp_map_memory,
-        .agp_unmap_memory       = intel_agp_unmap_memory,
-#endif
-};
+void intel_gmch_remove(struct pci_dev *pdev)
+{
+        if (intel_private.pcidev)
+                pci_dev_put(intel_private.pcidev);
+        if (intel_private.bridge_dev)
+                pci_dev_put(intel_private.bridge_dev);
+}
+EXPORT_SYMBOL(intel_gmch_remove);
 
-static const struct agp_bridge_driver intel_g33_driver = {
-        .owner                  = THIS_MODULE,
-        .aperture_sizes         = intel_i830_sizes,
-        .size_type              = FIXED_APER_SIZE,
-        .num_aperture_sizes     = 4,
-        .needs_scratch_page     = true,
-        .configure              = intel_i9xx_configure,
-        .fetch_size             = intel_i9xx_fetch_size,
-        .cleanup                = intel_i915_cleanup,
-        .mask_memory            = intel_i965_mask_memory,
-        .masks                  = intel_i810_masks,
-        .agp_enable             = intel_i810_agp_enable,
-        .cache_flush            = global_cache_flush,
-        .create_gatt_table      = intel_i915_create_gatt_table,
-        .free_gatt_table        = intel_i830_free_gatt_table,
-        .insert_memory          = intel_i915_insert_entries,
-        .remove_memory          = intel_i915_remove_entries,
-        .alloc_by_type          = intel_i830_alloc_by_type,
-        .free_by_type           = intel_i810_free_by_type,
-        .agp_alloc_page         = agp_generic_alloc_page,
-        .agp_alloc_pages        = agp_generic_alloc_pages,
-        .agp_destroy_page       = agp_generic_destroy_page,
-        .agp_destroy_pages      = agp_generic_destroy_pages,
-        .agp_type_to_mask_type  = intel_i830_type_to_mask_type,
-        .chipset_flush          = intel_i915_chipset_flush,
-#ifdef USE_PCI_DMA_API
-        .agp_map_page           = intel_agp_map_page,
-        .agp_unmap_page         = intel_agp_unmap_page,
-        .agp_map_memory         = intel_agp_map_memory,
-        .agp_unmap_memory       = intel_agp_unmap_memory,
-#endif
-};
+MODULE_AUTHOR("Dave Jones <davej@redhat.com>");
+MODULE_LICENSE("GPL and additional rights");
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c
index 1c129211302d..94821ab01c6d 100644
--- a/drivers/char/agp/parisc-agp.c
+++ b/drivers/char/agp/parisc-agp.c
@@ -19,6 +19,7 @@
 #include <linux/klist.h>
 #include <linux/agp_backend.h>
 #include <linux/log2.h>
+#include <linux/slab.h>
 
 #include <asm/parisc-device.h>
 #include <asm/ropes.h>
@@ -358,8 +359,12 @@ parisc_agp_setup(void __iomem *ioc_hpa, void __iomem *lba_hpa)
         bridge->dev = fake_bridge_dev;
 
         error = agp_add_bridge(bridge);
+        if (error)
+                goto fail;
+        return 0;
 
 fail:
+        kfree(fake_bridge_dev);
         return error;
 }
 
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 13acaaf64edb..f02f9b07fd4c 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -229,7 +229,7 @@ static int serverworks_fetch_size(void)
  * This routine could be implemented by taking the addresses
  * written to the GATT, and flushing them individually.  However
  * currently it just flushes the whole table.  Which is probably
- * more efficent, since agp_memory blocks can be a large number of
+ * more efficient, since agp_memory blocks can be a large number of
  * entries.
  */
 static void serverworks_tlbflush(struct agp_memory *temp)
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index f845a8f718b3..a32c492baf5c 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -80,7 +80,7 @@ static void uninorth_tlbflush(struct agp_memory *mem)
                                ctrl | UNI_N_CFG_GART_INVAL);
         pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, ctrl);
 
-        if (uninorth_rev <= 0x30) {
+        if (!mem && uninorth_rev <= 0x30) {
                 pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL,
                                        ctrl | UNI_N_CFG_GART_2xRESET);
                 pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL,
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index df67e80019d2..8bc384937401 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -400,7 +400,7 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
          * the traditional AGP which resides only in chipset. AGP is used
          * by 3D driver which wasn't available for the VT3336 and VT3364
          * generation until now.  Unfortunately, by testing, VT3364 works
-         * but VT3336 doesn't. - explaination from via, just leave this as
+         * but VT3336 doesn't. - explanation from via, just leave this as
          * as a placeholder to avoid future patches adding it back in.
          */
 #if 0
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
deleted file mode 100644
index a11c8c9ca3d4..000000000000
--- a/drivers/char/amiserial.c
+++ /dev/null
@@ -1,2174 +0,0 @@
-/*
- *  linux/drivers/char/amiserial.c
- *
- * Serial driver for the amiga builtin port.
- *
- * This code was created by taking serial.c version 4.30 from kernel
- * release 2.3.22, replacing all hardware related stuff with the
- * corresponding amiga hardware actions, and removing all irrelevant
- * code. As a consequence, it uses many of the constants and names
- * associated with the registers and bits of 16550 compatible UARTS -
- * but only to keep track of status, etc in the state variables. It
- * was done this was to make it easier to keep the code in line with
- * (non hardware specific) changes to serial.c.
- *
- * The port is registered with the tty driver as minor device 64, and
- * therefore other ports should should only use 65 upwards.
- *
- * Richard Lucock 28/12/99
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- *  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 
- *              1998, 1999  Theodore Ts'o
- *
- */
-
-/*
- * Serial driver configuration section.  Here are the various options:
- *
- * SERIAL_PARANOIA_CHECK
- *              Check the magic number for the async_structure where
- *              ever possible.
- */
-
-#include <linux/delay.h>
-
-#undef SERIAL_PARANOIA_CHECK
-#define SERIAL_DO_RESTART
-
-/* Set of debugging defines */
-
-#undef SERIAL_DEBUG_INTR
-#undef SERIAL_DEBUG_OPEN
-#undef SERIAL_DEBUG_FLOW
-#undef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
-
-/* Sanity checks */
-
-#if defined(MODULE) && defined(SERIAL_DEBUG_MCOUNT)
-#define DBG_CNT(s) printk("(%s): [%x] refc=%d, serc=%d, ttyc=%d -> %s\n", \
- tty->name, (info->flags), serial_driver->refcount,info->count,tty->count,s)
-#else
-#define DBG_CNT(s)
-#endif
-
-/*
- * End of serial driver configuration section.
- */
-
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/serial.h>
-#include <linux/serialP.h>
-#include <linux/serial_reg.h>
-static char *serial_version = "4.30";
-
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/console.h>
-#include <linux/major.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/ioport.h>
-#include <linux/mm.h>
-#include <linux/seq_file.h>
-#include <linux/slab.h>
-#include <linux/smp_lock.h>
-#include <linux/init.h>
-#include <linux/bitops.h>
-#include <linux/platform_device.h>
-
-#include <asm/setup.h>
-
-#include <asm/system.h>
-
-#include <asm/irq.h>
-
-#include <asm/amigahw.h>
-#include <asm/amigaints.h>
-
-#define custom amiga_custom
-static char *serial_name = "Amiga-builtin serial driver";
-
-static struct tty_driver *serial_driver;
-
-/* number of characters left in xmit buffer before we ask for more */
-#define WAKEUP_CHARS 256
-
-static struct async_struct *IRQ_ports;
-
-static unsigned char current_ctl_bits;
-
-static void change_speed(struct async_struct *info, struct ktermios *old);
-static void rs_wait_until_sent(struct tty_struct *tty, int timeout);
-
-
-static struct serial_state rs_table[1];
-
-#define NR_PORTS ARRAY_SIZE(rs_table)
-
-#include <asm/uaccess.h>
-
-#define serial_isroot() (capable(CAP_SYS_ADMIN))
-
-
-static inline int serial_paranoia_check(struct async_struct *info,
-                                        char *name, const char *routine)
-{
-#ifdef SERIAL_PARANOIA_CHECK
-        static const char *badmagic =
-                "Warning: bad magic number for serial struct (%s) in %s\n";
-        static const char *badinfo =
-                "Warning: null async_struct for (%s) in %s\n";
-
-        if (!info) {
-                printk(badinfo, name, routine);
-                return 1;
-        }
-        if (info->magic != SERIAL_MAGIC) {
-                printk(badmagic, name, routine);
-                return 1;
-        }
-#endif
-        return 0;
-}
-
-/* some serial hardware definitions */
-#define SDR_OVRUN   (1<<15)
-#define SDR_RBF     (1<<14)
-#define SDR_TBE     (1<<13)
-#define SDR_TSRE    (1<<12)
-
-#define SERPER_PARENB    (1<<15)
-
-#define AC_SETCLR   (1<<15)
-#define AC_UARTBRK  (1<<11)
-
-#define SER_DTR     (1<<7)
-#define SER_RTS     (1<<6)
-#define SER_DCD     (1<<5)
-#define SER_CTS     (1<<4)
-#define SER_DSR     (1<<3)
-
-static __inline__ void rtsdtr_ctrl(int bits)
-{
-    ciab.pra = ((bits & (SER_RTS | SER_DTR)) ^ (SER_RTS | SER_DTR)) | (ciab.pra & ~(SER_RTS | SER_DTR));
-}
-
-/*
- * ------------------------------------------------------------
- * rs_stop() and rs_start()
- *
- * This routines are called before setting or resetting tty->stopped.
- * They enable or disable transmitter interrupts, as necessary.
- * ------------------------------------------------------------
- */
-static void rs_stop(struct tty_struct *tty)
-{
-        struct async_struct *info = tty->driver_data;
-        unsigned long flags;
-
-        if (serial_paranoia_check(info, tty->name, "rs_stop"))
-                return;
-
-        local_irq_save(flags);
-        if (info->IER & UART_IER_THRI) {
-                info->IER &= ~UART_IER_THRI;
-                /* disable Tx interrupt and remove any pending interrupts */
-                custom.intena = IF_TBE;
-                mb();
-                custom.intreq = IF_TBE;
-                mb();
-        }
-        local_irq_restore(flags);
-}
-
-static void rs_start(struct tty_struct *tty)
-{
-        struct async_struct *info = tty->driver_data;
-        unsigned long flags;
-
-        if (serial_paranoia_check(info, tty->name, "rs_start"))
-                return;
-
-        local_irq_save(flags);
-        if (info->xmit.head != info->xmit.tail
-            && info->xmit.buf
-            && !(info->IER & UART_IER_THRI)) {
-                info->IER |= UART_IER_THRI;
-                custom.intena = IF_SETCLR | IF_TBE;
-                mb();
-                /* set a pending Tx Interrupt, transmitter should restart now */
-                custom.intreq = IF_SETCLR | IF_TBE;
-                mb();
-        }
-        local_irq_restore(flags);
-}
-
-/*
- * ----------------------------------------------------------------------
- *
- * Here starts the interrupt handling routines.  All of the following
- * subroutines are declared as inline and are folded into
- * rs_interrupt().  They were separated out for readability's sake.
- *
- * Note: rs_interrupt() is a "fast" interrupt, which means that it
- * runs with interrupts turned off.  People who may want to modify
- * rs_interrupt() should try to keep the interrupt handler as fast as
- * possible.  After you are done making modifications, it is not a bad
- * idea to do:
- * 
- * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer serial.c
- *
- * and look at the resulting assemble code in serial.s.
- *
- *                              - Ted Ts'o (tytso@mit.edu), 7-Mar-93
- * -----------------------------------------------------------------------
- */
-
-/*
- * This routine is used by the interrupt handler to schedule
- * processing in the software interrupt portion of the driver.
- */
-static void rs_sched_event(struct async_struct *info,
-                           int event)
-{
-        info->event |= 1 << event;
-        tasklet_schedule(&info->tlet);
-}
-
-static void receive_chars(struct async_struct *info)
-{
-        int status;
-        int serdatr;
-        struct tty_struct *tty = info->tty;
-        unsigned char ch, flag;
-        struct  async_icount *icount;
-        int oe = 0;
-
-        icount = &info->state->icount;
-
-        status = UART_LSR_DR; /* We obviously have a character! */
-        serdatr = custom.serdatr;
-        mb();
-        custom.intreq = IF_RBF;
-        mb();
-
-        if((serdatr & 0x1ff) == 0)
-            status |= UART_LSR_BI;
-        if(serdatr & SDR_OVRUN)
-            status |= UART_LSR_OE;
-
-        ch = serdatr & 0xff;
-        icount->rx++;
-
-#ifdef SERIAL_DEBUG_INTR
-        printk("DR%02x:%02x...", ch, status);
-#endif
-        flag = TTY_NORMAL;
-
-        /*
-         * We don't handle parity or frame errors - but I have left
-         * the code in, since I'm not sure that the errors can't be
-         * detected.
-         */
-
-        if (status & (UART_LSR_BI | UART_LSR_PE |
-                      UART_LSR_FE | UART_LSR_OE)) {
-          /*
-           * For statistics only
-           */
-          if (status & UART_LSR_BI) {
-            status &= ~(UART_LSR_FE | UART_LSR_PE);
-            icount->brk++;
-          } else if (status & UART_LSR_PE)
-            icount->parity++;
-          else if (status & UART_LSR_FE)
-            icount->frame++;
-          if (status & UART_LSR_OE)
-            icount->overrun++;
-
-          /*
-           * Now check to see if character should be
-           * ignored, and mask off conditions which
-           * should be ignored.
-           */
-          if (status & info->ignore_status_mask)
-            goto out;
-
-          status &= info->read_status_mask;
-
-          if (status & (UART_LSR_BI)) {
-#ifdef SERIAL_DEBUG_INTR
-            printk("handling break....");
-#endif
-            flag = TTY_BREAK;
-            if (info->flags & ASYNC_SAK)
-              do_SAK(tty);
-          } else if (status & UART_LSR_PE)
-            flag = TTY_PARITY;
-          else if (status & UART_LSR_FE)
-            flag = TTY_FRAME;
-          if (status & UART_LSR_OE) {
-            /*
-             * Overrun is special, since it's
-             * reported immediately, and doesn't
-             * affect the current character
-             */
-             oe = 1;
-          }
-        }
-        tty_insert_flip_char(tty, ch, flag);
-        if (oe == 1)
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-        tty_flip_buffer_push(tty);
-out:
-        return;
-}
-
-static void transmit_chars(struct async_struct *info)
-{
-        custom.intreq = IF_TBE;
-        mb();
-        if (info->x_char) {
-                custom.serdat = info->x_char | 0x100;
-                mb();
-                info->state->icount.tx++;
-                info->x_char = 0;
-                return;
-        }
-        if (info->xmit.head == info->xmit.tail
-            || info->tty->stopped
-            || info->tty->hw_stopped) {
-                info->IER &= ~UART_IER_THRI;
-                custom.intena = IF_TBE;
-                mb();
-                return;
-        }
-
-        custom.serdat = info->xmit.buf[info->xmit.tail++] | 0x100;
-        mb();
-        info->xmit.tail = info->xmit.tail & (SERIAL_XMIT_SIZE-1);
-        info->state->icount.tx++;
-
-        if (CIRC_CNT(info->xmit.head,
-                     info->xmit.tail,
-                     SERIAL_XMIT_SIZE) < WAKEUP_CHARS)
-                rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
-
-#ifdef SERIAL_DEBUG_INTR
-        printk("THRE...");
-#endif
-        if (info->xmit.head == info->xmit.tail) {
-                custom.intena = IF_TBE;
-                mb();
-                info->IER &= ~UART_IER_THRI;
-        }
-}
-
-static void check_modem_status(struct async_struct *info)
-{
-        unsigned char status = ciab.pra & (SER_DCD | SER_CTS | SER_DSR);
-        unsigned char dstatus;
-        struct  async_icount *icount;
-
-        /* Determine bits that have changed */
-        dstatus = status ^ current_ctl_bits;
-        current_ctl_bits = status;
-
-        if (dstatus) {
-                icount = &info->state->icount;
-                /* update input line counters */
-                if (dstatus & SER_DSR)
-                        icount->dsr++;
-                if (dstatus & SER_DCD) {
-                        icount->dcd++;
-#ifdef CONFIG_HARD_PPS
-                        if ((info->flags & ASYNC_HARDPPS_CD) &&
-                            !(status & SER_DCD))
-                                hardpps();
-#endif
-                }
-                if (dstatus & SER_CTS)
-                        icount->cts++;
-                wake_up_interruptible(&info->delta_msr_wait);
-        }
-
-        if ((info->flags & ASYNC_CHECK_CD) && (dstatus & SER_DCD)) {
-#if (defined(SERIAL_DEBUG_OPEN) || defined(SERIAL_DEBUG_INTR))
-                printk("ttyS%d CD now %s...", info->line,
-                       (!(status & SER_DCD)) ? "on" : "off");
-#endif
-                if (!(status & SER_DCD))
-                        wake_up_interruptible(&info->open_wait);
-                else {
-#ifdef SERIAL_DEBUG_OPEN
-                        printk("doing serial hangup...");
-#endif
-                        if (info->tty)
-                                tty_hangup(info->tty);
-                }
-        }
-        if (info->flags & ASYNC_CTS_FLOW) {
-                if (info->tty->hw_stopped) {
-                        if (!(status & SER_CTS)) {
-#if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
-                                printk("CTS tx start...");
-#endif
-                                info->tty->hw_stopped = 0;
-                                info->IER |= UART_IER_THRI;
-                                custom.intena = IF_SETCLR | IF_TBE;
-                                mb();
-                                /* set a pending Tx Interrupt, transmitter should restart now */
-                                custom.intreq = IF_SETCLR | IF_TBE;
-                                mb();
-                                rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
-                                return;
-                        }
-                } else {
-                        if ((status & SER_CTS)) {
-#if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
-                                printk("CTS tx stop...");
-#endif
-                                info->tty->hw_stopped = 1;
-                                info->IER &= ~UART_IER_THRI;
-                                /* disable Tx interrupt and remove any pending interrupts */
-                                custom.intena = IF_TBE;
-                                mb();
-                                custom.intreq = IF_TBE;
-                                mb();
-                        }
-                }
-        }
-}
-
-static irqreturn_t ser_vbl_int( int irq, void *data)
-{
-        /* vbl is just a periodic interrupt we tie into to update modem status */
-        struct async_struct * info = IRQ_ports;
-        /*
-         * TBD - is it better to unregister from this interrupt or to
-         * ignore it if MSI is clear ?
-         */
-        if(info->IER & UART_IER_MSI)
-          check_modem_status(info);
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t ser_rx_int(int irq, void *dev_id)
-{
-        struct async_struct * info;
-
-#ifdef SERIAL_DEBUG_INTR
-        printk("ser_rx_int...");
-#endif
-
-        info = IRQ_ports;
-        if (!info || !info->tty)
-                return IRQ_NONE;
-
-        receive_chars(info);
-        info->last_active = jiffies;
-#ifdef SERIAL_DEBUG_INTR
-        printk("end.\n");
-#endif
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t ser_tx_int(int irq, void *dev_id)
-{
-        struct async_struct * info;
-
-        if (custom.serdatr & SDR_TBE) {
-#ifdef SERIAL_DEBUG_INTR
-          printk("ser_tx_int...");
-#endif
-
-          info = IRQ_ports;
-          if (!info || !info->tty)
-                return IRQ_NONE;
-
-          transmit_chars(info);
-          info->last_active = jiffies;
-#ifdef SERIAL_DEBUG_INTR
-          printk("end.\n");
-#endif
-        }
-        return IRQ_HANDLED;
-}
-
-/*
- * -------------------------------------------------------------------
- * Here ends the serial interrupt routines.
- * -------------------------------------------------------------------
- */
-
-/*
- * This routine is used to handle the "bottom half" processing for the
- * serial driver, known also the "software interrupt" processing.
- * This processing is done at the kernel interrupt level, after the
- * rs_interrupt() has returned, BUT WITH INTERRUPTS TURNED ON.  This
- * is where time-consuming activities which can not be done in the
- * interrupt driver proper are done; the interrupt driver schedules
- * them using rs_sched_event(), and they get done here.
- */
-
-static void do_softint(unsigned long private_)
-{
-        struct async_struct     *info = (struct async_struct *) private_;
-        struct tty_struct       *tty;
-
-        tty = info->tty;
-        if (!tty)
-                return;
-
-        if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event))
-                tty_wakeup(tty);
-}
-
-/*
- * ---------------------------------------------------------------
- * Low level utility subroutines for the serial driver:  routines to
- * figure out the appropriate timeout for an interrupt chain, routines
- * to initialize and startup a serial port, and routines to shutdown a
- * serial port.  Useful stuff like that.
- * ---------------------------------------------------------------
- */
-
-static int startup(struct async_struct * info)
-{
-        unsigned long flags;
-        int     retval=0;
-        unsigned long page;
-
-        page = get_zeroed_page(GFP_KERNEL);
-        if (!page)
-                return -ENOMEM;
-
-        local_irq_save(flags);
-
-        if (info->flags & ASYNC_INITIALIZED) {
-                free_page(page);
-                goto errout;
-        }
-
-        if (info->xmit.buf)
-                free_page(page);
-        else
-                info->xmit.buf = (unsigned char *) page;
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk("starting up ttys%d ...", info->line);
-#endif
-
-        /* Clear anything in the input buffer */
-
-        custom.intreq = IF_RBF;
-        mb();
-
-        retval = request_irq(IRQ_AMIGA_VERTB, ser_vbl_int, 0, "serial status", info);
-        if (retval) {
-          if (serial_isroot()) {
-            if (info->tty)
-              set_bit(TTY_IO_ERROR,
-                      &info->tty->flags);
-            retval = 0;
-          }
-          goto errout;
-        }
-
-        /* enable both Rx and Tx interrupts */
-        custom.intena = IF_SETCLR | IF_RBF | IF_TBE;
-        mb();
-        info->IER = UART_IER_MSI;
-
-        /* remember current state of the DCD and CTS bits */
-        current_ctl_bits = ciab.pra & (SER_DCD | SER_CTS | SER_DSR);
-
-        IRQ_ports = info;
-
-        info->MCR = 0;
-        if (info->tty->termios->c_cflag & CBAUD)
-          info->MCR = SER_DTR | SER_RTS;
-        rtsdtr_ctrl(info->MCR);
-
-        if (info->tty)
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
-        info->xmit.head = info->xmit.tail = 0;
-
-        /*
-         * Set up the tty->alt_speed kludge
-         */
-        if (info->tty) {
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        info->tty->alt_speed = 57600;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        info->tty->alt_speed = 115200;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                        info->tty->alt_speed = 230400;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                        info->tty->alt_speed = 460800;
-        }
-
-        /*
-         * and set the speed of the serial port
-         */
-        change_speed(info, NULL);
-
-        info->flags |= ASYNC_INITIALIZED;
-        local_irq_restore(flags);
-        return 0;
-
-errout:
-        local_irq_restore(flags);
-        return retval;
-}
-
-/*
- * This routine will shutdown a serial port; interrupts are disabled, and
- * DTR is dropped if the hangup on close termio flag is on.
- */
-static void shutdown(struct async_struct * info)
-{
-        unsigned long   flags;
-        struct serial_state *state;
-
-        if (!(info->flags & ASYNC_INITIALIZED))
-                return;
-
-        state = info->state;
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk("Shutting down serial port %d ....\n", info->line);
-#endif
-
-        local_irq_save(flags); /* Disable interrupts */
-
-        /*
-         * clear delta_msr_wait queue to avoid mem leaks: we may free the irq
-         * here so the queue might never be waken up
-         */
-        wake_up_interruptible(&info->delta_msr_wait);
-
-        IRQ_ports = NULL;
-
-        /*
-         * Free the IRQ, if necessary
-         */
-        free_irq(IRQ_AMIGA_VERTB, info);
-
-        if (info->xmit.buf) {
-                free_page((unsigned long) info->xmit.buf);
-                info->xmit.buf = NULL;
-        }
-
-        info->IER = 0;
-        custom.intena = IF_RBF | IF_TBE;
-        mb();
-
-        /* disable break condition */
-        custom.adkcon = AC_UARTBRK;
-        mb();
-
-        if (!info->tty || (info->tty->termios->c_cflag & HUPCL))
-                info->MCR &= ~(SER_DTR|SER_RTS);
-        rtsdtr_ctrl(info->MCR);
-
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
-
-        info->flags &= ~ASYNC_INITIALIZED;
-        local_irq_restore(flags);
-}
-
-
-/*
- * This routine is called to set the UART divisor registers to match
- * the specified baud rate for a serial port.
- */
-static void change_speed(struct async_struct *info,
-                         struct ktermios *old_termios)
-{
-        int     quot = 0, baud_base, baud;
-        unsigned cflag, cval = 0;
-        int     bits;
-        unsigned long   flags;
-
-        if (!info->tty || !info->tty->termios)
-                return;
-        cflag = info->tty->termios->c_cflag;
-
-        /* Byte size is always 8 bits plus parity bit if requested */
-
-        cval = 3; bits = 10;
-        if (cflag & CSTOPB) {
-                cval |= 0x04;
-                bits++;
-        }
-        if (cflag & PARENB) {
-                cval |= UART_LCR_PARITY;
-                bits++;
-        }
-        if (!(cflag & PARODD))
-                cval |= UART_LCR_EPAR;
-#ifdef CMSPAR
-        if (cflag & CMSPAR)
-                cval |= UART_LCR_SPAR;
-#endif
-
-        /* Determine divisor based on baud rate */
-        baud = tty_get_baud_rate(info->tty);
-        if (!baud)
-                baud = 9600;    /* B0 transition handled in rs_set_termios */
-        baud_base = info->state->baud_base;
-        if (baud == 38400 &&
-            ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST))
-                quot = info->state->custom_divisor;
-        else {
-                if (baud == 134)
-                        /* Special case since 134 is really 134.5 */
-                        quot = (2*baud_base / 269);
-                else if (baud)
-                        quot = baud_base / baud;
-        }
-        /* If the quotient is zero refuse the change */
-        if (!quot && old_termios) {
-                /* FIXME: Will need updating for new tty in the end */
-                info->tty->termios->c_cflag &= ~CBAUD;
-                info->tty->termios->c_cflag |= (old_termios->c_cflag & CBAUD);
-                baud = tty_get_baud_rate(info->tty);
-                if (!baud)
-                        baud = 9600;
-                if (baud == 38400 &&
-                    ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST))
-                        quot = info->state->custom_divisor;
-                else {
-                        if (baud == 134)
-                                /* Special case since 134 is really 134.5 */
-                                quot = (2*baud_base / 269);
-                        else if (baud)
-                                quot = baud_base / baud;
-                }
-        }
-        /* As a last resort, if the quotient is zero, default to 9600 bps */
-        if (!quot)
-                quot = baud_base / 9600;
-        info->quot = quot;
-        info->timeout = ((info->xmit_fifo_size*HZ*bits*quot) / baud_base);
-        info->timeout += HZ/50;         /* Add .02 seconds of slop */
-
-        /* CTS flow control flag and modem status interrupts */
-        info->IER &= ~UART_IER_MSI;
-        if (info->flags & ASYNC_HARDPPS_CD)
-                info->IER |= UART_IER_MSI;
-        if (cflag & CRTSCTS) {
-                info->flags |= ASYNC_CTS_FLOW;
-                info->IER |= UART_IER_MSI;
-        } else
-                info->flags &= ~ASYNC_CTS_FLOW;
-        if (cflag & CLOCAL)
-                info->flags &= ~ASYNC_CHECK_CD;
-        else {
-                info->flags |= ASYNC_CHECK_CD;
-                info->IER |= UART_IER_MSI;
-        }
-        /* TBD:
-         * Does clearing IER_MSI imply that we should disable the VBL interrupt ?
-         */
-
-        /*
-         * Set up parity check flag
-         */
-
-        info->read_status_mask = UART_LSR_OE | UART_LSR_DR;
-        if (I_INPCK(info->tty))
-                info->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
-                info->read_status_mask |= UART_LSR_BI;
-
-        /*
-         * Characters to ignore
-         */
-        info->ignore_status_mask = 0;
-        if (I_IGNPAR(info->tty))
-                info->ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
-        if (I_IGNBRK(info->tty)) {
-                info->ignore_status_mask |= UART_LSR_BI;
-                /*
-                 * If we're ignore parity and break indicators, ignore 
-                 * overruns too.  (For real raw support).
-                 */
-                if (I_IGNPAR(info->tty))
-                        info->ignore_status_mask |= UART_LSR_OE;
-        }
-        /*
-         * !!! ignore all characters if CREAD is not set
-         */
-        if ((cflag & CREAD) == 0)
-                info->ignore_status_mask |= UART_LSR_DR;
-        local_irq_save(flags);
-
-        {
-          short serper;
-
-        /* Set up the baud rate */
-          serper = quot - 1;
-
-        /* Enable or disable parity bit */
-
-        if(cval & UART_LCR_PARITY)
-          serper |= (SERPER_PARENB);
-
-        custom.serper = serper;
-        mb();
-        }
-
-        info->LCR = cval;                               /* Save LCR */
-        local_irq_restore(flags);
-}
-
-static int rs_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        struct async_struct *info;
-        unsigned long flags;
-
-        info = tty->driver_data;
-
-        if (serial_paranoia_check(info, tty->name, "rs_put_char"))
-                return 0;
-
-        if (!info->xmit.buf)
-                return 0;
-
-        local_irq_save(flags);
-        if (CIRC_SPACE(info->xmit.head,
-                       info->xmit.tail,
-                       SERIAL_XMIT_SIZE) == 0) {
-                local_irq_restore(flags);
-                return 0;
-        }
-
-        info->xmit.buf[info->xmit.head++] = ch;
-        info->xmit.head &= SERIAL_XMIT_SIZE-1;
-        local_irq_restore(flags);
-        return 1;
-}
-
-static void rs_flush_chars(struct tty_struct *tty)
-{
-        struct async_struct *info = tty->driver_data;
-        unsigned long flags;
-
-        if (serial_paranoia_check(info, tty->name, "rs_flush_chars"))
-                return;
-
-        if (info->xmit.head == info->xmit.tail
-            || tty->stopped
-            || tty->hw_stopped
-            || !info->xmit.buf)
-                return;
-
-        local_irq_save(flags);
-        info->IER |= UART_IER_THRI;
-        custom.intena = IF_SETCLR | IF_TBE;
-        mb();
-        /* set a pending Tx Interrupt, transmitter should restart now */
-        custom.intreq = IF_SETCLR | IF_TBE;
-        mb();
-        local_irq_restore(flags);
-}
-
-static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count)
-{
-        int     c, ret = 0;
-        struct async_struct *info;
-        unsigned long flags;
-
-        info = tty->driver_data;
-
-        if (serial_paranoia_check(info, tty->name, "rs_write"))
-                return 0;
-
-        if (!info->xmit.buf)
-                return 0;
-
-        local_irq_save(flags);
-        while (1) {
-                c = CIRC_SPACE_TO_END(info->xmit.head,
-                                      info->xmit.tail,
-                                      SERIAL_XMIT_SIZE);
-                if (count < c)
-                        c = count;
-                if (c <= 0) {
-                        break;
-                }
-                memcpy(info->xmit.buf + info->xmit.head, buf, c);
-                info->xmit.head = ((info->xmit.head + c) &
-                                   (SERIAL_XMIT_SIZE-1));
-                buf += c;
-                count -= c;
-                ret += c;
-        }
-        local_irq_restore(flags);
-
-        if (info->xmit.head != info->xmit.tail
-            && !tty->stopped
-            && !tty->hw_stopped
-            && !(info->IER & UART_IER_THRI)) {
-                info->IER |= UART_IER_THRI;
-                local_irq_disable();
-                custom.intena = IF_SETCLR | IF_TBE;
-                mb();
-                /* set a pending Tx Interrupt, transmitter should restart now */
-                custom.intreq = IF_SETCLR | IF_TBE;
-                mb();
-                local_irq_restore(flags);
-        }
-        return ret;
-}
-
-static int rs_write_room(struct tty_struct *tty)
-{
-        struct async_struct *info = tty->driver_data;
-
-        if (serial_paranoia_check(info, tty->name, "rs_write_room"))
-                return 0;
-        return CIRC_SPACE(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE);
-}
-
-static int rs_chars_in_buffer(struct tty_struct *tty)
-{
-        struct async_struct *info = tty->driver_data;
-
-        if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer"))
-                return 0;
-        return CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE);
-}
-
-static void rs_flush_buffer(struct tty_struct *tty)
-{
-        struct async_struct *info = tty->driver_data;
-        unsigned long flags;
-
-        if (serial_paranoia_check(info, tty->name, "rs_flush_buffer"))
-                return;
-        local_irq_save(flags);
-        info->xmit.head = info->xmit.tail = 0;
-        local_irq_restore(flags);
-        tty_wakeup(tty);
-}
-
-/*
- * This function is used to send a high-priority XON/XOFF character to
- * the device
- */
-static void rs_send_xchar(struct tty_struct *tty, char ch)
-{
-        struct async_struct *info = tty->driver_data;
-        unsigned long flags;
-
-        if (serial_paranoia_check(info, tty->name, "rs_send_char"))
-                return;
-
-        info->x_char = ch;
-        if (ch) {
-                /* Make sure transmit interrupts are on */
-
-                /* Check this ! */
-                local_irq_save(flags);
-                if(!(custom.intenar & IF_TBE)) {
-                    custom.intena = IF_SETCLR | IF_TBE;
-                    mb();
-                    /* set a pending Tx Interrupt, transmitter should restart now */
-                    custom.intreq = IF_SETCLR | IF_TBE;
-                    mb();
-                }
-                local_irq_restore(flags);
-
-                info->IER |= UART_IER_THRI;
-        }
-}
-
-/*
- * ------------------------------------------------------------
- * rs_throttle()
- * 
- * This routine is called by the upper-layer tty layer to signal that
- * incoming characters should be throttled.
- * ------------------------------------------------------------
- */
-static void rs_throttle(struct tty_struct * tty)
-{
-        struct async_struct *info = tty->driver_data;
-        unsigned long flags;
-#ifdef SERIAL_DEBUG_THROTTLE
-        char    buf[64];
-
-        printk("throttle %s: %d....\n", tty_name(tty, buf),
-               tty->ldisc.chars_in_buffer(tty));
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "rs_throttle"))
-                return;
-
-        if (I_IXOFF(tty))
-                rs_send_xchar(tty, STOP_CHAR(tty));
-
-        if (tty->termios->c_cflag & CRTSCTS)
-                info->MCR &= ~SER_RTS;
-
-        local_irq_save(flags);
-        rtsdtr_ctrl(info->MCR);
-        local_irq_restore(flags);
-}
-
-static void rs_unthrottle(struct tty_struct * tty)
-{
-        struct async_struct *info = tty->driver_data;
-        unsigned long flags;
-#ifdef SERIAL_DEBUG_THROTTLE
-        char    buf[64];
-
-        printk("unthrottle %s: %d....\n", tty_name(tty, buf),
-               tty->ldisc.chars_in_buffer(tty));
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "rs_unthrottle"))
-                return;
-
-        if (I_IXOFF(tty)) {
-                if (info->x_char)
-                        info->x_char = 0;
-                else
-                        rs_send_xchar(tty, START_CHAR(tty));
-        }
-        if (tty->termios->c_cflag & CRTSCTS)
-                info->MCR |= SER_RTS;
-        local_irq_save(flags);
-        rtsdtr_ctrl(info->MCR);
-        local_irq_restore(flags);
-}
-
-/*
- * ------------------------------------------------------------
- * rs_ioctl() and friends
- * ------------------------------------------------------------
- */
-
-static int get_serial_info(struct async_struct * info,
-                           struct serial_struct __user * retinfo)
-{
-        struct serial_struct tmp;
-        struct serial_state *state = info->state;
-   
-        if (!retinfo)
-                return -EFAULT;
-        memset(&tmp, 0, sizeof(tmp));
-        tty_lock();
-        tmp.type = state->type;
-        tmp.line = state->line;
-        tmp.port = state->port;
-        tmp.irq = state->irq;
-        tmp.flags = state->flags;
-        tmp.xmit_fifo_size = state->xmit_fifo_size;
-        tmp.baud_base = state->baud_base;
-        tmp.close_delay = state->close_delay;
-        tmp.closing_wait = state->closing_wait;
-        tmp.custom_divisor = state->custom_divisor;
-        tty_unlock();
-        if (copy_to_user(retinfo,&tmp,sizeof(*retinfo)))
-                return -EFAULT;
-        return 0;
-}
-
-static int set_serial_info(struct async_struct * info,
-                           struct serial_struct __user * new_info)
-{
-        struct serial_struct new_serial;
-        struct serial_state old_state, *state;
-        unsigned int            change_irq,change_port;
-        int                     retval = 0;
-
-        if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))
-                return -EFAULT;
-
-        tty_lock();
-        state = info->state;
-        old_state = *state;
-  
-        change_irq = new_serial.irq != state->irq;
-        change_port = (new_serial.port != state->port);
-        if(change_irq || change_port || (new_serial.xmit_fifo_size != state->xmit_fifo_size)) {
-          tty_unlock();
-          return -EINVAL;
-        }
-  
-        if (!serial_isroot()) {
-                if ((new_serial.baud_base != state->baud_base) ||
-                    (new_serial.close_delay != state->close_delay) ||
-                    (new_serial.xmit_fifo_size != state->xmit_fifo_size) ||
-                    ((new_serial.flags & ~ASYNC_USR_MASK) !=
-                     (state->flags & ~ASYNC_USR_MASK)))
-                        return -EPERM;
-                state->flags = ((state->flags & ~ASYNC_USR_MASK) |
-                               (new_serial.flags & ASYNC_USR_MASK));
-                info->flags = ((info->flags & ~ASYNC_USR_MASK) |
-                               (new_serial.flags & ASYNC_USR_MASK));
-                state->custom_divisor = new_serial.custom_divisor;
-                goto check_and_exit;
-        }
-
-        if (new_serial.baud_base < 9600) {
-                tty_unlock();
-                return -EINVAL;
-        }
-
-        /*
-         * OK, past this point, all the error checking has been done.
-         * At this point, we start making changes.....
-         */
-
-        state->baud_base = new_serial.baud_base;
-        state->flags = ((state->flags & ~ASYNC_FLAGS) |
-                        (new_serial.flags & ASYNC_FLAGS));
-        info->flags = ((state->flags & ~ASYNC_INTERNAL_FLAGS) |
-                       (info->flags & ASYNC_INTERNAL_FLAGS));
-        state->custom_divisor = new_serial.custom_divisor;
-        state->close_delay = new_serial.close_delay * HZ/100;
-        state->closing_wait = new_serial.closing_wait * HZ/100;
-        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-
-check_and_exit:
-        if (info->flags & ASYNC_INITIALIZED) {
-                if (((old_state.flags & ASYNC_SPD_MASK) !=
-                     (state->flags & ASYNC_SPD_MASK)) ||
-                    (old_state.custom_divisor != state->custom_divisor)) {
-                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                                info->tty->alt_speed = 57600;
-                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                                info->tty->alt_speed = 115200;
-                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                                info->tty->alt_speed = 230400;
-                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                                info->tty->alt_speed = 460800;
-                        change_speed(info, NULL);
-                }
-        } else
-                retval = startup(info);
-        tty_unlock();
-        return retval;
-}
-
-
-/*
- * get_lsr_info - get line status register info
- *
- * Purpose: Let user call ioctl() to get info when the UART physically
- *          is emptied.  On bus types like RS485, the transmitter must
- *          release the bus after transmitting. This must be done when
- *          the transmit shift register is empty, not be done when the
- *          transmit holding register is empty.  This functionality
- *          allows an RS485 driver to be written in user space. 
- */
-static int get_lsr_info(struct async_struct * info, unsigned int __user *value)
-{
-        unsigned char status;
-        unsigned int result;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        status = custom.serdatr;
-        mb();
-        local_irq_restore(flags);
-        result = ((status & SDR_TSRE) ? TIOCSER_TEMT : 0);
-        if (copy_to_user(value, &result, sizeof(int)))
-                return -EFAULT;
-        return 0;
-}
-
-
-static int rs_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct async_struct * info = tty->driver_data;
-        unsigned char control, status;
-        unsigned long flags;
-
-        if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
-                return -ENODEV;
-        if (tty->flags & (1 << TTY_IO_ERROR))
-                return -EIO;
-
-        control = info->MCR;
-        local_irq_save(flags);
-        status = ciab.pra;
-        local_irq_restore(flags);
-        return    ((control & SER_RTS) ? TIOCM_RTS : 0)
-                | ((control & SER_DTR) ? TIOCM_DTR : 0)
-                | (!(status  & SER_DCD) ? TIOCM_CAR : 0)
-                | (!(status  & SER_DSR) ? TIOCM_DSR : 0)
-                | (!(status  & SER_CTS) ? TIOCM_CTS : 0);
-}
-
-static int rs_tiocmset(struct tty_struct *tty, struct file *file,
-                       unsigned int set, unsigned int clear)
-{
-        struct async_struct * info = tty->driver_data;
-        unsigned long flags;
-
-        if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
-                return -ENODEV;
-        if (tty->flags & (1 << TTY_IO_ERROR))
-                return -EIO;
-
-        local_irq_save(flags);
-        if (set & TIOCM_RTS)
-                info->MCR |= SER_RTS;
-        if (set & TIOCM_DTR)
-                info->MCR |= SER_DTR;
-        if (clear & TIOCM_RTS)
-                info->MCR &= ~SER_RTS;
-        if (clear & TIOCM_DTR)
-                info->MCR &= ~SER_DTR;
-        rtsdtr_ctrl(info->MCR);
-        local_irq_restore(flags);
-        return 0;
-}
-
-/*
- * rs_break() --- routine which turns the break handling on or off
- */
-static int rs_break(struct tty_struct *tty, int break_state)
-{
-        struct async_struct * info = tty->driver_data;
-        unsigned long flags;
-
-        if (serial_paranoia_check(info, tty->name, "rs_break"))
-                return -EINVAL;
-
-        local_irq_save(flags);
-        if (break_state == -1)
-          custom.adkcon = AC_SETCLR | AC_UARTBRK;
-        else
-          custom.adkcon = AC_UARTBRK;
-        mb();
-        local_irq_restore(flags);
-        return 0;
-}
-
-
-static int rs_ioctl(struct tty_struct *tty, struct file * file,
-                    unsigned int cmd, unsigned long arg)
-{
-        struct async_struct * info = tty->driver_data;
-        struct async_icount cprev, cnow;        /* kernel counter temps */
-        struct serial_icounter_struct icount;
-        void __user *argp = (void __user *)arg;
-        unsigned long flags;
-
-        if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
-                return -ENODEV;
-
-        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-            (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&
-            (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-                if (tty->flags & (1 << TTY_IO_ERROR))
-                    return -EIO;
-        }
-
-        switch (cmd) {
-                case TIOCGSERIAL:
-                        return get_serial_info(info, argp);
-                case TIOCSSERIAL:
-                        return set_serial_info(info, argp);
-                case TIOCSERCONFIG:
-                        return 0;
-
-                case TIOCSERGETLSR: /* Get line status register */
-                        return get_lsr_info(info, argp);
-
-                case TIOCSERGSTRUCT:
-                        if (copy_to_user(argp,
-                                         info, sizeof(struct async_struct)))
-                                return -EFAULT;
-                        return 0;
-
-                /*
-                 * Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change
-                 * - mask passed in arg for lines of interest
-                 *   (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
-                 * Caller should use TIOCGICOUNT to see which one it was
-                 */
-                case TIOCMIWAIT:
-                        local_irq_save(flags);
-                        /* note the counters on entry */
-                        cprev = info->state->icount;
-                        local_irq_restore(flags);
-                        while (1) {
-                                interruptible_sleep_on(&info->delta_msr_wait);
-                                /* see if a signal did it */
-                                if (signal_pending(current))
-                                        return -ERESTARTSYS;
-                                local_irq_save(flags);
-                                cnow = info->state->icount; /* atomic copy */
-                                local_irq_restore(flags);
-                                if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr && 
-                                    cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
-                                        return -EIO; /* no change => error */
-                                if ( ((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
-                                     ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
-                                     ((arg & TIOCM_CD)  && (cnow.dcd != cprev.dcd)) ||
-                                     ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts)) ) {
-                                        return 0;
-                                }
-                                cprev = cnow;
-                        }
-                        /* NOTREACHED */
-
-                /* 
-                 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-                 * Return: write counters to the user passed counter struct
-                 * NB: both 1->0 and 0->1 transitions are counted except for
-                 *     RI where only 0->1 is counted.
-                 */
-                case TIOCGICOUNT:
-                        local_irq_save(flags);
-                        cnow = info->state->icount;
-                        local_irq_restore(flags);
-                        icount.cts = cnow.cts;
-                        icount.dsr = cnow.dsr;
-                        icount.rng = cnow.rng;
-                        icount.dcd = cnow.dcd;
-                        icount.rx = cnow.rx;
-                        icount.tx = cnow.tx;
-                        icount.frame = cnow.frame;
-                        icount.overrun = cnow.overrun;
-                        icount.parity = cnow.parity;
-                        icount.brk = cnow.brk;
-                        icount.buf_overrun = cnow.buf_overrun;
-
-                        if (copy_to_user(argp, &icount, sizeof(icount)))
-                                return -EFAULT;
-                        return 0;
-                case TIOCSERGWILD:
-                case TIOCSERSWILD:
-                        /* "setserial -W" is called in Debian boot */
-                        printk ("TIOCSER?WILD ioctl obsolete, ignored.\n");
-                        return 0;
-
-                default:
-                        return -ENOIOCTLCMD;
-                }
-        return 0;
-}
-
-static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
-{
-        struct async_struct *info = tty->driver_data;
-        unsigned long flags;
-        unsigned int cflag = tty->termios->c_cflag;
-
-        change_speed(info, old_termios);
-
-        /* Handle transition to B0 status */
-        if ((old_termios->c_cflag & CBAUD) &&
-            !(cflag & CBAUD)) {
-                info->MCR &= ~(SER_DTR|SER_RTS);
-                local_irq_save(flags);
-                rtsdtr_ctrl(info->MCR);
-                local_irq_restore(flags);
-        }
-
-        /* Handle transition away from B0 status */
-        if (!(old_termios->c_cflag & CBAUD) &&
-            (cflag & CBAUD)) {
-                info->MCR |= SER_DTR;
-                if (!(tty->termios->c_cflag & CRTSCTS) || 
-                    !test_bit(TTY_THROTTLED, &tty->flags)) {
-                        info->MCR |= SER_RTS;
-                }
-                local_irq_save(flags);
-                rtsdtr_ctrl(info->MCR);
-                local_irq_restore(flags);
-        }
-
-        /* Handle turning off CRTSCTS */
-        if ((old_termios->c_cflag & CRTSCTS) &&
-            !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-                rs_start(tty);
-        }
-
-#if 0
-        /*
-         * No need to wake up processes in open wait, since they
-         * sample the CLOCAL flag once, and don't recheck it.
-         * XXX  It's not clear whether the current behavior is correct
-         * or not.  Hence, this may change.....
-         */
-        if (!(old_termios->c_cflag & CLOCAL) &&
-            (tty->termios->c_cflag & CLOCAL))
-                wake_up_interruptible(&info->open_wait);
-#endif
-}
-
-/*
- * ------------------------------------------------------------
- * rs_close()
- * 
- * This routine is called when the serial port gets closed.  First, we
- * wait for the last remaining data to be sent.  Then, we unlink its
- * async structure from the interrupt chain if necessary, and we free
- * that IRQ if nothing is left in the chain.
- * ------------------------------------------------------------
- */
-static void rs_close(struct tty_struct *tty, struct file * filp)
-{
-        struct async_struct * info = tty->driver_data;
-        struct serial_state *state;
-        unsigned long flags;
-
-        if (!info || serial_paranoia_check(info, tty->name, "rs_close"))
-                return;
-
-        state = info->state;
-
-        local_irq_save(flags);
-
-        if (tty_hung_up_p(filp)) {
-                DBG_CNT("before DEC-hung");
-                local_irq_restore(flags);
-                return;
-        }
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk("rs_close ttys%d, count = %d\n", info->line, state->count);
-#endif
-        if ((tty->count == 1) && (state->count != 1)) {
-                /*
-                 * Uh, oh.  tty->count is 1, which means that the tty
-                 * structure will be freed.  state->count should always
-                 * be one in these conditions.  If it's greater than
-                 * one, we've got real problems, since it means the
-                 * serial port won't be shutdown.
-                 */
-                printk("rs_close: bad serial port count; tty->count is 1, "
-                       "state->count is %d\n", state->count);
-                state->count = 1;
-        }
-        if (--state->count < 0) {
-                printk("rs_close: bad serial port count for ttys%d: %d\n",
-                       info->line, state->count);
-                state->count = 0;
-        }
-        if (state->count) {
-                DBG_CNT("before DEC-2");
-                local_irq_restore(flags);
-                return;
-        }
-        info->flags |= ASYNC_CLOSING;
-        /*
-         * Now we wait for the transmit buffer to clear; and we notify 
-         * the line discipline to only process XON/XOFF characters.
-         */
-        tty->closing = 1;
-        if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, info->closing_wait);
-        /*
-         * At this point we stop accepting input.  To do this, we
-         * disable the receive line status interrupts, and tell the
-         * interrupt driver to stop checking the data ready bit in the
-         * line status register.
-         */
-        info->read_status_mask &= ~UART_LSR_DR;
-        if (info->flags & ASYNC_INITIALIZED) {
-                /* disable receive interrupts */
-                custom.intena = IF_RBF;
-                mb();
-                /* clear any pending receive interrupt */
-                custom.intreq = IF_RBF;
-                mb();
-
-                /*
-                 * Before we drop DTR, make sure the UART transmitter
-                 * has completely drained; this is especially
-                 * important if there is a transmit FIFO!
-                 */
-                rs_wait_until_sent(tty, info->timeout);
-        }
-        shutdown(info);
-        rs_flush_buffer(tty);
-                
-        tty_ldisc_flush(tty);
-        tty->closing = 0;
-        info->event = 0;
-        info->tty = NULL;
-        if (info->blocked_open) {
-                if (info->close_delay) {
-                        msleep_interruptible(jiffies_to_msecs(info->close_delay));
-                }
-                wake_up_interruptible(&info->open_wait);
-        }
-        info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-        wake_up_interruptible(&info->close_wait);
-        local_irq_restore(flags);
-}
-
-/*
- * rs_wait_until_sent() --- wait until the transmitter is empty
- */
-static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-        struct async_struct * info = tty->driver_data;
-        unsigned long orig_jiffies, char_time;
-        int tty_was_locked = tty_locked();
-        int lsr;
-
-        if (serial_paranoia_check(info, tty->name, "rs_wait_until_sent"))
-                return;
-
-        if (info->xmit_fifo_size == 0)
-                return; /* Just in case.... */
-
-        orig_jiffies = jiffies;
-
-        /*
-         * tty_wait_until_sent is called from lots of places,
-         * with or without the BTM.
-         */
-        if (!tty_was_locked)
-                tty_lock();
-        /*
-         * Set the check interval to be 1/5 of the estimated time to
-         * send a single character, and make it at least 1.  The check
-         * interval should also be less than the timeout.
-         * 
-         * Note: we have to use pretty tight timings here to satisfy
-         * the NIST-PCTS.
-         */
-        char_time = (info->timeout - HZ/50) / info->xmit_fifo_size;
-        char_time = char_time / 5;
-        if (char_time == 0)
-                char_time = 1;
-        if (timeout)
-          char_time = min_t(unsigned long, char_time, timeout);
-        /*
-         * If the transmitter hasn't cleared in twice the approximate
-         * amount of time to send the entire FIFO, it probably won't
-         * ever clear.  This assumes the UART isn't doing flow
-         * control, which is currently the case.  Hence, if it ever
-         * takes longer than info->timeout, this is probably due to a
-         * UART bug of some kind.  So, we clamp the timeout parameter at
-         * 2*info->timeout.
-         */
-        if (!timeout || timeout > 2*info->timeout)
-                timeout = 2*info->timeout;
-#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
-        printk("In rs_wait_until_sent(%d) check=%lu...", timeout, char_time);
-        printk("jiff=%lu...", jiffies);
-#endif
-        while(!((lsr = custom.serdatr) & SDR_TSRE)) {
-#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
-                printk("serdatr = %d (jiff=%lu)...", lsr, jiffies);
-#endif
-                msleep_interruptible(jiffies_to_msecs(char_time));
-                if (signal_pending(current))
-                        break;
-                if (timeout && time_after(jiffies, orig_jiffies + timeout))
-                        break;
-        }
-        __set_current_state(TASK_RUNNING);
-        if (!tty_was_locked)
-                tty_unlock();
-#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
-        printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
-#endif
-}
-
-/*
- * rs_hangup() --- called by tty_hangup() when a hangup is signaled.
- */
-static void rs_hangup(struct tty_struct *tty)
-{
-        struct async_struct * info = tty->driver_data;
-        struct serial_state *state = info->state;
-
-        if (serial_paranoia_check(info, tty->name, "rs_hangup"))
-                return;
-
-        state = info->state;
-
-        rs_flush_buffer(tty);
-        shutdown(info);
-        info->event = 0;
-        state->count = 0;
-        info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tty = NULL;
-        wake_up_interruptible(&info->open_wait);
-}
-
-/*
- * ------------------------------------------------------------
- * rs_open() and friends
- * ------------------------------------------------------------
- */
-static int block_til_ready(struct tty_struct *tty, struct file * filp,
-                           struct async_struct *info)
-{
-#ifdef DECLARE_WAITQUEUE
-        DECLARE_WAITQUEUE(wait, current);
-#else
-        struct wait_queue wait = { current, NULL };
-#endif
-        struct serial_state *state = info->state;
-        int             retval;
-        int             do_clocal = 0, extra_count = 0;
-        unsigned long   flags;
-
-        /*
-         * If the device is in the middle of being closed, then block
-         * until it's done, and then try again.
-         */
-        if (tty_hung_up_p(filp) ||
-            (info->flags & ASYNC_CLOSING)) {
-                if (info->flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->close_wait);
-#ifdef SERIAL_DO_RESTART
-                return ((info->flags & ASYNC_HUP_NOTIFY) ?
-                        -EAGAIN : -ERESTARTSYS);
-#else
-                return -EAGAIN;
-#endif
-        }
-
-        /*
-         * If non-blocking mode is set, or the port is not enabled,
-         * then make the check up front and then exit.
-         */
-        if ((filp->f_flags & O_NONBLOCK) ||
-            (tty->flags & (1 << TTY_IO_ERROR))) {
-                info->flags |= ASYNC_NORMAL_ACTIVE;
-                return 0;
-        }
-
-        if (tty->termios->c_cflag & CLOCAL)
-                do_clocal = 1;
-
-        /*
-         * Block waiting for the carrier detect and the line to become
-         * free (i.e., not in use by the callout).  While we are in
-         * this loop, state->count is dropped by one, so that
-         * rs_close() knows when to free things.  We restore it upon
-         * exit, either normal or abnormal.
-         */
-        retval = 0;
-        add_wait_queue(&info->open_wait, &wait);
-#ifdef SERIAL_DEBUG_OPEN
-        printk("block_til_ready before block: ttys%d, count = %d\n",
-               state->line, state->count);
-#endif
-        local_irq_save(flags);
-        if (!tty_hung_up_p(filp)) {
-                extra_count = 1;
-                state->count--;
-        }
-        local_irq_restore(flags);
-        info->blocked_open++;
-        while (1) {
-                local_irq_save(flags);
-                if (tty->termios->c_cflag & CBAUD)
-                        rtsdtr_ctrl(SER_DTR|SER_RTS);
-                local_irq_restore(flags);
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (tty_hung_up_p(filp) ||
-                    !(info->flags & ASYNC_INITIALIZED)) {
-#ifdef SERIAL_DO_RESTART
-                        if (info->flags & ASYNC_HUP_NOTIFY)
-                                retval = -EAGAIN;
-                        else
-                                retval = -ERESTARTSYS;
-#else
-                        retval = -EAGAIN;
-#endif
-                        break;
-                }
-                if (!(info->flags & ASYNC_CLOSING) &&
-                    (do_clocal || (!(ciab.pra & SER_DCD)) ))
-                        break;
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-#ifdef SERIAL_DEBUG_OPEN
-                printk("block_til_ready blocking: ttys%d, count = %d\n",
-                       info->line, state->count);
-#endif
-                tty_unlock();
-                schedule();
-                tty_lock();
-        }
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&info->open_wait, &wait);
-        if (extra_count)
-                state->count++;
-        info->blocked_open--;
-#ifdef SERIAL_DEBUG_OPEN
-        printk("block_til_ready after blocking: ttys%d, count = %d\n",
-               info->line, state->count);
-#endif
-        if (retval)
-                return retval;
-        info->flags |= ASYNC_NORMAL_ACTIVE;
-        return 0;
-}
-
-static int get_async_struct(int line, struct async_struct **ret_info)
-{
-        struct async_struct *info;
-        struct serial_state *sstate;
-
-        sstate = rs_table + line;
-        sstate->count++;
-        if (sstate->info) {
-                *ret_info = sstate->info;
-                return 0;
-        }
-        info = kzalloc(sizeof(struct async_struct), GFP_KERNEL);
-        if (!info) {
-                sstate->count--;
-                return -ENOMEM;
-        }
-#ifdef DECLARE_WAITQUEUE
-        init_waitqueue_head(&info->open_wait);
-        init_waitqueue_head(&info->close_wait);
-        init_waitqueue_head(&info->delta_msr_wait);
-#endif
-        info->magic = SERIAL_MAGIC;
-        info->port = sstate->port;
-        info->flags = sstate->flags;
-        info->xmit_fifo_size = sstate->xmit_fifo_size;
-        info->line = line;
-        tasklet_init(&info->tlet, do_softint, (unsigned long)info);
-        info->state = sstate;
-        if (sstate->info) {
-                kfree(info);
-                *ret_info = sstate->info;
-                return 0;
-        }
-        *ret_info = sstate->info = info;
-        return 0;
-}
-
-/*
- * This routine is called whenever a serial port is opened.  It
- * enables interrupts for a serial port, linking in its async structure into
- * the IRQ chain.   It also performs the serial-specific
- * initialization for the tty structure.
- */
-static int rs_open(struct tty_struct *tty, struct file * filp)
-{
-        struct async_struct     *info;
-        int                     retval, line;
-
-        line = tty->index;
-        if ((line < 0) || (line >= NR_PORTS)) {
-                return -ENODEV;
-        }
-        retval = get_async_struct(line, &info);
-        if (retval) {
-                return retval;
-        }
-        tty->driver_data = info;
-        info->tty = tty;
-        if (serial_paranoia_check(info, tty->name, "rs_open"))
-                return -ENODEV;
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk("rs_open %s, count = %d\n", tty->name, info->state->count);
-#endif
-        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-
-        /*
-         * If the port is the middle of closing, bail out now
-         */
-        if (tty_hung_up_p(filp) ||
-            (info->flags & ASYNC_CLOSING)) {
-                if (info->flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->close_wait);
-#ifdef SERIAL_DO_RESTART
-                return ((info->flags & ASYNC_HUP_NOTIFY) ?
-                        -EAGAIN : -ERESTARTSYS);
-#else
-                return -EAGAIN;
-#endif
-        }
-
-        /*
-         * Start up serial port
-         */
-        retval = startup(info);
-        if (retval) {
-                return retval;
-        }
-
-        retval = block_til_ready(tty, filp, info);
-        if (retval) {
-#ifdef SERIAL_DEBUG_OPEN
-                printk("rs_open returning after block_til_ready with %d\n",
-                       retval);
-#endif
-                return retval;
-        }
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk("rs_open %s successful...", tty->name);
-#endif
-        return 0;
-}
-
-/*
- * /proc fs routines....
- */
-
-static inline void line_info(struct seq_file *m, struct serial_state *state)
-{
-        struct async_struct *info = state->info, scr_info;
-        char    stat_buf[30], control, status;
-        unsigned long flags;
-
-        seq_printf(m, "%d: uart:amiga_builtin",state->line);
-
-        /*
-         * Figure out the current RS-232 lines
-         */
-        if (!info) {
-                info = &scr_info;       /* This is just for serial_{in,out} */
-
-                info->magic = SERIAL_MAGIC;
-                info->flags = state->flags;
-                info->quot = 0;
-                info->tty = NULL;
-        }
-        local_irq_save(flags);
-        status = ciab.pra;
-        control = info ? info->MCR : status;
-        local_irq_restore(flags);
-
-        stat_buf[0] = 0;
-        stat_buf[1] = 0;
-        if(!(control & SER_RTS))
-                strcat(stat_buf, "|RTS");
-        if(!(status & SER_CTS))
-                strcat(stat_buf, "|CTS");
-        if(!(control & SER_DTR))
-                strcat(stat_buf, "|DTR");
-        if(!(status & SER_DSR))
-                strcat(stat_buf, "|DSR");
-        if(!(status & SER_DCD))
-                strcat(stat_buf, "|CD");
-
-        if (info->quot) {
-                seq_printf(m, " baud:%d", state->baud_base / info->quot);
-        }
-
-        seq_printf(m, " tx:%d rx:%d", state->icount.tx, state->icount.rx);
-
-        if (state->icount.frame)
-                seq_printf(m, " fe:%d", state->icount.frame);
-
-        if (state->icount.parity)
-                seq_printf(m, " pe:%d", state->icount.parity);
-
-        if (state->icount.brk)
-                seq_printf(m, " brk:%d", state->icount.brk);
-
-        if (state->icount.overrun)
-                seq_printf(m, " oe:%d", state->icount.overrun);
-
-        /*
-         * Last thing is the RS-232 status lines
-         */
-        seq_printf(m, " %s\n", stat_buf+1);
-}
-
-static int rs_proc_show(struct seq_file *m, void *v)
-{
-        seq_printf(m, "serinfo:1.0 driver:%s\n", serial_version);
-        line_info(m, &rs_table[0]);
-        return 0;
-}
-
-static int rs_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, rs_proc_show, NULL);
-}
-
-static const struct file_operations rs_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = rs_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-/*
- * ---------------------------------------------------------------------
- * rs_init() and friends
- *
- * rs_init() is called at boot-time to initialize the serial driver.
- * ---------------------------------------------------------------------
- */
-
-/*
- * This routine prints out the appropriate serial driver version
- * number, and identifies which options were configured into this
- * driver.
- */
-static void show_serial_version(void)
-{
-        printk(KERN_INFO "%s version %s\n", serial_name, serial_version);
-}
-
-
-static const struct tty_operations serial_ops = {
-        .open = rs_open,
-        .close = rs_close,
-        .write = rs_write,
-        .put_char = rs_put_char,
-        .flush_chars = rs_flush_chars,
-        .write_room = rs_write_room,
-        .chars_in_buffer = rs_chars_in_buffer,
-        .flush_buffer = rs_flush_buffer,
-        .ioctl = rs_ioctl,
-        .throttle = rs_throttle,
-        .unthrottle = rs_unthrottle,
-        .set_termios = rs_set_termios,
-        .stop = rs_stop,
-        .start = rs_start,
-        .hangup = rs_hangup,
-        .break_ctl = rs_break,
-        .send_xchar = rs_send_xchar,
-        .wait_until_sent = rs_wait_until_sent,
-        .tiocmget = rs_tiocmget,
-        .tiocmset = rs_tiocmset,
-        .proc_fops = &rs_proc_fops,
-};
-
-/*
- * The serial driver boot-time initialization code!
- */
-static int __init amiga_serial_probe(struct platform_device *pdev)
-{
-        unsigned long flags;
-        struct serial_state * state;
-        int error;
-
-        serial_driver = alloc_tty_driver(1);
-        if (!serial_driver)
-                return -ENOMEM;
-
-        IRQ_ports = NULL;
-
-        show_serial_version();
-
-        /* Initialize the tty_driver structure */
-
-        serial_driver->owner = THIS_MODULE;
-        serial_driver->driver_name = "amiserial";
-        serial_driver->name = "ttyS";
-        serial_driver->major = TTY_MAJOR;
-        serial_driver->minor_start = 64;
-        serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        serial_driver->subtype = SERIAL_TYPE_NORMAL;
-        serial_driver->init_termios = tty_std_termios;
-        serial_driver->init_termios.c_cflag =
-                B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        serial_driver->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(serial_driver, &serial_ops);
-
-        error = tty_register_driver(serial_driver);
-        if (error)
-                goto fail_put_tty_driver;
-
-        state = rs_table;
-        state->magic = SSTATE_MAGIC;
-        state->port = (int)&custom.serdatr; /* Just to give it a value */
-        state->line = 0;
-        state->custom_divisor = 0;
-        state->close_delay = 5*HZ/10;
-        state->closing_wait = 30*HZ;
-        state->icount.cts = state->icount.dsr = 
-          state->icount.rng = state->icount.dcd = 0;
-        state->icount.rx = state->icount.tx = 0;
-        state->icount.frame = state->icount.parity = 0;
-        state->icount.overrun = state->icount.brk = 0;
-
-        printk(KERN_INFO "ttyS%d is the amiga builtin serial port\n",
-                       state->line);
-
-        /* Hardware set up */
-
-        state->baud_base = amiga_colorclock;
-        state->xmit_fifo_size = 1;
-
-        /* set ISRs, and then disable the rx interrupts */
-        error = request_irq(IRQ_AMIGA_TBE, ser_tx_int, 0, "serial TX", state);
-        if (error)
-                goto fail_unregister;
-
-        error = request_irq(IRQ_AMIGA_RBF, ser_rx_int, IRQF_DISABLED,
-                            "serial RX", state);
-        if (error)
-                goto fail_free_irq;
-
-        local_irq_save(flags);
-
-        /* turn off Rx and Tx interrupts */
-        custom.intena = IF_RBF | IF_TBE;
-        mb();
-
-        /* clear any pending interrupt */
-        custom.intreq = IF_RBF | IF_TBE;
-        mb();
-
-        local_irq_restore(flags);
-
-        /*
-         * set the appropriate directions for the modem control flags,
-         * and clear RTS and DTR
-         */
-        ciab.ddra |= (SER_DTR | SER_RTS);   /* outputs */
-        ciab.ddra &= ~(SER_DCD | SER_CTS | SER_DSR);  /* inputs */
-
-        platform_set_drvdata(pdev, state);
-
-        return 0;
-
-fail_free_irq:
-        free_irq(IRQ_AMIGA_TBE, state);
-fail_unregister:
-        tty_unregister_driver(serial_driver);
-fail_put_tty_driver:
-        put_tty_driver(serial_driver);
-        return error;
-}
-
-static int __exit amiga_serial_remove(struct platform_device *pdev)
-{
-        int error;
-        struct serial_state *state = platform_get_drvdata(pdev);
-        struct async_struct *info = state->info;
-
-        /* printk("Unloading %s: version %s\n", serial_name, serial_version); */
-        tasklet_kill(&info->tlet);
-        if ((error = tty_unregister_driver(serial_driver)))
-                printk("SERIAL: failed to unregister serial driver (%d)\n",
-                       error);
-        put_tty_driver(serial_driver);
-
-        rs_table[0].info = NULL;
-        kfree(info);
-
-        free_irq(IRQ_AMIGA_TBE, rs_table);
-        free_irq(IRQ_AMIGA_RBF, rs_table);
-
-        platform_set_drvdata(pdev, NULL);
-
-        return error;
-}
-
-static struct platform_driver amiga_serial_driver = {
-        .remove = __exit_p(amiga_serial_remove),
-        .driver   = {
-                .name   = "amiga-serial",
-                .owner  = THIS_MODULE,
-        },
-};
-
-static int __init amiga_serial_init(void)
-{
-        return platform_driver_probe(&amiga_serial_driver, amiga_serial_probe);
-}
-
-module_init(amiga_serial_init);
-
-static void __exit amiga_serial_exit(void)
-{
-        platform_driver_unregister(&amiga_serial_driver);
-}
-
-module_exit(amiga_serial_exit);
-
-
-#if defined(CONFIG_SERIAL_CONSOLE) && !defined(MODULE)
-
-/*
- * ------------------------------------------------------------
- * Serial console driver
- * ------------------------------------------------------------
- */
-
-static void amiga_serial_putc(char c)
-{
-        custom.serdat = (unsigned char)c | 0x100;
-        while (!(custom.serdatr & 0x2000))
-                barrier();
-}
-
-/*
- *      Print a string to the serial port trying not to disturb
- *      any possible real use of the port...
- *
- *      The console must be locked when we get here.
- */
-static void serial_console_write(struct console *co, const char *s,
-                                unsigned count)
-{
-        unsigned short intena = custom.intenar;
-
-        custom.intena = IF_TBE;
-
-        while (count--) {
-                if (*s == '\n')
-                        amiga_serial_putc('\r');
-                amiga_serial_putc(*s++);
-        }
-
-        custom.intena = IF_SETCLR | (intena & IF_TBE);
-}
-
-static struct tty_driver *serial_console_device(struct console *c, int *index)
-{
-        *index = 0;
-        return serial_driver;
-}
-
-static struct console sercons = {
-        .name =         "ttyS",
-        .write =        serial_console_write,
-        .device =       serial_console_device,
-        .flags =        CON_PRINTBUFFER,
-        .index =        -1,
-};
-
-/*
- *      Register console.
- */
-static int __init amiserial_console_init(void)
-{
-        register_console(&sercons);
-        return 0;
-}
-console_initcall(amiserial_console_init);
-
-#endif /* CONFIG_SERIAL_CONSOLE && !MODULE */
-
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:amiga-serial");
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index 033e1505fca9..548708c4b2b8 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -7,13 +7,13 @@
  *   Intel Corporation, Microsoft Corporation. Advanced Power Management
  *   (APM) BIOS Interface Specification, Revision 1.2, February 1996.
  *
- * [This document is available from Microsoft at:
- *    http://www.microsoft.com/hwdev/busbios/amp_12.htm]
+ * This document is available from Microsoft at:
+ *    http://www.microsoft.com/whdc/archive/amp_12.mspx
  */
 #include <linux/module.h>
 #include <linux/poll.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/miscdevice.h>
@@ -274,7 +274,6 @@ apm_ioctl(struct file *filp, u_int cmd, u_long arg)
         if (!as->suser || !as->writer)
                 return -EPERM;
 
-        lock_kernel();
         switch (cmd) {
         case APM_IOC_SUSPEND:
                 mutex_lock(&state_lock);
@@ -335,7 +334,6 @@ apm_ioctl(struct file *filp, u_int cmd, u_long arg)
                 mutex_unlock(&state_lock);
                 break;
         }
-        unlock_kernel();
 
         return err;
 }
@@ -370,7 +368,6 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *as;
 
-        lock_kernel();
         as = kzalloc(sizeof(*as), GFP_KERNEL);
         if (as) {
                 /*
@@ -390,7 +387,6 @@ static int apm_open(struct inode * inode, struct file * filp)
 
                 filp->private_data = as;
         }
-        unlock_kernel();
 
         return as ? 0 : -ENOMEM;
 }
@@ -402,6 +398,7 @@ static const struct file_operations apm_bios_fops = {
         .unlocked_ioctl = apm_ioctl,
         .open           = apm_open,
         .release        = apm_release,
+        .llseek         = noop_llseek,
 };
 
 static struct miscdevice apm_device = {
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index f4ae0e0fb631..25373df1dcf8 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -26,7 +26,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/miscdevice.h>
 #include <linux/pci.h>
 #include <linux/wait.h>
@@ -60,6 +60,7 @@
 #define PCI_DEVICE_ID_APPLICOM_PCI2000PFB     0x0003
 #endif
 
+static DEFINE_MUTEX(ac_mutex);
 static char *applicom_pci_devnames[] = {
         "PCI board",
         "PCI2000IBS / PCI2000CAN",
@@ -565,6 +566,7 @@ static ssize_t ac_read (struct file *filp, char __user *buf, size_t count, loff_
                                 struct mailbox mailbox;
 
                                 /* Got a packet for us */
+                                memset(&st_loc, 0, sizeof(st_loc));
                                 ret = do_ac_read(i, buf, &st_loc, &mailbox);
                                 spin_unlock_irqrestore(&apbs[i].mutex, flags);
                                 set_current_state(TASK_RUNNING);
@@ -707,7 +709,7 @@ static long ac_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         if (IS_ERR(adgl))
                 return PTR_ERR(adgl);
 
-        lock_kernel();  
+        mutex_lock(&ac_mutex);  
         IndexCard = adgl->num_card-1;
          
         if(cmd != 6 && ((IndexCard >= MAX_BOARD) || !apbs[IndexCard].RamIO)) {
@@ -717,7 +719,7 @@ static long ac_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         warncount--;
                 }
                 kfree(adgl);
-                unlock_kernel();
+                mutex_unlock(&ac_mutex);
                 return -EINVAL;
         }
 
@@ -835,7 +837,7 @@ static long ac_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         }
         Dummy = readb(apbs[IndexCard].RamIO + VERS);
         kfree(adgl);
-        unlock_kernel();
+        mutex_unlock(&ac_mutex);
         return 0;
 }
 
diff --git a/drivers/char/bfin-otp.c b/drivers/char/bfin-otp.c
index 836d4f0a876f..44660f1c4849 100644
--- a/drivers/char/bfin-otp.c
+++ b/drivers/char/bfin-otp.c
@@ -222,6 +222,7 @@ static const struct file_operations bfin_otp_fops = {
         .unlocked_ioctl = bfin_otp_ioctl,
         .read           = bfin_otp_read,
         .write          = bfin_otp_write,
+        .llseek         = default_llseek,
 };
 
 static struct miscdevice bfin_otp_misc_device = {
diff --git a/drivers/char/bfin_jtag_comm.c b/drivers/char/bfin_jtag_comm.c
deleted file mode 100644
index e397df3ad98e..000000000000
--- a/drivers/char/bfin_jtag_comm.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * TTY over Blackfin JTAG Communication
- *
- * Copyright 2008-2009 Analog Devices Inc.
- *
- * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
- */
-
-#define DRV_NAME "bfin-jtag-comm"
-#define DEV_NAME "ttyBFJC"
-#define pr_fmt(fmt) DRV_NAME ": " fmt
-
-#include <linux/circ_buf.h>
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/kernel.h>
-#include <linux/kthread.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/tty.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <asm/atomic.h>
-
-#define pr_init(fmt, args...) ({ static const __initconst char __fmt[] = fmt; printk(__fmt, ## args); })
-
-/* See the Debug/Emulation chapter in the HRM */
-#define EMUDOF   0x00000001     /* EMUDAT_OUT full & valid */
-#define EMUDIF   0x00000002     /* EMUDAT_IN full & valid */
-#define EMUDOOVF 0x00000004     /* EMUDAT_OUT overflow */
-#define EMUDIOVF 0x00000008     /* EMUDAT_IN overflow */
-
-static inline uint32_t bfin_write_emudat(uint32_t emudat)
-{
-        __asm__ __volatile__("emudat = %0;" : : "d"(emudat));
-        return emudat;
-}
-
-static inline uint32_t bfin_read_emudat(void)
-{
-        uint32_t emudat;
-        __asm__ __volatile__("%0 = emudat;" : "=d"(emudat));
-        return emudat;
-}
-
-static inline uint32_t bfin_write_emudat_chars(char a, char b, char c, char d)
-{
-        return bfin_write_emudat((a << 0) | (b << 8) | (c << 16) | (d << 24));
-}
-
-#define CIRC_SIZE 2048  /* see comment in tty_io.c:do_tty_write() */
-#define CIRC_MASK (CIRC_SIZE - 1)
-#define circ_empty(circ)     ((circ)->head == (circ)->tail)
-#define circ_free(circ)      CIRC_SPACE((circ)->head, (circ)->tail, CIRC_SIZE)
-#define circ_cnt(circ)       CIRC_CNT((circ)->head, (circ)->tail, CIRC_SIZE)
-#define circ_byte(circ, idx) ((circ)->buf[(idx) & CIRC_MASK])
-
-static struct tty_driver *bfin_jc_driver;
-static struct task_struct *bfin_jc_kthread;
-static struct tty_struct * volatile bfin_jc_tty;
-static unsigned long bfin_jc_count;
-static DEFINE_MUTEX(bfin_jc_tty_mutex);
-static volatile struct circ_buf bfin_jc_write_buf;
-
-static int
-bfin_jc_emudat_manager(void *arg)
-{
-        uint32_t inbound_len = 0, outbound_len = 0;
-
-        while (!kthread_should_stop()) {
-                /* no one left to give data to, so sleep */
-                if (bfin_jc_tty == NULL && circ_empty(&bfin_jc_write_buf)) {
-                        pr_debug("waiting for readers\n");
-                        __set_current_state(TASK_UNINTERRUPTIBLE);
-                        schedule();
-                        __set_current_state(TASK_RUNNING);
-                }
-
-                /* no data available, so just chill */
-                if (!(bfin_read_DBGSTAT() & EMUDIF) && circ_empty(&bfin_jc_write_buf)) {
-                        pr_debug("waiting for data (in_len = %i) (circ: %i %i)\n",
-                                inbound_len, bfin_jc_write_buf.tail, bfin_jc_write_buf.head);
-                        if (inbound_len)
-                                schedule();
-                        else
-                                schedule_timeout_interruptible(HZ);
-                        continue;
-                }
-
-                /* if incoming data is ready, eat it */
-                if (bfin_read_DBGSTAT() & EMUDIF) {
-                        struct tty_struct *tty;
-                        mutex_lock(&bfin_jc_tty_mutex);
-                        tty = (struct tty_struct *)bfin_jc_tty;
-                        if (tty != NULL) {
-                                uint32_t emudat = bfin_read_emudat();
-                                if (inbound_len == 0) {
-                                        pr_debug("incoming length: 0x%08x\n", emudat);
-                                        inbound_len = emudat;
-                                } else {
-                                        size_t num_chars = (4 <= inbound_len ? 4 : inbound_len);
-                                        pr_debug("  incoming data: 0x%08x (pushing %zu)\n", emudat, num_chars);
-                                        inbound_len -= num_chars;
-                                        tty_insert_flip_string(tty, (unsigned char *)&emudat, num_chars);
-                                        tty_flip_buffer_push(tty);
-                                }
-                        }
-                        mutex_unlock(&bfin_jc_tty_mutex);
-                }
-
-                /* if outgoing data is ready, post it */
-                if (!(bfin_read_DBGSTAT() & EMUDOF) && !circ_empty(&bfin_jc_write_buf)) {
-                        if (outbound_len == 0) {
-                                outbound_len = circ_cnt(&bfin_jc_write_buf);
-                                bfin_write_emudat(outbound_len);
-                                pr_debug("outgoing length: 0x%08x\n", outbound_len);
-                        } else {
-                                struct tty_struct *tty;
-                                int tail = bfin_jc_write_buf.tail;
-                                size_t ate = (4 <= outbound_len ? 4 : outbound_len);
-                                uint32_t emudat =
-                                bfin_write_emudat_chars(
-                                        circ_byte(&bfin_jc_write_buf, tail + 0),
-                                        circ_byte(&bfin_jc_write_buf, tail + 1),
-                                        circ_byte(&bfin_jc_write_buf, tail + 2),
-                                        circ_byte(&bfin_jc_write_buf, tail + 3)
-                                );
-                                bfin_jc_write_buf.tail += ate;
-                                outbound_len -= ate;
-                                mutex_lock(&bfin_jc_tty_mutex);
-                                tty = (struct tty_struct *)bfin_jc_tty;
-                                if (tty)
-                                        tty_wakeup(tty);
-                                mutex_unlock(&bfin_jc_tty_mutex);
-                                pr_debug("  outgoing data: 0x%08x (pushing %zu)\n", emudat, ate);
-                        }
-                }
-        }
-
-        __set_current_state(TASK_RUNNING);
-        return 0;
-}
-
-static int
-bfin_jc_open(struct tty_struct *tty, struct file *filp)
-{
-        mutex_lock(&bfin_jc_tty_mutex);
-        pr_debug("open %lu\n", bfin_jc_count);
-        ++bfin_jc_count;
-        bfin_jc_tty = tty;
-        wake_up_process(bfin_jc_kthread);
-        mutex_unlock(&bfin_jc_tty_mutex);
-        return 0;
-}
-
-static void
-bfin_jc_close(struct tty_struct *tty, struct file *filp)
-{
-        mutex_lock(&bfin_jc_tty_mutex);
-        pr_debug("close %lu\n", bfin_jc_count);
-        if (--bfin_jc_count == 0)
-                bfin_jc_tty = NULL;
-        wake_up_process(bfin_jc_kthread);
-        mutex_unlock(&bfin_jc_tty_mutex);
-}
-
-/* XXX: we dont handle the put_char() case where we must handle count = 1 */
-static int
-bfin_jc_circ_write(const unsigned char *buf, int count)
-{
-        int i;
-        count = min(count, circ_free(&bfin_jc_write_buf));
-        pr_debug("going to write chunk of %i bytes\n", count);
-        for (i = 0; i < count; ++i)
-                circ_byte(&bfin_jc_write_buf, bfin_jc_write_buf.head + i) = buf[i];
-        bfin_jc_write_buf.head += i;
-        return i;
-}
-
-#ifndef CONFIG_BFIN_JTAG_COMM_CONSOLE
-# define acquire_console_sem()
-# define release_console_sem()
-#endif
-static int
-bfin_jc_write(struct tty_struct *tty, const unsigned char *buf, int count)
-{
-        int i;
-        acquire_console_sem();
-        i = bfin_jc_circ_write(buf, count);
-        release_console_sem();
-        wake_up_process(bfin_jc_kthread);
-        return i;
-}
-
-static void
-bfin_jc_flush_chars(struct tty_struct *tty)
-{
-        wake_up_process(bfin_jc_kthread);
-}
-
-static int
-bfin_jc_write_room(struct tty_struct *tty)
-{
-        return circ_free(&bfin_jc_write_buf);
-}
-
-static int
-bfin_jc_chars_in_buffer(struct tty_struct *tty)
-{
-        return circ_cnt(&bfin_jc_write_buf);
-}
-
-static void
-bfin_jc_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-        unsigned long expire = jiffies + timeout;
-        while (!circ_empty(&bfin_jc_write_buf)) {
-                if (signal_pending(current))
-                        break;
-                if (time_after(jiffies, expire))
-                        break;
-        }
-}
-
-static const struct tty_operations bfin_jc_ops = {
-        .open            = bfin_jc_open,
-        .close           = bfin_jc_close,
-        .write           = bfin_jc_write,
-        /*.put_char        = bfin_jc_put_char,*/
-        .flush_chars     = bfin_jc_flush_chars,
-        .write_room      = bfin_jc_write_room,
-        .chars_in_buffer = bfin_jc_chars_in_buffer,
-        .wait_until_sent = bfin_jc_wait_until_sent,
-};
-
-static int __init bfin_jc_init(void)
-{
-        int ret;
-
-        bfin_jc_kthread = kthread_create(bfin_jc_emudat_manager, NULL, DRV_NAME);
-        if (IS_ERR(bfin_jc_kthread))
-                return PTR_ERR(bfin_jc_kthread);
-
-        ret = -ENOMEM;
-
-        bfin_jc_write_buf.head = bfin_jc_write_buf.tail = 0;
-        bfin_jc_write_buf.buf = kmalloc(CIRC_SIZE, GFP_KERNEL);
-        if (!bfin_jc_write_buf.buf)
-                goto err;
-
-        bfin_jc_driver = alloc_tty_driver(1);
-        if (!bfin_jc_driver)
-                goto err;
-
-        bfin_jc_driver->owner        = THIS_MODULE;
-        bfin_jc_driver->driver_name  = DRV_NAME;
-        bfin_jc_driver->name         = DEV_NAME;
-        bfin_jc_driver->type         = TTY_DRIVER_TYPE_SERIAL;
-        bfin_jc_driver->subtype      = SERIAL_TYPE_NORMAL;
-        bfin_jc_driver->init_termios = tty_std_termios;
-        tty_set_operations(bfin_jc_driver, &bfin_jc_ops);
-
-        ret = tty_register_driver(bfin_jc_driver);
-        if (ret)
-                goto err;
-
-        pr_init(KERN_INFO DRV_NAME ": initialized\n");
-
-        return 0;
-
- err:
-        put_tty_driver(bfin_jc_driver);
-        kfree(bfin_jc_write_buf.buf);
-        kthread_stop(bfin_jc_kthread);
-        return ret;
-}
-module_init(bfin_jc_init);
-
-static void __exit bfin_jc_exit(void)
-{
-        kthread_stop(bfin_jc_kthread);
-        kfree(bfin_jc_write_buf.buf);
-        tty_unregister_driver(bfin_jc_driver);
-        put_tty_driver(bfin_jc_driver);
-}
-module_exit(bfin_jc_exit);
-
-#if defined(CONFIG_BFIN_JTAG_COMM_CONSOLE) || defined(CONFIG_EARLY_PRINTK)
-static void
-bfin_jc_straight_buffer_write(const char *buf, unsigned count)
-{
-        unsigned ate = 0;
-        while (bfin_read_DBGSTAT() & EMUDOF)
-                continue;
-        bfin_write_emudat(count);
-        while (ate < count) {
-                while (bfin_read_DBGSTAT() & EMUDOF)
-                        continue;
-                bfin_write_emudat_chars(buf[ate], buf[ate+1], buf[ate+2], buf[ate+3]);
-                ate += 4;
-        }
-}
-#endif
-
-#ifdef CONFIG_BFIN_JTAG_COMM_CONSOLE
-static void
-bfin_jc_console_write(struct console *co, const char *buf, unsigned count)
-{
-        if (bfin_jc_kthread == NULL)
-                bfin_jc_straight_buffer_write(buf, count);
-        else
-                bfin_jc_circ_write(buf, count);
-}
-
-static struct tty_driver *
-bfin_jc_console_device(struct console *co, int *index)
-{
-        *index = co->index;
-        return bfin_jc_driver;
-}
-
-static struct console bfin_jc_console = {
-        .name    = DEV_NAME,
-        .write   = bfin_jc_console_write,
-        .device  = bfin_jc_console_device,
-        .flags   = CON_ANYTIME | CON_PRINTBUFFER,
-        .index   = -1,
-};
-
-static int __init bfin_jc_console_init(void)
-{
-        register_console(&bfin_jc_console);
-        return 0;
-}
-console_initcall(bfin_jc_console_init);
-#endif
-
-#ifdef CONFIG_EARLY_PRINTK
-static void __init
-bfin_jc_early_write(struct console *co, const char *buf, unsigned int count)
-{
-        bfin_jc_straight_buffer_write(buf, count);
-}
-
-static struct __initdata console bfin_jc_early_console = {
-        .name   = "early_BFJC",
-        .write   = bfin_jc_early_write,
-        .flags   = CON_ANYTIME | CON_PRINTBUFFER,
-        .index   = -1,
-};
-
-struct console * __init
-bfin_jc_early_init(unsigned int port, unsigned int cflag)
-{
-        return &bfin_jc_early_console;
-}
-#endif
-
-MODULE_AUTHOR("Mike Frysinger <vapier@gentoo.org>");
-MODULE_DESCRIPTION("TTY over Blackfin JTAG Communication");
-MODULE_LICENSE("GPL");
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
index d5fa113afe37..095ab90535ce 100644
--- a/drivers/char/briq_panel.c
+++ b/drivers/char/briq_panel.c
@@ -6,7 +6,6 @@
 
 #include <linux/module.h>
 
-#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/tty.h>
@@ -186,6 +185,7 @@ static const struct file_operations briq_panel_fops = {
         .write          = briq_panel_write,
         .open           = briq_panel_open,
         .release        = briq_panel_release,
+        .llseek         = noop_llseek,
 };
 
 static struct miscdevice briq_panel_miscdev = {
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 91917133ae0a..cf39bc08ce08 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -155,6 +155,7 @@ static const struct file_operations bsr_fops = {
         .owner = THIS_MODULE,
         .mmap  = bsr_mmap,
         .open  = bsr_open,
+        .llseek = noop_llseek,
 };
 
 static void bsr_cleanup_devs(void)
@@ -294,7 +295,7 @@ static int bsr_create_devs(struct device_node *bn)
 static int __init bsr_init(void)
 {
         struct device_node *np;
-        dev_t bsr_dev = MKDEV(bsr_major, 0);
+        dev_t bsr_dev;
         int ret = -ENODEV;
         int result;
 
diff --git a/drivers/char/cd1865.h b/drivers/char/cd1865.h
deleted file mode 100644
index 9940966e7a1d..000000000000
--- a/drivers/char/cd1865.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- *      linux/drivers/char/cd1865.h -- Definitions relating to the CD1865
- *                          for the Specialix IO8+ multiport serial driver.
- *
- *      Copyright (C) 1997 Roger Wolff (R.E.Wolff@BitWizard.nl)
- *      Copyright (C) 1994-1996  Dmitry Gorodchanin (pgmdsg@ibi.com)
- *
- *      Specialix pays for the development and support of this driver.
- *      Please DO contact io8-linux@specialix.co.uk if you require
- *      support.
- *
- *      This driver was developped in the BitWizard linux device
- *      driver service. If you require a linux device driver for your
- *      product, please contact devices@BitWizard.nl for a quote.
- *
- */
-
-/*
- * Definitions for Driving CD180/CD1864/CD1865 based eightport serial cards.
- */
-
-
-/* Values of choice for Interrupt ACKs */
-/* These values are "obligatory" if you use the register based
- * interrupt acknowledgements. See page 99-101 of V2.0 of the CD1865
- * databook */
-#define SX_ACK_MINT     0x75    /* goes to PILR1                           */
-#define SX_ACK_TINT     0x76    /* goes to PILR2                           */
-#define SX_ACK_RINT     0x77    /* goes to PILR3                           */
-
-/* Chip ID (is used when chips ar daisy chained.) */
-#define SX_ID           0x10
-
-/* Definitions for Cirrus Logic CL-CD186x 8-port async mux chip */
- 
-#define CD186x_NCH       8       /* Total number of channels                */
-#define CD186x_TPC       16      /* Ticks per character                     */
-#define CD186x_NFIFO     8       /* TX FIFO size                            */
-
-
-/* Global registers */
-
-#define CD186x_GIVR      0x40    /* Global Interrupt Vector Register        */
-#define CD186x_GICR      0x41    /* Global Interrupting Channel Register    */
-#define CD186x_PILR1     0x61    /* Priority Interrupt Level Register 1     */
-#define CD186x_PILR2     0x62    /* Priority Interrupt Level Register 2     */
-#define CD186x_PILR3     0x63    /* Priority Interrupt Level Register 3     */
-#define CD186x_CAR       0x64    /* Channel Access Register                 */
-#define CD186x_SRSR      0x65    /* Channel Access Register                 */
-#define CD186x_GFRCR     0x6b    /* Global Firmware Revision Code Register  */
-#define CD186x_PPRH      0x70    /* Prescaler Period Register High          */
-#define CD186x_PPRL      0x71    /* Prescaler Period Register Low           */
-#define CD186x_RDR       0x78    /* Receiver Data Register                  */
-#define CD186x_RCSR      0x7a    /* Receiver Character Status Register      */
-#define CD186x_TDR       0x7b    /* Transmit Data Register                  */
-#define CD186x_EOIR      0x7f    /* End of Interrupt Register               */
-#define CD186x_MRAR      0x75    /* Modem Request Acknowledge register       */
-#define CD186x_TRAR      0x76    /* Transmit Request Acknowledge register    */
-#define CD186x_RRAR      0x77    /* Receive Request Acknowledge register     */
-#define CD186x_SRCR      0x66    /* Service Request Configuration register  */
-
-/* Channel Registers */
-
-#define CD186x_CCR       0x01    /* Channel Command Register                */
-#define CD186x_IER       0x02    /* Interrupt Enable Register               */
-#define CD186x_COR1      0x03    /* Channel Option Register 1               */
-#define CD186x_COR2      0x04    /* Channel Option Register 2               */
-#define CD186x_COR3      0x05    /* Channel Option Register 3               */
-#define CD186x_CCSR      0x06    /* Channel Control Status Register         */
-#define CD186x_RDCR      0x07    /* Receive Data Count Register             */
-#define CD186x_SCHR1     0x09    /* Special Character Register 1            */
-#define CD186x_SCHR2     0x0a    /* Special Character Register 2            */
-#define CD186x_SCHR3     0x0b    /* Special Character Register 3            */
-#define CD186x_SCHR4     0x0c    /* Special Character Register 4            */
-#define CD186x_MCOR1     0x10    /* Modem Change Option 1 Register          */
-#define CD186x_MCOR2     0x11    /* Modem Change Option 2 Register          */
-#define CD186x_MCR       0x12    /* Modem Change Register                   */
-#define CD186x_RTPR      0x18    /* Receive Timeout Period Register         */
-#define CD186x_MSVR      0x28    /* Modem Signal Value Register             */
-#define CD186x_MSVRTS    0x29    /* Modem Signal Value Register             */
-#define CD186x_MSVDTR    0x2a    /* Modem Signal Value Register             */
-#define CD186x_RBPRH     0x31    /* Receive Baud Rate Period Register High  */
-#define CD186x_RBPRL     0x32    /* Receive Baud Rate Period Register Low   */
-#define CD186x_TBPRH     0x39    /* Transmit Baud Rate Period Register High */
-#define CD186x_TBPRL     0x3a    /* Transmit Baud Rate Period Register Low  */
-
-
-/* Global Interrupt Vector Register (R/W) */
-
-#define GIVR_ITMASK     0x07     /* Interrupt type mask                     */
-#define  GIVR_IT_MODEM   0x01    /* Modem Signal Change Interrupt           */
-#define  GIVR_IT_TX      0x02    /* Transmit Data Interrupt                 */
-#define  GIVR_IT_RCV     0x03    /* Receive Good Data Interrupt             */
-#define  GIVR_IT_REXC    0x07    /* Receive Exception Interrupt             */
-
-
-/* Global Interrupt Channel Register (R/W) */
- 
-#define GICR_CHAN       0x1c    /* Channel Number Mask                     */
-#define GICR_CHAN_OFF   2       /* Channel Number shift                    */
-
-
-/* Channel Address Register (R/W) */
-
-#define CAR_CHAN        0x07    /* Channel Number Mask                     */
-#define CAR_A7          0x08    /* A7 Address Extension (unused)           */
-
-
-/* Receive Character Status Register (R/O) */
-
-#define RCSR_TOUT       0x80    /* Rx Timeout                              */
-#define RCSR_SCDET      0x70    /* Special Character Detected Mask         */
-#define  RCSR_NO_SC      0x00   /* No Special Characters Detected          */
-#define  RCSR_SC_1       0x10   /* Special Char 1 (or 1 & 3) Detected      */
-#define  RCSR_SC_2       0x20   /* Special Char 2 (or 2 & 4) Detected      */
-#define  RCSR_SC_3       0x30   /* Special Char 3 Detected                 */
-#define  RCSR_SC_4       0x40   /* Special Char 4 Detected                 */
-#define RCSR_BREAK      0x08    /* Break has been detected                 */
-#define RCSR_PE         0x04    /* Parity Error                            */
-#define RCSR_FE         0x02    /* Frame Error                             */
-#define RCSR_OE         0x01    /* Overrun Error                           */
-
-
-/* Channel Command Register (R/W) (commands in groups can be OR-ed) */
-
-#define CCR_HARDRESET   0x81    /* Reset the chip                          */
-
-#define CCR_SOFTRESET   0x80    /* Soft Channel Reset                      */
-
-#define CCR_CORCHG1     0x42    /* Channel Option Register 1 Changed       */
-#define CCR_CORCHG2     0x44    /* Channel Option Register 2 Changed       */
-#define CCR_CORCHG3     0x48    /* Channel Option Register 3 Changed       */
-
-#define CCR_SSCH1       0x21    /* Send Special Character 1                */
-
-#define CCR_SSCH2       0x22    /* Send Special Character 2                */
-
-#define CCR_SSCH3       0x23    /* Send Special Character 3                */
-
-#define CCR_SSCH4       0x24    /* Send Special Character 4                */
-
-#define CCR_TXEN        0x18    /* Enable Transmitter                      */
-#define CCR_RXEN        0x12    /* Enable Receiver                         */
-
-#define CCR_TXDIS       0x14    /* Disable Transmitter                     */
-#define CCR_RXDIS       0x11    /* Disable Receiver                        */
-
-
-/* Interrupt Enable Register (R/W) */
-
-#define IER_DSR         0x80    /* Enable interrupt on DSR change          */
-#define IER_CD          0x40    /* Enable interrupt on CD change           */
-#define IER_CTS         0x20    /* Enable interrupt on CTS change          */
-#define IER_RXD         0x10    /* Enable interrupt on Receive Data        */
-#define IER_RXSC        0x08    /* Enable interrupt on Receive Spec. Char  */
-#define IER_TXRDY       0x04    /* Enable interrupt on TX FIFO empty       */
-#define IER_TXEMPTY     0x02    /* Enable interrupt on TX completely empty */
-#define IER_RET         0x01    /* Enable interrupt on RX Exc. Timeout     */
-
-
-/* Channel Option Register 1 (R/W) */
-
-#define COR1_ODDP       0x80    /* Odd Parity                              */
-#define COR1_PARMODE    0x60    /* Parity Mode mask                        */
-#define  COR1_NOPAR      0x00   /* No Parity                               */
-#define  COR1_FORCEPAR   0x20   /* Force Parity                            */
-#define  COR1_NORMPAR    0x40   /* Normal Parity                           */
-#define COR1_IGNORE     0x10    /* Ignore Parity on RX                     */
-#define COR1_STOPBITS   0x0c    /* Number of Stop Bits                     */
-#define  COR1_1SB        0x00   /* 1 Stop Bit                              */
-#define  COR1_15SB       0x04   /* 1.5 Stop Bits                           */
-#define  COR1_2SB        0x08   /* 2 Stop Bits                             */
-#define COR1_CHARLEN    0x03    /* Character Length                        */
-#define  COR1_5BITS      0x00   /* 5 bits                                  */
-#define  COR1_6BITS      0x01   /* 6 bits                                  */
-#define  COR1_7BITS      0x02   /* 7 bits                                  */
-#define  COR1_8BITS      0x03   /* 8 bits                                  */
-
-
-/* Channel Option Register 2 (R/W) */
-
-#define COR2_IXM        0x80    /* Implied XON mode                        */
-#define COR2_TXIBE      0x40    /* Enable In-Band (XON/XOFF) Flow Control  */
-#define COR2_ETC        0x20    /* Embedded Tx Commands Enable             */
-#define COR2_LLM        0x10    /* Local Loopback Mode                     */
-#define COR2_RLM        0x08    /* Remote Loopback Mode                    */
-#define COR2_RTSAO      0x04    /* RTS Automatic Output Enable             */
-#define COR2_CTSAE      0x02    /* CTS Automatic Enable                    */
-#define COR2_DSRAE      0x01    /* DSR Automatic Enable                    */
-
-
-/* Channel Option Register 3 (R/W) */
-
-#define COR3_XONCH      0x80    /* XON is a pair of characters (1 & 3)     */
-#define COR3_XOFFCH     0x40    /* XOFF is a pair of characters (2 & 4)    */
-#define COR3_FCT        0x20    /* Flow-Control Transparency Mode          */
-#define COR3_SCDE       0x10    /* Special Character Detection Enable      */
-#define COR3_RXTH       0x0f    /* RX FIFO Threshold value (1-8)           */
-
-
-/* Channel Control Status Register (R/O) */
-
-#define CCSR_RXEN       0x80    /* Receiver Enabled                        */
-#define CCSR_RXFLOFF    0x40    /* Receive Flow Off (XOFF was sent)        */
-#define CCSR_RXFLON     0x20    /* Receive Flow On (XON was sent)          */
-#define CCSR_TXEN       0x08    /* Transmitter Enabled                     */
-#define CCSR_TXFLOFF    0x04    /* Transmit Flow Off (got XOFF)            */
-#define CCSR_TXFLON     0x02    /* Transmit Flow On (got XON)              */
-
-
-/* Modem Change Option Register 1 (R/W) */
-
-#define MCOR1_DSRZD     0x80    /* Detect 0->1 transition of DSR           */
-#define MCOR1_CDZD      0x40    /* Detect 0->1 transition of CD            */
-#define MCOR1_CTSZD     0x20    /* Detect 0->1 transition of CTS           */
-#define MCOR1_DTRTH     0x0f    /* Auto DTR flow control Threshold (1-8)   */
-#define  MCOR1_NODTRFC   0x0     /* Automatic DTR flow control disabled     */
-
-
-/* Modem Change Option Register 2 (R/W) */
-
-#define MCOR2_DSROD     0x80    /* Detect 1->0 transition of DSR           */
-#define MCOR2_CDOD      0x40    /* Detect 1->0 transition of CD            */
-#define MCOR2_CTSOD     0x20    /* Detect 1->0 transition of CTS           */
-
-/* Modem Change Register (R/W) */
-
-#define MCR_DSRCHG      0x80    /* DSR Changed                             */
-#define MCR_CDCHG       0x40    /* CD Changed                              */
-#define MCR_CTSCHG      0x20    /* CTS Changed                             */
-
-
-/* Modem Signal Value Register (R/W) */
-
-#define MSVR_DSR        0x80    /* Current state of DSR input              */
-#define MSVR_CD         0x40    /* Current state of CD input               */
-#define MSVR_CTS        0x20    /* Current state of CTS input              */
-#define MSVR_DTR        0x02    /* Current state of DTR output             */
-#define MSVR_RTS        0x01    /* Current state of RTS output             */
-
-
-/* Escape characters */
-
-#define CD186x_C_ESC     0x00    /* Escape character                        */
-#define CD186x_C_SBRK    0x81    /* Start sending BREAK                     */
-#define CD186x_C_DELAY   0x82    /* Delay output                            */
-#define CD186x_C_EBRK    0x83    /* Stop sending BREAK                      */
-
-#define SRSR_RREQint     0x10    /* This chip wants "rec" serviced          */
-#define SRSR_TREQint     0x04    /* This chip wants "transmit" serviced     */
-#define SRSR_MREQint     0x01    /* This chip wants "mdm change" serviced   */
-
-
-
-#define SRCR_PKGTYPE    0x80
-#define SRCR_REGACKEN   0x40
-#define SRCR_DAISYEN    0x20
-#define SRCR_GLOBPRI    0x10
-#define SRCR_UNFAIR     0x08
-#define SRCR_AUTOPRI    0x02
-#define SRCR_PRISEL     0x01
-
-
diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c
deleted file mode 100644
index 45d3e80156d4..000000000000
--- a/drivers/char/consolemap.c
+++ /dev/null
@@ -1,745 +0,0 @@
-/*
- * consolemap.c
- *
- * Mapping from internal code (such as Latin-1 or Unicode or IBM PC code)
- * to font positions.
- *
- * aeb, 950210
- *
- * Support for multiple unimaps by Jakub Jelinek <jj@ultra.linux.cz>, July 1998
- *
- * Fix bug in inverse translation. Stanislav Voronyi <stas@cnti.uanet.kharkov.ua>, Dec 1998
- */
-
-#include <linux/module.h>
-#include <linux/kd.h>
-#include <linux/errno.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/tty.h>
-#include <asm/uaccess.h>
-#include <linux/consolemap.h>
-#include <linux/vt_kern.h>
-
-static unsigned short translations[][256] = {
-  /* 8-bit Latin-1 mapped to Unicode -- trivial mapping */
-  {
-    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
-    0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
-    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
-    0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
-    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
-    0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
-    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
-    0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
-    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047,
-    0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
-    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
-    0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
-    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
-    0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
-    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
-    0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
-    0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7,
-    0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
-    0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7,
-    0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf,
-    0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7,
-    0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
-    0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7,
-    0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df,
-    0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7,
-    0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
-    0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7,
-    0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff
-  }, 
-  /* VT100 graphics mapped to Unicode */
-  {
-    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
-    0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
-    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
-    0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
-    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
-    0x0028, 0x0029, 0x002a, 0x2192, 0x2190, 0x2191, 0x2193, 0x002f,
-    0x2588, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
-    0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
-    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047,
-    0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
-    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
-    0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x00a0,
-    0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1,
-    0x2591, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba,
-    0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c,
-    0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 0x007f,
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
-    0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7,
-    0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
-    0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7,
-    0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf,
-    0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7,
-    0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
-    0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7,
-    0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df,
-    0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7,
-    0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
-    0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7,
-    0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff
-  },
-  /* IBM Codepage 437 mapped to Unicode */
-  {
-    0x0000, 0x263a, 0x263b, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022, 
-    0x25d8, 0x25cb, 0x25d9, 0x2642, 0x2640, 0x266a, 0x266b, 0x263c,
-    0x25b6, 0x25c0, 0x2195, 0x203c, 0x00b6, 0x00a7, 0x25ac, 0x21a8,
-    0x2191, 0x2193, 0x2192, 0x2190, 0x221f, 0x2194, 0x25b2, 0x25bc,
-    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
-    0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
-    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
-    0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
-    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047,
-    0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
-    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
-    0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
-    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
-    0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
-    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
-    0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x2302,
-    0x00c7, 0x00fc, 0x00e9, 0x00e2, 0x00e4, 0x00e0, 0x00e5, 0x00e7,
-    0x00ea, 0x00eb, 0x00e8, 0x00ef, 0x00ee, 0x00ec, 0x00c4, 0x00c5,
-    0x00c9, 0x00e6, 0x00c6, 0x00f4, 0x00f6, 0x00f2, 0x00fb, 0x00f9,
-    0x00ff, 0x00d6, 0x00dc, 0x00a2, 0x00a3, 0x00a5, 0x20a7, 0x0192,
-    0x00e1, 0x00ed, 0x00f3, 0x00fa, 0x00f1, 0x00d1, 0x00aa, 0x00ba,
-    0x00bf, 0x2310, 0x00ac, 0x00bd, 0x00bc, 0x00a1, 0x00ab, 0x00bb,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510,
-    0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f,
-    0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b,
-    0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580,
-    0x03b1, 0x00df, 0x0393, 0x03c0, 0x03a3, 0x03c3, 0x00b5, 0x03c4,
-    0x03a6, 0x0398, 0x03a9, 0x03b4, 0x221e, 0x03c6, 0x03b5, 0x2229,
-    0x2261, 0x00b1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00f7, 0x2248,
-    0x00b0, 0x2219, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x25a0, 0x00a0
-  }, 
-  /* User mapping -- default to codes for direct font mapping */
-  {
-    0xf000, 0xf001, 0xf002, 0xf003, 0xf004, 0xf005, 0xf006, 0xf007,
-    0xf008, 0xf009, 0xf00a, 0xf00b, 0xf00c, 0xf00d, 0xf00e, 0xf00f,
-    0xf010, 0xf011, 0xf012, 0xf013, 0xf014, 0xf015, 0xf016, 0xf017,
-    0xf018, 0xf019, 0xf01a, 0xf01b, 0xf01c, 0xf01d, 0xf01e, 0xf01f,
-    0xf020, 0xf021, 0xf022, 0xf023, 0xf024, 0xf025, 0xf026, 0xf027,
-    0xf028, 0xf029, 0xf02a, 0xf02b, 0xf02c, 0xf02d, 0xf02e, 0xf02f,
-    0xf030, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, 0xf036, 0xf037,
-    0xf038, 0xf039, 0xf03a, 0xf03b, 0xf03c, 0xf03d, 0xf03e, 0xf03f,
-    0xf040, 0xf041, 0xf042, 0xf043, 0xf044, 0xf045, 0xf046, 0xf047,
-    0xf048, 0xf049, 0xf04a, 0xf04b, 0xf04c, 0xf04d, 0xf04e, 0xf04f,
-    0xf050, 0xf051, 0xf052, 0xf053, 0xf054, 0xf055, 0xf056, 0xf057,
-    0xf058, 0xf059, 0xf05a, 0xf05b, 0xf05c, 0xf05d, 0xf05e, 0xf05f,
-    0xf060, 0xf061, 0xf062, 0xf063, 0xf064, 0xf065, 0xf066, 0xf067,
-    0xf068, 0xf069, 0xf06a, 0xf06b, 0xf06c, 0xf06d, 0xf06e, 0xf06f,
-    0xf070, 0xf071, 0xf072, 0xf073, 0xf074, 0xf075, 0xf076, 0xf077,
-    0xf078, 0xf079, 0xf07a, 0xf07b, 0xf07c, 0xf07d, 0xf07e, 0xf07f,
-    0xf080, 0xf081, 0xf082, 0xf083, 0xf084, 0xf085, 0xf086, 0xf087,
-    0xf088, 0xf089, 0xf08a, 0xf08b, 0xf08c, 0xf08d, 0xf08e, 0xf08f,
-    0xf090, 0xf091, 0xf092, 0xf093, 0xf094, 0xf095, 0xf096, 0xf097,
-    0xf098, 0xf099, 0xf09a, 0xf09b, 0xf09c, 0xf09d, 0xf09e, 0xf09f,
-    0xf0a0, 0xf0a1, 0xf0a2, 0xf0a3, 0xf0a4, 0xf0a5, 0xf0a6, 0xf0a7,
-    0xf0a8, 0xf0a9, 0xf0aa, 0xf0ab, 0xf0ac, 0xf0ad, 0xf0ae, 0xf0af,
-    0xf0b0, 0xf0b1, 0xf0b2, 0xf0b3, 0xf0b4, 0xf0b5, 0xf0b6, 0xf0b7,
-    0xf0b8, 0xf0b9, 0xf0ba, 0xf0bb, 0xf0bc, 0xf0bd, 0xf0be, 0xf0bf,
-    0xf0c0, 0xf0c1, 0xf0c2, 0xf0c3, 0xf0c4, 0xf0c5, 0xf0c6, 0xf0c7,
-    0xf0c8, 0xf0c9, 0xf0ca, 0xf0cb, 0xf0cc, 0xf0cd, 0xf0ce, 0xf0cf,
-    0xf0d0, 0xf0d1, 0xf0d2, 0xf0d3, 0xf0d4, 0xf0d5, 0xf0d6, 0xf0d7,
-    0xf0d8, 0xf0d9, 0xf0da, 0xf0db, 0xf0dc, 0xf0dd, 0xf0de, 0xf0df,
-    0xf0e0, 0xf0e1, 0xf0e2, 0xf0e3, 0xf0e4, 0xf0e5, 0xf0e6, 0xf0e7,
-    0xf0e8, 0xf0e9, 0xf0ea, 0xf0eb, 0xf0ec, 0xf0ed, 0xf0ee, 0xf0ef,
-    0xf0f0, 0xf0f1, 0xf0f2, 0xf0f3, 0xf0f4, 0xf0f5, 0xf0f6, 0xf0f7,
-    0xf0f8, 0xf0f9, 0xf0fa, 0xf0fb, 0xf0fc, 0xf0fd, 0xf0fe, 0xf0ff
-  }
-};
-
-/* The standard kernel character-to-font mappings are not invertible
-   -- this is just a best effort. */
-
-#define MAX_GLYPH 512           /* Max possible glyph value */
-
-static int inv_translate[MAX_NR_CONSOLES];
-
-struct uni_pagedir {
-        u16             **uni_pgdir[32];
-        unsigned long   refcount;
-        unsigned long   sum;
-        unsigned char   *inverse_translations[4];
-        u16             *inverse_trans_unicode;
-        int             readonly;
-};
-
-static struct uni_pagedir *dflt;
-
-static void set_inverse_transl(struct vc_data *conp, struct uni_pagedir *p, int i)
-{
-        int j, glyph;
-        unsigned short *t = translations[i];
-        unsigned char *q;
-        
-        if (!p) return;
-        q = p->inverse_translations[i];
-
-        if (!q) {
-                q = p->inverse_translations[i] = (unsigned char *) 
-                        kmalloc(MAX_GLYPH, GFP_KERNEL);
-                if (!q) return;
-        }
-        memset(q, 0, MAX_GLYPH);
-
-        for (j = 0; j < E_TABSZ; j++) {
-                glyph = conv_uni_to_pc(conp, t[j]);
-                if (glyph >= 0 && glyph < MAX_GLYPH && q[glyph] < 32) {
-                        /* prefer '-' above SHY etc. */
-                        q[glyph] = j;
-                }
-        }
-}
-
-static void set_inverse_trans_unicode(struct vc_data *conp,
-                                      struct uni_pagedir *p)
-{
-        int i, j, k, glyph;
-        u16 **p1, *p2;
-        u16 *q;
-
-        if (!p) return;
-        q = p->inverse_trans_unicode;
-        if (!q) {
-                q = p->inverse_trans_unicode =
-                        kmalloc(MAX_GLYPH * sizeof(u16), GFP_KERNEL);
-                if (!q)
-                        return;
-        }
-        memset(q, 0, MAX_GLYPH * sizeof(u16));
-
-        for (i = 0; i < 32; i++) {
-                p1 = p->uni_pgdir[i];
-                if (!p1)
-                        continue;
-                for (j = 0; j < 32; j++) {
-                        p2 = p1[j];
-                        if (!p2)
-                                continue;
-                        for (k = 0; k < 64; k++) {
-                                glyph = p2[k];
-                                if (glyph >= 0 && glyph < MAX_GLYPH
-                                               && q[glyph] < 32)
-                                        q[glyph] = (i << 11) + (j << 6) + k;
-                        }
-                }
-        }
-}
-
-unsigned short *set_translate(int m, struct vc_data *vc)
-{
-        inv_translate[vc->vc_num] = m;
-        return translations[m];
-}
-
-/*
- * Inverse translation is impossible for several reasons:
- * 1. The font<->character maps are not 1-1.
- * 2. The text may have been written while a different translation map
- *    was active.
- * Still, it is now possible to a certain extent to cut and paste non-ASCII.
- */
-u16 inverse_translate(struct vc_data *conp, int glyph, int use_unicode)
-{
-        struct uni_pagedir *p;
-        int m;
-        if (glyph < 0 || glyph >= MAX_GLYPH)
-                return 0;
-        else if (!(p = (struct uni_pagedir *)*conp->vc_uni_pagedir_loc))
-                return glyph;
-        else if (use_unicode) {
-                if (!p->inverse_trans_unicode)
-                        return glyph;
-                else
-                        return p->inverse_trans_unicode[glyph];
-        } else {
-                m = inv_translate[conp->vc_num];
-                if (!p->inverse_translations[m])
-                        return glyph;
-                else
-                        return p->inverse_translations[m][glyph];
-        }
-}
-EXPORT_SYMBOL_GPL(inverse_translate);
-
-static void update_user_maps(void)
-{
-        int i;
-        struct uni_pagedir *p, *q = NULL;
-        
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
-                if (!vc_cons_allocated(i))
-                        continue;
-                p = (struct uni_pagedir *)*vc_cons[i].d->vc_uni_pagedir_loc;
-                if (p && p != q) {
-                        set_inverse_transl(vc_cons[i].d, p, USER_MAP);
-                        set_inverse_trans_unicode(vc_cons[i].d, p);
-                        q = p;
-                }
-        }
-}
-
-/*
- * Load customizable translation table
- * arg points to a 256 byte translation table.
- *
- * The "old" variants are for translation directly to font (using the
- * 0xf000-0xf0ff "transparent" Unicodes) whereas the "new" variants set
- * Unicodes explicitly.
- */
-int con_set_trans_old(unsigned char __user * arg)
-{
-        int i;
-        unsigned short *p = translations[USER_MAP];
-
-        if (!access_ok(VERIFY_READ, arg, E_TABSZ))
-                return -EFAULT;
-
-        for (i=0; i<E_TABSZ ; i++) {
-                unsigned char uc;
-                __get_user(uc, arg+i);
-                p[i] = UNI_DIRECT_BASE | uc;
-        }
-
-        update_user_maps();
-        return 0;
-}
-
-int con_get_trans_old(unsigned char __user * arg)
-{
-        int i, ch;
-        unsigned short *p = translations[USER_MAP];
-
-        if (!access_ok(VERIFY_WRITE, arg, E_TABSZ))
-                return -EFAULT;
-
-        for (i=0; i<E_TABSZ ; i++)
-          {
-            ch = conv_uni_to_pc(vc_cons[fg_console].d, p[i]);
-            __put_user((ch & ~0xff) ? 0 : ch, arg+i);
-          }
-        return 0;
-}
-
-int con_set_trans_new(ushort __user * arg)
-{
-        int i;
-        unsigned short *p = translations[USER_MAP];
-
-        if (!access_ok(VERIFY_READ, arg, E_TABSZ*sizeof(unsigned short)))
-                return -EFAULT;
-
-        for (i=0; i<E_TABSZ ; i++) {
-                unsigned short us;
-                __get_user(us, arg+i);
-                p[i] = us;
-        }
-
-        update_user_maps();
-        return 0;
-}
-
-int con_get_trans_new(ushort __user * arg)
-{
-        int i;
-        unsigned short *p = translations[USER_MAP];
-
-        if (!access_ok(VERIFY_WRITE, arg, E_TABSZ*sizeof(unsigned short)))
-                return -EFAULT;
-
-        for (i=0; i<E_TABSZ ; i++)
-          __put_user(p[i], arg+i);
-        
-        return 0;
-}
-
-/*
- * Unicode -> current font conversion 
- *
- * A font has at most 512 chars, usually 256.
- * But one font position may represent several Unicode chars.
- * A hashtable is somewhat of a pain to deal with, so use a
- * "paged table" instead.  Simulation has shown the memory cost of
- * this 3-level paged table scheme to be comparable to a hash table.
- */
-
-extern u8 dfont_unicount[];     /* Defined in console_defmap.c */
-extern u16 dfont_unitable[];
-
-static void con_release_unimap(struct uni_pagedir *p)
-{
-        u16 **p1;
-        int i, j;
-
-        if (p == dflt) dflt = NULL;  
-        for (i = 0; i < 32; i++) {
-                if ((p1 = p->uni_pgdir[i]) != NULL) {
-                        for (j = 0; j < 32; j++)
-                                kfree(p1[j]);
-                        kfree(p1);
-                }
-                p->uni_pgdir[i] = NULL;
-        }
-        for (i = 0; i < 4; i++) {
-                kfree(p->inverse_translations[i]);
-                p->inverse_translations[i] = NULL;
-        }
-        if (p->inverse_trans_unicode) {
-                kfree(p->inverse_trans_unicode);
-                p->inverse_trans_unicode = NULL;
-        }
-}
-
-void con_free_unimap(struct vc_data *vc)
-{
-        struct uni_pagedir *p;
-
-        p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-        if (!p)
-                return;
-        *vc->vc_uni_pagedir_loc = 0;
-        if (--p->refcount)
-                return;
-        con_release_unimap(p);
-        kfree(p);
-}
-  
-static int con_unify_unimap(struct vc_data *conp, struct uni_pagedir *p)
-{
-        int i, j, k;
-        struct uni_pagedir *q;
-        
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
-                if (!vc_cons_allocated(i))
-                        continue;
-                q = (struct uni_pagedir *)*vc_cons[i].d->vc_uni_pagedir_loc;
-                if (!q || q == p || q->sum != p->sum)
-                        continue;
-                for (j = 0; j < 32; j++) {
-                        u16 **p1, **q1;
-                        p1 = p->uni_pgdir[j]; q1 = q->uni_pgdir[j];
-                        if (!p1 && !q1)
-                                continue;
-                        if (!p1 || !q1)
-                                break;
-                        for (k = 0; k < 32; k++) {
-                                if (!p1[k] && !q1[k])
-                                        continue;
-                                if (!p1[k] || !q1[k])
-                                        break;
-                                if (memcmp(p1[k], q1[k], 64*sizeof(u16)))
-                                        break;
-                        }
-                        if (k < 32)
-                                break;
-                }
-                if (j == 32) {
-                        q->refcount++;
-                        *conp->vc_uni_pagedir_loc = (unsigned long)q;
-                        con_release_unimap(p);
-                        kfree(p);
-                        return 1;
-                }
-        }
-        return 0;
-}
-
-static int
-con_insert_unipair(struct uni_pagedir *p, u_short unicode, u_short fontpos)
-{
-        int i, n;
-        u16 **p1, *p2;
-
-        if (!(p1 = p->uni_pgdir[n = unicode >> 11])) {
-                p1 = p->uni_pgdir[n] = kmalloc(32*sizeof(u16 *), GFP_KERNEL);
-                if (!p1) return -ENOMEM;
-                for (i = 0; i < 32; i++)
-                        p1[i] = NULL;
-        }
-
-        if (!(p2 = p1[n = (unicode >> 6) & 0x1f])) {
-                p2 = p1[n] = kmalloc(64*sizeof(u16), GFP_KERNEL);
-                if (!p2) return -ENOMEM;
-                memset(p2, 0xff, 64*sizeof(u16)); /* No glyphs for the characters (yet) */
-        }
-
-        p2[unicode & 0x3f] = fontpos;
-        
-        p->sum += (fontpos << 20) + unicode;
-
-        return 0;
-}
-
-/* ui is a leftover from using a hashtable, but might be used again */
-int con_clear_unimap(struct vc_data *vc, struct unimapinit *ui)
-{
-        struct uni_pagedir *p, *q;
-  
-        p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-        if (p && p->readonly) return -EIO;
-        if (!p || --p->refcount) {
-                q = kzalloc(sizeof(*p), GFP_KERNEL);
-                if (!q) {
-                        if (p) p->refcount++;
-                        return -ENOMEM;
-                }
-                q->refcount=1;
-                *vc->vc_uni_pagedir_loc = (unsigned long)q;
-        } else {
-                if (p == dflt) dflt = NULL;
-                p->refcount++;
-                p->sum = 0;
-                con_release_unimap(p);
-        }
-        return 0;
-}
-
-int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list)
-{
-        int err = 0, err1, i;
-        struct uni_pagedir *p, *q;
-
-        p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-        if (p->readonly) return -EIO;
-        
-        if (!ct) return 0;
-        
-        if (p->refcount > 1) {
-                int j, k;
-                u16 **p1, *p2, l;
-                
-                err1 = con_clear_unimap(vc, NULL);
-                if (err1) return err1;
-                
-                q = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-                for (i = 0, l = 0; i < 32; i++)
-                if ((p1 = p->uni_pgdir[i]))
-                        for (j = 0; j < 32; j++)
-                        if ((p2 = p1[j]))
-                                for (k = 0; k < 64; k++, l++)
-                                if (p2[k] != 0xffff) {
-                                        err1 = con_insert_unipair(q, l, p2[k]);
-                                        if (err1) {
-                                                p->refcount++;
-                                                *vc->vc_uni_pagedir_loc = (unsigned long)p;
-                                                con_release_unimap(q);
-                                                kfree(q);
-                                                return err1; 
-                                        }
-                                }
-                p = q;
-        } else if (p == dflt)
-                dflt = NULL;
-        
-        while (ct--) {
-                unsigned short unicode, fontpos;
-                __get_user(unicode, &list->unicode);
-                __get_user(fontpos, &list->fontpos);
-                if ((err1 = con_insert_unipair(p, unicode,fontpos)) != 0)
-                        err = err1;
-                list++;
-        }
-        
-        if (con_unify_unimap(vc, p))
-                return err;
-
-        for (i = 0; i <= 3; i++)
-                set_inverse_transl(vc, p, i); /* Update all inverse translations */
-        set_inverse_trans_unicode(vc, p);
-  
-        return err;
-}
-
-/* Loads the unimap for the hardware font, as defined in uni_hash.tbl.
-   The representation used was the most compact I could come up
-   with.  This routine is executed at sys_setup time, and when the
-   PIO_FONTRESET ioctl is called. */
-
-int con_set_default_unimap(struct vc_data *vc)
-{
-        int i, j, err = 0, err1;
-        u16 *q;
-        struct uni_pagedir *p;
-
-        if (dflt) {
-                p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-                if (p == dflt)
-                        return 0;
-                dflt->refcount++;
-                *vc->vc_uni_pagedir_loc = (unsigned long)dflt;
-                if (p && --p->refcount) {
-                        con_release_unimap(p);
-                        kfree(p);
-                }
-                return 0;
-        }
-        
-        /* The default font is always 256 characters */
-
-        err = con_clear_unimap(vc, NULL);
-        if (err) return err;
-    
-        p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-        q = dfont_unitable;
-        
-        for (i = 0; i < 256; i++)
-                for (j = dfont_unicount[i]; j; j--) {
-                        err1 = con_insert_unipair(p, *(q++), i);
-                        if (err1)
-                                err = err1;
-                }
-                        
-        if (con_unify_unimap(vc, p)) {
-                dflt = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-                return err;
-        }
-
-        for (i = 0; i <= 3; i++)
-                set_inverse_transl(vc, p, i);   /* Update all inverse translations */
-        set_inverse_trans_unicode(vc, p);
-        dflt = p;
-        return err;
-}
-EXPORT_SYMBOL(con_set_default_unimap);
-
-int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc)
-{
-        struct uni_pagedir *q;
-
-        if (!*src_vc->vc_uni_pagedir_loc)
-                return -EINVAL;
-        if (*dst_vc->vc_uni_pagedir_loc == *src_vc->vc_uni_pagedir_loc)
-                return 0;
-        con_free_unimap(dst_vc);
-        q = (struct uni_pagedir *)*src_vc->vc_uni_pagedir_loc;
-        q->refcount++;
-        *dst_vc->vc_uni_pagedir_loc = (long)q;
-        return 0;
-}
-
-int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct unipair __user *list)
-{
-        int i, j, k, ect;
-        u16 **p1, *p2;
-        struct uni_pagedir *p;
-
-        ect = 0;
-        if (*vc->vc_uni_pagedir_loc) {
-                p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-                for (i = 0; i < 32; i++)
-                if ((p1 = p->uni_pgdir[i]))
-                        for (j = 0; j < 32; j++)
-                        if ((p2 = *(p1++)))
-                                for (k = 0; k < 64; k++) {
-                                        if (*p2 < MAX_GLYPH && ect++ < ct) {
-                                                __put_user((u_short)((i<<11)+(j<<6)+k),
-                                                           &list->unicode);
-                                                __put_user((u_short) *p2, 
-                                                           &list->fontpos);
-                                                list++;
-                                        }
-                                        p2++;
-                                }
-        }
-        __put_user(ect, uct);
-        return ((ect <= ct) ? 0 : -ENOMEM);
-}
-
-void con_protect_unimap(struct vc_data *vc, int rdonly)
-{
-        struct uni_pagedir *p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-        
-        if (p)
-                p->readonly = rdonly;
-}
-
-/*
- * Always use USER_MAP. These functions are used by the keyboard,
- * which shouldn't be affected by G0/G1 switching, etc.
- * If the user map still contains default values, i.e. the
- * direct-to-font mapping, then assume user is using Latin1.
- */
-/* may be called during an interrupt */
-u32 conv_8bit_to_uni(unsigned char c)
-{
-        unsigned short uni = translations[USER_MAP][c];
-        return uni == (0xf000 | c) ? c : uni;
-}
-
-int conv_uni_to_8bit(u32 uni)
-{
-        int c;
-        for (c = 0; c < 0x100; c++)
-                if (translations[USER_MAP][c] == uni ||
-                   (translations[USER_MAP][c] == (c | 0xf000) && uni == c))
-                        return c;
-        return -1;
-}
-
-int
-conv_uni_to_pc(struct vc_data *conp, long ucs) 
-{
-        int h;
-        u16 **p1, *p2;
-        struct uni_pagedir *p;
-  
-        /* Only 16-bit codes supported at this time */
-        if (ucs > 0xffff)
-                return -4;              /* Not found */
-        else if (ucs < 0x20)
-                return -1;              /* Not a printable character */
-        else if (ucs == 0xfeff || (ucs >= 0x200b && ucs <= 0x200f))
-                return -2;                      /* Zero-width space */
-        /*
-         * UNI_DIRECT_BASE indicates the start of the region in the User Zone
-         * which always has a 1:1 mapping to the currently loaded font.  The
-         * UNI_DIRECT_MASK indicates the bit span of the region.
-         */
-        else if ((ucs & ~UNI_DIRECT_MASK) == UNI_DIRECT_BASE)
-                return ucs & UNI_DIRECT_MASK;
-  
-        if (!*conp->vc_uni_pagedir_loc)
-                return -3;
-
-        p = (struct uni_pagedir *)*conp->vc_uni_pagedir_loc;  
-        if ((p1 = p->uni_pgdir[ucs >> 11]) &&
-            (p2 = p1[(ucs >> 6) & 0x1f]) &&
-            (h = p2[ucs & 0x3f]) < MAX_GLYPH)
-                return h;
-
-        return -4;              /* not found */
-}
-
-/*
- * This is called at sys_setup time, after memory and the console are
- * initialized.  It must be possible to call kmalloc(..., GFP_KERNEL)
- * from this function, hence the call from sys_setup.
- */
-void __init 
-console_map_init(void)
-{
-        int i;
-        
-        for (i = 0; i < MAX_NR_CONSOLES; i++)
-                if (vc_cons_allocated(i) && !*vc_cons[i].d->vc_uni_pagedir_loc)
-                        con_set_default_unimap(vc_cons[i].d);
-}
-
-EXPORT_SYMBOL(con_copy_unimap);
diff --git a/drivers/char/cp437.uni b/drivers/char/cp437.uni
deleted file mode 100644
index bc6163484f62..000000000000
--- a/drivers/char/cp437.uni
+++ /dev/null
@@ -1,291 +0,0 @@
-#
-# Unicode table for IBM Codepage 437.  Note that there are many more
-# substitutions that could be conceived (for example, thick-line
-# graphs probably should be replaced with double-line ones, accented
-# Latin characters should replaced with their nonaccented versions,
-# and some upper case Greek characters could be replaced by Latin), however,
-# I have limited myself to the Unicodes used by the kernel ISO 8859-1,
-# DEC VT, and IBM CP 437 tables.
-#
-# --------------------------------
-#
-# Basic IBM dingbats, some of which will never have a purpose clear
-# to mankind
-#
-0x00    U+0000
-0x01    U+263a
-0x02    U+263b
-0x03    U+2665
-0x04    U+2666 U+25c6
-0x05    U+2663
-0x06    U+2660
-0x07    U+2022
-0x08    U+25d8
-0x09    U+25cb
-0x0a    U+25d9
-0x0b    U+2642
-0x0c    U+2640
-0x0d    U+266a
-0x0e    U+266b
-0x0f    U+263c U+00a4
-0x10    U+25b6 U+25ba
-0x11    U+25c0 U+25c4
-0x12    U+2195
-0x13    U+203c
-0x14    U+00b6
-0x15    U+00a7
-0x16    U+25ac
-0x17    U+21a8
-0x18    U+2191
-0x19    U+2193
-0x1a    U+2192
-0x1b    U+2190
-0x1c    U+221f
-0x1d    U+2194
-0x1e    U+25b2
-0x1f    U+25bc
-#
-# The ASCII range is identity-mapped, but some of the characters also
-# have to act as substitutes, especially the upper-case characters.
-#
-0x20    U+0020
-0x21    U+0021
-0x22    U+0022 U+00a8
-0x23    U+0023
-0x24    U+0024
-0x25    U+0025
-0x26    U+0026
-0x27    U+0027 U+00b4
-0x28    U+0028
-0x29    U+0029
-0x2a    U+002a
-0x2b    U+002b
-0x2c    U+002c U+00b8
-0x2d    U+002d U+00ad
-0x2e    U+002e
-0x2f    U+002f
-0x30    U+0030
-0x31    U+0031
-0x32    U+0032
-0x33    U+0033
-0x34    U+0034
-0x35    U+0035
-0x36    U+0036
-0x37    U+0037
-0x38    U+0038
-0x39    U+0039
-0x3a    U+003a
-0x3b    U+003b
-0x3c    U+003c
-0x3d    U+003d
-0x3e    U+003e
-0x3f    U+003f
-0x40    U+0040
-0x41    U+0041 U+00c0 U+00c1 U+00c2 U+00c3
-0x42    U+0042
-0x43    U+0043 U+00a9
-0x44    U+0044 U+00d0
-0x45    U+0045 U+00c8 U+00ca U+00cb
-0x46    U+0046
-0x47    U+0047
-0x48    U+0048
-0x49    U+0049 U+00cc U+00cd U+00ce U+00cf
-0x4a    U+004a
-0x4b    U+004b U+212a
-0x4c    U+004c
-0x4d    U+004d
-0x4e    U+004e
-0x4f    U+004f U+00d2 U+00d3 U+00d4 U+00d5
-0x50    U+0050
-0x51    U+0051
-0x52    U+0052 U+00ae
-0x53    U+0053
-0x54    U+0054
-0x55    U+0055 U+00d9 U+00da U+00db
-0x56    U+0056
-0x57    U+0057
-0x58    U+0058
-0x59    U+0059 U+00dd
-0x5a    U+005a
-0x5b    U+005b
-0x5c    U+005c
-0x5d    U+005d
-0x5e    U+005e
-0x5f    U+005f U+23bd U+f804
-0x60    U+0060
-0x61    U+0061 U+00e3
-0x62    U+0062
-0x63    U+0063
-0x64    U+0064
-0x65    U+0065
-0x66    U+0066
-0x67    U+0067
-0x68    U+0068
-0x69    U+0069
-0x6a    U+006a
-0x6b    U+006b
-0x6c    U+006c
-0x6d    U+006d
-0x6e    U+006e
-0x6f    U+006f U+00f5
-0x70    U+0070
-0x71    U+0071
-0x72    U+0072
-0x73    U+0073
-0x74    U+0074
-0x75    U+0075
-0x76    U+0076
-0x77    U+0077
-0x78    U+0078 U+00d7
-0x79    U+0079 U+00fd
-0x7a    U+007a
-0x7b    U+007b
-0x7c    U+007c U+00a6
-0x7d    U+007d
-0x7e    U+007e
-#
-# Okay, what on Earth is this one supposed to be used for?
-#
-0x7f    U+2302
-#
-# Non-English characters, mostly lower case letters...
-#
-0x80    U+00c7
-0x81    U+00fc
-0x82    U+00e9
-0x83    U+00e2
-0x84    U+00e4
-0x85    U+00e0
-0x86    U+00e5
-0x87    U+00e7
-0x88    U+00ea
-0x89    U+00eb
-0x8a    U+00e8
-0x8b    U+00ef
-0x8c    U+00ee
-0x8d    U+00ec
-0x8e    U+00c4
-0x8f    U+00c5 U+212b
-0x90    U+00c9
-0x91    U+00e6
-0x92    U+00c6
-0x93    U+00f4
-0x94    U+00f6
-0x95    U+00f2
-0x96    U+00fb
-0x97    U+00f9
-0x98    U+00ff
-0x99    U+00d6
-0x9a    U+00dc
-0x9b    U+00a2
-0x9c    U+00a3
-0x9d    U+00a5
-0x9e    U+20a7
-0x9f    U+0192
-0xa0    U+00e1
-0xa1    U+00ed
-0xa2    U+00f3
-0xa3    U+00fa
-0xa4    U+00f1
-0xa5    U+00d1
-0xa6    U+00aa
-0xa7    U+00ba
-0xa8    U+00bf
-0xa9    U+2310
-0xaa    U+00ac
-0xab    U+00bd
-0xac    U+00bc
-0xad    U+00a1
-0xae    U+00ab
-0xaf    U+00bb
-#
-# Block graphics
-#
-0xb0    U+2591
-0xb1    U+2592
-0xb2    U+2593
-0xb3    U+2502
-0xb4    U+2524
-0xb5    U+2561
-0xb6    U+2562
-0xb7    U+2556
-0xb8    U+2555
-0xb9    U+2563
-0xba    U+2551
-0xbb    U+2557
-0xbc    U+255d
-0xbd    U+255c
-0xbe    U+255b
-0xbf    U+2510
-0xc0    U+2514
-0xc1    U+2534
-0xc2    U+252c
-0xc3    U+251c
-0xc4    U+2500
-0xc5    U+253c
-0xc6    U+255e
-0xc7    U+255f
-0xc8    U+255a
-0xc9    U+2554
-0xca    U+2569
-0xcb    U+2566
-0xcc    U+2560
-0xcd    U+2550
-0xce    U+256c
-0xcf    U+2567
-0xd0    U+2568
-0xd1    U+2564
-0xd2    U+2565
-0xd3    U+2559
-0xd4    U+2558
-0xd5    U+2552
-0xd6    U+2553
-0xd7    U+256b
-0xd8    U+256a
-0xd9    U+2518
-0xda    U+250c
-0xdb    U+2588
-0xdc    U+2584
-0xdd    U+258c
-0xde    U+2590
-0xdf    U+2580
-#
-# Greek letters and mathematical symbols
-#
-0xe0    U+03b1
-0xe1    U+03b2 U+00df
-0xe2    U+0393
-0xe3    U+03c0
-0xe4    U+03a3
-0xe5    U+03c3
-0xe6    U+00b5 U+03bc
-0xe7    U+03c4
-0xe8    U+03a6 U+00d8
-0xe9    U+0398
-0xea    U+03a9 U+2126
-0xeb    U+03b4 U+00f0
-0xec    U+221e
-0xed    U+03c6 U+00f8
-0xee    U+03b5 U+2208
-0xef    U+2229
-0xf0    U+2261
-0xf1    U+00b1
-0xf2    U+2265
-0xf3    U+2264
-0xf4    U+2320
-0xf5    U+2321
-0xf6    U+00f7
-0xf7    U+2248
-0xf8    U+00b0
-0xf9    U+2219
-0xfa    U+00b7
-0xfb    U+221a
-0xfc    U+207f
-0xfd    U+00b2
-#
-# Square bullet, non-spacing blank
-# Mapping U+fffd to the square bullet means it is the substitution
-# character
-# 
-0xfe    U+25a0 U+fffd
-0xff    U+00a0
diff --git a/drivers/char/cs5535_gpio.c b/drivers/char/cs5535_gpio.c
deleted file mode 100644
index 4d830dc482ef..000000000000
--- a/drivers/char/cs5535_gpio.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * AMD CS5535/CS5536 GPIO driver.
- * Allows a user space process to play with the GPIO pins.
- *
- * Copyright (c) 2005 Ben Gardner <bgardner@wabtec.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the smems of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- */
-
-#include <linux/fs.h>
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/cdev.h>
-#include <linux/ioport.h>
-#include <linux/pci.h>
-
-#include <asm/uaccess.h>
-#include <asm/io.h>
-
-
-#define NAME                    "cs5535_gpio"
-
-MODULE_AUTHOR("Ben Gardner <bgardner@wabtec.com>");
-MODULE_DESCRIPTION("AMD CS5535/CS5536 GPIO Pin Driver");
-MODULE_LICENSE("GPL");
-
-static int major;
-module_param(major, int, 0);
-MODULE_PARM_DESC(major, "Major device number");
-
-static ulong mask;
-module_param(mask, ulong, 0);
-MODULE_PARM_DESC(mask, "GPIO channel mask");
-
-#define MSR_LBAR_GPIO           0x5140000C
-
-static u32 gpio_base;
-
-static struct pci_device_id divil_pci[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_NS,  PCI_DEVICE_ID_NS_CS5535_ISA) },
-        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
-        { } /* NULL entry */
-};
-MODULE_DEVICE_TABLE(pci, divil_pci);
-
-static struct cdev cs5535_gpio_cdev;
-
-/* reserve 32 entries even though some aren't usable */
-#define CS5535_GPIO_COUNT       32
-
-/* IO block size */
-#define CS5535_GPIO_SIZE        256
-
-struct gpio_regmap {
-        u32     rd_offset;
-        u32     wr_offset;
-        char    on;
-        char    off;
-};
-static struct gpio_regmap rm[] =
-{
-        { 0x30, 0x00, '1', '0' },       /* GPIOx_READ_BACK / GPIOx_OUT_VAL */
-        { 0x20, 0x20, 'I', 'i' },       /* GPIOx_IN_EN */
-        { 0x04, 0x04, 'O', 'o' },       /* GPIOx_OUT_EN */
-        { 0x08, 0x08, 't', 'T' },       /* GPIOx_OUT_OD_EN */
-        { 0x18, 0x18, 'P', 'p' },       /* GPIOx_OUT_PU_EN */
-        { 0x1c, 0x1c, 'D', 'd' },       /* GPIOx_OUT_PD_EN */
-};
-
-
-/**
- * Gets the register offset for the GPIO bank.
- * Low (0-15) starts at 0x00, high (16-31) starts at 0x80
- */
-static inline u32 cs5535_lowhigh_base(int reg)
-{
-        return (reg & 0x10) << 3;
-}
-
-static ssize_t cs5535_gpio_write(struct file *file, const char __user *data,
-                                 size_t len, loff_t *ppos)
-{
-        u32     m = iminor(file->f_path.dentry->d_inode);
-        int     i, j;
-        u32     base = gpio_base + cs5535_lowhigh_base(m);
-        u32     m0, m1;
-        char    c;
-
-        /**
-         * Creates the mask for atomic bit programming.
-         * The high 16 bits and the low 16 bits are used to set the mask.
-         * For example, GPIO 15 maps to 31,15: 0,1 => On; 1,0=> Off
-         */
-        m1 = 1 << (m & 0x0F);
-        m0 = m1 << 16;
-
-        for (i = 0; i < len; ++i) {
-                if (get_user(c, data+i))
-                        return -EFAULT;
-
-                for (j = 0; j < ARRAY_SIZE(rm); j++) {
-                        if (c == rm[j].on) {
-                                outl(m1, base + rm[j].wr_offset);
-                                /* If enabling output, turn off AUX 1 and AUX 2 */
-                                if (c == 'O') {
-                                        outl(m0, base + 0x10);
-                                        outl(m0, base + 0x14);
-                                }
-                                break;
-                        } else if (c == rm[j].off) {
-                                outl(m0, base + rm[j].wr_offset);
-                                break;
-                        }
-                }
-        }
-        *ppos = 0;
-        return len;
-}
-
-static ssize_t cs5535_gpio_read(struct file *file, char __user *buf,
-                                size_t len, loff_t *ppos)
-{
-        u32     m = iminor(file->f_path.dentry->d_inode);
-        u32     base = gpio_base + cs5535_lowhigh_base(m);
-        int     rd_bit = 1 << (m & 0x0f);
-        int     i;
-        char    ch;
-        ssize_t count = 0;
-
-        if (*ppos >= ARRAY_SIZE(rm))
-                return 0;
-
-        for (i = *ppos; (i < (*ppos + len)) && (i < ARRAY_SIZE(rm)); i++) {
-                ch = (inl(base + rm[i].rd_offset) & rd_bit) ?
-                     rm[i].on : rm[i].off;
-
-                if (put_user(ch, buf+count))
-                        return -EFAULT;
-
-                count++;
-        }
-
-        /* add a line-feed if there is room */
-        if ((i == ARRAY_SIZE(rm)) && (count < len)) {
-                put_user('\n', buf + count);
-                count++;
-        }
-
-        *ppos += count;
-        return count;
-}
-
-static int cs5535_gpio_open(struct inode *inode, struct file *file)
-{
-        u32 m = iminor(inode);
-
-        /* the mask says which pins are usable by this driver */
-        if ((mask & (1 << m)) == 0)
-                return -EINVAL;
-
-        return nonseekable_open(inode, file);
-}
-
-static const struct file_operations cs5535_gpio_fops = {
-        .owner  = THIS_MODULE,
-        .write  = cs5535_gpio_write,
-        .read   = cs5535_gpio_read,
-        .open   = cs5535_gpio_open
-};
-
-static int __init cs5535_gpio_init(void)
-{
-        dev_t   dev_id;
-        u32     low, hi;
-        int     retval;
-
-        if (pci_dev_present(divil_pci) == 0) {
-                printk(KERN_WARNING NAME ": DIVIL not found\n");
-                return -ENODEV;
-        }
-
-        /* Grab the GPIO I/O range */
-        rdmsr(MSR_LBAR_GPIO, low, hi);
-
-        /* Check the mask and whether GPIO is enabled (sanity check) */
-        if (hi != 0x0000f001) {
-                printk(KERN_WARNING NAME ": GPIO not enabled\n");
-                return -ENODEV;
-        }
-
-        /* Mask off the IO base address */
-        gpio_base = low & 0x0000ff00;
-
-        /**
-         * Some GPIO pins
-         *  31-29,23 : reserved (always mask out)
-         *  28       : Power Button
-         *  26       : PME#
-         *  22-16    : LPC
-         *  14,15    : SMBus
-         *  9,8      : UART1
-         *  7        : PCI INTB
-         *  3,4      : UART2/DDC
-         *  2        : IDE_IRQ0
-         *  0        : PCI INTA
-         *
-         * If a mask was not specified, be conservative and only allow:
-         *  1,2,5,6,10-13,24,25,27
-         */
-        if (mask != 0)
-                mask &= 0x1f7fffff;
-        else
-                mask = 0x0b003c66;
-
-        if (!request_region(gpio_base, CS5535_GPIO_SIZE, NAME)) {
-                printk(KERN_ERR NAME ": can't allocate I/O for GPIO\n");
-                return -ENODEV;
-        }
-
-        if (major) {
-                dev_id = MKDEV(major, 0);
-                retval = register_chrdev_region(dev_id, CS5535_GPIO_COUNT,
-                                                NAME);
-        } else {
-                retval = alloc_chrdev_region(&dev_id, 0, CS5535_GPIO_COUNT,
-                                             NAME);
-                major = MAJOR(dev_id);
-        }
-
-        if (retval) {
-                release_region(gpio_base, CS5535_GPIO_SIZE);
-                return -1;
-        }
-
-        printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
-               gpio_base, mask, major);
-
-        cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
-        cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-
-        return 0;
-}
-
-static void __exit cs5535_gpio_cleanup(void)
-{
-        dev_t dev_id = MKDEV(major, 0);
-
-        cdev_del(&cs5535_gpio_cdev);
-        unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
-        release_region(gpio_base, CS5535_GPIO_SIZE);
-}
-
-module_init(cs5535_gpio_init);
-module_exit(cs5535_gpio_cleanup);
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
deleted file mode 100644
index 27aad9422332..000000000000
--- a/drivers/char/cyclades.c
+++ /dev/null
@@ -1,4197 +0,0 @@
-#undef  BLOCKMOVE
-#define Z_WAKE
-#undef  Z_EXT_CHARS_IN_BUFFER
-
-/*
- *  linux/drivers/char/cyclades.c
- *
- * This file contains the driver for the Cyclades async multiport
- * serial boards.
- *
- * Initially written by Randolph Bentson <bentson@grieg.seaslug.org>.
- * Modified and maintained by Marcio Saito <marcio@cyclades.com>.
- *
- * Copyright (C) 2007-2009 Jiri Slaby <jirislaby@gmail.com>
- *
- * Much of the design and some of the code came from serial.c
- * which was copyright (C) 1991, 1992  Linus Torvalds.  It was
- * extensively rewritten by Theodore Ts'o, 8/16/92 -- 9/14/92,
- * and then fixed as suggested by Michael K. Johnson 12/12/92.
- * Converted to pci probing and cleaned up by Jiri Slaby.
- *
- */
-
-#define CY_VERSION      "2.6"
-
-/* If you need to install more boards than NR_CARDS, change the constant
-   in the definition below. No other change is necessary to support up to
-   eight boards. Beyond that you'll have to extend cy_isa_addresses. */
-
-#define NR_CARDS        4
-
-/*
-   If the total number of ports is larger than NR_PORTS, change this
-   constant in the definition below. No other change is necessary to
-   support more boards/ports. */
-
-#define NR_PORTS        256
-
-#define ZO_V1   0
-#define ZO_V2   1
-#define ZE_V1   2
-
-#define SERIAL_PARANOIA_CHECK
-#undef  CY_DEBUG_OPEN
-#undef  CY_DEBUG_THROTTLE
-#undef  CY_DEBUG_OTHER
-#undef  CY_DEBUG_IO
-#undef  CY_DEBUG_COUNT
-#undef  CY_DEBUG_DTR
-#undef  CY_DEBUG_WAIT_UNTIL_SENT
-#undef  CY_DEBUG_INTERRUPTS
-#undef  CY_16Y_HACK
-#undef  CY_ENABLE_MONITORING
-#undef  CY_PCI_DEBUG
-
-/*
- * Include section
- */
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial.h>
-#include <linux/major.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/cyclades.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/spinlock.h>
-#include <linux/bitops.h>
-#include <linux/firmware.h>
-#include <linux/device.h>
-#include <linux/slab.h>
-
-#include <linux/io.h>
-#include <linux/uaccess.h>
-
-#include <linux/kernel.h>
-#include <linux/pci.h>
-
-#include <linux/stat.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-
-static void cy_send_xchar(struct tty_struct *tty, char ch);
-
-#ifndef SERIAL_XMIT_SIZE
-#define SERIAL_XMIT_SIZE        (min(PAGE_SIZE, 4096))
-#endif
-
-#define STD_COM_FLAGS (0)
-
-/* firmware stuff */
-#define ZL_MAX_BLOCKS   16
-#define DRIVER_VERSION  0x02010203
-#define RAM_SIZE 0x80000
-
-enum zblock_type {
-        ZBLOCK_PRG = 0,
-        ZBLOCK_FPGA = 1
-};
-
-struct zfile_header {
-        char name[64];
-        char date[32];
-        char aux[32];
-        u32 n_config;
-        u32 config_offset;
-        u32 n_blocks;
-        u32 block_offset;
-        u32 reserved[9];
-} __attribute__ ((packed));
-
-struct zfile_config {
-        char name[64];
-        u32 mailbox;
-        u32 function;
-        u32 n_blocks;
-        u32 block_list[ZL_MAX_BLOCKS];
-} __attribute__ ((packed));
-
-struct zfile_block {
-        u32 type;
-        u32 file_offset;
-        u32 ram_offset;
-        u32 size;
-} __attribute__ ((packed));
-
-static struct tty_driver *cy_serial_driver;
-
-#ifdef CONFIG_ISA
-/* This is the address lookup table. The driver will probe for
-   Cyclom-Y/ISA boards at all addresses in here. If you want the
-   driver to probe addresses at a different address, add it to
-   this table.  If the driver is probing some other board and
-   causing problems, remove the offending address from this table.
-*/
-
-static unsigned int cy_isa_addresses[] = {
-        0xD0000,
-        0xD2000,
-        0xD4000,
-        0xD6000,
-        0xD8000,
-        0xDA000,
-        0xDC000,
-        0xDE000,
-        0, 0, 0, 0, 0, 0, 0, 0
-};
-
-#define NR_ISA_ADDRS ARRAY_SIZE(cy_isa_addresses)
-
-static long maddr[NR_CARDS];
-static int irq[NR_CARDS];
-
-module_param_array(maddr, long, NULL, 0);
-module_param_array(irq, int, NULL, 0);
-
-#endif                          /* CONFIG_ISA */
-
-/* This is the per-card data structure containing address, irq, number of
-   channels, etc. This driver supports a maximum of NR_CARDS cards.
-*/
-static struct cyclades_card cy_card[NR_CARDS];
-
-static int cy_next_channel;     /* next minor available */
-
-/*
- * This is used to look up the divisor speeds and the timeouts
- * We're normally limited to 15 distinct baud rates.  The extra
- * are accessed via settings in info->port.flags.
- *      0,     1,     2,     3,     4,     5,     6,     7,     8,     9,
- *     10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
- *                                               HI            VHI
- *     20
- */
-static const int baud_table[] = {
-        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200,
-        1800, 2400, 4800, 9600, 19200, 38400, 57600, 76800, 115200, 150000,
-        230400, 0
-};
-
-static const char baud_co_25[] = {      /* 25 MHz clock option table */
-        /* value =>    00    01   02    03    04 */
-        /* divide by    8    32   128   512  2048 */
-        0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03, 0x03, 0x02,
-        0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static const char baud_bpr_25[] = {     /* 25 MHz baud rate period table */
-        0x00, 0xf5, 0xa3, 0x6f, 0x5c, 0x51, 0xf5, 0xa3, 0x51, 0xa3,
-        0x6d, 0x51, 0xa3, 0x51, 0xa3, 0x51, 0x36, 0x29, 0x1b, 0x15
-};
-
-static const char baud_co_60[] = {      /* 60 MHz clock option table (CD1400 J) */
-        /* value =>    00    01   02    03    04 */
-        /* divide by    8    32   128   512  2048 */
-        0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03,
-        0x03, 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00
-};
-
-static const char baud_bpr_60[] = {     /* 60 MHz baud rate period table (CD1400 J) */
-        0x00, 0x82, 0x21, 0xff, 0xdb, 0xc3, 0x92, 0x62, 0xc3, 0x62,
-        0x41, 0xc3, 0x62, 0xc3, 0x62, 0xc3, 0x82, 0x62, 0x41, 0x32,
-        0x21
-};
-
-static const char baud_cor3[] = {       /* receive threshold */
-        0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a,
-        0x0a, 0x0a, 0x0a, 0x09, 0x09, 0x08, 0x08, 0x08, 0x08, 0x07,
-        0x07
-};
-
-/*
- * The Cyclades driver implements HW flow control as any serial driver.
- * 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
- * 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
- * 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
- * cables.
- */
-
-static const char rflow_thr[] = {       /* rflow threshold */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a,
-        0x0a
-};
-
-/*  The Cyclom-Ye has placed the sequential chips in non-sequential
- *  address order.  This look-up table overcomes that problem.
- */
-static const unsigned int cy_chip_offset[] = { 0x0000,
-        0x0400,
-        0x0800,
-        0x0C00,
-        0x0200,
-        0x0600,
-        0x0A00,
-        0x0E00
-};
-
-/* PCI related definitions */
-
-#ifdef CONFIG_PCI
-static const struct pci_device_id cy_pci_dev_id[] = {
-        /* PCI < 1Mb */
-        { PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Y_Lo) },
-        /* PCI > 1Mb */
-        { PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Y_Hi) },
-        /* 4Y PCI < 1Mb */
-        { PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_4Y_Lo) },
-        /* 4Y 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 */
-};
-MODULE_DEVICE_TABLE(pci, cy_pci_dev_id);
-#endif
-
-static void cy_start(struct tty_struct *);
-static void cy_set_line_char(struct cyclades_port *, struct tty_struct *);
-static int cyz_issue_cmd(struct cyclades_card *, __u32, __u8, __u32);
-#ifdef CONFIG_ISA
-static unsigned detect_isa_irq(void __iomem *);
-#endif                          /* CONFIG_ISA */
-
-#ifndef CONFIG_CYZ_INTR
-static void cyz_poll(unsigned long);
-
-/* The Cyclades-Z polling cycle is defined by this variable */
-static long cyz_polling_cycle = CZ_DEF_POLL;
-
-static DEFINE_TIMER(cyz_timerlist, cyz_poll, 0, 0);
-
-#else                           /* CONFIG_CYZ_INTR */
-static void cyz_rx_restart(unsigned long);
-static struct timer_list cyz_rx_full_timer[NR_PORTS];
-#endif                          /* CONFIG_CYZ_INTR */
-
-static inline void cyy_writeb(struct cyclades_port *port, u32 reg, u8 val)
-{
-        struct cyclades_card *card = port->card;
-
-        cy_writeb(port->u.cyy.base_addr + (reg << card->bus_index), val);
-}
-
-static inline u8 cyy_readb(struct cyclades_port *port, u32 reg)
-{
-        struct cyclades_card *card = port->card;
-
-        return readb(port->u.cyy.base_addr + (reg << card->bus_index));
-}
-
-static inline bool cy_is_Z(struct cyclades_card *card)
-{
-        return card->num_chips == (unsigned int)-1;
-}
-
-static inline bool __cyz_fpga_loaded(struct RUNTIME_9060 __iomem *ctl_addr)
-{
-        return readl(&ctl_addr->init_ctrl) & (1 << 17);
-}
-
-static inline bool cyz_fpga_loaded(struct cyclades_card *card)
-{
-        return __cyz_fpga_loaded(card->ctl_addr.p9060);
-}
-
-static inline bool cyz_is_loaded(struct cyclades_card *card)
-{
-        struct FIRM_ID __iomem *fw_id = card->base_addr + ID_ADDRESS;
-
-        return (card->hw_ver == ZO_V1 || cyz_fpga_loaded(card)) &&
-                        readl(&fw_id->signature) == ZFIRM_ID;
-}
-
-static inline int serial_paranoia_check(struct cyclades_port *info,
-                const char *name, const char *routine)
-{
-#ifdef SERIAL_PARANOIA_CHECK
-        if (!info) {
-                printk(KERN_WARNING "cyc Warning: null cyclades_port for (%s) "
-                                "in %s\n", name, routine);
-                return 1;
-        }
-
-        if (info->magic != CYCLADES_MAGIC) {
-                printk(KERN_WARNING "cyc Warning: bad magic number for serial "
-                                "struct (%s) in %s\n", name, routine);
-                return 1;
-        }
-#endif
-        return 0;
-}
-
-/***********************************************************/
-/********* Start of block of Cyclom-Y specific code ********/
-
-/* This routine waits up to 1000 micro-seconds for the previous
-   command to the Cirrus chip to complete and then issues the
-   new command.  An error is returned if the previous command
-   didn't finish within the time limit.
-
-   This function is only called from inside spinlock-protected code.
- */
-static int __cyy_issue_cmd(void __iomem *base_addr, u8 cmd, int index)
-{
-        void __iomem *ccr = base_addr + (CyCCR << index);
-        unsigned int i;
-
-        /* Check to see that the previous command has completed */
-        for (i = 0; i < 100; i++) {
-                if (readb(ccr) == 0)
-                        break;
-                udelay(10L);
-        }
-        /* if the CCR never cleared, the previous command
-           didn't finish within the "reasonable time" */
-        if (i == 100)
-                return -1;
-
-        /* Issue the new command */
-        cy_writeb(ccr, cmd);
-
-        return 0;
-}
-
-static inline int cyy_issue_cmd(struct cyclades_port *port, u8 cmd)
-{
-        return __cyy_issue_cmd(port->u.cyy.base_addr, cmd,
-                        port->card->bus_index);
-}
-
-#ifdef CONFIG_ISA
-/* ISA interrupt detection code */
-static unsigned detect_isa_irq(void __iomem *address)
-{
-        int irq;
-        unsigned long irqs, flags;
-        int save_xir, save_car;
-        int index = 0;          /* IRQ probing is only for ISA */
-
-        /* forget possible initially masked and pending IRQ */
-        irq = probe_irq_off(probe_irq_on());
-
-        /* Clear interrupts on the board first */
-        cy_writeb(address + (Cy_ClrIntr << index), 0);
-        /* Cy_ClrIntr is 0x1800 */
-
-        irqs = probe_irq_on();
-        /* Wait ... */
-        msleep(5);
-
-        /* Enable the Tx interrupts on the CD1400 */
-        local_irq_save(flags);
-        cy_writeb(address + (CyCAR << index), 0);
-        __cyy_issue_cmd(address, CyCHAN_CTL | CyENB_XMTR, index);
-
-        cy_writeb(address + (CyCAR << index), 0);
-        cy_writeb(address + (CySRER << index),
-                  readb(address + (CySRER << index)) | CyTxRdy);
-        local_irq_restore(flags);
-
-        /* Wait ... */
-        msleep(5);
-
-        /* Check which interrupt is in use */
-        irq = probe_irq_off(irqs);
-
-        /* Clean up */
-        save_xir = (u_char) readb(address + (CyTIR << index));
-        save_car = readb(address + (CyCAR << index));
-        cy_writeb(address + (CyCAR << index), (save_xir & 0x3));
-        cy_writeb(address + (CySRER << index),
-                  readb(address + (CySRER << index)) & ~CyTxRdy);
-        cy_writeb(address + (CyTIR << index), (save_xir & 0x3f));
-        cy_writeb(address + (CyCAR << index), (save_car));
-        cy_writeb(address + (Cy_ClrIntr << index), 0);
-        /* Cy_ClrIntr is 0x1800 */
-
-        return (irq > 0) ? irq : 0;
-}
-#endif                          /* CONFIG_ISA */
-
-static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
-                void __iomem *base_addr)
-{
-        struct cyclades_port *info;
-        struct tty_struct *tty;
-        int len, index = cinfo->bus_index;
-        u8 ivr, save_xir, channel, save_car, data, char_count;
-
-#ifdef CY_DEBUG_INTERRUPTS
-        printk(KERN_DEBUG "cyy_interrupt: rcvd intr, chip %d\n", chip);
-#endif
-        /* determine the channel & change to that context */
-        save_xir = readb(base_addr + (CyRIR << index));
-        channel = save_xir & CyIRChannel;
-        info = &cinfo->ports[channel + chip * 4];
-        save_car = cyy_readb(info, CyCAR);
-        cyy_writeb(info, CyCAR, save_xir);
-        ivr = cyy_readb(info, CyRIVR) & CyIVRMask;
-
-        tty = tty_port_tty_get(&info->port);
-        /* if there is nowhere to put the data, discard it */
-        if (tty == NULL) {
-                if (ivr == CyIVRRxEx) { /* exception */
-                        data = cyy_readb(info, CyRDSR);
-                } else {        /* normal character reception */
-                        char_count = cyy_readb(info, CyRDCR);
-                        while (char_count--)
-                                data = cyy_readb(info, CyRDSR);
-                }
-                goto end;
-        }
-        /* there is an open port for this data */
-        if (ivr == CyIVRRxEx) { /* exception */
-                data = cyy_readb(info, CyRDSR);
-
-                /* For statistics only */
-                if (data & CyBREAK)
-                        info->icount.brk++;
-                else if (data & CyFRAME)
-                        info->icount.frame++;
-                else if (data & CyPARITY)
-                        info->icount.parity++;
-                else if (data & CyOVERRUN)
-                        info->icount.overrun++;
-
-                if (data & info->ignore_status_mask) {
-                        info->icount.rx++;
-                        tty_kref_put(tty);
-                        return;
-                }
-                if (tty_buffer_request_room(tty, 1)) {
-                        if (data & info->read_status_mask) {
-                                if (data & CyBREAK) {
-                                        tty_insert_flip_char(tty,
-                                                cyy_readb(info, CyRDSR),
-                                                TTY_BREAK);
-                                        info->icount.rx++;
-                                        if (info->port.flags & ASYNC_SAK)
-                                                do_SAK(tty);
-                                } else if (data & CyFRAME) {
-                                        tty_insert_flip_char(tty,
-                                                cyy_readb(info, CyRDSR),
-                                                TTY_FRAME);
-                                        info->icount.rx++;
-                                        info->idle_stats.frame_errs++;
-                                } else if (data & CyPARITY) {
-                                        /* Pieces of seven... */
-                                        tty_insert_flip_char(tty,
-                                                cyy_readb(info, CyRDSR),
-                                                TTY_PARITY);
-                                        info->icount.rx++;
-                                        info->idle_stats.parity_errs++;
-                                } else if (data & CyOVERRUN) {
-                                        tty_insert_flip_char(tty, 0,
-                                                        TTY_OVERRUN);
-                                        info->icount.rx++;
-                                        /* If the flip buffer itself is
-                                           overflowing, we still lose
-                                           the next incoming character.
-                                         */
-                                        tty_insert_flip_char(tty,
-                                                cyy_readb(info, CyRDSR),
-                                                TTY_FRAME);
-                                        info->icount.rx++;
-                                        info->idle_stats.overruns++;
-                                /* These two conditions may imply */
-                                /* a normal read should be done. */
-                                /* } else if(data & CyTIMEOUT) { */
-                                /* } else if(data & CySPECHAR) { */
-                                } else {
-                                        tty_insert_flip_char(tty, 0,
-                                                        TTY_NORMAL);
-                                        info->icount.rx++;
-                                }
-                        } else {
-                                tty_insert_flip_char(tty, 0, TTY_NORMAL);
-                                info->icount.rx++;
-                        }
-                } else {
-                        /* there was a software buffer overrun and nothing
-                         * could be done about it!!! */
-                        info->icount.buf_overrun++;
-                        info->idle_stats.overruns++;
-                }
-        } else {        /* normal character reception */
-                /* load # chars available from the chip */
-                char_count = cyy_readb(info, CyRDCR);
-
-#ifdef CY_ENABLE_MONITORING
-                ++info->mon.int_count;
-                info->mon.char_count += char_count;
-                if (char_count > info->mon.char_max)
-                        info->mon.char_max = char_count;
-                info->mon.char_last = char_count;
-#endif
-                len = tty_buffer_request_room(tty, char_count);
-                while (len--) {
-                        data = cyy_readb(info, CyRDSR);
-                        tty_insert_flip_char(tty, data, TTY_NORMAL);
-                        info->idle_stats.recv_bytes++;
-                        info->icount.rx++;
-#ifdef CY_16Y_HACK
-                        udelay(10L);
-#endif
-                }
-                info->idle_stats.recv_idle = jiffies;
-        }
-        tty_schedule_flip(tty);
-        tty_kref_put(tty);
-end:
-        /* end of service */
-        cyy_writeb(info, CyRIR, save_xir & 0x3f);
-        cyy_writeb(info, CyCAR, save_car);
-}
-
-static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
-                void __iomem *base_addr)
-{
-        struct cyclades_port *info;
-        struct tty_struct *tty;
-        int char_count, index = cinfo->bus_index;
-        u8 save_xir, channel, save_car, outch;
-
-        /* Since we only get here when the transmit buffer
-           is empty, we know we can always stuff a dozen
-           characters. */
-#ifdef CY_DEBUG_INTERRUPTS
-        printk(KERN_DEBUG "cyy_interrupt: xmit intr, chip %d\n", chip);
-#endif
-
-        /* determine the channel & change to that context */
-        save_xir = readb(base_addr + (CyTIR << index));
-        channel = save_xir & CyIRChannel;
-        save_car = readb(base_addr + (CyCAR << index));
-        cy_writeb(base_addr + (CyCAR << index), save_xir);
-
-        info = &cinfo->ports[channel + chip * 4];
-        tty = tty_port_tty_get(&info->port);
-        if (tty == NULL) {
-                cyy_writeb(info, CySRER, cyy_readb(info, CySRER) & ~CyTxRdy);
-                goto end;
-        }
-
-        /* load the on-chip space for outbound data */
-        char_count = info->xmit_fifo_size;
-
-        if (info->x_char) {     /* send special char */
-                outch = info->x_char;
-                cyy_writeb(info, CyTDR, outch);
-                char_count--;
-                info->icount.tx++;
-                info->x_char = 0;
-        }
-
-        if (info->breakon || info->breakoff) {
-                if (info->breakon) {
-                        cyy_writeb(info, CyTDR, 0);
-                        cyy_writeb(info, CyTDR, 0x81);
-                        info->breakon = 0;
-                        char_count -= 2;
-                }
-                if (info->breakoff) {
-                        cyy_writeb(info, CyTDR, 0);
-                        cyy_writeb(info, CyTDR, 0x83);
-                        info->breakoff = 0;
-                        char_count -= 2;
-                }
-        }
-
-        while (char_count-- > 0) {
-                if (!info->xmit_cnt) {
-                        if (cyy_readb(info, CySRER) & CyTxMpty) {
-                                cyy_writeb(info, CySRER,
-                                        cyy_readb(info, CySRER) & ~CyTxMpty);
-                        } else {
-                                cyy_writeb(info, CySRER, CyTxMpty |
-                                        (cyy_readb(info, CySRER) & ~CyTxRdy));
-                        }
-                        goto done;
-                }
-                if (info->port.xmit_buf == NULL) {
-                        cyy_writeb(info, CySRER,
-                                cyy_readb(info, CySRER) & ~CyTxRdy);
-                        goto done;
-                }
-                if (tty->stopped || tty->hw_stopped) {
-                        cyy_writeb(info, CySRER,
-                                cyy_readb(info, CySRER) & ~CyTxRdy);
-                        goto done;
-                }
-                /* Because the Embedded Transmit Commands have been enabled,
-                 * we must check to see if the escape character, NULL, is being
-                 * sent. If it is, we must ensure that there is room for it to
-                 * be doubled in the output stream.  Therefore we no longer
-                 * advance the pointer when the character is fetched, but
-                 * rather wait until after the check for a NULL output
-                 * character. This is necessary because there may not be room
-                 * for the two chars needed to send a NULL.)
-                 */
-                outch = info->port.xmit_buf[info->xmit_tail];
-                if (outch) {
-                        info->xmit_cnt--;
-                        info->xmit_tail = (info->xmit_tail + 1) &
-                                        (SERIAL_XMIT_SIZE - 1);
-                        cyy_writeb(info, CyTDR, outch);
-                        info->icount.tx++;
-                } else {
-                        if (char_count > 1) {
-                                info->xmit_cnt--;
-                                info->xmit_tail = (info->xmit_tail + 1) &
-                                        (SERIAL_XMIT_SIZE - 1);
-                                cyy_writeb(info, CyTDR, outch);
-                                cyy_writeb(info, CyTDR, 0);
-                                info->icount.tx++;
-                                char_count--;
-                        }
-                }
-        }
-
-done:
-        tty_wakeup(tty);
-        tty_kref_put(tty);
-end:
-        /* end of service */
-        cyy_writeb(info, CyTIR, save_xir & 0x3f);
-        cyy_writeb(info, CyCAR, save_car);
-}
-
-static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
-                void __iomem *base_addr)
-{
-        struct cyclades_port *info;
-        struct tty_struct *tty;
-        int index = cinfo->bus_index;
-        u8 save_xir, channel, save_car, mdm_change, mdm_status;
-
-        /* determine the channel & change to that context */
-        save_xir = readb(base_addr + (CyMIR << index));
-        channel = save_xir & CyIRChannel;
-        info = &cinfo->ports[channel + chip * 4];
-        save_car = cyy_readb(info, CyCAR);
-        cyy_writeb(info, CyCAR, save_xir);
-
-        mdm_change = cyy_readb(info, CyMISR);
-        mdm_status = cyy_readb(info, CyMSVR1);
-
-        tty = tty_port_tty_get(&info->port);
-        if (!tty)
-                goto end;
-
-        if (mdm_change & CyANY_DELTA) {
-                /* For statistics only */
-                if (mdm_change & CyDCD)
-                        info->icount.dcd++;
-                if (mdm_change & CyCTS)
-                        info->icount.cts++;
-                if (mdm_change & CyDSR)
-                        info->icount.dsr++;
-                if (mdm_change & CyRI)
-                        info->icount.rng++;
-
-                wake_up_interruptible(&info->port.delta_msr_wait);
-        }
-
-        if ((mdm_change & CyDCD) && (info->port.flags & ASYNC_CHECK_CD)) {
-                if (mdm_status & CyDCD)
-                        wake_up_interruptible(&info->port.open_wait);
-                else
-                        tty_hangup(tty);
-        }
-        if ((mdm_change & CyCTS) && (info->port.flags & ASYNC_CTS_FLOW)) {
-                if (tty->hw_stopped) {
-                        if (mdm_status & CyCTS) {
-                                /* cy_start isn't used
-                                   because... !!! */
-                                tty->hw_stopped = 0;
-                                cyy_writeb(info, CySRER,
-                                        cyy_readb(info, CySRER) | CyTxRdy);
-                                tty_wakeup(tty);
-                        }
-                } else {
-                        if (!(mdm_status & CyCTS)) {
-                                /* cy_stop isn't used
-                                   because ... !!! */
-                                tty->hw_stopped = 1;
-                                cyy_writeb(info, CySRER,
-                                        cyy_readb(info, CySRER) & ~CyTxRdy);
-                        }
-                }
-        }
-/*      if (mdm_change & CyDSR) {
-        }
-        if (mdm_change & CyRI) {
-        }*/
-        tty_kref_put(tty);
-end:
-        /* end of service */
-        cyy_writeb(info, CyMIR, save_xir & 0x3f);
-        cyy_writeb(info, CyCAR, save_car);
-}
-
-/* The real interrupt service routine is called
-   whenever the card wants its hand held--chars
-   received, out buffer empty, modem change, etc.
- */
-static irqreturn_t cyy_interrupt(int irq, void *dev_id)
-{
-        int status;
-        struct cyclades_card *cinfo = dev_id;
-        void __iomem *base_addr, *card_base_addr;
-        unsigned int chip, too_many, had_work;
-        int index;
-
-        if (unlikely(cinfo == NULL)) {
-#ifdef CY_DEBUG_INTERRUPTS
-                printk(KERN_DEBUG "cyy_interrupt: spurious interrupt %d\n",
-                                irq);
-#endif
-                return IRQ_NONE;        /* spurious interrupt */
-        }
-
-        card_base_addr = cinfo->base_addr;
-        index = cinfo->bus_index;
-
-        /* card was not initialized yet (e.g. DEBUG_SHIRQ) */
-        if (unlikely(card_base_addr == NULL))
-                return IRQ_HANDLED;
-
-        /* This loop checks all chips in the card.  Make a note whenever
-           _any_ chip had some work to do, as this is considered an
-           indication that there will be more to do.  Only when no chip
-           has any work does this outermost loop exit.
-         */
-        do {
-                had_work = 0;
-                for (chip = 0; chip < cinfo->num_chips; chip++) {
-                        base_addr = cinfo->base_addr +
-                                        (cy_chip_offset[chip] << index);
-                        too_many = 0;
-                        while ((status = readb(base_addr +
-                                                (CySVRR << index))) != 0x00) {
-                                had_work++;
-                        /* The purpose of the following test is to ensure that
-                           no chip can monopolize the driver.  This forces the
-                           chips to be checked in a round-robin fashion (after
-                           draining each of a bunch (1000) of characters).
-                         */
-                                if (1000 < too_many++)
-                                        break;
-                                spin_lock(&cinfo->card_lock);
-                                if (status & CySRReceive) /* rx intr */
-                                        cyy_chip_rx(cinfo, chip, base_addr);
-                                if (status & CySRTransmit) /* tx intr */
-                                        cyy_chip_tx(cinfo, chip, base_addr);
-                                if (status & CySRModem) /* modem intr */
-                                        cyy_chip_modem(cinfo, chip, base_addr);
-                                spin_unlock(&cinfo->card_lock);
-                        }
-                }
-        } while (had_work);
-
-        /* clear interrupts */
-        spin_lock(&cinfo->card_lock);
-        cy_writeb(card_base_addr + (Cy_ClrIntr << index), 0);
-        /* Cy_ClrIntr is 0x1800 */
-        spin_unlock(&cinfo->card_lock);
-        return IRQ_HANDLED;
-}                               /* cyy_interrupt */
-
-static void cyy_change_rts_dtr(struct cyclades_port *info, unsigned int set,
-                unsigned int clear)
-{
-        struct cyclades_card *card = info->card;
-        int channel = info->line - card->first_line;
-        u32 rts, dtr, msvrr, msvrd;
-
-        channel &= 0x03;
-
-        if (info->rtsdtr_inv) {
-                msvrr = CyMSVR2;
-                msvrd = CyMSVR1;
-                rts = CyDTR;
-                dtr = CyRTS;
-        } else {
-                msvrr = CyMSVR1;
-                msvrd = CyMSVR2;
-                rts = CyRTS;
-                dtr = CyDTR;
-        }
-        if (set & TIOCM_RTS) {
-                cyy_writeb(info, CyCAR, channel);
-                cyy_writeb(info, msvrr, rts);
-        }
-        if (clear & TIOCM_RTS) {
-                cyy_writeb(info, CyCAR, channel);
-                cyy_writeb(info, msvrr, ~rts);
-        }
-        if (set & TIOCM_DTR) {
-                cyy_writeb(info, CyCAR, channel);
-                cyy_writeb(info, msvrd, dtr);
-#ifdef CY_DEBUG_DTR
-                printk(KERN_DEBUG "cyc:set_modem_info raising DTR\n");
-                printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                        cyy_readb(info, CyMSVR1),
-                        cyy_readb(info, CyMSVR2));
-#endif
-        }
-        if (clear & TIOCM_DTR) {
-                cyy_writeb(info, CyCAR, channel);
-                cyy_writeb(info, msvrd, ~dtr);
-#ifdef CY_DEBUG_DTR
-                printk(KERN_DEBUG "cyc:set_modem_info dropping DTR\n");
-                printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                        cyy_readb(info, CyMSVR1),
-                        cyy_readb(info, CyMSVR2));
-#endif
-        }
-}
-
-/***********************************************************/
-/********* End of block of Cyclom-Y specific code **********/
-/******** Start of block of Cyclades-Z specific code *******/
-/***********************************************************/
-
-static int
-cyz_fetch_msg(struct cyclades_card *cinfo,
-                __u32 *channel, __u8 *cmd, __u32 *param)
-{
-        struct BOARD_CTRL __iomem *board_ctrl = cinfo->board_ctrl;
-        unsigned long loc_doorbell;
-
-        loc_doorbell = readl(&cinfo->ctl_addr.p9060->loc_doorbell);
-        if (loc_doorbell) {
-                *cmd = (char)(0xff & loc_doorbell);
-                *channel = readl(&board_ctrl->fwcmd_channel);
-                *param = (__u32) readl(&board_ctrl->fwcmd_param);
-                cy_writel(&cinfo->ctl_addr.p9060->loc_doorbell, 0xffffffff);
-                return 1;
-        }
-        return 0;
-}                               /* cyz_fetch_msg */
-
-static int
-cyz_issue_cmd(struct cyclades_card *cinfo,
-                __u32 channel, __u8 cmd, __u32 param)
-{
-        struct BOARD_CTRL __iomem *board_ctrl = cinfo->board_ctrl;
-        __u32 __iomem *pci_doorbell;
-        unsigned int index;
-
-        if (!cyz_is_loaded(cinfo))
-                return -1;
-
-        index = 0;
-        pci_doorbell = &cinfo->ctl_addr.p9060->pci_doorbell;
-        while ((readl(pci_doorbell) & 0xff) != 0) {
-                if (index++ == 1000)
-                        return (int)(readl(pci_doorbell) & 0xff);
-                udelay(50L);
-        }
-        cy_writel(&board_ctrl->hcmd_channel, channel);
-        cy_writel(&board_ctrl->hcmd_param, param);
-        cy_writel(pci_doorbell, (long)cmd);
-
-        return 0;
-}                               /* cyz_issue_cmd */
-
-static void cyz_handle_rx(struct cyclades_port *info, struct tty_struct *tty)
-{
-        struct BUF_CTRL __iomem *buf_ctrl = info->u.cyz.buf_ctrl;
-        struct cyclades_card *cinfo = info->card;
-        unsigned int char_count;
-        int len;
-#ifdef BLOCKMOVE
-        unsigned char *buf;
-#else
-        char data;
-#endif
-        __u32 rx_put, rx_get, new_rx_get, rx_bufsize, rx_bufaddr;
-
-        rx_get = new_rx_get = readl(&buf_ctrl->rx_get);
-        rx_put = readl(&buf_ctrl->rx_put);
-        rx_bufsize = readl(&buf_ctrl->rx_bufsize);
-        rx_bufaddr = readl(&buf_ctrl->rx_bufaddr);
-        if (rx_put >= rx_get)
-                char_count = rx_put - rx_get;
-        else
-                char_count = rx_put - rx_get + rx_bufsize;
-
-        if (char_count) {
-#ifdef CY_ENABLE_MONITORING
-                info->mon.int_count++;
-                info->mon.char_count += char_count;
-                if (char_count > info->mon.char_max)
-                        info->mon.char_max = char_count;
-                info->mon.char_last = char_count;
-#endif
-                if (tty == NULL) {
-                        /* flush received characters */
-                        new_rx_get = (new_rx_get + char_count) &
-                                        (rx_bufsize - 1);
-                        info->rflush_count++;
-                } else {
-#ifdef BLOCKMOVE
-                /* we'd like to use memcpy(t, f, n) and memset(s, c, count)
-                   for performance, but because of buffer boundaries, there
-                   may be several steps to the operation */
-                        while (1) {
-                                len = tty_prepare_flip_string(tty, &buf,
-                                                char_count);
-                                if (!len)
-                                        break;
-
-                                len = min_t(unsigned int, min(len, char_count),
-                                                rx_bufsize - new_rx_get);
-
-                                memcpy_fromio(buf, cinfo->base_addr +
-                                                rx_bufaddr + new_rx_get, len);
-
-                                new_rx_get = (new_rx_get + len) &
-                                                (rx_bufsize - 1);
-                                char_count -= len;
-                                info->icount.rx += len;
-                                info->idle_stats.recv_bytes += len;
-                        }
-#else
-                        len = tty_buffer_request_room(tty, char_count);
-                        while (len--) {
-                                data = readb(cinfo->base_addr + rx_bufaddr +
-                                                new_rx_get);
-                                new_rx_get = (new_rx_get + 1) &
-                                                        (rx_bufsize - 1);
-                                tty_insert_flip_char(tty, data, TTY_NORMAL);
-                                info->idle_stats.recv_bytes++;
-                                info->icount.rx++;
-                        }
-#endif
-#ifdef CONFIG_CYZ_INTR
-                /* Recalculate the number of chars in the RX buffer and issue
-                   a cmd in case it's higher than the RX high water mark */
-                        rx_put = readl(&buf_ctrl->rx_put);
-                        if (rx_put >= rx_get)
-                                char_count = rx_put - rx_get;
-                        else
-                                char_count = rx_put - rx_get + rx_bufsize;
-                        if (char_count >= readl(&buf_ctrl->rx_threshold) &&
-                                        !timer_pending(&cyz_rx_full_timer[
-                                                        info->line]))
-                                mod_timer(&cyz_rx_full_timer[info->line],
-                                                jiffies + 1);
-#endif
-                        info->idle_stats.recv_idle = jiffies;
-                        tty_schedule_flip(tty);
-                }
-                /* Update rx_get */
-                cy_writel(&buf_ctrl->rx_get, new_rx_get);
-        }
-}
-
-static void cyz_handle_tx(struct cyclades_port *info, struct tty_struct *tty)
-{
-        struct BUF_CTRL __iomem *buf_ctrl = info->u.cyz.buf_ctrl;
-        struct cyclades_card *cinfo = info->card;
-        u8 data;
-        unsigned int char_count;
-#ifdef BLOCKMOVE
-        int small_count;
-#endif
-        __u32 tx_put, tx_get, tx_bufsize, tx_bufaddr;
-
-        if (info->xmit_cnt <= 0)        /* Nothing to transmit */
-                return;
-
-        tx_get = readl(&buf_ctrl->tx_get);
-        tx_put = readl(&buf_ctrl->tx_put);
-        tx_bufsize = readl(&buf_ctrl->tx_bufsize);
-        tx_bufaddr = readl(&buf_ctrl->tx_bufaddr);
-        if (tx_put >= tx_get)
-                char_count = tx_get - tx_put - 1 + tx_bufsize;
-        else
-                char_count = tx_get - tx_put - 1;
-
-        if (char_count) {
-
-                if (tty == NULL)
-                        goto ztxdone;
-
-                if (info->x_char) {     /* send special char */
-                        data = info->x_char;
-
-                        cy_writeb(cinfo->base_addr + tx_bufaddr + tx_put, data);
-                        tx_put = (tx_put + 1) & (tx_bufsize - 1);
-                        info->x_char = 0;
-                        char_count--;
-                        info->icount.tx++;
-                }
-#ifdef BLOCKMOVE
-                while (0 < (small_count = min_t(unsigned int,
-                                tx_bufsize - tx_put, min_t(unsigned int,
-                                        (SERIAL_XMIT_SIZE - info->xmit_tail),
-                                        min_t(unsigned int, info->xmit_cnt,
-                                                char_count))))) {
-
-                        memcpy_toio((char *)(cinfo->base_addr + tx_bufaddr +
-                                        tx_put),
-                                        &info->port.xmit_buf[info->xmit_tail],
-                                        small_count);
-
-                        tx_put = (tx_put + small_count) & (tx_bufsize - 1);
-                        char_count -= small_count;
-                        info->icount.tx += small_count;
-                        info->xmit_cnt -= small_count;
-                        info->xmit_tail = (info->xmit_tail + small_count) &
-                                        (SERIAL_XMIT_SIZE - 1);
-                }
-#else
-                while (info->xmit_cnt && char_count) {
-                        data = info->port.xmit_buf[info->xmit_tail];
-                        info->xmit_cnt--;
-                        info->xmit_tail = (info->xmit_tail + 1) &
-                                        (SERIAL_XMIT_SIZE - 1);
-
-                        cy_writeb(cinfo->base_addr + tx_bufaddr + tx_put, data);
-                        tx_put = (tx_put + 1) & (tx_bufsize - 1);
-                        char_count--;
-                        info->icount.tx++;
-                }
-#endif
-                tty_wakeup(tty);
-ztxdone:
-                /* Update tx_put */
-                cy_writel(&buf_ctrl->tx_put, tx_put);
-        }
-}
-
-static void cyz_handle_cmd(struct cyclades_card *cinfo)
-{
-        struct BOARD_CTRL __iomem *board_ctrl = cinfo->board_ctrl;
-        struct tty_struct *tty;
-        struct cyclades_port *info;
-        __u32 channel, param, fw_ver;
-        __u8 cmd;
-        int special_count;
-        int delta_count;
-
-        fw_ver = readl(&board_ctrl->fw_version);
-
-        while (cyz_fetch_msg(cinfo, &channel, &cmd, &param) == 1) {
-                special_count = 0;
-                delta_count = 0;
-                info = &cinfo->ports[channel];
-                tty = tty_port_tty_get(&info->port);
-                if (tty == NULL)
-                        continue;
-
-                switch (cmd) {
-                case C_CM_PR_ERROR:
-                        tty_insert_flip_char(tty, 0, TTY_PARITY);
-                        info->icount.rx++;
-                        special_count++;
-                        break;
-                case C_CM_FR_ERROR:
-                        tty_insert_flip_char(tty, 0, TTY_FRAME);
-                        info->icount.rx++;
-                        special_count++;
-                        break;
-                case C_CM_RXBRK:
-                        tty_insert_flip_char(tty, 0, TTY_BREAK);
-                        info->icount.rx++;
-                        special_count++;
-                        break;
-                case C_CM_MDCD:
-                        info->icount.dcd++;
-                        delta_count++;
-                        if (info->port.flags & ASYNC_CHECK_CD) {
-                                u32 dcd = fw_ver > 241 ? param :
-                                        readl(&info->u.cyz.ch_ctrl->rs_status);
-                                if (dcd & C_RS_DCD)
-                                        wake_up_interruptible(&info->port.open_wait);
-                                else
-                                        tty_hangup(tty);
-                        }
-                        break;
-                case C_CM_MCTS:
-                        info->icount.cts++;
-                        delta_count++;
-                        break;
-                case C_CM_MRI:
-                        info->icount.rng++;
-                        delta_count++;
-                        break;
-                case C_CM_MDSR:
-                        info->icount.dsr++;
-                        delta_count++;
-                        break;
-#ifdef Z_WAKE
-                case C_CM_IOCTLW:
-                        complete(&info->shutdown_wait);
-                        break;
-#endif
-#ifdef CONFIG_CYZ_INTR
-                case C_CM_RXHIWM:
-                case C_CM_RXNNDT:
-                case C_CM_INTBACK2:
-                        /* Reception Interrupt */
-#ifdef CY_DEBUG_INTERRUPTS
-                        printk(KERN_DEBUG "cyz_interrupt: rcvd intr, card %d, "
-                                        "port %ld\n", info->card, channel);
-#endif
-                        cyz_handle_rx(info, tty);
-                        break;
-                case C_CM_TXBEMPTY:
-                case C_CM_TXLOWWM:
-                case C_CM_INTBACK:
-                        /* Transmission Interrupt */
-#ifdef CY_DEBUG_INTERRUPTS
-                        printk(KERN_DEBUG "cyz_interrupt: xmit intr, card %d, "
-                                        "port %ld\n", info->card, channel);
-#endif
-                        cyz_handle_tx(info, tty);
-                        break;
-#endif                          /* CONFIG_CYZ_INTR */
-                case C_CM_FATAL:
-                        /* should do something with this !!! */
-                        break;
-                default:
-                        break;
-                }
-                if (delta_count)
-                        wake_up_interruptible(&info->port.delta_msr_wait);
-                if (special_count)
-                        tty_schedule_flip(tty);
-                tty_kref_put(tty);
-        }
-}
-
-#ifdef CONFIG_CYZ_INTR
-static irqreturn_t cyz_interrupt(int irq, void *dev_id)
-{
-        struct cyclades_card *cinfo = dev_id;
-
-        if (unlikely(!cyz_is_loaded(cinfo))) {
-#ifdef CY_DEBUG_INTERRUPTS
-                printk(KERN_DEBUG "cyz_interrupt: board not yet loaded "
-                                "(IRQ%d).\n", irq);
-#endif
-                return IRQ_NONE;
-        }
-
-        /* Handle the interrupts */
-        cyz_handle_cmd(cinfo);
-
-        return IRQ_HANDLED;
-}                               /* cyz_interrupt */
-
-static void cyz_rx_restart(unsigned long arg)
-{
-        struct cyclades_port *info = (struct cyclades_port *)arg;
-        struct cyclades_card *card = info->card;
-        int retval;
-        __u32 channel = info->line - card->first_line;
-        unsigned long flags;
-
-        spin_lock_irqsave(&card->card_lock, flags);
-        retval = cyz_issue_cmd(card, channel, C_CM_INTBACK2, 0L);
-        if (retval != 0) {
-                printk(KERN_ERR "cyc:cyz_rx_restart retval on ttyC%d was %x\n",
-                        info->line, retval);
-        }
-        spin_unlock_irqrestore(&card->card_lock, flags);
-}
-
-#else                           /* CONFIG_CYZ_INTR */
-
-static void cyz_poll(unsigned long arg)
-{
-        struct cyclades_card *cinfo;
-        struct cyclades_port *info;
-        unsigned long expires = jiffies + HZ;
-        unsigned int port, card;
-
-        for (card = 0; card < NR_CARDS; card++) {
-                cinfo = &cy_card[card];
-
-                if (!cy_is_Z(cinfo))
-                        continue;
-                if (!cyz_is_loaded(cinfo))
-                        continue;
-
-        /* Skip first polling cycle to avoid racing conditions with the FW */
-                if (!cinfo->intr_enabled) {
-                        cinfo->intr_enabled = 1;
-                        continue;
-                }
-
-                cyz_handle_cmd(cinfo);
-
-                for (port = 0; port < cinfo->nports; port++) {
-                        struct tty_struct *tty;
-
-                        info = &cinfo->ports[port];
-                        tty = tty_port_tty_get(&info->port);
-                        /* OK to pass NULL to the handle functions below.
-                           They need to drop the data in that case. */
-
-                        if (!info->throttle)
-                                cyz_handle_rx(info, tty);
-                        cyz_handle_tx(info, tty);
-                        tty_kref_put(tty);
-                }
-                /* poll every 'cyz_polling_cycle' period */
-                expires = jiffies + cyz_polling_cycle;
-        }
-        mod_timer(&cyz_timerlist, expires);
-}                               /* cyz_poll */
-
-#endif                          /* CONFIG_CYZ_INTR */
-
-/********** End of block of Cyclades-Z specific code *********/
-/***********************************************************/
-
-/* This is called whenever a port becomes active;
-   interrupts are enabled and DTR & RTS are turned on.
- */
-static int cy_startup(struct cyclades_port *info, struct tty_struct *tty)
-{
-        struct cyclades_card *card;
-        unsigned long flags;
-        int retval = 0;
-        int channel;
-        unsigned long page;
-
-        card = info->card;
-        channel = info->line - card->first_line;
-
-        page = get_zeroed_page(GFP_KERNEL);
-        if (!page)
-                return -ENOMEM;
-
-        spin_lock_irqsave(&card->card_lock, flags);
-
-        if (info->port.flags & ASYNC_INITIALIZED)
-                goto errout;
-
-        if (!info->type) {
-                set_bit(TTY_IO_ERROR, &tty->flags);
-                goto errout;
-        }
-
-        if (info->port.xmit_buf)
-                free_page(page);
-        else
-                info->port.xmit_buf = (unsigned char *)page;
-
-        spin_unlock_irqrestore(&card->card_lock, flags);
-
-        cy_set_line_char(info, tty);
-
-        if (!cy_is_Z(card)) {
-                channel &= 0x03;
-
-                spin_lock_irqsave(&card->card_lock, flags);
-
-                cyy_writeb(info, CyCAR, channel);
-
-                cyy_writeb(info, CyRTPR,
-                        (info->default_timeout ? info->default_timeout : 0x02));
-                /* 10ms rx timeout */
-
-                cyy_issue_cmd(info, CyCHAN_CTL | CyENB_RCVR | CyENB_XMTR);
-
-                cyy_change_rts_dtr(info, TIOCM_RTS | TIOCM_DTR, 0);
-
-                cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyRxData);
-        } else {
-                struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
-
-                if (!cyz_is_loaded(card))
-                        return -ENODEV;
-
-#ifdef CY_DEBUG_OPEN
-                printk(KERN_DEBUG "cyc startup Z card %d, channel %d, "
-                        "base_addr %p\n", card, channel, card->base_addr);
-#endif
-                spin_lock_irqsave(&card->card_lock, flags);
-
-                cy_writel(&ch_ctrl->op_mode, C_CH_ENABLE);
-#ifdef Z_WAKE
-#ifdef CONFIG_CYZ_INTR
-                cy_writel(&ch_ctrl->intr_enable,
-                          C_IN_TXBEMPTY | C_IN_TXLOWWM | C_IN_RXHIWM |
-                          C_IN_RXNNDT | C_IN_IOCTLW | C_IN_MDCD);
-#else
-                cy_writel(&ch_ctrl->intr_enable,
-                          C_IN_IOCTLW | C_IN_MDCD);
-#endif                          /* CONFIG_CYZ_INTR */
-#else
-#ifdef CONFIG_CYZ_INTR
-                cy_writel(&ch_ctrl->intr_enable,
-                          C_IN_TXBEMPTY | C_IN_TXLOWWM | C_IN_RXHIWM |
-                          C_IN_RXNNDT | C_IN_MDCD);
-#else
-                cy_writel(&ch_ctrl->intr_enable, C_IN_MDCD);
-#endif                          /* CONFIG_CYZ_INTR */
-#endif                          /* Z_WAKE */
-
-                retval = cyz_issue_cmd(card, channel, C_CM_IOCTL, 0L);
-                if (retval != 0) {
-                        printk(KERN_ERR "cyc:startup(1) retval on ttyC%d was "
-                                "%x\n", info->line, retval);
-                }
-
-                /* Flush RX buffers before raising DTR and RTS */
-                retval = cyz_issue_cmd(card, channel, C_CM_FLUSH_RX, 0L);
-                if (retval != 0) {
-                        printk(KERN_ERR "cyc:startup(2) retval on ttyC%d was "
-                                "%x\n", info->line, retval);
-                }
-
-                /* set timeout !!! */
-                /* set RTS and DTR !!! */
-                tty_port_raise_dtr_rts(&info->port);
-
-                /* enable send, recv, modem !!! */
-        }
-
-        info->port.flags |= ASYNC_INITIALIZED;
-
-        clear_bit(TTY_IO_ERROR, &tty->flags);
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-        info->breakon = info->breakoff = 0;
-        memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats));
-        info->idle_stats.in_use =
-        info->idle_stats.recv_idle =
-        info->idle_stats.xmit_idle = jiffies;
-
-        spin_unlock_irqrestore(&card->card_lock, flags);
-
-#ifdef CY_DEBUG_OPEN
-        printk(KERN_DEBUG "cyc startup done\n");
-#endif
-        return 0;
-
-errout:
-        spin_unlock_irqrestore(&card->card_lock, flags);
-        free_page(page);
-        return retval;
-}                               /* startup */
-
-static void start_xmit(struct cyclades_port *info)
-{
-        struct cyclades_card *card = info->card;
-        unsigned long flags;
-        int channel = info->line - card->first_line;
-
-        if (!cy_is_Z(card)) {
-                spin_lock_irqsave(&card->card_lock, flags);
-                cyy_writeb(info, CyCAR, channel & 0x03);
-                cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyTxRdy);
-                spin_unlock_irqrestore(&card->card_lock, flags);
-        } else {
-#ifdef CONFIG_CYZ_INTR
-                int retval;
-
-                spin_lock_irqsave(&card->card_lock, flags);
-                retval = cyz_issue_cmd(card, channel, C_CM_INTBACK, 0L);
-                if (retval != 0) {
-                        printk(KERN_ERR "cyc:start_xmit retval on ttyC%d was "
-                                "%x\n", info->line, retval);
-                }
-                spin_unlock_irqrestore(&card->card_lock, flags);
-#else                           /* CONFIG_CYZ_INTR */
-                /* Don't have to do anything at this time */
-#endif                          /* CONFIG_CYZ_INTR */
-        }
-}                               /* start_xmit */
-
-/*
- * This routine shuts down a serial port; interrupts are disabled,
- * and DTR is dropped if the hangup on close termio flag is on.
- */
-static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
-{
-        struct cyclades_card *card;
-        unsigned long flags;
-        int channel;
-
-        if (!(info->port.flags & ASYNC_INITIALIZED))
-                return;
-
-        card = info->card;
-        channel = info->line - card->first_line;
-        if (!cy_is_Z(card)) {
-                spin_lock_irqsave(&card->card_lock, flags);
-
-                /* Clear delta_msr_wait queue to avoid mem leaks. */
-                wake_up_interruptible(&info->port.delta_msr_wait);
-
-                if (info->port.xmit_buf) {
-                        unsigned char *temp;
-                        temp = info->port.xmit_buf;
-                        info->port.xmit_buf = NULL;
-                        free_page((unsigned long)temp);
-                }
-                if (tty->termios->c_cflag & HUPCL)
-                        cyy_change_rts_dtr(info, 0, TIOCM_RTS | TIOCM_DTR);
-
-                cyy_issue_cmd(info, CyCHAN_CTL | CyDIS_RCVR);
-                /* it may be appropriate to clear _XMIT at
-                   some later date (after testing)!!! */
-
-                set_bit(TTY_IO_ERROR, &tty->flags);
-                info->port.flags &= ~ASYNC_INITIALIZED;
-                spin_unlock_irqrestore(&card->card_lock, flags);
-        } else {
-#ifdef CY_DEBUG_OPEN
-                printk(KERN_DEBUG "cyc shutdown Z card %d, channel %d, "
-                        "base_addr %p\n", card, channel, card->base_addr);
-#endif
-
-                if (!cyz_is_loaded(card))
-                        return;
-
-                spin_lock_irqsave(&card->card_lock, flags);
-
-                if (info->port.xmit_buf) {
-                        unsigned char *temp;
-                        temp = info->port.xmit_buf;
-                        info->port.xmit_buf = NULL;
-                        free_page((unsigned long)temp);
-                }
-
-                if (tty->termios->c_cflag & HUPCL)
-                        tty_port_lower_dtr_rts(&info->port);
-
-                set_bit(TTY_IO_ERROR, &tty->flags);
-                info->port.flags &= ~ASYNC_INITIALIZED;
-
-                spin_unlock_irqrestore(&card->card_lock, flags);
-        }
-
-#ifdef CY_DEBUG_OPEN
-        printk(KERN_DEBUG "cyc shutdown done\n");
-#endif
-}                               /* shutdown */
-
-/*
- * ------------------------------------------------------------
- * cy_open() and friends
- * ------------------------------------------------------------
- */
-
-/*
- * This routine is called whenever a serial port is opened.  It
- * performs the serial-specific initialization for the tty structure.
- */
-static int cy_open(struct tty_struct *tty, struct file *filp)
-{
-        struct cyclades_port *info;
-        unsigned int i, line;
-        int retval;
-
-        line = tty->index;
-        if (tty->index < 0 || NR_PORTS <= line)
-                return -ENODEV;
-
-        for (i = 0; i < NR_CARDS; i++)
-                if (line < cy_card[i].first_line + cy_card[i].nports &&
-                                line >= cy_card[i].first_line)
-                        break;
-        if (i >= NR_CARDS)
-                return -ENODEV;
-        info = &cy_card[i].ports[line - cy_card[i].first_line];
-        if (info->line < 0)
-                return -ENODEV;
-
-        /* If the card's firmware hasn't been loaded,
-           treat it as absent from the system.  This
-           will make the user pay attention.
-         */
-        if (cy_is_Z(info->card)) {
-                struct cyclades_card *cinfo = info->card;
-                struct FIRM_ID __iomem *firm_id = cinfo->base_addr + ID_ADDRESS;
-
-                if (!cyz_is_loaded(cinfo)) {
-                        if (cinfo->hw_ver == ZE_V1 && cyz_fpga_loaded(cinfo) &&
-                                        readl(&firm_id->signature) ==
-                                        ZFIRM_HLT) {
-                                printk(KERN_ERR "cyc:Cyclades-Z Error: you "
-                                        "need an external power supply for "
-                                        "this number of ports.\nFirmware "
-                                        "halted.\n");
-                        } else {
-                                printk(KERN_ERR "cyc:Cyclades-Z firmware not "
-                                        "yet loaded\n");
-                        }
-                        return -ENODEV;
-                }
-#ifdef CONFIG_CYZ_INTR
-                else {
-                /* In case this Z board is operating in interrupt mode, its
-                   interrupts should be enabled as soon as the first open
-                   happens to one of its ports. */
-                        if (!cinfo->intr_enabled) {
-                                u16 intr;
-
-                                /* Enable interrupts on the PLX chip */
-                                intr = readw(&cinfo->ctl_addr.p9060->
-                                                intr_ctrl_stat) | 0x0900;
-                                cy_writew(&cinfo->ctl_addr.p9060->
-                                                intr_ctrl_stat, intr);
-                                /* Enable interrupts on the FW */
-                                retval = cyz_issue_cmd(cinfo, 0,
-                                                C_CM_IRQ_ENBL, 0L);
-                                if (retval != 0) {
-                                        printk(KERN_ERR "cyc:IRQ enable retval "
-                                                "was %x\n", retval);
-                                }
-                                cinfo->intr_enabled = 1;
-                        }
-                }
-#endif                          /* CONFIG_CYZ_INTR */
-                /* Make sure this Z port really exists in hardware */
-                if (info->line > (cinfo->first_line + cinfo->nports - 1))
-                        return -ENODEV;
-        }
-#ifdef CY_DEBUG_OTHER
-        printk(KERN_DEBUG "cyc:cy_open ttyC%d\n", info->line);
-#endif
-        tty->driver_data = info;
-        if (serial_paranoia_check(info, tty->name, "cy_open"))
-                return -ENODEV;
-
-#ifdef CY_DEBUG_OPEN
-        printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
-                        info->port.count);
-#endif
-        info->port.count++;
-#ifdef CY_DEBUG_COUNT
-        printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
-                current->pid, info->port.count);
-#endif
-
-        /*
-         * If the port is the middle of closing, bail out now
-         */
-        if (tty_hung_up_p(filp) || (info->port.flags & ASYNC_CLOSING)) {
-                wait_event_interruptible_tty(info->port.close_wait,
-                                !(info->port.flags & ASYNC_CLOSING));
-                return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;
-        }
-
-        /*
-         * Start up serial port
-         */
-        retval = cy_startup(info, tty);
-        if (retval)
-                return retval;
-
-        retval = tty_port_block_til_ready(&info->port, tty, filp);
-        if (retval) {
-#ifdef CY_DEBUG_OPEN
-                printk(KERN_DEBUG "cyc:cy_open returning after block_til_ready "
-                        "with %d\n", retval);
-#endif
-                return retval;
-        }
-
-        info->throttle = 0;
-        tty_port_tty_set(&info->port, tty);
-
-#ifdef CY_DEBUG_OPEN
-        printk(KERN_DEBUG "cyc:cy_open done\n");
-#endif
-        return 0;
-}                               /* cy_open */
-
-/*
- * cy_wait_until_sent() --- wait until the transmitter is empty
- */
-static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-        struct cyclades_card *card;
-        struct cyclades_port *info = tty->driver_data;
-        unsigned long orig_jiffies;
-        int char_time;
-
-        if (serial_paranoia_check(info, tty->name, "cy_wait_until_sent"))
-                return;
-
-        if (info->xmit_fifo_size == 0)
-                return;         /* Just in case.... */
-
-        orig_jiffies = jiffies;
-        /*
-         * Set the check interval to be 1/5 of the estimated time to
-         * send a single character, and make it at least 1.  The check
-         * interval should also be less than the timeout.
-         *
-         * Note: we have to use pretty tight timings here to satisfy
-         * the NIST-PCTS.
-         */
-        char_time = (info->timeout - HZ / 50) / info->xmit_fifo_size;
-        char_time = char_time / 5;
-        if (char_time <= 0)
-                char_time = 1;
-        if (timeout < 0)
-                timeout = 0;
-        if (timeout)
-                char_time = min(char_time, timeout);
-        /*
-         * If the transmitter hasn't cleared in twice the approximate
-         * amount of time to send the entire FIFO, it probably won't
-         * ever clear.  This assumes the UART isn't doing flow
-         * control, which is currently the case.  Hence, if it ever
-         * takes longer than info->timeout, this is probably due to a
-         * UART bug of some kind.  So, we clamp the timeout parameter at
-         * 2*info->timeout.
-         */
-        if (!timeout || timeout > 2 * info->timeout)
-                timeout = 2 * info->timeout;
-#ifdef CY_DEBUG_WAIT_UNTIL_SENT
-        printk(KERN_DEBUG "In cy_wait_until_sent(%d) check=%d, jiff=%lu...",
-                timeout, char_time, jiffies);
-#endif
-        card = info->card;
-        if (!cy_is_Z(card)) {
-                while (cyy_readb(info, CySRER) & CyTxRdy) {
-#ifdef CY_DEBUG_WAIT_UNTIL_SENT
-                        printk(KERN_DEBUG "Not clean (jiff=%lu)...", jiffies);
-#endif
-                        if (msleep_interruptible(jiffies_to_msecs(char_time)))
-                                break;
-                        if (timeout && time_after(jiffies, orig_jiffies +
-                                        timeout))
-                                break;
-                }
-        }
-        /* Run one more char cycle */
-        msleep_interruptible(jiffies_to_msecs(char_time * 5));
-#ifdef CY_DEBUG_WAIT_UNTIL_SENT
-        printk(KERN_DEBUG "Clean (jiff=%lu)...done\n", jiffies);
-#endif
-}
-
-static void cy_flush_buffer(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-        struct cyclades_card *card;
-        int channel, retval;
-        unsigned long flags;
-
-#ifdef CY_DEBUG_IO
-        printk(KERN_DEBUG "cyc:cy_flush_buffer ttyC%d\n", info->line);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_flush_buffer"))
-                return;
-
-        card = info->card;
-        channel = info->line - card->first_line;
-
-        spin_lock_irqsave(&card->card_lock, flags);
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-        spin_unlock_irqrestore(&card->card_lock, flags);
-
-        if (cy_is_Z(card)) {    /* If it is a Z card, flush the on-board
-                                           buffers as well */
-                spin_lock_irqsave(&card->card_lock, flags);
-                retval = cyz_issue_cmd(card, channel, C_CM_FLUSH_TX, 0L);
-                if (retval != 0) {
-                        printk(KERN_ERR "cyc: flush_buffer retval on ttyC%d "
-                                "was %x\n", info->line, retval);
-                }
-                spin_unlock_irqrestore(&card->card_lock, flags);
-        }
-        tty_wakeup(tty);
-}                               /* cy_flush_buffer */
-
-
-static void cy_do_close(struct tty_port *port)
-{
-        struct cyclades_port *info = container_of(port, struct cyclades_port,
-                                                                port);
-        struct cyclades_card *card;
-        unsigned long flags;
-        int channel;
-
-        card = info->card;
-        channel = info->line - card->first_line;
-        spin_lock_irqsave(&card->card_lock, flags);
-
-        if (!cy_is_Z(card)) {
-                /* Stop accepting input */
-                cyy_writeb(info, CyCAR, channel & 0x03);
-                cyy_writeb(info, CySRER, cyy_readb(info, CySRER) & ~CyRxData);
-                if (info->port.flags & ASYNC_INITIALIZED) {
-                        /* Waiting for on-board buffers to be empty before
-                           closing the port */
-                        spin_unlock_irqrestore(&card->card_lock, flags);
-                        cy_wait_until_sent(port->tty, info->timeout);
-                        spin_lock_irqsave(&card->card_lock, flags);
-                }
-        } else {
-#ifdef Z_WAKE
-                /* Waiting for on-board buffers to be empty before closing
-                   the port */
-                struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
-                int retval;
-
-                if (readl(&ch_ctrl->flow_status) != C_FS_TXIDLE) {
-                        retval = cyz_issue_cmd(card, channel, C_CM_IOCTLW, 0L);
-                        if (retval != 0) {
-                                printk(KERN_DEBUG "cyc:cy_close retval on "
-                                        "ttyC%d was %x\n", info->line, retval);
-                        }
-                        spin_unlock_irqrestore(&card->card_lock, flags);
-                        wait_for_completion_interruptible(&info->shutdown_wait);
-                        spin_lock_irqsave(&card->card_lock, flags);
-                }
-#endif
-        }
-        spin_unlock_irqrestore(&card->card_lock, flags);
-        cy_shutdown(info, port->tty);
-}
-
-/*
- * This routine is called when a particular tty device is closed.
- */
-static void cy_close(struct tty_struct *tty, struct file *filp)
-{
-        struct cyclades_port *info = tty->driver_data;
-        if (!info || serial_paranoia_check(info, tty->name, "cy_close"))
-                return;
-        tty_port_close(&info->port, tty, filp);
-}                               /* cy_close */
-
-/* This routine gets called when tty_write has put something into
- * the write_queue.  The characters may come from user space or
- * kernel space.
- *
- * This routine will return the number of characters actually
- * accepted for writing.
- *
- * If the port is not already transmitting stuff, start it off by
- * enabling interrupts.  The interrupt service routine will then
- * ensure that the characters are sent.
- * If the port is already active, there is no need to kick it.
- *
- */
-static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
-{
-        struct cyclades_port *info = tty->driver_data;
-        unsigned long flags;
-        int c, ret = 0;
-
-#ifdef CY_DEBUG_IO
-        printk(KERN_DEBUG "cyc:cy_write ttyC%d\n", info->line);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_write"))
-                return 0;
-
-        if (!info->port.xmit_buf)
-                return 0;
-
-        spin_lock_irqsave(&info->card->card_lock, flags);
-        while (1) {
-                c = min(count, (int)(SERIAL_XMIT_SIZE - info->xmit_cnt - 1));
-                c = min(c, (int)(SERIAL_XMIT_SIZE - info->xmit_head));
-
-                if (c <= 0)
-                        break;
-
-                memcpy(info->port.xmit_buf + info->xmit_head, buf, c);
-                info->xmit_head = (info->xmit_head + c) &
-                        (SERIAL_XMIT_SIZE - 1);
-                info->xmit_cnt += c;
-                buf += c;
-                count -= c;
-                ret += c;
-        }
-        spin_unlock_irqrestore(&info->card->card_lock, flags);
-
-        info->idle_stats.xmit_bytes += ret;
-        info->idle_stats.xmit_idle = jiffies;
-
-        if (info->xmit_cnt && !tty->stopped && !tty->hw_stopped)
-                start_xmit(info);
-
-        return ret;
-}                               /* cy_write */
-
-/*
- * This routine is called by the kernel to write a single
- * character to the tty device.  If the kernel uses this routine,
- * it must call the flush_chars() routine (if defined) when it is
- * done stuffing characters into the driver.  If there is no room
- * in the queue, the character is ignored.
- */
-static int cy_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        struct cyclades_port *info = tty->driver_data;
-        unsigned long flags;
-
-#ifdef CY_DEBUG_IO
-        printk(KERN_DEBUG "cyc:cy_put_char ttyC%d\n", info->line);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_put_char"))
-                return 0;
-
-        if (!info->port.xmit_buf)
-                return 0;
-
-        spin_lock_irqsave(&info->card->card_lock, flags);
-        if (info->xmit_cnt >= (int)(SERIAL_XMIT_SIZE - 1)) {
-                spin_unlock_irqrestore(&info->card->card_lock, flags);
-                return 0;
-        }
-
-        info->port.xmit_buf[info->xmit_head++] = ch;
-        info->xmit_head &= SERIAL_XMIT_SIZE - 1;
-        info->xmit_cnt++;
-        info->idle_stats.xmit_bytes++;
-        info->idle_stats.xmit_idle = jiffies;
-        spin_unlock_irqrestore(&info->card->card_lock, flags);
-        return 1;
-}                               /* cy_put_char */
-
-/*
- * This routine is called by the kernel after it has written a
- * series of characters to the tty device using put_char().
- */
-static void cy_flush_chars(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-
-#ifdef CY_DEBUG_IO
-        printk(KERN_DEBUG "cyc:cy_flush_chars ttyC%d\n", info->line);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_flush_chars"))
-                return;
-
-        if (info->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
-                        !info->port.xmit_buf)
-                return;
-
-        start_xmit(info);
-}                               /* cy_flush_chars */
-
-/*
- * This routine returns the numbers of characters the tty driver
- * will accept for queuing to be written.  This number is subject
- * to change as output buffers get emptied, or if the output flow
- * control is activated.
- */
-static int cy_write_room(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-        int ret;
-
-#ifdef CY_DEBUG_IO
-        printk(KERN_DEBUG "cyc:cy_write_room ttyC%d\n", info->line);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_write_room"))
-                return 0;
-        ret = SERIAL_XMIT_SIZE - info->xmit_cnt - 1;
-        if (ret < 0)
-                ret = 0;
-        return ret;
-}                               /* cy_write_room */
-
-static int cy_chars_in_buffer(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-
-        if (serial_paranoia_check(info, tty->name, "cy_chars_in_buffer"))
-                return 0;
-
-#ifdef Z_EXT_CHARS_IN_BUFFER
-        if (!cy_is_Z(info->card)) {
-#endif                          /* Z_EXT_CHARS_IN_BUFFER */
-#ifdef CY_DEBUG_IO
-                printk(KERN_DEBUG "cyc:cy_chars_in_buffer ttyC%d %d\n",
-                        info->line, info->xmit_cnt);
-#endif
-                return info->xmit_cnt;
-#ifdef Z_EXT_CHARS_IN_BUFFER
-        } else {
-                struct BUF_CTRL __iomem *buf_ctrl = info->u.cyz.buf_ctrl;
-                int char_count;
-                __u32 tx_put, tx_get, tx_bufsize;
-
-                tx_get = readl(&buf_ctrl->tx_get);
-                tx_put = readl(&buf_ctrl->tx_put);
-                tx_bufsize = readl(&buf_ctrl->tx_bufsize);
-                if (tx_put >= tx_get)
-                        char_count = tx_put - tx_get;
-                else
-                        char_count = tx_put - tx_get + tx_bufsize;
-#ifdef CY_DEBUG_IO
-                printk(KERN_DEBUG "cyc:cy_chars_in_buffer ttyC%d %d\n",
-                        info->line, info->xmit_cnt + char_count);
-#endif
-                return info->xmit_cnt + char_count;
-        }
-#endif                          /* Z_EXT_CHARS_IN_BUFFER */
-}                               /* cy_chars_in_buffer */
-
-/*
- * ------------------------------------------------------------
- * cy_ioctl() and friends
- * ------------------------------------------------------------
- */
-
-static void cyy_baud_calc(struct cyclades_port *info, __u32 baud)
-{
-        int co, co_val, bpr;
-        __u32 cy_clock = ((info->chip_rev >= CD1400_REV_J) ? 60000000 :
-                        25000000);
-
-        if (baud == 0) {
-                info->tbpr = info->tco = info->rbpr = info->rco = 0;
-                return;
-        }
-
-        /* determine which prescaler to use */
-        for (co = 4, co_val = 2048; co; co--, co_val >>= 2) {
-                if (cy_clock / co_val / baud > 63)
-                        break;
-        }
-
-        bpr = (cy_clock / co_val * 2 / baud + 1) / 2;
-        if (bpr > 255)
-                bpr = 255;
-
-        info->tbpr = info->rbpr = bpr;
-        info->tco = info->rco = co;
-}
-
-/*
- * This routine finds or computes the various line characteristics.
- * It used to be called config_setup
- */
-static void cy_set_line_char(struct cyclades_port *info, struct tty_struct *tty)
-{
-        struct cyclades_card *card;
-        unsigned long flags;
-        int channel;
-        unsigned cflag, iflag;
-        int baud, baud_rate = 0;
-        int i;
-
-        if (!tty->termios) /* XXX can this happen at all? */
-                return;
-
-        if (info->line == -1)
-                return;
-
-        cflag = tty->termios->c_cflag;
-        iflag = tty->termios->c_iflag;
-
-        /*
-         * Set up the tty->alt_speed kludge
-         */
-        if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                tty->alt_speed = 57600;
-        if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                tty->alt_speed = 115200;
-        if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                tty->alt_speed = 230400;
-        if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                tty->alt_speed = 460800;
-
-        card = info->card;
-        channel = info->line - card->first_line;
-
-        if (!cy_is_Z(card)) {
-                u32 cflags;
-
-                /* baud rate */
-                baud = tty_get_baud_rate(tty);
-                if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
-                                ASYNC_SPD_CUST) {
-                        if (info->custom_divisor)
-                                baud_rate = info->baud / info->custom_divisor;
-                        else
-                                baud_rate = info->baud;
-                } else if (baud > CD1400_MAX_SPEED) {
-                        baud = CD1400_MAX_SPEED;
-                }
-                /* find the baud index */
-                for (i = 0; i < 20; i++) {
-                        if (baud == baud_table[i])
-                                break;
-                }
-                if (i == 20)
-                        i = 19; /* CD1400_MAX_SPEED */
-
-                if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
-                                ASYNC_SPD_CUST) {
-                        cyy_baud_calc(info, baud_rate);
-                } else {
-                        if (info->chip_rev >= CD1400_REV_J) {
-                                /* It is a CD1400 rev. J or later */
-                                info->tbpr = baud_bpr_60[i];    /* Tx BPR */
-                                info->tco = baud_co_60[i];      /* Tx CO */
-                                info->rbpr = baud_bpr_60[i];    /* Rx BPR */
-                                info->rco = baud_co_60[i];      /* Rx CO */
-                        } else {
-                                info->tbpr = baud_bpr_25[i];    /* Tx BPR */
-                                info->tco = baud_co_25[i];      /* Tx CO */
-                                info->rbpr = baud_bpr_25[i];    /* Rx BPR */
-                                info->rco = baud_co_25[i];      /* Rx CO */
-                        }
-                }
-                if (baud_table[i] == 134) {
-                        /* get it right for 134.5 baud */
-                        info->timeout = (info->xmit_fifo_size * HZ * 30 / 269) +
-                                        2;
-                } else if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
-                                ASYNC_SPD_CUST) {
-                        info->timeout = (info->xmit_fifo_size * HZ * 15 /
-                                        baud_rate) + 2;
-                } else if (baud_table[i]) {
-                        info->timeout = (info->xmit_fifo_size * HZ * 15 /
-                                        baud_table[i]) + 2;
-                        /* this needs to be propagated into the card info */
-                } else {
-                        info->timeout = 0;
-                }
-                /* By tradition (is it a standard?) a baud rate of zero
-                   implies the line should be/has been closed.  A bit
-                   later in this routine such a test is performed. */
-
-                /* byte size and parity */
-                info->cor5 = 0;
-                info->cor4 = 0;
-                /* receive threshold */
-                info->cor3 = (info->default_threshold ?
-                                info->default_threshold : baud_cor3[i]);
-                info->cor2 = CyETC;
-                switch (cflag & CSIZE) {
-                case CS5:
-                        info->cor1 = Cy_5_BITS;
-                        break;
-                case CS6:
-                        info->cor1 = Cy_6_BITS;
-                        break;
-                case CS7:
-                        info->cor1 = Cy_7_BITS;
-                        break;
-                case CS8:
-                        info->cor1 = Cy_8_BITS;
-                        break;
-                }
-                if (cflag & CSTOPB)
-                        info->cor1 |= Cy_2_STOP;
-
-                if (cflag & PARENB) {
-                        if (cflag & PARODD)
-                                info->cor1 |= CyPARITY_O;
-                        else
-                                info->cor1 |= CyPARITY_E;
-                } else
-                        info->cor1 |= CyPARITY_NONE;
-
-                /* CTS flow control flag */
-                if (cflag & CRTSCTS) {
-                        info->port.flags |= ASYNC_CTS_FLOW;
-                        info->cor2 |= CyCtsAE;
-                } else {
-                        info->port.flags &= ~ASYNC_CTS_FLOW;
-                        info->cor2 &= ~CyCtsAE;
-                }
-                if (cflag & CLOCAL)
-                        info->port.flags &= ~ASYNC_CHECK_CD;
-                else
-                        info->port.flags |= ASYNC_CHECK_CD;
-
-         /***********************************************
-            The hardware option, CyRtsAO, presents RTS when
-            the chip has characters to send.  Since most modems
-            use RTS as reverse (inbound) flow control, this
-            option is not used.  If inbound flow control is
-            necessary, DTR can be programmed to provide the
-            appropriate signals for use with a non-standard
-            cable.  Contact Marcio Saito for details.
-         ***********************************************/
-
-                channel &= 0x03;
-
-                spin_lock_irqsave(&card->card_lock, flags);
-                cyy_writeb(info, CyCAR, channel);
-
-                /* tx and rx baud rate */
-
-                cyy_writeb(info, CyTCOR, info->tco);
-                cyy_writeb(info, CyTBPR, info->tbpr);
-                cyy_writeb(info, CyRCOR, info->rco);
-                cyy_writeb(info, CyRBPR, info->rbpr);
-
-                /* set line characteristics  according configuration */
-
-                cyy_writeb(info, CySCHR1, START_CHAR(tty));
-                cyy_writeb(info, CySCHR2, STOP_CHAR(tty));
-                cyy_writeb(info, CyCOR1, info->cor1);
-                cyy_writeb(info, CyCOR2, info->cor2);
-                cyy_writeb(info, CyCOR3, info->cor3);
-                cyy_writeb(info, CyCOR4, info->cor4);
-                cyy_writeb(info, CyCOR5, info->cor5);
-
-                cyy_issue_cmd(info, CyCOR_CHANGE | CyCOR1ch | CyCOR2ch |
-                                CyCOR3ch);
-
-                /* !!! Is this needed? */
-                cyy_writeb(info, CyCAR, channel);
-                cyy_writeb(info, CyRTPR,
-                        (info->default_timeout ? info->default_timeout : 0x02));
-                /* 10ms rx timeout */
-
-                cflags = CyCTS;
-                if (!C_CLOCAL(tty))
-                        cflags |= CyDSR | CyRI | CyDCD;
-                /* without modem intr */
-                cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyMdmCh);
-                /* act on 1->0 modem transitions */
-                if ((cflag & CRTSCTS) && info->rflow)
-                        cyy_writeb(info, CyMCOR1, cflags | rflow_thr[i]);
-                else
-                        cyy_writeb(info, CyMCOR1, cflags);
-                /* act on 0->1 modem transitions */
-                cyy_writeb(info, CyMCOR2, cflags);
-
-                if (i == 0)     /* baud rate is zero, turn off line */
-                        cyy_change_rts_dtr(info, 0, TIOCM_DTR);
-                else
-                        cyy_change_rts_dtr(info, TIOCM_DTR, 0);
-
-                clear_bit(TTY_IO_ERROR, &tty->flags);
-                spin_unlock_irqrestore(&card->card_lock, flags);
-
-        } else {
-                struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
-                __u32 sw_flow;
-                int retval;
-
-                if (!cyz_is_loaded(card))
-                        return;
-
-                /* baud rate */
-                baud = tty_get_baud_rate(tty);
-                if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
-                                ASYNC_SPD_CUST) {
-                        if (info->custom_divisor)
-                                baud_rate = info->baud / info->custom_divisor;
-                        else
-                                baud_rate = info->baud;
-                } else if (baud > CYZ_MAX_SPEED) {
-                        baud = CYZ_MAX_SPEED;
-                }
-                cy_writel(&ch_ctrl->comm_baud, baud);
-
-                if (baud == 134) {
-                        /* get it right for 134.5 baud */
-                        info->timeout = (info->xmit_fifo_size * HZ * 30 / 269) +
-                                        2;
-                } else if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
-                                ASYNC_SPD_CUST) {
-                        info->timeout = (info->xmit_fifo_size * HZ * 15 /
-                                        baud_rate) + 2;
-                } else if (baud) {
-                        info->timeout = (info->xmit_fifo_size * HZ * 15 /
-                                        baud) + 2;
-                        /* this needs to be propagated into the card info */
-                } else {
-                        info->timeout = 0;
-                }
-
-                /* byte size and parity */
-                switch (cflag & CSIZE) {
-                case CS5:
-                        cy_writel(&ch_ctrl->comm_data_l, C_DL_CS5);
-                        break;
-                case CS6:
-                        cy_writel(&ch_ctrl->comm_data_l, C_DL_CS6);
-                        break;
-                case CS7:
-                        cy_writel(&ch_ctrl->comm_data_l, C_DL_CS7);
-                        break;
-                case CS8:
-                        cy_writel(&ch_ctrl->comm_data_l, C_DL_CS8);
-                        break;
-                }
-                if (cflag & CSTOPB) {
-                        cy_writel(&ch_ctrl->comm_data_l,
-                                  readl(&ch_ctrl->comm_data_l) | C_DL_2STOP);
-                } else {
-                        cy_writel(&ch_ctrl->comm_data_l,
-                                  readl(&ch_ctrl->comm_data_l) | C_DL_1STOP);
-                }
-                if (cflag & PARENB) {
-                        if (cflag & PARODD)
-                                cy_writel(&ch_ctrl->comm_parity, C_PR_ODD);
-                        else
-                                cy_writel(&ch_ctrl->comm_parity, C_PR_EVEN);
-                } else
-                        cy_writel(&ch_ctrl->comm_parity, C_PR_NONE);
-
-                /* CTS flow control flag */
-                if (cflag & CRTSCTS) {
-                        cy_writel(&ch_ctrl->hw_flow,
-                                readl(&ch_ctrl->hw_flow) | C_RS_CTS | C_RS_RTS);
-                } else {
-                        cy_writel(&ch_ctrl->hw_flow, readl(&ch_ctrl->hw_flow) &
-                                        ~(C_RS_CTS | C_RS_RTS));
-                }
-                /* As the HW flow control is done in firmware, the driver
-                   doesn't need to care about it */
-                info->port.flags &= ~ASYNC_CTS_FLOW;
-
-                /* XON/XOFF/XANY flow control flags */
-                sw_flow = 0;
-                if (iflag & IXON) {
-                        sw_flow |= C_FL_OXX;
-                        if (iflag & IXANY)
-                                sw_flow |= C_FL_OIXANY;
-                }
-                cy_writel(&ch_ctrl->sw_flow, sw_flow);
-
-                retval = cyz_issue_cmd(card, channel, C_CM_IOCTL, 0L);
-                if (retval != 0) {
-                        printk(KERN_ERR "cyc:set_line_char retval on ttyC%d "
-                                "was %x\n", info->line, retval);
-                }
-
-                /* CD sensitivity */
-                if (cflag & CLOCAL)
-                        info->port.flags &= ~ASYNC_CHECK_CD;
-                else
-                        info->port.flags |= ASYNC_CHECK_CD;
-
-                if (baud == 0) {        /* baud rate is zero, turn off line */
-                        cy_writel(&ch_ctrl->rs_control,
-                                  readl(&ch_ctrl->rs_control) & ~C_RS_DTR);
-#ifdef CY_DEBUG_DTR
-                        printk(KERN_DEBUG "cyc:set_line_char dropping Z DTR\n");
-#endif
-                } else {
-                        cy_writel(&ch_ctrl->rs_control,
-                                  readl(&ch_ctrl->rs_control) | C_RS_DTR);
-#ifdef CY_DEBUG_DTR
-                        printk(KERN_DEBUG "cyc:set_line_char raising Z DTR\n");
-#endif
-                }
-
-                retval = cyz_issue_cmd(card, channel, C_CM_IOCTLM, 0L);
-                if (retval != 0) {
-                        printk(KERN_ERR "cyc:set_line_char(2) retval on ttyC%d "
-                                "was %x\n", info->line, retval);
-                }
-
-                clear_bit(TTY_IO_ERROR, &tty->flags);
-        }
-}                               /* set_line_char */
-
-static int cy_get_serial_info(struct cyclades_port *info,
-                struct serial_struct __user *retinfo)
-{
-        struct cyclades_card *cinfo = info->card;
-        struct serial_struct tmp = {
-                .type = info->type,
-                .line = info->line,
-                .port = (info->card - cy_card) * 0x100 + info->line -
-                        cinfo->first_line,
-                .irq = cinfo->irq,
-                .flags = info->port.flags,
-                .close_delay = info->port.close_delay,
-                .closing_wait = info->port.closing_wait,
-                .baud_base = info->baud,
-                .custom_divisor = info->custom_divisor,
-                .hub6 = 0,              /*!!! */
-        };
-        return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;
-}
-
-static int
-cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty,
-                struct serial_struct __user *new_info)
-{
-        struct serial_struct new_serial;
-        int ret;
-
-        if (copy_from_user(&new_serial, new_info, sizeof(new_serial)))
-                return -EFAULT;
-
-        mutex_lock(&info->port.mutex);
-        if (!capable(CAP_SYS_ADMIN)) {
-                if (new_serial.close_delay != info->port.close_delay ||
-                                new_serial.baud_base != info->baud ||
-                                (new_serial.flags & ASYNC_FLAGS &
-                                        ~ASYNC_USR_MASK) !=
-                                (info->port.flags & ASYNC_FLAGS & ~ASYNC_USR_MASK))
-                {
-                        mutex_unlock(&info->port.mutex);
-                        return -EPERM;
-                }
-                info->port.flags = (info->port.flags & ~ASYNC_USR_MASK) |
-                                (new_serial.flags & ASYNC_USR_MASK);
-                info->baud = new_serial.baud_base;
-                info->custom_divisor = new_serial.custom_divisor;
-                goto check_and_exit;
-        }
-
-        /*
-         * OK, past this point, all the error checking has been done.
-         * At this point, we start making changes.....
-         */
-
-        info->baud = new_serial.baud_base;
-        info->custom_divisor = new_serial.custom_divisor;
-        info->port.flags = (info->port.flags & ~ASYNC_FLAGS) |
-                        (new_serial.flags & ASYNC_FLAGS);
-        info->port.close_delay = new_serial.close_delay * HZ / 100;
-        info->port.closing_wait = new_serial.closing_wait * HZ / 100;
-
-check_and_exit:
-        if (info->port.flags & ASYNC_INITIALIZED) {
-                cy_set_line_char(info, tty);
-                ret = 0;
-        } else {
-                ret = cy_startup(info, tty);
-        }
-        mutex_unlock(&info->port.mutex);
-        return ret;
-}                               /* set_serial_info */
-
-/*
- * get_lsr_info - get line status register info
- *
- * Purpose: Let user call ioctl() to get info when the UART physically
- *          is emptied.  On bus types like RS485, the transmitter must
- *          release the bus after transmitting. This must be done when
- *          the transmit shift register is empty, not be done when the
- *          transmit holding register is empty.  This functionality
- *          allows an RS485 driver to be written in user space.
- */
-static int get_lsr_info(struct cyclades_port *info, unsigned int __user *value)
-{
-        struct cyclades_card *card = info->card;
-        unsigned int result;
-        unsigned long flags;
-        u8 status;
-
-        if (!cy_is_Z(card)) {
-                spin_lock_irqsave(&card->card_lock, flags);
-                status = cyy_readb(info, CySRER) & (CyTxRdy | CyTxMpty);
-                spin_unlock_irqrestore(&card->card_lock, flags);
-                result = (status ? 0 : TIOCSER_TEMT);
-        } else {
-                /* Not supported yet */
-                return -EINVAL;
-        }
-        return put_user(result, (unsigned long __user *)value);
-}
-
-static int cy_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct cyclades_port *info = tty->driver_data;
-        struct cyclades_card *card;
-        int result;
-
-        if (serial_paranoia_check(info, tty->name, __func__))
-                return -ENODEV;
-
-        card = info->card;
-
-        if (!cy_is_Z(card)) {
-                unsigned long flags;
-                int channel = info->line - card->first_line;
-                u8 status;
-
-                spin_lock_irqsave(&card->card_lock, flags);
-                cyy_writeb(info, CyCAR, channel & 0x03);
-                status = cyy_readb(info, CyMSVR1);
-                status |= cyy_readb(info, CyMSVR2);
-                spin_unlock_irqrestore(&card->card_lock, flags);
-
-                if (info->rtsdtr_inv) {
-                        result = ((status & CyRTS) ? TIOCM_DTR : 0) |
-                                ((status & CyDTR) ? TIOCM_RTS : 0);
-                } else {
-                        result = ((status & CyRTS) ? TIOCM_RTS : 0) |
-                                ((status & CyDTR) ? TIOCM_DTR : 0);
-                }
-                result |= ((status & CyDCD) ? TIOCM_CAR : 0) |
-                        ((status & CyRI) ? TIOCM_RNG : 0) |
-                        ((status & CyDSR) ? TIOCM_DSR : 0) |
-                        ((status & CyCTS) ? TIOCM_CTS : 0);
-        } else {
-                u32 lstatus;
-
-                if (!cyz_is_loaded(card)) {
-                        result = -ENODEV;
-                        goto end;
-                }
-
-                lstatus = readl(&info->u.cyz.ch_ctrl->rs_status);
-                result = ((lstatus & C_RS_RTS) ? TIOCM_RTS : 0) |
-                        ((lstatus & C_RS_DTR) ? TIOCM_DTR : 0) |
-                        ((lstatus & C_RS_DCD) ? TIOCM_CAR : 0) |
-                        ((lstatus & C_RS_RI) ? TIOCM_RNG : 0) |
-                        ((lstatus & C_RS_DSR) ? TIOCM_DSR : 0) |
-                        ((lstatus & C_RS_CTS) ? TIOCM_CTS : 0);
-        }
-end:
-        return result;
-}                               /* cy_tiomget */
-
-static int
-cy_tiocmset(struct tty_struct *tty, struct file *file,
-                unsigned int set, unsigned int clear)
-{
-        struct cyclades_port *info = tty->driver_data;
-        struct cyclades_card *card;
-        unsigned long flags;
-
-        if (serial_paranoia_check(info, tty->name, __func__))
-                return -ENODEV;
-
-        card = info->card;
-        if (!cy_is_Z(card)) {
-                spin_lock_irqsave(&card->card_lock, flags);
-                cyy_change_rts_dtr(info, set, clear);
-                spin_unlock_irqrestore(&card->card_lock, flags);
-        } else {
-                struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
-                int retval, channel = info->line - card->first_line;
-                u32 rs;
-
-                if (!cyz_is_loaded(card))
-                        return -ENODEV;
-
-                spin_lock_irqsave(&card->card_lock, flags);
-                rs = readl(&ch_ctrl->rs_control);
-                if (set & TIOCM_RTS)
-                        rs |= C_RS_RTS;
-                if (clear & TIOCM_RTS)
-                        rs &= ~C_RS_RTS;
-                if (set & TIOCM_DTR) {
-                        rs |= C_RS_DTR;
-#ifdef CY_DEBUG_DTR
-                        printk(KERN_DEBUG "cyc:set_modem_info raising Z DTR\n");
-#endif
-                }
-                if (clear & TIOCM_DTR) {
-                        rs &= ~C_RS_DTR;
-#ifdef CY_DEBUG_DTR
-                        printk(KERN_DEBUG "cyc:set_modem_info clearing "
-                                "Z DTR\n");
-#endif
-                }
-                cy_writel(&ch_ctrl->rs_control, rs);
-                retval = cyz_issue_cmd(card, channel, C_CM_IOCTLM, 0L);
-                spin_unlock_irqrestore(&card->card_lock, flags);
-                if (retval != 0) {
-                        printk(KERN_ERR "cyc:set_modem_info retval on ttyC%d "
-                                "was %x\n", info->line, retval);
-                }
-        }
-        return 0;
-}
-
-/*
- * cy_break() --- routine which turns the break handling on or off
- */
-static int cy_break(struct tty_struct *tty, int break_state)
-{
-        struct cyclades_port *info = tty->driver_data;
-        struct cyclades_card *card;
-        unsigned long flags;
-        int retval = 0;
-
-        if (serial_paranoia_check(info, tty->name, "cy_break"))
-                return -EINVAL;
-
-        card = info->card;
-
-        spin_lock_irqsave(&card->card_lock, flags);
-        if (!cy_is_Z(card)) {
-                /* Let the transmit ISR take care of this (since it
-                   requires stuffing characters into the output stream).
-                 */
-                if (break_state == -1) {
-                        if (!info->breakon) {
-                                info->breakon = 1;
-                                if (!info->xmit_cnt) {
-                                        spin_unlock_irqrestore(&card->card_lock, flags);
-                                        start_xmit(info);
-                                        spin_lock_irqsave(&card->card_lock, flags);
-                                }
-                        }
-                } else {
-                        if (!info->breakoff) {
-                                info->breakoff = 1;
-                                if (!info->xmit_cnt) {
-                                        spin_unlock_irqrestore(&card->card_lock, flags);
-                                        start_xmit(info);
-                                        spin_lock_irqsave(&card->card_lock, flags);
-                                }
-                        }
-                }
-        } else {
-                if (break_state == -1) {
-                        retval = cyz_issue_cmd(card,
-                                info->line - card->first_line,
-                                C_CM_SET_BREAK, 0L);
-                        if (retval != 0) {
-                                printk(KERN_ERR "cyc:cy_break (set) retval on "
-                                        "ttyC%d was %x\n", info->line, retval);
-                        }
-                } else {
-                        retval = cyz_issue_cmd(card,
-                                info->line - card->first_line,
-                                C_CM_CLR_BREAK, 0L);
-                        if (retval != 0) {
-                                printk(KERN_DEBUG "cyc:cy_break (clr) retval "
-                                        "on ttyC%d was %x\n", info->line,
-                                        retval);
-                        }
-                }
-        }
-        spin_unlock_irqrestore(&card->card_lock, flags);
-        return retval;
-}                               /* cy_break */
-
-static int set_threshold(struct cyclades_port *info, unsigned long value)
-{
-        struct cyclades_card *card = info->card;
-        unsigned long flags;
-
-        if (!cy_is_Z(card)) {
-                info->cor3 &= ~CyREC_FIFO;
-                info->cor3 |= value & CyREC_FIFO;
-
-                spin_lock_irqsave(&card->card_lock, flags);
-                cyy_writeb(info, CyCOR3, info->cor3);
-                cyy_issue_cmd(info, CyCOR_CHANGE | CyCOR3ch);
-                spin_unlock_irqrestore(&card->card_lock, flags);
-        }
-        return 0;
-}                               /* set_threshold */
-
-static int get_threshold(struct cyclades_port *info,
-                                                unsigned long __user *value)
-{
-        struct cyclades_card *card = info->card;
-
-        if (!cy_is_Z(card)) {
-                u8 tmp = cyy_readb(info, CyCOR3) & CyREC_FIFO;
-                return put_user(tmp, value);
-        }
-        return 0;
-}                               /* get_threshold */
-
-static int set_timeout(struct cyclades_port *info, unsigned long value)
-{
-        struct cyclades_card *card = info->card;
-        unsigned long flags;
-
-        if (!cy_is_Z(card)) {
-                spin_lock_irqsave(&card->card_lock, flags);
-                cyy_writeb(info, CyRTPR, value & 0xff);
-                spin_unlock_irqrestore(&card->card_lock, flags);
-        }
-        return 0;
-}                               /* set_timeout */
-
-static int get_timeout(struct cyclades_port *info,
-                                                unsigned long __user *value)
-{
-        struct cyclades_card *card = info->card;
-
-        if (!cy_is_Z(card)) {
-                u8 tmp = cyy_readb(info, CyRTPR);
-                return put_user(tmp, value);
-        }
-        return 0;
-}                               /* get_timeout */
-
-static int cy_cflags_changed(struct cyclades_port *info, unsigned long arg,
-                struct cyclades_icount *cprev)
-{
-        struct cyclades_icount cnow;
-        unsigned long flags;
-        int ret;
-
-        spin_lock_irqsave(&info->card->card_lock, flags);
-        cnow = info->icount;    /* atomic copy */
-        spin_unlock_irqrestore(&info->card->card_lock, flags);
-
-        ret =   ((arg & TIOCM_RNG) && (cnow.rng != cprev->rng)) ||
-                ((arg & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) ||
-                ((arg & TIOCM_CD)  && (cnow.dcd != cprev->dcd)) ||
-                ((arg & TIOCM_CTS) && (cnow.cts != cprev->cts));
-
-        *cprev = cnow;
-
-        return ret;
-}
-
-/*
- * This routine allows the tty driver to implement device-
- * specific ioctl's.  If the ioctl number passed in cmd is
- * not recognized by the driver, it should return ENOIOCTLCMD.
- */
-static int
-cy_ioctl(struct tty_struct *tty, struct file *file,
-         unsigned int cmd, unsigned long arg)
-{
-        struct cyclades_port *info = tty->driver_data;
-        struct cyclades_icount cnow;    /* kernel counter temps */
-        int ret_val = 0;
-        unsigned long flags;
-        void __user *argp = (void __user *)arg;
-
-        if (serial_paranoia_check(info, tty->name, "cy_ioctl"))
-                return -ENODEV;
-
-#ifdef CY_DEBUG_OTHER
-        printk(KERN_DEBUG "cyc:cy_ioctl ttyC%d, cmd = %x arg = %lx\n",
-                info->line, cmd, arg);
-#endif
-
-        switch (cmd) {
-        case CYGETMON:
-                if (copy_to_user(argp, &info->mon, sizeof(info->mon))) {
-                        ret_val = -EFAULT;
-                        break;
-                }
-                memset(&info->mon, 0, sizeof(info->mon));
-                break;
-        case CYGETTHRESH:
-                ret_val = get_threshold(info, argp);
-                break;
-        case CYSETTHRESH:
-                ret_val = set_threshold(info, arg);
-                break;
-        case CYGETDEFTHRESH:
-                ret_val = put_user(info->default_threshold,
-                                (unsigned long __user *)argp);
-                break;
-        case CYSETDEFTHRESH:
-                info->default_threshold = arg & 0x0f;
-                break;
-        case CYGETTIMEOUT:
-                ret_val = get_timeout(info, argp);
-                break;
-        case CYSETTIMEOUT:
-                ret_val = set_timeout(info, arg);
-                break;
-        case CYGETDEFTIMEOUT:
-                ret_val = put_user(info->default_timeout,
-                                (unsigned long __user *)argp);
-                break;
-        case CYSETDEFTIMEOUT:
-                info->default_timeout = arg & 0xff;
-                break;
-        case CYSETRFLOW:
-                info->rflow = (int)arg;
-                break;
-        case CYGETRFLOW:
-                ret_val = info->rflow;
-                break;
-        case CYSETRTSDTR_INV:
-                info->rtsdtr_inv = (int)arg;
-                break;
-        case CYGETRTSDTR_INV:
-                ret_val = info->rtsdtr_inv;
-                break;
-        case CYGETCD1400VER:
-                ret_val = info->chip_rev;
-                break;
-#ifndef CONFIG_CYZ_INTR
-        case CYZSETPOLLCYCLE:
-                cyz_polling_cycle = (arg * HZ) / 1000;
-                break;
-        case CYZGETPOLLCYCLE:
-                ret_val = (cyz_polling_cycle * 1000) / HZ;
-                break;
-#endif                          /* CONFIG_CYZ_INTR */
-        case CYSETWAIT:
-                info->port.closing_wait = (unsigned short)arg * HZ / 100;
-                break;
-        case CYGETWAIT:
-                ret_val = info->port.closing_wait / (HZ / 100);
-                break;
-        case TIOCGSERIAL:
-                ret_val = cy_get_serial_info(info, argp);
-                break;
-        case TIOCSSERIAL:
-                ret_val = cy_set_serial_info(info, tty, argp);
-                break;
-        case TIOCSERGETLSR:     /* Get line status register */
-                ret_val = get_lsr_info(info, argp);
-                break;
-                /*
-                 * Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change
-                 * - mask passed in arg for lines of interest
-                 *   (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
-                 * Caller should use TIOCGICOUNT to see which one it was
-                 */
-        case TIOCMIWAIT:
-                spin_lock_irqsave(&info->card->card_lock, flags);
-                /* note the counters on entry */
-                cnow = info->icount;
-                spin_unlock_irqrestore(&info->card->card_lock, flags);
-                ret_val = wait_event_interruptible(info->port.delta_msr_wait,
-                                cy_cflags_changed(info, arg, &cnow));
-                break;
-
-                /*
-                 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-                 * Return: write counters to the user passed counter struct
-                 * NB: both 1->0 and 0->1 transitions are counted except for
-                 *     RI where only 0->1 is counted.
-                 */
-        case TIOCGICOUNT: {
-                struct serial_icounter_struct sic = { };
-
-                spin_lock_irqsave(&info->card->card_lock, flags);
-                cnow = info->icount;
-                spin_unlock_irqrestore(&info->card->card_lock, flags);
-
-                sic.cts = cnow.cts;
-                sic.dsr = cnow.dsr;
-                sic.rng = cnow.rng;
-                sic.dcd = cnow.dcd;
-                sic.rx = cnow.rx;
-                sic.tx = cnow.tx;
-                sic.frame = cnow.frame;
-                sic.overrun = cnow.overrun;
-                sic.parity = cnow.parity;
-                sic.brk = cnow.brk;
-                sic.buf_overrun = cnow.buf_overrun;
-
-                if (copy_to_user(argp, &sic, sizeof(sic)))
-                        ret_val = -EFAULT;
-                break;
-        }
-        default:
-                ret_val = -ENOIOCTLCMD;
-        }
-
-#ifdef CY_DEBUG_OTHER
-        printk(KERN_DEBUG "cyc:cy_ioctl done\n");
-#endif
-        return ret_val;
-}                               /* cy_ioctl */
-
-/*
- * This routine allows the tty driver to be notified when
- * device's termios settings have changed.  Note that a
- * well-designed tty driver should be prepared to accept the case
- * where old == NULL, and try to do something rational.
- */
-static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
-{
-        struct cyclades_port *info = tty->driver_data;
-
-#ifdef CY_DEBUG_OTHER
-        printk(KERN_DEBUG "cyc:cy_set_termios ttyC%d\n", info->line);
-#endif
-
-        cy_set_line_char(info, tty);
-
-        if ((old_termios->c_cflag & CRTSCTS) &&
-                        !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-                cy_start(tty);
-        }
-#if 0
-        /*
-         * No need to wake up processes in open wait, since they
-         * sample the CLOCAL flag once, and don't recheck it.
-         * XXX  It's not clear whether the current behavior is correct
-         * or not.  Hence, this may change.....
-         */
-        if (!(old_termios->c_cflag & CLOCAL) &&
-            (tty->termios->c_cflag & CLOCAL))
-                wake_up_interruptible(&info->port.open_wait);
-#endif
-}                               /* cy_set_termios */
-
-/* This function is used to send a high-priority XON/XOFF character to
-   the device.
-*/
-static void cy_send_xchar(struct tty_struct *tty, char ch)
-{
-        struct cyclades_port *info = tty->driver_data;
-        struct cyclades_card *card;
-        int channel;
-
-        if (serial_paranoia_check(info, tty->name, "cy_send_xchar"))
-                return;
-
-        info->x_char = ch;
-
-        if (ch)
-                cy_start(tty);
-
-        card = info->card;
-        channel = info->line - card->first_line;
-
-        if (cy_is_Z(card)) {
-                if (ch == STOP_CHAR(tty))
-                        cyz_issue_cmd(card, channel, C_CM_SENDXOFF, 0L);
-                else if (ch == START_CHAR(tty))
-                        cyz_issue_cmd(card, channel, C_CM_SENDXON, 0L);
-        }
-}
-
-/* This routine is called by the upper-layer tty layer to signal
-   that incoming characters should be throttled because the input
-   buffers are close to full.
- */
-static void cy_throttle(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-        struct cyclades_card *card;
-        unsigned long flags;
-
-#ifdef CY_DEBUG_THROTTLE
-        char buf[64];
-
-        printk(KERN_DEBUG "cyc:throttle %s: %ld...ttyC%d\n", tty_name(tty, buf),
-                        tty->ldisc.chars_in_buffer(tty), info->line);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_throttle"))
-                return;
-
-        card = info->card;
-
-        if (I_IXOFF(tty)) {
-                if (!cy_is_Z(card))
-                        cy_send_xchar(tty, STOP_CHAR(tty));
-                else
-                        info->throttle = 1;
-        }
-
-        if (tty->termios->c_cflag & CRTSCTS) {
-                if (!cy_is_Z(card)) {
-                        spin_lock_irqsave(&card->card_lock, flags);
-                        cyy_change_rts_dtr(info, 0, TIOCM_RTS);
-                        spin_unlock_irqrestore(&card->card_lock, flags);
-                } else {
-                        info->throttle = 1;
-                }
-        }
-}                               /* cy_throttle */
-
-/*
- * This routine notifies the tty driver that it should signal
- * that characters can now be sent to the tty without fear of
- * overrunning the input buffers of the line disciplines.
- */
-static void cy_unthrottle(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-        struct cyclades_card *card;
-        unsigned long flags;
-
-#ifdef CY_DEBUG_THROTTLE
-        char buf[64];
-
-        printk(KERN_DEBUG "cyc:unthrottle %s: %ld...ttyC%d\n",
-                tty_name(tty, buf), tty_chars_in_buffer(tty), info->line);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_unthrottle"))
-                return;
-
-        if (I_IXOFF(tty)) {
-                if (info->x_char)
-                        info->x_char = 0;
-                else
-                        cy_send_xchar(tty, START_CHAR(tty));
-        }
-
-        if (tty->termios->c_cflag & CRTSCTS) {
-                card = info->card;
-                if (!cy_is_Z(card)) {
-                        spin_lock_irqsave(&card->card_lock, flags);
-                        cyy_change_rts_dtr(info, TIOCM_RTS, 0);
-                        spin_unlock_irqrestore(&card->card_lock, flags);
-                } else {
-                        info->throttle = 0;
-                }
-        }
-}                               /* cy_unthrottle */
-
-/* cy_start and cy_stop provide software output flow control as a
-   function of XON/XOFF, software CTS, and other such stuff.
-*/
-static void cy_stop(struct tty_struct *tty)
-{
-        struct cyclades_card *cinfo;
-        struct cyclades_port *info = tty->driver_data;
-        int channel;
-        unsigned long flags;
-
-#ifdef CY_DEBUG_OTHER
-        printk(KERN_DEBUG "cyc:cy_stop ttyC%d\n", info->line);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_stop"))
-                return;
-
-        cinfo = info->card;
-        channel = info->line - cinfo->first_line;
-        if (!cy_is_Z(cinfo)) {
-                spin_lock_irqsave(&cinfo->card_lock, flags);
-                cyy_writeb(info, CyCAR, channel & 0x03);
-                cyy_writeb(info, CySRER, cyy_readb(info, CySRER) & ~CyTxRdy);
-                spin_unlock_irqrestore(&cinfo->card_lock, flags);
-        }
-}                               /* cy_stop */
-
-static void cy_start(struct tty_struct *tty)
-{
-        struct cyclades_card *cinfo;
-        struct cyclades_port *info = tty->driver_data;
-        int channel;
-        unsigned long flags;
-
-#ifdef CY_DEBUG_OTHER
-        printk(KERN_DEBUG "cyc:cy_start ttyC%d\n", info->line);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_start"))
-                return;
-
-        cinfo = info->card;
-        channel = info->line - cinfo->first_line;
-        if (!cy_is_Z(cinfo)) {
-                spin_lock_irqsave(&cinfo->card_lock, flags);
-                cyy_writeb(info, CyCAR, channel & 0x03);
-                cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyTxRdy);
-                spin_unlock_irqrestore(&cinfo->card_lock, flags);
-        }
-}                               /* cy_start */
-
-/*
- * cy_hangup() --- called by tty_hangup() when a hangup is signaled.
- */
-static void cy_hangup(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-
-#ifdef CY_DEBUG_OTHER
-        printk(KERN_DEBUG "cyc:cy_hangup ttyC%d\n", info->line);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_hangup"))
-                return;
-
-        cy_flush_buffer(tty);
-        cy_shutdown(info, tty);
-        tty_port_hangup(&info->port);
-}                               /* cy_hangup */
-
-static int cyy_carrier_raised(struct tty_port *port)
-{
-        struct cyclades_port *info = container_of(port, struct cyclades_port,
-                        port);
-        struct cyclades_card *cinfo = info->card;
-        unsigned long flags;
-        int channel = info->line - cinfo->first_line;
-        u32 cd;
-
-        spin_lock_irqsave(&cinfo->card_lock, flags);
-        cyy_writeb(info, CyCAR, channel & 0x03);
-        cd = cyy_readb(info, CyMSVR1) & CyDCD;
-        spin_unlock_irqrestore(&cinfo->card_lock, flags);
-
-        return cd;
-}
-
-static void cyy_dtr_rts(struct tty_port *port, int raise)
-{
-        struct cyclades_port *info = container_of(port, struct cyclades_port,
-                        port);
-        struct cyclades_card *cinfo = info->card;
-        unsigned long flags;
-
-        spin_lock_irqsave(&cinfo->card_lock, flags);
-        cyy_change_rts_dtr(info, raise ? TIOCM_RTS | TIOCM_DTR : 0,
-                        raise ? 0 : TIOCM_RTS | TIOCM_DTR);
-        spin_unlock_irqrestore(&cinfo->card_lock, flags);
-}
-
-static int cyz_carrier_raised(struct tty_port *port)
-{
-        struct cyclades_port *info = container_of(port, struct cyclades_port,
-                        port);
-
-        return readl(&info->u.cyz.ch_ctrl->rs_status) & C_RS_DCD;
-}
-
-static void cyz_dtr_rts(struct tty_port *port, int raise)
-{
-        struct cyclades_port *info = container_of(port, struct cyclades_port,
-                        port);
-        struct cyclades_card *cinfo = info->card;
-        struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
-        int ret, channel = info->line - cinfo->first_line;
-        u32 rs;
-
-        rs = readl(&ch_ctrl->rs_control);
-        if (raise)
-                rs |= C_RS_RTS | C_RS_DTR;
-        else
-                rs &= ~(C_RS_RTS | C_RS_DTR);
-        cy_writel(&ch_ctrl->rs_control, rs);
-        ret = cyz_issue_cmd(cinfo, channel, C_CM_IOCTLM, 0L);
-        if (ret != 0)
-                printk(KERN_ERR "%s: retval on ttyC%d was %x\n",
-                                __func__, info->line, ret);
-#ifdef CY_DEBUG_DTR
-        printk(KERN_DEBUG "%s: raising Z DTR\n", __func__);
-#endif
-}
-
-static const struct tty_port_operations cyy_port_ops = {
-        .carrier_raised = cyy_carrier_raised,
-        .dtr_rts = cyy_dtr_rts,
-        .shutdown = cy_do_close,
-};
-
-static const struct tty_port_operations cyz_port_ops = {
-        .carrier_raised = cyz_carrier_raised,
-        .dtr_rts = cyz_dtr_rts,
-        .shutdown = cy_do_close,
-};
-
-/*
- * ---------------------------------------------------------------------
- * cy_init() and friends
- *
- * cy_init() is called at boot-time to initialize the serial driver.
- * ---------------------------------------------------------------------
- */
-
-static int __devinit cy_init_card(struct cyclades_card *cinfo)
-{
-        struct cyclades_port *info;
-        unsigned int channel, port;
-
-        spin_lock_init(&cinfo->card_lock);
-        cinfo->intr_enabled = 0;
-
-        cinfo->ports = kcalloc(cinfo->nports, sizeof(*cinfo->ports),
-                        GFP_KERNEL);
-        if (cinfo->ports == NULL) {
-                printk(KERN_ERR "Cyclades: cannot allocate ports\n");
-                return -ENOMEM;
-        }
-
-        for (channel = 0, port = cinfo->first_line; channel < cinfo->nports;
-                        channel++, port++) {
-                info = &cinfo->ports[channel];
-                tty_port_init(&info->port);
-                info->magic = CYCLADES_MAGIC;
-                info->card = cinfo;
-                info->line = port;
-
-                info->port.closing_wait = CLOSING_WAIT_DELAY;
-                info->port.close_delay = 5 * HZ / 10;
-                info->port.flags = STD_COM_FLAGS;
-                init_completion(&info->shutdown_wait);
-
-                if (cy_is_Z(cinfo)) {
-                        struct FIRM_ID *firm_id = cinfo->base_addr + ID_ADDRESS;
-                        struct ZFW_CTRL *zfw_ctrl;
-
-                        info->port.ops = &cyz_port_ops;
-                        info->type = PORT_STARTECH;
-
-                        zfw_ctrl = cinfo->base_addr +
-                                (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-                        info->u.cyz.ch_ctrl = &zfw_ctrl->ch_ctrl[channel];
-                        info->u.cyz.buf_ctrl = &zfw_ctrl->buf_ctrl[channel];
-
-                        if (cinfo->hw_ver == ZO_V1)
-                                info->xmit_fifo_size = CYZ_FIFO_SIZE;
-                        else
-                                info->xmit_fifo_size = 4 * CYZ_FIFO_SIZE;
-#ifdef CONFIG_CYZ_INTR
-                        setup_timer(&cyz_rx_full_timer[port],
-                                cyz_rx_restart, (unsigned long)info);
-#endif
-                } else {
-                        unsigned short chip_number;
-                        int index = cinfo->bus_index;
-
-                        info->port.ops = &cyy_port_ops;
-                        info->type = PORT_CIRRUS;
-                        info->xmit_fifo_size = CyMAX_CHAR_FIFO;
-                        info->cor1 = CyPARITY_NONE | Cy_1_STOP | Cy_8_BITS;
-                        info->cor2 = CyETC;
-                        info->cor3 = 0x08;      /* _very_ small rcv threshold */
-
-                        chip_number = channel / CyPORTS_PER_CHIP;
-                        info->u.cyy.base_addr = cinfo->base_addr +
-                                (cy_chip_offset[chip_number] << index);
-                        info->chip_rev = cyy_readb(info, CyGFRCR);
-
-                        if (info->chip_rev >= CD1400_REV_J) {
-                                /* It is a CD1400 rev. J or later */
-                                info->tbpr = baud_bpr_60[13];   /* Tx BPR */
-                                info->tco = baud_co_60[13];     /* Tx CO */
-                                info->rbpr = baud_bpr_60[13];   /* Rx BPR */
-                                info->rco = baud_co_60[13];     /* Rx CO */
-                                info->rtsdtr_inv = 1;
-                        } else {
-                                info->tbpr = baud_bpr_25[13];   /* Tx BPR */
-                                info->tco = baud_co_25[13];     /* Tx CO */
-                                info->rbpr = baud_bpr_25[13];   /* Rx BPR */
-                                info->rco = baud_co_25[13];     /* Rx CO */
-                                info->rtsdtr_inv = 0;
-                        }
-                        info->read_status_mask = CyTIMEOUT | CySPECHAR |
-                                CyBREAK | CyPARITY | CyFRAME | CyOVERRUN;
-                }
-
-        }
-
-#ifndef CONFIG_CYZ_INTR
-        if (cy_is_Z(cinfo) && !timer_pending(&cyz_timerlist)) {
-                mod_timer(&cyz_timerlist, jiffies + 1);
-#ifdef CY_PCI_DEBUG
-                printk(KERN_DEBUG "Cyclades-Z polling initialized\n");
-#endif
-        }
-#endif
-        return 0;
-}
-
-/* initialize chips on Cyclom-Y card -- return number of valid
-   chips (which is number of ports/4) */
-static unsigned short __devinit cyy_init_card(void __iomem *true_base_addr,
-                int index)
-{
-        unsigned int chip_number;
-        void __iomem *base_addr;
-
-        cy_writeb(true_base_addr + (Cy_HwReset << index), 0);
-        /* Cy_HwReset is 0x1400 */
-        cy_writeb(true_base_addr + (Cy_ClrIntr << index), 0);
-        /* Cy_ClrIntr is 0x1800 */
-        udelay(500L);
-
-        for (chip_number = 0; chip_number < CyMAX_CHIPS_PER_CARD;
-                                                        chip_number++) {
-                base_addr =
-                    true_base_addr + (cy_chip_offset[chip_number] << index);
-                mdelay(1);
-                if (readb(base_addr + (CyCCR << index)) != 0x00) {
-                        /*************
-                        printk(" chip #%d at %#6lx is never idle (CCR != 0)\n",
-                        chip_number, (unsigned long)base_addr);
-                        *************/
-                        return chip_number;
-                }
-
-                cy_writeb(base_addr + (CyGFRCR << index), 0);
-                udelay(10L);
-
-                /* The Cyclom-16Y does not decode address bit 9 and therefore
-                   cannot distinguish between references to chip 0 and a non-
-                   existent chip 4.  If the preceding clearing of the supposed
-                   chip 4 GFRCR register appears at chip 0, there is no chip 4
-                   and this must be a Cyclom-16Y, not a Cyclom-32Ye.
-                 */
-                if (chip_number == 4 && readb(true_base_addr +
-                                (cy_chip_offset[0] << index) +
-                                (CyGFRCR << index)) == 0) {
-                        return chip_number;
-                }
-
-                cy_writeb(base_addr + (CyCCR << index), CyCHIP_RESET);
-                mdelay(1);
-
-                if (readb(base_addr + (CyGFRCR << index)) == 0x00) {
-                        /*
-                           printk(" chip #%d at %#6lx is not responding ",
-                           chip_number, (unsigned long)base_addr);
-                           printk("(GFRCR stayed 0)\n",
-                         */
-                        return chip_number;
-                }
-                if ((0xf0 & (readb(base_addr + (CyGFRCR << index)))) !=
-                                0x40) {
-                        /*
-                        printk(" chip #%d at %#6lx is not valid (GFRCR == "
-                                        "%#2x)\n",
-                                        chip_number, (unsigned long)base_addr,
-                                        base_addr[CyGFRCR<<index]);
-                         */
-                        return chip_number;
-                }
-                cy_writeb(base_addr + (CyGCR << index), CyCH0_SERIAL);
-                if (readb(base_addr + (CyGFRCR << index)) >= CD1400_REV_J) {
-                        /* It is a CD1400 rev. J or later */
-                        /* Impossible to reach 5ms with this chip.
-                           Changed to 2ms instead (f = 500 Hz). */
-                        cy_writeb(base_addr + (CyPPR << index), CyCLOCK_60_2MS);
-                } else {
-                        /* f = 200 Hz */
-                        cy_writeb(base_addr + (CyPPR << index), CyCLOCK_25_5MS);
-                }
-
-                /*
-                   printk(" chip #%d at %#6lx is rev 0x%2x\n",
-                   chip_number, (unsigned long)base_addr,
-                   readb(base_addr+(CyGFRCR<<index)));
-                 */
-        }
-        return chip_number;
-}                               /* cyy_init_card */
-
-/*
- * ---------------------------------------------------------------------
- * cy_detect_isa() - Probe for Cyclom-Y/ISA boards.
- * sets global variables and return the number of ISA boards found.
- * ---------------------------------------------------------------------
- */
-static int __init cy_detect_isa(void)
-{
-#ifdef CONFIG_ISA
-        unsigned short cy_isa_irq, nboard;
-        void __iomem *cy_isa_address;
-        unsigned short i, j, cy_isa_nchan;
-        int isparam = 0;
-
-        nboard = 0;
-
-        /* Check for module parameters */
-        for (i = 0; i < NR_CARDS; i++) {
-                if (maddr[i] || i) {
-                        isparam = 1;
-                        cy_isa_addresses[i] = maddr[i];
-                }
-                if (!maddr[i])
-                        break;
-        }
-
-        /* scan the address table probing for Cyclom-Y/ISA boards */
-        for (i = 0; i < NR_ISA_ADDRS; i++) {
-                unsigned int isa_address = cy_isa_addresses[i];
-                if (isa_address == 0x0000)
-                        return nboard;
-
-                /* probe for CD1400... */
-                cy_isa_address = ioremap_nocache(isa_address, CyISA_Ywin);
-                if (cy_isa_address == NULL) {
-                        printk(KERN_ERR "Cyclom-Y/ISA: can't remap base "
-                                        "address\n");
-                        continue;
-                }
-                cy_isa_nchan = CyPORTS_PER_CHIP *
-                        cyy_init_card(cy_isa_address, 0);
-                if (cy_isa_nchan == 0) {
-                        iounmap(cy_isa_address);
-                        continue;
-                }
-
-                if (isparam && i < NR_CARDS && irq[i])
-                        cy_isa_irq = irq[i];
-                else
-                        /* find out the board's irq by probing */
-                        cy_isa_irq = detect_isa_irq(cy_isa_address);
-                if (cy_isa_irq == 0) {
-                        printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but the "
-                                "IRQ could not be detected.\n",
-                                (unsigned long)cy_isa_address);
-                        iounmap(cy_isa_address);
-                        continue;
-                }
-
-                if ((cy_next_channel + cy_isa_nchan) > NR_PORTS) {
-                        printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but no "
-                                "more channels are available. Change NR_PORTS "
-                                "in cyclades.c and recompile kernel.\n",
-                                (unsigned long)cy_isa_address);
-                        iounmap(cy_isa_address);
-                        return nboard;
-                }
-                /* fill the next cy_card structure available */
-                for (j = 0; j < NR_CARDS; j++) {
-                        if (cy_card[j].base_addr == NULL)
-                                break;
-                }
-                if (j == NR_CARDS) {    /* no more cy_cards available */
-                        printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but no "
-                                "more cards can be used. Change NR_CARDS in "
-                                "cyclades.c and recompile kernel.\n",
-                                (unsigned long)cy_isa_address);
-                        iounmap(cy_isa_address);
-                        return nboard;
-                }
-
-                /* allocate IRQ */
-                if (request_irq(cy_isa_irq, cyy_interrupt,
-                                IRQF_DISABLED, "Cyclom-Y", &cy_card[j])) {
-                        printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but "
-                                "could not allocate IRQ#%d.\n",
-                                (unsigned long)cy_isa_address, cy_isa_irq);
-                        iounmap(cy_isa_address);
-                        return nboard;
-                }
-
-                /* set cy_card */
-                cy_card[j].base_addr = cy_isa_address;
-                cy_card[j].ctl_addr.p9050 = NULL;
-                cy_card[j].irq = (int)cy_isa_irq;
-                cy_card[j].bus_index = 0;
-                cy_card[j].first_line = cy_next_channel;
-                cy_card[j].num_chips = cy_isa_nchan / CyPORTS_PER_CHIP;
-                cy_card[j].nports = cy_isa_nchan;
-                if (cy_init_card(&cy_card[j])) {
-                        cy_card[j].base_addr = NULL;
-                        free_irq(cy_isa_irq, &cy_card[j]);
-                        iounmap(cy_isa_address);
-                        continue;
-                }
-                nboard++;
-
-                printk(KERN_INFO "Cyclom-Y/ISA #%d: 0x%lx-0x%lx, IRQ%d found: "
-                        "%d channels starting from port %d\n",
-                        j + 1, (unsigned long)cy_isa_address,
-                        (unsigned long)(cy_isa_address + (CyISA_Ywin - 1)),
-                        cy_isa_irq, cy_isa_nchan, cy_next_channel);
-
-                for (j = cy_next_channel;
-                                j < cy_next_channel + cy_isa_nchan; j++)
-                        tty_register_device(cy_serial_driver, j, NULL);
-                cy_next_channel += cy_isa_nchan;
-        }
-        return nboard;
-#else
-        return 0;
-#endif                          /* CONFIG_ISA */
-}                               /* cy_detect_isa */
-
-#ifdef CONFIG_PCI
-static inline int __devinit cyc_isfwstr(const char *str, unsigned int size)
-{
-        unsigned int a;
-
-        for (a = 0; a < size && *str; a++, str++)
-                if (*str & 0x80)
-                        return -EINVAL;
-
-        for (; a < size; a++, str++)
-                if (*str)
-                        return -EINVAL;
-
-        return 0;
-}
-
-static inline void __devinit cyz_fpga_copy(void __iomem *fpga, const u8 *data,
-                unsigned int size)
-{
-        for (; size > 0; size--) {
-                cy_writel(fpga, *data++);
-                udelay(10);
-        }
-}
-
-static void __devinit plx_init(struct pci_dev *pdev, int irq,
-                struct RUNTIME_9060 __iomem *addr)
-{
-        /* Reset PLX */
-        cy_writel(&addr->init_ctrl, readl(&addr->init_ctrl) | 0x40000000);
-        udelay(100L);
-        cy_writel(&addr->init_ctrl, readl(&addr->init_ctrl) & ~0x40000000);
-
-        /* Reload Config. Registers from EEPROM */
-        cy_writel(&addr->init_ctrl, readl(&addr->init_ctrl) | 0x20000000);
-        udelay(100L);
-        cy_writel(&addr->init_ctrl, readl(&addr->init_ctrl) & ~0x20000000);
-
-        /* For some yet unknown reason, once the PLX9060 reloads the EEPROM,
-         * the IRQ is lost and, thus, we have to re-write it to the PCI config.
-         * registers. This will remain here until we find a permanent fix.
-         */
-        pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, irq);
-}
-
-static int __devinit __cyz_load_fw(const struct firmware *fw,
-                const char *name, const u32 mailbox, void __iomem *base,
-                void __iomem *fpga)
-{
-        const void *ptr = fw->data;
-        const struct zfile_header *h = ptr;
-        const struct zfile_config *c, *cs;
-        const struct zfile_block *b, *bs;
-        unsigned int a, tmp, len = fw->size;
-#define BAD_FW KERN_ERR "Bad firmware: "
-        if (len < sizeof(*h)) {
-                printk(BAD_FW "too short: %u<%zu\n", len, sizeof(*h));
-                return -EINVAL;
-        }
-
-        cs = ptr + h->config_offset;
-        bs = ptr + h->block_offset;
-
-        if ((void *)(cs + h->n_config) > ptr + len ||
-                        (void *)(bs + h->n_blocks) > ptr + len) {
-                printk(BAD_FW "too short");
-                return  -EINVAL;
-        }
-
-        if (cyc_isfwstr(h->name, sizeof(h->name)) ||
-                        cyc_isfwstr(h->date, sizeof(h->date))) {
-                printk(BAD_FW "bad formatted header string\n");
-                return -EINVAL;
-        }
-
-        if (strncmp(name, h->name, sizeof(h->name))) {
-                printk(BAD_FW "bad name '%s' (expected '%s')\n", h->name, name);
-                return -EINVAL;
-        }
-
-        tmp = 0;
-        for (c = cs; c < cs + h->n_config; c++) {
-                for (a = 0; a < c->n_blocks; a++)
-                        if (c->block_list[a] > h->n_blocks) {
-                                printk(BAD_FW "bad block ref number in cfgs\n");
-                                return -EINVAL;
-                        }
-                if (c->mailbox == mailbox && c->function == 0) /* 0 is normal */
-                        tmp++;
-        }
-        if (!tmp) {
-                printk(BAD_FW "nothing appropriate\n");
-                return -EINVAL;
-        }
-
-        for (b = bs; b < bs + h->n_blocks; b++)
-                if (b->file_offset + b->size > len) {
-                        printk(BAD_FW "bad block data offset\n");
-                        return -EINVAL;
-                }
-
-        /* everything is OK, let's seek'n'load it */
-        for (c = cs; c < cs + h->n_config; c++)
-                if (c->mailbox == mailbox && c->function == 0)
-                        break;
-
-        for (a = 0; a < c->n_blocks; a++) {
-                b = &bs[c->block_list[a]];
-                if (b->type == ZBLOCK_FPGA) {
-                        if (fpga != NULL)
-                                cyz_fpga_copy(fpga, ptr + b->file_offset,
-                                                b->size);
-                } else {
-                        if (base != NULL)
-                                memcpy_toio(base + b->ram_offset,
-                                               ptr + b->file_offset, b->size);
-                }
-        }
-#undef BAD_FW
-        return 0;
-}
-
-static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr,
-                struct RUNTIME_9060 __iomem *ctl_addr, int irq)
-{
-        const struct firmware *fw;
-        struct FIRM_ID __iomem *fid = base_addr + ID_ADDRESS;
-        struct CUSTOM_REG __iomem *cust = base_addr;
-        struct ZFW_CTRL __iomem *pt_zfwctrl;
-        void __iomem *tmp;
-        u32 mailbox, status, nchan;
-        unsigned int i;
-        int retval;
-
-        retval = request_firmware(&fw, "cyzfirm.bin", &pdev->dev);
-        if (retval) {
-                dev_err(&pdev->dev, "can't get firmware\n");
-                goto err;
-        }
-
-        /* Check whether the firmware is already loaded and running. If
-           positive, skip this board */
-        if (__cyz_fpga_loaded(ctl_addr) && readl(&fid->signature) == ZFIRM_ID) {
-                u32 cntval = readl(base_addr + 0x190);
-
-                udelay(100);
-                if (cntval != readl(base_addr + 0x190)) {
-                        /* FW counter is working, FW is running */
-                        dev_dbg(&pdev->dev, "Cyclades-Z FW already loaded. "
-                                        "Skipping board.\n");
-                        retval = 0;
-                        goto err_rel;
-                }
-        }
-
-        /* start boot */
-        cy_writel(&ctl_addr->intr_ctrl_stat, readl(&ctl_addr->intr_ctrl_stat) &
-                        ~0x00030800UL);
-
-        mailbox = readl(&ctl_addr->mail_box_0);
-
-        if (mailbox == 0 || __cyz_fpga_loaded(ctl_addr)) {
-                /* stops CPU and set window to beginning of RAM */
-                cy_writel(&ctl_addr->loc_addr_base, WIN_CREG);
-                cy_writel(&cust->cpu_stop, 0);
-                cy_writel(&ctl_addr->loc_addr_base, WIN_RAM);
-                udelay(100);
-        }
-
-        plx_init(pdev, irq, ctl_addr);
-
-        if (mailbox != 0) {
-                /* load FPGA */
-                retval = __cyz_load_fw(fw, "Cyclom-Z", mailbox, NULL,
-                                base_addr);
-                if (retval)
-                        goto err_rel;
-                if (!__cyz_fpga_loaded(ctl_addr)) {
-                        dev_err(&pdev->dev, "fw upload successful, but fw is "
-                                        "not loaded\n");
-                        goto err_rel;
-                }
-        }
-
-        /* stops CPU and set window to beginning of RAM */
-        cy_writel(&ctl_addr->loc_addr_base, WIN_CREG);
-        cy_writel(&cust->cpu_stop, 0);
-        cy_writel(&ctl_addr->loc_addr_base, WIN_RAM);
-        udelay(100);
-
-        /* clear memory */
-        for (tmp = base_addr; tmp < base_addr + RAM_SIZE; tmp++)
-                cy_writeb(tmp, 255);
-        if (mailbox != 0) {
-                /* set window to last 512K of RAM */
-                cy_writel(&ctl_addr->loc_addr_base, WIN_RAM + RAM_SIZE);
-                for (tmp = base_addr; tmp < base_addr + RAM_SIZE; tmp++)
-                        cy_writeb(tmp, 255);
-                /* set window to beginning of RAM */
-                cy_writel(&ctl_addr->loc_addr_base, WIN_RAM);
-        }
-
-        retval = __cyz_load_fw(fw, "Cyclom-Z", mailbox, base_addr, NULL);
-        release_firmware(fw);
-        if (retval)
-                goto err;
-
-        /* finish boot and start boards */
-        cy_writel(&ctl_addr->loc_addr_base, WIN_CREG);
-        cy_writel(&cust->cpu_start, 0);
-        cy_writel(&ctl_addr->loc_addr_base, WIN_RAM);
-        i = 0;
-        while ((status = readl(&fid->signature)) != ZFIRM_ID && i++ < 40)
-                msleep(100);
-        if (status != ZFIRM_ID) {
-                if (status == ZFIRM_HLT) {
-                        dev_err(&pdev->dev, "you need an external power supply "
-                                "for this number of ports. Firmware halted and "
-                                "board reset.\n");
-                        retval = -EIO;
-                        goto err;
-                }
-                dev_warn(&pdev->dev, "fid->signature = 0x%x... Waiting "
-                                "some more time\n", status);
-                while ((status = readl(&fid->signature)) != ZFIRM_ID &&
-                                i++ < 200)
-                        msleep(100);
-                if (status != ZFIRM_ID) {
-                        dev_err(&pdev->dev, "Board not started in 20 seconds! "
-                                        "Giving up. (fid->signature = 0x%x)\n",
-                                        status);
-                        dev_info(&pdev->dev, "*** Warning ***: if you are "
-                                "upgrading the FW, please power cycle the "
-                                "system before loading the new FW to the "
-                                "Cyclades-Z.\n");
-
-                        if (__cyz_fpga_loaded(ctl_addr))
-                                plx_init(pdev, irq, ctl_addr);
-
-                        retval = -EIO;
-                        goto err;
-                }
-                dev_dbg(&pdev->dev, "Firmware started after %d seconds.\n",
-                                i / 10);
-        }
-        pt_zfwctrl = base_addr + readl(&fid->zfwctrl_addr);
-
-        dev_dbg(&pdev->dev, "fid=> %p, zfwctrl_addr=> %x, npt_zfwctrl=> %p\n",
-                        base_addr + ID_ADDRESS, readl(&fid->zfwctrl_addr),
-                        base_addr + readl(&fid->zfwctrl_addr));
-
-        nchan = readl(&pt_zfwctrl->board_ctrl.n_channel);
-        dev_info(&pdev->dev, "Cyclades-Z FW loaded: version = %x, ports = %u\n",
-                readl(&pt_zfwctrl->board_ctrl.fw_version), nchan);
-
-        if (nchan == 0) {
-                dev_warn(&pdev->dev, "no Cyclades-Z ports were found. Please "
-                        "check the connection between the Z host card and the "
-                        "serial expanders.\n");
-
-                if (__cyz_fpga_loaded(ctl_addr))
-                        plx_init(pdev, irq, ctl_addr);
-
-                dev_info(&pdev->dev, "Null number of ports detected. Board "
-                                "reset.\n");
-                retval = 0;
-                goto err;
-        }
-
-        cy_writel(&pt_zfwctrl->board_ctrl.op_system, C_OS_LINUX);
-        cy_writel(&pt_zfwctrl->board_ctrl.dr_version, DRIVER_VERSION);
-
-        /*
-           Early firmware failed to start looking for commands.
-           This enables firmware interrupts for those commands.
-         */
-        cy_writel(&ctl_addr->intr_ctrl_stat, readl(&ctl_addr->intr_ctrl_stat) |
-                        (1 << 17));
-        cy_writel(&ctl_addr->intr_ctrl_stat, readl(&ctl_addr->intr_ctrl_stat) |
-                        0x00030800UL);
-
-        return nchan;
-err_rel:
-        release_firmware(fw);
-err:
-        return retval;
-}
-
-static int __devinit cy_pci_probe(struct pci_dev *pdev,
-                const struct pci_device_id *ent)
-{
-        void __iomem *addr0 = NULL, *addr2 = NULL;
-        char *card_name = NULL;
-        u32 uninitialized_var(mailbox);
-        unsigned int device_id, nchan = 0, card_no, i;
-        unsigned char plx_ver;
-        int retval, irq;
-
-        retval = pci_enable_device(pdev);
-        if (retval) {
-                dev_err(&pdev->dev, "cannot enable device\n");
-                goto err;
-        }
-
-        /* read PCI configuration area */
-        irq = pdev->irq;
-        device_id = pdev->device & ~PCI_DEVICE_ID_MASK;
-
-#if defined(__alpha__)
-        if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo) {   /* below 1M? */
-                dev_err(&pdev->dev, "Cyclom-Y/PCI not supported for low "
-                        "addresses on Alpha systems.\n");
-                retval = -EIO;
-                goto err_dis;
-        }
-#endif
-        if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Lo) {
-                dev_err(&pdev->dev, "Cyclades-Z/PCI not supported for low "
-                        "addresses\n");
-                retval = -EIO;
-                goto err_dis;
-        }
-
-        if (pci_resource_flags(pdev, 2) & IORESOURCE_IO) {
-                dev_warn(&pdev->dev, "PCI I/O bit incorrectly set. Ignoring "
-                                "it...\n");
-                pdev->resource[2].flags &= ~IORESOURCE_IO;
-        }
-
-        retval = pci_request_regions(pdev, "cyclades");
-        if (retval) {
-                dev_err(&pdev->dev, "failed to reserve resources\n");
-                goto err_dis;
-        }
-
-        retval = -EIO;
-        if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo ||
-                        device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
-                card_name = "Cyclom-Y";
-
-                addr0 = ioremap_nocache(pci_resource_start(pdev, 0),
-                                CyPCI_Yctl);
-                if (addr0 == NULL) {
-                        dev_err(&pdev->dev, "can't remap ctl region\n");
-                        goto err_reg;
-                }
-                addr2 = ioremap_nocache(pci_resource_start(pdev, 2),
-                                CyPCI_Ywin);
-                if (addr2 == NULL) {
-                        dev_err(&pdev->dev, "can't remap base region\n");
-                        goto err_unmap;
-                }
-
-                nchan = CyPORTS_PER_CHIP * cyy_init_card(addr2, 1);
-                if (nchan == 0) {
-                        dev_err(&pdev->dev, "Cyclom-Y PCI host card with no "
-                                        "Serial-Modules\n");
-                        goto err_unmap;
-                }
-        } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {
-                struct RUNTIME_9060 __iomem *ctl_addr;
-
-                ctl_addr = addr0 = ioremap_nocache(pci_resource_start(pdev, 0),
-                                CyPCI_Zctl);
-                if (addr0 == NULL) {
-                        dev_err(&pdev->dev, "can't remap ctl region\n");
-                        goto err_reg;
-                }
-
-                /* Disable interrupts on the PLX before resetting it */
-                cy_writew(&ctl_addr->intr_ctrl_stat,
-                                readw(&ctl_addr->intr_ctrl_stat) & ~0x0900);
-
-                plx_init(pdev, irq, addr0);
-
-                mailbox = readl(&ctl_addr->mail_box_0);
-
-                addr2 = ioremap_nocache(pci_resource_start(pdev, 2),
-                                mailbox == ZE_V1 ? CyPCI_Ze_win : CyPCI_Zwin);
-                if (addr2 == NULL) {
-                        dev_err(&pdev->dev, "can't remap base region\n");
-                        goto err_unmap;
-                }
-
-                if (mailbox == ZE_V1) {
-                        card_name = "Cyclades-Ze";
-                } else {
-                        card_name = "Cyclades-8Zo";
-#ifdef CY_PCI_DEBUG
-                        if (mailbox == ZO_V1) {
-                                cy_writel(&ctl_addr->loc_addr_base, WIN_CREG);
-                                dev_info(&pdev->dev, "Cyclades-8Zo/PCI: FPGA "
-                                        "id %lx, ver %lx\n", (ulong)(0xff &
-                                        readl(&((struct CUSTOM_REG *)addr2)->
-                                                fpga_id)), (ulong)(0xff &
-                                        readl(&((struct CUSTOM_REG *)addr2)->
-                                                fpga_version)));
-                                cy_writel(&ctl_addr->loc_addr_base, WIN_RAM);
-                        } else {
-                                dev_info(&pdev->dev, "Cyclades-Z/PCI: New "
-                                        "Cyclades-Z board.  FPGA not loaded\n");
-                        }
-#endif
-                        /* The following clears the firmware id word.  This
-                           ensures that the driver will not attempt to talk to
-                           the board until it has been properly initialized.
-                         */
-                        if ((mailbox == ZO_V1) || (mailbox == ZO_V2))
-                                cy_writel(addr2 + ID_ADDRESS, 0L);
-                }
-
-                retval = cyz_load_fw(pdev, addr2, addr0, irq);
-                if (retval <= 0)
-                        goto err_unmap;
-                nchan = retval;
-        }
-
-        if ((cy_next_channel + nchan) > NR_PORTS) {
-                dev_err(&pdev->dev, "Cyclades-8Zo/PCI found, but no "
-                        "channels are available. Change NR_PORTS in "
-                        "cyclades.c and recompile kernel.\n");
-                goto err_unmap;
-        }
-        /* fill the next cy_card structure available */
-        for (card_no = 0; card_no < NR_CARDS; card_no++) {
-                if (cy_card[card_no].base_addr == NULL)
-                        break;
-        }
-        if (card_no == NR_CARDS) {      /* no more cy_cards available */
-                dev_err(&pdev->dev, "Cyclades-8Zo/PCI found, but no "
-                        "more cards can be used. Change NR_CARDS in "
-                        "cyclades.c and recompile kernel.\n");
-                goto err_unmap;
-        }
-
-        if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo ||
-                        device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
-                /* allocate IRQ */
-                retval = request_irq(irq, cyy_interrupt,
-                                IRQF_SHARED, "Cyclom-Y", &cy_card[card_no]);
-                if (retval) {
-                        dev_err(&pdev->dev, "could not allocate IRQ\n");
-                        goto err_unmap;
-                }
-                cy_card[card_no].num_chips = nchan / CyPORTS_PER_CHIP;
-        } else {
-                struct FIRM_ID __iomem *firm_id = addr2 + ID_ADDRESS;
-                struct ZFW_CTRL __iomem *zfw_ctrl;
-
-                zfw_ctrl = addr2 + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-
-                cy_card[card_no].hw_ver = mailbox;
-                cy_card[card_no].num_chips = (unsigned int)-1;
-                cy_card[card_no].board_ctrl = &zfw_ctrl->board_ctrl;
-#ifdef CONFIG_CYZ_INTR
-                /* allocate IRQ only if board has an IRQ */
-                if (irq != 0 && irq != 255) {
-                        retval = request_irq(irq, cyz_interrupt,
-                                        IRQF_SHARED, "Cyclades-Z",
-                                        &cy_card[card_no]);
-                        if (retval) {
-                                dev_err(&pdev->dev, "could not allocate IRQ\n");
-                                goto err_unmap;
-                        }
-                }
-#endif                          /* CONFIG_CYZ_INTR */
-        }
-
-        /* set cy_card */
-        cy_card[card_no].base_addr = addr2;
-        cy_card[card_no].ctl_addr.p9050 = addr0;
-        cy_card[card_no].irq = irq;
-        cy_card[card_no].bus_index = 1;
-        cy_card[card_no].first_line = cy_next_channel;
-        cy_card[card_no].nports = nchan;
-        retval = cy_init_card(&cy_card[card_no]);
-        if (retval)
-                goto err_null;
-
-        pci_set_drvdata(pdev, &cy_card[card_no]);
-
-        if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo ||
-                        device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
-                /* enable interrupts in the PCI interface */
-                plx_ver = readb(addr2 + CyPLX_VER) & 0x0f;
-                switch (plx_ver) {
-                case PLX_9050:
-                        cy_writeb(addr0 + 0x4c, 0x43);
-                        break;
-
-                case PLX_9060:
-                case PLX_9080:
-                default:        /* Old boards, use PLX_9060 */
-                {
-                        struct RUNTIME_9060 __iomem *ctl_addr = addr0;
-                        plx_init(pdev, irq, ctl_addr);
-                        cy_writew(&ctl_addr->intr_ctrl_stat,
-                                readw(&ctl_addr->intr_ctrl_stat) | 0x0900);
-                        break;
-                }
-                }
-        }
-
-        dev_info(&pdev->dev, "%s/PCI #%d found: %d channels starting from "
-                "port %d.\n", card_name, card_no + 1, nchan, cy_next_channel);
-        for (i = cy_next_channel; i < cy_next_channel + nchan; i++)
-                tty_register_device(cy_serial_driver, i, &pdev->dev);
-        cy_next_channel += nchan;
-
-        return 0;
-err_null:
-        cy_card[card_no].base_addr = NULL;
-        free_irq(irq, &cy_card[card_no]);
-err_unmap:
-        iounmap(addr0);
-        if (addr2)
-                iounmap(addr2);
-err_reg:
-        pci_release_regions(pdev);
-err_dis:
-        pci_disable_device(pdev);
-err:
-        return retval;
-}
-
-static void __devexit cy_pci_remove(struct pci_dev *pdev)
-{
-        struct cyclades_card *cinfo = pci_get_drvdata(pdev);
-        unsigned int i;
-
-        /* non-Z with old PLX */
-        if (!cy_is_Z(cinfo) && (readb(cinfo->base_addr + CyPLX_VER) & 0x0f) ==
-                        PLX_9050)
-                cy_writeb(cinfo->ctl_addr.p9050 + 0x4c, 0);
-        else
-#ifndef CONFIG_CYZ_INTR
-                if (!cy_is_Z(cinfo))
-#endif
-                cy_writew(&cinfo->ctl_addr.p9060->intr_ctrl_stat,
-                        readw(&cinfo->ctl_addr.p9060->intr_ctrl_stat) &
-                        ~0x0900);
-
-        iounmap(cinfo->base_addr);
-        if (cinfo->ctl_addr.p9050)
-                iounmap(cinfo->ctl_addr.p9050);
-        if (cinfo->irq
-#ifndef CONFIG_CYZ_INTR
-                && !cy_is_Z(cinfo)
-#endif /* CONFIG_CYZ_INTR */
-                )
-                free_irq(cinfo->irq, cinfo);
-        pci_release_regions(pdev);
-
-        cinfo->base_addr = NULL;
-        for (i = cinfo->first_line; i < cinfo->first_line +
-                        cinfo->nports; i++)
-                tty_unregister_device(cy_serial_driver, i);
-        cinfo->nports = 0;
-        kfree(cinfo->ports);
-}
-
-static struct pci_driver cy_pci_driver = {
-        .name = "cyclades",
-        .id_table = cy_pci_dev_id,
-        .probe = cy_pci_probe,
-        .remove = __devexit_p(cy_pci_remove)
-};
-#endif
-
-static int cyclades_proc_show(struct seq_file *m, void *v)
-{
-        struct cyclades_port *info;
-        unsigned int i, j;
-        __u32 cur_jifs = jiffies;
-
-        seq_puts(m, "Dev TimeOpen   BytesOut  IdleOut    BytesIn   "
-                        "IdleIn  Overruns  Ldisc\n");
-
-        /* Output one line for each known port */
-        for (i = 0; i < NR_CARDS; i++)
-                for (j = 0; j < cy_card[i].nports; j++) {
-                        info = &cy_card[i].ports[j];
-
-                        if (info->port.count) {
-                                /* XXX is the ldisc num worth this? */
-                                struct tty_struct *tty;
-                                struct tty_ldisc *ld;
-                                int num = 0;
-                                tty = tty_port_tty_get(&info->port);
-                                if (tty) {
-                                        ld = tty_ldisc_ref(tty);
-                                        if (ld) {
-                                                num = ld->ops->num;
-                                                tty_ldisc_deref(ld);
-                                        }
-                                        tty_kref_put(tty);
-                                }
-                                seq_printf(m, "%3d %8lu %10lu %8lu "
-                                        "%10lu %8lu %9lu %6d\n", info->line,
-                                        (cur_jifs - info->idle_stats.in_use) /
-                                        HZ, info->idle_stats.xmit_bytes,
-                                        (cur_jifs - info->idle_stats.xmit_idle)/
-                                        HZ, info->idle_stats.recv_bytes,
-                                        (cur_jifs - info->idle_stats.recv_idle)/
-                                        HZ, info->idle_stats.overruns,
-                                        num);
-                        } else
-                                seq_printf(m, "%3d %8lu %10lu %8lu "
-                                        "%10lu %8lu %9lu %6ld\n",
-                                        info->line, 0L, 0L, 0L, 0L, 0L, 0L, 0L);
-                }
-        return 0;
-}
-
-static int cyclades_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, cyclades_proc_show, NULL);
-}
-
-static const struct file_operations cyclades_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = cyclades_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-/* The serial driver boot-time initialization code!
-    Hardware I/O ports are mapped to character special devices on a
-    first found, first allocated manner.  That is, this code searches
-    for Cyclom cards in the system.  As each is found, it is probed
-    to discover how many chips (and thus how many ports) are present.
-    These ports are mapped to the tty ports 32 and upward in monotonic
-    fashion.  If an 8-port card is replaced with a 16-port card, the
-    port mapping on a following card will shift.
-
-    This approach is different from what is used in the other serial
-    device driver because the Cyclom is more properly a multiplexer,
-    not just an aggregation of serial ports on one card.
-
-    If there are more cards with more ports than have been
-    statically allocated above, a warning is printed and the
-    extra ports are ignored.
- */
-
-static const struct tty_operations cy_ops = {
-        .open = cy_open,
-        .close = cy_close,
-        .write = cy_write,
-        .put_char = cy_put_char,
-        .flush_chars = cy_flush_chars,
-        .write_room = cy_write_room,
-        .chars_in_buffer = cy_chars_in_buffer,
-        .flush_buffer = cy_flush_buffer,
-        .ioctl = cy_ioctl,
-        .throttle = cy_throttle,
-        .unthrottle = cy_unthrottle,
-        .set_termios = cy_set_termios,
-        .stop = cy_stop,
-        .start = cy_start,
-        .hangup = cy_hangup,
-        .break_ctl = cy_break,
-        .wait_until_sent = cy_wait_until_sent,
-        .tiocmget = cy_tiocmget,
-        .tiocmset = cy_tiocmset,
-        .proc_fops = &cyclades_proc_fops,
-};
-
-static int __init cy_init(void)
-{
-        unsigned int nboards;
-        int retval = -ENOMEM;
-
-        cy_serial_driver = alloc_tty_driver(NR_PORTS);
-        if (!cy_serial_driver)
-                goto err;
-
-        printk(KERN_INFO "Cyclades driver " CY_VERSION " (built %s %s)\n",
-                        __DATE__, __TIME__);
-
-        /* Initialize the tty_driver structure */
-
-        cy_serial_driver->owner = THIS_MODULE;
-        cy_serial_driver->driver_name = "cyclades";
-        cy_serial_driver->name = "ttyC";
-        cy_serial_driver->major = CYCLADES_MAJOR;
-        cy_serial_driver->minor_start = 0;
-        cy_serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        cy_serial_driver->subtype = SERIAL_TYPE_NORMAL;
-        cy_serial_driver->init_termios = tty_std_termios;
-        cy_serial_driver->init_termios.c_cflag =
-            B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        cy_serial_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-        tty_set_operations(cy_serial_driver, &cy_ops);
-
-        retval = tty_register_driver(cy_serial_driver);
-        if (retval) {
-                printk(KERN_ERR "Couldn't register Cyclades serial driver\n");
-                goto err_frtty;
-        }
-
-        /* the code below is responsible to find the boards. Each different
-           type of board has its own detection routine. If a board is found,
-           the next cy_card structure available is set by the detection
-           routine. These functions are responsible for checking the
-           availability of cy_card and cy_port data structures and updating
-           the cy_next_channel. */
-
-        /* look for isa boards */
-        nboards = cy_detect_isa();
-
-#ifdef CONFIG_PCI
-        /* look for pci boards */
-        retval = pci_register_driver(&cy_pci_driver);
-        if (retval && !nboards) {
-                tty_unregister_driver(cy_serial_driver);
-                goto err_frtty;
-        }
-#endif
-
-        return 0;
-err_frtty:
-        put_tty_driver(cy_serial_driver);
-err:
-        return retval;
-}                               /* cy_init */
-
-static void __exit cy_cleanup_module(void)
-{
-        struct cyclades_card *card;
-        unsigned int i, e1;
-
-#ifndef CONFIG_CYZ_INTR
-        del_timer_sync(&cyz_timerlist);
-#endif /* CONFIG_CYZ_INTR */
-
-        e1 = tty_unregister_driver(cy_serial_driver);
-        if (e1)
-                printk(KERN_ERR "failed to unregister Cyclades serial "
-                                "driver(%d)\n", e1);
-
-#ifdef CONFIG_PCI
-        pci_unregister_driver(&cy_pci_driver);
-#endif
-
-        for (i = 0; i < NR_CARDS; i++) {
-                card = &cy_card[i];
-                if (card->base_addr) {
-                        /* clear interrupt */
-                        cy_writeb(card->base_addr + Cy_ClrIntr, 0);
-                        iounmap(card->base_addr);
-                        if (card->ctl_addr.p9050)
-                                iounmap(card->ctl_addr.p9050);
-                        if (card->irq
-#ifndef CONFIG_CYZ_INTR
-                                && !cy_is_Z(card)
-#endif /* CONFIG_CYZ_INTR */
-                                )
-                                free_irq(card->irq, card);
-                        for (e1 = card->first_line; e1 < card->first_line +
-                                        card->nports; e1++)
-                                tty_unregister_device(cy_serial_driver, e1);
-                        kfree(card->ports);
-                }
-        }
-
-        put_tty_driver(cy_serial_driver);
-} /* cy_cleanup_module */
-
-module_init(cy_init);
-module_exit(cy_cleanup_module);
-
-MODULE_LICENSE("GPL");
-MODULE_VERSION(CY_VERSION);
-MODULE_ALIAS_CHARDEV_MAJOR(CYCLADES_MAJOR);
-MODULE_FIRMWARE("cyzfirm.bin");
diff --git a/drivers/char/defkeymap.c_shipped b/drivers/char/defkeymap.c_shipped
deleted file mode 100644
index d2208dfe3f67..000000000000
--- a/drivers/char/defkeymap.c_shipped
+++ /dev/null
@@ -1,262 +0,0 @@
-/* Do not edit this file! It was automatically generated by   */
-/*    loadkeys --mktable defkeymap.map > defkeymap.c          */
-
-#include <linux/types.h>
-#include <linux/keyboard.h>
-#include <linux/kd.h>
-
-u_short plain_map[NR_KEYS] = {
-        0xf200, 0xf01b, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, 0xf036,
-        0xf037, 0xf038, 0xf039, 0xf030, 0xf02d, 0xf03d, 0xf07f, 0xf009,
-        0xfb71, 0xfb77, 0xfb65, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69,
-        0xfb6f, 0xfb70, 0xf05b, 0xf05d, 0xf201, 0xf702, 0xfb61, 0xfb73,
-        0xfb64, 0xfb66, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf03b,
-        0xf027, 0xf060, 0xf700, 0xf05c, 0xfb7a, 0xfb78, 0xfb63, 0xfb76,
-        0xfb62, 0xfb6e, 0xfb6d, 0xf02c, 0xf02e, 0xf02f, 0xf700, 0xf30c,
-        0xf703, 0xf020, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104,
-        0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf209, 0xf307,
-        0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301,
-        0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf03c, 0xf10a,
-        0xf10b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-        0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603,
-        0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116,
-        0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-};
-
-u_short shift_map[NR_KEYS] = {
-        0xf200, 0xf01b, 0xf021, 0xf040, 0xf023, 0xf024, 0xf025, 0xf05e,
-        0xf026, 0xf02a, 0xf028, 0xf029, 0xf05f, 0xf02b, 0xf07f, 0xf009,
-        0xfb51, 0xfb57, 0xfb45, 0xfb52, 0xfb54, 0xfb59, 0xfb55, 0xfb49,
-        0xfb4f, 0xfb50, 0xf07b, 0xf07d, 0xf201, 0xf702, 0xfb41, 0xfb53,
-        0xfb44, 0xfb46, 0xfb47, 0xfb48, 0xfb4a, 0xfb4b, 0xfb4c, 0xf03a,
-        0xf022, 0xf07e, 0xf700, 0xf07c, 0xfb5a, 0xfb58, 0xfb43, 0xfb56,
-        0xfb42, 0xfb4e, 0xfb4d, 0xf03c, 0xf03e, 0xf03f, 0xf700, 0xf30c,
-        0xf703, 0xf020, 0xf207, 0xf10a, 0xf10b, 0xf10c, 0xf10d, 0xf10e,
-        0xf10f, 0xf110, 0xf111, 0xf112, 0xf113, 0xf213, 0xf203, 0xf307,
-        0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301,
-        0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf03e, 0xf10a,
-        0xf10b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-        0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603,
-        0xf20b, 0xf601, 0xf602, 0xf117, 0xf600, 0xf20a, 0xf115, 0xf116,
-        0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-};
-
-u_short altgr_map[NR_KEYS] = {
-        0xf200, 0xf200, 0xf200, 0xf040, 0xf200, 0xf024, 0xf200, 0xf200,
-        0xf07b, 0xf05b, 0xf05d, 0xf07d, 0xf05c, 0xf200, 0xf200, 0xf200,
-        0xfb71, 0xfb77, 0xf918, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69,
-        0xfb6f, 0xfb70, 0xf200, 0xf07e, 0xf201, 0xf702, 0xf914, 0xfb73,
-        0xf917, 0xf919, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf200,
-        0xf200, 0xf200, 0xf700, 0xf200, 0xfb7a, 0xfb78, 0xf916, 0xfb76,
-        0xf915, 0xfb6e, 0xfb6d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c,
-        0xf703, 0xf200, 0xf207, 0xf50c, 0xf50d, 0xf50e, 0xf50f, 0xf510,
-        0xf511, 0xf512, 0xf513, 0xf514, 0xf515, 0xf208, 0xf202, 0xf911,
-        0xf912, 0xf913, 0xf30b, 0xf90e, 0xf90f, 0xf910, 0xf30a, 0xf90b,
-        0xf90c, 0xf90d, 0xf90a, 0xf310, 0xf206, 0xf200, 0xf07c, 0xf516,
-        0xf517, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-        0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603,
-        0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116,
-        0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-};
-
-u_short ctrl_map[NR_KEYS] = {
-        0xf200, 0xf200, 0xf200, 0xf000, 0xf01b, 0xf01c, 0xf01d, 0xf01e,
-        0xf01f, 0xf07f, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf008, 0xf200,
-        0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009,
-        0xf00f, 0xf010, 0xf01b, 0xf01d, 0xf201, 0xf702, 0xf001, 0xf013,
-        0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200,
-        0xf007, 0xf000, 0xf700, 0xf01c, 0xf01a, 0xf018, 0xf003, 0xf016,
-        0xf002, 0xf00e, 0xf00d, 0xf200, 0xf20e, 0xf07f, 0xf700, 0xf30c,
-        0xf703, 0xf000, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104,
-        0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf204, 0xf307,
-        0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301,
-        0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf10a,
-        0xf10b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-        0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603,
-        0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116,
-        0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-};
-
-u_short shift_ctrl_map[NR_KEYS] = {
-        0xf200, 0xf200, 0xf200, 0xf000, 0xf200, 0xf200, 0xf200, 0xf200,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf200, 0xf200,
-        0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009,
-        0xf00f, 0xf010, 0xf200, 0xf200, 0xf201, 0xf702, 0xf001, 0xf013,
-        0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200,
-        0xf200, 0xf200, 0xf700, 0xf200, 0xf01a, 0xf018, 0xf003, 0xf016,
-        0xf002, 0xf00e, 0xf00d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c,
-        0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307,
-        0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301,
-        0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-        0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603,
-        0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116,
-        0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-};
-
-u_short alt_map[NR_KEYS] = {
-        0xf200, 0xf81b, 0xf831, 0xf832, 0xf833, 0xf834, 0xf835, 0xf836,
-        0xf837, 0xf838, 0xf839, 0xf830, 0xf82d, 0xf83d, 0xf87f, 0xf809,
-        0xf871, 0xf877, 0xf865, 0xf872, 0xf874, 0xf879, 0xf875, 0xf869,
-        0xf86f, 0xf870, 0xf85b, 0xf85d, 0xf80d, 0xf702, 0xf861, 0xf873,
-        0xf864, 0xf866, 0xf867, 0xf868, 0xf86a, 0xf86b, 0xf86c, 0xf83b,
-        0xf827, 0xf860, 0xf700, 0xf85c, 0xf87a, 0xf878, 0xf863, 0xf876,
-        0xf862, 0xf86e, 0xf86d, 0xf82c, 0xf82e, 0xf82f, 0xf700, 0xf30c,
-        0xf703, 0xf820, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504,
-        0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf209, 0xf907,
-        0xf908, 0xf909, 0xf30b, 0xf904, 0xf905, 0xf906, 0xf30a, 0xf901,
-        0xf902, 0xf903, 0xf900, 0xf310, 0xf206, 0xf200, 0xf83c, 0xf50a,
-        0xf50b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-        0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603,
-        0xf118, 0xf210, 0xf211, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116,
-        0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-};
-
-u_short ctrl_alt_map[NR_KEYS] = {
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-        0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809,
-        0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf702, 0xf801, 0xf813,
-        0xf804, 0xf806, 0xf807, 0xf808, 0xf80a, 0xf80b, 0xf80c, 0xf200,
-        0xf200, 0xf200, 0xf700, 0xf200, 0xf81a, 0xf818, 0xf803, 0xf816,
-        0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c,
-        0xf703, 0xf200, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504,
-        0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf200, 0xf307,
-        0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301,
-        0xf302, 0xf303, 0xf300, 0xf20c, 0xf206, 0xf200, 0xf200, 0xf50a,
-        0xf50b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-        0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603,
-        0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf20c,
-        0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
-};
-
-ushort *key_maps[MAX_NR_KEYMAPS] = {
-        plain_map, shift_map, altgr_map, NULL,
-        ctrl_map, shift_ctrl_map, NULL, NULL,
-        alt_map, NULL, NULL, NULL,
-        ctrl_alt_map, NULL
-};
-
-unsigned int keymap_count = 7;
-
-/*
- * Philosophy: most people do not define more strings, but they who do
- * often want quite a lot of string space. So, we statically allocate
- * the default and allocate dynamically in chunks of 512 bytes.
- */
-
-char func_buf[] = {
-        '\033', '[', '[', 'A', 0, 
-        '\033', '[', '[', 'B', 0, 
-        '\033', '[', '[', 'C', 0, 
-        '\033', '[', '[', 'D', 0, 
-        '\033', '[', '[', 'E', 0, 
-        '\033', '[', '1', '7', '~', 0, 
-        '\033', '[', '1', '8', '~', 0, 
-        '\033', '[', '1', '9', '~', 0, 
-        '\033', '[', '2', '0', '~', 0, 
-        '\033', '[', '2', '1', '~', 0, 
-        '\033', '[', '2', '3', '~', 0, 
-        '\033', '[', '2', '4', '~', 0, 
-        '\033', '[', '2', '5', '~', 0, 
-        '\033', '[', '2', '6', '~', 0, 
-        '\033', '[', '2', '8', '~', 0, 
-        '\033', '[', '2', '9', '~', 0, 
-        '\033', '[', '3', '1', '~', 0, 
-        '\033', '[', '3', '2', '~', 0, 
-        '\033', '[', '3', '3', '~', 0, 
-        '\033', '[', '3', '4', '~', 0, 
-        '\033', '[', '1', '~', 0, 
-        '\033', '[', '2', '~', 0, 
-        '\033', '[', '3', '~', 0, 
-        '\033', '[', '4', '~', 0, 
-        '\033', '[', '5', '~', 0, 
-        '\033', '[', '6', '~', 0, 
-        '\033', '[', 'M', 0, 
-        '\033', '[', 'P', 0, 
-};
-
-char *funcbufptr = func_buf;
-int funcbufsize = sizeof(func_buf);
-int funcbufleft = 0;          /* space left */
-
-char *func_table[MAX_NR_FUNC] = {
-        func_buf + 0,
-        func_buf + 5,
-        func_buf + 10,
-        func_buf + 15,
-        func_buf + 20,
-        func_buf + 25,
-        func_buf + 31,
-        func_buf + 37,
-        func_buf + 43,
-        func_buf + 49,
-        func_buf + 55,
-        func_buf + 61,
-        func_buf + 67,
-        func_buf + 73,
-        func_buf + 79,
-        func_buf + 85,
-        func_buf + 91,
-        func_buf + 97,
-        func_buf + 103,
-        func_buf + 109,
-        func_buf + 115,
-        func_buf + 120,
-        func_buf + 125,
-        func_buf + 130,
-        func_buf + 135,
-        func_buf + 140,
-        func_buf + 145,
-        NULL,
-        NULL,
-        func_buf + 149,
-        NULL,
-};
-
-struct kbdiacruc accent_table[MAX_DIACR] = {
-        {'`', 'A', 0300},       {'`', 'a', 0340},
-        {'\'', 'A', 0301},      {'\'', 'a', 0341},
-        {'^', 'A', 0302},       {'^', 'a', 0342},
-        {'~', 'A', 0303},       {'~', 'a', 0343},
-        {'"', 'A', 0304},       {'"', 'a', 0344},
-        {'O', 'A', 0305},       {'o', 'a', 0345},
-        {'0', 'A', 0305},       {'0', 'a', 0345},
-        {'A', 'A', 0305},       {'a', 'a', 0345},
-        {'A', 'E', 0306},       {'a', 'e', 0346},
-        {',', 'C', 0307},       {',', 'c', 0347},
-        {'`', 'E', 0310},       {'`', 'e', 0350},
-        {'\'', 'E', 0311},      {'\'', 'e', 0351},
-        {'^', 'E', 0312},       {'^', 'e', 0352},
-        {'"', 'E', 0313},       {'"', 'e', 0353},
-        {'`', 'I', 0314},       {'`', 'i', 0354},
-        {'\'', 'I', 0315},      {'\'', 'i', 0355},
-        {'^', 'I', 0316},       {'^', 'i', 0356},
-        {'"', 'I', 0317},       {'"', 'i', 0357},
-        {'-', 'D', 0320},       {'-', 'd', 0360},
-        {'~', 'N', 0321},       {'~', 'n', 0361},
-        {'`', 'O', 0322},       {'`', 'o', 0362},
-        {'\'', 'O', 0323},      {'\'', 'o', 0363},
-        {'^', 'O', 0324},       {'^', 'o', 0364},
-        {'~', 'O', 0325},       {'~', 'o', 0365},
-        {'"', 'O', 0326},       {'"', 'o', 0366},
-        {'/', 'O', 0330},       {'/', 'o', 0370},
-        {'`', 'U', 0331},       {'`', 'u', 0371},
-        {'\'', 'U', 0332},      {'\'', 'u', 0372},
-        {'^', 'U', 0333},       {'^', 'u', 0373},
-        {'"', 'U', 0334},       {'"', 'u', 0374},
-        {'\'', 'Y', 0335},      {'\'', 'y', 0375},
-        {'T', 'H', 0336},       {'t', 'h', 0376},
-        {'s', 's', 0337},       {'"', 'y', 0377},
-        {'s', 'z', 0337},       {'i', 'j', 0377},
-};
-
-unsigned int accent_table_size = 68;
diff --git a/drivers/char/defkeymap.map b/drivers/char/defkeymap.map
deleted file mode 100644
index 50b30cace261..000000000000
--- a/drivers/char/defkeymap.map
+++ /dev/null
@@ -1,357 +0,0 @@
-# Default kernel keymap. This uses 7 modifier combinations.
-keymaps 0-2,4-5,8,12
-# Change the above line into
-#       keymaps 0-2,4-6,8,12
-# in case you want the entries
-#       altgr   control keycode  83 = Boot            
-#       altgr   control keycode 111 = Boot            
-# below.
-#
-# In fact AltGr is used very little, and one more keymap can
-# be saved by mapping AltGr to Alt (and adapting a few entries):
-# keycode 100 = Alt
-#
-keycode   1 = Escape           Escape          
-        alt     keycode   1 = Meta_Escape     
-keycode   2 = one              exclam          
-        alt     keycode   2 = Meta_one        
-keycode   3 = two              at               at              
-        control keycode   3 = nul             
-        shift   control keycode   3 = nul             
-        alt     keycode   3 = Meta_two        
-keycode   4 = three            numbersign      
-        control keycode   4 = Escape          
-        alt     keycode   4 = Meta_three      
-keycode   5 = four             dollar           dollar          
-        control keycode   5 = Control_backslash
-        alt     keycode   5 = Meta_four       
-keycode   6 = five             percent         
-        control keycode   6 = Control_bracketright
-        alt     keycode   6 = Meta_five       
-keycode   7 = six              asciicircum     
-        control keycode   7 = Control_asciicircum
-        alt     keycode   7 = Meta_six        
-keycode   8 = seven            ampersand        braceleft       
-        control keycode   8 = Control_underscore
-        alt     keycode   8 = Meta_seven      
-keycode   9 = eight            asterisk         bracketleft     
-        control keycode   9 = Delete          
-        alt     keycode   9 = Meta_eight      
-keycode  10 = nine             parenleft        bracketright    
-        alt     keycode  10 = Meta_nine       
-keycode  11 = zero             parenright       braceright      
-        alt     keycode  11 = Meta_zero       
-keycode  12 = minus            underscore       backslash       
-        control keycode  12 = Control_underscore
-        shift   control keycode  12 = Control_underscore
-        alt     keycode  12 = Meta_minus      
-keycode  13 = equal            plus            
-        alt     keycode  13 = Meta_equal      
-keycode  14 = Delete           Delete          
-        control keycode  14 = BackSpace
-        alt     keycode  14 = Meta_Delete     
-keycode  15 = Tab              Tab             
-        alt     keycode  15 = Meta_Tab        
-keycode  16 = q               
-keycode  17 = w               
-keycode  18 = e
-        altgr   keycode  18 = Hex_E   
-keycode  19 = r               
-keycode  20 = t               
-keycode  21 = y               
-keycode  22 = u               
-keycode  23 = i               
-keycode  24 = o               
-keycode  25 = p               
-keycode  26 = bracketleft      braceleft       
-        control keycode  26 = Escape          
-        alt     keycode  26 = Meta_bracketleft
-keycode  27 = bracketright     braceright       asciitilde      
-        control keycode  27 = Control_bracketright
-        alt     keycode  27 = Meta_bracketright
-keycode  28 = Return          
-        alt     keycode  28 = Meta_Control_m  
-keycode  29 = Control         
-keycode  30 = a
-        altgr   keycode  30 = Hex_A
-keycode  31 = s               
-keycode  32 = d
-        altgr   keycode  32 = Hex_D   
-keycode  33 = f
-        altgr   keycode  33 = Hex_F               
-keycode  34 = g               
-keycode  35 = h               
-keycode  36 = j               
-keycode  37 = k               
-keycode  38 = l               
-keycode  39 = semicolon        colon           
-        alt     keycode  39 = Meta_semicolon  
-keycode  40 = apostrophe       quotedbl        
-        control keycode  40 = Control_g       
-        alt     keycode  40 = Meta_apostrophe 
-keycode  41 = grave            asciitilde      
-        control keycode  41 = nul             
-        alt     keycode  41 = Meta_grave      
-keycode  42 = Shift           
-keycode  43 = backslash        bar             
-        control keycode  43 = Control_backslash
-        alt     keycode  43 = Meta_backslash  
-keycode  44 = z               
-keycode  45 = x               
-keycode  46 = c
-        altgr   keycode  46 = Hex_C   
-keycode  47 = v               
-keycode  48 = b
-        altgr   keycode  48 = Hex_B
-keycode  49 = n               
-keycode  50 = m               
-keycode  51 = comma            less            
-        alt     keycode  51 = Meta_comma      
-keycode  52 = period           greater         
-        control keycode  52 = Compose         
-        alt     keycode  52 = Meta_period     
-keycode  53 = slash            question        
-        control keycode  53 = Delete          
-        alt     keycode  53 = Meta_slash      
-keycode  54 = Shift           
-keycode  55 = KP_Multiply     
-keycode  56 = Alt             
-keycode  57 = space            space           
-        control keycode  57 = nul             
-        alt     keycode  57 = Meta_space      
-keycode  58 = Caps_Lock       
-keycode  59 = F1               F11              Console_13      
-        control keycode  59 = F1              
-        alt     keycode  59 = Console_1       
-        control alt     keycode  59 = Console_1       
-keycode  60 = F2               F12              Console_14      
-        control keycode  60 = F2              
-        alt     keycode  60 = Console_2       
-        control alt     keycode  60 = Console_2       
-keycode  61 = F3               F13              Console_15      
-        control keycode  61 = F3              
-        alt     keycode  61 = Console_3       
-        control alt     keycode  61 = Console_3       
-keycode  62 = F4               F14              Console_16      
-        control keycode  62 = F4              
-        alt     keycode  62 = Console_4       
-        control alt     keycode  62 = Console_4       
-keycode  63 = F5               F15              Console_17      
-        control keycode  63 = F5              
-        alt     keycode  63 = Console_5       
-        control alt     keycode  63 = Console_5       
-keycode  64 = F6               F16              Console_18      
-        control keycode  64 = F6              
-        alt     keycode  64 = Console_6       
-        control alt     keycode  64 = Console_6       
-keycode  65 = F7               F17              Console_19      
-        control keycode  65 = F7              
-        alt     keycode  65 = Console_7       
-        control alt     keycode  65 = Console_7       
-keycode  66 = F8               F18              Console_20      
-        control keycode  66 = F8              
-        alt     keycode  66 = Console_8       
-        control alt     keycode  66 = Console_8       
-keycode  67 = F9               F19              Console_21      
-        control keycode  67 = F9              
-        alt     keycode  67 = Console_9       
-        control alt     keycode  67 = Console_9       
-keycode  68 = F10              F20              Console_22      
-        control keycode  68 = F10             
-        alt     keycode  68 = Console_10      
-        control alt     keycode  68 = Console_10      
-keycode  69 = Num_Lock
-        shift   keycode  69 = Bare_Num_Lock
-keycode  70 = Scroll_Lock      Show_Memory      Show_Registers  
-        control keycode  70 = Show_State      
-        alt     keycode  70 = Scroll_Lock     
-keycode  71 = KP_7            
-        alt     keycode  71 = Ascii_7         
-        altgr   keycode  71 = Hex_7         
-keycode  72 = KP_8            
-        alt     keycode  72 = Ascii_8         
-        altgr   keycode  72 = Hex_8         
-keycode  73 = KP_9            
-        alt     keycode  73 = Ascii_9         
-        altgr   keycode  73 = Hex_9         
-keycode  74 = KP_Subtract     
-keycode  75 = KP_4            
-        alt     keycode  75 = Ascii_4         
-        altgr   keycode  75 = Hex_4         
-keycode  76 = KP_5            
-        alt     keycode  76 = Ascii_5         
-        altgr   keycode  76 = Hex_5         
-keycode  77 = KP_6            
-        alt     keycode  77 = Ascii_6         
-        altgr   keycode  77 = Hex_6         
-keycode  78 = KP_Add          
-keycode  79 = KP_1            
-        alt     keycode  79 = Ascii_1         
-        altgr   keycode  79 = Hex_1         
-keycode  80 = KP_2            
-        alt     keycode  80 = Ascii_2         
-        altgr   keycode  80 = Hex_2         
-keycode  81 = KP_3            
-        alt     keycode  81 = Ascii_3         
-        altgr   keycode  81 = Hex_3         
-keycode  82 = KP_0            
-        alt     keycode  82 = Ascii_0         
-        altgr   keycode  82 = Hex_0         
-keycode  83 = KP_Period       
-#       altgr   control keycode  83 = Boot            
-        control alt     keycode  83 = Boot            
-keycode  84 = Last_Console    
-keycode  85 =
-keycode  86 = less             greater          bar             
-        alt     keycode  86 = Meta_less       
-keycode  87 = F11              F11              Console_23      
-        control keycode  87 = F11             
-        alt     keycode  87 = Console_11      
-        control alt     keycode  87 = Console_11      
-keycode  88 = F12              F12              Console_24      
-        control keycode  88 = F12             
-        alt     keycode  88 = Console_12      
-        control alt     keycode  88 = Console_12      
-keycode  89 =
-keycode  90 =
-keycode  91 =
-keycode  92 =
-keycode  93 =
-keycode  94 =
-keycode  95 =
-keycode  96 = KP_Enter        
-keycode  97 = Control         
-keycode  98 = KP_Divide       
-keycode  99 = Control_backslash
-        control keycode  99 = Control_backslash
-        alt     keycode  99 = Control_backslash
-keycode 100 = AltGr           
-keycode 101 = Break           
-keycode 102 = Find            
-keycode 103 = Up              
-keycode 104 = Prior           
-        shift   keycode 104 = Scroll_Backward 
-keycode 105 = Left            
-        alt     keycode 105 = Decr_Console
-keycode 106 = Right           
-        alt     keycode 106 = Incr_Console
-keycode 107 = Select          
-keycode 108 = Down            
-keycode 109 = Next            
-        shift   keycode 109 = Scroll_Forward  
-keycode 110 = Insert          
-keycode 111 = Remove          
-#       altgr   control keycode 111 = Boot            
-        control alt     keycode 111 = Boot            
-keycode 112 = Macro           
-keycode 113 = F13             
-keycode 114 = F14             
-keycode 115 = Help            
-keycode 116 = Do              
-keycode 117 = F17             
-keycode 118 = KP_MinPlus      
-keycode 119 = Pause           
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 =
-keycode 126 =
-keycode 127 =
-string F1 = "\033[[A"
-string F2 = "\033[[B"
-string F3 = "\033[[C"
-string F4 = "\033[[D"
-string F5 = "\033[[E"
-string F6 = "\033[17~"
-string F7 = "\033[18~"
-string F8 = "\033[19~"
-string F9 = "\033[20~"
-string F10 = "\033[21~"
-string F11 = "\033[23~"
-string F12 = "\033[24~"
-string F13 = "\033[25~"
-string F14 = "\033[26~"
-string F15 = "\033[28~"
-string F16 = "\033[29~"
-string F17 = "\033[31~"
-string F18 = "\033[32~"
-string F19 = "\033[33~"
-string F20 = "\033[34~"
-string Find = "\033[1~"
-string Insert = "\033[2~"
-string Remove = "\033[3~"
-string Select = "\033[4~"
-string Prior = "\033[5~"
-string Next = "\033[6~"
-string Macro = "\033[M"
-string Pause = "\033[P"
-compose '`' 'A' to 'À'
-compose '`' 'a' to 'à'
-compose '\'' 'A' to 'Á'
-compose '\'' 'a' to 'á'
-compose '^' 'A' to 'Â'
-compose '^' 'a' to 'â'
-compose '~' 'A' to 'Ã'
-compose '~' 'a' to 'ã'
-compose '"' 'A' to 'Ä'
-compose '"' 'a' to 'ä'
-compose 'O' 'A' to 'Å'
-compose 'o' 'a' to 'å'
-compose '0' 'A' to 'Å'
-compose '0' 'a' to 'å'
-compose 'A' 'A' to 'Å'
-compose 'a' 'a' to 'å'
-compose 'A' 'E' to 'Æ'
-compose 'a' 'e' to 'æ'
-compose ',' 'C' to 'Ç'
-compose ',' 'c' to 'ç'
-compose '`' 'E' to 'È'
-compose '`' 'e' to 'è'
-compose '\'' 'E' to 'É'
-compose '\'' 'e' to 'é'
-compose '^' 'E' to 'Ê'
-compose '^' 'e' to 'ê'
-compose '"' 'E' to 'Ë'
-compose '"' 'e' to 'ë'
-compose '`' 'I' to 'Ì'
-compose '`' 'i' to 'ì'
-compose '\'' 'I' to 'Í'
-compose '\'' 'i' to 'í'
-compose '^' 'I' to 'Î'
-compose '^' 'i' to 'î'
-compose '"' 'I' to 'Ï'
-compose '"' 'i' to 'ï'
-compose '-' 'D' to 'Ð'
-compose '-' 'd' to 'ð'
-compose '~' 'N' to 'Ñ'
-compose '~' 'n' to 'ñ'
-compose '`' 'O' to 'Ò'
-compose '`' 'o' to 'ò'
-compose '\'' 'O' to 'Ó'
-compose '\'' 'o' to 'ó'
-compose '^' 'O' to 'Ô'
-compose '^' 'o' to 'ô'
-compose '~' 'O' to 'Õ'
-compose '~' 'o' to 'õ'
-compose '"' 'O' to 'Ö'
-compose '"' 'o' to 'ö'
-compose '/' 'O' to 'Ø'
-compose '/' 'o' to 'ø'
-compose '`' 'U' to 'Ù'
-compose '`' 'u' to 'ù'
-compose '\'' 'U' to 'Ú'
-compose '\'' 'u' to 'ú'
-compose '^' 'U' to 'Û'
-compose '^' 'u' to 'û'
-compose '"' 'U' to 'Ü'
-compose '"' 'u' to 'ü'
-compose '\'' 'Y' to 'Ý'
-compose '\'' 'y' to 'ý'
-compose 'T' 'H' to 'Þ'
-compose 't' 'h' to 'þ'
-compose 's' 's' to 'ß'
-compose '"' 'y' to 'ÿ'
-compose 's' 'z' to 'ß'
-compose 'i' 'j' to 'ÿ'
diff --git a/drivers/char/digi1.h b/drivers/char/digi1.h
deleted file mode 100644
index 94d4eab5d3ca..000000000000
--- a/drivers/char/digi1.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*          Definitions for DigiBoard ditty(1) command.                 */
-
-#if !defined(TIOCMODG)
-#define TIOCMODG        (('d'<<8) | 250)        /* get modem ctrl state */
-#define TIOCMODS        (('d'<<8) | 251)        /* set modem ctrl state */
-#endif
-
-#if !defined(TIOCMSET)
-#define TIOCMSET        (('d'<<8) | 252)        /* set modem ctrl state */
-#define TIOCMGET        (('d'<<8) | 253)        /* set modem ctrl state */
-#endif
-
-#if !defined(TIOCMBIC)
-#define TIOCMBIC        (('d'<<8) | 254)        /* set modem ctrl state */
-#define TIOCMBIS        (('d'<<8) | 255)        /* set modem ctrl state */
-#endif
-
-#if !defined(TIOCSDTR)
-#define TIOCSDTR        (('e'<<8) | 0)          /* set DTR              */
-#define TIOCCDTR        (('e'<<8) | 1)          /* clear DTR            */
-#endif
-
-/************************************************************************
- * Ioctl command arguments for DIGI parameters.
- ************************************************************************/
-#define DIGI_GETA       (('e'<<8) | 94)         /* Read params          */
-
-#define DIGI_SETA       (('e'<<8) | 95)         /* Set params           */
-#define DIGI_SETAW      (('e'<<8) | 96)         /* Drain & set params   */
-#define DIGI_SETAF      (('e'<<8) | 97)         /* Drain, flush & set params */
-
-#define DIGI_GETFLOW    (('e'<<8) | 99)         /* Get startc/stopc flow */
-                                                /* control characters    */
-#define DIGI_SETFLOW    (('e'<<8) | 100)        /* Set startc/stopc flow */
-                                                /* control characters    */
-#define DIGI_GETAFLOW   (('e'<<8) | 101)        /* Get Aux. startc/stopc */
-                                                /* flow control chars    */
-#define DIGI_SETAFLOW   (('e'<<8) | 102)        /* Set Aux. startc/stopc */
-                                                /* flow control chars    */
-
-#define DIGI_GETINFO    (('e'<<8) | 103)        /* Fill in digi_info */
-#define DIGI_POLLER     (('e'<<8) | 104)        /* Turn on/off poller */
-#define DIGI_INIT       (('e'<<8) | 105)        /* Allow things to run. */
-
-struct  digiflow_struct 
-{
-        unsigned char   startc;                         /* flow cntl start char */
-        unsigned char   stopc;                          /* flow cntl stop char  */
-};
-
-typedef struct digiflow_struct digiflow_t;
-
-
-/************************************************************************
- * Values for digi_flags 
- ************************************************************************/
-#define DIGI_IXON       0x0001          /* Handle IXON in the FEP       */
-#define DIGI_FAST       0x0002          /* Fast baud rates              */
-#define RTSPACE         0x0004          /* RTS input flow control       */
-#define CTSPACE         0x0008          /* CTS output flow control      */
-#define DSRPACE         0x0010          /* DSR output flow control      */
-#define DCDPACE         0x0020          /* DCD output flow control      */
-#define DTRPACE         0x0040          /* DTR input flow control       */
-#define DIGI_FORCEDCD   0x0100          /* Force carrier                */
-#define DIGI_ALTPIN     0x0200          /* Alternate RJ-45 pin config   */
-#define DIGI_AIXON      0x0400          /* Aux flow control in fep      */
-
-
-/************************************************************************
- * Values for digiDload
- ************************************************************************/
-#define NORMAL  0
-#define PCI_CTL 1
-
-#define SIZE8  0
-#define SIZE16 1
-#define SIZE32 2
-
-/************************************************************************
- * Structure used with ioctl commands for DIGI parameters.
- ************************************************************************/
-struct digi_struct 
-{
-        unsigned short  digi_flags;             /* Flags (see above)    */
-};
-
-typedef struct digi_struct digi_t;
-
-struct digi_info 
-{
-        unsigned long board;        /* Which board is this ? */
-        unsigned char status;       /* Alive or dead */
-        unsigned char type;         /* see epca.h */
-        unsigned char subtype;      /* For future XEM, XR, etc ... */
-        unsigned short numports;    /* Number of ports configured */
-        unsigned char *port;        /* I/O Address */
-        unsigned char *membase;     /* DPR Address */
-        unsigned char *version;     /* For future ... */
-        unsigned short windowData;  /* For future ... */
-} ;
diff --git a/drivers/char/digiFep1.h b/drivers/char/digiFep1.h
deleted file mode 100644
index 3c1f1922c798..000000000000
--- a/drivers/char/digiFep1.h
+++ /dev/null
@@ -1,136 +0,0 @@
-
-#define CSTART       0x400L
-#define CMAX         0x800L
-#define ISTART       0x800L
-#define IMAX         0xC00L
-#define CIN          0xD10L
-#define GLOBAL       0xD10L
-#define EIN          0xD18L
-#define FEPSTAT      0xD20L
-#define CHANSTRUCT   0x1000L
-#define RXTXBUF      0x4000L
-
-
-struct global_data 
-{
-        u16 cin;
-        u16 cout;
-        u16 cstart;
-        u16 cmax;
-        u16 ein;
-        u16 eout;
-        u16 istart;
-        u16 imax;
-};
-
-
-struct board_chan 
-{
-        u32 filler1;
-        u32 filler2;
-        u16 tseg;
-        u16 tin;
-        u16 tout;
-        u16 tmax;
-
-        u16 rseg;
-        u16 rin;
-        u16 rout;
-        u16 rmax;
-
-        u16 tlow;
-        u16 rlow;
-        u16 rhigh;
-        u16 incr;
-
-        u16 etime;
-        u16 edelay;
-        unchar *dev;
-
-        u16 iflag;
-        u16 oflag;
-        u16 cflag;
-        u16 gmask;
-
-        u16 col;
-        u16 delay;
-        u16 imask;
-        u16 tflush;
-
-        u32 filler3;
-        u32 filler4;
-        u32 filler5;
-        u32 filler6;
-
-        u8 num;
-        u8 ract;
-        u8 bstat;
-        u8 tbusy;
-        u8 iempty;
-        u8 ilow;
-        u8 idata;
-        u8 eflag;
-
-        u8 tflag;
-        u8 rflag;
-        u8 xmask;
-        u8 xval;
-        u8 mstat;
-        u8 mchange;
-        u8 mint;
-        u8 lstat;
-
-        u8 mtran;
-        u8 orun;
-        u8 startca;
-        u8 stopca;
-        u8 startc;
-        u8 stopc;
-        u8 vnext;
-        u8 hflow;
-
-        u8 fillc;
-        u8 ochar;
-        u8 omask;
-
-        u8 filler7;
-        u8 filler8[28];
-}; 
-
-
-#define SRXLWATER      0xE0
-#define SRXHWATER      0xE1
-#define STOUT          0xE2
-#define PAUSETX        0xE3
-#define RESUMETX       0xE4
-#define SAUXONOFFC     0xE6
-#define SENDBREAK      0xE8
-#define SETMODEM       0xE9
-#define SETIFLAGS      0xEA
-#define SONOFFC        0xEB
-#define STXLWATER      0xEC
-#define PAUSERX        0xEE
-#define RESUMERX       0xEF
-#define SETBUFFER      0xF2
-#define SETCOOKED      0xF3
-#define SETHFLOW       0xF4
-#define SETCTRLFLAGS   0xF5
-#define SETVNEXT       0xF6
-
-
-
-#define BREAK_IND        0x01
-#define LOWTX_IND        0x02
-#define EMPTYTX_IND      0x04
-#define DATA_IND         0x08
-#define MODEMCHG_IND     0x20
-
-#define FEP_HUPCL  0002000
-#if 0
-#define RTS   0x02
-#define CD    0x08
-#define DSR   0x10
-#define CTS   0x20
-#define RI    0x40
-#define DTR   0x80
-#endif
diff --git a/drivers/char/digiPCI.h b/drivers/char/digiPCI.h
deleted file mode 100644
index 6ca7819e5069..000000000000
--- a/drivers/char/digiPCI.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************
- * Defines and structure definitions for PCI BIOS Interface 
- *************************************************************************/
-#define PCIMAX  32              /* maximum number of PCI boards */
-
-
-#define PCI_VENDOR_DIGI         0x114F
-#define PCI_DEVICE_EPC          0x0002
-#define PCI_DEVICE_RIGHTSWITCH 0x0003  /* For testing */
-#define PCI_DEVICE_XEM          0x0004
-#define PCI_DEVICE_XR           0x0005
-#define PCI_DEVICE_CX           0x0006
-#define PCI_DEVICE_XRJ          0x0009   /* Jupiter boards with */
-#define PCI_DEVICE_EPCJ         0x000a   /* PLX 9060 chip for PCI  */
-
-
-/*
- * On the PCI boards, there is no IO space allocated 
- * The I/O registers will be in the first 3 bytes of the   
- * upper 2MB of the 4MB memory space.  The board memory 
- * will be mapped into the low 2MB of the 4MB memory space 
- */
-
-/* Potential location of PCI Bios from E0000 to FFFFF*/
-#define PCI_BIOS_SIZE           0x00020000      
-
-/* Size of Memory and I/O for PCI (4MB) */
-#define PCI_RAM_SIZE            0x00400000      
-
-/* Size of Memory (2MB) */
-#define PCI_MEM_SIZE            0x00200000      
-
-/* Offset of I/0 in Memory (2MB) */
-#define PCI_IO_OFFSET           0x00200000      
-
-#define MEMOUTB(basemem, pnum, setmemval)  *(caddr_t)((basemem) + ( PCI_IO_OFFSET | pnum << 4 | pnum )) = (setmemval)
-#define MEMINB(basemem, pnum)  *(caddr_t)((basemem) + (PCI_IO_OFFSET | pnum << 4 | pnum ))   /* for PCI I/O */
-
-
-
-
-
diff --git a/drivers/char/ds1302.c b/drivers/char/ds1302.c
index 170693c93c73..ed8303f9890c 100644
--- a/drivers/char/ds1302.c
+++ b/drivers/char/ds1302.c
@@ -20,7 +20,7 @@
 #include <linux/miscdevice.h>
 #include <linux/delay.h>
 #include <linux/bcd.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
 
@@ -32,6 +32,7 @@
 
 #define RTC_MAJOR_NR 121 /* local major, change later */
 
+static DEFINE_MUTEX(rtc_mutex);
 static const char ds1302_name[] = "ds1302";
 
 /* Send 8 bits. */
@@ -164,9 +165,9 @@ static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         struct rtc_time rtc_tm;
 
                         memset(&rtc_tm, 0, sizeof (struct rtc_time));
-                        lock_kernel();
+                        mutex_lock(&rtc_mutex);
                         get_rtc_time(&rtc_tm);
-                        unlock_kernel();
+                        mutex_unlock(&rtc_mutex);
                         if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
                                 return -EFAULT;
                         return 0;
@@ -218,7 +219,7 @@ static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         mon = bin2bcd(mon);
                         yrs = bin2bcd(yrs);
 
-                        lock_kernel();
+                        mutex_lock(&rtc_mutex);
                         local_irq_save(flags);
                         CMOS_WRITE(yrs, RTC_YEAR);
                         CMOS_WRITE(mon, RTC_MONTH);
@@ -227,7 +228,7 @@ static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         CMOS_WRITE(min, RTC_MINUTES);
                         CMOS_WRITE(sec, RTC_SECONDS);
                         local_irq_restore(flags);
-                        unlock_kernel();
+                        mutex_unlock(&rtc_mutex);
 
                         /* Notice that at this point, the RTC is updated but
                          * the kernel is still running with the old time.
@@ -247,10 +248,10 @@ static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         if(copy_from_user(&tcs_val, (int*)arg, sizeof(int)))
                                 return -EFAULT;
 
-                        lock_kernel();
+                        mutex_lock(&rtc_mutex);
                         tcs_val = RTC_TCR_PATTERN | (tcs_val & 0x0F);
                         ds1302_writereg(RTC_TRICKLECHARGER, tcs_val);
-                        unlock_kernel();
+                        mutex_unlock(&rtc_mutex);
                         return 0;
                 }
                 default:
@@ -288,6 +289,7 @@ get_rtc_status(char *buf)
 static const struct file_operations rtc_fops = {
         .owner          = THIS_MODULE,
         .unlocked_ioctl = rtc_ioctl,
+        .llseek         = noop_llseek,
 };
 
 /* Probe for the chip by writing something to its RAM and try reading it back. */
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c
index dbee8688f75c..aab9605f0b43 100644
--- a/drivers/char/ds1620.c
+++ b/drivers/char/ds1620.c
@@ -8,7 +8,7 @@
 #include <linux/proc_fs.h>
 #include <linux/capability.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -34,6 +34,7 @@
 #define CFG_CPU                 2
 #define CFG_1SHOT               1
 
+static DEFINE_MUTEX(ds1620_mutex);
 static const char *fan_state[] = { "off", "on", "on (hardwired)" };
 
 /*
@@ -210,7 +211,6 @@ static void ds1620_read_state(struct therm *therm)
 
 static int ds1620_open(struct inode *inode, struct file *file)
 {
-        cycle_kernel_lock();
         return nonseekable_open(inode, file);
 }
 
@@ -321,9 +321,9 @@ ds1620_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         int ret;
 
-        lock_kernel();
+        mutex_lock(&ds1620_mutex);
         ret = ds1620_ioctl(file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&ds1620_mutex);
 
         return ret;
 }
@@ -357,6 +357,7 @@ static const struct file_operations ds1620_fops = {
         .open           = ds1620_open,
         .read           = ds1620_read,
         .unlocked_ioctl = ds1620_unlocked_ioctl,
+        .llseek         = no_llseek,
 };
 
 static struct miscdevice ds1620_miscdev = {
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 8a1b28a10ef0..052797b32bd3 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -32,7 +32,7 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/device.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
 #include <linux/uaccess.h>      /* For put_user and get_user */
@@ -94,6 +94,7 @@
         } \
 }
 
+static DEFINE_MUTEX(dsp56k_mutex);
 static struct dsp56k_device {
         unsigned long in_use;
         long maxio, timeout;
@@ -330,9 +331,9 @@ static long dsp56k_ioctl(struct file *file, unsigned int cmd,
                         if (len > DSP56K_MAX_BINARY_LENGTH) {
                                 return -EINVAL;
                         }
-                        lock_kernel();
+                        mutex_lock(&dsp56k_mutex);
                         r = dsp56k_upload(bin, len);
-                        unlock_kernel();
+                        mutex_unlock(&dsp56k_mutex);
                         if (r < 0) {
                                 return r;
                         }
@@ -342,16 +343,16 @@ static long dsp56k_ioctl(struct file *file, unsigned int cmd,
                 case DSP56K_SET_TX_WSIZE:
                         if (arg > 4 || arg < 1)
                                 return -EINVAL;
-                        lock_kernel();
+                        mutex_lock(&dsp56k_mutex);
                         dsp56k.tx_wsize = (int) arg;
-                        unlock_kernel();
+                        mutex_unlock(&dsp56k_mutex);
                         break;
                 case DSP56K_SET_RX_WSIZE:
                         if (arg > 4 || arg < 1)
                                 return -EINVAL;
-                        lock_kernel();
+                        mutex_lock(&dsp56k_mutex);
                         dsp56k.rx_wsize = (int) arg;
-                        unlock_kernel();
+                        mutex_unlock(&dsp56k_mutex);
                         break;
                 case DSP56K_HOST_FLAGS:
                 {
@@ -363,7 +364,7 @@ static long dsp56k_ioctl(struct file *file, unsigned int cmd,
                         if(get_user(out, &hf->out) < 0)
                                 return -EFAULT;
 
-                        lock_kernel();
+                        mutex_lock(&dsp56k_mutex);
                         if ((dir & 0x1) && (out & 0x1))
                                 dsp56k_host_interface.icr |= DSP56K_ICR_HF0;
                         else if (dir & 0x1)
@@ -378,16 +379,16 @@ static long dsp56k_ioctl(struct file *file, unsigned int cmd,
                         if (dsp56k_host_interface.icr & DSP56K_ICR_HF1) status |= 0x2;
                         if (dsp56k_host_interface.isr & DSP56K_ISR_HF2) status |= 0x4;
                         if (dsp56k_host_interface.isr & DSP56K_ISR_HF3) status |= 0x8;
-                        unlock_kernel();
+                        mutex_unlock(&dsp56k_mutex);
                         return put_user(status, &hf->status);
                 }
                 case DSP56K_HOST_CMD:
                         if (arg > 31 || arg < 0)
                                 return -EINVAL;
-                        lock_kernel();
+                        mutex_lock(&dsp56k_mutex);
                         dsp56k_host_interface.cvr = (u_char)((arg & DSP56K_CVR_HV_MASK) |
                                                              DSP56K_CVR_HC);
-                        unlock_kernel();
+                        mutex_unlock(&dsp56k_mutex);
                         break;
                 default:
                         return -EINVAL;
@@ -427,7 +428,7 @@ static int dsp56k_open(struct inode *inode, struct file *file)
         int dev = iminor(inode) & 0x0f;
         int ret = 0;
 
-        lock_kernel();
+        mutex_lock(&dsp56k_mutex);
         switch(dev)
         {
         case DSP56K_DEV_56001:
@@ -454,7 +455,7 @@ static int dsp56k_open(struct inode *inode, struct file *file)
                 ret = -ENODEV;
         }
 out:
-        unlock_kernel();
+        mutex_unlock(&dsp56k_mutex);
         return ret;
 }
 
@@ -482,6 +483,7 @@ static const struct file_operations dsp56k_fops = {
         .unlocked_ioctl = dsp56k_ioctl,
         .open           = dsp56k_open,
         .release        = dsp56k_release,
+        .llseek         = noop_llseek,
 };
 
 
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index e3859d4eaead..85156dd0caee 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -57,7 +57,7 @@
 #include <linux/ioport.h>       /* for request_region */
 #include <linux/delay.h>        /* for loops_per_jiffy */
 #include <linux/sched.h>
-#include <linux/smp_lock.h>     /* cycle_kernel_lock() */
+#include <linux/mutex.h>
 #include <asm/io.h>             /* for inb_p, outb_p, inb, outb, etc. */
 #include <asm/uaccess.h>        /* for get_user, etc. */
 #include <linux/wait.h>         /* for wait_queue */
@@ -73,6 +73,7 @@
 #define TRACE_RET ((void) 0)
 #endif                          /* TRACING */
 
+static DEFINE_MUTEX(dtlk_mutex);
 static void dtlk_timer_tick(unsigned long data);
 
 static int dtlk_major;
@@ -105,6 +106,7 @@ static const struct file_operations dtlk_fops =
         .unlocked_ioctl = dtlk_ioctl,
         .open           = dtlk_open,
         .release        = dtlk_release,
+        .llseek         = no_llseek,
 };
 
 /* local prototypes */
@@ -275,9 +277,9 @@ static long dtlk_ioctl(struct file *file,
         switch (cmd) {
 
         case DTLK_INTERROGATE:
-                lock_kernel();
+                mutex_lock(&dtlk_mutex);
                 sp = dtlk_interrogate();
-                unlock_kernel();
+                mutex_unlock(&dtlk_mutex);
                 if (copy_to_user(argp, sp, sizeof(struct dtlk_settings)))
                         return -EINVAL;
                 return 0;
@@ -296,7 +298,6 @@ static int dtlk_open(struct inode *inode, struct file *file)
 {
         TRACE_TEXT("(dtlk_open");
 
-        cycle_kernel_lock();
         nonseekable_open(inode, file);
         switch (iminor(inode)) {
         case DTLK_MINOR:
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
deleted file mode 100644
index d9df46aa0fba..000000000000
--- a/drivers/char/epca.c
+++ /dev/null
@@ -1,2784 +0,0 @@
-/*
-        Copyright (C) 1996  Digi International.
-
-        For technical support please email digiLinux@dgii.com or
-        call Digi tech support at (612) 912-3456
-
-        ** This driver is no longer supported by Digi **
-
-        Much of this design and code came from epca.c which was
-        copyright (C) 1994, 1995 Troy De Jongh, and subsquently
-        modified by David Nugent, Christoph Lameter, Mike McLagan.
-
-        This program is free software; you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation; either version 2 of the License, or
-        (at your option) any later version.
-
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        GNU General Public License for more details.
-
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-/* See README.epca for change history --DAT*/
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/serial.h>
-#include <linux/delay.h>
-#include <linux/ctype.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/slab.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/uaccess.h>
-#include <linux/io.h>
-#include <linux/spinlock.h>
-#include <linux/pci.h>
-#include "digiPCI.h"
-
-
-#include "digi1.h"
-#include "digiFep1.h"
-#include "epca.h"
-#include "epcaconfig.h"
-
-#define VERSION            "1.3.0.1-LK2.6"
-
-/* This major needs to be submitted to Linux to join the majors list */
-#define DIGIINFOMAJOR       35  /* For Digi specific ioctl */
-
-
-#define MAXCARDS 7
-#define epcaassert(x, msg)  if (!(x)) epca_error(__LINE__, msg)
-
-#define PFX "epca: "
-
-static int nbdevs, num_cards, liloconfig;
-static int digi_poller_inhibited = 1 ;
-
-static int setup_error_code;
-static int invalid_lilo_config;
-
-/*
- * The ISA boards do window flipping into the same spaces so its only sane with
- * a single lock. It's still pretty efficient. This lock guards the hardware
- * and the tty_port lock guards the kernel side stuff like use counts. Take
- * this lock inside the port lock if you must take both.
- */
-static DEFINE_SPINLOCK(epca_lock);
-
-/* MAXBOARDS is typically 12, but ISA and EISA cards are restricted
-   to 7 below. */
-static struct board_info boards[MAXBOARDS];
-
-static struct tty_driver *pc_driver;
-static struct tty_driver *pc_info;
-
-/* ------------------ Begin Digi specific structures -------------------- */
-
-/*
- * digi_channels represents an array of structures that keep track of each
- * channel of the Digi product. Information such as transmit and receive
- * pointers, termio data, and signal definitions (DTR, CTS, etc ...) are stored
- * here. This structure is NOT used to overlay the cards physical channel
- * structure.
- */
-static struct channel digi_channels[MAX_ALLOC];
-
-/*
- * card_ptr is an array used to hold the address of the first channel structure
- * of each card. This array will hold the addresses of various channels located
- * in digi_channels.
- */
-static struct channel *card_ptr[MAXCARDS];
-
-static struct timer_list epca_timer;
-
-/*
- * Begin generic memory functions. These functions will be alias (point at)
- * more specific functions dependent on the board being configured.
- */
-static void memwinon(struct board_info *b, unsigned int win);
-static void memwinoff(struct board_info *b, unsigned int win);
-static void globalwinon(struct channel *ch);
-static void rxwinon(struct channel *ch);
-static void txwinon(struct channel *ch);
-static void memoff(struct channel *ch);
-static void assertgwinon(struct channel *ch);
-static void assertmemoff(struct channel *ch);
-
-/* ---- Begin more 'specific' memory functions for cx_like products --- */
-
-static void pcxem_memwinon(struct board_info *b, unsigned int win);
-static void pcxem_memwinoff(struct board_info *b, unsigned int win);
-static void pcxem_globalwinon(struct channel *ch);
-static void pcxem_rxwinon(struct channel *ch);
-static void pcxem_txwinon(struct channel *ch);
-static void pcxem_memoff(struct channel *ch);
-
-/* ------ Begin more 'specific' memory functions for the pcxe ------- */
-
-static void pcxe_memwinon(struct board_info *b, unsigned int win);
-static void pcxe_memwinoff(struct board_info *b, unsigned int win);
-static void pcxe_globalwinon(struct channel *ch);
-static void pcxe_rxwinon(struct channel *ch);
-static void pcxe_txwinon(struct channel *ch);
-static void pcxe_memoff(struct channel *ch);
-
-/* ---- Begin more 'specific' memory functions for the pc64xe and pcxi ---- */
-/* Note : pc64xe and pcxi share the same windowing routines */
-
-static void pcxi_memwinon(struct board_info *b, unsigned int win);
-static void pcxi_memwinoff(struct board_info *b, unsigned int win);
-static void pcxi_globalwinon(struct channel *ch);
-static void pcxi_rxwinon(struct channel *ch);
-static void pcxi_txwinon(struct channel *ch);
-static void pcxi_memoff(struct channel *ch);
-
-/* - Begin 'specific' do nothing memory functions needed for some cards - */
-
-static void dummy_memwinon(struct board_info *b, unsigned int win);
-static void dummy_memwinoff(struct board_info *b, unsigned int win);
-static void dummy_globalwinon(struct channel *ch);
-static void dummy_rxwinon(struct channel *ch);
-static void dummy_txwinon(struct channel *ch);
-static void dummy_memoff(struct channel *ch);
-static void dummy_assertgwinon(struct channel *ch);
-static void dummy_assertmemoff(struct channel *ch);
-
-static struct channel *verifyChannel(struct tty_struct *);
-static void pc_sched_event(struct channel *, int);
-static void epca_error(int, char *);
-static void pc_close(struct tty_struct *, struct file *);
-static void shutdown(struct channel *, struct tty_struct *tty);
-static void pc_hangup(struct tty_struct *);
-static int pc_write_room(struct tty_struct *);
-static int pc_chars_in_buffer(struct tty_struct *);
-static void pc_flush_buffer(struct tty_struct *);
-static void pc_flush_chars(struct tty_struct *);
-static int pc_open(struct tty_struct *, struct file *);
-static void post_fep_init(unsigned int crd);
-static void epcapoll(unsigned long);
-static void doevent(int);
-static void fepcmd(struct channel *, int, int, int, int, int);
-static unsigned termios2digi_h(struct channel *ch, unsigned);
-static unsigned termios2digi_i(struct channel *ch, unsigned);
-static unsigned termios2digi_c(struct channel *ch, unsigned);
-static void epcaparam(struct tty_struct *, struct channel *);
-static void receive_data(struct channel *, struct tty_struct *tty);
-static int pc_ioctl(struct tty_struct *, struct file *,
-                        unsigned int, unsigned long);
-static int info_ioctl(struct tty_struct *, struct file *,
-                        unsigned int, unsigned long);
-static void pc_set_termios(struct tty_struct *, struct ktermios *);
-static void do_softint(struct work_struct *work);
-static void pc_stop(struct tty_struct *);
-static void pc_start(struct tty_struct *);
-static void pc_throttle(struct tty_struct *tty);
-static void pc_unthrottle(struct tty_struct *tty);
-static int pc_send_break(struct tty_struct *tty, int msec);
-static void setup_empty_event(struct tty_struct *tty, struct channel *ch);
-
-static int pc_write(struct tty_struct *, const unsigned char *, int);
-static int pc_init(void);
-static int init_PCI(void);
-
-/*
- * Table of functions for each board to handle memory. Mantaining parallelism
- * is a *very* good idea here. The idea is for the runtime code to blindly call
- * these functions, not knowing/caring about the underlying hardware. This
- * stuff should contain no conditionals; if more functionality is needed a
- * different entry should be established. These calls are the interface calls
- * and are the only functions that should be accessed. Anyone caught making
- * direct calls deserves what they get.
- */
-static void memwinon(struct board_info *b, unsigned int win)
-{
-        b->memwinon(b, win);
-}
-
-static void memwinoff(struct board_info *b, unsigned int win)
-{
-        b->memwinoff(b, win);
-}
-
-static void globalwinon(struct channel *ch)
-{
-        ch->board->globalwinon(ch);
-}
-
-static void rxwinon(struct channel *ch)
-{
-        ch->board->rxwinon(ch);
-}
-
-static void txwinon(struct channel *ch)
-{
-        ch->board->txwinon(ch);
-}
-
-static void memoff(struct channel *ch)
-{
-        ch->board->memoff(ch);
-}
-static void assertgwinon(struct channel *ch)
-{
-        ch->board->assertgwinon(ch);
-}
-
-static void assertmemoff(struct channel *ch)
-{
-        ch->board->assertmemoff(ch);
-}
-
-/* PCXEM windowing is the same as that used in the PCXR and CX series cards. */
-static void pcxem_memwinon(struct board_info *b, unsigned int win)
-{
-        outb_p(FEPWIN | win, b->port + 1);
-}
-
-static void pcxem_memwinoff(struct board_info *b, unsigned int win)
-{
-        outb_p(0, b->port + 1);
-}
-
-static void pcxem_globalwinon(struct channel *ch)
-{
-        outb_p(FEPWIN, (int)ch->board->port + 1);
-}
-
-static void pcxem_rxwinon(struct channel *ch)
-{
-        outb_p(ch->rxwin, (int)ch->board->port + 1);
-}
-
-static void pcxem_txwinon(struct channel *ch)
-{
-        outb_p(ch->txwin, (int)ch->board->port + 1);
-}
-
-static void pcxem_memoff(struct channel *ch)
-{
-        outb_p(0, (int)ch->board->port + 1);
-}
-
-/* ----------------- Begin pcxe memory window stuff ------------------ */
-static void pcxe_memwinon(struct board_info *b, unsigned int win)
-{
-        outb_p(FEPWIN | win, b->port + 1);
-}
-
-static void pcxe_memwinoff(struct board_info *b, unsigned int win)
-{
-        outb_p(inb(b->port) & ~FEPMEM, b->port + 1);
-        outb_p(0, b->port + 1);
-}
-
-static void pcxe_globalwinon(struct channel *ch)
-{
-        outb_p(FEPWIN, (int)ch->board->port + 1);
-}
-
-static void pcxe_rxwinon(struct channel *ch)
-{
-        outb_p(ch->rxwin, (int)ch->board->port + 1);
-}
-
-static void pcxe_txwinon(struct channel *ch)
-{
-        outb_p(ch->txwin, (int)ch->board->port + 1);
-}
-
-static void pcxe_memoff(struct channel *ch)
-{
-        outb_p(0, (int)ch->board->port);
-        outb_p(0, (int)ch->board->port + 1);
-}
-
-/* ------------- Begin pc64xe and pcxi memory window stuff -------------- */
-static void pcxi_memwinon(struct board_info *b, unsigned int win)
-{
-        outb_p(inb(b->port) | FEPMEM, b->port);
-}
-
-static void pcxi_memwinoff(struct board_info *b, unsigned int win)
-{
-        outb_p(inb(b->port) & ~FEPMEM, b->port);
-}
-
-static void pcxi_globalwinon(struct channel *ch)
-{
-        outb_p(FEPMEM, ch->board->port);
-}
-
-static void pcxi_rxwinon(struct channel *ch)
-{
-        outb_p(FEPMEM, ch->board->port);
-}
-
-static void pcxi_txwinon(struct channel *ch)
-{
-        outb_p(FEPMEM, ch->board->port);
-}
-
-static void pcxi_memoff(struct channel *ch)
-{
-        outb_p(0, ch->board->port);
-}
-
-static void pcxi_assertgwinon(struct channel *ch)
-{
-        epcaassert(inb(ch->board->port) & FEPMEM, "Global memory off");
-}
-
-static void pcxi_assertmemoff(struct channel *ch)
-{
-        epcaassert(!(inb(ch->board->port) & FEPMEM), "Memory on");
-}
-
-/*
- * Not all of the cards need specific memory windowing routines. Some cards
- * (Such as PCI) needs no windowing routines at all. We provide these do
- * nothing routines so that the same code base can be used. The driver will
- * ALWAYS call a windowing routine if it thinks it needs to; regardless of the
- * card. However, dependent on the card the routine may or may not do anything.
- */
-static void dummy_memwinon(struct board_info *b, unsigned int win)
-{
-}
-
-static void dummy_memwinoff(struct board_info *b, unsigned int win)
-{
-}
-
-static void dummy_globalwinon(struct channel *ch)
-{
-}
-
-static void dummy_rxwinon(struct channel *ch)
-{
-}
-
-static void dummy_txwinon(struct channel *ch)
-{
-}
-
-static void dummy_memoff(struct channel *ch)
-{
-}
-
-static void dummy_assertgwinon(struct channel *ch)
-{
-}
-
-static void dummy_assertmemoff(struct channel *ch)
-{
-}
-
-static struct channel *verifyChannel(struct tty_struct *tty)
-{
-        /*
-         * This routine basically provides a sanity check. It insures that the
-         * channel returned is within the proper range of addresses as well as
-         * properly initialized. If some bogus info gets passed in
-         * through tty->driver_data this should catch it.
-         */
-        if (tty) {
-                struct channel *ch = tty->driver_data;
-                if (ch >= &digi_channels[0] && ch < &digi_channels[nbdevs]) {
-                        if (ch->magic == EPCA_MAGIC)
-                                return ch;
-                }
-        }
-        return NULL;
-}
-
-static void pc_sched_event(struct channel *ch, int event)
-{
-        /*
-         * We call this to schedule interrupt processing on some event. The
-         * kernel sees our request and calls the related routine in OUR driver.
-         */
-        ch->event |= 1 << event;
-        schedule_work(&ch->tqueue);
-}
-
-static void epca_error(int line, char *msg)
-{
-        printk(KERN_ERR "epca_error (Digi): line = %d %s\n", line, msg);
-}
-
-static void pc_close(struct tty_struct *tty, struct file *filp)
-{
-        struct channel *ch;
-        struct tty_port *port;
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-        if (ch == NULL)
-                return;
-        port = &ch->port;
-
-        if (tty_port_close_start(port, tty, filp) == 0)
-                return;
-
-        pc_flush_buffer(tty);
-        shutdown(ch, tty);
-
-        tty_port_close_end(port, tty);
-        ch->event = 0;  /* FIXME: review ch->event locking */
-        tty_port_tty_set(port, NULL);
-}
-
-static void shutdown(struct channel *ch, struct tty_struct *tty)
-{
-        unsigned long flags;
-        struct board_chan __iomem *bc;
-        struct tty_port *port = &ch->port;
-
-        if (!(port->flags & ASYNC_INITIALIZED))
-                return;
-
-        spin_lock_irqsave(&epca_lock, flags);
-
-        globalwinon(ch);
-        bc = ch->brdchan;
-
-        /*
-         * In order for an event to be generated on the receipt of data the
-         * idata flag must be set. Since we are shutting down, this is not
-         * necessary clear this flag.
-         */
-        if (bc)
-                writeb(0, &bc->idata);
-
-        /* If we're a modem control device and HUPCL is on, drop RTS & DTR. */
-        if (tty->termios->c_cflag & HUPCL)  {
-                ch->omodem &= ~(ch->m_rts | ch->m_dtr);
-                fepcmd(ch, SETMODEM, 0, ch->m_dtr | ch->m_rts, 10, 1);
-        }
-        memoff(ch);
-
-        /*
-         * The channel has officialy been closed. The next time it is opened it
-         * will have to reinitialized. Set a flag to indicate this.
-         */
-        /* Prevent future Digi programmed interrupts from coming active */
-        port->flags &= ~ASYNC_INITIALIZED;
-        spin_unlock_irqrestore(&epca_lock, flags);
-}
-
-static void pc_hangup(struct tty_struct *tty)
-{
-        struct channel *ch;
-
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-        if (ch != NULL) {
-                pc_flush_buffer(tty);
-                tty_ldisc_flush(tty);
-                shutdown(ch, tty);
-
-                ch->event = 0;  /* FIXME: review locking of ch->event */
-                tty_port_hangup(&ch->port);
-        }
-}
-
-static int pc_write(struct tty_struct *tty,
-                        const unsigned char *buf, int bytesAvailable)
-{
-        unsigned int head, tail;
-        int dataLen;
-        int size;
-        int amountCopied;
-        struct channel *ch;
-        unsigned long flags;
-        int remain;
-        struct board_chan __iomem *bc;
-
-        /*
-         * pc_write is primarily called directly by the kernel routine
-         * tty_write (Though it can also be called by put_char) found in
-         * tty_io.c. pc_write is passed a line discipline buffer where the data
-         * to be written out is stored. The line discipline implementation
-         * itself is done at the kernel level and is not brought into the
-         * driver.
-         */
-
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-        if (ch == NULL)
-                return 0;
-
-        /* Make a pointer to the channel data structure found on the board. */
-        bc   = ch->brdchan;
-        size = ch->txbufsize;
-        amountCopied = 0;
-
-        spin_lock_irqsave(&epca_lock, flags);
-        globalwinon(ch);
-
-        head = readw(&bc->tin) & (size - 1);
-        tail = readw(&bc->tout);
-
-        if (tail != readw(&bc->tout))
-                tail = readw(&bc->tout);
-        tail &= (size - 1);
-
-        if (head >= tail) {
-                /* head has not wrapped */
-                /*
-                 * remain (much like dataLen above) represents the total amount
-                 * of space available on the card for data. Here dataLen
-                 * represents the space existing between the head pointer and
-                 * the end of buffer. This is important because a memcpy cannot
-                 * be told to automatically wrap around when it hits the buffer
-                 * end.
-                 */
-                dataLen = size - head;
-                remain = size - (head - tail) - 1;
-        } else {
-                /* head has wrapped around */
-                remain = tail - head - 1;
-                dataLen = remain;
-        }
-        /*
-         * Check the space on the card. If we have more data than space; reduce
-         * the amount of data to fit the space.
-         */
-        bytesAvailable = min(remain, bytesAvailable);
-        txwinon(ch);
-        while (bytesAvailable > 0) {
-                /* there is data to copy onto card */
-
-                /*
-                 * If head is not wrapped, the below will make sure the first
-                 * data copy fills to the end of card buffer.
-                 */
-                dataLen = min(bytesAvailable, dataLen);
-                memcpy_toio(ch->txptr + head, buf, dataLen);
-                buf += dataLen;
-                head += dataLen;
-                amountCopied += dataLen;
-                bytesAvailable -= dataLen;
-
-                if (head >= size) {
-                        head = 0;
-                        dataLen = tail;
-                }
-        }
-        ch->statusflags |= TXBUSY;
-        globalwinon(ch);
-        writew(head, &bc->tin);
-
-        if ((ch->statusflags & LOWWAIT) == 0)  {
-                ch->statusflags |= LOWWAIT;
-                writeb(1, &bc->ilow);
-        }
-        memoff(ch);
-        spin_unlock_irqrestore(&epca_lock, flags);
-        return amountCopied;
-}
-
-static int pc_write_room(struct tty_struct *tty)
-{
-        int remain = 0;
-        struct channel *ch;
-        unsigned long flags;
-        unsigned int head, tail;
-        struct board_chan __iomem *bc;
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-        if (ch != NULL) {
-                spin_lock_irqsave(&epca_lock, flags);
-                globalwinon(ch);
-
-                bc   = ch->brdchan;
-                head = readw(&bc->tin) & (ch->txbufsize - 1);
-                tail = readw(&bc->tout);
-
-                if (tail != readw(&bc->tout))
-                        tail = readw(&bc->tout);
-                /* Wrap tail if necessary */
-                tail &= (ch->txbufsize - 1);
-                remain = tail - head - 1;
-                if (remain < 0)
-                        remain += ch->txbufsize;
-
-                if (remain && (ch->statusflags & LOWWAIT) == 0) {
-                        ch->statusflags |= LOWWAIT;
-                        writeb(1, &bc->ilow);
-                }
-                memoff(ch);
-                spin_unlock_irqrestore(&epca_lock, flags);
-        }
-        /* Return how much room is left on card */
-        return remain;
-}
-
-static int pc_chars_in_buffer(struct tty_struct *tty)
-{
-        int chars;
-        unsigned int ctail, head, tail;
-        int remain;
-        unsigned long flags;
-        struct channel *ch;
-        struct board_chan __iomem *bc;
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-        if (ch == NULL)
-                return 0;
-
-        spin_lock_irqsave(&epca_lock, flags);
-        globalwinon(ch);
-
-        bc = ch->brdchan;
-        tail = readw(&bc->tout);
-        head = readw(&bc->tin);
-        ctail = readw(&ch->mailbox->cout);
-
-        if (tail == head && readw(&ch->mailbox->cin) == ctail &&
-                                                readb(&bc->tbusy) == 0)
-                chars = 0;
-        else  { /* Begin if some space on the card has been used */
-                head = readw(&bc->tin) & (ch->txbufsize - 1);
-                tail &= (ch->txbufsize - 1);
-                /*
-                 * The logic here is basically opposite of the above
-                 * pc_write_room here we are finding the amount of bytes in the
-                 * buffer filled. Not the amount of bytes empty.
-                 */
-                remain = tail - head - 1;
-                if (remain < 0)
-                        remain += ch->txbufsize;
-                chars = (int)(ch->txbufsize - remain);
-                /*
-                 * Make it possible to wakeup anything waiting for output in
-                 * tty_ioctl.c, etc.
-                 *
-                 * If not already set. Setup an event to indicate when the
-                 * transmit buffer empties.
-                 */
-                if (!(ch->statusflags & EMPTYWAIT))
-                        setup_empty_event(tty, ch);
-        } /* End if some space on the card has been used */
-        memoff(ch);
-        spin_unlock_irqrestore(&epca_lock, flags);
-        /* Return number of characters residing on card. */
-        return chars;
-}
-
-static void pc_flush_buffer(struct tty_struct *tty)
-{
-        unsigned int tail;
-        unsigned long flags;
-        struct channel *ch;
-        struct board_chan __iomem *bc;
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-        if (ch == NULL)
-                return;
-
-        spin_lock_irqsave(&epca_lock, flags);
-        globalwinon(ch);
-        bc   = ch->brdchan;
-        tail = readw(&bc->tout);
-        /* Have FEP move tout pointer; effectively flushing transmit buffer */
-        fepcmd(ch, STOUT, (unsigned) tail, 0, 0, 0);
-        memoff(ch);
-        spin_unlock_irqrestore(&epca_lock, flags);
-        tty_wakeup(tty);
-}
-
-static void pc_flush_chars(struct tty_struct *tty)
-{
-        struct channel *ch;
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-        if (ch != NULL) {
-                unsigned long flags;
-                spin_lock_irqsave(&epca_lock, flags);
-                /*
-                 * If not already set and the transmitter is busy setup an
-                 * event to indicate when the transmit empties.
-                 */
-                if ((ch->statusflags & TXBUSY) &&
-                                !(ch->statusflags & EMPTYWAIT))
-                        setup_empty_event(tty, ch);
-                spin_unlock_irqrestore(&epca_lock, flags);
-        }
-}
-
-static int epca_carrier_raised(struct tty_port *port)
-{
-        struct channel *ch = container_of(port, struct channel, port);
-        if (ch->imodem & ch->dcd)
-                return 1;
-        return 0;
-}
-
-static void epca_dtr_rts(struct tty_port *port, int onoff)
-{
-}
-
-static int pc_open(struct tty_struct *tty, struct file *filp)
-{
-        struct channel *ch;
-        struct tty_port *port;
-        unsigned long flags;
-        int line, retval, boardnum;
-        struct board_chan __iomem *bc;
-        unsigned int head;
-
-        line = tty->index;
-        if (line < 0 || line >= nbdevs)
-                return -ENODEV;
-
-        ch = &digi_channels[line];
-        port = &ch->port;
-        boardnum = ch->boardnum;
-
-        /* Check status of board configured in system.  */
-
-        /*
-         * I check to see if the epca_setup routine detected a user error. It
-         * might be better to put this in pc_init, but for the moment it goes
-         * here.
-         */
-        if (invalid_lilo_config) {
-                if (setup_error_code & INVALID_BOARD_TYPE)
-                        printk(KERN_ERR "epca: pc_open: Invalid board type specified in kernel options.\n");
-                if (setup_error_code & INVALID_NUM_PORTS)
-                        printk(KERN_ERR "epca: pc_open: Invalid number of ports specified in kernel options.\n");
-                if (setup_error_code & INVALID_MEM_BASE)
-                        printk(KERN_ERR "epca: pc_open: Invalid board memory address specified in kernel options.\n");
-                if (setup_error_code & INVALID_PORT_BASE)
-                        printk(KERN_ERR "epca; pc_open: Invalid board port address specified in kernel options.\n");
-                if (setup_error_code & INVALID_BOARD_STATUS)
-                        printk(KERN_ERR "epca: pc_open: Invalid board status specified in kernel options.\n");
-                if (setup_error_code & INVALID_ALTPIN)
-                        printk(KERN_ERR "epca: pc_open: Invalid board altpin specified in kernel options;\n");
-                tty->driver_data = NULL;   /* Mark this device as 'down' */
-                return -ENODEV;
-        }
-        if (boardnum >= num_cards || boards[boardnum].status == DISABLED)  {
-                tty->driver_data = NULL;   /* Mark this device as 'down' */
-                return(-ENODEV);
-        }
-
-        bc = ch->brdchan;
-        if (bc == NULL) {
-                tty->driver_data = NULL;
-                return -ENODEV;
-        }
-
-        spin_lock_irqsave(&port->lock, flags);
-        /*
-         * Every time a channel is opened, increment a counter. This is
-         * necessary because we do not wish to flush and shutdown the channel
-         * until the last app holding the channel open, closes it.
-         */
-        port->count++;
-        /*
-         * Set a kernel structures pointer to our local channel structure. This
-         * way we can get to it when passed only a tty struct.
-         */
-        tty->driver_data = ch;
-        port->tty = tty;
-        /*
-         * If this is the first time the channel has been opened, initialize
-         * the tty->termios struct otherwise let pc_close handle it.
-         */
-        spin_lock(&epca_lock);
-        globalwinon(ch);
-        ch->statusflags = 0;
-
-        /* Save boards current modem status */
-        ch->imodem = readb(&bc->mstat);
-
-        /*
-         * Set receive head and tail ptrs to each other. This indicates no data
-         * available to read.
-         */
-        head = readw(&bc->rin);
-        writew(head, &bc->rout);
-
-        /* Set the channels associated tty structure */
-
-        /*
-         * The below routine generally sets up parity, baud, flow control
-         * issues, etc.... It effect both control flags and input flags.
-         */
-        epcaparam(tty, ch);
-        memoff(ch);
-        spin_unlock(&epca_lock);
-        port->flags |= ASYNC_INITIALIZED;
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        retval = tty_port_block_til_ready(port, tty, filp);
-        if (retval)
-                return retval;
-        /*
-         * Set this again in case a hangup set it to zero while this open() was
-         * waiting for the line...
-         */
-        spin_lock_irqsave(&port->lock, flags);
-        port->tty = tty;
-        spin_lock(&epca_lock);
-        globalwinon(ch);
-        /* Enable Digi Data events */
-        writeb(1, &bc->idata);
-        memoff(ch);
-        spin_unlock(&epca_lock);
-        spin_unlock_irqrestore(&port->lock, flags);
-        return 0;
-}
-
-static int __init epca_module_init(void)
-{
-        return pc_init();
-}
-module_init(epca_module_init);
-
-static struct pci_driver epca_driver;
-
-static void __exit epca_module_exit(void)
-{
-        int               count, crd;
-        struct board_info *bd;
-        struct channel    *ch;
-
-        del_timer_sync(&epca_timer);
-
-        if (tty_unregister_driver(pc_driver) ||
-                                tty_unregister_driver(pc_info)) {
-                printk(KERN_WARNING "epca: cleanup_module failed to un-register tty driver\n");
-                return;
-        }
-        put_tty_driver(pc_driver);
-        put_tty_driver(pc_info);
-
-        for (crd = 0; crd < num_cards; crd++) {
-                bd = &boards[crd];
-                if (!bd) { /* sanity check */
-                        printk(KERN_ERR "<Error> - Digi : cleanup_module failed\n");
-                        return;
-                }
-                ch = card_ptr[crd];
-                for (count = 0; count < bd->numports; count++, ch++) {
-                        struct tty_struct *tty = tty_port_tty_get(&ch->port);
-                        if (tty) {
-                                tty_hangup(tty);
-                                tty_kref_put(tty);
-                        }
-                }
-        }
-        pci_unregister_driver(&epca_driver);
-}
-module_exit(epca_module_exit);
-
-static const struct tty_operations pc_ops = {
-        .open = pc_open,
-        .close = pc_close,
-        .write = pc_write,
-        .write_room = pc_write_room,
-        .flush_buffer = pc_flush_buffer,
-        .chars_in_buffer = pc_chars_in_buffer,
-        .flush_chars = pc_flush_chars,
-        .ioctl = pc_ioctl,
-        .set_termios = pc_set_termios,
-        .stop = pc_stop,
-        .start = pc_start,
-        .throttle = pc_throttle,
-        .unthrottle = pc_unthrottle,
-        .hangup = pc_hangup,
-        .break_ctl = pc_send_break
-};
-
-static const struct tty_port_operations epca_port_ops = {
-        .carrier_raised = epca_carrier_raised,
-        .dtr_rts = epca_dtr_rts,
-};
-
-static int info_open(struct tty_struct *tty, struct file *filp)
-{
-        return 0;
-}
-
-static const struct tty_operations info_ops = {
-        .open = info_open,
-        .ioctl = info_ioctl,
-};
-
-static int __init pc_init(void)
-{
-        int crd;
-        struct board_info *bd;
-        unsigned char board_id = 0;
-        int err = -ENOMEM;
-
-        int pci_boards_found, pci_count;
-
-        pci_count = 0;
-
-        pc_driver = alloc_tty_driver(MAX_ALLOC);
-        if (!pc_driver)
-                goto out1;
-
-        pc_info = alloc_tty_driver(MAX_ALLOC);
-        if (!pc_info)
-                goto out2;
-
-        /*
-         * If epca_setup has not been ran by LILO set num_cards to defaults;
-         * copy board structure defined by digiConfig into drivers board
-         * structure. Note : If LILO has ran epca_setup then epca_setup will
-         * handle defining num_cards as well as copying the data into the board
-         * structure.
-         */
-        if (!liloconfig) {
-                /* driver has been configured via. epcaconfig */
-                nbdevs = NBDEVS;
-                num_cards = NUMCARDS;
-                memcpy(&boards, &static_boards,
-                       sizeof(struct board_info) * NUMCARDS);
-        }
-
-        /*
-         * Note : If lilo was used to configure the driver and the ignore
-         * epcaconfig option was choosen (digiepca=2) then nbdevs and num_cards
-         * will equal 0 at this point. This is okay; PCI cards will still be
-         * picked up if detected.
-         */
-
-        /*
-         * Set up interrupt, we will worry about memory allocation in
-         * post_fep_init.
-         */
-        printk(KERN_INFO "DIGI epca driver version %s loaded.\n", VERSION);
-
-        /*
-         * NOTE : This code assumes that the number of ports found in the
-         * boards array is correct. This could be wrong if the card in question
-         * is PCI (And therefore has no ports entry in the boards structure.)
-         * The rest of the information will be valid for PCI because the
-         * beginning of pc_init scans for PCI and determines i/o and base
-         * memory addresses. I am not sure if it is possible to read the number
-         * of ports supported by the card prior to it being booted (Since that
-         * is the state it is in when pc_init is run). Because it is not
-         * possible to query the number of supported ports until after the card
-         * has booted; we are required to calculate the card_ptrs as the card
-         * is initialized (Inside post_fep_init). The negative thing about this
-         * approach is that digiDload's call to GET_INFO will have a bad port
-         * value. (Since this is called prior to post_fep_init.)
-         */
-        pci_boards_found = 0;
-        if (num_cards < MAXBOARDS)
-                pci_boards_found += init_PCI();
-        num_cards += pci_boards_found;
-
-        pc_driver->owner = THIS_MODULE;
-        pc_driver->name = "ttyD";
-        pc_driver->major = DIGI_MAJOR;
-        pc_driver->minor_start = 0;
-        pc_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        pc_driver->subtype = SERIAL_TYPE_NORMAL;
-        pc_driver->init_termios = tty_std_termios;
-        pc_driver->init_termios.c_iflag = 0;
-        pc_driver->init_termios.c_oflag = 0;
-        pc_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL;
-        pc_driver->init_termios.c_lflag = 0;
-        pc_driver->init_termios.c_ispeed = 9600;
-        pc_driver->init_termios.c_ospeed = 9600;
-        pc_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_HARDWARE_BREAK;
-        tty_set_operations(pc_driver, &pc_ops);
-
-        pc_info->owner = THIS_MODULE;
-        pc_info->name = "digi_ctl";
-        pc_info->major = DIGIINFOMAJOR;
-        pc_info->minor_start = 0;
-        pc_info->type = TTY_DRIVER_TYPE_SERIAL;
-        pc_info->subtype = SERIAL_TYPE_INFO;
-        pc_info->init_termios = tty_std_termios;
-        pc_info->init_termios.c_iflag = 0;
-        pc_info->init_termios.c_oflag = 0;
-        pc_info->init_termios.c_lflag = 0;
-        pc_info->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL;
-        pc_info->init_termios.c_ispeed = 9600;
-        pc_info->init_termios.c_ospeed = 9600;
-        pc_info->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(pc_info, &info_ops);
-
-
-        for (crd = 0; crd < num_cards; crd++) {
-                /*
-                 * This is where the appropriate memory handlers for the
-                 * hardware is set. Everything at runtime blindly jumps through
-                 * these vectors.
-                 */
-
-                /* defined in epcaconfig.h */
-                bd = &boards[crd];
-
-                switch (bd->type) {
-                case PCXEM:
-                case EISAXEM:
-                        bd->memwinon     = pcxem_memwinon;
-                        bd->memwinoff    = pcxem_memwinoff;
-                        bd->globalwinon  = pcxem_globalwinon;
-                        bd->txwinon      = pcxem_txwinon;
-                        bd->rxwinon      = pcxem_rxwinon;
-                        bd->memoff       = pcxem_memoff;
-                        bd->assertgwinon = dummy_assertgwinon;
-                        bd->assertmemoff = dummy_assertmemoff;
-                        break;
-
-                case PCIXEM:
-                case PCIXRJ:
-                case PCIXR:
-                        bd->memwinon     = dummy_memwinon;
-                        bd->memwinoff    = dummy_memwinoff;
-                        bd->globalwinon  = dummy_globalwinon;
-                        bd->txwinon      = dummy_txwinon;
-                        bd->rxwinon      = dummy_rxwinon;
-                        bd->memoff       = dummy_memoff;
-                        bd->assertgwinon = dummy_assertgwinon;
-                        bd->assertmemoff = dummy_assertmemoff;
-                        break;
-
-                case PCXE:
-                case PCXEVE:
-                        bd->memwinon     = pcxe_memwinon;
-                        bd->memwinoff    = pcxe_memwinoff;
-                        bd->globalwinon  = pcxe_globalwinon;
-                        bd->txwinon      = pcxe_txwinon;
-                        bd->rxwinon      = pcxe_rxwinon;
-                        bd->memoff       = pcxe_memoff;
-                        bd->assertgwinon = dummy_assertgwinon;
-                        bd->assertmemoff = dummy_assertmemoff;
-                        break;
-
-                case PCXI:
-                case PC64XE:
-                        bd->memwinon     = pcxi_memwinon;
-                        bd->memwinoff    = pcxi_memwinoff;
-                        bd->globalwinon  = pcxi_globalwinon;
-                        bd->txwinon      = pcxi_txwinon;
-                        bd->rxwinon      = pcxi_rxwinon;
-                        bd->memoff       = pcxi_memoff;
-                        bd->assertgwinon = pcxi_assertgwinon;
-                        bd->assertmemoff = pcxi_assertmemoff;
-                        break;
-
-                default:
-                        break;
-                }
-
-                /*
-                 * Some cards need a memory segment to be defined for use in
-                 * transmit and receive windowing operations. These boards are
-                 * listed in the below switch. In the case of the XI the amount
-                 * of memory on the board is variable so the memory_seg is also
-                 * variable. This code determines what they segment should be.
-                 */
-                switch (bd->type) {
-                case PCXE:
-                case PCXEVE:
-                case PC64XE:
-                        bd->memory_seg = 0xf000;
-                        break;
-
-                case PCXI:
-                        board_id = inb((int)bd->port);
-                        if ((board_id & 0x1) == 0x1) {
-                                /* it's an XI card */
-                                /* Is it a 64K board */
-                                if ((board_id & 0x30) == 0)
-                                        bd->memory_seg = 0xf000;
-
-                                /* Is it a 128K board */
-                                if ((board_id & 0x30) == 0x10)
-                                        bd->memory_seg = 0xe000;
-
-                                /* Is is a 256K board */
-                                if ((board_id & 0x30) == 0x20)
-                                        bd->memory_seg = 0xc000;
-
-                                /* Is it a 512K board */
-                                if ((board_id & 0x30) == 0x30)
-                                        bd->memory_seg = 0x8000;
-                        } else
-                                printk(KERN_ERR "epca: Board at 0x%x doesn't appear to be an XI\n", (int)bd->port);
-                        break;
-                }
-        }
-
-        err = tty_register_driver(pc_driver);
-        if (err) {
-                printk(KERN_ERR "Couldn't register Digi PC/ driver");
-                goto out3;
-        }
-
-        err = tty_register_driver(pc_info);
-        if (err) {
-                printk(KERN_ERR "Couldn't register Digi PC/ info ");
-                goto out4;
-        }
-
-        /* Start up the poller to check for events on all enabled boards */
-        init_timer(&epca_timer);
-        epca_timer.function = epcapoll;
-        mod_timer(&epca_timer, jiffies + HZ/25);
-        return 0;
-
-out4:
-        tty_unregister_driver(pc_driver);
-out3:
-        put_tty_driver(pc_info);
-out2:
-        put_tty_driver(pc_driver);
-out1:
-        return err;
-}
-
-static void post_fep_init(unsigned int crd)
-{
-        int i;
-        void __iomem *memaddr;
-        struct global_data __iomem *gd;
-        struct board_info *bd;
-        struct board_chan __iomem *bc;
-        struct channel *ch;
-        int shrinkmem = 0, lowwater;
-
-        /*
-         * This call is made by the user via. the ioctl call DIGI_INIT. It is
-         * responsible for setting up all the card specific stuff.
-         */
-        bd = &boards[crd];
-
-        /*
-         * If this is a PCI board, get the port info. Remember PCI cards do not
-         * have entries into the epcaconfig.h file, so we can't get the number
-         * of ports from it. Unfortunetly, this means that anyone doing a
-         * DIGI_GETINFO before the board has booted will get an invalid number
-         * of ports returned (It should return 0). Calls to DIGI_GETINFO after
-         * DIGI_INIT has been called will return the proper values.
-         */
-        if (bd->type >= PCIXEM) { /* Begin get PCI number of ports */
-                /*
-                 * Below we use XEMPORTS as a memory offset regardless of which
-                 * PCI card it is. This is because all of the supported PCI
-                 * cards have the same memory offset for the channel data. This
-                 * will have to be changed if we ever develop a PCI/XE card.
-                 * NOTE : The FEP manual states that the port offset is 0xC22
-                 * as opposed to 0xC02. This is only true for PC/XE, and PC/XI
-                 * cards; not for the XEM, or CX series. On the PCI cards the
-                 * number of ports is determined by reading a ID PROM located
-                 * in the box attached to the card. The card can then determine
-                 * the index the id to determine the number of ports available.
-                 * (FYI - The id should be located at 0x1ac (And may use up to
-                 * 4 bytes if the box in question is a XEM or CX)).
-                 */
-                /* PCI cards are already remapped at this point ISA are not */
-                bd->numports = readw(bd->re_map_membase + XEMPORTS);
-                epcaassert(bd->numports <= 64, "PCI returned a invalid number of ports");
-                nbdevs += (bd->numports);
-        } else {
-                /* Fix up the mappings for ISA/EISA etc */
-                /* FIXME: 64K - can we be smarter ? */
-                bd->re_map_membase = ioremap_nocache(bd->membase, 0x10000);
-        }
-
-        if (crd != 0)
-                card_ptr[crd] = card_ptr[crd-1] + boards[crd-1].numports;
-        else
-                card_ptr[crd] = &digi_channels[crd]; /* <- For card 0 only */
-
-        ch = card_ptr[crd];
-        epcaassert(ch <= &digi_channels[nbdevs - 1], "ch out of range");
-
-        memaddr = bd->re_map_membase;
-
-        /*
-         * The below assignment will set bc to point at the BEGINING of the
-         * cards channel structures. For 1 card there will be between 8 and 64
-         * of these structures.
-         */
-        bc = memaddr + CHANSTRUCT;
-
-        /*
-         * The below assignment will set gd to point at the BEGINING of global
-         * memory address 0xc00. The first data in that global memory actually
-         * starts at address 0xc1a. The command in pointer begins at 0xd10.
-         */
-        gd = memaddr + GLOBAL;
-
-        /*
-         * XEPORTS (address 0xc22) points at the number of channels the card
-         * supports. (For 64XE, XI, XEM, and XR use 0xc02)
-         */
-        if ((bd->type == PCXEVE || bd->type == PCXE) &&
-                                        (readw(memaddr + XEPORTS) < 3))
-                shrinkmem = 1;
-        if (bd->type < PCIXEM)
-                if (!request_region((int)bd->port, 4, board_desc[bd->type]))
-                        return;
-        memwinon(bd, 0);
-
-        /*
-         * Remember ch is the main drivers channels structure, while bc is the
-         * cards channel structure.
-         */
-        for (i = 0; i < bd->numports; i++, ch++, bc++) {
-                unsigned long flags;
-                u16 tseg, rseg;
-
-                tty_port_init(&ch->port);
-                ch->port.ops = &epca_port_ops;
-                ch->brdchan = bc;
-                ch->mailbox = gd;
-                INIT_WORK(&ch->tqueue, do_softint);
-                ch->board = &boards[crd];
-
-                spin_lock_irqsave(&epca_lock, flags);
-                switch (bd->type) {
-                /*
-                 * Since some of the boards use different bitmaps for
-                 * their control signals we cannot hard code these
-                 * values and retain portability. We virtualize this
-                 * data here.
-                 */
-                case EISAXEM:
-                case PCXEM:
-                case PCIXEM:
-                case PCIXRJ:
-                case PCIXR:
-                        ch->m_rts = 0x02;
-                        ch->m_dcd = 0x80;
-                        ch->m_dsr = 0x20;
-                        ch->m_cts = 0x10;
-                        ch->m_ri  = 0x40;
-                        ch->m_dtr = 0x01;
-                        break;
-
-                case PCXE:
-                case PCXEVE:
-                case PCXI:
-                case PC64XE:
-                        ch->m_rts = 0x02;
-                        ch->m_dcd = 0x08;
-                        ch->m_dsr = 0x10;
-                        ch->m_cts = 0x20;
-                        ch->m_ri  = 0x40;
-                        ch->m_dtr = 0x80;
-                        break;
-                }
-
-                if (boards[crd].altpin) {
-                        ch->dsr = ch->m_dcd;
-                        ch->dcd = ch->m_dsr;
-                        ch->digiext.digi_flags |= DIGI_ALTPIN;
-                } else {
-                        ch->dcd = ch->m_dcd;
-                        ch->dsr = ch->m_dsr;
-                }
-
-                ch->boardnum   = crd;
-                ch->channelnum = i;
-                ch->magic      = EPCA_MAGIC;
-                tty_port_tty_set(&ch->port, NULL);
-
-                if (shrinkmem) {
-                        fepcmd(ch, SETBUFFER, 32, 0, 0, 0);
-                        shrinkmem = 0;
-                }
-
-                tseg = readw(&bc->tseg);
-                rseg = readw(&bc->rseg);
-
-                switch (bd->type) {
-                case PCIXEM:
-                case PCIXRJ:
-                case PCIXR:
-                        /* Cover all the 2MEG cards */
-                        ch->txptr = memaddr + ((tseg << 4) & 0x1fffff);
-                        ch->rxptr = memaddr + ((rseg << 4) & 0x1fffff);
-                        ch->txwin = FEPWIN | (tseg >> 11);
-                        ch->rxwin = FEPWIN | (rseg >> 11);
-                        break;
-
-                case PCXEM:
-                case EISAXEM:
-                        /* Cover all the 32K windowed cards */
-                        /* Mask equal to window size - 1 */
-                        ch->txptr = memaddr + ((tseg << 4) & 0x7fff);
-                        ch->rxptr = memaddr + ((rseg << 4) & 0x7fff);
-                        ch->txwin = FEPWIN | (tseg >> 11);
-                        ch->rxwin = FEPWIN | (rseg >> 11);
-                        break;
-
-                case PCXEVE:
-                case PCXE:
-                        ch->txptr = memaddr + (((tseg - bd->memory_seg) << 4)
-                                                                & 0x1fff);
-                        ch->txwin = FEPWIN | ((tseg - bd->memory_seg) >> 9);
-                        ch->rxptr = memaddr + (((rseg - bd->memory_seg) << 4)
-                                                                & 0x1fff);
-                        ch->rxwin = FEPWIN | ((rseg - bd->memory_seg) >> 9);
-                        break;
-
-                case PCXI:
-                case PC64XE:
-                        ch->txptr = memaddr + ((tseg - bd->memory_seg) << 4);
-                        ch->rxptr = memaddr + ((rseg - bd->memory_seg) << 4);
-                        ch->txwin = ch->rxwin = 0;
-                        break;
-                }
-
-                ch->txbufhead = 0;
-                ch->txbufsize = readw(&bc->tmax) + 1;
-
-                ch->rxbufhead = 0;
-                ch->rxbufsize = readw(&bc->rmax) + 1;
-
-                lowwater = ch->txbufsize >= 2000 ? 1024 : (ch->txbufsize / 2);
-
-                /* Set transmitter low water mark */
-                fepcmd(ch, STXLWATER, lowwater, 0, 10, 0);
-
-                /* Set receiver low water mark */
-                fepcmd(ch, SRXLWATER, (ch->rxbufsize / 4), 0, 10, 0);
-
-                /* Set receiver high water mark */
-                fepcmd(ch, SRXHWATER, (3 * ch->rxbufsize / 4), 0, 10, 0);
-
-                writew(100, &bc->edelay);
-                writeb(1, &bc->idata);
-
-                ch->startc  = readb(&bc->startc);
-                ch->stopc   = readb(&bc->stopc);
-                ch->startca = readb(&bc->startca);
-                ch->stopca  = readb(&bc->stopca);
-
-                ch->fepcflag = 0;
-                ch->fepiflag = 0;
-                ch->fepoflag = 0;
-                ch->fepstartc = 0;
-                ch->fepstopc = 0;
-                ch->fepstartca = 0;
-                ch->fepstopca = 0;
-
-                ch->port.close_delay = 50;
-
-                spin_unlock_irqrestore(&epca_lock, flags);
-        }
-
-        printk(KERN_INFO
-        "Digi PC/Xx Driver V%s:  %s I/O = 0x%lx Mem = 0x%lx Ports = %d\n",
-                                VERSION, board_desc[bd->type], (long)bd->port,
-                                        (long)bd->membase, bd->numports);
-        memwinoff(bd, 0);
-}
-
-static void epcapoll(unsigned long ignored)
-{
-        unsigned long flags;
-        int crd;
-        unsigned int head, tail;
-        struct channel *ch;
-        struct board_info *bd;
-
-        /*
-         * This routine is called upon every timer interrupt. Even though the
-         * Digi series cards are capable of generating interrupts this method
-         * of non-looping polling is more efficient. This routine checks for
-         * card generated events (Such as receive data, are transmit buffer
-         * empty) and acts on those events.
-         */
-        for (crd = 0; crd < num_cards; crd++) {
-                bd = &boards[crd];
-                ch = card_ptr[crd];
-
-                if ((bd->status == DISABLED) || digi_poller_inhibited)
-                        continue;
-
-                /*
-                 * assertmemoff is not needed here; indeed it is an empty
-                 * subroutine. It is being kept because future boards may need
-                 * this as well as some legacy boards.
-                 */
-                spin_lock_irqsave(&epca_lock, flags);
-
-                assertmemoff(ch);
-
-                globalwinon(ch);
-
-                /*
-                 * In this case head and tail actually refer to the event queue
-                 * not the transmit or receive queue.
-                 */
-                head = readw(&ch->mailbox->ein);
-                tail = readw(&ch->mailbox->eout);
-
-                /* If head isn't equal to tail we have an event */
-                if (head != tail)
-                        doevent(crd);
-                memoff(ch);
-
-                spin_unlock_irqrestore(&epca_lock, flags);
-        } /* End for each card */
-        mod_timer(&epca_timer, jiffies + (HZ / 25));
-}
-
-static void doevent(int crd)
-{
-        void __iomem *eventbuf;
-        struct channel *ch, *chan0;
-        static struct tty_struct *tty;
-        struct board_info *bd;
-        struct board_chan __iomem *bc;
-        unsigned int tail, head;
-        int event, channel;
-        int mstat, lstat;
-
-        /*
-         * This subroutine is called by epcapoll when an event is detected
-         * in the event queue. This routine responds to those events.
-         */
-        bd = &boards[crd];
-
-        chan0 = card_ptr[crd];
-        epcaassert(chan0 <= &digi_channels[nbdevs - 1], "ch out of range");
-        assertgwinon(chan0);
-        while ((tail = readw(&chan0->mailbox->eout)) !=
-                        (head = readw(&chan0->mailbox->ein))) {
-                /* Begin while something in event queue */
-                assertgwinon(chan0);
-                eventbuf = bd->re_map_membase + tail + ISTART;
-                /* Get the channel the event occurred on */
-                channel = readb(eventbuf);
-                /* Get the actual event code that occurred */
-                event = readb(eventbuf + 1);
-                /*
-                 * The two assignments below get the current modem status
-                 * (mstat) and the previous modem status (lstat). These are
-                 * useful becuase an event could signal a change in modem
-                 * signals itself.
-                 */
-                mstat = readb(eventbuf + 2);
-                lstat = readb(eventbuf + 3);
-
-                ch = chan0 + channel;
-                if ((unsigned)channel >= bd->numports || !ch)  {
-                        if (channel >= bd->numports)
-                                ch = chan0;
-                        bc = ch->brdchan;
-                        goto next;
-                }
-
-                bc = ch->brdchan;
-                if (bc == NULL)
-                        goto next;
-
-                tty = tty_port_tty_get(&ch->port);
-                if (event & DATA_IND)  { /* Begin DATA_IND */
-                        receive_data(ch, tty);
-                        assertgwinon(ch);
-                } /* End DATA_IND */
-                /* else *//* Fix for DCD transition missed bug */
-                if (event & MODEMCHG_IND) {
-                        /* A modem signal change has been indicated */
-                        ch->imodem = mstat;
-                        if (test_bit(ASYNCB_CHECK_CD, &ch->port.flags)) {
-                                /* We are now receiving dcd */
-                                if (mstat & ch->dcd)
-                                        wake_up_interruptible(&ch->port.open_wait);
-                                else    /* No dcd; hangup */
-                                        pc_sched_event(ch, EPCA_EVENT_HANGUP);
-                        }
-                }
-                if (tty) {
-                        if (event & BREAK_IND) {
-                                /* A break has been indicated */
-                                tty_insert_flip_char(tty, 0, TTY_BREAK);
-                                tty_schedule_flip(tty);
-                        } else if (event & LOWTX_IND)  {
-                                if (ch->statusflags & LOWWAIT) {
-                                        ch->statusflags &= ~LOWWAIT;
-                                        tty_wakeup(tty);
-                                }
-                        } else if (event & EMPTYTX_IND) {
-                                /* This event is generated by
-                                   setup_empty_event */
-                                ch->statusflags &= ~TXBUSY;
-                                if (ch->statusflags & EMPTYWAIT) {
-                                        ch->statusflags &= ~EMPTYWAIT;
-                                        tty_wakeup(tty);
-                                }
-                        }
-                        tty_kref_put(tty);
-                }
-next:
-                globalwinon(ch);
-                BUG_ON(!bc);
-                writew(1, &bc->idata);
-                writew((tail + 4) & (IMAX - ISTART - 4), &chan0->mailbox->eout);
-                globalwinon(chan0);
-        } /* End while something in event queue */
-}
-
-static void fepcmd(struct channel *ch, int cmd, int word_or_byte,
-                                        int byte2, int ncmds, int bytecmd)
-{
-        unchar __iomem *memaddr;
-        unsigned int head, cmdTail, cmdStart, cmdMax;
-        long count;
-        int n;
-
-        /* This is the routine in which commands may be passed to the card. */
-
-        if (ch->board->status == DISABLED)
-                return;
-        assertgwinon(ch);
-        /* Remember head (As well as max) is just an offset not a base addr */
-        head = readw(&ch->mailbox->cin);
-        /* cmdStart is a base address */
-        cmdStart = readw(&ch->mailbox->cstart);
-        /*
-         * We do the addition below because we do not want a max pointer
-         * relative to cmdStart. We want a max pointer that points at the
-         * physical end of the command queue.
-         */
-        cmdMax = (cmdStart + 4 + readw(&ch->mailbox->cmax));
-        memaddr = ch->board->re_map_membase;
-
-        if (head >= (cmdMax - cmdStart) || (head & 03))  {
-                printk(KERN_ERR "line %d: Out of range, cmd = %x, head = %x\n",
-                                                __LINE__,  cmd, head);
-                printk(KERN_ERR "line %d: Out of range, cmdMax = %x, cmdStart = %x\n",
-                                                __LINE__,  cmdMax, cmdStart);
-                return;
-        }
-        if (bytecmd)  {
-                writeb(cmd, memaddr + head + cmdStart + 0);
-                writeb(ch->channelnum,  memaddr + head + cmdStart + 1);
-                /* Below word_or_byte is bits to set */
-                writeb(word_or_byte,  memaddr + head + cmdStart + 2);
-                /* Below byte2 is bits to reset */
-                writeb(byte2, memaddr + head + cmdStart + 3);
-        }  else {
-                writeb(cmd, memaddr + head + cmdStart + 0);
-                writeb(ch->channelnum,  memaddr + head + cmdStart + 1);
-                writeb(word_or_byte,  memaddr + head + cmdStart + 2);
-        }
-        head = (head + 4) & (cmdMax - cmdStart - 4);
-        writew(head, &ch->mailbox->cin);
-        count = FEPTIMEOUT;
-
-        for (;;) {
-                count--;
-                if (count == 0)  {
-                        printk(KERN_ERR "<Error> - Fep not responding in fepcmd()\n");
-                        return;
-                }
-                head = readw(&ch->mailbox->cin);
-                cmdTail = readw(&ch->mailbox->cout);
-                n = (head - cmdTail) & (cmdMax - cmdStart - 4);
-                /*
-                 * Basically this will break when the FEP acknowledges the
-                 * command by incrementing cmdTail (Making it equal to head).
-                 */
-                if (n <= ncmds * (sizeof(short) * 4))
-                        break;
-        }
-}
-
-/*
- * Digi products use fields in their channels structures that are very similar
- * to the c_cflag and c_iflag fields typically found in UNIX termios
- * structures. The below three routines allow mappings between these hardware
- * "flags" and their respective Linux flags.
- */
-static unsigned termios2digi_h(struct channel *ch, unsigned cflag)
-{
-        unsigned res = 0;
-
-        if (cflag & CRTSCTS) {
-                ch->digiext.digi_flags |= (RTSPACE | CTSPACE);
-                res |= ((ch->m_cts) | (ch->m_rts));
-        }
-
-        if (ch->digiext.digi_flags & RTSPACE)
-                res |= ch->m_rts;
-
-        if (ch->digiext.digi_flags & DTRPACE)
-                res |= ch->m_dtr;
-
-        if (ch->digiext.digi_flags & CTSPACE)
-                res |= ch->m_cts;
-
-        if (ch->digiext.digi_flags & DSRPACE)
-                res |= ch->dsr;
-
-        if (ch->digiext.digi_flags & DCDPACE)
-                res |= ch->dcd;
-
-        if (res & (ch->m_rts))
-                ch->digiext.digi_flags |= RTSPACE;
-
-        if (res & (ch->m_cts))
-                ch->digiext.digi_flags |= CTSPACE;
-
-        return res;
-}
-
-static unsigned termios2digi_i(struct channel *ch, unsigned iflag)
-{
-        unsigned res = iflag & (IGNBRK | BRKINT | IGNPAR | PARMRK |
-                                        INPCK | ISTRIP | IXON | IXANY | IXOFF);
-        if (ch->digiext.digi_flags & DIGI_AIXON)
-                res |= IAIXON;
-        return res;
-}
-
-static unsigned termios2digi_c(struct channel *ch, unsigned cflag)
-{
-        unsigned res = 0;
-        if (cflag & CBAUDEX) {
-                ch->digiext.digi_flags |= DIGI_FAST;
-                /*
-                 * HUPCL bit is used by FEP to indicate fast baud table is to
-                 * be used.
-                 */
-                res |= FEP_HUPCL;
-        } else
-                ch->digiext.digi_flags &= ~DIGI_FAST;
-        /*
-         * CBAUD has bit position 0x1000 set these days to indicate Linux
-         * baud rate remap. Digi hardware can't handle the bit assignment.
-         * (We use a different bit assignment for high speed.). Clear this
-         * bit out.
-         */
-        res |= cflag & ((CBAUD ^ CBAUDEX) | PARODD | PARENB | CSTOPB | CSIZE);
-        /*
-         * This gets a little confusing. The Digi cards have their own
-         * representation of c_cflags controlling baud rate. For the most part
-         * this is identical to the Linux implementation. However; Digi
-         * supports one rate (76800) that Linux doesn't. This means that the
-         * c_cflag entry that would normally mean 76800 for Digi actually means
-         * 115200 under Linux. Without the below mapping, a stty 115200 would
-         * only drive the board at 76800. Since the rate 230400 is also found
-         * after 76800, the same problem afflicts us when we choose a rate of
-         * 230400. Without the below modificiation stty 230400 would actually
-         * give us 115200.
-         *
-         * There are two additional differences. The Linux value for CLOCAL
-         * (0x800; 0004000) has no meaning to the Digi hardware. Also in later
-         * releases of Linux; the CBAUD define has CBAUDEX (0x1000; 0010000)
-         * ored into it (CBAUD = 0x100f as opposed to 0xf). CBAUDEX should be
-         * checked for a screened out prior to termios2digi_c returning. Since
-         * CLOCAL isn't used by the board this can be ignored as long as the
-         * returned value is used only by Digi hardware.
-         */
-        if (cflag & CBAUDEX) {
-                /*
-                 * The below code is trying to guarantee that only baud rates
-                 * 115200 and 230400 are remapped. We use exclusive or because
-                 * the various baud rates share common bit positions and
-                 * therefore can't be tested for easily.
-                 */
-                if ((!((cflag & 0x7) ^ (B115200 & ~CBAUDEX))) ||
-                    (!((cflag & 0x7) ^ (B230400 & ~CBAUDEX))))
-                        res += 1;
-        }
-        return res;
-}
-
-/* Caller must hold the locks */
-static void epcaparam(struct tty_struct *tty, struct channel *ch)
-{
-        unsigned int cmdHead;
-        struct ktermios *ts;
-        struct board_chan __iomem *bc;
-        unsigned mval, hflow, cflag, iflag;
-
-        bc = ch->brdchan;
-        epcaassert(bc != NULL, "bc out of range");
-
-        assertgwinon(ch);
-        ts = tty->termios;
-        if ((ts->c_cflag & CBAUD) == 0)  { /* Begin CBAUD detected */
-                cmdHead = readw(&bc->rin);
-                writew(cmdHead, &bc->rout);
-                cmdHead = readw(&bc->tin);
-                /* Changing baud in mid-stream transmission can be wonderful */
-                /*
-                 * Flush current transmit buffer by setting cmdTail pointer
-                 * (tout) to cmdHead pointer (tin). Hopefully the transmit
-                 * buffer is empty.
-                 */
-                fepcmd(ch, STOUT, (unsigned) cmdHead, 0, 0, 0);
-                mval = 0;
-        } else { /* Begin CBAUD not detected */
-                /*
-                 * c_cflags have changed but that change had nothing to do with
-                 * BAUD. Propagate the change to the card.
-                 */
-                cflag = termios2digi_c(ch, ts->c_cflag);
-                if (cflag != ch->fepcflag)  {
-                        ch->fepcflag = cflag;
-                        /* Set baud rate, char size, stop bits, parity */
-                        fepcmd(ch, SETCTRLFLAGS, (unsigned) cflag, 0, 0, 0);
-                }
-                /*
-                 * If the user has not forced CLOCAL and if the device is not a
-                 * CALLOUT device (Which is always CLOCAL) we set flags such
-                 * that the driver will wait on carrier detect.
-                 */
-                if (ts->c_cflag & CLOCAL)
-                        clear_bit(ASYNCB_CHECK_CD, &ch->port.flags);
-                else
-                        set_bit(ASYNCB_CHECK_CD, &ch->port.flags);
-                mval = ch->m_dtr | ch->m_rts;
-        } /* End CBAUD not detected */
-        iflag = termios2digi_i(ch, ts->c_iflag);
-        /* Check input mode flags */
-        if (iflag != ch->fepiflag)  {
-                ch->fepiflag = iflag;
-                /*
-                 * Command sets channels iflag structure on the board. Such
-                 * things as input soft flow control, handling of parity
-                 * errors, and break handling are all set here.
-                 *
-                 * break handling, parity handling, input stripping,
-                 * flow control chars
-                 */
-                fepcmd(ch, SETIFLAGS, (unsigned int) ch->fepiflag, 0, 0, 0);
-        }
-        /*
-         * Set the board mint value for this channel. This will cause hardware
-         * events to be generated each time the DCD signal (Described in mint)
-         * changes.
-         */
-        writeb(ch->dcd, &bc->mint);
-        if ((ts->c_cflag & CLOCAL) || (ch->digiext.digi_flags & DIGI_FORCEDCD))
-                if (ch->digiext.digi_flags & DIGI_FORCEDCD)
-                        writeb(0, &bc->mint);
-        ch->imodem = readb(&bc->mstat);
-        hflow = termios2digi_h(ch, ts->c_cflag);
-        if (hflow != ch->hflow)  {
-                ch->hflow = hflow;
-                /*
-                 * Hard flow control has been selected but the board is not
-                 * using it. Activate hard flow control now.
-                 */
-                fepcmd(ch, SETHFLOW, hflow, 0xff, 0, 1);
-        }
-        mval ^= ch->modemfake & (mval ^ ch->modem);
-
-        if (ch->omodem ^ mval)  {
-                ch->omodem = mval;
-                /*
-                 * The below command sets the DTR and RTS mstat structure. If
-                 * hard flow control is NOT active these changes will drive the
-                 * output of the actual DTR and RTS lines. If hard flow control
-                 * is active, the changes will be saved in the mstat structure
-                 * and only asserted when hard flow control is turned off.
-                 */
-
-                /* First reset DTR & RTS; then set them */
-                fepcmd(ch, SETMODEM, 0, ((ch->m_dtr)|(ch->m_rts)), 0, 1);
-                fepcmd(ch, SETMODEM, mval, 0, 0, 1);
-        }
-        if (ch->startc != ch->fepstartc || ch->stopc != ch->fepstopc)  {
-                ch->fepstartc = ch->startc;
-                ch->fepstopc = ch->stopc;
-                /*
-                 * The XON / XOFF characters have changed; propagate these
-                 * changes to the card.
-                 */
-                fepcmd(ch, SONOFFC, ch->fepstartc, ch->fepstopc, 0, 1);
-        }
-        if (ch->startca != ch->fepstartca || ch->stopca != ch->fepstopca)  {
-                ch->fepstartca = ch->startca;
-                ch->fepstopca = ch->stopca;
-                /*
-                 * Similar to the above, this time the auxilarly XON / XOFF
-                 * characters have changed; propagate these changes to the card.
-                 */
-                fepcmd(ch, SAUXONOFFC, ch->fepstartca, ch->fepstopca, 0, 1);
-        }
-}
-
-/* Caller holds lock */
-static void receive_data(struct channel *ch, struct tty_struct *tty)
-{
-        unchar *rptr;
-        struct ktermios *ts = NULL;
-        struct board_chan __iomem *bc;
-        int dataToRead, wrapgap, bytesAvailable;
-        unsigned int tail, head;
-        unsigned int wrapmask;
-
-        /*
-         * This routine is called by doint when a receive data event has taken
-         * place.
-         */
-        globalwinon(ch);
-        if (ch->statusflags & RXSTOPPED)
-                return;
-        if (tty)
-                ts = tty->termios;
-        bc = ch->brdchan;
-        BUG_ON(!bc);
-        wrapmask = ch->rxbufsize - 1;
-
-        /*
-         * Get the head and tail pointers to the receiver queue. Wrap the head
-         * pointer if it has reached the end of the buffer.
-         */
-        head = readw(&bc->rin);
-        head &= wrapmask;
-        tail = readw(&bc->rout) & wrapmask;
-
-        bytesAvailable = (head - tail) & wrapmask;
-        if (bytesAvailable == 0)
-                return;
-
-        /* If CREAD bit is off or device not open, set TX tail to head */
-        if (!tty || !ts || !(ts->c_cflag & CREAD)) {
-                writew(head, &bc->rout);
-                return;
-        }
-
-        if (tty_buffer_request_room(tty, bytesAvailable + 1) == 0)
-                return;
-
-        if (readb(&bc->orun)) {
-                writeb(0, &bc->orun);
-                printk(KERN_WARNING "epca; overrun! DigiBoard device %s\n",
-                                                                tty->name);
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-        }
-        rxwinon(ch);
-        while (bytesAvailable > 0) {
-                /* Begin while there is data on the card */
-                wrapgap = (head >= tail) ? head - tail : ch->rxbufsize - tail;
-                /*
-                 * Even if head has wrapped around only report the amount of
-                 * data to be equal to the size - tail. Remember memcpy can't
-                 * automaticly wrap around the receive buffer.
-                 */
-                dataToRead = (wrapgap < bytesAvailable) ? wrapgap
-                                                        : bytesAvailable;
-                /* Make sure we don't overflow the buffer */
-                dataToRead = tty_prepare_flip_string(tty, &rptr, dataToRead);
-                if (dataToRead == 0)
-                        break;
-                /*
-                 * Move data read from our card into the line disciplines
-                 * buffer for translation if necessary.
-                 */
-                memcpy_fromio(rptr, ch->rxptr + tail, dataToRead);
-                tail = (tail + dataToRead) & wrapmask;
-                bytesAvailable -= dataToRead;
-        } /* End while there is data on the card */
-        globalwinon(ch);
-        writew(tail, &bc->rout);
-        /* Must be called with global data */
-        tty_schedule_flip(tty);
-}
-
-static int info_ioctl(struct tty_struct *tty, struct file *file,
-                    unsigned int cmd, unsigned long arg)
-{
-        switch (cmd) {
-        case DIGI_GETINFO:
-                {
-                        struct digi_info di;
-                        int brd;
-
-                        if (get_user(brd, (unsigned int __user *)arg))
-                                return -EFAULT;
-                        if (brd < 0 || brd >= num_cards || num_cards == 0)
-                                return -ENODEV;
-
-                        memset(&di, 0, sizeof(di));
-
-                        di.board = brd;
-                        di.status = boards[brd].status;
-                        di.type = boards[brd].type ;
-                        di.numports = boards[brd].numports ;
-                        /* Legacy fixups - just move along nothing to see */
-                        di.port = (unsigned char *)boards[brd].port ;
-                        di.membase = (unsigned char *)boards[brd].membase ;
-
-                        if (copy_to_user((void __user *)arg, &di, sizeof(di)))
-                                return -EFAULT;
-                        break;
-
-                }
-
-        case DIGI_POLLER:
-                {
-                        int brd = arg & 0xff000000 >> 16;
-                        unsigned char state = arg & 0xff;
-
-                        if (brd < 0 || brd >= num_cards) {
-                                printk(KERN_ERR "epca: DIGI POLLER : brd not valid!\n");
-                                return -ENODEV;
-                        }
-                        digi_poller_inhibited = state;
-                        break;
-                }
-
-        case DIGI_INIT:
-                {
-                        /*
-                         * This call is made by the apps to complete the
-                         * initialization of the board(s). This routine is
-                         * responsible for setting the card to its initial
-                         * state and setting the drivers control fields to the
-                         * sutianle settings for the card in question.
-                         */
-                        int crd;
-                        for (crd = 0; crd < num_cards; crd++)
-                                post_fep_init(crd);
-                        break;
-                }
-        default:
-                return -ENOTTY;
-        }
-        return 0;
-}
-
-static int pc_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct channel *ch = tty->driver_data;
-        struct board_chan __iomem *bc;
-        unsigned int mstat, mflag = 0;
-        unsigned long flags;
-
-        if (ch)
-                bc = ch->brdchan;
-        else
-                return -EINVAL;
-
-        spin_lock_irqsave(&epca_lock, flags);
-        globalwinon(ch);
-        mstat = readb(&bc->mstat);
-        memoff(ch);
-        spin_unlock_irqrestore(&epca_lock, flags);
-
-        if (mstat & ch->m_dtr)
-                mflag |= TIOCM_DTR;
-        if (mstat & ch->m_rts)
-                mflag |= TIOCM_RTS;
-        if (mstat & ch->m_cts)
-                mflag |= TIOCM_CTS;
-        if (mstat & ch->dsr)
-                mflag |= TIOCM_DSR;
-        if (mstat & ch->m_ri)
-                mflag |= TIOCM_RI;
-        if (mstat & ch->dcd)
-                mflag |= TIOCM_CD;
-        return mflag;
-}
-
-static int pc_tiocmset(struct tty_struct *tty, struct file *file,
-                       unsigned int set, unsigned int clear)
-{
-        struct channel *ch = tty->driver_data;
-        unsigned long flags;
-
-        if (!ch)
-                return -EINVAL;
-
-        spin_lock_irqsave(&epca_lock, flags);
-        /*
-         * I think this modemfake stuff is broken. It doesn't correctly reflect
-         * the behaviour desired by the TIOCM* ioctls. Therefore this is
-         * probably broken.
-         */
-        if (set & TIOCM_RTS) {
-                ch->modemfake |= ch->m_rts;
-                ch->modem |= ch->m_rts;
-        }
-        if (set & TIOCM_DTR) {
-                ch->modemfake |= ch->m_dtr;
-                ch->modem |= ch->m_dtr;
-        }
-        if (clear & TIOCM_RTS) {
-                ch->modemfake |= ch->m_rts;
-                ch->modem &= ~ch->m_rts;
-        }
-        if (clear & TIOCM_DTR) {
-                ch->modemfake |= ch->m_dtr;
-                ch->modem &= ~ch->m_dtr;
-        }
-        globalwinon(ch);
-        /*
-         * The below routine generally sets up parity, baud, flow control
-         * issues, etc.... It effect both control flags and input flags.
-         */
-        epcaparam(tty, ch);
-        memoff(ch);
-        spin_unlock_irqrestore(&epca_lock, flags);
-        return 0;
-}
-
-static int pc_ioctl(struct tty_struct *tty, struct file *file,
-                                        unsigned int cmd, unsigned long arg)
-{
-        digiflow_t dflow;
-        unsigned long flags;
-        unsigned int mflag, mstat;
-        unsigned char startc, stopc;
-        struct board_chan __iomem *bc;
-        struct channel *ch = tty->driver_data;
-        void __user *argp = (void __user *)arg;
-
-        if (ch)
-                bc = ch->brdchan;
-        else
-                return -EINVAL;
-        switch (cmd) {
-        case TIOCMODG:
-                mflag = pc_tiocmget(tty, file);
-                if (put_user(mflag, (unsigned long __user *)argp))
-                        return -EFAULT;
-                break;
-        case TIOCMODS:
-                if (get_user(mstat, (unsigned __user *)argp))
-                        return -EFAULT;
-                return pc_tiocmset(tty, file, mstat, ~mstat);
-        case TIOCSDTR:
-                spin_lock_irqsave(&epca_lock, flags);
-                ch->omodem |= ch->m_dtr;
-                globalwinon(ch);
-                fepcmd(ch, SETMODEM, ch->m_dtr, 0, 10, 1);
-                memoff(ch);
-                spin_unlock_irqrestore(&epca_lock, flags);
-                break;
-
-        case TIOCCDTR:
-                spin_lock_irqsave(&epca_lock, flags);
-                ch->omodem &= ~ch->m_dtr;
-                globalwinon(ch);
-                fepcmd(ch, SETMODEM, 0, ch->m_dtr, 10, 1);
-                memoff(ch);
-                spin_unlock_irqrestore(&epca_lock, flags);
-                break;
-        case DIGI_GETA:
-                if (copy_to_user(argp, &ch->digiext, sizeof(digi_t)))
-                        return -EFAULT;
-                break;
-        case DIGI_SETAW:
-        case DIGI_SETAF:
-                if (cmd == DIGI_SETAW) {
-                        /* Setup an event to indicate when the transmit
-                           buffer empties */
-                        spin_lock_irqsave(&epca_lock, flags);
-                        setup_empty_event(tty, ch);
-                        spin_unlock_irqrestore(&epca_lock, flags);
-                        tty_wait_until_sent(tty, 0);
-                } else {
-                        /* ldisc lock already held in ioctl */
-                        if (tty->ldisc->ops->flush_buffer)
-                                tty->ldisc->ops->flush_buffer(tty);
-                }
-                /* Fall Thru */
-        case DIGI_SETA:
-                if (copy_from_user(&ch->digiext, argp, sizeof(digi_t)))
-                        return -EFAULT;
-
-                if (ch->digiext.digi_flags & DIGI_ALTPIN)  {
-                        ch->dcd = ch->m_dsr;
-                        ch->dsr = ch->m_dcd;
-                } else {
-                        ch->dcd = ch->m_dcd;
-                        ch->dsr = ch->m_dsr;
-                        }
-
-                spin_lock_irqsave(&epca_lock, flags);
-                globalwinon(ch);
-
-                /*
-                 * The below routine generally sets up parity, baud, flow
-                 * control issues, etc.... It effect both control flags and
-                 * input flags.
-                 */
-                epcaparam(tty, ch);
-                memoff(ch);
-                spin_unlock_irqrestore(&epca_lock, flags);
-                break;
-
-        case DIGI_GETFLOW:
-        case DIGI_GETAFLOW:
-                spin_lock_irqsave(&epca_lock, flags);
-                globalwinon(ch);
-                if (cmd == DIGI_GETFLOW) {
-                        dflow.startc = readb(&bc->startc);
-                        dflow.stopc = readb(&bc->stopc);
-                } else {
-                        dflow.startc = readb(&bc->startca);
-                        dflow.stopc = readb(&bc->stopca);
-                }
-                memoff(ch);
-                spin_unlock_irqrestore(&epca_lock, flags);
-
-                if (copy_to_user(argp, &dflow, sizeof(dflow)))
-                        return -EFAULT;
-                break;
-
-        case DIGI_SETAFLOW:
-        case DIGI_SETFLOW:
-                if (cmd == DIGI_SETFLOW) {
-                        startc = ch->startc;
-                        stopc = ch->stopc;
-                } else {
-                        startc = ch->startca;
-                        stopc = ch->stopca;
-                }
-
-                if (copy_from_user(&dflow, argp, sizeof(dflow)))
-                        return -EFAULT;
-
-                if (dflow.startc != startc || dflow.stopc != stopc) {
-                        /* Begin  if setflow toggled */
-                        spin_lock_irqsave(&epca_lock, flags);
-                        globalwinon(ch);
-
-                        if (cmd == DIGI_SETFLOW) {
-                                ch->fepstartc = ch->startc = dflow.startc;
-                                ch->fepstopc = ch->stopc = dflow.stopc;
-                                fepcmd(ch, SONOFFC, ch->fepstartc,
-                                                ch->fepstopc, 0, 1);
-                        } else {
-                                ch->fepstartca = ch->startca = dflow.startc;
-                                ch->fepstopca  = ch->stopca = dflow.stopc;
-                                fepcmd(ch, SAUXONOFFC, ch->fepstartca,
-                                                ch->fepstopca, 0, 1);
-                        }
-
-                        if (ch->statusflags & TXSTOPPED)
-                                pc_start(tty);
-
-                        memoff(ch);
-                        spin_unlock_irqrestore(&epca_lock, flags);
-                } /* End if setflow toggled */
-                break;
-        default:
-                return -ENOIOCTLCMD;
-        }
-        return 0;
-}
-
-static void pc_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
-{
-        struct channel *ch;
-        unsigned long flags;
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-
-        if (ch != NULL)  { /* Begin if channel valid */
-                spin_lock_irqsave(&epca_lock, flags);
-                globalwinon(ch);
-                epcaparam(tty, ch);
-                memoff(ch);
-                spin_unlock_irqrestore(&epca_lock, flags);
-
-                if ((old_termios->c_cflag & CRTSCTS) &&
-                         ((tty->termios->c_cflag & CRTSCTS) == 0))
-                        tty->hw_stopped = 0;
-
-                if (!(old_termios->c_cflag & CLOCAL) &&
-                         (tty->termios->c_cflag & CLOCAL))
-                        wake_up_interruptible(&ch->port.open_wait);
-
-        } /* End if channel valid */
-}
-
-static void do_softint(struct work_struct *work)
-{
-        struct channel *ch = container_of(work, struct channel, tqueue);
-        /* Called in response to a modem change event */
-        if (ch && ch->magic == EPCA_MAGIC) {
-                struct tty_struct *tty = tty_port_tty_get(&ch->port);
-
-                if (tty && tty->driver_data) {
-                        if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) {
-                                tty_hangup(tty);
-                                wake_up_interruptible(&ch->port.open_wait);
-                                clear_bit(ASYNCB_NORMAL_ACTIVE,
-                                                &ch->port.flags);
-                        }
-                }
-                tty_kref_put(tty);
-        }
-}
-
-/*
- * pc_stop and pc_start provide software flow control to the routine and the
- * pc_ioctl routine.
- */
-static void pc_stop(struct tty_struct *tty)
-{
-        struct channel *ch;
-        unsigned long flags;
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-        if (ch != NULL) {
-                spin_lock_irqsave(&epca_lock, flags);
-                if ((ch->statusflags & TXSTOPPED) == 0) {
-                        /* Begin if transmit stop requested */
-                        globalwinon(ch);
-                        /* STOP transmitting now !! */
-                        fepcmd(ch, PAUSETX, 0, 0, 0, 0);
-                        ch->statusflags |= TXSTOPPED;
-                        memoff(ch);
-                } /* End if transmit stop requested */
-                spin_unlock_irqrestore(&epca_lock, flags);
-        }
-}
-
-static void pc_start(struct tty_struct *tty)
-{
-        struct channel *ch;
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-        if (ch != NULL) {
-                unsigned long flags;
-                spin_lock_irqsave(&epca_lock, flags);
-                /* Just in case output was resumed because of a change
-                   in Digi-flow */
-                if (ch->statusflags & TXSTOPPED)  {
-                        /* Begin transmit resume requested */
-                        struct board_chan __iomem *bc;
-                        globalwinon(ch);
-                        bc = ch->brdchan;
-                        if (ch->statusflags & LOWWAIT)
-                                writeb(1, &bc->ilow);
-                        /* Okay, you can start transmitting again... */
-                        fepcmd(ch, RESUMETX, 0, 0, 0, 0);
-                        ch->statusflags &= ~TXSTOPPED;
-                        memoff(ch);
-                } /* End transmit resume requested */
-                spin_unlock_irqrestore(&epca_lock, flags);
-        }
-}
-
-/*
- * The below routines pc_throttle and pc_unthrottle are used to slow (And
- * resume) the receipt of data into the kernels receive buffers. The exact
- * occurrence of this depends on the size of the kernels receive buffer and
- * what the 'watermarks' are set to for that buffer. See the n_ttys.c file for
- * more details.
- */
-static void pc_throttle(struct tty_struct *tty)
-{
-        struct channel *ch;
-        unsigned long flags;
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-        if (ch != NULL) {
-                spin_lock_irqsave(&epca_lock, flags);
-                if ((ch->statusflags & RXSTOPPED) == 0) {
-                        globalwinon(ch);
-                        fepcmd(ch, PAUSERX, 0, 0, 0, 0);
-                        ch->statusflags |= RXSTOPPED;
-                        memoff(ch);
-                }
-                spin_unlock_irqrestore(&epca_lock, flags);
-        }
-}
-
-static void pc_unthrottle(struct tty_struct *tty)
-{
-        struct channel *ch;
-        unsigned long flags;
-        /*
-         * verifyChannel returns the channel from the tty struct if it is
-         * valid. This serves as a sanity check.
-         */
-        ch = verifyChannel(tty);
-        if (ch != NULL) {
-                /* Just in case output was resumed because of a change
-                   in Digi-flow */
-                spin_lock_irqsave(&epca_lock, flags);
-                if (ch->statusflags & RXSTOPPED) {
-                        globalwinon(ch);
-                        fepcmd(ch, RESUMERX, 0, 0, 0, 0);
-                        ch->statusflags &= ~RXSTOPPED;
-                        memoff(ch);
-                }
-                spin_unlock_irqrestore(&epca_lock, flags);
-        }
-}
-
-static int pc_send_break(struct tty_struct *tty, int msec)
-{
-        struct channel *ch = tty->driver_data;
-        unsigned long flags;
-
-        if (msec == -1)
-                msec = 0xFFFF;
-        else if (msec > 0xFFFE)
-                msec = 0xFFFE;
-        else if (msec < 1)
-                msec = 1;
-
-        spin_lock_irqsave(&epca_lock, flags);
-        globalwinon(ch);
-        /*
-         * Maybe I should send an infinite break here, schedule() for msec
-         * amount of time, and then stop the break. This way, the user can't
-         * screw up the FEP by causing digi_send_break() to be called (i.e. via
-         * an ioctl()) more than once in msec amount of time.
-         * Try this for now...
-         */
-        fepcmd(ch, SENDBREAK, msec, 0, 10, 0);
-        memoff(ch);
-        spin_unlock_irqrestore(&epca_lock, flags);
-        return 0;
-}
-
-/* Caller MUST hold the lock */
-static void setup_empty_event(struct tty_struct *tty, struct channel *ch)
-{
-        struct board_chan __iomem *bc = ch->brdchan;
-
-        globalwinon(ch);
-        ch->statusflags |= EMPTYWAIT;
-        /*
-         * When set the iempty flag request a event to be generated when the
-         * transmit buffer is empty (If there is no BREAK in progress).
-         */
-        writeb(1, &bc->iempty);
-        memoff(ch);
-}
-
-#ifndef MODULE
-static void __init epca_setup(char *str, int *ints)
-{
-        struct board_info board;
-        int               index, loop, last;
-        char              *temp, *t2;
-        unsigned          len;
-
-        /*
-         * If this routine looks a little strange it is because it is only
-         * called if a LILO append command is given to boot the kernel with
-         * parameters. In this way, we can provide the user a method of
-         * changing his board configuration without rebuilding the kernel.
-         */
-        if (!liloconfig)
-                liloconfig = 1;
-
-        memset(&board, 0, sizeof(board));
-
-        /* Assume the data is int first, later we can change it */
-        /* I think that array position 0 of ints holds the number of args */
-        for (last = 0, index = 1; index <= ints[0]; index++)
-                switch (index) { /* Begin parse switch */
-                case 1:
-                        board.status = ints[index];
-                        /*
-                         * We check for 2 (As opposed to 1; because 2 is a flag
-                         * instructing the driver to ignore epcaconfig.) For
-                         * this reason we check for 2.
-                         */
-                        if (board.status == 2) {
-                        /* Begin ignore epcaconfig as well as lilo cmd line */
-                                nbdevs = 0;
-                                num_cards = 0;
-                                return;
-                        } /* End ignore epcaconfig as well as lilo cmd line */
-
-                        if (board.status > 2) {
-                                printk(KERN_ERR "epca_setup: Invalid board status 0x%x\n",
-                                                board.status);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_BOARD_STATUS;
-                                return;
-                        }
-                        last = index;
-                        break;
-                case 2:
-                        board.type = ints[index];
-                        if (board.type >= PCIXEM)  {
-                                printk(KERN_ERR "epca_setup: Invalid board type 0x%x\n", board.type);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_BOARD_TYPE;
-                                return;
-                        }
-                        last = index;
-                        break;
-                case 3:
-                        board.altpin = ints[index];
-                        if (board.altpin > 1) {
-                                printk(KERN_ERR "epca_setup: Invalid board altpin 0x%x\n", board.altpin);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_ALTPIN;
-                                return;
-                        }
-                        last = index;
-                        break;
-
-                case 4:
-                        board.numports = ints[index];
-                        if (board.numports < 2 || board.numports > 256) {
-                                printk(KERN_ERR "epca_setup: Invalid board numports 0x%x\n", board.numports);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_NUM_PORTS;
-                                return;
-                        }
-                        nbdevs += board.numports;
-                        last = index;
-                        break;
-
-                case 5:
-                        board.port = ints[index];
-                        if (ints[index] <= 0) {
-                                printk(KERN_ERR "epca_setup: Invalid io port 0x%x\n", (unsigned int)board.port);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_PORT_BASE;
-                                return;
-                        }
-                        last = index;
-                        break;
-
-                case 6:
-                        board.membase = ints[index];
-                        if (ints[index] <= 0) {
-                                printk(KERN_ERR "epca_setup: Invalid memory base 0x%x\n",
-                                        (unsigned int)board.membase);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_MEM_BASE;
-                                return;
-                        }
-                        last = index;
-                        break;
-
-                default:
-                        printk(KERN_ERR "<Error> - epca_setup: Too many integer parms\n");
-                        return;
-
-                } /* End parse switch */
-
-        while (str && *str)  { /* Begin while there is a string arg */
-                /* find the next comma or terminator */
-                temp = str;
-                /* While string is not null, and a comma hasn't been found */
-                while (*temp && (*temp != ','))
-                        temp++;
-                if (!*temp)
-                        temp = NULL;
-                else
-                        *temp++ = 0;
-                /* Set index to the number of args + 1 */
-                index = last + 1;
-
-                switch (index) {
-                case 1:
-                        len = strlen(str);
-                        if (strncmp("Disable", str, len) == 0)
-                                board.status = 0;
-                        else if (strncmp("Enable", str, len) == 0)
-                                board.status = 1;
-                        else {
-                                printk(KERN_ERR "epca_setup: Invalid status %s\n", str);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_BOARD_STATUS;
-                                return;
-                        }
-                        last = index;
-                        break;
-
-                case 2:
-                        for (loop = 0; loop < EPCA_NUM_TYPES; loop++)
-                                if (strcmp(board_desc[loop], str) == 0)
-                                        break;
-                        /*
-                         * If the index incremented above refers to a
-                         * legitamate board type set it here.
-                         */
-                        if (index < EPCA_NUM_TYPES)
-                                board.type = loop;
-                        else {
-                                printk(KERN_ERR "epca_setup: Invalid board type: %s\n", str);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_BOARD_TYPE;
-                                return;
-                        }
-                        last = index;
-                        break;
-
-                case 3:
-                        len = strlen(str);
-                        if (strncmp("Disable", str, len) == 0)
-                                board.altpin = 0;
-                        else if (strncmp("Enable", str, len) == 0)
-                                board.altpin = 1;
-                        else {
-                                printk(KERN_ERR "epca_setup: Invalid altpin %s\n", str);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_ALTPIN;
-                                return;
-                        }
-                        last = index;
-                        break;
-
-                case 4:
-                        t2 = str;
-                        while (isdigit(*t2))
-                                t2++;
-
-                        if (*t2) {
-                                printk(KERN_ERR "epca_setup: Invalid port count %s\n", str);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_NUM_PORTS;
-                                return;
-                        }
-
-                        /*
-                         * There is not a man page for simple_strtoul but the
-                         * code can be found in vsprintf.c. The first argument
-                         * is the string to translate (To an unsigned long
-                         * obviously), the second argument can be the address
-                         * of any character variable or a NULL. If a variable
-                         * is given, the end pointer of the string will be
-                         * stored in that variable; if a NULL is given the end
-                         * pointer will not be returned. The last argument is
-                         * the base to use. If a 0 is indicated, the routine
-                         * will attempt to determine the proper base by looking
-                         * at the values prefix (A '0' for octal, a 'x' for
-                         * hex, etc ... If a value is given it will use that
-                         * value as the base.
-                         */
-                        board.numports = simple_strtoul(str, NULL, 0);
-                        nbdevs += board.numports;
-                        last = index;
-                        break;
-
-                case 5:
-                        t2 = str;
-                        while (isxdigit(*t2))
-                                t2++;
-
-                        if (*t2) {
-                                printk(KERN_ERR "epca_setup: Invalid i/o address %s\n", str);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_PORT_BASE;
-                                return;
-                        }
-
-                        board.port = simple_strtoul(str, NULL, 16);
-                        last = index;
-                        break;
-
-                case 6:
-                        t2 = str;
-                        while (isxdigit(*t2))
-                                t2++;
-
-                        if (*t2) {
-                                printk(KERN_ERR "epca_setup: Invalid memory base %s\n", str);
-                                invalid_lilo_config = 1;
-                                setup_error_code |= INVALID_MEM_BASE;
-                                return;
-                        }
-                        board.membase = simple_strtoul(str, NULL, 16);
-                        last = index;
-                        break;
-                default:
-                        printk(KERN_ERR "epca: Too many string parms\n");
-                        return;
-                }
-                str = temp;
-        } /* End while there is a string arg */
-
-        if (last < 6) {
-                printk(KERN_ERR "epca: Insufficient parms specified\n");
-                return;
-        }
-
-        /* I should REALLY validate the stuff here */
-        /* Copies our local copy of board into boards */
-        memcpy((void *)&boards[num_cards], (void *)&board, sizeof(board));
-        /* Does this get called once per lilo arg are what ? */
-        printk(KERN_INFO "PC/Xx: Added board %i, %s %i ports at 0x%4.4X base 0x%6.6X\n",
-                num_cards, board_desc[board.type],
-                board.numports, (int)board.port, (unsigned int) board.membase);
-        num_cards++;
-}
-
-static int __init epca_real_setup(char *str)
-{
-        int ints[11];
-
-        epca_setup(get_options(str, 11, ints), ints);
-        return 1;
-}
-
-__setup("digiepca", epca_real_setup);
-#endif
-
-enum epic_board_types {
-        brd_xr = 0,
-        brd_xem,
-        brd_cx,
-        brd_xrj,
-};
-
-/* indexed directly by epic_board_types enum */
-static struct {
-        unsigned char board_type;
-        unsigned bar_idx;               /* PCI base address region */
-} epca_info_tbl[] = {
-        { PCIXR, 0, },
-        { PCIXEM, 0, },
-        { PCICX, 0, },
-        { PCIXRJ, 2, },
-};
-
-static int __devinit epca_init_one(struct pci_dev *pdev,
-                                 const struct pci_device_id *ent)
-{
-        static int board_num = -1;
-        int board_idx, info_idx = ent->driver_data;
-        unsigned long addr;
-
-        if (pci_enable_device(pdev))
-                return -EIO;
-
-        board_num++;
-        board_idx = board_num + num_cards;
-        if (board_idx >= MAXBOARDS)
-                goto err_out;
-
-        addr = pci_resource_start(pdev, epca_info_tbl[info_idx].bar_idx);
-        if (!addr) {
-                printk(KERN_ERR PFX "PCI region #%d not available (size 0)\n",
-                        epca_info_tbl[info_idx].bar_idx);
-                goto err_out;
-        }
-
-        boards[board_idx].status = ENABLED;
-        boards[board_idx].type = epca_info_tbl[info_idx].board_type;
-        boards[board_idx].numports = 0x0;
-        boards[board_idx].port = addr + PCI_IO_OFFSET;
-        boards[board_idx].membase = addr;
-
-        if (!request_mem_region(addr + PCI_IO_OFFSET, 0x200000, "epca")) {
-                printk(KERN_ERR PFX "resource 0x%x @ 0x%lx unavailable\n",
-                        0x200000, addr + PCI_IO_OFFSET);
-                goto err_out;
-        }
-
-        boards[board_idx].re_map_port = ioremap_nocache(addr + PCI_IO_OFFSET,
-                                                                0x200000);
-        if (!boards[board_idx].re_map_port) {
-                printk(KERN_ERR PFX "cannot map 0x%x @ 0x%lx\n",
-                        0x200000, addr + PCI_IO_OFFSET);
-                goto err_out_free_pciio;
-        }
-
-        if (!request_mem_region(addr, 0x200000, "epca")) {
-                printk(KERN_ERR PFX "resource 0x%x @ 0x%lx unavailable\n",
-                        0x200000, addr);
-                goto err_out_free_iounmap;
-        }
-
-        boards[board_idx].re_map_membase = ioremap_nocache(addr, 0x200000);
-        if (!boards[board_idx].re_map_membase) {
-                printk(KERN_ERR PFX "cannot map 0x%x @ 0x%lx\n",
-                        0x200000, addr + PCI_IO_OFFSET);
-                goto err_out_free_memregion;
-        }
-
-        /*
-         * I don't know what the below does, but the hardware guys say its
-         * required on everything except PLX (In this case XRJ).
-         */
-        if (info_idx != brd_xrj) {
-                pci_write_config_byte(pdev, 0x40, 0);
-                pci_write_config_byte(pdev, 0x46, 0);
-        }
-
-        return 0;
-
-err_out_free_memregion:
-        release_mem_region(addr, 0x200000);
-err_out_free_iounmap:
-        iounmap(boards[board_idx].re_map_port);
-err_out_free_pciio:
-        release_mem_region(addr + PCI_IO_OFFSET, 0x200000);
-err_out:
-        return -ENODEV;
-}
-
-
-static struct pci_device_id epca_pci_tbl[] = {
-        { PCI_VENDOR_DIGI, PCI_DEVICE_XR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xr },
-        { PCI_VENDOR_DIGI, PCI_DEVICE_XEM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xem },
-        { PCI_VENDOR_DIGI, PCI_DEVICE_CX, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_cx },
-        { PCI_VENDOR_DIGI, PCI_DEVICE_XRJ, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xrj },
-        { 0, }
-};
-
-MODULE_DEVICE_TABLE(pci, epca_pci_tbl);
-
-static int __init init_PCI(void)
-{
-        memset(&epca_driver, 0, sizeof(epca_driver));
-        epca_driver.name = "epca";
-        epca_driver.id_table = epca_pci_tbl;
-        epca_driver.probe = epca_init_one;
-
-        return pci_register_driver(&epca_driver);
-}
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/char/epca.h b/drivers/char/epca.h
deleted file mode 100644
index d414bf2dbf7c..000000000000
--- a/drivers/char/epca.h
+++ /dev/null
@@ -1,158 +0,0 @@
-#define XEMPORTS    0xC02
-#define XEPORTS     0xC22
-
-#define MAX_ALLOC   0x100
-
-#define MAXBOARDS   12
-#define FEPCODESEG  0x0200L
-#define FEPCODE     0x2000L
-#define BIOSCODE    0xf800L
-
-#define MISCGLOBAL  0x0C00L
-#define NPORT       0x0C22L
-#define MBOX        0x0C40L
-#define PORTBASE    0x0C90L
-
-/* Begin code defines used for epca_setup */
-
-#define INVALID_BOARD_TYPE   0x1
-#define INVALID_NUM_PORTS    0x2
-#define INVALID_MEM_BASE     0x4
-#define INVALID_PORT_BASE    0x8
-#define INVALID_BOARD_STATUS 0x10
-#define INVALID_ALTPIN       0x20
-
-/* End code defines used for epca_setup */
-
-
-#define FEPCLR      0x00
-#define FEPMEM      0x02
-#define FEPRST      0x04
-#define FEPINT      0x08
-#define FEPMASK     0x0e
-#define FEPWIN      0x80
-
-#define PCXE    0
-#define PCXEVE  1
-#define PCXEM   2   
-#define EISAXEM 3
-#define PC64XE  4
-#define PCXI    5
-#define PCIXEM  7
-#define PCICX   8
-#define PCIXR   9
-#define PCIXRJ  10
-#define EPCA_NUM_TYPES 6
-
-
-static char *board_desc[] = 
-{
-        "PC/Xe",
-        "PC/Xeve",
-        "PC/Xem",
-        "EISA/Xem",
-        "PC/64Xe",
-        "PC/Xi",
-        "unknown",
-        "PCI/Xem",
-        "PCI/CX",
-        "PCI/Xr",
-        "PCI/Xrj",
-};
-
-#define STARTC      021
-#define STOPC       023
-#define IAIXON      0x2000
-
-
-#define TXSTOPPED  0x1
-#define LOWWAIT    0x2
-#define EMPTYWAIT  0x4
-#define RXSTOPPED  0x8
-#define TXBUSY     0x10
-
-#define DISABLED   0
-#define ENABLED    1
-#define OFF        0
-#define ON         1
-
-#define FEPTIMEOUT 200000  
-#define SERIAL_TYPE_INFO    3
-#define EPCA_EVENT_HANGUP   1
-#define EPCA_MAGIC          0x5c6df104L
-
-struct channel 
-{
-        long   magic;
-        struct tty_port port;
-        unsigned char boardnum;
-        unsigned char channelnum;
-        unsigned char omodem;         /* FEP output modem status     */
-        unsigned char imodem;         /* FEP input modem status      */
-        unsigned char modemfake;      /* Modem values to be forced   */
-        unsigned char modem;          /* Force values                */
-        unsigned char hflow;
-        unsigned char dsr;
-        unsigned char dcd;
-        unsigned char m_rts ;           /* The bits used in whatever FEP */
-        unsigned char m_dcd ;           /* is indiginous to this board to */
-        unsigned char m_dsr ;           /* represent each of the physical */
-        unsigned char m_cts ;           /* handshake lines */
-        unsigned char m_ri ;
-        unsigned char m_dtr ;
-        unsigned char stopc;
-        unsigned char startc;
-        unsigned char stopca;
-        unsigned char startca;
-        unsigned char fepstopc;
-        unsigned char fepstartc;
-        unsigned char fepstopca;
-        unsigned char fepstartca;
-        unsigned char txwin;
-        unsigned char rxwin;
-        unsigned short fepiflag;
-        unsigned short fepcflag;
-        unsigned short fepoflag;
-        unsigned short txbufhead;
-        unsigned short txbufsize;
-        unsigned short rxbufhead;
-        unsigned short rxbufsize;
-        int    close_delay;
-        unsigned long  event;
-        uint   dev;
-        unsigned long  statusflags;
-        unsigned long  c_iflag;
-        unsigned long  c_cflag;
-        unsigned long  c_lflag;
-        unsigned long  c_oflag;
-        unsigned char __iomem *txptr;
-        unsigned char __iomem *rxptr;
-        struct board_info           *board;
-        struct board_chan           __iomem *brdchan;
-        struct digi_struct          digiext;
-        struct work_struct          tqueue;
-        struct global_data          __iomem *mailbox;
-};
-
-struct board_info       
-{
-        unsigned char status;
-        unsigned char type;
-        unsigned char altpin;
-        unsigned short numports;
-        unsigned long port;
-        unsigned long membase;
-        void __iomem *re_map_port;
-        void __iomem *re_map_membase;
-        unsigned long  memory_seg;
-        void ( * memwinon )     (struct board_info *, unsigned int) ;
-        void ( * memwinoff )    (struct board_info *, unsigned int) ;
-        void ( * globalwinon )  (struct channel *) ;
-        void ( * txwinon )      (struct channel *) ;
-        void ( * rxwinon )      (struct channel *) ;
-        void ( * memoff )       (struct channel *) ;
-        void ( * assertgwinon ) (struct channel *) ;
-        void ( * assertmemoff ) (struct channel *) ;
-        unsigned char poller_inhibited ;
-};
-
diff --git a/drivers/char/epcaconfig.h b/drivers/char/epcaconfig.h
deleted file mode 100644
index 55dec067078e..000000000000
--- a/drivers/char/epcaconfig.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#define NUMCARDS 0
-#define NBDEVS 0
-
-struct board_info static_boards[NUMCARDS]={
-};
-
-/* DO NOT HAND EDIT THIS FILE! */
diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c
index 82b5a88a82d7..0e941b57482e 100644
--- a/drivers/char/generic_nvram.c
+++ b/drivers/char/generic_nvram.c
@@ -19,7 +19,7 @@
 #include <linux/miscdevice.h>
 #include <linux/fcntl.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <asm/uaccess.h>
 #include <asm/nvram.h>
 #ifdef CONFIG_PPC_PMAC
@@ -28,6 +28,7 @@
 
 #define NVRAM_SIZE      8192
 
+static DEFINE_MUTEX(nvram_mutex);
 static ssize_t nvram_len;
 
 static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
@@ -120,9 +121,9 @@ static long nvram_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned l
 {
         int ret;
 
-        lock_kernel();
+        mutex_lock(&nvram_mutex);
         ret = nvram_ioctl(file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&nvram_mutex);
 
         return ret;
 }
diff --git a/drivers/char/generic_serial.c b/drivers/char/generic_serial.c
deleted file mode 100644
index 5954ee1dc953..000000000000
--- a/drivers/char/generic_serial.c
+++ /dev/null
@@ -1,844 +0,0 @@
-/*
- *  generic_serial.c
- *
- *  Copyright (C) 1998/1999 R.E.Wolff@BitWizard.nl
- *
- *  written for the SX serial driver.
- *     Contains the code that should be shared over all the serial drivers.
- *
- *  Credit for the idea to do it this way might go to Alan Cox. 
- *
- *
- *  Version 0.1 -- December, 1998. Initial version.
- *  Version 0.2 -- March, 1999.    Some more routines. Bugfixes. Etc.
- *  Version 0.5 -- August, 1999.   Some more fixes. Reformat for Linus.
- *
- *  BitWizard is actively maintaining this file. We sometimes find
- *  that someone submitted changes to this file. We really appreciate
- *  your help, but please submit changes through us. We're doing our
- *  best to be responsive.  -- REW
- * */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/tty.h>
-#include <linux/sched.h>
-#include <linux/serial.h>
-#include <linux/mm.h>
-#include <linux/generic_serial.h>
-#include <linux/interrupt.h>
-#include <linux/tty_flip.h>
-#include <linux/delay.h>
-#include <linux/gfp.h>
-#include <asm/uaccess.h>
-
-#define DEBUG 
-
-static int gs_debug;
-
-#ifdef DEBUG
-#define gs_dprintk(f, str...) if (gs_debug & f) printk (str)
-#else
-#define gs_dprintk(f, str...) /* nothing */
-#endif
-
-#define func_enter() gs_dprintk (GS_DEBUG_FLOW, "gs: enter %s\n", __func__)
-#define func_exit()  gs_dprintk (GS_DEBUG_FLOW, "gs: exit  %s\n", __func__)
-
-#define RS_EVENT_WRITE_WAKEUP   1
-
-module_param(gs_debug, int, 0644);
-
-
-int gs_put_char(struct tty_struct * tty, unsigned char ch)
-{
-        struct gs_port *port;
-
-        func_enter (); 
-
-        port = tty->driver_data;
-
-        if (!port) return 0;
-
-        if (! (port->port.flags & ASYNC_INITIALIZED)) return 0;
-
-        /* Take a lock on the serial tranmit buffer! */
-        mutex_lock(& port->port_write_mutex);
-
-        if (port->xmit_cnt >= SERIAL_XMIT_SIZE - 1) {
-                /* Sorry, buffer is full, drop character. Update statistics???? -- REW */
-                mutex_unlock(&port->port_write_mutex);
-                return 0;
-        }
-
-        port->xmit_buf[port->xmit_head++] = ch;
-        port->xmit_head &= SERIAL_XMIT_SIZE - 1;
-        port->xmit_cnt++;  /* Characters in buffer */
-
-        mutex_unlock(&port->port_write_mutex);
-        func_exit ();
-        return 1;
-}
-
-
-/*
-> Problems to take into account are:
->       -1- Interrupts that empty part of the buffer.
->       -2- page faults on the access to userspace. 
->       -3- Other processes that are also trying to do a "write". 
-*/
-
-int gs_write(struct tty_struct * tty, 
-                    const unsigned char *buf, int count)
-{
-        struct gs_port *port;
-        int c, total = 0;
-        int t;
-
-        func_enter ();
-
-        port = tty->driver_data;
-
-        if (!port) return 0;
-
-        if (! (port->port.flags & ASYNC_INITIALIZED))
-                return 0;
-
-        /* get exclusive "write" access to this port (problem 3) */
-        /* This is not a spinlock because we can have a disk access (page 
-                 fault) in copy_from_user */
-        mutex_lock(& port->port_write_mutex);
-
-        while (1) {
-
-                c = count;
- 
-                /* This is safe because we "OWN" the "head". Noone else can 
-                   change the "head": we own the port_write_mutex. */
-                /* Don't overrun the end of the buffer */
-                t = SERIAL_XMIT_SIZE - port->xmit_head;
-                if (t < c) c = t;
- 
-                /* This is safe because the xmit_cnt can only decrease. This 
-                   would increase "t", so we might copy too little chars. */
-                /* Don't copy past the "head" of the buffer */
-                t = SERIAL_XMIT_SIZE - 1 - port->xmit_cnt;
-                if (t < c) c = t;
- 
-                /* Can't copy more? break out! */
-                if (c <= 0) break;
-
-                memcpy (port->xmit_buf + port->xmit_head, buf, c);
-
-                port -> xmit_cnt += c;
-                port -> xmit_head = (port->xmit_head + c) & (SERIAL_XMIT_SIZE -1);
-                buf += c;
-                count -= c;
-                total += c;
-        }
-        mutex_unlock(& port->port_write_mutex);
-
-        gs_dprintk (GS_DEBUG_WRITE, "write: interrupts are %s\n", 
-                    (port->port.flags & GS_TX_INTEN)?"enabled": "disabled");
-
-        if (port->xmit_cnt && 
-            !tty->stopped && 
-            !tty->hw_stopped &&
-            !(port->port.flags & GS_TX_INTEN)) {
-                port->port.flags |= GS_TX_INTEN;
-                port->rd->enable_tx_interrupts (port);
-        }
-        func_exit ();
-        return total;
-}
-
-
-
-int gs_write_room(struct tty_struct * tty)
-{
-        struct gs_port *port = tty->driver_data;
-        int ret;
-
-        func_enter ();
-        ret = SERIAL_XMIT_SIZE - port->xmit_cnt - 1;
-        if (ret < 0)
-                ret = 0;
-        func_exit ();
-        return ret;
-}
-
-
-int gs_chars_in_buffer(struct tty_struct *tty)
-{
-        struct gs_port *port = tty->driver_data;
-        func_enter ();
-
-        func_exit ();
-        return port->xmit_cnt;
-}
-
-
-static int gs_real_chars_in_buffer(struct tty_struct *tty)
-{
-        struct gs_port *port;
-        func_enter ();
-
-        port = tty->driver_data;
-
-        if (!port->rd) return 0;
-        if (!port->rd->chars_in_buffer) return 0;
-
-        func_exit ();
-        return port->xmit_cnt + port->rd->chars_in_buffer (port);
-}
-
-
-static int gs_wait_tx_flushed (void * ptr, unsigned long timeout) 
-{
-        struct gs_port *port = ptr;
-        unsigned long end_jiffies;
-        int jiffies_to_transmit, charsleft = 0, rv = 0;
-        int rcib;
-
-        func_enter();
-
-        gs_dprintk (GS_DEBUG_FLUSH, "port=%p.\n", port);
-        if (port) {
-                gs_dprintk (GS_DEBUG_FLUSH, "xmit_cnt=%x, xmit_buf=%p, tty=%p.\n", 
-                port->xmit_cnt, port->xmit_buf, port->port.tty);
-        }
-
-        if (!port || port->xmit_cnt < 0 || !port->xmit_buf) {
-                gs_dprintk (GS_DEBUG_FLUSH, "ERROR: !port, !port->xmit_buf or prot->xmit_cnt < 0.\n");
-                func_exit();
-                return -EINVAL;  /* This is an error which we don't know how to handle. */
-        }
-
-        rcib = gs_real_chars_in_buffer(port->port.tty);
-
-        if(rcib <= 0) {
-                gs_dprintk (GS_DEBUG_FLUSH, "nothing to wait for.\n");
-                func_exit();
-                return rv;
-        }
-        /* stop trying: now + twice the time it would normally take +  seconds */
-        if (timeout == 0) timeout = MAX_SCHEDULE_TIMEOUT;
-        end_jiffies  = jiffies; 
-        if (timeout !=  MAX_SCHEDULE_TIMEOUT)
-                end_jiffies += port->baud?(2 * rcib * 10 * HZ / port->baud):0;
-        end_jiffies += timeout;
-
-        gs_dprintk (GS_DEBUG_FLUSH, "now=%lx, end=%lx (%ld).\n", 
-                    jiffies, end_jiffies, end_jiffies-jiffies); 
-
-        /* the expression is actually jiffies < end_jiffies, but that won't
-           work around the wraparound. Tricky eh? */
-        while ((charsleft = gs_real_chars_in_buffer (port->port.tty)) &&
-                time_after (end_jiffies, jiffies)) {
-                /* Units check: 
-                   chars * (bits/char) * (jiffies /sec) / (bits/sec) = jiffies!
-                   check! */
-
-                charsleft += 16; /* Allow 16 chars more to be transmitted ... */
-                jiffies_to_transmit = port->baud?(1 + charsleft * 10 * HZ / port->baud):0;
-                /*                                ^^^ Round up.... */
-                if (jiffies_to_transmit <= 0) jiffies_to_transmit = 1;
-
-                gs_dprintk (GS_DEBUG_FLUSH, "Expect to finish in %d jiffies "
-                            "(%d chars).\n", jiffies_to_transmit, charsleft); 
-
-                msleep_interruptible(jiffies_to_msecs(jiffies_to_transmit));
-                if (signal_pending (current)) {
-                        gs_dprintk (GS_DEBUG_FLUSH, "Signal pending. Bombing out: "); 
-                        rv = -EINTR;
-                        break;
-                }
-        }
-
-        gs_dprintk (GS_DEBUG_FLUSH, "charsleft = %d.\n", charsleft); 
-        set_current_state (TASK_RUNNING);
-
-        func_exit();
-        return rv;
-}
-
-
-
-void gs_flush_buffer(struct tty_struct *tty)
-{
-        struct gs_port *port;
-        unsigned long flags;
-
-        func_enter ();
-
-        port = tty->driver_data;
-
-        if (!port) return;
-
-        /* XXX Would the write semaphore do? */
-        spin_lock_irqsave (&port->driver_lock, flags);
-        port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
-        spin_unlock_irqrestore (&port->driver_lock, flags);
-
-        tty_wakeup(tty);
-        func_exit ();
-}
-
-
-void gs_flush_chars(struct tty_struct * tty)
-{
-        struct gs_port *port;
-
-        func_enter ();
-
-        port = tty->driver_data;
-
-        if (!port) return;
-
-        if (port->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
-            !port->xmit_buf) {
-                func_exit ();
-                return;
-        }
-
-        /* Beats me -- REW */
-        port->port.flags |= GS_TX_INTEN;
-        port->rd->enable_tx_interrupts (port);
-        func_exit ();
-}
-
-
-void gs_stop(struct tty_struct * tty)
-{
-        struct gs_port *port;
-
-        func_enter ();
-
-        port = tty->driver_data;
-
-        if (!port) return;
-
-        if (port->xmit_cnt && 
-            port->xmit_buf && 
-            (port->port.flags & GS_TX_INTEN) ) {
-                port->port.flags &= ~GS_TX_INTEN;
-                port->rd->disable_tx_interrupts (port);
-        }
-        func_exit ();
-}
-
-
-void gs_start(struct tty_struct * tty)
-{
-        struct gs_port *port;
-
-        port = tty->driver_data;
-
-        if (!port) return;
-
-        if (port->xmit_cnt && 
-            port->xmit_buf && 
-            !(port->port.flags & GS_TX_INTEN) ) {
-                port->port.flags |= GS_TX_INTEN;
-                port->rd->enable_tx_interrupts (port);
-        }
-        func_exit ();
-}
-
-
-static void gs_shutdown_port (struct gs_port *port)
-{
-        unsigned long flags;
-
-        func_enter();
-        
-        if (!port) return;
-        
-        if (!(port->port.flags & ASYNC_INITIALIZED))
-                return;
-
-        spin_lock_irqsave(&port->driver_lock, flags);
-
-        if (port->xmit_buf) {
-                free_page((unsigned long) port->xmit_buf);
-                port->xmit_buf = NULL;
-        }
-
-        if (port->port.tty)
-                set_bit(TTY_IO_ERROR, &port->port.tty->flags);
-
-        port->rd->shutdown_port (port);
-
-        port->port.flags &= ~ASYNC_INITIALIZED;
-        spin_unlock_irqrestore(&port->driver_lock, flags);
-
-        func_exit();
-}
-
-
-void gs_hangup(struct tty_struct *tty)
-{
-        struct gs_port *port;
-        unsigned long flags;
-
-        func_enter ();
-
-        port = tty->driver_data;
-        tty = port->port.tty;
-        if (!tty) 
-                return;
-
-        gs_shutdown_port (port);
-        spin_lock_irqsave(&port->port.lock, flags);
-        port->port.flags &= ~(ASYNC_NORMAL_ACTIVE|GS_ACTIVE);
-        port->port.tty = NULL;
-        port->port.count = 0;
-        spin_unlock_irqrestore(&port->port.lock, flags);
-
-        wake_up_interruptible(&port->port.open_wait);
-        func_exit ();
-}
-
-
-int gs_block_til_ready(void *port_, struct file * filp)
-{
-        struct gs_port *gp = port_;
-        struct tty_port *port = &gp->port;
-        DECLARE_WAITQUEUE(wait, current);
-        int    retval;
-        int    do_clocal = 0;
-        int    CD;
-        struct tty_struct *tty;
-        unsigned long flags;
-
-        func_enter ();
-
-        if (!port) return 0;
-
-        tty = port->tty;
-
-        gs_dprintk (GS_DEBUG_BTR, "Entering gs_block_till_ready.\n"); 
-        /*
-         * If the device is in the middle of being closed, then block
-         * until it's done, and then try again.
-         */
-        if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
-                interruptible_sleep_on(&port->close_wait);
-                if (port->flags & ASYNC_HUP_NOTIFY)
-                        return -EAGAIN;
-                else
-                        return -ERESTARTSYS;
-        }
-
-        gs_dprintk (GS_DEBUG_BTR, "after hung up\n"); 
-
-        /*
-         * If non-blocking mode is set, or the port is not enabled,
-         * then make the check up front and then exit.
-         */
-        if ((filp->f_flags & O_NONBLOCK) ||
-            (tty->flags & (1 << TTY_IO_ERROR))) {
-                port->flags |= ASYNC_NORMAL_ACTIVE;
-                return 0;
-        }
-
-        gs_dprintk (GS_DEBUG_BTR, "after nonblock\n"); 
- 
-        if (C_CLOCAL(tty))
-                do_clocal = 1;
-
-        /*
-         * Block waiting for the carrier detect and the line to become
-         * free (i.e., not in use by the callout).  While we are in
-         * this loop, port->count is dropped by one, so that
-         * rs_close() knows when to free things.  We restore it upon
-         * exit, either normal or abnormal.
-         */
-        retval = 0;
-
-        add_wait_queue(&port->open_wait, &wait);
-
-        gs_dprintk (GS_DEBUG_BTR, "after add waitq.\n"); 
-        spin_lock_irqsave(&port->lock, flags);
-        if (!tty_hung_up_p(filp)) {
-                port->count--;
-        }
-        port->blocked_open++;
-        spin_unlock_irqrestore(&port->lock, flags);
-        while (1) {
-                CD = tty_port_carrier_raised(port);
-                gs_dprintk (GS_DEBUG_BTR, "CD is now %d.\n", CD);
-                set_current_state (TASK_INTERRUPTIBLE);
-                if (tty_hung_up_p(filp) ||
-                    !(port->flags & ASYNC_INITIALIZED)) {
-                        if (port->flags & ASYNC_HUP_NOTIFY)
-                                retval = -EAGAIN;
-                        else
-                                retval = -ERESTARTSYS;
-                        break;
-                }
-                if (!(port->flags & ASYNC_CLOSING) &&
-                    (do_clocal || CD))
-                        break;
-                gs_dprintk (GS_DEBUG_BTR, "signal_pending is now: %d (%lx)\n", 
-                (int)signal_pending (current), *(long*)(&current->blocked)); 
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-                schedule();
-        }
-        gs_dprintk (GS_DEBUG_BTR, "Got out of the loop. (%d)\n",
-                    port->blocked_open);
-        set_current_state (TASK_RUNNING);
-        remove_wait_queue(&port->open_wait, &wait);
-        
-        spin_lock_irqsave(&port->lock, flags);
-        if (!tty_hung_up_p(filp)) {
-                port->count++;
-        }
-        port->blocked_open--;
-        if (retval == 0)
-                port->flags |= ASYNC_NORMAL_ACTIVE;
-        spin_unlock_irqrestore(&port->lock, flags);
-        func_exit ();
-        return retval;
-}                        
-
-
-void gs_close(struct tty_struct * tty, struct file * filp)
-{
-        unsigned long flags;
-        struct gs_port *port;
-        
-        func_enter ();
-
-        port = tty->driver_data;
-
-        if (!port) return;
-
-        if (!port->port.tty) {
-                /* This seems to happen when this is called from vhangup. */
-                gs_dprintk (GS_DEBUG_CLOSE, "gs: Odd: port->port.tty is NULL\n");
-                port->port.tty = tty;
-        }
-
-        spin_lock_irqsave(&port->port.lock, flags);
-
-        if (tty_hung_up_p(filp)) {
-                spin_unlock_irqrestore(&port->port.lock, flags);
-                if (port->rd->hungup)
-                        port->rd->hungup (port);
-                func_exit ();
-                return;
-        }
-
-        if ((tty->count == 1) && (port->port.count != 1)) {
-                printk(KERN_ERR "gs: gs_close port %p: bad port count;"
-                       " tty->count is 1, port count is %d\n", port, port->port.count);
-                port->port.count = 1;
-        }
-        if (--port->port.count < 0) {
-                printk(KERN_ERR "gs: gs_close port %p: bad port count: %d\n", port, port->port.count);
-                port->port.count = 0;
-        }
-
-        if (port->port.count) {
-                gs_dprintk(GS_DEBUG_CLOSE, "gs_close port %p: count: %d\n", port, port->port.count);
-                spin_unlock_irqrestore(&port->port.lock, flags);
-                func_exit ();
-                return;
-        }
-        port->port.flags |= ASYNC_CLOSING;
-
-        /*
-         * Now we wait for the transmit buffer to clear; and we notify 
-         * the line discipline to only process XON/XOFF characters.
-         */
-        tty->closing = 1;
-        /* if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-           tty_wait_until_sent(tty, port->closing_wait); */
-
-        /*
-         * At this point we stop accepting input.  To do this, we
-         * disable the receive line status interrupts, and tell the
-         * interrupt driver to stop checking the data ready bit in the
-         * line status register.
-         */
-
-        spin_lock_irqsave(&port->driver_lock, flags);
-        port->rd->disable_rx_interrupts (port);
-        spin_unlock_irqrestore(&port->driver_lock, flags);
-        spin_unlock_irqrestore(&port->port.lock, flags);
-
-        /* close has no way of returning "EINTR", so discard return value */
-        if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                gs_wait_tx_flushed (port, port->closing_wait);
-
-        port->port.flags &= ~GS_ACTIVE;
-
-        gs_flush_buffer(tty);
-
-        tty_ldisc_flush(tty);
-        tty->closing = 0;
-
-        spin_lock_irqsave(&port->driver_lock, flags);
-        port->event = 0;
-        port->rd->close (port);
-        port->rd->shutdown_port (port);
-        spin_unlock_irqrestore(&port->driver_lock, flags);
-
-        spin_lock_irqsave(&port->port.lock, flags);
-        port->port.tty = NULL;
-
-        if (port->port.blocked_open) {
-                if (port->close_delay) {
-                        spin_unlock_irqrestore(&port->port.lock, flags);
-                        msleep_interruptible(jiffies_to_msecs(port->close_delay));
-                        spin_lock_irqsave(&port->port.lock, flags);
-                }
-                wake_up_interruptible(&port->port.open_wait);
-        }
-        port->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING | ASYNC_INITIALIZED);
-        spin_unlock_irqrestore(&port->port.lock, flags);
-        wake_up_interruptible(&port->port.close_wait);
-
-        func_exit ();
-}
-
-
-void gs_set_termios (struct tty_struct * tty, 
-                     struct ktermios * old_termios)
-{
-        struct gs_port *port;
-        int baudrate, tmp, rv;
-        struct ktermios *tiosp;
-
-        func_enter();
-
-        port = tty->driver_data;
-
-        if (!port) return;
-        if (!port->port.tty) {
-                /* This seems to happen when this is called after gs_close. */
-                gs_dprintk (GS_DEBUG_TERMIOS, "gs: Odd: port->port.tty is NULL\n");
-                port->port.tty = tty;
-        }
-
-
-        tiosp = tty->termios;
-
-        if (gs_debug & GS_DEBUG_TERMIOS) {
-                gs_dprintk (GS_DEBUG_TERMIOS, "termios structure (%p):\n", tiosp);
-        }
-
-        if(old_termios && (gs_debug & GS_DEBUG_TERMIOS)) {
-                if(tiosp->c_iflag != old_termios->c_iflag)  printk("c_iflag changed\n");
-                if(tiosp->c_oflag != old_termios->c_oflag)  printk("c_oflag changed\n");
-                if(tiosp->c_cflag != old_termios->c_cflag)  printk("c_cflag changed\n");
-                if(tiosp->c_lflag != old_termios->c_lflag)  printk("c_lflag changed\n");
-                if(tiosp->c_line  != old_termios->c_line)   printk("c_line changed\n");
-                if(!memcmp(tiosp->c_cc, old_termios->c_cc, NCC)) printk("c_cc changed\n");
-        }
-
-        baudrate = tty_get_baud_rate(tty);
-
-        if ((tiosp->c_cflag & CBAUD) == B38400) {
-                if (     (port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        baudrate = 57600;
-                else if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        baudrate = 115200;
-                else if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                        baudrate = 230400;
-                else if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                        baudrate = 460800;
-                else if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
-                        baudrate = (port->baud_base / port->custom_divisor);
-        }
-
-        /* I recommend using THIS instead of the mess in termios (and
-           duplicating the above code). Next we should create a clean
-           interface towards this variable. If your card supports arbitrary
-           baud rates, (e.g. CD1400 or 16550 based cards) then everything
-           will be very easy..... */
-        port->baud = baudrate;
-
-        /* Two timer ticks seems enough to wakeup something like SLIP driver */
-        /* Baudrate/10 is cps. Divide by HZ to get chars per tick. */
-        tmp = (baudrate / 10 / HZ) * 2;                  
-
-        if (tmp <                 0) tmp = 0;
-        if (tmp >= SERIAL_XMIT_SIZE) tmp = SERIAL_XMIT_SIZE-1;
-
-        port->wakeup_chars = tmp;
-
-        /* We should really wait for the characters to be all sent before
-           changing the settings. -- CAL */
-        rv = gs_wait_tx_flushed (port, MAX_SCHEDULE_TIMEOUT);
-        if (rv < 0) return /* rv */;
-
-        rv = port->rd->set_real_termios(port);
-        if (rv < 0) return /* rv */;
-
-        if ((!old_termios || 
-             (old_termios->c_cflag & CRTSCTS)) &&
-            !(      tiosp->c_cflag & CRTSCTS)) {
-                tty->stopped = 0;
-                gs_start(tty);
-        }
-
-#ifdef tytso_patch_94Nov25_1726
-        /* This "makes sense", Why is it commented out? */
-
-        if (!(old_termios->c_cflag & CLOCAL) &&
-            (tty->termios->c_cflag & CLOCAL))
-                wake_up_interruptible(&port->gs.open_wait);
-#endif
-
-        func_exit();
-        return /* 0 */;
-}
-
-
-
-/* Must be called with interrupts enabled */
-int gs_init_port(struct gs_port *port)
-{
-        unsigned long flags;
-
-        func_enter ();
-
-        if (port->port.flags & ASYNC_INITIALIZED) {
-                func_exit ();
-                return 0;
-        }
-        if (!port->xmit_buf) {
-                /* We may sleep in get_zeroed_page() */
-                unsigned long tmp;
-
-                tmp = get_zeroed_page(GFP_KERNEL);
-                spin_lock_irqsave (&port->driver_lock, flags);
-                if (port->xmit_buf) 
-                        free_page (tmp);
-                else
-                        port->xmit_buf = (unsigned char *) tmp;
-                spin_unlock_irqrestore(&port->driver_lock, flags);
-                if (!port->xmit_buf) {
-                        func_exit ();
-                        return -ENOMEM;
-                }
-        }
-
-        spin_lock_irqsave (&port->driver_lock, flags);
-        if (port->port.tty)
-                clear_bit(TTY_IO_ERROR, &port->port.tty->flags);
-        mutex_init(&port->port_write_mutex);
-        port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
-        spin_unlock_irqrestore(&port->driver_lock, flags);
-        gs_set_termios(port->port.tty, NULL);
-        spin_lock_irqsave (&port->driver_lock, flags);
-        port->port.flags |= ASYNC_INITIALIZED;
-        port->port.flags &= ~GS_TX_INTEN;
-
-        spin_unlock_irqrestore(&port->driver_lock, flags);
-        func_exit ();
-        return 0;
-}
-
-
-int gs_setserial(struct gs_port *port, struct serial_struct __user *sp)
-{
-        struct serial_struct sio;
-
-        if (copy_from_user(&sio, sp, sizeof(struct serial_struct)))
-                return(-EFAULT);
-
-        if (!capable(CAP_SYS_ADMIN)) {
-                if ((sio.baud_base != port->baud_base) ||
-                    (sio.close_delay != port->close_delay) ||
-                    ((sio.flags & ~ASYNC_USR_MASK) !=
-                     (port->port.flags & ~ASYNC_USR_MASK)))
-                        return(-EPERM);
-        } 
-
-        port->port.flags = (port->port.flags & ~ASYNC_USR_MASK) |
-                (sio.flags & ASYNC_USR_MASK);
-  
-        port->baud_base = sio.baud_base;
-        port->close_delay = sio.close_delay;
-        port->closing_wait = sio.closing_wait;
-        port->custom_divisor = sio.custom_divisor;
-
-        gs_set_termios (port->port.tty, NULL);
-
-        return 0;
-}
-
-
-/*****************************************************************************/
-
-/*
- *      Generate the serial struct info.
- */
-
-int gs_getserial(struct gs_port *port, struct serial_struct __user *sp)
-{
-        struct serial_struct    sio;
-
-        memset(&sio, 0, sizeof(struct serial_struct));
-        sio.flags = port->port.flags;
-        sio.baud_base = port->baud_base;
-        sio.close_delay = port->close_delay;
-        sio.closing_wait = port->closing_wait;
-        sio.custom_divisor = port->custom_divisor;
-        sio.hub6 = 0;
-
-        /* If you want you can override these. */
-        sio.type = PORT_UNKNOWN;
-        sio.xmit_fifo_size = -1;
-        sio.line = -1;
-        sio.port = -1;
-        sio.irq = -1;
-
-        if (port->rd->getserial)
-                port->rd->getserial (port, &sio);
-
-        if (copy_to_user(sp, &sio, sizeof(struct serial_struct)))
-                return -EFAULT;
-        return 0;
-
-}
-
-
-void gs_got_break(struct gs_port *port)
-{
-        func_enter ();
-
-        tty_insert_flip_char(port->port.tty, 0, TTY_BREAK);
-        tty_schedule_flip(port->port.tty);
-        if (port->port.flags & ASYNC_SAK) {
-                do_SAK (port->port.tty);
-        }
-
-        func_exit ();
-}
-
-
-EXPORT_SYMBOL(gs_put_char);
-EXPORT_SYMBOL(gs_write);
-EXPORT_SYMBOL(gs_write_room);
-EXPORT_SYMBOL(gs_chars_in_buffer);
-EXPORT_SYMBOL(gs_flush_buffer);
-EXPORT_SYMBOL(gs_flush_chars);
-EXPORT_SYMBOL(gs_stop);
-EXPORT_SYMBOL(gs_start);
-EXPORT_SYMBOL(gs_hangup);
-EXPORT_SYMBOL(gs_block_til_ready);
-EXPORT_SYMBOL(gs_close);
-EXPORT_SYMBOL(gs_set_termios);
-EXPORT_SYMBOL(gs_init_port);
-EXPORT_SYMBOL(gs_setserial);
-EXPORT_SYMBOL(gs_getserial);
-EXPORT_SYMBOL(gs_got_break);
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
index b6c2cc167c11..f773a9dd14f3 100644
--- a/drivers/char/genrtc.c
+++ b/drivers/char/genrtc.c
@@ -52,7 +52,7 @@
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/workqueue.h>
 
 #include <asm/uaccess.h>
@@ -66,6 +66,7 @@
  *      ioctls.
  */
 
+static DEFINE_MUTEX(gen_rtc_mutex);
 static DECLARE_WAIT_QUEUE_HEAD(gen_rtc_wait);
 
 /*
@@ -337,9 +338,9 @@ static long gen_rtc_unlocked_ioctl(struct file *file, unsigned int cmd,
 {
         int ret;
 
-        lock_kernel();
+        mutex_lock(&gen_rtc_mutex);
         ret = gen_rtc_ioctl(file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&gen_rtc_mutex);
 
         return ret;
 }
@@ -352,16 +353,16 @@ static long gen_rtc_unlocked_ioctl(struct file *file, unsigned int cmd,
 
 static int gen_rtc_open(struct inode *inode, struct file *file)
 {
-        lock_kernel();
+        mutex_lock(&gen_rtc_mutex);
         if (gen_rtc_status & RTC_IS_OPEN) {
-                unlock_kernel();
+                mutex_unlock(&gen_rtc_mutex);
                 return -EBUSY;
         }
 
         gen_rtc_status |= RTC_IS_OPEN;
         gen_rtc_irq_data = 0;
         irq_active = 0;
-        unlock_kernel();
+        mutex_unlock(&gen_rtc_mutex);
 
         return 0;
 }
@@ -497,6 +498,7 @@ static const struct file_operations gen_rtc_fops = {
         .unlocked_ioctl = gen_rtc_unlocked_ioctl,
         .open           = gen_rtc_open,
         .release        = gen_rtc_release,
+        .llseek         = noop_llseek,
 };
 
 static struct miscdevice rtc_gen_dev =
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index a0a1829d3198..34d6a1cab8de 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -14,7 +14,6 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/miscdevice.h>
 #include <linux/major.h>
@@ -30,13 +29,14 @@
 #include <linux/bcd.h>
 #include <linux/seq_file.h>
 #include <linux/bitops.h>
+#include <linux/compat.h>
 #include <linux/clocksource.h>
+#include <linux/uaccess.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 
 #include <asm/current.h>
-#include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/div64.h>
 
@@ -67,6 +67,7 @@
 #define read_counter(MC)        readl(MC)
 #endif
 
+static DEFINE_MUTEX(hpet_mutex); /* replaces BKL */
 static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ;
 
 /* This clocksource driver currently only works on ia64 */
@@ -79,13 +80,11 @@ static cycle_t read_hpet(struct clocksource *cs)
 }
 
 static struct clocksource clocksource_hpet = {
-        .name           = "hpet",
-        .rating         = 250,
-        .read           = read_hpet,
-        .mask           = CLOCKSOURCE_MASK(64),
-        .mult           = 0, /* to be calculated */
-        .shift          = 10,
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
+        .name           = "hpet",
+        .rating         = 250,
+        .read           = read_hpet,
+        .mask           = CLOCKSOURCE_MASK(64),
+        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 static struct clocksource *hpet_clocksource;
 #endif
@@ -164,11 +163,32 @@ static irqreturn_t hpet_interrupt(int irq, void *data)
          * This has the effect of treating non-periodic like periodic.
          */
         if ((devp->hd_flags & (HPET_IE | HPET_PERIODIC)) == HPET_IE) {
-                unsigned long m, t;
+                unsigned long m, t, mc, base, k;
+                struct hpet __iomem *hpet = devp->hd_hpet;
+                struct hpets *hpetp = devp->hd_hpets;
 
                 t = devp->hd_ireqfreq;
                 m = read_counter(&devp->hd_timer->hpet_compare);
-                write_counter(t + m, &devp->hd_timer->hpet_compare);
+                mc = read_counter(&hpet->hpet_mc);
+                /* The time for the next interrupt would logically be t + m,
+                 * however, if we are very unlucky and the interrupt is delayed
+                 * for longer than t then we will completely miss the next
+                 * interrupt if we set t + m and an application will hang.
+                 * Therefore we need to make a more complex computation assuming
+                 * that there exists a k for which the following is true:
+                 * k * t + base < mc + delta
+                 * (k + 1) * t + base > mc + delta
+                 * where t is the interval in hpet ticks for the given freq,
+                 * base is the theoretical start value 0 < base < t,
+                 * mc is the main counter value at the time of the interrupt,
+                 * delta is the time it takes to write the a value to the
+                 * comparator.
+                 * k may then be computed as (mc - base + delta) / t .
+                 */
+                base = mc % t;
+                k = (mc - base + hpetp->hp_delta) / t;
+                write_counter(t * (k + 1) + base,
+                              &devp->hd_timer->hpet_compare);
         }
 
         if (devp->hd_flags & HPET_SHARED_IRQ)
@@ -250,7 +270,7 @@ static int hpet_open(struct inode *inode, struct file *file)
         if (file->f_mode & FMODE_WRITE)
                 return -EINVAL;
 
-        lock_kernel();
+        mutex_lock(&hpet_mutex);
         spin_lock_irq(&hpet_lock);
 
         for (devp = NULL, hpetp = hpets; hpetp && !devp; hpetp = hpetp->hp_next)
@@ -264,7 +284,7 @@ static int hpet_open(struct inode *inode, struct file *file)
 
         if (!devp) {
                 spin_unlock_irq(&hpet_lock);
-                unlock_kernel();
+                mutex_unlock(&hpet_mutex);
                 return -EBUSY;
         }
 
@@ -272,7 +292,7 @@ static int hpet_open(struct inode *inode, struct file *file)
         devp->hd_irqdata = 0;
         devp->hd_flags |= HPET_OPEN;
         spin_unlock_irq(&hpet_lock);
-        unlock_kernel();
+        mutex_unlock(&hpet_mutex);
 
         hpet_timer_set_irq(devp);
 
@@ -429,22 +449,6 @@ static int hpet_release(struct inode *inode, struct file *file)
         return 0;
 }
 
-static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
-
-static long hpet_ioctl(struct file *file, unsigned int cmd,
-                        unsigned long arg)
-{
-        struct hpet_dev *devp;
-        int ret;
-
-        devp = file->private_data;
-        lock_kernel();
-        ret = hpet_ioctl_common(devp, cmd, arg, 0);
-        unlock_kernel();
-
-        return ret;
-}
-
 static int hpet_ioctl_ieon(struct hpet_dev *devp)
 {
         struct hpet_timer __iomem *timer;
@@ -479,6 +483,21 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
         if (irq) {
                 unsigned long irq_flags;
 
+                if (devp->hd_flags & HPET_SHARED_IRQ) {
+                        /*
+                         * To prevent the interrupt handler from seeing an
+                         * unwanted interrupt status bit, program the timer
+                         * so that it will not fire in the near future ...
+                         */
+                        writel(readl(&timer->hpet_config) & ~Tn_TYPE_CNF_MASK,
+                               &timer->hpet_config);
+                        write_counter(read_counter(&hpet->hpet_mc),
+                                      &timer->hpet_compare);
+                        /* ... and clear any left-over status. */
+                        isr = 1 << (devp - devp->hd_hpets->hp_dev);
+                        writel(isr, &hpet->hpet_isr);
+                }
+
                 sprintf(devp->hd_name, "hpet%d", (int)(devp - hpetp->hp_dev));
                 irq_flags = devp->hd_flags & HPET_SHARED_IRQ
                                                 ? IRQF_SHARED : IRQF_DISABLED;
@@ -553,7 +572,8 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
 }
 
 static int
-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
+hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
+                  struct hpet_info *info)
 {
         struct hpet_timer __iomem *timer;
         struct hpet __iomem *hpet;
@@ -594,23 +614,14 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
                 break;
         case HPET_INFO:
                 {
-                        struct hpet_info info;
-
+                        memset(info, 0, sizeof(*info));
                         if (devp->hd_ireqfreq)
-                                info.hi_ireqfreq =
+                                info->hi_ireqfreq =
                                         hpet_time_div(hpetp, devp->hd_ireqfreq);
-                        else
-                                info.hi_ireqfreq = 0;
-                        info.hi_flags =
+                        info->hi_flags =
                             readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
-                        info.hi_hpet = hpetp->hp_which;
-                        info.hi_timer = devp - hpetp->hp_dev;
-                        if (kernel)
-                                memcpy((void *)arg, &info, sizeof(info));
-                        else
-                                if (copy_to_user((void __user *)arg, &info,
-                                                 sizeof(info)))
-                                        err = -EFAULT;
+                        info->hi_hpet = hpetp->hp_which;
+                        info->hi_timer = devp - hpetp->hp_dev;
                         break;
                 }
         case HPET_EPI:
@@ -636,7 +647,7 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
                 devp->hd_flags &= ~HPET_PERIODIC;
                 break;
         case HPET_IRQFREQ:
-                if (!kernel && (arg > hpet_max_freq) &&
+                if ((arg > hpet_max_freq) &&
                     !capable(CAP_SYS_RESOURCE)) {
                         err = -EACCES;
                         break;
@@ -653,12 +664,63 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
         return err;
 }
 
+static long
+hpet_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        struct hpet_info info;
+        int err;
+
+        mutex_lock(&hpet_mutex);
+        err = hpet_ioctl_common(file->private_data, cmd, arg, &info);
+        mutex_unlock(&hpet_mutex);
+
+        if ((cmd == HPET_INFO) && !err &&
+            (copy_to_user((void __user *)arg, &info, sizeof(info))))
+                err = -EFAULT;
+
+        return err;
+}
+
+#ifdef CONFIG_COMPAT
+struct compat_hpet_info {
+        compat_ulong_t hi_ireqfreq;     /* Hz */
+        compat_ulong_t hi_flags;        /* information */
+        unsigned short hi_hpet;
+        unsigned short hi_timer;
+};
+
+static long
+hpet_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        struct hpet_info info;
+        int err;
+
+        mutex_lock(&hpet_mutex);
+        err = hpet_ioctl_common(file->private_data, cmd, arg, &info);
+        mutex_unlock(&hpet_mutex);
+
+        if ((cmd == HPET_INFO) && !err) {
+                struct compat_hpet_info __user *u = compat_ptr(arg);
+                if (put_user(info.hi_ireqfreq, &u->hi_ireqfreq) ||
+                    put_user(info.hi_flags, &u->hi_flags) ||
+                    put_user(info.hi_hpet, &u->hi_hpet) ||
+                    put_user(info.hi_timer, &u->hi_timer))
+                        err = -EFAULT;
+        }
+
+        return err;
+}
+#endif
+
 static const struct file_operations hpet_fops = {
         .owner = THIS_MODULE,
         .llseek = no_llseek,
         .read = hpet_read,
         .poll = hpet_poll,
         .unlocked_ioctl = hpet_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl = hpet_compat_ioctl,
+#endif
         .open = hpet_open,
         .release = hpet_release,
         .fasync = hpet_fasync,
@@ -781,7 +843,7 @@ int hpet_alloc(struct hpet_data *hdp)
         struct hpets *hpetp;
         size_t siz;
         struct hpet __iomem *hpet;
-        static struct hpets *last = NULL;
+        static struct hpets *last;
         unsigned long period;
         unsigned long long temp;
         u32 remainder;
@@ -891,9 +953,7 @@ int hpet_alloc(struct hpet_data *hdp)
         if (!hpet_clocksource) {
                 hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc;
                 CLKSRC_FSYS_MMIO_SET(clocksource_hpet.fsys_mmio, hpet_mctr);
-                clocksource_hpet.mult = clocksource_hz2mult(hpetp->hp_tick_freq,
-                                                clocksource_hpet.shift);
-                clocksource_register(&clocksource_hpet);
+                clocksource_register_hz(&clocksource_hpet, hpetp->hp_tick_freq);
                 hpetp->hp_clocksource = &clocksource_hpet;
                 hpet_clocksource = &clocksource_hpet;
         }
@@ -970,6 +1030,8 @@ static int hpet_acpi_add(struct acpi_device *device)
                 return -ENODEV;
 
         if (!data.hd_address || !data.hd_nirqs) {
+                if (data.hd_address)
+                        iounmap(data.hd_address);
                 printk("%s: no address or irqs in _CRS\n", __func__);
                 return -ENODEV;
         }
diff --git a/drivers/char/hvc_beat.c b/drivers/char/hvc_beat.c
deleted file mode 100644
index 5fe4631e2a61..000000000000
--- a/drivers/char/hvc_beat.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Beat hypervisor console driver
- *
- * (C) Copyright 2006 TOSHIBA CORPORATION
- *
- * This code is based on drivers/char/hvc_rtas.c:
- * (C) Copyright IBM Corporation 2001-2005
- * (C) Copyright Red Hat, Inc. 2005
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/string.h>
-#include <linux/console.h>
-#include <asm/prom.h>
-#include <asm/hvconsole.h>
-#include <asm/firmware.h>
-
-#include "hvc_console.h"
-
-extern int64_t beat_get_term_char(uint64_t, uint64_t *, uint64_t *, uint64_t *);
-extern int64_t beat_put_term_char(uint64_t, uint64_t, uint64_t, uint64_t);
-
-struct hvc_struct *hvc_beat_dev = NULL;
-
-/* bug: only one queue is available regardless of vtermno */
-static int hvc_beat_get_chars(uint32_t vtermno, char *buf, int cnt)
-{
-        static unsigned char q[sizeof(unsigned long) * 2]
-                __attribute__((aligned(sizeof(unsigned long))));
-        static int qlen = 0;
-        u64 got;
-
-again:
-        if (qlen) {
-                if (qlen > cnt) {
-                        memcpy(buf, q, cnt);
-                        qlen -= cnt;
-                        memmove(q + cnt, q, qlen);
-                        return cnt;
-                } else {        /* qlen <= cnt */
-                        int     r;
-
-                        memcpy(buf, q, qlen);
-                        r = qlen;
-                        qlen = 0;
-                        return r;
-                }
-        }
-        if (beat_get_term_char(vtermno, &got,
-                ((u64 *)q), ((u64 *)q) + 1) == 0) {
-                qlen = got;
-                goto again;
-        }
-        return 0;
-}
-
-static int hvc_beat_put_chars(uint32_t vtermno, const char *buf, int cnt)
-{
-        unsigned long kb[2];
-        int rest, nlen;
-
-        for (rest = cnt; rest > 0; rest -= nlen) {
-                nlen = (rest > 16) ? 16 : rest;
-                memcpy(kb, buf, nlen);
-                beat_put_term_char(vtermno, nlen, kb[0], kb[1]);
-                buf += nlen;
-        }
-        return cnt;
-}
-
-static const struct hv_ops hvc_beat_get_put_ops = {
-        .get_chars = hvc_beat_get_chars,
-        .put_chars = hvc_beat_put_chars,
-};
-
-static int hvc_beat_useit = 1;
-
-static int hvc_beat_config(char *p)
-{
-        hvc_beat_useit = simple_strtoul(p, NULL, 0);
-        return 0;
-}
-
-static int __init hvc_beat_console_init(void)
-{
-        if (hvc_beat_useit && of_machine_is_compatible("Beat")) {
-                hvc_instantiate(0, 0, &hvc_beat_get_put_ops);
-        }
-        return 0;
-}
-
-/* temp */
-static int __init hvc_beat_init(void)
-{
-        struct hvc_struct *hp;
-
-        if (!firmware_has_feature(FW_FEATURE_BEAT))
-                return -ENODEV;
-
-        hp = hvc_alloc(0, NO_IRQ, &hvc_beat_get_put_ops, 16);
-        if (IS_ERR(hp))
-                return PTR_ERR(hp);
-        hvc_beat_dev = hp;
-        return 0;
-}
-
-static void __exit hvc_beat_exit(void)
-{
-        if (hvc_beat_dev)
-                hvc_remove(hvc_beat_dev);
-}
-
-module_init(hvc_beat_init);
-module_exit(hvc_beat_exit);
-
-__setup("hvc_beat=", hvc_beat_config);
-
-console_initcall(hvc_beat_console_init);
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
deleted file mode 100644
index 3afd62e856eb..000000000000
--- a/drivers/char/hvc_console.c
+++ /dev/null
@@ -1,915 +0,0 @@
-/*
- * Copyright (C) 2001 Anton Blanchard <anton@au.ibm.com>, IBM
- * Copyright (C) 2001 Paul Mackerras <paulus@au.ibm.com>, IBM
- * Copyright (C) 2004 Benjamin Herrenschmidt <benh@kernel.crashing.org>, IBM Corp.
- * Copyright (C) 2004 IBM Corporation
- *
- * Additional Author(s):
- *  Ryan S. Arnold <rsa@us.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-#include <linux/console.h>
-#include <linux/cpumask.h>
-#include <linux/init.h>
-#include <linux/kbd_kern.h>
-#include <linux/kernel.h>
-#include <linux/kthread.h>
-#include <linux/list.h>
-#include <linux/module.h>
-#include <linux/major.h>
-#include <linux/sysrq.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/delay.h>
-#include <linux/freezer.h>
-#include <linux/slab.h>
-
-#include <asm/uaccess.h>
-
-#include "hvc_console.h"
-
-#define HVC_MAJOR       229
-#define HVC_MINOR       0
-
-/*
- * Wait this long per iteration while trying to push buffered data to the
- * hypervisor before allowing the tty to complete a close operation.
- */
-#define HVC_CLOSE_WAIT (HZ/100) /* 1/10 of a second */
-
-/*
- * These sizes are most efficient for vio, because they are the
- * native transfer size. We could make them selectable in the
- * future to better deal with backends that want other buffer sizes.
- */
-#define N_OUTBUF        16
-#define N_INBUF         16
-
-#define __ALIGNED__ __attribute__((__aligned__(sizeof(long))))
-
-static struct tty_driver *hvc_driver;
-static struct task_struct *hvc_task;
-
-/* Picks up late kicks after list walk but before schedule() */
-static int hvc_kicked;
-
-static int hvc_init(void);
-
-#ifdef CONFIG_MAGIC_SYSRQ
-static int sysrq_pressed;
-#endif
-
-/* dynamic list of hvc_struct instances */
-static LIST_HEAD(hvc_structs);
-
-/*
- * Protect the list of hvc_struct instances from inserts and removals during
- * list traversal.
- */
-static DEFINE_SPINLOCK(hvc_structs_lock);
-
-/*
- * This value is used to assign a tty->index value to a hvc_struct based
- * upon order of exposure via hvc_probe(), when we can not match it to
- * a console candidate registered with hvc_instantiate().
- */
-static int last_hvc = -1;
-
-/*
- * Do not call this function with either the hvc_structs_lock or the hvc_struct
- * lock held.  If successful, this function increments the kref reference
- * count against the target hvc_struct so it should be released when finished.
- */
-static struct hvc_struct *hvc_get_by_index(int index)
-{
-        struct hvc_struct *hp;
-        unsigned long flags;
-
-        spin_lock(&hvc_structs_lock);
-
-        list_for_each_entry(hp, &hvc_structs, next) {
-                spin_lock_irqsave(&hp->lock, flags);
-                if (hp->index == index) {
-                        kref_get(&hp->kref);
-                        spin_unlock_irqrestore(&hp->lock, flags);
-                        spin_unlock(&hvc_structs_lock);
-                        return hp;
-                }
-                spin_unlock_irqrestore(&hp->lock, flags);
-        }
-        hp = NULL;
-
-        spin_unlock(&hvc_structs_lock);
-        return hp;
-}
-
-
-/*
- * Initial console vtermnos for console API usage prior to full console
- * initialization.  Any vty adapter outside this range will not have usable
- * console interfaces but can still be used as a tty device.  This has to be
- * static because kmalloc will not work during early console init.
- */
-static const struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
-static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] =
-        {[0 ... MAX_NR_HVC_CONSOLES - 1] = -1};
-
-/*
- * Console APIs, NOT TTY.  These APIs are available immediately when
- * hvc_console_setup() finds adapters.
- */
-
-static void hvc_console_print(struct console *co, const char *b,
-                              unsigned count)
-{
-        char c[N_OUTBUF] __ALIGNED__;
-        unsigned i = 0, n = 0;
-        int r, donecr = 0, index = co->index;
-
-        /* Console access attempt outside of acceptable console range. */
-        if (index >= MAX_NR_HVC_CONSOLES)
-                return;
-
-        /* This console adapter was removed so it is not usable. */
-        if (vtermnos[index] == -1)
-                return;
-
-        while (count > 0 || i > 0) {
-                if (count > 0 && i < sizeof(c)) {
-                        if (b[n] == '\n' && !donecr) {
-                                c[i++] = '\r';
-                                donecr = 1;
-                        } else {
-                                c[i++] = b[n++];
-                                donecr = 0;
-                                --count;
-                        }
-                } else {
-                        r = cons_ops[index]->put_chars(vtermnos[index], c, i);
-                        if (r <= 0) {
-                                /* throw away chars on error */
-                                i = 0;
-                        } else if (r > 0) {
-                                i -= r;
-                                if (i > 0)
-                                        memmove(c, c+r, i);
-                        }
-                }
-        }
-}
-
-static struct tty_driver *hvc_console_device(struct console *c, int *index)
-{
-        if (vtermnos[c->index] == -1)
-                return NULL;
-
-        *index = c->index;
-        return hvc_driver;
-}
-
-static int __init hvc_console_setup(struct console *co, char *options)
-{
-        if (co->index < 0 || co->index >= MAX_NR_HVC_CONSOLES)
-                return -ENODEV;
-
-        if (vtermnos[co->index] == -1)
-                return -ENODEV;
-
-        return 0;
-}
-
-static struct console hvc_console = {
-        .name           = "hvc",
-        .write          = hvc_console_print,
-        .device         = hvc_console_device,
-        .setup          = hvc_console_setup,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-};
-
-/*
- * Early console initialization.  Precedes driver initialization.
- *
- * (1) we are first, and the user specified another driver
- * -- index will remain -1
- * (2) we are first and the user specified no driver
- * -- index will be set to 0, then we will fail setup.
- * (3)  we are first and the user specified our driver
- * -- index will be set to user specified driver, and we will fail
- * (4) we are after driver, and this initcall will register us
- * -- if the user didn't specify a driver then the console will match
- *
- * Note that for cases 2 and 3, we will match later when the io driver
- * calls hvc_instantiate() and call register again.
- */
-static int __init hvc_console_init(void)
-{
-        register_console(&hvc_console);
-        return 0;
-}
-console_initcall(hvc_console_init);
-
-/* callback when the kboject ref count reaches zero. */
-static void destroy_hvc_struct(struct kref *kref)
-{
-        struct hvc_struct *hp = container_of(kref, struct hvc_struct, kref);
-        unsigned long flags;
-
-        spin_lock(&hvc_structs_lock);
-
-        spin_lock_irqsave(&hp->lock, flags);
-        list_del(&(hp->next));
-        spin_unlock_irqrestore(&hp->lock, flags);
-
-        spin_unlock(&hvc_structs_lock);
-
-        kfree(hp);
-}
-
-/*
- * hvc_instantiate() is an early console discovery method which locates
- * consoles * prior to the vio subsystem discovering them.  Hotplugged
- * vty adapters do NOT get an hvc_instantiate() callback since they
- * appear after early console init.
- */
-int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
-{
-        struct hvc_struct *hp;
-
-        if (index < 0 || index >= MAX_NR_HVC_CONSOLES)
-                return -1;
-
-        if (vtermnos[index] != -1)
-                return -1;
-
-        /* make sure no no tty has been registered in this index */
-        hp = hvc_get_by_index(index);
-        if (hp) {
-                kref_put(&hp->kref, destroy_hvc_struct);
-                return -1;
-        }
-
-        vtermnos[index] = vtermno;
-        cons_ops[index] = ops;
-
-        /* reserve all indices up to and including this index */
-        if (last_hvc < index)
-                last_hvc = index;
-
-        /* if this index is what the user requested, then register
-         * now (setup won't fail at this point).  It's ok to just
-         * call register again if previously .setup failed.
-         */
-        if (index == hvc_console.index)
-                register_console(&hvc_console);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(hvc_instantiate);
-
-/* Wake the sleeping khvcd */
-void hvc_kick(void)
-{
-        hvc_kicked = 1;
-        wake_up_process(hvc_task);
-}
-EXPORT_SYMBOL_GPL(hvc_kick);
-
-static void hvc_unthrottle(struct tty_struct *tty)
-{
-        hvc_kick();
-}
-
-/*
- * The TTY interface won't be used until after the vio layer has exposed the vty
- * adapter to the kernel.
- */
-static int hvc_open(struct tty_struct *tty, struct file * filp)
-{
-        struct hvc_struct *hp;
-        unsigned long flags;
-        int rc = 0;
-
-        /* Auto increments kref reference if found. */
-        if (!(hp = hvc_get_by_index(tty->index)))
-                return -ENODEV;
-
-        spin_lock_irqsave(&hp->lock, flags);
-        /* Check and then increment for fast path open. */
-        if (hp->count++ > 0) {
-                tty_kref_get(tty);
-                spin_unlock_irqrestore(&hp->lock, flags);
-                hvc_kick();
-                return 0;
-        } /* else count == 0 */
-
-        tty->driver_data = hp;
-
-        hp->tty = tty_kref_get(tty);
-
-        spin_unlock_irqrestore(&hp->lock, flags);
-
-        if (hp->ops->notifier_add)
-                rc = hp->ops->notifier_add(hp, hp->data);
-
-        /*
-         * If the notifier fails we return an error.  The tty layer
-         * will call hvc_close() after a failed open but we don't want to clean
-         * up there so we'll clean up here and clear out the previously set
-         * tty fields and return the kref reference.
-         */
-        if (rc) {
-                spin_lock_irqsave(&hp->lock, flags);
-                hp->tty = NULL;
-                spin_unlock_irqrestore(&hp->lock, flags);
-                tty_kref_put(tty);
-                tty->driver_data = NULL;
-                kref_put(&hp->kref, destroy_hvc_struct);
-                printk(KERN_ERR "hvc_open: request_irq failed with rc %d.\n", rc);
-        }
-        /* Force wakeup of the polling thread */
-        hvc_kick();
-
-        return rc;
-}
-
-static void hvc_close(struct tty_struct *tty, struct file * filp)
-{
-        struct hvc_struct *hp;
-        unsigned long flags;
-
-        if (tty_hung_up_p(filp))
-                return;
-
-        /*
-         * No driver_data means that this close was issued after a failed
-         * hvc_open by the tty layer's release_dev() function and we can just
-         * exit cleanly because the kref reference wasn't made.
-         */
-        if (!tty->driver_data)
-                return;
-
-        hp = tty->driver_data;
-
-        spin_lock_irqsave(&hp->lock, flags);
-
-        if (--hp->count == 0) {
-                /* We are done with the tty pointer now. */
-                hp->tty = NULL;
-                spin_unlock_irqrestore(&hp->lock, flags);
-
-                if (hp->ops->notifier_del)
-                        hp->ops->notifier_del(hp, hp->data);
-
-                /* cancel pending tty resize work */
-                cancel_work_sync(&hp->tty_resize);
-
-                /*
-                 * Chain calls chars_in_buffer() and returns immediately if
-                 * there is no buffered data otherwise sleeps on a wait queue
-                 * waking periodically to check chars_in_buffer().
-                 */
-                tty_wait_until_sent(tty, HVC_CLOSE_WAIT);
-        } else {
-                if (hp->count < 0)
-                        printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
-                                hp->vtermno, hp->count);
-                spin_unlock_irqrestore(&hp->lock, flags);
-        }
-
-        tty_kref_put(tty);
-        kref_put(&hp->kref, destroy_hvc_struct);
-}
-
-static void hvc_hangup(struct tty_struct *tty)
-{
-        struct hvc_struct *hp = tty->driver_data;
-        unsigned long flags;
-        int temp_open_count;
-
-        if (!hp)
-                return;
-
-        /* cancel pending tty resize work */
-        cancel_work_sync(&hp->tty_resize);
-
-        spin_lock_irqsave(&hp->lock, flags);
-
-        /*
-         * The N_TTY line discipline has problems such that in a close vs
-         * open->hangup case this can be called after the final close so prevent
-         * that from happening for now.
-         */
-        if (hp->count <= 0) {
-                spin_unlock_irqrestore(&hp->lock, flags);
-                return;
-        }
-
-        temp_open_count = hp->count;
-        hp->count = 0;
-        hp->n_outbuf = 0;
-        hp->tty = NULL;
-
-        spin_unlock_irqrestore(&hp->lock, flags);
-
-        if (hp->ops->notifier_hangup)
-                hp->ops->notifier_hangup(hp, hp->data);
-
-        while(temp_open_count) {
-                --temp_open_count;
-                tty_kref_put(tty);
-                kref_put(&hp->kref, destroy_hvc_struct);
-        }
-}
-
-/*
- * Push buffered characters whether they were just recently buffered or waiting
- * on a blocked hypervisor.  Call this function with hp->lock held.
- */
-static int hvc_push(struct hvc_struct *hp)
-{
-        int n;
-
-        n = hp->ops->put_chars(hp->vtermno, hp->outbuf, hp->n_outbuf);
-        if (n <= 0) {
-                if (n == 0) {
-                        hp->do_wakeup = 1;
-                        return 0;
-                }
-                /* throw away output on error; this happens when
-                   there is no session connected to the vterm. */
-                hp->n_outbuf = 0;
-        } else
-                hp->n_outbuf -= n;
-        if (hp->n_outbuf > 0)
-                memmove(hp->outbuf, hp->outbuf + n, hp->n_outbuf);
-        else
-                hp->do_wakeup = 1;
-
-        return n;
-}
-
-static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count)
-{
-        struct hvc_struct *hp = tty->driver_data;
-        unsigned long flags;
-        int rsize, written = 0;
-
-        /* This write was probably executed during a tty close. */
-        if (!hp)
-                return -EPIPE;
-
-        if (hp->count <= 0)
-                return -EIO;
-
-        spin_lock_irqsave(&hp->lock, flags);
-
-        /* Push pending writes */
-        if (hp->n_outbuf > 0)
-                hvc_push(hp);
-
-        while (count > 0 && (rsize = hp->outbuf_size - hp->n_outbuf) > 0) {
-                if (rsize > count)
-                        rsize = count;
-                memcpy(hp->outbuf + hp->n_outbuf, buf, rsize);
-                count -= rsize;
-                buf += rsize;
-                hp->n_outbuf += rsize;
-                written += rsize;
-                hvc_push(hp);
-        }
-        spin_unlock_irqrestore(&hp->lock, flags);
-
-        /*
-         * Racy, but harmless, kick thread if there is still pending data.
-         */
-        if (hp->n_outbuf)
-                hvc_kick();
-
-        return written;
-}
-
-/**
- * hvc_set_winsz() - Resize the hvc tty terminal window.
- * @work:       work structure.
- *
- * The routine shall not be called within an atomic context because it
- * might sleep.
- *
- * Locking:     hp->lock
- */
-static void hvc_set_winsz(struct work_struct *work)
-{
-        struct hvc_struct *hp;
-        unsigned long hvc_flags;
-        struct tty_struct *tty;
-        struct winsize ws;
-
-        hp = container_of(work, struct hvc_struct, tty_resize);
-
-        spin_lock_irqsave(&hp->lock, hvc_flags);
-        if (!hp->tty) {
-                spin_unlock_irqrestore(&hp->lock, hvc_flags);
-                return;
-        }
-        ws  = hp->ws;
-        tty = tty_kref_get(hp->tty);
-        spin_unlock_irqrestore(&hp->lock, hvc_flags);
-
-        tty_do_resize(tty, &ws);
-        tty_kref_put(tty);
-}
-
-/*
- * This is actually a contract between the driver and the tty layer outlining
- * how much write room the driver can guarantee will be sent OR BUFFERED.  This
- * driver MUST honor the return value.
- */
-static int hvc_write_room(struct tty_struct *tty)
-{
-        struct hvc_struct *hp = tty->driver_data;
-
-        if (!hp)
-                return -1;
-
-        return hp->outbuf_size - hp->n_outbuf;
-}
-
-static int hvc_chars_in_buffer(struct tty_struct *tty)
-{
-        struct hvc_struct *hp = tty->driver_data;
-
-        if (!hp)
-                return 0;
-        return hp->n_outbuf;
-}
-
-/*
- * timeout will vary between the MIN and MAX values defined here.  By default
- * and during console activity we will use a default MIN_TIMEOUT of 10.  When
- * the console is idle, we increase the timeout value on each pass through
- * msleep until we reach the max.  This may be noticeable as a brief (average
- * one second) delay on the console before the console responds to input when
- * there has been no input for some time.
- */
-#define MIN_TIMEOUT             (10)
-#define MAX_TIMEOUT             (2000)
-static u32 timeout = MIN_TIMEOUT;
-
-#define HVC_POLL_READ   0x00000001
-#define HVC_POLL_WRITE  0x00000002
-
-int hvc_poll(struct hvc_struct *hp)
-{
-        struct tty_struct *tty;
-        int i, n, poll_mask = 0;
-        char buf[N_INBUF] __ALIGNED__;
-        unsigned long flags;
-        int read_total = 0;
-        int written_total = 0;
-
-        spin_lock_irqsave(&hp->lock, flags);
-
-        /* Push pending writes */
-        if (hp->n_outbuf > 0)
-                written_total = hvc_push(hp);
-
-        /* Reschedule us if still some write pending */
-        if (hp->n_outbuf > 0) {
-                poll_mask |= HVC_POLL_WRITE;
-                /* If hvc_push() was not able to write, sleep a few msecs */
-                timeout = (written_total) ? 0 : MIN_TIMEOUT;
-        }
-
-        /* No tty attached, just skip */
-        tty = tty_kref_get(hp->tty);
-        if (tty == NULL)
-                goto bail;
-
-        /* Now check if we can get data (are we throttled ?) */
-        if (test_bit(TTY_THROTTLED, &tty->flags))
-                goto throttled;
-
-        /* If we aren't notifier driven and aren't throttled, we always
-         * request a reschedule
-         */
-        if (!hp->irq_requested)
-                poll_mask |= HVC_POLL_READ;
-
-        /* Read data if any */
-        for (;;) {
-                int count = tty_buffer_request_room(tty, N_INBUF);
-
-                /* If flip is full, just reschedule a later read */
-                if (count == 0) {
-                        poll_mask |= HVC_POLL_READ;
-                        break;
-                }
-
-                n = hp->ops->get_chars(hp->vtermno, buf, count);
-                if (n <= 0) {
-                        /* Hangup the tty when disconnected from host */
-                        if (n == -EPIPE) {
-                                spin_unlock_irqrestore(&hp->lock, flags);
-                                tty_hangup(tty);
-                                spin_lock_irqsave(&hp->lock, flags);
-                        } else if ( n == -EAGAIN ) {
-                                /*
-                                 * Some back-ends can only ensure a certain min
-                                 * num of bytes read, which may be > 'count'.
-                                 * Let the tty clear the flip buff to make room.
-                                 */
-                                poll_mask |= HVC_POLL_READ;
-                        }
-                        break;
-                }
-                for (i = 0; i < n; ++i) {
-#ifdef CONFIG_MAGIC_SYSRQ
-                        if (hp->index == hvc_console.index) {
-                                /* Handle the SysRq Hack */
-                                /* XXX should support a sequence */
-                                if (buf[i] == '\x0f') { /* ^O */
-                                        /* if ^O is pressed again, reset
-                                         * sysrq_pressed and flip ^O char */
-                                        sysrq_pressed = !sysrq_pressed;
-                                        if (sysrq_pressed)
-                                                continue;
-                                } else if (sysrq_pressed) {
-                                        handle_sysrq(buf[i]);
-                                        sysrq_pressed = 0;
-                                        continue;
-                                }
-                        }
-#endif /* CONFIG_MAGIC_SYSRQ */
-                        tty_insert_flip_char(tty, buf[i], 0);
-                }
-
-                read_total += n;
-        }
- throttled:
-        /* Wakeup write queue if necessary */
-        if (hp->do_wakeup) {
-                hp->do_wakeup = 0;
-                tty_wakeup(tty);
-        }
- bail:
-        spin_unlock_irqrestore(&hp->lock, flags);
-
-        if (read_total) {
-                /* Activity is occurring, so reset the polling backoff value to
-                   a minimum for performance. */
-                timeout = MIN_TIMEOUT;
-
-                tty_flip_buffer_push(tty);
-        }
-        if (tty)
-                tty_kref_put(tty);
-
-        return poll_mask;
-}
-EXPORT_SYMBOL_GPL(hvc_poll);
-
-/**
- * __hvc_resize() - Update terminal window size information.
- * @hp:         HVC console pointer
- * @ws:         Terminal window size structure
- *
- * Stores the specified window size information in the hvc structure of @hp.
- * The function schedule the tty resize update.
- *
- * Locking:     Locking free; the function MUST be called holding hp->lock
- */
-void __hvc_resize(struct hvc_struct *hp, struct winsize ws)
-{
-        hp->ws = ws;
-        schedule_work(&hp->tty_resize);
-}
-EXPORT_SYMBOL_GPL(__hvc_resize);
-
-/*
- * This kthread is either polling or interrupt driven.  This is determined by
- * calling hvc_poll() who determines whether a console adapter support
- * interrupts.
- */
-static int khvcd(void *unused)
-{
-        int poll_mask;
-        struct hvc_struct *hp;
-
-        set_freezable();
-        __set_current_state(TASK_RUNNING);
-        do {
-                poll_mask = 0;
-                hvc_kicked = 0;
-                try_to_freeze();
-                wmb();
-                if (!cpus_are_in_xmon()) {
-                        spin_lock(&hvc_structs_lock);
-                        list_for_each_entry(hp, &hvc_structs, next) {
-                                poll_mask |= hvc_poll(hp);
-                        }
-                        spin_unlock(&hvc_structs_lock);
-                } else
-                        poll_mask |= HVC_POLL_READ;
-                if (hvc_kicked)
-                        continue;
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (!hvc_kicked) {
-                        if (poll_mask == 0)
-                                schedule();
-                        else {
-                                if (timeout < MAX_TIMEOUT)
-                                        timeout += (timeout >> 6) + 1;
-
-                                msleep_interruptible(timeout);
-                        }
-                }
-                __set_current_state(TASK_RUNNING);
-        } while (!kthread_should_stop());
-
-        return 0;
-}
-
-static const struct tty_operations hvc_ops = {
-        .open = hvc_open,
-        .close = hvc_close,
-        .write = hvc_write,
-        .hangup = hvc_hangup,
-        .unthrottle = hvc_unthrottle,
-        .write_room = hvc_write_room,
-        .chars_in_buffer = hvc_chars_in_buffer,
-};
-
-struct hvc_struct *hvc_alloc(uint32_t vtermno, int data,
-                             const struct hv_ops *ops,
-                             int outbuf_size)
-{
-        struct hvc_struct *hp;
-        int i;
-
-        /* We wait until a driver actually comes along */
-        if (!hvc_driver) {
-                int err = hvc_init();
-                if (err)
-                        return ERR_PTR(err);
-        }
-
-        hp = kzalloc(ALIGN(sizeof(*hp), sizeof(long)) + outbuf_size,
-                        GFP_KERNEL);
-        if (!hp)
-                return ERR_PTR(-ENOMEM);
-
-        hp->vtermno = vtermno;
-        hp->data = data;
-        hp->ops = ops;
-        hp->outbuf_size = outbuf_size;
-        hp->outbuf = &((char *)hp)[ALIGN(sizeof(*hp), sizeof(long))];
-
-        kref_init(&hp->kref);
-
-        INIT_WORK(&hp->tty_resize, hvc_set_winsz);
-        spin_lock_init(&hp->lock);
-        spin_lock(&hvc_structs_lock);
-
-        /*
-         * find index to use:
-         * see if this vterm id matches one registered for console.
-         */
-        for (i=0; i < MAX_NR_HVC_CONSOLES; i++)
-                if (vtermnos[i] == hp->vtermno &&
-                    cons_ops[i] == hp->ops)
-                        break;
-
-        /* no matching slot, just use a counter */
-        if (i >= MAX_NR_HVC_CONSOLES)
-                i = ++last_hvc;
-
-        hp->index = i;
-
-        list_add_tail(&(hp->next), &hvc_structs);
-        spin_unlock(&hvc_structs_lock);
-
-        return hp;
-}
-EXPORT_SYMBOL_GPL(hvc_alloc);
-
-int hvc_remove(struct hvc_struct *hp)
-{
-        unsigned long flags;
-        struct tty_struct *tty;
-
-        spin_lock_irqsave(&hp->lock, flags);
-        tty = tty_kref_get(hp->tty);
-
-        if (hp->index < MAX_NR_HVC_CONSOLES)
-                vtermnos[hp->index] = -1;
-
-        /* Don't whack hp->irq because tty_hangup() will need to free the irq. */
-
-        spin_unlock_irqrestore(&hp->lock, flags);
-
-        /*
-         * We 'put' the instance that was grabbed when the kref instance
-         * was initialized using kref_init().  Let the last holder of this
-         * kref cause it to be removed, which will probably be the tty_vhangup
-         * below.
-         */
-        kref_put(&hp->kref, destroy_hvc_struct);
-
-        /*
-         * This function call will auto chain call hvc_hangup.
-         */
-        if (tty) {
-                tty_vhangup(tty);
-                tty_kref_put(tty);
-        }
-        return 0;
-}
-EXPORT_SYMBOL_GPL(hvc_remove);
-
-/* Driver initialization: called as soon as someone uses hvc_alloc(). */
-static int hvc_init(void)
-{
-        struct tty_driver *drv;
-        int err;
-
-        /* We need more than hvc_count adapters due to hotplug additions. */
-        drv = alloc_tty_driver(HVC_ALLOC_TTY_ADAPTERS);
-        if (!drv) {
-                err = -ENOMEM;
-                goto out;
-        }
-
-        drv->owner = THIS_MODULE;
-        drv->driver_name = "hvc";
-        drv->name = "hvc";
-        drv->major = HVC_MAJOR;
-        drv->minor_start = HVC_MINOR;
-        drv->type = TTY_DRIVER_TYPE_SYSTEM;
-        drv->init_termios = tty_std_termios;
-        drv->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_RESET_TERMIOS;
-        tty_set_operations(drv, &hvc_ops);
-
-        /* Always start the kthread because there can be hotplug vty adapters
-         * added later. */
-        hvc_task = kthread_run(khvcd, NULL, "khvcd");
-        if (IS_ERR(hvc_task)) {
-                printk(KERN_ERR "Couldn't create kthread for console.\n");
-                err = PTR_ERR(hvc_task);
-                goto put_tty;
-        }
-
-        err = tty_register_driver(drv);
-        if (err) {
-                printk(KERN_ERR "Couldn't register hvc console driver\n");
-                goto stop_thread;
-        }
-
-        /*
-         * Make sure tty is fully registered before allowing it to be
-         * found by hvc_console_device.
-         */
-        smp_mb();
-        hvc_driver = drv;
-        return 0;
-
-stop_thread:
-        kthread_stop(hvc_task);
-        hvc_task = NULL;
-put_tty:
-        put_tty_driver(drv);
-out:
-        return err;
-}
-
-/* This isn't particularly necessary due to this being a console driver
- * but it is nice to be thorough.
- */
-static void __exit hvc_exit(void)
-{
-        if (hvc_driver) {
-                kthread_stop(hvc_task);
-
-                tty_unregister_driver(hvc_driver);
-                /* return tty_struct instances allocated in hvc_init(). */
-                put_tty_driver(hvc_driver);
-                unregister_console(&hvc_console);
-        }
-}
-module_exit(hvc_exit);
diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h
deleted file mode 100644
index 54381eba4e4a..000000000000
--- a/drivers/char/hvc_console.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * hvc_console.h
- * Copyright (C) 2005 IBM Corporation
- *
- * Author(s):
- *      Ryan S. Arnold <rsa@us.ibm.com>
- *
- * hvc_console header information:
- *      moved here from arch/powerpc/include/asm/hvconsole.h
- *      and drivers/char/hvc_console.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-#ifndef HVC_CONSOLE_H
-#define HVC_CONSOLE_H
-#include <linux/kref.h>
-#include <linux/tty.h>
-#include <linux/spinlock.h>
-
-/*
- * This is the max number of console adapters that can/will be found as
- * console devices on first stage console init.  Any number beyond this range
- * can't be used as a console device but is still a valid tty device.
- */
-#define MAX_NR_HVC_CONSOLES     16
-
-/*
- * The Linux TTY code does not support dynamic addition of tty derived devices
- * so we need to know how many tty devices we might need when space is allocated
- * for the tty device.  Since this driver supports hotplug of vty adapters we
- * need to make sure we have enough allocated.
- */
-#define HVC_ALLOC_TTY_ADAPTERS  8
-
-struct hvc_struct {
-        spinlock_t lock;
-        int index;
-        struct tty_struct *tty;
-        int count;
-        int do_wakeup;
-        char *outbuf;
-        int outbuf_size;
-        int n_outbuf;
-        uint32_t vtermno;
-        const struct hv_ops *ops;
-        int irq_requested;
-        int data;
-        struct winsize ws;
-        struct work_struct tty_resize;
-        struct list_head next;
-        struct kref kref; /* ref count & hvc_struct lifetime */
-};
-
-/* implemented by a low level driver */
-struct hv_ops {
-        int (*get_chars)(uint32_t vtermno, char *buf, int count);
-        int (*put_chars)(uint32_t vtermno, const char *buf, int count);
-
-        /* Callbacks for notification. Called in open, close and hangup */
-        int (*notifier_add)(struct hvc_struct *hp, int irq);
-        void (*notifier_del)(struct hvc_struct *hp, int irq);
-        void (*notifier_hangup)(struct hvc_struct *hp, int irq);
-};
-
-/* Register a vterm and a slot index for use as a console (console_init) */
-extern int hvc_instantiate(uint32_t vtermno, int index,
-                           const struct hv_ops *ops);
-
-/* register a vterm for hvc tty operation (module_init or hotplug add) */
-extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data,
-                                     const struct hv_ops *ops, int outbuf_size);
-/* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
-extern int hvc_remove(struct hvc_struct *hp);
-
-/* data available */
-int hvc_poll(struct hvc_struct *hp);
-void hvc_kick(void);
-
-/* Resize hvc tty terminal window */
-extern void __hvc_resize(struct hvc_struct *hp, struct winsize ws);
-
-static inline void hvc_resize(struct hvc_struct *hp, struct winsize ws)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&hp->lock, flags);
-        __hvc_resize(hp, ws);
-        spin_unlock_irqrestore(&hp->lock, flags);
-}
-
-/* default notifier for irq based notification */
-extern int notifier_add_irq(struct hvc_struct *hp, int data);
-extern void notifier_del_irq(struct hvc_struct *hp, int data);
-extern void notifier_hangup_irq(struct hvc_struct *hp, int data);
-
-
-#if defined(CONFIG_XMON) && defined(CONFIG_SMP)
-#include <asm/xmon.h>
-#else
-static inline int cpus_are_in_xmon(void)
-{
-        return 0;
-}
-#endif
-
-#endif // HVC_CONSOLE_H
diff --git a/drivers/char/hvc_irq.c b/drivers/char/hvc_irq.c
deleted file mode 100644
index 2623e177e8d6..000000000000
--- a/drivers/char/hvc_irq.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright IBM Corp. 2001,2008
- *
- * This file contains the IRQ specific code for hvc_console
- *
- */
-
-#include <linux/interrupt.h>
-
-#include "hvc_console.h"
-
-static irqreturn_t hvc_handle_interrupt(int irq, void *dev_instance)
-{
-        /* if hvc_poll request a repoll, then kick the hvcd thread */
-        if (hvc_poll(dev_instance))
-                hvc_kick();
-        return IRQ_HANDLED;
-}
-
-/*
- * For IRQ based systems these callbacks can be used
- */
-int notifier_add_irq(struct hvc_struct *hp, int irq)
-{
-        int rc;
-
-        if (!irq) {
-                hp->irq_requested = 0;
-                return 0;
-        }
-        rc = request_irq(irq, hvc_handle_interrupt, IRQF_DISABLED,
-                           "hvc_console", hp);
-        if (!rc)
-                hp->irq_requested = 1;
-        return rc;
-}
-
-void notifier_del_irq(struct hvc_struct *hp, int irq)
-{
-        if (!hp->irq_requested)
-                return;
-        free_irq(irq, hp);
-        hp->irq_requested = 0;
-}
-
-void notifier_hangup_irq(struct hvc_struct *hp, int irq)
-{
-        notifier_del_irq(hp, irq);
-}
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
deleted file mode 100644
index 21c54955084e..000000000000
--- a/drivers/char/hvc_iseries.c
+++ /dev/null
@@ -1,598 +0,0 @@
-/*
- * iSeries vio driver interface to hvc_console.c
- *
- * This code is based heavily on hvc_vio.c and viocons.c
- *
- * Copyright (C) 2006 Stephen Rothwell, IBM Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#include <stdarg.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/console.h>
-
-#include <asm/hvconsole.h>
-#include <asm/vio.h>
-#include <asm/prom.h>
-#include <asm/firmware.h>
-#include <asm/iseries/vio.h>
-#include <asm/iseries/hv_call.h>
-#include <asm/iseries/hv_lp_config.h>
-#include <asm/iseries/hv_lp_event.h>
-
-#include "hvc_console.h"
-
-#define VTTY_PORTS 10
-
-static DEFINE_SPINLOCK(consolelock);
-static DEFINE_SPINLOCK(consoleloglock);
-
-static const char hvc_driver_name[] = "hvc_console";
-
-#define IN_BUF_SIZE     200
-
-/*
- * Our port information.
- */
-static struct port_info {
-        HvLpIndex lp;
-        u64 seq;        /* sequence number of last HV send */
-        u64 ack;        /* last ack from HV */
-        struct hvc_struct *hp;
-        int in_start;
-        int in_end;
-        unsigned char in_buf[IN_BUF_SIZE];
-} port_info[VTTY_PORTS] = {
-        [ 0 ... VTTY_PORTS - 1 ] = {
-                .lp = HvLpIndexInvalid
-        }
-};
-
-#define viochar_is_console(pi)  ((pi) == &port_info[0])
-
-static struct vio_device_id hvc_driver_table[] __devinitdata = {
-        {"serial", "IBM,iSeries-vty"},
-        { "", "" }
-};
-MODULE_DEVICE_TABLE(vio, hvc_driver_table);
-
-static void hvlog(char *fmt, ...)
-{
-        int i;
-        unsigned long flags;
-        va_list args;
-        static char buf[256];
-
-        spin_lock_irqsave(&consoleloglock, flags);
-        va_start(args, fmt);
-        i = vscnprintf(buf, sizeof(buf) - 1, fmt, args);
-        va_end(args);
-        buf[i++] = '\r';
-        HvCall_writeLogBuffer(buf, i);
-        spin_unlock_irqrestore(&consoleloglock, flags);
-}
-
-/*
- * Initialize the common fields in a charLpEvent
- */
-static void init_data_event(struct viocharlpevent *viochar, HvLpIndex lp)
-{
-        struct HvLpEvent *hev = &viochar->event;
-
-        memset(viochar, 0, sizeof(struct viocharlpevent));
-
-        hev->flags = HV_LP_EVENT_VALID | HV_LP_EVENT_DEFERRED_ACK |
-                HV_LP_EVENT_INT;
-        hev->xType = HvLpEvent_Type_VirtualIo;
-        hev->xSubtype = viomajorsubtype_chario | viochardata;
-        hev->xSourceLp = HvLpConfig_getLpIndex();
-        hev->xTargetLp = lp;
-        hev->xSizeMinus1 = sizeof(struct viocharlpevent);
-        hev->xSourceInstanceId = viopath_sourceinst(lp);
-        hev->xTargetInstanceId = viopath_targetinst(lp);
-}
-
-static int get_chars(uint32_t vtermno, char *buf, int count)
-{
-        struct port_info *pi;
-        int n = 0;
-        unsigned long flags;
-
-        if (vtermno >= VTTY_PORTS)
-                return -EINVAL;
-        if (count == 0)
-                return 0;
-
-        pi = &port_info[vtermno];
-        spin_lock_irqsave(&consolelock, flags);
-
-        if (pi->in_end == 0)
-                goto done;
-
-        n = pi->in_end - pi->in_start;
-        if (n > count)
-                n = count;
-        memcpy(buf, &pi->in_buf[pi->in_start], n);
-        pi->in_start += n;
-        if (pi->in_start == pi->in_end) {
-                pi->in_start = 0;
-                pi->in_end = 0;
-        }
-done:
-        spin_unlock_irqrestore(&consolelock, flags);
-        return n;
-}
-
-static int put_chars(uint32_t vtermno, const char *buf, int count)
-{
-        struct viocharlpevent *viochar;
-        struct port_info *pi;
-        HvLpEvent_Rc hvrc;
-        unsigned long flags;
-        int sent = 0;
-
-        if (vtermno >= VTTY_PORTS)
-                return -EINVAL;
-
-        pi = &port_info[vtermno];
-
-        spin_lock_irqsave(&consolelock, flags);
-
-        if (viochar_is_console(pi) && !viopath_isactive(pi->lp)) {
-                HvCall_writeLogBuffer(buf, count);
-                sent = count;
-                goto done;
-        }
-
-        viochar = vio_get_event_buffer(viomajorsubtype_chario);
-        if (viochar == NULL) {
-                hvlog("\n\rviocons: Can't get viochar buffer.");
-                goto done;
-        }
-
-        while ((count > 0) && ((pi->seq - pi->ack) < VIOCHAR_WINDOW)) {
-                int len;
-
-                len = (count > VIOCHAR_MAX_DATA) ? VIOCHAR_MAX_DATA : count;
-
-                if (viochar_is_console(pi))
-                        HvCall_writeLogBuffer(buf, len);
-
-                init_data_event(viochar, pi->lp);
-
-                viochar->len = len;
-                viochar->event.xCorrelationToken = pi->seq++;
-                viochar->event.xSizeMinus1 =
-                        offsetof(struct viocharlpevent, data) + len;
-
-                memcpy(viochar->data, buf, len);
-
-                hvrc = HvCallEvent_signalLpEvent(&viochar->event);
-                if (hvrc)
-                        hvlog("\n\rerror sending event! return code %d\n\r",
-                                (int)hvrc);
-                sent += len;
-                count -= len;
-                buf += len;
-        }
-
-        vio_free_event_buffer(viomajorsubtype_chario, viochar);
-done:
-        spin_unlock_irqrestore(&consolelock, flags);
-        return sent;
-}
-
-static const struct hv_ops hvc_get_put_ops = {
-        .get_chars = get_chars,
-        .put_chars = put_chars,
-        .notifier_add = notifier_add_irq,
-        .notifier_del = notifier_del_irq,
-        .notifier_hangup = notifier_hangup_irq,
-};
-
-static int __devinit hvc_vio_probe(struct vio_dev *vdev,
-                        const struct vio_device_id *id)
-{
-        struct hvc_struct *hp;
-        struct port_info *pi;
-
-        /* probed with invalid parameters. */
-        if (!vdev || !id)
-                return -EPERM;
-
-        if (vdev->unit_address >= VTTY_PORTS)
-                return -ENODEV;
-
-        pi = &port_info[vdev->unit_address];
-
-        hp = hvc_alloc(vdev->unit_address, vdev->irq, &hvc_get_put_ops,
-                        VIOCHAR_MAX_DATA);
-        if (IS_ERR(hp))
-                return PTR_ERR(hp);
-        pi->hp = hp;
-        dev_set_drvdata(&vdev->dev, pi);
-
-        return 0;
-}
-
-static int __devexit hvc_vio_remove(struct vio_dev *vdev)
-{
-        struct port_info *pi = dev_get_drvdata(&vdev->dev);
-        struct hvc_struct *hp = pi->hp;
-
-        return hvc_remove(hp);
-}
-
-static struct vio_driver hvc_vio_driver = {
-        .id_table       = hvc_driver_table,
-        .probe          = hvc_vio_probe,
-        .remove         = __devexit_p(hvc_vio_remove),
-        .driver         = {
-                .name   = hvc_driver_name,
-                .owner  = THIS_MODULE,
-        }
-};
-
-static void hvc_open_event(struct HvLpEvent *event)
-{
-        unsigned long flags;
-        struct viocharlpevent *cevent = (struct viocharlpevent *)event;
-        u8 port = cevent->virtual_device;
-        struct port_info *pi;
-        int reject = 0;
-
-        if (hvlpevent_is_ack(event)) {
-                if (port >= VTTY_PORTS)
-                        return;
-
-                spin_lock_irqsave(&consolelock, flags);
-
-                pi = &port_info[port];
-                if (event->xRc == HvLpEvent_Rc_Good) {
-                        pi->seq = pi->ack = 0;
-                        /*
-                         * This line allows connections from the primary
-                         * partition but once one is connected from the
-                         * primary partition nothing short of a reboot
-                         * of linux will allow access from the hosting
-                         * partition again without a required iSeries fix.
-                         */
-                        pi->lp = event->xTargetLp;
-                }
-
-                spin_unlock_irqrestore(&consolelock, flags);
-                if (event->xRc != HvLpEvent_Rc_Good)
-                        printk(KERN_WARNING
-                               "hvc: handle_open_event: event->xRc == (%d).\n",
-                               event->xRc);
-
-                if (event->xCorrelationToken != 0) {
-                        atomic_t *aptr= (atomic_t *)event->xCorrelationToken;
-                        atomic_set(aptr, 1);
-                } else
-                        printk(KERN_WARNING
-                               "hvc: weird...got open ack without atomic\n");
-                return;
-        }
-
-        /* This had better require an ack, otherwise complain */
-        if (!hvlpevent_need_ack(event)) {
-                printk(KERN_WARNING "hvc: viocharopen without ack bit!\n");
-                return;
-        }
-
-        spin_lock_irqsave(&consolelock, flags);
-
-        /* Make sure this is a good virtual tty */
-        if (port >= VTTY_PORTS) {
-                event->xRc = HvLpEvent_Rc_SubtypeError;
-                cevent->subtype_result_code = viorc_openRejected;
-                /*
-                 * Flag state here since we can't printk while holding
-                 * the consolelock spinlock.
-                 */
-                reject = 1;
-        } else {
-                pi = &port_info[port];
-                if ((pi->lp != HvLpIndexInvalid) &&
-                                (pi->lp != event->xSourceLp)) {
-                        /*
-                         * If this is tty is already connected to a different
-                         * partition, fail.
-                         */
-                        event->xRc = HvLpEvent_Rc_SubtypeError;
-                        cevent->subtype_result_code = viorc_openRejected;
-                        reject = 2;
-                } else {
-                        pi->lp = event->xSourceLp;
-                        event->xRc = HvLpEvent_Rc_Good;
-                        cevent->subtype_result_code = viorc_good;
-                        pi->seq = pi->ack = 0;
-                }
-        }
-
-        spin_unlock_irqrestore(&consolelock, flags);
-
-        if (reject == 1)
-                printk(KERN_WARNING "hvc: open rejected: bad virtual tty.\n");
-        else if (reject == 2)
-                printk(KERN_WARNING "hvc: open rejected: console in exclusive "
-                                "use by another partition.\n");
-
-        /* Return the acknowledgement */
-        HvCallEvent_ackLpEvent(event);
-}
-
-/*
- * Handle a close charLpEvent.  This should ONLY be an Interrupt because the
- * virtual console should never actually issue a close event to the hypervisor
- * because the virtual console never goes away.  A close event coming from the
- * hypervisor simply means that there are no client consoles connected to the
- * virtual console.
- */
-static void hvc_close_event(struct HvLpEvent *event)
-{
-        unsigned long flags;
-        struct viocharlpevent *cevent = (struct viocharlpevent *)event;
-        u8 port = cevent->virtual_device;
-
-        if (!hvlpevent_is_int(event)) {
-                printk(KERN_WARNING
-                        "hvc: got unexpected close acknowledgement\n");
-                return;
-        }
-
-        if (port >= VTTY_PORTS) {
-                printk(KERN_WARNING
-                        "hvc: close message from invalid virtual device.\n");
-                return;
-        }
-
-        /* For closes, just mark the console partition invalid */
-        spin_lock_irqsave(&consolelock, flags);
-
-        if (port_info[port].lp == event->xSourceLp)
-                port_info[port].lp = HvLpIndexInvalid;
-
-        spin_unlock_irqrestore(&consolelock, flags);
-}
-
-static void hvc_data_event(struct HvLpEvent *event)
-{
-        unsigned long flags;
-        struct viocharlpevent *cevent = (struct viocharlpevent *)event;
-        struct port_info *pi;
-        int n;
-        u8 port = cevent->virtual_device;
-
-        if (port >= VTTY_PORTS) {
-                printk(KERN_WARNING "hvc: data on invalid virtual device %d\n",
-                                port);
-                return;
-        }
-        if (cevent->len == 0)
-                return;
-
-        /*
-         * Change 05/01/2003 - Ryan Arnold: If a partition other than
-         * the current exclusive partition tries to send us data
-         * events then just drop them on the floor because we don't
-         * want his stinking data.  He isn't authorized to receive
-         * data because he wasn't the first one to get the console,
-         * therefore he shouldn't be allowed to send data either.
-         * This will work without an iSeries fix.
-         */
-        pi = &port_info[port];
-        if (pi->lp != event->xSourceLp)
-                return;
-
-        spin_lock_irqsave(&consolelock, flags);
-
-        n = IN_BUF_SIZE - pi->in_end;
-        if (n > cevent->len)
-                n = cevent->len;
-        if (n > 0) {
-                memcpy(&pi->in_buf[pi->in_end], cevent->data, n);
-                pi->in_end += n;
-        }
-        spin_unlock_irqrestore(&consolelock, flags);
-        if (n == 0)
-                printk(KERN_WARNING "hvc: input buffer overflow\n");
-}
-
-static void hvc_ack_event(struct HvLpEvent *event)
-{
-        struct viocharlpevent *cevent = (struct viocharlpevent *)event;
-        unsigned long flags;
-        u8 port = cevent->virtual_device;
-
-        if (port >= VTTY_PORTS) {
-                printk(KERN_WARNING "hvc: data on invalid virtual device\n");
-                return;
-        }
-
-        spin_lock_irqsave(&consolelock, flags);
-        port_info[port].ack = event->xCorrelationToken;
-        spin_unlock_irqrestore(&consolelock, flags);
-}
-
-static void hvc_config_event(struct HvLpEvent *event)
-{
-        struct viocharlpevent *cevent = (struct viocharlpevent *)event;
-
-        if (cevent->data[0] == 0x01)
-                printk(KERN_INFO "hvc: window resized to %d: %d: %d: %d\n",
-                       cevent->data[1], cevent->data[2],
-                       cevent->data[3], cevent->data[4]);
-        else
-                printk(KERN_WARNING "hvc: unknown config event\n");
-}
-
-static void hvc_handle_event(struct HvLpEvent *event)
-{
-        int charminor;
-
-        if (event == NULL)
-                return;
-
-        charminor = event->xSubtype & VIOMINOR_SUBTYPE_MASK;
-        switch (charminor) {
-        case viocharopen:
-                hvc_open_event(event);
-                break;
-        case viocharclose:
-                hvc_close_event(event);
-                break;
-        case viochardata:
-                hvc_data_event(event);
-                break;
-        case viocharack:
-                hvc_ack_event(event);
-                break;
-        case viocharconfig:
-                hvc_config_event(event);
-                break;
-        default:
-                if (hvlpevent_is_int(event) && hvlpevent_need_ack(event)) {
-                        event->xRc = HvLpEvent_Rc_InvalidSubtype;
-                        HvCallEvent_ackLpEvent(event);
-                }
-        }
-}
-
-static int __init send_open(HvLpIndex remoteLp, void *sem)
-{
-        return HvCallEvent_signalLpEventFast(remoteLp,
-                        HvLpEvent_Type_VirtualIo,
-                        viomajorsubtype_chario | viocharopen,
-                        HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck,
-                        viopath_sourceinst(remoteLp),
-                        viopath_targetinst(remoteLp),
-                        (u64)(unsigned long)sem, VIOVERSION << 16,
-                        0, 0, 0, 0);
-}
-
-static int __init hvc_vio_init(void)
-{
-        atomic_t wait_flag;
-        int rc;
-
-        if (!firmware_has_feature(FW_FEATURE_ISERIES))
-                return -EIO;
-
-        /* +2 for fudge */
-        rc = viopath_open(HvLpConfig_getPrimaryLpIndex(),
-                        viomajorsubtype_chario, VIOCHAR_WINDOW + 2);
-        if (rc)
-                printk(KERN_WARNING "hvc: error opening to primary %d\n", rc);
-
-        if (viopath_hostLp == HvLpIndexInvalid)
-                vio_set_hostlp();
-
-        /*
-         * And if the primary is not the same as the hosting LP, open to the
-         * hosting lp
-         */
-        if ((viopath_hostLp != HvLpIndexInvalid) &&
-            (viopath_hostLp != HvLpConfig_getPrimaryLpIndex())) {
-                printk(KERN_INFO "hvc: open path to hosting (%d)\n",
-                                viopath_hostLp);
-                rc = viopath_open(viopath_hostLp, viomajorsubtype_chario,
-                                VIOCHAR_WINDOW + 2);    /* +2 for fudge */
-                if (rc)
-                        printk(KERN_WARNING
-                                "error opening to partition %d: %d\n",
-                                viopath_hostLp, rc);
-        }
-
-        if (vio_setHandler(viomajorsubtype_chario, hvc_handle_event) < 0)
-                printk(KERN_WARNING
-                        "hvc: error seting handler for console events!\n");
-
-        /*
-         * First, try to open the console to the hosting lp.
-         * Wait on a semaphore for the response.
-         */
-        atomic_set(&wait_flag, 0);
-        if ((viopath_isactive(viopath_hostLp)) &&
-            (send_open(viopath_hostLp, &wait_flag) == 0)) {
-                printk(KERN_INFO "hvc: hosting partition %d\n", viopath_hostLp);
-                while (atomic_read(&wait_flag) == 0)
-                        mb();
-                atomic_set(&wait_flag, 0);
-        }
-
-        /*
-         * If we don't have an active console, try the primary
-         */
-        if ((!viopath_isactive(port_info[0].lp)) &&
-            (viopath_isactive(HvLpConfig_getPrimaryLpIndex())) &&
-            (send_open(HvLpConfig_getPrimaryLpIndex(), &wait_flag) == 0)) {
-                printk(KERN_INFO "hvc: opening console to primary partition\n");
-                while (atomic_read(&wait_flag) == 0)
-                        mb();
-        }
-
-        /* Register as a vio device to receive callbacks */
-        rc = vio_register_driver(&hvc_vio_driver);
-
-        return rc;
-}
-module_init(hvc_vio_init); /* after drivers/char/hvc_console.c */
-
-static void __exit hvc_vio_exit(void)
-{
-        vio_unregister_driver(&hvc_vio_driver);
-}
-module_exit(hvc_vio_exit);
-
-/* the device tree order defines our numbering */
-static int __init hvc_find_vtys(void)
-{
-        struct device_node *vty;
-        int num_found = 0;
-
-        for (vty = of_find_node_by_name(NULL, "vty"); vty != NULL;
-                        vty = of_find_node_by_name(vty, "vty")) {
-                const uint32_t *vtermno;
-
-                /* We have statically defined space for only a certain number
-                 * of console adapters.
-                 */
-                if ((num_found >= MAX_NR_HVC_CONSOLES) ||
-                                (num_found >= VTTY_PORTS)) {
-                        of_node_put(vty);
-                        break;
-                }
-
-                vtermno = of_get_property(vty, "reg", NULL);
-                if (!vtermno)
-                        continue;
-
-                if (!of_device_is_compatible(vty, "IBM,iSeries-vty"))
-                        continue;
-
-                if (num_found == 0)
-                        add_preferred_console("hvc", 0, NULL);
-                hvc_instantiate(*vtermno, num_found, &hvc_get_put_ops);
-                ++num_found;
-        }
-
-        return num_found;
-}
-console_initcall(hvc_find_vtys);
diff --git a/drivers/char/hvc_iucv.c b/drivers/char/hvc_iucv.c
deleted file mode 100644
index 7b01bc609de3..000000000000
--- a/drivers/char/hvc_iucv.c
+++ /dev/null
@@ -1,1339 +0,0 @@
-/*
- * hvc_iucv.c - z/VM IUCV hypervisor console (HVC) device driver
- *
- * This HVC device driver provides terminal access using
- * z/VM IUCV communication paths.
- *
- * Copyright IBM Corp. 2008, 2009
- *
- * Author(s):   Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
- */
-#define KMSG_COMPONENT          "hvc_iucv"
-#define pr_fmt(fmt)             KMSG_COMPONENT ": " fmt
-
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <asm/ebcdic.h>
-#include <linux/ctype.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/init.h>
-#include <linux/mempool.h>
-#include <linux/moduleparam.h>
-#include <linux/tty.h>
-#include <linux/wait.h>
-#include <net/iucv/iucv.h>
-
-#include "hvc_console.h"
-
-
-/* General device driver settings */
-#define HVC_IUCV_MAGIC          0xc9e4c3e5
-#define MAX_HVC_IUCV_LINES      HVC_ALLOC_TTY_ADAPTERS
-#define MEMPOOL_MIN_NR          (PAGE_SIZE / sizeof(struct iucv_tty_buffer)/4)
-
-/* IUCV TTY message  */
-#define MSG_VERSION             0x02    /* Message version */
-#define MSG_TYPE_ERROR          0x01    /* Error message */
-#define MSG_TYPE_TERMENV        0x02    /* Terminal environment variable */
-#define MSG_TYPE_TERMIOS        0x04    /* Terminal IO struct update */
-#define MSG_TYPE_WINSIZE        0x08    /* Terminal window size update */
-#define MSG_TYPE_DATA           0x10    /* Terminal data */
-
-struct iucv_tty_msg {
-        u8      version;                /* Message version */
-        u8      type;                   /* Message type */
-#define MSG_MAX_DATALEN         ((u16)(~0))
-        u16     datalen;                /* Payload length */
-        u8      data[];                 /* Payload buffer */
-} __attribute__((packed));
-#define MSG_SIZE(s)             ((s) + offsetof(struct iucv_tty_msg, data))
-
-enum iucv_state_t {
-        IUCV_DISCONN    = 0,
-        IUCV_CONNECTED  = 1,
-        IUCV_SEVERED    = 2,
-};
-
-enum tty_state_t {
-        TTY_CLOSED      = 0,
-        TTY_OPENED      = 1,
-};
-
-struct hvc_iucv_private {
-        struct hvc_struct       *hvc;           /* HVC struct reference */
-        u8                      srv_name[8];    /* IUCV service name (ebcdic) */
-        unsigned char           is_console;     /* Linux console usage flag */
-        enum iucv_state_t       iucv_state;     /* IUCV connection status */
-        enum tty_state_t        tty_state;      /* TTY status */
-        struct iucv_path        *path;          /* IUCV path pointer */
-        spinlock_t              lock;           /* hvc_iucv_private lock */
-#define SNDBUF_SIZE             (PAGE_SIZE)     /* must be < MSG_MAX_DATALEN */
-        void                    *sndbuf;        /* send buffer            */
-        size_t                  sndbuf_len;     /* length of send buffer  */
-#define QUEUE_SNDBUF_DELAY      (HZ / 25)
-        struct delayed_work     sndbuf_work;    /* work: send iucv msg(s) */
-        wait_queue_head_t       sndbuf_waitq;   /* wait for send completion */
-        struct list_head        tty_outqueue;   /* outgoing IUCV messages */
-        struct list_head        tty_inqueue;    /* incoming IUCV messages */
-        struct device           *dev;           /* device structure */
-};
-
-struct iucv_tty_buffer {
-        struct list_head        list;   /* list pointer */
-        struct iucv_message     msg;    /* store an IUCV message */
-        size_t                  offset; /* data buffer offset */
-        struct iucv_tty_msg     *mbuf;  /* buffer to store input/output data */
-};
-
-/* IUCV callback handler */
-static  int hvc_iucv_path_pending(struct iucv_path *, u8[8], u8[16]);
-static void hvc_iucv_path_severed(struct iucv_path *, u8[16]);
-static void hvc_iucv_msg_pending(struct iucv_path *, struct iucv_message *);
-static void hvc_iucv_msg_complete(struct iucv_path *, struct iucv_message *);
-
-
-/* Kernel module parameter: use one terminal device as default */
-static unsigned long hvc_iucv_devices = 1;
-
-/* Array of allocated hvc iucv tty lines... */
-static struct hvc_iucv_private *hvc_iucv_table[MAX_HVC_IUCV_LINES];
-#define IUCV_HVC_CON_IDX        (0)
-/* List of z/VM user ID filter entries (struct iucv_vmid_filter) */
-#define MAX_VMID_FILTER         (500)
-static size_t hvc_iucv_filter_size;
-static void *hvc_iucv_filter;
-static const char *hvc_iucv_filter_string;
-static DEFINE_RWLOCK(hvc_iucv_filter_lock);
-
-/* Kmem cache and mempool for iucv_tty_buffer elements */
-static struct kmem_cache *hvc_iucv_buffer_cache;
-static mempool_t *hvc_iucv_mempool;
-
-/* IUCV handler callback functions */
-static struct iucv_handler hvc_iucv_handler = {
-        .path_pending  = hvc_iucv_path_pending,
-        .path_severed  = hvc_iucv_path_severed,
-        .message_complete = hvc_iucv_msg_complete,
-        .message_pending  = hvc_iucv_msg_pending,
-};
-
-
-/**
- * hvc_iucv_get_private() - Return a struct hvc_iucv_private instance.
- * @num:        The HVC virtual terminal number (vtermno)
- *
- * This function returns the struct hvc_iucv_private instance that corresponds
- * to the HVC virtual terminal number specified as parameter @num.
- */
-struct hvc_iucv_private *hvc_iucv_get_private(uint32_t num)
-{
-        if ((num < HVC_IUCV_MAGIC) || (num - HVC_IUCV_MAGIC > hvc_iucv_devices))
-                return NULL;
-        return hvc_iucv_table[num - HVC_IUCV_MAGIC];
-}
-
-/**
- * alloc_tty_buffer() - Return a new struct iucv_tty_buffer element.
- * @size:       Size of the internal buffer used to store data.
- * @flags:      Memory allocation flags passed to mempool.
- *
- * This function allocates a new struct iucv_tty_buffer element and, optionally,
- * allocates an internal data buffer with the specified size @size.
- * The internal data buffer is always allocated with GFP_DMA which is
- * required for receiving and sending data with IUCV.
- * Note: The total message size arises from the internal buffer size and the
- *       members of the iucv_tty_msg structure.
- * The function returns NULL if memory allocation has failed.
- */
-static struct iucv_tty_buffer *alloc_tty_buffer(size_t size, gfp_t flags)
-{
-        struct iucv_tty_buffer *bufp;
-
-        bufp = mempool_alloc(hvc_iucv_mempool, flags);
-        if (!bufp)
-                return NULL;
-        memset(bufp, 0, sizeof(*bufp));
-
-        if (size > 0) {
-                bufp->msg.length = MSG_SIZE(size);
-                bufp->mbuf = kmalloc(bufp->msg.length, flags | GFP_DMA);
-                if (!bufp->mbuf) {
-                        mempool_free(bufp, hvc_iucv_mempool);
-                        return NULL;
-                }
-                bufp->mbuf->version = MSG_VERSION;
-                bufp->mbuf->type    = MSG_TYPE_DATA;
-                bufp->mbuf->datalen = (u16) size;
-        }
-        return bufp;
-}
-
-/**
- * destroy_tty_buffer() - destroy struct iucv_tty_buffer element.
- * @bufp:       Pointer to a struct iucv_tty_buffer element, SHALL NOT be NULL.
- */
-static void destroy_tty_buffer(struct iucv_tty_buffer *bufp)
-{
-        kfree(bufp->mbuf);
-        mempool_free(bufp, hvc_iucv_mempool);
-}
-
-/**
- * destroy_tty_buffer_list() - call destroy_tty_buffer() for each list element.
- * @list:       List containing struct iucv_tty_buffer elements.
- */
-static void destroy_tty_buffer_list(struct list_head *list)
-{
-        struct iucv_tty_buffer *ent, *next;
-
-        list_for_each_entry_safe(ent, next, list, list) {
-                list_del(&ent->list);
-                destroy_tty_buffer(ent);
-        }
-}
-
-/**
- * hvc_iucv_write() - Receive IUCV message & write data to HVC buffer.
- * @priv:               Pointer to struct hvc_iucv_private
- * @buf:                HVC buffer for writing received terminal data.
- * @count:              HVC buffer size.
- * @has_more_data:      Pointer to an int variable.
- *
- * The function picks up pending messages from the input queue and receives
- * the message data that is then written to the specified buffer @buf.
- * If the buffer size @count is less than the data message size, the
- * message is kept on the input queue and @has_more_data is set to 1.
- * If all message data has been written, the message is removed from
- * the input queue.
- *
- * The function returns the number of bytes written to the terminal, zero if
- * there are no pending data messages available or if there is no established
- * IUCV path.
- * If the IUCV path has been severed, then -EPIPE is returned to cause a
- * hang up (that is issued by the HVC layer).
- */
-static int hvc_iucv_write(struct hvc_iucv_private *priv,
-                          char *buf, int count, int *has_more_data)
-{
-        struct iucv_tty_buffer *rb;
-        int written;
-        int rc;
-
-        /* immediately return if there is no IUCV connection */
-        if (priv->iucv_state == IUCV_DISCONN)
-                return 0;
-
-        /* if the IUCV path has been severed, return -EPIPE to inform the
-         * HVC layer to hang up the tty device. */
-        if (priv->iucv_state == IUCV_SEVERED)
-                return -EPIPE;
-
-        /* check if there are pending messages */
-        if (list_empty(&priv->tty_inqueue))
-                return 0;
-
-        /* receive an iucv message and flip data to the tty (ldisc) */
-        rb = list_first_entry(&priv->tty_inqueue, struct iucv_tty_buffer, list);
-
-        written = 0;
-        if (!rb->mbuf) { /* message not yet received ... */
-                /* allocate mem to store msg data; if no memory is available
-                 * then leave the buffer on the list and re-try later */
-                rb->mbuf = kmalloc(rb->msg.length, GFP_ATOMIC | GFP_DMA);
-                if (!rb->mbuf)
-                        return -ENOMEM;
-
-                rc = __iucv_message_receive(priv->path, &rb->msg, 0,
-                                            rb->mbuf, rb->msg.length, NULL);
-                switch (rc) {
-                case 0: /* Successful       */
-                        break;
-                case 2: /* No message found */
-                case 9: /* Message purged   */
-                        break;
-                default:
-                        written = -EIO;
-                }
-                /* remove buffer if an error has occured or received data
-                 * is not correct */
-                if (rc || (rb->mbuf->version != MSG_VERSION) ||
-                          (rb->msg.length    != MSG_SIZE(rb->mbuf->datalen)))
-                        goto out_remove_buffer;
-        }
-
-        switch (rb->mbuf->type) {
-        case MSG_TYPE_DATA:
-                written = min_t(int, rb->mbuf->datalen - rb->offset, count);
-                memcpy(buf, rb->mbuf->data + rb->offset, written);
-                if (written < (rb->mbuf->datalen - rb->offset)) {
-                        rb->offset += written;
-                        *has_more_data = 1;
-                        goto out_written;
-                }
-                break;
-
-        case MSG_TYPE_WINSIZE:
-                if (rb->mbuf->datalen != sizeof(struct winsize))
-                        break;
-                /* The caller must ensure that the hvc is locked, which
-                 * is the case when called from hvc_iucv_get_chars() */
-                __hvc_resize(priv->hvc, *((struct winsize *) rb->mbuf->data));
-                break;
-
-        case MSG_TYPE_ERROR:    /* ignored ... */
-        case MSG_TYPE_TERMENV:  /* ignored ... */
-        case MSG_TYPE_TERMIOS:  /* ignored ... */
-                break;
-        }
-
-out_remove_buffer:
-        list_del(&rb->list);
-        destroy_tty_buffer(rb);
-        *has_more_data = !list_empty(&priv->tty_inqueue);
-
-out_written:
-        return written;
-}
-
-/**
- * hvc_iucv_get_chars() - HVC get_chars operation.
- * @vtermno:    HVC virtual terminal number.
- * @buf:        Pointer to a buffer to store data
- * @count:      Size of buffer available for writing
- *
- * The HVC thread calls this method to read characters from the back-end.
- * If an IUCV communication path has been established, pending IUCV messages
- * are received and data is copied into buffer @buf up to @count bytes.
- *
- * Locking:     The routine gets called under an irqsave() spinlock; and
- *              the routine locks the struct hvc_iucv_private->lock to call
- *              helper functions.
- */
-static int hvc_iucv_get_chars(uint32_t vtermno, char *buf, int count)
-{
-        struct hvc_iucv_private *priv = hvc_iucv_get_private(vtermno);
-        int written;
-        int has_more_data;
-
-        if (count <= 0)
-                return 0;
-
-        if (!priv)
-                return -ENODEV;
-
-        spin_lock(&priv->lock);
-        has_more_data = 0;
-        written = hvc_iucv_write(priv, buf, count, &has_more_data);
-        spin_unlock(&priv->lock);
-
-        /* if there are still messages on the queue... schedule another run */
-        if (has_more_data)
-                hvc_kick();
-
-        return written;
-}
-
-/**
- * hvc_iucv_queue() - Buffer terminal data for sending.
- * @priv:       Pointer to struct hvc_iucv_private instance.
- * @buf:        Buffer containing data to send.
- * @count:      Size of buffer and amount of data to send.
- *
- * The function queues data for sending. To actually send the buffered data,
- * a work queue function is scheduled (with QUEUE_SNDBUF_DELAY).
- * The function returns the number of data bytes that has been buffered.
- *
- * If the device is not connected, data is ignored and the function returns
- * @count.
- * If the buffer is full, the function returns 0.
- * If an existing IUCV communicaton path has been severed, -EPIPE is returned
- * (that can be passed to HVC layer to cause a tty hangup).
- */
-static int hvc_iucv_queue(struct hvc_iucv_private *priv, const char *buf,
-                          int count)
-{
-        size_t len;
-
-        if (priv->iucv_state == IUCV_DISCONN)
-                return count;                   /* ignore data */
-
-        if (priv->iucv_state == IUCV_SEVERED)
-                return -EPIPE;
-
-        len = min_t(size_t, count, SNDBUF_SIZE - priv->sndbuf_len);
-        if (!len)
-                return 0;
-
-        memcpy(priv->sndbuf + priv->sndbuf_len, buf, len);
-        priv->sndbuf_len += len;
-
-        if (priv->iucv_state == IUCV_CONNECTED)
-                schedule_delayed_work(&priv->sndbuf_work, QUEUE_SNDBUF_DELAY);
-
-        return len;
-}
-
-/**
- * hvc_iucv_send() - Send an IUCV message containing terminal data.
- * @priv:       Pointer to struct hvc_iucv_private instance.
- *
- * If an IUCV communication path has been established, the buffered output data
- * is sent via an IUCV message and the number of bytes sent is returned.
- * Returns 0 if there is no established IUCV communication path or
- * -EPIPE if an existing IUCV communicaton path has been severed.
- */
-static int hvc_iucv_send(struct hvc_iucv_private *priv)
-{
-        struct iucv_tty_buffer *sb;
-        int rc, len;
-
-        if (priv->iucv_state == IUCV_SEVERED)
-                return -EPIPE;
-
-        if (priv->iucv_state == IUCV_DISCONN)
-                return -EIO;
-
-        if (!priv->sndbuf_len)
-                return 0;
-
-        /* allocate internal buffer to store msg data and also compute total
-         * message length */
-        sb = alloc_tty_buffer(priv->sndbuf_len, GFP_ATOMIC);
-        if (!sb)
-                return -ENOMEM;
-
-        memcpy(sb->mbuf->data, priv->sndbuf, priv->sndbuf_len);
-        sb->mbuf->datalen = (u16) priv->sndbuf_len;
-        sb->msg.length = MSG_SIZE(sb->mbuf->datalen);
-
-        list_add_tail(&sb->list, &priv->tty_outqueue);
-
-        rc = __iucv_message_send(priv->path, &sb->msg, 0, 0,
-                                 (void *) sb->mbuf, sb->msg.length);
-        if (rc) {
-                /* drop the message here; however we might want to handle
-                 * 0x03 (msg limit reached) by trying again... */
-                list_del(&sb->list);
-                destroy_tty_buffer(sb);
-        }
-        len = priv->sndbuf_len;
-        priv->sndbuf_len = 0;
-
-        return len;
-}
-
-/**
- * hvc_iucv_sndbuf_work() - Send buffered data over IUCV
- * @work:       Work structure.
- *
- * This work queue function sends buffered output data over IUCV and,
- * if not all buffered data could be sent, reschedules itself.
- */
-static void hvc_iucv_sndbuf_work(struct work_struct *work)
-{
-        struct hvc_iucv_private *priv;
-
-        priv = container_of(work, struct hvc_iucv_private, sndbuf_work.work);
-        if (!priv)
-                return;
-
-        spin_lock_bh(&priv->lock);
-        hvc_iucv_send(priv);
-        spin_unlock_bh(&priv->lock);
-}
-
-/**
- * hvc_iucv_put_chars() - HVC put_chars operation.
- * @vtermno:    HVC virtual terminal number.
- * @buf:        Pointer to an buffer to read data from
- * @count:      Size of buffer available for reading
- *
- * The HVC thread calls this method to write characters to the back-end.
- * The function calls hvc_iucv_queue() to queue terminal data for sending.
- *
- * Locking:     The method gets called under an irqsave() spinlock; and
- *              locks struct hvc_iucv_private->lock.
- */
-static int hvc_iucv_put_chars(uint32_t vtermno, const char *buf, int count)
-{
-        struct hvc_iucv_private *priv = hvc_iucv_get_private(vtermno);
-        int queued;
-
-        if (count <= 0)
-                return 0;
-
-        if (!priv)
-                return -ENODEV;
-
-        spin_lock(&priv->lock);
-        queued = hvc_iucv_queue(priv, buf, count);
-        spin_unlock(&priv->lock);
-
-        return queued;
-}
-
-/**
- * hvc_iucv_notifier_add() - HVC notifier for opening a TTY for the first time.
- * @hp: Pointer to the HVC device (struct hvc_struct)
- * @id: Additional data (originally passed to hvc_alloc): the index of an struct
- *      hvc_iucv_private instance.
- *
- * The function sets the tty state to TTY_OPENED for the struct hvc_iucv_private
- * instance that is derived from @id. Always returns 0.
- *
- * Locking:     struct hvc_iucv_private->lock, spin_lock_bh
- */
-static int hvc_iucv_notifier_add(struct hvc_struct *hp, int id)
-{
-        struct hvc_iucv_private *priv;
-
-        priv = hvc_iucv_get_private(id);
-        if (!priv)
-                return 0;
-
-        spin_lock_bh(&priv->lock);
-        priv->tty_state = TTY_OPENED;
-        spin_unlock_bh(&priv->lock);
-
-        return 0;
-}
-
-/**
- * hvc_iucv_cleanup() - Clean up and reset a z/VM IUCV HVC instance.
- * @priv:       Pointer to the struct hvc_iucv_private instance.
- */
-static void hvc_iucv_cleanup(struct hvc_iucv_private *priv)
-{
-        destroy_tty_buffer_list(&priv->tty_outqueue);
-        destroy_tty_buffer_list(&priv->tty_inqueue);
-
-        priv->tty_state = TTY_CLOSED;
-        priv->iucv_state = IUCV_DISCONN;
-
-        priv->sndbuf_len = 0;
-}
-
-/**
- * tty_outqueue_empty() - Test if the tty outq is empty
- * @priv:       Pointer to struct hvc_iucv_private instance.
- */
-static inline int tty_outqueue_empty(struct hvc_iucv_private *priv)
-{
-        int rc;
-
-        spin_lock_bh(&priv->lock);
-        rc = list_empty(&priv->tty_outqueue);
-        spin_unlock_bh(&priv->lock);
-
-        return rc;
-}
-
-/**
- * flush_sndbuf_sync() - Flush send buffer and wait for completion
- * @priv:       Pointer to struct hvc_iucv_private instance.
- *
- * The routine cancels a pending sndbuf work, calls hvc_iucv_send()
- * to flush any buffered terminal output data and waits for completion.
- */
-static void flush_sndbuf_sync(struct hvc_iucv_private *priv)
-{
-        int sync_wait;
-
-        cancel_delayed_work_sync(&priv->sndbuf_work);
-
-        spin_lock_bh(&priv->lock);
-        hvc_iucv_send(priv);            /* force sending buffered data */
-        sync_wait = !list_empty(&priv->tty_outqueue); /* anything queued ? */
-        spin_unlock_bh(&priv->lock);
-
-        if (sync_wait)
-                wait_event_timeout(priv->sndbuf_waitq,
-                                   tty_outqueue_empty(priv), HZ/10);
-}
-
-/**
- * hvc_iucv_hangup() - Sever IUCV path and schedule hvc tty hang up
- * @priv:       Pointer to hvc_iucv_private structure
- *
- * This routine severs an existing IUCV communication path and hangs
- * up the underlying HVC terminal device.
- * The hang-up occurs only if an IUCV communication path is established;
- * otherwise there is no need to hang up the terminal device.
- *
- * The IUCV HVC hang-up is separated into two steps:
- * 1. After the IUCV path has been severed, the iucv_state is set to
- *    IUCV_SEVERED.
- * 2. Later, when the HVC thread calls hvc_iucv_get_chars(), the
- *    IUCV_SEVERED state causes the tty hang-up in the HVC layer.
- *
- * If the tty has not yet been opened, clean up the hvc_iucv_private
- * structure to allow re-connects.
- * If the tty has been opened, let get_chars() return -EPIPE to signal
- * the HVC layer to hang up the tty and, if so, wake up the HVC thread
- * to call get_chars()...
- *
- * Special notes on hanging up a HVC terminal instantiated as console:
- * Hang-up:     1. do_tty_hangup() replaces file ops (= hung_up_tty_fops)
- *              2. do_tty_hangup() calls tty->ops->close() for console_filp
- *                      => no hangup notifier is called by HVC (default)
- *              2. hvc_close() returns because of tty_hung_up_p(filp)
- *                      => no delete notifier is called!
- * Finally, the back-end is not being notified, thus, the tty session is
- * kept active (TTY_OPEN) to be ready for re-connects.
- *
- * Locking:     spin_lock(&priv->lock) w/o disabling bh
- */
-static void hvc_iucv_hangup(struct hvc_iucv_private *priv)
-{
-        struct iucv_path *path;
-
-        path = NULL;
-        spin_lock(&priv->lock);
-        if (priv->iucv_state == IUCV_CONNECTED) {
-                path = priv->path;
-                priv->path = NULL;
-                priv->iucv_state = IUCV_SEVERED;
-                if (priv->tty_state == TTY_CLOSED)
-                        hvc_iucv_cleanup(priv);
-                else
-                        /* console is special (see above) */
-                        if (priv->is_console) {
-                                hvc_iucv_cleanup(priv);
-                                priv->tty_state = TTY_OPENED;
-                        } else
-                                hvc_kick();
-        }
-        spin_unlock(&priv->lock);
-
-        /* finally sever path (outside of priv->lock due to lock ordering) */
-        if (path) {
-                iucv_path_sever(path, NULL);
-                iucv_path_free(path);
-        }
-}
-
-/**
- * hvc_iucv_notifier_hangup() - HVC notifier for TTY hangups.
- * @hp:         Pointer to the HVC device (struct hvc_struct)
- * @id:         Additional data (originally passed to hvc_alloc):
- *              the index of an struct hvc_iucv_private instance.
- *
- * This routine notifies the HVC back-end that a tty hangup (carrier loss,
- * virtual or otherwise) has occured.
- * The z/VM IUCV HVC device driver ignores virtual hangups (vhangup())
- * to keep an existing IUCV communication path established.
- * (Background: vhangup() is called from user space (by getty or login) to
- *              disable writing to the tty by other applications).
- * If the tty has been opened and an established IUCV path has been severed
- * (we caused the tty hangup), the function calls hvc_iucv_cleanup().
- *
- * Locking:     struct hvc_iucv_private->lock
- */
-static void hvc_iucv_notifier_hangup(struct hvc_struct *hp, int id)
-{
-        struct hvc_iucv_private *priv;
-
-        priv = hvc_iucv_get_private(id);
-        if (!priv)
-                return;
-
-        flush_sndbuf_sync(priv);
-
-        spin_lock_bh(&priv->lock);
-        /* NOTE: If the hangup was scheduled by ourself (from the iucv
-         *       path_servered callback [IUCV_SEVERED]), we have to clean up
-         *       our structure and to set state to TTY_CLOSED.
-         *       If the tty was hung up otherwise (e.g. vhangup()), then we
-         *       ignore this hangup and keep an established IUCV path open...
-         *       (...the reason is that we are not able to connect back to the
-         *       client if we disconnect on hang up) */
-        priv->tty_state = TTY_CLOSED;
-
-        if (priv->iucv_state == IUCV_SEVERED)
-                hvc_iucv_cleanup(priv);
-        spin_unlock_bh(&priv->lock);
-}
-
-/**
- * hvc_iucv_notifier_del() - HVC notifier for closing a TTY for the last time.
- * @hp:         Pointer to the HVC device (struct hvc_struct)
- * @id:         Additional data (originally passed to hvc_alloc):
- *              the index of an struct hvc_iucv_private instance.
- *
- * This routine notifies the HVC back-end that the last tty device fd has been
- * closed.  The function calls hvc_iucv_cleanup() to clean up the struct
- * hvc_iucv_private instance.
- *
- * Locking:     struct hvc_iucv_private->lock
- */
-static void hvc_iucv_notifier_del(struct hvc_struct *hp, int id)
-{
-        struct hvc_iucv_private *priv;
-        struct iucv_path        *path;
-
-        priv = hvc_iucv_get_private(id);
-        if (!priv)
-                return;
-
-        flush_sndbuf_sync(priv);
-
-        spin_lock_bh(&priv->lock);
-        path = priv->path;              /* save reference to IUCV path */
-        priv->path = NULL;
-        hvc_iucv_cleanup(priv);
-        spin_unlock_bh(&priv->lock);
-
-        /* sever IUCV path outside of priv->lock due to lock ordering of:
-         * priv->lock <--> iucv_table_lock */
-        if (path) {
-                iucv_path_sever(path, NULL);
-                iucv_path_free(path);
-        }
-}
-
-/**
- * hvc_iucv_filter_connreq() - Filter connection request based on z/VM user ID
- * @ipvmid:     Originating z/VM user ID (right padded with blanks)
- *
- * Returns 0 if the z/VM user ID @ipvmid is allowed to connection, otherwise
- * non-zero.
- */
-static int hvc_iucv_filter_connreq(u8 ipvmid[8])
-{
-        size_t i;
-
-        /* Note: default policy is ACCEPT if no filter is set */
-        if (!hvc_iucv_filter_size)
-                return 0;
-
-        for (i = 0; i < hvc_iucv_filter_size; i++)
-                if (0 == memcmp(ipvmid, hvc_iucv_filter + (8 * i), 8))
-                        return 0;
-        return 1;
-}
-
-/**
- * hvc_iucv_path_pending() - IUCV handler to process a connection request.
- * @path:       Pending path (struct iucv_path)
- * @ipvmid:     z/VM system identifier of originator
- * @ipuser:     User specified data for this path
- *              (AF_IUCV: port/service name and originator port)
- *
- * The function uses the @ipuser data to determine if the pending path belongs
- * to a terminal managed by this device driver.
- * If the path belongs to this driver, ensure that the terminal is not accessed
- * multiple times (only one connection to a terminal is allowed).
- * If the terminal is not yet connected, the pending path is accepted and is
- * associated to the appropriate struct hvc_iucv_private instance.
- *
- * Returns 0 if @path belongs to a terminal managed by the this device driver;
- * otherwise returns -ENODEV in order to dispatch this path to other handlers.
- *
- * Locking:     struct hvc_iucv_private->lock
- */
-static  int hvc_iucv_path_pending(struct iucv_path *path,
-                                  u8 ipvmid[8], u8 ipuser[16])
-{
-        struct hvc_iucv_private *priv;
-        u8 nuser_data[16];
-        u8 vm_user_id[9];
-        int i, rc;
-
-        priv = NULL;
-        for (i = 0; i < hvc_iucv_devices; i++)
-                if (hvc_iucv_table[i] &&
-                    (0 == memcmp(hvc_iucv_table[i]->srv_name, ipuser, 8))) {
-                        priv = hvc_iucv_table[i];
-                        break;
-                }
-        if (!priv)
-                return -ENODEV;
-
-        /* Enforce that ipvmid is allowed to connect to us */
-        read_lock(&hvc_iucv_filter_lock);
-        rc = hvc_iucv_filter_connreq(ipvmid);
-        read_unlock(&hvc_iucv_filter_lock);
-        if (rc) {
-                iucv_path_sever(path, ipuser);
-                iucv_path_free(path);
-                memcpy(vm_user_id, ipvmid, 8);
-                vm_user_id[8] = 0;
-                pr_info("A connection request from z/VM user ID %s "
-                        "was refused\n", vm_user_id);
-                return 0;
-        }
-
-        spin_lock(&priv->lock);
-
-        /* If the terminal is already connected or being severed, then sever
-         * this path to enforce that there is only ONE established communication
-         * path per terminal. */
-        if (priv->iucv_state != IUCV_DISCONN) {
-                iucv_path_sever(path, ipuser);
-                iucv_path_free(path);
-                goto out_path_handled;
-        }
-
-        /* accept path */
-        memcpy(nuser_data, ipuser + 8, 8);  /* remote service (for af_iucv) */
-        memcpy(nuser_data + 8, ipuser, 8);  /* local service  (for af_iucv) */
-        path->msglim = 0xffff;              /* IUCV MSGLIMIT */
-        path->flags &= ~IUCV_IPRMDATA;      /* TODO: use IUCV_IPRMDATA */
-        rc = iucv_path_accept(path, &hvc_iucv_handler, nuser_data, priv);
-        if (rc) {
-                iucv_path_sever(path, ipuser);
-                iucv_path_free(path);
-                goto out_path_handled;
-        }
-        priv->path = path;
-        priv->iucv_state = IUCV_CONNECTED;
-
-        /* flush buffered output data... */
-        schedule_delayed_work(&priv->sndbuf_work, 5);
-
-out_path_handled:
-        spin_unlock(&priv->lock);
-        return 0;
-}
-
-/**
- * hvc_iucv_path_severed() - IUCV handler to process a path sever.
- * @path:       Pending path (struct iucv_path)
- * @ipuser:     User specified data for this path
- *              (AF_IUCV: port/service name and originator port)
- *
- * This function calls the hvc_iucv_hangup() function for the
- * respective IUCV HVC terminal.
- *
- * Locking:     struct hvc_iucv_private->lock
- */
-static void hvc_iucv_path_severed(struct iucv_path *path, u8 ipuser[16])
-{
-        struct hvc_iucv_private *priv = path->private;
-
-        hvc_iucv_hangup(priv);
-}
-
-/**
- * hvc_iucv_msg_pending() - IUCV handler to process an incoming IUCV message.
- * @path:       Pending path (struct iucv_path)
- * @msg:        Pointer to the IUCV message
- *
- * The function puts an incoming message on the input queue for later
- * processing (by hvc_iucv_get_chars() / hvc_iucv_write()).
- * If the tty has not yet been opened, the message is rejected.
- *
- * Locking:     struct hvc_iucv_private->lock
- */
-static void hvc_iucv_msg_pending(struct iucv_path *path,
-                                 struct iucv_message *msg)
-{
-        struct hvc_iucv_private *priv = path->private;
-        struct iucv_tty_buffer *rb;
-
-        /* reject messages that exceed max size of iucv_tty_msg->datalen */
-        if (msg->length > MSG_SIZE(MSG_MAX_DATALEN)) {
-                iucv_message_reject(path, msg);
-                return;
-        }
-
-        spin_lock(&priv->lock);
-
-        /* reject messages if tty has not yet been opened */
-        if (priv->tty_state == TTY_CLOSED) {
-                iucv_message_reject(path, msg);
-                goto unlock_return;
-        }
-
-        /* allocate tty buffer to save iucv msg only */
-        rb = alloc_tty_buffer(0, GFP_ATOMIC);
-        if (!rb) {
-                iucv_message_reject(path, msg);
-                goto unlock_return;     /* -ENOMEM */
-        }
-        rb->msg = *msg;
-
-        list_add_tail(&rb->list, &priv->tty_inqueue);
-
-        hvc_kick();     /* wake up hvc thread */
-
-unlock_return:
-        spin_unlock(&priv->lock);
-}
-
-/**
- * hvc_iucv_msg_complete() - IUCV handler to process message completion
- * @path:       Pending path (struct iucv_path)
- * @msg:        Pointer to the IUCV message
- *
- * The function is called upon completion of message delivery to remove the
- * message from the outqueue. Additional delivery information can be found
- * msg->audit: rejected messages (0x040000 (IPADRJCT)), and
- *             purged messages   (0x010000 (IPADPGNR)).
- *
- * Locking:     struct hvc_iucv_private->lock
- */
-static void hvc_iucv_msg_complete(struct iucv_path *path,
-                                  struct iucv_message *msg)
-{
-        struct hvc_iucv_private *priv = path->private;
-        struct iucv_tty_buffer  *ent, *next;
-        LIST_HEAD(list_remove);
-
-        spin_lock(&priv->lock);
-        list_for_each_entry_safe(ent, next, &priv->tty_outqueue, list)
-                if (ent->msg.id == msg->id) {
-                        list_move(&ent->list, &list_remove);
-                        break;
-                }
-        wake_up(&priv->sndbuf_waitq);
-        spin_unlock(&priv->lock);
-        destroy_tty_buffer_list(&list_remove);
-}
-
-/**
- * hvc_iucv_pm_freeze() - Freeze PM callback
- * @dev:        IUVC HVC terminal device
- *
- * Sever an established IUCV communication path and
- * trigger a hang-up of the underlying HVC terminal.
- */
-static int hvc_iucv_pm_freeze(struct device *dev)
-{
-        struct hvc_iucv_private *priv = dev_get_drvdata(dev);
-
-        local_bh_disable();
-        hvc_iucv_hangup(priv);
-        local_bh_enable();
-
-        return 0;
-}
-
-/**
- * hvc_iucv_pm_restore_thaw() - Thaw and restore PM callback
- * @dev:        IUVC HVC terminal device
- *
- * Wake up the HVC thread to trigger hang-up and respective
- * HVC back-end notifier invocations.
- */
-static int hvc_iucv_pm_restore_thaw(struct device *dev)
-{
-        hvc_kick();
-        return 0;
-}
-
-
-/* HVC operations */
-static const struct hv_ops hvc_iucv_ops = {
-        .get_chars = hvc_iucv_get_chars,
-        .put_chars = hvc_iucv_put_chars,
-        .notifier_add = hvc_iucv_notifier_add,
-        .notifier_del = hvc_iucv_notifier_del,
-        .notifier_hangup = hvc_iucv_notifier_hangup,
-};
-
-/* Suspend / resume device operations */
-static const struct dev_pm_ops hvc_iucv_pm_ops = {
-        .freeze   = hvc_iucv_pm_freeze,
-        .thaw     = hvc_iucv_pm_restore_thaw,
-        .restore  = hvc_iucv_pm_restore_thaw,
-};
-
-/* IUCV HVC device driver */
-static struct device_driver hvc_iucv_driver = {
-        .name = KMSG_COMPONENT,
-        .bus  = &iucv_bus,
-        .pm   = &hvc_iucv_pm_ops,
-};
-
-/**
- * hvc_iucv_alloc() - Allocates a new struct hvc_iucv_private instance
- * @id:                 hvc_iucv_table index
- * @is_console:         Flag if the instance is used as Linux console
- *
- * This function allocates a new hvc_iucv_private structure and stores
- * the instance in hvc_iucv_table at index @id.
- * Returns 0 on success; otherwise non-zero.
- */
-static int __init hvc_iucv_alloc(int id, unsigned int is_console)
-{
-        struct hvc_iucv_private *priv;
-        char name[9];
-        int rc;
-
-        priv = kzalloc(sizeof(struct hvc_iucv_private), GFP_KERNEL);
-        if (!priv)
-                return -ENOMEM;
-
-        spin_lock_init(&priv->lock);
-        INIT_LIST_HEAD(&priv->tty_outqueue);
-        INIT_LIST_HEAD(&priv->tty_inqueue);
-        INIT_DELAYED_WORK(&priv->sndbuf_work, hvc_iucv_sndbuf_work);
-        init_waitqueue_head(&priv->sndbuf_waitq);
-
-        priv->sndbuf = (void *) get_zeroed_page(GFP_KERNEL);
-        if (!priv->sndbuf) {
-                kfree(priv);
-                return -ENOMEM;
-        }
-
-        /* set console flag */
-        priv->is_console = is_console;
-
-        /* allocate hvc device */
-        priv->hvc = hvc_alloc(HVC_IUCV_MAGIC + id, /*             PAGE_SIZE */
-                              HVC_IUCV_MAGIC + id, &hvc_iucv_ops, 256);
-        if (IS_ERR(priv->hvc)) {
-                rc = PTR_ERR(priv->hvc);
-                goto out_error_hvc;
-        }
-
-        /* notify HVC thread instead of using polling */
-        priv->hvc->irq_requested = 1;
-
-        /* setup iucv related information */
-        snprintf(name, 9, "lnxhvc%-2d", id);
-        memcpy(priv->srv_name, name, 8);
-        ASCEBC(priv->srv_name, 8);
-
-        /* create and setup device */
-        priv->dev = kzalloc(sizeof(*priv->dev), GFP_KERNEL);
-        if (!priv->dev) {
-                rc = -ENOMEM;
-                goto out_error_dev;
-        }
-        dev_set_name(priv->dev, "hvc_iucv%d", id);
-        dev_set_drvdata(priv->dev, priv);
-        priv->dev->bus = &iucv_bus;
-        priv->dev->parent = iucv_root;
-        priv->dev->driver = &hvc_iucv_driver;
-        priv->dev->release = (void (*)(struct device *)) kfree;
-        rc = device_register(priv->dev);
-        if (rc) {
-                put_device(priv->dev);
-                goto out_error_dev;
-        }
-
-        hvc_iucv_table[id] = priv;
-        return 0;
-
-out_error_dev:
-        hvc_remove(priv->hvc);
-out_error_hvc:
-        free_page((unsigned long) priv->sndbuf);
-        kfree(priv);
-
-        return rc;
-}
-
-/**
- * hvc_iucv_destroy() - Destroy and free hvc_iucv_private instances
- */
-static void __init hvc_iucv_destroy(struct hvc_iucv_private *priv)
-{
-        hvc_remove(priv->hvc);
-        device_unregister(priv->dev);
-        free_page((unsigned long) priv->sndbuf);
-        kfree(priv);
-}
-
-/**
- * hvc_iucv_parse_filter() - Parse filter for a single z/VM user ID
- * @filter:     String containing a comma-separated list of z/VM user IDs
- */
-static const char *hvc_iucv_parse_filter(const char *filter, char *dest)
-{
-        const char *nextdelim, *residual;
-        size_t len;
-
-        nextdelim = strchr(filter, ',');
-        if (nextdelim) {
-                len = nextdelim - filter;
-                residual = nextdelim + 1;
-        } else {
-                len = strlen(filter);
-                residual = filter + len;
-        }
-
-        if (len == 0)
-                return ERR_PTR(-EINVAL);
-
-        /* check for '\n' (if called from sysfs) */
-        if (filter[len - 1] == '\n')
-                len--;
-
-        if (len > 8)
-                return ERR_PTR(-EINVAL);
-
-        /* pad with blanks and save upper case version of user ID */
-        memset(dest, ' ', 8);
-        while (len--)
-                dest[len] = toupper(filter[len]);
-        return residual;
-}
-
-/**
- * hvc_iucv_setup_filter() - Set up z/VM user ID filter
- * @filter:     String consisting of a comma-separated list of z/VM user IDs
- *
- * The function parses the @filter string and creates an array containing
- * the list of z/VM user ID filter entries.
- * Return code 0 means success, -EINVAL if the filter is syntactically
- * incorrect, -ENOMEM if there was not enough memory to allocate the
- * filter list array, or -ENOSPC if too many z/VM user IDs have been specified.
- */
-static int hvc_iucv_setup_filter(const char *val)
-{
-        const char *residual;
-        int err;
-        size_t size, count;
-        void *array, *old_filter;
-
-        count = strlen(val);
-        if (count == 0 || (count == 1 && val[0] == '\n')) {
-                size  = 0;
-                array = NULL;
-                goto out_replace_filter;        /* clear filter */
-        }
-
-        /* count user IDs in order to allocate sufficient memory */
-        size = 1;
-        residual = val;
-        while ((residual = strchr(residual, ',')) != NULL) {
-                residual++;
-                size++;
-        }
-
-        /* check if the specified list exceeds the filter limit */
-        if (size > MAX_VMID_FILTER)
-                return -ENOSPC;
-
-        array = kzalloc(size * 8, GFP_KERNEL);
-        if (!array)
-                return -ENOMEM;
-
-        count = size;
-        residual = val;
-        while (*residual && count) {
-                residual = hvc_iucv_parse_filter(residual,
-                                                 array + ((size - count) * 8));
-                if (IS_ERR(residual)) {
-                        err = PTR_ERR(residual);
-                        kfree(array);
-                        goto out_err;
-                }
-                count--;
-        }
-
-out_replace_filter:
-        write_lock_bh(&hvc_iucv_filter_lock);
-        old_filter = hvc_iucv_filter;
-        hvc_iucv_filter_size = size;
-        hvc_iucv_filter = array;
-        write_unlock_bh(&hvc_iucv_filter_lock);
-        kfree(old_filter);
-
-        err = 0;
-out_err:
-        return err;
-}
-
-/**
- * param_set_vmidfilter() - Set z/VM user ID filter parameter
- * @val:        String consisting of a comma-separated list of z/VM user IDs
- * @kp:         Kernel parameter pointing to hvc_iucv_filter array
- *
- * The function sets up the z/VM user ID filter specified as comma-separated
- * list of user IDs in @val.
- * Note: If it is called early in the boot process, @val is stored and
- *       parsed later in hvc_iucv_init().
- */
-static int param_set_vmidfilter(const char *val, const struct kernel_param *kp)
-{
-        int rc;
-
-        if (!MACHINE_IS_VM || !hvc_iucv_devices)
-                return -ENODEV;
-
-        if (!val)
-                return -EINVAL;
-
-        rc = 0;
-        if (slab_is_available())
-                rc = hvc_iucv_setup_filter(val);
-        else
-                hvc_iucv_filter_string = val;   /* defer... */
-        return rc;
-}
-
-/**
- * param_get_vmidfilter() - Get z/VM user ID filter
- * @buffer:     Buffer to store z/VM user ID filter,
- *              (buffer size assumption PAGE_SIZE)
- * @kp:         Kernel parameter pointing to the hvc_iucv_filter array
- *
- * The function stores the filter as a comma-separated list of z/VM user IDs
- * in @buffer. Typically, sysfs routines call this function for attr show.
- */
-static int param_get_vmidfilter(char *buffer, const struct kernel_param *kp)
-{
-        int rc;
-        size_t index, len;
-        void *start, *end;
-
-        if (!MACHINE_IS_VM || !hvc_iucv_devices)
-                return -ENODEV;
-
-        rc = 0;
-        read_lock_bh(&hvc_iucv_filter_lock);
-        for (index = 0; index < hvc_iucv_filter_size; index++) {
-                start = hvc_iucv_filter + (8 * index);
-                end   = memchr(start, ' ', 8);
-                len   = (end) ? end - start : 8;
-                memcpy(buffer + rc, start, len);
-                rc += len;
-                buffer[rc++] = ',';
-        }
-        read_unlock_bh(&hvc_iucv_filter_lock);
-        if (rc)
-                buffer[--rc] = '\0';    /* replace last comma and update rc */
-        return rc;
-}
-
-#define param_check_vmidfilter(name, p) __param_check(name, p, void)
-
-static struct kernel_param_ops param_ops_vmidfilter = {
-        .set = param_set_vmidfilter,
-        .get = param_get_vmidfilter,
-};
-
-/**
- * hvc_iucv_init() - z/VM IUCV HVC device driver initialization
- */
-static int __init hvc_iucv_init(void)
-{
-        int rc;
-        unsigned int i;
-
-        if (!hvc_iucv_devices)
-                return -ENODEV;
-
-        if (!MACHINE_IS_VM) {
-                pr_notice("The z/VM IUCV HVC device driver cannot "
-                           "be used without z/VM\n");
-                rc = -ENODEV;
-                goto out_error;
-        }
-
-        if (hvc_iucv_devices > MAX_HVC_IUCV_LINES) {
-                pr_err("%lu is not a valid value for the hvc_iucv= "
-                        "kernel parameter\n", hvc_iucv_devices);
-                rc = -EINVAL;
-                goto out_error;
-        }
-
-        /* register IUCV HVC device driver */
-        rc = driver_register(&hvc_iucv_driver);
-        if (rc)
-                goto out_error;
-
-        /* parse hvc_iucv_allow string and create z/VM user ID filter list */
-        if (hvc_iucv_filter_string) {
-                rc = hvc_iucv_setup_filter(hvc_iucv_filter_string);
-                switch (rc) {
-                case 0:
-                        break;
-                case -ENOMEM:
-                        pr_err("Allocating memory failed with "
-                                "reason code=%d\n", 3);
-                        goto out_error;
-                case -EINVAL:
-                        pr_err("hvc_iucv_allow= does not specify a valid "
-                                "z/VM user ID list\n");
-                        goto out_error;
-                case -ENOSPC:
-                        pr_err("hvc_iucv_allow= specifies too many "
-                                "z/VM user IDs\n");
-                        goto out_error;
-                default:
-                        goto out_error;
-                }
-        }
-
-        hvc_iucv_buffer_cache = kmem_cache_create(KMSG_COMPONENT,
-                                           sizeof(struct iucv_tty_buffer),
-                                           0, 0, NULL);
-        if (!hvc_iucv_buffer_cache) {
-                pr_err("Allocating memory failed with reason code=%d\n", 1);
-                rc = -ENOMEM;
-                goto out_error;
-        }
-
-        hvc_iucv_mempool = mempool_create_slab_pool(MEMPOOL_MIN_NR,
-                                                    hvc_iucv_buffer_cache);
-        if (!hvc_iucv_mempool) {
-                pr_err("Allocating memory failed with reason code=%d\n", 2);
-                kmem_cache_destroy(hvc_iucv_buffer_cache);
-                rc = -ENOMEM;
-                goto out_error;
-        }
-
-        /* register the first terminal device as console
-         * (must be done before allocating hvc terminal devices) */
-        rc = hvc_instantiate(HVC_IUCV_MAGIC, IUCV_HVC_CON_IDX, &hvc_iucv_ops);
-        if (rc) {
-                pr_err("Registering HVC terminal device as "
-                       "Linux console failed\n");
-                goto out_error_memory;
-        }
-
-        /* allocate hvc_iucv_private structs */
-        for (i = 0; i < hvc_iucv_devices; i++) {
-                rc = hvc_iucv_alloc(i, (i == IUCV_HVC_CON_IDX) ? 1 : 0);
-                if (rc) {
-                        pr_err("Creating a new HVC terminal device "
-                                "failed with error code=%d\n", rc);
-                        goto out_error_hvc;
-                }
-        }
-
-        /* register IUCV callback handler */
-        rc = iucv_register(&hvc_iucv_handler, 0);
-        if (rc) {
-                pr_err("Registering IUCV handlers failed with error code=%d\n",
-                        rc);
-                goto out_error_iucv;
-        }
-
-        return 0;
-
-out_error_iucv:
-        iucv_unregister(&hvc_iucv_handler, 0);
-out_error_hvc:
-        for (i = 0; i < hvc_iucv_devices; i++)
-                if (hvc_iucv_table[i])
-                        hvc_iucv_destroy(hvc_iucv_table[i]);
-out_error_memory:
-        mempool_destroy(hvc_iucv_mempool);
-        kmem_cache_destroy(hvc_iucv_buffer_cache);
-out_error:
-        if (hvc_iucv_filter)
-                kfree(hvc_iucv_filter);
-        hvc_iucv_devices = 0; /* ensure that we do not provide any device */
-        return rc;
-}
-
-/**
- * hvc_iucv_config() - Parsing of hvc_iucv=  kernel command line parameter
- * @val:        Parameter value (numeric)
- */
-static  int __init hvc_iucv_config(char *val)
-{
-         return strict_strtoul(val, 10, &hvc_iucv_devices);
-}
-
-
-device_initcall(hvc_iucv_init);
-__setup("hvc_iucv=", hvc_iucv_config);
-core_param(hvc_iucv_allow, hvc_iucv_filter, vmidfilter, 0640);
diff --git a/drivers/char/hvc_rtas.c b/drivers/char/hvc_rtas.c
deleted file mode 100644
index 61c4a61558d9..000000000000
--- a/drivers/char/hvc_rtas.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * IBM RTAS driver interface to hvc_console.c
- *
- * (C) Copyright IBM Corporation 2001-2005
- * (C) Copyright Red Hat, Inc. 2005
- *
- * Author(s): Maximino Augilar <IBM STI Design Center>
- *          : Ryan S. Arnold <rsa@us.ibm.com>
- *          : Utz Bacher <utz.bacher@de.ibm.com>
- *          : David Woodhouse <dwmw2@infradead.org>
- *
- *    inspired by drivers/char/hvc_console.c
- *    written by Anton Blanchard and Paul Mackerras
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/init.h>
-#include <linux/moduleparam.h>
-#include <linux/types.h>
-
-#include <asm/irq.h>
-#include <asm/rtas.h>
-#include "hvc_console.h"
-
-#define hvc_rtas_cookie 0x67781e15
-struct hvc_struct *hvc_rtas_dev;
-
-static int rtascons_put_char_token = RTAS_UNKNOWN_SERVICE;
-static int rtascons_get_char_token = RTAS_UNKNOWN_SERVICE;
-
-static inline int hvc_rtas_write_console(uint32_t vtermno, const char *buf,
-                int count)
-{
-        int i;
-
-        for (i = 0; i < count; i++) {
-                if (rtas_call(rtascons_put_char_token, 1, 1, NULL, buf[i]))
-                        break;
-        }
-
-        return i;
-}
-
-static int hvc_rtas_read_console(uint32_t vtermno, char *buf, int count)
-{
-        int i, c;
-
-        for (i = 0; i < count; i++) {
-                if (rtas_call(rtascons_get_char_token, 0, 2, &c))
-                        break;
-
-                buf[i] = c;
-        }
-
-        return i;
-}
-
-static const struct hv_ops hvc_rtas_get_put_ops = {
-        .get_chars = hvc_rtas_read_console,
-        .put_chars = hvc_rtas_write_console,
-};
-
-static int __init hvc_rtas_init(void)
-{
-        struct hvc_struct *hp;
-
-        if (rtascons_put_char_token == RTAS_UNKNOWN_SERVICE)
-                rtascons_put_char_token = rtas_token("put-term-char");
-        if (rtascons_put_char_token == RTAS_UNKNOWN_SERVICE)
-                return -EIO;
-
-        if (rtascons_get_char_token == RTAS_UNKNOWN_SERVICE)
-                rtascons_get_char_token = rtas_token("get-term-char");
-        if (rtascons_get_char_token == RTAS_UNKNOWN_SERVICE)
-                return -EIO;
-
-        BUG_ON(hvc_rtas_dev);
-
-        /* Allocate an hvc_struct for the console device we instantiated
-         * earlier.  Save off hp so that we can return it on exit */
-        hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops, 16);
-        if (IS_ERR(hp))
-                return PTR_ERR(hp);
-
-        hvc_rtas_dev = hp;
-
-        return 0;
-}
-module_init(hvc_rtas_init);
-
-/* This will tear down the tty portion of the driver */
-static void __exit hvc_rtas_exit(void)
-{
-        /* Really the fun isn't over until the worker thread breaks down and
-         * the tty cleans up */
-        if (hvc_rtas_dev)
-                hvc_remove(hvc_rtas_dev);
-}
-module_exit(hvc_rtas_exit);
-
-/* This will happen prior to module init.  There is no tty at this time? */
-static int __init hvc_rtas_console_init(void)
-{
-        rtascons_put_char_token = rtas_token("put-term-char");
-        if (rtascons_put_char_token == RTAS_UNKNOWN_SERVICE)
-                return -EIO;
-
-        rtascons_get_char_token = rtas_token("get-term-char");
-        if (rtascons_get_char_token == RTAS_UNKNOWN_SERVICE)
-                return -EIO;
-
-        hvc_instantiate(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops);
-        add_preferred_console("hvc", 0, NULL);
-
-        return 0;
-}
-console_initcall(hvc_rtas_console_init);
diff --git a/drivers/char/hvc_tile.c b/drivers/char/hvc_tile.c
deleted file mode 100644
index c4efb55cbc03..000000000000
--- a/drivers/char/hvc_tile.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2010 Tilera Corporation. All Rights Reserved.
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation, version 2.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- *   NON INFRINGEMENT.  See the GNU General Public License for
- *   more details.
- *
- * Tilera TILE Processor hypervisor console
- */
-
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/init.h>
-#include <linux/moduleparam.h>
-#include <linux/types.h>
-
-#include <hv/hypervisor.h>
-
-#include "hvc_console.h"
-
-static int hvc_tile_put_chars(uint32_t vt, const char *buf, int count)
-{
-        return hv_console_write((HV_VirtAddr)buf, count);
-}
-
-static int hvc_tile_get_chars(uint32_t vt, char *buf, int count)
-{
-        int i, c;
-
-        for (i = 0; i < count; ++i) {
-                c = hv_console_read_if_ready();
-                if (c < 0)
-                        break;
-                buf[i] = c;
-        }
-
-        return i;
-}
-
-static const struct hv_ops hvc_tile_get_put_ops = {
-        .get_chars = hvc_tile_get_chars,
-        .put_chars = hvc_tile_put_chars,
-};
-
-static int __init hvc_tile_console_init(void)
-{
-        extern void disable_early_printk(void);
-        hvc_instantiate(0, 0, &hvc_tile_get_put_ops);
-        add_preferred_console("hvc", 0, NULL);
-        disable_early_printk();
-        return 0;
-}
-console_initcall(hvc_tile_console_init);
-
-static int __init hvc_tile_init(void)
-{
-        hvc_alloc(0, 0, &hvc_tile_get_put_ops, 128);
-        return 0;
-}
-device_initcall(hvc_tile_init);
diff --git a/drivers/char/hvc_udbg.c b/drivers/char/hvc_udbg.c
deleted file mode 100644
index b0957e61a7be..000000000000
--- a/drivers/char/hvc_udbg.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * udbg interface to hvc_console.c
- *
- * (C) Copyright David Gibson, IBM Corporation 2008.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/init.h>
-#include <linux/moduleparam.h>
-#include <linux/types.h>
-#include <linux/irq.h>
-
-#include <asm/udbg.h>
-
-#include "hvc_console.h"
-
-struct hvc_struct *hvc_udbg_dev;
-
-static int hvc_udbg_put(uint32_t vtermno, const char *buf, int count)
-{
-        int i;
-
-        for (i = 0; i < count; i++)
-                udbg_putc(buf[i]);
-
-        return i;
-}
-
-static int hvc_udbg_get(uint32_t vtermno, char *buf, int count)
-{
-        int i, c;
-
-        if (!udbg_getc_poll)
-                return 0;
-
-        for (i = 0; i < count; i++) {
-                if ((c = udbg_getc_poll()) == -1)
-                        break;
-                buf[i] = c;
-        }
-
-        return i;
-}
-
-static const struct hv_ops hvc_udbg_ops = {
-        .get_chars = hvc_udbg_get,
-        .put_chars = hvc_udbg_put,
-};
-
-static int __init hvc_udbg_init(void)
-{
-        struct hvc_struct *hp;
-
-        BUG_ON(hvc_udbg_dev);
-
-        hp = hvc_alloc(0, NO_IRQ, &hvc_udbg_ops, 16);
-        if (IS_ERR(hp))
-                return PTR_ERR(hp);
-
-        hvc_udbg_dev = hp;
-
-        return 0;
-}
-module_init(hvc_udbg_init);
-
-static void __exit hvc_udbg_exit(void)
-{
-        if (hvc_udbg_dev)
-                hvc_remove(hvc_udbg_dev);
-}
-module_exit(hvc_udbg_exit);
-
-static int __init hvc_udbg_console_init(void)
-{
-        hvc_instantiate(0, 0, &hvc_udbg_ops);
-        add_preferred_console("hvc", 0, NULL);
-
-        return 0;
-}
-console_initcall(hvc_udbg_console_init);
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
deleted file mode 100644
index 27370e99c66f..000000000000
--- a/drivers/char/hvc_vio.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * vio driver interface to hvc_console.c
- *
- * This code was moved here to allow the remaing code to be reused as a
- * generic polling mode with semi-reliable transport driver core to the
- * console and tty subsystems.
- *
- *
- * Copyright (C) 2001 Anton Blanchard <anton@au.ibm.com>, IBM
- * Copyright (C) 2001 Paul Mackerras <paulus@au.ibm.com>, IBM
- * Copyright (C) 2004 Benjamin Herrenschmidt <benh@kernel.crashing.org>, IBM Corp.
- * Copyright (C) 2004 IBM Corporation
- *
- * Additional Author(s):
- *  Ryan S. Arnold <rsa@us.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-#include <linux/types.h>
-#include <linux/init.h>
-
-#include <asm/hvconsole.h>
-#include <asm/vio.h>
-#include <asm/prom.h>
-#include <asm/firmware.h>
-
-#include "hvc_console.h"
-
-char hvc_driver_name[] = "hvc_console";
-
-static struct vio_device_id hvc_driver_table[] __devinitdata = {
-        {"serial", "hvterm1"},
-        { "", "" }
-};
-MODULE_DEVICE_TABLE(vio, hvc_driver_table);
-
-static int filtered_get_chars(uint32_t vtermno, char *buf, int count)
-{
-        unsigned long got;
-        int i;
-
-        /*
-         * Vio firmware will read up to SIZE_VIO_GET_CHARS at its own discretion
-         * so we play safe and avoid the situation where got > count which could
-         * overload the flip buffer.
-         */
-        if (count < SIZE_VIO_GET_CHARS)
-                return -EAGAIN;
-
-        got = hvc_get_chars(vtermno, buf, count);
-
-        /*
-         * Work around a HV bug where it gives us a null
-         * after every \r.  -- paulus
-         */
-        for (i = 1; i < got; ++i) {
-                if (buf[i] == 0 && buf[i-1] == '\r') {
-                        --got;
-                        if (i < got)
-                                memmove(&buf[i], &buf[i+1],
-                                        got - i);
-                }
-        }
-        return got;
-}
-
-static const struct hv_ops hvc_get_put_ops = {
-        .get_chars = filtered_get_chars,
-        .put_chars = hvc_put_chars,
-        .notifier_add = notifier_add_irq,
-        .notifier_del = notifier_del_irq,
-        .notifier_hangup = notifier_hangup_irq,
-};
-
-static int __devinit hvc_vio_probe(struct vio_dev *vdev,
-                                const struct vio_device_id *id)
-{
-        struct hvc_struct *hp;
-
-        /* probed with invalid parameters. */
-        if (!vdev || !id)
-                return -EPERM;
-
-        hp = hvc_alloc(vdev->unit_address, vdev->irq, &hvc_get_put_ops,
-                        MAX_VIO_PUT_CHARS);
-        if (IS_ERR(hp))
-                return PTR_ERR(hp);
-        dev_set_drvdata(&vdev->dev, hp);
-
-        return 0;
-}
-
-static int __devexit hvc_vio_remove(struct vio_dev *vdev)
-{
-        struct hvc_struct *hp = dev_get_drvdata(&vdev->dev);
-
-        return hvc_remove(hp);
-}
-
-static struct vio_driver hvc_vio_driver = {
-        .id_table       = hvc_driver_table,
-        .probe          = hvc_vio_probe,
-        .remove         = __devexit_p(hvc_vio_remove),
-        .driver         = {
-                .name   = hvc_driver_name,
-                .owner  = THIS_MODULE,
-        }
-};
-
-static int __init hvc_vio_init(void)
-{
-        int rc;
-
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                return -EIO;
-
-        /* Register as a vio device to receive callbacks */
-        rc = vio_register_driver(&hvc_vio_driver);
-
-        return rc;
-}
-module_init(hvc_vio_init); /* after drivers/char/hvc_console.c */
-
-static void __exit hvc_vio_exit(void)
-{
-        vio_unregister_driver(&hvc_vio_driver);
-}
-module_exit(hvc_vio_exit);
-
-/* the device tree order defines our numbering */
-static int hvc_find_vtys(void)
-{
-        struct device_node *vty;
-        int num_found = 0;
-
-        for (vty = of_find_node_by_name(NULL, "vty"); vty != NULL;
-                        vty = of_find_node_by_name(vty, "vty")) {
-                const uint32_t *vtermno;
-
-                /* We have statically defined space for only a certain number
-                 * of console adapters.
-                 */
-                if (num_found >= MAX_NR_HVC_CONSOLES) {
-                        of_node_put(vty);
-                        break;
-                }
-
-                vtermno = of_get_property(vty, "reg", NULL);
-                if (!vtermno)
-                        continue;
-
-                if (of_device_is_compatible(vty, "hvterm1")) {
-                        hvc_instantiate(*vtermno, num_found, &hvc_get_put_ops);
-                        ++num_found;
-                }
-        }
-
-        return num_found;
-}
-console_initcall(hvc_find_vtys);
diff --git a/drivers/char/hvc_xen.c b/drivers/char/hvc_xen.c
deleted file mode 100644
index 60446f82a3fc..000000000000
--- a/drivers/char/hvc_xen.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * xen console driver interface to hvc_console.c
- *
- * (c) 2007 Gerd Hoffmann <kraxel@suse.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/init.h>
-#include <linux/types.h>
-
-#include <asm/xen/hypervisor.h>
-
-#include <xen/xen.h>
-#include <xen/page.h>
-#include <xen/events.h>
-#include <xen/interface/io/console.h>
-#include <xen/hvc-console.h>
-
-#include "hvc_console.h"
-
-#define HVC_COOKIE   0x58656e /* "Xen" in hex */
-
-static struct hvc_struct *hvc;
-static int xencons_irq;
-
-/* ------------------------------------------------------------------ */
-
-static unsigned long console_pfn = ~0ul;
-
-static inline struct xencons_interface *xencons_interface(void)
-{
-        if (console_pfn == ~0ul)
-                return mfn_to_virt(xen_start_info->console.domU.mfn);
-        else
-                return __va(console_pfn << PAGE_SHIFT);
-}
-
-static inline void notify_daemon(void)
-{
-        /* Use evtchn: this is called early, before irq is set up. */
-        notify_remote_via_evtchn(xen_start_info->console.domU.evtchn);
-}
-
-static int __write_console(const char *data, int len)
-{
-        struct xencons_interface *intf = xencons_interface();
-        XENCONS_RING_IDX cons, prod;
-        int sent = 0;
-
-        cons = intf->out_cons;
-        prod = intf->out_prod;
-        mb();                   /* update queue values before going on */
-        BUG_ON((prod - cons) > sizeof(intf->out));
-
-        while ((sent < len) && ((prod - cons) < sizeof(intf->out)))
-                intf->out[MASK_XENCONS_IDX(prod++, intf->out)] = data[sent++];
-
-        wmb();                  /* write ring before updating pointer */
-        intf->out_prod = prod;
-
-        notify_daemon();
-        return sent;
-}
-
-static int write_console(uint32_t vtermno, const char *data, int len)
-{
-        int ret = len;
-
-        /*
-         * Make sure the whole buffer is emitted, polling if
-         * necessary.  We don't ever want to rely on the hvc daemon
-         * because the most interesting console output is when the
-         * kernel is crippled.
-         */
-        while (len) {
-                int sent = __write_console(data, len);
-                
-                data += sent;
-                len -= sent;
-
-                if (unlikely(len))
-                        HYPERVISOR_sched_op(SCHEDOP_yield, NULL);
-        }
-
-        return ret;
-}
-
-static int read_console(uint32_t vtermno, char *buf, int len)
-{
-        struct xencons_interface *intf = xencons_interface();
-        XENCONS_RING_IDX cons, prod;
-        int recv = 0;
-
-        cons = intf->in_cons;
-        prod = intf->in_prod;
-        mb();                   /* get pointers before reading ring */
-        BUG_ON((prod - cons) > sizeof(intf->in));
-
-        while (cons != prod && recv < len)
-                buf[recv++] = intf->in[MASK_XENCONS_IDX(cons++, intf->in)];
-
-        mb();                   /* read ring before consuming */
-        intf->in_cons = cons;
-
-        notify_daemon();
-        return recv;
-}
-
-static const struct hv_ops hvc_ops = {
-        .get_chars = read_console,
-        .put_chars = write_console,
-        .notifier_add = notifier_add_irq,
-        .notifier_del = notifier_del_irq,
-        .notifier_hangup = notifier_hangup_irq,
-};
-
-static int __init xen_init(void)
-{
-        struct hvc_struct *hp;
-
-        if (!xen_pv_domain() ||
-            xen_initial_domain() ||
-            !xen_start_info->console.domU.evtchn)
-                return -ENODEV;
-
-        xencons_irq = bind_evtchn_to_irq(xen_start_info->console.domU.evtchn);
-        if (xencons_irq < 0)
-                xencons_irq = 0; /* NO_IRQ */
-
-        hp = hvc_alloc(HVC_COOKIE, xencons_irq, &hvc_ops, 256);
-        if (IS_ERR(hp))
-                return PTR_ERR(hp);
-
-        hvc = hp;
-
-        console_pfn = mfn_to_pfn(xen_start_info->console.domU.mfn);
-
-        return 0;
-}
-
-void xen_console_resume(void)
-{
-        if (xencons_irq)
-                rebind_evtchn_irq(xen_start_info->console.domU.evtchn, xencons_irq);
-}
-
-static void __exit xen_fini(void)
-{
-        if (hvc)
-                hvc_remove(hvc);
-}
-
-static int xen_cons_init(void)
-{
-        if (!xen_pv_domain())
-                return 0;
-
-        hvc_instantiate(HVC_COOKIE, 0, &hvc_ops);
-        return 0;
-}
-
-module_init(xen_init);
-module_exit(xen_fini);
-console_initcall(xen_cons_init);
-
-static void raw_console_write(const char *str, int len)
-{
-        while(len > 0) {
-                int rc = HYPERVISOR_console_io(CONSOLEIO_write, len, (char *)str);
-                if (rc <= 0)
-                        break;
-
-                str += rc;
-                len -= rc;
-        }
-}
-
-#ifdef CONFIG_EARLY_PRINTK
-static void xenboot_write_console(struct console *console, const char *string,
-                                  unsigned len)
-{
-        unsigned int linelen, off = 0;
-        const char *pos;
-
-        raw_console_write(string, len);
-
-        write_console(0, "(early) ", 8);
-        while (off < len && NULL != (pos = strchr(string+off, '\n'))) {
-                linelen = pos-string+off;
-                if (off + linelen > len)
-                        break;
-                write_console(0, string+off, linelen);
-                write_console(0, "\r\n", 2);
-                off += linelen + 1;
-        }
-        if (off < len)
-                write_console(0, string+off, len-off);
-}
-
-struct console xenboot_console = {
-        .name           = "xenboot",
-        .write          = xenboot_write_console,
-        .flags          = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME,
-};
-#endif  /* CONFIG_EARLY_PRINTK */
-
-void xen_raw_console_write(const char *str)
-{
-        raw_console_write(str, strlen(str));
-}
-
-void xen_raw_printk(const char *fmt, ...)
-{
-        static char buf[512];
-        va_list ap;
-
-        va_start(ap, fmt);
-        vsnprintf(buf, sizeof(buf), fmt, ap);
-        va_end(ap);
-
-        xen_raw_console_write(buf);
-}
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
deleted file mode 100644
index bedc6c1b6fa5..000000000000
--- a/drivers/char/hvcs.c
+++ /dev/null
@@ -1,1604 +0,0 @@
-/*
- * IBM eServer Hypervisor Virtual Console Server Device Driver
- * Copyright (C) 2003, 2004 IBM Corp.
- *  Ryan S. Arnold (rsa@us.ibm.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * Author(s) :  Ryan S. Arnold <rsa@us.ibm.com>
- *
- * This is the device driver for the IBM Hypervisor Virtual Console Server,
- * "hvcs".  The IBM hvcs provides a tty driver interface to allow Linux
- * user space applications access to the system consoles of logically
- * partitioned operating systems, e.g. Linux, running on the same partitioned
- * Power5 ppc64 system.  Physical hardware consoles per partition are not
- * practical on this hardware so system consoles are accessed by this driver
- * using inter-partition firmware interfaces to virtual terminal devices.
- *
- * A vty is known to the HMC as a "virtual serial server adapter".  It is a
- * virtual terminal device that is created by firmware upon partition creation
- * to act as a partitioned OS's console device.
- *
- * Firmware dynamically (via hotplug) exposes vty-servers to a running ppc64
- * Linux system upon their creation by the HMC or their exposure during boot.
- * The non-user interactive backend of this driver is implemented as a vio
- * device driver so that it can receive notification of vty-server lifetimes
- * after it registers with the vio bus to handle vty-server probe and remove
- * callbacks.
- *
- * Many vty-servers can be configured to connect to one vty, but a vty can
- * only be actively connected to by a single vty-server, in any manner, at one
- * time.  If the HMC is currently hosting the console for a target Linux
- * partition; attempts to open the tty device to the partition's console using
- * the hvcs on any partition will return -EBUSY with every open attempt until
- * the HMC frees the connection between its vty-server and the desired
- * partition's vty device.  Conversely, a vty-server may only be connected to
- * a single vty at one time even though it may have several configured vty
- * partner possibilities.
- *
- * Firmware does not provide notification of vty partner changes to this
- * driver.  This means that an HMC Super Admin may add or remove partner vtys
- * from a vty-server's partner list but the changes will not be signaled to
- * the vty-server.  Firmware only notifies the driver when a vty-server is
- * added or removed from the system.  To compensate for this deficiency, this
- * driver implements a sysfs update attribute which provides a method for
- * rescanning partner information upon a user's request.
- *
- * Each vty-server, prior to being exposed to this driver is reference counted
- * using the 2.6 Linux kernel kref construct.
- *
- * For direction on installation and usage of this driver please reference
- * Documentation/powerpc/hvcs.txt.
- */
-
-#include <linux/device.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/kref.h>
-#include <linux/kthread.h>
-#include <linux/list.h>
-#include <linux/major.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/stat.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <asm/hvconsole.h>
-#include <asm/hvcserver.h>
-#include <asm/uaccess.h>
-#include <asm/vio.h>
-
-/*
- * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
- * Removed braces around single statements following conditionals.  Removed '=
- * 0' after static int declarations since these default to zero.  Removed
- * list_for_each_safe() and replaced with list_for_each_entry() in
- * hvcs_get_by_index().  The 'safe' version is un-needed now that the driver is
- * using spinlocks.  Changed spin_lock_irqsave() to spin_lock() when locking
- * hvcs_structs_lock and hvcs_pi_lock since these are not touched in an int
- * handler.  Initialized hvcs_structs_lock and hvcs_pi_lock to
- * SPIN_LOCK_UNLOCKED at declaration time rather than in hvcs_module_init().
- * Added spin_lock around list_del() in destroy_hvcs_struct() to protect the
- * list traversals from a deletion.  Removed '= NULL' from pointer declaration
- * statements since they are initialized NULL by default.  Removed wmb()
- * instances from hvcs_try_write().  They probably aren't needed with locking in
- * place.  Added check and cleanup for hvcs_pi_buff = kmalloc() in
- * hvcs_module_init().  Exposed hvcs_struct.index via a sysfs attribute so that
- * the coupling between /dev/hvcs* and a vty-server can be automatically
- * determined.  Moved kobject_put() in hvcs_open outside of the
- * spin_unlock_irqrestore().
- *
- * 1.3.1 -> 1.3.2 Changed method for determining hvcs_struct->index and had it
- * align with how the tty layer always assigns the lowest index available.  This
- * change resulted in a list of ints that denotes which indexes are available.
- * Device additions and removals use the new hvcs_get_index() and
- * hvcs_return_index() helper functions.  The list is created with
- * hvsc_alloc_index_list() and it is destroyed with hvcs_free_index_list().
- * Without these fixes hotplug vty-server adapter support goes crazy with this
- * driver if the user removes a vty-server adapter.  Moved free_irq() outside of
- * the hvcs_final_close() function in order to get it out of the spinlock.
- * Rearranged hvcs_close().  Cleaned up some printks and did some housekeeping
- * on the changelog.  Removed local CLC_LENGTH and used HVCS_CLC_LENGTH from
- * arch/powerepc/include/asm/hvcserver.h
- *
- * 1.3.2 -> 1.3.3 Replaced yield() in hvcs_close() with tty_wait_until_sent() to
- * prevent possible lockup with realtime scheduling as similarily pointed out by
- * akpm in hvc_console.  Changed resulted in the removal of hvcs_final_close()
- * to reorder cleanup operations and prevent discarding of pending data during
- * an hvcs_close().  Removed spinlock protection of hvcs_struct data members in
- * hvcs_write_room() and hvcs_chars_in_buffer() because they aren't needed.
- */
-
-#define HVCS_DRIVER_VERSION "1.3.3"
-
-MODULE_AUTHOR("Ryan S. Arnold <rsa@us.ibm.com>");
-MODULE_DESCRIPTION("IBM hvcs (Hypervisor Virtual Console Server) Driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(HVCS_DRIVER_VERSION);
-
-/*
- * Wait this long per iteration while trying to push buffered data to the
- * hypervisor before allowing the tty to complete a close operation.
- */
-#define HVCS_CLOSE_WAIT (HZ/100) /* 1/10 of a second */
-
-/*
- * Since the Linux TTY code does not currently (2-04-2004) support dynamic
- * addition of tty derived devices and we shouldn't allocate thousands of
- * tty_device pointers when the number of vty-server & vty partner connections
- * will most often be much lower than this, we'll arbitrarily allocate
- * HVCS_DEFAULT_SERVER_ADAPTERS tty_structs and cdev's by default when we
- * register the tty_driver. This can be overridden using an insmod parameter.
- */
-#define HVCS_DEFAULT_SERVER_ADAPTERS    64
-
-/*
- * The user can't insmod with more than HVCS_MAX_SERVER_ADAPTERS hvcs device
- * nodes as a sanity check.  Theoretically there can be over 1 Billion
- * vty-server & vty partner connections.
- */
-#define HVCS_MAX_SERVER_ADAPTERS        1024
-
-/*
- * We let Linux assign us a major number and we start the minors at zero.  There
- * is no intuitive mapping between minor number and the target vty-server
- * adapter except that each new vty-server adapter is always assigned to the
- * smallest minor number available.
- */
-#define HVCS_MINOR_START        0
-
-/*
- * The hcall interface involves putting 8 chars into each of two registers.
- * We load up those 2 registers (in arch/powerpc/platforms/pseries/hvconsole.c)
- * by casting char[16] to long[2].  It would work without __ALIGNED__, but a 
- * little (tiny) bit slower because an unaligned load is slower than aligned 
- * load.
- */
-#define __ALIGNED__     __attribute__((__aligned__(8)))
-
-/*
- * How much data can firmware send with each hvc_put_chars()?  Maybe this
- * should be moved into an architecture specific area.
- */
-#define HVCS_BUFF_LEN   16
-
-/*
- * This is the maximum amount of data we'll let the user send us (hvcs_write) at
- * once in a chunk as a sanity check.
- */
-#define HVCS_MAX_FROM_USER      4096
-
-/*
- * Be careful when adding flags to this line discipline.  Don't add anything
- * that will cause echoing or we'll go into recursive loop echoing chars back
- * and forth with the console drivers.
- */
-static struct ktermios hvcs_tty_termios = {
-        .c_iflag = IGNBRK | IGNPAR,
-        .c_oflag = OPOST,
-        .c_cflag = B38400 | CS8 | CREAD | HUPCL,
-        .c_cc = INIT_C_CC,
-        .c_ispeed = 38400,
-        .c_ospeed = 38400
-};
-
-/*
- * This value is used to take the place of a command line parameter when the
- * module is inserted.  It starts as -1 and stays as such if the user doesn't
- * specify a module insmod parameter.  If they DO specify one then it is set to
- * the value of the integer passed in.
- */
-static int hvcs_parm_num_devs = -1;
-module_param(hvcs_parm_num_devs, int, 0);
-
-static const char hvcs_driver_name[] = "hvcs";
-static const char hvcs_device_node[] = "hvcs";
-static const char hvcs_driver_string[]
-        = "IBM hvcs (Hypervisor Virtual Console Server) Driver";
-
-/* Status of partner info rescan triggered via sysfs. */
-static int hvcs_rescan_status;
-
-static struct tty_driver *hvcs_tty_driver;
-
-/*
- * In order to be somewhat sane this driver always associates the hvcs_struct
- * index element with the numerically equal tty->index.  This means that a
- * hotplugged vty-server adapter will always map to the lowest index valued
- * device node.  If vty-servers were hotplug removed from the system and then
- * new ones added the new vty-server may have the largest slot number of all
- * the vty-server adapters in the partition but it may have the lowest dev node
- * index of all the adapters due to the hole left by the hotplug removed
- * adapter.  There are a set of functions provided to get the lowest index for
- * a new device as well as return the index to the list.  This list is allocated
- * with a number of elements equal to the number of device nodes requested when
- * the module was inserted.
- */
-static int *hvcs_index_list;
-
-/*
- * How large is the list?  This is kept for traversal since the list is
- * dynamically created.
- */
-static int hvcs_index_count;
-
-/*
- * Used by the khvcsd to pick up I/O operations when the kernel_thread is
- * already awake but potentially shifted to TASK_INTERRUPTIBLE state.
- */
-static int hvcs_kicked;
-
-/*
- * Use by the kthread construct for task operations like waking the sleeping
- * thread and stopping the kthread.
- */
-static struct task_struct *hvcs_task;
-
-/*
- * We allocate this for the use of all of the hvcs_structs when they fetch
- * partner info.
- */
-static unsigned long *hvcs_pi_buff;
-
-/* Only allow one hvcs_struct to use the hvcs_pi_buff at a time. */
-static DEFINE_SPINLOCK(hvcs_pi_lock);
-
-/* One vty-server per hvcs_struct */
-struct hvcs_struct {
-        spinlock_t lock;
-
-        /*
-         * This index identifies this hvcs device as the complement to a
-         * specific tty index.
-         */
-        unsigned int index;
-
-        struct tty_struct *tty;
-        int open_count;
-
-        /*
-         * Used to tell the driver kernel_thread what operations need to take
-         * place upon this hvcs_struct instance.
-         */
-        int todo_mask;
-
-        /*
-         * This buffer is required so that when hvcs_write_room() reports that
-         * it can send HVCS_BUFF_LEN characters that it will buffer the full
-         * HVCS_BUFF_LEN characters if need be.  This is essential for opost
-         * writes since they do not do high level buffering and expect to be
-         * able to send what the driver commits to sending buffering
-         * [e.g. tab to space conversions in n_tty.c opost()].
-         */
-        char buffer[HVCS_BUFF_LEN];
-        int chars_in_buffer;
-
-        /*
-         * Any variable below the kref is valid before a tty is connected and
-         * stays valid after the tty is disconnected.  These shouldn't be
-         * whacked until the koject refcount reaches zero though some entries
-         * may be changed via sysfs initiatives.
-         */
-        struct kref kref; /* ref count & hvcs_struct lifetime */
-        int connected; /* is the vty-server currently connected to a vty? */
-        uint32_t p_unit_address; /* partner unit address */
-        uint32_t p_partition_ID; /* partner partition ID */
-        char p_location_code[HVCS_CLC_LENGTH + 1]; /* CLC + Null Term */
-        struct list_head next; /* list management */
-        struct vio_dev *vdev;
-};
-
-/* Required to back map a kref to its containing object */
-#define from_kref(k) container_of(k, struct hvcs_struct, kref)
-
-static LIST_HEAD(hvcs_structs);
-static DEFINE_SPINLOCK(hvcs_structs_lock);
-
-static void hvcs_unthrottle(struct tty_struct *tty);
-static void hvcs_throttle(struct tty_struct *tty);
-static irqreturn_t hvcs_handle_interrupt(int irq, void *dev_instance);
-
-static int hvcs_write(struct tty_struct *tty,
-                const unsigned char *buf, int count);
-static int hvcs_write_room(struct tty_struct *tty);
-static int hvcs_chars_in_buffer(struct tty_struct *tty);
-
-static int hvcs_has_pi(struct hvcs_struct *hvcsd);
-static void hvcs_set_pi(struct hvcs_partner_info *pi,
-                struct hvcs_struct *hvcsd);
-static int hvcs_get_pi(struct hvcs_struct *hvcsd);
-static int hvcs_rescan_devices_list(void);
-
-static int hvcs_partner_connect(struct hvcs_struct *hvcsd);
-static void hvcs_partner_free(struct hvcs_struct *hvcsd);
-
-static int hvcs_enable_device(struct hvcs_struct *hvcsd,
-                uint32_t unit_address, unsigned int irq, struct vio_dev *dev);
-
-static int hvcs_open(struct tty_struct *tty, struct file *filp);
-static void hvcs_close(struct tty_struct *tty, struct file *filp);
-static void hvcs_hangup(struct tty_struct * tty);
-
-static int __devinit hvcs_probe(struct vio_dev *dev,
-                const struct vio_device_id *id);
-static int __devexit hvcs_remove(struct vio_dev *dev);
-static int __init hvcs_module_init(void);
-static void __exit hvcs_module_exit(void);
-
-#define HVCS_SCHED_READ 0x00000001
-#define HVCS_QUICK_READ 0x00000002
-#define HVCS_TRY_WRITE  0x00000004
-#define HVCS_READ_MASK  (HVCS_SCHED_READ | HVCS_QUICK_READ)
-
-static inline struct hvcs_struct *from_vio_dev(struct vio_dev *viod)
-{
-        return dev_get_drvdata(&viod->dev);
-}
-/* The sysfs interface for the driver and devices */
-
-static ssize_t hvcs_partner_vtys_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct vio_dev *viod = to_vio_dev(dev);
-        struct hvcs_struct *hvcsd = from_vio_dev(viod);
-        unsigned long flags;
-        int retval;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        retval = sprintf(buf, "%X\n", hvcsd->p_unit_address);
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        return retval;
-}
-static DEVICE_ATTR(partner_vtys, S_IRUGO, hvcs_partner_vtys_show, NULL);
-
-static ssize_t hvcs_partner_clcs_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct vio_dev *viod = to_vio_dev(dev);
-        struct hvcs_struct *hvcsd = from_vio_dev(viod);
-        unsigned long flags;
-        int retval;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        retval = sprintf(buf, "%s\n", &hvcsd->p_location_code[0]);
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        return retval;
-}
-static DEVICE_ATTR(partner_clcs, S_IRUGO, hvcs_partner_clcs_show, NULL);
-
-static ssize_t hvcs_current_vty_store(struct device *dev, struct device_attribute *attr, const char * buf,
-                size_t count)
-{
-        /*
-         * Don't need this feature at the present time because firmware doesn't
-         * yet support multiple partners.
-         */
-        printk(KERN_INFO "HVCS: Denied current_vty change: -EPERM.\n");
-        return -EPERM;
-}
-
-static ssize_t hvcs_current_vty_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct vio_dev *viod = to_vio_dev(dev);
-        struct hvcs_struct *hvcsd = from_vio_dev(viod);
-        unsigned long flags;
-        int retval;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        retval = sprintf(buf, "%s\n", &hvcsd->p_location_code[0]);
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        return retval;
-}
-
-static DEVICE_ATTR(current_vty,
-        S_IRUGO | S_IWUSR, hvcs_current_vty_show, hvcs_current_vty_store);
-
-static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribute *attr, const char *buf,
-                size_t count)
-{
-        struct vio_dev *viod = to_vio_dev(dev);
-        struct hvcs_struct *hvcsd = from_vio_dev(viod);
-        unsigned long flags;
-
-        /* writing a '0' to this sysfs entry will result in the disconnect. */
-        if (simple_strtol(buf, NULL, 0) != 0)
-                return -EINVAL;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-
-        if (hvcsd->open_count > 0) {
-                spin_unlock_irqrestore(&hvcsd->lock, flags);
-                printk(KERN_INFO "HVCS: vterm state unchanged.  "
-                                "The hvcs device node is still in use.\n");
-                return -EPERM;
-        }
-
-        if (hvcsd->connected == 0) {
-                spin_unlock_irqrestore(&hvcsd->lock, flags);
-                printk(KERN_INFO "HVCS: vterm state unchanged. The"
-                                " vty-server is not connected to a vty.\n");
-                return -EPERM;
-        }
-
-        hvcs_partner_free(hvcsd);
-        printk(KERN_INFO "HVCS: Closed vty-server@%X and"
-                        " partner vty@%X:%d connection.\n",
-                        hvcsd->vdev->unit_address,
-                        hvcsd->p_unit_address,
-                        (uint32_t)hvcsd->p_partition_ID);
-
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        return count;
-}
-
-static ssize_t hvcs_vterm_state_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct vio_dev *viod = to_vio_dev(dev);
-        struct hvcs_struct *hvcsd = from_vio_dev(viod);
-        unsigned long flags;
-        int retval;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        retval = sprintf(buf, "%d\n", hvcsd->connected);
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        return retval;
-}
-static DEVICE_ATTR(vterm_state, S_IRUGO | S_IWUSR,
-                hvcs_vterm_state_show, hvcs_vterm_state_store);
-
-static ssize_t hvcs_index_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct vio_dev *viod = to_vio_dev(dev);
-        struct hvcs_struct *hvcsd = from_vio_dev(viod);
-        unsigned long flags;
-        int retval;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        retval = sprintf(buf, "%d\n", hvcsd->index);
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        return retval;
-}
-
-static DEVICE_ATTR(index, S_IRUGO, hvcs_index_show, NULL);
-
-static struct attribute *hvcs_attrs[] = {
-        &dev_attr_partner_vtys.attr,
-        &dev_attr_partner_clcs.attr,
-        &dev_attr_current_vty.attr,
-        &dev_attr_vterm_state.attr,
-        &dev_attr_index.attr,
-        NULL,
-};
-
-static struct attribute_group hvcs_attr_group = {
-        .attrs = hvcs_attrs,
-};
-
-static ssize_t hvcs_rescan_show(struct device_driver *ddp, char *buf)
-{
-        /* A 1 means it is updating, a 0 means it is done updating */
-        return snprintf(buf, PAGE_SIZE, "%d\n", hvcs_rescan_status);
-}
-
-static ssize_t hvcs_rescan_store(struct device_driver *ddp, const char * buf,
-                size_t count)
-{
-        if ((simple_strtol(buf, NULL, 0) != 1)
-                && (hvcs_rescan_status != 0))
-                return -EINVAL;
-
-        hvcs_rescan_status = 1;
-        printk(KERN_INFO "HVCS: rescanning partner info for all"
-                " vty-servers.\n");
-        hvcs_rescan_devices_list();
-        hvcs_rescan_status = 0;
-        return count;
-}
-
-static DRIVER_ATTR(rescan,
-        S_IRUGO | S_IWUSR, hvcs_rescan_show, hvcs_rescan_store);
-
-static void hvcs_kick(void)
-{
-        hvcs_kicked = 1;
-        wmb();
-        wake_up_process(hvcs_task);
-}
-
-static void hvcs_unthrottle(struct tty_struct *tty)
-{
-        struct hvcs_struct *hvcsd = tty->driver_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        hvcsd->todo_mask |= HVCS_SCHED_READ;
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        hvcs_kick();
-}
-
-static void hvcs_throttle(struct tty_struct *tty)
-{
-        struct hvcs_struct *hvcsd = tty->driver_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        vio_disable_interrupts(hvcsd->vdev);
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-}
-
-/*
- * If the device is being removed we don't have to worry about this interrupt
- * handler taking any further interrupts because they are disabled which means
- * the hvcs_struct will always be valid in this handler.
- */
-static irqreturn_t hvcs_handle_interrupt(int irq, void *dev_instance)
-{
-        struct hvcs_struct *hvcsd = dev_instance;
-
-        spin_lock(&hvcsd->lock);
-        vio_disable_interrupts(hvcsd->vdev);
-        hvcsd->todo_mask |= HVCS_SCHED_READ;
-        spin_unlock(&hvcsd->lock);
-        hvcs_kick();
-
-        return IRQ_HANDLED;
-}
-
-/* This function must be called with the hvcsd->lock held */
-static void hvcs_try_write(struct hvcs_struct *hvcsd)
-{
-        uint32_t unit_address = hvcsd->vdev->unit_address;
-        struct tty_struct *tty = hvcsd->tty;
-        int sent;
-
-        if (hvcsd->todo_mask & HVCS_TRY_WRITE) {
-                /* won't send partial writes */
-                sent = hvc_put_chars(unit_address,
-                                &hvcsd->buffer[0],
-                                hvcsd->chars_in_buffer );
-                if (sent > 0) {
-                        hvcsd->chars_in_buffer = 0;
-                        /* wmb(); */
-                        hvcsd->todo_mask &= ~(HVCS_TRY_WRITE);
-                        /* wmb(); */
-
-                        /*
-                         * We are still obligated to deliver the data to the
-                         * hypervisor even if the tty has been closed because
-                         * we commited to delivering it.  But don't try to wake
-                         * a non-existent tty.
-                         */
-                        if (tty) {
-                                tty_wakeup(tty);
-                        }
-                }
-        }
-}
-
-static int hvcs_io(struct hvcs_struct *hvcsd)
-{
-        uint32_t unit_address;
-        struct tty_struct *tty;
-        char buf[HVCS_BUFF_LEN] __ALIGNED__;
-        unsigned long flags;
-        int got = 0;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-
-        unit_address = hvcsd->vdev->unit_address;
-        tty = hvcsd->tty;
-
-        hvcs_try_write(hvcsd);
-
-        if (!tty || test_bit(TTY_THROTTLED, &tty->flags)) {
-                hvcsd->todo_mask &= ~(HVCS_READ_MASK);
-                goto bail;
-        } else if (!(hvcsd->todo_mask & (HVCS_READ_MASK)))
-                goto bail;
-
-        /* remove the read masks */
-        hvcsd->todo_mask &= ~(HVCS_READ_MASK);
-
-        if (tty_buffer_request_room(tty, HVCS_BUFF_LEN) >= HVCS_BUFF_LEN) {
-                got = hvc_get_chars(unit_address,
-                                &buf[0],
-                                HVCS_BUFF_LEN);
-                tty_insert_flip_string(tty, buf, got);
-        }
-
-        /* Give the TTY time to process the data we just sent. */
-        if (got)
-                hvcsd->todo_mask |= HVCS_QUICK_READ;
-
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        /* This is synch because tty->low_latency == 1 */
-        if(got)
-                tty_flip_buffer_push(tty);
-
-        if (!got) {
-                /* Do this _after_ the flip_buffer_push */
-                spin_lock_irqsave(&hvcsd->lock, flags);
-                vio_enable_interrupts(hvcsd->vdev);
-                spin_unlock_irqrestore(&hvcsd->lock, flags);
-        }
-
-        return hvcsd->todo_mask;
-
- bail:
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        return hvcsd->todo_mask;
-}
-
-static int khvcsd(void *unused)
-{
-        struct hvcs_struct *hvcsd;
-        int hvcs_todo_mask;
-
-        __set_current_state(TASK_RUNNING);
-
-        do {
-                hvcs_todo_mask = 0;
-                hvcs_kicked = 0;
-                wmb();
-
-                spin_lock(&hvcs_structs_lock);
-                list_for_each_entry(hvcsd, &hvcs_structs, next) {
-                        hvcs_todo_mask |= hvcs_io(hvcsd);
-                }
-                spin_unlock(&hvcs_structs_lock);
-
-                /*
-                 * If any of the hvcs adapters want to try a write or quick read
-                 * don't schedule(), yield a smidgen then execute the hvcs_io
-                 * thread again for those that want the write.
-                 */
-                 if (hvcs_todo_mask & (HVCS_TRY_WRITE | HVCS_QUICK_READ)) {
-                        yield();
-                        continue;
-                }
-
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (!hvcs_kicked)
-                        schedule();
-                __set_current_state(TASK_RUNNING);
-        } while (!kthread_should_stop());
-
-        return 0;
-}
-
-static struct vio_device_id hvcs_driver_table[] __devinitdata= {
-        {"serial-server", "hvterm2"},
-        { "", "" }
-};
-MODULE_DEVICE_TABLE(vio, hvcs_driver_table);
-
-static void hvcs_return_index(int index)
-{
-        /* Paranoia check */
-        if (!hvcs_index_list)
-                return;
-        if (index < 0 || index >= hvcs_index_count)
-                return;
-        if (hvcs_index_list[index] == -1)
-                return;
-        else
-                hvcs_index_list[index] = -1;
-}
-
-/* callback when the kref ref count reaches zero */
-static void destroy_hvcs_struct(struct kref *kref)
-{
-        struct hvcs_struct *hvcsd = from_kref(kref);
-        struct vio_dev *vdev;
-        unsigned long flags;
-
-        spin_lock(&hvcs_structs_lock);
-        spin_lock_irqsave(&hvcsd->lock, flags);
-
-        /* the list_del poisons the pointers */
-        list_del(&(hvcsd->next));
-
-        if (hvcsd->connected == 1) {
-                hvcs_partner_free(hvcsd);
-                printk(KERN_INFO "HVCS: Closed vty-server@%X and"
-                                " partner vty@%X:%d connection.\n",
-                                hvcsd->vdev->unit_address,
-                                hvcsd->p_unit_address,
-                                (uint32_t)hvcsd->p_partition_ID);
-        }
-        printk(KERN_INFO "HVCS: Destroyed hvcs_struct for vty-server@%X.\n",
-                        hvcsd->vdev->unit_address);
-
-        vdev = hvcsd->vdev;
-        hvcsd->vdev = NULL;
-
-        hvcsd->p_unit_address = 0;
-        hvcsd->p_partition_ID = 0;
-        hvcs_return_index(hvcsd->index);
-        memset(&hvcsd->p_location_code[0], 0x00, HVCS_CLC_LENGTH + 1);
-
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        spin_unlock(&hvcs_structs_lock);
-
-        sysfs_remove_group(&vdev->dev.kobj, &hvcs_attr_group);
-
-        kfree(hvcsd);
-}
-
-static int hvcs_get_index(void)
-{
-        int i;
-        /* Paranoia check */
-        if (!hvcs_index_list) {
-                printk(KERN_ERR "HVCS: hvcs_index_list NOT valid!.\n");
-                return -EFAULT;
-        }
-        /* Find the numerically lowest first free index. */
-        for(i = 0; i < hvcs_index_count; i++) {
-                if (hvcs_index_list[i] == -1) {
-                        hvcs_index_list[i] = 0;
-                        return i;
-                }
-        }
-        return -1;
-}
-
-static int __devinit hvcs_probe(
-        struct vio_dev *dev,
-        const struct vio_device_id *id)
-{
-        struct hvcs_struct *hvcsd;
-        int index;
-        int retval;
-
-        if (!dev || !id) {
-                printk(KERN_ERR "HVCS: probed with invalid parameter.\n");
-                return -EPERM;
-        }
-
-        /* early to avoid cleanup on failure */
-        index = hvcs_get_index();
-        if (index < 0) {
-                return -EFAULT;
-        }
-
-        hvcsd = kzalloc(sizeof(*hvcsd), GFP_KERNEL);
-        if (!hvcsd)
-                return -ENODEV;
-
-
-        spin_lock_init(&hvcsd->lock);
-        /* Automatically incs the refcount the first time */
-        kref_init(&hvcsd->kref);
-
-        hvcsd->vdev = dev;
-        dev_set_drvdata(&dev->dev, hvcsd);
-
-        hvcsd->index = index;
-
-        /* hvcsd->index = ++hvcs_struct_count; */
-        hvcsd->chars_in_buffer = 0;
-        hvcsd->todo_mask = 0;
-        hvcsd->connected = 0;
-
-        /*
-         * This will populate the hvcs_struct's partner info fields for the
-         * first time.
-         */
-        if (hvcs_get_pi(hvcsd)) {
-                printk(KERN_ERR "HVCS: Failed to fetch partner"
-                        " info for vty-server@%X on device probe.\n",
-                        hvcsd->vdev->unit_address);
-        }
-
-        /*
-         * If a user app opens a tty that corresponds to this vty-server before
-         * the hvcs_struct has been added to the devices list then the user app
-         * will get -ENODEV.
-         */
-        spin_lock(&hvcs_structs_lock);
-        list_add_tail(&(hvcsd->next), &hvcs_structs);
-        spin_unlock(&hvcs_structs_lock);
-
-        retval = sysfs_create_group(&dev->dev.kobj, &hvcs_attr_group);
-        if (retval) {
-                printk(KERN_ERR "HVCS: Can't create sysfs attrs for vty-server@%X\n",
-                       hvcsd->vdev->unit_address);
-                return retval;
-        }
-
-        printk(KERN_INFO "HVCS: vty-server@%X added to the vio bus.\n", dev->unit_address);
-
-        /*
-         * DON'T enable interrupts here because there is no user to receive the
-         * data.
-         */
-        return 0;
-}
-
-static int __devexit hvcs_remove(struct vio_dev *dev)
-{
-        struct hvcs_struct *hvcsd = dev_get_drvdata(&dev->dev);
-        unsigned long flags;
-        struct tty_struct *tty;
-
-        if (!hvcsd)
-                return -ENODEV;
-
-        /* By this time the vty-server won't be getting any more interrupts */
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-
-        tty = hvcsd->tty;
-
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-        /*
-         * Let the last holder of this object cause it to be removed, which
-         * would probably be tty_hangup below.
-         */
-        kref_put(&hvcsd->kref, destroy_hvcs_struct);
-
-        /*
-         * The hangup is a scheduled function which will auto chain call
-         * hvcs_hangup.  The tty should always be valid at this time unless a
-         * simultaneous tty close already cleaned up the hvcs_struct.
-         */
-        if (tty)
-                tty_hangup(tty);
-
-        printk(KERN_INFO "HVCS: vty-server@%X removed from the"
-                        " vio bus.\n", dev->unit_address);
-        return 0;
-};
-
-static struct vio_driver hvcs_vio_driver = {
-        .id_table       = hvcs_driver_table,
-        .probe          = hvcs_probe,
-        .remove         = __devexit_p(hvcs_remove),
-        .driver         = {
-                .name   = hvcs_driver_name,
-                .owner  = THIS_MODULE,
-        }
-};
-
-/* Only called from hvcs_get_pi please */
-static void hvcs_set_pi(struct hvcs_partner_info *pi, struct hvcs_struct *hvcsd)
-{
-        int clclength;
-
-        hvcsd->p_unit_address = pi->unit_address;
-        hvcsd->p_partition_ID  = pi->partition_ID;
-        clclength = strlen(&pi->location_code[0]);
-        if (clclength > HVCS_CLC_LENGTH)
-                clclength = HVCS_CLC_LENGTH;
-
-        /* copy the null-term char too */
-        strncpy(&hvcsd->p_location_code[0],
-                        &pi->location_code[0], clclength + 1);
-}
-
-/*
- * Traverse the list and add the partner info that is found to the hvcs_struct
- * struct entry. NOTE: At this time I know that partner info will return a
- * single entry but in the future there may be multiple partner info entries per
- * vty-server and you'll want to zero out that list and reset it.  If for some
- * reason you have an old version of this driver but there IS more than one
- * partner info then hvcsd->p_* will hold the last partner info data from the
- * firmware query.  A good way to update this code would be to replace the three
- * partner info fields in hvcs_struct with a list of hvcs_partner_info
- * instances.
- *
- * This function must be called with the hvcsd->lock held.
- */
-static int hvcs_get_pi(struct hvcs_struct *hvcsd)
-{
-        struct hvcs_partner_info *pi;
-        uint32_t unit_address = hvcsd->vdev->unit_address;
-        struct list_head head;
-        int retval;
-
-        spin_lock(&hvcs_pi_lock);
-        if (!hvcs_pi_buff) {
-                spin_unlock(&hvcs_pi_lock);
-                return -EFAULT;
-        }
-        retval = hvcs_get_partner_info(unit_address, &head, hvcs_pi_buff);
-        spin_unlock(&hvcs_pi_lock);
-        if (retval) {
-                printk(KERN_ERR "HVCS: Failed to fetch partner"
-                        " info for vty-server@%x.\n", unit_address);
-                return retval;
-        }
-
-        /* nixes the values if the partner vty went away */
-        hvcsd->p_unit_address = 0;
-        hvcsd->p_partition_ID = 0;
-
-        list_for_each_entry(pi, &head, node)
-                hvcs_set_pi(pi, hvcsd);
-
-        hvcs_free_partner_info(&head);
-        return 0;
-}
-
-/*
- * This function is executed by the driver "rescan" sysfs entry.  It shouldn't
- * be executed elsewhere, in order to prevent deadlock issues.
- */
-static int hvcs_rescan_devices_list(void)
-{
-        struct hvcs_struct *hvcsd;
-        unsigned long flags;
-
-        spin_lock(&hvcs_structs_lock);
-
-        list_for_each_entry(hvcsd, &hvcs_structs, next) {
-                spin_lock_irqsave(&hvcsd->lock, flags);
-                hvcs_get_pi(hvcsd);
-                spin_unlock_irqrestore(&hvcsd->lock, flags);
-        }
-
-        spin_unlock(&hvcs_structs_lock);
-
-        return 0;
-}
-
-/*
- * Farm this off into its own function because it could be more complex once
- * multiple partners support is added. This function should be called with
- * the hvcsd->lock held.
- */
-static int hvcs_has_pi(struct hvcs_struct *hvcsd)
-{
-        if ((!hvcsd->p_unit_address) || (!hvcsd->p_partition_ID))
-                return 0;
-        return 1;
-}
-
-/*
- * NOTE: It is possible that the super admin removed a partner vty and then
- * added a different vty as the new partner.
- *
- * This function must be called with the hvcsd->lock held.
- */
-static int hvcs_partner_connect(struct hvcs_struct *hvcsd)
-{
-        int retval;
-        unsigned int unit_address = hvcsd->vdev->unit_address;
-
-        /*
-         * If there wasn't any pi when the device was added it doesn't meant
-         * there isn't any now.  This driver isn't notified when a new partner
-         * vty is added to a vty-server so we discover changes on our own.
-         * Please see comments in hvcs_register_connection() for justification
-         * of this bizarre code.
-         */
-        retval = hvcs_register_connection(unit_address,
-                        hvcsd->p_partition_ID,
-                        hvcsd->p_unit_address);
-        if (!retval) {
-                hvcsd->connected = 1;
-                return 0;
-        } else if (retval != -EINVAL)
-                return retval;
-
-        /*
-         * As per the spec re-get the pi and try again if -EINVAL after the
-         * first connection attempt.
-         */
-        if (hvcs_get_pi(hvcsd))
-                return -ENOMEM;
-
-        if (!hvcs_has_pi(hvcsd))
-                return -ENODEV;
-
-        retval = hvcs_register_connection(unit_address,
-                        hvcsd->p_partition_ID,
-                        hvcsd->p_unit_address);
-        if (retval != -EINVAL) {
-                hvcsd->connected = 1;
-                return retval;
-        }
-
-        /*
-         * EBUSY is the most likely scenario though the vty could have been
-         * removed or there really could be an hcall error due to the parameter
-         * data but thanks to ambiguous firmware return codes we can't really
-         * tell.
-         */
-        printk(KERN_INFO "HVCS: vty-server or partner"
-                        " vty is busy.  Try again later.\n");
-        return -EBUSY;
-}
-
-/* This function must be called with the hvcsd->lock held */
-static void hvcs_partner_free(struct hvcs_struct *hvcsd)
-{
-        int retval;
-        do {
-                retval = hvcs_free_connection(hvcsd->vdev->unit_address);
-        } while (retval == -EBUSY);
-        hvcsd->connected = 0;
-}
-
-/* This helper function must be called WITHOUT the hvcsd->lock held */
-static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address,
-                unsigned int irq, struct vio_dev *vdev)
-{
-        unsigned long flags;
-        int rc;
-
-        /*
-         * It is possible that the vty-server was removed between the time that
-         * the conn was registered and now.
-         */
-        if (!(rc = request_irq(irq, &hvcs_handle_interrupt,
-                                IRQF_DISABLED, "ibmhvcs", hvcsd))) {
-                /*
-                 * It is possible the vty-server was removed after the irq was
-                 * requested but before we have time to enable interrupts.
-                 */
-                if (vio_enable_interrupts(vdev) == H_SUCCESS)
-                        return 0;
-                else {
-                        printk(KERN_ERR "HVCS: int enable failed for"
-                                        " vty-server@%X.\n", unit_address);
-                        free_irq(irq, hvcsd);
-                }
-        } else
-                printk(KERN_ERR "HVCS: irq req failed for"
-                                " vty-server@%X.\n", unit_address);
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        hvcs_partner_free(hvcsd);
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-        return rc;
-
-}
-
-/*
- * This always increments the kref ref count if the call is successful.
- * Please remember to dec when you are done with the instance.
- *
- * NOTICE: Do NOT hold either the hvcs_struct.lock or hvcs_structs_lock when
- * calling this function or you will get deadlock.
- */
-static struct hvcs_struct *hvcs_get_by_index(int index)
-{
-        struct hvcs_struct *hvcsd = NULL;
-        unsigned long flags;
-
-        spin_lock(&hvcs_structs_lock);
-        /* We can immediately discard OOB requests */
-        if (index >= 0 && index < HVCS_MAX_SERVER_ADAPTERS) {
-                list_for_each_entry(hvcsd, &hvcs_structs, next) {
-                        spin_lock_irqsave(&hvcsd->lock, flags);
-                        if (hvcsd->index == index) {
-                                kref_get(&hvcsd->kref);
-                                spin_unlock_irqrestore(&hvcsd->lock, flags);
-                                spin_unlock(&hvcs_structs_lock);
-                                return hvcsd;
-                        }
-                        spin_unlock_irqrestore(&hvcsd->lock, flags);
-                }
-                hvcsd = NULL;
-        }
-
-        spin_unlock(&hvcs_structs_lock);
-        return hvcsd;
-}
-
-/*
- * This is invoked via the tty_open interface when a user app connects to the
- * /dev node.
- */
-static int hvcs_open(struct tty_struct *tty, struct file *filp)
-{
-        struct hvcs_struct *hvcsd;
-        int rc, retval = 0;
-        unsigned long flags;
-        unsigned int irq;
-        struct vio_dev *vdev;
-        unsigned long unit_address;
-
-        if (tty->driver_data)
-                goto fast_open;
-
-        /*
-         * Is there a vty-server that shares the same index?
-         * This function increments the kref index.
-         */
-        if (!(hvcsd = hvcs_get_by_index(tty->index))) {
-                printk(KERN_WARNING "HVCS: open failed, no device associated"
-                                " with tty->index %d.\n", tty->index);
-                return -ENODEV;
-        }
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-
-        if (hvcsd->connected == 0)
-                if ((retval = hvcs_partner_connect(hvcsd)))
-                        goto error_release;
-
-        hvcsd->open_count = 1;
-        hvcsd->tty = tty;
-        tty->driver_data = hvcsd;
-
-        memset(&hvcsd->buffer[0], 0x00, HVCS_BUFF_LEN);
-
-        /*
-         * Save these in the spinlock for the enable operations that need them
-         * outside of the spinlock.
-         */
-        irq = hvcsd->vdev->irq;
-        vdev = hvcsd->vdev;
-        unit_address = hvcsd->vdev->unit_address;
-
-        hvcsd->todo_mask |= HVCS_SCHED_READ;
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-        /*
-         * This must be done outside of the spinlock because it requests irqs
-         * and will grab the spinlock and free the connection if it fails.
-         */
-        if (((rc = hvcs_enable_device(hvcsd, unit_address, irq, vdev)))) {
-                kref_put(&hvcsd->kref, destroy_hvcs_struct);
-                printk(KERN_WARNING "HVCS: enable device failed.\n");
-                return rc;
-        }
-
-        goto open_success;
-
-fast_open:
-        hvcsd = tty->driver_data;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        kref_get(&hvcsd->kref);
-        hvcsd->open_count++;
-        hvcsd->todo_mask |= HVCS_SCHED_READ;
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-open_success:
-        hvcs_kick();
-
-        printk(KERN_INFO "HVCS: vty-server@%X connection opened.\n",
-                hvcsd->vdev->unit_address );
-
-        return 0;
-
-error_release:
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        kref_put(&hvcsd->kref, destroy_hvcs_struct);
-
-        printk(KERN_WARNING "HVCS: partner connect failed.\n");
-        return retval;
-}
-
-static void hvcs_close(struct tty_struct *tty, struct file *filp)
-{
-        struct hvcs_struct *hvcsd;
-        unsigned long flags;
-        int irq = NO_IRQ;
-
-        /*
-         * Is someone trying to close the file associated with this device after
-         * we have hung up?  If so tty->driver_data wouldn't be valid.
-         */
-        if (tty_hung_up_p(filp))
-                return;
-
-        /*
-         * No driver_data means that this close was probably issued after a
-         * failed hvcs_open by the tty layer's release_dev() api and we can just
-         * exit cleanly.
-         */
-        if (!tty->driver_data)
-                return;
-
-        hvcsd = tty->driver_data;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        if (--hvcsd->open_count == 0) {
-
-                vio_disable_interrupts(hvcsd->vdev);
-
-                /*
-                 * NULL this early so that the kernel_thread doesn't try to
-                 * execute any operations on the TTY even though it is obligated
-                 * to deliver any pending I/O to the hypervisor.
-                 */
-                hvcsd->tty = NULL;
-
-                irq = hvcsd->vdev->irq;
-                spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-                tty_wait_until_sent(tty, HVCS_CLOSE_WAIT);
-
-                /*
-                 * This line is important because it tells hvcs_open that this
-                 * device needs to be re-configured the next time hvcs_open is
-                 * called.
-                 */
-                tty->driver_data = NULL;
-
-                free_irq(irq, hvcsd);
-                kref_put(&hvcsd->kref, destroy_hvcs_struct);
-                return;
-        } else if (hvcsd->open_count < 0) {
-                printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
-                                " is missmanaged.\n",
-                hvcsd->vdev->unit_address, hvcsd->open_count);
-        }
-
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        kref_put(&hvcsd->kref, destroy_hvcs_struct);
-}
-
-static void hvcs_hangup(struct tty_struct * tty)
-{
-        struct hvcs_struct *hvcsd = tty->driver_data;
-        unsigned long flags;
-        int temp_open_count;
-        int irq = NO_IRQ;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        /* Preserve this so that we know how many kref refs to put */
-        temp_open_count = hvcsd->open_count;
-
-        /*
-         * Don't kref put inside the spinlock because the destruction
-         * callback may use the spinlock and it may get called before the
-         * spinlock has been released.
-         */
-        vio_disable_interrupts(hvcsd->vdev);
-
-        hvcsd->todo_mask = 0;
-
-        /* I don't think the tty needs the hvcs_struct pointer after a hangup */
-        hvcsd->tty->driver_data = NULL;
-        hvcsd->tty = NULL;
-
-        hvcsd->open_count = 0;
-
-        /* This will drop any buffered data on the floor which is OK in a hangup
-         * scenario. */
-        memset(&hvcsd->buffer[0], 0x00, HVCS_BUFF_LEN);
-        hvcsd->chars_in_buffer = 0;
-
-        irq = hvcsd->vdev->irq;
-
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-        free_irq(irq, hvcsd);
-
-        /*
-         * We need to kref_put() for every open_count we have since the
-         * tty_hangup() function doesn't invoke a close per open connection on a
-         * non-console device.
-         */
-        while(temp_open_count) {
-                --temp_open_count;
-                /*
-                 * The final put will trigger destruction of the hvcs_struct.
-                 * NOTE:  If this hangup was signaled from user space then the
-                 * final put will never happen.
-                 */
-                kref_put(&hvcsd->kref, destroy_hvcs_struct);
-        }
-}
-
-/*
- * NOTE: This is almost always from_user since user level apps interact with the
- * /dev nodes. I'm trusting that if hvcs_write gets called and interrupted by
- * hvcs_remove (which removes the target device and executes tty_hangup()) that
- * tty_hangup will allow hvcs_write time to complete execution before it
- * terminates our device.
- */
-static int hvcs_write(struct tty_struct *tty,
-                const unsigned char *buf, int count)
-{
-        struct hvcs_struct *hvcsd = tty->driver_data;
-        unsigned int unit_address;
-        const unsigned char *charbuf;
-        unsigned long flags;
-        int total_sent = 0;
-        int tosend = 0;
-        int result = 0;
-
-        /*
-         * If they don't check the return code off of their open they may
-         * attempt this even if there is no connected device.
-         */
-        if (!hvcsd)
-                return -ENODEV;
-
-        /* Reasonable size to prevent user level flooding */
-        if (count > HVCS_MAX_FROM_USER) {
-                printk(KERN_WARNING "HVCS write: count being truncated to"
-                                " HVCS_MAX_FROM_USER.\n");
-                count = HVCS_MAX_FROM_USER;
-        }
-
-        charbuf = buf;
-
-        spin_lock_irqsave(&hvcsd->lock, flags);
-
-        /*
-         * Somehow an open succedded but the device was removed or the
-         * connection terminated between the vty-server and partner vty during
-         * the middle of a write operation?  This is a crummy place to do this
-         * but we want to keep it all in the spinlock.
-         */
-        if (hvcsd->open_count <= 0) {
-                spin_unlock_irqrestore(&hvcsd->lock, flags);
-                return -ENODEV;
-        }
-
-        unit_address = hvcsd->vdev->unit_address;
-
-        while (count > 0) {
-                tosend = min(count, (HVCS_BUFF_LEN - hvcsd->chars_in_buffer));
-                /*
-                 * No more space, this probably means that the last call to
-                 * hvcs_write() didn't succeed and the buffer was filled up.
-                 */
-                if (!tosend)
-                        break;
-
-                memcpy(&hvcsd->buffer[hvcsd->chars_in_buffer],
-                                &charbuf[total_sent],
-                                tosend);
-
-                hvcsd->chars_in_buffer += tosend;
-
-                result = 0;
-
-                /*
-                 * If this is true then we don't want to try writing to the
-                 * hypervisor because that is the kernel_threads job now.  We'll
-                 * just add to the buffer.
-                 */
-                if (!(hvcsd->todo_mask & HVCS_TRY_WRITE))
-                        /* won't send partial writes */
-                        result = hvc_put_chars(unit_address,
-                                        &hvcsd->buffer[0],
-                                        hvcsd->chars_in_buffer);
-
-                /*
-                 * Since we know we have enough room in hvcsd->buffer for
-                 * tosend we record that it was sent regardless of whether the
-                 * hypervisor actually took it because we have it buffered.
-                 */
-                total_sent+=tosend;
-                count-=tosend;
-                if (result == 0) {
-                        hvcsd->todo_mask |= HVCS_TRY_WRITE;
-                        hvcs_kick();
-                        break;
-                }
-
-                hvcsd->chars_in_buffer = 0;
-                /*
-                 * Test after the chars_in_buffer reset otherwise this could
-                 * deadlock our writes if hvc_put_chars fails.
-                 */
-                if (result < 0)
-                        break;
-        }
-
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-
-        if (result == -1)
-                return -EIO;
-        else
-                return total_sent;
-}
-
-/*
- * This is really asking how much can we guarentee that we can send or that we
- * absolutely WILL BUFFER if we can't send it.  This driver MUST honor the
- * return value, hence the reason for hvcs_struct buffering.
- */
-static int hvcs_write_room(struct tty_struct *tty)
-{
-        struct hvcs_struct *hvcsd = tty->driver_data;
-
-        if (!hvcsd || hvcsd->open_count <= 0)
-                return 0;
-
-        return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-}
-
-static int hvcs_chars_in_buffer(struct tty_struct *tty)
-{
-        struct hvcs_struct *hvcsd = tty->driver_data;
-
-        return hvcsd->chars_in_buffer;
-}
-
-static const struct tty_operations hvcs_ops = {
-        .open = hvcs_open,
-        .close = hvcs_close,
-        .hangup = hvcs_hangup,
-        .write = hvcs_write,
-        .write_room = hvcs_write_room,
-        .chars_in_buffer = hvcs_chars_in_buffer,
-        .unthrottle = hvcs_unthrottle,
-        .throttle = hvcs_throttle,
-};
-
-static int hvcs_alloc_index_list(int n)
-{
-        int i;
-
-        hvcs_index_list = kmalloc(n * sizeof(hvcs_index_count),GFP_KERNEL);
-        if (!hvcs_index_list)
-                return -ENOMEM;
-        hvcs_index_count = n;
-        for (i = 0; i < hvcs_index_count; i++)
-                hvcs_index_list[i] = -1;
-        return 0;
-}
-
-static void hvcs_free_index_list(void)
-{
-        /* Paranoia check to be thorough. */
-        kfree(hvcs_index_list);
-        hvcs_index_list = NULL;
-        hvcs_index_count = 0;
-}
-
-static int __init hvcs_module_init(void)
-{
-        int rc;
-        int num_ttys_to_alloc;
-
-        printk(KERN_INFO "Initializing %s\n", hvcs_driver_string);
-
-        /* Has the user specified an overload with an insmod param? */
-        if (hvcs_parm_num_devs <= 0 ||
-                (hvcs_parm_num_devs > HVCS_MAX_SERVER_ADAPTERS)) {
-                num_ttys_to_alloc = HVCS_DEFAULT_SERVER_ADAPTERS;
-        } else
-                num_ttys_to_alloc = hvcs_parm_num_devs;
-
-        hvcs_tty_driver = alloc_tty_driver(num_ttys_to_alloc);
-        if (!hvcs_tty_driver)
-                return -ENOMEM;
-
-        if (hvcs_alloc_index_list(num_ttys_to_alloc)) {
-                rc = -ENOMEM;
-                goto index_fail;
-        }
-
-        hvcs_tty_driver->owner = THIS_MODULE;
-
-        hvcs_tty_driver->driver_name = hvcs_driver_name;
-        hvcs_tty_driver->name = hvcs_device_node;
-
-        /*
-         * We'll let the system assign us a major number, indicated by leaving
-         * it blank.
-         */
-
-        hvcs_tty_driver->minor_start = HVCS_MINOR_START;
-        hvcs_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM;
-
-        /*
-         * We role our own so that we DONT ECHO.  We can't echo because the
-         * device we are connecting to already echoes by default and this would
-         * throw us into a horrible recursive echo-echo-echo loop.
-         */
-        hvcs_tty_driver->init_termios = hvcs_tty_termios;
-        hvcs_tty_driver->flags = TTY_DRIVER_REAL_RAW;
-
-        tty_set_operations(hvcs_tty_driver, &hvcs_ops);
-
-        /*
-         * The following call will result in sysfs entries that denote the
-         * dynamically assigned major and minor numbers for our devices.
-         */
-        if (tty_register_driver(hvcs_tty_driver)) {
-                printk(KERN_ERR "HVCS: registration as a tty driver failed.\n");
-                rc = -EIO;
-                goto register_fail;
-        }
-
-        hvcs_pi_buff = kmalloc(PAGE_SIZE, GFP_KERNEL);
-        if (!hvcs_pi_buff) {
-                rc = -ENOMEM;
-                goto buff_alloc_fail;
-        }
-
-        hvcs_task = kthread_run(khvcsd, NULL, "khvcsd");
-        if (IS_ERR(hvcs_task)) {
-                printk(KERN_ERR "HVCS: khvcsd creation failed.  Driver not loaded.\n");
-                rc = -EIO;
-                goto kthread_fail;
-        }
-
-        rc = vio_register_driver(&hvcs_vio_driver);
-        if (rc) {
-                printk(KERN_ERR "HVCS: can't register vio driver\n");
-                goto vio_fail;
-        }
-
-        /*
-         * This needs to be done AFTER the vio_register_driver() call or else
-         * the kobjects won't be initialized properly.
-         */
-        rc = driver_create_file(&(hvcs_vio_driver.driver), &driver_attr_rescan);
-        if (rc) {
-                printk(KERN_ERR "HVCS: sysfs attr create failed\n");
-                goto attr_fail;
-        }
-
-        printk(KERN_INFO "HVCS: driver module inserted.\n");
-
-        return 0;
-
-attr_fail:
-        vio_unregister_driver(&hvcs_vio_driver);
-vio_fail:
-        kthread_stop(hvcs_task);
-kthread_fail:
-        kfree(hvcs_pi_buff);
-buff_alloc_fail:
-        tty_unregister_driver(hvcs_tty_driver);
-register_fail:
-        hvcs_free_index_list();
-index_fail:
-        put_tty_driver(hvcs_tty_driver);
-        hvcs_tty_driver = NULL;
-        return rc;
-}
-
-static void __exit hvcs_module_exit(void)
-{
-        /*
-         * This driver receives hvcs_remove callbacks for each device upon
-         * module removal.
-         */
-
-        /*
-         * This synchronous operation  will wake the khvcsd kthread if it is
-         * asleep and will return when khvcsd has terminated.
-         */
-        kthread_stop(hvcs_task);
-
-        spin_lock(&hvcs_pi_lock);
-        kfree(hvcs_pi_buff);
-        hvcs_pi_buff = NULL;
-        spin_unlock(&hvcs_pi_lock);
-
-        driver_remove_file(&hvcs_vio_driver.driver, &driver_attr_rescan);
-
-        vio_unregister_driver(&hvcs_vio_driver);
-
-        tty_unregister_driver(hvcs_tty_driver);
-
-        hvcs_free_index_list();
-
-        put_tty_driver(hvcs_tty_driver);
-
-        printk(KERN_INFO "HVCS: driver module removed.\n");
-}
-
-module_init(hvcs_module_init);
-module_exit(hvcs_module_exit);
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
deleted file mode 100644
index a2bc885ce60a..000000000000
--- a/drivers/char/hvsi.c
+++ /dev/null
@@ -1,1314 +0,0 @@
-/*
- * Copyright (C) 2004 Hollis Blanchard <hollisb@us.ibm.com>, IBM
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-/* Host Virtual Serial Interface (HVSI) is a protocol between the hosted OS
- * and the service processor on IBM pSeries servers. On these servers, there
- * are no serial ports under the OS's control, and sometimes there is no other
- * console available either. However, the service processor has two standard
- * serial ports, so this over-complicated protocol allows the OS to control
- * those ports by proxy.
- *
- * Besides data, the procotol supports the reading/writing of the serial
- * port's DTR line, and the reading of the CD line. This is to allow the OS to
- * control a modem attached to the service processor's serial port. Note that
- * the OS cannot change the speed of the port through this protocol.
- */
-
-#undef DEBUG
-
-#include <linux/console.h>
-#include <linux/ctype.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/major.h>
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/sysrq.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <asm/hvcall.h>
-#include <asm/hvconsole.h>
-#include <asm/prom.h>
-#include <asm/uaccess.h>
-#include <asm/vio.h>
-#include <asm/param.h>
-
-#define HVSI_MAJOR      229
-#define HVSI_MINOR      128
-#define MAX_NR_HVSI_CONSOLES 4
-
-#define HVSI_TIMEOUT (5*HZ)
-#define HVSI_VERSION 1
-#define HVSI_MAX_PACKET 256
-#define HVSI_MAX_READ 16
-#define HVSI_MAX_OUTGOING_DATA 12
-#define N_OUTBUF 12
-
-/*
- * we pass data via two 8-byte registers, so we would like our char arrays
- * properly aligned for those loads.
- */
-#define __ALIGNED__     __attribute__((__aligned__(sizeof(long))))
-
-struct hvsi_struct {
-        struct delayed_work writer;
-        struct work_struct handshaker;
-        wait_queue_head_t emptyq; /* woken when outbuf is emptied */
-        wait_queue_head_t stateq; /* woken when HVSI state changes */
-        spinlock_t lock;
-        int index;
-        struct tty_struct *tty;
-        int count;
-        uint8_t throttle_buf[128];
-        uint8_t outbuf[N_OUTBUF]; /* to implement write_room and chars_in_buffer */
-        /* inbuf is for packet reassembly. leave a little room for leftovers. */
-        uint8_t inbuf[HVSI_MAX_PACKET + HVSI_MAX_READ];
-        uint8_t *inbuf_end;
-        int n_throttle;
-        int n_outbuf;
-        uint32_t vtermno;
-        uint32_t virq;
-        atomic_t seqno; /* HVSI packet sequence number */
-        uint16_t mctrl;
-        uint8_t state;  /* HVSI protocol state */
-        uint8_t flags;
-#ifdef CONFIG_MAGIC_SYSRQ
-        uint8_t sysrq;
-#endif /* CONFIG_MAGIC_SYSRQ */
-};
-static struct hvsi_struct hvsi_ports[MAX_NR_HVSI_CONSOLES];
-
-static struct tty_driver *hvsi_driver;
-static int hvsi_count;
-static int (*hvsi_wait)(struct hvsi_struct *hp, int state);
-
-enum HVSI_PROTOCOL_STATE {
-        HVSI_CLOSED,
-        HVSI_WAIT_FOR_VER_RESPONSE,
-        HVSI_WAIT_FOR_VER_QUERY,
-        HVSI_OPEN,
-        HVSI_WAIT_FOR_MCTRL_RESPONSE,
-        HVSI_FSP_DIED,
-};
-#define HVSI_CONSOLE 0x1
-
-#define VS_DATA_PACKET_HEADER           0xff
-#define VS_CONTROL_PACKET_HEADER        0xfe
-#define VS_QUERY_PACKET_HEADER          0xfd
-#define VS_QUERY_RESPONSE_PACKET_HEADER 0xfc
-
-/* control verbs */
-#define VSV_SET_MODEM_CTL    1 /* to service processor only */
-#define VSV_MODEM_CTL_UPDATE 2 /* from service processor only */
-#define VSV_CLOSE_PROTOCOL   3
-
-/* query verbs */
-#define VSV_SEND_VERSION_NUMBER 1
-#define VSV_SEND_MODEM_CTL_STATUS 2
-
-/* yes, these masks are not consecutive. */
-#define HVSI_TSDTR 0x01
-#define HVSI_TSCD  0x20
-
-struct hvsi_header {
-        uint8_t  type;
-        uint8_t  len;
-        uint16_t seqno;
-} __attribute__((packed));
-
-struct hvsi_data {
-        uint8_t  type;
-        uint8_t  len;
-        uint16_t seqno;
-        uint8_t  data[HVSI_MAX_OUTGOING_DATA];
-} __attribute__((packed));
-
-struct hvsi_control {
-        uint8_t  type;
-        uint8_t  len;
-        uint16_t seqno;
-        uint16_t verb;
-        /* optional depending on verb: */
-        uint32_t word;
-        uint32_t mask;
-} __attribute__((packed));
-
-struct hvsi_query {
-        uint8_t  type;
-        uint8_t  len;
-        uint16_t seqno;
-        uint16_t verb;
-} __attribute__((packed));
-
-struct hvsi_query_response {
-        uint8_t  type;
-        uint8_t  len;
-        uint16_t seqno;
-        uint16_t verb;
-        uint16_t query_seqno;
-        union {
-                uint8_t  version;
-                uint32_t mctrl_word;
-        } u;
-} __attribute__((packed));
-
-
-
-static inline int is_console(struct hvsi_struct *hp)
-{
-        return hp->flags & HVSI_CONSOLE;
-}
-
-static inline int is_open(struct hvsi_struct *hp)
-{
-        /* if we're waiting for an mctrl then we're already open */
-        return (hp->state == HVSI_OPEN)
-                        || (hp->state == HVSI_WAIT_FOR_MCTRL_RESPONSE);
-}
-
-static inline void print_state(struct hvsi_struct *hp)
-{
-#ifdef DEBUG
-        static const char *state_names[] = {
-                "HVSI_CLOSED",
-                "HVSI_WAIT_FOR_VER_RESPONSE",
-                "HVSI_WAIT_FOR_VER_QUERY",
-                "HVSI_OPEN",
-                "HVSI_WAIT_FOR_MCTRL_RESPONSE",
-                "HVSI_FSP_DIED",
-        };
-        const char *name = (hp->state < ARRAY_SIZE(state_names))
-                ? state_names[hp->state] : "UNKNOWN";
-
-        pr_debug("hvsi%i: state = %s\n", hp->index, name);
-#endif /* DEBUG */
-}
-
-static inline void __set_state(struct hvsi_struct *hp, int state)
-{
-        hp->state = state;
-        print_state(hp);
-        wake_up_all(&hp->stateq);
-}
-
-static inline void set_state(struct hvsi_struct *hp, int state)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&hp->lock, flags);
-        __set_state(hp, state);
-        spin_unlock_irqrestore(&hp->lock, flags);
-}
-
-static inline int len_packet(const uint8_t *packet)
-{
-        return (int)((struct hvsi_header *)packet)->len;
-}
-
-static inline int is_header(const uint8_t *packet)
-{
-        struct hvsi_header *header = (struct hvsi_header *)packet;
-        return header->type >= VS_QUERY_RESPONSE_PACKET_HEADER;
-}
-
-static inline int got_packet(const struct hvsi_struct *hp, uint8_t *packet)
-{
-        if (hp->inbuf_end < packet + sizeof(struct hvsi_header))
-                return 0; /* don't even have the packet header */
-
-        if (hp->inbuf_end < (packet + len_packet(packet)))
-                return 0; /* don't have the rest of the packet */
-
-        return 1;
-}
-
-/* shift remaining bytes in packetbuf down */
-static void compact_inbuf(struct hvsi_struct *hp, uint8_t *read_to)
-{
-        int remaining = (int)(hp->inbuf_end - read_to);
-
-        pr_debug("%s: %i chars remain\n", __func__, remaining);
-
-        if (read_to != hp->inbuf)
-                memmove(hp->inbuf, read_to, remaining);
-
-        hp->inbuf_end = hp->inbuf + remaining;
-}
-
-#ifdef DEBUG
-#define dbg_dump_packet(packet) dump_packet(packet)
-#define dbg_dump_hex(data, len) dump_hex(data, len)
-#else
-#define dbg_dump_packet(packet) do { } while (0)
-#define dbg_dump_hex(data, len) do { } while (0)
-#endif
-
-static void dump_hex(const uint8_t *data, int len)
-{
-        int i;
-
-        printk("    ");
-        for (i=0; i < len; i++)
-                printk("%.2x", data[i]);
-
-        printk("\n    ");
-        for (i=0; i < len; i++) {
-                if (isprint(data[i]))
-                        printk("%c", data[i]);
-                else
-                        printk(".");
-        }
-        printk("\n");
-}
-
-static void dump_packet(uint8_t *packet)
-{
-        struct hvsi_header *header = (struct hvsi_header *)packet;
-
-        printk("type 0x%x, len %i, seqno %i:\n", header->type, header->len,
-                        header->seqno);
-
-        dump_hex(packet, header->len);
-}
-
-static int hvsi_read(struct hvsi_struct *hp, char *buf, int count)
-{
-        unsigned long got;
-
-        got = hvc_get_chars(hp->vtermno, buf, count);
-
-        return got;
-}
-
-static void hvsi_recv_control(struct hvsi_struct *hp, uint8_t *packet,
-        struct tty_struct **to_hangup, struct hvsi_struct **to_handshake)
-{
-        struct hvsi_control *header = (struct hvsi_control *)packet;
-
-        switch (header->verb) {
-                case VSV_MODEM_CTL_UPDATE:
-                        if ((header->word & HVSI_TSCD) == 0) {
-                                /* CD went away; no more connection */
-                                pr_debug("hvsi%i: CD dropped\n", hp->index);
-                                hp->mctrl &= TIOCM_CD;
-                                /* If userland hasn't done an open(2) yet, hp->tty is NULL. */
-                                if (hp->tty && !(hp->tty->flags & CLOCAL))
-                                        *to_hangup = hp->tty;
-                        }
-                        break;
-                case VSV_CLOSE_PROTOCOL:
-                        pr_debug("hvsi%i: service processor came back\n", hp->index);
-                        if (hp->state != HVSI_CLOSED) {
-                                *to_handshake = hp;
-                        }
-                        break;
-                default:
-                        printk(KERN_WARNING "hvsi%i: unknown HVSI control packet: ",
-                                hp->index);
-                        dump_packet(packet);
-                        break;
-        }
-}
-
-static void hvsi_recv_response(struct hvsi_struct *hp, uint8_t *packet)
-{
-        struct hvsi_query_response *resp = (struct hvsi_query_response *)packet;
-
-        switch (hp->state) {
-                case HVSI_WAIT_FOR_VER_RESPONSE:
-                        __set_state(hp, HVSI_WAIT_FOR_VER_QUERY);
-                        break;
-                case HVSI_WAIT_FOR_MCTRL_RESPONSE:
-                        hp->mctrl = 0;
-                        if (resp->u.mctrl_word & HVSI_TSDTR)
-                                hp->mctrl |= TIOCM_DTR;
-                        if (resp->u.mctrl_word & HVSI_TSCD)
-                                hp->mctrl |= TIOCM_CD;
-                        __set_state(hp, HVSI_OPEN);
-                        break;
-                default:
-                        printk(KERN_ERR "hvsi%i: unexpected query response: ", hp->index);
-                        dump_packet(packet);
-                        break;
-        }
-}
-
-/* respond to service processor's version query */
-static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
-{
-        struct hvsi_query_response packet __ALIGNED__;
-        int wrote;
-
-        packet.type = VS_QUERY_RESPONSE_PACKET_HEADER;
-        packet.len = sizeof(struct hvsi_query_response);
-        packet.seqno = atomic_inc_return(&hp->seqno);
-        packet.verb = VSV_SEND_VERSION_NUMBER;
-        packet.u.version = HVSI_VERSION;
-        packet.query_seqno = query_seqno+1;
-
-        pr_debug("%s: sending %i bytes\n", __func__, packet.len);
-        dbg_dump_hex((uint8_t*)&packet, packet.len);
-
-        wrote = hvc_put_chars(hp->vtermno, (char *)&packet, packet.len);
-        if (wrote != packet.len) {
-                printk(KERN_ERR "hvsi%i: couldn't send query response!\n",
-                        hp->index);
-                return -EIO;
-        }
-
-        return 0;
-}
-
-static void hvsi_recv_query(struct hvsi_struct *hp, uint8_t *packet)
-{
-        struct hvsi_query *query = (struct hvsi_query *)packet;
-
-        switch (hp->state) {
-                case HVSI_WAIT_FOR_VER_QUERY:
-                        hvsi_version_respond(hp, query->seqno);
-                        __set_state(hp, HVSI_OPEN);
-                        break;
-                default:
-                        printk(KERN_ERR "hvsi%i: unexpected query: ", hp->index);
-                        dump_packet(packet);
-                        break;
-        }
-}
-
-static void hvsi_insert_chars(struct hvsi_struct *hp, const char *buf, int len)
-{
-        int i;
-
-        for (i=0; i < len; i++) {
-                char c = buf[i];
-#ifdef CONFIG_MAGIC_SYSRQ
-                if (c == '\0') {
-                        hp->sysrq = 1;
-                        continue;
-                } else if (hp->sysrq) {
-                        handle_sysrq(c);
-                        hp->sysrq = 0;
-                        continue;
-                }
-#endif /* CONFIG_MAGIC_SYSRQ */
-                tty_insert_flip_char(hp->tty, c, 0);
-        }
-}
-
-/*
- * We could get 252 bytes of data at once here. But the tty layer only
- * throttles us at TTY_THRESHOLD_THROTTLE (128) bytes, so we could overflow
- * it. Accordingly we won't send more than 128 bytes at a time to the flip
- * buffer, which will give the tty buffer a chance to throttle us. Should the
- * value of TTY_THRESHOLD_THROTTLE change in n_tty.c, this code should be
- * revisited.
- */
-#define TTY_THRESHOLD_THROTTLE 128
-static struct tty_struct *hvsi_recv_data(struct hvsi_struct *hp,
-                const uint8_t *packet)
-{
-        const struct hvsi_header *header = (const struct hvsi_header *)packet;
-        const uint8_t *data = packet + sizeof(struct hvsi_header);
-        int datalen = header->len - sizeof(struct hvsi_header);
-        int overflow = datalen - TTY_THRESHOLD_THROTTLE;
-
-        pr_debug("queueing %i chars '%.*s'\n", datalen, datalen, data);
-
-        if (datalen == 0)
-                return NULL;
-
-        if (overflow > 0) {
-                pr_debug("%s: got >TTY_THRESHOLD_THROTTLE bytes\n", __func__);
-                datalen = TTY_THRESHOLD_THROTTLE;
-        }
-
-        hvsi_insert_chars(hp, data, datalen);
-
-        if (overflow > 0) {
-                /*
-                 * we still have more data to deliver, so we need to save off the
-                 * overflow and send it later
-                 */
-                pr_debug("%s: deferring overflow\n", __func__);
-                memcpy(hp->throttle_buf, data + TTY_THRESHOLD_THROTTLE, overflow);
-                hp->n_throttle = overflow;
-        }
-
-        return hp->tty;
-}
-
-/*
- * Returns true/false indicating data successfully read from hypervisor.
- * Used both to get packets for tty connections and to advance the state
- * machine during console handshaking (in which case tty = NULL and we ignore
- * incoming data).
- */
-static int hvsi_load_chunk(struct hvsi_struct *hp, struct tty_struct **flip,
-                struct tty_struct **hangup, struct hvsi_struct **handshake)
-{
-        uint8_t *packet = hp->inbuf;
-        int chunklen;
-
-        *flip = NULL;
-        *hangup = NULL;
-        *handshake = NULL;
-
-        chunklen = hvsi_read(hp, hp->inbuf_end, HVSI_MAX_READ);
-        if (chunklen == 0) {
-                pr_debug("%s: 0-length read\n", __func__);
-                return 0;
-        }
-
-        pr_debug("%s: got %i bytes\n", __func__, chunklen);
-        dbg_dump_hex(hp->inbuf_end, chunklen);
-
-        hp->inbuf_end += chunklen;
-
-        /* handle all completed packets */
-        while ((packet < hp->inbuf_end) && got_packet(hp, packet)) {
-                struct hvsi_header *header = (struct hvsi_header *)packet;
-
-                if (!is_header(packet)) {
-                        printk(KERN_ERR "hvsi%i: got malformed packet\n", hp->index);
-                        /* skip bytes until we find a header or run out of data */
-                        while ((packet < hp->inbuf_end) && (!is_header(packet)))
-                                packet++;
-                        continue;
-                }
-
-                pr_debug("%s: handling %i-byte packet\n", __func__,
-                                len_packet(packet));
-                dbg_dump_packet(packet);
-
-                switch (header->type) {
-                        case VS_DATA_PACKET_HEADER:
-                                if (!is_open(hp))
-                                        break;
-                                if (hp->tty == NULL)
-                                        break; /* no tty buffer to put data in */
-                                *flip = hvsi_recv_data(hp, packet);
-                                break;
-                        case VS_CONTROL_PACKET_HEADER:
-                                hvsi_recv_control(hp, packet, hangup, handshake);
-                                break;
-                        case VS_QUERY_RESPONSE_PACKET_HEADER:
-                                hvsi_recv_response(hp, packet);
-                                break;
-                        case VS_QUERY_PACKET_HEADER:
-                                hvsi_recv_query(hp, packet);
-                                break;
-                        default:
-                                printk(KERN_ERR "hvsi%i: unknown HVSI packet type 0x%x\n",
-                                                hp->index, header->type);
-                                dump_packet(packet);
-                                break;
-                }
-
-                packet += len_packet(packet);
-
-                if (*hangup || *handshake) {
-                        pr_debug("%s: hangup or handshake\n", __func__);
-                        /*
-                         * we need to send the hangup now before receiving any more data.
-                         * If we get "data, hangup, data", we can't deliver the second
-                         * data before the hangup.
-                         */
-                        break;
-                }
-        }
-
-        compact_inbuf(hp, packet);
-
-        return 1;
-}
-
-static void hvsi_send_overflow(struct hvsi_struct *hp)
-{
-        pr_debug("%s: delivering %i bytes overflow\n", __func__,
-                        hp->n_throttle);
-
-        hvsi_insert_chars(hp, hp->throttle_buf, hp->n_throttle);
-        hp->n_throttle = 0;
-}
-
-/*
- * must get all pending data because we only get an irq on empty->non-empty
- * transition
- */
-static irqreturn_t hvsi_interrupt(int irq, void *arg)
-{
-        struct hvsi_struct *hp = (struct hvsi_struct *)arg;
-        struct tty_struct *flip;
-        struct tty_struct *hangup;
-        struct hvsi_struct *handshake;
-        unsigned long flags;
-        int again = 1;
-
-        pr_debug("%s\n", __func__);
-
-        while (again) {
-                spin_lock_irqsave(&hp->lock, flags);
-                again = hvsi_load_chunk(hp, &flip, &hangup, &handshake);
-                spin_unlock_irqrestore(&hp->lock, flags);
-
-                /*
-                 * we have to call tty_flip_buffer_push() and tty_hangup() outside our
-                 * spinlock. But we also have to keep going until we've read all the
-                 * available data.
-                 */
-
-                if (flip) {
-                        /* there was data put in the tty flip buffer */
-                        tty_flip_buffer_push(flip);
-                        flip = NULL;
-                }
-
-                if (hangup) {
-                        tty_hangup(hangup);
-                }
-
-                if (handshake) {
-                        pr_debug("hvsi%i: attempting re-handshake\n", handshake->index);
-                        schedule_work(&handshake->handshaker);
-                }
-        }
-
-        spin_lock_irqsave(&hp->lock, flags);
-        if (hp->tty && hp->n_throttle
-                        && (!test_bit(TTY_THROTTLED, &hp->tty->flags))) {
-                /* we weren't hung up and we weren't throttled, so we can deliver the
-                 * rest now */
-                flip = hp->tty;
-                hvsi_send_overflow(hp);
-        }
-        spin_unlock_irqrestore(&hp->lock, flags);
-
-        if (flip) {
-                tty_flip_buffer_push(flip);
-        }
-
-        return IRQ_HANDLED;
-}
-
-/* for boot console, before the irq handler is running */
-static int __init poll_for_state(struct hvsi_struct *hp, int state)
-{
-        unsigned long end_jiffies = jiffies + HVSI_TIMEOUT;
-
-        for (;;) {
-                hvsi_interrupt(hp->virq, (void *)hp); /* get pending data */
-
-                if (hp->state == state)
-                        return 0;
-
-                mdelay(5);
-                if (time_after(jiffies, end_jiffies))
-                        return -EIO;
-        }
-}
-
-/* wait for irq handler to change our state */
-static int wait_for_state(struct hvsi_struct *hp, int state)
-{
-        int ret = 0;
-
-        if (!wait_event_timeout(hp->stateq, (hp->state == state), HVSI_TIMEOUT))
-                ret = -EIO;
-
-        return ret;
-}
-
-static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
-{
-        struct hvsi_query packet __ALIGNED__;
-        int wrote;
-
-        packet.type = VS_QUERY_PACKET_HEADER;
-        packet.len = sizeof(struct hvsi_query);
-        packet.seqno = atomic_inc_return(&hp->seqno);
-        packet.verb = verb;
-
-        pr_debug("%s: sending %i bytes\n", __func__, packet.len);
-        dbg_dump_hex((uint8_t*)&packet, packet.len);
-
-        wrote = hvc_put_chars(hp->vtermno, (char *)&packet, packet.len);
-        if (wrote != packet.len) {
-                printk(KERN_ERR "hvsi%i: couldn't send query (%i)!\n", hp->index,
-                        wrote);
-                return -EIO;
-        }
-
-        return 0;
-}
-
-static int hvsi_get_mctrl(struct hvsi_struct *hp)
-{
-        int ret;
-
-        set_state(hp, HVSI_WAIT_FOR_MCTRL_RESPONSE);
-        hvsi_query(hp, VSV_SEND_MODEM_CTL_STATUS);
-
-        ret = hvsi_wait(hp, HVSI_OPEN);
-        if (ret < 0) {
-                printk(KERN_ERR "hvsi%i: didn't get modem flags\n", hp->index);
-                set_state(hp, HVSI_OPEN);
-                return ret;
-        }
-
-        pr_debug("%s: mctrl 0x%x\n", __func__, hp->mctrl);
-
-        return 0;
-}
-
-/* note that we can only set DTR */
-static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
-{
-        struct hvsi_control packet __ALIGNED__;
-        int wrote;
-
-        packet.type = VS_CONTROL_PACKET_HEADER,
-        packet.seqno = atomic_inc_return(&hp->seqno);
-        packet.len = sizeof(struct hvsi_control);
-        packet.verb = VSV_SET_MODEM_CTL;
-        packet.mask = HVSI_TSDTR;
-
-        if (mctrl & TIOCM_DTR)
-                packet.word = HVSI_TSDTR;
-
-        pr_debug("%s: sending %i bytes\n", __func__, packet.len);
-        dbg_dump_hex((uint8_t*)&packet, packet.len);
-
-        wrote = hvc_put_chars(hp->vtermno, (char *)&packet, packet.len);
-        if (wrote != packet.len) {
-                printk(KERN_ERR "hvsi%i: couldn't set DTR!\n", hp->index);
-                return -EIO;
-        }
-
-        return 0;
-}
-
-static void hvsi_drain_input(struct hvsi_struct *hp)
-{
-        uint8_t buf[HVSI_MAX_READ] __ALIGNED__;
-        unsigned long end_jiffies = jiffies + HVSI_TIMEOUT;
-
-        while (time_before(end_jiffies, jiffies))
-                if (0 == hvsi_read(hp, buf, HVSI_MAX_READ))
-                        break;
-}
-
-static int hvsi_handshake(struct hvsi_struct *hp)
-{
-        int ret;
-
-        /*
-         * We could have a CLOSE or other data waiting for us before we even try
-         * to open; try to throw it all away so we don't get confused. (CLOSE
-         * is the first message sent up the pipe when the FSP comes online. We
-         * need to distinguish between "it came up a while ago and we're the first
-         * user" and "it was just reset before it saw our handshake packet".)
-         */
-        hvsi_drain_input(hp);
-
-        set_state(hp, HVSI_WAIT_FOR_VER_RESPONSE);
-        ret = hvsi_query(hp, VSV_SEND_VERSION_NUMBER);
-        if (ret < 0) {
-                printk(KERN_ERR "hvsi%i: couldn't send version query\n", hp->index);
-                return ret;
-        }
-
-        ret = hvsi_wait(hp, HVSI_OPEN);
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-
-static void hvsi_handshaker(struct work_struct *work)
-{
-        struct hvsi_struct *hp =
-                container_of(work, struct hvsi_struct, handshaker);
-
-        if (hvsi_handshake(hp) >= 0)
-                return;
-
-        printk(KERN_ERR "hvsi%i: re-handshaking failed\n", hp->index);
-        if (is_console(hp)) {
-                /*
-                 * ttys will re-attempt the handshake via hvsi_open, but
-                 * the console will not.
-                 */
-                printk(KERN_ERR "hvsi%i: lost console!\n", hp->index);
-        }
-}
-
-static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
-{
-        struct hvsi_data packet __ALIGNED__;
-        int ret;
-
-        BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
-
-        packet.type = VS_DATA_PACKET_HEADER;
-        packet.seqno = atomic_inc_return(&hp->seqno);
-        packet.len = count + sizeof(struct hvsi_header);
-        memcpy(&packet.data, buf, count);
-
-        ret = hvc_put_chars(hp->vtermno, (char *)&packet, packet.len);
-        if (ret == packet.len) {
-                /* return the number of chars written, not the packet length */
-                return count;
-        }
-        return ret; /* return any errors */
-}
-
-static void hvsi_close_protocol(struct hvsi_struct *hp)
-{
-        struct hvsi_control packet __ALIGNED__;
-
-        packet.type = VS_CONTROL_PACKET_HEADER;
-        packet.seqno = atomic_inc_return(&hp->seqno);
-        packet.len = 6;
-        packet.verb = VSV_CLOSE_PROTOCOL;
-
-        pr_debug("%s: sending %i bytes\n", __func__, packet.len);
-        dbg_dump_hex((uint8_t*)&packet, packet.len);
-
-        hvc_put_chars(hp->vtermno, (char *)&packet, packet.len);
-}
-
-static int hvsi_open(struct tty_struct *tty, struct file *filp)
-{
-        struct hvsi_struct *hp;
-        unsigned long flags;
-        int line = tty->index;
-        int ret;
-
-        pr_debug("%s\n", __func__);
-
-        if (line < 0 || line >= hvsi_count)
-                return -ENODEV;
-        hp = &hvsi_ports[line];
-
-        tty->driver_data = hp;
-
-        mb();
-        if (hp->state == HVSI_FSP_DIED)
-                return -EIO;
-
-        spin_lock_irqsave(&hp->lock, flags);
-        hp->tty = tty;
-        hp->count++;
-        atomic_set(&hp->seqno, 0);
-        h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
-        spin_unlock_irqrestore(&hp->lock, flags);
-
-        if (is_console(hp))
-                return 0; /* this has already been handshaked as the console */
-
-        ret = hvsi_handshake(hp);
-        if (ret < 0) {
-                printk(KERN_ERR "%s: HVSI handshaking failed\n", tty->name);
-                return ret;
-        }
-
-        ret = hvsi_get_mctrl(hp);
-        if (ret < 0) {
-                printk(KERN_ERR "%s: couldn't get initial modem flags\n", tty->name);
-                return ret;
-        }
-
-        ret = hvsi_set_mctrl(hp, hp->mctrl | TIOCM_DTR);
-        if (ret < 0) {
-                printk(KERN_ERR "%s: couldn't set DTR\n", tty->name);
-                return ret;
-        }
-
-        return 0;
-}
-
-/* wait for hvsi_write_worker to empty hp->outbuf */
-static void hvsi_flush_output(struct hvsi_struct *hp)
-{
-        wait_event_timeout(hp->emptyq, (hp->n_outbuf <= 0), HVSI_TIMEOUT);
-
-        /* 'writer' could still be pending if it didn't see n_outbuf = 0 yet */
-        cancel_delayed_work(&hp->writer);
-        flush_scheduled_work();
-
-        /*
-         * it's also possible that our timeout expired and hvsi_write_worker
-         * didn't manage to push outbuf. poof.
-         */
-        hp->n_outbuf = 0;
-}
-
-static void hvsi_close(struct tty_struct *tty, struct file *filp)
-{
-        struct hvsi_struct *hp = tty->driver_data;
-        unsigned long flags;
-
-        pr_debug("%s\n", __func__);
-
-        if (tty_hung_up_p(filp))
-                return;
-
-        spin_lock_irqsave(&hp->lock, flags);
-
-        if (--hp->count == 0) {
-                hp->tty = NULL;
-                hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
-
-                /* only close down connection if it is not the console */
-                if (!is_console(hp)) {
-                        h_vio_signal(hp->vtermno, VIO_IRQ_DISABLE); /* no more irqs */
-                        __set_state(hp, HVSI_CLOSED);
-                        /*
-                         * any data delivered to the tty layer after this will be
-                         * discarded (except for XON/XOFF)
-                         */
-                        tty->closing = 1;
-
-                        spin_unlock_irqrestore(&hp->lock, flags);
-
-                        /* let any existing irq handlers finish. no more will start. */
-                        synchronize_irq(hp->virq);
-
-                        /* hvsi_write_worker will re-schedule until outbuf is empty. */
-                        hvsi_flush_output(hp);
-
-                        /* tell FSP to stop sending data */
-                        hvsi_close_protocol(hp);
-
-                        /*
-                         * drain anything FSP is still in the middle of sending, and let
-                         * hvsi_handshake drain the rest on the next open.
-                         */
-                        hvsi_drain_input(hp);
-
-                        spin_lock_irqsave(&hp->lock, flags);
-                }
-        } else if (hp->count < 0)
-                printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
-                       hp - hvsi_ports, hp->count);
-
-        spin_unlock_irqrestore(&hp->lock, flags);
-}
-
-static void hvsi_hangup(struct tty_struct *tty)
-{
-        struct hvsi_struct *hp = tty->driver_data;
-        unsigned long flags;
-
-        pr_debug("%s\n", __func__);
-
-        spin_lock_irqsave(&hp->lock, flags);
-
-        hp->count = 0;
-        hp->n_outbuf = 0;
-        hp->tty = NULL;
-
-        spin_unlock_irqrestore(&hp->lock, flags);
-}
-
-/* called with hp->lock held */
-static void hvsi_push(struct hvsi_struct *hp)
-{
-        int n;
-
-        if (hp->n_outbuf <= 0)
-                return;
-
-        n = hvsi_put_chars(hp, hp->outbuf, hp->n_outbuf);
-        if (n > 0) {
-                /* success */
-                pr_debug("%s: wrote %i chars\n", __func__, n);
-                hp->n_outbuf = 0;
-        } else if (n == -EIO) {
-                __set_state(hp, HVSI_FSP_DIED);
-                printk(KERN_ERR "hvsi%i: service processor died\n", hp->index);
-        }
-}
-
-/* hvsi_write_worker will keep rescheduling itself until outbuf is empty */
-static void hvsi_write_worker(struct work_struct *work)
-{
-        struct hvsi_struct *hp =
-                container_of(work, struct hvsi_struct, writer.work);
-        unsigned long flags;
-#ifdef DEBUG
-        static long start_j = 0;
-
-        if (start_j == 0)
-                start_j = jiffies;
-#endif /* DEBUG */
-
-        spin_lock_irqsave(&hp->lock, flags);
-
-        pr_debug("%s: %i chars in buffer\n", __func__, hp->n_outbuf);
-
-        if (!is_open(hp)) {
-                /*
-                 * We could have a non-open connection if the service processor died
-                 * while we were busily scheduling ourselves. In that case, it could
-                 * be minutes before the service processor comes back, so only try
-                 * again once a second.
-                 */
-                schedule_delayed_work(&hp->writer, HZ);
-                goto out;
-        }
-
-        hvsi_push(hp);
-        if (hp->n_outbuf > 0)
-                schedule_delayed_work(&hp->writer, 10);
-        else {
-#ifdef DEBUG
-                pr_debug("%s: outbuf emptied after %li jiffies\n", __func__,
-                                jiffies - start_j);
-                start_j = 0;
-#endif /* DEBUG */
-                wake_up_all(&hp->emptyq);
-                tty_wakeup(hp->tty);
-        }
-
-out:
-        spin_unlock_irqrestore(&hp->lock, flags);
-}
-
-static int hvsi_write_room(struct tty_struct *tty)
-{
-        struct hvsi_struct *hp = tty->driver_data;
-
-        return N_OUTBUF - hp->n_outbuf;
-}
-
-static int hvsi_chars_in_buffer(struct tty_struct *tty)
-{
-        struct hvsi_struct *hp = tty->driver_data;
-
-        return hp->n_outbuf;
-}
-
-static int hvsi_write(struct tty_struct *tty,
-                     const unsigned char *buf, int count)
-{
-        struct hvsi_struct *hp = tty->driver_data;
-        const char *source = buf;
-        unsigned long flags;
-        int total = 0;
-        int origcount = count;
-
-        spin_lock_irqsave(&hp->lock, flags);
-
-        pr_debug("%s: %i chars in buffer\n", __func__, hp->n_outbuf);
-
-        if (!is_open(hp)) {
-                /* we're either closing or not yet open; don't accept data */
-                pr_debug("%s: not open\n", __func__);
-                goto out;
-        }
-
-        /*
-         * when the hypervisor buffer (16K) fills, data will stay in hp->outbuf
-         * and hvsi_write_worker will be scheduled. subsequent hvsi_write() calls
-         * will see there is no room in outbuf and return.
-         */
-        while ((count > 0) && (hvsi_write_room(hp->tty) > 0)) {
-                int chunksize = min(count, hvsi_write_room(hp->tty));
-
-                BUG_ON(hp->n_outbuf < 0);
-                memcpy(hp->outbuf + hp->n_outbuf, source, chunksize);
-                hp->n_outbuf += chunksize;
-
-                total += chunksize;
-                source += chunksize;
-                count -= chunksize;
-                hvsi_push(hp);
-        }
-
-        if (hp->n_outbuf > 0) {
-                /*
-                 * we weren't able to write it all to the hypervisor.
-                 * schedule another push attempt.
-                 */
-                schedule_delayed_work(&hp->writer, 10);
-        }
-
-out:
-        spin_unlock_irqrestore(&hp->lock, flags);
-
-        if (total != origcount)
-                pr_debug("%s: wanted %i, only wrote %i\n", __func__, origcount,
-                        total);
-
-        return total;
-}
-
-/*
- * I have never seen throttle or unthrottle called, so this little throttle
- * buffering scheme may or may not work.
- */
-static void hvsi_throttle(struct tty_struct *tty)
-{
-        struct hvsi_struct *hp = tty->driver_data;
-
-        pr_debug("%s\n", __func__);
-
-        h_vio_signal(hp->vtermno, VIO_IRQ_DISABLE);
-}
-
-static void hvsi_unthrottle(struct tty_struct *tty)
-{
-        struct hvsi_struct *hp = tty->driver_data;
-        unsigned long flags;
-        int shouldflip = 0;
-
-        pr_debug("%s\n", __func__);
-
-        spin_lock_irqsave(&hp->lock, flags);
-        if (hp->n_throttle) {
-                hvsi_send_overflow(hp);
-                shouldflip = 1;
-        }
-        spin_unlock_irqrestore(&hp->lock, flags);
-
-        if (shouldflip)
-                tty_flip_buffer_push(hp->tty);
-
-        h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
-}
-
-static int hvsi_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct hvsi_struct *hp = tty->driver_data;
-
-        hvsi_get_mctrl(hp);
-        return hp->mctrl;
-}
-
-static int hvsi_tiocmset(struct tty_struct *tty, struct file *file,
-                unsigned int set, unsigned int clear)
-{
-        struct hvsi_struct *hp = tty->driver_data;
-        unsigned long flags;
-        uint16_t new_mctrl;
-
-        /* we can only alter DTR */
-        clear &= TIOCM_DTR;
-        set &= TIOCM_DTR;
-
-        spin_lock_irqsave(&hp->lock, flags);
-
-        new_mctrl = (hp->mctrl & ~clear) | set;
-
-        if (hp->mctrl != new_mctrl) {
-                hvsi_set_mctrl(hp, new_mctrl);
-                hp->mctrl = new_mctrl;
-        }
-        spin_unlock_irqrestore(&hp->lock, flags);
-
-        return 0;
-}
-
-
-static const struct tty_operations hvsi_ops = {
-        .open = hvsi_open,
-        .close = hvsi_close,
-        .write = hvsi_write,
-        .hangup = hvsi_hangup,
-        .write_room = hvsi_write_room,
-        .chars_in_buffer = hvsi_chars_in_buffer,
-        .throttle = hvsi_throttle,
-        .unthrottle = hvsi_unthrottle,
-        .tiocmget = hvsi_tiocmget,
-        .tiocmset = hvsi_tiocmset,
-};
-
-static int __init hvsi_init(void)
-{
-        int i;
-
-        hvsi_driver = alloc_tty_driver(hvsi_count);
-        if (!hvsi_driver)
-                return -ENOMEM;
-
-        hvsi_driver->owner = THIS_MODULE;
-        hvsi_driver->driver_name = "hvsi";
-        hvsi_driver->name = "hvsi";
-        hvsi_driver->major = HVSI_MAJOR;
-        hvsi_driver->minor_start = HVSI_MINOR;
-        hvsi_driver->type = TTY_DRIVER_TYPE_SYSTEM;
-        hvsi_driver->init_termios = tty_std_termios;
-        hvsi_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL;
-        hvsi_driver->init_termios.c_ispeed = 9600;
-        hvsi_driver->init_termios.c_ospeed = 9600;
-        hvsi_driver->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(hvsi_driver, &hvsi_ops);
-
-        for (i=0; i < hvsi_count; i++) {
-                struct hvsi_struct *hp = &hvsi_ports[i];
-                int ret = 1;
-
-                ret = request_irq(hp->virq, hvsi_interrupt, IRQF_DISABLED, "hvsi", hp);
-                if (ret)
-                        printk(KERN_ERR "HVSI: couldn't reserve irq 0x%x (error %i)\n",
-                                hp->virq, ret);
-        }
-        hvsi_wait = wait_for_state; /* irqs active now */
-
-        if (tty_register_driver(hvsi_driver))
-                panic("Couldn't register hvsi console driver\n");
-
-        printk(KERN_DEBUG "HVSI: registered %i devices\n", hvsi_count);
-
-        return 0;
-}
-device_initcall(hvsi_init);
-
-/***** console (not tty) code: *****/
-
-static void hvsi_console_print(struct console *console, const char *buf,
-                unsigned int count)
-{
-        struct hvsi_struct *hp = &hvsi_ports[console->index];
-        char c[HVSI_MAX_OUTGOING_DATA] __ALIGNED__;
-        unsigned int i = 0, n = 0;
-        int ret, donecr = 0;
-
-        mb();
-        if (!is_open(hp))
-                return;
-
-        /*
-         * ugh, we have to translate LF -> CRLF ourselves, in place.
-         * copied from hvc_console.c:
-         */
-        while (count > 0 || i > 0) {
-                if (count > 0 && i < sizeof(c)) {
-                        if (buf[n] == '\n' && !donecr) {
-                                c[i++] = '\r';
-                                donecr = 1;
-                        } else {
-                                c[i++] = buf[n++];
-                                donecr = 0;
-                                --count;
-                        }
-                } else {
-                        ret = hvsi_put_chars(hp, c, i);
-                        if (ret < 0)
-                                i = 0;
-                        i -= ret;
-                }
-        }
-}
-
-static struct tty_driver *hvsi_console_device(struct console *console,
-        int *index)
-{
-        *index = console->index;
-        return hvsi_driver;
-}
-
-static int __init hvsi_console_setup(struct console *console, char *options)
-{
-        struct hvsi_struct *hp;
-        int ret;
-
-        if (console->index < 0 || console->index >= hvsi_count)
-                return -1;
-        hp = &hvsi_ports[console->index];
-
-        /* give the FSP a chance to change the baud rate when we re-open */
-        hvsi_close_protocol(hp);
-
-        ret = hvsi_handshake(hp);
-        if (ret < 0)
-                return ret;
-
-        ret = hvsi_get_mctrl(hp);
-        if (ret < 0)
-                return ret;
-
-        ret = hvsi_set_mctrl(hp, hp->mctrl | TIOCM_DTR);
-        if (ret < 0)
-                return ret;
-
-        hp->flags |= HVSI_CONSOLE;
-
-        return 0;
-}
-
-static struct console hvsi_console = {
-        .name           = "hvsi",
-        .write          = hvsi_console_print,
-        .device         = hvsi_console_device,
-        .setup          = hvsi_console_setup,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-};
-
-static int __init hvsi_console_init(void)
-{
-        struct device_node *vty;
-
-        hvsi_wait = poll_for_state; /* no irqs yet; must poll */
-
-        /* search device tree for vty nodes */
-        for (vty = of_find_compatible_node(NULL, "serial", "hvterm-protocol");
-                        vty != NULL;
-                        vty = of_find_compatible_node(vty, "serial", "hvterm-protocol")) {
-                struct hvsi_struct *hp;
-                const uint32_t *vtermno, *irq;
-
-                vtermno = of_get_property(vty, "reg", NULL);
-                irq = of_get_property(vty, "interrupts", NULL);
-                if (!vtermno || !irq)
-                        continue;
-
-                if (hvsi_count >= MAX_NR_HVSI_CONSOLES) {
-                        of_node_put(vty);
-                        break;
-                }
-
-                hp = &hvsi_ports[hvsi_count];
-                INIT_DELAYED_WORK(&hp->writer, hvsi_write_worker);
-                INIT_WORK(&hp->handshaker, hvsi_handshaker);
-                init_waitqueue_head(&hp->emptyq);
-                init_waitqueue_head(&hp->stateq);
-                spin_lock_init(&hp->lock);
-                hp->index = hvsi_count;
-                hp->inbuf_end = hp->inbuf;
-                hp->state = HVSI_CLOSED;
-                hp->vtermno = *vtermno;
-                hp->virq = irq_create_mapping(NULL, irq[0]);
-                if (hp->virq == NO_IRQ) {
-                        printk(KERN_ERR "%s: couldn't create irq mapping for 0x%x\n",
-                                __func__, irq[0]);
-                        continue;
-                }
-
-                hvsi_count++;
-        }
-
-        if (hvsi_count)
-                register_console(&hvsi_console);
-        return 0;
-}
-console_initcall(hvsi_console_init);
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index d31483c54883..a60043b3e409 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -49,7 +49,7 @@ config HW_RANDOM_INTEL
 
 config HW_RANDOM_AMD
         tristate "AMD HW Random Number Generator support"
-        depends on HW_RANDOM && X86 && PCI
+        depends on HW_RANDOM && (X86 || PPC_MAPLE) && PCI
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -198,3 +198,15 @@ config HW_RANDOM_NOMADIK
           module will be called nomadik-rng.
 
           If unsure, say Y.
+
+config HW_RANDOM_PICOXCELL
+        tristate "Picochip picoXcell true random number generator support"
+        depends on HW_RANDOM && ARCH_PICOXCELL && PICOXCELL_PC3X3
+        ---help---
+          This driver provides kernel-side support for the Random Number
+          Generator hardware found on Picochip PC3x3 and later devices.
+
+          To compile this driver as a module, choose M here: the
+          module will be called picoxcell-rng.
+
+          If unsure, say Y.
diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
index 4273308aa1e3..3db4eb8b19c0 100644
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
@@ -19,3 +19,4 @@ obj-$(CONFIG_HW_RANDOM_TX4939) += tx4939-rng.o
 obj-$(CONFIG_HW_RANDOM_MXC_RNGA) += mxc-rnga.o
 obj-$(CONFIG_HW_RANDOM_OCTEON) += octeon-rng.o
 obj-$(CONFIG_HW_RANDOM_NOMADIK) += nomadik-rng.o
+obj-$(CONFIG_HW_RANDOM_PICOXCELL) += picoxcell-rng.o
diff --git a/drivers/char/hw_random/amd-rng.c b/drivers/char/hw_random/amd-rng.c
index 0d8c5788b8e4..c6af038682f1 100644
--- a/drivers/char/hw_random/amd-rng.c
+++ b/drivers/char/hw_random/amd-rng.c
@@ -133,6 +133,12 @@ found:
         pmbase &= 0x0000FF00;
         if (pmbase == 0)
                 goto out;
+        if (!request_region(pmbase + 0xF0, 8, "AMD HWRNG")) {
+                dev_err(&pdev->dev, "AMD HWRNG region 0x%x already in use!\n",
+                        pmbase + 0xF0);
+                err = -EBUSY;
+                goto out;
+        }
         amd_rng.priv = (unsigned long)pmbase;
         amd_pdev = pdev;
 
@@ -141,6 +147,7 @@ found:
         if (err) {
                 printk(KERN_ERR PFX "RNG registering failed (%d)\n",
                        err);
+                release_region(pmbase + 0xF0, 8);
                 goto out;
         }
 out:
@@ -149,6 +156,8 @@ out:
 
 static void __exit mod_exit(void)
 {
+        u32 pmbase = (unsigned long)amd_rng.priv;
+        release_region(pmbase + 0xF0, 8);
         hwrng_unregister(&amd_rng);
 }
 
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 3d9c61e5acbf..2016aad85203 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -37,7 +37,6 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/miscdevice.h>
 #include <linux/delay.h>
@@ -170,6 +169,7 @@ static const struct file_operations rng_chrdev_ops = {
         .owner          = THIS_MODULE,
         .open           = rng_dev_open,
         .read           = rng_dev_read,
+        .llseek         = noop_llseek,
 };
 
 static struct miscdevice rng_miscdev = {
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index a3f5e381e746..ac6739e085e3 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -619,15 +619,20 @@ static void __devinit n2rng_driver_version(void)
                 pr_info("%s", version);
 }
 
-static int __devinit n2rng_probe(struct platform_device *op,
-                                 const struct of_device_id *match)
+static const struct of_device_id n2rng_match[];
+static int __devinit n2rng_probe(struct platform_device *op)
 {
-        int victoria_falls = (match->data != NULL);
+        const struct of_device_id *match;
+        int victoria_falls;
         int err = -ENOMEM;
         struct n2rng *np;
 
-        n2rng_driver_version();
+        match = of_match_device(n2rng_match, &op->dev);
+        if (!match)
+                return -EINVAL;
+        victoria_falls = (match->data != NULL);
 
+        n2rng_driver_version();
         np = kzalloc(sizeof(*np), GFP_KERNEL);
         if (!np)
                 goto out;
@@ -750,7 +755,7 @@ static const struct of_device_id n2rng_match[] = {
 };
 MODULE_DEVICE_TABLE(of, n2rng_match);
 
-static struct of_platform_driver n2rng_driver = {
+static struct platform_driver n2rng_driver = {
         .driver = {
                 .name = "n2rng",
                 .owner = THIS_MODULE,
@@ -762,12 +767,12 @@ static struct of_platform_driver n2rng_driver = {
 
 static int __init n2rng_init(void)
 {
-        return of_register_platform_driver(&n2rng_driver);
+        return platform_driver_register(&n2rng_driver);
 }
 
 static void __exit n2rng_exit(void)
 {
-        of_unregister_platform_driver(&n2rng_driver);
+        platform_driver_unregister(&n2rng_driver);
 }
 
 module_init(n2rng_init);
diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c
index a348c7e9aa0b..dd1d143eb8ea 100644
--- a/drivers/char/hw_random/nomadik-rng.c
+++ b/drivers/char/hw_random/nomadik-rng.c
@@ -39,7 +39,7 @@ static struct hwrng nmk_rng = {
         .read           = nmk_rng_read,
 };
 
-static int nmk_rng_probe(struct amba_device *dev, struct amba_id *id)
+static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)
 {
         void __iomem *base;
         int ret;
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index 06aad0831c73..2cc755a64302 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -91,7 +91,7 @@ static struct hwrng omap_rng_ops = {
 
 static int __devinit omap_rng_probe(struct platform_device *pdev)
 {
-        struct resource *res, *mem;
+        struct resource *res;
         int ret;
 
         /*
@@ -116,14 +116,12 @@ static int __devinit omap_rng_probe(struct platform_device *pdev)
         if (!res)
                 return -ENOENT;
 
-        mem = request_mem_region(res->start, resource_size(res),
-                                 pdev->name);
-        if (mem == NULL) {
+        if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
                 ret = -EBUSY;
                 goto err_region;
         }
 
-        dev_set_drvdata(&pdev->dev, mem);
+        dev_set_drvdata(&pdev->dev, res);
         rng_base = ioremap(res->start, resource_size(res));
         if (!rng_base) {
                 ret = -ENOMEM;
@@ -146,7 +144,7 @@ err_register:
         iounmap(rng_base);
         rng_base = NULL;
 err_ioremap:
-        release_resource(mem);
+        release_mem_region(res->start, resource_size(res));
 err_region:
         if (cpu_is_omap24xx()) {
                 clk_disable(rng_ick);
@@ -157,7 +155,7 @@ err_region:
 
 static int __exit omap_rng_remove(struct platform_device *pdev)
 {
-        struct resource *mem = dev_get_drvdata(&pdev->dev);
+        struct resource *res = dev_get_drvdata(&pdev->dev);
 
         hwrng_unregister(&omap_rng_ops);
 
@@ -170,7 +168,7 @@ static int __exit omap_rng_remove(struct platform_device *pdev)
                 clk_put(rng_ick);
         }
 
-        release_resource(mem);
+        release_mem_region(res->start, resource_size(res));
         rng_base = NULL;
 
         return 0;
diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c
index a31c830ca8cd..1d504815e6db 100644
--- a/drivers/char/hw_random/pasemi-rng.c
+++ b/drivers/char/hw_random/pasemi-rng.c
@@ -94,8 +94,7 @@ static struct hwrng pasemi_rng = {
         .data_read      = pasemi_rng_data_read,
 };
 
-static int __devinit rng_probe(struct platform_device *ofdev,
-                               const struct of_device_id *match)
+static int __devinit rng_probe(struct platform_device *ofdev)
 {
         void __iomem *rng_regs;
         struct device_node *rng_np = ofdev->dev.of_node;
@@ -139,7 +138,7 @@ static struct of_device_id rng_match[] = {
         { },
 };
 
-static struct of_platform_driver rng_driver = {
+static struct platform_driver rng_driver = {
         .driver = {
                 .name = "pasemi-rng",
                 .owner = THIS_MODULE,
@@ -151,13 +150,13 @@ static struct of_platform_driver rng_driver = {
 
 static int __init rng_init(void)
 {
-        return of_register_platform_driver(&rng_driver);
+        return platform_driver_register(&rng_driver);
 }
 module_init(rng_init);
 
 static void __exit rng_exit(void)
 {
-        of_unregister_platform_driver(&rng_driver);
+        platform_driver_unregister(&rng_driver);
 }
 module_exit(rng_exit);
 
diff --git a/drivers/char/hw_random/picoxcell-rng.c b/drivers/char/hw_random/picoxcell-rng.c
new file mode 100644
index 000000000000..990d55a5e3e8
--- /dev/null
+++ b/drivers/char/hw_random/picoxcell-rng.c
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2010-2011 Picochip Ltd., Jamie Iles
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * All enquiries to support@picochip.com
+ */
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/hw_random.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#define DATA_REG_OFFSET         0x0200
+#define CSR_REG_OFFSET          0x0278
+#define CSR_OUT_EMPTY_MASK      (1 << 24)
+#define CSR_FAULT_MASK          (1 << 1)
+#define TRNG_BLOCK_RESET_MASK   (1 << 0)
+#define TAI_REG_OFFSET          0x0380
+
+/*
+ * The maximum amount of time in microseconds to spend waiting for data if the
+ * core wants us to wait.  The TRNG should generate 32 bits every 320ns so a
+ * timeout of 20us seems reasonable.  The TRNG does builtin tests of the data
+ * for randomness so we can't always assume there is data present.
+ */
+#define PICO_TRNG_TIMEOUT               20
+
+static void __iomem *rng_base;
+static struct clk *rng_clk;
+struct device *rng_dev;
+
+static inline u32 picoxcell_trng_read_csr(void)
+{
+        return __raw_readl(rng_base + CSR_REG_OFFSET);
+}
+
+static inline bool picoxcell_trng_is_empty(void)
+{
+        return picoxcell_trng_read_csr() & CSR_OUT_EMPTY_MASK;
+}
+
+/*
+ * Take the random number generator out of reset and make sure the interrupts
+ * are masked. We shouldn't need to get large amounts of random bytes so just
+ * poll the status register. The hardware generates 32 bits every 320ns so we
+ * shouldn't have to wait long enough to warrant waiting for an IRQ.
+ */
+static void picoxcell_trng_start(void)
+{
+        __raw_writel(0, rng_base + TAI_REG_OFFSET);
+        __raw_writel(0, rng_base + CSR_REG_OFFSET);
+}
+
+static void picoxcell_trng_reset(void)
+{
+        __raw_writel(TRNG_BLOCK_RESET_MASK, rng_base + CSR_REG_OFFSET);
+        __raw_writel(TRNG_BLOCK_RESET_MASK, rng_base + TAI_REG_OFFSET);
+        picoxcell_trng_start();
+}
+
+/*
+ * Get some random data from the random number generator. The hw_random core
+ * layer provides us with locking.
+ */
+static int picoxcell_trng_read(struct hwrng *rng, void *buf, size_t max,
+                               bool wait)
+{
+        int i;
+
+        /* Wait for some data to become available. */
+        for (i = 0; i < PICO_TRNG_TIMEOUT && picoxcell_trng_is_empty(); ++i) {
+                if (!wait)
+                        return 0;
+
+                udelay(1);
+        }
+
+        if (picoxcell_trng_read_csr() & CSR_FAULT_MASK) {
+                dev_err(rng_dev, "fault detected, resetting TRNG\n");
+                picoxcell_trng_reset();
+                return -EIO;
+        }
+
+        if (i == PICO_TRNG_TIMEOUT)
+                return 0;
+
+        *(u32 *)buf = __raw_readl(rng_base + DATA_REG_OFFSET);
+        return sizeof(u32);
+}
+
+static struct hwrng picoxcell_trng = {
+        .name           = "picoxcell",
+        .read           = picoxcell_trng_read,
+};
+
+static int picoxcell_trng_probe(struct platform_device *pdev)
+{
+        int ret;
+        struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        if (!mem) {
+                dev_warn(&pdev->dev, "no memory resource\n");
+                return -ENOMEM;
+        }
+
+        if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem),
+                                     "picoxcell_trng")) {
+                dev_warn(&pdev->dev, "unable to request io mem\n");
+                return -EBUSY;
+        }
+
+        rng_base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
+        if (!rng_base) {
+                dev_warn(&pdev->dev, "unable to remap io mem\n");
+                return -ENOMEM;
+        }
+
+        rng_clk = clk_get(&pdev->dev, NULL);
+        if (IS_ERR(rng_clk)) {
+                dev_warn(&pdev->dev, "no clk\n");
+                return PTR_ERR(rng_clk);
+        }
+
+        ret = clk_enable(rng_clk);
+        if (ret) {
+                dev_warn(&pdev->dev, "unable to enable clk\n");
+                goto err_enable;
+        }
+
+        picoxcell_trng_start();
+        ret = hwrng_register(&picoxcell_trng);
+        if (ret)
+                goto err_register;
+
+        rng_dev = &pdev->dev;
+        dev_info(&pdev->dev, "pixoxcell random number generator active\n");
+
+        return 0;
+
+err_register:
+        clk_disable(rng_clk);
+err_enable:
+        clk_put(rng_clk);
+
+        return ret;
+}
+
+static int __devexit picoxcell_trng_remove(struct platform_device *pdev)
+{
+        hwrng_unregister(&picoxcell_trng);
+        clk_disable(rng_clk);
+        clk_put(rng_clk);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int picoxcell_trng_suspend(struct device *dev)
+{
+        clk_disable(rng_clk);
+
+        return 0;
+}
+
+static int picoxcell_trng_resume(struct device *dev)
+{
+        return clk_enable(rng_clk);
+}
+
+static const struct dev_pm_ops picoxcell_trng_pm_ops = {
+        .suspend        = picoxcell_trng_suspend,
+        .resume         = picoxcell_trng_resume,
+};
+#endif /* CONFIG_PM */
+
+static struct platform_driver picoxcell_trng_driver = {
+        .probe          = picoxcell_trng_probe,
+        .remove         = __devexit_p(picoxcell_trng_remove),
+        .driver         = {
+                .name   = "picoxcell-trng",
+                .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     = &picoxcell_trng_pm_ops,
+#endif /* CONFIG_PM */
+        },
+};
+
+static int __init picoxcell_trng_init(void)
+{
+        return platform_driver_register(&picoxcell_trng_driver);
+}
+module_init(picoxcell_trng_init);
+
+static void __exit picoxcell_trng_exit(void)
+{
+        platform_driver_unregister(&picoxcell_trng_driver);
+}
+module_exit(picoxcell_trng_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jamie Iles");
+MODULE_DESCRIPTION("Picochip picoXcell TRNG driver");
diff --git a/drivers/char/hw_random/via-rng.c b/drivers/char/hw_random/via-rng.c
index 794aacb715c1..d0387a84eec1 100644
--- a/drivers/char/hw_random/via-rng.c
+++ b/drivers/char/hw_random/via-rng.c
@@ -24,6 +24,7 @@
  * warranty of any kind, whether express or implied.
  */
 
+#include <crypto/padlock.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/hw_random.h>
@@ -34,7 +35,6 @@
 #include <asm/i387.h>
 
 
-#define PFX     KBUILD_MODNAME ": "
 
 
 enum {
@@ -81,8 +81,7 @@ static inline u32 xstore(u32 *addr, u32 edx_in)
         ts_state = irq_ts_save();
 
         asm(".byte 0x0F,0xA7,0xC0 /* xstore %%edi (addr=%0) */"
-                :"=m"(*addr), "=a"(eax_out)
-                :"D"(addr), "d"(edx_in));
+                : "=m" (*addr), "=a" (eax_out), "+d" (edx_in), "+D" (addr));
 
         irq_ts_restore(ts_state);
         return eax_out;
@@ -90,8 +89,10 @@ static inline u32 xstore(u32 *addr, u32 edx_in)
 
 static int via_rng_data_present(struct hwrng *rng, int wait)
 {
+        char buf[16 + PADLOCK_ALIGNMENT - STACK_ALIGN] __attribute__
+                ((aligned(STACK_ALIGN)));
+        u32 *via_rng_datum = (u32 *)PTR_ALIGN(&buf[0], PADLOCK_ALIGNMENT);
         u32 bytes_out;
-        u32 *via_rng_datum = (u32 *)(&rng->priv);
         int i;
 
         /* We choose the recommended 1-byte-per-instruction RNG rate,
@@ -115,6 +116,7 @@ static int via_rng_data_present(struct hwrng *rng, int wait)
                         break;
                 udelay(10);
         }
+        rng->priv = *via_rng_datum;
         return bytes_out ? 1 : 0;
 }
 
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 4cd8b227c11f..6e40072fbf67 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -5,6 +5,9 @@
  *
  * Copyright (C) 2001  Massimo Dal Zotto <dz@debian.org>
  *
+ * Hwmon integration:
+ * Copyright (C) 2011  Jean Delvare <khali@linux-fr.org>
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  * Free Software Foundation; either version 2, or (at your option) any
@@ -23,7 +26,9 @@
 #include <linux/seq_file.h>
 #include <linux/dmi.h>
 #include <linux/capability.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -56,7 +61,9 @@
 
 #define I8K_TEMPERATURE_BUG     1
 
+static DEFINE_MUTEX(i8k_mutex);
 static char bios_version[4];
+static struct device *i8k_hwmon_dev;
 
 MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");
 MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");
@@ -119,7 +126,7 @@ static int i8k_smm(struct smm_regs *regs)
         int eax = regs->eax;
 
 #if defined(CONFIG_X86_64)
-        asm("pushq %%rax\n\t"
+        asm volatile("pushq %%rax\n\t"
                 "movl 0(%%rax),%%edx\n\t"
                 "pushq %%rdx\n\t"
                 "movl 4(%%rax),%%ebx\n\t"
@@ -138,14 +145,14 @@ static int i8k_smm(struct smm_regs *regs)
                 "movl %%edi,20(%%rax)\n\t"
                 "popq %%rdx\n\t"
                 "movl %%edx,0(%%rax)\n\t"
-                "lahf\n\t"
-                "shrl $8,%%eax\n\t"
+                "pushfq\n\t"
+                "popq %%rax\n\t"
                 "andl $1,%%eax\n"
                 :"=a"(rc)
                 :    "a"(regs)
                 :    "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
 #else
-        asm("pushl %%eax\n\t"
+        asm volatile("pushl %%eax\n\t"
             "movl 0(%%eax),%%edx\n\t"
             "push %%edx\n\t"
             "movl 4(%%eax),%%ebx\n\t"
@@ -166,7 +173,8 @@ static int i8k_smm(struct smm_regs *regs)
             "movl %%edx,0(%%eax)\n\t"
             "lahf\n\t"
             "shrl $8,%%eax\n\t"
-            "andl $1,%%eax\n":"=a"(rc)
+            "andl $1,%%eax\n"
+            :"=a"(rc)
             :    "a"(regs)
             :    "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
 #endif
@@ -399,9 +407,9 @@ static long i8k_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
 {
         long ret;
 
-        lock_kernel();
+        mutex_lock(&i8k_mutex);
         ret = i8k_ioctl_unlocked(fp, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&i8k_mutex);
 
         return ret;
 }
@@ -453,6 +461,152 @@ static int i8k_open_fs(struct inode *inode, struct file *file)
         return single_open(file, i8k_proc_show, NULL);
 }
 
+
+/*
+ * Hwmon interface
+ */
+
+static ssize_t i8k_hwmon_show_temp(struct device *dev,
+                                   struct device_attribute *devattr,
+                                   char *buf)
+{
+        int cpu_temp;
+
+        cpu_temp = i8k_get_temp(0);
+        if (cpu_temp < 0)
+                return cpu_temp;
+        return sprintf(buf, "%d\n", cpu_temp * 1000);
+}
+
+static ssize_t i8k_hwmon_show_fan(struct device *dev,
+                                  struct device_attribute *devattr,
+                                  char *buf)
+{
+        int index = to_sensor_dev_attr(devattr)->index;
+        int fan_speed;
+
+        fan_speed = i8k_get_fan_speed(index);
+        if (fan_speed < 0)
+                return fan_speed;
+        return sprintf(buf, "%d\n", fan_speed);
+}
+
+static ssize_t i8k_hwmon_show_label(struct device *dev,
+                                    struct device_attribute *devattr,
+                                    char *buf)
+{
+        static const char *labels[4] = {
+                "i8k",
+                "CPU",
+                "Left Fan",
+                "Right Fan",
+        };
+        int index = to_sensor_dev_attr(devattr)->index;
+
+        return sprintf(buf, "%s\n", labels[index]);
+}
+
+static DEVICE_ATTR(temp1_input, S_IRUGO, i8k_hwmon_show_temp, NULL);
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, i8k_hwmon_show_fan, NULL,
+                          I8K_FAN_LEFT);
+static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, i8k_hwmon_show_fan, NULL,
+                          I8K_FAN_RIGHT);
+static SENSOR_DEVICE_ATTR(name, S_IRUGO, i8k_hwmon_show_label, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, i8k_hwmon_show_label, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan1_label, S_IRUGO, i8k_hwmon_show_label, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan2_label, S_IRUGO, i8k_hwmon_show_label, NULL, 3);
+
+static void i8k_hwmon_remove_files(struct device *dev)
+{
+        device_remove_file(dev, &dev_attr_temp1_input);
+        device_remove_file(dev, &sensor_dev_attr_fan1_input.dev_attr);
+        device_remove_file(dev, &sensor_dev_attr_fan2_input.dev_attr);
+        device_remove_file(dev, &sensor_dev_attr_temp1_label.dev_attr);
+        device_remove_file(dev, &sensor_dev_attr_fan1_label.dev_attr);
+        device_remove_file(dev, &sensor_dev_attr_fan2_label.dev_attr);
+        device_remove_file(dev, &sensor_dev_attr_name.dev_attr);
+}
+
+static int __init i8k_init_hwmon(void)
+{
+        int err;
+
+        i8k_hwmon_dev = hwmon_device_register(NULL);
+        if (IS_ERR(i8k_hwmon_dev)) {
+                err = PTR_ERR(i8k_hwmon_dev);
+                i8k_hwmon_dev = NULL;
+                printk(KERN_ERR "i8k: hwmon registration failed (%d)\n", err);
+                return err;
+        }
+
+        /* Required name attribute */
+        err = device_create_file(i8k_hwmon_dev,
+                                 &sensor_dev_attr_name.dev_attr);
+        if (err)
+                goto exit_unregister;
+
+        /* CPU temperature attributes, if temperature reading is OK */
+        err = i8k_get_temp(0);
+        if (err < 0) {
+                dev_dbg(i8k_hwmon_dev,
+                        "Not creating temperature attributes (%d)\n", err);
+        } else {
+                err = device_create_file(i8k_hwmon_dev, &dev_attr_temp1_input);
+                if (err)
+                        goto exit_remove_files;
+                err = device_create_file(i8k_hwmon_dev,
+                                         &sensor_dev_attr_temp1_label.dev_attr);
+                if (err)
+                        goto exit_remove_files;
+        }
+
+        /* Left fan attributes, if left fan is present */
+        err = i8k_get_fan_status(I8K_FAN_LEFT);
+        if (err < 0) {
+                dev_dbg(i8k_hwmon_dev,
+                        "Not creating %s fan attributes (%d)\n", "left", err);
+        } else {
+                err = device_create_file(i8k_hwmon_dev,
+                                         &sensor_dev_attr_fan1_input.dev_attr);
+                if (err)
+                        goto exit_remove_files;
+                err = device_create_file(i8k_hwmon_dev,
+                                         &sensor_dev_attr_fan1_label.dev_attr);
+                if (err)
+                        goto exit_remove_files;
+        }
+
+        /* Right fan attributes, if right fan is present */
+        err = i8k_get_fan_status(I8K_FAN_RIGHT);
+        if (err < 0) {
+                dev_dbg(i8k_hwmon_dev,
+                        "Not creating %s fan attributes (%d)\n", "right", err);
+        } else {
+                err = device_create_file(i8k_hwmon_dev,
+                                         &sensor_dev_attr_fan2_input.dev_attr);
+                if (err)
+                        goto exit_remove_files;
+                err = device_create_file(i8k_hwmon_dev,
+                                         &sensor_dev_attr_fan2_label.dev_attr);
+                if (err)
+                        goto exit_remove_files;
+        }
+
+        return 0;
+
+ exit_remove_files:
+        i8k_hwmon_remove_files(i8k_hwmon_dev);
+ exit_unregister:
+        hwmon_device_unregister(i8k_hwmon_dev);
+        return err;
+}
+
+static void __exit i8k_exit_hwmon(void)
+{
+        i8k_hwmon_remove_files(i8k_hwmon_dev);
+        hwmon_device_unregister(i8k_hwmon_dev);
+}
+
 static struct dmi_system_id __initdata i8k_dmi_table[] = {
         {
                 .ident = "Dell Inspiron",
@@ -578,6 +732,7 @@ static int __init i8k_probe(void)
 static int __init i8k_init(void)
 {
         struct proc_dir_entry *proc_i8k;
+        int err;
 
         /* Are we running on an supported laptop? */
         if (i8k_probe())
@@ -588,15 +743,24 @@ static int __init i8k_init(void)
         if (!proc_i8k)
                 return -ENOENT;
 
+        err = i8k_init_hwmon();
+        if (err)
+                goto exit_remove_proc;
+
         printk(KERN_INFO
                "Dell laptop SMM driver v%s Massimo Dal Zotto (dz@debian.org)\n",
                I8K_VERSION);
 
         return 0;
+
+ exit_remove_proc:
+        remove_proc_entry("i8k", NULL);
+        return err;
 }
 
 static void __exit i8k_exit(void)
 {
+        i8k_exit_hwmon();
         remove_proc_entry("i8k", NULL);
 }
 
diff --git a/drivers/char/ip2/Makefile b/drivers/char/ip2/Makefile
deleted file mode 100644
index bc397d92b499..000000000000
--- a/drivers/char/ip2/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for the Computone IntelliPort Plus Driver
-#
-
-obj-$(CONFIG_COMPUTONE)         += ip2.o
-
-ip2-objs                        := ip2main.o
-
diff --git a/drivers/char/ip2/i2cmd.c b/drivers/char/ip2/i2cmd.c
deleted file mode 100644
index e7af647800b6..000000000000
--- a/drivers/char/ip2/i2cmd.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
-*
-*   (c) 1998 by Computone Corporation
-*
-********************************************************************************
-*
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: Definition table for In-line and Bypass commands. Applicable
-*                only when the standard loadware is active. (This is included
-*                source code, not a separate compilation module.)
-*
-*******************************************************************************/
-
-//------------------------------------------------------------------------------
-//
-// Revision History:
-//
-// 10 October 1991   MAG First Draft
-//  7 November 1991  MAG Reflects additional commands.
-// 24 February 1992  MAG Additional commands for 1.4.x loadware
-// 11 March 1992     MAG Additional commands
-// 30 March 1992     MAG Additional command: CMD_DSS_NOW
-// 18 May 1992       MAG Discovered commands 39 & 40 must be at the end of a
-//                       packet: affects implementation.
-//------------------------------------------------------------------------------
-
-//************
-//* Includes *
-//************
-
-#include "i2cmd.h"   /* To get some bit-defines */
-
-//------------------------------------------------------------------------------
-// Here is the table of global arrays which represent each type of command
-// supported in the IntelliPort standard loadware. See also i2cmd.h
-// for a more complete explanation of what is going on.
-//------------------------------------------------------------------------------
-
-// Here are the various globals: note that the names are not used except through
-// the macros defined in i2cmd.h. Also note that although they are character
-// arrays here (for extendability) they are cast to structure pointers in the
-// i2cmd.h macros. See i2cmd.h for flags definitions.
-
-//                     Length Flags Command
-static UCHAR ct02[] = { 1, BTH,     0x02                     }; // DTR UP
-static UCHAR ct03[] = { 1, BTH,     0x03                     }; // DTR DN
-static UCHAR ct04[] = { 1, BTH,     0x04                     }; // RTS UP
-static UCHAR ct05[] = { 1, BTH,     0x05                     }; // RTS DN
-static UCHAR ct06[] = { 1, BYP,     0x06                     }; // START FL
-static UCHAR ct07[] = { 2, BTH,     0x07,0                   }; // BAUD
-static UCHAR ct08[] = { 2, BTH,     0x08,0                   }; // BITS
-static UCHAR ct09[] = { 2, BTH,     0x09,0                   }; // STOP
-static UCHAR ct10[] = { 2, BTH,     0x0A,0                   }; // PARITY
-static UCHAR ct11[] = { 2, BTH,     0x0B,0                   }; // XON
-static UCHAR ct12[] = { 2, BTH,     0x0C,0                   }; // XOFF
-static UCHAR ct13[] = { 1, BTH,     0x0D                     }; // STOP FL
-static UCHAR ct14[] = { 1, BYP|VIP, 0x0E                     }; // ACK HOTK
-//static UCHAR ct15[]={ 2, BTH|VIP, 0x0F,0                   }; // IRQ SET
-static UCHAR ct16[] = { 2, INL,     0x10,0                   }; // IXONOPTS
-static UCHAR ct17[] = { 2, INL,     0x11,0                   }; // OXONOPTS
-static UCHAR ct18[] = { 1, INL,     0x12                     }; // CTSENAB
-static UCHAR ct19[] = { 1, BTH,     0x13                     }; // CTSDSAB
-static UCHAR ct20[] = { 1, INL,     0x14                     }; // DCDENAB
-static UCHAR ct21[] = { 1, BTH,     0x15                     }; // DCDDSAB
-static UCHAR ct22[] = { 1, BTH,     0x16                     }; // DSRENAB
-static UCHAR ct23[] = { 1, BTH,     0x17                     }; // DSRDSAB
-static UCHAR ct24[] = { 1, BTH,     0x18                     }; // RIENAB
-static UCHAR ct25[] = { 1, BTH,     0x19                     }; // RIDSAB
-static UCHAR ct26[] = { 2, BTH,     0x1A,0                   }; // BRKENAB
-static UCHAR ct27[] = { 1, BTH,     0x1B                     }; // BRKDSAB
-//static UCHAR ct28[]={ 2, BTH,     0x1C,0                   }; // MAXBLOKSIZE
-//static UCHAR ct29[]={ 2, 0,       0x1D,0                   }; // reserved
-static UCHAR ct30[] = { 1, INL,     0x1E                     }; // CTSFLOWENAB
-static UCHAR ct31[] = { 1, INL,     0x1F                     }; // CTSFLOWDSAB
-static UCHAR ct32[] = { 1, INL,     0x20                     }; // RTSFLOWENAB
-static UCHAR ct33[] = { 1, INL,     0x21                     }; // RTSFLOWDSAB
-static UCHAR ct34[] = { 2, BTH,     0x22,0                   }; // ISTRIPMODE
-static UCHAR ct35[] = { 2, BTH|END, 0x23,0                   }; // SENDBREAK
-static UCHAR ct36[] = { 2, BTH,     0x24,0                   }; // SETERRMODE
-//static UCHAR ct36a[]={ 3, INL,    0x24,0,0                 }; // SET_REPLACE
-
-// The following is listed for completeness, but should never be sent directly
-// by user-level code. It is sent only by library routines in response to data
-// movement.
-//static UCHAR ct37[]={ 5, BYP|VIP, 0x25,0,0,0,0             }; // FLOW PACKET
-
-// Back to normal
-//static UCHAR ct38[] = {11, BTH|VAR, 0x26,0,0,0,0,0,0,0,0,0,0 }; // DEF KEY SEQ
-//static UCHAR ct39[]={ 3, BTH|END, 0x27,0,0                 }; // OPOSTON
-//static UCHAR ct40[]={ 1, BTH|END, 0x28                     }; // OPOSTOFF
-static UCHAR ct41[] = { 1, BYP,     0x29                     }; // RESUME
-//static UCHAR ct42[]={ 2, BTH,     0x2A,0                   }; // TXBAUD
-//static UCHAR ct43[]={ 2, BTH,     0x2B,0                   }; // RXBAUD
-//static UCHAR ct44[]={ 2, BTH,     0x2C,0                   }; // MS PING
-//static UCHAR ct45[]={ 1, BTH,     0x2D                     }; // HOTENAB
-//static UCHAR ct46[]={ 1, BTH,     0x2E                     }; // HOTDSAB
-//static UCHAR ct47[]={ 7, BTH,     0x2F,0,0,0,0,0,0         }; // UNIX FLAGS
-//static UCHAR ct48[]={ 1, BTH,     0x30                     }; // DSRFLOWENAB
-//static UCHAR ct49[]={ 1, BTH,     0x31                     }; // DSRFLOWDSAB
-//static UCHAR ct50[]={ 1, BTH,     0x32                     }; // DTRFLOWENAB
-//static UCHAR ct51[]={ 1, BTH,     0x33                     }; // DTRFLOWDSAB
-//static UCHAR ct52[]={ 1, BTH,     0x34                     }; // BAUDTABRESET
-//static UCHAR ct53[] = { 3, BTH,     0x35,0,0                 }; // BAUDREMAP
-static UCHAR ct54[] = { 3, BTH,     0x36,0,0                 }; // CUSTOMBAUD1
-static UCHAR ct55[] = { 3, BTH,     0x37,0,0                 }; // CUSTOMBAUD2
-static UCHAR ct56[] = { 2, BTH|END, 0x38,0                   }; // PAUSE
-static UCHAR ct57[] = { 1, BYP,     0x39                     }; // SUSPEND
-static UCHAR ct58[] = { 1, BYP,     0x3A                     }; // UNSUSPEND
-static UCHAR ct59[] = { 2, BTH,     0x3B,0                   }; // PARITYCHK
-static UCHAR ct60[] = { 1, INL|VIP, 0x3C                     }; // BOOKMARKREQ
-//static UCHAR ct61[]={ 2, BTH,     0x3D,0                   }; // INTERNALLOOP
-//static UCHAR ct62[]={ 2, BTH,     0x3E,0                   }; // HOTKTIMEOUT
-static UCHAR ct63[] = { 2, INL,     0x3F,0                   }; // SETTXON
-static UCHAR ct64[] = { 2, INL,     0x40,0                   }; // SETTXOFF
-//static UCHAR ct65[]={ 2, BTH,     0x41,0                   }; // SETAUTORTS
-//static UCHAR ct66[]={ 2, BTH,     0x42,0                   }; // SETHIGHWAT
-//static UCHAR ct67[]={ 2, BYP,     0x43,0                   }; // STARTSELFL
-//static UCHAR ct68[]={ 2, INL,     0x44,0                   }; // ENDSELFL
-//static UCHAR ct69[]={ 1, BYP,     0x45                     }; // HWFLOW_OFF
-//static UCHAR ct70[]={ 1, BTH,     0x46                     }; // ODSRFL_ENAB
-//static UCHAR ct71[]={ 1, BTH,     0x47                     }; // ODSRFL_DSAB
-//static UCHAR ct72[]={ 1, BTH,     0x48                     }; // ODCDFL_ENAB
-//static UCHAR ct73[]={ 1, BTH,     0x49                     }; // ODCDFL_DSAB
-//static UCHAR ct74[]={ 2, BTH,     0x4A,0                   }; // LOADLEVEL
-//static UCHAR ct75[]={ 2, BTH,     0x4B,0                   }; // STATDATA
-//static UCHAR ct76[]={ 1, BYP,     0x4C                     }; // BREAK_ON
-//static UCHAR ct77[]={ 1, BYP,     0x4D                     }; // BREAK_OFF
-//static UCHAR ct78[]={ 1, BYP,     0x4E                     }; // GETFC
-static UCHAR ct79[] = { 2, BYP,     0x4F,0                   }; // XMIT_NOW
-//static UCHAR ct80[]={ 4, BTH,     0x50,0,0,0               }; // DIVISOR_LATCH
-//static UCHAR ct81[]={ 1, BYP,     0x51                     }; // GET_STATUS
-//static UCHAR ct82[]={ 1, BYP,     0x52                     }; // GET_TXCNT
-//static UCHAR ct83[]={ 1, BYP,     0x53                     }; // GET_RXCNT
-//static UCHAR ct84[]={ 1, BYP,     0x54                     }; // GET_BOXIDS
-//static UCHAR ct85[]={10, BYP,     0x55,0,0,0,0,0,0,0,0,0   }; // ENAB_MULT
-//static UCHAR ct86[]={ 2, BTH,     0x56,0                   }; // RCV_ENABLE
-static UCHAR ct87[] = { 1, BYP,     0x57                     }; // HW_TEST
-//static UCHAR ct88[]={ 3, BTH,     0x58,0,0                 }; // RCV_THRESHOLD
-//static UCHAR ct90[]={ 3, BYP,     0x5A,0,0                 }; // Set SILO
-//static UCHAR ct91[]={ 2, BYP,     0x5B,0                   }; // timed break
-
-// Some composite commands as well
-//static UCHAR cc01[]={ 2, BTH,     0x02,0x04                }; // DTR & RTS UP
-//static UCHAR cc02[]={ 2, BTH,     0x03,0x05                }; // DTR & RTS DN
-
-//********
-//* Code *
-//********
-
-//******************************************************************************
-// Function:   i2cmdUnixFlags(iflag, cflag, lflag)
-// Parameters: Unix tty flags
-//
-// Returns:    Pointer to command structure
-//
-// Description:
-//
-// This routine sets the parameters of command 47 and returns a pointer to the
-// appropriate structure.
-//******************************************************************************
-#if 0
-cmdSyntaxPtr
-i2cmdUnixFlags(unsigned short iflag,unsigned short cflag,unsigned short lflag)
-{
-        cmdSyntaxPtr pCM = (cmdSyntaxPtr) ct47;
-
-        pCM->cmd[1] = (unsigned char)  iflag;
-        pCM->cmd[2] = (unsigned char) (iflag >> 8);
-        pCM->cmd[3] = (unsigned char)  cflag;
-        pCM->cmd[4] = (unsigned char) (cflag >> 8);
-        pCM->cmd[5] = (unsigned char)  lflag;
-        pCM->cmd[6] = (unsigned char) (lflag >> 8);
-        return pCM;
-}
-#endif  /*  0  */
-
-//******************************************************************************
-// Function:   i2cmdBaudDef(which, rate)
-// Parameters: ?
-//
-// Returns:    Pointer to command structure
-//
-// Description:
-//
-// This routine sets the parameters of commands 54 or 55 (according to the
-// argument which), and returns a pointer to the appropriate structure.
-//******************************************************************************
-static cmdSyntaxPtr
-i2cmdBaudDef(int which, unsigned short rate)
-{
-        cmdSyntaxPtr pCM;
-
-        switch(which)
-        {
-        case 1:
-                pCM = (cmdSyntaxPtr) ct54;
-                break;
-        default:
-        case 2:
-                pCM = (cmdSyntaxPtr) ct55;
-                break;
-        }
-        pCM->cmd[1] = (unsigned char) rate;
-        pCM->cmd[2] = (unsigned char) (rate >> 8);
-        return pCM;
-}
-
diff --git a/drivers/char/ip2/i2cmd.h b/drivers/char/ip2/i2cmd.h
deleted file mode 100644
index 29277ec6b8ed..000000000000
--- a/drivers/char/ip2/i2cmd.h
+++ /dev/null
@@ -1,630 +0,0 @@
-/*******************************************************************************
-*
-*   (c) 1999 by Computone Corporation
-*
-********************************************************************************
-*
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort II family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: Definitions and support for In-line and Bypass commands.
-*                Applicable only when the standard loadware is active.
-*
-*******************************************************************************/
-//------------------------------------------------------------------------------
-// Revision History:
-//
-// 10 October 1991   MAG First Draft
-//  7 November 1991  MAG Reflects some new commands
-// 20 February 1992  MAG CMD_HOTACK corrected: no argument.
-// 24 February 1992  MAG Support added for new commands for 1.4.x loadware.
-// 11 March 1992     MAG Additional commands.
-// 16 March 1992     MAG Additional commands.
-// 30 March 1992     MAG Additional command: CMD_DSS_NOW
-// 18 May   1992     MAG Changed CMD_OPOST
-//
-//------------------------------------------------------------------------------
-#ifndef I2CMD_H      // To prevent multiple includes
-#define I2CMD_H   1
-
-#include "ip2types.h"
-
-// This module is designed to provide a uniform method of sending commands to
-// the board through command packets. The difficulty is, some commands take
-// parameters, others do not. Furthermore, it is often useful to send several
-// commands to the same channel as part of the same packet. (See also i2pack.h.)
-//
-// This module is designed so that the caller should not be responsible for
-// remembering the exact syntax of each command, or at least so that the
-// compiler could check things somewhat. I'll explain as we go...
-//
-// First, a structure which can embody the syntax of each type of command.
-//
-typedef struct _cmdSyntax
-{
-        UCHAR length;   // Number of bytes in the command
-        UCHAR flags;    // Information about the command (see below)
-
-        // The command and its parameters, which may be of arbitrary length. Don't
-        // worry yet how the parameters will be initialized; macros later take care
-        // of it. Also, don't worry about the arbitrary length issue; this structure
-        // is never used to allocate space (see i2cmd.c).
-        UCHAR cmd[2];
-} cmdSyntax, *cmdSyntaxPtr;
-
-// Bit assignments for flags
-
-#define INL 1           // Set if suitable for inline commands
-#define BYP 2           // Set if suitable for bypass commands
-#define BTH (INL|BYP)   // suitable for either!
-#define END 4           // Set if this must be the last command in a block
-#define VIP 8           // Set if this command is special in some way and really
-                                                // should only be sent from the library-level and not
-                                                // directly from user-level
-#define VAR 0x10        // This command is of variable length!
-
-// Declarations for the global arrays used to bear the commands and their
-// arguments.
-//
-// Note: Since these are globals and the arguments might change, it is important
-// that the library routine COPY these into buffers from whence they would be
-// sent, rather than merely storing the pointers. In multi-threaded
-// environments, important that the copy should obtain before any context switch
-// is allowed. Also, for parameterized commands, DO NOT ISSUE THE SAME COMMAND
-// MORE THAN ONCE WITH THE SAME PARAMETERS in the same call.
-//
-static UCHAR ct02[];
-static UCHAR ct03[];
-static UCHAR ct04[];
-static UCHAR ct05[];
-static UCHAR ct06[];
-static UCHAR ct07[];
-static UCHAR ct08[];
-static UCHAR ct09[];
-static UCHAR ct10[];
-static UCHAR ct11[];
-static UCHAR ct12[];
-static UCHAR ct13[];
-static UCHAR ct14[];
-static UCHAR ct15[];
-static UCHAR ct16[];
-static UCHAR ct17[];
-static UCHAR ct18[];
-static UCHAR ct19[];
-static UCHAR ct20[];
-static UCHAR ct21[];
-static UCHAR ct22[];
-static UCHAR ct23[];
-static UCHAR ct24[];
-static UCHAR ct25[];
-static UCHAR ct26[];
-static UCHAR ct27[];
-static UCHAR ct28[];
-static UCHAR ct29[];
-static UCHAR ct30[];
-static UCHAR ct31[];
-static UCHAR ct32[];
-static UCHAR ct33[];
-static UCHAR ct34[];
-static UCHAR ct35[];
-static UCHAR ct36[];
-static UCHAR ct36a[];
-static UCHAR ct41[];
-static UCHAR ct42[];
-static UCHAR ct43[];
-static UCHAR ct44[];
-static UCHAR ct45[];
-static UCHAR ct46[];
-static UCHAR ct48[];
-static UCHAR ct49[];
-static UCHAR ct50[];
-static UCHAR ct51[];
-static UCHAR ct52[];
-static UCHAR ct56[];
-static UCHAR ct57[];
-static UCHAR ct58[];
-static UCHAR ct59[];
-static UCHAR ct60[];
-static UCHAR ct61[];
-static UCHAR ct62[];
-static UCHAR ct63[];
-static UCHAR ct64[];
-static UCHAR ct65[];
-static UCHAR ct66[];
-static UCHAR ct67[];
-static UCHAR ct68[];
-static UCHAR ct69[];
-static UCHAR ct70[];
-static UCHAR ct71[];
-static UCHAR ct72[];
-static UCHAR ct73[];
-static UCHAR ct74[];
-static UCHAR ct75[];
-static UCHAR ct76[];
-static UCHAR ct77[];
-static UCHAR ct78[];
-static UCHAR ct79[];
-static UCHAR ct80[];
-static UCHAR ct81[];
-static UCHAR ct82[];
-static UCHAR ct83[];
-static UCHAR ct84[];
-static UCHAR ct85[];
-static UCHAR ct86[];
-static UCHAR ct87[];
-static UCHAR ct88[];
-static UCHAR ct89[];
-static UCHAR ct90[];
-static UCHAR ct91[];
-static UCHAR cc01[];
-static UCHAR cc02[];
-
-// Now, refer to i2cmd.c, and see the character arrays defined there. They are
-// cast here to cmdSyntaxPtr.
-//
-// There are library functions for issuing bypass or inline commands. These
-// functions take one or more arguments of the type cmdSyntaxPtr. The routine
-// then can figure out how long each command is supposed to be and easily add it
-// to the list.
-//
-// For ease of use, we define manifests which return pointers to appropriate
-// cmdSyntaxPtr things. But some commands also take arguments. If a single
-// argument is used, we define a macro which performs the single assignment and
-// (through the expedient of a comma expression) references the appropriate
-// pointer. For commands requiring several arguments, we actually define a
-// function to perform the assignments.
-
-#define CMD_DTRUP       (cmdSyntaxPtr)(ct02)    // Raise DTR
-#define CMD_DTRDN       (cmdSyntaxPtr)(ct03)    // Lower DTR
-#define CMD_RTSUP       (cmdSyntaxPtr)(ct04)    // Raise RTS
-#define CMD_RTSDN       (cmdSyntaxPtr)(ct05)    // Lower RTS
-#define CMD_STARTFL     (cmdSyntaxPtr)(ct06)    // Start Flushing Data
-
-#define CMD_DTRRTS_UP (cmdSyntaxPtr)(cc01)      // Raise DTR and RTS
-#define CMD_DTRRTS_DN (cmdSyntaxPtr)(cc02)      // Lower DTR and RTS
-
-// Set Baud Rate for transmit and receive
-#define CMD_SETBAUD(arg) \
-        (((cmdSyntaxPtr)(ct07))->cmd[1] = (arg),(cmdSyntaxPtr)(ct07))
-
-#define CBR_50       1
-#define CBR_75       2
-#define CBR_110      3
-#define CBR_134      4
-#define CBR_150      5
-#define CBR_200      6
-#define CBR_300      7
-#define CBR_600      8
-#define CBR_1200     9
-#define CBR_1800     10
-#define CBR_2400     11
-#define CBR_4800     12
-#define CBR_9600     13
-#define CBR_19200    14
-#define CBR_38400    15
-#define CBR_2000     16
-#define CBR_3600     17
-#define CBR_7200     18
-#define CBR_56000    19
-#define CBR_57600    20
-#define CBR_64000    21
-#define CBR_76800    22
-#define CBR_115200   23
-#define CBR_C1       24    // Custom baud rate 1
-#define CBR_C2       25    // Custom baud rate 2
-#define CBR_153600   26
-#define CBR_230400   27
-#define CBR_307200   28
-#define CBR_460800   29
-#define CBR_921600   30
-
-// Set Character size
-//
-#define CMD_SETBITS(arg) \
-        (((cmdSyntaxPtr)(ct08))->cmd[1] = (arg),(cmdSyntaxPtr)(ct08))
-
-#define CSZ_5  0
-#define CSZ_6  1
-#define CSZ_7  2
-#define CSZ_8  3
-
-// Set number of stop bits
-//
-#define CMD_SETSTOP(arg) \
-        (((cmdSyntaxPtr)(ct09))->cmd[1] = (arg),(cmdSyntaxPtr)(ct09))
-
-#define CST_1  0
-#define CST_15 1  // 1.5 stop bits
-#define CST_2  2
-
-// Set parity option
-//
-#define CMD_SETPAR(arg) \
-        (((cmdSyntaxPtr)(ct10))->cmd[1] = (arg),(cmdSyntaxPtr)(ct10))
-
-#define CSP_NP 0  // no parity
-#define CSP_OD 1  // odd parity
-#define CSP_EV 2  // Even parity
-#define CSP_SP 3  // Space parity
-#define CSP_MK 4  // Mark parity
-
-// Define xon char for transmitter flow control
-//
-#define CMD_DEF_IXON(arg) \
-        (((cmdSyntaxPtr)(ct11))->cmd[1] = (arg),(cmdSyntaxPtr)(ct11))
-
-// Define xoff char for transmitter flow control
-//
-#define CMD_DEF_IXOFF(arg) \
-        (((cmdSyntaxPtr)(ct12))->cmd[1] = (arg),(cmdSyntaxPtr)(ct12))
-
-#define CMD_STOPFL   (cmdSyntaxPtr)(ct13) // Stop Flushing data
-
-// Acknowledge receipt of hotkey signal
-//
-#define CMD_HOTACK   (cmdSyntaxPtr)(ct14)
-
-// Define irq level to use. Should actually be sent by library-level code, not
-// directly from user...
-//
-#define CMDVALUE_IRQ 15 // For library use at initialization. Until this command
-                                                // is sent, board processing doesn't really start.
-#define CMD_SET_IRQ(arg) \
-        (((cmdSyntaxPtr)(ct15))->cmd[1] = (arg),(cmdSyntaxPtr)(ct15))
-
-#define CIR_POLL  0  // No IRQ - Poll
-#define CIR_3     3  // IRQ 3
-#define CIR_4     4  // IRQ 4
-#define CIR_5     5  // IRQ 5
-#define CIR_7     7  // IRQ 7
-#define CIR_10    10 // IRQ 10
-#define CIR_11    11 // IRQ 11
-#define CIR_12    12 // IRQ 12
-#define CIR_15    15 // IRQ 15
-
-// Select transmit flow xon/xoff options
-//
-#define CMD_IXON_OPT(arg) \
-        (((cmdSyntaxPtr)(ct16))->cmd[1] = (arg),(cmdSyntaxPtr)(ct16))
-
-#define CIX_NONE  0  // Incoming Xon/Xoff characters not special
-#define CIX_XON   1  // Xoff disable, Xon enable
-#define CIX_XANY  2  // Xoff disable, any key enable
-
-// Select receive flow xon/xoff options
-//
-#define CMD_OXON_OPT(arg) \
-        (((cmdSyntaxPtr)(ct17))->cmd[1] = (arg),(cmdSyntaxPtr)(ct17))
-
-#define COX_NONE  0  // Don't send Xon/Xoff
-#define COX_XON   1  // Send xon/xoff to start/stop incoming data
-
-
-#define CMD_CTS_REP  (cmdSyntaxPtr)(ct18) // Enable  CTS reporting
-#define CMD_CTS_NREP (cmdSyntaxPtr)(ct19) // Disable CTS reporting
-
-#define CMD_DCD_REP  (cmdSyntaxPtr)(ct20) // Enable  DCD reporting
-#define CMD_DCD_NREP (cmdSyntaxPtr)(ct21) // Disable DCD reporting
-
-#define CMD_DSR_REP  (cmdSyntaxPtr)(ct22) // Enable  DSR reporting
-#define CMD_DSR_NREP (cmdSyntaxPtr)(ct23) // Disable DSR reporting
-
-#define CMD_RI_REP   (cmdSyntaxPtr)(ct24) // Enable  RI  reporting
-#define CMD_RI_NREP  (cmdSyntaxPtr)(ct25) // Disable RI  reporting
-
-// Enable break reporting and select style
-//
-#define CMD_BRK_REP(arg) \
-        (((cmdSyntaxPtr)(ct26))->cmd[1] = (arg),(cmdSyntaxPtr)(ct26))
-
-#define CBK_STAT     0x00  // Report breaks as a status (exception,irq)
-#define CBK_NULL     0x01  // Report breaks as a good null
-#define CBK_STAT_SEQ 0x02  // Report breaks as a status AND as in-band character
-                           //  sequence FFh, 01h, 10h
-#define CBK_SEQ      0x03  // Report breaks as the in-band 
-                                                   //sequence FFh, 01h, 10h ONLY.
-#define CBK_FLSH     0x04  // if this bit set also flush input data
-#define CBK_POSIX    0x08  // if this bit set report as FF,0,0 sequence
-#define CBK_SINGLE   0x10  // if this bit set with CBK_SEQ or CBK_STAT_SEQ
-                                                   //then reports single null instead of triple
-
-#define CMD_BRK_NREP (cmdSyntaxPtr)(ct27) // Disable break reporting
-
-// Specify maximum block size for received data
-//
-#define CMD_MAX_BLOCK(arg) \
-        (((cmdSyntaxPtr)(ct28))->cmd[1] = (arg),(cmdSyntaxPtr)(ct28))
-
-// -- COMMAND 29 is reserved --
-
-#define CMD_CTSFL_ENAB  (cmdSyntaxPtr)(ct30) // Enable  CTS flow control
-#define CMD_CTSFL_DSAB  (cmdSyntaxPtr)(ct31) // Disable CTS flow control
-#define CMD_RTSFL_ENAB  (cmdSyntaxPtr)(ct32) // Enable  RTS flow control
-#define CMD_RTSFL_DSAB  (cmdSyntaxPtr)(ct33) // Disable RTS flow control
-
-// Specify istrip option
-//
-#define CMD_ISTRIP_OPT(arg) \
-        (((cmdSyntaxPtr)(ct34))->cmd[1] = (arg),(cmdSyntaxPtr)(ct34))
-
-#define CIS_NOSTRIP  0  // Strip characters to character size
-#define CIS_STRIP    1  // Strip any 8-bit characters to 7 bits
-
-// Send a break of arg milliseconds
-//
-#define CMD_SEND_BRK(arg) \
-        (((cmdSyntaxPtr)(ct35))->cmd[1] = (arg),(cmdSyntaxPtr)(ct35))
-
-// Set error reporting mode
-//
-#define CMD_SET_ERROR(arg) \
-        (((cmdSyntaxPtr)(ct36))->cmd[1] = (arg),(cmdSyntaxPtr)(ct36))
-
-#define CSE_ESTAT 0  // Report error in a status packet
-#define CSE_NOREP 1  // Treat character as though it were good
-#define CSE_DROP  2  // Discard the character
-#define CSE_NULL  3  // Replace with a null
-#define CSE_MARK  4  // Replace with a 3-character sequence (as Unix)
-
-#define CSE_REPLACE  0x8        // Replace the errored character with the
-                                                        // replacement character defined here
-
-#define CSE_STAT_REPLACE   0x18 // Replace the errored character with the
-                                                                // replacement character defined here AND
-                                                                // report the error as a status packet (as in
-                                                                // CSE_ESTAT).
-
-
-// COMMAND 37, to send flow control packets, is handled only by low-level
-// library code in response to data movement and shouldn't ever be sent by the
-// user code. See i2pack.h and the body of i2lib.c for details.
-
-// Enable on-board post-processing, using options given in oflag argument.
-// Formerly, this command was automatically preceded by a CMD_OPOST_OFF command
-// because the loadware does not permit sending back-to-back CMD_OPOST_ON
-// commands without an intervening CMD_OPOST_OFF. BUT, WE LEARN 18 MAY 92, that
-// CMD_OPOST_ON and CMD_OPOST_OFF must each be at the end of a packet (or in a
-// solo packet). This means the caller must specify separately CMD_OPOST_OFF,
-// CMD_OPOST_ON(parm) when he calls i2QueueCommands(). That function will ensure
-// each gets a separate packet. Extra CMD_OPOST_OFF's are always ok.
-//
-#define CMD_OPOST_ON(oflag)   \
-        (*(USHORT *)(((cmdSyntaxPtr)(ct39))->cmd[1]) = (oflag), \
-                (cmdSyntaxPtr)(ct39))
-
-#define CMD_OPOST_OFF   (cmdSyntaxPtr)(ct40) // Disable on-board post-proc
-
-#define CMD_RESUME   (cmdSyntaxPtr)(ct41)       // Resume: behave as though an XON
-                                                                                        // were received;
-
-// Set Transmit baud rate (see command 7 for arguments)
-//
-#define CMD_SETBAUD_TX(arg) \
-        (((cmdSyntaxPtr)(ct42))->cmd[1] = (arg),(cmdSyntaxPtr)(ct42))
-
-// Set Receive baud rate (see command 7 for arguments)
-//
-#define CMD_SETBAUD_RX(arg) \
-        (((cmdSyntaxPtr)(ct43))->cmd[1] = (arg),(cmdSyntaxPtr)(ct43))
-
-// Request interrupt from board each arg milliseconds. Interrupt will specify
-// "received data", even though there may be no data present. If arg == 0,
-// disables any such interrupts.
-//
-#define CMD_PING_REQ(arg) \
-        (((cmdSyntaxPtr)(ct44))->cmd[1] = (arg),(cmdSyntaxPtr)(ct44))
-
-#define CMD_HOT_ENAB (cmdSyntaxPtr)(ct45) // Enable Hot-key checking
-#define CMD_HOT_DSAB (cmdSyntaxPtr)(ct46) // Disable Hot-key checking
-
-#if 0
-// COMMAND 47: Send Protocol info via Unix flags:
-// iflag = Unix tty t_iflag
-// cflag = Unix tty t_cflag
-// lflag = Unix tty t_lflag
-// See System V Unix/Xenix documentation for the meanings of the bit fields
-// within these flags
-//
-#define CMD_UNIX_FLAGS(iflag,cflag,lflag) i2cmdUnixFlags(iflag,cflag,lflag)
-#endif  /*  0  */
-
-#define CMD_DSRFL_ENAB  (cmdSyntaxPtr)(ct48) // Enable  DSR receiver ctrl
-#define CMD_DSRFL_DSAB  (cmdSyntaxPtr)(ct49) // Disable DSR receiver ctrl
-#define CMD_DTRFL_ENAB  (cmdSyntaxPtr)(ct50) // Enable  DTR flow control
-#define CMD_DTRFL_DSAB  (cmdSyntaxPtr)(ct51) // Disable DTR flow control
-#define CMD_BAUD_RESET  (cmdSyntaxPtr)(ct52) // Reset baudrate table
-
-// COMMAND 54: Define custom rate #1
-// rate = (short) 1/10 of the desired baud rate
-//
-#define CMD_BAUD_DEF1(rate) i2cmdBaudDef(1,rate)
-
-// COMMAND 55: Define custom rate #2
-// rate = (short) 1/10 of the desired baud rate
-//
-#define CMD_BAUD_DEF2(rate) i2cmdBaudDef(2,rate)
-
-// Pause arg hundredths of seconds. (Note, this is NOT milliseconds.)
-//
-#define CMD_PAUSE(arg) \
-        (((cmdSyntaxPtr)(ct56))->cmd[1] = (arg),(cmdSyntaxPtr)(ct56))
-
-#define CMD_SUSPEND     (cmdSyntaxPtr)(ct57) // Suspend output
-#define CMD_UNSUSPEND   (cmdSyntaxPtr)(ct58) // Un-Suspend output
-
-// Set parity-checking options
-//
-#define CMD_PARCHK(arg) \
-        (((cmdSyntaxPtr)(ct59))->cmd[1] = (arg),(cmdSyntaxPtr)(ct59))
-
-#define CPK_ENAB  0     // Enable parity checking on input
-#define CPK_DSAB  1     // Disable parity checking on input
-
-#define CMD_BMARK_REQ   (cmdSyntaxPtr)(ct60) // Bookmark request
-
-
-// Enable/Disable internal loopback mode
-//
-#define CMD_INLOOP(arg) \
-        (((cmdSyntaxPtr)(ct61))->cmd[1] = (arg),(cmdSyntaxPtr)(ct61))
-
-#define CIN_DISABLE  0  // Normal operation (default)
-#define CIN_ENABLE   1  // Internal (local) loopback
-#define CIN_REMOTE   2  // Remote loopback
-
-// Specify timeout for hotkeys: Delay will be (arg x 10) milliseconds, arg == 0
-// --> no timeout: wait forever.
-//
-#define CMD_HOT_TIME(arg) \
-        (((cmdSyntaxPtr)(ct62))->cmd[1] = (arg),(cmdSyntaxPtr)(ct62))
-
-
-// Define (outgoing) xon for receive flow control
-//
-#define CMD_DEF_OXON(arg) \
-        (((cmdSyntaxPtr)(ct63))->cmd[1] = (arg),(cmdSyntaxPtr)(ct63))
-
-// Define (outgoing) xoff for receiver flow control
-//
-#define CMD_DEF_OXOFF(arg) \
-        (((cmdSyntaxPtr)(ct64))->cmd[1] = (arg),(cmdSyntaxPtr)(ct64))
-
-// Enable/Disable RTS on transmit (1/2 duplex-style)
-//
-#define CMD_RTS_XMIT(arg) \
-        (((cmdSyntaxPtr)(ct65))->cmd[1] = (arg),(cmdSyntaxPtr)(ct65))
-
-#define CHD_DISABLE  0
-#define CHD_ENABLE   1
-
-// Set high-water-mark level (debugging use only)
-//
-#define CMD_SETHIGHWAT(arg) \
-        (((cmdSyntaxPtr)(ct66))->cmd[1] = (arg),(cmdSyntaxPtr)(ct66))
-
-// Start flushing tagged data (tag = 0-14)
-//
-#define CMD_START_SELFL(tag) \
-        (((cmdSyntaxPtr)(ct67))->cmd[1] = (tag),(cmdSyntaxPtr)(ct67))
-
-// End flushing tagged data (tag = 0-14)
-//
-#define CMD_END_SELFL(tag) \
-        (((cmdSyntaxPtr)(ct68))->cmd[1] = (tag),(cmdSyntaxPtr)(ct68))
-
-#define CMD_HWFLOW_OFF  (cmdSyntaxPtr)(ct69) // Disable HW TX flow control
-#define CMD_ODSRFL_ENAB (cmdSyntaxPtr)(ct70) // Enable DSR output f/c
-#define CMD_ODSRFL_DSAB (cmdSyntaxPtr)(ct71) // Disable DSR output f/c
-#define CMD_ODCDFL_ENAB (cmdSyntaxPtr)(ct72) // Enable DCD output f/c
-#define CMD_ODCDFL_DSAB (cmdSyntaxPtr)(ct73) // Disable DCD output f/c
-
-// Set transmit interrupt load level. Count should be an even value 2-12
-//
-#define CMD_LOADLEVEL(count) \
-        (((cmdSyntaxPtr)(ct74))->cmd[1] = (count),(cmdSyntaxPtr)(ct74))
-
-// If reporting DSS changes, map to character sequence FFh, 2, MSR
-//
-#define CMD_STATDATA(arg) \
-        (((cmdSyntaxPtr)(ct75))->cmd[1] = (arg),(cmdSyntaxPtr)(ct75))
-
-#define CSTD_DISABLE// Report DSS changes as status packets only (default)
-#define CSTD_ENABLE     // Report DSS changes as in-band data sequence as well as
-                                        // by status packet.
-
-#define CMD_BREAK_ON    (cmdSyntaxPtr)(ct76)// Set break and stop xmit
-#define CMD_BREAK_OFF   (cmdSyntaxPtr)(ct77)// End break and restart xmit
-#define CMD_GETFC       (cmdSyntaxPtr)(ct78)// Request for flow control packet
-                                                                                        // from board.
-
-// Transmit this character immediately
-//
-#define CMD_XMIT_NOW(ch) \
-        (((cmdSyntaxPtr)(ct79))->cmd[1] = (ch),(cmdSyntaxPtr)(ct79))
-
-// Set baud rate via "divisor latch"
-//
-#define CMD_DIVISOR_LATCH(which,value) \
-                        (((cmdSyntaxPtr)(ct80))->cmd[1] = (which), \
-                        *(USHORT *)(((cmdSyntaxPtr)(ct80))->cmd[2]) = (value), \
-                        (cmdSyntaxPtr)(ct80))
-
-#define CDL_RX 1        // Set receiver rate
-#define CDL_TX 2        // Set transmit rate
-                                        // (CDL_TX | CDL_RX) Set both rates
-
-// Request for special diagnostic status pkt from the board.
-//
-#define CMD_GET_STATUS (cmdSyntaxPtr)(ct81)
-
-// Request time-stamped transmit character count packet.
-//
-#define CMD_GET_TXCNT  (cmdSyntaxPtr)(ct82)
-
-// Request time-stamped receive character count packet.
-//
-#define CMD_GET_RXCNT  (cmdSyntaxPtr)(ct83)
-
-// Request for box/board I.D. packet.
-#define CMD_GET_BOXIDS (cmdSyntaxPtr)(ct84)
-
-// Enable or disable multiple channels according to bit-mapped ushorts box 1-4
-//
-#define CMD_ENAB_MULT(enable, box1, box2, box3, box4)    \
-                        (((cmdSytaxPtr)(ct85))->cmd[1] = (enable),            \
-                        *(USHORT *)(((cmdSyntaxPtr)(ct85))->cmd[2]) = (box1), \
-                        *(USHORT *)(((cmdSyntaxPtr)(ct85))->cmd[4]) = (box2), \
-                        *(USHORT *)(((cmdSyntaxPtr)(ct85))->cmd[6]) = (box3), \
-                        *(USHORT *)(((cmdSyntaxPtr)(ct85))->cmd[8]) = (box4), \
-                        (cmdSyntaxPtr)(ct85))
-
-#define CEM_DISABLE  0
-#define CEM_ENABLE   1
-
-// Enable or disable receiver or receiver interrupts (default both enabled)
-//
-#define CMD_RCV_ENABLE(ch) \
-        (((cmdSyntaxPtr)(ct86))->cmd[1] = (ch),(cmdSyntaxPtr)(ct86))
-
-#define CRE_OFF      0  // Disable the receiver
-#define CRE_ON       1  // Enable the receiver
-#define CRE_INTOFF   2  // Disable receiver interrupts (to loadware)
-#define CRE_INTON    3  // Enable receiver interrupts (to loadware)
-
-// Starts up a hardware test process, which runs transparently, and sends a
-// STAT_HWFAIL packet in case a hardware failure is detected.
-//
-#define CMD_HW_TEST  (cmdSyntaxPtr)(ct87)
-
-// Change receiver threshold and timeout value:
-// Defaults: timeout = 20mS
-// threshold count = 8 when DTRflow not in use,
-// threshold count = 5 when DTRflow in use.
-//
-#define CMD_RCV_THRESHOLD(count,ms) \
-                        (((cmdSyntaxPtr)(ct88))->cmd[1] = (count), \
-                        ((cmdSyntaxPtr)(ct88))->cmd[2] = (ms), \
-                        (cmdSyntaxPtr)(ct88))
-
-// Makes the loadware report DSS signals for this channel immediately.
-//
-#define CMD_DSS_NOW (cmdSyntaxPtr)(ct89)
-        
-// Set the receive silo parameters 
-//      timeout is ms idle wait until delivery       (~VTIME)
-//      threshold is max characters cause interrupt  (~VMIN)
-//
-#define CMD_SET_SILO(timeout,threshold) \
-                        (((cmdSyntaxPtr)(ct90))->cmd[1] = (timeout), \
-                        ((cmdSyntaxPtr)(ct90))->cmd[2]  = (threshold), \
-                        (cmdSyntaxPtr)(ct90))
-
-// Set timed break in decisecond (1/10s)
-//
-#define CMD_LBREAK(ds) \
-        (((cmdSyntaxPtr)(ct91))->cmd[1] = (ds),(cmdSyntaxPtr)(ct66))
-
-
-
-#endif // I2CMD_H
diff --git a/drivers/char/ip2/i2ellis.c b/drivers/char/ip2/i2ellis.c
deleted file mode 100644
index 29db44de399f..000000000000
--- a/drivers/char/ip2/i2ellis.c
+++ /dev/null
@@ -1,1403 +0,0 @@
-/*******************************************************************************
-*
-*   (c) 1998 by Computone Corporation
-*
-********************************************************************************
-*
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: Low-level interface code for the device driver
-*                (This is included source code, not a separate compilation
-*                module.)
-*
-*******************************************************************************/
-//---------------------------------------------
-// Function declarations private to this module
-//---------------------------------------------
-// Functions called only indirectly through i2eBordStr entries.
-
-static int iiWriteBuf16(i2eBordStrPtr, unsigned char *, int);
-static int iiWriteBuf8(i2eBordStrPtr, unsigned char *, int);
-static int iiReadBuf16(i2eBordStrPtr, unsigned char *, int);
-static int iiReadBuf8(i2eBordStrPtr, unsigned char *, int);
-
-static unsigned short iiReadWord16(i2eBordStrPtr);
-static unsigned short iiReadWord8(i2eBordStrPtr);
-static void iiWriteWord16(i2eBordStrPtr, unsigned short);
-static void iiWriteWord8(i2eBordStrPtr, unsigned short);
-
-static int iiWaitForTxEmptyII(i2eBordStrPtr, int);
-static int iiWaitForTxEmptyIIEX(i2eBordStrPtr, int);
-static int iiTxMailEmptyII(i2eBordStrPtr);
-static int iiTxMailEmptyIIEX(i2eBordStrPtr);
-static int iiTrySendMailII(i2eBordStrPtr, unsigned char);
-static int iiTrySendMailIIEX(i2eBordStrPtr, unsigned char);
-
-static unsigned short iiGetMailII(i2eBordStrPtr);
-static unsigned short iiGetMailIIEX(i2eBordStrPtr);
-
-static void iiEnableMailIrqII(i2eBordStrPtr);
-static void iiEnableMailIrqIIEX(i2eBordStrPtr);
-static void iiWriteMaskII(i2eBordStrPtr, unsigned char);
-static void iiWriteMaskIIEX(i2eBordStrPtr, unsigned char);
-
-static void ii2Nop(void);
-
-//***************
-//* Static Data *
-//***************
-
-static int ii2Safe;         // Safe I/O address for delay routine
-
-static int iiDelayed;   // Set when the iiResetDelay function is
-                                                        // called. Cleared when ANY board is reset.
-static DEFINE_RWLOCK(Dl_spinlock);
-
-//********
-//* Code *
-//********
-
-//=======================================================
-// Initialization Routines
-//
-// iiSetAddress
-// iiReset
-// iiResetDelay
-// iiInitialize
-//=======================================================
-
-//******************************************************************************
-// Function:   iiSetAddress(pB, address, delay)
-// Parameters: pB      - pointer to the board structure
-//             address - the purported I/O address of the board
-//             delay   - pointer to the 1-ms delay function to use
-//                       in this and any future operations to this board
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// This routine (roughly) checks for address validity, sets the i2eValid OK and
-// sets the state to II_STATE_COLD which means that we haven't even sent a reset
-// yet.
-//
-//******************************************************************************
-static int
-iiSetAddress( i2eBordStrPtr pB, int address, delayFunc_t delay )
-{
-        // Should any failure occur before init is finished...
-        pB->i2eValid = I2E_INCOMPLETE;
-
-        // Cannot check upper limit except extremely: Might be microchannel
-        // Address must be on an 8-byte boundary
-
-        if ((unsigned int)address <= 0x100
-                || (unsigned int)address >= 0xfff8
-                || (address & 0x7)
-                )
-        {
-                I2_COMPLETE(pB, I2EE_BADADDR);
-        }
-
-        // Initialize accelerators
-        pB->i2eBase    = address;
-        pB->i2eData    = address + FIFO_DATA;
-        pB->i2eStatus  = address + FIFO_STATUS;
-        pB->i2ePointer = address + FIFO_PTR;
-        pB->i2eXMail   = address + FIFO_MAIL;
-        pB->i2eXMask   = address + FIFO_MASK;
-
-        // Initialize i/o address for ii2DelayIO
-        ii2Safe = address + FIFO_NOP;
-
-        // Initialize the delay routine
-        pB->i2eDelay = ((delay != (delayFunc_t)NULL) ? delay : (delayFunc_t)ii2Nop);
-
-        pB->i2eValid = I2E_MAGIC;
-        pB->i2eState = II_STATE_COLD;
-
-        I2_COMPLETE(pB, I2EE_GOOD);
-}
-
-//******************************************************************************
-// Function:   iiReset(pB)
-// Parameters: pB - pointer to the board structure
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// Attempts to reset the board (see also i2hw.h). Normally, we would use this to
-// reset a board immediately after iiSetAddress(), but it is valid to reset a
-// board from any state, say, in order to change or re-load loadware. (Under
-// such circumstances, no reason to re-run iiSetAddress(), which is why it is a
-// separate routine and not included in this routine.
-//
-//******************************************************************************
-static int
-iiReset(i2eBordStrPtr pB)
-{
-        // Magic number should be set, else even the address is suspect
-        if (pB->i2eValid != I2E_MAGIC)
-        {
-                I2_COMPLETE(pB, I2EE_BADMAGIC);
-        }
-
-        outb(0, pB->i2eBase + FIFO_RESET);  /* Any data will do */
-        iiDelay(pB, 50);                    // Pause between resets
-        outb(0, pB->i2eBase + FIFO_RESET);  /* Second reset */
-
-        // We must wait before even attempting to read anything from the FIFO: the
-        // board's P.O.S.T may actually attempt to read and write its end of the
-        // FIFO in order to check flags, loop back (where supported), etc. On
-        // completion of this testing it would reset the FIFO, and on completion
-        // of all // P.O.S.T., write the message. We must not mistake data which
-        // might have been sent for testing as part of the reset message. To
-        // better utilize time, say, when resetting several boards, we allow the
-        // delay to be performed externally; in this way the caller can reset 
-        // several boards, delay a single time, then call the initialization
-        // routine for all.
-
-        pB->i2eState = II_STATE_RESET;
-
-        iiDelayed = 0;  // i.e., the delay routine hasn't been called since the most
-                                        // recent reset.
-
-        // Ensure anything which would have been of use to standard loadware is
-        // blanked out, since board has now forgotten everything!.
-
-        pB->i2eUsingIrq = I2_IRQ_UNDEFINED; /* to not use an interrupt so far */
-        pB->i2eWaitingForEmptyFifo = 0;
-        pB->i2eOutMailWaiting = 0;
-        pB->i2eChannelPtr = NULL;
-        pB->i2eChannelCnt = 0;
-
-        pB->i2eLeadoffWord[0] = 0;
-        pB->i2eFifoInInts = 0;
-        pB->i2eFifoOutInts = 0;
-        pB->i2eFatalTrap = NULL;
-        pB->i2eFatal = 0;
-
-        I2_COMPLETE(pB, I2EE_GOOD);
-}
-
-//******************************************************************************
-// Function:   iiResetDelay(pB)
-// Parameters: pB - pointer to the board structure
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// Using the delay defined in board structure, waits two seconds (for board to
-// reset).
-//
-//******************************************************************************
-static int
-iiResetDelay(i2eBordStrPtr pB)
-{
-        if (pB->i2eValid != I2E_MAGIC) {
-                I2_COMPLETE(pB, I2EE_BADMAGIC);
-        }
-        if (pB->i2eState != II_STATE_RESET) {
-                I2_COMPLETE(pB, I2EE_BADSTATE);
-        }
-        iiDelay(pB,2000);       /* Now we wait for two seconds. */
-        iiDelayed = 1;          /* Delay has been called: ok to initialize */
-        I2_COMPLETE(pB, I2EE_GOOD);
-}
-
-//******************************************************************************
-// Function:   iiInitialize(pB)
-// Parameters: pB - pointer to the board structure
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// Attempts to read the Power-on reset message. Initializes any remaining fields
-// in the pB structure.
-//
-// This should be called as the third step of a process beginning with
-// iiReset(), then iiResetDelay(). This routine checks to see that the structure
-// is "valid" and in the reset state, also confirms that the delay routine has
-// been called since the latest reset (to any board! overly strong!).
-//
-//******************************************************************************
-static int
-iiInitialize(i2eBordStrPtr pB)
-{
-        int itemp;
-        unsigned char c;
-        unsigned short utemp;
-        unsigned int ilimit;
-
-        if (pB->i2eValid != I2E_MAGIC)
-        {
-                I2_COMPLETE(pB, I2EE_BADMAGIC);
-        }
-
-        if (pB->i2eState != II_STATE_RESET || !iiDelayed)
-        {
-                I2_COMPLETE(pB, I2EE_BADSTATE);
-        }
-
-        // In case there is a failure short of our completely reading the power-up
-        // message.
-        pB->i2eValid = I2E_INCOMPLETE;
-
-
-        // Now attempt to read the message.
-
-        for (itemp = 0; itemp < sizeof(porStr); itemp++)
-        {
-                // We expect the entire message is ready.
-                if (!I2_HAS_INPUT(pB)) {
-                        pB->i2ePomSize = itemp;
-                        I2_COMPLETE(pB, I2EE_PORM_SHORT);
-                }
-
-                pB->i2ePom.c[itemp] = c = inb(pB->i2eData);
-
-                // We check the magic numbers as soon as they are supposed to be read
-                // (rather than after) to minimize effect of reading something we
-                // already suspect can't be "us".
-                if (  (itemp == POR_1_INDEX && c != POR_MAGIC_1) ||
-                                (itemp == POR_2_INDEX && c != POR_MAGIC_2))
-                {
-                        pB->i2ePomSize = itemp+1;
-                        I2_COMPLETE(pB, I2EE_BADMAGIC);
-                }
-        }
-
-        pB->i2ePomSize = itemp;
-
-        // Ensure that this was all the data...
-        if (I2_HAS_INPUT(pB))
-                I2_COMPLETE(pB, I2EE_PORM_LONG);
-
-        // For now, we'll fail to initialize if P.O.S.T reports bad chip mapper:
-        // Implying we will not be able to download any code either:  That's ok: the
-        // condition is pretty explicit.
-        if (pB->i2ePom.e.porDiag1 & POR_BAD_MAPPER)
-        {
-                I2_COMPLETE(pB, I2EE_POSTERR);
-        }
-
-        // Determine anything which must be done differently depending on the family
-        // of boards!
-        switch (pB->i2ePom.e.porID & POR_ID_FAMILY)
-        {
-        case POR_ID_FII:  // IntelliPort-II
-
-                pB->i2eFifoStyle   = FIFO_II;
-                pB->i2eFifoSize    = 512;     // 512 bytes, always
-                pB->i2eDataWidth16 = false;
-
-                pB->i2eMaxIrq = 15;     // Because board cannot tell us it is in an 8-bit
-                                                        // slot, we do allow it to be done (documentation!)
-
-                pB->i2eGoodMap[1] =
-                pB->i2eGoodMap[2] =
-                pB->i2eGoodMap[3] =
-                pB->i2eChannelMap[1] =
-                pB->i2eChannelMap[2] =
-                pB->i2eChannelMap[3] = 0;
-
-                switch (pB->i2ePom.e.porID & POR_ID_SIZE)
-                {
-                case POR_ID_II_4:
-                        pB->i2eGoodMap[0] =
-                        pB->i2eChannelMap[0] = 0x0f;  // four-port
-
-                        // Since porPorts1 is based on the Hardware ID register, the numbers
-                        // should always be consistent for IntelliPort-II.  Ditto below...
-                        if (pB->i2ePom.e.porPorts1 != 4)
-                        {
-                                I2_COMPLETE(pB, I2EE_INCONSIST);
-                        }
-                        break;
-
-                case POR_ID_II_8:
-                case POR_ID_II_8R:
-                        pB->i2eGoodMap[0] =
-                        pB->i2eChannelMap[0] = 0xff;  // Eight port
-                        if (pB->i2ePom.e.porPorts1 != 8)
-                        {
-                                I2_COMPLETE(pB, I2EE_INCONSIST);
-                        }
-                        break;
-
-                case POR_ID_II_6:
-                        pB->i2eGoodMap[0] =
-                        pB->i2eChannelMap[0] = 0x3f;  // Six Port
-                        if (pB->i2ePom.e.porPorts1 != 6)
-                        {
-                                I2_COMPLETE(pB, I2EE_INCONSIST);
-                        }
-                        break;
-                }
-
-                // Fix up the "good channel list based on any errors reported.
-                if (pB->i2ePom.e.porDiag1 & POR_BAD_UART1)
-                {
-                        pB->i2eGoodMap[0] &= ~0x0f;
-                }
-
-                if (pB->i2ePom.e.porDiag1 & POR_BAD_UART2)
-                {
-                        pB->i2eGoodMap[0] &= ~0xf0;
-                }
-
-                break;   // POR_ID_FII case
-
-        case POR_ID_FIIEX:   // IntelliPort-IIEX
-
-                pB->i2eFifoStyle = FIFO_IIEX;
-
-                itemp = pB->i2ePom.e.porFifoSize;
-
-                // Implicit assumption that fifo would not grow beyond 32k, 
-                // nor would ever be less than 256.
-
-                if (itemp < 8 || itemp > 15)
-                {
-                        I2_COMPLETE(pB, I2EE_INCONSIST);
-                }
-                pB->i2eFifoSize = (1 << itemp);
-
-                // These are based on what P.O.S.T thinks should be there, based on
-                // box ID registers
-                ilimit = pB->i2ePom.e.porNumBoxes;
-                if (ilimit > ABS_MAX_BOXES)
-                {
-                        ilimit = ABS_MAX_BOXES;
-                }
-
-                // For as many boxes as EXIST, gives the type of box.
-                // Added 8/6/93: check for the ISA-4 (asic) which looks like an
-                // expandable but for whom "8 or 16?" is not the right question.
-
-                utemp = pB->i2ePom.e.porFlags;
-                if (utemp & POR_CEX4)
-                {
-                        pB->i2eChannelMap[0] = 0x000f;
-                } else {
-                        utemp &= POR_BOXES;
-                        for (itemp = 0; itemp < ilimit; itemp++)
-                        {
-                                pB->i2eChannelMap[itemp] = 
-                                        ((utemp & POR_BOX_16) ? 0xffff : 0x00ff);
-                                utemp >>= 1;
-                        }
-                }
-
-                // These are based on what P.O.S.T actually found.
-
-                utemp = (pB->i2ePom.e.porPorts2 << 8) + pB->i2ePom.e.porPorts1;
-
-                for (itemp = 0; itemp < ilimit; itemp++)
-                {
-                        pB->i2eGoodMap[itemp] = 0;
-                        if (utemp & 1) pB->i2eGoodMap[itemp] |= 0x000f;
-                        if (utemp & 2) pB->i2eGoodMap[itemp] |= 0x00f0;
-                        if (utemp & 4) pB->i2eGoodMap[itemp] |= 0x0f00;
-                        if (utemp & 8) pB->i2eGoodMap[itemp] |= 0xf000;
-                        utemp >>= 4;
-                }
-
-                // Now determine whether we should transfer in 8 or 16-bit mode.
-                switch (pB->i2ePom.e.porBus & (POR_BUS_SLOT16 | POR_BUS_DIP16) )
-                {
-                case POR_BUS_SLOT16 | POR_BUS_DIP16:
-                        pB->i2eDataWidth16 = true;
-                        pB->i2eMaxIrq = 15;
-                        break;
-
-                case POR_BUS_SLOT16:
-                        pB->i2eDataWidth16 = false;
-                        pB->i2eMaxIrq = 15;
-                        break;
-
-                case 0:
-                case POR_BUS_DIP16:     // In an 8-bit slot, DIP switch don't care.
-                default:
-                        pB->i2eDataWidth16 = false;
-                        pB->i2eMaxIrq = 7;
-                        break;
-                }
-                break;   // POR_ID_FIIEX case
-
-        default:    // Unknown type of board
-                I2_COMPLETE(pB, I2EE_BAD_FAMILY);
-                break;
-        }  // End the switch based on family
-
-        // Temporarily, claim there is no room in the outbound fifo. 
-        // We will maintain this whenever we check for an empty outbound FIFO.
-        pB->i2eFifoRemains = 0;
-
-        // Now, based on the bus type, should we expect to be able to re-configure
-        // interrupts (say, for testing purposes).
-        switch (pB->i2ePom.e.porBus & POR_BUS_TYPE)
-        {
-        case POR_BUS_T_ISA:
-        case POR_BUS_T_UNK:  // If the type of bus is undeclared, assume ok.
-        case POR_BUS_T_MCA:
-        case POR_BUS_T_EISA:
-                break;
-        default:
-                I2_COMPLETE(pB, I2EE_BADBUS);
-        }
-
-        if (pB->i2eDataWidth16)
-        {
-                pB->i2eWriteBuf  = iiWriteBuf16;
-                pB->i2eReadBuf   = iiReadBuf16;
-                pB->i2eWriteWord = iiWriteWord16;
-                pB->i2eReadWord  = iiReadWord16;
-        } else {
-                pB->i2eWriteBuf  = iiWriteBuf8;
-                pB->i2eReadBuf   = iiReadBuf8;
-                pB->i2eWriteWord = iiWriteWord8;
-                pB->i2eReadWord  = iiReadWord8;
-        }
-
-        switch(pB->i2eFifoStyle)
-        {
-        case FIFO_II:
-                pB->i2eWaitForTxEmpty = iiWaitForTxEmptyII;
-                pB->i2eTxMailEmpty    = iiTxMailEmptyII;
-                pB->i2eTrySendMail    = iiTrySendMailII;
-                pB->i2eGetMail        = iiGetMailII;
-                pB->i2eEnableMailIrq  = iiEnableMailIrqII;
-                pB->i2eWriteMask      = iiWriteMaskII;
-
-                break;
-
-        case FIFO_IIEX:
-                pB->i2eWaitForTxEmpty = iiWaitForTxEmptyIIEX;
-                pB->i2eTxMailEmpty    = iiTxMailEmptyIIEX;
-                pB->i2eTrySendMail    = iiTrySendMailIIEX;
-                pB->i2eGetMail        = iiGetMailIIEX;
-                pB->i2eEnableMailIrq  = iiEnableMailIrqIIEX;
-                pB->i2eWriteMask      = iiWriteMaskIIEX;
-
-                break;
-
-        default:
-                I2_COMPLETE(pB, I2EE_INCONSIST);
-        }
-
-        // Initialize state information.
-        pB->i2eState = II_STATE_READY;   // Ready to load loadware.
-
-        // Some Final cleanup:
-        // For some boards, the bootstrap firmware may perform some sort of test
-        // resulting in a stray character pending in the incoming mailbox. If one is
-        // there, it should be read and discarded, especially since for the standard
-        // firmware, it's the mailbox that interrupts the host.
-
-        pB->i2eStartMail = iiGetMail(pB);
-
-        // Throw it away and clear the mailbox structure element
-        pB->i2eStartMail = NO_MAIL_HERE;
-
-        // Everything is ok now, return with good status/
-
-        pB->i2eValid = I2E_MAGIC;
-        I2_COMPLETE(pB, I2EE_GOOD);
-}
-
-//******************************************************************************
-// Function:   ii2DelayTimer(mseconds)
-// Parameters: mseconds - number of milliseconds to delay
-//
-// Returns:    Nothing
-//
-// Description:
-//
-// This routine delays for approximately mseconds milliseconds and is intended
-// to be called indirectly through i2Delay field in i2eBordStr. It uses the
-// Linux timer_list mechanism.
-//
-// The Linux timers use a unit called "jiffies" which are 10mS in the Intel
-// architecture. This function rounds the delay period up to the next "jiffy".
-// In the Alpha architecture the "jiffy" is 1mS, but this driver is not intended
-// for Alpha platforms at this time.
-//
-//******************************************************************************
-static void
-ii2DelayTimer(unsigned int mseconds)
-{
-        msleep_interruptible(mseconds);
-}
-
-#if 0
-//static void ii2DelayIO(unsigned int);
-//******************************************************************************
-// !!! Not Used, this is DOS crap, some of you young folks may be interested in
-//     in how things were done in the stone age of caculating machines       !!!
-// Function:   ii2DelayIO(mseconds)
-// Parameters: mseconds - number of milliseconds to delay
-//
-// Returns:    Nothing
-//
-// Description:
-//
-// This routine delays for approximately mseconds milliseconds and is intended
-// to be called indirectly through i2Delay field in i2eBordStr. It is intended
-// for use where a clock-based function is impossible: for example, DOS drivers.
-//
-// This function uses the IN instruction to place bounds on the timing and
-// assumes that ii2Safe has been set. This is because I/O instructions are not
-// subject to caching and will therefore take a certain minimum time. To ensure
-// the delay is at least long enough on fast machines, it is based on some
-// fastest-case calculations.  On slower machines this may cause VERY long
-// delays. (3 x fastest case). In the fastest case, everything is cached except
-// the I/O instruction itself.
-//
-// Timing calculations:
-// The fastest bus speed for I/O operations is likely to be 10 MHz. The I/O
-// operation in question is a byte operation to an odd address. For 8-bit
-// operations, the architecture generally enforces two wait states. At 10 MHz, a
-// single cycle time is 100nS. A read operation at two wait states takes 6
-// cycles for a total time of 600nS. Therefore approximately 1666 iterations
-// would be required to generate a single millisecond delay. The worst
-// (reasonable) case would be an 8MHz system with no cacheing. In this case, the
-// I/O instruction would take 125nS x 6 cyles = 750 nS. More importantly, code
-// fetch of other instructions in the loop would take time (zero wait states,
-// however) and would be hard to estimate. This is minimized by using in-line
-// assembler for the in inner loop of IN instructions. This consists of just a
-// few bytes. So we'll guess about four code fetches per loop. Each code fetch
-// should take four cycles, so we have 125nS * 8 = 1000nS. Worst case then is
-// that what should have taken 1 mS takes instead 1666 * (1750) = 2.9 mS.
-//
-// So much for theoretical timings: results using 1666 value on some actual
-// machines:
-// IBM      286      6MHz     3.15 mS
-// Zenith   386      33MHz    2.45 mS
-// (brandX) 386      33MHz    1.90 mS  (has cache)
-// (brandY) 486      33MHz    2.35 mS
-// NCR      486      ??       1.65 mS (microchannel)
-//
-// For most machines, it is probably safe to scale this number back (remember,
-// for robust operation use an actual timed delay if possible), so we are using
-// a value of 1190. This yields 1.17 mS for the fastest machine in our sample,
-// 1.75 mS for typical 386 machines, and 2.25 mS the absolute slowest machine.
-//
-// 1/29/93:
-// The above timings are too slow. Actual cycle times might be faster. ISA cycle
-// times could approach 500 nS, and ...
-// The IBM model 77 being microchannel has no wait states for 8-bit reads and
-// seems to be accessing the I/O at 440 nS per access (from start of one to
-// start of next). This would imply we need 1000/.440 = 2272 iterations to
-// guarantee we are fast enough. In actual testing, we see that 2 * 1190 are in
-// fact enough. For diagnostics, we keep the level at 1190, but developers note
-// this needs tuning.
-//
-// Safe assumption:  2270 i/o reads = 1 millisecond
-//
-//******************************************************************************
-
-
-static int ii2DelValue = 1190;  // See timing calculations below
-                                                // 1666 for fastest theoretical machine
-                                                // 1190 safe for most fast 386 machines
-                                                // 1000 for fastest machine tested here
-                                                //  540 (sic) for AT286/6Mhz
-static void
-ii2DelayIO(unsigned int mseconds)
-{
-        if (!ii2Safe) 
-                return;   /* Do nothing if this variable uninitialized */
-
-        while(mseconds--) {
-                int i = ii2DelValue;
-                while ( i-- ) {
-                        inb(ii2Safe);
-                }
-        }
-}
-#endif 
-
-//******************************************************************************
-// Function:   ii2Nop()
-// Parameters: None
-//
-// Returns:    Nothing
-//
-// Description:
-//
-// iiInitialize will set i2eDelay to this if the delay parameter is NULL. This
-// saves checking for a NULL pointer at every call.
-//******************************************************************************
-static void
-ii2Nop(void)
-{
-        return; // no mystery here
-}
-
-//=======================================================
-// Routines which are available in 8/16-bit versions, or
-// in different fifo styles. These are ALL called
-// indirectly through the board structure.
-//=======================================================
-
-//******************************************************************************
-// Function:   iiWriteBuf16(pB, address, count)
-// Parameters: pB      - pointer to board structure
-//             address - address of data to write
-//             count   - number of data bytes to write
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// Writes 'count' bytes from 'address' to the data fifo specified by the board
-// structure pointer pB. Should count happen to be odd, an extra pad byte is
-// sent (identity unknown...). Uses 16-bit (word) operations. Is called
-// indirectly through pB->i2eWriteBuf.
-//
-//******************************************************************************
-static int
-iiWriteBuf16(i2eBordStrPtr pB, unsigned char *address, int count)
-{
-        // Rudimentary sanity checking here.
-        if (pB->i2eValid != I2E_MAGIC)
-                I2_COMPLETE(pB, I2EE_INVALID);
-
-        I2_OUTSW(pB->i2eData, address, count);
-
-        I2_COMPLETE(pB, I2EE_GOOD);
-}
-
-//******************************************************************************
-// Function:   iiWriteBuf8(pB, address, count)
-// Parameters: pB      - pointer to board structure
-//             address - address of data to write
-//             count   - number of data bytes to write
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// Writes 'count' bytes from 'address' to the data fifo specified by the board
-// structure pointer pB. Should count happen to be odd, an extra pad byte is
-// sent (identity unknown...). This is to be consistent with the 16-bit version.
-// Uses 8-bit (byte) operations. Is called indirectly through pB->i2eWriteBuf.
-//
-//******************************************************************************
-static int
-iiWriteBuf8(i2eBordStrPtr pB, unsigned char *address, int count)
-{
-        /* Rudimentary sanity checking here */
-        if (pB->i2eValid != I2E_MAGIC)
-                I2_COMPLETE(pB, I2EE_INVALID);
-
-        I2_OUTSB(pB->i2eData, address, count);
-
-        I2_COMPLETE(pB, I2EE_GOOD);
-}
-
-//******************************************************************************
-// Function:   iiReadBuf16(pB, address, count)
-// Parameters: pB      - pointer to board structure
-//             address - address to put data read
-//             count   - number of data bytes to read
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// Reads 'count' bytes into 'address' from the data fifo specified by the board
-// structure pointer pB. Should count happen to be odd, an extra pad byte is
-// received (identity unknown...). Uses 16-bit (word) operations. Is called
-// indirectly through pB->i2eReadBuf.
-//
-//******************************************************************************
-static int
-iiReadBuf16(i2eBordStrPtr pB, unsigned char *address, int count)
-{
-        // Rudimentary sanity checking here.
-        if (pB->i2eValid != I2E_MAGIC)
-                I2_COMPLETE(pB, I2EE_INVALID);
-
-        I2_INSW(pB->i2eData, address, count);
-
-        I2_COMPLETE(pB, I2EE_GOOD);
-}
-
-//******************************************************************************
-// Function:   iiReadBuf8(pB, address, count)
-// Parameters: pB      - pointer to board structure
-//             address - address to put data read
-//             count   - number of data bytes to read
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// Reads 'count' bytes into 'address' from the data fifo specified by the board
-// structure pointer pB. Should count happen to be odd, an extra pad byte is
-// received (identity unknown...). This to match the 16-bit behaviour. Uses
-// 8-bit (byte) operations. Is called indirectly through pB->i2eReadBuf.
-//
-//******************************************************************************
-static int
-iiReadBuf8(i2eBordStrPtr pB, unsigned char *address, int count)
-{
-        // Rudimentary sanity checking here.
-        if (pB->i2eValid != I2E_MAGIC)
-                I2_COMPLETE(pB, I2EE_INVALID);
-
-        I2_INSB(pB->i2eData, address, count);
-
-        I2_COMPLETE(pB, I2EE_GOOD);
-}
-
-//******************************************************************************
-// Function:   iiReadWord16(pB)
-// Parameters: pB      - pointer to board structure
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// Returns the word read from the data fifo specified by the board-structure
-// pointer pB. Uses a 16-bit operation. Is called indirectly through
-// pB->i2eReadWord.
-//
-//******************************************************************************
-static unsigned short
-iiReadWord16(i2eBordStrPtr pB)
-{
-        return inw(pB->i2eData);
-}
-
-//******************************************************************************
-// Function:   iiReadWord8(pB)
-// Parameters: pB      - pointer to board structure
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// Returns the word read from the data fifo specified by the board-structure
-// pointer pB. Uses two 8-bit operations. Bytes are assumed to be LSB first. Is
-// called indirectly through pB->i2eReadWord.
-//
-//******************************************************************************
-static unsigned short
-iiReadWord8(i2eBordStrPtr pB)
-{
-        unsigned short urs;
-
-        urs = inb(pB->i2eData);
-
-        return (inb(pB->i2eData) << 8) | urs;
-}
-
-//******************************************************************************
-// Function:   iiWriteWord16(pB, value)
-// Parameters: pB    - pointer to board structure
-//             value - data to write
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// Writes the word 'value' to the data fifo specified by the board-structure
-// pointer pB. Uses 16-bit operation. Is called indirectly through
-// pB->i2eWriteWord.
-//
-//******************************************************************************
-static void
-iiWriteWord16(i2eBordStrPtr pB, unsigned short value)
-{
-        outw((int)value, pB->i2eData);
-}
-
-//******************************************************************************
-// Function:   iiWriteWord8(pB, value)
-// Parameters: pB    - pointer to board structure
-//             value - data to write
-//
-// Returns:    True if everything appears copacetic.
-//             False if there is any error: the pB->i2eError field has the error
-//
-// Description:
-//
-// Writes the word 'value' to the data fifo specified by the board-structure
-// pointer pB. Uses two 8-bit operations (writes LSB first). Is called
-// indirectly through pB->i2eWriteWord.
-//
-//******************************************************************************
-static void
-iiWriteWord8(i2eBordStrPtr pB, unsigned short value)
-{
-        outb((char)value, pB->i2eData);
-        outb((char)(value >> 8), pB->i2eData);
-}
-
-//******************************************************************************
-// Function:   iiWaitForTxEmptyII(pB, mSdelay)
-// Parameters: pB      - pointer to board structure
-//             mSdelay - period to wait before returning
-//
-// Returns:    True if the FIFO is empty.
-//             False if it not empty in the required time: the pB->i2eError
-//             field has the error.
-//
-// Description:
-//
-// Waits up to "mSdelay" milliseconds for the outgoing FIFO to become empty; if
-// not empty by the required time, returns false and error in pB->i2eError,
-// otherwise returns true.
-//
-// mSdelay == 0 is taken to mean must be empty on the first test.
-//
-// This version operates on IntelliPort-II - style FIFO's
-//
-// Note this routine is organized so that if status is ok there is no delay at
-// all called either before or after the test.  Is called indirectly through
-// pB->i2eWaitForTxEmpty.
-//
-//******************************************************************************
-static int
-iiWaitForTxEmptyII(i2eBordStrPtr pB, int mSdelay)
-{
-        unsigned long   flags;
-        int itemp;
-
-        for (;;)
-        {
-                // This routine hinges on being able to see the "other" status register
-                // (as seen by the local processor).  His incoming fifo is our outgoing
-                // FIFO.
-                //
-                // By the nature of this routine, you would be using this as part of a
-                // larger atomic context: i.e., you would use this routine to ensure the
-                // fifo empty, then act on this information. Between these two halves, 
-                // you will generally not want to service interrupts or in any way 
-                // disrupt the assumptions implicit in the larger context.
-                //
-                // Even worse, however, this routine "shifts" the status register to 
-                // point to the local status register which is not the usual situation.
-                // Therefore for extra safety, we force the critical section to be
-                // completely atomic, and pick up after ourselves before allowing any
-                // interrupts of any kind.
-
-
-                write_lock_irqsave(&Dl_spinlock, flags);
-                outb(SEL_COMMAND, pB->i2ePointer);
-                outb(SEL_CMD_SH, pB->i2ePointer);
-
-                itemp = inb(pB->i2eStatus);
-
-                outb(SEL_COMMAND, pB->i2ePointer);
-                outb(SEL_CMD_UNSH, pB->i2ePointer);
-
-                if (itemp & ST_IN_EMPTY)
-                {
-                        I2_UPDATE_FIFO_ROOM(pB);
-                        write_unlock_irqrestore(&Dl_spinlock, flags);
-                        I2_COMPLETE(pB, I2EE_GOOD);
-                }
-
-                write_unlock_irqrestore(&Dl_spinlock, flags);
-
-                if (mSdelay-- == 0)
-                        break;
-
-                iiDelay(pB, 1);      /* 1 mS granularity on checking condition */
-        }
-        I2_COMPLETE(pB, I2EE_TXE_TIME);
-}
-
-//******************************************************************************
-// Function:   iiWaitForTxEmptyIIEX(pB, mSdelay)
-// Parameters: pB      - pointer to board structure
-//             mSdelay - period to wait before returning
-//
-// Returns:    True if the FIFO is empty.
-//             False if it not empty in the required time: the pB->i2eError
-//             field has the error.
-//
-// Description:
-//
-// Waits up to "mSdelay" milliseconds for the outgoing FIFO to become empty; if
-// not empty by the required time, returns false and error in pB->i2eError,
-// otherwise returns true.
-//
-// mSdelay == 0 is taken to mean must be empty on the first test.
-//
-// This version operates on IntelliPort-IIEX - style FIFO's
-//
-// Note this routine is organized so that if status is ok there is no delay at
-// all called either before or after the test.  Is called indirectly through
-// pB->i2eWaitForTxEmpty.
-//
-//******************************************************************************
-static int
-iiWaitForTxEmptyIIEX(i2eBordStrPtr pB, int mSdelay)
-{
-        unsigned long   flags;
-
-        for (;;)
-        {
-                // By the nature of this routine, you would be using this as part of a
-                // larger atomic context: i.e., you would use this routine to ensure the
-                // fifo empty, then act on this information. Between these two halves,
-                // you will generally not want to service interrupts or in any way
-                // disrupt the assumptions implicit in the larger context.
-
-                write_lock_irqsave(&Dl_spinlock, flags);
-
-                if (inb(pB->i2eStatus) & STE_OUT_MT) {
-                        I2_UPDATE_FIFO_ROOM(pB);
-                        write_unlock_irqrestore(&Dl_spinlock, flags);
-                        I2_COMPLETE(pB, I2EE_GOOD);
-                }
-                write_unlock_irqrestore(&Dl_spinlock, flags);
-
-                if (mSdelay-- == 0)
-                        break;
-
-                iiDelay(pB, 1);      // 1 mS granularity on checking condition
-        }
-        I2_COMPLETE(pB, I2EE_TXE_TIME);
-}
-
-//******************************************************************************
-// Function:   iiTxMailEmptyII(pB)
-// Parameters: pB      - pointer to board structure
-//
-// Returns:    True if the transmit mailbox is empty.
-//             False if it not empty.
-//
-// Description:
-//
-// Returns true or false according to whether the transmit mailbox is empty (and
-// therefore able to accept more mail)
-//
-// This version operates on IntelliPort-II - style FIFO's
-//
-//******************************************************************************
-static int
-iiTxMailEmptyII(i2eBordStrPtr pB)
-{
-        int port = pB->i2ePointer;
-        outb(SEL_OUTMAIL, port);
-        return inb(port) == 0;
-}
-
-//******************************************************************************
-// Function:   iiTxMailEmptyIIEX(pB)
-// Parameters: pB      - pointer to board structure
-//
-// Returns:    True if the transmit mailbox is empty.
-//             False if it not empty.
-//
-// Description:
-//
-// Returns true or false according to whether the transmit mailbox is empty (and
-// therefore able to accept more mail)
-//
-// This version operates on IntelliPort-IIEX - style FIFO's
-//
-//******************************************************************************
-static int
-iiTxMailEmptyIIEX(i2eBordStrPtr pB)
-{
-        return !(inb(pB->i2eStatus) & STE_OUT_MAIL);
-}
-
-//******************************************************************************
-// Function:   iiTrySendMailII(pB,mail)
-// Parameters: pB   - pointer to board structure
-//             mail - value to write to mailbox
-//
-// Returns:    True if the transmit mailbox is empty, and mail is sent.
-//             False if it not empty.
-//
-// Description:
-//
-// If outgoing mailbox is empty, sends mail and returns true. If outgoing
-// mailbox is not empty, returns false.
-//
-// This version operates on IntelliPort-II - style FIFO's
-//
-//******************************************************************************
-static int
-iiTrySendMailII(i2eBordStrPtr pB, unsigned char mail)
-{
-        int port = pB->i2ePointer;
-
-        outb(SEL_OUTMAIL, port);
-        if (inb(port) == 0) {
-                outb(SEL_OUTMAIL, port);
-                outb(mail, port);
-                return 1;
-        }
-        return 0;
-}
-
-//******************************************************************************
-// Function:   iiTrySendMailIIEX(pB,mail)
-// Parameters: pB   - pointer to board structure
-//             mail - value to write to mailbox
-//
-// Returns:    True if the transmit mailbox is empty, and mail is sent.
-//             False if it not empty.
-//
-// Description:
-//
-// If outgoing mailbox is empty, sends mail and returns true. If outgoing
-// mailbox is not empty, returns false.
-//
-// This version operates on IntelliPort-IIEX - style FIFO's
-//
-//******************************************************************************
-static int
-iiTrySendMailIIEX(i2eBordStrPtr pB, unsigned char mail)
-{
-        if (inb(pB->i2eStatus) & STE_OUT_MAIL)
-                return 0;
-        outb(mail, pB->i2eXMail);
-        return 1;
-}
-
-//******************************************************************************
-// Function:   iiGetMailII(pB,mail)
-// Parameters: pB   - pointer to board structure
-//
-// Returns:    Mailbox data or NO_MAIL_HERE.
-//
-// Description:
-//
-// If no mail available, returns NO_MAIL_HERE otherwise returns the data from
-// the mailbox, which is guaranteed != NO_MAIL_HERE.
-//
-// This version operates on IntelliPort-II - style FIFO's
-//
-//******************************************************************************
-static unsigned short
-iiGetMailII(i2eBordStrPtr pB)
-{
-        if (I2_HAS_MAIL(pB)) {
-                outb(SEL_INMAIL, pB->i2ePointer);
-                return inb(pB->i2ePointer);
-        } else {
-                return NO_MAIL_HERE;
-        }
-}
-
-//******************************************************************************
-// Function:   iiGetMailIIEX(pB,mail)
-// Parameters: pB   - pointer to board structure
-//
-// Returns:    Mailbox data or NO_MAIL_HERE.
-//
-// Description:
-//
-// If no mail available, returns NO_MAIL_HERE otherwise returns the data from
-// the mailbox, which is guaranteed != NO_MAIL_HERE.
-//
-// This version operates on IntelliPort-IIEX - style FIFO's
-//
-//******************************************************************************
-static unsigned short
-iiGetMailIIEX(i2eBordStrPtr pB)
-{
-        if (I2_HAS_MAIL(pB))
-                return inb(pB->i2eXMail);
-        else
-                return NO_MAIL_HERE;
-}
-
-//******************************************************************************
-// Function:   iiEnableMailIrqII(pB)
-// Parameters: pB - pointer to board structure
-//
-// Returns:    Nothing
-//
-// Description:
-//
-// Enables board to interrupt host (only) by writing to host's in-bound mailbox.
-//
-// This version operates on IntelliPort-II - style FIFO's
-//
-//******************************************************************************
-static void
-iiEnableMailIrqII(i2eBordStrPtr pB)
-{
-        outb(SEL_MASK, pB->i2ePointer);
-        outb(ST_IN_MAIL, pB->i2ePointer);
-}
-
-//******************************************************************************
-// Function:   iiEnableMailIrqIIEX(pB)
-// Parameters: pB - pointer to board structure
-//
-// Returns:    Nothing
-//
-// Description:
-//
-// Enables board to interrupt host (only) by writing to host's in-bound mailbox.
-//
-// This version operates on IntelliPort-IIEX - style FIFO's
-//
-//******************************************************************************
-static void
-iiEnableMailIrqIIEX(i2eBordStrPtr pB)
-{
-        outb(MX_IN_MAIL, pB->i2eXMask);
-}
-
-//******************************************************************************
-// Function:   iiWriteMaskII(pB)
-// Parameters: pB - pointer to board structure
-//
-// Returns:    Nothing
-//
-// Description:
-//
-// Writes arbitrary value to the mask register.
-//
-// This version operates on IntelliPort-II - style FIFO's
-//
-//******************************************************************************
-static void
-iiWriteMaskII(i2eBordStrPtr pB, unsigned char value)
-{
-        outb(SEL_MASK, pB->i2ePointer);
-        outb(value, pB->i2ePointer);
-}
-
-//******************************************************************************
-// Function:   iiWriteMaskIIEX(pB)
-// Parameters: pB - pointer to board structure
-//
-// Returns:    Nothing
-//
-// Description:
-//
-// Writes arbitrary value to the mask register.
-//
-// This version operates on IntelliPort-IIEX - style FIFO's
-//
-//******************************************************************************
-static void
-iiWriteMaskIIEX(i2eBordStrPtr pB, unsigned char value)
-{
-        outb(value, pB->i2eXMask);
-}
-
-//******************************************************************************
-// Function:   iiDownloadBlock(pB, pSource, isStandard)
-// Parameters: pB         - pointer to board structure
-//             pSource    - loadware block to download
-//             isStandard - True if "standard" loadware, else false.
-//
-// Returns:    Success or Failure
-//
-// Description:
-//
-// Downloads a single block (at pSource)to the board referenced by pB. Caller
-// sets isStandard to true/false according to whether the "standard" loadware is
-// what's being loaded. The normal process, then, is to perform an iiInitialize
-// to the board, then perform some number of iiDownloadBlocks using the returned
-// state to determine when download is complete.
-//
-// Possible return values: (see I2ELLIS.H)
-// II_DOWN_BADVALID
-// II_DOWN_BADFILE
-// II_DOWN_CONTINUING
-// II_DOWN_GOOD
-// II_DOWN_BAD
-// II_DOWN_BADSTATE
-// II_DOWN_TIMEOUT
-//
-// Uses the i2eState and i2eToLoad fields (initialized at iiInitialize) to
-// determine whether this is the first block, whether to check for magic
-// numbers, how many blocks there are to go...
-//
-//******************************************************************************
-static int
-iiDownloadBlock ( i2eBordStrPtr pB, loadHdrStrPtr pSource, int isStandard)
-{
-        int itemp;
-        int loadedFirst;
-
-        if (pB->i2eValid != I2E_MAGIC) return II_DOWN_BADVALID;
-
-        switch(pB->i2eState)
-        {
-        case II_STATE_READY:
-
-                // Loading the first block after reset. Must check the magic number of the
-                // loadfile, store the number of blocks we expect to load.
-                if (pSource->e.loadMagic != MAGIC_LOADFILE)
-                {
-                        return II_DOWN_BADFILE;
-                }
-
-                // Next we store the total number of blocks to load, including this one.
-                pB->i2eToLoad = 1 + pSource->e.loadBlocksMore;
-
-                // Set the state, store the version numbers. ('Cause this may have come
-                // from a file - we might want to report these versions and revisions in
-                // case of an error!
-                pB->i2eState = II_STATE_LOADING;
-                pB->i2eLVersion = pSource->e.loadVersion;
-                pB->i2eLRevision = pSource->e.loadRevision;
-                pB->i2eLSub = pSource->e.loadSubRevision;
-
-                // The time and date of compilation is also available but don't bother
-                // storing it for normal purposes.
-                loadedFirst = 1;
-                break;
-
-        case II_STATE_LOADING:
-                loadedFirst = 0;
-                break;
-
-        default:
-                return II_DOWN_BADSTATE;
-        }
-
-        // Now we must be in the II_STATE_LOADING state, and we assume i2eToLoad
-        // must be positive still, because otherwise we would have cleaned up last
-        // time and set the state to II_STATE_LOADED.
-        if (!iiWaitForTxEmpty(pB, MAX_DLOAD_READ_TIME)) {
-                return II_DOWN_TIMEOUT;
-        }
-
-        if (!iiWriteBuf(pB, pSource->c, LOADWARE_BLOCK_SIZE)) {
-                return II_DOWN_BADVALID;
-        }
-
-        // If we just loaded the first block, wait for the fifo to empty an extra
-        // long time to allow for any special startup code in the firmware, like
-        // sending status messages to the LCD's.
-
-        if (loadedFirst) {
-                if (!iiWaitForTxEmpty(pB, MAX_DLOAD_START_TIME)) {
-                        return II_DOWN_TIMEOUT;
-                }
-        }
-
-        // Determine whether this was our last block!
-        if (--(pB->i2eToLoad)) {
-                return II_DOWN_CONTINUING;    // more to come...
-        }
-
-        // It WAS our last block: Clean up operations...
-        // ...Wait for last buffer to drain from the board...
-        if (!iiWaitForTxEmpty(pB, MAX_DLOAD_READ_TIME)) {
-                return II_DOWN_TIMEOUT;
-        }
-        // If there were only a single block written, this would come back
-        // immediately and be harmless, though not strictly necessary.
-        itemp = MAX_DLOAD_ACK_TIME/10;
-        while (--itemp) {
-                if (I2_HAS_INPUT(pB)) {
-                        switch (inb(pB->i2eData)) {
-                        case LOADWARE_OK:
-                                pB->i2eState =
-                                        isStandard ? II_STATE_STDLOADED :II_STATE_LOADED;
-
-                                // Some revisions of the bootstrap firmware (e.g. ISA-8 1.0.2)
-                                // will, // if there is a debug port attached, require some
-                                // time to send information to the debug port now. It will do
-                                // this before // executing any of the code we just downloaded.
-                                // It may take up to 700 milliseconds.
-                                if (pB->i2ePom.e.porDiag2 & POR_DEBUG_PORT) {
-                                        iiDelay(pB, 700);
-                                }
-
-                                return II_DOWN_GOOD;
-
-                        case LOADWARE_BAD:
-                        default:
-                                return II_DOWN_BAD;
-                        }
-                }
-
-                iiDelay(pB, 10);      // 10 mS granularity on checking condition
-        }
-
-        // Drop-through --> timed out waiting for firmware confirmation
-
-        pB->i2eState = II_STATE_BADLOAD;
-        return II_DOWN_TIMEOUT;
-}
-
-//******************************************************************************
-// Function:   iiDownloadAll(pB, pSource, isStandard, size)
-// Parameters: pB         - pointer to board structure
-//             pSource    - loadware block to download
-//             isStandard - True if "standard" loadware, else false.
-//             size       - size of data to download (in bytes)
-//
-// Returns:    Success or Failure
-//
-// Description:
-//
-// Given a pointer to a board structure, a pointer to the beginning of some
-// loadware, whether it is considered the "standard loadware", and the size of
-// the array in bytes loads the entire array to the board as loadware.
-//
-// Assumes the board has been freshly reset and the power-up reset message read.
-// (i.e., in II_STATE_READY). Complains if state is bad, or if there seems to be
-// too much or too little data to load, or if iiDownloadBlock complains.
-//******************************************************************************
-static int
-iiDownloadAll(i2eBordStrPtr pB, loadHdrStrPtr pSource, int isStandard, int size)
-{
-        int status;
-
-        // We know (from context) board should be ready for the first block of
-        // download.  Complain if not.
-        if (pB->i2eState != II_STATE_READY) return II_DOWN_BADSTATE;
-
-        while (size > 0) {
-                size -= LOADWARE_BLOCK_SIZE;    // How much data should there be left to
-                                                                                // load after the following operation ?
-
-                // Note we just bump pSource by "one", because its size is actually that
-                // of an entire block, same as LOADWARE_BLOCK_SIZE.
-                status = iiDownloadBlock(pB, pSource++, isStandard);
-
-                switch(status)
-                {
-                case II_DOWN_GOOD:
-                        return ( (size > 0) ? II_DOWN_OVER : II_DOWN_GOOD);
-
-                case II_DOWN_CONTINUING:
-                        break;
-
-                default:
-                        return status;
-                }
-        }
-
-        // We shouldn't drop out: it means "while" caught us with nothing left to
-        // download, yet the previous DownloadBlock did not return complete. Ergo,
-        // not enough data to match the size byte in the header.
-        return II_DOWN_UNDER;
-}
diff --git a/drivers/char/ip2/i2ellis.h b/drivers/char/ip2/i2ellis.h
deleted file mode 100644
index fb6df2456018..000000000000
--- a/drivers/char/ip2/i2ellis.h
+++ /dev/null
@@ -1,566 +0,0 @@
-/*******************************************************************************
-*
-*   (c) 1999 by Computone Corporation
-*
-********************************************************************************
-*
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort II family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: Mainline code for the device driver
-*
-*******************************************************************************/
-//------------------------------------------------------------------------------
-// i2ellis.h
-//
-// IntelliPort-II and IntelliPort-IIEX
-//
-// Extremely
-// Low
-// Level
-// Interface
-// Services
-//
-// Structure Definitions and declarations for "ELLIS" service routines found in
-// i2ellis.c
-//
-// These routines are based on properties of the IntelliPort-II and -IIEX
-// hardware and bootstrap firmware, and are not sensitive to particular
-// conventions of any particular loadware.
-//
-// Unlike i2hw.h, which provides IRONCLAD hardware definitions, the material
-// here and in i2ellis.c is intended to provice a useful, but not required,
-// layer of insulation from the hardware specifics.
-//------------------------------------------------------------------------------
-#ifndef  I2ELLIS_H   /* To prevent multiple includes */
-#define  I2ELLIS_H   1
-//------------------------------------------------
-// Revision History:
-//
-// 30 September 1991 MAG First Draft Started
-// 12 October   1991 ...continued...
-//
-// 20 December  1996 AKM Linux version
-//-------------------------------------------------
-
-//----------------------
-// Mandatory Includes:
-//----------------------
-#include "ip2types.h"
-#include "i2hw.h"       // The hardware definitions
-
-//------------------------------------------
-// STAT_BOXIDS packets
-//------------------------------------------
-#define MAX_BOX         4
-
-typedef struct _bidStat
-{
-        unsigned char bid_value[MAX_BOX];
-} bidStat, *bidStatPtr;
-
-// This packet is sent in response to a CMD_GET_BOXIDS bypass command. For -IIEX
-// boards, reports the hardware-specific "asynchronous resource register" on
-// each expansion box. Boxes not present report 0xff. For -II boards, the first
-// element contains 0x80 for 8-port, 0x40 for 4-port boards.
-
-// Box IDs aka ARR or Async Resource Register (more than you want to know)
-//   7   6   5   4   3   2   1   0
-//   F   F   N   N   L   S   S   S
-//   =============================
-//   F   F   -  Product Family Designator
-//   =====+++++++++++++++++++++++++++++++
-//   0   0   -  Intelliport II EX / ISA-8
-//   1   0   -  IntelliServer
-//   0   1   -  SAC - Port Device (Intelliport III ??? )
-//           =====+++++++++++++++++++++++++++++++++++++++
-//           N   N   -  Number of Ports
-//           0   0   -  8  (eight)
-//           0   1   -  4  (four)
-//           1   0   -  12 (twelve)
-//           1   1   -  16 (sixteen)
-//                   =++++++++++++++++++++++++++++++++++
-//                   L  -   LCD Display Module Present
-//                   0  -   No
-//                   1  -   LCD module present
-//                   =========+++++++++++++++++++++++++++++++++++++
-//                      S   S   S - Async Signals Supported Designator
-//                      0   0   0 - 8dss, Mod DCE DB25 Female
-//                      0   0   1 - 6dss, RJ-45
-//                      0   1   0 - RS-232/422 dss, DB25 Female
-//                      0   1   1 - RS-232/422 dss, separate 232/422 DB25 Female
-//                      1   0   0 - 6dss, 921.6 I/F with ST654's
-//                      1   0   1 - RS-423/232 8dss, RJ-45 10Pin
-//                      1   1   0 - 6dss, Mod DCE DB25 Female
-//                      1   1   1 - NO BOX PRESENT
-
-#define FF(c)   ((c & 0xC0) >> 6)
-#define NN(c)   ((c & 0x30) >> 4)
-#define L(c)    ((c & 0x08) >> 3)
-#define SSS(c)   (c & 0x07)
-
-#define BID_HAS_654(x)  (SSS(x) == 0x04)
-#define BID_NO_BOX      0xff /* no box */
-#define BID_8PORT       0x80 /* IP2-8 port */
-#define BID_4PORT       0x81 /* IP2-4 port */
-#define BID_EXP_MASK    0x30 /* IP2-EX  */
-#define BID_EXP_8PORT   0x00 /*     8, */
-#define BID_EXP_4PORT   0x10 /*     4, */
-#define BID_EXP_UNDEF   0x20 /*     UNDEF, */
-#define BID_EXP_16PORT  0x30 /*    16, */
-#define BID_LCD_CTRL    0x08 /* LCD Controller */
-#define BID_LCD_NONE    0x00 /* - no controller present */
-#define BID_LCD_PRES    0x08 /* - controller present */
-#define BID_CON_MASK    0x07 /* - connector pinouts */
-#define BID_CON_DB25    0x00 /* - DB-25 F */
-#define BID_CON_RJ45    0x01 /* - rj45 */
-
-//------------------------------------------------------------------------------
-// i2eBordStr
-//
-// This structure contains all the information the ELLIS routines require in
-// dealing with a particular board.
-//------------------------------------------------------------------------------
-// There are some queues here which are guaranteed to never contain the entry
-// for a single channel twice. So they must be slightly larger to allow
-// unambiguous full/empty management
-//
-#define CH_QUEUE_SIZE ABS_MOST_PORTS+2
-
-typedef struct _i2eBordStr
-{
-        porStr         i2ePom;  // Structure containing the power-on message.
-
-        unsigned short i2ePomSize;
-                                                // The number of bytes actually read if
-                                                // different from sizeof i2ePom, indicates
-                                                // there is an error!
-
-        unsigned short i2eStartMail;
-                                                // Contains whatever inbound mailbox data
-                                                // present at startup. NO_MAIL_HERE indicates
-                                                // nothing was present. No special
-                                                // significance as of this writing, but may be
-                                                // useful for diagnostic reasons.
-
-        unsigned short i2eValid;
-                                                // Indicates validity of the structure; if
-                                                // i2eValid == I2E_MAGIC, then we can trust
-                                                // the other fields. Some (especially
-                                                // initialization) functions are good about
-                                                // checking for validity.  Many functions do
-                                                // not, it being assumed that the larger
-                                                // context assures we are using a valid
-                                                // i2eBordStrPtr.
-
-        unsigned short i2eError;
-                                                // Used for returning an error condition from
-                                                // several functions which use i2eBordStrPtr
-                                                // as an argument.
-
-        // Accelerators to characterize separate features of a board, derived from a
-        // number of sources.
-
-        unsigned short i2eFifoSize;
-                                                // Always, the size of the FIFO. For
-                                                // IntelliPort-II, always the same, for -IIEX
-                                                // taken from the Power-On reset message.
-
-        volatile 
-        unsigned short i2eFifoRemains;
-                                                // Used during normal operation to indicate a
-                                                // lower bound on the amount of data which
-                                                // might be in the outbound fifo.
-
-        unsigned char  i2eFifoStyle;
-                                                // Accelerator which tells which style (-II or
-                                                // -IIEX) FIFO we are using.
-
-        unsigned char  i2eDataWidth16;
-                                                // Accelerator which tells whether we should
-                                                // do 8 or 16-bit data transfers.
-
-        unsigned char  i2eMaxIrq;
-                                                // The highest allowable IRQ, based on the
-                                                // slot size.
-
-        // Accelerators for various addresses on the board
-        int            i2eBase;        // I/O Address of the Board
-        int            i2eData;        // From here data transfers happen
-        int            i2eStatus;      // From here status reads happen
-        int            i2ePointer;     // (IntelliPort-II: pointer/commands)
-        int            i2eXMail;       // (IntelliPOrt-IIEX: mailboxes
-        int            i2eXMask;       // (IntelliPort-IIEX: mask write
-
-        //-------------------------------------------------------
-        // Information presented in a common format across boards
-        // For each box, bit map of the channels present.  Box closest to 
-        // the host is box 0. LSB is channel 0. IntelliPort-II (non-expandable)
-        // is taken to be box 0. These are derived from product i.d. registers.
-
-        unsigned short i2eChannelMap[ABS_MAX_BOXES];
-
-        // Same as above, except each is derived from firmware attempting to detect
-        // the uart presence (by reading a valid GFRCR register). If bits are set in
-        // i2eChannelMap and not in i2eGoodMap, there is a potential problem.
-
-        unsigned short i2eGoodMap[ABS_MAX_BOXES];
-
-        // ---------------------------
-        // For indirect function calls
-
-        // Routine to cause an N-millisecond delay: Patched by the ii2Initialize
-        // function.
-
-        void  (*i2eDelay)(unsigned int);
-
-        // Routine to write N bytes to the board through the FIFO. Returns true if
-        // all copacetic, otherwise returns false and error is in i2eError field.
-        // IF COUNT IS ODD, ROUNDS UP TO THE NEXT EVEN NUMBER.
-
-        int   (*i2eWriteBuf)(struct _i2eBordStr *, unsigned char *, int);
-
-        // Routine to read N bytes from the board through the FIFO. Returns true if
-        // copacetic, otherwise returns false and error in i2eError.
-        // IF COUNT IS ODD, ROUNDS UP TO THE NEXT EVEN NUMBER.
-
-        int   (*i2eReadBuf)(struct _i2eBordStr *, unsigned char *, int);
-
-        // Returns a word from FIFO. Will use 2 byte operations if needed.
-
-        unsigned short (*i2eReadWord)(struct _i2eBordStr *);
-
-        // Writes a word to FIFO. Will use 2 byte operations if needed.
-
-        void  (*i2eWriteWord)(struct _i2eBordStr *, unsigned short);
-
-        // Waits specified time for the Transmit FIFO to go empty. Returns true if
-        //  ok, otherwise returns false and error in i2eError.
-
-        int   (*i2eWaitForTxEmpty)(struct _i2eBordStr *, int);
-
-        // Returns true or false according to whether the outgoing mailbox is empty.
-
-        int   (*i2eTxMailEmpty)(struct _i2eBordStr *);
-
-        // Checks whether outgoing mailbox is empty.  If so, sends mail and returns
-        // true.  Otherwise returns false.
-
-        int   (*i2eTrySendMail)(struct _i2eBordStr *, unsigned char);
-
-        // If no mail available, returns NO_MAIL_HERE, else returns the value in the
-        // mailbox (guaranteed can't be NO_MAIL_HERE).
-
-        unsigned short (*i2eGetMail)(struct _i2eBordStr *);
-
-        // Enables the board to interrupt the host when it writes to the mailbox.
-        // Irqs will not occur, however, until the loadware separately enables
-        // interrupt generation to the host.  The standard loadware does this in
-        // response to a command packet sent by the host. (Also, disables
-        // any other potential interrupt sources from the board -- other than the
-        // inbound mailbox).
-
-        void  (*i2eEnableMailIrq)(struct _i2eBordStr *);
-
-        // Writes an arbitrary value to the mask register.
-
-        void  (*i2eWriteMask)(struct _i2eBordStr *, unsigned char);
-
-
-        // State information
-
-        // During downloading, indicates the number of blocks remaining to download
-        // to the board.
-
-        short i2eToLoad;
-
-        // State of board (see manifests below) (e.g., whether in reset condition,
-        // whether standard loadware is installed, etc.
-
-        unsigned char  i2eState;
-
-        // These three fields are only valid when there is loadware running on the
-        // board. (i2eState == II_STATE_LOADED or i2eState == II_STATE_STDLOADED )
-
-        unsigned char  i2eLVersion;  // Loadware version
-        unsigned char  i2eLRevision; // Loadware revision
-        unsigned char  i2eLSub;      // Loadware subrevision
-
-        // Flags which only have meaning in the context of the standard loadware.
-        // Somewhat violates the layering concept, but there is so little additional
-        // needed at the board level (while much additional at the channel level),
-        // that this beats maintaining two different per-board structures.
-
-        // Indicates which IRQ the board has been initialized (from software) to use
-        // For MicroChannel boards, any value different from IRQ_UNDEFINED means
-        // that the software command has been sent to enable interrupts (or specify
-        // they are disabled). Special value: IRQ_UNDEFINED indicates that the
-        // software command to select the interrupt has not yet been sent, therefore
-        // (since the standard loadware insists that it be sent before any other
-        // packets are sent) no other packets should be sent yet.
-
-        unsigned short i2eUsingIrq;
-
-        // This is set when we hit the MB_OUT_STUFFED mailbox, which prevents us
-        // putting more in the mailbox until an appropriate mailbox message is
-        // received.
-
-        unsigned char  i2eWaitingForEmptyFifo;
-
-        // Any mailbox bits waiting to be sent to the board are OR'ed in here.
-
-        unsigned char  i2eOutMailWaiting;
-
-        // The head of any incoming packet is read into here, is then examined and 
-        // we dispatch accordingly.
-
-        unsigned short i2eLeadoffWord[1];
-
-        // Running counter of interrupts where the mailbox indicated incoming data.
-
-        unsigned short i2eFifoInInts;
-
-        // Running counter of interrupts where the mailbox indicated outgoing data
-        // had been stripped.
-
-        unsigned short i2eFifoOutInts;
-
-        // If not void, gives the address of a routine to call if fatal board error
-        // is found (only applies to standard l/w).
-
-        void  (*i2eFatalTrap)(struct _i2eBordStr *);
-
-        // Will point to an array of some sort of channel structures (whose format
-        // is unknown at this level, being a function of what loadware is
-        // installed and the code configuration (max sizes of buffers, etc.)).
-
-        void  *i2eChannelPtr;
-
-        // Set indicates that the board has gone fatal.
-
-        unsigned short i2eFatal;
-
-        // The number of elements pointed to by i2eChannelPtr.
-
-        unsigned short i2eChannelCnt;
-
-        // Ring-buffers of channel structures whose channels have particular needs.
-
-        rwlock_t        Fbuf_spinlock;
-        volatile
-        unsigned short i2Fbuf_strip;    // Strip index
-        volatile 
-        unsigned short i2Fbuf_stuff;    // Stuff index
-        void  *i2Fbuf[CH_QUEUE_SIZE];   // An array of channel pointers
-                                                                        // of channels who need to send
-                                                                        // flow control packets.
-        rwlock_t        Dbuf_spinlock;
-        volatile
-        unsigned short i2Dbuf_strip;    // Strip index
-        volatile
-        unsigned short i2Dbuf_stuff;    // Stuff index
-        void  *i2Dbuf[CH_QUEUE_SIZE];   // An array of channel pointers
-                                                                        // of channels who need to send
-                                                                        // data or in-line command packets.
-        rwlock_t        Bbuf_spinlock;
-        volatile
-        unsigned short i2Bbuf_strip;    // Strip index
-        volatile
-        unsigned short i2Bbuf_stuff;    // Stuff index
-        void  *i2Bbuf[CH_QUEUE_SIZE];   // An array of channel pointers
-                                                                        // of channels who need to send
-                                                                        // bypass command packets.
-
-        /*
-         * A set of flags to indicate that certain events have occurred on at least
-         * one of the ports on this board. We use this to decide whether to spin
-         * through the channels looking for breaks, etc.
-         */
-        int             got_input;
-        int             status_change;
-        bidStat channelBtypes;
-
-        /*
-         * Debugging counters, etc.
-         */
-        unsigned long debugFlowQueued;
-        unsigned long debugInlineQueued;
-        unsigned long debugDataQueued;
-        unsigned long debugBypassQueued;
-        unsigned long debugFlowCount;
-        unsigned long debugInlineCount;
-        unsigned long debugBypassCount;
-        
-        rwlock_t        read_fifo_spinlock;
-        rwlock_t        write_fifo_spinlock;
-
-//      For queuing interrupt bottom half handlers.     /\/\|=mhw=|\/\/
-        struct work_struct      tqueue_interrupt;
-
-        struct timer_list  SendPendingTimer;   // Used by iiSendPending
-        unsigned int    SendPendingRetry;
-} i2eBordStr, *i2eBordStrPtr;
-
-//-------------------------------------------------------------------
-// Macro Definitions for the indirect calls defined in the i2eBordStr
-//-------------------------------------------------------------------
-//
-#define iiDelay(a,b)          (*(a)->i2eDelay)(b)
-#define iiWriteBuf(a,b,c)     (*(a)->i2eWriteBuf)(a,b,c)
-#define iiReadBuf(a,b,c)      (*(a)->i2eReadBuf)(a,b,c)
-
-#define iiWriteWord(a,b)      (*(a)->i2eWriteWord)(a,b)
-#define iiReadWord(a)         (*(a)->i2eReadWord)(a)
-
-#define iiWaitForTxEmpty(a,b) (*(a)->i2eWaitForTxEmpty)(a,b)
-
-#define iiTxMailEmpty(a)      (*(a)->i2eTxMailEmpty)(a)
-#define iiTrySendMail(a,b)    (*(a)->i2eTrySendMail)(a,b)
-
-#define iiGetMail(a)          (*(a)->i2eGetMail)(a)
-#define iiEnableMailIrq(a)    (*(a)->i2eEnableMailIrq)(a)
-#define iiDisableMailIrq(a)   (*(a)->i2eWriteMask)(a,0)
-#define iiWriteMask(a,b)      (*(a)->i2eWriteMask)(a,b)
-
-//-------------------------------------------
-// Manifests for i2eBordStr:
-//-------------------------------------------
-
-typedef void (*delayFunc_t)(unsigned int);
-
-// i2eValid
-//
-#define I2E_MAGIC       0x4251   // Structure is valid.
-#define I2E_INCOMPLETE  0x1122   // Structure failed during init.
-
-
-// i2eError
-//
-#define I2EE_GOOD       0       // Operation successful
-#define I2EE_BADADDR    1       // Address out of range
-#define I2EE_BADSTATE   2       // Attempt to perform a function when the board
-                                                        // structure was in the incorrect state
-#define I2EE_BADMAGIC   3       // Bad magic number from Power On test (i2ePomSize
-                                                        // reflects what was read
-#define I2EE_PORM_SHORT 4       // Power On message too short
-#define I2EE_PORM_LONG  5       // Power On message too long
-#define I2EE_BAD_FAMILY 6       // Un-supported board family type
-#define I2EE_INCONSIST  7       // Firmware reports something impossible,
-                                                        // e.g. unexpected number of ports... Almost no
-                                                        // excuse other than bad FIFO...
-#define I2EE_POSTERR    8       // Power-On self test reported a bad error
-#define I2EE_BADBUS     9       // Unknown Bus type declared in message
-#define I2EE_TXE_TIME   10      // Timed out waiting for TX Fifo to empty
-#define I2EE_INVALID    11      // i2eValid field does not indicate a valid and
-                                                        // complete board structure (for functions which
-                                                        // require this be so.)
-#define I2EE_BAD_PORT   12      // Discrepancy between channels actually found and
-                                                        // what the product is supposed to have. Check
-                                                        // i2eGoodMap vs i2eChannelMap for details.
-#define I2EE_BAD_IRQ    13      // Someone specified an unsupported IRQ
-#define I2EE_NOCHANNELS 14      // No channel structures have been defined (for
-                                                        // functions requiring this).
-
-// i2eFifoStyle
-//
-#define FIFO_II   0  /* IntelliPort-II style: see also i2hw.h */
-#define FIFO_IIEX 1  /* IntelliPort-IIEX style */
-
-// i2eGetMail
-//
-#define NO_MAIL_HERE    0x1111  // Since mail is unsigned char, cannot possibly
-                                                                // promote to 0x1111.
-// i2eState
-//
-#define II_STATE_COLD      0  // Addresses have been defined, but board not even
-                                                          // reset yet.
-#define II_STATE_RESET     1  // Board,if it exists, has just been reset
-#define II_STATE_READY     2  // Board ready for its first block
-#define II_STATE_LOADING   3  // Board continuing load
-#define II_STATE_LOADED    4  // Board has finished load: status ok
-#define II_STATE_BADLOAD   5  // Board has finished load: failed!
-#define II_STATE_STDLOADED 6  // Board has finished load: standard firmware
-
-// i2eUsingIrq
-//
-#define I2_IRQ_UNDEFINED        0x1352  /* No valid irq (or polling = 0) can
-                                         * ever promote to this! */
-//------------------------------------------
-// Handy Macros for i2ellis.c and others
-// Note these are common to -II and -IIEX
-//------------------------------------------
-
-// Given a pointer to the board structure, does the input FIFO have any data or
-// not?
-//
-#define I2_HAS_INPUT(pB)        !(inb(pB->i2eStatus) & ST_IN_EMPTY)
-
-// Given a pointer to the board structure, is there anything in the incoming
-// mailbox?
-//
-#define I2_HAS_MAIL(pB)         (inb(pB->i2eStatus) & ST_IN_MAIL)
-
-#define I2_UPDATE_FIFO_ROOM(pB) ((pB)->i2eFifoRemains = (pB)->i2eFifoSize)
-
-//------------------------------------------
-// Function Declarations for i2ellis.c
-//------------------------------------------
-//
-// Functions called directly
-//
-// Initialization of a board & structure is in four (five!) parts:
-//
-// 1) iiSetAddress() - Define the board address & delay function for a board.
-// 2) iiReset()      - Reset the board   (provided it exists)
-//       -- Note you may do this to several boards --
-// 3) iiResetDelay() - Delay for 2 seconds (once for all boards)
-// 4) iiInitialize() - Attempt to read Power-up message; further initialize
-//                     accelerators
-//
-// Then you may use iiDownloadAll() or iiDownloadFile() (in i2file.c) to write
-// loadware.  To change loadware, you must begin again with step 2, resetting
-// the board again (step 1 not needed).
-
-static int iiSetAddress(i2eBordStrPtr, int, delayFunc_t );
-static int iiReset(i2eBordStrPtr);
-static int iiResetDelay(i2eBordStrPtr);
-static int iiInitialize(i2eBordStrPtr);
-
-// Routine to validate that all channels expected are there.
-//
-extern int iiValidateChannels(i2eBordStrPtr);
-
-// Routine used to download a block of loadware.
-//
-static int iiDownloadBlock(i2eBordStrPtr, loadHdrStrPtr, int);
-
-// Return values given by iiDownloadBlock, iiDownloadAll, iiDownloadFile:
-//
-#define II_DOWN_BADVALID   0    // board structure is invalid
-#define II_DOWN_CONTINUING 1    // So far, so good, firmware expects more
-#define II_DOWN_GOOD       2    // Download complete, CRC good
-#define II_DOWN_BAD        3    // Download complete, but CRC bad
-#define II_DOWN_BADFILE    4    // Bad magic number in loadware file
-#define II_DOWN_BADSTATE   5    // Board is in an inappropriate state for
-                                                                // downloading loadware. (see i2eState)
-#define II_DOWN_TIMEOUT    6    // Timeout waiting for firmware
-#define II_DOWN_OVER       7    // Too much data
-#define II_DOWN_UNDER      8    // Not enough data
-#define II_DOWN_NOFILE     9    // Loadware file not found
-
-// Routine to download an entire loadware module: Return values are a subset of
-// iiDownloadBlock's, excluding, of course, II_DOWN_CONTINUING
-//
-static int iiDownloadAll(i2eBordStrPtr, loadHdrStrPtr, int, int);
-
-// Many functions defined here return True if good, False otherwise, with an
-// error code in i2eError field. Here is a handy macro for setting the error
-// code and returning.
-//
-#define I2_COMPLETE(pB,code) do { \
-                 pB->i2eError = code; \
-                 return (code == I2EE_GOOD);\
-        } while (0)
-
-#endif   // I2ELLIS_H
diff --git a/drivers/char/ip2/i2hw.h b/drivers/char/ip2/i2hw.h
deleted file mode 100644
index c0ba6c05f0cd..000000000000
--- a/drivers/char/ip2/i2hw.h
+++ /dev/null
@@ -1,652 +0,0 @@
-/*******************************************************************************
-*
-*   (c) 1999 by Computone Corporation
-*
-********************************************************************************
-*
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort II family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: Definitions limited to properties of the hardware or the
-*                bootstrap firmware. As such, they are applicable regardless of
-*                operating system or loadware (standard or diagnostic).
-*
-*******************************************************************************/
-#ifndef I2HW_H
-#define I2HW_H 1
-//------------------------------------------------------------------------------
-// Revision History:
-//
-// 23 September 1991 MAG   First Draft Started...through...
-// 11 October 1991   ...   Continuing development...
-//  6 August 1993          Added support for ISA-4 (asic) which is architected
-//                         as an ISA-CEX with a single 4-port box.
-//
-// 20 December 1996  AKM   Version for Linux
-//
-//------------------------------------------------------------------------------
-/*------------------------------------------------------------------------------
-
-HARDWARE DESCRIPTION:
-
-Introduction:
-
-The IntelliPort-II and IntelliPort-IIEX products occupy a block of eight (8)
-addresses in the host's I/O space.
-
-Some addresses are used to transfer data to/from the board, some to transfer
-so-called "mailbox" messages, and some to read bit-mapped status information.
-While all the products in the line are functionally similar, some use a 16-bit
-data path to transfer data while others use an 8-bit path. Also, the use of
-command /status/mailbox registers differs slightly between the II and IIEX
-branches of the family.
-
-The host determines what type of board it is dealing with by reading a string of
-sixteen characters from the board. These characters are always placed in the
-fifo by the board's local processor whenever the board is reset (either from
-power-on or under software control) and are known as the "Power-on Reset
-Message." In order that this message can be read from either type of board, the
-hardware registers used in reading this message are the same. Once this message
-has been read by the host, then it has the information required to operate.
-
-General Differences between boards:
-
-The greatest structural difference is between the -II and -IIEX families of
-product. The -II boards use the Am4701 dual 512x8 bidirectional fifo to support
-the data path, mailbox registers, and status registers. This chip contains some
-features which are not used in the IntelliPort-II products; a description of
-these is omitted here. Because of these many features, it contains many
-registers, too many to access directly within a small address space. They are
-accessed by first writing a value to a "pointer" register. This value selects
-the register to be accessed.  The next read or write to that address accesses
-the selected register rather than the pointer register.
-
-The -IIEX boards use a proprietary design similar to the Am4701 in function. But
-because of a simpler, more streamlined design it doesn't require so many
-registers. This means they can be accessed directly in single operations rather
-than through a pointer register.
-
-Besides these differences, there are differences in whether 8-bit or 16-bit
-transfers are used to move data to the board.
-
-The -II boards are capable only of 8-bit data transfers, while the -IIEX boards
-may be configured for either 8-bit or 16-bit data transfers. If the on-board DIP
-switch #8 is ON, and the card has been installed in a 16-bit slot, 16-bit
-transfers are supported (and will be expected by the standard loadware). The
-on-board firmware can determine the position of the switch, and whether the
-board is installed in a 16-bit slot; it supplies this information to the host as
-part of the power-up reset message.
-
-The configuration switch (#8) and slot selection do not directly configure the
-hardware. It is up to the on-board loadware and host-based drivers to act
-according to the selected options. That is, loadware and drivers could be
-written to perform 8-bit transfers regardless of the state of the DIP switch or
-slot (and in a diagnostic environment might well do so). Likewise, 16-bit
-transfers could be performed as long as the card is in a 16-bit slot.
-
-Note the slot selection and DIP switch selection are provided separately: a
-board running in 8-bit mode in a 16-bit slot has a greater range of possible
-interrupts to choose from; information of potential use to the host.
-
-All 8-bit data transfers are done in the same way, regardless of whether on a
--II board or a -IIEX board.
-
-The host must consider two things then: 1) whether a -II or -IIEX product is
-being used, and 2) whether an 8-bit or 16-bit data path is used.
-
-A further difference is that -II boards always have a 512-byte fifo operating in
-each direction. -IIEX boards may use fifos of varying size; this size is
-reported as part of the power-up message.
-
-I/O Map Of IntelliPort-II and IntelliPort-IIEX boards:
-(Relative to the chosen base address)
-
-Addr  R/W      IntelliPort-II    IntelliPort-IIEX
-----  ---      --------------    ----------------
-0     R/W      Data Port (byte)  Data Port (byte or word)
-1     R/W      (Not used)        (MSB of word-wide data written to Data Port)
-2     R        Status Register   Status Register
-2     W        Pointer Register  Interrupt Mask Register
-3     R/W      (Not used)        Mailbox Registers (6 bits: 11111100)
-4,5   --       Reserved for future products
-6     --       Reserved for future products
-7     R        Guaranteed to have no effect
-7     W        Hardware reset of board.
-
-
-Rules:
-All data transfers are performed using the even i/o address. If byte-wide data
-transfers are being used, do INB/OUTB operations on the data port. If word-wide
-transfers are used, do INW/OUTW operations. In some circumstances (such as
-reading the power-up message) you will do INB from the data port, but in this
-case the MSB of each word read is lost. When accessing all other unreserved
-registers, use byte operations only.
-------------------------------------------------------------------------------*/
-
-//------------------------------------------------
-// Mandatory Includes:
-//------------------------------------------------
-//
-#include "ip2types.h"
-
-//-------------------------------------------------------------------------
-// Manifests for the I/O map:
-//-------------------------------------------------------------------------
-// R/W: Data port (byte) for IntelliPort-II,
-// R/W: Data port (byte or word) for IntelliPort-IIEX
-// Incoming or outgoing data passes through a FIFO, the status of which is
-// available in some of the bits in FIFO_STATUS. This (bidirectional) FIFO is
-// the primary means of transferring data, commands, flow-control, and status
-// information between the host and board.
-//
-#define FIFO_DATA 0
-
-// Another way of passing information between the board and the host is
-// through "mailboxes". Unlike a FIFO, a mailbox holds only a single byte of
-// data.  Writing data to the mailbox causes a status bit to be set, and
-// potentially interrupting the intended receiver. The sender has some way to
-// determine whether the data has been read yet; as soon as it has, it may send
-// more. The mailboxes are handled differently on -II and -IIEX products, as
-// suggested below.
-//------------------------------------------------------------------------------
-// Read: Status Register for IntelliPort-II or -IIEX
-// The presence of any bit set here will cause an interrupt to the host,
-// provided the corresponding bit has been unmasked in the interrupt mask
-// register. Furthermore, interrupts to the host are disabled globally until the
-// loadware selects the irq line to use. With the exception of STN_MR, the bits
-// remain set so long as the associated condition is true.
-//
-#define FIFO_STATUS 2
-
-// Bit map of status bits which are identical for -II and -IIEX
-//
-#define ST_OUT_FULL  0x40  // Outbound FIFO full
-#define ST_IN_EMPTY  0x20  // Inbound FIFO empty
-#define ST_IN_MAIL   0x04  // Inbound Mailbox full
-
-// The following exists only on the Intelliport-IIEX, and indicates that the
-// board has not read the last outgoing mailbox data yet. In the IntelliPort-II,
-// the outgoing mailbox may be read back: a zero indicates the board has read
-// the data.
-//
-#define STE_OUT_MAIL 0x80  // Outbound mailbox full (!)
-
-// The following bits are defined differently for -II and -IIEX boards. Code
-// which relies on these bits will need to be functionally different for the two
-// types of boards and should be generally avoided because of the additional
-// complexity this creates:
-
-// Bit map of status bits only on -II
-
-// Fifo has been RESET (cleared when the status register is read). Note that
-// this condition cannot be masked and would always interrupt the host, except
-// that the hardware reset also disables interrupts globally from the board
-// until re-enabled by loadware. This could also arise from the
-// Am4701-supported command to reset the chip, but this command is generally not
-// used here.
-//
-#define STN_MR       0x80
-
-// See the AMD Am4701 data sheet for details on the following four bits. They
-// are not presently used by Computone drivers.
-//
-#define STN_OUT_AF  0x10  // Outbound FIFO almost full (programmable)
-#define STN_IN_AE   0x08  // Inbound FIFO almost empty (programmable)
-#define STN_BD      0x02  // Inbound byte detected
-#define STN_PE      0x01  // Parity/Framing condition detected
-
-// Bit-map of status bits only on -IIEX
-//
-#define STE_OUT_HF  0x10  // Outbound FIFO half full
-#define STE_IN_HF   0x08  // Inbound FIFO half full
-#define STE_IN_FULL 0x02  // Inbound FIFO full
-#define STE_OUT_MT  0x01  // Outbound FIFO empty
-
-//------------------------------------------------------------------------------
-
-// Intelliport-II -- Write Only: the pointer register.
-// Values are written to this register to select the Am4701 internal register to
-// be accessed on the next operation.
-//
-#define FIFO_PTR    0x02
-
-// Values for the pointer register
-//
-#define SEL_COMMAND 0x1    // Selects the Am4701 command register
-
-// Some possible commands:
-//
-#define SEL_CMD_MR  0x80        // Am4701 command to reset the chip
-#define SEL_CMD_SH  0x40        // Am4701 command to map the "other" port into the
-                                                        // status register.
-#define SEL_CMD_UNSH   0        // Am4701 command to "unshift": port maps into its
-                                                        // own status register.
-#define SEL_MASK     0x2        // Selects the Am4701 interrupt mask register. The
-                                                        // interrupt mask register is bit-mapped to match 
-                                                        // the status register (FIFO_STATUS) except for
-                                                        // STN_MR. (See above.)
-#define SEL_BYTE_DET 0x3        // Selects the Am4701 byte-detect register. (Not
-                                                        // normally used except in diagnostics.)
-#define SEL_OUTMAIL  0x4        // Selects the outbound mailbox (R/W). Reading back
-                                                        // a value of zero indicates that the mailbox has
-                                                        // been read by the board and is available for more
-                                                        // data./ Writing to the mailbox optionally
-                                                        // interrupts the board, depending on the loadware's
-                                                        // setting of its interrupt mask register.
-#define SEL_AEAF     0x5        // Selects AE/AF threshold register.
-#define SEL_INMAIL   0x6        // Selects the inbound mailbox (Read)
-
-//------------------------------------------------------------------------------
-// IntelliPort-IIEX --  Write Only: interrupt mask (and misc flags) register:
-// Unlike IntelliPort-II, bit assignments do NOT match those of the status
-// register.
-//
-#define FIFO_MASK    0x2
-
-// Mailbox readback select:
-// If set, reads to FIFO_MAIL will read the OUTBOUND mailbox (host to board). If
-// clear (default on reset) reads to FIFO_MAIL will read the INBOUND mailbox.
-// This is the normal situation. The clearing of a mailbox is determined on
-// -IIEX boards by waiting for the STE_OUT_MAIL bit to clear. Readback
-// capability is provided for diagnostic purposes only.
-//
-#define  MX_OUTMAIL_RSEL   0x80
-
-#define  MX_IN_MAIL  0x40       // Enables interrupts when incoming mailbox goes
-                                                        // full (ST_IN_MAIL set).
-#define  MX_IN_FULL  0x20       // Enables interrupts when incoming FIFO goes full
-                                                        // (STE_IN_FULL).
-#define  MX_IN_MT    0x08       // Enables interrupts when incoming FIFO goes empty
-                                                        // (ST_IN_MT).
-#define  MX_OUT_FULL 0x04       // Enables interrupts when outgoing FIFO goes full
-                                                        // (ST_OUT_FULL).
-#define  MX_OUT_MT   0x01       // Enables interrupts when outgoing FIFO goes empty
-                                                        // (STE_OUT_MT).
-
-// Any remaining bits are reserved, and should be written to ZERO for
-// compatibility with future Computone products.
-
-//------------------------------------------------------------------------------
-// IntelliPort-IIEX: -- These are only 6-bit mailboxes !!! -- 11111100 (low two
-// bits always read back 0).
-// Read:  One of the mailboxes, usually Inbound.
-//        Inbound Mailbox (MX_OUTMAIL_RSEL = 0)
-//        Outbound Mailbox (MX_OUTMAIL_RSEL = 1)
-// Write: Outbound Mailbox
-// For the IntelliPort-II boards, the outbound mailbox is read back to determine
-// whether the board has read the data (0 --> data has been read). For the
-// IntelliPort-IIEX, this is done by reading a status register. To determine
-// whether mailbox is available for more outbound data, use the STE_OUT_MAIL bit
-// in FIFO_STATUS. Moreover, although the Outbound Mailbox can be read back by
-// setting MX_OUTMAIL_RSEL, it is NOT cleared when the board reads it, as is the
-// case with the -II boards. For this reason, FIFO_MAIL is normally used to read
-// the inbound FIFO, and MX_OUTMAIL_RSEL kept clear. (See above for
-// MX_OUTMAIL_RSEL description.)
-//
-#define  FIFO_MAIL   0x3
-
-//------------------------------------------------------------------------------
-// WRITE ONLY:  Resets the board. (Data doesn't matter).
-//
-#define  FIFO_RESET  0x7
-
-//------------------------------------------------------------------------------
-// READ ONLY:  Will have no effect. (Data is undefined.)
-// Actually, there will be an effect, in that the operation is sure to generate
-// a bus cycle: viz., an I/O byte Read. This fact can be used to enforce short
-// delays when no comparable time constant is available.
-//
-#define  FIFO_NOP    0x7
-
-//------------------------------------------------------------------------------
-// RESET & POWER-ON RESET MESSAGE
-/*------------------------------------------------------------------------------
-RESET:
-
-The IntelliPort-II and -IIEX boards are reset in three ways: Power-up, channel
-reset, and via a write to the reset register described above. For products using
-the ISA bus, these three sources of reset are equvalent. For MCA and EISA buses,
-the Power-up and channel reset sources cause additional hardware initialization
-which should only occur at system startup time.
-
-The third type of reset, called a "command reset", is done by writing any data
-to the FIFO_RESET address described above. This resets the on-board processor,
-FIFO, UARTS, and associated hardware.
-
-This passes control of the board to the bootstrap firmware, which performs a
-Power-On Self Test and which detects its current configuration. For example,
--IIEX products determine the size of FIFO which has been installed, and the
-number and type of expansion boxes attached.
-
-This and other information is then written to the FIFO in a 16-byte data block
-to be read by the host. This block is guaranteed to be present within two (2)
-seconds of having received the command reset. The firmware is now ready to
-receive loadware from the host.
-
-It is good practice to perform a command reset to the board explicitly as part
-of your software initialization.  This allows your code to properly restart from
-a soft boot. (Many systems do not issue channel reset on soft boot).
-
-Because of a hardware reset problem on some of the Cirrus Logic 1400's which are
-used on the product, it is recommended that you reset the board twice, separated
-by an approximately 50 milliseconds delay. (VERY approximately: probably ok to
-be off by a factor of five. The important point is that the first command reset
-in fact generates a reset pulse on the board. This pulse is guaranteed to last
-less than 10 milliseconds. The additional delay ensures the 1400 has had the
-chance to respond sufficiently to the first reset. Why not a longer delay? Much
-more than 50 milliseconds gets to be noticable, but the board would still work.
-
-Once all 16 bytes of the Power-on Reset Message have been read, the bootstrap
-firmware is ready to receive loadware.
-
-Note on Power-on Reset Message format:
-The various fields have been designed with future expansion in view.
-Combinations of bitfields and values have been defined which define products
-which may not currently exist. This has been done to allow drivers to anticipate
-the possible introduction of products in a systematic fashion. This is not
-intended to suggest that each potential product is actually under consideration.
-------------------------------------------------------------------------------*/
-
-//----------------------------------------
-// Format of Power-on Reset Message
-//----------------------------------------
-
-typedef union _porStr           // "por" stands for Power On Reset
-{
-        unsigned char  c[16];   // array used when considering the message as a
-                                                        // string of undifferentiated characters
-
-        struct                                  // Elements used when considering values
-        {
-                // The first two bytes out of the FIFO are two magic numbers. These are
-                // intended to establish that there is indeed a member of the
-                // IntelliPort-II(EX) family present. The remaining bytes may be 
-                // expected // to be valid. When reading the Power-on Reset message, 
-                // if the magic numbers do not match it is probably best to stop
-                // reading immediately. You are certainly not reading our board (unless
-                // hardware is faulty), and may in fact be reading some other piece of
-                // hardware.
-
-                unsigned char porMagic1;   // magic number: first byte == POR_MAGIC_1 
-                unsigned char porMagic2;   // magic number: second byte == POR_MAGIC_2 
-
-                // The Version, Revision, and Subrevision are stored as absolute numbers
-                // and would normally be displayed in the format V.R.S (e.g. 1.0.2)
-
-                unsigned char porVersion;  // Bootstrap firmware version number
-                unsigned char porRevision; // Bootstrap firmware revision number
-                unsigned char porSubRev;   // Bootstrap firmware sub-revision number
-
-                unsigned char porID;    // Product ID:  Bit-mapped according to
-                                                                // conventions described below. Among other
-                                                                // things, this allows us to distinguish
-                                                                // IntelliPort-II boards from IntelliPort-IIEX
-                                                                // boards.
-
-                unsigned char porBus;   // IntelliPort-II: Unused
-                                                                // IntelliPort-IIEX: Bus Information:
-                                                                // Bit-mapped below
-
-                unsigned char porMemory;        // On-board DRAM size: in 32k blocks
-
-                // porPorts1 (and porPorts2) are used to determine the ports which are
-                // available to the board. For non-expandable product, a single number 
-                // is sufficient. For expandable product, the board may be connected
-                // to as many as four boxes. Each box may be (so far) either a 16-port
-                // or an 8-port size. Whenever an 8-port box is used, the remaining 8
-                // ports leave gaps between existing channels. For that reason,
-                // expandable products must report a MAP of available channels. Since 
-                // each UART supports four ports, we represent each UART found by a
-                // single bit. Using two bytes to supply the mapping information we
-                // report the presense or absense of up to 16 UARTS, or 64 ports in
-                // steps of 4 ports. For -IIEX products, the ports are numbered
-                // starting at the box closest to the controller in the "chain".
-
-                // Interpreted Differently for IntelliPort-II and -IIEX.
-                // -II:   Number of ports (Derived actually from product ID). See
-                // Diag1&2 to indicate if uart was actually detected.
-                // -IIEX: Bit-map of UARTS found, LSB (see below for MSB of this). This
-                //        bitmap is based on detecting the uarts themselves; 
-                //        see porFlags for information from the box i.d's.
-                unsigned char  porPorts1;
-
-                unsigned char  porDiag1;        // Results of on-board P.O.S.T, 1st byte
-                unsigned char  porDiag2;        // Results of on-board P.O.S.T, 2nd byte
-                unsigned char  porSpeed;        // Speed of local CPU: given as MHz x10
-                                                                        // e.g., 16.0 MHz CPU is reported as 160
-                unsigned char  porFlags;        // Misc information (see manifests below)
-                                                                        // Bit-mapped: CPU type, UART's present
-
-                unsigned char  porPorts2;       // -II:  Undefined
-                                                                        // -IIEX: Bit-map of UARTS found, MSB (see
-                                                                        //        above for LSB)
-
-                // IntelliPort-II: undefined
-                // IntelliPort-IIEX: 1 << porFifoSize gives the size, in bytes, of the
-                // host interface FIFO, in each direction. When running the -IIEX in
-                // 8-bit mode, fifo capacity is halved. The bootstrap firmware will
-                // have already accounted for this fact in generating this number.
-                unsigned char  porFifoSize;
-
-                // IntelliPort-II: undefined
-                // IntelliPort-IIEX: The number of boxes connected. (Presently 1-4)
-                unsigned char  porNumBoxes;
-        } e;
-} porStr, *porStrPtr;
-
-//--------------------------
-// Values for porStr fields
-//--------------------------
-
-//---------------------
-// porMagic1, porMagic2
-//----------------------
-//
-#define  POR_MAGIC_1    0x96  // The only valid value for porMagic1
-#define  POR_MAGIC_2    0x35  // The only valid value for porMagic2
-#define  POR_1_INDEX    0     // Byte position of POR_MAGIC_1
-#define  POR_2_INDEX    1     // Ditto for POR_MAGIC_2
-
-//----------------------
-// porID
-//----------------------
-//
-#define  POR_ID_FAMILY  0xc0    // These bits indicate the general family of
-                                                                // product.
-#define  POR_ID_FII     0x00    // Family is "IntelliPort-II"
-#define  POR_ID_FIIEX   0x40    // Family is "IntelliPort-IIEX"
-
-// These bits are reserved, presently zero. May be used at a later date to
-// convey other product information.
-//
-#define POR_ID_RESERVED 0x3c
-
-#define POR_ID_SIZE     0x03    // Remaining bits indicate number of ports &
-                                                                // Connector information.
-#define POR_ID_II_8     0x00    // For IntelliPort-II, indicates 8-port using
-                                                                // standard brick.
-#define POR_ID_II_8R    0x01    // For IntelliPort-II, indicates 8-port using
-                                                                // RJ11's (no CTS)
-#define POR_ID_II_6     0x02    // For IntelliPort-II, indicates 6-port using
-                                                                // RJ45's
-#define POR_ID_II_4     0x03    // For IntelliPort-II, indicates 4-port using
-                                                                // 4xRJ45 connectors
-#define POR_ID_EX       0x00    // For IntelliPort-IIEX, indicates standard
-                                                                // expandable controller (other values reserved)
-
-//----------------------
-// porBus
-//----------------------
-
-// IntelliPort-IIEX only: Board is installed in a 16-bit slot
-//
-#define POR_BUS_SLOT16  0x20
-
-// IntelliPort-IIEX only: DIP switch #8 is on, selecting 16-bit host interface
-// operation.
-// 
-#define POR_BUS_DIP16   0x10
-
-// Bits 0-2 indicate type of bus: This information is stored in the bootstrap
-// loadware, different loadware being used on different products for different
-// buses. For most situations, the drivers do not need this information; but it
-// is handy in a diagnostic environment. For example, on microchannel boards,
-// you would not want to try to test several interrupts, only the one for which
-// you were configured.
-//
-#define  POR_BUS_TYPE   0x07
-
-// Unknown:  this product doesn't know what bus it is running in. (e.g. if same
-// bootstrap firmware were wanted for two different buses.)
-//
-#define  POR_BUS_T_UNK  0
-
-// Note: existing firmware for ISA-8 and MC-8 currently report the POR_BUS_T_UNK
-// state, since the same bootstrap firmware is used for each.
-
-#define  POR_BUS_T_MCA  1  // MCA BUS */
-#define  POR_BUS_T_EISA 2  // EISA BUS */
-#define  POR_BUS_T_ISA  3  // ISA BUS */
-
-// Values 4-7 Reserved
-
-// Remaining bits are reserved
-
-//----------------------
-// porDiag1
-//----------------------
-
-#define  POR_BAD_MAPPER 0x80    // HW failure on P.O.S.T: Chip mapper failed
-
-// These two bits valid only for the IntelliPort-II
-//
-#define  POR_BAD_UART1  0x01    // First  1400 bad
-#define  POR_BAD_UART2  0x02    // Second 1400 bad
-
-//----------------------
-// porDiag2
-//----------------------
-
-#define  POR_DEBUG_PORT 0x80    // debug port was detected by the P.O.S.T
-#define  POR_DIAG_OK    0x00    // Indicates passage: Failure codes not yet
-                                                                // available.
-                                                                // Other bits undefined.
-//----------------------
-// porFlags
-//----------------------
-
-#define  POR_CPU     0x03       // These bits indicate supposed CPU type
-#define  POR_CPU_8   0x01       // Board uses an 80188 (no such thing yet)
-#define  POR_CPU_6   0x02       // Board uses an 80186 (all existing products)
-#define  POR_CEX4    0x04       // If set, this is an ISA-CEX/4: An ISA-4 (asic)
-                                                        // which is architected like an ISA-CEX connected
-                                                        // to a (hitherto impossible) 4-port box.
-#define POR_BOXES    0xf0       // Valid for IntelliPort-IIEX only: Map of Box
-                                                        // sizes based on box I.D.
-#define POR_BOX_16   0x10       // Set indicates 16-port, clear 8-port
-
-//-------------------------------------
-// LOADWARE and DOWNLOADING CODE
-//-------------------------------------
-
-/*
-Loadware may be sent to the board in two ways:
-1) It may be read from a (binary image) data file block by block as each block
-        is sent to the board. This is only possible when the initialization is
-        performed by code which can access your file system. This is most suitable
-        for diagnostics and appications which use the interface library directly.
-
-2) It may be hard-coded into your source by including a .h file (typically
-        supplied by Computone), which declares a data array and initializes every
-        element. This achieves the same result as if an entire loadware file had 
-        been read into the array.
-
-        This requires more data space in your program, but access to the file system
-        is not required. This method is more suited to driver code, which typically
-        is running at a level too low to access the file system directly.
-
-At present, loadware can only be generated at Computone.
-
-All Loadware begins with a header area which has a particular format. This
-includes a magic number which identifies the file as being (purportedly)
-loadware, CRC (for the loader), and version information.
-*/
-
-
-//-----------------------------------------------------------------------------
-// Format of loadware block
-//
-// This is defined as a union so we can pass a pointer to one of these items
-// and (if it is the first block) pick out the version information, etc.
-//
-// Otherwise, to deal with this as a simple character array
-//------------------------------------------------------------------------------
-
-#define LOADWARE_BLOCK_SIZE   512   // Number of bytes in each block of loadware
-
-typedef union _loadHdrStr
-{
-        unsigned char c[LOADWARE_BLOCK_SIZE];  // Valid for every block
-
-        struct  // These fields are valid for only the first block of loadware.
-        {
-                unsigned char loadMagic;                // Magic number: see below
-                unsigned char loadBlocksMore;   // How many more blocks?
-                unsigned char loadCRC[2];               // Two CRC bytes: used by loader
-                unsigned char loadVersion;              // Version number
-                unsigned char loadRevision;             // Revision number
-                unsigned char loadSubRevision;  // Sub-revision number
-                unsigned char loadSpares[9];    // Presently unused
-                unsigned char loadDates[32];    // Null-terminated string which can give
-                                                                                // date and time of compilation
-        } e;
-} loadHdrStr, *loadHdrStrPtr;
-
-//------------------------------------
-// Defines for downloading code:
-//------------------------------------
-
-// The loadMagic field in the first block of the loadfile must be this, else the
-// file is not valid.
-//
-#define  MAGIC_LOADFILE 0x3c
-
-// How do we know the load was successful? On completion of the load, the
-// bootstrap firmware returns a code to indicate whether it thought the download
-// was valid and intends to execute it. These are the only possible valid codes:
-//
-#define  LOADWARE_OK    0xc3        // Download was ok
-#define  LOADWARE_BAD   0x5a        // Download was bad (CRC error)
-
-// Constants applicable to writing blocks of loadware:
-// The first block of loadware might take 600 mS to load, in extreme cases.
-// (Expandable board: worst case for sending startup messages to the LCD's).
-// The 600mS figure is not really a calculation, but a conservative
-// guess/guarantee. Usually this will be within 100 mS, like subsequent blocks.
-//
-#define  MAX_DLOAD_START_TIME 1000  // 1000 mS
-#define  MAX_DLOAD_READ_TIME  100   // 100 mS
-
-// Firmware should respond with status (see above) within this long of host
-// having sent the final block.
-//
-#define  MAX_DLOAD_ACK_TIME   100   // 100 mS, again!
-
-//------------------------------------------------------
-// MAXIMUM NUMBER OF PORTS PER BOARD:
-// This is fixed for now (with the expandable), but may
-// be expanding according to even newer products.
-//------------------------------------------------------
-//
-#define ABS_MAX_BOXES   4     // Absolute most boxes per board
-#define ABS_BIGGEST_BOX 16    // Absolute the most ports per box
-#define ABS_MOST_PORTS  (ABS_MAX_BOXES * ABS_BIGGEST_BOX)
-
-#define I2_OUTSW(port, addr, count)     outsw((port), (addr), (((count)+1)/2))
-#define I2_OUTSB(port, addr, count)     outsb((port), (addr), (((count)+1))&-2)
-#define I2_INSW(port, addr, count)      insw((port), (addr), (((count)+1)/2))
-#define I2_INSB(port, addr, count)      insb((port), (addr), (((count)+1))&-2)
-
-#endif   // I2HW_H
-
diff --git a/drivers/char/ip2/i2lib.c b/drivers/char/ip2/i2lib.c
deleted file mode 100644
index 0d10b89218ed..000000000000
--- a/drivers/char/ip2/i2lib.c
+++ /dev/null
@@ -1,2214 +0,0 @@
-/*******************************************************************************
-*
-*   (c) 1999 by Computone Corporation
-*
-********************************************************************************
-*
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: High-level interface code for the device driver. Uses the
-*                Extremely Low Level Interface Support (i2ellis.c). Provides an
-*                interface to the standard loadware, to support drivers or
-*                application code. (This is included source code, not a separate
-*                compilation module.)
-*
-*******************************************************************************/
-//------------------------------------------------------------------------------
-// Note on Strategy:
-// Once the board has been initialized, it will interrupt us when:
-// 1) It has something in the fifo for us to read (incoming data, flow control
-// packets, or whatever).
-// 2) It has stripped whatever we have sent last time in the FIFO (and
-// consequently is ready for more).
-//
-// Note also that the buffer sizes declared in i2lib.h are VERY SMALL. This
-// worsens performance considerably, but is done so that a great many channels
-// might use only a little memory.
-//------------------------------------------------------------------------------
-
-//------------------------------------------------------------------------------
-// Revision History:
-//
-// 0.00 -  4/16/91 --- First Draft
-// 0.01 -  4/29/91 --- 1st beta release
-// 0.02 -  6/14/91 --- Changes to allow small model compilation
-// 0.03 -  6/17/91 MAG Break reporting protected from interrupts routines with
-//                     in-line asm added for moving data to/from ring buffers,
-//                     replacing a variety of methods used previously.
-// 0.04 -  6/21/91 MAG Initial flow-control packets not queued until
-//                     i2_enable_interrupts time. Former versions would enqueue
-//                     them at i2_init_channel time, before we knew how many
-//                     channels were supposed to exist!
-// 0.05 - 10/12/91 MAG Major changes: works through the ellis.c routines now;
-//                     supports new 16-bit protocol and expandable boards.
-//      - 10/24/91 MAG Most changes in place and stable.
-// 0.06 -  2/20/92 MAG Format of CMD_HOTACK corrected: the command takes no
-//                     argument.
-// 0.07 -- 3/11/92 MAG Support added to store special packet types at interrupt
-//                     level (mostly responses to specific commands.)
-// 0.08 -- 3/30/92 MAG Support added for STAT_MODEM packet
-// 0.09 -- 6/24/93 MAG i2Link... needed to update number of boards BEFORE
-//                     turning on the interrupt.
-// 0.10 -- 6/25/93 MAG To avoid gruesome death from a bad board, we sanity check
-//                     some incoming.
-//
-// 1.1  - 12/25/96 AKM Linux version.
-//      - 10/09/98 DMC Revised Linux version.
-//------------------------------------------------------------------------------
-
-//************
-//* Includes *
-//************
-
-#include <linux/sched.h>
-#include "i2lib.h"
-
-
-//***********************
-//* Function Prototypes *
-//***********************
-static void i2QueueNeeds(i2eBordStrPtr, i2ChanStrPtr, int);
-static i2ChanStrPtr i2DeQueueNeeds(i2eBordStrPtr, int );
-static void i2StripFifo(i2eBordStrPtr);
-static void i2StuffFifoBypass(i2eBordStrPtr);
-static void i2StuffFifoFlow(i2eBordStrPtr);
-static void i2StuffFifoInline(i2eBordStrPtr);
-static int i2RetryFlushOutput(i2ChanStrPtr);
-
-// Not a documented part of the library routines (careful...) but the Diagnostic
-// i2diag.c finds them useful to help the throughput in certain limited
-// single-threaded operations.
-static void iiSendPendingMail(i2eBordStrPtr);
-static void serviceOutgoingFifo(i2eBordStrPtr);
-
-// Functions defined in ip2.c as part of interrupt handling
-static void do_input(struct work_struct *);
-static void do_status(struct work_struct *);
-
-//***************
-//* Debug  Data *
-//***************
-#ifdef DEBUG_FIFO
-
-unsigned char DBGBuf[0x4000];
-unsigned short I = 0;
-
-static void
-WriteDBGBuf(char *s, unsigned char *src, unsigned short n ) 
-{
-        char *p = src;
-
-        // XXX: We need a spin lock here if we ever use this again
-
-        while (*s) {    // copy label
-                DBGBuf[I] = *s++;
-                I = I++ & 0x3fff;
-        }
-        while (n--) {   // copy data
-                DBGBuf[I] = *p++;
-                I = I++ & 0x3fff;
-        }
-}
-
-static void
-fatality(i2eBordStrPtr pB )
-{
-        int i;
-
-        for (i=0;i<sizeof(DBGBuf);i++) {
-                if ((i%16) == 0)
-                        printk("\n%4x:",i);
-                printk("%02x ",DBGBuf[i]);
-        }
-        printk("\n");
-        for (i=0;i<sizeof(DBGBuf);i++) {
-                if ((i%16) == 0)
-                        printk("\n%4x:",i);
-                if (DBGBuf[i] >= ' ' && DBGBuf[i] <= '~') {
-                        printk(" %c ",DBGBuf[i]);
-                } else {
-                        printk(" . ");
-                }
-        }
-        printk("\n");
-        printk("Last index %x\n",I);
-}
-#endif /* DEBUG_FIFO */
-
-//********
-//* Code *
-//********
-
-static inline int
-i2Validate ( i2ChanStrPtr pCh )
-{
-        //ip2trace(pCh->port_index, ITRC_VERIFY,ITRC_ENTER,2,pCh->validity,
-        //      (CHANNEL_MAGIC | CHANNEL_SUPPORT));
-        return ((pCh->validity & (CHANNEL_MAGIC_BITS | CHANNEL_SUPPORT)) 
-                          == (CHANNEL_MAGIC | CHANNEL_SUPPORT));
-}
-
-static void iiSendPendingMail_t(unsigned long data)
-{
-        i2eBordStrPtr pB = (i2eBordStrPtr)data;
-
-        iiSendPendingMail(pB);
-}
-
-//******************************************************************************
-// Function:   iiSendPendingMail(pB)
-// Parameters: Pointer to a board structure
-// Returns:    Nothing
-//
-// Description:
-// If any outgoing mail bits are set and there is outgoing mailbox is empty,
-// send the mail and clear the bits.
-//******************************************************************************
-static void
-iiSendPendingMail(i2eBordStrPtr pB)
-{
-        if (pB->i2eOutMailWaiting && (!pB->i2eWaitingForEmptyFifo) )
-        {
-                if (iiTrySendMail(pB, pB->i2eOutMailWaiting))
-                {
-                        /* If we were already waiting for fifo to empty,
-                         * or just sent MB_OUT_STUFFED, then we are
-                         * still waiting for it to empty, until we should
-                         * receive an MB_IN_STRIPPED from the board.
-                         */
-                        pB->i2eWaitingForEmptyFifo |=
-                                (pB->i2eOutMailWaiting & MB_OUT_STUFFED);
-                        pB->i2eOutMailWaiting = 0;
-                        pB->SendPendingRetry = 0;
-                } else {
-/*              The only time we hit this area is when "iiTrySendMail" has
-                failed.  That only occurs when the outbound mailbox is
-                still busy with the last message.  We take a short breather
-                to let the board catch up with itself and then try again.
-                16 Retries is the limit - then we got a borked board.
-                        /\/\|=mhw=|\/\/                         */
-
-                        if( ++pB->SendPendingRetry < 16 ) {
-                                setup_timer(&pB->SendPendingTimer,
-                                        iiSendPendingMail_t, (unsigned long)pB);
-                                mod_timer(&pB->SendPendingTimer, jiffies + 1);
-                        } else {
-                                printk( KERN_ERR "IP2: iiSendPendingMail unable to queue outbound mail\n" );
-                        }
-                }
-        }
-}
-
-//******************************************************************************
-// Function:   i2InitChannels(pB, nChannels, pCh)
-// Parameters: Pointer to Ellis Board structure
-//             Number of channels to initialize
-//             Pointer to first element in an array of channel structures
-// Returns:    Success or failure
-//
-// Description:
-//
-// This function patches pointers, back-pointers, and initializes all the
-// elements in the channel structure array.
-//
-// This should be run after the board structure is initialized, through having
-// loaded the standard loadware (otherwise it complains).
-//
-// In any case, it must be done before any serious work begins initializing the
-// irq's or sending commands...
-//
-//******************************************************************************
-static int
-i2InitChannels ( i2eBordStrPtr pB, int nChannels, i2ChanStrPtr pCh)
-{
-        int index, stuffIndex;
-        i2ChanStrPtr *ppCh;
-        
-        if (pB->i2eValid != I2E_MAGIC) {
-                I2_COMPLETE(pB, I2EE_BADMAGIC);
-        }
-        if (pB->i2eState != II_STATE_STDLOADED) {
-                I2_COMPLETE(pB, I2EE_BADSTATE);
-        }
-
-        rwlock_init(&pB->read_fifo_spinlock);
-        rwlock_init(&pB->write_fifo_spinlock);
-        rwlock_init(&pB->Dbuf_spinlock);
-        rwlock_init(&pB->Bbuf_spinlock);
-        rwlock_init(&pB->Fbuf_spinlock);
-        
-        // NO LOCK needed yet - this is init
-
-        pB->i2eChannelPtr = pCh;
-        pB->i2eChannelCnt = nChannels;
-
-        pB->i2Fbuf_strip = pB->i2Fbuf_stuff = 0;
-        pB->i2Dbuf_strip = pB->i2Dbuf_stuff = 0;
-        pB->i2Bbuf_strip = pB->i2Bbuf_stuff = 0;
-
-        pB->SendPendingRetry = 0;
-
-        memset ( pCh, 0, sizeof (i2ChanStr) * nChannels );
-
-        for (index = stuffIndex = 0, ppCh = (i2ChanStrPtr *)(pB->i2Fbuf);
-                  nChannels && index < ABS_MOST_PORTS;
-                  index++)
-        {
-                if ( !(pB->i2eChannelMap[index >> 4] & (1 << (index & 0xf)) ) ) {
-                        continue;
-                }
-                rwlock_init(&pCh->Ibuf_spinlock);
-                rwlock_init(&pCh->Obuf_spinlock);
-                rwlock_init(&pCh->Cbuf_spinlock);
-                rwlock_init(&pCh->Pbuf_spinlock);
-                // NO LOCK needed yet - this is init
-                // Set up validity flag according to support level
-                if (pB->i2eGoodMap[index >> 4] & (1 << (index & 0xf)) ) {
-                        pCh->validity = CHANNEL_MAGIC | CHANNEL_SUPPORT;
-                } else {
-                        pCh->validity = CHANNEL_MAGIC;
-                }
-                pCh->pMyBord = pB;      /* Back-pointer */
-
-                // Prepare an outgoing flow-control packet to send as soon as the chance
-                // occurs.
-                if ( pCh->validity & CHANNEL_SUPPORT ) {
-                        pCh->infl.hd.i2sChannel = index;
-                        pCh->infl.hd.i2sCount = 5;
-                        pCh->infl.hd.i2sType = PTYPE_BYPASS;
-                        pCh->infl.fcmd = 37;
-                        pCh->infl.asof = 0;
-                        pCh->infl.room = IBUF_SIZE - 1;
-
-                        pCh->whenSendFlow = (IBUF_SIZE/5)*4; // when 80% full
-
-                // The following is similar to calling i2QueueNeeds, except that this
-                // is done in longhand, since we are setting up initial conditions on
-                // many channels at once.
-                        pCh->channelNeeds = NEED_FLOW;  // Since starting from scratch
-                        pCh->sinceLastFlow = 0;         // No bytes received since last flow
-                                                                                        // control packet was queued
-                        stuffIndex++;
-                        *ppCh++ = pCh;      // List this channel as needing
-                                                                // initial flow control packet sent
-                }
-
-                // Don't allow anything to be sent until the status packets come in from
-                // the board.
-
-                pCh->outfl.asof = 0;
-                pCh->outfl.room = 0;
-
-                // Initialize all the ring buffers
-
-                pCh->Ibuf_stuff = pCh->Ibuf_strip = 0;
-                pCh->Obuf_stuff = pCh->Obuf_strip = 0;
-                pCh->Cbuf_stuff = pCh->Cbuf_strip = 0;
-
-                memset( &pCh->icount, 0, sizeof (struct async_icount) );
-                pCh->hotKeyIn       = HOT_CLEAR;
-                pCh->channelOptions = 0;
-                pCh->bookMarks      = 0;
-                init_waitqueue_head(&pCh->pBookmarkWait);
-
-                init_waitqueue_head(&pCh->open_wait);
-                init_waitqueue_head(&pCh->close_wait);
-                init_waitqueue_head(&pCh->delta_msr_wait);
-
-                // Set base and divisor so default custom rate is 9600
-                pCh->BaudBase    = 921600;      // MAX for ST654, changed after we get
-                pCh->BaudDivisor = 96;          // the boxids (UART types) later
-
-                pCh->dataSetIn   = 0;
-                pCh->dataSetOut  = 0;
-
-                pCh->wopen       = 0;
-                pCh->throttled   = 0;
-
-                pCh->speed       = CBR_9600;
-
-                pCh->flags    = 0;
-
-                pCh->ClosingDelay     = 5*HZ/10;
-                pCh->ClosingWaitTime  = 30*HZ;
-
-                // Initialize task queue objects
-                INIT_WORK(&pCh->tqueue_input, do_input);
-                INIT_WORK(&pCh->tqueue_status, do_status);
-
-#ifdef IP2DEBUG_TRACE
-                pCh->trace = ip2trace;
-#endif
-
-                ++pCh;
-        --nChannels;
-        }
-        // No need to check for wrap here; this is initialization.
-        pB->i2Fbuf_stuff = stuffIndex;
-        I2_COMPLETE(pB, I2EE_GOOD);
-
-}
-
-//******************************************************************************
-// Function:   i2DeQueueNeeds(pB, type)
-// Parameters: Pointer to a board structure
-//             type bit map: may include NEED_INLINE, NEED_BYPASS, or NEED_FLOW
-// Returns:   
-//             Pointer to a channel structure
-//
-// Description: Returns pointer struct of next channel that needs service of
-//  the type specified. Otherwise returns a NULL reference.
-//
-//******************************************************************************
-static i2ChanStrPtr 
-i2DeQueueNeeds(i2eBordStrPtr pB, int type)
-{
-        unsigned short queueIndex;
-        unsigned long flags;
-
-        i2ChanStrPtr pCh = NULL;
-
-        switch(type) {
-
-        case  NEED_INLINE:
-
-                write_lock_irqsave(&pB->Dbuf_spinlock, flags);
-                if ( pB->i2Dbuf_stuff != pB->i2Dbuf_strip)
-                {
-                        queueIndex = pB->i2Dbuf_strip;
-                        pCh = pB->i2Dbuf[queueIndex];
-                        queueIndex++;
-                        if (queueIndex >= CH_QUEUE_SIZE) {
-                                queueIndex = 0;
-                        }
-                        pB->i2Dbuf_strip = queueIndex;
-                        pCh->channelNeeds &= ~NEED_INLINE;
-                }
-                write_unlock_irqrestore(&pB->Dbuf_spinlock, flags);
-                break;
-
-        case NEED_BYPASS:
-
-                write_lock_irqsave(&pB->Bbuf_spinlock, flags);
-                if (pB->i2Bbuf_stuff != pB->i2Bbuf_strip)
-                {
-                        queueIndex = pB->i2Bbuf_strip;
-                        pCh = pB->i2Bbuf[queueIndex];
-                        queueIndex++;
-                        if (queueIndex >= CH_QUEUE_SIZE) {
-                                queueIndex = 0;
-                        }
-                        pB->i2Bbuf_strip = queueIndex;
-                        pCh->channelNeeds &= ~NEED_BYPASS;
-                }
-                write_unlock_irqrestore(&pB->Bbuf_spinlock, flags);
-                break;
-        
-        case NEED_FLOW:
-
-                write_lock_irqsave(&pB->Fbuf_spinlock, flags);
-                if (pB->i2Fbuf_stuff != pB->i2Fbuf_strip)
-                {
-                        queueIndex = pB->i2Fbuf_strip;
-                        pCh = pB->i2Fbuf[queueIndex];
-                        queueIndex++;
-                        if (queueIndex >= CH_QUEUE_SIZE) {
-                                queueIndex = 0;
-                        }
-                        pB->i2Fbuf_strip = queueIndex;
-                        pCh->channelNeeds &= ~NEED_FLOW;
-                }
-                write_unlock_irqrestore(&pB->Fbuf_spinlock, flags);
-                break;
-        default:
-                printk(KERN_ERR "i2DeQueueNeeds called with bad type:%x\n",type);
-                break;
-        }
-        return pCh;
-}
-
-//******************************************************************************
-// Function:   i2QueueNeeds(pB, pCh, type)
-// Parameters: Pointer to a board structure
-//             Pointer to a channel structure
-//             type bit map: may include NEED_INLINE, NEED_BYPASS, or NEED_FLOW
-// Returns:    Nothing
-//
-// Description:
-// For each type of need selected, if the given channel is not already in the
-// queue, adds it, and sets the flag indicating it is in the queue.
-//******************************************************************************
-static void
-i2QueueNeeds(i2eBordStrPtr pB, i2ChanStrPtr pCh, int type)
-{
-        unsigned short queueIndex;
-        unsigned long flags;
-
-        // We turn off all the interrupts during this brief process, since the
-        // interrupt-level code might want to put things on the queue as well.
-
-        switch (type) {
-
-        case NEED_INLINE:
-
-                write_lock_irqsave(&pB->Dbuf_spinlock, flags);
-                if ( !(pCh->channelNeeds & NEED_INLINE) )
-                {
-                        pCh->channelNeeds |= NEED_INLINE;
-                        queueIndex = pB->i2Dbuf_stuff;
-                        pB->i2Dbuf[queueIndex++] = pCh;
-                        if (queueIndex >= CH_QUEUE_SIZE)
-                                queueIndex = 0;
-                        pB->i2Dbuf_stuff = queueIndex;
-                }
-                write_unlock_irqrestore(&pB->Dbuf_spinlock, flags);
-                break;
-
-        case NEED_BYPASS:
-
-                write_lock_irqsave(&pB->Bbuf_spinlock, flags);
-                if ((type & NEED_BYPASS) && !(pCh->channelNeeds & NEED_BYPASS))
-                {
-                        pCh->channelNeeds |= NEED_BYPASS;
-                        queueIndex = pB->i2Bbuf_stuff;
-                        pB->i2Bbuf[queueIndex++] = pCh;
-                        if (queueIndex >= CH_QUEUE_SIZE)
-                                queueIndex = 0;
-                        pB->i2Bbuf_stuff = queueIndex;
-                } 
-                write_unlock_irqrestore(&pB->Bbuf_spinlock, flags);
-                break;
-
-        case NEED_FLOW:
-
-                write_lock_irqsave(&pB->Fbuf_spinlock, flags);
-                if ((type & NEED_FLOW) && !(pCh->channelNeeds & NEED_FLOW))
-                {
-                        pCh->channelNeeds |= NEED_FLOW;
-                        queueIndex = pB->i2Fbuf_stuff;
-                        pB->i2Fbuf[queueIndex++] = pCh;
-                        if (queueIndex >= CH_QUEUE_SIZE)
-                                queueIndex = 0;
-                        pB->i2Fbuf_stuff = queueIndex;
-                }
-                write_unlock_irqrestore(&pB->Fbuf_spinlock, flags);
-                break;
-
-        case NEED_CREDIT:
-                pCh->channelNeeds |= NEED_CREDIT;
-                break;
-        default:
-                printk(KERN_ERR "i2QueueNeeds called with bad type:%x\n",type);
-                break;
-        }
-        return;
-}
-
-//******************************************************************************
-// Function:   i2QueueCommands(type, pCh, timeout, nCommands, pCs,...)
-// Parameters: type - PTYPE_BYPASS or PTYPE_INLINE
-//             pointer to the channel structure
-//             maximum period to wait
-//             number of commands (n)
-//             n commands
-// Returns:    Number of commands sent, or -1 for error
-//
-// get board lock before calling
-//
-// Description:
-// Queues up some commands to be sent to a channel. To send possibly several
-// bypass or inline commands to the given channel. The timeout parameter
-// indicates how many HUNDREDTHS OF SECONDS to wait until there is room:
-// 0 = return immediately if no room, -ive  = wait forever, +ive = number of
-// 1/100 seconds to wait. Return values:
-// -1 Some kind of nasty error: bad channel structure or invalid arguments.
-//  0 No room to send all the commands
-// (+)   Number of commands sent
-//******************************************************************************
-static int
-i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands,
-                                         cmdSyntaxPtr pCs0,...)
-{
-        int totalsize = 0;
-        int blocksize;
-        int lastended;
-        cmdSyntaxPtr *ppCs;
-        cmdSyntaxPtr pCs;
-        int count;
-        int flag;
-        i2eBordStrPtr pB;
-
-        unsigned short maxBlock;
-        unsigned short maxBuff;
-        short bufroom;
-        unsigned short stuffIndex;
-        unsigned char *pBuf;
-        unsigned char *pInsert;
-        unsigned char *pDest, *pSource;
-        unsigned short channel;
-        int cnt;
-        unsigned long flags = 0;
-        rwlock_t *lock_var_p = NULL;
-
-        // Make sure the channel exists, otherwise do nothing
-        if ( !i2Validate ( pCh ) ) {
-                return -1;
-        }
-
-        ip2trace (CHANN, ITRC_QUEUE, ITRC_ENTER, 0 );
-
-        pB = pCh->pMyBord;
-
-        // Board must also exist, and THE INTERRUPT COMMAND ALREADY SENT
-        if (pB->i2eValid != I2E_MAGIC || pB->i2eUsingIrq == I2_IRQ_UNDEFINED)
-                return -2;
-        // If the board has gone fatal, return bad, and also hit the trap routine if
-        // it exists.
-        if (pB->i2eFatal) {
-                if ( pB->i2eFatalTrap ) {
-                        (*(pB)->i2eFatalTrap)(pB);
-                }
-                return -3;
-        }
-        // Set up some variables, Which buffers are we using?  How big are they?
-        switch(type)
-        {
-        case PTYPE_INLINE:
-                flag = INL;
-                maxBlock = MAX_OBUF_BLOCK;
-                maxBuff = OBUF_SIZE;
-                pBuf = pCh->Obuf;
-                break;
-        case PTYPE_BYPASS:
-                flag = BYP;
-                maxBlock = MAX_CBUF_BLOCK;
-                maxBuff = CBUF_SIZE;
-                pBuf = pCh->Cbuf;
-                break;
-        default:
-                return -4;
-        }
-        // Determine the total size required for all the commands
-        totalsize = blocksize = sizeof(i2CmdHeader);
-        lastended = 0;
-        ppCs = &pCs0;
-        for ( count = nCommands; count; count--, ppCs++)
-        {
-                pCs = *ppCs;
-                cnt = pCs->length;
-                // Will a new block be needed for this one? 
-                // Two possible reasons: too
-                // big or previous command has to be at the end of a packet.
-                if ((blocksize + cnt > maxBlock) || lastended) {
-                        blocksize = sizeof(i2CmdHeader);
-                        totalsize += sizeof(i2CmdHeader);
-                }
-                totalsize += cnt;
-                blocksize += cnt;
-
-                // If this command had to end a block, then we will make sure to
-                // account for it should there be any more blocks.
-                lastended = pCs->flags & END;
-        }
-        for (;;) {
-                // Make sure any pending flush commands go out before we add more data.
-                if ( !( pCh->flush_flags && i2RetryFlushOutput( pCh ) ) ) {
-                        // How much room (this time through) ?
-                        switch(type) {
-                        case PTYPE_INLINE:
-                                lock_var_p = &pCh->Obuf_spinlock;
-                                write_lock_irqsave(lock_var_p, flags);
-                                stuffIndex = pCh->Obuf_stuff;
-                                bufroom = pCh->Obuf_strip - stuffIndex;
-                                break;
-                        case PTYPE_BYPASS:
-                                lock_var_p = &pCh->Cbuf_spinlock;
-                                write_lock_irqsave(lock_var_p, flags);
-                                stuffIndex = pCh->Cbuf_stuff;
-                                bufroom = pCh->Cbuf_strip - stuffIndex;
-                                break;
-                        default:
-                                return -5;
-                        }
-                        if (--bufroom < 0) {
-                                bufroom += maxBuff;
-                        }
-
-                        ip2trace (CHANN, ITRC_QUEUE, 2, 1, bufroom );
-
-                        // Check for overflow
-                        if (totalsize <= bufroom) {
-                                // Normal Expected path - We still hold LOCK
-                                break; /* from for()- Enough room: goto proceed */
-                        }
-                        ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize);
-                        write_unlock_irqrestore(lock_var_p, flags);
-                } else
-                        ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize);
-
-                /* Prepare to wait for buffers to empty */
-                serviceOutgoingFifo(pB);        // Dump what we got
-
-                if (timeout == 0) {
-                        return 0;   // Tired of waiting
-                }
-                if (timeout > 0)
-                        timeout--;   // So negative values == forever
-                
-                if (!in_interrupt()) {
-                        schedule_timeout_interruptible(1);      // short nap
-                } else {
-                        // we cannot sched/sleep in interrupt silly
-                        return 0;   
-                }
-                if (signal_pending(current)) {
-                        return 0;   // Wake up! Time to die!!!
-                }
-
-                ip2trace (CHANN, ITRC_QUEUE, 4, 0 );
-
-        }       // end of for(;;)
-
-        // At this point we have room and the lock - stick them in.
-        channel = pCh->infl.hd.i2sChannel;
-        pInsert = &pBuf[stuffIndex];     // Pointer to start of packet
-        pDest = CMD_OF(pInsert);         // Pointer to start of command
-
-        // When we start counting, the block is the size of the header
-        for (blocksize = sizeof(i2CmdHeader), count = nCommands,
-                        lastended = 0, ppCs = &pCs0;
-                count;
-                count--, ppCs++)
-        {
-                pCs = *ppCs;         // Points to command protocol structure
-
-                // If this is a bookmark request command, post the fact that a bookmark
-                // request is pending. NOTE THIS TRICK ONLY WORKS BECAUSE CMD_BMARK_REQ
-                // has no parameters!  The more general solution would be to reference
-                // pCs->cmd[0].
-                if (pCs == CMD_BMARK_REQ) {
-                        pCh->bookMarks++;
-
-                        ip2trace (CHANN, ITRC_DRAIN, 30, 1, pCh->bookMarks );
-
-                }
-                cnt = pCs->length;
-
-                // If this command would put us over the maximum block size or 
-                // if the last command had to be at the end of a block, we end
-                // the existing block here and start a new one.
-                if ((blocksize + cnt > maxBlock) || lastended) {
-
-                        ip2trace (CHANN, ITRC_QUEUE, 5, 0 );
-
-                        PTYPE_OF(pInsert) = type;
-                        CHANNEL_OF(pInsert) = channel;
-                        // count here does not include the header
-                        CMD_COUNT_OF(pInsert) = blocksize - sizeof(i2CmdHeader);
-                        stuffIndex += blocksize;
-                        if(stuffIndex >= maxBuff) {
-                                stuffIndex = 0;
-                                pInsert = pBuf;
-                        }
-                        pInsert = &pBuf[stuffIndex];  // Pointer to start of next pkt
-                        pDest = CMD_OF(pInsert);
-                        blocksize = sizeof(i2CmdHeader);
-                }
-                // Now we know there is room for this one in the current block
-
-                blocksize += cnt;       // Total bytes in this command
-                pSource = pCs->cmd;     // Copy the command into the buffer
-                while (cnt--) {
-                        *pDest++ = *pSource++;
-                }
-                // If this command had to end a block, then we will make sure to account
-                // for it should there be any more blocks.
-                lastended = pCs->flags & END;
-        }       // end for
-        // Clean up the final block by writing header, etc
-
-        PTYPE_OF(pInsert) = type;
-        CHANNEL_OF(pInsert) = channel;
-        // count here does not include the header
-        CMD_COUNT_OF(pInsert) = blocksize - sizeof(i2CmdHeader);
-        stuffIndex += blocksize;
-        if(stuffIndex >= maxBuff) {
-                stuffIndex = 0;
-                pInsert = pBuf;
-        }
-        // Updates the index, and post the need for service. When adding these to
-        // the queue of channels, we turn off the interrupt while doing so,
-        // because at interrupt level we might want to push a channel back to the
-        // end of the queue.
-        switch(type)
-        {
-        case PTYPE_INLINE:
-                pCh->Obuf_stuff = stuffIndex;  // Store buffer pointer
-                write_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
-
-                pB->debugInlineQueued++;
-                // Add the channel pointer to list of channels needing service (first
-                // come...), if it's not already there.
-                i2QueueNeeds(pB, pCh, NEED_INLINE);
-                break;
-
-        case PTYPE_BYPASS:
-                pCh->Cbuf_stuff = stuffIndex;  // Store buffer pointer
-                write_unlock_irqrestore(&pCh->Cbuf_spinlock, flags);
-
-                pB->debugBypassQueued++;
-                // Add the channel pointer to list of channels needing service (first
-                // come...), if it's not already there.
-                i2QueueNeeds(pB, pCh, NEED_BYPASS);
-                break;
-        }
-
-        ip2trace (CHANN, ITRC_QUEUE, ITRC_RETURN, 1, nCommands );
-
-        return nCommands; // Good status: number of commands sent
-}
-
-//******************************************************************************
-// Function:   i2GetStatus(pCh,resetBits)
-// Parameters: Pointer to a channel structure
-//             Bit map of status bits to clear
-// Returns:    Bit map of current status bits
-//
-// Description:
-// Returns the state of data set signals, and whether a break has been received,
-// (see i2lib.h for bit-mapped result). resetBits is a bit-map of any status
-// bits to be cleared: I2_BRK, I2_PAR, I2_FRA, I2_OVR,... These are cleared
-// AFTER the condition is passed. If pCh does not point to a valid channel,
-// returns -1 (which would be impossible otherwise.
-//******************************************************************************
-static int
-i2GetStatus(i2ChanStrPtr pCh, int resetBits)
-{
-        unsigned short status;
-        i2eBordStrPtr pB;
-
-        ip2trace (CHANN, ITRC_STATUS, ITRC_ENTER, 2, pCh->dataSetIn, resetBits );
-
-        // Make sure the channel exists, otherwise do nothing */
-        if ( !i2Validate ( pCh ) )
-                return -1;
-
-        pB = pCh->pMyBord;
-
-        status = pCh->dataSetIn;
-
-        // Clear any specified error bits: but note that only actual error bits can
-        // be cleared, regardless of the value passed.
-        if (resetBits)
-        {
-                pCh->dataSetIn &= ~(resetBits & (I2_BRK | I2_PAR | I2_FRA | I2_OVR));
-                pCh->dataSetIn &= ~(I2_DDCD | I2_DCTS | I2_DDSR | I2_DRI);
-        }
-
-        ip2trace (CHANN, ITRC_STATUS, ITRC_RETURN, 1, pCh->dataSetIn );
-
-        return status;
-}
-
-//******************************************************************************
-// Function:   i2Input(pChpDest,count)
-// Parameters: Pointer to a channel structure
-//             Pointer to data buffer
-//             Number of bytes to read
-// Returns:    Number of bytes read, or -1 for error
-//
-// Description:
-// Strips data from the input buffer and writes it to pDest. If there is a
-// collosal blunder, (invalid structure pointers or the like), returns -1.
-// Otherwise, returns the number of bytes read.
-//******************************************************************************
-static int
-i2Input(i2ChanStrPtr pCh)
-{
-        int amountToMove;
-        unsigned short stripIndex;
-        int count;
-        unsigned long flags = 0;
-
-        ip2trace (CHANN, ITRC_INPUT, ITRC_ENTER, 0);
-
-        // Ensure channel structure seems real
-        if ( !i2Validate( pCh ) ) {
-                count = -1;
-                goto i2Input_exit;
-        }
-        write_lock_irqsave(&pCh->Ibuf_spinlock, flags);
-
-        // initialize some accelerators and private copies
-        stripIndex = pCh->Ibuf_strip;
-
-        count = pCh->Ibuf_stuff - stripIndex;
-
-        // If buffer is empty or requested data count was 0, (trivial case) return
-        // without any further thought.
-        if ( count == 0 ) {
-                write_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
-                goto i2Input_exit;
-        }
-        // Adjust for buffer wrap
-        if ( count < 0 ) {
-                count += IBUF_SIZE;
-        }
-        // Don't give more than can be taken by the line discipline
-        amountToMove = pCh->pTTY->receive_room;
-        if (count > amountToMove) {
-                count = amountToMove;
-        }
-        // How much could we copy without a wrap?
-        amountToMove = IBUF_SIZE - stripIndex;
-
-        if (amountToMove > count) {
-                amountToMove = count;
-        }
-        // Move the first block
-        pCh->pTTY->ldisc->ops->receive_buf( pCh->pTTY,
-                 &(pCh->Ibuf[stripIndex]), NULL, amountToMove );
-        // If we needed to wrap, do the second data move
-        if (count > amountToMove) {
-                pCh->pTTY->ldisc->ops->receive_buf( pCh->pTTY,
-                 pCh->Ibuf, NULL, count - amountToMove );
-        }
-        // Bump and wrap the stripIndex all at once by the amount of data read. This
-        // method is good regardless of whether the data was in one or two pieces.
-        stripIndex += count;
-        if (stripIndex >= IBUF_SIZE) {
-                stripIndex -= IBUF_SIZE;
-        }
-        pCh->Ibuf_strip = stripIndex;
-
-        // Update our flow control information and possibly queue ourselves to send
-        // it, depending on how much data has been stripped since the last time a
-        // packet was sent.
-        pCh->infl.asof += count;
-
-        if ((pCh->sinceLastFlow += count) >= pCh->whenSendFlow) {
-                pCh->sinceLastFlow -= pCh->whenSendFlow;
-                write_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
-                i2QueueNeeds(pCh->pMyBord, pCh, NEED_FLOW);
-        } else {
-                write_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
-        }
-
-i2Input_exit:
-
-        ip2trace (CHANN, ITRC_INPUT, ITRC_RETURN, 1, count);
-
-        return count;
-}
-
-//******************************************************************************
-// Function:   i2InputFlush(pCh)
-// Parameters: Pointer to a channel structure
-// Returns:    Number of bytes stripped, or -1 for error
-//
-// Description:
-// Strips any data from the input buffer. If there is a collosal blunder,
-// (invalid structure pointers or the like), returns -1. Otherwise, returns the
-// number of bytes stripped.
-//******************************************************************************
-static int
-i2InputFlush(i2ChanStrPtr pCh)
-{
-        int count;
-        unsigned long flags;
-
-        // Ensure channel structure seems real
-        if ( !i2Validate ( pCh ) )
-                return -1;
-
-        ip2trace (CHANN, ITRC_INPUT, 10, 0);
-
-        write_lock_irqsave(&pCh->Ibuf_spinlock, flags);
-        count = pCh->Ibuf_stuff - pCh->Ibuf_strip;
-
-        // Adjust for buffer wrap
-        if (count < 0) {
-                count += IBUF_SIZE;
-        }
-
-        // Expedient way to zero out the buffer
-        pCh->Ibuf_strip = pCh->Ibuf_stuff;
-
-
-        // Update our flow control information and possibly queue ourselves to send
-        // it, depending on how much data has been stripped since the last time a
-        // packet was sent.
-
-        pCh->infl.asof += count;
-
-        if ( (pCh->sinceLastFlow += count) >= pCh->whenSendFlow )
-        {
-                pCh->sinceLastFlow -= pCh->whenSendFlow;
-                write_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
-                i2QueueNeeds(pCh->pMyBord, pCh, NEED_FLOW);
-        } else {
-                write_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
-        }
-
-        ip2trace (CHANN, ITRC_INPUT, 19, 1, count);
-
-        return count;
-}
-
-//******************************************************************************
-// Function:   i2InputAvailable(pCh)
-// Parameters: Pointer to a channel structure
-// Returns:    Number of bytes available, or -1 for error
-//
-// Description:
-// If there is a collosal blunder, (invalid structure pointers or the like),
-// returns -1. Otherwise, returns the number of bytes stripped. Otherwise,
-// returns the number of bytes available in the buffer.
-//******************************************************************************
-#if 0
-static int
-i2InputAvailable(i2ChanStrPtr pCh)
-{
-        int count;
-
-        // Ensure channel structure seems real
-        if ( !i2Validate ( pCh ) ) return -1;
-
-
-        // initialize some accelerators and private copies
-        read_lock_irqsave(&pCh->Ibuf_spinlock, flags);
-        count = pCh->Ibuf_stuff - pCh->Ibuf_strip;
-        read_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
-
-        // Adjust for buffer wrap
-        if (count < 0)
-        {
-                count += IBUF_SIZE;
-        }
-
-        return count;
-}
-#endif 
-
-//******************************************************************************
-// Function:   i2Output(pCh, pSource, count)
-// Parameters: Pointer to channel structure
-//             Pointer to source data
-//             Number of bytes to send
-// Returns:    Number of bytes sent, or -1 for error
-//
-// Description:
-// Queues the data at pSource to be sent as data packets to the board. If there
-// is a collosal blunder, (invalid structure pointers or the like), returns -1.
-// Otherwise, returns the number of bytes written. What if there is not enough
-// room for all the data? If pCh->channelOptions & CO_NBLOCK_WRITE is set, then
-// we transfer as many characters as we can now, then return. If this bit is
-// clear (default), routine will spin along until all the data is buffered.
-// Should this occur, the 1-ms delay routine is called while waiting to avoid
-// applications that one cannot break out of.
-//******************************************************************************
-static int
-i2Output(i2ChanStrPtr pCh, const char *pSource, int count)
-{
-        i2eBordStrPtr pB;
-        unsigned char *pInsert;
-        int amountToMove;
-        int countOriginal = count;
-        unsigned short channel;
-        unsigned short stuffIndex;
-        unsigned long flags;
-
-        int bailout = 10;
-
-        ip2trace (CHANN, ITRC_OUTPUT, ITRC_ENTER, 2, count, 0 );
-
-        // Ensure channel structure seems real
-        if ( !i2Validate ( pCh ) ) 
-                return -1;
-
-        // initialize some accelerators and private copies
-        pB = pCh->pMyBord;
-        channel = pCh->infl.hd.i2sChannel;
-
-        // If the board has gone fatal, return bad, and also hit the trap routine if
-        // it exists.
-        if (pB->i2eFatal) {
-                if (pB->i2eFatalTrap) {
-                        (*(pB)->i2eFatalTrap)(pB);
-                }
-                return -1;
-        }
-        // Proceed as though we would do everything
-        while ( count > 0 ) {
-
-                // How much room in output buffer is there?
-                read_lock_irqsave(&pCh->Obuf_spinlock, flags);
-                amountToMove = pCh->Obuf_strip - pCh->Obuf_stuff - 1;
-                read_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
-                if (amountToMove < 0) {
-                        amountToMove += OBUF_SIZE;
-                }
-                // Subtract off the headers size and see how much room there is for real
-                // data. If this is negative, we will discover later.
-                amountToMove -= sizeof (i2DataHeader);
-
-                // Don't move more (now) than can go in a single packet
-                if ( amountToMove > (int)(MAX_OBUF_BLOCK - sizeof(i2DataHeader)) ) {
-                        amountToMove = MAX_OBUF_BLOCK - sizeof(i2DataHeader);
-                }
-                // Don't move more than the count we were given
-                if (amountToMove > count) {
-                        amountToMove = count;
-                }
-                // Now we know how much we must move: NB because the ring buffers have
-                // an overflow area at the end, we needn't worry about wrapping in the
-                // middle of a packet.
-
-// Small WINDOW here with no LOCK but I can't call Flush with LOCK
-// We would be flushing (or ending flush) anyway
-
-                ip2trace (CHANN, ITRC_OUTPUT, 10, 1, amountToMove );
-
-                if ( !(pCh->flush_flags && i2RetryFlushOutput(pCh) ) 
-                                && amountToMove > 0 )
-                {
-                        write_lock_irqsave(&pCh->Obuf_spinlock, flags);
-                        stuffIndex = pCh->Obuf_stuff;
-      
-                        // Had room to move some data: don't know whether the block size,
-                        // buffer space, or what was the limiting factor...
-                        pInsert = &(pCh->Obuf[stuffIndex]);
-
-                        // Set up the header
-                        CHANNEL_OF(pInsert)     = channel;
-                        PTYPE_OF(pInsert)       = PTYPE_DATA;
-                        TAG_OF(pInsert)         = 0;
-                        ID_OF(pInsert)          = ID_ORDINARY_DATA;
-                        DATA_COUNT_OF(pInsert)  = amountToMove;
-
-                        // Move the data
-                        memcpy( (char*)(DATA_OF(pInsert)), pSource, amountToMove );
-                        // Adjust pointers and indices
-                        pSource                                 += amountToMove;
-                        pCh->Obuf_char_count    += amountToMove;
-                        stuffIndex                              += amountToMove + sizeof(i2DataHeader);
-                        count                                   -= amountToMove;
-
-                        if (stuffIndex >= OBUF_SIZE) {
-                                stuffIndex = 0;
-                        }
-                        pCh->Obuf_stuff = stuffIndex;
-
-                        write_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
-
-                        ip2trace (CHANN, ITRC_OUTPUT, 13, 1, stuffIndex );
-
-                } else {
-
-                        // Cannot move data
-                        // becuz we need to stuff a flush 
-                        // or amount to move is <= 0
-
-                        ip2trace(CHANN, ITRC_OUTPUT, 14, 3,
-                                amountToMove,  pB->i2eFifoRemains,
-                                pB->i2eWaitingForEmptyFifo );
-
-                        // Put this channel back on queue
-                        // this ultimatly gets more data or wakes write output
-                        i2QueueNeeds(pB, pCh, NEED_INLINE);
-
-                        if ( pB->i2eWaitingForEmptyFifo ) {
-
-                                ip2trace (CHANN, ITRC_OUTPUT, 16, 0 );
-
-                                // or schedule
-                                if (!in_interrupt()) {
-
-                                        ip2trace (CHANN, ITRC_OUTPUT, 61, 0 );
-
-                                        schedule_timeout_interruptible(2);
-                                        if (signal_pending(current)) {
-                                                break;
-                                        }
-                                        continue;
-                                } else {
-
-                                        ip2trace (CHANN, ITRC_OUTPUT, 62, 0 );
-
-                                        // let interrupt in = WAS restore_flags()
-                                        // We hold no lock nor is irq off anymore???
-                                        
-                                        break;
-                                }
-                                break;   // from while(count)
-                        }
-                        else if ( pB->i2eFifoRemains < 32 && !pB->i2eTxMailEmpty ( pB ) )
-                        {
-                                ip2trace (CHANN, ITRC_OUTPUT, 19, 2,
-                                        pB->i2eFifoRemains,
-                                        pB->i2eTxMailEmpty );
-
-                                break;   // from while(count)
-                        } else if ( pCh->channelNeeds & NEED_CREDIT ) {
-
-                                ip2trace (CHANN, ITRC_OUTPUT, 22, 0 );
-
-                                break;   // from while(count)
-                        } else if ( --bailout) {
-
-                                // Try to throw more things (maybe not us) in the fifo if we're
-                                // not already waiting for it.
-        
-                                ip2trace (CHANN, ITRC_OUTPUT, 20, 0 );
-
-                                serviceOutgoingFifo(pB);
-                                //break;  CONTINUE;
-                        } else {
-                                ip2trace (CHANN, ITRC_OUTPUT, 21, 3,
-                                        pB->i2eFifoRemains,
-                                        pB->i2eOutMailWaiting,
-                                        pB->i2eWaitingForEmptyFifo );
-
-                                break;   // from while(count)
-                        }
-                }
-        } // End of while(count)
-
-        i2QueueNeeds(pB, pCh, NEED_INLINE);
-
-        // We drop through either when the count expires, or when there is some
-        // count left, but there was a non-blocking write.
-        if (countOriginal > count) {
-
-                ip2trace (CHANN, ITRC_OUTPUT, 17, 2, countOriginal, count );
-
-                serviceOutgoingFifo( pB );
-        }
-
-        ip2trace (CHANN, ITRC_OUTPUT, ITRC_RETURN, 2, countOriginal, count );
-
-        return countOriginal - count;
-}
-
-//******************************************************************************
-// Function:   i2FlushOutput(pCh)
-// Parameters: Pointer to a channel structure
-// Returns:    Nothing
-//
-// Description:
-// Sends bypass command to start flushing (waiting possibly forever until there
-// is room), then sends inline command to stop flushing output, (again waiting
-// possibly forever).
-//******************************************************************************
-static inline void
-i2FlushOutput(i2ChanStrPtr pCh)
-{
-
-        ip2trace (CHANN, ITRC_FLUSH, 1, 1, pCh->flush_flags );
-
-        if (pCh->flush_flags)
-                return;
-
-        if ( 1 != i2QueueCommands(PTYPE_BYPASS, pCh, 0, 1, CMD_STARTFL) ) {
-                pCh->flush_flags = STARTFL_FLAG;                // Failed - flag for later
-
-                ip2trace (CHANN, ITRC_FLUSH, 2, 0 );
-
-        } else if ( 1 != i2QueueCommands(PTYPE_INLINE, pCh, 0, 1, CMD_STOPFL) ) {
-                pCh->flush_flags = STOPFL_FLAG;         // Failed - flag for later
-
-                ip2trace (CHANN, ITRC_FLUSH, 3, 0 );
-        }
-}
-
-static int 
-i2RetryFlushOutput(i2ChanStrPtr pCh)
-{
-        int old_flags = pCh->flush_flags;
-
-        ip2trace (CHANN, ITRC_FLUSH, 14, 1, old_flags );
-
-        pCh->flush_flags = 0;   // Clear flag so we can avoid recursion
-                                                                        // and queue the commands
-
-        if ( old_flags & STARTFL_FLAG ) {
-                if ( 1 == i2QueueCommands(PTYPE_BYPASS, pCh, 0, 1, CMD_STARTFL) ) {
-                        old_flags = STOPFL_FLAG;        //Success - send stop flush
-                } else {
-                        old_flags = STARTFL_FLAG;       //Failure - Flag for retry later
-                }
-
-                ip2trace (CHANN, ITRC_FLUSH, 15, 1, old_flags );
-
-        }
-        if ( old_flags & STOPFL_FLAG ) {
-                if (1 == i2QueueCommands(PTYPE_INLINE, pCh, 0, 1, CMD_STOPFL)) {
-                        old_flags = 0;  // Success - clear flags
-                }
-
-                ip2trace (CHANN, ITRC_FLUSH, 16, 1, old_flags );
-        }
-        pCh->flush_flags = old_flags;
-
-        ip2trace (CHANN, ITRC_FLUSH, 17, 1, old_flags );
-
-        return old_flags;
-}
-
-//******************************************************************************
-// Function:   i2DrainOutput(pCh,timeout)
-// Parameters: Pointer to a channel structure
-//             Maximum period to wait
-// Returns:    ?
-//
-// Description:
-// Uses the bookmark request command to ask the board to send a bookmark back as
-// soon as all the data is completely sent.
-//******************************************************************************
-static void
-i2DrainWakeup(unsigned long d)
-{
-        i2ChanStrPtr pCh = (i2ChanStrPtr)d;
-
-        ip2trace (CHANN, ITRC_DRAIN, 10, 1, pCh->BookmarkTimer.expires );
-
-        pCh->BookmarkTimer.expires = 0;
-        wake_up_interruptible( &pCh->pBookmarkWait );
-}
-
-static void
-i2DrainOutput(i2ChanStrPtr pCh, int timeout)
-{
-        wait_queue_t wait;
-        i2eBordStrPtr pB;
-
-        ip2trace (CHANN, ITRC_DRAIN, ITRC_ENTER, 1, pCh->BookmarkTimer.expires);
-
-        pB = pCh->pMyBord;
-        // If the board has gone fatal, return bad, 
-        // and also hit the trap routine if it exists.
-        if (pB->i2eFatal) {
-                if (pB->i2eFatalTrap) {
-                        (*(pB)->i2eFatalTrap)(pB);
-                }
-                return;
-        }
-        if ((timeout > 0) && (pCh->BookmarkTimer.expires == 0 )) {
-                // One per customer (channel)
-                setup_timer(&pCh->BookmarkTimer, i2DrainWakeup,
-                                (unsigned long)pCh);
-
-                ip2trace (CHANN, ITRC_DRAIN, 1, 1, pCh->BookmarkTimer.expires );
-
-                mod_timer(&pCh->BookmarkTimer, jiffies + timeout);
-        }
-        
-        i2QueueCommands( PTYPE_INLINE, pCh, -1, 1, CMD_BMARK_REQ );
-
-        init_waitqueue_entry(&wait, current);
-        add_wait_queue(&(pCh->pBookmarkWait), &wait);
-        set_current_state( TASK_INTERRUPTIBLE );
-
-        serviceOutgoingFifo( pB );
-        
-        schedule();     // Now we take our interruptible sleep on
-
-        // Clean up the queue
-        set_current_state( TASK_RUNNING );
-        remove_wait_queue(&(pCh->pBookmarkWait), &wait);
-
-        // if expires == 0 then timer poped, then do not need to del_timer
-        if ((timeout > 0) && pCh->BookmarkTimer.expires && 
-                             time_before(jiffies, pCh->BookmarkTimer.expires)) {
-                del_timer( &(pCh->BookmarkTimer) );
-                pCh->BookmarkTimer.expires = 0;
-
-                ip2trace (CHANN, ITRC_DRAIN, 3, 1, pCh->BookmarkTimer.expires );
-
-        }
-        ip2trace (CHANN, ITRC_DRAIN, ITRC_RETURN, 1, pCh->BookmarkTimer.expires );
-        return;
-}
-
-//******************************************************************************
-// Function:   i2OutputFree(pCh)
-// Parameters: Pointer to a channel structure
-// Returns:    Space in output buffer
-//
-// Description:
-// Returns -1 if very gross error. Otherwise returns the amount of bytes still
-// free in the output buffer.
-//******************************************************************************
-static int
-i2OutputFree(i2ChanStrPtr pCh)
-{
-        int amountToMove;
-        unsigned long flags;
-
-        // Ensure channel structure seems real
-        if ( !i2Validate ( pCh ) ) {
-                return -1;
-        }
-        read_lock_irqsave(&pCh->Obuf_spinlock, flags);
-        amountToMove = pCh->Obuf_strip - pCh->Obuf_stuff - 1;
-        read_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
-
-        if (amountToMove < 0) {
-                amountToMove += OBUF_SIZE;
-        }
-        // If this is negative, we will discover later
-        amountToMove -= sizeof(i2DataHeader);
-
-        return (amountToMove < 0) ? 0 : amountToMove;
-}
-static void
-
-ip2_owake( PTTY tp)
-{
-        i2ChanStrPtr  pCh;
-
-        if (tp == NULL) return;
-
-        pCh = tp->driver_data;
-
-        ip2trace (CHANN, ITRC_SICMD, 10, 2, tp->flags,
-                        (1 << TTY_DO_WRITE_WAKEUP) );
-
-        tty_wakeup(tp);
-}
-
-static inline void
-set_baud_params(i2eBordStrPtr pB) 
-{
-        int i,j;
-        i2ChanStrPtr  *pCh;
-
-        pCh = (i2ChanStrPtr *) pB->i2eChannelPtr;
-
-        for (i = 0; i < ABS_MAX_BOXES; i++) {
-                if (pB->channelBtypes.bid_value[i]) {
-                        if (BID_HAS_654(pB->channelBtypes.bid_value[i])) {
-                                for (j = 0; j < ABS_BIGGEST_BOX; j++) {
-                                        if (pCh[i*16+j] == NULL)
-                                                break;
-                                        (pCh[i*16+j])->BaudBase    = 921600;    // MAX for ST654
-                                        (pCh[i*16+j])->BaudDivisor = 96;
-                                }
-                        } else {        // has cirrus cd1400
-                                for (j = 0; j < ABS_BIGGEST_BOX; j++) {
-                                        if (pCh[i*16+j] == NULL)
-                                                break;
-                                        (pCh[i*16+j])->BaudBase    = 115200;    // MAX for CD1400
-                                        (pCh[i*16+j])->BaudDivisor = 12;
-                                }
-                        }
-                }
-        }
-}
-
-//******************************************************************************
-// Function:   i2StripFifo(pB)
-// Parameters: Pointer to a board structure
-// Returns:    ?
-//
-// Description:
-// Strips all the available data from the incoming FIFO, identifies the type of
-// packet, and either buffers the data or does what needs to be done.
-//
-// Note there is no overflow checking here: if the board sends more data than it
-// ought to, we will not detect it here, but blindly overflow...
-//******************************************************************************
-
-// A buffer for reading in blocks for unknown channels
-static unsigned char junkBuffer[IBUF_SIZE];
-
-// A buffer to read in a status packet. Because of the size of the count field
-// for these things, the maximum packet size must be less than MAX_CMD_PACK_SIZE
-static unsigned char cmdBuffer[MAX_CMD_PACK_SIZE + 4];
-
-// This table changes the bit order from MSR order given by STAT_MODEM packet to
-// status bits used in our library.
-static char xlatDss[16] = {
-0      | 0     | 0      | 0      ,
-0      | 0     | 0      | I2_CTS ,
-0      | 0     | I2_DSR | 0      ,
-0      | 0     | I2_DSR | I2_CTS ,
-0      | I2_RI | 0      | 0      ,
-0      | I2_RI | 0      | I2_CTS ,
-0      | I2_RI | I2_DSR | 0      ,
-0      | I2_RI | I2_DSR | I2_CTS ,
-I2_DCD | 0     | 0      | 0      ,
-I2_DCD | 0     | 0      | I2_CTS ,
-I2_DCD | 0     | I2_DSR | 0      ,
-I2_DCD | 0     | I2_DSR | I2_CTS ,
-I2_DCD | I2_RI | 0      | 0      ,
-I2_DCD | I2_RI | 0      | I2_CTS ,
-I2_DCD | I2_RI | I2_DSR | 0      ,
-I2_DCD | I2_RI | I2_DSR | I2_CTS };
-
-static inline void
-i2StripFifo(i2eBordStrPtr pB)
-{
-        i2ChanStrPtr pCh;
-        int channel;
-        int count;
-        unsigned short stuffIndex;
-        int amountToRead;
-        unsigned char *pc, *pcLimit;
-        unsigned char uc;
-        unsigned char dss_change;
-        unsigned long bflags,cflags;
-
-//      ip2trace (ITRC_NO_PORT, ITRC_SFIFO, ITRC_ENTER, 0 );
-
-        while (I2_HAS_INPUT(pB)) {
-//              ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 2, 0 );
-
-                // Process packet from fifo a one atomic unit
-                write_lock_irqsave(&pB->read_fifo_spinlock, bflags);
-   
-                // The first word (or two bytes) will have channel number and type of
-                // packet, possibly other information
-                pB->i2eLeadoffWord[0] = iiReadWord(pB);
-
-                switch(PTYPE_OF(pB->i2eLeadoffWord))
-                {
-                case PTYPE_DATA:
-                        pB->got_input = 1;
-
-//                      ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 3, 0 );
-
-                        channel = CHANNEL_OF(pB->i2eLeadoffWord); /* Store channel */
-                        count = iiReadWord(pB);          /* Count is in the next word */
-
-// NEW: Check the count for sanity! Should the hardware fail, our death
-// is more pleasant. While an oversize channel is acceptable (just more
-// than the driver supports), an over-length count clearly means we are
-// sick!
-                        if ( ((unsigned int)count) > IBUF_SIZE ) {
-                                pB->i2eFatal = 2;
-                                write_unlock_irqrestore(&pB->read_fifo_spinlock,
-                                                bflags);
-                                return;     /* Bail out ASAP */
-                        }
-                        // Channel is illegally big ?
-                        if ((channel >= pB->i2eChannelCnt) ||
-                                (NULL==(pCh = ((i2ChanStrPtr*)pB->i2eChannelPtr)[channel])))
-                        {
-                                iiReadBuf(pB, junkBuffer, count);
-                                write_unlock_irqrestore(&pB->read_fifo_spinlock,
-                                                bflags);
-                                break;         /* From switch: ready for next packet */
-                        }
-
-                        // Channel should be valid, then
-
-                        // If this is a hot-key, merely post its receipt for now. These are
-                        // always supposed to be 1-byte packets, so we won't even check the
-                        // count. Also we will post an acknowledgement to the board so that
-                        // more data can be forthcoming. Note that we are not trying to use
-                        // these sequences in this driver, merely to robustly ignore them.
-                        if(ID_OF(pB->i2eLeadoffWord) == ID_HOT_KEY)
-                        {
-                                pCh->hotKeyIn = iiReadWord(pB) & 0xff;
-                                write_unlock_irqrestore(&pB->read_fifo_spinlock,
-                                                bflags);
-                                i2QueueCommands(PTYPE_BYPASS, pCh, 0, 1, CMD_HOTACK);
-                                break;   /* From the switch: ready for next packet */
-                        }
-
-                        // Normal data! We crudely assume there is room for the data in our
-                        // buffer because the board wouldn't have exceeded his credit limit.
-                        write_lock_irqsave(&pCh->Ibuf_spinlock, cflags);
-                                                                                                        // We have 2 locks now
-                        stuffIndex = pCh->Ibuf_stuff;
-                        amountToRead = IBUF_SIZE - stuffIndex;
-                        if (amountToRead > count)
-                                amountToRead = count;
-
-                        // stuffIndex would have been already adjusted so there would 
-                        // always be room for at least one, and count is always at least
-                        // one.
-
-                        iiReadBuf(pB, &(pCh->Ibuf[stuffIndex]), amountToRead);
-                        pCh->icount.rx += amountToRead;
-
-                        // Update the stuffIndex by the amount of data moved. Note we could
-                        // never ask for more data than would just fit. However, we might
-                        // have read in one more byte than we wanted because the read
-                        // rounds up to even bytes. If this byte is on the end of the
-                        // packet, and is padding, we ignore it. If the byte is part of
-                        // the actual data, we need to move it.
-
-                        stuffIndex += amountToRead;
-
-                        if (stuffIndex >= IBUF_SIZE) {
-                                if ((amountToRead & 1) && (count > amountToRead)) {
-                                        pCh->Ibuf[0] = pCh->Ibuf[IBUF_SIZE];
-                                        amountToRead++;
-                                        stuffIndex = 1;
-                                } else {
-                                        stuffIndex = 0;
-                                }
-                        }
-
-                        // If there is anything left over, read it as well
-                        if (count > amountToRead) {
-                                amountToRead = count - amountToRead;
-                                iiReadBuf(pB, &(pCh->Ibuf[stuffIndex]), amountToRead);
-                                pCh->icount.rx += amountToRead;
-                                stuffIndex += amountToRead;
-                        }
-
-                        // Update stuff index
-                        pCh->Ibuf_stuff = stuffIndex;
-                        write_unlock_irqrestore(&pCh->Ibuf_spinlock, cflags);
-                        write_unlock_irqrestore(&pB->read_fifo_spinlock,
-                                        bflags);
-
-#ifdef USE_IQ
-                        schedule_work(&pCh->tqueue_input);
-#else
-                        do_input(&pCh->tqueue_input);
-#endif
-
-                        // Note we do not need to maintain any flow-control credits at this
-                        // time:  if we were to increment .asof and decrement .room, there
-                        // would be no net effect. Instead, when we strip data, we will
-                        // increment .asof and leave .room unchanged.
-
-                        break;   // From switch: ready for next packet
-
-                case PTYPE_STATUS:
-                        ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 4, 0 );
-      
-                        count = CMD_COUNT_OF(pB->i2eLeadoffWord);
-
-                        iiReadBuf(pB, cmdBuffer, count);
-                        // We can release early with buffer grab
-                        write_unlock_irqrestore(&pB->read_fifo_spinlock,
-                                        bflags);
-
-                        pc = cmdBuffer;
-                        pcLimit = &(cmdBuffer[count]);
-
-                        while (pc < pcLimit) {
-                                channel = *pc++;
-
-                                ip2trace (channel, ITRC_SFIFO, 7, 2, channel, *pc );
-
-                                /* check for valid channel */
-                                if (channel < pB->i2eChannelCnt
-                                         && 
-                                         (pCh = (((i2ChanStrPtr*)pB->i2eChannelPtr)[channel])) != NULL
-                                        )
-                                {
-                                        dss_change = 0;
-
-                                        switch (uc = *pc++)
-                                        {
-                                        /* Breaks and modem signals are easy: just update status */
-                                        case STAT_CTS_UP:
-                                                if ( !(pCh->dataSetIn & I2_CTS) )
-                                                {
-                                                        pCh->dataSetIn |= I2_DCTS;
-                                                        pCh->icount.cts++;
-                                                        dss_change = 1;
-                                                }
-                                                pCh->dataSetIn |= I2_CTS;
-                                                break;
-
-                                        case STAT_CTS_DN:
-                                                if ( pCh->dataSetIn & I2_CTS )
-                                                {
-                                                        pCh->dataSetIn |= I2_DCTS;
-                                                        pCh->icount.cts++;
-                                                        dss_change = 1;
-                                                }
-                                                pCh->dataSetIn &= ~I2_CTS;
-                                                break;
-
-                                        case STAT_DCD_UP:
-                                                ip2trace (channel, ITRC_MODEM, 1, 1, pCh->dataSetIn );
-
-                                                if ( !(pCh->dataSetIn & I2_DCD) )
-                                                {
-                                                        ip2trace (CHANN, ITRC_MODEM, 2, 0 );
-                                                        pCh->dataSetIn |= I2_DDCD;
-                                                        pCh->icount.dcd++;
-                                                        dss_change = 1;
-                                                }
-                                                pCh->dataSetIn |= I2_DCD;
-
-                                                ip2trace (channel, ITRC_MODEM, 3, 1, pCh->dataSetIn );
-                                                break;
-
-                                        case STAT_DCD_DN:
-                                                ip2trace (channel, ITRC_MODEM, 4, 1, pCh->dataSetIn );
-                                                if ( pCh->dataSetIn & I2_DCD )
-                                                {
-                                                        ip2trace (channel, ITRC_MODEM, 5, 0 );
-                                                        pCh->dataSetIn |= I2_DDCD;
-                                                        pCh->icount.dcd++;
-                                                        dss_change = 1;
-                                                }
-                                                pCh->dataSetIn &= ~I2_DCD;
-
-                                                ip2trace (channel, ITRC_MODEM, 6, 1, pCh->dataSetIn );
-                                                break;
-
-                                        case STAT_DSR_UP:
-                                                if ( !(pCh->dataSetIn & I2_DSR) )
-                                                {
-                                                        pCh->dataSetIn |= I2_DDSR;
-                                                        pCh->icount.dsr++;
-                                                        dss_change = 1;
-                                                }
-                                                pCh->dataSetIn |= I2_DSR;
-                                                break;
-
-                                        case STAT_DSR_DN:
-                                                if ( pCh->dataSetIn & I2_DSR )
-                                                {
-                                                        pCh->dataSetIn |= I2_DDSR;
-                                                        pCh->icount.dsr++;
-                                                        dss_change = 1;
-                                                }
-                                                pCh->dataSetIn &= ~I2_DSR;
-                                                break;
-
-                                        case STAT_RI_UP:
-                                                if ( !(pCh->dataSetIn & I2_RI) )
-                                                {
-                                                        pCh->dataSetIn |= I2_DRI;
-                                                        pCh->icount.rng++;
-                                                        dss_change = 1;
-                                                }
-                                                pCh->dataSetIn |= I2_RI ;
-                                                break;
-
-                                        case STAT_RI_DN:
-                                                // to be compat with serial.c
-                                                //if ( pCh->dataSetIn & I2_RI )
-                                                //{
-                                                //      pCh->dataSetIn |= I2_DRI;
-                                                //      pCh->icount.rng++; 
-                                                //      dss_change = 1;
-                                                //}
-                                                pCh->dataSetIn &= ~I2_RI ;
-                                                break;
-
-                                        case STAT_BRK_DET:
-                                                pCh->dataSetIn |= I2_BRK;
-                                                pCh->icount.brk++;
-                                                dss_change = 1;
-                                                break;
-
-                                        // Bookmarks? one less request we're waiting for
-                                        case STAT_BMARK:
-                                                pCh->bookMarks--;
-                                                if (pCh->bookMarks <= 0 ) {
-                                                        pCh->bookMarks = 0;
-                                                        wake_up_interruptible( &pCh->pBookmarkWait );
-
-                                                ip2trace (channel, ITRC_DRAIN, 20, 1, pCh->BookmarkTimer.expires );
-                                                }
-                                                break;
-
-                                        // Flow control packets? Update the new credits, and if
-                                        // someone was waiting for output, queue him up again.
-                                        case STAT_FLOW:
-                                                pCh->outfl.room =
-                                                        ((flowStatPtr)pc)->room -
-                                                        (pCh->outfl.asof - ((flowStatPtr)pc)->asof);
-
-                                                ip2trace (channel, ITRC_STFLW, 1, 1, pCh->outfl.room );
-
-                                                if (pCh->channelNeeds & NEED_CREDIT)
-                                                {
-                                                        ip2trace (channel, ITRC_STFLW, 2, 1, pCh->channelNeeds);
-
-                                                        pCh->channelNeeds &= ~NEED_CREDIT;
-                                                        i2QueueNeeds(pB, pCh, NEED_INLINE);
-                                                        if ( pCh->pTTY )
-                                                                ip2_owake(pCh->pTTY);
-                                                }
-
-                                                ip2trace (channel, ITRC_STFLW, 3, 1, pCh->channelNeeds);
-
-                                                pc += sizeof(flowStat);
-                                                break;
-
-                                        /* Special packets: */
-                                        /* Just copy the information into the channel structure */
-
-                                        case STAT_STATUS:
-
-                                                pCh->channelStatus = *((debugStatPtr)pc);
-                                                pc += sizeof(debugStat);
-                                                break;
-
-                                        case STAT_TXCNT:
-
-                                                pCh->channelTcount = *((cntStatPtr)pc);
-                                                pc += sizeof(cntStat);
-                                                break;
-
-                                        case STAT_RXCNT:
-
-                                                pCh->channelRcount = *((cntStatPtr)pc);
-                                                pc += sizeof(cntStat);
-                                                break;
-
-                                        case STAT_BOXIDS:
-                                                pB->channelBtypes = *((bidStatPtr)pc);
-                                                pc += sizeof(bidStat);
-                                                set_baud_params(pB);
-                                                break;
-
-                                        case STAT_HWFAIL:
-                                                i2QueueCommands (PTYPE_INLINE, pCh, 0, 1, CMD_HW_TEST);
-                                                pCh->channelFail = *((failStatPtr)pc);
-                                                pc += sizeof(failStat);
-                                                break;
-
-                                        /* No explicit match? then
-                                         * Might be an error packet...
-                                         */
-                                        default:
-                                                switch (uc & STAT_MOD_ERROR)
-                                                {
-                                                case STAT_ERROR:
-                                                        if (uc & STAT_E_PARITY) {
-                                                                pCh->dataSetIn |= I2_PAR;
-                                                                pCh->icount.parity++;
-                                                        }
-                                                        if (uc & STAT_E_FRAMING){
-                                                                pCh->dataSetIn |= I2_FRA;
-                                                                pCh->icount.frame++;
-                                                        }
-                                                        if (uc & STAT_E_OVERRUN){
-                                                                pCh->dataSetIn |= I2_OVR;
-                                                                pCh->icount.overrun++;
-                                                        }
-                                                        break;
-
-                                                case STAT_MODEM:
-                                                        // the answer to DSS_NOW request (not change)
-                                                        pCh->dataSetIn = (pCh->dataSetIn
-                                                                & ~(I2_RI | I2_CTS | I2_DCD | I2_DSR) )
-                                                                | xlatDss[uc & 0xf];
-                                                        wake_up_interruptible ( &pCh->dss_now_wait );
-                                                default:
-                                                        break;
-                                                }
-                                        }  /* End of switch on status type */
-                                        if (dss_change) {
-#ifdef USE_IQ
-                                                schedule_work(&pCh->tqueue_status);
-#else
-                                                do_status(&pCh->tqueue_status);
-#endif
-                                        }
-                                }
-                                else  /* Or else, channel is invalid */
-                                {
-                                        // Even though the channel is invalid, we must test the
-                                        // status to see how much additional data it has (to be
-                                        // skipped)
-                                        switch (*pc++)
-                                        {
-                                        case STAT_FLOW:
-                                                pc += 4;    /* Skip the data */
-                                                break;
-
-                                        default:
-                                                break;
-                                        }
-                                }
-                        }  // End of while (there is still some status packet left)
-                        break;
-
-                default: // Neither packet? should be impossible
-                        ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 5, 1,
-                                PTYPE_OF(pB->i2eLeadoffWord) );
-                        write_unlock_irqrestore(&pB->read_fifo_spinlock,
-                                        bflags);
-
-                        break;
-                }  // End of switch on type of packets
-        }       /*while(board I2_HAS_INPUT)*/
-
-        ip2trace (ITRC_NO_PORT, ITRC_SFIFO, ITRC_RETURN, 0 );
-
-        // Send acknowledgement to the board even if there was no data!
-        pB->i2eOutMailWaiting |= MB_IN_STRIPPED;
-        return;
-}
-
-//******************************************************************************
-// Function:   i2Write2Fifo(pB,address,count)
-// Parameters: Pointer to a board structure, source address, byte count
-// Returns:    bytes written
-//
-// Description:
-//  Writes count bytes to board io address(implied) from source
-//  Adjusts count, leaves reserve for next time around bypass cmds
-//******************************************************************************
-static int
-i2Write2Fifo(i2eBordStrPtr pB, unsigned char *source, int count,int reserve)
-{
-        int rc = 0;
-        unsigned long flags;
-        write_lock_irqsave(&pB->write_fifo_spinlock, flags);
-        if (!pB->i2eWaitingForEmptyFifo) {
-                if (pB->i2eFifoRemains > (count+reserve)) {
-                        pB->i2eFifoRemains -= count;
-                        iiWriteBuf(pB, source, count);
-                        pB->i2eOutMailWaiting |= MB_OUT_STUFFED;
-                        rc =  count;
-                }
-        }
-        write_unlock_irqrestore(&pB->write_fifo_spinlock, flags);
-        return rc;
-}
-//******************************************************************************
-// Function:   i2StuffFifoBypass(pB)
-// Parameters: Pointer to a board structure
-// Returns:    Nothing
-//
-// Description:
-// Stuffs as many bypass commands into the fifo as possible. This is simpler
-// than stuffing data or inline commands to fifo, since we do not have
-// flow-control to deal with.
-//******************************************************************************
-static inline void
-i2StuffFifoBypass(i2eBordStrPtr pB)
-{
-        i2ChanStrPtr pCh;
-        unsigned char *pRemove;
-        unsigned short stripIndex;
-        unsigned short packetSize;
-        unsigned short paddedSize;
-        unsigned short notClogged = 1;
-        unsigned long flags;
-
-        int bailout = 1000;
-
-        // Continue processing so long as there are entries, or there is room in the
-        // fifo. Each entry represents a channel with something to do.
-        while ( --bailout && notClogged && 
-                        (NULL != (pCh = i2DeQueueNeeds(pB,NEED_BYPASS))))
-        {
-                write_lock_irqsave(&pCh->Cbuf_spinlock, flags);
-                stripIndex = pCh->Cbuf_strip;
-
-                // as long as there are packets for this channel...
-
-                while (stripIndex != pCh->Cbuf_stuff) {
-                        pRemove = &(pCh->Cbuf[stripIndex]);
-                        packetSize = CMD_COUNT_OF(pRemove) + sizeof(i2CmdHeader);
-                        paddedSize = roundup(packetSize, 2);
-
-                        if (paddedSize > 0) {
-                                if ( 0 == i2Write2Fifo(pB, pRemove, paddedSize,0)) {
-                                        notClogged = 0; /* fifo full */
-                                        i2QueueNeeds(pB, pCh, NEED_BYPASS);     // Put back on queue
-                                        break;   // Break from the channel
-                                } 
-                        }
-#ifdef DEBUG_FIFO
-WriteDBGBuf("BYPS", pRemove, paddedSize);
-#endif  /* DEBUG_FIFO */
-                        pB->debugBypassCount++;
-
-                        pRemove += packetSize;
-                        stripIndex += packetSize;
-                        if (stripIndex >= CBUF_SIZE) {
-                                stripIndex = 0;
-                                pRemove = pCh->Cbuf;
-                        }
-                }
-                // Done with this channel. Move to next, removing this one from 
-                // the queue of channels if we cleaned it out (i.e., didn't get clogged.
-                pCh->Cbuf_strip = stripIndex;
-                write_unlock_irqrestore(&pCh->Cbuf_spinlock, flags);
-        }  // Either clogged or finished all the work
-
-#ifdef IP2DEBUG_TRACE
-        if ( !bailout ) {
-                ip2trace (ITRC_NO_PORT, ITRC_ERROR, 1, 0 );
-        }
-#endif
-}
-
-//******************************************************************************
-// Function:   i2StuffFifoFlow(pB)
-// Parameters: Pointer to a board structure
-// Returns:    Nothing
-//
-// Description:
-// Stuffs as many flow control packets into the fifo as possible. This is easier
-// even than doing normal bypass commands, because there is always at most one
-// packet, already assembled, for each channel.
-//******************************************************************************
-static inline void
-i2StuffFifoFlow(i2eBordStrPtr pB)
-{
-        i2ChanStrPtr pCh;
-        unsigned short paddedSize = roundup(sizeof(flowIn), 2);
-
-        ip2trace (ITRC_NO_PORT, ITRC_SFLOW, ITRC_ENTER, 2,
-                pB->i2eFifoRemains, paddedSize );
-
-        // Continue processing so long as there are entries, or there is room in the
-        // fifo. Each entry represents a channel with something to do.
-        while ( (NULL != (pCh = i2DeQueueNeeds(pB,NEED_FLOW)))) {
-                pB->debugFlowCount++;
-
-                // NO Chan LOCK needed ???
-                if ( 0 == i2Write2Fifo(pB,(unsigned char *)&(pCh->infl),paddedSize,0)) {
-                        break;
-                }
-#ifdef DEBUG_FIFO
-                WriteDBGBuf("FLOW",(unsigned char *) &(pCh->infl), paddedSize);
-#endif /* DEBUG_FIFO */
-
-        }  // Either clogged or finished all the work
-
-        ip2trace (ITRC_NO_PORT, ITRC_SFLOW, ITRC_RETURN, 0 );
-}
-
-//******************************************************************************
-// Function:   i2StuffFifoInline(pB)
-// Parameters: Pointer to a board structure
-// Returns:    Nothing
-//
-// Description:
-// Stuffs as much data and inline commands into the fifo as possible. This is
-// the most complex fifo-stuffing operation, since there if now the channel
-// flow-control issue to deal with.
-//******************************************************************************
-static inline void
-i2StuffFifoInline(i2eBordStrPtr pB)
-{
-        i2ChanStrPtr pCh;
-        unsigned char *pRemove;
-        unsigned short stripIndex;
-        unsigned short packetSize;
-        unsigned short paddedSize;
-        unsigned short notClogged = 1;
-        unsigned short flowsize;
-        unsigned long flags;
-
-        int bailout  = 1000;
-        int bailout2;
-
-        ip2trace (ITRC_NO_PORT, ITRC_SICMD, ITRC_ENTER, 3, pB->i2eFifoRemains, 
-                        pB->i2Dbuf_strip, pB->i2Dbuf_stuff );
-
-        // Continue processing so long as there are entries, or there is room in the
-        // fifo. Each entry represents a channel with something to do.
-        while ( --bailout && notClogged && 
-                        (NULL != (pCh = i2DeQueueNeeds(pB,NEED_INLINE))) )
-        {
-                write_lock_irqsave(&pCh->Obuf_spinlock, flags);
-                stripIndex = pCh->Obuf_strip;
-
-                ip2trace (CHANN, ITRC_SICMD, 3, 2, stripIndex, pCh->Obuf_stuff );
-
-                // as long as there are packets for this channel...
-                bailout2 = 1000;
-                while ( --bailout2 && stripIndex != pCh->Obuf_stuff) {
-                        pRemove = &(pCh->Obuf[stripIndex]);
-
-                        // Must determine whether this be a data or command packet to
-                        // calculate correctly the header size and the amount of
-                        // flow-control credit this type of packet will use.
-                        if (PTYPE_OF(pRemove) == PTYPE_DATA) {
-                                flowsize = DATA_COUNT_OF(pRemove);
-                                packetSize = flowsize + sizeof(i2DataHeader);
-                        } else {
-                                flowsize = CMD_COUNT_OF(pRemove);
-                                packetSize = flowsize + sizeof(i2CmdHeader);
-                        }
-                        flowsize = CREDIT_USAGE(flowsize);
-                        paddedSize = roundup(packetSize, 2);
-
-                        ip2trace (CHANN, ITRC_SICMD, 4, 2, pB->i2eFifoRemains, paddedSize );
-
-                        // If we don't have enough credits from the board to send the data,
-                        // flag the channel that we are waiting for flow control credit, and
-                        // break out. This will clean up this channel and remove us from the
-                        // queue of hot things to do.
-
-                                ip2trace (CHANN, ITRC_SICMD, 5, 2, pCh->outfl.room, flowsize );
-
-                        if (pCh->outfl.room <= flowsize)        {
-                                // Do Not have the credits to send this packet.
-                                i2QueueNeeds(pB, pCh, NEED_CREDIT);
-                                notClogged = 0;
-                                break;   // So to do next channel
-                        }
-                        if ( (paddedSize > 0) 
-                                && ( 0 == i2Write2Fifo(pB, pRemove, paddedSize, 128))) {
-                                // Do Not have room in fifo to send this packet.
-                                notClogged = 0;
-                                i2QueueNeeds(pB, pCh, NEED_INLINE);     
-                                break;   // Break from the channel
-                        }
-#ifdef DEBUG_FIFO
-WriteDBGBuf("DATA", pRemove, paddedSize);
-#endif /* DEBUG_FIFO */
-                        pB->debugInlineCount++;
-
-                        pCh->icount.tx += flowsize;
-                        // Update current credits
-                        pCh->outfl.room -= flowsize;
-                        pCh->outfl.asof += flowsize;
-                        if (PTYPE_OF(pRemove) == PTYPE_DATA) {
-                                pCh->Obuf_char_count -= DATA_COUNT_OF(pRemove);
-                        }
-                        pRemove += packetSize;
-                        stripIndex += packetSize;
-
-                        ip2trace (CHANN, ITRC_SICMD, 6, 2, stripIndex, pCh->Obuf_strip);
-
-                        if (stripIndex >= OBUF_SIZE) {
-                                stripIndex = 0;
-                                pRemove = pCh->Obuf;
-
-                                ip2trace (CHANN, ITRC_SICMD, 7, 1, stripIndex );
-
-                        }
-                }       /* while */
-                if ( !bailout2 ) {
-                        ip2trace (CHANN, ITRC_ERROR, 3, 0 );
-                }
-                // Done with this channel. Move to next, removing this one from the
-                // queue of channels if we cleaned it out (i.e., didn't get clogged.
-                pCh->Obuf_strip = stripIndex;
-                write_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
-                if ( notClogged )
-                {
-
-                        ip2trace (CHANN, ITRC_SICMD, 8, 0 );
-
-                        if ( pCh->pTTY ) {
-                                ip2_owake(pCh->pTTY);
-                        }
-                }
-        }  // Either clogged or finished all the work
-
-        if ( !bailout ) {
-                ip2trace (ITRC_NO_PORT, ITRC_ERROR, 4, 0 );
-        }
-
-        ip2trace (ITRC_NO_PORT, ITRC_SICMD, ITRC_RETURN, 1,pB->i2Dbuf_strip);
-}
-
-//******************************************************************************
-// Function:   serviceOutgoingFifo(pB)
-// Parameters: Pointer to a board structure
-// Returns:    Nothing
-//
-// Description:
-// Helper routine to put data in the outgoing fifo, if we aren't already waiting
-// for something to be there. If the fifo has only room for a very little data,
-// go head and hit the board with a mailbox hit immediately. Otherwise, it will
-// have to happen later in the interrupt processing. Since this routine may be
-// called both at interrupt and foreground time, we must turn off interrupts
-// during the entire process.
-//******************************************************************************
-static void
-serviceOutgoingFifo(i2eBordStrPtr pB)
-{
-        // If we aren't currently waiting for the board to empty our fifo, service
-        // everything that is pending, in priority order (especially, Bypass before
-        // Inline).
-        if ( ! pB->i2eWaitingForEmptyFifo )
-        {
-                i2StuffFifoFlow(pB);
-                i2StuffFifoBypass(pB);
-                i2StuffFifoInline(pB);
-
-                iiSendPendingMail(pB);
-        } 
-}
-
-//******************************************************************************
-// Function:   i2ServiceBoard(pB)
-// Parameters: Pointer to a board structure
-// Returns:    Nothing
-//
-// Description:
-// Normally this is called from interrupt level, but there is deliberately
-// nothing in here specific to being called from interrupt level. All the
-// hardware-specific, interrupt-specific things happen at the outer levels.
-//
-// For example, a timer interrupt could drive this routine for some sort of
-// polled operation. The only requirement is that the programmer deal with any
-// atomiticity/concurrency issues that result.
-//
-// This routine responds to the board's having sent mailbox information to the
-// host (which would normally cause an interrupt). This routine reads the
-// incoming mailbox. If there is no data in it, this board did not create the
-// interrupt and/or has nothing to be done to it. (Except, if we have been
-// waiting to write mailbox data to it, we may do so.
-//
-// Based on the value in the mailbox, we may take various actions.
-//
-// No checking here of pB validity: after all, it shouldn't have been called by
-// the handler unless pB were on the list.
-//******************************************************************************
-static inline int
-i2ServiceBoard ( i2eBordStrPtr pB )
-{
-        unsigned inmail;
-        unsigned long flags;
-
-
-        /* This should be atomic because of the way we are called... */
-        if (NO_MAIL_HERE == ( inmail = pB->i2eStartMail ) ) {
-                inmail = iiGetMail(pB);
-        }
-        pB->i2eStartMail = NO_MAIL_HERE;
-
-        ip2trace (ITRC_NO_PORT, ITRC_INTR, 2, 1, inmail );
-
-        if (inmail != NO_MAIL_HERE) {
-                // If the board has gone fatal, nothing to do but hit a bit that will
-                // alert foreground tasks to protest!
-                if ( inmail & MB_FATAL_ERROR ) {
-                        pB->i2eFatal = 1;
-                        goto exit_i2ServiceBoard;
-                }
-
-                /* Assuming no fatal condition, we proceed to do work */
-                if ( inmail & MB_IN_STUFFED ) {
-                        pB->i2eFifoInInts++;
-                        i2StripFifo(pB);     /* There might be incoming packets */
-                }
-
-                if (inmail & MB_OUT_STRIPPED) {
-                        pB->i2eFifoOutInts++;
-                        write_lock_irqsave(&pB->write_fifo_spinlock, flags);
-                        pB->i2eFifoRemains = pB->i2eFifoSize;
-                        pB->i2eWaitingForEmptyFifo = 0;
-                        write_unlock_irqrestore(&pB->write_fifo_spinlock,
-                                        flags);
-
-                        ip2trace (ITRC_NO_PORT, ITRC_INTR, 30, 1, pB->i2eFifoRemains );
-
-                }
-                serviceOutgoingFifo(pB);
-        }
-
-        ip2trace (ITRC_NO_PORT, ITRC_INTR, 8, 0 );
-
-exit_i2ServiceBoard:
-
-        return 0;
-}
diff --git a/drivers/char/ip2/i2lib.h b/drivers/char/ip2/i2lib.h
deleted file mode 100644
index e559e9bac06d..000000000000
--- a/drivers/char/ip2/i2lib.h
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
-*
-*   (c) 1998 by Computone Corporation
-*
-********************************************************************************
-*
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort II family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: Header file for high level library functions
-*
-*******************************************************************************/
-#ifndef I2LIB_H
-#define I2LIB_H   1
-//------------------------------------------------------------------------------
-// I2LIB.H
-//
-// IntelliPort-II and IntelliPort-IIEX
-//
-// Defines, structure definitions, and external declarations for i2lib.c
-//------------------------------------------------------------------------------
-//--------------------------------------
-// Mandatory Includes:
-//--------------------------------------
-#include "ip2types.h"
-#include "i2ellis.h"
-#include "i2pack.h"
-#include "i2cmd.h"
-#include <linux/workqueue.h>
-
-//------------------------------------------------------------------------------
-// i2ChanStr -- Channel Structure:
-// Used to track per-channel information for the library routines using standard
-// loadware. Note also, a pointer to an array of these structures is patched
-// into the i2eBordStr (see i2ellis.h)
-//------------------------------------------------------------------------------
-//
-// If we make some limits on the maximum block sizes, we can avoid dealing with
-// buffer wrap. The wrapping of the buffer is based on where the start of the
-// packet is. Then there is always room for the packet contiguously.
-//
-// Maximum total length of an outgoing data or in-line command block. The limit
-// of 36 on data is quite arbitrary and based more on DOS memory limitations
-// than the board interface. However, for commands, the maximum packet length is
-// MAX_CMD_PACK_SIZE, because the field size for the count is only a few bits
-// (see I2PACK.H) in such packets. For data packets, the count field size is not
-// the limiting factor. As of this writing, MAX_OBUF_BLOCK < MAX_CMD_PACK_SIZE,
-// but be careful if wanting to modify either.
-//
-#define MAX_OBUF_BLOCK  36
-
-// Another note on maximum block sizes: we are buffering packets here. Data is
-// put into the buffer (if there is room) regardless of the credits from the
-// board. The board sends new credits whenever it has removed from his buffers a
-// number of characters equal to 80% of total buffer size. (Of course, the total
-// buffer size is what is reported when the very first set of flow control
-// status packets are received from the board. Therefore, to be robust, you must
-// always fill the board to at least 80% of the current credit limit, else you
-// might not give it enough to trigger a new report. These conditions are
-// obtained here so long as the maximum output block size is less than 20% the
-// size of the board's output buffers. This is true at present by "coincidence"
-// or "infernal knowledge": the board's output buffers are at least 700 bytes
-// long (20% = 140 bytes, at least). The 80% figure is "official", so the safest
-// strategy might be to trap the first flow control report and guarantee that
-// the effective maxObufBlock is the minimum of MAX_OBUF_BLOCK and 20% of first
-// reported buffer credit.
-//
-#define MAX_CBUF_BLOCK  6       // Maximum total length of a bypass command block
-
-#define IBUF_SIZE       512     // character capacity of input buffer per channel
-#define OBUF_SIZE       1024// character capacity of output buffer per channel
-#define CBUF_SIZE       10      // character capacity of output bypass buffer
-
-typedef struct _i2ChanStr
-{
-        // First, back-pointers so that given a pointer to this structure, you can
-        // determine the correct board and channel number to reference, (say, when
-        // issuing commands, etc. (Note, channel number is in infl.hd.i2sChannel.)
-
-        int      port_index;    // Index of port in channel structure array attached
-                                                        // to board structure.
-        PTTY     pTTY;          // Pointer to tty structure for port (OS specific)
-        USHORT   validity;      // Indicates whether the given channel has been
-                                                        // initialized, really exists (or is a missing
-                                                        // channel, e.g. channel 9 on an 8-port box.)
-
-        i2eBordStrPtr  pMyBord; // Back-pointer to this channel's board structure 
-
-        int      wopen;                 // waiting fer carrier
-
-        int      throttled;             // Set if upper layer can take no data
-
-        int      flags;         // Defined in tty.h
-
-        PWAITQ   open_wait;     // Pointer for OS sleep function.
-        PWAITQ   close_wait;    // Pointer for OS sleep function.
-        PWAITQ   delta_msr_wait;// Pointer for OS sleep function.
-        PWAITQ   dss_now_wait;  // Pointer for OS sleep function.
-
-        struct timer_list  BookmarkTimer;   // Used by i2DrainOutput
-        wait_queue_head_t pBookmarkWait;   // Used by i2DrainOutput
-
-        int      BaudBase;
-        int      BaudDivisor;
-
-        USHORT   ClosingDelay;
-        USHORT   ClosingWaitTime;
-
-        volatile
-        flowIn   infl;  // This structure is initialized as a completely
-                                        // formed flow-control command packet, and as such
-                                        // has the channel number, also the capacity and
-                                        // "as-of" data needed continuously.
-
-        USHORT   sinceLastFlow; // Counts the number of characters read from input
-                                                        // buffers, since the last time flow control info
-                                                        // was sent.
-
-        USHORT   whenSendFlow;  // Determines when new flow control is to be sent to
-                                                        // the board. Note unlike earlier manifestations of
-                                                        // the driver, these packets can be sent from
-                                                        // in-place.
-
-        USHORT   channelNeeds;  // Bit map of important things which must be done
-                                                        // for this channel. (See bits below )
-
-        volatile
-        flowStat outfl;         // Same type of structure is used to hold current
-                                                        // flow control information used to control our
-                                                        // output. "asof" is kept updated as data is sent,
-                                                        // and "room" never goes to zero.
-
-        // The incoming ring buffer
-        // Unlike the outgoing buffers, this holds raw data, not packets. The two
-        // extra bytes are used to hold the byte-padding when there is room for an
-        // odd number of bytes before we must wrap.
-        //
-        UCHAR    Ibuf[IBUF_SIZE + 2];
-        volatile
-        USHORT   Ibuf_stuff;     // Stuffing index
-        volatile
-        USHORT   Ibuf_strip;     // Stripping index
-
-        // The outgoing ring-buffer: Holds Data and command packets. N.B., even
-        // though these are in the channel structure, the channel is also written
-        // here, the easier to send it to the fifo when ready. HOWEVER, individual
-        // packets here are NOT padded to even length: the routines for writing
-        // blocks to the fifo will pad to even byte counts.
-        //
-        UCHAR   Obuf[OBUF_SIZE+MAX_OBUF_BLOCK+4];
-        volatile
-        USHORT  Obuf_stuff;     // Stuffing index
-        volatile
-        USHORT  Obuf_strip;     // Stripping index
-        int     Obuf_char_count;
-
-        // The outgoing bypass-command buffer. Unlike earlier manifestations, the
-        // flow control packets are sent directly from the structures. As above, the
-        // channel number is included in the packet, but they are NOT padded to even
-        // size.
-        //
-        UCHAR    Cbuf[CBUF_SIZE+MAX_CBUF_BLOCK+2];
-        volatile
-        USHORT   Cbuf_stuff;     // Stuffing index
-        volatile
-        USHORT   Cbuf_strip;     // Stripping index
-
-        // The temporary buffer for the Linux tty driver PutChar entry.
-        //
-        UCHAR    Pbuf[MAX_OBUF_BLOCK - sizeof (i2DataHeader)];
-        volatile
-        USHORT   Pbuf_stuff;     // Stuffing index
-
-        // The state of incoming data-set signals
-        //
-        USHORT   dataSetIn;     // Bit-mapped according to below. Also indicates
-                                                        // whether a break has been detected since last
-                                                        // inquiry.
-
-        // The state of outcoming data-set signals (as far as we can tell!)
-        //
-        USHORT   dataSetOut;     // Bit-mapped according to below. 
-
-        // Most recent hot-key identifier detected
-        //
-        USHORT   hotKeyIn;      // Hot key as sent by the board, HOT_CLEAR indicates
-                                // no hot key detected since last examined.
-
-        // Counter of outstanding requests for bookmarks
-        //
-        short   bookMarks;      // Number of outstanding bookmark requests, (+ive
-                                                // whenever a bookmark request if queued up, -ive
-                                                // whenever a bookmark is received).
-
-        // Misc options
-        //
-        USHORT   channelOptions;   // See below
-
-        // To store various incoming special packets
-        //
-        debugStat   channelStatus;
-        cntStat     channelRcount;
-        cntStat     channelTcount;
-        failStat    channelFail;
-
-        // To store the last values for line characteristics we sent to the board.
-        //
-        int     speed;
-
-        int flush_flags;
-
-        void (*trace)(unsigned short,unsigned char,unsigned char,unsigned long,...);
-
-        /*
-         * Kernel counters for the 4 input interrupts 
-         */
-        struct async_icount icount;
-
-        /*
-         *      Task queues for processing input packets from the board.
-         */
-        struct work_struct      tqueue_input;
-        struct work_struct      tqueue_status;
-        struct work_struct      tqueue_hangup;
-
-        rwlock_t Ibuf_spinlock;
-        rwlock_t Obuf_spinlock;
-        rwlock_t Cbuf_spinlock;
-        rwlock_t Pbuf_spinlock;
-
-} i2ChanStr, *i2ChanStrPtr;
-
-//---------------------------------------------------
-// Manifests and bit-maps for elements in i2ChanStr
-//---------------------------------------------------
-//
-// flush flags
-//
-#define STARTFL_FLAG 1
-#define STOPFL_FLAG  2
-
-// validity
-//
-#define CHANNEL_MAGIC_BITS 0xff00
-#define CHANNEL_MAGIC      0x5300   // (validity & CHANNEL_MAGIC_BITS) ==
-                                                                        // CHANNEL_MAGIC --> structure good
-
-#define CHANNEL_SUPPORT    0x0001   // Indicates channel is supported, exists,
-                                                                        // and passed P.O.S.T.
-
-// channelNeeds
-//
-#define NEED_FLOW    1  // Indicates flow control has been queued
-#define NEED_INLINE  2  // Indicates inline commands or data queued
-#define NEED_BYPASS  4  // Indicates bypass commands queued
-#define NEED_CREDIT  8  // Indicates would be sending except has not sufficient
-                                                // credit. The data is still in the channel structure,
-                                                // but the channel is not enqueued in the board
-                                                // structure again until there is a credit received from
-                                                // the board.
-
-// dataSetIn (Also the bits for i2GetStatus return value)
-//
-#define I2_DCD 1
-#define I2_CTS 2
-#define I2_DSR 4
-#define I2_RI  8
-
-// dataSetOut (Also the bits for i2GetStatus return value)
-//
-#define I2_DTR 1
-#define I2_RTS 2
-
-// i2GetStatus() can optionally clear these bits
-//
-#define I2_BRK    0x10  // A break was detected
-#define I2_PAR    0x20  // A parity error was received 
-#define I2_FRA    0x40  // A framing error was received
-#define I2_OVR    0x80  // An overrun error was received 
-
-// i2GetStatus() automatically clears these bits */
-//
-#define I2_DDCD   0x100 // DCD changed from its  former value
-#define I2_DCTS   0x200 // CTS changed from its former value 
-#define I2_DDSR   0x400 // DSR changed from its former value 
-#define I2_DRI    0x800 // RI changed from its former value 
-
-// hotKeyIn
-//
-#define HOT_CLEAR 0x1322   // Indicates that no hot-key has been detected
-
-// channelOptions
-//
-#define CO_NBLOCK_WRITE 1       // Writes don't block waiting for buffer. (Default
-                                                        // is, they do wait.)
-
-// fcmodes
-//
-#define I2_OUTFLOW_CTS  0x0001
-#define I2_INFLOW_RTS   0x0002
-#define I2_INFLOW_DSR   0x0004
-#define I2_INFLOW_DTR   0x0008
-#define I2_OUTFLOW_DSR  0x0010
-#define I2_OUTFLOW_DTR  0x0020
-#define I2_OUTFLOW_XON  0x0040
-#define I2_OUTFLOW_XANY 0x0080
-#define I2_INFLOW_XON   0x0100
-
-#define I2_CRTSCTS      (I2_OUTFLOW_CTS|I2_INFLOW_RTS)
-#define I2_IXANY_MODE   (I2_OUTFLOW_XON|I2_OUTFLOW_XANY)
-
-//-------------------------------------------
-// Macros used from user level like functions
-//-------------------------------------------
-
-// Macros to set and clear channel options
-//
-#define i2SetOption(pCh, option) pCh->channelOptions |= option
-#define i2ClrOption(pCh, option) pCh->channelOptions &= ~option
-
-// Macro to set fatal-error trap
-//
-#define i2SetFatalTrap(pB, routine) pB->i2eFatalTrap = routine
-
-//--------------------------------------------
-// Declarations and prototypes for i2lib.c
-//--------------------------------------------
-//
-static int  i2InitChannels(i2eBordStrPtr, int, i2ChanStrPtr);
-static int  i2QueueCommands(int, i2ChanStrPtr, int, int, cmdSyntaxPtr,...);
-static int  i2GetStatus(i2ChanStrPtr, int);
-static int  i2Input(i2ChanStrPtr);
-static int  i2InputFlush(i2ChanStrPtr);
-static int  i2Output(i2ChanStrPtr, const char *, int);
-static int  i2OutputFree(i2ChanStrPtr);
-static int  i2ServiceBoard(i2eBordStrPtr);
-static void i2DrainOutput(i2ChanStrPtr, int);
-
-#ifdef IP2DEBUG_TRACE
-void ip2trace(unsigned short,unsigned char,unsigned char,unsigned long,...);
-#else
-#define ip2trace(a,b,c,d...) do {} while (0)
-#endif
-
-// Argument to i2QueueCommands
-//
-#define C_IN_LINE 1
-#define C_BYPASS  0
-
-#endif   // I2LIB_H
diff --git a/drivers/char/ip2/i2pack.h b/drivers/char/ip2/i2pack.h
deleted file mode 100644
index 00342a677c90..000000000000
--- a/drivers/char/ip2/i2pack.h
+++ /dev/null
@@ -1,364 +0,0 @@
-/*******************************************************************************
-*
-*   (c) 1998 by Computone Corporation
-*
-********************************************************************************
-*
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort II family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: Definitions of the packets used to transfer data and commands
-*                Host <--> Board. Information provided here is only applicable
-*                when the standard loadware is active.
-*
-*******************************************************************************/
-#ifndef I2PACK_H
-#define I2PACK_H  1
-
-//-----------------------------------------------
-// Revision History:
-//
-// 10 October 1991   MAG First draft
-// 24 February 1992  MAG Additions for 1.4.x loadware
-// 11 March 1992     MAG New status packets
-//
-//-----------------------------------------------
-
-//------------------------------------------------------------------------------
-// Packet Formats:
-//
-// Information passes between the host and board through the FIFO in packets.
-// These have headers which indicate the type of packet. Because the fifo data
-// path may be 16-bits wide, the protocol is constrained such that each packet
-// is always padded to an even byte count. (The lower-level interface routines
-// -- i2ellis.c -- are designed to do this).
-//
-// The sender (be it host or board) must place some number of complete packets
-// in the fifo, then place a message in the mailbox that packets are available.
-// Placing such a message interrupts the "receiver" (be it board or host), who
-// reads the mailbox message and determines that there are incoming packets
-// ready. Since there are no partial packets, and the length of a packet is
-// given in the header, the remainder of the packet can be read without checking
-// for FIFO empty condition. The process is repeated, packet by packet, until
-// the incoming FIFO is empty. Then the receiver uses the outbound mailbox to
-// signal the board that it has read the data. Only then can the sender place
-// additional data in the fifo.
-//------------------------------------------------------------------------------
-//
-//------------------------------------------------
-// Definition of Packet Header Area
-//------------------------------------------------
-//
-// Caution: these only define header areas. In actual use the data runs off
-// beyond the end of these structures.
-//
-// Since these structures are based on sequences of bytes which go to the board,
-// there cannot be ANY padding between the elements.
-#pragma pack(1)
-
-//----------------------------
-// DATA PACKETS
-//----------------------------
-
-typedef struct _i2DataHeader
-{
-        unsigned char i2sChannel;  /* The channel number: 0-255 */
-
-        // -- Bitfields are allocated LSB first --
-
-        // For incoming data, indicates whether this is an ordinary packet or a
-        // special one (e.g., hot key hit).
-        unsigned i2sId : 2 __attribute__ ((__packed__));
-
-        // For tagging data packets. There are flush commands which flush only data
-        // packets bearing a particular tag. (used in implementing IntelliView and
-        // IntelliPrint). THE TAG VALUE 0xf is RESERVED and must not be used (it has
-        // meaning internally to the loadware).
-        unsigned i2sTag : 4;
-
-        // These two bits determine the type of packet sent/received.
-        unsigned i2sType : 2;
-
-        // The count of data to follow: does not include the possible additional
-        // padding byte. MAXIMUM COUNT: 4094. The top four bits must be 0.
-        unsigned short i2sCount;
-
-} i2DataHeader, *i2DataHeaderPtr;
-
-// Structure is immediately followed by the data, proper.
-
-//----------------------------
-// NON-DATA PACKETS
-//----------------------------
-
-typedef struct _i2CmdHeader
-{
-        unsigned char i2sChannel;       // The channel number: 0-255 (Except where noted
-                                                                // - see below
-
-        // Number of bytes of commands, status or whatever to follow
-        unsigned i2sCount : 6;
-
-        // These two bits determine the type of packet sent/received.
-        unsigned i2sType : 2;
-
-} i2CmdHeader, *i2CmdHeaderPtr;
-
-// Structure is immediately followed by the applicable data.
-
-//---------------------------------------
-// Flow Control Packets (Outbound)
-//---------------------------------------
-
-// One type of outbound command packet is so important that the entire structure
-// is explicitly defined here. That is the flow-control packet. This is never
-// sent by user-level code (as would be the commands to raise/lower DTR, for
-// example). These are only sent by the library routines in response to reading
-// incoming data into the buffers.
-//
-// The parameters inside the command block are maintained in place, then the
-// block is sent at the appropriate time.
-
-typedef struct _flowIn
-{
-        i2CmdHeader    hd;      // Channel #, count, type (see above)
-        unsigned char  fcmd;    // The flow control command (37)
-        unsigned short asof;    // As of byte number "asof" (LSB first!) I have room
-                                                        // for "room" bytes
-        unsigned short room;
-} flowIn, *flowInPtr;
-
-//----------------------------------------
-// (Incoming) Status Packets
-//----------------------------------------
-
-// Incoming packets which are non-data packets are status packets. In this case,
-// the channel number in the header is unimportant. What follows are one or more
-// sub-packets, the first word of which consists of the channel (first or low
-// byte) and the status indicator (second or high byte), followed by possibly
-// more data.
-
-#define STAT_CTS_UP     0  /* CTS raised  (no other bytes) */
-#define STAT_CTS_DN     1  /* CTS dropped (no other bytes) */
-#define STAT_DCD_UP     2  /* DCD raised  (no other bytes) */
-#define STAT_DCD_DN     3  /* DCD dropped (no other bytes) */
-#define STAT_DSR_UP     4  /* DSR raised  (no other bytes) */
-#define STAT_DSR_DN     5  /* DSR dropped (no other bytes) */
-#define STAT_RI_UP      6  /* RI  raised  (no other bytes) */
-#define STAT_RI_DN      7  /* RI  dropped (no other bytes) */
-#define STAT_BRK_DET    8  /* BRK detect  (no other bytes) */
-#define STAT_FLOW       9  /* Flow control(-- more: see below */
-#define STAT_BMARK      10 /* Bookmark    (no other bytes)
-                                                        * Bookmark is sent as a response to
-                                                        * a command 60: request for bookmark
-                                                        */
-#define STAT_STATUS     11 /* Special packet: see below */
-#define STAT_TXCNT      12 /* Special packet: see below */
-#define STAT_RXCNT      13 /* Special packet: see below */
-#define STAT_BOXIDS     14 /* Special packet: see below */
-#define STAT_HWFAIL     15 /* Special packet: see below */
-
-#define STAT_MOD_ERROR  0xc0
-#define STAT_MODEM      0xc0/* If status & STAT_MOD_ERROR:
-                                                         * == STAT_MODEM, then this is a modem
-                                                         * status packet, given in response to a
-                                                         * CMD_DSS_NOW command.
-                                                         * The low nibble has each data signal:
-                                                         */
-#define STAT_MOD_DCD    0x8
-#define STAT_MOD_RI     0x4
-#define STAT_MOD_DSR    0x2
-#define STAT_MOD_CTS    0x1
-
-#define STAT_ERROR      0x80/* If status & STAT_MOD_ERROR
-                                                         * == STAT_ERROR, then
-                                                         * sort of error on the channel.
-                                                         * The remaining seven bits indicate
-                                                         * what sort of error it is.
-                                                         */
-/* The low three bits indicate parity, framing, or overrun errors */
-
-#define STAT_E_PARITY   4     /* Parity error */
-#define STAT_E_FRAMING  2     /* Framing error */
-#define STAT_E_OVERRUN  1     /* (uxart) overrun error */
-
-//---------------------------------------
-// STAT_FLOW packets
-//---------------------------------------
-
-typedef struct _flowStat
-{
-        unsigned short asof;
-        unsigned short room;
-}flowStat, *flowStatPtr;
-
-// flowStat packets are received from the board to regulate the flow of outgoing
-// data. A local copy of this structure is also kept to track the amount of
-// credits used and credits remaining. "room" is the amount of space in the
-// board's buffers, "as of" having received a certain byte number. When sending
-// data to the fifo, you must calculate how much buffer space your packet will
-// use.  Add this to the current "asof" and subtract it from the current "room".
-//
-// The calculation for the board's buffer is given by CREDIT_USAGE, where size
-// is the un-rounded count of either data characters or command characters.
-// (Which is to say, the count rounded up, plus two).
-
-#define CREDIT_USAGE(size) (((size) + 3) & ~1)
-
-//---------------------------------------
-// STAT_STATUS packets
-//---------------------------------------
-
-typedef  struct   _debugStat
-{
-        unsigned char d_ccsr;
-        unsigned char d_txinh;
-        unsigned char d_stat1;
-        unsigned char d_stat2;
-} debugStat, *debugStatPtr;
-
-// debugStat packets are sent to the host in response to a CMD_GET_STATUS
-// command.  Each byte is bit-mapped as described below:
-
-#define D_CCSR_XON      2     /* Has received XON, ready to transmit */
-#define D_CCSR_XOFF     4     /* Has received XOFF, not transmitting */
-#define D_CCSR_TXENAB   8     /* Transmitter is enabled */
-#define D_CCSR_RXENAB   0x80  /* Receiver is enabled */
-
-#define D_TXINH_BREAK   1     /* We are sending a break */
-#define D_TXINH_EMPTY   2     /* No data to send */
-#define D_TXINH_SUSP    4     /* Output suspended via command 57 */
-#define D_TXINH_CMD     8     /* We are processing an in-line command */
-#define D_TXINH_LCD     0x10  /* LCD diagnostics are running */
-#define D_TXINH_PAUSE   0x20  /* We are processing a PAUSE command */
-#define D_TXINH_DCD     0x40  /* DCD is low, preventing transmission */
-#define D_TXINH_DSR     0x80  /* DSR is low, preventing transmission */
-
-#define D_STAT1_TXEN    1     /* Transmit INTERRUPTS enabled */
-#define D_STAT1_RXEN    2     /* Receiver INTERRUPTS enabled */
-#define D_STAT1_MDEN    4     /* Modem (data set sigs) interrupts enabled */
-#define D_STAT1_RLM     8     /* Remote loopback mode selected */
-#define D_STAT1_LLM     0x10  /* Local internal loopback mode selected */
-#define D_STAT1_CTS     0x20  /* CTS is low, preventing transmission */
-#define D_STAT1_DTR     0x40  /* DTR is low, to stop remote transmission */
-#define D_STAT1_RTS     0x80  /* RTS is low, to stop remote transmission */
-
-#define D_STAT2_TXMT    1     /* Transmit buffers are all empty */
-#define D_STAT2_RXMT    2     /* Receive buffers are all empty */
-#define D_STAT2_RXINH   4     /* Loadware has tried to inhibit remote
-                                                           * transmission:  dropped DTR, sent XOFF,
-                                                           * whatever...
-                                                           */
-#define D_STAT2_RXFLO   8     /* Loadware can send no more data to host
-                                                           * until it receives a flow-control packet
-                                                           */
-//-----------------------------------------
-// STAT_TXCNT and STAT_RXCNT packets
-//----------------------------------------
-
-typedef  struct   _cntStat
-{
-        unsigned short cs_time;    // (Assumes host is little-endian!)
-        unsigned short cs_count;
-} cntStat, *cntStatPtr;
-
-// These packets are sent in response to a CMD_GET_RXCNT or a CMD_GET_TXCNT
-// bypass command. cs_time is a running 1 Millisecond counter which acts as a
-// time stamp. cs_count is a running counter of data sent or received from the
-// uxarts. (Not including data added by the chip itself, as with CRLF
-// processing).
-//------------------------------------------
-// STAT_HWFAIL packets
-//------------------------------------------
-
-typedef struct _failStat
-{
-        unsigned char fs_written;
-        unsigned char fs_read;
-        unsigned short fs_address;
-} failStat, *failStatPtr;
-
-// This packet is sent whenever the on-board diagnostic process detects an
-// error. At startup, this process is dormant. The host can wake it up by
-// issuing the bypass command CMD_HW_TEST. The process runs at low priority and
-// performs continuous hardware verification; writing data to certain on-board
-// registers, reading it back, and comparing. If it detects an error, this
-// packet is sent to the host, and the process goes dormant again until the host
-// sends another CMD_HW_TEST. It then continues with the next register to be
-// tested.
-
-//------------------------------------------------------------------------------
-// Macros to deal with the headers more easily! Note that these are defined so
-// they may be used as "left" as well as "right" expressions.
-//------------------------------------------------------------------------------
-
-// Given a pointer to the packet, reference the channel number
-//
-#define CHANNEL_OF(pP)  ((i2DataHeaderPtr)(pP))->i2sChannel
-
-// Given a pointer to the packet, reference the Packet type
-//
-#define PTYPE_OF(pP) ((i2DataHeaderPtr)(pP))->i2sType
-
-// The possible types of packets
-//
-#define PTYPE_DATA   0  /* Host <--> Board */
-#define PTYPE_BYPASS 1  /* Host ---> Board */
-#define PTYPE_INLINE 2  /* Host ---> Board */
-#define PTYPE_STATUS 2  /* Host <--- Board */
-
-// Given a pointer to a Data packet, reference the Tag
-//
-#define TAG_OF(pP) ((i2DataHeaderPtr)(pP))->i2sTag
-
-// Given a pointer to a Data packet, reference the data i.d.
-//
-#define ID_OF(pP)  ((i2DataHeaderPtr)(pP))->i2sId
-
-// The possible types of ID's
-//
-#define ID_ORDINARY_DATA   0
-#define ID_HOT_KEY         1
-
-// Given a pointer to a Data packet, reference the count
-//
-#define DATA_COUNT_OF(pP) ((i2DataHeaderPtr)(pP))->i2sCount
-
-// Given a pointer to a Data packet, reference the beginning of data
-//
-#define DATA_OF(pP) &((unsigned char *)(pP))[4] // 4 = size of header
-
-// Given a pointer to a Non-Data packet, reference the count
-//
-#define CMD_COUNT_OF(pP) ((i2CmdHeaderPtr)(pP))->i2sCount
-
-#define MAX_CMD_PACK_SIZE  62 // Maximum size of such a count
-
-// Given a pointer to a Non-Data packet, reference the beginning of data
-//
-#define CMD_OF(pP) &((unsigned char *)(pP))[2]  // 2 = size of header
-
-//--------------------------------
-// MailBox Bits:
-//--------------------------------
-
-//--------------------------
-// Outgoing (host to board)
-//--------------------------
-//
-#define MB_OUT_STUFFED     0x80  // Host has placed output in fifo 
-#define MB_IN_STRIPPED     0x40  // Host has read in all input from fifo 
-
-//--------------------------
-// Incoming (board to host)
-//--------------------------
-//
-#define MB_IN_STUFFED      0x80  // Board has placed input in fifo 
-#define MB_OUT_STRIPPED    0x40  // Board has read all output from fifo 
-#define MB_FATAL_ERROR     0x20  // Board has encountered a fatal error
-
-#pragma pack()                  // Reset padding to command-line default
-
-#endif      // I2PACK_H
-
diff --git a/drivers/char/ip2/ip2.h b/drivers/char/ip2/ip2.h
deleted file mode 100644
index 936ccc533949..000000000000
--- a/drivers/char/ip2/ip2.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
-*
-*   (c) 1998 by Computone Corporation
-*
-********************************************************************************
-*
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort II family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: Driver constants for configuration and tuning
-*
-*   NOTES:
-*
-*******************************************************************************/
-#ifndef IP2_H
-#define IP2_H
-
-#include "ip2types.h"
-#include "i2cmd.h"
-
-/*************/
-/* Constants */
-/*************/
-
-/* Device major numbers - since version 2.0.26. */
-#define IP2_TTY_MAJOR      71
-#define IP2_CALLOUT_MAJOR  72
-#define IP2_IPL_MAJOR      73
-
-/* Board configuration array.
- * This array defines the hardware irq and address for up to IP2_MAX_BOARDS
- * (4 supported per ip2_types.h) ISA board addresses and irqs MUST be specified,
- * PCI and EISA boards are probed for and automagicly configed
- * iff the addresses are set to 1 and 2 respectivily.
- *    0x0100 - 0x03f0 == ISA
- *               1        == PCI
- *               2        == EISA
- *               0        == (skip this board)
- * This array defines the hardware addresses for them. Special 
- * addresses are EISA and PCI which go sniffing for boards. 
-
- * In a multiboard system the position in the array determines which port
- * devices are assigned to each board: 
- *              board 0 is assigned ttyF0.. to ttyF63, 
- *              board 1 is assigned ttyF64  to ttyF127,
- *              board 2 is assigned ttyF128 to ttyF191,
- *              board 3 is assigned ttyF192 to ttyF255. 
- *
- * In PCI and EISA bus systems each range is mapped to card in 
- * monotonically increasing slot number order, ISA position is as specified
- * here.
-
- * If the irqs are ALL set to 0,0,0,0 all boards operate in 
- * polled mode. For interrupt operation ISA boards require that the IRQ be 
- * specified, while PCI and EISA boards any nonzero entry 
- * will enable interrupts using the BIOS configured irq for the board. 
- * An invalid irq entry will default to polled mode for that card and print
- * console warning.
- 
- * When the driver is loaded as a module these setting can be overridden on the 
- * modprobe command line or on an option line in /etc/modprobe.conf.
- * If the driver is built-in the configuration must be 
- * set here for ISA cards and address set to 1 and 2 for PCI and EISA.
- *
- * Here is an example that shows most if not all possibe combinations:
-
- *static ip2config_t ip2config =
- *{
- *      {11,1,0,0},             // irqs
- *      {                               // Addresses
- *              0x0308,         // Board 0, ttyF0   - ttyF63// ISA card at io=0x308, irq=11
- *              0x0001,         // Board 1, ttyF64  - ttyF127//PCI card configured by BIOS
- *              0x0000,         // Board 2, ttyF128 - ttyF191// Slot skipped
- *              0x0002          // Board 3, ttyF192 - ttyF255//EISA card configured by BIOS
- *                                                                                               // but polled not irq driven
- *      }
- *};
- */
-
- /* this structure is zeroed out because the suggested method is to configure
-  * the driver as a module, set up the parameters with an options line in
-  * /etc/modprobe.conf and load with modprobe or kmod, the kernel
-  * module loader
-  */
-
- /* This structure is NOW always initialized when the driver is initialized.
-  * Compiled in defaults MUST be added to the io and irq arrays in
-  * ip2.c.  Those values are configurable from insmod parameters in the
-  * case of modules or from command line parameters (ip2=io,irq) when
-  * compiled in.
-  */
-
-static ip2config_t ip2config =
-{
-        {0,0,0,0},              // irqs
-        {                               // Addresses
-        /* Do NOT set compile time defaults HERE!  Use the arrays in
-                ip2.c!  These WILL be overwritten!  =mhw= */
-                0x0000,         // Board 0, ttyF0   - ttyF63
-                0x0000,         // Board 1, ttyF64  - ttyF127
-                0x0000,         // Board 2, ttyF128 - ttyF191
-                0x0000          // Board 3, ttyF192 - ttyF255
-        }
-};
-
-#endif
diff --git a/drivers/char/ip2/ip2ioctl.h b/drivers/char/ip2/ip2ioctl.h
deleted file mode 100644
index aa0a9da85e05..000000000000
--- a/drivers/char/ip2/ip2ioctl.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
-*
-*   (c) 1998 by Computone Corporation
-*
-********************************************************************************
-*
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort II family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: Driver constants for configuration and tuning
-*
-*   NOTES:
-*
-*******************************************************************************/
-
-#ifndef IP2IOCTL_H
-#define IP2IOCTL_H
-
-//*************
-//* Constants *
-//*************
-
-// High baud rates (if not defined elsewhere.
-#ifndef B153600   
-#       define B153600   0010005
-#endif
-#ifndef B307200   
-#       define B307200   0010006
-#endif
-#ifndef B921600   
-#       define B921600   0010007
-#endif
-
-#endif
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
deleted file mode 100644
index d4b71e8d0d23..000000000000
--- a/drivers/char/ip2/ip2main.c
+++ /dev/null
@@ -1,3219 +0,0 @@
-/*
-*
-*   (c) 1999 by Computone Corporation
-*
-********************************************************************************
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: Mainline code for the device driver
-*
-*******************************************************************************/
-// ToDo:
-//
-// Fix the immediate DSS_NOW problem.
-// Work over the channel stats return logic in ip2_ipl_ioctl so they
-//      make sense for all 256 possible channels and so the user space
-//      utilities will compile and work properly.
-//
-// Done:
-//
-// 1.2.14       /\/\|=mhw=|\/\/
-// Added bounds checking to ip2_ipl_ioctl to avoid potential terroristic acts.
-// Changed the definition of ip2trace to be more consistent with kernel style
-//      Thanks to Andreas Dilger <adilger@turbolabs.com> for these updates
-//
-// 1.2.13       /\/\|=mhw=|\/\/
-// DEVFS: Renamed ttf/{n} to tts/F{n} and cuf/{n} to cua/F{n} to conform
-//      to agreed devfs serial device naming convention.
-//
-// 1.2.12       /\/\|=mhw=|\/\/
-// Cleaned up some remove queue cut and paste errors
-//
-// 1.2.11       /\/\|=mhw=|\/\/
-// Clean up potential NULL pointer dereferences
-// Clean up devfs registration
-// Add kernel command line parsing for io and irq
-//      Compile defaults for io and irq are now set in ip2.c not ip2.h!
-// Reworked poll_only hack for explicit parameter setting
-//      You must now EXPLICITLY set poll_only = 1 or set all irqs to 0
-// Merged ip2_loadmain and old_ip2_init
-// Converted all instances of interruptible_sleep_on into queue calls
-//      Most of these had no race conditions but better to clean up now
-//
-// 1.2.10       /\/\|=mhw=|\/\/
-// Fixed the bottom half interrupt handler and enabled USE_IQI
-//      to split the interrupt handler into a formal top-half / bottom-half
-// Fixed timing window on high speed processors that queued messages to
-//      the outbound mail fifo faster than the board could handle.
-//
-// 1.2.9
-// Four box EX was barfing on >128k kmalloc, made structure smaller by
-// reducing output buffer size
-//
-// 1.2.8
-// Device file system support (MHW)
-//
-// 1.2.7 
-// Fixed
-// Reload of ip2 without unloading ip2main hangs system on cat of /proc/modules
-//
-// 1.2.6
-//Fixes DCD problems
-//      DCD was not reported when CLOCAL was set on call to TIOCMGET
-//
-//Enhancements:
-//      TIOCMGET requests and waits for status return
-//      No DSS interrupts enabled except for DCD when needed
-//
-// For internal use only
-//
-//#define IP2DEBUG_INIT
-//#define IP2DEBUG_OPEN
-//#define IP2DEBUG_WRITE
-//#define IP2DEBUG_READ
-//#define IP2DEBUG_IOCTL
-//#define IP2DEBUG_IPL
-
-//#define IP2DEBUG_TRACE
-//#define DEBUG_FIFO
-
-/************/
-/* Includes */
-/************/
-
-#include <linux/ctype.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/errno.h>
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/major.h>
-#include <linux/wait.h>
-#include <linux/device.h>
-#include <linux/smp_lock.h>
-#include <linux/firmware.h>
-#include <linux/platform_device.h>
-
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/termios.h>
-#include <linux/tty_driver.h>
-#include <linux/serial.h>
-#include <linux/ptrace.h>
-#include <linux/ioport.h>
-
-#include <linux/cdk.h>
-#include <linux/comstats.h>
-#include <linux/delay.h>
-#include <linux/bitops.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include <linux/vmalloc.h>
-#include <linux/init.h>
-
-#include <asm/uaccess.h>
-
-#include "ip2types.h"
-#include "ip2trace.h"
-#include "ip2ioctl.h"
-#include "ip2.h"
-#include "i2ellis.h"
-#include "i2lib.h"
-
-/*****************
- * /proc/ip2mem  *
- *****************/
-
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-
-static const struct file_operations ip2mem_proc_fops;
-static const struct file_operations ip2_proc_fops;
-
-/********************/
-/* Type Definitions */
-/********************/
-
-/*************/
-/* Constants */
-/*************/
-
-/* String constants to identify ourselves */
-static const char pcName[] = "Computone IntelliPort Plus multiport driver";
-static const char pcVersion[] = "1.2.14";
-
-/* String constants for port names */
-static const char pcDriver_name[] = "ip2";
-static const char pcIpl[] = "ip2ipl";
-
-/***********************/
-/* Function Prototypes */
-/***********************/
-
-/* Global module entry functions */
-
-/* Private (static) functions */
-static int  ip2_open(PTTY, struct file *);
-static void ip2_close(PTTY, struct file *);
-static int  ip2_write(PTTY, const unsigned char *, int);
-static int  ip2_putchar(PTTY, unsigned char);
-static void ip2_flush_chars(PTTY);
-static int  ip2_write_room(PTTY);
-static int  ip2_chars_in_buf(PTTY);
-static void ip2_flush_buffer(PTTY);
-static int  ip2_ioctl(PTTY, struct file *, UINT, ULONG);
-static void ip2_set_termios(PTTY, struct ktermios *);
-static void ip2_set_line_discipline(PTTY);
-static void ip2_throttle(PTTY);
-static void ip2_unthrottle(PTTY);
-static void ip2_stop(PTTY);
-static void ip2_start(PTTY);
-static void ip2_hangup(PTTY);
-static int  ip2_tiocmget(struct tty_struct *tty, struct file *file);
-static int  ip2_tiocmset(struct tty_struct *tty, struct file *file,
-                         unsigned int set, unsigned int clear);
-
-static void set_irq(int, int);
-static void ip2_interrupt_bh(struct work_struct *work);
-static irqreturn_t ip2_interrupt(int irq, void *dev_id);
-static void ip2_poll(unsigned long arg);
-static inline void service_all_boards(void);
-static void do_input(struct work_struct *);
-static void do_status(struct work_struct *);
-
-static void ip2_wait_until_sent(PTTY,int);
-
-static void set_params (i2ChanStrPtr, struct ktermios *);
-static int get_serial_info(i2ChanStrPtr, struct serial_struct __user *);
-static int set_serial_info(i2ChanStrPtr, struct serial_struct __user *);
-
-static ssize_t ip2_ipl_read(struct file *, char __user *, size_t, loff_t *);
-static ssize_t ip2_ipl_write(struct file *, const char __user *, size_t, loff_t *);
-static long ip2_ipl_ioctl(struct file *, UINT, ULONG);
-static int ip2_ipl_open(struct inode *, struct file *);
-
-static int DumpTraceBuffer(char __user *, int);
-static int DumpFifoBuffer( char __user *, int);
-
-static void ip2_init_board(int, const struct firmware *);
-static unsigned short find_eisa_board(int);
-static int ip2_setup(char *str);
-
-/***************/
-/* Static Data */
-/***************/
-
-static struct tty_driver *ip2_tty_driver;
-
-/* Here, then is a table of board pointers which the interrupt routine should
- * scan through to determine who it must service.
- */
-static unsigned short i2nBoards; // Number of boards here
-
-static i2eBordStrPtr i2BoardPtrTable[IP2_MAX_BOARDS];
-
-static i2ChanStrPtr  DevTable[IP2_MAX_PORTS];
-//DevTableMem just used to save addresses for kfree
-static void  *DevTableMem[IP2_MAX_BOARDS];
-
-/* This is the driver descriptor for the ip2ipl device, which is used to
- * download the loadware to the boards.
- */
-static const struct file_operations ip2_ipl = {
-        .owner          = THIS_MODULE,
-        .read           = ip2_ipl_read,
-        .write          = ip2_ipl_write,
-        .unlocked_ioctl = ip2_ipl_ioctl,
-        .open           = ip2_ipl_open,
-}; 
-
-static unsigned long irq_counter;
-static unsigned long bh_counter;
-
-// Use immediate queue to service interrupts
-#define USE_IQI
-//#define USE_IQ        // PCI&2.2 needs work
-
-/* The timer_list entry for our poll routine. If interrupt operation is not
- * selected, the board is serviced periodically to see if anything needs doing.
- */
-#define  POLL_TIMEOUT   (jiffies + 1)
-static DEFINE_TIMER(PollTimer, ip2_poll, 0, 0);
-
-#ifdef IP2DEBUG_TRACE
-/* Trace (debug) buffer data */
-#define TRACEMAX  1000
-static unsigned long tracebuf[TRACEMAX];
-static int tracestuff;
-static int tracestrip;
-static int tracewrap;
-#endif
-
-/**********/
-/* Macros */
-/**********/
-
-#ifdef IP2DEBUG_OPEN
-#define DBG_CNT(s) printk(KERN_DEBUG "(%s): [%x] ttyc=%d, modc=%x -> %s\n", \
-                    tty->name,(pCh->flags), \
-                    tty->count,/*GET_USE_COUNT(module)*/0,s)
-#else
-#define DBG_CNT(s)
-#endif
-
-/********/
-/* Code */
-/********/
-
-#include "i2ellis.c"    /* Extremely low-level interface services */
-#include "i2cmd.c"      /* Standard loadware command definitions */
-#include "i2lib.c"      /* High level interface services */
-
-/* Configuration area for modprobe */
-
-MODULE_AUTHOR("Doug McNash");
-MODULE_DESCRIPTION("Computone IntelliPort Plus Driver");
-MODULE_LICENSE("GPL");
-
-#define MAX_CMD_STR     50
-
-static int poll_only;
-static char cmd[MAX_CMD_STR];
-
-static int Eisa_irq;
-static int Eisa_slot;
-
-static int iindx;
-static char rirqs[IP2_MAX_BOARDS];
-static int Valid_Irqs[] = { 3, 4, 5, 7, 10, 11, 12, 15, 0};
-
-/* Note: Add compiled in defaults to these arrays, not to the structure
-        in ip2.h any longer.  That structure WILL get overridden
-        by these values, or command line values, or insmod values!!!  =mhw=
-*/
-static int io[IP2_MAX_BOARDS];
-static int irq[IP2_MAX_BOARDS] = { -1, -1, -1, -1 };
-
-MODULE_AUTHOR("Doug McNash");
-MODULE_DESCRIPTION("Computone IntelliPort Plus Driver");
-module_param_array(irq, int, NULL, 0);
-MODULE_PARM_DESC(irq, "Interrupts for IntelliPort Cards");
-module_param_array(io, int, NULL, 0);
-MODULE_PARM_DESC(io, "I/O ports for IntelliPort Cards");
-module_param(poll_only, bool, 0);
-MODULE_PARM_DESC(poll_only, "Do not use card interrupts");
-module_param_string(ip2, cmd, MAX_CMD_STR, 0);
-MODULE_PARM_DESC(ip2, "Contains module parameter passed with 'ip2='");
-
-/* for sysfs class support */
-static struct class *ip2_class;
-
-/* Some functions to keep track of what irqs we have */
-
-static int __init is_valid_irq(int irq)
-{
-        int *i = Valid_Irqs;
-        
-        while (*i != 0 && *i != irq)
-                i++;
-
-        return *i;
-}
-
-static void __init mark_requested_irq(char irq)
-{
-        rirqs[iindx++] = irq;
-}
-
-static int __exit clear_requested_irq(char irq)
-{
-        int i;
-        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
-                if (rirqs[i] == irq) {
-                        rirqs[i] = 0;
-                        return 1;
-                }
-        }
-        return 0;
-}
-
-static int have_requested_irq(char irq)
-{
-        /* array init to zeros so 0 irq will not be requested as a side
-         * effect */
-        int i;
-        for (i = 0; i < IP2_MAX_BOARDS; ++i)
-                if (rirqs[i] == irq)
-                        return 1;
-        return 0;
-}
-
-/******************************************************************************/
-/* Function:   cleanup_module()                                               */
-/* Parameters: None                                                           */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/* This is a required entry point for an installable module. It has to return */
-/* the device and the driver to a passive state. It should not be necessary   */
-/* to reset the board fully, especially as the loadware is downloaded         */
-/* externally rather than in the driver. We just want to disable the board    */
-/* and clear the loadware to a reset state. To allow this there has to be a   */
-/* way to detect whether the board has the loadware running at init time to   */
-/* handle subsequent installations of the driver. All memory allocated by the */
-/* driver should be returned since it may be unloaded from memory.            */
-/******************************************************************************/
-static void __exit ip2_cleanup_module(void)
-{
-        int err;
-        int i;
-
-        del_timer_sync(&PollTimer);
-
-        /* Reset the boards we have. */
-        for (i = 0; i < IP2_MAX_BOARDS; i++)
-                if (i2BoardPtrTable[i])
-                        iiReset(i2BoardPtrTable[i]);
-
-        /* The following is done at most once, if any boards were installed. */
-        for (i = 0; i < IP2_MAX_BOARDS; i++) {
-                if (i2BoardPtrTable[i]) {
-                        iiResetDelay(i2BoardPtrTable[i]);
-                        /* free io addresses and Tibet */
-                        release_region(ip2config.addr[i], 8);
-                        device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i));
-                        device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR,
-                                                4 * i + 1));
-                }
-                /* Disable and remove interrupt handler. */
-                if (ip2config.irq[i] > 0 &&
-                                have_requested_irq(ip2config.irq[i])) {
-                        free_irq(ip2config.irq[i], (void *)&pcName);
-                        clear_requested_irq(ip2config.irq[i]);
-                }
-        }
-        class_destroy(ip2_class);
-        err = tty_unregister_driver(ip2_tty_driver);
-        if (err)
-                printk(KERN_ERR "IP2: failed to unregister tty driver (%d)\n",
-                                err);
-        put_tty_driver(ip2_tty_driver);
-        unregister_chrdev(IP2_IPL_MAJOR, pcIpl);
-        remove_proc_entry("ip2mem", NULL);
-
-        /* free memory */
-        for (i = 0; i < IP2_MAX_BOARDS; i++) {
-                void *pB;
-#ifdef CONFIG_PCI
-                if (ip2config.type[i] == PCI && ip2config.pci_dev[i]) {
-                        pci_disable_device(ip2config.pci_dev[i]);
-                        pci_dev_put(ip2config.pci_dev[i]);
-                        ip2config.pci_dev[i] = NULL;
-                }
-#endif
-                pB = i2BoardPtrTable[i];
-                if (pB != NULL) {
-                        kfree(pB);
-                        i2BoardPtrTable[i] = NULL;
-                }
-                if (DevTableMem[i] != NULL) {
-                        kfree(DevTableMem[i]);
-                        DevTableMem[i] = NULL;
-                }
-        }
-}
-module_exit(ip2_cleanup_module);
-
-static const struct tty_operations ip2_ops = {
-        .open            = ip2_open,
-        .close           = ip2_close,
-        .write           = ip2_write,
-        .put_char        = ip2_putchar,
-        .flush_chars     = ip2_flush_chars,
-        .write_room      = ip2_write_room,
-        .chars_in_buffer = ip2_chars_in_buf,
-        .flush_buffer    = ip2_flush_buffer,
-        .ioctl           = ip2_ioctl,
-        .throttle        = ip2_throttle,
-        .unthrottle      = ip2_unthrottle,
-        .set_termios     = ip2_set_termios,
-        .set_ldisc       = ip2_set_line_discipline,
-        .stop            = ip2_stop,
-        .start           = ip2_start,
-        .hangup          = ip2_hangup,
-        .tiocmget        = ip2_tiocmget,
-        .tiocmset        = ip2_tiocmset,
-        .proc_fops       = &ip2_proc_fops,
-};
-
-/******************************************************************************/
-/* Function:   ip2_loadmain()                                                 */
-/* Parameters: irq, io from command line of insmod et. al.                    */
-/*              pointer to fip firmware and firmware size for boards          */
-/* Returns:    Success (0)                                                    */
-/*                                                                            */
-/* Description:                                                               */
-/* This was the required entry point for all drivers (now in ip2.c)           */
-/* It performs all                                                            */
-/* initialisation of the devices and driver structures, and registers itself  */
-/* with the relevant kernel modules.                                          */
-/******************************************************************************/
-/* IRQF_DISABLED - if set blocks all interrupts else only this line */
-/* IRQF_SHARED    - for shared irq PCI or maybe EISA only */
-/* SA_RANDOM   - can be source for cert. random number generators */
-#define IP2_SA_FLAGS    0
-
-
-static const struct firmware *ip2_request_firmware(void)
-{
-        struct platform_device *pdev;
-        const struct firmware *fw;
-
-        pdev = platform_device_register_simple("ip2", 0, NULL, 0);
-        if (IS_ERR(pdev)) {
-                printk(KERN_ERR "Failed to register platform device for ip2\n");
-                return NULL;
-        }
-        if (request_firmware(&fw, "intelliport2.bin", &pdev->dev)) {
-                printk(KERN_ERR "Failed to load firmware 'intelliport2.bin'\n");
-                fw = NULL;
-        }
-        platform_device_unregister(pdev);
-        return fw;
-}
-
-/******************************************************************************
- *      ip2_setup:
- *              str: kernel command line string
- *
- *      Can't autoprobe the boards so user must specify configuration on
- *      kernel command line.  Sane people build it modular but the others
- *      come here.
- *
- *      Alternating pairs of io,irq for up to 4 boards.
- *              ip2=io0,irq0,io1,irq1,io2,irq2,io3,irq3
- *
- *              io=0 => No board
- *              io=1 => PCI
- *              io=2 => EISA
- *              else => ISA I/O address
- *
- *              irq=0 or invalid for ISA will revert to polling mode
- *
- *              Any value = -1, do not overwrite compiled in value.
- *
- ******************************************************************************/
-static int __init ip2_setup(char *str)
-{
-        int j, ints[10];        /* 4 boards, 2 parameters + 2 */
-        unsigned int i;
-
-        str = get_options(str, ARRAY_SIZE(ints), ints);
-
-        for (i = 0, j = 1; i < 4; i++) {
-                if (j > ints[0])
-                        break;
-                if (ints[j] >= 0)
-                        io[i] = ints[j];
-                j++;
-                if (j > ints[0])
-                        break;
-                if (ints[j] >= 0)
-                        irq[i] = ints[j];
-                j++;
-        }
-        return 1;
-}
-__setup("ip2=", ip2_setup);
-
-static int __init ip2_loadmain(void)
-{
-        int i, j, box;
-        int err = 0;
-        i2eBordStrPtr pB = NULL;
-        int rc = -1;
-        const struct firmware *fw = NULL;
-        char *str;
-
-        str = cmd;
-
-        if (poll_only) {
-                /* Hard lock the interrupts to zero */
-                irq[0] = irq[1] = irq[2] = irq[3] = poll_only = 0;
-        }
-
-        /* Check module parameter with 'ip2=' has been passed or not */
-        if (!poll_only && (!strncmp(str, "ip2=", 4)))
-                ip2_setup(str);
-
-        ip2trace(ITRC_NO_PORT, ITRC_INIT, ITRC_ENTER, 0);
-
-        /* process command line arguments to modprobe or
-                insmod i.e. iop & irqp */
-        /* irqp and iop should ALWAYS be specified now...  But we check
-                them individually just to be sure, anyways... */
-        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
-                ip2config.addr[i] = io[i];
-                if (irq[i] >= 0)
-                        ip2config.irq[i] = irq[i];
-                else
-                        ip2config.irq[i] = 0;
-        /* This is a little bit of a hack.  If poll_only=1 on command
-           line back in ip2.c OR all IRQs on all specified boards are
-           explicitly set to 0, then drop to poll only mode and override
-           PCI or EISA interrupts.  This superceeds the old hack of
-           triggering if all interrupts were zero (like da default).
-           Still a hack but less prone to random acts of terrorism.
-
-           What we really should do, now that the IRQ default is set
-           to -1, is to use 0 as a hard coded, do not probe.
-
-                /\/\|=mhw=|\/\/
-        */
-                poll_only |= irq[i];
-        }
-        poll_only = !poll_only;
-
-        /* Announce our presence */
-        printk(KERN_INFO "%s version %s\n", pcName, pcVersion);
-
-        ip2_tty_driver = alloc_tty_driver(IP2_MAX_PORTS);
-        if (!ip2_tty_driver)
-                return -ENOMEM;
-
-        /* Initialise all the boards we can find (up to the maximum). */
-        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
-                switch (ip2config.addr[i]) {
-                case 0: /* skip this slot even if card is present */
-                        break;
-                default: /* ISA */
-                   /* ISA address must be specified */
-                        if (ip2config.addr[i] < 0x100 ||
-                                        ip2config.addr[i] > 0x3f8) {
-                                printk(KERN_ERR "IP2: Bad ISA board %d "
-                                                "address %x\n", i,
-                                                ip2config.addr[i]);
-                                ip2config.addr[i] = 0;
-                                break;
-                        }
-                        ip2config.type[i] = ISA;
-
-                        /* Check for valid irq argument, set for polling if
-                         * invalid */
-                        if (ip2config.irq[i] &&
-                                        !is_valid_irq(ip2config.irq[i])) {
-                                printk(KERN_ERR "IP2: Bad IRQ(%d) specified\n",
-                                                ip2config.irq[i]);
-                                /* 0 is polling and is valid in that sense */
-                                ip2config.irq[i] = 0;
-                        }
-                        break;
-                case PCI:
-#ifdef CONFIG_PCI
-                {
-                        struct pci_dev *pdev = NULL;
-                        u32 addr;
-                        int status;
-
-                        pdev = pci_get_device(PCI_VENDOR_ID_COMPUTONE,
-                                        PCI_DEVICE_ID_COMPUTONE_IP2EX, pdev);
-                        if (pdev == NULL) {
-                                ip2config.addr[i] = 0;
-                                printk(KERN_ERR "IP2: PCI board %d not "
-                                                "found\n", i);
-                                break;
-                        }
-
-                        if (pci_enable_device(pdev)) {
-                                dev_err(&pdev->dev, "can't enable device\n");
-                                goto out;
-                        }
-                        ip2config.type[i] = PCI;
-                        ip2config.pci_dev[i] = pci_dev_get(pdev);
-                        status = pci_read_config_dword(pdev, PCI_BASE_ADDRESS_1,
-                                        &addr);
-                        if (addr & 1)
-                                ip2config.addr[i] = (USHORT)(addr & 0xfffe);
-                        else
-                                dev_err(&pdev->dev, "I/O address error\n");
-
-                        ip2config.irq[i] = pdev->irq;
-out:
-                        pci_dev_put(pdev);
-                }
-#else
-                        printk(KERN_ERR "IP2: PCI card specified but PCI "
-                                        "support not enabled.\n");
-                        printk(KERN_ERR "IP2: Recompile kernel with CONFIG_PCI "
-                                        "defined!\n");
-#endif /* CONFIG_PCI */
-                        break;
-                case EISA:
-                        ip2config.addr[i] = find_eisa_board(Eisa_slot + 1);
-                        if (ip2config.addr[i] != 0) {
-                                /* Eisa_irq set as side effect, boo */
-                                ip2config.type[i] = EISA;
-                        } 
-                        ip2config.irq[i] = Eisa_irq;
-                        break;
-                }       /* switch */
-        }       /* for */
-
-        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
-                if (ip2config.addr[i]) {
-                        pB = kzalloc(sizeof(i2eBordStr), GFP_KERNEL);
-                        if (pB) {
-                                i2BoardPtrTable[i] = pB;
-                                iiSetAddress(pB, ip2config.addr[i],
-                                                ii2DelayTimer);
-                                iiReset(pB);
-                        } else
-                                printk(KERN_ERR "IP2: board memory allocation "
-                                                "error\n");
-                }
-        }
-        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
-                pB = i2BoardPtrTable[i];
-                if (pB != NULL) {
-                        iiResetDelay(pB);
-                        break;
-                }
-        }
-        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
-                /* We don't want to request the firmware unless we have at
-                   least one board */
-                if (i2BoardPtrTable[i] != NULL) {
-                        if (!fw)
-                                fw = ip2_request_firmware();
-                        if (!fw)
-                                break;
-                        ip2_init_board(i, fw);
-                }
-        }
-        if (fw)
-                release_firmware(fw);
-
-        ip2trace(ITRC_NO_PORT, ITRC_INIT, 2, 0);
-
-        ip2_tty_driver->owner               = THIS_MODULE;
-        ip2_tty_driver->name                 = "ttyF";
-        ip2_tty_driver->driver_name          = pcDriver_name;
-        ip2_tty_driver->major                = IP2_TTY_MAJOR;
-        ip2_tty_driver->minor_start          = 0;
-        ip2_tty_driver->type                 = TTY_DRIVER_TYPE_SERIAL;
-        ip2_tty_driver->subtype              = SERIAL_TYPE_NORMAL;
-        ip2_tty_driver->init_termios         = tty_std_termios;
-        ip2_tty_driver->init_termios.c_cflag = B9600|CS8|CREAD|HUPCL|CLOCAL;
-        ip2_tty_driver->flags                = TTY_DRIVER_REAL_RAW |
-                TTY_DRIVER_DYNAMIC_DEV;
-        tty_set_operations(ip2_tty_driver, &ip2_ops);
-
-        ip2trace(ITRC_NO_PORT, ITRC_INIT, 3, 0);
-
-        err = tty_register_driver(ip2_tty_driver);
-        if (err) {
-                printk(KERN_ERR "IP2: failed to register tty driver\n");
-                put_tty_driver(ip2_tty_driver);
-                return err; /* leaking resources */
-        }
-
-        err = register_chrdev(IP2_IPL_MAJOR, pcIpl, &ip2_ipl);
-        if (err) {
-                printk(KERN_ERR "IP2: failed to register IPL device (%d)\n",
-                                err);
-        } else {
-                /* create the sysfs class */
-                ip2_class = class_create(THIS_MODULE, "ip2");
-                if (IS_ERR(ip2_class)) {
-                        err = PTR_ERR(ip2_class);
-                        goto out_chrdev;        
-                }
-        }
-        /* Register the read_procmem thing */
-        if (!proc_create("ip2mem",0,NULL,&ip2mem_proc_fops)) {
-                printk(KERN_ERR "IP2: failed to register read_procmem\n");
-                return -EIO; /* leaking resources */
-        }
-
-        ip2trace(ITRC_NO_PORT, ITRC_INIT, 4, 0);
-        /* Register the interrupt handler or poll handler, depending upon the
-         * specified interrupt.
-         */
-
-        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
-                if (ip2config.addr[i] == 0)
-                        continue;
-
-                pB = i2BoardPtrTable[i];
-                if (pB != NULL) {
-                        device_create(ip2_class, NULL,
-                                      MKDEV(IP2_IPL_MAJOR, 4 * i),
-                                      NULL, "ipl%d", i);
-                        device_create(ip2_class, NULL,
-                                      MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
-                                      NULL, "stat%d", i);
-
-                        for (box = 0; box < ABS_MAX_BOXES; box++)
-                                for (j = 0; j < ABS_BIGGEST_BOX; j++)
-                                        if (pB->i2eChannelMap[box] & (1 << j))
-                                                tty_register_device(
-                                                        ip2_tty_driver,
-                                                        j + ABS_BIGGEST_BOX *
-                                                        (box+i*ABS_MAX_BOXES),
-                                                        NULL);
-                }
-
-                if (poll_only) {
-                        /* Poll only forces driver to only use polling and
-                           to ignore the probed PCI or EISA interrupts. */
-                        ip2config.irq[i] = CIR_POLL;
-                }
-                if (ip2config.irq[i] == CIR_POLL) {
-retry:
-                        if (!timer_pending(&PollTimer)) {
-                                mod_timer(&PollTimer, POLL_TIMEOUT);
-                                printk(KERN_INFO "IP2: polling\n");
-                        }
-                } else {
-                        if (have_requested_irq(ip2config.irq[i]))
-                                continue;
-                        rc = request_irq(ip2config.irq[i], ip2_interrupt,
-                                IP2_SA_FLAGS |
-                                (ip2config.type[i] == PCI ? IRQF_SHARED : 0),
-                                pcName, i2BoardPtrTable[i]);
-                        if (rc) {
-                                printk(KERN_ERR "IP2: request_irq failed: "
-                                                "error %d\n", rc);
-                                ip2config.irq[i] = CIR_POLL;
-                                printk(KERN_INFO "IP2: Polling %ld/sec.\n",
-                                                (POLL_TIMEOUT - jiffies));
-                                goto retry;
-                        }
-                        mark_requested_irq(ip2config.irq[i]);
-                        /* Initialise the interrupt handler bottom half
-                         * (aka slih). */
-                }
-        }
-
-        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
-                if (i2BoardPtrTable[i]) {
-                        /* set and enable board interrupt */
-                        set_irq(i, ip2config.irq[i]);
-                }
-        }
-
-        ip2trace(ITRC_NO_PORT, ITRC_INIT, ITRC_RETURN, 0);
-
-        return 0;
-
-out_chrdev:
-        unregister_chrdev(IP2_IPL_MAJOR, "ip2");
-        /* unregister and put tty here */
-        return err;
-}
-module_init(ip2_loadmain);
-
-/******************************************************************************/
-/* Function:   ip2_init_board()                                               */
-/* Parameters: Index of board in configuration structure                      */
-/* Returns:    Success (0)                                                    */
-/*                                                                            */
-/* Description:                                                               */
-/* This function initializes the specified board. The loadware is copied to   */
-/* the board, the channel structures are initialized, and the board details   */
-/* are reported on the console.                                               */
-/******************************************************************************/
-static void
-ip2_init_board(int boardnum, const struct firmware *fw)
-{
-        int i;
-        int nports = 0, nboxes = 0;
-        i2ChanStrPtr pCh;
-        i2eBordStrPtr pB = i2BoardPtrTable[boardnum];
-
-        if ( !iiInitialize ( pB ) ) {
-                printk ( KERN_ERR "IP2: Failed to initialize board at 0x%x, error %d\n",
-                         pB->i2eBase, pB->i2eError );
-                goto err_initialize;
-        }
-        printk(KERN_INFO "IP2: Board %d: addr=0x%x irq=%d\n", boardnum + 1,
-               ip2config.addr[boardnum], ip2config.irq[boardnum] );
-
-        if (!request_region( ip2config.addr[boardnum], 8, pcName )) {
-                printk(KERN_ERR "IP2: bad addr=0x%x\n", ip2config.addr[boardnum]);
-                goto err_initialize;
-        }
-
-        if ( iiDownloadAll ( pB, (loadHdrStrPtr)fw->data, 1, fw->size )
-            != II_DOWN_GOOD ) {
-                printk ( KERN_ERR "IP2: failed to download loadware\n" );
-                goto err_release_region;
-        } else {
-                printk ( KERN_INFO "IP2: fv=%d.%d.%d lv=%d.%d.%d\n",
-                         pB->i2ePom.e.porVersion,
-                         pB->i2ePom.e.porRevision,
-                         pB->i2ePom.e.porSubRev, pB->i2eLVersion,
-                         pB->i2eLRevision, pB->i2eLSub );
-        }
-
-        switch ( pB->i2ePom.e.porID & ~POR_ID_RESERVED ) {
-
-        default:
-                printk( KERN_ERR "IP2: Unknown board type, ID = %x\n",
-                                pB->i2ePom.e.porID );
-                nports = 0;
-                goto err_release_region;
-                break;
-
-        case POR_ID_II_4: /* IntelliPort-II, ISA-4 (4xRJ45) */
-                printk ( KERN_INFO "IP2: ISA-4\n" );
-                nports = 4;
-                break;
-
-        case POR_ID_II_8: /* IntelliPort-II, 8-port using standard brick. */
-                printk ( KERN_INFO "IP2: ISA-8 std\n" );
-                nports = 8;
-                break;
-
-        case POR_ID_II_8R: /* IntelliPort-II, 8-port using RJ11's (no CTS) */
-                printk ( KERN_INFO "IP2: ISA-8 RJ11\n" );
-                nports = 8;
-                break;
-
-        case POR_ID_FIIEX: /* IntelliPort IIEX */
-        {
-                int portnum = IP2_PORTS_PER_BOARD * boardnum;
-                int            box;
-
-                for( box = 0; box < ABS_MAX_BOXES; ++box ) {
-                        if ( pB->i2eChannelMap[box] != 0 ) {
-                                ++nboxes;
-                        }
-                        for( i = 0; i < ABS_BIGGEST_BOX; ++i ) {
-                                if ( pB->i2eChannelMap[box] & 1<< i ) {
-                                        ++nports;
-                                }
-                        }
-                }
-                DevTableMem[boardnum] = pCh =
-                        kmalloc( sizeof(i2ChanStr) * nports, GFP_KERNEL );
-                if ( !pCh ) {
-                        printk ( KERN_ERR "IP2: (i2_init_channel:) Out of memory.\n");
-                        goto err_release_region;
-                }
-                if ( !i2InitChannels( pB, nports, pCh ) ) {
-                        printk(KERN_ERR "IP2: i2InitChannels failed: %d\n",pB->i2eError);
-                        kfree ( pCh );
-                        goto err_release_region;
-                }
-                pB->i2eChannelPtr = &DevTable[portnum];
-                pB->i2eChannelCnt = ABS_MOST_PORTS;
-
-                for( box = 0; box < ABS_MAX_BOXES; ++box, portnum += ABS_BIGGEST_BOX ) {
-                        for( i = 0; i < ABS_BIGGEST_BOX; ++i ) {
-                                if ( pB->i2eChannelMap[box] & (1 << i) ) {
-                                        DevTable[portnum + i] = pCh;
-                                        pCh->port_index = portnum + i;
-                                        pCh++;
-                                }
-                        }
-                }
-                printk(KERN_INFO "IP2: EX box=%d ports=%d %d bit\n",
-                        nboxes, nports, pB->i2eDataWidth16 ? 16 : 8 );
-                }
-                goto ex_exit;
-        }
-        DevTableMem[boardnum] = pCh =
-                kmalloc ( sizeof (i2ChanStr) * nports, GFP_KERNEL );
-        if ( !pCh ) {
-                printk ( KERN_ERR "IP2: (i2_init_channel:) Out of memory.\n");
-                goto err_release_region;
-        }
-        pB->i2eChannelPtr = pCh;
-        pB->i2eChannelCnt = nports;
-        if ( !i2InitChannels( pB, nports, pCh ) ) {
-                printk(KERN_ERR "IP2: i2InitChannels failed: %d\n",pB->i2eError);
-                kfree ( pCh );
-                goto err_release_region;
-        }
-        pB->i2eChannelPtr = &DevTable[IP2_PORTS_PER_BOARD * boardnum];
-
-        for( i = 0; i < pB->i2eChannelCnt; ++i ) {
-                DevTable[IP2_PORTS_PER_BOARD * boardnum + i] = pCh;
-                pCh->port_index = (IP2_PORTS_PER_BOARD * boardnum) + i;
-                pCh++;
-        }
-ex_exit:
-        INIT_WORK(&pB->tqueue_interrupt, ip2_interrupt_bh);
-        return;
-
-err_release_region:
-        release_region(ip2config.addr[boardnum], 8);
-err_initialize:
-        kfree ( pB );
-        i2BoardPtrTable[boardnum] = NULL;
-        return;
-}
-
-/******************************************************************************/
-/* Function:   find_eisa_board ( int start_slot )                             */
-/* Parameters: First slot to check                                            */
-/* Returns:    Address of EISA IntelliPort II controller                      */
-/*                                                                            */
-/* Description:                                                               */
-/* This function searches for an EISA IntelliPort controller, starting        */
-/* from the specified slot number. If the motherboard is not identified as an */
-/* EISA motherboard, or no valid board ID is selected it returns 0. Otherwise */
-/* it returns the base address of the controller.                             */
-/******************************************************************************/
-static unsigned short
-find_eisa_board( int start_slot )
-{
-        int i, j;
-        unsigned int idm = 0;
-        unsigned int idp = 0;
-        unsigned int base = 0;
-        unsigned int value;
-        int setup_address;
-        int setup_irq;
-        int ismine = 0;
-
-        /*
-         * First a check for an EISA motherboard, which we do by comparing the
-         * EISA ID registers for the system board and the first couple of slots.
-         * No slot ID should match the system board ID, but on an ISA or PCI
-         * machine the odds are that an empty bus will return similar values for
-         * each slot.
-         */
-        i = 0x0c80;
-        value = (inb(i) << 24) + (inb(i+1) << 16) + (inb(i+2) << 8) + inb(i+3);
-        for( i = 0x1c80; i <= 0x4c80; i += 0x1000 ) {
-                j = (inb(i)<<24)+(inb(i+1)<<16)+(inb(i+2)<<8)+inb(i+3);
-                if ( value == j )
-                        return 0;
-        }
-
-        /*
-         * OK, so we are inclined to believe that this is an EISA machine. Find
-         * an IntelliPort controller.
-         */
-        for( i = start_slot; i < 16; i++ ) {
-                base = i << 12;
-                idm = (inb(base + 0xc80) << 8) | (inb(base + 0xc81) & 0xff);
-                idp = (inb(base + 0xc82) << 8) | (inb(base + 0xc83) & 0xff);
-                ismine = 0;
-                if ( idm == 0x0e8e ) {
-                        if ( idp == 0x0281 || idp == 0x0218 ) {
-                                ismine = 1;
-                        } else if ( idp == 0x0282 || idp == 0x0283 ) {
-                                ismine = 3;     /* Can do edge-trigger */
-                        }
-                        if ( ismine ) {
-                                Eisa_slot = i;
-                                break;
-                        }
-                }
-        }
-        if ( !ismine )
-                return 0;
-
-        /* It's some sort of EISA card, but at what address is it configured? */
-
-        setup_address = base + 0xc88;
-        value = inb(base + 0xc86);
-        setup_irq = (value & 8) ? Valid_Irqs[value & 7] : 0;
-
-        if ( (ismine & 2) && !(value & 0x10) ) {
-                ismine = 1;     /* Could be edging, but not */
-        }
-
-        if ( Eisa_irq == 0 ) {
-                Eisa_irq = setup_irq;
-        } else if ( Eisa_irq != setup_irq ) {
-                printk ( KERN_ERR "IP2: EISA irq mismatch between EISA controllers\n" );
-        }
-
-#ifdef IP2DEBUG_INIT
-printk(KERN_DEBUG "Computone EISA board in slot %d, I.D. 0x%x%x, Address 0x%x",
-               base >> 12, idm, idp, setup_address);
-        if ( Eisa_irq ) {
-                printk(KERN_DEBUG ", Interrupt %d %s\n",
-                       setup_irq, (ismine & 2) ? "(edge)" : "(level)");
-        } else {
-                printk(KERN_DEBUG ", (polled)\n");
-        }
-#endif
-        return setup_address;
-}
-
-/******************************************************************************/
-/* Function:   set_irq()                                                      */
-/* Parameters: index to board in board table                                  */
-/*             IRQ to use                                                     */
-/* Returns:    Success (0)                                                    */
-/*                                                                            */
-/* Description:                                                               */
-/******************************************************************************/
-static void
-set_irq( int boardnum, int boardIrq )
-{
-        unsigned char tempCommand[16];
-        i2eBordStrPtr pB = i2BoardPtrTable[boardnum];
-        unsigned long flags;
-
-        /*
-         * Notify the boards they may generate interrupts. This is done by
-         * sending an in-line command to channel 0 on each board. This is why
-         * the channels have to be defined already. For each board, if the
-         * interrupt has never been defined, we must do so NOW, directly, since
-         * board will not send flow control or even give an interrupt until this
-         * is done.  If polling we must send 0 as the interrupt parameter.
-         */
-
-        // We will get an interrupt here at the end of this function
-
-        iiDisableMailIrq(pB);
-
-        /* We build up the entire packet header. */
-        CHANNEL_OF(tempCommand) = 0;
-        PTYPE_OF(tempCommand) = PTYPE_INLINE;
-        CMD_COUNT_OF(tempCommand) = 2;
-        (CMD_OF(tempCommand))[0] = CMDVALUE_IRQ;
-        (CMD_OF(tempCommand))[1] = boardIrq;
-        /*
-         * Write to FIFO; don't bother to adjust fifo capacity for this, since
-         * board will respond almost immediately after SendMail hit.
-         */
-        write_lock_irqsave(&pB->write_fifo_spinlock, flags);
-        iiWriteBuf(pB, tempCommand, 4);
-        write_unlock_irqrestore(&pB->write_fifo_spinlock, flags);
-        pB->i2eUsingIrq = boardIrq;
-        pB->i2eOutMailWaiting |= MB_OUT_STUFFED;
-
-        /* Need to update number of boards before you enable mailbox int */
-        ++i2nBoards;
-
-        CHANNEL_OF(tempCommand) = 0;
-        PTYPE_OF(tempCommand) = PTYPE_BYPASS;
-        CMD_COUNT_OF(tempCommand) = 6;
-        (CMD_OF(tempCommand))[0] = 88;  // SILO
-        (CMD_OF(tempCommand))[1] = 64;  // chars
-        (CMD_OF(tempCommand))[2] = 32;  // ms
-
-        (CMD_OF(tempCommand))[3] = 28;  // MAX_BLOCK
-        (CMD_OF(tempCommand))[4] = 64;  // chars
-
-        (CMD_OF(tempCommand))[5] = 87;  // HW_TEST
-        write_lock_irqsave(&pB->write_fifo_spinlock, flags);
-        iiWriteBuf(pB, tempCommand, 8);
-        write_unlock_irqrestore(&pB->write_fifo_spinlock, flags);
-
-        CHANNEL_OF(tempCommand) = 0;
-        PTYPE_OF(tempCommand) = PTYPE_BYPASS;
-        CMD_COUNT_OF(tempCommand) = 1;
-        (CMD_OF(tempCommand))[0] = 84;  /* get BOX_IDS */
-        iiWriteBuf(pB, tempCommand, 3);
-
-#ifdef XXX
-        // enable heartbeat for test porpoises
-        CHANNEL_OF(tempCommand) = 0;
-        PTYPE_OF(tempCommand) = PTYPE_BYPASS;
-        CMD_COUNT_OF(tempCommand) = 2;
-        (CMD_OF(tempCommand))[0] = 44;  /* get ping */
-        (CMD_OF(tempCommand))[1] = 200; /* 200 ms */
-        write_lock_irqsave(&pB->write_fifo_spinlock, flags);
-        iiWriteBuf(pB, tempCommand, 4);
-        write_unlock_irqrestore(&pB->write_fifo_spinlock, flags);
-#endif
-
-        iiEnableMailIrq(pB);
-        iiSendPendingMail(pB);
-}
-
-/******************************************************************************/
-/* Interrupt Handler Section                                                  */
-/******************************************************************************/
-
-static inline void
-service_all_boards(void)
-{
-        int i;
-        i2eBordStrPtr  pB;
-
-        /* Service every board on the list */
-        for( i = 0; i < IP2_MAX_BOARDS; ++i ) {
-                pB = i2BoardPtrTable[i];
-                if ( pB ) {
-                        i2ServiceBoard( pB );
-                }
-        }
-}
-
-
-/******************************************************************************/
-/* Function:   ip2_interrupt_bh(work)                                         */
-/* Parameters: work - pointer to the board structure                          */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/*      Service the board in a bottom half interrupt handler and then         */
-/*      reenable the board's interrupts if it has an IRQ number               */
-/*                                                                            */
-/******************************************************************************/
-static void
-ip2_interrupt_bh(struct work_struct *work)
-{
-        i2eBordStrPtr pB = container_of(work, i2eBordStr, tqueue_interrupt);
-//      pB better well be set or we have a problem!  We can only get
-//      here from the IMMEDIATE queue.  Here, we process the boards.
-//      Checking pB doesn't cost much and it saves us from the sanity checkers.
-
-        bh_counter++; 
-
-        if ( pB ) {
-                i2ServiceBoard( pB );
-                if( pB->i2eUsingIrq ) {
-//                      Re-enable his interrupts
-                        iiEnableMailIrq(pB);
-                }
-        }
-}
-
-
-/******************************************************************************/
-/* Function:   ip2_interrupt(int irq, void *dev_id)    */
-/* Parameters: irq - interrupt number                                         */
-/*             pointer to optional device ID structure                        */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*      Our task here is simply to identify each board which needs servicing. */
-/*      If we are queuing then, queue it to be serviced, and disable its irq  */
-/*      mask otherwise process the board directly.                            */
-/*                                                                            */
-/*      We could queue by IRQ but that just complicates things on both ends   */
-/*      with very little gain in performance (how many instructions does      */
-/*      it take to iterate on the immediate queue).                           */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static void
-ip2_irq_work(i2eBordStrPtr pB)
-{
-#ifdef USE_IQI
-        if (NO_MAIL_HERE != ( pB->i2eStartMail = iiGetMail(pB))) {
-//              Disable his interrupt (will be enabled when serviced)
-//              This is mostly to protect from reentrancy.
-                iiDisableMailIrq(pB);
-
-//              Park the board on the immediate queue for processing.
-                schedule_work(&pB->tqueue_interrupt);
-
-//              Make sure the immediate queue is flagged to fire.
-        }
-#else
-
-//      We are using immediate servicing here.  This sucks and can
-//      cause all sorts of havoc with ppp and others.  The failsafe
-//      check on iiSendPendingMail could also throw a hairball.
-
-        i2ServiceBoard( pB );
-
-#endif /* USE_IQI */
-}
-
-static void
-ip2_polled_interrupt(void)
-{
-        int i;
-        i2eBordStrPtr  pB;
-
-        ip2trace(ITRC_NO_PORT, ITRC_INTR, 99, 1, 0);
-
-        /* Service just the boards on the list using this irq */
-        for( i = 0; i < i2nBoards; ++i ) {
-                pB = i2BoardPtrTable[i];
-
-//              Only process those boards which match our IRQ.
-//                      IRQ = 0 for polled boards, we won't poll "IRQ" boards
-
-                if (pB && pB->i2eUsingIrq == 0)
-                        ip2_irq_work(pB);
-        }
-
-        ++irq_counter;
-
-        ip2trace (ITRC_NO_PORT, ITRC_INTR, ITRC_RETURN, 0 );
-}
-
-static irqreturn_t
-ip2_interrupt(int irq, void *dev_id)
-{
-        i2eBordStrPtr pB = dev_id;
-
-        ip2trace (ITRC_NO_PORT, ITRC_INTR, 99, 1, pB->i2eUsingIrq );
-
-        ip2_irq_work(pB);
-
-        ++irq_counter;
-
-        ip2trace (ITRC_NO_PORT, ITRC_INTR, ITRC_RETURN, 0 );
-        return IRQ_HANDLED;
-}
-
-/******************************************************************************/
-/* Function:   ip2_poll(unsigned long arg)                                    */
-/* Parameters: ?                                                              */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/* This function calls the library routine i2ServiceBoard for each board in   */
-/* the board table. This is used instead of the interrupt routine when polled */
-/* mode is specified.                                                         */
-/******************************************************************************/
-static void
-ip2_poll(unsigned long arg)
-{
-        ip2trace (ITRC_NO_PORT, ITRC_INTR, 100, 0 );
-
-        // Just polled boards, IRQ = 0 will hit all non-interrupt boards.
-        // It will NOT poll boards handled by hard interrupts.
-        // The issue of queued BH interrupts is handled in ip2_interrupt().
-        ip2_polled_interrupt();
-
-        mod_timer(&PollTimer, POLL_TIMEOUT);
-
-        ip2trace (ITRC_NO_PORT, ITRC_INTR, ITRC_RETURN, 0 );
-}
-
-static void do_input(struct work_struct *work)
-{
-        i2ChanStrPtr pCh = container_of(work, i2ChanStr, tqueue_input);
-        unsigned long flags;
-
-        ip2trace(CHANN, ITRC_INPUT, 21, 0 );
-
-        // Data input
-        if ( pCh->pTTY != NULL ) {
-                read_lock_irqsave(&pCh->Ibuf_spinlock, flags);
-                if (!pCh->throttled && (pCh->Ibuf_stuff != pCh->Ibuf_strip)) {
-                        read_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
-                        i2Input( pCh );
-                } else
-                        read_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
-        } else {
-                ip2trace(CHANN, ITRC_INPUT, 22, 0 );
-
-                i2InputFlush( pCh );
-        }
-}
-
-// code duplicated from n_tty (ldisc)
-static inline void  isig(int sig, struct tty_struct *tty, int flush)
-{
-        /* FIXME: This is completely bogus */
-        if (tty->pgrp)
-                kill_pgrp(tty->pgrp, sig, 1);
-        if (flush || !L_NOFLSH(tty)) {
-                if ( tty->ldisc->ops->flush_buffer )  
-                        tty->ldisc->ops->flush_buffer(tty);
-                i2InputFlush( tty->driver_data );
-        }
-}
-
-static void do_status(struct work_struct *work)
-{
-        i2ChanStrPtr pCh = container_of(work, i2ChanStr, tqueue_status);
-        int status;
-
-        status =  i2GetStatus( pCh, (I2_BRK|I2_PAR|I2_FRA|I2_OVR) );
-
-        ip2trace (CHANN, ITRC_STATUS, 21, 1, status );
-
-        if (pCh->pTTY && (status & (I2_BRK|I2_PAR|I2_FRA|I2_OVR)) ) {
-                if ( (status & I2_BRK) ) {
-                        // code duplicated from n_tty (ldisc)
-                        if (I_IGNBRK(pCh->pTTY))
-                                goto skip_this;
-                        if (I_BRKINT(pCh->pTTY)) {
-                                isig(SIGINT, pCh->pTTY, 1);
-                                goto skip_this;
-                        }
-                        wake_up_interruptible(&pCh->pTTY->read_wait);
-                }
-#ifdef NEVER_HAPPENS_AS_SETUP_XXX
-        // and can't work because we don't know the_char
-        // as the_char is reported on a separate path
-        // The intelligent board does this stuff as setup
-        {
-        char brkf = TTY_NORMAL;
-        unsigned char brkc = '\0';
-        unsigned char tmp;
-                if ( (status & I2_BRK) ) {
-                        brkf = TTY_BREAK;
-                        brkc = '\0';
-                } 
-                else if (status & I2_PAR) {
-                        brkf = TTY_PARITY;
-                        brkc = the_char;
-                } else if (status & I2_FRA) {
-                        brkf = TTY_FRAME;
-                        brkc = the_char;
-                } else if (status & I2_OVR) {
-                        brkf = TTY_OVERRUN;
-                        brkc = the_char;
-                }
-                tmp = pCh->pTTY->real_raw;
-                pCh->pTTY->real_raw = 0;
-                pCh->pTTY->ldisc->ops.receive_buf( pCh->pTTY, &brkc, &brkf, 1 );
-                pCh->pTTY->real_raw = tmp;
-        }
-#endif /* NEVER_HAPPENS_AS_SETUP_XXX */
-        }
-skip_this:
-
-        if ( status & (I2_DDCD | I2_DDSR | I2_DCTS | I2_DRI) ) {
-                wake_up_interruptible(&pCh->delta_msr_wait);
-
-                if ( (pCh->flags & ASYNC_CHECK_CD) && (status & I2_DDCD) ) {
-                        if ( status & I2_DCD ) {
-                                if ( pCh->wopen ) {
-                                        wake_up_interruptible ( &pCh->open_wait );
-                                }
-                        } else {
-                                if (pCh->pTTY &&  (!(pCh->pTTY->termios->c_cflag & CLOCAL)) ) {
-                                        tty_hangup( pCh->pTTY );
-                                }
-                        }
-                }
-        }
-
-        ip2trace (CHANN, ITRC_STATUS, 26, 0 );
-}
-
-/******************************************************************************/
-/* Device Open/Close/Ioctl Entry Point Section                                */
-/******************************************************************************/
-
-/******************************************************************************/
-/* Function:   open_sanity_check()                                            */
-/* Parameters: Pointer to tty structure                                       */
-/*             Pointer to file structure                                      */
-/* Returns:    Success or failure                                             */
-/*                                                                            */
-/* Description:                                                               */
-/* Verifies the structure magic numbers and cross links.                      */
-/******************************************************************************/
-#ifdef IP2DEBUG_OPEN
-static void 
-open_sanity_check( i2ChanStrPtr pCh, i2eBordStrPtr pBrd )
-{
-        if ( pBrd->i2eValid != I2E_MAGIC ) {
-                printk(KERN_ERR "IP2: invalid board structure\n" );
-        } else if ( pBrd != pCh->pMyBord ) {
-                printk(KERN_ERR "IP2: board structure pointer mismatch (%p)\n",
-                         pCh->pMyBord );
-        } else if ( pBrd->i2eChannelCnt < pCh->port_index ) {
-                printk(KERN_ERR "IP2: bad device index (%d)\n", pCh->port_index );
-        } else if (&((i2ChanStrPtr)pBrd->i2eChannelPtr)[pCh->port_index] != pCh) {
-        } else {
-                printk(KERN_INFO "IP2: all pointers check out!\n" );
-        }
-}
-#endif
-
-
-/******************************************************************************/
-/* Function:   ip2_open()                                                     */
-/* Parameters: Pointer to tty structure                                       */
-/*             Pointer to file structure                                      */
-/* Returns:    Success or failure                                             */
-/*                                                                            */
-/* Description: (MANDATORY)                                                   */
-/* A successful device open has to run a gauntlet of checks before it         */
-/* completes. After some sanity checking and pointer setup, the function      */
-/* blocks until all conditions are satisfied. It then initialises the port to */
-/* the default characteristics and returns.                                   */
-/******************************************************************************/
-static int
-ip2_open( PTTY tty, struct file *pFile )
-{
-        wait_queue_t wait;
-        int rc = 0;
-        int do_clocal = 0;
-        i2ChanStrPtr  pCh = DevTable[tty->index];
-
-        ip2trace (tty->index, ITRC_OPEN, ITRC_ENTER, 0 );
-
-        if ( pCh == NULL ) {
-                return -ENODEV;
-        }
-        /* Setup pointer links in device and tty structures */
-        pCh->pTTY = tty;
-        tty->driver_data = pCh;
-
-#ifdef IP2DEBUG_OPEN
-        printk(KERN_DEBUG \
-                        "IP2:open(tty=%p,pFile=%p):dev=%s,ch=%d,idx=%d\n",
-               tty, pFile, tty->name, pCh->infl.hd.i2sChannel, pCh->port_index);
-        open_sanity_check ( pCh, pCh->pMyBord );
-#endif
-
-        i2QueueCommands(PTYPE_INLINE, pCh, 100, 3, CMD_DTRUP,CMD_RTSUP,CMD_DCD_REP);
-        pCh->dataSetOut |= (I2_DTR | I2_RTS);
-        serviceOutgoingFifo( pCh->pMyBord );
-
-        /* Block here until the port is ready (per serial and istallion) */
-        /*
-         * 1. If the port is in the middle of closing wait for the completion
-         *    and then return the appropriate error.
-         */
-        init_waitqueue_entry(&wait, current);
-        add_wait_queue(&pCh->close_wait, &wait);
-        set_current_state( TASK_INTERRUPTIBLE );
-
-        if ( tty_hung_up_p(pFile) || ( pCh->flags & ASYNC_CLOSING )) {
-                if ( pCh->flags & ASYNC_CLOSING ) {
-                        tty_unlock();
-                        schedule();
-                        tty_lock();
-                }
-                if ( tty_hung_up_p(pFile) ) {
-                        set_current_state( TASK_RUNNING );
-                        remove_wait_queue(&pCh->close_wait, &wait);
-                        return( pCh->flags & ASYNC_HUP_NOTIFY ) ? -EAGAIN : -ERESTARTSYS;
-                }
-        }
-        set_current_state( TASK_RUNNING );
-        remove_wait_queue(&pCh->close_wait, &wait);
-
-        /*
-         * 3. Handle a non-blocking open of a normal port.
-         */
-        if ( (pFile->f_flags & O_NONBLOCK) || (tty->flags & (1<<TTY_IO_ERROR) )) {
-                pCh->flags |= ASYNC_NORMAL_ACTIVE;
-                goto noblock;
-        }
-        /*
-         * 4. Now loop waiting for the port to be free and carrier present
-         *    (if required).
-         */
-        if ( tty->termios->c_cflag & CLOCAL )
-                do_clocal = 1;
-
-#ifdef IP2DEBUG_OPEN
-        printk(KERN_DEBUG "OpenBlock: do_clocal = %d\n", do_clocal);
-#endif
-
-        ++pCh->wopen;
-
-        init_waitqueue_entry(&wait, current);
-        add_wait_queue(&pCh->open_wait, &wait);
-
-        for(;;) {
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 2, CMD_DTRUP, CMD_RTSUP);
-                pCh->dataSetOut |= (I2_DTR | I2_RTS);
-                set_current_state( TASK_INTERRUPTIBLE );
-                serviceOutgoingFifo( pCh->pMyBord );
-                if ( tty_hung_up_p(pFile) ) {
-                        set_current_state( TASK_RUNNING );
-                        remove_wait_queue(&pCh->open_wait, &wait);
-                        return ( pCh->flags & ASYNC_HUP_NOTIFY ) ? -EBUSY : -ERESTARTSYS;
-                }
-                if (!(pCh->flags & ASYNC_CLOSING) && 
-                                (do_clocal || (pCh->dataSetIn & I2_DCD) )) {
-                        rc = 0;
-                        break;
-                }
-
-#ifdef IP2DEBUG_OPEN
-                printk(KERN_DEBUG "ASYNC_CLOSING = %s\n",
-                        (pCh->flags & ASYNC_CLOSING)?"True":"False");
-                printk(KERN_DEBUG "OpenBlock: waiting for CD or signal\n");
-#endif
-                ip2trace (CHANN, ITRC_OPEN, 3, 2, 0,
-                                (pCh->flags & ASYNC_CLOSING) );
-                /* check for signal */
-                if (signal_pending(current)) {
-                        rc = (( pCh->flags & ASYNC_HUP_NOTIFY ) ? -EAGAIN : -ERESTARTSYS);
-                        break;
-                }
-                tty_unlock();
-                schedule();
-                tty_lock();
-        }
-        set_current_state( TASK_RUNNING );
-        remove_wait_queue(&pCh->open_wait, &wait);
-
-        --pCh->wopen; //why count?
-
-        ip2trace (CHANN, ITRC_OPEN, 4, 0 );
-
-        if (rc != 0 ) {
-                return rc;
-        }
-        pCh->flags |= ASYNC_NORMAL_ACTIVE;
-
-noblock:
-
-        /* first open - Assign termios structure to port */
-        if ( tty->count == 1 ) {
-                i2QueueCommands(PTYPE_INLINE, pCh, 0, 2, CMD_CTSFL_DSAB, CMD_RTSFL_DSAB);
-                /* Now we must send the termios settings to the loadware */
-                set_params( pCh, NULL );
-        }
-
-        /*
-         * Now set any i2lib options. These may go away if the i2lib code ends
-         * up rolled into the mainline.
-         */
-        pCh->channelOptions |= CO_NBLOCK_WRITE;
-
-#ifdef IP2DEBUG_OPEN
-        printk (KERN_DEBUG "IP2: open completed\n" );
-#endif
-        serviceOutgoingFifo( pCh->pMyBord );
-
-        ip2trace (CHANN, ITRC_OPEN, ITRC_RETURN, 0 );
-
-        return 0;
-}
-
-/******************************************************************************/
-/* Function:   ip2_close()                                                    */
-/* Parameters: Pointer to tty structure                                       */
-/*             Pointer to file structure                                      */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static void
-ip2_close( PTTY tty, struct file *pFile )
-{
-        i2ChanStrPtr  pCh = tty->driver_data;
-
-        if ( !pCh ) {
-                return;
-        }
-
-        ip2trace (CHANN, ITRC_CLOSE, ITRC_ENTER, 0 );
-
-#ifdef IP2DEBUG_OPEN
-        printk(KERN_DEBUG "IP2:close %s:\n",tty->name);
-#endif
-
-        if ( tty_hung_up_p ( pFile ) ) {
-
-                ip2trace (CHANN, ITRC_CLOSE, 2, 1, 2 );
-
-                return;
-        }
-        if ( tty->count > 1 ) { /* not the last close */
-
-                ip2trace (CHANN, ITRC_CLOSE, 2, 1, 3 );
-
-                return;
-        }
-        pCh->flags |= ASYNC_CLOSING;    // last close actually
-
-        tty->closing = 1;
-
-        if (pCh->ClosingWaitTime != ASYNC_CLOSING_WAIT_NONE) {
-                /*
-                 * Before we drop DTR, make sure the transmitter has completely drained.
-                 * This uses an timeout, after which the close
-                 * completes.
-                 */
-                ip2_wait_until_sent(tty, pCh->ClosingWaitTime );
-        }
-        /*
-         * At this point we stop accepting input. Here we flush the channel
-         * input buffer which will allow the board to send up more data. Any
-         * additional input is tossed at interrupt/poll time.
-         */
-        i2InputFlush( pCh );
-
-        /* disable DSS reporting */
-        i2QueueCommands(PTYPE_INLINE, pCh, 100, 4,
-                                CMD_DCD_NREP, CMD_CTS_NREP, CMD_DSR_NREP, CMD_RI_NREP);
-        if (tty->termios->c_cflag & HUPCL) {
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 2, CMD_RTSDN, CMD_DTRDN);
-                pCh->dataSetOut &= ~(I2_DTR | I2_RTS);
-                i2QueueCommands( PTYPE_INLINE, pCh, 100, 1, CMD_PAUSE(25));
-        }
-
-        serviceOutgoingFifo ( pCh->pMyBord );
-
-        tty_ldisc_flush(tty);
-        tty_driver_flush_buffer(tty);
-        tty->closing = 0;
-        
-        pCh->pTTY = NULL;
-
-        if (pCh->wopen) {
-                if (pCh->ClosingDelay) {
-                        msleep_interruptible(jiffies_to_msecs(pCh->ClosingDelay));
-                }
-                wake_up_interruptible(&pCh->open_wait);
-        }
-
-        pCh->flags &=~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-        wake_up_interruptible(&pCh->close_wait);
-
-#ifdef IP2DEBUG_OPEN
-        DBG_CNT("ip2_close: after wakeups--");
-#endif
-
-
-        ip2trace (CHANN, ITRC_CLOSE, ITRC_RETURN, 1, 1 );
-
-        return;
-}
-
-/******************************************************************************/
-/* Function:   ip2_hangup()                                                   */
-/* Parameters: Pointer to tty structure                                       */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static void
-ip2_hangup ( PTTY tty )
-{
-        i2ChanStrPtr  pCh = tty->driver_data;
-
-        if( !pCh ) {
-                return;
-        }
-
-        ip2trace (CHANN, ITRC_HANGUP, ITRC_ENTER, 0 );
-
-        ip2_flush_buffer(tty);
-
-        /* disable DSS reporting */
-
-        i2QueueCommands(PTYPE_BYPASS, pCh, 0, 1, CMD_DCD_NREP);
-        i2QueueCommands(PTYPE_INLINE, pCh, 0, 2, CMD_CTSFL_DSAB, CMD_RTSFL_DSAB);
-        if ( (tty->termios->c_cflag & HUPCL) ) {
-                i2QueueCommands(PTYPE_BYPASS, pCh, 0, 2, CMD_RTSDN, CMD_DTRDN);
-                pCh->dataSetOut &= ~(I2_DTR | I2_RTS);
-                i2QueueCommands( PTYPE_INLINE, pCh, 100, 1, CMD_PAUSE(25));
-        }
-        i2QueueCommands(PTYPE_INLINE, pCh, 1, 3, 
-                                CMD_CTS_NREP, CMD_DSR_NREP, CMD_RI_NREP);
-        serviceOutgoingFifo ( pCh->pMyBord );
-
-        wake_up_interruptible ( &pCh->delta_msr_wait );
-
-        pCh->flags &= ~ASYNC_NORMAL_ACTIVE;
-        pCh->pTTY = NULL;
-        wake_up_interruptible ( &pCh->open_wait );
-
-        ip2trace (CHANN, ITRC_HANGUP, ITRC_RETURN, 0 );
-}
-
-/******************************************************************************/
-/******************************************************************************/
-/* Device Output Section                                                      */
-/******************************************************************************/
-/******************************************************************************/
-
-/******************************************************************************/
-/* Function:   ip2_write()                                                    */
-/* Parameters: Pointer to tty structure                                       */
-/*             Flag denoting data is in user (1) or kernel (0) space          */
-/*             Pointer to data                                                */
-/*             Number of bytes to write                                       */
-/* Returns:    Number of bytes actually written                               */
-/*                                                                            */
-/* Description: (MANDATORY)                                                   */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static int
-ip2_write( PTTY tty, const unsigned char *pData, int count)
-{
-        i2ChanStrPtr  pCh = tty->driver_data;
-        int bytesSent = 0;
-        unsigned long flags;
-
-        ip2trace (CHANN, ITRC_WRITE, ITRC_ENTER, 2, count, -1 );
-
-        /* Flush out any buffered data left over from ip2_putchar() calls. */
-        ip2_flush_chars( tty );
-
-        /* This is the actual move bit. Make sure it does what we need!!!!! */
-        write_lock_irqsave(&pCh->Pbuf_spinlock, flags);
-        bytesSent = i2Output( pCh, pData, count);
-        write_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
-
-        ip2trace (CHANN, ITRC_WRITE, ITRC_RETURN, 1, bytesSent );
-
-        return bytesSent > 0 ? bytesSent : 0;
-}
-
-/******************************************************************************/
-/* Function:   ip2_putchar()                                                  */
-/* Parameters: Pointer to tty structure                                       */
-/*             Character to write                                             */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static int
-ip2_putchar( PTTY tty, unsigned char ch )
-{
-        i2ChanStrPtr  pCh = tty->driver_data;
-        unsigned long flags;
-
-//      ip2trace (CHANN, ITRC_PUTC, ITRC_ENTER, 1, ch );
-
-        write_lock_irqsave(&pCh->Pbuf_spinlock, flags);
-        pCh->Pbuf[pCh->Pbuf_stuff++] = ch;
-        if ( pCh->Pbuf_stuff == sizeof pCh->Pbuf ) {
-                write_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
-                ip2_flush_chars( tty );
-        } else
-                write_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
-        return 1;
-
-//      ip2trace (CHANN, ITRC_PUTC, ITRC_RETURN, 1, ch );
-}
-
-/******************************************************************************/
-/* Function:   ip2_flush_chars()                                              */
-/* Parameters: Pointer to tty structure                                       */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/******************************************************************************/
-static void
-ip2_flush_chars( PTTY tty )
-{
-        int   strip;
-        i2ChanStrPtr  pCh = tty->driver_data;
-        unsigned long flags;
-
-        write_lock_irqsave(&pCh->Pbuf_spinlock, flags);
-        if ( pCh->Pbuf_stuff ) {
-
-//              ip2trace (CHANN, ITRC_PUTC, 10, 1, strip );
-
-                //
-                // We may need to restart i2Output if it does not fullfill this request
-                //
-                strip = i2Output( pCh, pCh->Pbuf, pCh->Pbuf_stuff);
-                if ( strip != pCh->Pbuf_stuff ) {
-                        memmove( pCh->Pbuf, &pCh->Pbuf[strip], pCh->Pbuf_stuff - strip );
-                }
-                pCh->Pbuf_stuff -= strip;
-        }
-        write_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
-}
-
-/******************************************************************************/
-/* Function:   ip2_write_room()                                               */
-/* Parameters: Pointer to tty structure                                       */
-/* Returns:    Number of bytes that the driver can accept                     */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/******************************************************************************/
-static int
-ip2_write_room ( PTTY tty )
-{
-        int bytesFree;
-        i2ChanStrPtr  pCh = tty->driver_data;
-        unsigned long flags;
-
-        read_lock_irqsave(&pCh->Pbuf_spinlock, flags);
-        bytesFree = i2OutputFree( pCh ) - pCh->Pbuf_stuff;
-        read_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
-
-        ip2trace (CHANN, ITRC_WRITE, 11, 1, bytesFree );
-
-        return ((bytesFree > 0) ? bytesFree : 0);
-}
-
-/******************************************************************************/
-/* Function:   ip2_chars_in_buf()                                             */
-/* Parameters: Pointer to tty structure                                       */
-/* Returns:    Number of bytes queued for transmission                        */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static int
-ip2_chars_in_buf ( PTTY tty )
-{
-        i2ChanStrPtr  pCh = tty->driver_data;
-        int rc;
-        unsigned long flags;
-
-        ip2trace (CHANN, ITRC_WRITE, 12, 1, pCh->Obuf_char_count + pCh->Pbuf_stuff );
-
-#ifdef IP2DEBUG_WRITE
-        printk (KERN_DEBUG "IP2: chars in buffer = %d (%d,%d)\n",
-                                 pCh->Obuf_char_count + pCh->Pbuf_stuff,
-                                 pCh->Obuf_char_count, pCh->Pbuf_stuff );
-#endif
-        read_lock_irqsave(&pCh->Obuf_spinlock, flags);
-        rc =  pCh->Obuf_char_count;
-        read_unlock_irqrestore(&pCh->Obuf_spinlock, flags);
-        read_lock_irqsave(&pCh->Pbuf_spinlock, flags);
-        rc +=  pCh->Pbuf_stuff;
-        read_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
-        return rc;
-}
-
-/******************************************************************************/
-/* Function:   ip2_flush_buffer()                                             */
-/* Parameters: Pointer to tty structure                                       */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static void
-ip2_flush_buffer( PTTY tty )
-{
-        i2ChanStrPtr  pCh = tty->driver_data;
-        unsigned long flags;
-
-        ip2trace (CHANN, ITRC_FLUSH, ITRC_ENTER, 0 );
-
-#ifdef IP2DEBUG_WRITE
-        printk (KERN_DEBUG "IP2: flush buffer\n" );
-#endif
-        write_lock_irqsave(&pCh->Pbuf_spinlock, flags);
-        pCh->Pbuf_stuff = 0;
-        write_unlock_irqrestore(&pCh->Pbuf_spinlock, flags);
-        i2FlushOutput( pCh );
-        ip2_owake(tty);
-
-        ip2trace (CHANN, ITRC_FLUSH, ITRC_RETURN, 0 );
-
-}
-
-/******************************************************************************/
-/* Function:   ip2_wait_until_sent()                                          */
-/* Parameters: Pointer to tty structure                                       */
-/*             Timeout for wait.                                              */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/* This function is used in place of the normal tty_wait_until_sent, which    */
-/* only waits for the driver buffers to be empty (or rather, those buffers    */
-/* reported by chars_in_buffer) which doesn't work for IP2 due to the         */
-/* indeterminate number of bytes buffered on the board.                       */
-/******************************************************************************/
-static void
-ip2_wait_until_sent ( PTTY tty, int timeout )
-{
-        int i = jiffies;
-        i2ChanStrPtr  pCh = tty->driver_data;
-
-        tty_wait_until_sent(tty, timeout );
-        if ( (i = timeout - (jiffies -i)) > 0)
-                i2DrainOutput( pCh, i );
-}
-
-/******************************************************************************/
-/******************************************************************************/
-/* Device Input Section                                                       */
-/******************************************************************************/
-/******************************************************************************/
-
-/******************************************************************************/
-/* Function:   ip2_throttle()                                                 */
-/* Parameters: Pointer to tty structure                                       */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static void
-ip2_throttle ( PTTY tty )
-{
-        i2ChanStrPtr  pCh = tty->driver_data;
-
-#ifdef IP2DEBUG_READ
-        printk (KERN_DEBUG "IP2: throttle\n" );
-#endif
-        /*
-         * Signal the poll/interrupt handlers not to forward incoming data to
-         * the line discipline. This will cause the buffers to fill up in the
-         * library and thus cause the library routines to send the flow control
-         * stuff.
-         */
-        pCh->throttled = 1;
-}
-
-/******************************************************************************/
-/* Function:   ip2_unthrottle()                                               */
-/* Parameters: Pointer to tty structure                                       */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static void
-ip2_unthrottle ( PTTY tty )
-{
-        i2ChanStrPtr  pCh = tty->driver_data;
-        unsigned long flags;
-
-#ifdef IP2DEBUG_READ
-        printk (KERN_DEBUG "IP2: unthrottle\n" );
-#endif
-
-        /* Pass incoming data up to the line discipline again. */
-        pCh->throttled = 0;
-        i2QueueCommands(PTYPE_BYPASS, pCh, 0, 1, CMD_RESUME);
-        serviceOutgoingFifo( pCh->pMyBord );
-        read_lock_irqsave(&pCh->Ibuf_spinlock, flags);
-        if ( pCh->Ibuf_stuff != pCh->Ibuf_strip ) {
-                read_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
-#ifdef IP2DEBUG_READ
-                printk (KERN_DEBUG "i2Input called from unthrottle\n" );
-#endif
-                i2Input( pCh );
-        } else
-                read_unlock_irqrestore(&pCh->Ibuf_spinlock, flags);
-}
-
-static void
-ip2_start ( PTTY tty )
-{
-        i2ChanStrPtr  pCh = DevTable[tty->index];
-
-        i2QueueCommands(PTYPE_BYPASS, pCh, 0, 1, CMD_RESUME);
-        i2QueueCommands(PTYPE_BYPASS, pCh, 100, 1, CMD_UNSUSPEND);
-        i2QueueCommands(PTYPE_BYPASS, pCh, 100, 1, CMD_RESUME);
-#ifdef IP2DEBUG_WRITE
-        printk (KERN_DEBUG "IP2: start tx\n" );
-#endif
-}
-
-static void
-ip2_stop ( PTTY tty )
-{
-        i2ChanStrPtr  pCh = DevTable[tty->index];
-
-        i2QueueCommands(PTYPE_BYPASS, pCh, 100, 1, CMD_SUSPEND);
-#ifdef IP2DEBUG_WRITE
-        printk (KERN_DEBUG "IP2: stop tx\n" );
-#endif
-}
-
-/******************************************************************************/
-/* Device Ioctl Section                                                       */
-/******************************************************************************/
-
-static int ip2_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        i2ChanStrPtr pCh = DevTable[tty->index];
-#ifdef  ENABLE_DSSNOW
-        wait_queue_t wait;
-#endif
-
-        if (pCh == NULL)
-                return -ENODEV;
-
-/*
-        FIXME - the following code is causing a NULL pointer dereference in
-        2.3.51 in an interrupt handler.  It's suppose to prompt the board
-        to return the DSS signal status immediately.  Why doesn't it do
-        the same thing in 2.2.14?
-*/
-
-/*      This thing is still busted in the 1.2.12 driver on 2.4.x
-        and even hoses the serial console so the oops can be trapped.
-                /\/\|=mhw=|\/\/                 */
-
-#ifdef  ENABLE_DSSNOW
-        i2QueueCommands(PTYPE_BYPASS, pCh, 100, 1, CMD_DSS_NOW);
-
-        init_waitqueue_entry(&wait, current);
-        add_wait_queue(&pCh->dss_now_wait, &wait);
-        set_current_state( TASK_INTERRUPTIBLE );
-
-        serviceOutgoingFifo( pCh->pMyBord );
-
-        schedule();
-
-        set_current_state( TASK_RUNNING );
-        remove_wait_queue(&pCh->dss_now_wait, &wait);
-
-        if (signal_pending(current)) {
-                return -EINTR;
-        }
-#endif
-        return  ((pCh->dataSetOut & I2_RTS) ? TIOCM_RTS : 0)
-              | ((pCh->dataSetOut & I2_DTR) ? TIOCM_DTR : 0)
-              | ((pCh->dataSetIn  & I2_DCD) ? TIOCM_CAR : 0)
-              | ((pCh->dataSetIn  & I2_RI)  ? TIOCM_RNG : 0)
-              | ((pCh->dataSetIn  & I2_DSR) ? TIOCM_DSR : 0)
-              | ((pCh->dataSetIn  & I2_CTS) ? TIOCM_CTS : 0);
-}
-
-static int ip2_tiocmset(struct tty_struct *tty, struct file *file,
-                        unsigned int set, unsigned int clear)
-{
-        i2ChanStrPtr pCh = DevTable[tty->index];
-
-        if (pCh == NULL)
-                return -ENODEV;
-
-        if (set & TIOCM_RTS) {
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_RTSUP);
-                pCh->dataSetOut |= I2_RTS;
-        }
-        if (set & TIOCM_DTR) {
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_DTRUP);
-                pCh->dataSetOut |= I2_DTR;
-        }
-
-        if (clear & TIOCM_RTS) {
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_RTSDN);
-                pCh->dataSetOut &= ~I2_RTS;
-        }
-        if (clear & TIOCM_DTR) {
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_DTRDN);
-                pCh->dataSetOut &= ~I2_DTR;
-        }
-        serviceOutgoingFifo( pCh->pMyBord );
-        return 0;
-}
-
-/******************************************************************************/
-/* Function:   ip2_ioctl()                                                    */
-/* Parameters: Pointer to tty structure                                       */
-/*             Pointer to file structure                                      */
-/*             Command                                                        */
-/*             Argument                                                       */
-/* Returns:    Success or failure                                             */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static int
-ip2_ioctl ( PTTY tty, struct file *pFile, UINT cmd, ULONG arg )
-{
-        wait_queue_t wait;
-        i2ChanStrPtr pCh = DevTable[tty->index];
-        i2eBordStrPtr pB;
-        struct async_icount cprev, cnow;        /* kernel counter temps */
-        struct serial_icounter_struct __user *p_cuser;
-        int rc = 0;
-        unsigned long flags;
-        void __user *argp = (void __user *)arg;
-
-        if ( pCh == NULL )
-                return -ENODEV;
-
-        pB = pCh->pMyBord;
-
-        ip2trace (CHANN, ITRC_IOCTL, ITRC_ENTER, 2, cmd, arg );
-
-#ifdef IP2DEBUG_IOCTL
-        printk(KERN_DEBUG "IP2: ioctl cmd (%x), arg (%lx)\n", cmd, arg );
-#endif
-
-        switch(cmd) {
-        case TIOCGSERIAL:
-
-                ip2trace (CHANN, ITRC_IOCTL, 2, 1, rc );
-
-                rc = get_serial_info(pCh, argp);
-                if (rc)
-                        return rc;
-                break;
-
-        case TIOCSSERIAL:
-
-                ip2trace (CHANN, ITRC_IOCTL, 3, 1, rc );
-
-                rc = set_serial_info(pCh, argp);
-                if (rc)
-                        return rc;
-                break;
-
-        case TCXONC:
-                rc = tty_check_change(tty);
-                if (rc)
-                        return rc;
-                switch (arg) {
-                case TCOOFF:
-                        //return  -ENOIOCTLCMD;
-                        break;
-                case TCOON:
-                        //return  -ENOIOCTLCMD;
-                        break;
-                case TCIOFF:
-                        if (STOP_CHAR(tty) != __DISABLED_CHAR) {
-                                i2QueueCommands( PTYPE_BYPASS, pCh, 100, 1,
-                                                CMD_XMIT_NOW(STOP_CHAR(tty)));
-                        }
-                        break;
-                case TCION:
-                        if (START_CHAR(tty) != __DISABLED_CHAR) {
-                                i2QueueCommands( PTYPE_BYPASS, pCh, 100, 1,
-                                                CMD_XMIT_NOW(START_CHAR(tty)));
-                        }
-                        break;
-                default:
-                        return -EINVAL;
-                }
-                return 0;
-
-        case TCSBRK:   /* SVID version: non-zero arg --> no break */
-                rc = tty_check_change(tty);
-
-                ip2trace (CHANN, ITRC_IOCTL, 4, 1, rc );
-
-                if (!rc) {
-                        ip2_wait_until_sent(tty,0);
-                        if (!arg) {
-                                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_SEND_BRK(250));
-                                serviceOutgoingFifo( pCh->pMyBord );
-                        }
-                }
-                break;
-
-        case TCSBRKP:  /* support for POSIX tcsendbreak() */
-                rc = tty_check_change(tty);
-
-                ip2trace (CHANN, ITRC_IOCTL, 5, 1, rc );
-
-                if (!rc) {
-                        ip2_wait_until_sent(tty,0);
-                        i2QueueCommands(PTYPE_INLINE, pCh, 100, 1,
-                                CMD_SEND_BRK(arg ? arg*100 : 250));
-                        serviceOutgoingFifo ( pCh->pMyBord );   
-                }
-                break;
-
-        case TIOCGSOFTCAR:
-
-                ip2trace (CHANN, ITRC_IOCTL, 6, 1, rc );
-
-                        rc = put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *)argp);
-                if (rc) 
-                        return rc;
-        break;
-
-        case TIOCSSOFTCAR:
-
-                ip2trace (CHANN, ITRC_IOCTL, 7, 1, rc );
-
-                rc = get_user(arg,(unsigned long __user *) argp);
-                if (rc) 
-                        return rc;
-                tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL)
-                                         | (arg ? CLOCAL : 0));
-                
-                break;
-
-        /*
-         * Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change - mask
-         * passed in arg for lines of interest (use |'ed TIOCM_RNG/DSR/CD/CTS
-         * for masking). Caller should use TIOCGICOUNT to see which one it was
-         */
-        case TIOCMIWAIT:
-                write_lock_irqsave(&pB->read_fifo_spinlock, flags);
-                cprev = pCh->icount;     /* note the counters on entry */
-                write_unlock_irqrestore(&pB->read_fifo_spinlock, flags);
-                i2QueueCommands(PTYPE_BYPASS, pCh, 100, 4, 
-                                                CMD_DCD_REP, CMD_CTS_REP, CMD_DSR_REP, CMD_RI_REP);
-                init_waitqueue_entry(&wait, current);
-                add_wait_queue(&pCh->delta_msr_wait, &wait);
-                set_current_state( TASK_INTERRUPTIBLE );
-
-                serviceOutgoingFifo( pCh->pMyBord );
-                for(;;) {
-                        ip2trace (CHANN, ITRC_IOCTL, 10, 0 );
-
-                        schedule();
-
-                        ip2trace (CHANN, ITRC_IOCTL, 11, 0 );
-
-                        /* see if a signal did it */
-                        if (signal_pending(current)) {
-                                rc = -ERESTARTSYS;
-                                break;
-                        }
-                        write_lock_irqsave(&pB->read_fifo_spinlock, flags);
-                        cnow = pCh->icount; /* atomic copy */
-                        write_unlock_irqrestore(&pB->read_fifo_spinlock, flags);
-                        if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
-                                cnow.dcd == cprev.dcd && cnow.cts == cprev.cts) {
-                                rc =  -EIO; /* no change => rc */
-                                break;
-                        }
-                        if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
-                            ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
-                            ((arg & TIOCM_CD)  && (cnow.dcd != cprev.dcd)) ||
-                            ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts)) ) {
-                                rc =  0;
-                                break;
-                        }
-                        cprev = cnow;
-                }
-                set_current_state( TASK_RUNNING );
-                remove_wait_queue(&pCh->delta_msr_wait, &wait);
-
-                i2QueueCommands(PTYPE_BYPASS, pCh, 100, 3, 
-                                                 CMD_CTS_NREP, CMD_DSR_NREP, CMD_RI_NREP);
-                if ( ! (pCh->flags      & ASYNC_CHECK_CD)) {
-                        i2QueueCommands(PTYPE_BYPASS, pCh, 100, 1, CMD_DCD_NREP);
-                }
-                serviceOutgoingFifo( pCh->pMyBord );
-                return rc;
-                break;
-
-        /*
-         * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-         * Return: write counters to the user passed counter struct
-         * NB: both 1->0 and 0->1 transitions are counted except for RI where
-         * only 0->1 is counted. The controller is quite capable of counting
-         * both, but this done to preserve compatibility with the standard
-         * serial driver.
-         */
-        case TIOCGICOUNT:
-                ip2trace (CHANN, ITRC_IOCTL, 11, 1, rc );
-
-                write_lock_irqsave(&pB->read_fifo_spinlock, flags);
-                cnow = pCh->icount;
-                write_unlock_irqrestore(&pB->read_fifo_spinlock, flags);
-                p_cuser = argp;
-                rc = put_user(cnow.cts, &p_cuser->cts);
-                rc = put_user(cnow.dsr, &p_cuser->dsr);
-                rc = put_user(cnow.rng, &p_cuser->rng);
-                rc = put_user(cnow.dcd, &p_cuser->dcd);
-                rc = put_user(cnow.rx, &p_cuser->rx);
-                rc = put_user(cnow.tx, &p_cuser->tx);
-                rc = put_user(cnow.frame, &p_cuser->frame);
-                rc = put_user(cnow.overrun, &p_cuser->overrun);
-                rc = put_user(cnow.parity, &p_cuser->parity);
-                rc = put_user(cnow.brk, &p_cuser->brk);
-                rc = put_user(cnow.buf_overrun, &p_cuser->buf_overrun);
-                break;
-
-        /*
-         * The rest are not supported by this driver. By returning -ENOIOCTLCMD they
-         * will be passed to the line discipline for it to handle.
-         */
-        case TIOCSERCONFIG:
-        case TIOCSERGWILD:
-        case TIOCSERGETLSR:
-        case TIOCSERSWILD:
-        case TIOCSERGSTRUCT:
-        case TIOCSERGETMULTI:
-        case TIOCSERSETMULTI:
-
-        default:
-                ip2trace (CHANN, ITRC_IOCTL, 12, 0 );
-
-                rc =  -ENOIOCTLCMD;
-                break;
-        }
-
-        ip2trace (CHANN, ITRC_IOCTL, ITRC_RETURN, 0 );
-
-        return rc;
-}
-
-/******************************************************************************/
-/* Function:   GetSerialInfo()                                                */
-/* Parameters: Pointer to channel structure                                   */
-/*             Pointer to old termios structure                               */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/* This is to support the setserial command, and requires processing of the   */
-/* standard Linux serial structure.                                           */
-/******************************************************************************/
-static int
-get_serial_info ( i2ChanStrPtr pCh, struct serial_struct __user *retinfo )
-{
-        struct serial_struct tmp;
-
-        memset ( &tmp, 0, sizeof(tmp) );
-        tmp.type = pCh->pMyBord->channelBtypes.bid_value[(pCh->port_index & (IP2_PORTS_PER_BOARD-1))/16];
-        if (BID_HAS_654(tmp.type)) {
-                tmp.type = PORT_16650;
-        } else {
-                tmp.type = PORT_CIRRUS;
-        }
-        tmp.line = pCh->port_index;
-        tmp.port = pCh->pMyBord->i2eBase;
-        tmp.irq  = ip2config.irq[pCh->port_index/64];
-        tmp.flags = pCh->flags;
-        tmp.baud_base = pCh->BaudBase;
-        tmp.close_delay = pCh->ClosingDelay;
-        tmp.closing_wait = pCh->ClosingWaitTime;
-        tmp.custom_divisor = pCh->BaudDivisor;
-        return copy_to_user(retinfo,&tmp,sizeof(*retinfo));
-}
-
-/******************************************************************************/
-/* Function:   SetSerialInfo()                                                */
-/* Parameters: Pointer to channel structure                                   */
-/*             Pointer to old termios structure                               */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/* This function provides support for setserial, which uses the TIOCSSERIAL   */
-/* ioctl. Not all setserial parameters are relevant. If the user attempts to  */
-/* change the IRQ, address or type of the port the ioctl fails.               */
-/******************************************************************************/
-static int
-set_serial_info( i2ChanStrPtr pCh, struct serial_struct __user *new_info )
-{
-        struct serial_struct ns;
-        int   old_flags, old_baud_divisor;
-
-        if (copy_from_user(&ns, new_info, sizeof (ns)))
-                return -EFAULT;
-
-        /*
-         * We don't allow setserial to change IRQ, board address, type or baud
-         * base. Also line nunber as such is meaningless but we use it for our
-         * array index so it is fixed also.
-         */
-        if ( (ns.irq        != ip2config.irq[pCh->port_index])
-            || ((int) ns.port      != ((int) (pCh->pMyBord->i2eBase)))
-            || (ns.baud_base != pCh->BaudBase)
-            || (ns.line      != pCh->port_index) ) {
-                return -EINVAL;
-        }
-
-        old_flags = pCh->flags;
-        old_baud_divisor = pCh->BaudDivisor;
-
-        if ( !capable(CAP_SYS_ADMIN) ) {
-                if ( ( ns.close_delay != pCh->ClosingDelay ) ||
-                    ( (ns.flags & ~ASYNC_USR_MASK) !=
-                      (pCh->flags & ~ASYNC_USR_MASK) ) ) {
-                        return -EPERM;
-                }
-
-                pCh->flags = (pCh->flags & ~ASYNC_USR_MASK) |
-                               (ns.flags & ASYNC_USR_MASK);
-                pCh->BaudDivisor = ns.custom_divisor;
-        } else {
-                pCh->flags = (pCh->flags & ~ASYNC_FLAGS) |
-                               (ns.flags & ASYNC_FLAGS);
-                pCh->BaudDivisor = ns.custom_divisor;
-                pCh->ClosingDelay = ns.close_delay * HZ/100;
-                pCh->ClosingWaitTime = ns.closing_wait * HZ/100;
-        }
-
-        if ( ( (old_flags & ASYNC_SPD_MASK) != (pCh->flags & ASYNC_SPD_MASK) )
-            || (old_baud_divisor != pCh->BaudDivisor) ) {
-                // Invalidate speed and reset parameters
-                set_params( pCh, NULL );
-        }
-
-        return 0;
-}
-
-/******************************************************************************/
-/* Function:   ip2_set_termios()                                              */
-/* Parameters: Pointer to tty structure                                       */
-/*             Pointer to old termios structure                               */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static void
-ip2_set_termios( PTTY tty, struct ktermios *old_termios )
-{
-        i2ChanStrPtr pCh = (i2ChanStrPtr)tty->driver_data;
-
-#ifdef IP2DEBUG_IOCTL
-        printk (KERN_DEBUG "IP2: set termios %p\n", old_termios );
-#endif
-
-        set_params( pCh, old_termios );
-}
-
-/******************************************************************************/
-/* Function:   ip2_set_line_discipline()                                      */
-/* Parameters: Pointer to tty structure                                       */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:  Does nothing                                                 */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static void
-ip2_set_line_discipline ( PTTY tty )
-{
-#ifdef IP2DEBUG_IOCTL
-        printk (KERN_DEBUG "IP2: set line discipline\n" );
-#endif
-
-        ip2trace (((i2ChanStrPtr)tty->driver_data)->port_index, ITRC_IOCTL, 16, 0 );
-
-}
-
-/******************************************************************************/
-/* Function:   SetLine Characteristics()                                      */
-/* Parameters: Pointer to channel structure                                   */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/* This routine is called to update the channel structure with the new line   */
-/* characteristics, and send the appropriate commands to the board when they  */
-/* change.                                                                    */
-/******************************************************************************/
-static void
-set_params( i2ChanStrPtr pCh, struct ktermios *o_tios )
-{
-        tcflag_t cflag, iflag, lflag;
-        char stop_char, start_char;
-        struct ktermios dummy;
-
-        lflag = pCh->pTTY->termios->c_lflag;
-        cflag = pCh->pTTY->termios->c_cflag;
-        iflag = pCh->pTTY->termios->c_iflag;
-
-        if (o_tios == NULL) {
-                dummy.c_lflag = ~lflag;
-                dummy.c_cflag = ~cflag;
-                dummy.c_iflag = ~iflag;
-                o_tios = &dummy;
-        }
-
-        {
-                switch ( cflag & CBAUD ) {
-                case B0:
-                        i2QueueCommands( PTYPE_BYPASS, pCh, 100, 2, CMD_RTSDN, CMD_DTRDN);
-                        pCh->dataSetOut &= ~(I2_DTR | I2_RTS);
-                        i2QueueCommands( PTYPE_INLINE, pCh, 100, 1, CMD_PAUSE(25));
-                        pCh->pTTY->termios->c_cflag |= (CBAUD & o_tios->c_cflag);
-                        goto service_it;
-                        break;
-                case B38400:
-                        /*
-                         * This is the speed that is overloaded with all the other high
-                         * speeds, depending upon the flag settings.
-                         */
-                        if ( ( pCh->flags & ASYNC_SPD_MASK ) == ASYNC_SPD_HI ) {
-                                pCh->speed = CBR_57600;
-                        } else if ( (pCh->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI ) {
-                                pCh->speed = CBR_115200;
-                        } else if ( (pCh->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST ) {
-                                pCh->speed = CBR_C1;
-                        } else {
-                                pCh->speed = CBR_38400;
-                        }
-                        break;
-                case B50:      pCh->speed = CBR_50;      break;
-                case B75:      pCh->speed = CBR_75;      break;
-                case B110:     pCh->speed = CBR_110;     break;
-                case B134:     pCh->speed = CBR_134;     break;
-                case B150:     pCh->speed = CBR_150;     break;
-                case B200:     pCh->speed = CBR_200;     break;
-                case B300:     pCh->speed = CBR_300;     break;
-                case B600:     pCh->speed = CBR_600;     break;
-                case B1200:    pCh->speed = CBR_1200;    break;
-                case B1800:    pCh->speed = CBR_1800;    break;
-                case B2400:    pCh->speed = CBR_2400;    break;
-                case B4800:    pCh->speed = CBR_4800;    break;
-                case B9600:    pCh->speed = CBR_9600;    break;
-                case B19200:   pCh->speed = CBR_19200;   break;
-                case B57600:   pCh->speed = CBR_57600;   break;
-                case B115200:  pCh->speed = CBR_115200;  break;
-                case B153600:  pCh->speed = CBR_153600;  break;
-                case B230400:  pCh->speed = CBR_230400;  break;
-                case B307200:  pCh->speed = CBR_307200;  break;
-                case B460800:  pCh->speed = CBR_460800;  break;
-                case B921600:  pCh->speed = CBR_921600;  break;
-                default:       pCh->speed = CBR_9600;    break;
-                }
-                if ( pCh->speed == CBR_C1 ) {
-                        // Process the custom speed parameters.
-                        int bps = pCh->BaudBase / pCh->BaudDivisor;
-                        if ( bps == 921600 ) {
-                                pCh->speed = CBR_921600;
-                        } else {
-                                bps = bps/10;
-                                i2QueueCommands( PTYPE_INLINE, pCh, 100, 1, CMD_BAUD_DEF1(bps) );
-                        }
-                }
-                i2QueueCommands( PTYPE_INLINE, pCh, 100, 1, CMD_SETBAUD(pCh->speed));
-                
-                i2QueueCommands ( PTYPE_INLINE, pCh, 100, 2, CMD_DTRUP, CMD_RTSUP);
-                pCh->dataSetOut |= (I2_DTR | I2_RTS);
-        }
-        if ( (CSTOPB & cflag) ^ (CSTOPB & o_tios->c_cflag)) 
-        {
-                i2QueueCommands ( PTYPE_INLINE, pCh, 100, 1, 
-                        CMD_SETSTOP( ( cflag & CSTOPB ) ? CST_2 : CST_1));
-        }
-        if (((PARENB|PARODD) & cflag) ^ ((PARENB|PARODD) & o_tios->c_cflag)) 
-        {
-                i2QueueCommands ( PTYPE_INLINE, pCh, 100, 1,
-                        CMD_SETPAR( 
-                                (cflag & PARENB ?  (cflag & PARODD ? CSP_OD : CSP_EV) : CSP_NP)
-                        )
-                );
-        }
-        /* byte size and parity */
-        if ( (CSIZE & cflag)^(CSIZE & o_tios->c_cflag)) 
-        {
-                int datasize;
-                switch ( cflag & CSIZE ) {
-                case CS5: datasize = CSZ_5; break;
-                case CS6: datasize = CSZ_6; break;
-                case CS7: datasize = CSZ_7; break;
-                case CS8: datasize = CSZ_8; break;
-                default:  datasize = CSZ_5; break;      /* as per serial.c */
-                }
-                i2QueueCommands ( PTYPE_INLINE, pCh, 100, 1, CMD_SETBITS(datasize) );
-        }
-        /* Process CTS flow control flag setting */
-        if ( (cflag & CRTSCTS) ) {
-                i2QueueCommands(PTYPE_INLINE, pCh, 100,
-                                                2, CMD_CTSFL_ENAB, CMD_RTSFL_ENAB);
-        } else {
-                i2QueueCommands(PTYPE_INLINE, pCh, 100,
-                                                2, CMD_CTSFL_DSAB, CMD_RTSFL_DSAB);
-        }
-        //
-        // Process XON/XOFF flow control flags settings
-        //
-        stop_char = STOP_CHAR(pCh->pTTY);
-        start_char = START_CHAR(pCh->pTTY);
-
-        //////////// can't be \000
-        if (stop_char == __DISABLED_CHAR ) 
-        {
-                stop_char = ~__DISABLED_CHAR; 
-        }
-        if (start_char == __DISABLED_CHAR ) 
-        {
-                start_char = ~__DISABLED_CHAR;
-        }
-        /////////////////////////////////
-
-        if ( o_tios->c_cc[VSTART] != start_char ) 
-        {
-                i2QueueCommands(PTYPE_BYPASS, pCh, 100, 1, CMD_DEF_IXON(start_char));
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_DEF_OXON(start_char));
-        }
-        if ( o_tios->c_cc[VSTOP] != stop_char ) 
-        {
-                 i2QueueCommands(PTYPE_BYPASS, pCh, 100, 1, CMD_DEF_IXOFF(stop_char));
-                 i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_DEF_OXOFF(stop_char));
-        }
-        if (stop_char == __DISABLED_CHAR ) 
-        {
-                stop_char = ~__DISABLED_CHAR;  //TEST123
-                goto no_xoff;
-        }
-        if ((iflag & (IXOFF))^(o_tios->c_iflag & (IXOFF))) 
-        {
-                if ( iflag & IXOFF ) {  // Enable XOFF output flow control
-                        i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_OXON_OPT(COX_XON));
-                } else {        // Disable XOFF output flow control
-no_xoff:
-                        i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_OXON_OPT(COX_NONE));
-                }
-        }
-        if (start_char == __DISABLED_CHAR ) 
-        {
-                goto no_xon;
-        }
-        if ((iflag & (IXON|IXANY)) ^ (o_tios->c_iflag & (IXON|IXANY))) 
-        {
-                if ( iflag & IXON ) {
-                        if ( iflag & IXANY ) { // Enable XON/XANY output flow control
-                                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_IXON_OPT(CIX_XANY));
-                        } else { // Enable XON output flow control
-                                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_IXON_OPT(CIX_XON));
-                        }
-                } else { // Disable XON output flow control
-no_xon:
-                        i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_IXON_OPT(CIX_NONE));
-                }
-        }
-        if ( (iflag & ISTRIP) ^ ( o_tios->c_iflag & (ISTRIP)) ) 
-        {
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, 
-                                CMD_ISTRIP_OPT((iflag & ISTRIP ? 1 : 0)));
-        }
-        if ( (iflag & INPCK) ^ ( o_tios->c_iflag & (INPCK)) ) 
-        {
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, 
-                                CMD_PARCHK((iflag & INPCK) ? CPK_ENAB : CPK_DSAB));
-        }
-
-        if ( (iflag & (IGNBRK|PARMRK|BRKINT|IGNPAR)) 
-                        ^       ( o_tios->c_iflag & (IGNBRK|PARMRK|BRKINT|IGNPAR)) ) 
-        {
-                char brkrpt = 0;
-                char parrpt = 0;
-
-                if ( iflag & IGNBRK ) { /* Ignore breaks altogether */
-                        /* Ignore breaks altogether */
-                        i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_BRK_NREP);
-                } else {
-                        if ( iflag & BRKINT ) {
-                                if ( iflag & PARMRK ) {
-                                        brkrpt = 0x0a;  // exception an inline triple
-                                } else {
-                                        brkrpt = 0x1a;  // exception and NULL
-                                }
-                                brkrpt |= 0x04; // flush input
-                        } else {
-                                if ( iflag & PARMRK ) {
-                                        brkrpt = 0x0b;  //POSIX triple \0377 \0 \0
-                                } else {
-                                        brkrpt = 0x01;  // Null only
-                                }
-                        }
-                        i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_BRK_REP(brkrpt));
-                } 
-
-                if (iflag & IGNPAR) {
-                        parrpt = 0x20;
-                                                                                                        /* would be 2 for not cirrus bug */
-                                                                                                        /* would be 0x20 cept for cirrus bug */
-                } else {
-                        if ( iflag & PARMRK ) {
-                                /*
-                                 * Replace error characters with 3-byte sequence (\0377,\0,char)
-                                 */
-                                parrpt = 0x04 ;
-                                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_ISTRIP_OPT((char)0));
-                        } else {
-                                parrpt = 0x03;
-                        } 
-                }
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_SET_ERROR(parrpt));
-        }
-        if (cflag & CLOCAL) {
-                // Status reporting fails for DCD if this is off
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_DCD_NREP);
-                pCh->flags &= ~ASYNC_CHECK_CD;
-        } else {
-                i2QueueCommands(PTYPE_INLINE, pCh, 100, 1, CMD_DCD_REP);
-                pCh->flags      |= ASYNC_CHECK_CD;
-        }
-
-service_it:
-        i2DrainOutput( pCh, 100 );              
-}
-
-/******************************************************************************/
-/* IPL Device Section                                                         */
-/******************************************************************************/
-
-/******************************************************************************/
-/* Function:   ip2_ipl_read()                                                  */
-/* Parameters: Pointer to device inode                                        */
-/*             Pointer to file structure                                      */
-/*             Pointer to data                                                */
-/*             Number of bytes to read                                        */
-/* Returns:    Success or failure                                             */
-/*                                                                            */
-/* Description:   Ugly                                                        */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-
-static 
-ssize_t
-ip2_ipl_read(struct file *pFile, char __user *pData, size_t count, loff_t *off )
-{
-        unsigned int minor = iminor(pFile->f_path.dentry->d_inode);
-        int rc = 0;
-
-#ifdef IP2DEBUG_IPL
-        printk (KERN_DEBUG "IP2IPL: read %p, %d bytes\n", pData, count );
-#endif
-
-        switch( minor ) {
-        case 0:     // IPL device
-                rc = -EINVAL;
-                break;
-        case 1:     // Status dump
-                rc = -EINVAL;
-                break;
-        case 2:     // Ping device
-                rc = -EINVAL;
-                break;
-        case 3:     // Trace device
-                rc = DumpTraceBuffer ( pData, count );
-                break;
-        case 4:     // Trace device
-                rc = DumpFifoBuffer ( pData, count );
-                break;
-        default:
-                rc = -ENODEV;
-                break;
-        }
-        return rc;
-}
-
-static int
-DumpFifoBuffer ( char __user *pData, int count )
-{
-#ifdef DEBUG_FIFO
-        int rc;
-        rc = copy_to_user(pData, DBGBuf, count);
-
-        printk(KERN_DEBUG "Last index %d\n", I );
-
-        return count;
-#endif  /* DEBUG_FIFO */
-        return 0;
-}
-
-static int
-DumpTraceBuffer ( char __user *pData, int count )
-{
-#ifdef IP2DEBUG_TRACE
-        int rc;
-        int dumpcount;
-        int chunk;
-        int *pIndex = (int __user *)pData;
-
-        if ( count < (sizeof(int) * 6) ) {
-                return -EIO;
-        }
-        rc = put_user(tracewrap, pIndex );
-        rc = put_user(TRACEMAX, ++pIndex );
-        rc = put_user(tracestrip, ++pIndex );
-        rc = put_user(tracestuff, ++pIndex );
-        pData += sizeof(int) * 6;
-        count -= sizeof(int) * 6;
-
-        dumpcount = tracestuff - tracestrip;
-        if ( dumpcount < 0 ) {
-                dumpcount += TRACEMAX;
-        }
-        if ( dumpcount > count ) {
-                dumpcount = count;
-        }
-        chunk = TRACEMAX - tracestrip;
-        if ( dumpcount > chunk ) {
-                rc = copy_to_user(pData, &tracebuf[tracestrip],
-                              chunk * sizeof(tracebuf[0]) );
-                pData += chunk * sizeof(tracebuf[0]);
-                tracestrip = 0;
-                chunk = dumpcount - chunk;
-        } else {
-                chunk = dumpcount;
-        }
-        rc = copy_to_user(pData, &tracebuf[tracestrip],
-                      chunk * sizeof(tracebuf[0]) );
-        tracestrip += chunk;
-        tracewrap = 0;
-
-        rc = put_user(tracestrip, ++pIndex );
-        rc = put_user(tracestuff, ++pIndex );
-
-        return dumpcount;
-#else
-        return 0;
-#endif
-}
-
-/******************************************************************************/
-/* Function:   ip2_ipl_write()                                                 */
-/* Parameters:                                                                */
-/*             Pointer to file structure                                      */
-/*             Pointer to data                                                */
-/*             Number of bytes to write                                       */
-/* Returns:    Success or failure                                             */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static ssize_t
-ip2_ipl_write(struct file *pFile, const char __user *pData, size_t count, loff_t *off)
-{
-#ifdef IP2DEBUG_IPL
-        printk (KERN_DEBUG "IP2IPL: write %p, %d bytes\n", pData, count );
-#endif
-        return 0;
-}
-
-/******************************************************************************/
-/* Function:   ip2_ipl_ioctl()                                                */
-/* Parameters: Pointer to device inode                                        */
-/*             Pointer to file structure                                      */
-/*             Command                                                        */
-/*             Argument                                                       */
-/* Returns:    Success or failure                                             */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static long
-ip2_ipl_ioctl (struct file *pFile, UINT cmd, ULONG arg )
-{
-        unsigned int iplminor = iminor(pFile->f_path.dentry->d_inode);
-        int rc = 0;
-        void __user *argp = (void __user *)arg;
-        ULONG __user *pIndex = argp;
-        i2eBordStrPtr pB = i2BoardPtrTable[iplminor / 4];
-        i2ChanStrPtr pCh;
-
-#ifdef IP2DEBUG_IPL
-        printk (KERN_DEBUG "IP2IPL: ioctl cmd %d, arg %ld\n", cmd, arg );
-#endif
-
-        lock_kernel();
-
-        switch ( iplminor ) {
-        case 0:     // IPL device
-                rc = -EINVAL;
-                break;
-        case 1:     // Status dump
-        case 5:
-        case 9:
-        case 13:
-                switch ( cmd ) {
-                case 64:        /* Driver - ip2stat */
-                        rc = put_user(-1, pIndex++ );
-                        rc = put_user(irq_counter, pIndex++  );
-                        rc = put_user(bh_counter, pIndex++  );
-                        break;
-
-                case 65:        /* Board  - ip2stat */
-                        if ( pB ) {
-                                rc = copy_to_user(argp, pB, sizeof(i2eBordStr));
-                                rc = put_user(inb(pB->i2eStatus),
-                                        (ULONG __user *)(arg + (ULONG)(&pB->i2eStatus) - (ULONG)pB ) );
-                        } else {
-                                rc = -ENODEV;
-                        }
-                        break;
-
-                default:
-                        if (cmd < IP2_MAX_PORTS) {
-                                pCh = DevTable[cmd];
-                                if ( pCh )
-                                {
-                                        rc = copy_to_user(argp, pCh, sizeof(i2ChanStr));
-                                        if (rc)
-                                                rc = -EFAULT;
-                                } else {
-                                        rc = -ENODEV;
-                                }
-                        } else {
-                                rc = -EINVAL;
-                        }
-                }
-                break;
-
-        case 2:     // Ping device
-                rc = -EINVAL;
-                break;
-        case 3:     // Trace device
-                /*
-                 * akpm: This used to write a whole bunch of function addresses
-                 * to userspace, which generated lots of put_user() warnings.
-                 * I killed it all.  Just return "success" and don't do
-                 * anything.
-                 */
-                if (cmd == 1)
-                        rc = 0;
-                else
-                        rc = -EINVAL;
-                break;
-
-        default:
-                rc = -ENODEV;
-                break;
-        }
-        unlock_kernel();
-        return rc;
-}
-
-/******************************************************************************/
-/* Function:   ip2_ipl_open()                                                 */
-/* Parameters: Pointer to device inode                                        */
-/*             Pointer to file structure                                      */
-/* Returns:    Success or failure                                             */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-static int
-ip2_ipl_open( struct inode *pInode, struct file *pFile )
-{
-
-#ifdef IP2DEBUG_IPL
-        printk (KERN_DEBUG "IP2IPL: open\n" );
-#endif
-        cycle_kernel_lock();
-        return 0;
-}
-
-static int
-proc_ip2mem_show(struct seq_file *m, void *v)
-{
-        i2eBordStrPtr  pB;
-        i2ChanStrPtr  pCh;
-        PTTY tty;
-        int i;
-
-#define FMTLINE "%3d: 0x%08x 0x%08x 0%011o 0%011o\n"
-#define FMTLIN2 "     0x%04x 0x%04x tx flow 0x%x\n"
-#define FMTLIN3 "     0x%04x 0x%04x rc flow\n"
-
-        seq_printf(m,"\n");
-
-        for( i = 0; i < IP2_MAX_BOARDS; ++i ) {
-                pB = i2BoardPtrTable[i];
-                if ( pB ) {
-                        seq_printf(m,"board %d:\n",i);
-                        seq_printf(m,"\tFifo rem: %d mty: %x outM %x\n",
-                                pB->i2eFifoRemains,pB->i2eWaitingForEmptyFifo,pB->i2eOutMailWaiting);
-                }
-        }
-
-        seq_printf(m,"#: tty flags, port flags,     cflags,     iflags\n");
-        for (i=0; i < IP2_MAX_PORTS; i++) {
-                pCh = DevTable[i];
-                if (pCh) {
-                        tty = pCh->pTTY;
-                        if (tty && tty->count) {
-                                seq_printf(m,FMTLINE,i,(int)tty->flags,pCh->flags,
-                                                                        tty->termios->c_cflag,tty->termios->c_iflag);
-
-                                seq_printf(m,FMTLIN2,
-                                                pCh->outfl.asof,pCh->outfl.room,pCh->channelNeeds);
-                                seq_printf(m,FMTLIN3,pCh->infl.asof,pCh->infl.room);
-                        }
-                }
-        }
-        return 0;
-}
-
-static int proc_ip2mem_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_ip2mem_show, NULL);
-}
-
-static const struct file_operations ip2mem_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_ip2mem_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-/*
- * This is the handler for /proc/tty/driver/ip2
- *
- * This stretch of code has been largely plagerized from at least three
- * different sources including ip2mkdev.c and a couple of other drivers.
- * The bugs are all mine.  :-)  =mhw=
- */
-static int ip2_proc_show(struct seq_file *m, void *v)
-{
-        int     i, j, box;
-        int     boxes = 0;
-        int     ports = 0;
-        int     tports = 0;
-        i2eBordStrPtr  pB;
-        char *sep;
-
-        seq_printf(m, "ip2info: 1.0 driver: %s\n", pcVersion);
-        seq_printf(m, "Driver: SMajor=%d CMajor=%d IMajor=%d MaxBoards=%d MaxBoxes=%d MaxPorts=%d\n",
-                        IP2_TTY_MAJOR, IP2_CALLOUT_MAJOR, IP2_IPL_MAJOR,
-                        IP2_MAX_BOARDS, ABS_MAX_BOXES, ABS_BIGGEST_BOX);
-
-        for( i = 0; i < IP2_MAX_BOARDS; ++i ) {
-                /* This need to be reset for a board by board count... */
-                boxes = 0;
-                pB = i2BoardPtrTable[i];
-                if( pB ) {
-                        switch( pB->i2ePom.e.porID & ~POR_ID_RESERVED ) 
-                        {
-                        case POR_ID_FIIEX:
-                                seq_printf(m, "Board %d: EX ports=", i);
-                                sep = "";
-                                for( box = 0; box < ABS_MAX_BOXES; ++box )
-                                {
-                                        ports = 0;
-
-                                        if( pB->i2eChannelMap[box] != 0 ) ++boxes;
-                                        for( j = 0; j < ABS_BIGGEST_BOX; ++j ) 
-                                        {
-                                                if( pB->i2eChannelMap[box] & 1<< j ) {
-                                                        ++ports;
-                                                }
-                                        }
-                                        seq_printf(m, "%s%d", sep, ports);
-                                        sep = ",";
-                                        tports += ports;
-                                }
-                                seq_printf(m, " boxes=%d width=%d", boxes, pB->i2eDataWidth16 ? 16 : 8);
-                                break;
-
-                        case POR_ID_II_4:
-                                seq_printf(m, "Board %d: ISA-4 ports=4 boxes=1", i);
-                                tports = ports = 4;
-                                break;
-
-                        case POR_ID_II_8:
-                                seq_printf(m, "Board %d: ISA-8-std ports=8 boxes=1", i);
-                                tports = ports = 8;
-                                break;
-
-                        case POR_ID_II_8R:
-                                seq_printf(m, "Board %d: ISA-8-RJ11 ports=8 boxes=1", i);
-                                tports = ports = 8;
-                                break;
-
-                        default:
-                                seq_printf(m, "Board %d: unknown", i);
-                                /* Don't try and probe for minor numbers */
-                                tports = ports = 0;
-                        }
-
-                } else {
-                        /* Don't try and probe for minor numbers */
-                        seq_printf(m, "Board %d: vacant", i);
-                        tports = ports = 0;
-                }
-
-                if( tports ) {
-                        seq_puts(m, " minors=");
-                        sep = "";
-                        for ( box = 0; box < ABS_MAX_BOXES; ++box )
-                        {
-                                for ( j = 0; j < ABS_BIGGEST_BOX; ++j )
-                                {
-                                        if ( pB->i2eChannelMap[box] & (1 << j) )
-                                        {
-                                                seq_printf(m, "%s%d", sep,
-                                                        j + ABS_BIGGEST_BOX *
-                                                        (box+i*ABS_MAX_BOXES));
-                                                sep = ",";
-                                        }
-                                }
-                        }
-                }
-                seq_putc(m, '\n');
-        }
-        return 0;
- }
-
-static int ip2_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ip2_proc_show, NULL);
-}
-
-static const struct file_operations ip2_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = ip2_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
- 
-/******************************************************************************/
-/* Function:   ip2trace()                                                     */
-/* Parameters: Value to add to trace buffer                                   */
-/* Returns:    Nothing                                                        */
-/*                                                                            */
-/* Description:                                                               */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-#ifdef IP2DEBUG_TRACE
-void
-ip2trace (unsigned short pn, unsigned char cat, unsigned char label, unsigned long codes, ...)
-{
-        long flags;
-        unsigned long *pCode = &codes;
-        union ip2breadcrumb bc;
-        i2ChanStrPtr  pCh;
-
-
-        tracebuf[tracestuff++] = jiffies;
-        if ( tracestuff == TRACEMAX ) {
-                tracestuff = 0;
-        }
-        if ( tracestuff == tracestrip ) {
-                if ( ++tracestrip == TRACEMAX ) {
-                        tracestrip = 0;
-                }
-                ++tracewrap;
-        }
-
-        bc.hdr.port  = 0xff & pn;
-        bc.hdr.cat   = cat;
-        bc.hdr.codes = (unsigned char)( codes & 0xff );
-        bc.hdr.label = label;
-        tracebuf[tracestuff++] = bc.value;
-
-        for (;;) {
-                if ( tracestuff == TRACEMAX ) {
-                        tracestuff = 0;
-                }
-                if ( tracestuff == tracestrip ) {
-                        if ( ++tracestrip == TRACEMAX ) {
-                                tracestrip = 0;
-                        }
-                        ++tracewrap;
-                }
-
-                if ( !codes-- )
-                        break;
-
-                tracebuf[tracestuff++] = *++pCode;
-        }
-}
-#endif
-
-
-MODULE_LICENSE("GPL");
-
-static struct pci_device_id ip2main_pci_tbl[] __devinitdata = {
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTONE, PCI_DEVICE_ID_COMPUTONE_IP2EX) },
-        { }
-};
-
-MODULE_DEVICE_TABLE(pci, ip2main_pci_tbl);
-
-MODULE_FIRMWARE("intelliport2.bin");
diff --git a/drivers/char/ip2/ip2trace.h b/drivers/char/ip2/ip2trace.h
deleted file mode 100644
index da20435dc8a6..000000000000
--- a/drivers/char/ip2/ip2trace.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-//
-union ip2breadcrumb 
-{
-        struct { 
-                unsigned char port, cat, codes, label;
-        } __attribute__ ((packed)) hdr;
-        unsigned long value;
-};
-
-#define ITRC_NO_PORT    0xFF
-#define CHANN   (pCh->port_index)
-
-#define ITRC_ERROR      '!'
-#define ITRC_INIT       'A'
-#define ITRC_OPEN       'B'
-#define ITRC_CLOSE      'C'
-#define ITRC_DRAIN      'D'
-#define ITRC_IOCTL      'E'
-#define ITRC_FLUSH      'F'
-#define ITRC_STATUS     'G'
-#define ITRC_HANGUP     'H'
-#define ITRC_INTR       'I'
-#define ITRC_SFLOW      'J'
-#define ITRC_SBCMD      'K'
-#define ITRC_SICMD      'L'
-#define ITRC_MODEM      'M'
-#define ITRC_INPUT      'N'
-#define ITRC_OUTPUT     'O'
-#define ITRC_PUTC       'P'
-#define ITRC_QUEUE      'Q'
-#define ITRC_STFLW      'R'
-#define ITRC_SFIFO      'S'
-#define ITRC_VERIFY     'V'
-#define ITRC_WRITE      'W'
-
-#define ITRC_ENTER      0x00
-#define ITRC_RETURN     0xFF
-
-#define ITRC_QUEUE_ROOM 2
-#define ITRC_QUEUE_CMD  6
-
diff --git a/drivers/char/ip2/ip2types.h b/drivers/char/ip2/ip2types.h
deleted file mode 100644
index 9d67b260b2f6..000000000000
--- a/drivers/char/ip2/ip2types.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
-*
-*   (c) 1998 by Computone Corporation
-*
-********************************************************************************
-*
-*
-*   PACKAGE:     Linux tty Device Driver for IntelliPort II family of multiport
-*                serial I/O controllers.
-*
-*   DESCRIPTION: Driver constants and type definitions.
-*
-*   NOTES:
-*
-*******************************************************************************/
-#ifndef IP2TYPES_H
-#define IP2TYPES_H
-
-//*************
-//* Constants *
-//*************
-
-// Define some limits for this driver. Ports per board is a hardware limitation
-// that will not change. Current hardware limits this to 64 ports per board.
-// Boards per driver is a self-imposed limit.
-//
-#define IP2_MAX_BOARDS        4
-#define IP2_PORTS_PER_BOARD   ABS_MOST_PORTS
-#define IP2_MAX_PORTS         (IP2_MAX_BOARDS*IP2_PORTS_PER_BOARD)
-
-#define ISA    0
-#define PCI    1
-#define EISA   2
-
-//********************
-//* Type Definitions *
-//********************
-
-typedef struct tty_struct *   PTTY;
-typedef wait_queue_head_t   PWAITQ;
-
-typedef unsigned char         UCHAR;
-typedef unsigned int          UINT;
-typedef unsigned short        USHORT;
-typedef unsigned long         ULONG;
-
-typedef struct 
-{
-        short irq[IP2_MAX_BOARDS]; 
-        unsigned short addr[IP2_MAX_BOARDS];
-        int type[IP2_MAX_BOARDS];
-#ifdef CONFIG_PCI
-        struct pci_dev *pci_dev[IP2_MAX_BOARDS];
-#endif
-} ip2config_t;
-
-#endif
diff --git a/drivers/char/ipmi/Makefile b/drivers/char/ipmi/Makefile
index eb8a1a8c188e..16a93648d54e 100644
--- a/drivers/char/ipmi/Makefile
+++ b/drivers/char/ipmi/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the ipmi drivers.
 #
 
-ipmi_si-objs := ipmi_si_intf.o ipmi_kcs_sm.o ipmi_smic_sm.o ipmi_bt_sm.o
+ipmi_si-y := ipmi_si_intf.o ipmi_kcs_sm.o ipmi_smic_sm.o ipmi_bt_sm.o
 
 obj-$(CONFIG_IPMI_HANDLER) += ipmi_msghandler.o
 obj-$(CONFIG_IPMI_DEVICE_INTERFACE) += ipmi_devintf.o
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c
index 7b98c067190a..3ed20e8abc0d 100644
--- a/drivers/char/ipmi/ipmi_bt_sm.c
+++ b/drivers/char/ipmi/ipmi_bt_sm.c
@@ -2,7 +2,7 @@
  *  ipmi_bt_sm.c
  *
  *  The state machine for an Open IPMI BT sub-driver under ipmi_si.c, part
- *  of the driver architecture at http://sourceforge.net/project/openipmi
+ *  of the driver architecture at http://sourceforge.net/projects/openipmi 
  *
  *  Author:     Rocky Craig <first.last@hp.com>
  *
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index d8ec92a38980..2aa3977aae5e 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -44,7 +44,6 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/compat.h>
-#include <linux/smp_lock.h>
 
 struct ipmi_file_private
 {
@@ -59,6 +58,7 @@ struct ipmi_file_private
         unsigned int         default_retry_time_ms;
 };
 
+static DEFINE_MUTEX(ipmi_mutex);
 static void file_receive_handler(struct ipmi_recv_msg *msg,
                                  void                 *handler_data)
 {
@@ -102,9 +102,9 @@ static int ipmi_fasync(int fd, struct file *file, int on)
         struct ipmi_file_private *priv = file->private_data;
         int                      result;
 
-        lock_kernel(); /* could race against open() otherwise */
+        mutex_lock(&ipmi_mutex); /* could race against open() otherwise */
         result = fasync_helper(fd, file, on, &priv->fasync_queue);
-        unlock_kernel();
+        mutex_unlock(&ipmi_mutex);
 
         return (result);
 }
@@ -125,7 +125,7 @@ static int ipmi_open(struct inode *inode, struct file *file)
         if (!priv)
                 return -ENOMEM;
 
-        lock_kernel();
+        mutex_lock(&ipmi_mutex);
         priv->file = file;
 
         rv = ipmi_create_user(if_num,
@@ -150,7 +150,7 @@ static int ipmi_open(struct inode *inode, struct file *file)
         priv->default_retry_time_ms = 0;
 
 out:
-        unlock_kernel();
+        mutex_unlock(&ipmi_mutex);
         return rv;
 }
 
@@ -639,9 +639,9 @@ static long ipmi_unlocked_ioctl(struct file   *file,
 {
         int ret;
 
-        lock_kernel();
+        mutex_lock(&ipmi_mutex);
         ret = ipmi_ioctl(file, cmd, data);
-        unlock_kernel();
+        mutex_unlock(&ipmi_mutex);
 
         return ret;
 }
@@ -850,6 +850,7 @@ static const struct file_operations ipmi_fops = {
         .release        = ipmi_release,
         .fasync         = ipmi_fasync,
         .poll           = ipmi_poll,
+        .llseek         = noop_llseek,
 };
 
 #define DEVICE_NAME     "ipmidev"
@@ -915,7 +916,7 @@ static struct ipmi_smi_watcher smi_watcher =
         .smi_gone = ipmi_smi_gone,
 };
 
-static __init int init_ipmi_devintf(void)
+static int __init init_ipmi_devintf(void)
 {
         int rv;
 
@@ -953,7 +954,7 @@ static __init int init_ipmi_devintf(void)
 }
 module_init(init_ipmi_devintf);
 
-static __exit void cleanup_ipmi(void)
+static void __exit cleanup_ipmi(void)
 {
         struct ipmi_reg_list *entry, *entry2;
         mutex_lock(&reg_list_mutex);
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 4f3f8c9ec262..58c0e6387cf7 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -36,6 +36,7 @@
 #include <asm/system.h>
 #include <linux/poll.h>
 #include <linux/sched.h>
+#include <linux/seq_file.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
@@ -970,6 +971,33 @@ out_kfree:
 }
 EXPORT_SYMBOL(ipmi_create_user);
 
+int ipmi_get_smi_info(int if_num, struct ipmi_smi_info *data)
+{
+        int           rv = 0;
+        ipmi_smi_t    intf;
+        struct ipmi_smi_handlers *handlers;
+
+        mutex_lock(&ipmi_interfaces_mutex);
+        list_for_each_entry_rcu(intf, &ipmi_interfaces, link) {
+                if (intf->intf_num == if_num)
+                        goto found;
+        }
+        /* Not found, return an error */
+        rv = -EINVAL;
+        mutex_unlock(&ipmi_interfaces_mutex);
+        return rv;
+
+found:
+        handlers = intf->handlers;
+        rv = -ENOSYS;
+        if (handlers->get_smi_info)
+                rv = handlers->get_smi_info(intf->send_info, data);
+        mutex_unlock(&ipmi_interfaces_mutex);
+
+        return rv;
+}
+EXPORT_SYMBOL(ipmi_get_smi_info);
+
 static void free_user(struct kref *ref)
 {
         ipmi_user_t user = container_of(ref, struct ipmi_user, refcount);
@@ -1869,102 +1897,128 @@ int ipmi_request_supply_msgs(ipmi_user_t          user,
 EXPORT_SYMBOL(ipmi_request_supply_msgs);
 
 #ifdef CONFIG_PROC_FS
-static int ipmb_file_read_proc(char *page, char **start, off_t off,
-                               int count, int *eof, void *data)
+static int smi_ipmb_proc_show(struct seq_file *m, void *v)
 {
-        char       *out = (char *) page;
-        ipmi_smi_t intf = data;
+        ipmi_smi_t intf = m->private;
         int        i;
-        int        rv = 0;
 
-        for (i = 0; i < IPMI_MAX_CHANNELS; i++)
-                rv += sprintf(out+rv, "%x ", intf->channels[i].address);
-        out[rv-1] = '\n'; /* Replace the final space with a newline */
-        out[rv] = '\0';
-        rv++;
-        return rv;
+        seq_printf(m, "%x", intf->channels[0].address);
+        for (i = 1; i < IPMI_MAX_CHANNELS; i++)
+                seq_printf(m, " %x", intf->channels[i].address);
+        return seq_putc(m, '\n');
+}
+
+static int smi_ipmb_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, smi_ipmb_proc_show, PDE(inode)->data);
 }
 
-static int version_file_read_proc(char *page, char **start, off_t off,
-                                  int count, int *eof, void *data)
+static const struct file_operations smi_ipmb_proc_ops = {
+        .open           = smi_ipmb_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int smi_version_proc_show(struct seq_file *m, void *v)
 {
-        char       *out = (char *) page;
-        ipmi_smi_t intf = data;
+        ipmi_smi_t intf = m->private;
 
-        return sprintf(out, "%u.%u\n",
+        return seq_printf(m, "%u.%u\n",
                        ipmi_version_major(&intf->bmc->id),
                        ipmi_version_minor(&intf->bmc->id));
 }
 
-static int stat_file_read_proc(char *page, char **start, off_t off,
-                               int count, int *eof, void *data)
+static int smi_version_proc_open(struct inode *inode, struct file *file)
 {
-        char       *out = (char *) page;
-        ipmi_smi_t intf = data;
+        return single_open(file, smi_version_proc_show, PDE(inode)->data);
+}
 
-        out += sprintf(out, "sent_invalid_commands:       %u\n",
+static const struct file_operations smi_version_proc_ops = {
+        .open           = smi_version_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int smi_stats_proc_show(struct seq_file *m, void *v)
+{
+        ipmi_smi_t intf = m->private;
+
+        seq_printf(m, "sent_invalid_commands:       %u\n",
                        ipmi_get_stat(intf, sent_invalid_commands));
-        out += sprintf(out, "sent_local_commands:         %u\n",
+        seq_printf(m, "sent_local_commands:         %u\n",
                        ipmi_get_stat(intf, sent_local_commands));
-        out += sprintf(out, "handled_local_responses:     %u\n",
+        seq_printf(m, "handled_local_responses:     %u\n",
                        ipmi_get_stat(intf, handled_local_responses));
-        out += sprintf(out, "unhandled_local_responses:   %u\n",
+        seq_printf(m, "unhandled_local_responses:   %u\n",
                        ipmi_get_stat(intf, unhandled_local_responses));
-        out += sprintf(out, "sent_ipmb_commands:          %u\n",
+        seq_printf(m, "sent_ipmb_commands:          %u\n",
                        ipmi_get_stat(intf, sent_ipmb_commands));
-        out += sprintf(out, "sent_ipmb_command_errs:      %u\n",
+        seq_printf(m, "sent_ipmb_command_errs:      %u\n",
                        ipmi_get_stat(intf, sent_ipmb_command_errs));
-        out += sprintf(out, "retransmitted_ipmb_commands: %u\n",
+        seq_printf(m, "retransmitted_ipmb_commands: %u\n",
                        ipmi_get_stat(intf, retransmitted_ipmb_commands));
-        out += sprintf(out, "timed_out_ipmb_commands:     %u\n",
+        seq_printf(m, "timed_out_ipmb_commands:     %u\n",
                        ipmi_get_stat(intf, timed_out_ipmb_commands));
-        out += sprintf(out, "timed_out_ipmb_broadcasts:   %u\n",
+        seq_printf(m, "timed_out_ipmb_broadcasts:   %u\n",
                        ipmi_get_stat(intf, timed_out_ipmb_broadcasts));
-        out += sprintf(out, "sent_ipmb_responses:         %u\n",
+        seq_printf(m, "sent_ipmb_responses:         %u\n",
                        ipmi_get_stat(intf, sent_ipmb_responses));
-        out += sprintf(out, "handled_ipmb_responses:      %u\n",
+        seq_printf(m, "handled_ipmb_responses:      %u\n",
                        ipmi_get_stat(intf, handled_ipmb_responses));
-        out += sprintf(out, "invalid_ipmb_responses:      %u\n",
+        seq_printf(m, "invalid_ipmb_responses:      %u\n",
                        ipmi_get_stat(intf, invalid_ipmb_responses));
-        out += sprintf(out, "unhandled_ipmb_responses:    %u\n",
+        seq_printf(m, "unhandled_ipmb_responses:    %u\n",
                        ipmi_get_stat(intf, unhandled_ipmb_responses));
-        out += sprintf(out, "sent_lan_commands:           %u\n",
+        seq_printf(m, "sent_lan_commands:           %u\n",
                        ipmi_get_stat(intf, sent_lan_commands));
-        out += sprintf(out, "sent_lan_command_errs:       %u\n",
+        seq_printf(m, "sent_lan_command_errs:       %u\n",
                        ipmi_get_stat(intf, sent_lan_command_errs));
-        out += sprintf(out, "retransmitted_lan_commands:  %u\n",
+        seq_printf(m, "retransmitted_lan_commands:  %u\n",
                        ipmi_get_stat(intf, retransmitted_lan_commands));
-        out += sprintf(out, "timed_out_lan_commands:      %u\n",
+        seq_printf(m, "timed_out_lan_commands:      %u\n",
                        ipmi_get_stat(intf, timed_out_lan_commands));
-        out += sprintf(out, "sent_lan_responses:          %u\n",
+        seq_printf(m, "sent_lan_responses:          %u\n",
                        ipmi_get_stat(intf, sent_lan_responses));
-        out += sprintf(out, "handled_lan_responses:       %u\n",
+        seq_printf(m, "handled_lan_responses:       %u\n",
                        ipmi_get_stat(intf, handled_lan_responses));
-        out += sprintf(out, "invalid_lan_responses:       %u\n",
+        seq_printf(m, "invalid_lan_responses:       %u\n",
                        ipmi_get_stat(intf, invalid_lan_responses));
-        out += sprintf(out, "unhandled_lan_responses:     %u\n",
+        seq_printf(m, "unhandled_lan_responses:     %u\n",
                        ipmi_get_stat(intf, unhandled_lan_responses));
-        out += sprintf(out, "handled_commands:            %u\n",
+        seq_printf(m, "handled_commands:            %u\n",
                        ipmi_get_stat(intf, handled_commands));
-        out += sprintf(out, "invalid_commands:            %u\n",
+        seq_printf(m, "invalid_commands:            %u\n",
                        ipmi_get_stat(intf, invalid_commands));
-        out += sprintf(out, "unhandled_commands:          %u\n",
+        seq_printf(m, "unhandled_commands:          %u\n",
                        ipmi_get_stat(intf, unhandled_commands));
-        out += sprintf(out, "invalid_events:              %u\n",
+        seq_printf(m, "invalid_events:              %u\n",
                        ipmi_get_stat(intf, invalid_events));
-        out += sprintf(out, "events:                      %u\n",
+        seq_printf(m, "events:                      %u\n",
                        ipmi_get_stat(intf, events));
-        out += sprintf(out, "failed rexmit LAN msgs:      %u\n",
+        seq_printf(m, "failed rexmit LAN msgs:      %u\n",
                        ipmi_get_stat(intf, dropped_rexmit_lan_commands));
-        out += sprintf(out, "failed rexmit IPMB msgs:     %u\n",
+        seq_printf(m, "failed rexmit IPMB msgs:     %u\n",
                        ipmi_get_stat(intf, dropped_rexmit_ipmb_commands));
+        return 0;
+}
 
-        return (out - ((char *) page));
+static int smi_stats_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, smi_stats_proc_show, PDE(inode)->data);
 }
+
+static const struct file_operations smi_stats_proc_ops = {
+        .open           = smi_stats_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
 #endif /* CONFIG_PROC_FS */
 
 int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name,
-                            read_proc_t *read_proc,
+                            const struct file_operations *proc_ops,
                             void *data)
 {
         int                    rv = 0;
@@ -1983,15 +2037,12 @@ int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name,
         }
         strcpy(entry->name, name);
 
-        file = create_proc_entry(name, 0, smi->proc_dir);
+        file = proc_create_data(name, 0, smi->proc_dir, proc_ops, data);
         if (!file) {
                 kfree(entry->name);
                 kfree(entry);
                 rv = -ENOMEM;
         } else {
-                file->data = data;
-                file->read_proc = read_proc;
-
                 mutex_lock(&smi->proc_entry_lock);
                 /* Stick it on the list. */
                 entry->next = smi->proc_entries;
@@ -2016,17 +2067,17 @@ static int add_proc_entries(ipmi_smi_t smi, int num)
 
         if (rv == 0)
                 rv = ipmi_smi_add_proc_entry(smi, "stats",
-                                             stat_file_read_proc,
+                                             &smi_stats_proc_ops,
                                              smi);
 
         if (rv == 0)
                 rv = ipmi_smi_add_proc_entry(smi, "ipmb",
-                                             ipmb_file_read_proc,
+                                             &smi_ipmb_proc_ops,
                                              smi);
 
         if (rv == 0)
                 rv = ipmi_smi_add_proc_entry(smi, "version",
-                                             version_file_read_proc,
+                                             &smi_version_proc_ops,
                                              smi);
 #endif /* CONFIG_PROC_FS */
 
@@ -4442,13 +4493,13 @@ static int ipmi_init_msghandler(void)
         return 0;
 }
 
-static __init int ipmi_init_msghandler_mod(void)
+static int __init ipmi_init_msghandler_mod(void)
 {
         ipmi_init_msghandler();
         return 0;
 }
 
-static __exit void cleanup_ipmi(void)
+static void __exit cleanup_ipmi(void)
 {
         int count;
 
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index 0dec5da000ef..2efa176beab0 100644
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -122,7 +122,7 @@ static struct ipmi_recv_msg halt_recv_msg = {
 
 
 /*
- * Code to send a message and wait for the reponse.
+ * Code to send a message and wait for the response.
  */
 
 static void receive_handler(struct ipmi_recv_msg *recv_msg, void *handler_data)
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 7bd7c45b53ef..9397ab49b72e 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -43,6 +43,7 @@
 #include <linux/moduleparam.h>
 #include <asm/system.h>
 #include <linux/sched.h>
+#include <linux/seq_file.h>
 #include <linux/timer.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>
@@ -57,6 +58,7 @@
 #include <asm/irq.h>
 #include <linux/interrupt.h>
 #include <linux/rcupdate.h>
+#include <linux/ipmi.h>
 #include <linux/ipmi_smi.h>
 #include <asm/io.h>
 #include "ipmi_si_sm.h"
@@ -65,11 +67,10 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/pnp.h>
-
-#ifdef CONFIG_PPC_OF
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
-#endif
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 
 #define PFX "ipmi_si: "
 
@@ -107,23 +108,13 @@ enum si_type {
 };
 static char *si_to_str[] = { "kcs", "smic", "bt" };
 
-enum ipmi_addr_src {
-        SI_INVALID = 0, SI_HOTMOD, SI_HARDCODED, SI_SPMI, SI_ACPI, SI_SMBIOS,
-        SI_PCI, SI_DEVICETREE, SI_DEFAULT
-};
 static char *ipmi_addr_src_to_str[] = { NULL, "hotmod", "hardcoded", "SPMI",
                                         "ACPI", "SMBIOS", "PCI",
                                         "device-tree", "default" };
 
 #define DEVICE_NAME "ipmi_si"
 
-static struct platform_driver ipmi_driver = {
-        .driver = {
-                .name = DEVICE_NAME,
-                .bus = &platform_bus_type
-        }
-};
-
+static struct platform_driver ipmi_driver;
 
 /*
  * Indexes into stats[] in smi_info below.
@@ -291,6 +282,7 @@ struct smi_info {
         struct task_struct *thread;
 
         struct list_head link;
+        union ipmi_smi_info_union addr_info;
 };
 
 #define smi_inc_stat(smi, stat) \
@@ -308,9 +300,6 @@ static int pci_registered;
 #ifdef CONFIG_ACPI
 static int pnp_registered;
 #endif
-#ifdef CONFIG_PPC_OF
-static int of_registered;
-#endif
 
 static unsigned int kipmid_max_busy_us[SI_MAX_PARMS];
 static int num_max_busy_us;
@@ -320,6 +309,7 @@ static int unload_when_empty = 1;
 static int add_smi(struct smi_info *smi);
 static int try_smi_init(struct smi_info *smi);
 static void cleanup_one_si(struct smi_info *to_clean);
+static void cleanup_ipmi_si(void);
 
 static ATOMIC_NOTIFIER_HEAD(xaction_notifier_list);
 static int register_xaction_notifier(struct notifier_block *nb)
@@ -350,7 +340,7 @@ static void return_hosed_msg(struct smi_info *smi_info, int cCode)
                 cCode = IPMI_ERR_UNSPECIFIED;
         /* else use it as is */
 
-        /* Make it a reponse */
+        /* Make it a response */
         msg->rsp[0] = msg->data[0] | 4;
         msg->rsp[1] = msg->data[1];
         msg->rsp[2] = cCode;
@@ -899,6 +889,14 @@ static void sender(void                *send_info,
         printk("**Enqueue: %d.%9.9d\n", t.tv_sec, t.tv_usec);
 #endif
 
+        /*
+         * last_timeout_jiffies is updated here to avoid
+         * smi_timeout() handler passing very large time_diff
+         * value to smi_event_handler() that causes
+         * the send command to abort.
+         */
+        smi_info->last_timeout_jiffies = jiffies;
+
         mod_timer(&smi_info->si_timer, jiffies + SI_TIMEOUT_JIFFIES);
 
         if (smi_info->thread)
@@ -1186,6 +1184,18 @@ static int smi_start_processing(void       *send_info,
         return 0;
 }
 
+static int get_smi_info(void *send_info, struct ipmi_smi_info *data)
+{
+        struct smi_info *smi = send_info;
+
+        data->addr_src = smi->addr_source;
+        data->dev = smi->dev;
+        data->addr_info = smi->addr_info;
+        get_device(smi->dev);
+
+        return 0;
+}
+
 static void set_maintenance_mode(void *send_info, int enable)
 {
         struct smi_info   *smi_info = send_info;
@@ -1197,6 +1207,7 @@ static void set_maintenance_mode(void *send_info, int enable)
 static struct ipmi_smi_handlers handlers = {
         .owner                  = THIS_MODULE,
         .start_processing       = smi_start_processing,
+        .get_smi_info           = get_smi_info,
         .sender                 = sender,
         .request_events         = request_events,
         .set_maintenance_mode   = set_maintenance_mode,
@@ -1665,6 +1676,17 @@ static int check_hotmod_int_op(const char *curr, const char *option,
         return 0;
 }
 
+static struct smi_info *smi_info_alloc(void)
+{
+        struct smi_info *info = kzalloc(sizeof(*info), GFP_KERNEL);
+
+        if (info) {
+                spin_lock_init(&info->si_lock);
+                spin_lock_init(&info->msg_lock);
+        }
+        return info;
+}
+
 static int hotmod_handler(const char *val, struct kernel_param *kp)
 {
         char *str = kstrdup(val, GFP_KERNEL);
@@ -1779,7 +1801,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
                 }
 
                 if (op == HM_ADD) {
-                        info = kzalloc(sizeof(*info), GFP_KERNEL);
+                        info = smi_info_alloc();
                         if (!info) {
                                 rv = -ENOMEM;
                                 goto out;
@@ -1835,8 +1857,9 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
         return rv;
 }
 
-static __devinit void hardcode_find_bmc(void)
+static int __devinit hardcode_find_bmc(void)
 {
+        int ret = -ENODEV;
         int             i;
         struct smi_info *info;
 
@@ -1844,9 +1867,9 @@ static __devinit void hardcode_find_bmc(void)
                 if (!ports[i] && !addrs[i])
                         continue;
 
-                info = kzalloc(sizeof(*info), GFP_KERNEL);
+                info = smi_info_alloc();
                 if (!info)
-                        return;
+                        return -ENOMEM;
 
                 info->addr_source = SI_HARDCODED;
                 printk(KERN_INFO PFX "probing via hardcoded address\n");
@@ -1899,10 +1922,12 @@ static __devinit void hardcode_find_bmc(void)
                 if (!add_smi(info)) {
                         if (try_smi_init(info))
                                 cleanup_one_si(info);
+                        ret = 0;
                 } else {
                         kfree(info);
                 }
         }
+        return ret;
 }
 
 #ifdef CONFIG_ACPI
@@ -1917,7 +1942,8 @@ static __devinit void hardcode_find_bmc(void)
 static int acpi_failure;
 
 /* For GPE-type interrupts. */
-static u32 ipmi_acpi_gpe(void *context)
+static u32 ipmi_acpi_gpe(acpi_handle gpe_device,
+        u32 gpe_number, void *context)
 {
         struct smi_info *smi_info = context;
         unsigned long   flags;
@@ -1974,8 +2000,7 @@ static int acpi_gpe_irq_setup(struct smi_info *info)
 
 /*
  * Defined at
- * http://h21007.www2.hp.com/portal/download/files
- * /unprot/hpspmi.pdf
+ * http://h21007.www2.hp.com/portal/download/files/unprot/hpspmi.pdf
  */
 struct SPMITable {
         s8      Signature[4];
@@ -2019,7 +2044,7 @@ struct SPMITable {
         s8      spmi_id[1]; /* A '\0' terminated array starts here. */
 };
 
-static __devinit int try_init_spmi(struct SPMITable *spmi)
+static int __devinit try_init_spmi(struct SPMITable *spmi)
 {
         struct smi_info  *info;
 
@@ -2028,7 +2053,7 @@ static __devinit int try_init_spmi(struct SPMITable *spmi)
                 return -ENODEV;
         }
 
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = smi_info_alloc();
         if (!info) {
                 printk(KERN_ERR PFX "Could not allocate SI data (3)\n");
                 return -ENOMEM;
@@ -2102,7 +2127,7 @@ static __devinit int try_init_spmi(struct SPMITable *spmi)
         return 0;
 }
 
-static __devinit void spmi_find_bmc(void)
+static void __devinit spmi_find_bmc(void)
 {
         acpi_status      status;
         struct SPMITable *spmi;
@@ -2138,7 +2163,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
         if (!acpi_dev)
                 return -ENODEV;
 
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = smi_info_alloc();
         if (!info)
                 return -ENOMEM;
 
@@ -2146,6 +2171,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
         printk(KERN_INFO PFX "probing via ACPI\n");
 
         handle = acpi_dev->handle;
+        info->addr_info.acpi_info.acpi_handle = handle;
 
         /* _IFT tells us the interface type: KCS, BT, etc */
         status = acpi_evaluate_integer(handle, "_IFT", NULL, &tmp);
@@ -2315,11 +2341,11 @@ static int __devinit decode_dmi(const struct dmi_header *dm,
         return 0;
 }
 
-static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
+static void __devinit try_init_dmi(struct dmi_ipmi_data *ipmi_data)
 {
         struct smi_info *info;
 
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = smi_info_alloc();
         if (!info) {
                 printk(KERN_ERR PFX "Could not allocate SI data\n");
                 return;
@@ -2426,7 +2452,7 @@ static int __devinit ipmi_pci_probe(struct pci_dev *pdev,
         int class_type = pdev->class & PCI_ERMC_CLASSCODE_TYPE_MASK;
         struct smi_info *info;
 
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = smi_info_alloc();
         if (!info)
                 return -ENOMEM;
 
@@ -2529,20 +2555,24 @@ static struct pci_driver ipmi_pci_driver = {
 };
 #endif /* CONFIG_PCI */
 
-
-#ifdef CONFIG_PPC_OF
-static int __devinit ipmi_of_probe(struct platform_device *dev,
-                         const struct of_device_id *match)
+static struct of_device_id ipmi_match[];
+static int __devinit ipmi_probe(struct platform_device *dev)
 {
+#ifdef CONFIG_OF
+        const struct of_device_id *match;
         struct smi_info *info;
         struct resource resource;
-        const int *regsize, *regspacing, *regshift;
+        const __be32 *regsize, *regspacing, *regshift;
         struct device_node *np = dev->dev.of_node;
         int ret;
         int proplen;
 
         dev_info(&dev->dev, "probing via device tree\n");
 
+        match = of_match_device(ipmi_match, &dev->dev);
+        if (!match)
+                return -EINVAL;
+
         ret = of_address_to_resource(np, 0, &resource);
         if (ret) {
                 dev_warn(&dev->dev, PFX "invalid address from OF\n");
@@ -2567,7 +2597,7 @@ static int __devinit ipmi_of_probe(struct platform_device *dev,
                 return -EINVAL;
         }
 
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = smi_info_alloc();
 
         if (!info) {
                 dev_err(&dev->dev,
@@ -2589,9 +2619,9 @@ static int __devinit ipmi_of_probe(struct platform_device *dev,
 
         info->io.addr_data      = resource.start;
 
-        info->io.regsize        = regsize ? *regsize : DEFAULT_REGSIZE;
-        info->io.regspacing     = regspacing ? *regspacing : DEFAULT_REGSPACING;
-        info->io.regshift       = regshift ? *regshift : 0;
+        info->io.regsize        = regsize ? be32_to_cpup(regsize) : DEFAULT_REGSIZE;
+        info->io.regspacing     = regspacing ? be32_to_cpup(regspacing) : DEFAULT_REGSPACING;
+        info->io.regshift       = regshift ? be32_to_cpup(regshift) : 0;
 
         info->irq               = irq_of_parse_and_map(dev->dev.of_node, 0);
         info->dev               = &dev->dev;
@@ -2606,13 +2636,15 @@ static int __devinit ipmi_of_probe(struct platform_device *dev,
                 kfree(info);
                 return -EBUSY;
         }
-
+#endif
         return 0;
 }
 
-static int __devexit ipmi_of_remove(struct platform_device *dev)
+static int __devexit ipmi_remove(struct platform_device *dev)
 {
+#ifdef CONFIG_OF
         cleanup_one_si(dev_get_drvdata(&dev->dev));
+#endif
         return 0;
 }
 
@@ -2627,16 +2659,15 @@ static struct of_device_id ipmi_match[] =
         {},
 };
 
-static struct of_platform_driver ipmi_of_platform_driver = {
+static struct platform_driver ipmi_driver = {
         .driver = {
-                .name = "ipmi",
+                .name = DEVICE_NAME,
                 .owner = THIS_MODULE,
                 .of_match_table = ipmi_match,
         },
-        .probe          = ipmi_of_probe,
-        .remove         = __devexit_p(ipmi_of_remove),
+        .probe          = ipmi_probe,
+        .remove         = __devexit_p(ipmi_remove),
 };
-#endif /* CONFIG_PPC_OF */
 
 static int wait_for_msg_done(struct smi_info *smi_info)
 {
@@ -2775,54 +2806,73 @@ static int try_enable_event_buffer(struct smi_info *smi_info)
         return rv;
 }
 
-static int type_file_read_proc(char *page, char **start, off_t off,
-                               int count, int *eof, void *data)
+static int smi_type_proc_show(struct seq_file *m, void *v)
 {
-        struct smi_info *smi = data;
+        struct smi_info *smi = m->private;
+
+        return seq_printf(m, "%s\n", si_to_str[smi->si_type]);
+}
 
-        return sprintf(page, "%s\n", si_to_str[smi->si_type]);
+static int smi_type_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, smi_type_proc_show, PDE(inode)->data);
 }
 
-static int stat_file_read_proc(char *page, char **start, off_t off,
-                               int count, int *eof, void *data)
+static const struct file_operations smi_type_proc_ops = {
+        .open           = smi_type_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int smi_si_stats_proc_show(struct seq_file *m, void *v)
 {
-        char            *out = (char *) page;
-        struct smi_info *smi = data;
+        struct smi_info *smi = m->private;
 
-        out += sprintf(out, "interrupts_enabled:    %d\n",
+        seq_printf(m, "interrupts_enabled:    %d\n",
                        smi->irq && !smi->interrupt_disabled);
-        out += sprintf(out, "short_timeouts:        %u\n",
+        seq_printf(m, "short_timeouts:        %u\n",
                        smi_get_stat(smi, short_timeouts));
-        out += sprintf(out, "long_timeouts:         %u\n",
+        seq_printf(m, "long_timeouts:         %u\n",
                        smi_get_stat(smi, long_timeouts));
-        out += sprintf(out, "idles:                 %u\n",
+        seq_printf(m, "idles:                 %u\n",
                        smi_get_stat(smi, idles));
-        out += sprintf(out, "interrupts:            %u\n",
+        seq_printf(m, "interrupts:            %u\n",
                        smi_get_stat(smi, interrupts));
-        out += sprintf(out, "attentions:            %u\n",
+        seq_printf(m, "attentions:            %u\n",
                        smi_get_stat(smi, attentions));
-        out += sprintf(out, "flag_fetches:          %u\n",
+        seq_printf(m, "flag_fetches:          %u\n",
                        smi_get_stat(smi, flag_fetches));
-        out += sprintf(out, "hosed_count:           %u\n",
+        seq_printf(m, "hosed_count:           %u\n",
                        smi_get_stat(smi, hosed_count));
-        out += sprintf(out, "complete_transactions: %u\n",
+        seq_printf(m, "complete_transactions: %u\n",
                        smi_get_stat(smi, complete_transactions));
-        out += sprintf(out, "events:                %u\n",
+        seq_printf(m, "events:                %u\n",
                        smi_get_stat(smi, events));
-        out += sprintf(out, "watchdog_pretimeouts:  %u\n",
+        seq_printf(m, "watchdog_pretimeouts:  %u\n",
                        smi_get_stat(smi, watchdog_pretimeouts));
-        out += sprintf(out, "incoming_messages:     %u\n",
+        seq_printf(m, "incoming_messages:     %u\n",
                        smi_get_stat(smi, incoming_messages));
+        return 0;
+}
 
-        return out - page;
+static int smi_si_stats_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, smi_si_stats_proc_show, PDE(inode)->data);
 }
 
-static int param_read_proc(char *page, char **start, off_t off,
-                           int count, int *eof, void *data)
+static const struct file_operations smi_si_stats_proc_ops = {
+        .open           = smi_si_stats_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int smi_params_proc_show(struct seq_file *m, void *v)
 {
-        struct smi_info *smi = data;
+        struct smi_info *smi = m->private;
 
-        return sprintf(page,
+        return seq_printf(m,
                        "%s,%s,0x%lx,rsp=%d,rsi=%d,rsh=%d,irq=%d,ipmb=%d\n",
                        si_to_str[smi->si_type],
                        addr_space_to_str[smi->io.addr_type],
@@ -2834,6 +2884,18 @@ static int param_read_proc(char *page, char **start, off_t off,
                        smi->slave_addr);
 }
 
+static int smi_params_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, smi_params_proc_show, PDE(inode)->data);
+}
+
+static const struct file_operations smi_params_proc_ops = {
+        .open           = smi_params_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 /*
  * oem_data_avail_to_receive_msg_avail
  * @info - smi_info structure with msg_flags set
@@ -2900,7 +2962,7 @@ static void return_hosed_msg_badsize(struct smi_info *smi_info)
 {
         struct ipmi_smi_msg *msg = smi_info->curr_msg;
 
-        /* Make it a reponse */
+        /* Make it a response */
         msg->rsp[0] = msg->data[0] | 4;
         msg->rsp[1] = msg->data[1];
         msg->rsp[2] = CANNOT_RETURN_REQUESTED_LENGTH;
@@ -3002,7 +3064,7 @@ static __devinitdata struct ipmi_default_vals
         { .port = 0 }
 };
 
-static __devinit void default_find_bmc(void)
+static void __devinit default_find_bmc(void)
 {
         struct smi_info *info;
         int             i;
@@ -3014,7 +3076,7 @@ static __devinit void default_find_bmc(void)
                 if (check_legacy_ioport(ipmi_defaults[i].port))
                         continue;
 #endif
-                info = kzalloc(sizeof(*info), GFP_KERNEL);
+                info = smi_info_alloc();
                 if (!info)
                         return;
 
@@ -3139,9 +3201,6 @@ static int try_smi_init(struct smi_info *new_smi)
                 goto out_err;
         }
 
-        spin_lock_init(&(new_smi->si_lock));
-        spin_lock_init(&(new_smi->msg_lock));
-
         /* Do low-level detection first. */
         if (new_smi->handlers->detect(new_smi->si_sm)) {
                 if (new_smi->addr_source)
@@ -3230,7 +3289,7 @@ static int try_smi_init(struct smi_info *new_smi)
         }
 
         rv = ipmi_smi_add_proc_entry(new_smi->intf, "type",
-                                     type_file_read_proc,
+                                     &smi_type_proc_ops,
                                      new_smi);
         if (rv) {
                 dev_err(new_smi->dev, "Unable to create proc entry: %d\n", rv);
@@ -3238,7 +3297,7 @@ static int try_smi_init(struct smi_info *new_smi)
         }
 
         rv = ipmi_smi_add_proc_entry(new_smi->intf, "si_stats",
-                                     stat_file_read_proc,
+                                     &smi_si_stats_proc_ops,
                                      new_smi);
         if (rv) {
                 dev_err(new_smi->dev, "Unable to create proc entry: %d\n", rv);
@@ -3246,7 +3305,7 @@ static int try_smi_init(struct smi_info *new_smi)
         }
 
         rv = ipmi_smi_add_proc_entry(new_smi->intf, "params",
-                                     param_read_proc,
+                                     &smi_params_proc_ops,
                                      new_smi);
         if (rv) {
                 dev_err(new_smi->dev, "Unable to create proc entry: %d\n", rv);
@@ -3305,7 +3364,7 @@ static int try_smi_init(struct smi_info *new_smi)
         return rv;
 }
 
-static __devinit int init_ipmi_si(void)
+static int __devinit init_ipmi_si(void)
 {
         int  i;
         char *str;
@@ -3317,8 +3376,7 @@ static __devinit int init_ipmi_si(void)
                 return 0;
         initialized = 1;
 
-        /* Register the device drivers. */
-        rv = driver_register(&ipmi_driver.driver);
+        rv = platform_driver_register(&ipmi_driver);
         if (rv) {
                 printk(KERN_ERR PFX "Unable to register driver: %d\n", rv);
                 return rv;
@@ -3342,15 +3400,9 @@ static __devinit int init_ipmi_si(void)
 
         printk(KERN_INFO "IPMI System Interface driver.\n");
 
-        hardcode_find_bmc();
-
         /* If the user gave us a device, they presumably want us to use it */
-        mutex_lock(&smi_infos_lock);
-        if (!list_empty(&smi_infos)) {
-                mutex_unlock(&smi_infos_lock);
+        if (!hardcode_find_bmc())
                 return 0;
-        }
-        mutex_unlock(&smi_infos_lock);
 
 #ifdef CONFIG_PCI
         rv = pci_register_driver(&ipmi_pci_driver);
@@ -3373,11 +3425,6 @@ static __devinit int init_ipmi_si(void)
         spmi_find_bmc();
 #endif
 
-#ifdef CONFIG_PPC_OF
-        of_register_platform_driver(&ipmi_of_platform_driver);
-        of_registered = 1;
-#endif
-
         /* We prefer devices with interrupts, but in the case of a machine
            with multiple BMCs we assume that there will be several instances
            of a given type so if we succeed in registering a type then also
@@ -3428,16 +3475,7 @@ static __devinit int init_ipmi_si(void)
         mutex_lock(&smi_infos_lock);
         if (unload_when_empty && list_empty(&smi_infos)) {
                 mutex_unlock(&smi_infos_lock);
-#ifdef CONFIG_PCI
-                if (pci_registered)
-                        pci_unregister_driver(&ipmi_pci_driver);
-#endif
-
-#ifdef CONFIG_PPC_OF
-                if (of_registered)
-                        of_unregister_platform_driver(&ipmi_of_platform_driver);
-#endif
-                driver_unregister(&ipmi_driver.driver);
+                cleanup_ipmi_si();
                 printk(KERN_WARNING PFX
                        "Unable to find any System Interface(s)\n");
                 return -ENODEV;
@@ -3518,7 +3556,7 @@ static void cleanup_one_si(struct smi_info *to_clean)
         kfree(to_clean);
 }
 
-static __exit void cleanup_ipmi_si(void)
+static void cleanup_ipmi_si(void)
 {
         struct smi_info *e, *tmp_e;
 
@@ -3534,17 +3572,12 @@ static __exit void cleanup_ipmi_si(void)
                 pnp_unregister_driver(&ipmi_pnp_driver);
 #endif
 
-#ifdef CONFIG_PPC_OF
-        if (of_registered)
-                of_unregister_platform_driver(&ipmi_of_platform_driver);
-#endif
+        platform_driver_unregister(&ipmi_driver);
 
         mutex_lock(&smi_infos_lock);
         list_for_each_entry_safe(e, tmp_e, &smi_infos, link)
                 cleanup_one_si(e);
         mutex_unlock(&smi_infos_lock);
-
-        driver_unregister(&ipmi_driver.driver);
 }
 module_exit(cleanup_ipmi_si);
 
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 654d566ca57c..320668f4c3aa 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -35,7 +35,7 @@
 #include <linux/moduleparam.h>
 #include <linux/ipmi.h>
 #include <linux/ipmi_smi.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/watchdog.h>
 #include <linux/miscdevice.h>
 #include <linux/init.h>
@@ -149,6 +149,7 @@
 #define WDIOC_GET_PRETIMEOUT     _IOW(WATCHDOG_IOCTL_BASE, 22, int)
 #endif
 
+static DEFINE_MUTEX(ipmi_watchdog_mutex);
 static int nowayout = WATCHDOG_NOWAYOUT;
 
 static ipmi_user_t watchdog_user;
@@ -748,9 +749,9 @@ static long ipmi_unlocked_ioctl(struct file *file,
 {
         int ret;
 
-        lock_kernel();
+        mutex_lock(&ipmi_watchdog_mutex);
         ret = ipmi_ioctl(file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&ipmi_watchdog_mutex);
 
         return ret;
 }
@@ -844,7 +845,6 @@ static int ipmi_open(struct inode *ino, struct file *filep)
                 if (test_and_set_bit(0, &ipmi_wdog_open))
                         return -EBUSY;
 
-                cycle_kernel_lock();
 
                 /*
                  * Don't start the timer now, let it start on the
@@ -909,6 +909,7 @@ static const struct file_operations ipmi_wdog_fops = {
         .open    = ipmi_open,
         .release = ipmi_close,
         .fasync  = ipmi_fasync,
+        .llseek  = no_llseek,
 };
 
 static struct miscdevice ipmi_wdog_miscdev = {
@@ -1080,7 +1081,7 @@ ipmi_nmi(struct notifier_block *self, unsigned long val, void *data)
 {
         struct die_args *args = data;
 
-        if (val != DIE_NMI)
+        if (val != DIE_NMIUNKNOWN)
                 return NOTIFY_OK;
 
         /* Hack, if it's a memory or I/O error, ignore it. */
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
deleted file mode 100644
index c27e9d21fea9..000000000000
--- a/drivers/char/isicom.c
+++ /dev/null
@@ -1,1736 +0,0 @@
-/*
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- *      Original driver code supplied by Multi-Tech
- *
- *      Changes
- *      1/9/98  alan@lxorguk.ukuu.org.uk
- *                                      Merge to 2.0.x kernel tree
- *                                      Obtain and use official major/minors
- *                                      Loader switched to a misc device
- *                                      (fixed range check bug as a side effect)
- *                                      Printk clean up
- *      9/12/98 alan@lxorguk.ukuu.org.uk
- *                                      Rough port to 2.1.x
- *
- *      10/6/99 sameer                  Merged the ISA and PCI drivers to
- *                                      a new unified driver.
- *
- *      3/9/99  sameer                  Added support for ISI4616 cards.
- *
- *      16/9/99 sameer                  We do not force RTS low anymore.
- *                                      This is to prevent the firmware
- *                                      from getting confused.
- *
- *      26/10/99 sameer                 Cosmetic changes:The driver now
- *                                      dumps the Port Count information
- *                                      along with I/O address and IRQ.
- *
- *      13/12/99 sameer                 Fixed the problem with IRQ sharing.
- *
- *      10/5/00  sameer                 Fixed isicom_shutdown_board()
- *                                      to not lower DTR on all the ports
- *                                      when the last port on the card is
- *                                      closed.
- *
- *      10/5/00  sameer                 Signal mask setup command added
- *                                      to  isicom_setup_port and
- *                                      isicom_shutdown_port.
- *
- *      24/5/00  sameer                 The driver is now SMP aware.
- *
- *
- *      27/11/00 Vinayak P Risbud       Fixed the Driver Crash Problem
- *
- *
- *      03/01/01  anil .s               Added support for resetting the
- *                                      internal modems on ISI cards.
- *
- *      08/02/01  anil .s               Upgraded the driver for kernel
- *                                      2.4.x
- *
- *      11/04/01  Kevin                 Fixed firmware load problem with
- *                                      ISIHP-4X card
- *
- *      30/04/01  anil .s               Fixed the remote login through
- *                                      ISI port problem. Now the link
- *                                      does not go down before password
- *                                      prompt.
- *
- *      03/05/01  anil .s               Fixed the problem with IRQ sharing
- *                                      among ISI-PCI cards.
- *
- *      03/05/01  anil .s               Added support to display the version
- *                                      info during insmod as well as module
- *                                      listing by lsmod.
- *
- *      10/05/01  anil .s               Done the modifications to the source
- *                                      file and Install script so that the
- *                                      same installation can be used for
- *                                      2.2.x and 2.4.x kernel.
- *
- *      06/06/01  anil .s               Now we drop both dtr and rts during
- *                                      shutdown_port as well as raise them
- *                                      during isicom_config_port.
- *
- *      09/06/01 acme@conectiva.com.br  use capable, not suser, do
- *                                      restore_flags on failure in
- *                                      isicom_send_break, verify put_user
- *                                      result
- *
- *      11/02/03  ranjeeth              Added support for 230 Kbps and 460 Kbps
- *                                      Baud index extended to 21
- *
- *      20/03/03  ranjeeth              Made to work for Linux Advanced server.
- *                                      Taken care of license warning.
- *
- *      10/12/03  Ravindra              Made to work for Fedora Core 1 of
- *                                      Red Hat Distribution
- *
- *      06/01/05  Alan Cox              Merged the ISI and base kernel strands
- *                                      into a single 2.6 driver
- *
- *      ***********************************************************
- *
- *      To use this driver you also need the support package. You
- *      can find this in RPM format on
- *              ftp://ftp.linux.org.uk/pub/linux/alan
- *
- *      You can find the original tools for this direct from Multitech
- *              ftp://ftp.multitech.com/ISI-Cards/
- *
- *      Having installed the cards the module options (/etc/modprobe.conf)
- *
- *      options isicom   io=card1,card2,card3,card4 irq=card1,card2,card3,card4
- *
- *      Omit those entries for boards you don't have installed.
- *
- *      TODO
- *              Merge testing
- *              64-bit verification
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/firmware.h>
-#include <linux/kernel.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/termios.h>
-#include <linux/fs.h>
-#include <linux/sched.h>
-#include <linux/serial.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/timer.h>
-#include <linux/delay.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-
-#include <linux/uaccess.h>
-#include <linux/io.h>
-#include <asm/system.h>
-
-#include <linux/pci.h>
-
-#include <linux/isicom.h>
-
-#define InterruptTheCard(base) outw(0, (base) + 0xc)
-#define ClearInterrupt(base) inw((base) + 0x0a)
-
-#ifdef DEBUG
-#define isicom_paranoia_check(a, b, c) __isicom_paranoia_check((a), (b), (c))
-#else
-#define isicom_paranoia_check(a, b, c) 0
-#endif
-
-static int isicom_probe(struct pci_dev *, const struct pci_device_id *);
-static void __devexit isicom_remove(struct pci_dev *);
-
-static struct pci_device_id isicom_pci_tbl[] = {
-        { PCI_DEVICE(VENDOR_ID, 0x2028) },
-        { PCI_DEVICE(VENDOR_ID, 0x2051) },
-        { PCI_DEVICE(VENDOR_ID, 0x2052) },
-        { PCI_DEVICE(VENDOR_ID, 0x2053) },
-        { PCI_DEVICE(VENDOR_ID, 0x2054) },
-        { PCI_DEVICE(VENDOR_ID, 0x2055) },
-        { PCI_DEVICE(VENDOR_ID, 0x2056) },
-        { PCI_DEVICE(VENDOR_ID, 0x2057) },
-        { PCI_DEVICE(VENDOR_ID, 0x2058) },
-        { 0 }
-};
-MODULE_DEVICE_TABLE(pci, isicom_pci_tbl);
-
-static struct pci_driver isicom_driver = {
-        .name           = "isicom",
-        .id_table       = isicom_pci_tbl,
-        .probe          = isicom_probe,
-        .remove         = __devexit_p(isicom_remove)
-};
-
-static int prev_card = 3;       /*      start servicing isi_card[0]     */
-static struct tty_driver *isicom_normal;
-
-static void isicom_tx(unsigned long _data);
-static void isicom_start(struct tty_struct *tty);
-
-static DEFINE_TIMER(tx, isicom_tx, 0, 0);
-
-/*   baud index mappings from linux defns to isi */
-
-static signed char linuxb_to_isib[] = {
-        -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 15, 16, 17, 18, 19, 20, 21
-};
-
-struct  isi_board {
-        unsigned long           base;
-        int                     irq;
-        unsigned char           port_count;
-        unsigned short          status;
-        unsigned short          port_status; /* each bit for each port */
-        unsigned short          shift_count;
-        struct isi_port         *ports;
-        signed char             count;
-        spinlock_t              card_lock; /* Card wide lock 11/5/00 -sameer */
-        unsigned long           flags;
-        unsigned int            index;
-};
-
-struct  isi_port {
-        unsigned short          magic;
-        struct tty_port         port;
-        u16                     channel;
-        u16                     status;
-        struct isi_board        *card;
-        unsigned char           *xmit_buf;
-        int                     xmit_head;
-        int                     xmit_tail;
-        int                     xmit_cnt;
-};
-
-static struct isi_board isi_card[BOARD_COUNT];
-static struct isi_port  isi_ports[PORT_COUNT];
-
-/*
- *      Locking functions for card level locking. We need to own both
- *      the kernel lock for the card and have the card in a position that
- *      it wants to talk.
- */
-
-static inline int WaitTillCardIsFree(unsigned long base)
-{
-        unsigned int count = 0;
-        unsigned int a = in_atomic(); /* do we run under spinlock? */
-
-        while (!(inw(base + 0xe) & 0x1) && count++ < 100)
-                if (a)
-                        mdelay(1);
-                else
-                        msleep(1);
-
-        return !(inw(base + 0xe) & 0x1);
-}
-
-static int lock_card(struct isi_board *card)
-{
-        unsigned long base = card->base;
-        unsigned int retries, a;
-
-        for (retries = 0; retries < 10; retries++) {
-                spin_lock_irqsave(&card->card_lock, card->flags);
-                for (a = 0; a < 10; a++) {
-                        if (inw(base + 0xe) & 0x1)
-                                return 1;
-                        udelay(10);
-                }
-                spin_unlock_irqrestore(&card->card_lock, card->flags);
-                msleep(10);
-        }
-        pr_warning("Failed to lock Card (0x%lx)\n", card->base);
-
-        return 0;       /* Failed to acquire the card! */
-}
-
-static void unlock_card(struct isi_board *card)
-{
-        spin_unlock_irqrestore(&card->card_lock, card->flags);
-}
-
-/*
- *  ISI Card specific ops ...
- */
-
-/* card->lock HAS to be held */
-static void raise_dtr(struct isi_port *port)
-{
-        struct isi_board *card = port->card;
-        unsigned long base = card->base;
-        u16 channel = port->channel;
-
-        if (WaitTillCardIsFree(base))
-                return;
-
-        outw(0x8000 | (channel << card->shift_count) | 0x02, base);
-        outw(0x0504, base);
-        InterruptTheCard(base);
-        port->status |= ISI_DTR;
-}
-
-/* card->lock HAS to be held */
-static inline void drop_dtr(struct isi_port *port)
-{
-        struct isi_board *card = port->card;
-        unsigned long base = card->base;
-        u16 channel = port->channel;
-
-        if (WaitTillCardIsFree(base))
-                return;
-
-        outw(0x8000 | (channel << card->shift_count) | 0x02, base);
-        outw(0x0404, base);
-        InterruptTheCard(base);
-        port->status &= ~ISI_DTR;
-}
-
-/* card->lock HAS to be held */
-static inline void raise_rts(struct isi_port *port)
-{
-        struct isi_board *card = port->card;
-        unsigned long base = card->base;
-        u16 channel = port->channel;
-
-        if (WaitTillCardIsFree(base))
-                return;
-
-        outw(0x8000 | (channel << card->shift_count) | 0x02, base);
-        outw(0x0a04, base);
-        InterruptTheCard(base);
-        port->status |= ISI_RTS;
-}
-
-/* card->lock HAS to be held */
-static inline void drop_rts(struct isi_port *port)
-{
-        struct isi_board *card = port->card;
-        unsigned long base = card->base;
-        u16 channel = port->channel;
-
-        if (WaitTillCardIsFree(base))
-                return;
-
-        outw(0x8000 | (channel << card->shift_count) | 0x02, base);
-        outw(0x0804, base);
-        InterruptTheCard(base);
-        port->status &= ~ISI_RTS;
-}
-
-/* card->lock MUST NOT be held */
-
-static void isicom_dtr_rts(struct tty_port *port, int on)
-{
-        struct isi_port *ip = container_of(port, struct isi_port, port);
-        struct isi_board *card = ip->card;
-        unsigned long base = card->base;
-        u16 channel = ip->channel;
-
-        if (!lock_card(card))
-                return;
-
-        if (on) {
-                outw(0x8000 | (channel << card->shift_count) | 0x02, base);
-                outw(0x0f04, base);
-                InterruptTheCard(base);
-                ip->status |= (ISI_DTR | ISI_RTS);
-        } else {
-                outw(0x8000 | (channel << card->shift_count) | 0x02, base);
-                outw(0x0C04, base);
-                InterruptTheCard(base);
-                ip->status &= ~(ISI_DTR | ISI_RTS);
-        }
-        unlock_card(card);
-}
-
-/* card->lock HAS to be held */
-static void drop_dtr_rts(struct isi_port *port)
-{
-        struct isi_board *card = port->card;
-        unsigned long base = card->base;
-        u16 channel = port->channel;
-
-        if (WaitTillCardIsFree(base))
-                return;
-
-        outw(0x8000 | (channel << card->shift_count) | 0x02, base);
-        outw(0x0c04, base);
-        InterruptTheCard(base);
-        port->status &= ~(ISI_RTS | ISI_DTR);
-}
-
-/*
- *      ISICOM Driver specific routines ...
- *
- */
-
-static inline int __isicom_paranoia_check(struct isi_port const *port,
-        char *name, const char *routine)
-{
-        if (!port) {
-                pr_warning("Warning: bad isicom magic for dev %s in %s.\n",
-                           name, routine);
-                return 1;
-        }
-        if (port->magic != ISICOM_MAGIC) {
-                pr_warning("Warning: NULL isicom port for dev %s in %s.\n",
-                           name, routine);
-                return 1;
-        }
-
-        return 0;
-}
-
-/*
- *      Transmitter.
- *
- *      We shovel data into the card buffers on a regular basis. The card
- *      will do the rest of the work for us.
- */
-
-static void isicom_tx(unsigned long _data)
-{
-        unsigned long flags, base;
-        unsigned int retries;
-        short count = (BOARD_COUNT-1), card;
-        short txcount, wrd, residue, word_count, cnt;
-        struct isi_port *port;
-        struct tty_struct *tty;
-
-        /*      find next active board  */
-        card = (prev_card + 1) & 0x0003;
-        while (count-- > 0) {
-                if (isi_card[card].status & BOARD_ACTIVE)
-                        break;
-                card = (card + 1) & 0x0003;
-        }
-        if (!(isi_card[card].status & BOARD_ACTIVE))
-                goto sched_again;
-
-        prev_card = card;
-
-        count = isi_card[card].port_count;
-        port = isi_card[card].ports;
-        base = isi_card[card].base;
-
-        spin_lock_irqsave(&isi_card[card].card_lock, flags);
-        for (retries = 0; retries < 100; retries++) {
-                if (inw(base + 0xe) & 0x1)
-                        break;
-                udelay(2);
-        }
-        if (retries >= 100)
-                goto unlock;
-
-        tty = tty_port_tty_get(&port->port);
-        if (tty == NULL)
-                goto put_unlock;
-
-        for (; count > 0; count--, port++) {
-                /* port not active or tx disabled to force flow control */
-                if (!(port->port.flags & ASYNC_INITIALIZED) ||
-                                !(port->status & ISI_TXOK))
-                        continue;
-
-                txcount = min_t(short, TX_SIZE, port->xmit_cnt);
-                if (txcount <= 0 || tty->stopped || tty->hw_stopped)
-                        continue;
-
-                if (!(inw(base + 0x02) & (1 << port->channel)))
-                        continue;
-
-                pr_debug("txing %d bytes, port%d.\n",
-                         txcount, port->channel + 1);
-                outw((port->channel << isi_card[card].shift_count) | txcount,
-                        base);
-                residue = NO;
-                wrd = 0;
-                while (1) {
-                        cnt = min_t(int, txcount, (SERIAL_XMIT_SIZE
-                                        - port->xmit_tail));
-                        if (residue == YES) {
-                                residue = NO;
-                                if (cnt > 0) {
-                                        wrd |= (port->port.xmit_buf[port->xmit_tail]
-                                                                        << 8);
-                                        port->xmit_tail = (port->xmit_tail + 1)
-                                                & (SERIAL_XMIT_SIZE - 1);
-                                        port->xmit_cnt--;
-                                        txcount--;
-                                        cnt--;
-                                        outw(wrd, base);
-                                } else {
-                                        outw(wrd, base);
-                                        break;
-                                }
-                        }
-                        if (cnt <= 0)
-                                break;
-                        word_count = cnt >> 1;
-                        outsw(base, port->port.xmit_buf+port->xmit_tail, word_count);
-                        port->xmit_tail = (port->xmit_tail
-                                + (word_count << 1)) & (SERIAL_XMIT_SIZE - 1);
-                        txcount -= (word_count << 1);
-                        port->xmit_cnt -= (word_count << 1);
-                        if (cnt & 0x0001) {
-                                residue = YES;
-                                wrd = port->port.xmit_buf[port->xmit_tail];
-                                port->xmit_tail = (port->xmit_tail + 1)
-                                        & (SERIAL_XMIT_SIZE - 1);
-                                port->xmit_cnt--;
-                                txcount--;
-                        }
-                }
-
-                InterruptTheCard(base);
-                if (port->xmit_cnt <= 0)
-                        port->status &= ~ISI_TXOK;
-                if (port->xmit_cnt <= WAKEUP_CHARS)
-                        tty_wakeup(tty);
-        }
-
-put_unlock:
-        tty_kref_put(tty);
-unlock:
-        spin_unlock_irqrestore(&isi_card[card].card_lock, flags);
-        /*      schedule another tx for hopefully in about 10ms */
-sched_again:
-        mod_timer(&tx, jiffies + msecs_to_jiffies(10));
-}
-
-/*
- *      Main interrupt handler routine
- */
-
-static irqreturn_t isicom_interrupt(int irq, void *dev_id)
-{
-        struct isi_board *card = dev_id;
-        struct isi_port *port;
-        struct tty_struct *tty;
-        unsigned long base;
-        u16 header, word_count, count, channel;
-        short byte_count;
-        unsigned char *rp;
-
-        if (!card || !(card->status & FIRMWARE_LOADED))
-                return IRQ_NONE;
-
-        base = card->base;
-
-        /* did the card interrupt us? */
-        if (!(inw(base + 0x0e) & 0x02))
-                return IRQ_NONE;
-
-        spin_lock(&card->card_lock);
-
-        /*
-         * disable any interrupts from the PCI card and lower the
-         * interrupt line
-         */
-        outw(0x8000, base+0x04);
-        ClearInterrupt(base);
-
-        inw(base);              /* get the dummy word out */
-        header = inw(base);
-        channel = (header & 0x7800) >> card->shift_count;
-        byte_count = header & 0xff;
-
-        if (channel + 1 > card->port_count) {
-                pr_warning("%s(0x%lx): %d(channel) > port_count.\n",
-                           __func__, base, channel+1);
-                outw(0x0000, base+0x04); /* enable interrupts */
-                spin_unlock(&card->card_lock);
-                return IRQ_HANDLED;
-        }
-        port = card->ports + channel;
-        if (!(port->port.flags & ASYNC_INITIALIZED)) {
-                outw(0x0000, base+0x04); /* enable interrupts */
-                spin_unlock(&card->card_lock);
-                return IRQ_HANDLED;
-        }
-
-        tty = tty_port_tty_get(&port->port);
-        if (tty == NULL) {
-                word_count = byte_count >> 1;
-                while (byte_count > 1) {
-                        inw(base);
-                        byte_count -= 2;
-                }
-                if (byte_count & 0x01)
-                        inw(base);
-                outw(0x0000, base+0x04); /* enable interrupts */
-                spin_unlock(&card->card_lock);
-                return IRQ_HANDLED;
-        }
-
-        if (header & 0x8000) {          /* Status Packet */
-                header = inw(base);
-                switch (header & 0xff) {
-                case 0: /* Change in EIA signals */
-                        if (port->port.flags & ASYNC_CHECK_CD) {
-                                if (port->status & ISI_DCD) {
-                                        if (!(header & ISI_DCD)) {
-                                        /* Carrier has been lost  */
-                                                pr_debug("%s: DCD->low.\n",
-                                                         __func__);
-                                                port->status &= ~ISI_DCD;
-                                                tty_hangup(tty);
-                                        }
-                                } else if (header & ISI_DCD) {
-                                /* Carrier has been detected */
-                                        pr_debug("%s: DCD->high.\n",
-                                                __func__);
-                                        port->status |= ISI_DCD;
-                                        wake_up_interruptible(&port->port.open_wait);
-                                }
-                        } else {
-                                if (header & ISI_DCD)
-                                        port->status |= ISI_DCD;
-                                else
-                                        port->status &= ~ISI_DCD;
-                        }
-
-                        if (port->port.flags & ASYNC_CTS_FLOW) {
-                                if (tty->hw_stopped) {
-                                        if (header & ISI_CTS) {
-                                                port->port.tty->hw_stopped = 0;
-                                                /* start tx ing */
-                                                port->status |= (ISI_TXOK
-                                                        | ISI_CTS);
-                                                tty_wakeup(tty);
-                                        }
-                                } else if (!(header & ISI_CTS)) {
-                                        tty->hw_stopped = 1;
-                                        /* stop tx ing */
-                                        port->status &= ~(ISI_TXOK | ISI_CTS);
-                                }
-                        } else {
-                                if (header & ISI_CTS)
-                                        port->status |= ISI_CTS;
-                                else
-                                        port->status &= ~ISI_CTS;
-                        }
-
-                        if (header & ISI_DSR)
-                                port->status |= ISI_DSR;
-                        else
-                                port->status &= ~ISI_DSR;
-
-                        if (header & ISI_RI)
-                                port->status |= ISI_RI;
-                        else
-                                port->status &= ~ISI_RI;
-
-                        break;
-
-                case 1: /* Received Break !!! */
-                        tty_insert_flip_char(tty, 0, TTY_BREAK);
-                        if (port->port.flags & ASYNC_SAK)
-                                do_SAK(tty);
-                        tty_flip_buffer_push(tty);
-                        break;
-
-                case 2: /* Statistics            */
-                        pr_debug("%s: stats!!!\n", __func__);
-                        break;
-
-                default:
-                        pr_debug("%s: Unknown code in status packet.\n",
-                                 __func__);
-                        break;
-                }
-        } else {                                /* Data   Packet */
-
-                count = tty_prepare_flip_string(tty, &rp, byte_count & ~1);
-                pr_debug("%s: Can rx %d of %d bytes.\n",
-                         __func__, count, byte_count);
-                word_count = count >> 1;
-                insw(base, rp, word_count);
-                byte_count -= (word_count << 1);
-                if (count & 0x0001) {
-                        tty_insert_flip_char(tty,  inw(base) & 0xff,
-                                TTY_NORMAL);
-                        byte_count -= 2;
-                }
-                if (byte_count > 0) {
-                        pr_debug("%s(0x%lx:%d): Flip buffer overflow! dropping bytes...\n",
-                                 __func__, base, channel + 1);
-                /* drain out unread xtra data */
-                while (byte_count > 0) {
-                                inw(base);
-                                byte_count -= 2;
-                        }
-                }
-                tty_flip_buffer_push(tty);
-        }
-        outw(0x0000, base+0x04); /* enable interrupts */
-        spin_unlock(&card->card_lock);
-        tty_kref_put(tty);
-
-        return IRQ_HANDLED;
-}
-
-static void isicom_config_port(struct tty_struct *tty)
-{
-        struct isi_port *port = tty->driver_data;
-        struct isi_board *card = port->card;
-        unsigned long baud;
-        unsigned long base = card->base;
-        u16 channel_setup, channel = port->channel,
-                shift_count = card->shift_count;
-        unsigned char flow_ctrl;
-
-        /* FIXME: Switch to new tty baud API */
-        baud = C_BAUD(tty);
-        if (baud & CBAUDEX) {
-                baud &= ~CBAUDEX;
-
-                /*  if CBAUDEX bit is on and the baud is set to either 50 or 75
-                 *  then the card is programmed for 57.6Kbps or 115Kbps
-                 *  respectively.
-                 */
-
-                /* 1,2,3,4 => 57.6, 115.2, 230, 460 kbps resp. */
-                if (baud < 1 || baud > 4)
-                        tty->termios->c_cflag &= ~CBAUDEX;
-                else
-                        baud += 15;
-        }
-        if (baud == 15) {
-
-                /*  the ASYNC_SPD_HI and ASYNC_SPD_VHI options are set
-                 *  by the set_serial_info ioctl ... this is done by
-                 *  the 'setserial' utility.
-                 */
-
-                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        baud++; /*  57.6 Kbps */
-                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        baud += 2; /*  115  Kbps */
-                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                        baud += 3; /* 230 kbps*/
-                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                        baud += 4; /* 460 kbps*/
-        }
-        if (linuxb_to_isib[baud] == -1) {
-                /* hang up */
-                drop_dtr(port);
-                return;
-        } else
-                raise_dtr(port);
-
-        if (WaitTillCardIsFree(base) == 0) {
-                outw(0x8000 | (channel << shift_count) | 0x03, base);
-                outw(linuxb_to_isib[baud] << 8 | 0x03, base);
-                channel_setup = 0;
-                switch (C_CSIZE(tty)) {
-                case CS5:
-                        channel_setup |= ISICOM_CS5;
-                        break;
-                case CS6:
-                        channel_setup |= ISICOM_CS6;
-                        break;
-                case CS7:
-                        channel_setup |= ISICOM_CS7;
-                        break;
-                case CS8:
-                        channel_setup |= ISICOM_CS8;
-                        break;
-                }
-
-                if (C_CSTOPB(tty))
-                        channel_setup |= ISICOM_2SB;
-                if (C_PARENB(tty)) {
-                        channel_setup |= ISICOM_EVPAR;
-                        if (C_PARODD(tty))
-                                channel_setup |= ISICOM_ODPAR;
-                }
-                outw(channel_setup, base);
-                InterruptTheCard(base);
-        }
-        if (C_CLOCAL(tty))
-                port->port.flags &= ~ASYNC_CHECK_CD;
-        else
-                port->port.flags |= ASYNC_CHECK_CD;
-
-        /* flow control settings ...*/
-        flow_ctrl = 0;
-        port->port.flags &= ~ASYNC_CTS_FLOW;
-        if (C_CRTSCTS(tty)) {
-                port->port.flags |= ASYNC_CTS_FLOW;
-                flow_ctrl |= ISICOM_CTSRTS;
-        }
-        if (I_IXON(tty))
-                flow_ctrl |= ISICOM_RESPOND_XONXOFF;
-        if (I_IXOFF(tty))
-                flow_ctrl |= ISICOM_INITIATE_XONXOFF;
-
-        if (WaitTillCardIsFree(base) == 0) {
-                outw(0x8000 | (channel << shift_count) | 0x04, base);
-                outw(flow_ctrl << 8 | 0x05, base);
-                outw((STOP_CHAR(tty)) << 8 | (START_CHAR(tty)), base);
-                InterruptTheCard(base);
-        }
-
-        /*      rx enabled -> enable port for rx on the card    */
-        if (C_CREAD(tty)) {
-                card->port_status |= (1 << channel);
-                outw(card->port_status, base + 0x02);
-        }
-}
-
-/* open et all */
-
-static inline void isicom_setup_board(struct isi_board *bp)
-{
-        int channel;
-        struct isi_port *port;
-
-        bp->count++;
-        if (!(bp->status & BOARD_INIT)) {
-                port = bp->ports;
-                for (channel = 0; channel < bp->port_count; channel++, port++)
-                        drop_dtr_rts(port);
-        }
-        bp->status |= BOARD_ACTIVE | BOARD_INIT;
-}
-
-/* Activate and thus setup board are protected from races against shutdown
-   by the tty_port mutex */
-
-static int isicom_activate(struct tty_port *tport, struct tty_struct *tty)
-{
-        struct isi_port *port = container_of(tport, struct isi_port, port);
-        struct isi_board *card = port->card;
-        unsigned long flags;
-
-        if (tty_port_alloc_xmit_buf(tport) < 0)
-                return -ENOMEM;
-
-        spin_lock_irqsave(&card->card_lock, flags);
-        isicom_setup_board(card);
-
-        port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
-
-        /*      discard any residual data       */
-        if (WaitTillCardIsFree(card->base) == 0) {
-                outw(0x8000 | (port->channel << card->shift_count) | 0x02,
-                                card->base);
-                outw(((ISICOM_KILLTX | ISICOM_KILLRX) << 8) | 0x06, card->base);
-                InterruptTheCard(card->base);
-        }
-        isicom_config_port(tty);
-        spin_unlock_irqrestore(&card->card_lock, flags);
-
-        return 0;
-}
-
-static int isicom_carrier_raised(struct tty_port *port)
-{
-        struct isi_port *ip = container_of(port, struct isi_port, port);
-        return (ip->status & ISI_DCD)?1 : 0;
-}
-
-static struct tty_port *isicom_find_port(struct tty_struct *tty)
-{
-        struct isi_port *port;
-        struct isi_board *card;
-        unsigned int board;
-        int line = tty->index;
-
-        if (line < 0 || line > PORT_COUNT-1)
-                return NULL;
-        board = BOARD(line);
-        card = &isi_card[board];
-
-        if (!(card->status & FIRMWARE_LOADED))
-                return NULL;
-
-        /*  open on a port greater than the port count for the card !!! */
-        if (line > ((board * 16) + card->port_count - 1))
-                return NULL;
-
-        port = &isi_ports[line];
-        if (isicom_paranoia_check(port, tty->name, "isicom_open"))
-                return NULL;
-
-        return &port->port;
-}
-
-static int isicom_open(struct tty_struct *tty, struct file *filp)
-{
-        struct isi_port *port;
-        struct tty_port *tport;
-
-        tport = isicom_find_port(tty);
-        if (tport == NULL)
-                return -ENODEV;
-        port = container_of(tport, struct isi_port, port);
-
-        tty->driver_data = port;
-        return tty_port_open(tport, tty, filp);
-}
-
-/* close et all */
-
-/* card->lock HAS to be held */
-static void isicom_shutdown_port(struct isi_port *port)
-{
-        struct isi_board *card = port->card;
-
-        if (--card->count < 0) {
-                pr_debug("%s: bad board(0x%lx) count %d.\n",
-                         __func__, card->base, card->count);
-                card->count = 0;
-        }
-        /* last port was closed, shutdown that board too */
-        if (!card->count)
-                card->status &= BOARD_ACTIVE;
-}
-
-static void isicom_flush_buffer(struct tty_struct *tty)
-{
-        struct isi_port *port = tty->driver_data;
-        struct isi_board *card = port->card;
-        unsigned long flags;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_flush_buffer"))
-                return;
-
-        spin_lock_irqsave(&card->card_lock, flags);
-        port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
-        spin_unlock_irqrestore(&card->card_lock, flags);
-
-        tty_wakeup(tty);
-}
-
-static void isicom_shutdown(struct tty_port *port)
-{
-        struct isi_port *ip = container_of(port, struct isi_port, port);
-        struct isi_board *card = ip->card;
-        unsigned long flags;
-
-        /* indicate to the card that no more data can be received
-           on this port */
-        spin_lock_irqsave(&card->card_lock, flags);
-        card->port_status &= ~(1 << ip->channel);
-        outw(card->port_status, card->base + 0x02);
-        isicom_shutdown_port(ip);
-        spin_unlock_irqrestore(&card->card_lock, flags);
-        tty_port_free_xmit_buf(port);
-}
-
-static void isicom_close(struct tty_struct *tty, struct file *filp)
-{
-        struct isi_port *ip = tty->driver_data;
-        struct tty_port *port;
-
-        if (ip == NULL)
-                return;
-
-        port = &ip->port;
-        if (isicom_paranoia_check(ip, tty->name, "isicom_close"))
-                return;
-        tty_port_close(port, tty, filp);
-}
-
-/* write et all */
-static int isicom_write(struct tty_struct *tty, const unsigned char *buf,
-        int count)
-{
-        struct isi_port *port = tty->driver_data;
-        struct isi_board *card = port->card;
-        unsigned long flags;
-        int cnt, total = 0;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_write"))
-                return 0;
-
-        spin_lock_irqsave(&card->card_lock, flags);
-
-        while (1) {
-                cnt = min_t(int, count, min(SERIAL_XMIT_SIZE - port->xmit_cnt
-                                - 1, SERIAL_XMIT_SIZE - port->xmit_head));
-                if (cnt <= 0)
-                        break;
-
-                memcpy(port->port.xmit_buf + port->xmit_head, buf, cnt);
-                port->xmit_head = (port->xmit_head + cnt) & (SERIAL_XMIT_SIZE
-                        - 1);
-                port->xmit_cnt += cnt;
-                buf += cnt;
-                count -= cnt;
-                total += cnt;
-        }
-        if (port->xmit_cnt && !tty->stopped && !tty->hw_stopped)
-                port->status |= ISI_TXOK;
-        spin_unlock_irqrestore(&card->card_lock, flags);
-        return total;
-}
-
-/* put_char et all */
-static int isicom_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        struct isi_port *port = tty->driver_data;
-        struct isi_board *card = port->card;
-        unsigned long flags;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_put_char"))
-                return 0;
-
-        spin_lock_irqsave(&card->card_lock, flags);
-        if (port->xmit_cnt >= SERIAL_XMIT_SIZE - 1) {
-                spin_unlock_irqrestore(&card->card_lock, flags);
-                return 0;
-        }
-
-        port->port.xmit_buf[port->xmit_head++] = ch;
-        port->xmit_head &= (SERIAL_XMIT_SIZE - 1);
-        port->xmit_cnt++;
-        spin_unlock_irqrestore(&card->card_lock, flags);
-        return 1;
-}
-
-/* flush_chars et all */
-static void isicom_flush_chars(struct tty_struct *tty)
-{
-        struct isi_port *port = tty->driver_data;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_flush_chars"))
-                return;
-
-        if (port->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
-                        !port->port.xmit_buf)
-                return;
-
-        /* this tells the transmitter to consider this port for
-           data output to the card ... that's the best we can do. */
-        port->status |= ISI_TXOK;
-}
-
-/* write_room et all */
-static int isicom_write_room(struct tty_struct *tty)
-{
-        struct isi_port *port = tty->driver_data;
-        int free;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_write_room"))
-                return 0;
-
-        free = SERIAL_XMIT_SIZE - port->xmit_cnt - 1;
-        if (free < 0)
-                free = 0;
-        return free;
-}
-
-/* chars_in_buffer et all */
-static int isicom_chars_in_buffer(struct tty_struct *tty)
-{
-        struct isi_port *port = tty->driver_data;
-        if (isicom_paranoia_check(port, tty->name, "isicom_chars_in_buffer"))
-                return 0;
-        return port->xmit_cnt;
-}
-
-/* ioctl et all */
-static int isicom_send_break(struct tty_struct *tty, int length)
-{
-        struct isi_port *port = tty->driver_data;
-        struct isi_board *card = port->card;
-        unsigned long base = card->base;
-
-        if (length == -1)
-                return -EOPNOTSUPP;
-
-        if (!lock_card(card))
-                return -EINVAL;
-
-        outw(0x8000 | ((port->channel) << (card->shift_count)) | 0x3, base);
-        outw((length & 0xff) << 8 | 0x00, base);
-        outw((length & 0xff00), base);
-        InterruptTheCard(base);
-
-        unlock_card(card);
-        return 0;
-}
-
-static int isicom_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct isi_port *port = tty->driver_data;
-        /* just send the port status */
-        u16 status = port->status;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_ioctl"))
-                return -ENODEV;
-
-        return  ((status & ISI_RTS) ? TIOCM_RTS : 0) |
-                ((status & ISI_DTR) ? TIOCM_DTR : 0) |
-                ((status & ISI_DCD) ? TIOCM_CAR : 0) |
-                ((status & ISI_DSR) ? TIOCM_DSR : 0) |
-                ((status & ISI_CTS) ? TIOCM_CTS : 0) |
-                ((status & ISI_RI ) ? TIOCM_RI  : 0);
-}
-
-static int isicom_tiocmset(struct tty_struct *tty, struct file *file,
-        unsigned int set, unsigned int clear)
-{
-        struct isi_port *port = tty->driver_data;
-        unsigned long flags;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_ioctl"))
-                return -ENODEV;
-
-        spin_lock_irqsave(&port->card->card_lock, flags);
-        if (set & TIOCM_RTS)
-                raise_rts(port);
-        if (set & TIOCM_DTR)
-                raise_dtr(port);
-
-        if (clear & TIOCM_RTS)
-                drop_rts(port);
-        if (clear & TIOCM_DTR)
-                drop_dtr(port);
-        spin_unlock_irqrestore(&port->card->card_lock, flags);
-
-        return 0;
-}
-
-static int isicom_set_serial_info(struct tty_struct *tty,
-                                        struct serial_struct __user *info)
-{
-        struct isi_port *port = tty->driver_data;
-        struct serial_struct newinfo;
-        int reconfig_port;
-
-        if (copy_from_user(&newinfo, info, sizeof(newinfo)))
-                return -EFAULT;
-
-        mutex_lock(&port->port.mutex);
-        reconfig_port = ((port->port.flags & ASYNC_SPD_MASK) !=
-                (newinfo.flags & ASYNC_SPD_MASK));
-
-        if (!capable(CAP_SYS_ADMIN)) {
-                if ((newinfo.close_delay != port->port.close_delay) ||
-                                (newinfo.closing_wait != port->port.closing_wait) ||
-                                ((newinfo.flags & ~ASYNC_USR_MASK) !=
-                                (port->port.flags & ~ASYNC_USR_MASK))) {
-                        mutex_unlock(&port->port.mutex);
-                        return -EPERM;
-                }
-                port->port.flags = ((port->port.flags & ~ASYNC_USR_MASK) |
-                                (newinfo.flags & ASYNC_USR_MASK));
-        } else {
-                port->port.close_delay = newinfo.close_delay;
-                port->port.closing_wait = newinfo.closing_wait;
-                port->port.flags = ((port->port.flags & ~ASYNC_FLAGS) |
-                                (newinfo.flags & ASYNC_FLAGS));
-        }
-        if (reconfig_port) {
-                unsigned long flags;
-                spin_lock_irqsave(&port->card->card_lock, flags);
-                isicom_config_port(tty);
-                spin_unlock_irqrestore(&port->card->card_lock, flags);
-        }
-        mutex_unlock(&port->port.mutex);
-        return 0;
-}
-
-static int isicom_get_serial_info(struct isi_port *port,
-        struct serial_struct __user *info)
-{
-        struct serial_struct out_info;
-
-        mutex_lock(&port->port.mutex);
-        memset(&out_info, 0, sizeof(out_info));
-/*      out_info.type = ? */
-        out_info.line = port - isi_ports;
-        out_info.port = port->card->base;
-        out_info.irq = port->card->irq;
-        out_info.flags = port->port.flags;
-/*      out_info.baud_base = ? */
-        out_info.close_delay = port->port.close_delay;
-        out_info.closing_wait = port->port.closing_wait;
-        mutex_unlock(&port->port.mutex);
-        if (copy_to_user(info, &out_info, sizeof(out_info)))
-                return -EFAULT;
-        return 0;
-}
-
-static int isicom_ioctl(struct tty_struct *tty, struct file *filp,
-        unsigned int cmd, unsigned long arg)
-{
-        struct isi_port *port = tty->driver_data;
-        void __user *argp = (void __user *)arg;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_ioctl"))
-                return -ENODEV;
-
-        switch (cmd) {
-        case TIOCGSERIAL:
-                return isicom_get_serial_info(port, argp);
-
-        case TIOCSSERIAL:
-                return isicom_set_serial_info(tty, argp);
-
-        default:
-                return -ENOIOCTLCMD;
-        }
-        return 0;
-}
-
-/* set_termios et all */
-static void isicom_set_termios(struct tty_struct *tty,
-        struct ktermios *old_termios)
-{
-        struct isi_port *port = tty->driver_data;
-        unsigned long flags;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_set_termios"))
-                return;
-
-        if (tty->termios->c_cflag == old_termios->c_cflag &&
-                        tty->termios->c_iflag == old_termios->c_iflag)
-                return;
-
-        spin_lock_irqsave(&port->card->card_lock, flags);
-        isicom_config_port(tty);
-        spin_unlock_irqrestore(&port->card->card_lock, flags);
-
-        if ((old_termios->c_cflag & CRTSCTS) &&
-                        !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-                isicom_start(tty);
-        }
-}
-
-/* throttle et all */
-static void isicom_throttle(struct tty_struct *tty)
-{
-        struct isi_port *port = tty->driver_data;
-        struct isi_board *card = port->card;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_throttle"))
-                return;
-
-        /* tell the card that this port cannot handle any more data for now */
-        card->port_status &= ~(1 << port->channel);
-        outw(card->port_status, card->base + 0x02);
-}
-
-/* unthrottle et all */
-static void isicom_unthrottle(struct tty_struct *tty)
-{
-        struct isi_port *port = tty->driver_data;
-        struct isi_board *card = port->card;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_unthrottle"))
-                return;
-
-        /* tell the card that this port is ready to accept more data */
-        card->port_status |= (1 << port->channel);
-        outw(card->port_status, card->base + 0x02);
-}
-
-/* stop et all */
-static void isicom_stop(struct tty_struct *tty)
-{
-        struct isi_port *port = tty->driver_data;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_stop"))
-                return;
-
-        /* this tells the transmitter not to consider this port for
-           data output to the card. */
-        port->status &= ~ISI_TXOK;
-}
-
-/* start et all */
-static void isicom_start(struct tty_struct *tty)
-{
-        struct isi_port *port = tty->driver_data;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_start"))
-                return;
-
-        /* this tells the transmitter to consider this port for
-           data output to the card. */
-        port->status |= ISI_TXOK;
-}
-
-static void isicom_hangup(struct tty_struct *tty)
-{
-        struct isi_port *port = tty->driver_data;
-
-        if (isicom_paranoia_check(port, tty->name, "isicom_hangup"))
-                return;
-        tty_port_hangup(&port->port);
-}
-
-
-/*
- * Driver init and deinit functions
- */
-
-static const struct tty_operations isicom_ops = {
-        .open                   = isicom_open,
-        .close                  = isicom_close,
-        .write                  = isicom_write,
-        .put_char               = isicom_put_char,
-        .flush_chars            = isicom_flush_chars,
-        .write_room             = isicom_write_room,
-        .chars_in_buffer        = isicom_chars_in_buffer,
-        .ioctl                  = isicom_ioctl,
-        .set_termios            = isicom_set_termios,
-        .throttle               = isicom_throttle,
-        .unthrottle             = isicom_unthrottle,
-        .stop                   = isicom_stop,
-        .start                  = isicom_start,
-        .hangup                 = isicom_hangup,
-        .flush_buffer           = isicom_flush_buffer,
-        .tiocmget               = isicom_tiocmget,
-        .tiocmset               = isicom_tiocmset,
-        .break_ctl              = isicom_send_break,
-};
-
-static const struct tty_port_operations isicom_port_ops = {
-        .carrier_raised         = isicom_carrier_raised,
-        .dtr_rts                = isicom_dtr_rts,
-        .activate               = isicom_activate,
-        .shutdown               = isicom_shutdown,
-};
-
-static int __devinit reset_card(struct pci_dev *pdev,
-        const unsigned int card, unsigned int *signature)
-{
-        struct isi_board *board = pci_get_drvdata(pdev);
-        unsigned long base = board->base;
-        unsigned int sig, portcount = 0;
-        int retval = 0;
-
-        dev_dbg(&pdev->dev, "ISILoad:Resetting Card%d at 0x%lx\n", card + 1,
-                base);
-
-        inw(base + 0x8);
-
-        msleep(10);
-
-        outw(0, base + 0x8); /* Reset */
-
-        msleep(1000);
-
-        sig = inw(base + 0x4) & 0xff;
-
-        if (sig != 0xa5 && sig != 0xbb && sig != 0xcc && sig != 0xdd &&
-                        sig != 0xee) {
-                dev_warn(&pdev->dev, "ISILoad:Card%u reset failure (Possible "
-                        "bad I/O Port Address 0x%lx).\n", card + 1, base);
-                dev_dbg(&pdev->dev, "Sig=0x%x\n", sig);
-                retval = -EIO;
-                goto end;
-        }
-
-        msleep(10);
-
-        portcount = inw(base + 0x2);
-        if (!(inw(base + 0xe) & 0x1) || (portcount != 0 && portcount != 4 &&
-                                portcount != 8 && portcount != 16)) {
-                dev_err(&pdev->dev, "ISILoad:PCI Card%d reset failure.\n",
-                        card + 1);
-                retval = -EIO;
-                goto end;
-        }
-
-        switch (sig) {
-        case 0xa5:
-        case 0xbb:
-        case 0xdd:
-                board->port_count = (portcount == 4) ? 4 : 8;
-                board->shift_count = 12;
-                break;
-        case 0xcc:
-        case 0xee:
-                board->port_count = 16;
-                board->shift_count = 11;
-                break;
-        }
-        dev_info(&pdev->dev, "-Done\n");
-        *signature = sig;
-
-end:
-        return retval;
-}
-
-static int __devinit load_firmware(struct pci_dev *pdev,
-        const unsigned int index, const unsigned int signature)
-{
-        struct isi_board *board = pci_get_drvdata(pdev);
-        const struct firmware *fw;
-        unsigned long base = board->base;
-        unsigned int a;
-        u16 word_count, status;
-        int retval = -EIO;
-        char *name;
-        u8 *data;
-
-        struct stframe {
-                u16     addr;
-                u16     count;
-                u8      data[0];
-        } *frame;
-
-        switch (signature) {
-        case 0xa5:
-                name = "isi608.bin";
-                break;
-        case 0xbb:
-                name = "isi608em.bin";
-                break;
-        case 0xcc:
-                name = "isi616em.bin";
-                break;
-        case 0xdd:
-                name = "isi4608.bin";
-                break;
-        case 0xee:
-                name = "isi4616.bin";
-                break;
-        default:
-                dev_err(&pdev->dev, "Unknown signature.\n");
-                goto end;
-        }
-
-        retval = request_firmware(&fw, name, &pdev->dev);
-        if (retval)
-                goto end;
-
-        retval = -EIO;
-
-        for (frame = (struct stframe *)fw->data;
-                        frame < (struct stframe *)(fw->data + fw->size);
-                        frame = (struct stframe *)((u8 *)(frame + 1) +
-                                frame->count)) {
-                if (WaitTillCardIsFree(base))
-                        goto errrelfw;
-
-                outw(0xf0, base);       /* start upload sequence */
-                outw(0x00, base);
-                outw(frame->addr, base); /* lsb of address */
-
-                word_count = frame->count / 2 + frame->count % 2;
-                outw(word_count, base);
-                InterruptTheCard(base);
-
-                udelay(100); /* 0x2f */
-
-                if (WaitTillCardIsFree(base))
-                        goto errrelfw;
-
-                status = inw(base + 0x4);
-                if (status != 0) {
-                        dev_warn(&pdev->dev, "Card%d rejected load header:\n"
-                                 "Address:0x%x\n"
-                                 "Count:0x%x\n"
-                                 "Status:0x%x\n",
-                                 index + 1, frame->addr, frame->count, status);
-                        goto errrelfw;
-                }
-                outsw(base, frame->data, word_count);
-
-                InterruptTheCard(base);
-
-                udelay(50); /* 0x0f */
-
-                if (WaitTillCardIsFree(base))
-                        goto errrelfw;
-
-                status = inw(base + 0x4);
-                if (status != 0) {
-                        dev_err(&pdev->dev, "Card%d got out of sync.Card "
-                                "Status:0x%x\n", index + 1, status);
-                        goto errrelfw;
-                }
-        }
-
-/* XXX: should we test it by reading it back and comparing with original like
- * in load firmware package? */
-        for (frame = (struct stframe *)fw->data;
-                        frame < (struct stframe *)(fw->data + fw->size);
-                        frame = (struct stframe *)((u8 *)(frame + 1) +
-                                frame->count)) {
-                if (WaitTillCardIsFree(base))
-                        goto errrelfw;
-
-                outw(0xf1, base); /* start download sequence */
-                outw(0x00, base);
-                outw(frame->addr, base); /* lsb of address */
-
-                word_count = (frame->count >> 1) + frame->count % 2;
-                outw(word_count + 1, base);
-                InterruptTheCard(base);
-
-                udelay(50); /* 0xf */
-
-                if (WaitTillCardIsFree(base))
-                        goto errrelfw;
-
-                status = inw(base + 0x4);
-                if (status != 0) {
-                        dev_warn(&pdev->dev, "Card%d rejected verify header:\n"
-                                 "Address:0x%x\n"
-                                 "Count:0x%x\n"
-                                 "Status: 0x%x\n",
-                                 index + 1, frame->addr, frame->count, status);
-                        goto errrelfw;
-                }
-
-                data = kmalloc(word_count * 2, GFP_KERNEL);
-                if (data == NULL) {
-                        dev_err(&pdev->dev, "Card%d, firmware upload "
-                                "failed, not enough memory\n", index + 1);
-                        goto errrelfw;
-                }
-                inw(base);
-                insw(base, data, word_count);
-                InterruptTheCard(base);
-
-                for (a = 0; a < frame->count; a++)
-                        if (data[a] != frame->data[a]) {
-                                kfree(data);
-                                dev_err(&pdev->dev, "Card%d, firmware upload "
-                                        "failed\n", index + 1);
-                                goto errrelfw;
-                        }
-                kfree(data);
-
-                udelay(50); /* 0xf */
-
-                if (WaitTillCardIsFree(base))
-                        goto errrelfw;
-
-                status = inw(base + 0x4);
-                if (status != 0) {
-                        dev_err(&pdev->dev, "Card%d verify got out of sync. "
-                                "Card Status:0x%x\n", index + 1, status);
-                        goto errrelfw;
-                }
-        }
-
-        /* xfer ctrl */
-        if (WaitTillCardIsFree(base))
-                goto errrelfw;
-
-        outw(0xf2, base);
-        outw(0x800, base);
-        outw(0x0, base);
-        outw(0x0, base);
-        InterruptTheCard(base);
-        outw(0x0, base + 0x4); /* for ISI4608 cards */
-
-        board->status |= FIRMWARE_LOADED;
-        retval = 0;
-
-errrelfw:
-        release_firmware(fw);
-end:
-        return retval;
-}
-
-/*
- *      Insmod can set static symbols so keep these static
- */
-static unsigned int card_count;
-
-static int __devinit isicom_probe(struct pci_dev *pdev,
-        const struct pci_device_id *ent)
-{
-        unsigned int uninitialized_var(signature), index;
-        int retval = -EPERM;
-        struct isi_board *board = NULL;
-
-        if (card_count >= BOARD_COUNT)
-                goto err;
-
-        retval = pci_enable_device(pdev);
-        if (retval) {
-                dev_err(&pdev->dev, "failed to enable\n");
-                goto err;
-        }
-
-        dev_info(&pdev->dev, "ISI PCI Card(Device ID 0x%x)\n", ent->device);
-
-        /* allot the first empty slot in the array */
-        for (index = 0; index < BOARD_COUNT; index++) {
-                if (isi_card[index].base == 0) {
-                        board = &isi_card[index];
-                        break;
-                }
-        }
-        if (index == BOARD_COUNT) {
-                retval = -ENODEV;
-                goto err_disable;
-        }
-
-        board->index = index;
-        board->base = pci_resource_start(pdev, 3);
-        board->irq = pdev->irq;
-        card_count++;
-
-        pci_set_drvdata(pdev, board);
-
-        retval = pci_request_region(pdev, 3, ISICOM_NAME);
-        if (retval) {
-                dev_err(&pdev->dev, "I/O Region 0x%lx-0x%lx is busy. Card%d "
-                        "will be disabled.\n", board->base, board->base + 15,
-                        index + 1);
-                retval = -EBUSY;
-                goto errdec;
-        }
-
-        retval = request_irq(board->irq, isicom_interrupt,
-                        IRQF_SHARED | IRQF_DISABLED, ISICOM_NAME, board);
-        if (retval < 0) {
-                dev_err(&pdev->dev, "Could not install handler at Irq %d. "
-                        "Card%d will be disabled.\n", board->irq, index + 1);
-                goto errunrr;
-        }
-
-        retval = reset_card(pdev, index, &signature);
-        if (retval < 0)
-                goto errunri;
-
-        retval = load_firmware(pdev, index, signature);
-        if (retval < 0)
-                goto errunri;
-
-        for (index = 0; index < board->port_count; index++)
-                tty_register_device(isicom_normal, board->index * 16 + index,
-                                &pdev->dev);
-
-        return 0;
-
-errunri:
-        free_irq(board->irq, board);
-errunrr:
-        pci_release_region(pdev, 3);
-errdec:
-        board->base = 0;
-        card_count--;
-err_disable:
-        pci_disable_device(pdev);
-err:
-        return retval;
-}
-
-static void __devexit isicom_remove(struct pci_dev *pdev)
-{
-        struct isi_board *board = pci_get_drvdata(pdev);
-        unsigned int i;
-
-        for (i = 0; i < board->port_count; i++)
-                tty_unregister_device(isicom_normal, board->index * 16 + i);
-
-        free_irq(board->irq, board);
-        pci_release_region(pdev, 3);
-        board->base = 0;
-        card_count--;
-        pci_disable_device(pdev);
-}
-
-static int __init isicom_init(void)
-{
-        int retval, idx, channel;
-        struct isi_port *port;
-
-        for (idx = 0; idx < BOARD_COUNT; idx++) {
-                port = &isi_ports[idx * 16];
-                isi_card[idx].ports = port;
-                spin_lock_init(&isi_card[idx].card_lock);
-                for (channel = 0; channel < 16; channel++, port++) {
-                        tty_port_init(&port->port);
-                        port->port.ops = &isicom_port_ops;
-                        port->magic = ISICOM_MAGIC;
-                        port->card = &isi_card[idx];
-                        port->channel = channel;
-                        port->port.close_delay = 50 * HZ/100;
-                        port->port.closing_wait = 3000 * HZ/100;
-                        port->status = 0;
-                        /*  . . .  */
-                }
-                isi_card[idx].base = 0;
-                isi_card[idx].irq = 0;
-        }
-
-        /* tty driver structure initialization */
-        isicom_normal = alloc_tty_driver(PORT_COUNT);
-        if (!isicom_normal) {
-                retval = -ENOMEM;
-                goto error;
-        }
-
-        isicom_normal->owner                    = THIS_MODULE;
-        isicom_normal->name                     = "ttyM";
-        isicom_normal->major                    = ISICOM_NMAJOR;
-        isicom_normal->minor_start              = 0;
-        isicom_normal->type                     = TTY_DRIVER_TYPE_SERIAL;
-        isicom_normal->subtype                  = SERIAL_TYPE_NORMAL;
-        isicom_normal->init_termios             = tty_std_termios;
-        isicom_normal->init_termios.c_cflag     = B9600 | CS8 | CREAD | HUPCL |
-                CLOCAL;
-        isicom_normal->flags                    = TTY_DRIVER_REAL_RAW |
-                TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_HARDWARE_BREAK;
-        tty_set_operations(isicom_normal, &isicom_ops);
-
-        retval = tty_register_driver(isicom_normal);
-        if (retval) {
-                pr_debug("Couldn't register the dialin driver\n");
-                goto err_puttty;
-        }
-
-        retval = pci_register_driver(&isicom_driver);
-        if (retval < 0) {
-                pr_err("Unable to register pci driver.\n");
-                goto err_unrtty;
-        }
-
-        mod_timer(&tx, jiffies + 1);
-
-        return 0;
-err_unrtty:
-        tty_unregister_driver(isicom_normal);
-err_puttty:
-        put_tty_driver(isicom_normal);
-error:
-        return retval;
-}
-
-static void __exit isicom_exit(void)
-{
-        del_timer_sync(&tx);
-
-        pci_unregister_driver(&isicom_driver);
-        tty_unregister_driver(isicom_normal);
-        put_tty_driver(isicom_normal);
-}
-
-module_init(isicom_init);
-module_exit(isicom_exit);
-
-MODULE_AUTHOR("MultiTech");
-MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech");
-MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("isi608.bin");
-MODULE_FIRMWARE("isi608em.bin");
-MODULE_FIRMWARE("isi616em.bin");
-MODULE_FIRMWARE("isi4608.bin");
-MODULE_FIRMWARE("isi4616.bin");
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
deleted file mode 100644
index be28391adb79..000000000000
--- a/drivers/char/istallion.c
+++ /dev/null
@@ -1,4507 +0,0 @@
-/*****************************************************************************/
-
-/*
- *      istallion.c  -- stallion intelligent multiport serial driver.
- *
- *      Copyright (C) 1996-1999  Stallion Technologies
- *      Copyright (C) 1994-1996  Greg Ungerer.
- *
- *      This code is loosely based on the Linux serial driver, written by
- *      Linus Torvalds, Theodore T'so and others.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- */
-
-/*****************************************************************************/
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/smp_lock.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial.h>
-#include <linux/seq_file.h>
-#include <linux/cdk.h>
-#include <linux/comstats.h>
-#include <linux/istallion.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/wait.h>
-#include <linux/eisa.h>
-#include <linux/ctype.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-
-#include <linux/pci.h>
-
-/*****************************************************************************/
-
-/*
- *      Define different board types. Not all of the following board types
- *      are supported by this driver. But I will use the standard "assigned"
- *      board numbers. Currently supported boards are abbreviated as:
- *      ECP = EasyConnection 8/64, ONB = ONboard, BBY = Brumby and
- *      STAL = Stallion.
- */
-#define BRD_UNKNOWN     0
-#define BRD_STALLION    1
-#define BRD_BRUMBY4     2
-#define BRD_ONBOARD2    3
-#define BRD_ONBOARD     4
-#define BRD_ONBOARDE    7
-#define BRD_ECP         23
-#define BRD_ECPE        24
-#define BRD_ECPMC       25
-#define BRD_ECPPCI      29
-
-#define BRD_BRUMBY      BRD_BRUMBY4
-
-/*
- *      Define a configuration structure to hold the board configuration.
- *      Need to set this up in the code (for now) with the boards that are
- *      to be configured into the system. This is what needs to be modified
- *      when adding/removing/modifying boards. Each line entry in the
- *      stli_brdconf[] array is a board. Each line contains io/irq/memory
- *      ranges for that board (as well as what type of board it is).
- *      Some examples:
- *              { BRD_ECP, 0x2a0, 0, 0xcc000, 0, 0 },
- *      This line will configure an EasyConnection 8/64 at io address 2a0,
- *      and shared memory address of cc000. Multiple EasyConnection 8/64
- *      boards can share the same shared memory address space. No interrupt
- *      is required for this board type.
- *      Another example:
- *              { BRD_ECPE, 0x5000, 0, 0x80000000, 0, 0 },
- *      This line will configure an EasyConnection 8/64 EISA in slot 5 and
- *      shared memory address of 0x80000000 (2 GByte). Multiple
- *      EasyConnection 8/64 EISA boards can share the same shared memory
- *      address space. No interrupt is required for this board type.
- *      Another example:
- *              { BRD_ONBOARD, 0x240, 0, 0xd0000, 0, 0 },
- *      This line will configure an ONboard (ISA type) at io address 240,
- *      and shared memory address of d0000. Multiple ONboards can share
- *      the same shared memory address space. No interrupt required.
- *      Another example:
- *              { BRD_BRUMBY4, 0x360, 0, 0xc8000, 0, 0 },
- *      This line will configure a Brumby board (any number of ports!) at
- *      io address 360 and shared memory address of c8000. All Brumby boards
- *      configured into a system must have their own separate io and memory
- *      addresses. No interrupt is required.
- *      Another example:
- *              { BRD_STALLION, 0x330, 0, 0xd0000, 0, 0 },
- *      This line will configure an original Stallion board at io address 330
- *      and shared memory address d0000 (this would only be valid for a "V4.0"
- *      or Rev.O Stallion board). All Stallion boards configured into the
- *      system must have their own separate io and memory addresses. No
- *      interrupt is required.
- */
-
-struct stlconf {
-        int             brdtype;
-        int             ioaddr1;
-        int             ioaddr2;
-        unsigned long   memaddr;
-        int             irq;
-        int             irqtype;
-};
-
-static unsigned int stli_nrbrds;
-
-/* stli_lock must NOT be taken holding brd_lock */
-static spinlock_t stli_lock;    /* TTY logic lock */
-static spinlock_t brd_lock;     /* Board logic lock */
-
-/*
- *      There is some experimental EISA board detection code in this driver.
- *      By default it is disabled, but for those that want to try it out,
- *      then set the define below to be 1.
- */
-#define STLI_EISAPROBE  0
-
-/*****************************************************************************/
-
-/*
- *      Define some important driver characteristics. Device major numbers
- *      allocated as per Linux Device Registry.
- */
-#ifndef STL_SIOMEMMAJOR
-#define STL_SIOMEMMAJOR         28
-#endif
-#ifndef STL_SERIALMAJOR
-#define STL_SERIALMAJOR         24
-#endif
-#ifndef STL_CALLOUTMAJOR
-#define STL_CALLOUTMAJOR        25
-#endif
-
-/*****************************************************************************/
-
-/*
- *      Define our local driver identity first. Set up stuff to deal with
- *      all the local structures required by a serial tty driver.
- */
-static char     *stli_drvtitle = "Stallion Intelligent Multiport Serial Driver";
-static char     *stli_drvname = "istallion";
-static char     *stli_drvversion = "5.6.0";
-static char     *stli_serialname = "ttyE";
-
-static struct tty_driver        *stli_serial;
-static const struct tty_port_operations stli_port_ops;
-
-#define STLI_TXBUFSIZE          4096
-
-/*
- *      Use a fast local buffer for cooked characters. Typically a whole
- *      bunch of cooked characters come in for a port, 1 at a time. So we
- *      save those up into a local buffer, then write out the whole lot
- *      with a large memcpy. Just use 1 buffer for all ports, since its
- *      use it is only need for short periods of time by each port.
- */
-static char                     *stli_txcookbuf;
-static int                      stli_txcooksize;
-static int                      stli_txcookrealsize;
-static struct tty_struct        *stli_txcooktty;
-
-/*
- *      Define a local default termios struct. All ports will be created
- *      with this termios initially. Basically all it defines is a raw port
- *      at 9600 baud, 8 data bits, no parity, 1 stop bit.
- */
-static struct ktermios          stli_deftermios = {
-        .c_cflag        = (B9600 | CS8 | CREAD | HUPCL | CLOCAL),
-        .c_cc           = INIT_C_CC,
-        .c_ispeed       = 9600,
-        .c_ospeed       = 9600,
-};
-
-/*
- *      Define global stats structures. Not used often, and can be
- *      re-used for each stats call.
- */
-static comstats_t       stli_comstats;
-static combrd_t         stli_brdstats;
-static struct asystats  stli_cdkstats;
-
-/*****************************************************************************/
-
-static DEFINE_MUTEX(stli_brdslock);
-static struct stlibrd   *stli_brds[STL_MAXBRDS];
-
-static int              stli_shared;
-
-/*
- *      Per board state flags. Used with the state field of the board struct.
- *      Not really much here... All we need to do is keep track of whether
- *      the board has been detected, and whether it is actually running a slave
- *      or not.
- */
-#define BST_FOUND       0
-#define BST_STARTED     1
-#define BST_PROBED      2
-
-/*
- *      Define the set of port state flags. These are marked for internal
- *      state purposes only, usually to do with the state of communications
- *      with the slave. Most of them need to be updated atomically, so always
- *      use the bit setting operations (unless protected by cli/sti).
- */
-#define ST_OPENING      2
-#define ST_CLOSING      3
-#define ST_CMDING       4
-#define ST_TXBUSY       5
-#define ST_RXING        6
-#define ST_DOFLUSHRX    7
-#define ST_DOFLUSHTX    8
-#define ST_DOSIGS       9
-#define ST_RXSTOP       10
-#define ST_GETSIGS      11
-
-/*
- *      Define an array of board names as printable strings. Handy for
- *      referencing boards when printing trace and stuff.
- */
-static char     *stli_brdnames[] = {
-        "Unknown",
-        "Stallion",
-        "Brumby",
-        "ONboard-MC",
-        "ONboard",
-        "Brumby",
-        "Brumby",
-        "ONboard-EI",
-        NULL,
-        "ONboard",
-        "ONboard-MC",
-        "ONboard-MC",
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        "EasyIO",
-        "EC8/32-AT",
-        "EC8/32-MC",
-        "EC8/64-AT",
-        "EC8/64-EI",
-        "EC8/64-MC",
-        "EC8/32-PCI",
-        "EC8/64-PCI",
-        "EasyIO-PCI",
-        "EC/RA-PCI",
-};
-
-/*****************************************************************************/
-
-/*
- *      Define some string labels for arguments passed from the module
- *      load line. These allow for easy board definitions, and easy
- *      modification of the io, memory and irq resoucres.
- */
-
-static char     *board0[8];
-static char     *board1[8];
-static char     *board2[8];
-static char     *board3[8];
-
-static char     **stli_brdsp[] = {
-        (char **) &board0,
-        (char **) &board1,
-        (char **) &board2,
-        (char **) &board3
-};
-
-/*
- *      Define a set of common board names, and types. This is used to
- *      parse any module arguments.
- */
-
-static struct stlibrdtype {
-        char    *name;
-        int     type;
-} stli_brdstr[] = {
-        { "stallion", BRD_STALLION },
-        { "1", BRD_STALLION },
-        { "brumby", BRD_BRUMBY },
-        { "brumby4", BRD_BRUMBY },
-        { "brumby/4", BRD_BRUMBY },
-        { "brumby-4", BRD_BRUMBY },
-        { "brumby8", BRD_BRUMBY },
-        { "brumby/8", BRD_BRUMBY },
-        { "brumby-8", BRD_BRUMBY },
-        { "brumby16", BRD_BRUMBY },
-        { "brumby/16", BRD_BRUMBY },
-        { "brumby-16", BRD_BRUMBY },
-        { "2", BRD_BRUMBY },
-        { "onboard2", BRD_ONBOARD2 },
-        { "onboard-2", BRD_ONBOARD2 },
-        { "onboard/2", BRD_ONBOARD2 },
-        { "onboard-mc", BRD_ONBOARD2 },
-        { "onboard/mc", BRD_ONBOARD2 },
-        { "onboard-mca", BRD_ONBOARD2 },
-        { "onboard/mca", BRD_ONBOARD2 },
-        { "3", BRD_ONBOARD2 },
-        { "onboard", BRD_ONBOARD },
-        { "onboardat", BRD_ONBOARD },
-        { "4", BRD_ONBOARD },
-        { "onboarde", BRD_ONBOARDE },
-        { "onboard-e", BRD_ONBOARDE },
-        { "onboard/e", BRD_ONBOARDE },
-        { "onboard-ei", BRD_ONBOARDE },
-        { "onboard/ei", BRD_ONBOARDE },
-        { "7", BRD_ONBOARDE },
-        { "ecp", BRD_ECP },
-        { "ecpat", BRD_ECP },
-        { "ec8/64", BRD_ECP },
-        { "ec8/64-at", BRD_ECP },
-        { "ec8/64-isa", BRD_ECP },
-        { "23", BRD_ECP },
-        { "ecpe", BRD_ECPE },
-        { "ecpei", BRD_ECPE },
-        { "ec8/64-e", BRD_ECPE },
-        { "ec8/64-ei", BRD_ECPE },
-        { "24", BRD_ECPE },
-        { "ecpmc", BRD_ECPMC },
-        { "ec8/64-mc", BRD_ECPMC },
-        { "ec8/64-mca", BRD_ECPMC },
-        { "25", BRD_ECPMC },
-        { "ecppci", BRD_ECPPCI },
-        { "ec/ra", BRD_ECPPCI },
-        { "ec/ra-pc", BRD_ECPPCI },
-        { "ec/ra-pci", BRD_ECPPCI },
-        { "29", BRD_ECPPCI },
-};
-
-/*
- *      Define the module agruments.
- */
-MODULE_AUTHOR("Greg Ungerer");
-MODULE_DESCRIPTION("Stallion Intelligent Multiport Serial Driver");
-MODULE_LICENSE("GPL");
-
-
-module_param_array(board0, charp, NULL, 0);
-MODULE_PARM_DESC(board0, "Board 0 config -> name[,ioaddr[,memaddr]");
-module_param_array(board1, charp, NULL, 0);
-MODULE_PARM_DESC(board1, "Board 1 config -> name[,ioaddr[,memaddr]");
-module_param_array(board2, charp, NULL, 0);
-MODULE_PARM_DESC(board2, "Board 2 config -> name[,ioaddr[,memaddr]");
-module_param_array(board3, charp, NULL, 0);
-MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]");
-
-#if STLI_EISAPROBE != 0
-/*
- *      Set up a default memory address table for EISA board probing.
- *      The default addresses are all bellow 1Mbyte, which has to be the
- *      case anyway. They should be safe, since we only read values from
- *      them, and interrupts are disabled while we do it. If the higher
- *      memory support is compiled in then we also try probing around
- *      the 1Gb, 2Gb and 3Gb areas as well...
- */
-static unsigned long    stli_eisamemprobeaddrs[] = {
-        0xc0000,    0xd0000,    0xe0000,    0xf0000,
-        0x80000000, 0x80010000, 0x80020000, 0x80030000,
-        0x40000000, 0x40010000, 0x40020000, 0x40030000,
-        0xc0000000, 0xc0010000, 0xc0020000, 0xc0030000,
-        0xff000000, 0xff010000, 0xff020000, 0xff030000,
-};
-
-static int      stli_eisamempsize = ARRAY_SIZE(stli_eisamemprobeaddrs);
-#endif
-
-/*
- *      Define the Stallion PCI vendor and device IDs.
- */
-#ifndef PCI_DEVICE_ID_ECRA
-#define PCI_DEVICE_ID_ECRA              0x0004
-#endif
-
-static struct pci_device_id istallion_pci_tbl[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_ECRA), },
-        { 0 }
-};
-MODULE_DEVICE_TABLE(pci, istallion_pci_tbl);
-
-static struct pci_driver stli_pcidriver;
-
-/*****************************************************************************/
-
-/*
- *      Hardware configuration info for ECP boards. These defines apply
- *      to the directly accessible io ports of the ECP. There is a set of
- *      defines for each ECP board type, ISA, EISA, MCA and PCI.
- */
-#define ECP_IOSIZE      4
-
-#define ECP_MEMSIZE     (128 * 1024)
-#define ECP_PCIMEMSIZE  (256 * 1024)
-
-#define ECP_ATPAGESIZE  (4 * 1024)
-#define ECP_MCPAGESIZE  (4 * 1024)
-#define ECP_EIPAGESIZE  (64 * 1024)
-#define ECP_PCIPAGESIZE (64 * 1024)
-
-#define STL_EISAID      0x8c4e
-
-/*
- *      Important defines for the ISA class of ECP board.
- */
-#define ECP_ATIREG      0
-#define ECP_ATCONFR     1
-#define ECP_ATMEMAR     2
-#define ECP_ATMEMPR     3
-#define ECP_ATSTOP      0x1
-#define ECP_ATINTENAB   0x10
-#define ECP_ATENABLE    0x20
-#define ECP_ATDISABLE   0x00
-#define ECP_ATADDRMASK  0x3f000
-#define ECP_ATADDRSHFT  12
-
-/*
- *      Important defines for the EISA class of ECP board.
- */
-#define ECP_EIIREG      0
-#define ECP_EIMEMARL    1
-#define ECP_EICONFR     2
-#define ECP_EIMEMARH    3
-#define ECP_EIENABLE    0x1
-#define ECP_EIDISABLE   0x0
-#define ECP_EISTOP      0x4
-#define ECP_EIEDGE      0x00
-#define ECP_EILEVEL     0x80
-#define ECP_EIADDRMASKL 0x00ff0000
-#define ECP_EIADDRSHFTL 16
-#define ECP_EIADDRMASKH 0xff000000
-#define ECP_EIADDRSHFTH 24
-#define ECP_EIBRDENAB   0xc84
-
-#define ECP_EISAID      0x4
-
-/*
- *      Important defines for the Micro-channel class of ECP board.
- *      (It has a lot in common with the ISA boards.)
- */
-#define ECP_MCIREG      0
-#define ECP_MCCONFR     1
-#define ECP_MCSTOP      0x20
-#define ECP_MCENABLE    0x80
-#define ECP_MCDISABLE   0x00
-
-/*
- *      Important defines for the PCI class of ECP board.
- *      (It has a lot in common with the other ECP boards.)
- */
-#define ECP_PCIIREG     0
-#define ECP_PCICONFR    1
-#define ECP_PCISTOP     0x01
-
-/*
- *      Hardware configuration info for ONboard and Brumby boards. These
- *      defines apply to the directly accessible io ports of these boards.
- */
-#define ONB_IOSIZE      16
-#define ONB_MEMSIZE     (64 * 1024)
-#define ONB_ATPAGESIZE  (64 * 1024)
-#define ONB_MCPAGESIZE  (64 * 1024)
-#define ONB_EIMEMSIZE   (128 * 1024)
-#define ONB_EIPAGESIZE  (64 * 1024)
-
-/*
- *      Important defines for the ISA class of ONboard board.
- */
-#define ONB_ATIREG      0
-#define ONB_ATMEMAR     1
-#define ONB_ATCONFR     2
-#define ONB_ATSTOP      0x4
-#define ONB_ATENABLE    0x01
-#define ONB_ATDISABLE   0x00
-#define ONB_ATADDRMASK  0xff0000
-#define ONB_ATADDRSHFT  16
-
-#define ONB_MEMENABLO   0
-#define ONB_MEMENABHI   0x02
-
-/*
- *      Important defines for the EISA class of ONboard board.
- */
-#define ONB_EIIREG      0
-#define ONB_EIMEMARL    1
-#define ONB_EICONFR     2
-#define ONB_EIMEMARH    3
-#define ONB_EIENABLE    0x1
-#define ONB_EIDISABLE   0x0
-#define ONB_EISTOP      0x4
-#define ONB_EIEDGE      0x00
-#define ONB_EILEVEL     0x80
-#define ONB_EIADDRMASKL 0x00ff0000
-#define ONB_EIADDRSHFTL 16
-#define ONB_EIADDRMASKH 0xff000000
-#define ONB_EIADDRSHFTH 24
-#define ONB_EIBRDENAB   0xc84
-
-#define ONB_EISAID      0x1
-
-/*
- *      Important defines for the Brumby boards. They are pretty simple,
- *      there is not much that is programmably configurable.
- */
-#define BBY_IOSIZE      16
-#define BBY_MEMSIZE     (64 * 1024)
-#define BBY_PAGESIZE    (16 * 1024)
-
-#define BBY_ATIREG      0
-#define BBY_ATCONFR     1
-#define BBY_ATSTOP      0x4
-
-/*
- *      Important defines for the Stallion boards. They are pretty simple,
- *      there is not much that is programmably configurable.
- */
-#define STAL_IOSIZE     16
-#define STAL_MEMSIZE    (64 * 1024)
-#define STAL_PAGESIZE   (64 * 1024)
-
-/*
- *      Define the set of status register values for EasyConnection panels.
- *      The signature will return with the status value for each panel. From
- *      this we can determine what is attached to the board - before we have
- *      actually down loaded any code to it.
- */
-#define ECH_PNLSTATUS   2
-#define ECH_PNL16PORT   0x20
-#define ECH_PNLIDMASK   0x07
-#define ECH_PNLXPID     0x40
-#define ECH_PNLINTRPEND 0x80
-
-/*
- *      Define some macros to do things to the board. Even those these boards
- *      are somewhat related there is often significantly different ways of
- *      doing some operation on it (like enable, paging, reset, etc). So each
- *      board class has a set of functions which do the commonly required
- *      operations. The macros below basically just call these functions,
- *      generally checking for a NULL function - which means that the board
- *      needs nothing done to it to achieve this operation!
- */
-#define EBRDINIT(brdp)                                          \
-        if (brdp->init != NULL)                                 \
-                (* brdp->init)(brdp)
-
-#define EBRDENABLE(brdp)                                        \
-        if (brdp->enable != NULL)                               \
-                (* brdp->enable)(brdp);
-
-#define EBRDDISABLE(brdp)                                       \
-        if (brdp->disable != NULL)                              \
-                (* brdp->disable)(brdp);
-
-#define EBRDINTR(brdp)                                          \
-        if (brdp->intr != NULL)                                 \
-                (* brdp->intr)(brdp);
-
-#define EBRDRESET(brdp)                                         \
-        if (brdp->reset != NULL)                                \
-                (* brdp->reset)(brdp);
-
-#define EBRDGETMEMPTR(brdp,offset)                              \
-        (* brdp->getmemptr)(brdp, offset, __LINE__)
-
-/*
- *      Define the maximal baud rate, and the default baud base for ports.
- */
-#define STL_MAXBAUD     460800
-#define STL_BAUDBASE    115200
-#define STL_CLOSEDELAY  (5 * HZ / 10)
-
-/*****************************************************************************/
-
-/*
- *      Define macros to extract a brd or port number from a minor number.
- */
-#define MINOR2BRD(min)          (((min) & 0xc0) >> 6)
-#define MINOR2PORT(min)         ((min) & 0x3f)
-
-/*****************************************************************************/
-
-/*
- *      Prototype all functions in this driver!
- */
-
-static int      stli_parsebrd(struct stlconf *confp, char **argp);
-static int      stli_open(struct tty_struct *tty, struct file *filp);
-static void     stli_close(struct tty_struct *tty, struct file *filp);
-static int      stli_write(struct tty_struct *tty, const unsigned char *buf, int count);
-static int      stli_putchar(struct tty_struct *tty, unsigned char ch);
-static void     stli_flushchars(struct tty_struct *tty);
-static int      stli_writeroom(struct tty_struct *tty);
-static int      stli_charsinbuffer(struct tty_struct *tty);
-static int      stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg);
-static void     stli_settermios(struct tty_struct *tty, struct ktermios *old);
-static void     stli_throttle(struct tty_struct *tty);
-static void     stli_unthrottle(struct tty_struct *tty);
-static void     stli_stop(struct tty_struct *tty);
-static void     stli_start(struct tty_struct *tty);
-static void     stli_flushbuffer(struct tty_struct *tty);
-static int      stli_breakctl(struct tty_struct *tty, int state);
-static void     stli_waituntilsent(struct tty_struct *tty, int timeout);
-static void     stli_sendxchar(struct tty_struct *tty, char ch);
-static void     stli_hangup(struct tty_struct *tty);
-
-static int      stli_brdinit(struct stlibrd *brdp);
-static int      stli_startbrd(struct stlibrd *brdp);
-static ssize_t  stli_memread(struct file *fp, char __user *buf, size_t count, loff_t *offp);
-static ssize_t  stli_memwrite(struct file *fp, const char __user *buf, size_t count, loff_t *offp);
-static long     stli_memioctl(struct file *fp, unsigned int cmd, unsigned long arg);
-static void     stli_brdpoll(struct stlibrd *brdp, cdkhdr_t __iomem *hdrp);
-static void     stli_poll(unsigned long arg);
-static int      stli_hostcmd(struct stlibrd *brdp, struct stliport *portp);
-static int      stli_initopen(struct tty_struct *tty, struct stlibrd *brdp, struct stliport *portp);
-static int      stli_rawopen(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait);
-static int      stli_rawclose(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait);
-static int      stli_setport(struct tty_struct *tty);
-static int      stli_cmdwait(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);
-static void     stli_sendcmd(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);
-static void     __stli_sendcmd(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);
-static void     stli_dodelaycmd(struct stliport *portp, cdkctrl_t __iomem *cp);
-static void     stli_mkasyport(struct tty_struct *tty, struct stliport *portp, asyport_t *pp, struct ktermios *tiosp);
-static void     stli_mkasysigs(asysigs_t *sp, int dtr, int rts);
-static long     stli_mktiocm(unsigned long sigvalue);
-static void     stli_read(struct stlibrd *brdp, struct stliport *portp);
-static int      stli_getserial(struct stliport *portp, struct serial_struct __user *sp);
-static int      stli_setserial(struct tty_struct *tty, struct serial_struct __user *sp);
-static int      stli_getbrdstats(combrd_t __user *bp);
-static int      stli_getportstats(struct tty_struct *tty, struct stliport *portp, comstats_t __user *cp);
-static int      stli_portcmdstats(struct tty_struct *tty, struct stliport *portp);
-static int      stli_clrportstats(struct stliport *portp, comstats_t __user *cp);
-static int      stli_getportstruct(struct stliport __user *arg);
-static int      stli_getbrdstruct(struct stlibrd __user *arg);
-static struct stlibrd *stli_allocbrd(void);
-
-static void     stli_ecpinit(struct stlibrd *brdp);
-static void     stli_ecpenable(struct stlibrd *brdp);
-static void     stli_ecpdisable(struct stlibrd *brdp);
-static void __iomem *stli_ecpgetmemptr(struct stlibrd *brdp, unsigned long offset, int line);
-static void     stli_ecpreset(struct stlibrd *brdp);
-static void     stli_ecpintr(struct stlibrd *brdp);
-static void     stli_ecpeiinit(struct stlibrd *brdp);
-static void     stli_ecpeienable(struct stlibrd *brdp);
-static void     stli_ecpeidisable(struct stlibrd *brdp);
-static void __iomem *stli_ecpeigetmemptr(struct stlibrd *brdp, unsigned long offset, int line);
-static void     stli_ecpeireset(struct stlibrd *brdp);
-static void     stli_ecpmcenable(struct stlibrd *brdp);
-static void     stli_ecpmcdisable(struct stlibrd *brdp);
-static void __iomem *stli_ecpmcgetmemptr(struct stlibrd *brdp, unsigned long offset, int line);
-static void     stli_ecpmcreset(struct stlibrd *brdp);
-static void     stli_ecppciinit(struct stlibrd *brdp);
-static void __iomem *stli_ecppcigetmemptr(struct stlibrd *brdp, unsigned long offset, int line);
-static void     stli_ecppcireset(struct stlibrd *brdp);
-
-static void     stli_onbinit(struct stlibrd *brdp);
-static void     stli_onbenable(struct stlibrd *brdp);
-static void     stli_onbdisable(struct stlibrd *brdp);
-static void __iomem *stli_onbgetmemptr(struct stlibrd *brdp, unsigned long offset, int line);
-static void     stli_onbreset(struct stlibrd *brdp);
-static void     stli_onbeinit(struct stlibrd *brdp);
-static void     stli_onbeenable(struct stlibrd *brdp);
-static void     stli_onbedisable(struct stlibrd *brdp);
-static void __iomem *stli_onbegetmemptr(struct stlibrd *brdp, unsigned long offset, int line);
-static void     stli_onbereset(struct stlibrd *brdp);
-static void     stli_bbyinit(struct stlibrd *brdp);
-static void __iomem *stli_bbygetmemptr(struct stlibrd *brdp, unsigned long offset, int line);
-static void     stli_bbyreset(struct stlibrd *brdp);
-static void     stli_stalinit(struct stlibrd *brdp);
-static void __iomem *stli_stalgetmemptr(struct stlibrd *brdp, unsigned long offset, int line);
-static void     stli_stalreset(struct stlibrd *brdp);
-
-static struct stliport *stli_getport(unsigned int brdnr, unsigned int panelnr, unsigned int portnr);
-
-static int      stli_initecp(struct stlibrd *brdp);
-static int      stli_initonb(struct stlibrd *brdp);
-#if STLI_EISAPROBE != 0
-static int      stli_eisamemprobe(struct stlibrd *brdp);
-#endif
-static int      stli_initports(struct stlibrd *brdp);
-
-/*****************************************************************************/
-
-/*
- *      Define the driver info for a user level shared memory device. This
- *      device will work sort of like the /dev/kmem device - except that it
- *      will give access to the shared memory on the Stallion intelligent
- *      board. This is also a very useful debugging tool.
- */
-static const struct file_operations     stli_fsiomem = {
-        .owner          = THIS_MODULE,
-        .read           = stli_memread,
-        .write          = stli_memwrite,
-        .unlocked_ioctl = stli_memioctl,
-};
-
-/*****************************************************************************/
-
-/*
- *      Define a timer_list entry for our poll routine. The slave board
- *      is polled every so often to see if anything needs doing. This is
- *      much cheaper on host cpu than using interrupts. It turns out to
- *      not increase character latency by much either...
- */
-static DEFINE_TIMER(stli_timerlist, stli_poll, 0, 0);
-
-static int      stli_timeron;
-
-/*
- *      Define the calculation for the timeout routine.
- */
-#define STLI_TIMEOUT    (jiffies + 1)
-
-/*****************************************************************************/
-
-static struct class *istallion_class;
-
-static void stli_cleanup_ports(struct stlibrd *brdp)
-{
-        struct stliport *portp;
-        unsigned int j;
-        struct tty_struct *tty;
-
-        for (j = 0; j < STL_MAXPORTS; j++) {
-                portp = brdp->ports[j];
-                if (portp != NULL) {
-                        tty = tty_port_tty_get(&portp->port);
-                        if (tty != NULL) {
-                                tty_hangup(tty);
-                                tty_kref_put(tty);
-                        }
-                        kfree(portp);
-                }
-        }
-}
-
-/*****************************************************************************/
-
-/*
- *      Parse the supplied argument string, into the board conf struct.
- */
-
-static int stli_parsebrd(struct stlconf *confp, char **argp)
-{
-        unsigned int i;
-        char *sp;
-
-        if (argp[0] == NULL || *argp[0] == 0)
-                return 0;
-
-        for (sp = argp[0], i = 0; ((*sp != 0) && (i < 25)); sp++, i++)
-                *sp = tolower(*sp);
-
-        for (i = 0; i < ARRAY_SIZE(stli_brdstr); i++) {
-                if (strcmp(stli_brdstr[i].name, argp[0]) == 0)
-                        break;
-        }
-        if (i == ARRAY_SIZE(stli_brdstr)) {
-                printk(KERN_WARNING "istallion: unknown board name, %s?\n", argp[0]);
-                return 0;
-        }
-
-        confp->brdtype = stli_brdstr[i].type;
-        if (argp[1] != NULL && *argp[1] != 0)
-                confp->ioaddr1 = simple_strtoul(argp[1], NULL, 0);
-        if (argp[2] !=  NULL && *argp[2] != 0)
-                confp->memaddr = simple_strtoul(argp[2], NULL, 0);
-        return(1);
-}
-
-/*****************************************************************************/
-
-/*
- *      On the first open of the device setup the port hardware, and
- *      initialize the per port data structure. Since initializing the port
- *      requires several commands to the board we will need to wait for any
- *      other open that is already initializing the port.
- *
- *      Locking: protected by the port mutex.
- */
-
-static int stli_activate(struct tty_port *port, struct tty_struct *tty)
-{
-        struct stliport *portp = container_of(port, struct stliport, port);
-        struct stlibrd *brdp = stli_brds[portp->brdnr];
-        int rc;
-
-        if ((rc = stli_initopen(tty, brdp, portp)) >= 0)
-                clear_bit(TTY_IO_ERROR, &tty->flags);
-        wake_up_interruptible(&portp->raw_wait);
-        return rc;
-}
-
-static int stli_open(struct tty_struct *tty, struct file *filp)
-{
-        struct stlibrd *brdp;
-        struct stliport *portp;
-        unsigned int minordev, brdnr, portnr;
-
-        minordev = tty->index;
-        brdnr = MINOR2BRD(minordev);
-        if (brdnr >= stli_nrbrds)
-                return -ENODEV;
-        brdp = stli_brds[brdnr];
-        if (brdp == NULL)
-                return -ENODEV;
-        if (!test_bit(BST_STARTED, &brdp->state))
-                return -ENODEV;
-        portnr = MINOR2PORT(minordev);
-        if (portnr > brdp->nrports)
-                return -ENODEV;
-
-        portp = brdp->ports[portnr];
-        if (portp == NULL)
-                return -ENODEV;
-        if (portp->devnr < 1)
-                return -ENODEV;
-
-        tty->driver_data = portp;
-        return tty_port_open(&portp->port, tty, filp);
-}
-
-
-/*****************************************************************************/
-
-static void stli_shutdown(struct tty_port *port)
-{
-        struct stlibrd *brdp;
-        unsigned long ftype;
-        unsigned long flags;
-        struct stliport *portp = container_of(port, struct stliport, port);
-
-        if (portp->brdnr >= stli_nrbrds)
-                return;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return;
-
-        /*
-         *      May want to wait for data to drain before closing. The BUSY
-         *      flag keeps track of whether we are still transmitting or not.
-         *      It is updated by messages from the slave - indicating when all
-         *      chars really have drained.
-         */
-
-        if (!test_bit(ST_CLOSING, &portp->state))
-                stli_rawclose(brdp, portp, 0, 0);
-
-        spin_lock_irqsave(&stli_lock, flags);
-        clear_bit(ST_TXBUSY, &portp->state);
-        clear_bit(ST_RXSTOP, &portp->state);
-        spin_unlock_irqrestore(&stli_lock, flags);
-
-        ftype = FLUSHTX | FLUSHRX;
-        stli_cmdwait(brdp, portp, A_FLUSH, &ftype, sizeof(u32), 0);
-}
-
-static void stli_close(struct tty_struct *tty, struct file *filp)
-{
-        struct stliport *portp = tty->driver_data;
-        unsigned long flags;
-        if (portp == NULL)
-                return;
-        spin_lock_irqsave(&stli_lock, flags);
-        /*      Flush any internal buffering out first */
-        if (tty == stli_txcooktty)
-                stli_flushchars(tty);
-        spin_unlock_irqrestore(&stli_lock, flags);
-        tty_port_close(&portp->port, tty, filp);
-}
-
-/*****************************************************************************/
-
-/*
- *      Carry out first open operations on a port. This involves a number of
- *      commands to be sent to the slave. We need to open the port, set the
- *      notification events, set the initial port settings, get and set the
- *      initial signal values. We sleep and wait in between each one. But
- *      this still all happens pretty quickly.
- */
-
-static int stli_initopen(struct tty_struct *tty,
-                                struct stlibrd *brdp, struct stliport *portp)
-{
-        asynotify_t nt;
-        asyport_t aport;
-        int rc;
-
-        if ((rc = stli_rawopen(brdp, portp, 0, 1)) < 0)
-                return rc;
-
-        memset(&nt, 0, sizeof(asynotify_t));
-        nt.data = (DT_TXLOW | DT_TXEMPTY | DT_RXBUSY | DT_RXBREAK);
-        nt.signal = SG_DCD;
-        if ((rc = stli_cmdwait(brdp, portp, A_SETNOTIFY, &nt,
-            sizeof(asynotify_t), 0)) < 0)
-                return rc;
-
-        stli_mkasyport(tty, portp, &aport, tty->termios);
-        if ((rc = stli_cmdwait(brdp, portp, A_SETPORT, &aport,
-            sizeof(asyport_t), 0)) < 0)
-                return rc;
-
-        set_bit(ST_GETSIGS, &portp->state);
-        if ((rc = stli_cmdwait(brdp, portp, A_GETSIGNALS, &portp->asig,
-            sizeof(asysigs_t), 1)) < 0)
-                return rc;
-        if (test_and_clear_bit(ST_GETSIGS, &portp->state))
-                portp->sigs = stli_mktiocm(portp->asig.sigvalue);
-        stli_mkasysigs(&portp->asig, 1, 1);
-        if ((rc = stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig,
-            sizeof(asysigs_t), 0)) < 0)
-                return rc;
-
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Send an open message to the slave. This will sleep waiting for the
- *      acknowledgement, so must have user context. We need to co-ordinate
- *      with close events here, since we don't want open and close events
- *      to overlap.
- */
-
-static int stli_rawopen(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait)
-{
-        cdkhdr_t __iomem *hdrp;
-        cdkctrl_t __iomem *cp;
-        unsigned char __iomem *bits;
-        unsigned long flags;
-        int rc;
-
-/*
- *      Send a message to the slave to open this port.
- */
-
-/*
- *      Slave is already closing this port. This can happen if a hangup
- *      occurs on this port. So we must wait until it is complete. The
- *      order of opens and closes may not be preserved across shared
- *      memory, so we must wait until it is complete.
- */
-        wait_event_interruptible_tty(portp->raw_wait,
-                        !test_bit(ST_CLOSING, &portp->state));
-        if (signal_pending(current)) {
-                return -ERESTARTSYS;
-        }
-
-/*
- *      Everything is ready now, so write the open message into shared
- *      memory. Once the message is in set the service bits to say that
- *      this port wants service.
- */
-        spin_lock_irqsave(&brd_lock, flags);
-        EBRDENABLE(brdp);
-        cp = &((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr))->ctrl;
-        writel(arg, &cp->openarg);
-        writeb(1, &cp->open);
-        hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
-        bits = ((unsigned char __iomem *) hdrp) + brdp->slaveoffset +
-                portp->portidx;
-        writeb(readb(bits) | portp->portbit, bits);
-        EBRDDISABLE(brdp);
-
-        if (wait == 0) {
-                spin_unlock_irqrestore(&brd_lock, flags);
-                return 0;
-        }
-
-/*
- *      Slave is in action, so now we must wait for the open acknowledgment
- *      to come back.
- */
-        rc = 0;
-        set_bit(ST_OPENING, &portp->state);
-        spin_unlock_irqrestore(&brd_lock, flags);
-
-        wait_event_interruptible_tty(portp->raw_wait,
-                        !test_bit(ST_OPENING, &portp->state));
-        if (signal_pending(current))
-                rc = -ERESTARTSYS;
-
-        if ((rc == 0) && (portp->rc != 0))
-                rc = -EIO;
-        return rc;
-}
-
-/*****************************************************************************/
-
-/*
- *      Send a close message to the slave. Normally this will sleep waiting
- *      for the acknowledgement, but if wait parameter is 0 it will not. If
- *      wait is true then must have user context (to sleep).
- */
-
-static int stli_rawclose(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait)
-{
-        cdkhdr_t __iomem *hdrp;
-        cdkctrl_t __iomem *cp;
-        unsigned char __iomem *bits;
-        unsigned long flags;
-        int rc;
-
-/*
- *      Slave is already closing this port. This can happen if a hangup
- *      occurs on this port.
- */
-        if (wait) {
-                wait_event_interruptible_tty(portp->raw_wait,
-                                !test_bit(ST_CLOSING, &portp->state));
-                if (signal_pending(current)) {
-                        return -ERESTARTSYS;
-                }
-        }
-
-/*
- *      Write the close command into shared memory.
- */
-        spin_lock_irqsave(&brd_lock, flags);
-        EBRDENABLE(brdp);
-        cp = &((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr))->ctrl;
-        writel(arg, &cp->closearg);
-        writeb(1, &cp->close);
-        hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
-        bits = ((unsigned char __iomem *) hdrp) + brdp->slaveoffset +
-                portp->portidx;
-        writeb(readb(bits) |portp->portbit, bits);
-        EBRDDISABLE(brdp);
-
-        set_bit(ST_CLOSING, &portp->state);
-        spin_unlock_irqrestore(&brd_lock, flags);
-
-        if (wait == 0)
-                return 0;
-
-/*
- *      Slave is in action, so now we must wait for the open acknowledgment
- *      to come back.
- */
-        rc = 0;
-        wait_event_interruptible_tty(portp->raw_wait,
-                        !test_bit(ST_CLOSING, &portp->state));
-        if (signal_pending(current))
-                rc = -ERESTARTSYS;
-
-        if ((rc == 0) && (portp->rc != 0))
-                rc = -EIO;
-        return rc;
-}
-
-/*****************************************************************************/
-
-/*
- *      Send a command to the slave and wait for the response. This must
- *      have user context (it sleeps). This routine is generic in that it
- *      can send any type of command. Its purpose is to wait for that command
- *      to complete (as opposed to initiating the command then returning).
- */
-
-static int stli_cmdwait(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback)
-{
-        /*
-         * no need for wait_event_tty because clearing ST_CMDING cannot block
-         * on BTM
-         */
-        wait_event_interruptible(portp->raw_wait,
-                        !test_bit(ST_CMDING, &portp->state));
-        if (signal_pending(current))
-                return -ERESTARTSYS;
-
-        stli_sendcmd(brdp, portp, cmd, arg, size, copyback);
-
-        wait_event_interruptible(portp->raw_wait,
-                        !test_bit(ST_CMDING, &portp->state));
-        if (signal_pending(current))
-                return -ERESTARTSYS;
-
-        if (portp->rc != 0)
-                return -EIO;
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Send the termios settings for this port to the slave. This sleeps
- *      waiting for the command to complete - so must have user context.
- */
-
-static int stli_setport(struct tty_struct *tty)
-{
-        struct stliport *portp = tty->driver_data;
-        struct stlibrd *brdp;
-        asyport_t aport;
-
-        if (portp == NULL)
-                return -ENODEV;
-        if (portp->brdnr >= stli_nrbrds)
-                return -ENODEV;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return -ENODEV;
-
-        stli_mkasyport(tty, portp, &aport, tty->termios);
-        return(stli_cmdwait(brdp, portp, A_SETPORT, &aport, sizeof(asyport_t), 0));
-}
-
-/*****************************************************************************/
-
-static int stli_carrier_raised(struct tty_port *port)
-{
-        struct stliport *portp = container_of(port, struct stliport, port);
-        return (portp->sigs & TIOCM_CD) ? 1 : 0;
-}
-
-static void stli_dtr_rts(struct tty_port *port, int on)
-{
-        struct stliport *portp = container_of(port, struct stliport, port);
-        struct stlibrd *brdp = stli_brds[portp->brdnr];
-        stli_mkasysigs(&portp->asig, on, on);
-        if (stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig,
-                sizeof(asysigs_t), 0) < 0)
-                        printk(KERN_WARNING "istallion: dtr set failed.\n");
-}
-
-
-/*****************************************************************************/
-
-/*
- *      Write routine. Take the data and put it in the shared memory ring
- *      queue. If port is not already sending chars then need to mark the
- *      service bits for this port.
- */
-
-static int stli_write(struct tty_struct *tty, const unsigned char *buf, int count)
-{
-        cdkasy_t __iomem *ap;
-        cdkhdr_t __iomem *hdrp;
-        unsigned char __iomem *bits;
-        unsigned char __iomem *shbuf;
-        unsigned char *chbuf;
-        struct stliport *portp;
-        struct stlibrd *brdp;
-        unsigned int len, stlen, head, tail, size;
-        unsigned long flags;
-
-        if (tty == stli_txcooktty)
-                stli_flushchars(tty);
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return 0;
-        if (portp->brdnr >= stli_nrbrds)
-                return 0;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return 0;
-        chbuf = (unsigned char *) buf;
-
-/*
- *      All data is now local, shove as much as possible into shared memory.
- */
-        spin_lock_irqsave(&brd_lock, flags);
-        EBRDENABLE(brdp);
-        ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr);
-        head = (unsigned int) readw(&ap->txq.head);
-        tail = (unsigned int) readw(&ap->txq.tail);
-        if (tail != ((unsigned int) readw(&ap->txq.tail)))
-                tail = (unsigned int) readw(&ap->txq.tail);
-        size = portp->txsize;
-        if (head >= tail) {
-                len = size - (head - tail) - 1;
-                stlen = size - head;
-        } else {
-                len = tail - head - 1;
-                stlen = len;
-        }
-
-        len = min(len, (unsigned int)count);
-        count = 0;
-        shbuf = (char __iomem *) EBRDGETMEMPTR(brdp, portp->txoffset);
-
-        while (len > 0) {
-                stlen = min(len, stlen);
-                memcpy_toio(shbuf + head, chbuf, stlen);
-                chbuf += stlen;
-                len -= stlen;
-                count += stlen;
-                head += stlen;
-                if (head >= size) {
-                        head = 0;
-                        stlen = tail;
-                }
-        }
-
-        ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr);
-        writew(head, &ap->txq.head);
-        if (test_bit(ST_TXBUSY, &portp->state)) {
-                if (readl(&ap->changed.data) & DT_TXEMPTY)
-                        writel(readl(&ap->changed.data) & ~DT_TXEMPTY, &ap->changed.data);
-        }
-        hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
-        bits = ((unsigned char __iomem *) hdrp) + brdp->slaveoffset +
-                portp->portidx;
-        writeb(readb(bits) | portp->portbit, bits);
-        set_bit(ST_TXBUSY, &portp->state);
-        EBRDDISABLE(brdp);
-        spin_unlock_irqrestore(&brd_lock, flags);
-
-        return(count);
-}
-
-/*****************************************************************************/
-
-/*
- *      Output a single character. We put it into a temporary local buffer
- *      (for speed) then write out that buffer when the flushchars routine
- *      is called. There is a safety catch here so that if some other port
- *      writes chars before the current buffer has been, then we write them
- *      first them do the new ports.
- */
-
-static int stli_putchar(struct tty_struct *tty, unsigned char ch)
-{
-        if (tty != stli_txcooktty) {
-                if (stli_txcooktty != NULL)
-                        stli_flushchars(stli_txcooktty);
-                stli_txcooktty = tty;
-        }
-
-        stli_txcookbuf[stli_txcooksize++] = ch;
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Transfer characters from the local TX cooking buffer to the board.
- *      We sort of ignore the tty that gets passed in here. We rely on the
- *      info stored with the TX cook buffer to tell us which port to flush
- *      the data on. In any case we clean out the TX cook buffer, for re-use
- *      by someone else.
- */
-
-static void stli_flushchars(struct tty_struct *tty)
-{
-        cdkhdr_t __iomem *hdrp;
-        unsigned char __iomem *bits;
-        cdkasy_t __iomem *ap;
-        struct tty_struct *cooktty;
-        struct stliport *portp;
-        struct stlibrd *brdp;
-        unsigned int len, stlen, head, tail, size, count, cooksize;
-        unsigned char *buf;
-        unsigned char __iomem *shbuf;
-        unsigned long flags;
-
-        cooksize = stli_txcooksize;
-        cooktty = stli_txcooktty;
-        stli_txcooksize = 0;
-        stli_txcookrealsize = 0;
-        stli_txcooktty = NULL;
-
-        if (cooktty == NULL)
-                return;
-        if (tty != cooktty)
-                tty = cooktty;
-        if (cooksize == 0)
-                return;
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-        if (portp->brdnr >= stli_nrbrds)
-                return;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        EBRDENABLE(brdp);
-
-        ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr);
-        head = (unsigned int) readw(&ap->txq.head);
-        tail = (unsigned int) readw(&ap->txq.tail);
-        if (tail != ((unsigned int) readw(&ap->txq.tail)))
-                tail = (unsigned int) readw(&ap->txq.tail);
-        size = portp->txsize;
-        if (head >= tail) {
-                len = size - (head - tail) - 1;
-                stlen = size - head;
-        } else {
-                len = tail - head - 1;
-                stlen = len;
-        }
-
-        len = min(len, cooksize);
-        count = 0;
-        shbuf = EBRDGETMEMPTR(brdp, portp->txoffset);
-        buf = stli_txcookbuf;
-
-        while (len > 0) {
-                stlen = min(len, stlen);
-                memcpy_toio(shbuf + head, buf, stlen);
-                buf += stlen;
-                len -= stlen;
-                count += stlen;
-                head += stlen;
-                if (head >= size) {
-                        head = 0;
-                        stlen = tail;
-                }
-        }
-
-        ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr);
-        writew(head, &ap->txq.head);
-
-        if (test_bit(ST_TXBUSY, &portp->state)) {
-                if (readl(&ap->changed.data) & DT_TXEMPTY)
-                        writel(readl(&ap->changed.data) & ~DT_TXEMPTY, &ap->changed.data);
-        }
-        hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
-        bits = ((unsigned char __iomem *) hdrp) + brdp->slaveoffset +
-                portp->portidx;
-        writeb(readb(bits) | portp->portbit, bits);
-        set_bit(ST_TXBUSY, &portp->state);
-
-        EBRDDISABLE(brdp);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-static int stli_writeroom(struct tty_struct *tty)
-{
-        cdkasyrq_t __iomem *rp;
-        struct stliport *portp;
-        struct stlibrd *brdp;
-        unsigned int head, tail, len;
-        unsigned long flags;
-
-        if (tty == stli_txcooktty) {
-                if (stli_txcookrealsize != 0) {
-                        len = stli_txcookrealsize - stli_txcooksize;
-                        return len;
-                }
-        }
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return 0;
-        if (portp->brdnr >= stli_nrbrds)
-                return 0;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return 0;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        EBRDENABLE(brdp);
-        rp = &((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr))->txq;
-        head = (unsigned int) readw(&rp->head);
-        tail = (unsigned int) readw(&rp->tail);
-        if (tail != ((unsigned int) readw(&rp->tail)))
-                tail = (unsigned int) readw(&rp->tail);
-        len = (head >= tail) ? (portp->txsize - (head - tail)) : (tail - head);
-        len--;
-        EBRDDISABLE(brdp);
-        spin_unlock_irqrestore(&brd_lock, flags);
-
-        if (tty == stli_txcooktty) {
-                stli_txcookrealsize = len;
-                len -= stli_txcooksize;
-        }
-        return len;
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the number of characters in the transmit buffer. Normally we
- *      will return the number of chars in the shared memory ring queue.
- *      We need to kludge around the case where the shared memory buffer is
- *      empty but not all characters have drained yet, for this case just
- *      return that there is 1 character in the buffer!
- */
-
-static int stli_charsinbuffer(struct tty_struct *tty)
-{
-        cdkasyrq_t __iomem *rp;
-        struct stliport *portp;
-        struct stlibrd *brdp;
-        unsigned int head, tail, len;
-        unsigned long flags;
-
-        if (tty == stli_txcooktty)
-                stli_flushchars(tty);
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return 0;
-        if (portp->brdnr >= stli_nrbrds)
-                return 0;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return 0;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        EBRDENABLE(brdp);
-        rp = &((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr))->txq;
-        head = (unsigned int) readw(&rp->head);
-        tail = (unsigned int) readw(&rp->tail);
-        if (tail != ((unsigned int) readw(&rp->tail)))
-                tail = (unsigned int) readw(&rp->tail);
-        len = (head >= tail) ? (head - tail) : (portp->txsize - (tail - head));
-        if ((len == 0) && test_bit(ST_TXBUSY, &portp->state))
-                len = 1;
-        EBRDDISABLE(brdp);
-        spin_unlock_irqrestore(&brd_lock, flags);
-
-        return len;
-}
-
-/*****************************************************************************/
-
-/*
- *      Generate the serial struct info.
- */
-
-static int stli_getserial(struct stliport *portp, struct serial_struct __user *sp)
-{
-        struct serial_struct sio;
-        struct stlibrd *brdp;
-
-        memset(&sio, 0, sizeof(struct serial_struct));
-        sio.type = PORT_UNKNOWN;
-        sio.line = portp->portnr;
-        sio.irq = 0;
-        sio.flags = portp->port.flags;
-        sio.baud_base = portp->baud_base;
-        sio.close_delay = portp->port.close_delay;
-        sio.closing_wait = portp->closing_wait;
-        sio.custom_divisor = portp->custom_divisor;
-        sio.xmit_fifo_size = 0;
-        sio.hub6 = 0;
-
-        brdp = stli_brds[portp->brdnr];
-        if (brdp != NULL)
-                sio.port = brdp->iobase;
-                
-        return copy_to_user(sp, &sio, sizeof(struct serial_struct)) ?
-                        -EFAULT : 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Set port according to the serial struct info.
- *      At this point we do not do any auto-configure stuff, so we will
- *      just quietly ignore any requests to change irq, etc.
- */
-
-static int stli_setserial(struct tty_struct *tty, struct serial_struct __user *sp)
-{
-        struct serial_struct sio;
-        int rc;
-        struct stliport *portp = tty->driver_data;
-
-        if (copy_from_user(&sio, sp, sizeof(struct serial_struct)))
-                return -EFAULT;
-        if (!capable(CAP_SYS_ADMIN)) {
-                if ((sio.baud_base != portp->baud_base) ||
-                    (sio.close_delay != portp->port.close_delay) ||
-                    ((sio.flags & ~ASYNC_USR_MASK) !=
-                    (portp->port.flags & ~ASYNC_USR_MASK)))
-                        return -EPERM;
-        } 
-
-        portp->port.flags = (portp->port.flags & ~ASYNC_USR_MASK) |
-                (sio.flags & ASYNC_USR_MASK);
-        portp->baud_base = sio.baud_base;
-        portp->port.close_delay = sio.close_delay;
-        portp->closing_wait = sio.closing_wait;
-        portp->custom_divisor = sio.custom_divisor;
-
-        if ((rc = stli_setport(tty)) < 0)
-                return rc;
-        return 0;
-}
-
-/*****************************************************************************/
-
-static int stli_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct stliport *portp = tty->driver_data;
-        struct stlibrd *brdp;
-        int rc;
-
-        if (portp == NULL)
-                return -ENODEV;
-        if (portp->brdnr >= stli_nrbrds)
-                return 0;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return 0;
-        if (tty->flags & (1 << TTY_IO_ERROR))
-                return -EIO;
-
-        if ((rc = stli_cmdwait(brdp, portp, A_GETSIGNALS,
-                               &portp->asig, sizeof(asysigs_t), 1)) < 0)
-                return rc;
-
-        return stli_mktiocm(portp->asig.sigvalue);
-}
-
-static int stli_tiocmset(struct tty_struct *tty, struct file *file,
-                         unsigned int set, unsigned int clear)
-{
-        struct stliport *portp = tty->driver_data;
-        struct stlibrd *brdp;
-        int rts = -1, dtr = -1;
-
-        if (portp == NULL)
-                return -ENODEV;
-        if (portp->brdnr >= stli_nrbrds)
-                return 0;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return 0;
-        if (tty->flags & (1 << TTY_IO_ERROR))
-                return -EIO;
-
-        if (set & TIOCM_RTS)
-                rts = 1;
-        if (set & TIOCM_DTR)
-                dtr = 1;
-        if (clear & TIOCM_RTS)
-                rts = 0;
-        if (clear & TIOCM_DTR)
-                dtr = 0;
-
-        stli_mkasysigs(&portp->asig, dtr, rts);
-
-        return stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig,
-                            sizeof(asysigs_t), 0);
-}
-
-static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg)
-{
-        struct stliport *portp;
-        struct stlibrd *brdp;
-        int rc;
-        void __user *argp = (void __user *)arg;
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return -ENODEV;
-        if (portp->brdnr >= stli_nrbrds)
-                return 0;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return 0;
-
-        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-            (cmd != COM_GETPORTSTATS) && (cmd != COM_CLRPORTSTATS)) {
-                if (tty->flags & (1 << TTY_IO_ERROR))
-                        return -EIO;
-        }
-
-        rc = 0;
-
-        switch (cmd) {
-        case TIOCGSERIAL:
-                rc = stli_getserial(portp, argp);
-                break;
-        case TIOCSSERIAL:
-                rc = stli_setserial(tty, argp);
-                break;
-        case STL_GETPFLAG:
-                rc = put_user(portp->pflag, (unsigned __user *)argp);
-                break;
-        case STL_SETPFLAG:
-                if ((rc = get_user(portp->pflag, (unsigned __user *)argp)) == 0)
-                        stli_setport(tty);
-                break;
-        case COM_GETPORTSTATS:
-                rc = stli_getportstats(tty, portp, argp);
-                break;
-        case COM_CLRPORTSTATS:
-                rc = stli_clrportstats(portp, argp);
-                break;
-        case TIOCSERCONFIG:
-        case TIOCSERGWILD:
-        case TIOCSERSWILD:
-        case TIOCSERGETLSR:
-        case TIOCSERGSTRUCT:
-        case TIOCSERGETMULTI:
-        case TIOCSERSETMULTI:
-        default:
-                rc = -ENOIOCTLCMD;
-                break;
-        }
-
-        return rc;
-}
-
-/*****************************************************************************/
-
-/*
- *      This routine assumes that we have user context and can sleep.
- *      Looks like it is true for the current ttys implementation..!!
- */
-
-static void stli_settermios(struct tty_struct *tty, struct ktermios *old)
-{
-        struct stliport *portp;
-        struct stlibrd *brdp;
-        struct ktermios *tiosp;
-        asyport_t aport;
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-        if (portp->brdnr >= stli_nrbrds)
-                return;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return;
-
-        tiosp = tty->termios;
-
-        stli_mkasyport(tty, portp, &aport, tiosp);
-        stli_cmdwait(brdp, portp, A_SETPORT, &aport, sizeof(asyport_t), 0);
-        stli_mkasysigs(&portp->asig, ((tiosp->c_cflag & CBAUD) ? 1 : 0), -1);
-        stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig,
-                sizeof(asysigs_t), 0);
-        if ((old->c_cflag & CRTSCTS) && ((tiosp->c_cflag & CRTSCTS) == 0))
-                tty->hw_stopped = 0;
-        if (((old->c_cflag & CLOCAL) == 0) && (tiosp->c_cflag & CLOCAL))
-                wake_up_interruptible(&portp->port.open_wait);
-}
-
-/*****************************************************************************/
-
-/*
- *      Attempt to flow control who ever is sending us data. We won't really
- *      do any flow control action here. We can't directly, and even if we
- *      wanted to we would have to send a command to the slave. The slave
- *      knows how to flow control, and will do so when its buffers reach its
- *      internal high water marks. So what we will do is set a local state
- *      bit that will stop us sending any RX data up from the poll routine
- *      (which is the place where RX data from the slave is handled).
- */
-
-static void stli_throttle(struct tty_struct *tty)
-{
-        struct stliport *portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-        set_bit(ST_RXSTOP, &portp->state);
-}
-
-/*****************************************************************************/
-
-/*
- *      Unflow control the device sending us data... That means that all
- *      we have to do is clear the RXSTOP state bit. The next poll call
- *      will then be able to pass the RX data back up.
- */
-
-static void stli_unthrottle(struct tty_struct *tty)
-{
-        struct stliport *portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-        clear_bit(ST_RXSTOP, &portp->state);
-}
-
-/*****************************************************************************/
-
-/*
- *      Stop the transmitter.
- */
-
-static void stli_stop(struct tty_struct *tty)
-{
-}
-
-/*****************************************************************************/
-
-/*
- *      Start the transmitter again.
- */
-
-static void stli_start(struct tty_struct *tty)
-{
-}
-
-/*****************************************************************************/
-
-
-/*
- *      Hangup this port. This is pretty much like closing the port, only
- *      a little more brutal. No waiting for data to drain. Shutdown the
- *      port and maybe drop signals. This is rather tricky really. We want
- *      to close the port as well.
- */
-
-static void stli_hangup(struct tty_struct *tty)
-{
-        struct stliport *portp = tty->driver_data;
-        tty_port_hangup(&portp->port);
-}
-
-/*****************************************************************************/
-
-/*
- *      Flush characters from the lower buffer. We may not have user context
- *      so we cannot sleep waiting for it to complete. Also we need to check
- *      if there is chars for this port in the TX cook buffer, and flush them
- *      as well.
- */
-
-static void stli_flushbuffer(struct tty_struct *tty)
-{
-        struct stliport *portp;
-        struct stlibrd *brdp;
-        unsigned long ftype, flags;
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-        if (portp->brdnr >= stli_nrbrds)
-                return;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        if (tty == stli_txcooktty) {
-                stli_txcooktty = NULL;
-                stli_txcooksize = 0;
-                stli_txcookrealsize = 0;
-        }
-        if (test_bit(ST_CMDING, &portp->state)) {
-                set_bit(ST_DOFLUSHTX, &portp->state);
-        } else {
-                ftype = FLUSHTX;
-                if (test_bit(ST_DOFLUSHRX, &portp->state)) {
-                        ftype |= FLUSHRX;
-                        clear_bit(ST_DOFLUSHRX, &portp->state);
-                }
-                __stli_sendcmd(brdp, portp, A_FLUSH, &ftype, sizeof(u32), 0);
-        }
-        spin_unlock_irqrestore(&brd_lock, flags);
-        tty_wakeup(tty);
-}
-
-/*****************************************************************************/
-
-static int stli_breakctl(struct tty_struct *tty, int state)
-{
-        struct stlibrd  *brdp;
-        struct stliport *portp;
-        long            arg;
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return -EINVAL;
-        if (portp->brdnr >= stli_nrbrds)
-                return -EINVAL;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return -EINVAL;
-
-        arg = (state == -1) ? BREAKON : BREAKOFF;
-        stli_cmdwait(brdp, portp, A_BREAK, &arg, sizeof(long), 0);
-        return 0;
-}
-
-/*****************************************************************************/
-
-static void stli_waituntilsent(struct tty_struct *tty, int timeout)
-{
-        struct stliport *portp;
-        unsigned long tend;
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-
-        if (timeout == 0)
-                timeout = HZ;
-        tend = jiffies + timeout;
-
-        while (test_bit(ST_TXBUSY, &portp->state)) {
-                if (signal_pending(current))
-                        break;
-                msleep_interruptible(20);
-                if (time_after_eq(jiffies, tend))
-                        break;
-        }
-}
-
-/*****************************************************************************/
-
-static void stli_sendxchar(struct tty_struct *tty, char ch)
-{
-        struct stlibrd  *brdp;
-        struct stliport *portp;
-        asyctrl_t       actrl;
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-        if (portp->brdnr >= stli_nrbrds)
-                return;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return;
-
-        memset(&actrl, 0, sizeof(asyctrl_t));
-        if (ch == STOP_CHAR(tty)) {
-                actrl.rxctrl = CT_STOPFLOW;
-        } else if (ch == START_CHAR(tty)) {
-                actrl.rxctrl = CT_STARTFLOW;
-        } else {
-                actrl.txctrl = CT_SENDCHR;
-                actrl.tximdch = ch;
-        }
-        stli_cmdwait(brdp, portp, A_PORTCTRL, &actrl, sizeof(asyctrl_t), 0);
-}
-
-static void stli_portinfo(struct seq_file *m, struct stlibrd *brdp, struct stliport *portp, int portnr)
-{
-        char *uart;
-        int rc;
-
-        rc = stli_portcmdstats(NULL, portp);
-
-        uart = "UNKNOWN";
-        if (test_bit(BST_STARTED, &brdp->state)) {
-                switch (stli_comstats.hwid) {
-                case 0: uart = "2681"; break;
-                case 1: uart = "SC26198"; break;
-                default:uart = "CD1400"; break;
-                }
-        }
-        seq_printf(m, "%d: uart:%s ", portnr, uart);
-
-        if (test_bit(BST_STARTED, &brdp->state) && rc >= 0) {
-                char sep;
-
-                seq_printf(m, "tx:%d rx:%d", (int) stli_comstats.txtotal,
-                        (int) stli_comstats.rxtotal);
-
-                if (stli_comstats.rxframing)
-                        seq_printf(m, " fe:%d",
-                                (int) stli_comstats.rxframing);
-                if (stli_comstats.rxparity)
-                        seq_printf(m, " pe:%d",
-                                (int) stli_comstats.rxparity);
-                if (stli_comstats.rxbreaks)
-                        seq_printf(m, " brk:%d",
-                                (int) stli_comstats.rxbreaks);
-                if (stli_comstats.rxoverrun)
-                        seq_printf(m, " oe:%d",
-                                (int) stli_comstats.rxoverrun);
-
-                sep = ' ';
-                if (stli_comstats.signals & TIOCM_RTS) {
-                        seq_printf(m, "%c%s", sep, "RTS");
-                        sep = '|';
-                }
-                if (stli_comstats.signals & TIOCM_CTS) {
-                        seq_printf(m, "%c%s", sep, "CTS");
-                        sep = '|';
-                }
-                if (stli_comstats.signals & TIOCM_DTR) {
-                        seq_printf(m, "%c%s", sep, "DTR");
-                        sep = '|';
-                }
-                if (stli_comstats.signals & TIOCM_CD) {
-                        seq_printf(m, "%c%s", sep, "DCD");
-                        sep = '|';
-                }
-                if (stli_comstats.signals & TIOCM_DSR) {
-                        seq_printf(m, "%c%s", sep, "DSR");
-                        sep = '|';
-                }
-        }
-        seq_putc(m, '\n');
-}
-
-/*****************************************************************************/
-
-/*
- *      Port info, read from the /proc file system.
- */
-
-static int stli_proc_show(struct seq_file *m, void *v)
-{
-        struct stlibrd *brdp;
-        struct stliport *portp;
-        unsigned int brdnr, portnr, totalport;
-
-        totalport = 0;
-
-        seq_printf(m, "%s: version %s\n", stli_drvtitle, stli_drvversion);
-
-/*
- *      We scan through for each board, panel and port. The offset is
- *      calculated on the fly, and irrelevant ports are skipped.
- */
-        for (brdnr = 0; (brdnr < stli_nrbrds); brdnr++) {
-                brdp = stli_brds[brdnr];
-                if (brdp == NULL)
-                        continue;
-                if (brdp->state == 0)
-                        continue;
-
-                totalport = brdnr * STL_MAXPORTS;
-                for (portnr = 0; (portnr < brdp->nrports); portnr++,
-                    totalport++) {
-                        portp = brdp->ports[portnr];
-                        if (portp == NULL)
-                                continue;
-                        stli_portinfo(m, brdp, portp, totalport);
-                }
-        }
-        return 0;
-}
-
-static int stli_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, stli_proc_show, NULL);
-}
-
-static const struct file_operations stli_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = stli_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-/*****************************************************************************/
-
-/*
- *      Generic send command routine. This will send a message to the slave,
- *      of the specified type with the specified argument. Must be very
- *      careful of data that will be copied out from shared memory -
- *      containing command results. The command completion is all done from
- *      a poll routine that does not have user context. Therefore you cannot
- *      copy back directly into user space, or to the kernel stack of a
- *      process. This routine does not sleep, so can be called from anywhere.
- *
- *      The caller must hold the brd_lock (see also stli_sendcmd the usual
- *      entry point)
- */
-
-static void __stli_sendcmd(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback)
-{
-        cdkhdr_t __iomem *hdrp;
-        cdkctrl_t __iomem *cp;
-        unsigned char __iomem *bits;
-
-        if (test_bit(ST_CMDING, &portp->state)) {
-                printk(KERN_ERR "istallion: command already busy, cmd=%x!\n",
-                                (int) cmd);
-                return;
-        }
-
-        EBRDENABLE(brdp);
-        cp = &((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr))->ctrl;
-        if (size > 0) {
-                memcpy_toio((void __iomem *) &(cp->args[0]), arg, size);
-                if (copyback) {
-                        portp->argp = arg;
-                        portp->argsize = size;
-                }
-        }
-        writel(0, &cp->status);
-        writel(cmd, &cp->cmd);
-        hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
-        bits = ((unsigned char __iomem *) hdrp) + brdp->slaveoffset +
-                portp->portidx;
-        writeb(readb(bits) | portp->portbit, bits);
-        set_bit(ST_CMDING, &portp->state);
-        EBRDDISABLE(brdp);
-}
-
-static void stli_sendcmd(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback)
-{
-        unsigned long           flags;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        __stli_sendcmd(brdp, portp, cmd, arg, size, copyback);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Read data from shared memory. This assumes that the shared memory
- *      is enabled and that interrupts are off. Basically we just empty out
- *      the shared memory buffer into the tty buffer. Must be careful to
- *      handle the case where we fill up the tty buffer, but still have
- *      more chars to unload.
- */
-
-static void stli_read(struct stlibrd *brdp, struct stliport *portp)
-{
-        cdkasyrq_t __iomem *rp;
-        char __iomem *shbuf;
-        struct tty_struct       *tty;
-        unsigned int head, tail, size;
-        unsigned int len, stlen;
-
-        if (test_bit(ST_RXSTOP, &portp->state))
-                return;
-        tty = tty_port_tty_get(&portp->port);
-        if (tty == NULL)
-                return;
-
-        rp = &((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr))->rxq;
-        head = (unsigned int) readw(&rp->head);
-        if (head != ((unsigned int) readw(&rp->head)))
-                head = (unsigned int) readw(&rp->head);
-        tail = (unsigned int) readw(&rp->tail);
-        size = portp->rxsize;
-        if (head >= tail) {
-                len = head - tail;
-                stlen = len;
-        } else {
-                len = size - (tail - head);
-                stlen = size - tail;
-        }
-
-        len = tty_buffer_request_room(tty, len);
-
-        shbuf = (char __iomem *) EBRDGETMEMPTR(brdp, portp->rxoffset);
-
-        while (len > 0) {
-                unsigned char *cptr;
-
-                stlen = min(len, stlen);
-                tty_prepare_flip_string(tty, &cptr, stlen);
-                memcpy_fromio(cptr, shbuf + tail, stlen);
-                len -= stlen;
-                tail += stlen;
-                if (tail >= size) {
-                        tail = 0;
-                        stlen = head;
-                }
-        }
-        rp = &((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr))->rxq;
-        writew(tail, &rp->tail);
-
-        if (head != tail)
-                set_bit(ST_RXING, &portp->state);
-
-        tty_schedule_flip(tty);
-        tty_kref_put(tty);
-}
-
-/*****************************************************************************/
-
-/*
- *      Set up and carry out any delayed commands. There is only a small set
- *      of slave commands that can be done "off-level". So it is not too
- *      difficult to deal with them here.
- */
-
-static void stli_dodelaycmd(struct stliport *portp, cdkctrl_t __iomem *cp)
-{
-        int cmd;
-
-        if (test_bit(ST_DOSIGS, &portp->state)) {
-                if (test_bit(ST_DOFLUSHTX, &portp->state) &&
-                    test_bit(ST_DOFLUSHRX, &portp->state))
-                        cmd = A_SETSIGNALSF;
-                else if (test_bit(ST_DOFLUSHTX, &portp->state))
-                        cmd = A_SETSIGNALSFTX;
-                else if (test_bit(ST_DOFLUSHRX, &portp->state))
-                        cmd = A_SETSIGNALSFRX;
-                else
-                        cmd = A_SETSIGNALS;
-                clear_bit(ST_DOFLUSHTX, &portp->state);
-                clear_bit(ST_DOFLUSHRX, &portp->state);
-                clear_bit(ST_DOSIGS, &portp->state);
-                memcpy_toio((void __iomem *) &(cp->args[0]), (void *) &portp->asig,
-                        sizeof(asysigs_t));
-                writel(0, &cp->status);
-                writel(cmd, &cp->cmd);
-                set_bit(ST_CMDING, &portp->state);
-        } else if (test_bit(ST_DOFLUSHTX, &portp->state) ||
-            test_bit(ST_DOFLUSHRX, &portp->state)) {
-                cmd = ((test_bit(ST_DOFLUSHTX, &portp->state)) ? FLUSHTX : 0);
-                cmd |= ((test_bit(ST_DOFLUSHRX, &portp->state)) ? FLUSHRX : 0);
-                clear_bit(ST_DOFLUSHTX, &portp->state);
-                clear_bit(ST_DOFLUSHRX, &portp->state);
-                memcpy_toio((void __iomem *) &(cp->args[0]), (void *) &cmd, sizeof(int));
-                writel(0, &cp->status);
-                writel(A_FLUSH, &cp->cmd);
-                set_bit(ST_CMDING, &portp->state);
-        }
-}
-
-/*****************************************************************************/
-
-/*
- *      Host command service checking. This handles commands or messages
- *      coming from the slave to the host. Must have board shared memory
- *      enabled and interrupts off when called. Notice that by servicing the
- *      read data last we don't need to change the shared memory pointer
- *      during processing (which is a slow IO operation).
- *      Return value indicates if this port is still awaiting actions from
- *      the slave (like open, command, or even TX data being sent). If 0
- *      then port is still busy, otherwise no longer busy.
- */
-
-static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp)
-{
-        cdkasy_t __iomem *ap;
-        cdkctrl_t __iomem *cp;
-        struct tty_struct *tty;
-        asynotify_t nt;
-        unsigned long oldsigs;
-        int rc, donerx;
-
-        ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr);
-        cp = &ap->ctrl;
-
-/*
- *      Check if we are waiting for an open completion message.
- */
-        if (test_bit(ST_OPENING, &portp->state)) {
-                rc = readl(&cp->openarg);
-                if (readb(&cp->open) == 0 && rc != 0) {
-                        if (rc > 0)
-                                rc--;
-                        writel(0, &cp->openarg);
-                        portp->rc = rc;
-                        clear_bit(ST_OPENING, &portp->state);
-                        wake_up_interruptible(&portp->raw_wait);
-                }
-        }
-
-/*
- *      Check if we are waiting for a close completion message.
- */
-        if (test_bit(ST_CLOSING, &portp->state)) {
-                rc = (int) readl(&cp->closearg);
-                if (readb(&cp->close) == 0 && rc != 0) {
-                        if (rc > 0)
-                                rc--;
-                        writel(0, &cp->closearg);
-                        portp->rc = rc;
-                        clear_bit(ST_CLOSING, &portp->state);
-                        wake_up_interruptible(&portp->raw_wait);
-                }
-        }
-
-/*
- *      Check if we are waiting for a command completion message. We may
- *      need to copy out the command results associated with this command.
- */
-        if (test_bit(ST_CMDING, &portp->state)) {
-                rc = readl(&cp->status);
-                if (readl(&cp->cmd) == 0 && rc != 0) {
-                        if (rc > 0)
-                                rc--;
-                        if (portp->argp != NULL) {
-                                memcpy_fromio(portp->argp, (void __iomem *) &(cp->args[0]),
-                                        portp->argsize);
-                                portp->argp = NULL;
-                        }
-                        writel(0, &cp->status);
-                        portp->rc = rc;
-                        clear_bit(ST_CMDING, &portp->state);
-                        stli_dodelaycmd(portp, cp);
-                        wake_up_interruptible(&portp->raw_wait);
-                }
-        }
-
-/*
- *      Check for any notification messages ready. This includes lots of
- *      different types of events - RX chars ready, RX break received,
- *      TX data low or empty in the slave, modem signals changed state.
- */
-        donerx = 0;
-
-        if (ap->notify) {
-                nt = ap->changed;
-                ap->notify = 0;
-                tty = tty_port_tty_get(&portp->port);
-
-                if (nt.signal & SG_DCD) {
-                        oldsigs = portp->sigs;
-                        portp->sigs = stli_mktiocm(nt.sigvalue);
-                        clear_bit(ST_GETSIGS, &portp->state);
-                        if ((portp->sigs & TIOCM_CD) &&
-                            ((oldsigs & TIOCM_CD) == 0))
-                                wake_up_interruptible(&portp->port.open_wait);
-                        if ((oldsigs & TIOCM_CD) &&
-                            ((portp->sigs & TIOCM_CD) == 0)) {
-                                if (portp->port.flags & ASYNC_CHECK_CD) {
-                                        if (tty)
-                                                tty_hangup(tty);
-                                }
-                        }
-                }
-
-                if (nt.data & DT_TXEMPTY)
-                        clear_bit(ST_TXBUSY, &portp->state);
-                if (nt.data & (DT_TXEMPTY | DT_TXLOW)) {
-                        if (tty != NULL) {
-                                tty_wakeup(tty);
-                                EBRDENABLE(brdp);
-                        }
-                }
-
-                if ((nt.data & DT_RXBREAK) && (portp->rxmarkmsk & BRKINT)) {
-                        if (tty != NULL) {
-                                tty_insert_flip_char(tty, 0, TTY_BREAK);
-                                if (portp->port.flags & ASYNC_SAK) {
-                                        do_SAK(tty);
-                                        EBRDENABLE(brdp);
-                                }
-                                tty_schedule_flip(tty);
-                        }
-                }
-                tty_kref_put(tty);
-
-                if (nt.data & DT_RXBUSY) {
-                        donerx++;
-                        stli_read(brdp, portp);
-                }
-        }
-
-/*
- *      It might seem odd that we are checking for more RX chars here.
- *      But, we need to handle the case where the tty buffer was previously
- *      filled, but we had more characters to pass up. The slave will not
- *      send any more RX notify messages until the RX buffer has been emptied.
- *      But it will leave the service bits on (since the buffer is not empty).
- *      So from here we can try to process more RX chars.
- */
-        if ((!donerx) && test_bit(ST_RXING, &portp->state)) {
-                clear_bit(ST_RXING, &portp->state);
-                stli_read(brdp, portp);
-        }
-
-        return((test_bit(ST_OPENING, &portp->state) ||
-                test_bit(ST_CLOSING, &portp->state) ||
-                test_bit(ST_CMDING, &portp->state) ||
-                test_bit(ST_TXBUSY, &portp->state) ||
-                test_bit(ST_RXING, &portp->state)) ? 0 : 1);
-}
-
-/*****************************************************************************/
-
-/*
- *      Service all ports on a particular board. Assumes that the boards
- *      shared memory is enabled, and that the page pointer is pointed
- *      at the cdk header structure.
- */
-
-static void stli_brdpoll(struct stlibrd *brdp, cdkhdr_t __iomem *hdrp)
-{
-        struct stliport *portp;
-        unsigned char hostbits[(STL_MAXCHANS / 8) + 1];
-        unsigned char slavebits[(STL_MAXCHANS / 8) + 1];
-        unsigned char __iomem *slavep;
-        int bitpos, bitat, bitsize;
-        int channr, nrdevs, slavebitchange;
-
-        bitsize = brdp->bitsize;
-        nrdevs = brdp->nrdevs;
-
-/*
- *      Check if slave wants any service. Basically we try to do as
- *      little work as possible here. There are 2 levels of service
- *      bits. So if there is nothing to do we bail early. We check
- *      8 service bits at a time in the inner loop, so we can bypass
- *      the lot if none of them want service.
- */
-        memcpy_fromio(&hostbits[0], (((unsigned char __iomem *) hdrp) + brdp->hostoffset),
-                bitsize);
-
-        memset(&slavebits[0], 0, bitsize);
-        slavebitchange = 0;
-
-        for (bitpos = 0; (bitpos < bitsize); bitpos++) {
-                if (hostbits[bitpos] == 0)
-                        continue;
-                channr = bitpos * 8;
-                for (bitat = 0x1; (channr < nrdevs); channr++, bitat <<= 1) {
-                        if (hostbits[bitpos] & bitat) {
-                                portp = brdp->ports[(channr - 1)];
-                                if (stli_hostcmd(brdp, portp)) {
-                                        slavebitchange++;
-                                        slavebits[bitpos] |= bitat;
-                                }
-                        }
-                }
-        }
-
-/*
- *      If any of the ports are no longer busy then update them in the
- *      slave request bits. We need to do this after, since a host port
- *      service may initiate more slave requests.
- */
-        if (slavebitchange) {
-                hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
-                slavep = ((unsigned char __iomem *) hdrp) + brdp->slaveoffset;
-                for (bitpos = 0; (bitpos < bitsize); bitpos++) {
-                        if (readb(slavebits + bitpos))
-                                writeb(readb(slavep + bitpos) & ~slavebits[bitpos], slavebits + bitpos);
-                }
-        }
-}
-
-/*****************************************************************************/
-
-/*
- *      Driver poll routine. This routine polls the boards in use and passes
- *      messages back up to host when necessary. This is actually very
- *      CPU efficient, since we will always have the kernel poll clock, it
- *      adds only a few cycles when idle (since board service can be
- *      determined very easily), but when loaded generates no interrupts
- *      (with their expensive associated context change).
- */
-
-static void stli_poll(unsigned long arg)
-{
-        cdkhdr_t __iomem *hdrp;
-        struct stlibrd *brdp;
-        unsigned int brdnr;
-
-        mod_timer(&stli_timerlist, STLI_TIMEOUT);
-
-/*
- *      Check each board and do any servicing required.
- */
-        for (brdnr = 0; (brdnr < stli_nrbrds); brdnr++) {
-                brdp = stli_brds[brdnr];
-                if (brdp == NULL)
-                        continue;
-                if (!test_bit(BST_STARTED, &brdp->state))
-                        continue;
-
-                spin_lock(&brd_lock);
-                EBRDENABLE(brdp);
-                hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
-                if (readb(&hdrp->hostreq))
-                        stli_brdpoll(brdp, hdrp);
-                EBRDDISABLE(brdp);
-                spin_unlock(&brd_lock);
-        }
-}
-
-/*****************************************************************************/
-
-/*
- *      Translate the termios settings into the port setting structure of
- *      the slave.
- */
-
-static void stli_mkasyport(struct tty_struct *tty, struct stliport *portp,
-                                asyport_t *pp, struct ktermios *tiosp)
-{
-        memset(pp, 0, sizeof(asyport_t));
-
-/*
- *      Start of by setting the baud, char size, parity and stop bit info.
- */
-        pp->baudout = tty_get_baud_rate(tty);
-        if ((tiosp->c_cflag & CBAUD) == B38400) {
-                if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        pp->baudout = 57600;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        pp->baudout = 115200;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                        pp->baudout = 230400;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                        pp->baudout = 460800;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
-                        pp->baudout = (portp->baud_base / portp->custom_divisor);
-        }
-        if (pp->baudout > STL_MAXBAUD)
-                pp->baudout = STL_MAXBAUD;
-        pp->baudin = pp->baudout;
-
-        switch (tiosp->c_cflag & CSIZE) {
-        case CS5:
-                pp->csize = 5;
-                break;
-        case CS6:
-                pp->csize = 6;
-                break;
-        case CS7:
-                pp->csize = 7;
-                break;
-        default:
-                pp->csize = 8;
-                break;
-        }
-
-        if (tiosp->c_cflag & CSTOPB)
-                pp->stopbs = PT_STOP2;
-        else
-                pp->stopbs = PT_STOP1;
-
-        if (tiosp->c_cflag & PARENB) {
-                if (tiosp->c_cflag & PARODD)
-                        pp->parity = PT_ODDPARITY;
-                else
-                        pp->parity = PT_EVENPARITY;
-        } else {
-                pp->parity = PT_NOPARITY;
-        }
-
-/*
- *      Set up any flow control options enabled.
- */
-        if (tiosp->c_iflag & IXON) {
-                pp->flow |= F_IXON;
-                if (tiosp->c_iflag & IXANY)
-                        pp->flow |= F_IXANY;
-        }
-        if (tiosp->c_cflag & CRTSCTS)
-                pp->flow |= (F_RTSFLOW | F_CTSFLOW);
-
-        pp->startin = tiosp->c_cc[VSTART];
-        pp->stopin = tiosp->c_cc[VSTOP];
-        pp->startout = tiosp->c_cc[VSTART];
-        pp->stopout = tiosp->c_cc[VSTOP];
-
-/*
- *      Set up the RX char marking mask with those RX error types we must
- *      catch. We can get the slave to help us out a little here, it will
- *      ignore parity errors and breaks for us, and mark parity errors in
- *      the data stream.
- */
-        if (tiosp->c_iflag & IGNPAR)
-                pp->iflag |= FI_IGNRXERRS;
-        if (tiosp->c_iflag & IGNBRK)
-                pp->iflag |= FI_IGNBREAK;
-
-        portp->rxmarkmsk = 0;
-        if (tiosp->c_iflag & (INPCK | PARMRK))
-                pp->iflag |= FI_1MARKRXERRS;
-        if (tiosp->c_iflag & BRKINT)
-                portp->rxmarkmsk |= BRKINT;
-
-/*
- *      Set up clocal processing as required.
- */
-        if (tiosp->c_cflag & CLOCAL)
-                portp->port.flags &= ~ASYNC_CHECK_CD;
-        else
-                portp->port.flags |= ASYNC_CHECK_CD;
-
-/*
- *      Transfer any persistent flags into the asyport structure.
- */
-        pp->pflag = (portp->pflag & 0xffff);
-        pp->vmin = (portp->pflag & P_RXIMIN) ? 1 : 0;
-        pp->vtime = (portp->pflag & P_RXITIME) ? 1 : 0;
-        pp->cc[1] = (portp->pflag & P_RXTHOLD) ? 1 : 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Construct a slave signals structure for setting the DTR and RTS
- *      signals as specified.
- */
-
-static void stli_mkasysigs(asysigs_t *sp, int dtr, int rts)
-{
-        memset(sp, 0, sizeof(asysigs_t));
-        if (dtr >= 0) {
-                sp->signal |= SG_DTR;
-                sp->sigvalue |= ((dtr > 0) ? SG_DTR : 0);
-        }
-        if (rts >= 0) {
-                sp->signal |= SG_RTS;
-                sp->sigvalue |= ((rts > 0) ? SG_RTS : 0);
-        }
-}
-
-/*****************************************************************************/
-
-/*
- *      Convert the signals returned from the slave into a local TIOCM type
- *      signals value. We keep them locally in TIOCM format.
- */
-
-static long stli_mktiocm(unsigned long sigvalue)
-{
-        long    tiocm = 0;
-        tiocm |= ((sigvalue & SG_DCD) ? TIOCM_CD : 0);
-        tiocm |= ((sigvalue & SG_CTS) ? TIOCM_CTS : 0);
-        tiocm |= ((sigvalue & SG_RI) ? TIOCM_RI : 0);
-        tiocm |= ((sigvalue & SG_DSR) ? TIOCM_DSR : 0);
-        tiocm |= ((sigvalue & SG_DTR) ? TIOCM_DTR : 0);
-        tiocm |= ((sigvalue & SG_RTS) ? TIOCM_RTS : 0);
-        return(tiocm);
-}
-
-/*****************************************************************************/
-
-/*
- *      All panels and ports actually attached have been worked out. All
- *      we need to do here is set up the appropriate per port data structures.
- */
-
-static int stli_initports(struct stlibrd *brdp)
-{
-        struct stliport *portp;
-        unsigned int i, panelnr, panelport;
-
-        for (i = 0, panelnr = 0, panelport = 0; (i < brdp->nrports); i++) {
-                portp = kzalloc(sizeof(struct stliport), GFP_KERNEL);
-                if (!portp) {
-                        printk(KERN_WARNING "istallion: failed to allocate port structure\n");
-                        continue;
-                }
-                tty_port_init(&portp->port);
-                portp->port.ops = &stli_port_ops;
-                portp->magic = STLI_PORTMAGIC;
-                portp->portnr = i;
-                portp->brdnr = brdp->brdnr;
-                portp->panelnr = panelnr;
-                portp->baud_base = STL_BAUDBASE;
-                portp->port.close_delay = STL_CLOSEDELAY;
-                portp->closing_wait = 30 * HZ;
-                init_waitqueue_head(&portp->port.open_wait);
-                init_waitqueue_head(&portp->port.close_wait);
-                init_waitqueue_head(&portp->raw_wait);
-                panelport++;
-                if (panelport >= brdp->panels[panelnr]) {
-                        panelport = 0;
-                        panelnr++;
-                }
-                brdp->ports[i] = portp;
-        }
-
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      All the following routines are board specific hardware operations.
- */
-
-static void stli_ecpinit(struct stlibrd *brdp)
-{
-        unsigned long   memconf;
-
-        outb(ECP_ATSTOP, (brdp->iobase + ECP_ATCONFR));
-        udelay(10);
-        outb(ECP_ATDISABLE, (brdp->iobase + ECP_ATCONFR));
-        udelay(100);
-
-        memconf = (brdp->memaddr & ECP_ATADDRMASK) >> ECP_ATADDRSHFT;
-        outb(memconf, (brdp->iobase + ECP_ATMEMAR));
-}
-
-/*****************************************************************************/
-
-static void stli_ecpenable(struct stlibrd *brdp)
-{       
-        outb(ECP_ATENABLE, (brdp->iobase + ECP_ATCONFR));
-}
-
-/*****************************************************************************/
-
-static void stli_ecpdisable(struct stlibrd *brdp)
-{       
-        outb(ECP_ATDISABLE, (brdp->iobase + ECP_ATCONFR));
-}
-
-/*****************************************************************************/
-
-static void __iomem *stli_ecpgetmemptr(struct stlibrd *brdp, unsigned long offset, int line)
-{       
-        void __iomem *ptr;
-        unsigned char val;
-
-        if (offset > brdp->memsize) {
-                printk(KERN_ERR "istallion: shared memory pointer=%x out of "
-                                "range at line=%d(%d), brd=%d\n",
-                        (int) offset, line, __LINE__, brdp->brdnr);
-                ptr = NULL;
-                val = 0;
-        } else {
-                ptr = brdp->membase + (offset % ECP_ATPAGESIZE);
-                val = (unsigned char) (offset / ECP_ATPAGESIZE);
-        }
-        outb(val, (brdp->iobase + ECP_ATMEMPR));
-        return(ptr);
-}
-
-/*****************************************************************************/
-
-static void stli_ecpreset(struct stlibrd *brdp)
-{       
-        outb(ECP_ATSTOP, (brdp->iobase + ECP_ATCONFR));
-        udelay(10);
-        outb(ECP_ATDISABLE, (brdp->iobase + ECP_ATCONFR));
-        udelay(500);
-}
-
-/*****************************************************************************/
-
-static void stli_ecpintr(struct stlibrd *brdp)
-{       
-        outb(0x1, brdp->iobase);
-}
-
-/*****************************************************************************/
-
-/*
- *      The following set of functions act on ECP EISA boards.
- */
-
-static void stli_ecpeiinit(struct stlibrd *brdp)
-{
-        unsigned long   memconf;
-
-        outb(0x1, (brdp->iobase + ECP_EIBRDENAB));
-        outb(ECP_EISTOP, (brdp->iobase + ECP_EICONFR));
-        udelay(10);
-        outb(ECP_EIDISABLE, (brdp->iobase + ECP_EICONFR));
-        udelay(500);
-
-        memconf = (brdp->memaddr & ECP_EIADDRMASKL) >> ECP_EIADDRSHFTL;
-        outb(memconf, (brdp->iobase + ECP_EIMEMARL));
-        memconf = (brdp->memaddr & ECP_EIADDRMASKH) >> ECP_EIADDRSHFTH;
-        outb(memconf, (brdp->iobase + ECP_EIMEMARH));
-}
-
-/*****************************************************************************/
-
-static void stli_ecpeienable(struct stlibrd *brdp)
-{       
-        outb(ECP_EIENABLE, (brdp->iobase + ECP_EICONFR));
-}
-
-/*****************************************************************************/
-
-static void stli_ecpeidisable(struct stlibrd *brdp)
-{       
-        outb(ECP_EIDISABLE, (brdp->iobase + ECP_EICONFR));
-}
-
-/*****************************************************************************/
-
-static void __iomem *stli_ecpeigetmemptr(struct stlibrd *brdp, unsigned long offset, int line)
-{       
-        void __iomem *ptr;
-        unsigned char   val;
-
-        if (offset > brdp->memsize) {
-                printk(KERN_ERR "istallion: shared memory pointer=%x out of "
-                                "range at line=%d(%d), brd=%d\n",
-                        (int) offset, line, __LINE__, brdp->brdnr);
-                ptr = NULL;
-                val = 0;
-        } else {
-                ptr = brdp->membase + (offset % ECP_EIPAGESIZE);
-                if (offset < ECP_EIPAGESIZE)
-                        val = ECP_EIENABLE;
-                else
-                        val = ECP_EIENABLE | 0x40;
-        }
-        outb(val, (brdp->iobase + ECP_EICONFR));
-        return(ptr);
-}
-
-/*****************************************************************************/
-
-static void stli_ecpeireset(struct stlibrd *brdp)
-{       
-        outb(ECP_EISTOP, (brdp->iobase + ECP_EICONFR));
-        udelay(10);
-        outb(ECP_EIDISABLE, (brdp->iobase + ECP_EICONFR));
-        udelay(500);
-}
-
-/*****************************************************************************/
-
-/*
- *      The following set of functions act on ECP MCA boards.
- */
-
-static void stli_ecpmcenable(struct stlibrd *brdp)
-{       
-        outb(ECP_MCENABLE, (brdp->iobase + ECP_MCCONFR));
-}
-
-/*****************************************************************************/
-
-static void stli_ecpmcdisable(struct stlibrd *brdp)
-{       
-        outb(ECP_MCDISABLE, (brdp->iobase + ECP_MCCONFR));
-}
-
-/*****************************************************************************/
-
-static void __iomem *stli_ecpmcgetmemptr(struct stlibrd *brdp, unsigned long offset, int line)
-{       
-        void __iomem *ptr;
-        unsigned char val;
-
-        if (offset > brdp->memsize) {
-                printk(KERN_ERR "istallion: shared memory pointer=%x out of "
-                                "range at line=%d(%d), brd=%d\n",
-                        (int) offset, line, __LINE__, brdp->brdnr);
-                ptr = NULL;
-                val = 0;
-        } else {
-                ptr = brdp->membase + (offset % ECP_MCPAGESIZE);
-                val = ((unsigned char) (offset / ECP_MCPAGESIZE)) | ECP_MCENABLE;
-        }
-        outb(val, (brdp->iobase + ECP_MCCONFR));
-        return(ptr);
-}
-
-/*****************************************************************************/
-
-static void stli_ecpmcreset(struct stlibrd *brdp)
-{       
-        outb(ECP_MCSTOP, (brdp->iobase + ECP_MCCONFR));
-        udelay(10);
-        outb(ECP_MCDISABLE, (brdp->iobase + ECP_MCCONFR));
-        udelay(500);
-}
-
-/*****************************************************************************/
-
-/*
- *      The following set of functions act on ECP PCI boards.
- */
-
-static void stli_ecppciinit(struct stlibrd *brdp)
-{
-        outb(ECP_PCISTOP, (brdp->iobase + ECP_PCICONFR));
-        udelay(10);
-        outb(0, (brdp->iobase + ECP_PCICONFR));
-        udelay(500);
-}
-
-/*****************************************************************************/
-
-static void __iomem *stli_ecppcigetmemptr(struct stlibrd *brdp, unsigned long offset, int line)
-{       
-        void __iomem *ptr;
-        unsigned char   val;
-
-        if (offset > brdp->memsize) {
-                printk(KERN_ERR "istallion: shared memory pointer=%x out of "
-                                "range at line=%d(%d), board=%d\n",
-                                (int) offset, line, __LINE__, brdp->brdnr);
-                ptr = NULL;
-                val = 0;
-        } else {
-                ptr = brdp->membase + (offset % ECP_PCIPAGESIZE);
-                val = (offset / ECP_PCIPAGESIZE) << 1;
-        }
-        outb(val, (brdp->iobase + ECP_PCICONFR));
-        return(ptr);
-}
-
-/*****************************************************************************/
-
-static void stli_ecppcireset(struct stlibrd *brdp)
-{       
-        outb(ECP_PCISTOP, (brdp->iobase + ECP_PCICONFR));
-        udelay(10);
-        outb(0, (brdp->iobase + ECP_PCICONFR));
-        udelay(500);
-}
-
-/*****************************************************************************/
-
-/*
- *      The following routines act on ONboards.
- */
-
-static void stli_onbinit(struct stlibrd *brdp)
-{
-        unsigned long   memconf;
-
-        outb(ONB_ATSTOP, (brdp->iobase + ONB_ATCONFR));
-        udelay(10);
-        outb(ONB_ATDISABLE, (brdp->iobase + ONB_ATCONFR));
-        mdelay(1000);
-
-        memconf = (brdp->memaddr & ONB_ATADDRMASK) >> ONB_ATADDRSHFT;
-        outb(memconf, (brdp->iobase + ONB_ATMEMAR));
-        outb(0x1, brdp->iobase);
-        mdelay(1);
-}
-
-/*****************************************************************************/
-
-static void stli_onbenable(struct stlibrd *brdp)
-{       
-        outb((brdp->enabval | ONB_ATENABLE), (brdp->iobase + ONB_ATCONFR));
-}
-
-/*****************************************************************************/
-
-static void stli_onbdisable(struct stlibrd *brdp)
-{       
-        outb((brdp->enabval | ONB_ATDISABLE), (brdp->iobase + ONB_ATCONFR));
-}
-
-/*****************************************************************************/
-
-static void __iomem *stli_onbgetmemptr(struct stlibrd *brdp, unsigned long offset, int line)
-{       
-        void __iomem *ptr;
-
-        if (offset > brdp->memsize) {
-                printk(KERN_ERR "istallion: shared memory pointer=%x out of "
-                                "range at line=%d(%d), brd=%d\n",
-                                (int) offset, line, __LINE__, brdp->brdnr);
-                ptr = NULL;
-        } else {
-                ptr = brdp->membase + (offset % ONB_ATPAGESIZE);
-        }
-        return(ptr);
-}
-
-/*****************************************************************************/
-
-static void stli_onbreset(struct stlibrd *brdp)
-{       
-        outb(ONB_ATSTOP, (brdp->iobase + ONB_ATCONFR));
-        udelay(10);
-        outb(ONB_ATDISABLE, (brdp->iobase + ONB_ATCONFR));
-        mdelay(1000);
-}
-
-/*****************************************************************************/
-
-/*
- *      The following routines act on ONboard EISA.
- */
-
-static void stli_onbeinit(struct stlibrd *brdp)
-{
-        unsigned long   memconf;
-
-        outb(0x1, (brdp->iobase + ONB_EIBRDENAB));
-        outb(ONB_EISTOP, (brdp->iobase + ONB_EICONFR));
-        udelay(10);
-        outb(ONB_EIDISABLE, (brdp->iobase + ONB_EICONFR));
-        mdelay(1000);
-
-        memconf = (brdp->memaddr & ONB_EIADDRMASKL) >> ONB_EIADDRSHFTL;
-        outb(memconf, (brdp->iobase + ONB_EIMEMARL));
-        memconf = (brdp->memaddr & ONB_EIADDRMASKH) >> ONB_EIADDRSHFTH;
-        outb(memconf, (brdp->iobase + ONB_EIMEMARH));
-        outb(0x1, brdp->iobase);
-        mdelay(1);
-}
-
-/*****************************************************************************/
-
-static void stli_onbeenable(struct stlibrd *brdp)
-{       
-        outb(ONB_EIENABLE, (brdp->iobase + ONB_EICONFR));
-}
-
-/*****************************************************************************/
-
-static void stli_onbedisable(struct stlibrd *brdp)
-{       
-        outb(ONB_EIDISABLE, (brdp->iobase + ONB_EICONFR));
-}
-
-/*****************************************************************************/
-
-static void __iomem *stli_onbegetmemptr(struct stlibrd *brdp, unsigned long offset, int line)
-{       
-        void __iomem *ptr;
-        unsigned char val;
-
-        if (offset > brdp->memsize) {
-                printk(KERN_ERR "istallion: shared memory pointer=%x out of "
-                                "range at line=%d(%d), brd=%d\n",
-                        (int) offset, line, __LINE__, brdp->brdnr);
-                ptr = NULL;
-                val = 0;
-        } else {
-                ptr = brdp->membase + (offset % ONB_EIPAGESIZE);
-                if (offset < ONB_EIPAGESIZE)
-                        val = ONB_EIENABLE;
-                else
-                        val = ONB_EIENABLE | 0x40;
-        }
-        outb(val, (brdp->iobase + ONB_EICONFR));
-        return(ptr);
-}
-
-/*****************************************************************************/
-
-static void stli_onbereset(struct stlibrd *brdp)
-{       
-        outb(ONB_EISTOP, (brdp->iobase + ONB_EICONFR));
-        udelay(10);
-        outb(ONB_EIDISABLE, (brdp->iobase + ONB_EICONFR));
-        mdelay(1000);
-}
-
-/*****************************************************************************/
-
-/*
- *      The following routines act on Brumby boards.
- */
-
-static void stli_bbyinit(struct stlibrd *brdp)
-{
-        outb(BBY_ATSTOP, (brdp->iobase + BBY_ATCONFR));
-        udelay(10);
-        outb(0, (brdp->iobase + BBY_ATCONFR));
-        mdelay(1000);
-        outb(0x1, brdp->iobase);
-        mdelay(1);
-}
-
-/*****************************************************************************/
-
-static void __iomem *stli_bbygetmemptr(struct stlibrd *brdp, unsigned long offset, int line)
-{       
-        void __iomem *ptr;
-        unsigned char val;
-
-        BUG_ON(offset > brdp->memsize);
-
-        ptr = brdp->membase + (offset % BBY_PAGESIZE);
-        val = (unsigned char) (offset / BBY_PAGESIZE);
-        outb(val, (brdp->iobase + BBY_ATCONFR));
-        return(ptr);
-}
-
-/*****************************************************************************/
-
-static void stli_bbyreset(struct stlibrd *brdp)
-{       
-        outb(BBY_ATSTOP, (brdp->iobase + BBY_ATCONFR));
-        udelay(10);
-        outb(0, (brdp->iobase + BBY_ATCONFR));
-        mdelay(1000);
-}
-
-/*****************************************************************************/
-
-/*
- *      The following routines act on original old Stallion boards.
- */
-
-static void stli_stalinit(struct stlibrd *brdp)
-{
-        outb(0x1, brdp->iobase);
-        mdelay(1000);
-}
-
-/*****************************************************************************/
-
-static void __iomem *stli_stalgetmemptr(struct stlibrd *brdp, unsigned long offset, int line)
-{       
-        BUG_ON(offset > brdp->memsize);
-        return brdp->membase + (offset % STAL_PAGESIZE);
-}
-
-/*****************************************************************************/
-
-static void stli_stalreset(struct stlibrd *brdp)
-{       
-        u32 __iomem *vecp;
-
-        vecp = (u32 __iomem *) (brdp->membase + 0x30);
-        writel(0xffff0000, vecp);
-        outb(0, brdp->iobase);
-        mdelay(1000);
-}
-
-/*****************************************************************************/
-
-/*
- *      Try to find an ECP board and initialize it. This handles only ECP
- *      board types.
- */
-
-static int stli_initecp(struct stlibrd *brdp)
-{
-        cdkecpsig_t sig;
-        cdkecpsig_t __iomem *sigsp;
-        unsigned int status, nxtid;
-        char *name;
-        int retval, panelnr, nrports;
-
-        if ((brdp->iobase == 0) || (brdp->memaddr == 0)) {
-                retval = -ENODEV;
-                goto err;
-        }
-
-        brdp->iosize = ECP_IOSIZE;
-
-        if (!request_region(brdp->iobase, brdp->iosize, "istallion")) {
-                retval = -EIO;
-                goto err;
-        }
-
-/*
- *      Based on the specific board type setup the common vars to access
- *      and enable shared memory. Set all board specific information now
- *      as well.
- */
-        switch (brdp->brdtype) {
-        case BRD_ECP:
-                brdp->memsize = ECP_MEMSIZE;
-                brdp->pagesize = ECP_ATPAGESIZE;
-                brdp->init = stli_ecpinit;
-                brdp->enable = stli_ecpenable;
-                brdp->reenable = stli_ecpenable;
-                brdp->disable = stli_ecpdisable;
-                brdp->getmemptr = stli_ecpgetmemptr;
-                brdp->intr = stli_ecpintr;
-                brdp->reset = stli_ecpreset;
-                name = "serial(EC8/64)";
-                break;
-
-        case BRD_ECPE:
-                brdp->memsize = ECP_MEMSIZE;
-                brdp->pagesize = ECP_EIPAGESIZE;
-                brdp->init = stli_ecpeiinit;
-                brdp->enable = stli_ecpeienable;
-                brdp->reenable = stli_ecpeienable;
-                brdp->disable = stli_ecpeidisable;
-                brdp->getmemptr = stli_ecpeigetmemptr;
-                brdp->intr = stli_ecpintr;
-                brdp->reset = stli_ecpeireset;
-                name = "serial(EC8/64-EI)";
-                break;
-
-        case BRD_ECPMC:
-                brdp->memsize = ECP_MEMSIZE;
-                brdp->pagesize = ECP_MCPAGESIZE;
-                brdp->init = NULL;
-                brdp->enable = stli_ecpmcenable;
-                brdp->reenable = stli_ecpmcenable;
-                brdp->disable = stli_ecpmcdisable;
-                brdp->getmemptr = stli_ecpmcgetmemptr;
-                brdp->intr = stli_ecpintr;
-                brdp->reset = stli_ecpmcreset;
-                name = "serial(EC8/64-MCA)";
-                break;
-
-        case BRD_ECPPCI:
-                brdp->memsize = ECP_PCIMEMSIZE;
-                brdp->pagesize = ECP_PCIPAGESIZE;
-                brdp->init = stli_ecppciinit;
-                brdp->enable = NULL;
-                brdp->reenable = NULL;
-                brdp->disable = NULL;
-                brdp->getmemptr = stli_ecppcigetmemptr;
-                brdp->intr = stli_ecpintr;
-                brdp->reset = stli_ecppcireset;
-                name = "serial(EC/RA-PCI)";
-                break;
-
-        default:
-                retval = -EINVAL;
-                goto err_reg;
-        }
-
-/*
- *      The per-board operations structure is all set up, so now let's go
- *      and get the board operational. Firstly initialize board configuration
- *      registers. Set the memory mapping info so we can get at the boards
- *      shared memory.
- */
-        EBRDINIT(brdp);
-
-        brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
-        if (brdp->membase == NULL) {
-                retval = -ENOMEM;
-                goto err_reg;
-        }
-
-/*
- *      Now that all specific code is set up, enable the shared memory and
- *      look for the a signature area that will tell us exactly what board
- *      this is, and what it is connected to it.
- */
-        EBRDENABLE(brdp);
-        sigsp = (cdkecpsig_t __iomem *) EBRDGETMEMPTR(brdp, CDK_SIGADDR);
-        memcpy_fromio(&sig, sigsp, sizeof(cdkecpsig_t));
-        EBRDDISABLE(brdp);
-
-        if (sig.magic != cpu_to_le32(ECP_MAGIC)) {
-                retval = -ENODEV;
-                goto err_unmap;
-        }
-
-/*
- *      Scan through the signature looking at the panels connected to the
- *      board. Calculate the total number of ports as we go.
- */
-        for (panelnr = 0, nxtid = 0; (panelnr < STL_MAXPANELS); panelnr++) {
-                status = sig.panelid[nxtid];
-                if ((status & ECH_PNLIDMASK) != nxtid)
-                        break;
-
-                brdp->panelids[panelnr] = status;
-                nrports = (status & ECH_PNL16PORT) ? 16 : 8;
-                if ((nrports == 16) && ((status & ECH_PNLXPID) == 0))
-                        nxtid++;
-                brdp->panels[panelnr] = nrports;
-                brdp->nrports += nrports;
-                nxtid++;
-                brdp->nrpanels++;
-        }
-
-
-        set_bit(BST_FOUND, &brdp->state);
-        return 0;
-err_unmap:
-        iounmap(brdp->membase);
-        brdp->membase = NULL;
-err_reg:
-        release_region(brdp->iobase, brdp->iosize);
-err:
-        return retval;
-}
-
-/*****************************************************************************/
-
-/*
- *      Try to find an ONboard, Brumby or Stallion board and initialize it.
- *      This handles only these board types.
- */
-
-static int stli_initonb(struct stlibrd *brdp)
-{
-        cdkonbsig_t sig;
-        cdkonbsig_t __iomem *sigsp;
-        char *name;
-        int i, retval;
-
-/*
- *      Do a basic sanity check on the IO and memory addresses.
- */
-        if (brdp->iobase == 0 || brdp->memaddr == 0) {
-                retval = -ENODEV;
-                goto err;
-        }
-
-        brdp->iosize = ONB_IOSIZE;
-        
-        if (!request_region(brdp->iobase, brdp->iosize, "istallion")) {
-                retval = -EIO;
-                goto err;
-        }
-
-/*
- *      Based on the specific board type setup the common vars to access
- *      and enable shared memory. Set all board specific information now
- *      as well.
- */
-        switch (brdp->brdtype) {
-        case BRD_ONBOARD:
-        case BRD_ONBOARD2:
-                brdp->memsize = ONB_MEMSIZE;
-                brdp->pagesize = ONB_ATPAGESIZE;
-                brdp->init = stli_onbinit;
-                brdp->enable = stli_onbenable;
-                brdp->reenable = stli_onbenable;
-                brdp->disable = stli_onbdisable;
-                brdp->getmemptr = stli_onbgetmemptr;
-                brdp->intr = stli_ecpintr;
-                brdp->reset = stli_onbreset;
-                if (brdp->memaddr > 0x100000)
-                        brdp->enabval = ONB_MEMENABHI;
-                else
-                        brdp->enabval = ONB_MEMENABLO;
-                name = "serial(ONBoard)";
-                break;
-
-        case BRD_ONBOARDE:
-                brdp->memsize = ONB_EIMEMSIZE;
-                brdp->pagesize = ONB_EIPAGESIZE;
-                brdp->init = stli_onbeinit;
-                brdp->enable = stli_onbeenable;
-                brdp->reenable = stli_onbeenable;
-                brdp->disable = stli_onbedisable;
-                brdp->getmemptr = stli_onbegetmemptr;
-                brdp->intr = stli_ecpintr;
-                brdp->reset = stli_onbereset;
-                name = "serial(ONBoard/E)";
-                break;
-
-        case BRD_BRUMBY4:
-                brdp->memsize = BBY_MEMSIZE;
-                brdp->pagesize = BBY_PAGESIZE;
-                brdp->init = stli_bbyinit;
-                brdp->enable = NULL;
-                brdp->reenable = NULL;
-                brdp->disable = NULL;
-                brdp->getmemptr = stli_bbygetmemptr;
-                brdp->intr = stli_ecpintr;
-                brdp->reset = stli_bbyreset;
-                name = "serial(Brumby)";
-                break;
-
-        case BRD_STALLION:
-                brdp->memsize = STAL_MEMSIZE;
-                brdp->pagesize = STAL_PAGESIZE;
-                brdp->init = stli_stalinit;
-                brdp->enable = NULL;
-                brdp->reenable = NULL;
-                brdp->disable = NULL;
-                brdp->getmemptr = stli_stalgetmemptr;
-                brdp->intr = stli_ecpintr;
-                brdp->reset = stli_stalreset;
-                name = "serial(Stallion)";
-                break;
-
-        default:
-                retval = -EINVAL;
-                goto err_reg;
-        }
-
-/*
- *      The per-board operations structure is all set up, so now let's go
- *      and get the board operational. Firstly initialize board configuration
- *      registers. Set the memory mapping info so we can get at the boards
- *      shared memory.
- */
-        EBRDINIT(brdp);
-
-        brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
-        if (brdp->membase == NULL) {
-                retval = -ENOMEM;
-                goto err_reg;
-        }
-
-/*
- *      Now that all specific code is set up, enable the shared memory and
- *      look for the a signature area that will tell us exactly what board
- *      this is, and how many ports.
- */
-        EBRDENABLE(brdp);
-        sigsp = (cdkonbsig_t __iomem *) EBRDGETMEMPTR(brdp, CDK_SIGADDR);
-        memcpy_fromio(&sig, sigsp, sizeof(cdkonbsig_t));
-        EBRDDISABLE(brdp);
-
-        if (sig.magic0 != cpu_to_le16(ONB_MAGIC0) ||
-            sig.magic1 != cpu_to_le16(ONB_MAGIC1) ||
-            sig.magic2 != cpu_to_le16(ONB_MAGIC2) ||
-            sig.magic3 != cpu_to_le16(ONB_MAGIC3)) {
-                retval = -ENODEV;
-                goto err_unmap;
-        }
-
-/*
- *      Scan through the signature alive mask and calculate how many ports
- *      there are on this board.
- */
-        brdp->nrpanels = 1;
-        if (sig.amask1) {
-                brdp->nrports = 32;
-        } else {
-                for (i = 0; (i < 16); i++) {
-                        if (((sig.amask0 << i) & 0x8000) == 0)
-                                break;
-                }
-                brdp->nrports = i;
-        }
-        brdp->panels[0] = brdp->nrports;
-
-
-        set_bit(BST_FOUND, &brdp->state);
-        return 0;
-err_unmap:
-        iounmap(brdp->membase);
-        brdp->membase = NULL;
-err_reg:
-        release_region(brdp->iobase, brdp->iosize);
-err:
-        return retval;
-}
-
-/*****************************************************************************/
-
-/*
- *      Start up a running board. This routine is only called after the
- *      code has been down loaded to the board and is operational. It will
- *      read in the memory map, and get the show on the road...
- */
-
-static int stli_startbrd(struct stlibrd *brdp)
-{
-        cdkhdr_t __iomem *hdrp;
-        cdkmem_t __iomem *memp;
-        cdkasy_t __iomem *ap;
-        unsigned long flags;
-        unsigned int portnr, nrdevs, i;
-        struct stliport *portp;
-        int rc = 0;
-        u32 memoff;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        EBRDENABLE(brdp);
-        hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);
-        nrdevs = hdrp->nrdevs;
-
-#if 0
-        printk("%s(%d): CDK version %d.%d.%d --> "
-                "nrdevs=%d memp=%x hostp=%x slavep=%x\n",
-                 __FILE__, __LINE__, readb(&hdrp->ver_release), readb(&hdrp->ver_modification),
-                 readb(&hdrp->ver_fix), nrdevs, (int) readl(&hdrp->memp), readl(&hdrp->hostp),
-                 readl(&hdrp->slavep));
-#endif
-
-        if (nrdevs < (brdp->nrports + 1)) {
-                printk(KERN_ERR "istallion: slave failed to allocate memory for "
-                                "all devices, devices=%d\n", nrdevs);
-                brdp->nrports = nrdevs - 1;
-        }
-        brdp->nrdevs = nrdevs;
-        brdp->hostoffset = hdrp->hostp - CDK_CDKADDR;
-        brdp->slaveoffset = hdrp->slavep - CDK_CDKADDR;
-        brdp->bitsize = (nrdevs + 7) / 8;
-        memoff = readl(&hdrp->memp);
-        if (memoff > brdp->memsize) {
-                printk(KERN_ERR "istallion: corrupted shared memory region?\n");
-                rc = -EIO;
-                goto stli_donestartup;
-        }
-        memp = (cdkmem_t __iomem *) EBRDGETMEMPTR(brdp, memoff);
-        if (readw(&memp->dtype) != TYP_ASYNCTRL) {
-                printk(KERN_ERR "istallion: no slave control device found\n");
-                goto stli_donestartup;
-        }
-        memp++;
-
-/*
- *      Cycle through memory allocation of each port. We are guaranteed to
- *      have all ports inside the first page of slave window, so no need to
- *      change pages while reading memory map.
- */
-        for (i = 1, portnr = 0; (i < nrdevs); i++, portnr++, memp++) {
-                if (readw(&memp->dtype) != TYP_ASYNC)
-                        break;
-                portp = brdp->ports[portnr];
-                if (portp == NULL)
-                        break;
-                portp->devnr = i;
-                portp->addr = readl(&memp->offset);
-                portp->reqbit = (unsigned char) (0x1 << (i * 8 / nrdevs));
-                portp->portidx = (unsigned char) (i / 8);
-                portp->portbit = (unsigned char) (0x1 << (i % 8));
-        }
-
-        writeb(0xff, &hdrp->slavereq);
-
-/*
- *      For each port setup a local copy of the RX and TX buffer offsets
- *      and sizes. We do this separate from the above, because we need to
- *      move the shared memory page...
- */
-        for (i = 1, portnr = 0; (i < nrdevs); i++, portnr++) {
-                portp = brdp->ports[portnr];
-                if (portp == NULL)
-                        break;
-                if (portp->addr == 0)
-                        break;
-                ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp->addr);
-                if (ap != NULL) {
-                        portp->rxsize = readw(&ap->rxq.size);
-                        portp->txsize = readw(&ap->txq.size);
-                        portp->rxoffset = readl(&ap->rxq.offset);
-                        portp->txoffset = readl(&ap->txq.offset);
-                }
-        }
-
-stli_donestartup:
-        EBRDDISABLE(brdp);
-        spin_unlock_irqrestore(&brd_lock, flags);
-
-        if (rc == 0)
-                set_bit(BST_STARTED, &brdp->state);
-
-        if (! stli_timeron) {
-                stli_timeron++;
-                mod_timer(&stli_timerlist, STLI_TIMEOUT);
-        }
-
-        return rc;
-}
-
-/*****************************************************************************/
-
-/*
- *      Probe and initialize the specified board.
- */
-
-static int __devinit stli_brdinit(struct stlibrd *brdp)
-{
-        int retval;
-
-        switch (brdp->brdtype) {
-        case BRD_ECP:
-        case BRD_ECPE:
-        case BRD_ECPMC:
-        case BRD_ECPPCI:
-                retval = stli_initecp(brdp);
-                break;
-        case BRD_ONBOARD:
-        case BRD_ONBOARDE:
-        case BRD_ONBOARD2:
-        case BRD_BRUMBY4:
-        case BRD_STALLION:
-                retval = stli_initonb(brdp);
-                break;
-        default:
-                printk(KERN_ERR "istallion: board=%d is unknown board "
-                                "type=%d\n", brdp->brdnr, brdp->brdtype);
-                retval = -ENODEV;
-        }
-
-        if (retval)
-                return retval;
-
-        stli_initports(brdp);
-        printk(KERN_INFO "istallion: %s found, board=%d io=%x mem=%x "
-                "nrpanels=%d nrports=%d\n", stli_brdnames[brdp->brdtype],
-                brdp->brdnr, brdp->iobase, (int) brdp->memaddr,
-                brdp->nrpanels, brdp->nrports);
-        return 0;
-}
-
-#if STLI_EISAPROBE != 0
-/*****************************************************************************/
-
-/*
- *      Probe around trying to find where the EISA boards shared memory
- *      might be. This is a bit if hack, but it is the best we can do.
- */
-
-static int stli_eisamemprobe(struct stlibrd *brdp)
-{
-        cdkecpsig_t     ecpsig, __iomem *ecpsigp;
-        cdkonbsig_t     onbsig, __iomem *onbsigp;
-        int             i, foundit;
-
-/*
- *      First up we reset the board, to get it into a known state. There
- *      is only 2 board types here we need to worry about. Don;t use the
- *      standard board init routine here, it programs up the shared
- *      memory address, and we don't know it yet...
- */
-        if (brdp->brdtype == BRD_ECPE) {
-                outb(0x1, (brdp->iobase + ECP_EIBRDENAB));
-                outb(ECP_EISTOP, (brdp->iobase + ECP_EICONFR));
-                udelay(10);
-                outb(ECP_EIDISABLE, (brdp->iobase + ECP_EICONFR));
-                udelay(500);
-                stli_ecpeienable(brdp);
-        } else if (brdp->brdtype == BRD_ONBOARDE) {
-                outb(0x1, (brdp->iobase + ONB_EIBRDENAB));
-                outb(ONB_EISTOP, (brdp->iobase + ONB_EICONFR));
-                udelay(10);
-                outb(ONB_EIDISABLE, (brdp->iobase + ONB_EICONFR));
-                mdelay(100);
-                outb(0x1, brdp->iobase);
-                mdelay(1);
-                stli_onbeenable(brdp);
-        } else {
-                return -ENODEV;
-        }
-
-        foundit = 0;
-        brdp->memsize = ECP_MEMSIZE;
-
-/*
- *      Board shared memory is enabled, so now we have a poke around and
- *      see if we can find it.
- */
-        for (i = 0; (i < stli_eisamempsize); i++) {
-                brdp->memaddr = stli_eisamemprobeaddrs[i];
-                brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
-                if (brdp->membase == NULL)
-                        continue;
-
-                if (brdp->brdtype == BRD_ECPE) {
-                        ecpsigp = stli_ecpeigetmemptr(brdp,
-                                CDK_SIGADDR, __LINE__);
-                        memcpy_fromio(&ecpsig, ecpsigp, sizeof(cdkecpsig_t));
-                        if (ecpsig.magic == cpu_to_le32(ECP_MAGIC))
-                                foundit = 1;
-                } else {
-                        onbsigp = (cdkonbsig_t __iomem *) stli_onbegetmemptr(brdp,
-                                CDK_SIGADDR, __LINE__);
-                        memcpy_fromio(&onbsig, onbsigp, sizeof(cdkonbsig_t));
-                        if ((onbsig.magic0 == cpu_to_le16(ONB_MAGIC0)) &&
-                            (onbsig.magic1 == cpu_to_le16(ONB_MAGIC1)) &&
-                            (onbsig.magic2 == cpu_to_le16(ONB_MAGIC2)) &&
-                            (onbsig.magic3 == cpu_to_le16(ONB_MAGIC3)))
-                                foundit = 1;
-                }
-
-                iounmap(brdp->membase);
-                if (foundit)
-                        break;
-        }
-
-/*
- *      Regardless of whether we found the shared memory or not we must
- *      disable the region. After that return success or failure.
- */
-        if (brdp->brdtype == BRD_ECPE)
-                stli_ecpeidisable(brdp);
-        else
-                stli_onbedisable(brdp);
-
-        if (! foundit) {
-                brdp->memaddr = 0;
-                brdp->membase = NULL;
-                printk(KERN_ERR "istallion: failed to probe shared memory "
-                                "region for %s in EISA slot=%d\n",
-                        stli_brdnames[brdp->brdtype], (brdp->iobase >> 12));
-                return -ENODEV;
-        }
-        return 0;
-}
-#endif
-
-static int stli_getbrdnr(void)
-{
-        unsigned int i;
-
-        for (i = 0; i < STL_MAXBRDS; i++) {
-                if (!stli_brds[i]) {
-                        if (i >= stli_nrbrds)
-                                stli_nrbrds = i + 1;
-                        return i;
-                }
-        }
-        return -1;
-}
-
-#if STLI_EISAPROBE != 0
-/*****************************************************************************/
-
-/*
- *      Probe around and try to find any EISA boards in system. The biggest
- *      problem here is finding out what memory address is associated with
- *      an EISA board after it is found. The registers of the ECPE and
- *      ONboardE are not readable - so we can't read them from there. We
- *      don't have access to the EISA CMOS (or EISA BIOS) so we don't
- *      actually have any way to find out the real value. The best we can
- *      do is go probing around in the usual places hoping we can find it.
- */
-
-static int __init stli_findeisabrds(void)
-{
-        struct stlibrd *brdp;
-        unsigned int iobase, eid, i;
-        int brdnr, found = 0;
-
-/*
- *      Firstly check if this is an EISA system.  If this is not an EISA system then
- *      don't bother going any further!
- */
-        if (EISA_bus)
-                return 0;
-
-/*
- *      Looks like an EISA system, so go searching for EISA boards.
- */
-        for (iobase = 0x1000; (iobase <= 0xc000); iobase += 0x1000) {
-                outb(0xff, (iobase + 0xc80));
-                eid = inb(iobase + 0xc80);
-                eid |= inb(iobase + 0xc81) << 8;
-                if (eid != STL_EISAID)
-                        continue;
-
-/*
- *              We have found a board. Need to check if this board was
- *              statically configured already (just in case!).
- */
-                for (i = 0; (i < STL_MAXBRDS); i++) {
-                        brdp = stli_brds[i];
-                        if (brdp == NULL)
-                                continue;
-                        if (brdp->iobase == iobase)
-                                break;
-                }
-                if (i < STL_MAXBRDS)
-                        continue;
-
-/*
- *              We have found a Stallion board and it is not configured already.
- *              Allocate a board structure and initialize it.
- */
-                if ((brdp = stli_allocbrd()) == NULL)
-                        return found ? : -ENOMEM;
-                brdnr = stli_getbrdnr();
-                if (brdnr < 0)
-                        return found ? : -ENOMEM;
-                brdp->brdnr = (unsigned int)brdnr;
-                eid = inb(iobase + 0xc82);
-                if (eid == ECP_EISAID)
-                        brdp->brdtype = BRD_ECPE;
-                else if (eid == ONB_EISAID)
-                        brdp->brdtype = BRD_ONBOARDE;
-                else
-                        brdp->brdtype = BRD_UNKNOWN;
-                brdp->iobase = iobase;
-                outb(0x1, (iobase + 0xc84));
-                if (stli_eisamemprobe(brdp))
-                        outb(0, (iobase + 0xc84));
-                if (stli_brdinit(brdp) < 0) {
-                        kfree(brdp);
-                        continue;
-                }
-
-                stli_brds[brdp->brdnr] = brdp;
-                found++;
-
-                for (i = 0; i < brdp->nrports; i++)
-                        tty_register_device(stli_serial,
-                                        brdp->brdnr * STL_MAXPORTS + i, NULL);
-        }
-
-        return found;
-}
-#else
-static inline int stli_findeisabrds(void) { return 0; }
-#endif
-
-/*****************************************************************************/
-
-/*
- *      Find the next available board number that is free.
- */
-
-/*****************************************************************************/
-
-/*
- *      We have a Stallion board. Allocate a board structure and
- *      initialize it. Read its IO and MEMORY resources from PCI
- *      configuration space.
- */
-
-static int __devinit stli_pciprobe(struct pci_dev *pdev,
-                const struct pci_device_id *ent)
-{
-        struct stlibrd *brdp;
-        unsigned int i;
-        int brdnr, retval = -EIO;
-
-        retval = pci_enable_device(pdev);
-        if (retval)
-                goto err;
-        brdp = stli_allocbrd();
-        if (brdp == NULL) {
-                retval = -ENOMEM;
-                goto err;
-        }
-        mutex_lock(&stli_brdslock);
-        brdnr = stli_getbrdnr();
-        if (brdnr < 0) {
-                printk(KERN_INFO "istallion: too many boards found, "
-                        "maximum supported %d\n", STL_MAXBRDS);
-                mutex_unlock(&stli_brdslock);
-                retval = -EIO;
-                goto err_fr;
-        }
-        brdp->brdnr = (unsigned int)brdnr;
-        stli_brds[brdp->brdnr] = brdp;
-        mutex_unlock(&stli_brdslock);
-        brdp->brdtype = BRD_ECPPCI;
-/*
- *      We have all resources from the board, so lets setup the actual
- *      board structure now.
- */
-        brdp->iobase = pci_resource_start(pdev, 3);
-        brdp->memaddr = pci_resource_start(pdev, 2);
-        retval = stli_brdinit(brdp);
-        if (retval)
-                goto err_null;
-
-        set_bit(BST_PROBED, &brdp->state);
-        pci_set_drvdata(pdev, brdp);
-
-        EBRDENABLE(brdp);
-        brdp->enable = NULL;
-        brdp->disable = NULL;
-
-        for (i = 0; i < brdp->nrports; i++)
-                tty_register_device(stli_serial, brdp->brdnr * STL_MAXPORTS + i,
-                                &pdev->dev);
-
-        return 0;
-err_null:
-        stli_brds[brdp->brdnr] = NULL;
-err_fr:
-        kfree(brdp);
-err:
-        return retval;
-}
-
-static void __devexit stli_pciremove(struct pci_dev *pdev)
-{
-        struct stlibrd *brdp = pci_get_drvdata(pdev);
-
-        stli_cleanup_ports(brdp);
-
-        iounmap(brdp->membase);
-        if (brdp->iosize > 0)
-                release_region(brdp->iobase, brdp->iosize);
-
-        stli_brds[brdp->brdnr] = NULL;
-        kfree(brdp);
-}
-
-static struct pci_driver stli_pcidriver = {
-        .name = "istallion",
-        .id_table = istallion_pci_tbl,
-        .probe = stli_pciprobe,
-        .remove = __devexit_p(stli_pciremove)
-};
-/*****************************************************************************/
-
-/*
- *      Allocate a new board structure. Fill out the basic info in it.
- */
-
-static struct stlibrd *stli_allocbrd(void)
-{
-        struct stlibrd *brdp;
-
-        brdp = kzalloc(sizeof(struct stlibrd), GFP_KERNEL);
-        if (!brdp) {
-                printk(KERN_ERR "istallion: failed to allocate memory "
-                                "(size=%Zd)\n", sizeof(struct stlibrd));
-                return NULL;
-        }
-        brdp->magic = STLI_BOARDMAGIC;
-        return brdp;
-}
-
-/*****************************************************************************/
-
-/*
- *      Scan through all the boards in the configuration and see what we
- *      can find.
- */
-
-static int __init stli_initbrds(void)
-{
-        struct stlibrd *brdp, *nxtbrdp;
-        struct stlconf conf;
-        unsigned int i, j, found = 0;
-        int retval;
-
-        for (stli_nrbrds = 0; stli_nrbrds < ARRAY_SIZE(stli_brdsp);
-                        stli_nrbrds++) {
-                memset(&conf, 0, sizeof(conf));
-                if (stli_parsebrd(&conf, stli_brdsp[stli_nrbrds]) == 0)
-                        continue;
-                if ((brdp = stli_allocbrd()) == NULL)
-                        continue;
-                brdp->brdnr = stli_nrbrds;
-                brdp->brdtype = conf.brdtype;
-                brdp->iobase = conf.ioaddr1;
-                brdp->memaddr = conf.memaddr;
-                if (stli_brdinit(brdp) < 0) {
-                        kfree(brdp);
-                        continue;
-                }
-                stli_brds[brdp->brdnr] = brdp;
-                found++;
-
-                for (i = 0; i < brdp->nrports; i++)
-                        tty_register_device(stli_serial,
-                                        brdp->brdnr * STL_MAXPORTS + i, NULL);
-        }
-
-        retval = stli_findeisabrds();
-        if (retval > 0)
-                found += retval;
-
-/*
- *      All found boards are initialized. Now for a little optimization, if
- *      no boards are sharing the "shared memory" regions then we can just
- *      leave them all enabled. This is in fact the usual case.
- */
-        stli_shared = 0;
-        if (stli_nrbrds > 1) {
-                for (i = 0; (i < stli_nrbrds); i++) {
-                        brdp = stli_brds[i];
-                        if (brdp == NULL)
-                                continue;
-                        for (j = i + 1; (j < stli_nrbrds); j++) {
-                                nxtbrdp = stli_brds[j];
-                                if (nxtbrdp == NULL)
-                                        continue;
-                                if ((brdp->membase >= nxtbrdp->membase) &&
-                                    (brdp->membase <= (nxtbrdp->membase +
-                                    nxtbrdp->memsize - 1))) {
-                                        stli_shared++;
-                                        break;
-                                }
-                        }
-                }
-        }
-
-        if (stli_shared == 0) {
-                for (i = 0; (i < stli_nrbrds); i++) {
-                        brdp = stli_brds[i];
-                        if (brdp == NULL)
-                                continue;
-                        if (test_bit(BST_FOUND, &brdp->state)) {
-                                EBRDENABLE(brdp);
-                                brdp->enable = NULL;
-                                brdp->disable = NULL;
-                        }
-                }
-        }
-
-        retval = pci_register_driver(&stli_pcidriver);
-        if (retval && found == 0) {
-                printk(KERN_ERR "Neither isa nor eisa cards found nor pci "
-                                "driver can be registered!\n");
-                goto err;
-        }
-
-        return 0;
-err:
-        return retval;
-}
-
-/*****************************************************************************/
-
-/*
- *      Code to handle an "staliomem" read operation. This device is the 
- *      contents of the board shared memory. It is used for down loading
- *      the slave image (and debugging :-)
- */
-
-static ssize_t stli_memread(struct file *fp, char __user *buf, size_t count, loff_t *offp)
-{
-        unsigned long flags;
-        void __iomem *memptr;
-        struct stlibrd *brdp;
-        unsigned int brdnr;
-        int size, n;
-        void *p;
-        loff_t off = *offp;
-
-        brdnr = iminor(fp->f_path.dentry->d_inode);
-        if (brdnr >= stli_nrbrds)
-                return -ENODEV;
-        brdp = stli_brds[brdnr];
-        if (brdp == NULL)
-                return -ENODEV;
-        if (brdp->state == 0)
-                return -ENODEV;
-        if (off >= brdp->memsize || off + count < off)
-                return 0;
-
-        size = min(count, (size_t)(brdp->memsize - off));
-
-        /*
-         *      Copy the data a page at a time
-         */
-
-        p = (void *)__get_free_page(GFP_KERNEL);
-        if(p == NULL)
-                return -ENOMEM;
-
-        while (size > 0) {
-                spin_lock_irqsave(&brd_lock, flags);
-                EBRDENABLE(brdp);
-                memptr = EBRDGETMEMPTR(brdp, off);
-                n = min(size, (int)(brdp->pagesize - (((unsigned long) off) % brdp->pagesize)));
-                n = min(n, (int)PAGE_SIZE);
-                memcpy_fromio(p, memptr, n);
-                EBRDDISABLE(brdp);
-                spin_unlock_irqrestore(&brd_lock, flags);
-                if (copy_to_user(buf, p, n)) {
-                        count = -EFAULT;
-                        goto out;
-                }
-                off += n;
-                buf += n;
-                size -= n;
-        }
-out:
-        *offp = off;
-        free_page((unsigned long)p);
-        return count;
-}
-
-/*****************************************************************************/
-
-/*
- *      Code to handle an "staliomem" write operation. This device is the 
- *      contents of the board shared memory. It is used for down loading
- *      the slave image (and debugging :-)
- *
- *      FIXME: copy under lock
- */
-
-static ssize_t stli_memwrite(struct file *fp, const char __user *buf, size_t count, loff_t *offp)
-{
-        unsigned long flags;
-        void __iomem *memptr;
-        struct stlibrd *brdp;
-        char __user *chbuf;
-        unsigned int brdnr;
-        int size, n;
-        void *p;
-        loff_t off = *offp;
-
-        brdnr = iminor(fp->f_path.dentry->d_inode);
-
-        if (brdnr >= stli_nrbrds)
-                return -ENODEV;
-        brdp = stli_brds[brdnr];
-        if (brdp == NULL)
-                return -ENODEV;
-        if (brdp->state == 0)
-                return -ENODEV;
-        if (off >= brdp->memsize || off + count < off)
-                return 0;
-
-        chbuf = (char __user *) buf;
-        size = min(count, (size_t)(brdp->memsize - off));
-
-        /*
-         *      Copy the data a page at a time
-         */
-
-        p = (void *)__get_free_page(GFP_KERNEL);
-        if(p == NULL)
-                return -ENOMEM;
-
-        while (size > 0) {
-                n = min(size, (int)(brdp->pagesize - (((unsigned long) off) % brdp->pagesize)));
-                n = min(n, (int)PAGE_SIZE);
-                if (copy_from_user(p, chbuf, n)) {
-                        if (count == 0)
-                                count = -EFAULT;
-                        goto out;
-                }
-                spin_lock_irqsave(&brd_lock, flags);
-                EBRDENABLE(brdp);
-                memptr = EBRDGETMEMPTR(brdp, off);
-                memcpy_toio(memptr, p, n);
-                EBRDDISABLE(brdp);
-                spin_unlock_irqrestore(&brd_lock, flags);
-                off += n;
-                chbuf += n;
-                size -= n;
-        }
-out:
-        free_page((unsigned long) p);
-        *offp = off;
-        return count;
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the board stats structure to user app.
- */
-
-static int stli_getbrdstats(combrd_t __user *bp)
-{
-        struct stlibrd *brdp;
-        unsigned int i;
-
-        if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
-                return -EFAULT;
-        if (stli_brdstats.brd >= STL_MAXBRDS)
-                return -ENODEV;
-        brdp = stli_brds[stli_brdstats.brd];
-        if (brdp == NULL)
-                return -ENODEV;
-
-        memset(&stli_brdstats, 0, sizeof(combrd_t));
-
-        stli_brdstats.brd = brdp->brdnr;
-        stli_brdstats.type = brdp->brdtype;
-        stli_brdstats.hwid = 0;
-        stli_brdstats.state = brdp->state;
-        stli_brdstats.ioaddr = brdp->iobase;
-        stli_brdstats.memaddr = brdp->memaddr;
-        stli_brdstats.nrpanels = brdp->nrpanels;
-        stli_brdstats.nrports = brdp->nrports;
-        for (i = 0; (i < brdp->nrpanels); i++) {
-                stli_brdstats.panels[i].panel = i;
-                stli_brdstats.panels[i].hwid = brdp->panelids[i];
-                stli_brdstats.panels[i].nrports = brdp->panels[i];
-        }
-
-        if (copy_to_user(bp, &stli_brdstats, sizeof(combrd_t)))
-                return -EFAULT;
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Resolve the referenced port number into a port struct pointer.
- */
-
-static struct stliport *stli_getport(unsigned int brdnr, unsigned int panelnr,
-                unsigned int portnr)
-{
-        struct stlibrd *brdp;
-        unsigned int i;
-
-        if (brdnr >= STL_MAXBRDS)
-                return NULL;
-        brdp = stli_brds[brdnr];
-        if (brdp == NULL)
-                return NULL;
-        for (i = 0; (i < panelnr); i++)
-                portnr += brdp->panels[i];
-        if (portnr >= brdp->nrports)
-                return NULL;
-        return brdp->ports[portnr];
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the port stats structure to user app. A NULL port struct
- *      pointer passed in means that we need to find out from the app
- *      what port to get stats for (used through board control device).
- */
-
-static int stli_portcmdstats(struct tty_struct *tty, struct stliport *portp)
-{
-        unsigned long   flags;
-        struct stlibrd  *brdp;
-        int             rc;
-
-        memset(&stli_comstats, 0, sizeof(comstats_t));
-
-        if (portp == NULL)
-                return -ENODEV;
-        brdp = stli_brds[portp->brdnr];
-        if (brdp == NULL)
-                return -ENODEV;
-
-        mutex_lock(&portp->port.mutex);
-        if (test_bit(BST_STARTED, &brdp->state)) {
-                if ((rc = stli_cmdwait(brdp, portp, A_GETSTATS,
-                    &stli_cdkstats, sizeof(asystats_t), 1)) < 0) {
-                        mutex_unlock(&portp->port.mutex);
-                        return rc;
-                }
-        } else {
-                memset(&stli_cdkstats, 0, sizeof(asystats_t));
-        }
-
-        stli_comstats.brd = portp->brdnr;
-        stli_comstats.panel = portp->panelnr;
-        stli_comstats.port = portp->portnr;
-        stli_comstats.state = portp->state;
-        stli_comstats.flags = portp->port.flags;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        if (tty != NULL) {
-                if (portp->port.tty == tty) {
-                        stli_comstats.ttystate = tty->flags;
-                        stli_comstats.rxbuffered = -1;
-                        if (tty->termios != NULL) {
-                                stli_comstats.cflags = tty->termios->c_cflag;
-                                stli_comstats.iflags = tty->termios->c_iflag;
-                                stli_comstats.oflags = tty->termios->c_oflag;
-                                stli_comstats.lflags = tty->termios->c_lflag;
-                        }
-                }
-        }
-        spin_unlock_irqrestore(&brd_lock, flags);
-
-        stli_comstats.txtotal = stli_cdkstats.txchars;
-        stli_comstats.rxtotal = stli_cdkstats.rxchars + stli_cdkstats.ringover;
-        stli_comstats.txbuffered = stli_cdkstats.txringq;
-        stli_comstats.rxbuffered += stli_cdkstats.rxringq;
-        stli_comstats.rxoverrun = stli_cdkstats.overruns;
-        stli_comstats.rxparity = stli_cdkstats.parity;
-        stli_comstats.rxframing = stli_cdkstats.framing;
-        stli_comstats.rxlost = stli_cdkstats.ringover;
-        stli_comstats.rxbreaks = stli_cdkstats.rxbreaks;
-        stli_comstats.txbreaks = stli_cdkstats.txbreaks;
-        stli_comstats.txxon = stli_cdkstats.txstart;
-        stli_comstats.txxoff = stli_cdkstats.txstop;
-        stli_comstats.rxxon = stli_cdkstats.rxstart;
-        stli_comstats.rxxoff = stli_cdkstats.rxstop;
-        stli_comstats.rxrtsoff = stli_cdkstats.rtscnt / 2;
-        stli_comstats.rxrtson = stli_cdkstats.rtscnt - stli_comstats.rxrtsoff;
-        stli_comstats.modem = stli_cdkstats.dcdcnt;
-        stli_comstats.hwid = stli_cdkstats.hwid;
-        stli_comstats.signals = stli_mktiocm(stli_cdkstats.signals);
-        mutex_unlock(&portp->port.mutex);
-
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the port stats structure to user app. A NULL port struct
- *      pointer passed in means that we need to find out from the app
- *      what port to get stats for (used through board control device).
- */
-
-static int stli_getportstats(struct tty_struct *tty, struct stliport *portp,
-                                                        comstats_t __user *cp)
-{
-        struct stlibrd *brdp;
-        int rc;
-
-        if (!portp) {
-                if (copy_from_user(&stli_comstats, cp, sizeof(comstats_t)))
-                        return -EFAULT;
-                portp = stli_getport(stli_comstats.brd, stli_comstats.panel,
-                        stli_comstats.port);
-                if (!portp)
-                        return -ENODEV;
-        }
-
-        brdp = stli_brds[portp->brdnr];
-        if (!brdp)
-                return -ENODEV;
-
-        if ((rc = stli_portcmdstats(tty, portp)) < 0)
-                return rc;
-
-        return copy_to_user(cp, &stli_comstats, sizeof(comstats_t)) ?
-                        -EFAULT : 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Clear the port stats structure. We also return it zeroed out...
- */
-
-static int stli_clrportstats(struct stliport *portp, comstats_t __user *cp)
-{
-        struct stlibrd *brdp;
-        int rc;
-
-        if (!portp) {
-                if (copy_from_user(&stli_comstats, cp, sizeof(comstats_t)))
-                        return -EFAULT;
-                portp = stli_getport(stli_comstats.brd, stli_comstats.panel,
-                        stli_comstats.port);
-                if (!portp)
-                        return -ENODEV;
-        }
-
-        brdp = stli_brds[portp->brdnr];
-        if (!brdp)
-                return -ENODEV;
-
-        mutex_lock(&portp->port.mutex);
-
-        if (test_bit(BST_STARTED, &brdp->state)) {
-                if ((rc = stli_cmdwait(brdp, portp, A_CLEARSTATS, NULL, 0, 0)) < 0) {
-                        mutex_unlock(&portp->port.mutex);
-                        return rc;
-                }
-        }
-
-        memset(&stli_comstats, 0, sizeof(comstats_t));
-        stli_comstats.brd = portp->brdnr;
-        stli_comstats.panel = portp->panelnr;
-        stli_comstats.port = portp->portnr;
-        mutex_unlock(&portp->port.mutex);
-
-        if (copy_to_user(cp, &stli_comstats, sizeof(comstats_t)))
-                return -EFAULT;
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the entire driver ports structure to a user app.
- */
-
-static int stli_getportstruct(struct stliport __user *arg)
-{
-        struct stliport stli_dummyport;
-        struct stliport *portp;
-
-        if (copy_from_user(&stli_dummyport, arg, sizeof(struct stliport)))
-                return -EFAULT;
-        portp = stli_getport(stli_dummyport.brdnr, stli_dummyport.panelnr,
-                 stli_dummyport.portnr);
-        if (!portp)
-                return -ENODEV;
-        if (copy_to_user(arg, portp, sizeof(struct stliport)))
-                return -EFAULT;
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the entire driver board structure to a user app.
- */
-
-static int stli_getbrdstruct(struct stlibrd __user *arg)
-{
-        struct stlibrd stli_dummybrd;
-        struct stlibrd *brdp;
-
-        if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd)))
-                return -EFAULT;
-        if (stli_dummybrd.brdnr >= STL_MAXBRDS)
-                return -ENODEV;
-        brdp = stli_brds[stli_dummybrd.brdnr];
-        if (!brdp)
-                return -ENODEV;
-        if (copy_to_user(arg, brdp, sizeof(struct stlibrd)))
-                return -EFAULT;
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      The "staliomem" device is also required to do some special operations on
- *      the board. We need to be able to send an interrupt to the board,
- *      reset it, and start/stop it.
- */
-
-static long stli_memioctl(struct file *fp, unsigned int cmd, unsigned long arg)
-{
-        struct stlibrd *brdp;
-        int brdnr, rc, done;
-        void __user *argp = (void __user *)arg;
-
-/*
- *      First up handle the board independent ioctls.
- */
-        done = 0;
-        rc = 0;
-
-        switch (cmd) {
-        case COM_GETPORTSTATS:
-                rc = stli_getportstats(NULL, NULL, argp);
-                done++;
-                break;
-        case COM_CLRPORTSTATS:
-                rc = stli_clrportstats(NULL, argp);
-                done++;
-                break;
-        case COM_GETBRDSTATS:
-                rc = stli_getbrdstats(argp);
-                done++;
-                break;
-        case COM_READPORT:
-                rc = stli_getportstruct(argp);
-                done++;
-                break;
-        case COM_READBOARD:
-                rc = stli_getbrdstruct(argp);
-                done++;
-                break;
-        }
-        if (done)
-                return rc;
-
-/*
- *      Now handle the board specific ioctls. These all depend on the
- *      minor number of the device they were called from.
- */
-        brdnr = iminor(fp->f_dentry->d_inode);
-        if (brdnr >= STL_MAXBRDS)
-                return -ENODEV;
-        brdp = stli_brds[brdnr];
-        if (!brdp)
-                return -ENODEV;
-        if (brdp->state == 0)
-                return -ENODEV;
-
-        switch (cmd) {
-        case STL_BINTR:
-                EBRDINTR(brdp);
-                break;
-        case STL_BSTART:
-                rc = stli_startbrd(brdp);
-                break;
-        case STL_BSTOP:
-                clear_bit(BST_STARTED, &brdp->state);
-                break;
-        case STL_BRESET:
-                clear_bit(BST_STARTED, &brdp->state);
-                EBRDRESET(brdp);
-                if (stli_shared == 0) {
-                        if (brdp->reenable != NULL)
-                                (* brdp->reenable)(brdp);
-                }
-                break;
-        default:
-                rc = -ENOIOCTLCMD;
-                break;
-        }
-        return rc;
-}
-
-static const struct tty_operations stli_ops = {
-        .open = stli_open,
-        .close = stli_close,
-        .write = stli_write,
-        .put_char = stli_putchar,
-        .flush_chars = stli_flushchars,
-        .write_room = stli_writeroom,
-        .chars_in_buffer = stli_charsinbuffer,
-        .ioctl = stli_ioctl,
-        .set_termios = stli_settermios,
-        .throttle = stli_throttle,
-        .unthrottle = stli_unthrottle,
-        .stop = stli_stop,
-        .start = stli_start,
-        .hangup = stli_hangup,
-        .flush_buffer = stli_flushbuffer,
-        .break_ctl = stli_breakctl,
-        .wait_until_sent = stli_waituntilsent,
-        .send_xchar = stli_sendxchar,
-        .tiocmget = stli_tiocmget,
-        .tiocmset = stli_tiocmset,
-        .proc_fops = &stli_proc_fops,
-};
-
-static const struct tty_port_operations stli_port_ops = {
-        .carrier_raised = stli_carrier_raised,
-        .dtr_rts = stli_dtr_rts,
-        .activate = stli_activate,
-        .shutdown = stli_shutdown,
-};
-
-/*****************************************************************************/
-/*
- *      Loadable module initialization stuff.
- */
-
-static void istallion_cleanup_isa(void)
-{
-        struct stlibrd  *brdp;
-        unsigned int j;
-
-        for (j = 0; (j < stli_nrbrds); j++) {
-                if ((brdp = stli_brds[j]) == NULL ||
-                                test_bit(BST_PROBED, &brdp->state))
-                        continue;
-
-                stli_cleanup_ports(brdp);
-
-                iounmap(brdp->membase);
-                if (brdp->iosize > 0)
-                        release_region(brdp->iobase, brdp->iosize);
-                kfree(brdp);
-                stli_brds[j] = NULL;
-        }
-}
-
-static int __init istallion_module_init(void)
-{
-        unsigned int i;
-        int retval;
-
-        printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion);
-
-        spin_lock_init(&stli_lock);
-        spin_lock_init(&brd_lock);
-
-        stli_txcookbuf = kmalloc(STLI_TXBUFSIZE, GFP_KERNEL);
-        if (!stli_txcookbuf) {
-                printk(KERN_ERR "istallion: failed to allocate memory "
-                                "(size=%d)\n", STLI_TXBUFSIZE);
-                retval = -ENOMEM;
-                goto err;
-        }
-
-        stli_serial = alloc_tty_driver(STL_MAXBRDS * STL_MAXPORTS);
-        if (!stli_serial) {
-                retval = -ENOMEM;
-                goto err_free;
-        }
-
-        stli_serial->owner = THIS_MODULE;
-        stli_serial->driver_name = stli_drvname;
-        stli_serial->name = stli_serialname;
-        stli_serial->major = STL_SERIALMAJOR;
-        stli_serial->minor_start = 0;
-        stli_serial->type = TTY_DRIVER_TYPE_SERIAL;
-        stli_serial->subtype = SERIAL_TYPE_NORMAL;
-        stli_serial->init_termios = stli_deftermios;
-        stli_serial->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-        tty_set_operations(stli_serial, &stli_ops);
-
-        retval = tty_register_driver(stli_serial);
-        if (retval) {
-                printk(KERN_ERR "istallion: failed to register serial driver\n");
-                goto err_ttyput;
-        }
-
-        retval = stli_initbrds();
-        if (retval)
-                goto err_ttyunr;
-
-/*
- *      Set up a character driver for the shared memory region. We need this
- *      to down load the slave code image. Also it is a useful debugging tool.
- */
-        retval = register_chrdev(STL_SIOMEMMAJOR, "staliomem", &stli_fsiomem);
-        if (retval) {
-                printk(KERN_ERR "istallion: failed to register serial memory "
-                                "device\n");
-                goto err_deinit;
-        }
-
-        istallion_class = class_create(THIS_MODULE, "staliomem");
-        for (i = 0; i < 4; i++)
-                device_create(istallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),
-                              NULL, "staliomem%d", i);
-
-        return 0;
-err_deinit:
-        pci_unregister_driver(&stli_pcidriver);
-        istallion_cleanup_isa();
-err_ttyunr:
-        tty_unregister_driver(stli_serial);
-err_ttyput:
-        put_tty_driver(stli_serial);
-err_free:
-        kfree(stli_txcookbuf);
-err:
-        return retval;
-}
-
-/*****************************************************************************/
-
-static void __exit istallion_module_exit(void)
-{
-        unsigned int j;
-
-        printk(KERN_INFO "Unloading %s: version %s\n", stli_drvtitle,
-                stli_drvversion);
-
-        if (stli_timeron) {
-                stli_timeron = 0;
-                del_timer_sync(&stli_timerlist);
-        }
-
-        unregister_chrdev(STL_SIOMEMMAJOR, "staliomem");
-
-        for (j = 0; j < 4; j++)
-                device_destroy(istallion_class, MKDEV(STL_SIOMEMMAJOR, j));
-        class_destroy(istallion_class);
-
-        pci_unregister_driver(&stli_pcidriver);
-        istallion_cleanup_isa();
-
-        tty_unregister_driver(stli_serial);
-        put_tty_driver(stli_serial);
-
-        kfree(stli_txcookbuf);
-}
-
-module_init(istallion_module_init);
-module_exit(istallion_module_exit);
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
deleted file mode 100644
index a7ca75212bfe..000000000000
--- a/drivers/char/keyboard.c
+++ /dev/null
@@ -1,1437 +0,0 @@
-/*
- * linux/drivers/char/keyboard.c
- *
- * Written for linux by Johan Myreen as a translation from
- * the assembly version by Linus (with diacriticals added)
- *
- * Some additional features added by Christoph Niemann (ChN), March 1993
- *
- * Loadable keymaps by Risto Kankkunen, May 1993
- *
- * Diacriticals redone & other small changes, aeb@cwi.nl, June 1993
- * Added decr/incr_console, dynamic keymaps, Unicode support,
- * dynamic function/string keys, led setting,  Sept 1994
- * `Sticky' modifier keys, 951006.
- *
- * 11-11-96: SAK should now work in the raw mode (Martin Mares)
- *
- * Modified to provide 'generic' keyboard support by Hamish Macdonald
- * Merge with the m68k keyboard driver and split-off of the PC low-level
- * parts by Geert Uytterhoeven, May 1997
- *
- * 27-05-97: Added support for the Magic SysRq Key (Martin Mares)
- * 30-07-98: Dead keys redone, aeb@cwi.nl.
- * 21-08-02: Converted to input API, major cleanup. (Vojtech Pavlik)
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/consolemap.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/irq.h>
-
-#include <linux/kbd_kern.h>
-#include <linux/kbd_diacr.h>
-#include <linux/vt_kern.h>
-#include <linux/input.h>
-#include <linux/reboot.h>
-#include <linux/notifier.h>
-#include <linux/jiffies.h>
-
-extern void ctrl_alt_del(void);
-
-/*
- * Exported functions/variables
- */
-
-#define KBD_DEFMODE ((1 << VC_REPEAT) | (1 << VC_META))
-
-/*
- * Some laptops take the 789uiojklm,. keys as number pad when NumLock is on.
- * This seems a good reason to start with NumLock off. On HIL keyboards
- * of PARISC machines however there is no NumLock key and everyone expects the keypad
- * to be used for numbers.
- */
-
-#if defined(CONFIG_PARISC) && (defined(CONFIG_KEYBOARD_HIL) || defined(CONFIG_KEYBOARD_HIL_OLD))
-#define KBD_DEFLEDS (1 << VC_NUMLOCK)
-#else
-#define KBD_DEFLEDS 0
-#endif
-
-#define KBD_DEFLOCK 0
-
-void compute_shiftstate(void);
-
-/*
- * Handler Tables.
- */
-
-#define K_HANDLERS\
-        k_self,         k_fn,           k_spec,         k_pad,\
-        k_dead,         k_cons,         k_cur,          k_shift,\
-        k_meta,         k_ascii,        k_lock,         k_lowercase,\
-        k_slock,        k_dead2,        k_brl,          k_ignore
-
-typedef void (k_handler_fn)(struct vc_data *vc, unsigned char value,
-                            char up_flag);
-static k_handler_fn K_HANDLERS;
-static k_handler_fn *k_handler[16] = { K_HANDLERS };
-
-#define FN_HANDLERS\
-        fn_null,        fn_enter,       fn_show_ptregs, fn_show_mem,\
-        fn_show_state,  fn_send_intr,   fn_lastcons,    fn_caps_toggle,\
-        fn_num,         fn_hold,        fn_scroll_forw, fn_scroll_back,\
-        fn_boot_it,     fn_caps_on,     fn_compose,     fn_SAK,\
-        fn_dec_console, fn_inc_console, fn_spawn_con,   fn_bare_num
-
-typedef void (fn_handler_fn)(struct vc_data *vc);
-static fn_handler_fn FN_HANDLERS;
-static fn_handler_fn *fn_handler[] = { FN_HANDLERS };
-
-/*
- * Variables exported for vt_ioctl.c
- */
-
-/* maximum values each key_handler can handle */
-const int max_vals[] = {
-        255, ARRAY_SIZE(func_table) - 1, ARRAY_SIZE(fn_handler) - 1, NR_PAD - 1,
-        NR_DEAD - 1, 255, 3, NR_SHIFT - 1, 255, NR_ASCII - 1, NR_LOCK - 1,
-        255, NR_LOCK - 1, 255, NR_BRL - 1
-};
-
-const int NR_TYPES = ARRAY_SIZE(max_vals);
-
-struct kbd_struct kbd_table[MAX_NR_CONSOLES];
-EXPORT_SYMBOL_GPL(kbd_table);
-static struct kbd_struct *kbd = kbd_table;
-
-struct vt_spawn_console vt_spawn_con = {
-        .lock = __SPIN_LOCK_UNLOCKED(vt_spawn_con.lock),
-        .pid  = NULL,
-        .sig  = 0,
-};
-
-/*
- * Variables exported for vt.c
- */
-
-int shift_state = 0;
-
-/*
- * Internal Data.
- */
-
-static struct input_handler kbd_handler;
-static DEFINE_SPINLOCK(kbd_event_lock);
-static unsigned long key_down[BITS_TO_LONGS(KEY_CNT)];  /* keyboard key bitmap */
-static unsigned char shift_down[NR_SHIFT];              /* shift state counters.. */
-static bool dead_key_next;
-static int npadch = -1;                                 /* -1 or number assembled on pad */
-static unsigned int diacr;
-static char rep;                                        /* flag telling character repeat */
-
-static unsigned char ledstate = 0xff;                   /* undefined */
-static unsigned char ledioctl;
-
-static struct ledptr {
-        unsigned int *addr;
-        unsigned int mask;
-        unsigned char valid:1;
-} ledptrs[3];
-
-/*
- * Notifier list for console keyboard events
- */
-static ATOMIC_NOTIFIER_HEAD(keyboard_notifier_list);
-
-int register_keyboard_notifier(struct notifier_block *nb)
-{
-        return atomic_notifier_chain_register(&keyboard_notifier_list, nb);
-}
-EXPORT_SYMBOL_GPL(register_keyboard_notifier);
-
-int unregister_keyboard_notifier(struct notifier_block *nb)
-{
-        return atomic_notifier_chain_unregister(&keyboard_notifier_list, nb);
-}
-EXPORT_SYMBOL_GPL(unregister_keyboard_notifier);
-
-/*
- * Translation of scancodes to keycodes. We set them on only the first
- * keyboard in the list that accepts the scancode and keycode.
- * Explanation for not choosing the first attached keyboard anymore:
- *  USB keyboards for example have two event devices: one for all "normal"
- *  keys and one for extra function keys (like "volume up", "make coffee",
- *  etc.). So this means that scancodes for the extra function keys won't
- *  be valid for the first event device, but will be for the second.
- */
-
-struct getset_keycode_data {
-        unsigned int scancode;
-        unsigned int keycode;
-        int error;
-};
-
-static int getkeycode_helper(struct input_handle *handle, void *data)
-{
-        struct getset_keycode_data *d = data;
-
-        d->error = input_get_keycode(handle->dev, d->scancode, &d->keycode);
-
-        return d->error == 0; /* stop as soon as we successfully get one */
-}
-
-int getkeycode(unsigned int scancode)
-{
-        struct getset_keycode_data d = { scancode, 0, -ENODEV };
-
-        input_handler_for_each_handle(&kbd_handler, &d, getkeycode_helper);
-
-        return d.error ?: d.keycode;
-}
-
-static int setkeycode_helper(struct input_handle *handle, void *data)
-{
-        struct getset_keycode_data *d = data;
-
-        d->error = input_set_keycode(handle->dev, d->scancode, d->keycode);
-
-        return d->error == 0; /* stop as soon as we successfully set one */
-}
-
-int setkeycode(unsigned int scancode, unsigned int keycode)
-{
-        struct getset_keycode_data d = { scancode, keycode, -ENODEV };
-
-        input_handler_for_each_handle(&kbd_handler, &d, setkeycode_helper);
-
-        return d.error;
-}
-
-/*
- * Making beeps and bells. Note that we prefer beeps to bells, but when
- * shutting the sound off we do both.
- */
-
-static int kd_sound_helper(struct input_handle *handle, void *data)
-{
-        unsigned int *hz = data;
-        struct input_dev *dev = handle->dev;
-
-        if (test_bit(EV_SND, dev->evbit)) {
-                if (test_bit(SND_TONE, dev->sndbit)) {
-                        input_inject_event(handle, EV_SND, SND_TONE, *hz);
-                        if (*hz)
-                                return 0;
-                }
-                if (test_bit(SND_BELL, dev->sndbit))
-                        input_inject_event(handle, EV_SND, SND_BELL, *hz ? 1 : 0);
-        }
-
-        return 0;
-}
-
-static void kd_nosound(unsigned long ignored)
-{
-        static unsigned int zero;
-
-        input_handler_for_each_handle(&kbd_handler, &zero, kd_sound_helper);
-}
-
-static DEFINE_TIMER(kd_mksound_timer, kd_nosound, 0, 0);
-
-void kd_mksound(unsigned int hz, unsigned int ticks)
-{
-        del_timer_sync(&kd_mksound_timer);
-
-        input_handler_for_each_handle(&kbd_handler, &hz, kd_sound_helper);
-
-        if (hz && ticks)
-                mod_timer(&kd_mksound_timer, jiffies + ticks);
-}
-EXPORT_SYMBOL(kd_mksound);
-
-/*
- * Setting the keyboard rate.
- */
-
-static int kbd_rate_helper(struct input_handle *handle, void *data)
-{
-        struct input_dev *dev = handle->dev;
-        struct kbd_repeat *rep = data;
-
-        if (test_bit(EV_REP, dev->evbit)) {
-
-                if (rep[0].delay > 0)
-                        input_inject_event(handle,
-                                           EV_REP, REP_DELAY, rep[0].delay);
-                if (rep[0].period > 0)
-                        input_inject_event(handle,
-                                           EV_REP, REP_PERIOD, rep[0].period);
-
-                rep[1].delay = dev->rep[REP_DELAY];
-                rep[1].period = dev->rep[REP_PERIOD];
-        }
-
-        return 0;
-}
-
-int kbd_rate(struct kbd_repeat *rep)
-{
-        struct kbd_repeat data[2] = { *rep };
-
-        input_handler_for_each_handle(&kbd_handler, data, kbd_rate_helper);
-        *rep = data[1]; /* Copy currently used settings */
-
-        return 0;
-}
-
-/*
- * Helper Functions.
- */
-static void put_queue(struct vc_data *vc, int ch)
-{
-        struct tty_struct *tty = vc->port.tty;
-
-        if (tty) {
-                tty_insert_flip_char(tty, ch, 0);
-                con_schedule_flip(tty);
-        }
-}
-
-static void puts_queue(struct vc_data *vc, char *cp)
-{
-        struct tty_struct *tty = vc->port.tty;
-
-        if (!tty)
-                return;
-
-        while (*cp) {
-                tty_insert_flip_char(tty, *cp, 0);
-                cp++;
-        }
-        con_schedule_flip(tty);
-}
-
-static void applkey(struct vc_data *vc, int key, char mode)
-{
-        static char buf[] = { 0x1b, 'O', 0x00, 0x00 };
-
-        buf[1] = (mode ? 'O' : '[');
-        buf[2] = key;
-        puts_queue(vc, buf);
-}
-
-/*
- * Many other routines do put_queue, but I think either
- * they produce ASCII, or they produce some user-assigned
- * string, and in both cases we might assume that it is
- * in utf-8 already.
- */
-static void to_utf8(struct vc_data *vc, uint c)
-{
-        if (c < 0x80)
-                /*  0******* */
-                put_queue(vc, c);
-        else if (c < 0x800) {
-                /* 110***** 10****** */
-                put_queue(vc, 0xc0 | (c >> 6));
-                put_queue(vc, 0x80 | (c & 0x3f));
-        } else if (c < 0x10000) {
-                if (c >= 0xD800 && c < 0xE000)
-                        return;
-                if (c == 0xFFFF)
-                        return;
-                /* 1110**** 10****** 10****** */
-                put_queue(vc, 0xe0 | (c >> 12));
-                put_queue(vc, 0x80 | ((c >> 6) & 0x3f));
-                put_queue(vc, 0x80 | (c & 0x3f));
-        } else if (c < 0x110000) {
-                /* 11110*** 10****** 10****** 10****** */
-                put_queue(vc, 0xf0 | (c >> 18));
-                put_queue(vc, 0x80 | ((c >> 12) & 0x3f));
-                put_queue(vc, 0x80 | ((c >> 6) & 0x3f));
-                put_queue(vc, 0x80 | (c & 0x3f));
-        }
-}
-
-/*
- * Called after returning from RAW mode or when changing consoles - recompute
- * shift_down[] and shift_state from key_down[] maybe called when keymap is
- * undefined, so that shiftkey release is seen
- */
-void compute_shiftstate(void)
-{
-        unsigned int i, j, k, sym, val;
-
-        shift_state = 0;
-        memset(shift_down, 0, sizeof(shift_down));
-
-        for (i = 0; i < ARRAY_SIZE(key_down); i++) {
-
-                if (!key_down[i])
-                        continue;
-
-                k = i * BITS_PER_LONG;
-
-                for (j = 0; j < BITS_PER_LONG; j++, k++) {
-
-                        if (!test_bit(k, key_down))
-                                continue;
-
-                        sym = U(key_maps[0][k]);
-                        if (KTYP(sym) != KT_SHIFT && KTYP(sym) != KT_SLOCK)
-                                continue;
-
-                        val = KVAL(sym);
-                        if (val == KVAL(K_CAPSSHIFT))
-                                val = KVAL(K_SHIFT);
-
-                        shift_down[val]++;
-                        shift_state |= (1 << val);
-                }
-        }
-}
-
-/*
- * We have a combining character DIACR here, followed by the character CH.
- * If the combination occurs in the table, return the corresponding value.
- * Otherwise, if CH is a space or equals DIACR, return DIACR.
- * Otherwise, conclude that DIACR was not combining after all,
- * queue it and return CH.
- */
-static unsigned int handle_diacr(struct vc_data *vc, unsigned int ch)
-{
-        unsigned int d = diacr;
-        unsigned int i;
-
-        diacr = 0;
-
-        if ((d & ~0xff) == BRL_UC_ROW) {
-                if ((ch & ~0xff) == BRL_UC_ROW)
-                        return d | ch;
-        } else {
-                for (i = 0; i < accent_table_size; i++)
-                        if (accent_table[i].diacr == d && accent_table[i].base == ch)
-                                return accent_table[i].result;
-        }
-
-        if (ch == ' ' || ch == (BRL_UC_ROW|0) || ch == d)
-                return d;
-
-        if (kbd->kbdmode == VC_UNICODE)
-                to_utf8(vc, d);
-        else {
-                int c = conv_uni_to_8bit(d);
-                if (c != -1)
-                        put_queue(vc, c);
-        }
-
-        return ch;
-}
-
-/*
- * Special function handlers
- */
-static void fn_enter(struct vc_data *vc)
-{
-        if (diacr) {
-                if (kbd->kbdmode == VC_UNICODE)
-                        to_utf8(vc, diacr);
-                else {
-                        int c = conv_uni_to_8bit(diacr);
-                        if (c != -1)
-                                put_queue(vc, c);
-                }
-                diacr = 0;
-        }
-
-        put_queue(vc, 13);
-        if (vc_kbd_mode(kbd, VC_CRLF))
-                put_queue(vc, 10);
-}
-
-static void fn_caps_toggle(struct vc_data *vc)
-{
-        if (rep)
-                return;
-
-        chg_vc_kbd_led(kbd, VC_CAPSLOCK);
-}
-
-static void fn_caps_on(struct vc_data *vc)
-{
-        if (rep)
-                return;
-
-        set_vc_kbd_led(kbd, VC_CAPSLOCK);
-}
-
-static void fn_show_ptregs(struct vc_data *vc)
-{
-        struct pt_regs *regs = get_irq_regs();
-
-        if (regs)
-                show_regs(regs);
-}
-
-static void fn_hold(struct vc_data *vc)
-{
-        struct tty_struct *tty = vc->port.tty;
-
-        if (rep || !tty)
-                return;
-
-        /*
-         * Note: SCROLLOCK will be set (cleared) by stop_tty (start_tty);
-         * these routines are also activated by ^S/^Q.
-         * (And SCROLLOCK can also be set by the ioctl KDSKBLED.)
-         */
-        if (tty->stopped)
-                start_tty(tty);
-        else
-                stop_tty(tty);
-}
-
-static void fn_num(struct vc_data *vc)
-{
-        if (vc_kbd_mode(kbd, VC_APPLIC))
-                applkey(vc, 'P', 1);
-        else
-                fn_bare_num(vc);
-}
-
-/*
- * Bind this to Shift-NumLock if you work in application keypad mode
- * but want to be able to change the NumLock flag.
- * Bind this to NumLock if you prefer that the NumLock key always
- * changes the NumLock flag.
- */
-static void fn_bare_num(struct vc_data *vc)
-{
-        if (!rep)
-                chg_vc_kbd_led(kbd, VC_NUMLOCK);
-}
-
-static void fn_lastcons(struct vc_data *vc)
-{
-        /* switch to the last used console, ChN */
-        set_console(last_console);
-}
-
-static void fn_dec_console(struct vc_data *vc)
-{
-        int i, cur = fg_console;
-
-        /* Currently switching?  Queue this next switch relative to that. */
-        if (want_console != -1)
-                cur = want_console;
-
-        for (i = cur - 1; i != cur; i--) {
-                if (i == -1)
-                        i = MAX_NR_CONSOLES - 1;
-                if (vc_cons_allocated(i))
-                        break;
-        }
-        set_console(i);
-}
-
-static void fn_inc_console(struct vc_data *vc)
-{
-        int i, cur = fg_console;
-
-        /* Currently switching?  Queue this next switch relative to that. */
-        if (want_console != -1)
-                cur = want_console;
-
-        for (i = cur+1; i != cur; i++) {
-                if (i == MAX_NR_CONSOLES)
-                        i = 0;
-                if (vc_cons_allocated(i))
-                        break;
-        }
-        set_console(i);
-}
-
-static void fn_send_intr(struct vc_data *vc)
-{
-        struct tty_struct *tty = vc->port.tty;
-
-        if (!tty)
-                return;
-        tty_insert_flip_char(tty, 0, TTY_BREAK);
-        con_schedule_flip(tty);
-}
-
-static void fn_scroll_forw(struct vc_data *vc)
-{
-        scrollfront(vc, 0);
-}
-
-static void fn_scroll_back(struct vc_data *vc)
-{
-        scrollback(vc, 0);
-}
-
-static void fn_show_mem(struct vc_data *vc)
-{
-        show_mem();
-}
-
-static void fn_show_state(struct vc_data *vc)
-{
-        show_state();
-}
-
-static void fn_boot_it(struct vc_data *vc)
-{
-        ctrl_alt_del();
-}
-
-static void fn_compose(struct vc_data *vc)
-{
-        dead_key_next = true;
-}
-
-static void fn_spawn_con(struct vc_data *vc)
-{
-        spin_lock(&vt_spawn_con.lock);
-        if (vt_spawn_con.pid)
-                if (kill_pid(vt_spawn_con.pid, vt_spawn_con.sig, 1)) {
-                        put_pid(vt_spawn_con.pid);
-                        vt_spawn_con.pid = NULL;
-                }
-        spin_unlock(&vt_spawn_con.lock);
-}
-
-static void fn_SAK(struct vc_data *vc)
-{
-        struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work;
-        schedule_work(SAK_work);
-}
-
-static void fn_null(struct vc_data *vc)
-{
-        compute_shiftstate();
-}
-
-/*
- * Special key handlers
- */
-static void k_ignore(struct vc_data *vc, unsigned char value, char up_flag)
-{
-}
-
-static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        if (up_flag)
-                return;
-        if (value >= ARRAY_SIZE(fn_handler))
-                return;
-        if ((kbd->kbdmode == VC_RAW ||
-             kbd->kbdmode == VC_MEDIUMRAW) &&
-             value != KVAL(K_SAK))
-                return;         /* SAK is allowed even in raw mode */
-        fn_handler[value](vc);
-}
-
-static void k_lowercase(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        pr_err("k_lowercase was called - impossible\n");
-}
-
-static void k_unicode(struct vc_data *vc, unsigned int value, char up_flag)
-{
-        if (up_flag)
-                return;         /* no action, if this is a key release */
-
-        if (diacr)
-                value = handle_diacr(vc, value);
-
-        if (dead_key_next) {
-                dead_key_next = false;
-                diacr = value;
-                return;
-        }
-        if (kbd->kbdmode == VC_UNICODE)
-                to_utf8(vc, value);
-        else {
-                int c = conv_uni_to_8bit(value);
-                if (c != -1)
-                        put_queue(vc, c);
-        }
-}
-
-/*
- * Handle dead key. Note that we now may have several
- * dead keys modifying the same character. Very useful
- * for Vietnamese.
- */
-static void k_deadunicode(struct vc_data *vc, unsigned int value, char up_flag)
-{
-        if (up_flag)
-                return;
-
-        diacr = (diacr ? handle_diacr(vc, value) : value);
-}
-
-static void k_self(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        k_unicode(vc, conv_8bit_to_uni(value), up_flag);
-}
-
-static void k_dead2(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        k_deadunicode(vc, value, up_flag);
-}
-
-/*
- * Obsolete - for backwards compatibility only
- */
-static void k_dead(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        static const unsigned char ret_diacr[NR_DEAD] = {'`', '\'', '^', '~', '"', ',' };
-
-        k_deadunicode(vc, ret_diacr[value], up_flag);
-}
-
-static void k_cons(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        if (up_flag)
-                return;
-
-        set_console(value);
-}
-
-static void k_fn(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        if (up_flag)
-                return;
-
-        if ((unsigned)value < ARRAY_SIZE(func_table)) {
-                if (func_table[value])
-                        puts_queue(vc, func_table[value]);
-        } else
-                pr_err("k_fn called with value=%d\n", value);
-}
-
-static void k_cur(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        static const char cur_chars[] = "BDCA";
-
-        if (up_flag)
-                return;
-
-        applkey(vc, cur_chars[value], vc_kbd_mode(kbd, VC_CKMODE));
-}
-
-static void k_pad(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        static const char pad_chars[] = "0123456789+-*/\015,.?()#";
-        static const char app_map[] = "pqrstuvwxylSRQMnnmPQS";
-
-        if (up_flag)
-                return;         /* no action, if this is a key release */
-
-        /* kludge... shift forces cursor/number keys */
-        if (vc_kbd_mode(kbd, VC_APPLIC) && !shift_down[KG_SHIFT]) {
-                applkey(vc, app_map[value], 1);
-                return;
-        }
-
-        if (!vc_kbd_led(kbd, VC_NUMLOCK)) {
-
-                switch (value) {
-                case KVAL(K_PCOMMA):
-                case KVAL(K_PDOT):
-                        k_fn(vc, KVAL(K_REMOVE), 0);
-                        return;
-                case KVAL(K_P0):
-                        k_fn(vc, KVAL(K_INSERT), 0);
-                        return;
-                case KVAL(K_P1):
-                        k_fn(vc, KVAL(K_SELECT), 0);
-                        return;
-                case KVAL(K_P2):
-                        k_cur(vc, KVAL(K_DOWN), 0);
-                        return;
-                case KVAL(K_P3):
-                        k_fn(vc, KVAL(K_PGDN), 0);
-                        return;
-                case KVAL(K_P4):
-                        k_cur(vc, KVAL(K_LEFT), 0);
-                        return;
-                case KVAL(K_P6):
-                        k_cur(vc, KVAL(K_RIGHT), 0);
-                        return;
-                case KVAL(K_P7):
-                        k_fn(vc, KVAL(K_FIND), 0);
-                        return;
-                case KVAL(K_P8):
-                        k_cur(vc, KVAL(K_UP), 0);
-                        return;
-                case KVAL(K_P9):
-                        k_fn(vc, KVAL(K_PGUP), 0);
-                        return;
-                case KVAL(K_P5):
-                        applkey(vc, 'G', vc_kbd_mode(kbd, VC_APPLIC));
-                        return;
-                }
-        }
-
-        put_queue(vc, pad_chars[value]);
-        if (value == KVAL(K_PENTER) && vc_kbd_mode(kbd, VC_CRLF))
-                put_queue(vc, 10);
-}
-
-static void k_shift(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        int old_state = shift_state;
-
-        if (rep)
-                return;
-        /*
-         * Mimic typewriter:
-         * a CapsShift key acts like Shift but undoes CapsLock
-         */
-        if (value == KVAL(K_CAPSSHIFT)) {
-                value = KVAL(K_SHIFT);
-                if (!up_flag)
-                        clr_vc_kbd_led(kbd, VC_CAPSLOCK);
-        }
-
-        if (up_flag) {
-                /*
-                 * handle the case that two shift or control
-                 * keys are depressed simultaneously
-                 */
-                if (shift_down[value])
-                        shift_down[value]--;
-        } else
-                shift_down[value]++;
-
-        if (shift_down[value])
-                shift_state |= (1 << value);
-        else
-                shift_state &= ~(1 << value);
-
-        /* kludge */
-        if (up_flag && shift_state != old_state && npadch != -1) {
-                if (kbd->kbdmode == VC_UNICODE)
-                        to_utf8(vc, npadch);
-                else
-                        put_queue(vc, npadch & 0xff);
-                npadch = -1;
-        }
-}
-
-static void k_meta(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        if (up_flag)
-                return;
-
-        if (vc_kbd_mode(kbd, VC_META)) {
-                put_queue(vc, '\033');
-                put_queue(vc, value);
-        } else
-                put_queue(vc, value | 0x80);
-}
-
-static void k_ascii(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        int base;
-
-        if (up_flag)
-                return;
-
-        if (value < 10) {
-                /* decimal input of code, while Alt depressed */
-                base = 10;
-        } else {
-                /* hexadecimal input of code, while AltGr depressed */
-                value -= 10;
-                base = 16;
-        }
-
-        if (npadch == -1)
-                npadch = value;
-        else
-                npadch = npadch * base + value;
-}
-
-static void k_lock(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        if (up_flag || rep)
-                return;
-
-        chg_vc_kbd_lock(kbd, value);
-}
-
-static void k_slock(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        k_shift(vc, value, up_flag);
-        if (up_flag || rep)
-                return;
-
-        chg_vc_kbd_slock(kbd, value);
-        /* try to make Alt, oops, AltGr and such work */
-        if (!key_maps[kbd->lockstate ^ kbd->slockstate]) {
-                kbd->slockstate = 0;
-                chg_vc_kbd_slock(kbd, value);
-        }
-}
-
-/* by default, 300ms interval for combination release */
-static unsigned brl_timeout = 300;
-MODULE_PARM_DESC(brl_timeout, "Braille keys release delay in ms (0 for commit on first key release)");
-module_param(brl_timeout, uint, 0644);
-
-static unsigned brl_nbchords = 1;
-MODULE_PARM_DESC(brl_nbchords, "Number of chords that produce a braille pattern (0 for dead chords)");
-module_param(brl_nbchords, uint, 0644);
-
-static void k_brlcommit(struct vc_data *vc, unsigned int pattern, char up_flag)
-{
-        static unsigned long chords;
-        static unsigned committed;
-
-        if (!brl_nbchords)
-                k_deadunicode(vc, BRL_UC_ROW | pattern, up_flag);
-        else {
-                committed |= pattern;
-                chords++;
-                if (chords == brl_nbchords) {
-                        k_unicode(vc, BRL_UC_ROW | committed, up_flag);
-                        chords = 0;
-                        committed = 0;
-                }
-        }
-}
-
-static void k_brl(struct vc_data *vc, unsigned char value, char up_flag)
-{
-        static unsigned pressed, committing;
-        static unsigned long releasestart;
-
-        if (kbd->kbdmode != VC_UNICODE) {
-                if (!up_flag)
-                        pr_warning("keyboard mode must be unicode for braille patterns\n");
-                return;
-        }
-
-        if (!value) {
-                k_unicode(vc, BRL_UC_ROW, up_flag);
-                return;
-        }
-
-        if (value > 8)
-                return;
-
-        if (!up_flag) {
-                pressed |= 1 << (value - 1);
-                if (!brl_timeout)
-                        committing = pressed;
-        } else if (brl_timeout) {
-                if (!committing ||
-                    time_after(jiffies,
-                               releasestart + msecs_to_jiffies(brl_timeout))) {
-                        committing = pressed;
-                        releasestart = jiffies;
-                }
-                pressed &= ~(1 << (value - 1));
-                if (!pressed && committing) {
-                        k_brlcommit(vc, committing, 0);
-                        committing = 0;
-                }
-        } else {
-                if (committing) {
-                        k_brlcommit(vc, committing, 0);
-                        committing = 0;
-                }
-                pressed &= ~(1 << (value - 1));
-        }
-}
-
-/*
- * The leds display either (i) the status of NumLock, CapsLock, ScrollLock,
- * or (ii) whatever pattern of lights people want to show using KDSETLED,
- * or (iii) specified bits of specified words in kernel memory.
- */
-unsigned char getledstate(void)
-{
-        return ledstate;
-}
-
-void setledstate(struct kbd_struct *kbd, unsigned int led)
-{
-        if (!(led & ~7)) {
-                ledioctl = led;
-                kbd->ledmode = LED_SHOW_IOCTL;
-        } else
-                kbd->ledmode = LED_SHOW_FLAGS;
-
-        set_leds();
-}
-
-static inline unsigned char getleds(void)
-{
-        struct kbd_struct *kbd = kbd_table + fg_console;
-        unsigned char leds;
-        int i;
-
-        if (kbd->ledmode == LED_SHOW_IOCTL)
-                return ledioctl;
-
-        leds = kbd->ledflagstate;
-
-        if (kbd->ledmode == LED_SHOW_MEM) {
-                for (i = 0; i < 3; i++)
-                        if (ledptrs[i].valid) {
-                                if (*ledptrs[i].addr & ledptrs[i].mask)
-                                        leds |= (1 << i);
-                                else
-                                        leds &= ~(1 << i);
-                        }
-        }
-        return leds;
-}
-
-static int kbd_update_leds_helper(struct input_handle *handle, void *data)
-{
-        unsigned char leds = *(unsigned char *)data;
-
-        if (test_bit(EV_LED, handle->dev->evbit)) {
-                input_inject_event(handle, EV_LED, LED_SCROLLL, !!(leds & 0x01));
-                input_inject_event(handle, EV_LED, LED_NUML,    !!(leds & 0x02));
-                input_inject_event(handle, EV_LED, LED_CAPSL,   !!(leds & 0x04));
-                input_inject_event(handle, EV_SYN, SYN_REPORT, 0);
-        }
-
-        return 0;
-}
-
-/*
- * This is the tasklet that updates LED state on all keyboards
- * attached to the box. The reason we use tasklet is that we
- * need to handle the scenario when keyboard handler is not
- * registered yet but we already getting updates form VT to
- * update led state.
- */
-static void kbd_bh(unsigned long dummy)
-{
-        unsigned char leds = getleds();
-
-        if (leds != ledstate) {
-                input_handler_for_each_handle(&kbd_handler, &leds,
-                                              kbd_update_leds_helper);
-                ledstate = leds;
-        }
-}
-
-DECLARE_TASKLET_DISABLED(keyboard_tasklet, kbd_bh, 0);
-
-#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\
-    defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\
-    defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\
-    (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC)) ||\
-    defined(CONFIG_AVR32)
-
-#define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\
-                        ((dev)->id.bustype == BUS_I8042) && ((dev)->id.vendor == 0x0001) && ((dev)->id.product == 0x0001))
-
-static const unsigned short x86_keycodes[256] =
-        { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-         32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-         48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-         64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-         80, 81, 82, 83, 84,118, 86, 87, 88,115,120,119,121,112,123, 92,
-        284,285,309,  0,312, 91,327,328,329,331,333,335,336,337,338,339,
-        367,288,302,304,350, 89,334,326,267,126,268,269,125,347,348,349,
-        360,261,262,263,268,376,100,101,321,316,373,286,289,102,351,355,
-        103,104,105,275,287,279,258,106,274,107,294,364,358,363,362,361,
-        291,108,381,281,290,272,292,305,280, 99,112,257,306,359,113,114,
-        264,117,271,374,379,265,266, 93, 94, 95, 85,259,375,260, 90,116,
-        377,109,111,277,278,282,283,295,296,297,299,300,301,293,303,307,
-        308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330,
-        332,340,365,342,343,344,345,346,356,270,341,368,369,370,371,372 };
-
-#ifdef CONFIG_SPARC
-static int sparc_l1_a_state;
-extern void sun_do_break(void);
-#endif
-
-static int emulate_raw(struct vc_data *vc, unsigned int keycode,
-                       unsigned char up_flag)
-{
-        int code;
-
-        switch (keycode) {
-
-        case KEY_PAUSE:
-                put_queue(vc, 0xe1);
-                put_queue(vc, 0x1d | up_flag);
-                put_queue(vc, 0x45 | up_flag);
-                break;
-
-        case KEY_HANGEUL:
-                if (!up_flag)
-                        put_queue(vc, 0xf2);
-                break;
-
-        case KEY_HANJA:
-                if (!up_flag)
-                        put_queue(vc, 0xf1);
-                break;
-
-        case KEY_SYSRQ:
-                /*
-                 * Real AT keyboards (that's what we're trying
-                 * to emulate here emit 0xe0 0x2a 0xe0 0x37 when
-                 * pressing PrtSc/SysRq alone, but simply 0x54
-                 * when pressing Alt+PrtSc/SysRq.
-                 */
-                if (test_bit(KEY_LEFTALT, key_down) ||
-                    test_bit(KEY_RIGHTALT, key_down)) {
-                        put_queue(vc, 0x54 | up_flag);
-                } else {
-                        put_queue(vc, 0xe0);
-                        put_queue(vc, 0x2a | up_flag);
-                        put_queue(vc, 0xe0);
-                        put_queue(vc, 0x37 | up_flag);
-                }
-                break;
-
-        default:
-                if (keycode > 255)
-                        return -1;
-
-                code = x86_keycodes[keycode];
-                if (!code)
-                        return -1;
-
-                if (code & 0x100)
-                        put_queue(vc, 0xe0);
-                put_queue(vc, (code & 0x7f) | up_flag);
-
-                break;
-        }
-
-        return 0;
-}
-
-#else
-
-#define HW_RAW(dev)     0
-
-static int emulate_raw(struct vc_data *vc, unsigned int keycode, unsigned char up_flag)
-{
-        if (keycode > 127)
-                return -1;
-
-        put_queue(vc, keycode | up_flag);
-        return 0;
-}
-#endif
-
-static void kbd_rawcode(unsigned char data)
-{
-        struct vc_data *vc = vc_cons[fg_console].d;
-
-        kbd = kbd_table + vc->vc_num;
-        if (kbd->kbdmode == VC_RAW)
-                put_queue(vc, data);
-}
-
-static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
-{
-        struct vc_data *vc = vc_cons[fg_console].d;
-        unsigned short keysym, *key_map;
-        unsigned char type;
-        bool raw_mode;
-        struct tty_struct *tty;
-        int shift_final;
-        struct keyboard_notifier_param param = { .vc = vc, .value = keycode, .down = down };
-        int rc;
-
-        tty = vc->port.tty;
-
-        if (tty && (!tty->driver_data)) {
-                /* No driver data? Strange. Okay we fix it then. */
-                tty->driver_data = vc;
-        }
-
-        kbd = kbd_table + vc->vc_num;
-
-#ifdef CONFIG_SPARC
-        if (keycode == KEY_STOP)
-                sparc_l1_a_state = down;
-#endif
-
-        rep = (down == 2);
-
-        raw_mode = (kbd->kbdmode == VC_RAW);
-        if (raw_mode && !hw_raw)
-                if (emulate_raw(vc, keycode, !down << 7))
-                        if (keycode < BTN_MISC && printk_ratelimit())
-                                pr_warning("can't emulate rawmode for keycode %d\n",
-                                           keycode);
-
-#ifdef CONFIG_SPARC
-        if (keycode == KEY_A && sparc_l1_a_state) {
-                sparc_l1_a_state = false;
-                sun_do_break();
-        }
-#endif
-
-        if (kbd->kbdmode == VC_MEDIUMRAW) {
-                /*
-                 * This is extended medium raw mode, with keys above 127
-                 * encoded as 0, high 7 bits, low 7 bits, with the 0 bearing
-                 * the 'up' flag if needed. 0 is reserved, so this shouldn't
-                 * interfere with anything else. The two bytes after 0 will
-                 * always have the up flag set not to interfere with older
-                 * applications. This allows for 16384 different keycodes,
-                 * which should be enough.
-                 */
-                if (keycode < 128) {
-                        put_queue(vc, keycode | (!down << 7));
-                } else {
-                        put_queue(vc, !down << 7);
-                        put_queue(vc, (keycode >> 7) | 0x80);
-                        put_queue(vc, keycode | 0x80);
-                }
-                raw_mode = true;
-        }
-
-        if (down)
-                set_bit(keycode, key_down);
-        else
-                clear_bit(keycode, key_down);
-
-        if (rep &&
-            (!vc_kbd_mode(kbd, VC_REPEAT) ||
-             (tty && !L_ECHO(tty) && tty_chars_in_buffer(tty)))) {
-                /*
-                 * Don't repeat a key if the input buffers are not empty and the
-                 * characters get aren't echoed locally. This makes key repeat
-                 * usable with slow applications and under heavy loads.
-                 */
-                return;
-        }
-
-        param.shift = shift_final = (shift_state | kbd->slockstate) ^ kbd->lockstate;
-        param.ledstate = kbd->ledflagstate;
-        key_map = key_maps[shift_final];
-
-        rc = atomic_notifier_call_chain(&keyboard_notifier_list,
-                                        KBD_KEYCODE, &param);
-        if (rc == NOTIFY_STOP || !key_map) {
-                atomic_notifier_call_chain(&keyboard_notifier_list,
-                                           KBD_UNBOUND_KEYCODE, &param);
-                compute_shiftstate();
-                kbd->slockstate = 0;
-                return;
-        }
-
-        if (keycode < NR_KEYS)
-                keysym = key_map[keycode];
-        else if (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT8)
-                keysym = U(K(KT_BRL, keycode - KEY_BRL_DOT1 + 1));
-        else
-                return;
-
-        type = KTYP(keysym);
-
-        if (type < 0xf0) {
-                param.value = keysym;
-                rc = atomic_notifier_call_chain(&keyboard_notifier_list,
-                                                KBD_UNICODE, &param);
-                if (rc != NOTIFY_STOP)
-                        if (down && !raw_mode)
-                                to_utf8(vc, keysym);
-                return;
-        }
-
-        type -= 0xf0;
-
-        if (type == KT_LETTER) {
-                type = KT_LATIN;
-                if (vc_kbd_led(kbd, VC_CAPSLOCK)) {
-                        key_map = key_maps[shift_final ^ (1 << KG_SHIFT)];
-                        if (key_map)
-                                keysym = key_map[keycode];
-                }
-        }
-
-        param.value = keysym;
-        rc = atomic_notifier_call_chain(&keyboard_notifier_list,
-                                        KBD_KEYSYM, &param);
-        if (rc == NOTIFY_STOP)
-                return;
-
-        if (raw_mode && type != KT_SPEC && type != KT_SHIFT)
-                return;
-
-        (*k_handler[type])(vc, keysym & 0xff, !down);
-
-        param.ledstate = kbd->ledflagstate;
-        atomic_notifier_call_chain(&keyboard_notifier_list, KBD_POST_KEYSYM, &param);
-
-        if (type != KT_SLOCK)
-                kbd->slockstate = 0;
-}
-
-static void kbd_event(struct input_handle *handle, unsigned int event_type,
-                      unsigned int event_code, int value)
-{
-        /* We are called with interrupts disabled, just take the lock */
-        spin_lock(&kbd_event_lock);
-
-        if (event_type == EV_MSC && event_code == MSC_RAW && HW_RAW(handle->dev))
-                kbd_rawcode(value);
-        if (event_type == EV_KEY)
-                kbd_keycode(event_code, value, HW_RAW(handle->dev));
-
-        spin_unlock(&kbd_event_lock);
-
-        tasklet_schedule(&keyboard_tasklet);
-        do_poke_blanked_console = 1;
-        schedule_console_callback();
-}
-
-static bool kbd_match(struct input_handler *handler, struct input_dev *dev)
-{
-        int i;
-
-        if (test_bit(EV_SND, dev->evbit))
-                return true;
-
-        if (test_bit(EV_KEY, dev->evbit)) {
-                for (i = KEY_RESERVED; i < BTN_MISC; i++)
-                        if (test_bit(i, dev->keybit))
-                                return true;
-                for (i = KEY_BRL_DOT1; i <= KEY_BRL_DOT10; i++)
-                        if (test_bit(i, dev->keybit))
-                                return true;
-        }
-
-        return false;
-}
-
-/*
- * When a keyboard (or other input device) is found, the kbd_connect
- * function is called. The function then looks at the device, and if it
- * likes it, it can open it and get events from it. In this (kbd_connect)
- * function, we should decide which VT to bind that keyboard to initially.
- */
-static int kbd_connect(struct input_handler *handler, struct input_dev *dev,
-                        const struct input_device_id *id)
-{
-        struct input_handle *handle;
-        int error;
-
-        handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL);
-        if (!handle)
-                return -ENOMEM;
-
-        handle->dev = dev;
-        handle->handler = handler;
-        handle->name = "kbd";
-
-        error = input_register_handle(handle);
-        if (error)
-                goto err_free_handle;
-
-        error = input_open_device(handle);
-        if (error)
-                goto err_unregister_handle;
-
-        return 0;
-
- err_unregister_handle:
-        input_unregister_handle(handle);
- err_free_handle:
-        kfree(handle);
-        return error;
-}
-
-static void kbd_disconnect(struct input_handle *handle)
-{
-        input_close_device(handle);
-        input_unregister_handle(handle);
-        kfree(handle);
-}
-
-/*
- * Start keyboard handler on the new keyboard by refreshing LED state to
- * match the rest of the system.
- */
-static void kbd_start(struct input_handle *handle)
-{
-        tasklet_disable(&keyboard_tasklet);
-
-        if (ledstate != 0xff)
-                kbd_update_leds_helper(handle, &ledstate);
-
-        tasklet_enable(&keyboard_tasklet);
-}
-
-static const struct input_device_id kbd_ids[] = {
-        {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
-                .evbit = { BIT_MASK(EV_KEY) },
-        },
-
-        {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
-                .evbit = { BIT_MASK(EV_SND) },
-        },
-
-        { },    /* Terminating entry */
-};
-
-MODULE_DEVICE_TABLE(input, kbd_ids);
-
-static struct input_handler kbd_handler = {
-        .event          = kbd_event,
-        .match          = kbd_match,
-        .connect        = kbd_connect,
-        .disconnect     = kbd_disconnect,
-        .start          = kbd_start,
-        .name           = "kbd",
-        .id_table       = kbd_ids,
-};
-
-int __init kbd_init(void)
-{
-        int i;
-        int error;
-
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
-                kbd_table[i].ledflagstate = KBD_DEFLEDS;
-                kbd_table[i].default_ledflagstate = KBD_DEFLEDS;
-                kbd_table[i].ledmode = LED_SHOW_FLAGS;
-                kbd_table[i].lockstate = KBD_DEFLOCK;
-                kbd_table[i].slockstate = 0;
-                kbd_table[i].modeflags = KBD_DEFMODE;
-                kbd_table[i].kbdmode = default_utf8 ? VC_UNICODE : VC_XLATE;
-        }
-
-        error = input_register_handler(&kbd_handler);
-        if (error)
-                return error;
-
-        tasklet_enable(&keyboard_tasklet);
-        tasklet_schedule(&keyboard_tasklet);
-
-        return 0;
-}
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 938a3a273886..97c3edb95ae7 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -126,7 +126,7 @@
 #include <linux/device.h>
 #include <linux/wait.h>
 #include <linux/jiffies.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/compat.h>
 
 #include <linux/parport.h>
@@ -140,6 +140,7 @@
 /* if you have more than 8 printers, remember to increase LP_NO */
 #define LP_NO 8
 
+static DEFINE_MUTEX(lp_mutex);
 static struct lp_struct lp_table[LP_NO];
 
 static unsigned int lp_count = 0;
@@ -493,7 +494,7 @@ static int lp_open(struct inode * inode, struct file * file)
         unsigned int minor = iminor(inode);
         int ret = 0;
 
-        lock_kernel();
+        mutex_lock(&lp_mutex);
         if (minor >= LP_NO) {
                 ret = -ENXIO;
                 goto out;
@@ -554,7 +555,7 @@ static int lp_open(struct inode * inode, struct file * file)
         lp_release_parport (&lp_table[minor]);
         lp_table[minor].current_mode = IEEE1284_MODE_COMPAT;
 out:
-        unlock_kernel();
+        mutex_unlock(&lp_mutex);
         return ret;
 }
 
@@ -680,7 +681,7 @@ static long lp_ioctl(struct file *file, unsigned int cmd,
         int ret;
 
         minor = iminor(file->f_path.dentry->d_inode);
-        lock_kernel();
+        mutex_lock(&lp_mutex);
         switch (cmd) {
         case LPSETTIMEOUT:
                 if (copy_from_user(&par_timeout, (void __user *)arg,
@@ -694,7 +695,7 @@ static long lp_ioctl(struct file *file, unsigned int cmd,
                 ret = lp_do_ioctl(minor, cmd, arg, (void __user *)arg);
                 break;
         }
-        unlock_kernel();
+        mutex_unlock(&lp_mutex);
 
         return ret;
 }
@@ -709,7 +710,7 @@ static long lp_compat_ioctl(struct file *file, unsigned int cmd,
         int ret;
 
         minor = iminor(file->f_path.dentry->d_inode);
-        lock_kernel();
+        mutex_lock(&lp_mutex);
         switch (cmd) {
         case LPSETTIMEOUT:
                 tc = compat_ptr(arg);
@@ -730,7 +731,7 @@ static long lp_compat_ioctl(struct file *file, unsigned int cmd,
                 ret = lp_do_ioctl(minor, cmd, arg, compat_ptr(arg));
                 break;
         }
-        unlock_kernel();
+        mutex_unlock(&lp_mutex);
 
         return ret;
 }
@@ -748,6 +749,7 @@ static const struct file_operations lp_fops = {
 #ifdef CONFIG_PARPORT_1284
         .read           = lp_read,
 #endif
+        .llseek         = noop_llseek,
 };
 
 /* --- support for console on the line printer ----------------- */
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index 83bef4efe376..1aeaaba680d2 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -25,7 +25,6 @@
 #include <linux/mm.h>
 #include <linux/uio.h>
 #include <linux/mutex.h>
-#include <linux/smp_lock.h>
 #include <linux/slab.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -42,6 +41,7 @@
 #else
 #define DBG(fmt...)
 #endif
+static DEFINE_MUTEX(mbcs_mutex);
 static int mbcs_major;
 
 static LIST_HEAD(soft_list);
@@ -385,19 +385,19 @@ static int mbcs_open(struct inode *ip, struct file *fp)
         struct mbcs_soft *soft;
         int minor;
 
-        lock_kernel();
+        mutex_lock(&mbcs_mutex);
         minor = iminor(ip);
 
         /* Nothing protects access to this list... */
         list_for_each_entry(soft, &soft_list, list) {
                 if (soft->nasid == minor) {
                         fp->private_data = soft->cxdev;
-                        unlock_kernel();
+                        mutex_unlock(&mbcs_mutex);
                         return 0;
                 }
         }
 
-        unlock_kernel();
+        mutex_unlock(&mbcs_mutex);
         return -ENODEV;
 }
 
diff --git a/drivers/char/mbcs.h b/drivers/char/mbcs.h
index ba671589f4cb..1a36884c48b5 100644
--- a/drivers/char/mbcs.h
+++ b/drivers/char/mbcs.h
@@ -36,13 +36,13 @@
 #define MBCS_RD_DMA_CTRL        0x0110  /* Read DMA Control */
 #define MBCS_RD_DMA_AMO_DEST    0x0118  /* Read DMA AMO Destination */
 #define MBCS_RD_DMA_INT_DEST    0x0120  /* Read DMA Interrupt Destination */
-#define MBCS_RD_DMA_AUX_STAT    0x0130  /* Read DMA Auxillary Status */
+#define MBCS_RD_DMA_AUX_STAT    0x0130  /* Read DMA Auxiliary Status */
 #define MBCS_WR_DMA_SYS_ADDR    0x0200  /* Write DMA System Address */
 #define MBCS_WR_DMA_LOC_ADDR    0x0208  /* Write DMA Local Address */
 #define MBCS_WR_DMA_CTRL        0x0210  /* Write DMA Control */
 #define MBCS_WR_DMA_AMO_DEST    0x0218  /* Write DMA AMO Destination */
 #define MBCS_WR_DMA_INT_DEST    0x0220  /* Write DMA Interrupt Destination */
-#define MBCS_WR_DMA_AUX_STAT    0x0230  /* Write DMA Auxillary Status */
+#define MBCS_WR_DMA_AUX_STAT    0x0230  /* Write DMA Auxiliary Status */
 #define MBCS_ALG_AMO_DEST       0x0300  /* Algorithm AMO Destination */
 #define MBCS_ALG_INT_DEST       0x0308  /* Algorithm Interrupt Destination */
 #define MBCS_ALG_OFFSETS        0x0310
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 1f528fad3516..8fc04b4f311f 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -47,10 +47,7 @@ static inline unsigned long size_inside_page(unsigned long start,
 #ifndef ARCH_HAS_VALID_PHYS_ADDR_RANGE
 static inline int valid_phys_addr_range(unsigned long addr, size_t count)
 {
-        if (addr + count > __pa(high_memory))
-                return 0;
-
-        return 1;
+        return addr + count <= __pa(high_memory);
 }
 
 static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t size)
@@ -805,32 +802,46 @@ static const struct file_operations full_fops = {
 static const struct file_operations oldmem_fops = {
         .read   = read_oldmem,
         .open   = open_oldmem,
+        .llseek = default_llseek,
 };
 #endif
 
-static ssize_t kmsg_write(struct file *file, const char __user *buf,
-                          size_t count, loff_t *ppos)
+static ssize_t kmsg_writev(struct kiocb *iocb, const struct iovec *iv,
+                           unsigned long count, loff_t pos)
 {
-        char *tmp;
-        ssize_t ret;
+        char *line, *p;
+        int i;
+        ssize_t ret = -EFAULT;
+        size_t len = iov_length(iv, count);
 
-        tmp = kmalloc(count + 1, GFP_KERNEL);
-        if (tmp == NULL)
+        line = kmalloc(len + 1, GFP_KERNEL);
+        if (line == NULL)
                 return -ENOMEM;
-        ret = -EFAULT;
-        if (!copy_from_user(tmp, buf, count)) {
-                tmp[count] = 0;
-                ret = printk("%s", tmp);
-                if (ret > count)
-                        /* printk can add a prefix */
-                        ret = count;
+
+        /*
+         * copy all vectors into a single string, to ensure we do
+         * not interleave our log line with other printk calls
+         */
+        p = line;
+        for (i = 0; i < count; i++) {
+                if (copy_from_user(p, iv[i].iov_base, iv[i].iov_len))
+                        goto out;
+                p += iv[i].iov_len;
         }
-        kfree(tmp);
+        p[0] = '\0';
+
+        ret = printk("%s", line);
+        /* printk can add a prefix */
+        if (ret > len)
+                ret = len;
+out:
+        kfree(line);
         return ret;
 }
 
 static const struct file_operations kmsg_fops = {
-        .write = kmsg_write,
+        .aio_write = kmsg_writev,
+        .llseek = noop_llseek,
 };
 
 static const struct memdev {
@@ -874,6 +885,10 @@ static int memory_open(struct inode *inode, struct file *filp)
         if (dev->dev_info)
                 filp->f_mapping->backing_dev_info = dev->dev_info;
 
+        /* Is /dev/mem or /dev/kmem ? */
+        if (dev->dev_info == &directly_mappable_cdev_bdi)
+                filp->f_mode |= FMODE_UNSIGNED_OFFSET;
+
         if (dev->fops->open)
                 return dev->fops->open(inode, filp);
 
@@ -882,6 +897,7 @@ static int memory_open(struct inode *inode, struct file *filp)
 
 static const struct file_operations memory_fops = {
         .open = memory_open,
+        .llseek = noop_llseek,
 };
 
 static char *mem_devnode(struct device *dev, mode_t *mode)
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index abdafd488980..778273c93242 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -162,6 +162,7 @@ static struct class *misc_class;
 static const struct file_operations misc_fops = {
         .owner          = THIS_MODULE,
         .open           = misc_open,
+        .llseek         = noop_llseek,
 };
 
 /**
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index ea7c99fa978f..33dc2298af73 100644
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -32,7 +32,7 @@
 #include <linux/interrupt.h>
 #include <linux/time.h>
 #include <linux/math64.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/slab.h>
 
 #include <asm/uaccess.h>
@@ -53,12 +53,15 @@ MODULE_LICENSE("GPL");
 
 #define RTC_BITS 55 /* 55 bits for this implementation */
 
+static struct k_clock sgi_clock;
+
 extern unsigned long sn_rtc_cycles_per_second;
 
 #define RTC_COUNTER_ADDR        ((long *)LOCAL_MMR_ADDR(SH_RTC))
 
 #define rtc_time()              (*RTC_COUNTER_ADDR)
 
+static DEFINE_MUTEX(mmtimer_mutex);
 static long mmtimer_ioctl(struct file *file, unsigned int cmd,
                                                 unsigned long arg);
 static int mmtimer_mmap(struct file *file, struct vm_area_struct *vma);
@@ -72,6 +75,7 @@ static const struct file_operations mmtimer_fops = {
         .owner = THIS_MODULE,
         .mmap = mmtimer_mmap,
         .unlocked_ioctl = mmtimer_ioctl,
+        .llseek = noop_llseek,
 };
 
 /*
@@ -174,9 +178,9 @@ static void mmtimer_setup_int_2(int cpu, u64 expires)
  * in order to insure that the setup succeeds in a deterministic time frame.
  * It will check if the interrupt setup succeeded.
  */
-static int mmtimer_setup(int cpu, int comparator, unsigned long expires)
+static int mmtimer_setup(int cpu, int comparator, unsigned long expires,
+        u64 *set_completion_time)
 {
-
         switch (comparator) {
         case 0:
                 mmtimer_setup_int_0(cpu, expires);
@@ -189,7 +193,8 @@ static int mmtimer_setup(int cpu, int comparator, unsigned long expires)
                 break;
         }
         /* We might've missed our expiration time */
-        if (rtc_time() <= expires)
+        *set_completion_time = rtc_time();
+        if (*set_completion_time <= expires)
                 return 1;
 
         /*
@@ -225,6 +230,8 @@ static int mmtimer_disable_int(long nasid, int comparator)
 #define TIMER_OFF       0xbadcabLL      /* Timer is not setup */
 #define TIMER_SET       0               /* Comparator is set for this timer */
 
+#define MMTIMER_INTERVAL_RETRY_INCREMENT_DEFAULT 40
+
 /* There is one of these for each timer */
 struct mmtimer {
         struct rb_node list;
@@ -240,6 +247,11 @@ struct mmtimer_node {
 };
 static struct mmtimer_node *timers;
 
+static unsigned mmtimer_interval_retry_increment =
+        MMTIMER_INTERVAL_RETRY_INCREMENT_DEFAULT;
+module_param(mmtimer_interval_retry_increment, uint, 0644);
+MODULE_PARM_DESC(mmtimer_interval_retry_increment,
+        "RTC ticks to add to expiration on interval retry (default 40)");
 
 /*
  * Add a new mmtimer struct to the node's mmtimer list.
@@ -287,7 +299,8 @@ static void mmtimer_set_next_timer(int nodeid)
         struct mmtimer_node *n = &timers[nodeid];
         struct mmtimer *x;
         struct k_itimer *t;
-        int o;
+        u64 expires, exp, set_completion_time;
+        int i;
 
 restart:
         if (n->next == NULL)
@@ -298,7 +311,8 @@ restart:
         if (!t->it.mmtimer.incr) {
                 /* Not an interval timer */
                 if (!mmtimer_setup(x->cpu, COMPARATOR,
-                                        t->it.mmtimer.expires)) {
+                                        t->it.mmtimer.expires,
+                                        &set_completion_time)) {
                         /* Late setup, fire now */
                         tasklet_schedule(&n->tasklet);
                 }
@@ -306,14 +320,23 @@ restart:
         }
 
         /* Interval timer */
-        o = 0;
-        while (!mmtimer_setup(x->cpu, COMPARATOR, t->it.mmtimer.expires)) {
-                unsigned long e, e1;
-                struct rb_node *next;
-                t->it.mmtimer.expires += t->it.mmtimer.incr << o;
-                t->it_overrun += 1 << o;
-                o++;
-                if (o > 20) {
+        i = 0;
+        expires = exp = t->it.mmtimer.expires;
+        while (!mmtimer_setup(x->cpu, COMPARATOR, expires,
+                                &set_completion_time)) {
+                int to;
+
+                i++;
+                expires = set_completion_time +
+                                mmtimer_interval_retry_increment + (1 << i);
+                /* Calculate overruns as we go. */
+                to = ((u64)(expires - exp) / t->it.mmtimer.incr);
+                if (to) {
+                        t->it_overrun += to;
+                        t->it.mmtimer.expires += t->it.mmtimer.incr * to;
+                        exp = t->it.mmtimer.expires;
+                }
+                if (i > 20) {
                         printk(KERN_ALERT "mmtimer: cannot reschedule timer\n");
                         t->it.mmtimer.clock = TIMER_OFF;
                         n->next = rb_next(&x->list);
@@ -321,21 +344,6 @@ restart:
                         kfree(x);
                         goto restart;
                 }
-
-                e = t->it.mmtimer.expires;
-                next = rb_next(&x->list);
-
-                if (next == NULL)
-                        continue;
-
-                e1 = rb_entry(next, struct mmtimer, list)->
-                        timer->it.mmtimer.expires;
-                if (e > e1) {
-                        n->next = next;
-                        rb_erase(&x->list, &n->timer_head);
-                        mmtimer_add_list(x);
-                        goto restart;
-                }
         }
 }
 
@@ -371,7 +379,7 @@ static long mmtimer_ioctl(struct file *file, unsigned int cmd,
 {
         int ret = 0;
 
-        lock_kernel();
+        mutex_lock(&mmtimer_mutex);
 
         switch (cmd) {
         case MMTIMER_GETOFFSET: /* offset of the counter */
@@ -414,7 +422,7 @@ static long mmtimer_ioctl(struct file *file, unsigned int cmd,
                 ret = -ENOTTY;
                 break;
         }
-        unlock_kernel();
+        mutex_unlock(&mmtimer_mutex);
         return ret;
 }
 
@@ -481,7 +489,7 @@ static int sgi_clock_get(clockid_t clockid, struct timespec *tp)
         return 0;
 };
 
-static int sgi_clock_set(clockid_t clockid, struct timespec *tp)
+static int sgi_clock_set(const clockid_t clockid, const struct timespec *tp)
 {
 
         u64 nsec;
@@ -757,15 +765,21 @@ static int sgi_timer_set(struct k_itimer *timr, int flags,
         return err;
 }
 
+static int sgi_clock_getres(const clockid_t which_clock, struct timespec *tp)
+{
+        tp->tv_sec = 0;
+        tp->tv_nsec = sgi_clock_period;
+        return 0;
+}
+
 static struct k_clock sgi_clock = {
-        .res = 0,
-        .clock_set = sgi_clock_set,
-        .clock_get = sgi_clock_get,
-        .timer_create = sgi_timer_create,
-        .nsleep = do_posix_clock_nonanosleep,
-        .timer_set = sgi_timer_set,
-        .timer_del = sgi_timer_del,
-        .timer_get = sgi_timer_get
+        .clock_set      = sgi_clock_set,
+        .clock_get      = sgi_clock_get,
+        .clock_getres   = sgi_clock_getres,
+        .timer_create   = sgi_timer_create,
+        .timer_set      = sgi_timer_set,
+        .timer_del      = sgi_timer_del,
+        .timer_get      = sgi_timer_get
 };
 
 /**
@@ -825,8 +839,8 @@ static int __init mmtimer_init(void)
                         (unsigned long) node);
         }
 
-        sgi_clock_period = sgi_clock.res = NSEC_PER_SEC / sn_rtc_cycles_per_second;
-        register_posix_clock(CLOCK_SGI_CYCLE, &sgi_clock);
+        sgi_clock_period = NSEC_PER_SEC / sn_rtc_cycles_per_second;
+        posix_timers_register_clock(CLOCK_SGI_CYCLE, &sgi_clock);
 
         printk(KERN_INFO "%s: v%s, %ld MHz\n", MMTIMER_DESC, MMTIMER_VERSION,
                sn_rtc_cycles_per_second/(unsigned long)1E6);
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
deleted file mode 100644
index 107b0bd58d19..000000000000
--- a/drivers/char/moxa.c
+++ /dev/null
@@ -1,2092 +0,0 @@
-/*****************************************************************************/
-/*
- *           moxa.c  -- MOXA Intellio family multiport serial driver.
- *
- *      Copyright (C) 1999-2000  Moxa Technologies (support@moxa.com).
- *      Copyright (c) 2007 Jiri Slaby <jirislaby@gmail.com>
- *
- *      This code is loosely based on the Linux serial driver, written by
- *      Linus Torvalds, Theodore T'so and others.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- */
-
-/*
- *    MOXA Intellio Series Driver
- *      for             : LINUX
- *      date            : 1999/1/7
- *      version         : 5.1
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/errno.h>
-#include <linux/firmware.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/major.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/serial.h>
-#include <linux/tty_driver.h>
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/bitops.h>
-#include <linux/slab.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-
-#include "moxa.h"
-
-#define MOXA_VERSION            "6.0k"
-
-#define MOXA_FW_HDRLEN          32
-
-#define MOXAMAJOR               172
-
-#define MAX_BOARDS              4       /* Don't change this value */
-#define MAX_PORTS_PER_BOARD     32      /* Don't change this value */
-#define MAX_PORTS               (MAX_BOARDS * MAX_PORTS_PER_BOARD)
-
-#define MOXA_IS_320(brd) ((brd)->boardType == MOXA_BOARD_C320_ISA || \
-                (brd)->boardType == MOXA_BOARD_C320_PCI)
-
-/*
- *    Define the Moxa PCI vendor and device IDs.
- */
-#define MOXA_BUS_TYPE_ISA       0
-#define MOXA_BUS_TYPE_PCI       1
-
-enum {
-        MOXA_BOARD_C218_PCI = 1,
-        MOXA_BOARD_C218_ISA,
-        MOXA_BOARD_C320_PCI,
-        MOXA_BOARD_C320_ISA,
-        MOXA_BOARD_CP204J,
-};
-
-static char *moxa_brdname[] =
-{
-        "C218 Turbo PCI series",
-        "C218 Turbo ISA series",
-        "C320 Turbo PCI series",
-        "C320 Turbo ISA series",
-        "CP-204J series",
-};
-
-#ifdef CONFIG_PCI
-static struct pci_device_id moxa_pcibrds[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C218),
-                .driver_data = MOXA_BOARD_C218_PCI },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C320),
-                .driver_data = MOXA_BOARD_C320_PCI },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP204J),
-                .driver_data = MOXA_BOARD_CP204J },
-        { 0 }
-};
-MODULE_DEVICE_TABLE(pci, moxa_pcibrds);
-#endif /* CONFIG_PCI */
-
-struct moxa_port;
-
-static struct moxa_board_conf {
-        int boardType;
-        int numPorts;
-        int busType;
-
-        unsigned int ready;
-
-        struct moxa_port *ports;
-
-        void __iomem *basemem;
-        void __iomem *intNdx;
-        void __iomem *intPend;
-        void __iomem *intTable;
-} moxa_boards[MAX_BOARDS];
-
-struct mxser_mstatus {
-        tcflag_t cflag;
-        int cts;
-        int dsr;
-        int ri;
-        int dcd;
-};
-
-struct moxaq_str {
-        int inq;
-        int outq;
-};
-
-struct moxa_port {
-        struct tty_port port;
-        struct moxa_board_conf *board;
-        void __iomem *tableAddr;
-
-        int type;
-        int cflag;
-        unsigned long statusflags;
-
-        u8 DCDState;            /* Protected by the port lock */
-        u8 lineCtrl;
-        u8 lowChkFlag;
-};
-
-struct mon_str {
-        int tick;
-        int rxcnt[MAX_PORTS];
-        int txcnt[MAX_PORTS];
-};
-
-/* statusflags */
-#define TXSTOPPED       1
-#define LOWWAIT         2
-#define EMPTYWAIT       3
-
-#define SERIAL_DO_RESTART
-
-#define WAKEUP_CHARS            256
-
-static int ttymajor = MOXAMAJOR;
-static struct mon_str moxaLog;
-static unsigned int moxaFuncTout = HZ / 2;
-static unsigned int moxaLowWaterChk;
-static DEFINE_MUTEX(moxa_openlock);
-static DEFINE_SPINLOCK(moxa_lock);
-
-static unsigned long baseaddr[MAX_BOARDS];
-static unsigned int type[MAX_BOARDS];
-static unsigned int numports[MAX_BOARDS];
-
-MODULE_AUTHOR("William Chen");
-MODULE_DESCRIPTION("MOXA Intellio Family Multiport Board Device Driver");
-MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("c218tunx.cod");
-MODULE_FIRMWARE("cp204unx.cod");
-MODULE_FIRMWARE("c320tunx.cod");
-
-module_param_array(type, uint, NULL, 0);
-MODULE_PARM_DESC(type, "card type: C218=2, C320=4");
-module_param_array(baseaddr, ulong, NULL, 0);
-MODULE_PARM_DESC(baseaddr, "base address");
-module_param_array(numports, uint, NULL, 0);
-MODULE_PARM_DESC(numports, "numports (ignored for C218)");
-
-module_param(ttymajor, int, 0);
-
-/*
- * static functions:
- */
-static int moxa_open(struct tty_struct *, struct file *);
-static void moxa_close(struct tty_struct *, struct file *);
-static int moxa_write(struct tty_struct *, const unsigned char *, int);
-static int moxa_write_room(struct tty_struct *);
-static void moxa_flush_buffer(struct tty_struct *);
-static int moxa_chars_in_buffer(struct tty_struct *);
-static void moxa_set_termios(struct tty_struct *, struct ktermios *);
-static void moxa_stop(struct tty_struct *);
-static void moxa_start(struct tty_struct *);
-static void moxa_hangup(struct tty_struct *);
-static int moxa_tiocmget(struct tty_struct *tty, struct file *file);
-static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
-                         unsigned int set, unsigned int clear);
-static void moxa_poll(unsigned long);
-static void moxa_set_tty_param(struct tty_struct *, struct ktermios *);
-static void moxa_shutdown(struct tty_port *);
-static int moxa_carrier_raised(struct tty_port *);
-static void moxa_dtr_rts(struct tty_port *, int);
-/*
- * moxa board interface functions:
- */
-static void MoxaPortEnable(struct moxa_port *);
-static void MoxaPortDisable(struct moxa_port *);
-static int MoxaPortSetTermio(struct moxa_port *, struct ktermios *, speed_t);
-static int MoxaPortGetLineOut(struct moxa_port *, int *, int *);
-static void MoxaPortLineCtrl(struct moxa_port *, int, int);
-static void MoxaPortFlowCtrl(struct moxa_port *, int, int, int, int, int);
-static int MoxaPortLineStatus(struct moxa_port *);
-static void MoxaPortFlushData(struct moxa_port *, int);
-static int MoxaPortWriteData(struct tty_struct *, const unsigned char *, int);
-static int MoxaPortReadData(struct moxa_port *);
-static int MoxaPortTxQueue(struct moxa_port *);
-static int MoxaPortRxQueue(struct moxa_port *);
-static int MoxaPortTxFree(struct moxa_port *);
-static void MoxaPortTxDisable(struct moxa_port *);
-static void MoxaPortTxEnable(struct moxa_port *);
-static int moxa_get_serial_info(struct moxa_port *, struct serial_struct __user *);
-static int moxa_set_serial_info(struct moxa_port *, struct serial_struct __user *);
-static void MoxaSetFifo(struct moxa_port *port, int enable);
-
-/*
- * I/O functions
- */
-
-static DEFINE_SPINLOCK(moxafunc_lock);
-
-static void moxa_wait_finish(void __iomem *ofsAddr)
-{
-        unsigned long end = jiffies + moxaFuncTout;
-
-        while (readw(ofsAddr + FuncCode) != 0)
-                if (time_after(jiffies, end))
-                        return;
-        if (readw(ofsAddr + FuncCode) != 0 && printk_ratelimit())
-                printk(KERN_WARNING "moxa function expired\n");
-}
-
-static void moxafunc(void __iomem *ofsAddr, u16 cmd, u16 arg)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&moxafunc_lock, flags);
-        writew(arg, ofsAddr + FuncArg);
-        writew(cmd, ofsAddr + FuncCode);
-        moxa_wait_finish(ofsAddr);
-        spin_unlock_irqrestore(&moxafunc_lock, flags);
-}
-
-static int moxafuncret(void __iomem *ofsAddr, u16 cmd, u16 arg)
-{
-        unsigned long flags;
-        u16 ret;
-        spin_lock_irqsave(&moxafunc_lock, flags);
-        writew(arg, ofsAddr + FuncArg);
-        writew(cmd, ofsAddr + FuncCode);
-        moxa_wait_finish(ofsAddr);
-        ret = readw(ofsAddr + FuncArg);
-        spin_unlock_irqrestore(&moxafunc_lock, flags);
-        return ret;
-}
-
-static void moxa_low_water_check(void __iomem *ofsAddr)
-{
-        u16 rptr, wptr, mask, len;
-
-        if (readb(ofsAddr + FlagStat) & Xoff_state) {
-                rptr = readw(ofsAddr + RXrptr);
-                wptr = readw(ofsAddr + RXwptr);
-                mask = readw(ofsAddr + RX_mask);
-                len = (wptr - rptr) & mask;
-                if (len <= Low_water)
-                        moxafunc(ofsAddr, FC_SendXon, 0);
-        }
-}
-
-/*
- * TTY operations
- */
-
-static int moxa_ioctl(struct tty_struct *tty, struct file *file,
-                      unsigned int cmd, unsigned long arg)
-{
-        struct moxa_port *ch = tty->driver_data;
-        void __user *argp = (void __user *)arg;
-        int status, ret = 0;
-
-        if (tty->index == MAX_PORTS) {
-                if (cmd != MOXA_GETDATACOUNT && cmd != MOXA_GET_IOQUEUE &&
-                                cmd != MOXA_GETMSTATUS)
-                        return -EINVAL;
-        } else if (!ch)
-                return -ENODEV;
-
-        switch (cmd) {
-        case MOXA_GETDATACOUNT:
-                moxaLog.tick = jiffies;
-                if (copy_to_user(argp, &moxaLog, sizeof(moxaLog)))
-                        ret = -EFAULT;
-                break;
-        case MOXA_FLUSH_QUEUE:
-                MoxaPortFlushData(ch, arg);
-                break;
-        case MOXA_GET_IOQUEUE: {
-                struct moxaq_str __user *argm = argp;
-                struct moxaq_str tmp;
-                struct moxa_port *p;
-                unsigned int i, j;
-
-                for (i = 0; i < MAX_BOARDS; i++) {
-                        p = moxa_boards[i].ports;
-                        for (j = 0; j < MAX_PORTS_PER_BOARD; j++, p++, argm++) {
-                                memset(&tmp, 0, sizeof(tmp));
-                                spin_lock_bh(&moxa_lock);
-                                if (moxa_boards[i].ready) {
-                                        tmp.inq = MoxaPortRxQueue(p);
-                                        tmp.outq = MoxaPortTxQueue(p);
-                                }
-                                spin_unlock_bh(&moxa_lock);
-                                if (copy_to_user(argm, &tmp, sizeof(tmp)))
-                                        return -EFAULT;
-                        }
-                }
-                break;
-        } case MOXA_GET_OQUEUE:
-                status = MoxaPortTxQueue(ch);
-                ret = put_user(status, (unsigned long __user *)argp);
-                break;
-        case MOXA_GET_IQUEUE:
-                status = MoxaPortRxQueue(ch);
-                ret = put_user(status, (unsigned long __user *)argp);
-                break;
-        case MOXA_GETMSTATUS: {
-                struct mxser_mstatus __user *argm = argp;
-                struct mxser_mstatus tmp;
-                struct moxa_port *p;
-                unsigned int i, j;
-
-                for (i = 0; i < MAX_BOARDS; i++) {
-                        p = moxa_boards[i].ports;
-                        for (j = 0; j < MAX_PORTS_PER_BOARD; j++, p++, argm++) {
-                                struct tty_struct *ttyp;
-                                memset(&tmp, 0, sizeof(tmp));
-                                spin_lock_bh(&moxa_lock);
-                                if (!moxa_boards[i].ready) {
-                                        spin_unlock_bh(&moxa_lock);
-                                        goto copy;
-                                }
-
-                                status = MoxaPortLineStatus(p);
-                                spin_unlock_bh(&moxa_lock);
-
-                                if (status & 1)
-                                        tmp.cts = 1;
-                                if (status & 2)
-                                        tmp.dsr = 1;
-                                if (status & 4)
-                                        tmp.dcd = 1;
-
-                                ttyp = tty_port_tty_get(&p->port);
-                                if (!ttyp || !ttyp->termios)
-                                        tmp.cflag = p->cflag;
-                                else
-                                        tmp.cflag = ttyp->termios->c_cflag;
-                                tty_kref_put(tty);
-copy:
-                                if (copy_to_user(argm, &tmp, sizeof(tmp)))
-                                        return -EFAULT;
-                        }
-                }
-                break;
-        }
-        case TIOCGSERIAL:
-                mutex_lock(&ch->port.mutex);
-                ret = moxa_get_serial_info(ch, argp);
-                mutex_unlock(&ch->port.mutex);
-                break;
-        case TIOCSSERIAL:
-                mutex_lock(&ch->port.mutex);
-                ret = moxa_set_serial_info(ch, argp);
-                mutex_unlock(&ch->port.mutex);
-                break;
-        default:
-                ret = -ENOIOCTLCMD;
-        }
-        return ret;
-}
-
-static int moxa_break_ctl(struct tty_struct *tty, int state)
-{
-        struct moxa_port *port = tty->driver_data;
-
-        moxafunc(port->tableAddr, state ? FC_SendBreak : FC_StopBreak,
-                        Magic_code);
-        return 0;
-}
-
-static const struct tty_operations moxa_ops = {
-        .open = moxa_open,
-        .close = moxa_close,
-        .write = moxa_write,
-        .write_room = moxa_write_room,
-        .flush_buffer = moxa_flush_buffer,
-        .chars_in_buffer = moxa_chars_in_buffer,
-        .ioctl = moxa_ioctl,
-        .set_termios = moxa_set_termios,
-        .stop = moxa_stop,
-        .start = moxa_start,
-        .hangup = moxa_hangup,
-        .break_ctl = moxa_break_ctl,
-        .tiocmget = moxa_tiocmget,
-        .tiocmset = moxa_tiocmset,
-};
-
-static const struct tty_port_operations moxa_port_ops = {
-        .carrier_raised = moxa_carrier_raised,
-        .dtr_rts = moxa_dtr_rts,
-        .shutdown = moxa_shutdown,
-};
-
-static struct tty_driver *moxaDriver;
-static DEFINE_TIMER(moxaTimer, moxa_poll, 0, 0);
-
-/*
- * HW init
- */
-
-static int moxa_check_fw_model(struct moxa_board_conf *brd, u8 model)
-{
-        switch (brd->boardType) {
-        case MOXA_BOARD_C218_ISA:
-        case MOXA_BOARD_C218_PCI:
-                if (model != 1)
-                        goto err;
-                break;
-        case MOXA_BOARD_CP204J:
-                if (model != 3)
-                        goto err;
-                break;
-        default:
-                if (model != 2)
-                        goto err;
-                break;
-        }
-        return 0;
-err:
-        return -EINVAL;
-}
-
-static int moxa_check_fw(const void *ptr)
-{
-        const __le16 *lptr = ptr;
-
-        if (*lptr != cpu_to_le16(0x7980))
-                return -EINVAL;
-
-        return 0;
-}
-
-static int moxa_load_bios(struct moxa_board_conf *brd, const u8 *buf,
-                size_t len)
-{
-        void __iomem *baseAddr = brd->basemem;
-        u16 tmp;
-
-        writeb(HW_reset, baseAddr + Control_reg);       /* reset */
-        msleep(10);
-        memset_io(baseAddr, 0, 4096);
-        memcpy_toio(baseAddr, buf, len);        /* download BIOS */
-        writeb(0, baseAddr + Control_reg);      /* restart */
-
-        msleep(2000);
-
-        switch (brd->boardType) {
-        case MOXA_BOARD_C218_ISA:
-        case MOXA_BOARD_C218_PCI:
-                tmp = readw(baseAddr + C218_key);
-                if (tmp != C218_KeyCode)
-                        goto err;
-                break;
-        case MOXA_BOARD_CP204J:
-                tmp = readw(baseAddr + C218_key);
-                if (tmp != CP204J_KeyCode)
-                        goto err;
-                break;
-        default:
-                tmp = readw(baseAddr + C320_key);
-                if (tmp != C320_KeyCode)
-                        goto err;
-                tmp = readw(baseAddr + C320_status);
-                if (tmp != STS_init) {
-                        printk(KERN_ERR "MOXA: bios upload failed -- CPU/Basic "
-                                        "module not found\n");
-                        return -EIO;
-                }
-                break;
-        }
-
-        return 0;
-err:
-        printk(KERN_ERR "MOXA: bios upload failed -- board not found\n");
-        return -EIO;
-}
-
-static int moxa_load_320b(struct moxa_board_conf *brd, const u8 *ptr,
-                size_t len)
-{
-        void __iomem *baseAddr = brd->basemem;
-
-        if (len < 7168) {
-                printk(KERN_ERR "MOXA: invalid 320 bios -- too short\n");
-                return -EINVAL;
-        }
-
-        writew(len - 7168 - 2, baseAddr + C320bapi_len);
-        writeb(1, baseAddr + Control_reg);      /* Select Page 1 */
-        memcpy_toio(baseAddr + DynPage_addr, ptr, 7168);
-        writeb(2, baseAddr + Control_reg);      /* Select Page 2 */
-        memcpy_toio(baseAddr + DynPage_addr, ptr + 7168, len - 7168);
-
-        return 0;
-}
-
-static int moxa_real_load_code(struct moxa_board_conf *brd, const void *ptr,
-                size_t len)
-{
-        void __iomem *baseAddr = brd->basemem;
-        const __le16 *uptr = ptr;
-        size_t wlen, len2, j;
-        unsigned long key, loadbuf, loadlen, checksum, checksum_ok;
-        unsigned int i, retry;
-        u16 usum, keycode;
-
-        keycode = (brd->boardType == MOXA_BOARD_CP204J) ? CP204J_KeyCode :
-                                C218_KeyCode;
-
-        switch (brd->boardType) {
-        case MOXA_BOARD_CP204J:
-        case MOXA_BOARD_C218_ISA:
-        case MOXA_BOARD_C218_PCI:
-                key = C218_key;
-                loadbuf = C218_LoadBuf;
-                loadlen = C218DLoad_len;
-                checksum = C218check_sum;
-                checksum_ok = C218chksum_ok;
-                break;
-        default:
-                key = C320_key;
-                keycode = C320_KeyCode;
-                loadbuf = C320_LoadBuf;
-                loadlen = C320DLoad_len;
-                checksum = C320check_sum;
-                checksum_ok = C320chksum_ok;
-                break;
-        }
-
-        usum = 0;
-        wlen = len >> 1;
-        for (i = 0; i < wlen; i++)
-                usum += le16_to_cpu(uptr[i]);
-        retry = 0;
-        do {
-                wlen = len >> 1;
-                j = 0;
-                while (wlen) {
-                        len2 = (wlen > 2048) ? 2048 : wlen;
-                        wlen -= len2;
-                        memcpy_toio(baseAddr + loadbuf, ptr + j, len2 << 1);
-                        j += len2 << 1;
-
-                        writew(len2, baseAddr + loadlen);
-                        writew(0, baseAddr + key);
-                        for (i = 0; i < 100; i++) {
-                                if (readw(baseAddr + key) == keycode)
-                                        break;
-                                msleep(10);
-                        }
-                        if (readw(baseAddr + key) != keycode)
-                                return -EIO;
-                }
-                writew(0, baseAddr + loadlen);
-                writew(usum, baseAddr + checksum);
-                writew(0, baseAddr + key);
-                for (i = 0; i < 100; i++) {
-                        if (readw(baseAddr + key) == keycode)
-                                break;
-                        msleep(10);
-                }
-                retry++;
-        } while ((readb(baseAddr + checksum_ok) != 1) && (retry < 3));
-        if (readb(baseAddr + checksum_ok) != 1)
-                return -EIO;
-
-        writew(0, baseAddr + key);
-        for (i = 0; i < 600; i++) {
-                if (readw(baseAddr + Magic_no) == Magic_code)
-                        break;
-                msleep(10);
-        }
-        if (readw(baseAddr + Magic_no) != Magic_code)
-                return -EIO;
-
-        if (MOXA_IS_320(brd)) {
-                if (brd->busType == MOXA_BUS_TYPE_PCI) {        /* ASIC board */
-                        writew(0x3800, baseAddr + TMS320_PORT1);
-                        writew(0x3900, baseAddr + TMS320_PORT2);
-                        writew(28499, baseAddr + TMS320_CLOCK);
-                } else {
-                        writew(0x3200, baseAddr + TMS320_PORT1);
-                        writew(0x3400, baseAddr + TMS320_PORT2);
-                        writew(19999, baseAddr + TMS320_CLOCK);
-                }
-        }
-        writew(1, baseAddr + Disable_IRQ);
-        writew(0, baseAddr + Magic_no);
-        for (i = 0; i < 500; i++) {
-                if (readw(baseAddr + Magic_no) == Magic_code)
-                        break;
-                msleep(10);
-        }
-        if (readw(baseAddr + Magic_no) != Magic_code)
-                return -EIO;
-
-        if (MOXA_IS_320(brd)) {
-                j = readw(baseAddr + Module_cnt);
-                if (j <= 0)
-                        return -EIO;
-                brd->numPorts = j * 8;
-                writew(j, baseAddr + Module_no);
-                writew(0, baseAddr + Magic_no);
-                for (i = 0; i < 600; i++) {
-                        if (readw(baseAddr + Magic_no) == Magic_code)
-                                break;
-                        msleep(10);
-                }
-                if (readw(baseAddr + Magic_no) != Magic_code)
-                        return -EIO;
-        }
-        brd->intNdx = baseAddr + IRQindex;
-        brd->intPend = baseAddr + IRQpending;
-        brd->intTable = baseAddr + IRQtable;
-
-        return 0;
-}
-
-static int moxa_load_code(struct moxa_board_conf *brd, const void *ptr,
-                size_t len)
-{
-        void __iomem *ofsAddr, *baseAddr = brd->basemem;
-        struct moxa_port *port;
-        int retval, i;
-
-        if (len % 2) {
-                printk(KERN_ERR "MOXA: bios length is not even\n");
-                return -EINVAL;
-        }
-
-        retval = moxa_real_load_code(brd, ptr, len); /* may change numPorts */
-        if (retval)
-                return retval;
-
-        switch (brd->boardType) {
-        case MOXA_BOARD_C218_ISA:
-        case MOXA_BOARD_C218_PCI:
-        case MOXA_BOARD_CP204J:
-                port = brd->ports;
-                for (i = 0; i < brd->numPorts; i++, port++) {
-                        port->board = brd;
-                        port->DCDState = 0;
-                        port->tableAddr = baseAddr + Extern_table +
-                                        Extern_size * i;
-                        ofsAddr = port->tableAddr;
-                        writew(C218rx_mask, ofsAddr + RX_mask);
-                        writew(C218tx_mask, ofsAddr + TX_mask);
-                        writew(C218rx_spage + i * C218buf_pageno, ofsAddr + Page_rxb);
-                        writew(readw(ofsAddr + Page_rxb) + C218rx_pageno, ofsAddr + EndPage_rxb);
-
-                        writew(C218tx_spage + i * C218buf_pageno, ofsAddr + Page_txb);
-                        writew(readw(ofsAddr + Page_txb) + C218tx_pageno, ofsAddr + EndPage_txb);
-
-                }
-                break;
-        default:
-                port = brd->ports;
-                for (i = 0; i < brd->numPorts; i++, port++) {
-                        port->board = brd;
-                        port->DCDState = 0;
-                        port->tableAddr = baseAddr + Extern_table +
-                                        Extern_size * i;
-                        ofsAddr = port->tableAddr;
-                        switch (brd->numPorts) {
-                        case 8:
-                                writew(C320p8rx_mask, ofsAddr + RX_mask);
-                                writew(C320p8tx_mask, ofsAddr + TX_mask);
-                                writew(C320p8rx_spage + i * C320p8buf_pgno, ofsAddr + Page_rxb);
-                                writew(readw(ofsAddr + Page_rxb) + C320p8rx_pgno, ofsAddr + EndPage_rxb);
-                                writew(C320p8tx_spage + i * C320p8buf_pgno, ofsAddr + Page_txb);
-                                writew(readw(ofsAddr + Page_txb) + C320p8tx_pgno, ofsAddr + EndPage_txb);
-
-                                break;
-                        case 16:
-                                writew(C320p16rx_mask, ofsAddr + RX_mask);
-                                writew(C320p16tx_mask, ofsAddr + TX_mask);
-                                writew(C320p16rx_spage + i * C320p16buf_pgno, ofsAddr + Page_rxb);
-                                writew(readw(ofsAddr + Page_rxb) + C320p16rx_pgno, ofsAddr + EndPage_rxb);
-                                writew(C320p16tx_spage + i * C320p16buf_pgno, ofsAddr + Page_txb);
-                                writew(readw(ofsAddr + Page_txb) + C320p16tx_pgno, ofsAddr + EndPage_txb);
-                                break;
-
-                        case 24:
-                                writew(C320p24rx_mask, ofsAddr + RX_mask);
-                                writew(C320p24tx_mask, ofsAddr + TX_mask);
-                                writew(C320p24rx_spage + i * C320p24buf_pgno, ofsAddr + Page_rxb);
-                                writew(readw(ofsAddr + Page_rxb) + C320p24rx_pgno, ofsAddr + EndPage_rxb);
-                                writew(C320p24tx_spage + i * C320p24buf_pgno, ofsAddr + Page_txb);
-                                writew(readw(ofsAddr + Page_txb), ofsAddr + EndPage_txb);
-                                break;
-                        case 32:
-                                writew(C320p32rx_mask, ofsAddr + RX_mask);
-                                writew(C320p32tx_mask, ofsAddr + TX_mask);
-                                writew(C320p32tx_ofs, ofsAddr + Ofs_txb);
-                                writew(C320p32rx_spage + i * C320p32buf_pgno, ofsAddr + Page_rxb);
-                                writew(readb(ofsAddr + Page_rxb), ofsAddr + EndPage_rxb);
-                                writew(C320p32tx_spage + i * C320p32buf_pgno, ofsAddr + Page_txb);
-                                writew(readw(ofsAddr + Page_txb), ofsAddr + EndPage_txb);
-                                break;
-                        }
-                }
-                break;
-        }
-        return 0;
-}
-
-static int moxa_load_fw(struct moxa_board_conf *brd, const struct firmware *fw)
-{
-        const void *ptr = fw->data;
-        char rsn[64];
-        u16 lens[5];
-        size_t len;
-        unsigned int a, lenp, lencnt;
-        int ret = -EINVAL;
-        struct {
-                __le32 magic;   /* 0x34303430 */
-                u8 reserved1[2];
-                u8 type;        /* UNIX = 3 */
-                u8 model;       /* C218T=1, C320T=2, CP204=3 */
-                u8 reserved2[8];
-                __le16 len[5];
-        } const *hdr = ptr;
-
-        BUILD_BUG_ON(ARRAY_SIZE(hdr->len) != ARRAY_SIZE(lens));
-
-        if (fw->size < MOXA_FW_HDRLEN) {
-                strcpy(rsn, "too short (even header won't fit)");
-                goto err;
-        }
-        if (hdr->magic != cpu_to_le32(0x30343034)) {
-                sprintf(rsn, "bad magic: %.8x", le32_to_cpu(hdr->magic));
-                goto err;
-        }
-        if (hdr->type != 3) {
-                sprintf(rsn, "not for linux, type is %u", hdr->type);
-                goto err;
-        }
-        if (moxa_check_fw_model(brd, hdr->model)) {
-                sprintf(rsn, "not for this card, model is %u", hdr->model);
-                goto err;
-        }
-
-        len = MOXA_FW_HDRLEN;
-        lencnt = hdr->model == 2 ? 5 : 3;
-        for (a = 0; a < ARRAY_SIZE(lens); a++) {
-                lens[a] = le16_to_cpu(hdr->len[a]);
-                if (lens[a] && len + lens[a] <= fw->size &&
-                                moxa_check_fw(&fw->data[len]))
-                        printk(KERN_WARNING "MOXA firmware: unexpected input "
-                                "at offset %u, but going on\n", (u32)len);
-                if (!lens[a] && a < lencnt) {
-                        sprintf(rsn, "too few entries in fw file");
-                        goto err;
-                }
-                len += lens[a];
-        }
-
-        if (len != fw->size) {
-                sprintf(rsn, "bad length: %u (should be %u)", (u32)fw->size,
-                                (u32)len);
-                goto err;
-        }
-
-        ptr += MOXA_FW_HDRLEN;
-        lenp = 0; /* bios */
-
-        strcpy(rsn, "read above");
-
-        ret = moxa_load_bios(brd, ptr, lens[lenp]);
-        if (ret)
-                goto err;
-
-        /* we skip the tty section (lens[1]), since we don't need it */
-        ptr += lens[lenp] + lens[lenp + 1];
-        lenp += 2; /* comm */
-
-        if (hdr->model == 2) {
-                ret = moxa_load_320b(brd, ptr, lens[lenp]);
-                if (ret)
-                        goto err;
-                /* skip another tty */
-                ptr += lens[lenp] + lens[lenp + 1];
-                lenp += 2;
-        }
-
-        ret = moxa_load_code(brd, ptr, lens[lenp]);
-        if (ret)
-                goto err;
-
-        return 0;
-err:
-        printk(KERN_ERR "firmware failed to load, reason: %s\n", rsn);
-        return ret;
-}
-
-static int moxa_init_board(struct moxa_board_conf *brd, struct device *dev)
-{
-        const struct firmware *fw;
-        const char *file;
-        struct moxa_port *p;
-        unsigned int i;
-        int ret;
-
-        brd->ports = kcalloc(MAX_PORTS_PER_BOARD, sizeof(*brd->ports),
-                        GFP_KERNEL);
-        if (brd->ports == NULL) {
-                printk(KERN_ERR "cannot allocate memory for ports\n");
-                ret = -ENOMEM;
-                goto err;
-        }
-
-        for (i = 0, p = brd->ports; i < MAX_PORTS_PER_BOARD; i++, p++) {
-                tty_port_init(&p->port);
-                p->port.ops = &moxa_port_ops;
-                p->type = PORT_16550A;
-                p->cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL;
-        }
-
-        switch (brd->boardType) {
-        case MOXA_BOARD_C218_ISA:
-        case MOXA_BOARD_C218_PCI:
-                file = "c218tunx.cod";
-                break;
-        case MOXA_BOARD_CP204J:
-                file = "cp204unx.cod";
-                break;
-        default:
-                file = "c320tunx.cod";
-                break;
-        }
-
-        ret = request_firmware(&fw, file, dev);
-        if (ret) {
-                printk(KERN_ERR "MOXA: request_firmware failed. Make sure "
-                                "you've placed '%s' file into your firmware "
-                                "loader directory (e.g. /lib/firmware)\n",
-                                file);
-                goto err_free;
-        }
-
-        ret = moxa_load_fw(brd, fw);
-
-        release_firmware(fw);
-
-        if (ret)
-                goto err_free;
-
-        spin_lock_bh(&moxa_lock);
-        brd->ready = 1;
-        if (!timer_pending(&moxaTimer))
-                mod_timer(&moxaTimer, jiffies + HZ / 50);
-        spin_unlock_bh(&moxa_lock);
-
-        return 0;
-err_free:
-        kfree(brd->ports);
-err:
-        return ret;
-}
-
-static void moxa_board_deinit(struct moxa_board_conf *brd)
-{
-        unsigned int a, opened;
-
-        mutex_lock(&moxa_openlock);
-        spin_lock_bh(&moxa_lock);
-        brd->ready = 0;
-        spin_unlock_bh(&moxa_lock);
-
-        /* pci hot-un-plug support */
-        for (a = 0; a < brd->numPorts; a++)
-                if (brd->ports[a].port.flags & ASYNC_INITIALIZED) {
-                        struct tty_struct *tty = tty_port_tty_get(
-                                                &brd->ports[a].port);
-                        if (tty) {
-                                tty_hangup(tty);
-                                tty_kref_put(tty);
-                        }
-                }
-        while (1) {
-                opened = 0;
-                for (a = 0; a < brd->numPorts; a++)
-                        if (brd->ports[a].port.flags & ASYNC_INITIALIZED)
-                                opened++;
-                mutex_unlock(&moxa_openlock);
-                if (!opened)
-                        break;
-                msleep(50);
-                mutex_lock(&moxa_openlock);
-        }
-
-        iounmap(brd->basemem);
-        brd->basemem = NULL;
-        kfree(brd->ports);
-}
-
-#ifdef CONFIG_PCI
-static int __devinit moxa_pci_probe(struct pci_dev *pdev,
-                const struct pci_device_id *ent)
-{
-        struct moxa_board_conf *board;
-        unsigned int i;
-        int board_type = ent->driver_data;
-        int retval;
-
-        retval = pci_enable_device(pdev);
-        if (retval) {
-                dev_err(&pdev->dev, "can't enable pci device\n");
-                goto err;
-        }
-
-        for (i = 0; i < MAX_BOARDS; i++)
-                if (moxa_boards[i].basemem == NULL)
-                        break;
-
-        retval = -ENODEV;
-        if (i >= MAX_BOARDS) {
-                dev_warn(&pdev->dev, "more than %u MOXA Intellio family boards "
-                                "found. Board is ignored.\n", MAX_BOARDS);
-                goto err;
-        }
-
-        board = &moxa_boards[i];
-
-        retval = pci_request_region(pdev, 2, "moxa-base");
-        if (retval) {
-                dev_err(&pdev->dev, "can't request pci region 2\n");
-                goto err;
-        }
-
-        board->basemem = ioremap_nocache(pci_resource_start(pdev, 2), 0x4000);
-        if (board->basemem == NULL) {
-                dev_err(&pdev->dev, "can't remap io space 2\n");
-                goto err_reg;
-        }
-
-        board->boardType = board_type;
-        switch (board_type) {
-        case MOXA_BOARD_C218_ISA:
-        case MOXA_BOARD_C218_PCI:
-                board->numPorts = 8;
-                break;
-
-        case MOXA_BOARD_CP204J:
-                board->numPorts = 4;
-                break;
-        default:
-                board->numPorts = 0;
-                break;
-        }
-        board->busType = MOXA_BUS_TYPE_PCI;
-
-        retval = moxa_init_board(board, &pdev->dev);
-        if (retval)
-                goto err_base;
-
-        pci_set_drvdata(pdev, board);
-
-        dev_info(&pdev->dev, "board '%s' ready (%u ports, firmware loaded)\n",
-                        moxa_brdname[board_type - 1], board->numPorts);
-
-        return 0;
-err_base:
-        iounmap(board->basemem);
-        board->basemem = NULL;
-err_reg:
-        pci_release_region(pdev, 2);
-err:
-        return retval;
-}
-
-static void __devexit moxa_pci_remove(struct pci_dev *pdev)
-{
-        struct moxa_board_conf *brd = pci_get_drvdata(pdev);
-
-        moxa_board_deinit(brd);
-
-        pci_release_region(pdev, 2);
-}
-
-static struct pci_driver moxa_pci_driver = {
-        .name = "moxa",
-        .id_table = moxa_pcibrds,
-        .probe = moxa_pci_probe,
-        .remove = __devexit_p(moxa_pci_remove)
-};
-#endif /* CONFIG_PCI */
-
-static int __init moxa_init(void)
-{
-        unsigned int isabrds = 0;
-        int retval = 0;
-        struct moxa_board_conf *brd = moxa_boards;
-        unsigned int i;
-
-        printk(KERN_INFO "MOXA Intellio family driver version %s\n",
-                        MOXA_VERSION);
-        moxaDriver = alloc_tty_driver(MAX_PORTS + 1);
-        if (!moxaDriver)
-                return -ENOMEM;
-
-        moxaDriver->owner = THIS_MODULE;
-        moxaDriver->name = "ttyMX";
-        moxaDriver->major = ttymajor;
-        moxaDriver->minor_start = 0;
-        moxaDriver->type = TTY_DRIVER_TYPE_SERIAL;
-        moxaDriver->subtype = SERIAL_TYPE_NORMAL;
-        moxaDriver->init_termios = tty_std_termios;
-        moxaDriver->init_termios.c_cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL;
-        moxaDriver->init_termios.c_ispeed = 9600;
-        moxaDriver->init_termios.c_ospeed = 9600;
-        moxaDriver->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(moxaDriver, &moxa_ops);
-
-        if (tty_register_driver(moxaDriver)) {
-                printk(KERN_ERR "can't register MOXA Smartio tty driver!\n");
-                put_tty_driver(moxaDriver);
-                return -1;
-        }
-
-        /* Find the boards defined from module args. */
-
-        for (i = 0; i < MAX_BOARDS; i++) {
-                if (!baseaddr[i])
-                        break;
-                if (type[i] == MOXA_BOARD_C218_ISA ||
-                                type[i] == MOXA_BOARD_C320_ISA) {
-                        pr_debug("Moxa board %2d: %s board(baseAddr=%lx)\n",
-                                        isabrds + 1, moxa_brdname[type[i] - 1],
-                                        baseaddr[i]);
-                        brd->boardType = type[i];
-                        brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 :
-                                        numports[i];
-                        brd->busType = MOXA_BUS_TYPE_ISA;
-                        brd->basemem = ioremap_nocache(baseaddr[i], 0x4000);
-                        if (!brd->basemem) {
-                                printk(KERN_ERR "MOXA: can't remap %lx\n",
-                                                baseaddr[i]);
-                                continue;
-                        }
-                        if (moxa_init_board(brd, NULL)) {
-                                iounmap(brd->basemem);
-                                brd->basemem = NULL;
-                                continue;
-                        }
-
-                        printk(KERN_INFO "MOXA isa board found at 0x%.8lu and "
-                                        "ready (%u ports, firmware loaded)\n",
-                                        baseaddr[i], brd->numPorts);
-
-                        brd++;
-                        isabrds++;
-                }
-        }
-
-#ifdef CONFIG_PCI
-        retval = pci_register_driver(&moxa_pci_driver);
-        if (retval) {
-                printk(KERN_ERR "Can't register MOXA pci driver!\n");
-                if (isabrds)
-                        retval = 0;
-        }
-#endif
-
-        return retval;
-}
-
-static void __exit moxa_exit(void)
-{
-        unsigned int i;
-
-#ifdef CONFIG_PCI
-        pci_unregister_driver(&moxa_pci_driver);
-#endif
-
-        for (i = 0; i < MAX_BOARDS; i++) /* ISA boards */
-                if (moxa_boards[i].ready)
-                        moxa_board_deinit(&moxa_boards[i]);
-
-        del_timer_sync(&moxaTimer);
-
-        if (tty_unregister_driver(moxaDriver))
-                printk(KERN_ERR "Couldn't unregister MOXA Intellio family "
-                                "serial driver\n");
-        put_tty_driver(moxaDriver);
-}
-
-module_init(moxa_init);
-module_exit(moxa_exit);
-
-static void moxa_shutdown(struct tty_port *port)
-{
-        struct moxa_port *ch = container_of(port, struct moxa_port, port);
-        MoxaPortDisable(ch);
-        MoxaPortFlushData(ch, 2);
-        clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
-}
-
-static int moxa_carrier_raised(struct tty_port *port)
-{
-        struct moxa_port *ch = container_of(port, struct moxa_port, port);
-        int dcd;
-
-        spin_lock_irq(&port->lock);
-        dcd = ch->DCDState;
-        spin_unlock_irq(&port->lock);
-        return dcd;
-}
-
-static void moxa_dtr_rts(struct tty_port *port, int onoff)
-{
-        struct moxa_port *ch = container_of(port, struct moxa_port, port);
-        MoxaPortLineCtrl(ch, onoff, onoff);
-}
-
-
-static int moxa_open(struct tty_struct *tty, struct file *filp)
-{
-        struct moxa_board_conf *brd;
-        struct moxa_port *ch;
-        int port;
-        int retval;
-
-        port = tty->index;
-        if (port == MAX_PORTS) {
-                return capable(CAP_SYS_ADMIN) ? 0 : -EPERM;
-        }
-        if (mutex_lock_interruptible(&moxa_openlock))
-                return -ERESTARTSYS;
-        brd = &moxa_boards[port / MAX_PORTS_PER_BOARD];
-        if (!brd->ready) {
-                mutex_unlock(&moxa_openlock);
-                return -ENODEV;
-        }
-
-        if (port % MAX_PORTS_PER_BOARD >= brd->numPorts) {
-                mutex_unlock(&moxa_openlock);
-                return -ENODEV;
-        }
-
-        ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
-        ch->port.count++;
-        tty->driver_data = ch;
-        tty_port_tty_set(&ch->port, tty);
-        mutex_lock(&ch->port.mutex);
-        if (!(ch->port.flags & ASYNC_INITIALIZED)) {
-                ch->statusflags = 0;
-                moxa_set_tty_param(tty, tty->termios);
-                MoxaPortLineCtrl(ch, 1, 1);
-                MoxaPortEnable(ch);
-                MoxaSetFifo(ch, ch->type == PORT_16550A);
-                ch->port.flags |= ASYNC_INITIALIZED;
-        }
-        mutex_unlock(&ch->port.mutex);
-        mutex_unlock(&moxa_openlock);
-
-        retval = tty_port_block_til_ready(&ch->port, tty, filp);
-        if (retval == 0)
-                set_bit(ASYNCB_NORMAL_ACTIVE, &ch->port.flags);
-        return retval;
-}
-
-static void moxa_close(struct tty_struct *tty, struct file *filp)
-{
-        struct moxa_port *ch = tty->driver_data;
-        ch->cflag = tty->termios->c_cflag;
-        tty_port_close(&ch->port, tty, filp);
-}
-
-static int moxa_write(struct tty_struct *tty,
-                      const unsigned char *buf, int count)
-{
-        struct moxa_port *ch = tty->driver_data;
-        int len;
-
-        if (ch == NULL)
-                return 0;
-
-        spin_lock_bh(&moxa_lock);
-        len = MoxaPortWriteData(tty, buf, count);
-        spin_unlock_bh(&moxa_lock);
-
-        set_bit(LOWWAIT, &ch->statusflags);
-        return len;
-}
-
-static int moxa_write_room(struct tty_struct *tty)
-{
-        struct moxa_port *ch;
-
-        if (tty->stopped)
-                return 0;
-        ch = tty->driver_data;
-        if (ch == NULL)
-                return 0;
-        return MoxaPortTxFree(ch);
-}
-
-static void moxa_flush_buffer(struct tty_struct *tty)
-{
-        struct moxa_port *ch = tty->driver_data;
-
-        if (ch == NULL)
-                return;
-        MoxaPortFlushData(ch, 1);
-        tty_wakeup(tty);
-}
-
-static int moxa_chars_in_buffer(struct tty_struct *tty)
-{
-        struct moxa_port *ch = tty->driver_data;
-        int chars;
-
-        chars = MoxaPortTxQueue(ch);
-        if (chars)
-                /*
-                 * Make it possible to wakeup anything waiting for output
-                 * in tty_ioctl.c, etc.
-                 */
-                set_bit(EMPTYWAIT, &ch->statusflags);
-        return chars;
-}
-
-static int moxa_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct moxa_port *ch = tty->driver_data;
-        int flag = 0, dtr, rts;
-
-        MoxaPortGetLineOut(ch, &dtr, &rts);
-        if (dtr)
-                flag |= TIOCM_DTR;
-        if (rts)
-                flag |= TIOCM_RTS;
-        dtr = MoxaPortLineStatus(ch);
-        if (dtr & 1)
-                flag |= TIOCM_CTS;
-        if (dtr & 2)
-                flag |= TIOCM_DSR;
-        if (dtr & 4)
-                flag |= TIOCM_CD;
-        return flag;
-}
-
-static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
-                         unsigned int set, unsigned int clear)
-{
-        struct moxa_port *ch;
-        int port;
-        int dtr, rts;
-
-        port = tty->index;
-        mutex_lock(&moxa_openlock);
-        ch = tty->driver_data;
-        if (!ch) {
-                mutex_unlock(&moxa_openlock);
-                return -EINVAL;
-        }
-
-        MoxaPortGetLineOut(ch, &dtr, &rts);
-        if (set & TIOCM_RTS)
-                rts = 1;
-        if (set & TIOCM_DTR)
-                dtr = 1;
-        if (clear & TIOCM_RTS)
-                rts = 0;
-        if (clear & TIOCM_DTR)
-                dtr = 0;
-        MoxaPortLineCtrl(ch, dtr, rts);
-        mutex_unlock(&moxa_openlock);
-        return 0;
-}
-
-static void moxa_set_termios(struct tty_struct *tty,
-                struct ktermios *old_termios)
-{
-        struct moxa_port *ch = tty->driver_data;
-
-        if (ch == NULL)
-                return;
-        moxa_set_tty_param(tty, old_termios);
-        if (!(old_termios->c_cflag & CLOCAL) && C_CLOCAL(tty))
-                wake_up_interruptible(&ch->port.open_wait);
-}
-
-static void moxa_stop(struct tty_struct *tty)
-{
-        struct moxa_port *ch = tty->driver_data;
-
-        if (ch == NULL)
-                return;
-        MoxaPortTxDisable(ch);
-        set_bit(TXSTOPPED, &ch->statusflags);
-}
-
-
-static void moxa_start(struct tty_struct *tty)
-{
-        struct moxa_port *ch = tty->driver_data;
-
-        if (ch == NULL)
-                return;
-
-        if (!(ch->statusflags & TXSTOPPED))
-                return;
-
-        MoxaPortTxEnable(ch);
-        clear_bit(TXSTOPPED, &ch->statusflags);
-}
-
-static void moxa_hangup(struct tty_struct *tty)
-{
-        struct moxa_port *ch = tty->driver_data;
-        tty_port_hangup(&ch->port);
-}
-
-static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)
-{
-        struct tty_struct *tty;
-        unsigned long flags;
-        dcd = !!dcd;
-
-        spin_lock_irqsave(&p->port.lock, flags);
-        if (dcd != p->DCDState) {
-                p->DCDState = dcd;
-                spin_unlock_irqrestore(&p->port.lock, flags);
-                tty = tty_port_tty_get(&p->port);
-                if (tty && C_CLOCAL(tty) && !dcd)
-                        tty_hangup(tty);
-                tty_kref_put(tty);
-        }
-        else
-                spin_unlock_irqrestore(&p->port.lock, flags);
-}
-
-static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
-                u16 __iomem *ip)
-{
-        struct tty_struct *tty = tty_port_tty_get(&p->port);
-        void __iomem *ofsAddr;
-        unsigned int inited = p->port.flags & ASYNC_INITIALIZED;
-        u16 intr;
-
-        if (tty) {
-                if (test_bit(EMPTYWAIT, &p->statusflags) &&
-                                MoxaPortTxQueue(p) == 0) {
-                        clear_bit(EMPTYWAIT, &p->statusflags);
-                        tty_wakeup(tty);
-                }
-                if (test_bit(LOWWAIT, &p->statusflags) && !tty->stopped &&
-                                MoxaPortTxQueue(p) <= WAKEUP_CHARS) {
-                        clear_bit(LOWWAIT, &p->statusflags);
-                        tty_wakeup(tty);
-                }
-
-                if (inited && !test_bit(TTY_THROTTLED, &tty->flags) &&
-                                MoxaPortRxQueue(p) > 0) { /* RX */
-                        MoxaPortReadData(p);
-                        tty_schedule_flip(tty);
-                }
-        } else {
-                clear_bit(EMPTYWAIT, &p->statusflags);
-                MoxaPortFlushData(p, 0); /* flush RX */
-        }
-
-        if (!handle) /* nothing else to do */
-                goto put;
-
-        intr = readw(ip); /* port irq status */
-        if (intr == 0)
-                goto put;
-
-        writew(0, ip); /* ACK port */
-        ofsAddr = p->tableAddr;
-        if (intr & IntrTx) /* disable tx intr */
-                writew(readw(ofsAddr + HostStat) & ~WakeupTx,
-                                ofsAddr + HostStat);
-
-        if (!inited)
-                goto put;
-
-        if (tty && (intr & IntrBreak) && !I_IGNBRK(tty)) { /* BREAK */
-                tty_insert_flip_char(tty, 0, TTY_BREAK);
-                tty_schedule_flip(tty);
-        }
-
-        if (intr & IntrLine)
-                moxa_new_dcdstate(p, readb(ofsAddr + FlagStat) & DCD_state);
-put:
-        tty_kref_put(tty);
-
-        return 0;
-}
-
-static void moxa_poll(unsigned long ignored)
-{
-        struct moxa_board_conf *brd;
-        u16 __iomem *ip;
-        unsigned int card, port, served = 0;
-
-        spin_lock(&moxa_lock);
-        for (card = 0; card < MAX_BOARDS; card++) {
-                brd = &moxa_boards[card];
-                if (!brd->ready)
-                        continue;
-
-                served++;
-
-                ip = NULL;
-                if (readb(brd->intPend) == 0xff)
-                        ip = brd->intTable + readb(brd->intNdx);
-
-                for (port = 0; port < brd->numPorts; port++)
-                        moxa_poll_port(&brd->ports[port], !!ip, ip + port);
-
-                if (ip)
-                        writeb(0, brd->intPend); /* ACK */
-
-                if (moxaLowWaterChk) {
-                        struct moxa_port *p = brd->ports;
-                        for (port = 0; port < brd->numPorts; port++, p++)
-                                if (p->lowChkFlag) {
-                                        p->lowChkFlag = 0;
-                                        moxa_low_water_check(p->tableAddr);
-                                }
-                }
-        }
-        moxaLowWaterChk = 0;
-
-        if (served)
-                mod_timer(&moxaTimer, jiffies + HZ / 50);
-        spin_unlock(&moxa_lock);
-}
-
-/******************************************************************************/
-
-static void moxa_set_tty_param(struct tty_struct *tty, struct ktermios *old_termios)
-{
-        register struct ktermios *ts = tty->termios;
-        struct moxa_port *ch = tty->driver_data;
-        int rts, cts, txflow, rxflow, xany, baud;
-
-        rts = cts = txflow = rxflow = xany = 0;
-        if (ts->c_cflag & CRTSCTS)
-                rts = cts = 1;
-        if (ts->c_iflag & IXON)
-                txflow = 1;
-        if (ts->c_iflag & IXOFF)
-                rxflow = 1;
-        if (ts->c_iflag & IXANY)
-                xany = 1;
-
-        /* Clear the features we don't support */
-        ts->c_cflag &= ~CMSPAR;
-        MoxaPortFlowCtrl(ch, rts, cts, txflow, rxflow, xany);
-        baud = MoxaPortSetTermio(ch, ts, tty_get_baud_rate(tty));
-        if (baud == -1)
-                baud = tty_termios_baud_rate(old_termios);
-        /* Not put the baud rate into the termios data */
-        tty_encode_baud_rate(tty, baud, baud);
-}
-
-/*****************************************************************************
- *      Driver level functions:                                              *
- *****************************************************************************/
-
-static void MoxaPortFlushData(struct moxa_port *port, int mode)
-{
-        void __iomem *ofsAddr;
-        if (mode < 0 || mode > 2)
-                return;
-        ofsAddr = port->tableAddr;
-        moxafunc(ofsAddr, FC_FlushQueue, mode);
-        if (mode != 1) {
-                port->lowChkFlag = 0;
-                moxa_low_water_check(ofsAddr);
-        }
-}
-
-/*
- *    Moxa Port Number Description:
- *
- *      MOXA serial driver supports up to 4 MOXA-C218/C320 boards. And,
- *      the port number using in MOXA driver functions will be 0 to 31 for
- *      first MOXA board, 32 to 63 for second, 64 to 95 for third and 96
- *      to 127 for fourth. For example, if you setup three MOXA boards,
- *      first board is C218, second board is C320-16 and third board is
- *      C320-32. The port number of first board (C218 - 8 ports) is from
- *      0 to 7. The port number of second board (C320 - 16 ports) is form
- *      32 to 47. The port number of third board (C320 - 32 ports) is from
- *      64 to 95. And those port numbers form 8 to 31, 48 to 63 and 96 to
- *      127 will be invalid.
- *
- *
- *      Moxa Functions Description:
- *
- *      Function 1:     Driver initialization routine, this routine must be
- *                      called when initialized driver.
- *      Syntax:
- *      void MoxaDriverInit();
- *
- *
- *      Function 2:     Moxa driver private IOCTL command processing.
- *      Syntax:
- *      int  MoxaDriverIoctl(unsigned int cmd, unsigned long arg, int port);
- *
- *           unsigned int cmd   : IOCTL command
- *           unsigned long arg  : IOCTL argument
- *           int port           : port number (0 - 127)
- *
- *           return:    0  (OK)
- *                      -EINVAL
- *                      -ENOIOCTLCMD
- *
- *
- *      Function 6:     Enable this port to start Tx/Rx data.
- *      Syntax:
- *      void MoxaPortEnable(int port);
- *           int port           : port number (0 - 127)
- *
- *
- *      Function 7:     Disable this port
- *      Syntax:
- *      void MoxaPortDisable(int port);
- *           int port           : port number (0 - 127)
- *
- *
- *      Function 10:    Setting baud rate of this port.
- *      Syntax:
- *      speed_t MoxaPortSetBaud(int port, speed_t baud);
- *           int port           : port number (0 - 127)
- *           long baud          : baud rate (50 - 115200)
- *
- *           return:    0       : this port is invalid or baud < 50
- *                      50 - 115200 : the real baud rate set to the port, if
- *                                    the argument baud is large than maximun
- *                                    available baud rate, the real setting
- *                                    baud rate will be the maximun baud rate.
- *
- *
- *      Function 12:    Configure the port.
- *      Syntax:
- *      int  MoxaPortSetTermio(int port, struct ktermios *termio, speed_t baud);
- *           int port           : port number (0 - 127)
- *           struct ktermios * termio : termio structure pointer
- *           speed_t baud       : baud rate
- *
- *           return:    -1      : this port is invalid or termio == NULL
- *                      0       : setting O.K.
- *
- *
- *      Function 13:    Get the DTR/RTS state of this port.
- *      Syntax:
- *      int  MoxaPortGetLineOut(int port, int *dtrState, int *rtsState);
- *           int port           : port number (0 - 127)
- *           int * dtrState     : pointer to INT to receive the current DTR
- *                                state. (if NULL, this function will not
- *                                write to this address)
- *           int * rtsState     : pointer to INT to receive the current RTS
- *                                state. (if NULL, this function will not
- *                                write to this address)
- *
- *           return:    -1      : this port is invalid
- *                      0       : O.K.
- *
- *
- *      Function 14:    Setting the DTR/RTS output state of this port.
- *      Syntax:
- *      void MoxaPortLineCtrl(int port, int dtrState, int rtsState);
- *           int port           : port number (0 - 127)
- *           int dtrState       : DTR output state (0: off, 1: on)
- *           int rtsState       : RTS output state (0: off, 1: on)
- *
- *
- *      Function 15:    Setting the flow control of this port.
- *      Syntax:
- *      void MoxaPortFlowCtrl(int port, int rtsFlow, int ctsFlow, int rxFlow,
- *                            int txFlow,int xany);
- *           int port           : port number (0 - 127)
- *           int rtsFlow        : H/W RTS flow control (0: no, 1: yes)
- *           int ctsFlow        : H/W CTS flow control (0: no, 1: yes)
- *           int rxFlow         : S/W Rx XON/XOFF flow control (0: no, 1: yes)
- *           int txFlow         : S/W Tx XON/XOFF flow control (0: no, 1: yes)
- *           int xany           : S/W XANY flow control (0: no, 1: yes)
- *
- *
- *      Function 16:    Get ths line status of this port
- *      Syntax:
- *      int  MoxaPortLineStatus(int port);
- *           int port           : port number (0 - 127)
- *
- *           return:    Bit 0 - CTS state (0: off, 1: on)
- *                      Bit 1 - DSR state (0: off, 1: on)
- *                      Bit 2 - DCD state (0: off, 1: on)
- *
- *
- *      Function 19:    Flush the Rx/Tx buffer data of this port.
- *      Syntax:
- *      void MoxaPortFlushData(int port, int mode);
- *           int port           : port number (0 - 127)
- *           int mode    
- *                      0       : flush the Rx buffer 
- *                      1       : flush the Tx buffer 
- *                      2       : flush the Rx and Tx buffer 
- *
- *
- *      Function 20:    Write data.
- *      Syntax:
- *      int  MoxaPortWriteData(int port, unsigned char * buffer, int length);
- *           int port           : port number (0 - 127)
- *           unsigned char * buffer     : pointer to write data buffer.
- *           int length         : write data length
- *
- *           return:    0 - length      : real write data length
- *
- *
- *      Function 21:    Read data.
- *      Syntax:
- *      int  MoxaPortReadData(int port, struct tty_struct *tty);
- *           int port           : port number (0 - 127)
- *           struct tty_struct *tty : tty for data
- *
- *           return:    0 - length      : real read data length
- *
- *
- *      Function 24:    Get the Tx buffer current queued data bytes
- *      Syntax:
- *      int  MoxaPortTxQueue(int port);
- *           int port           : port number (0 - 127)
- *
- *           return:    ..      : Tx buffer current queued data bytes
- *
- *
- *      Function 25:    Get the Tx buffer current free space
- *      Syntax:
- *      int  MoxaPortTxFree(int port);
- *           int port           : port number (0 - 127)
- *
- *           return:    ..      : Tx buffer current free space
- *
- *
- *      Function 26:    Get the Rx buffer current queued data bytes
- *      Syntax:
- *      int  MoxaPortRxQueue(int port);
- *           int port           : port number (0 - 127)
- *
- *           return:    ..      : Rx buffer current queued data bytes
- *
- *
- *      Function 28:    Disable port data transmission.
- *      Syntax:
- *      void MoxaPortTxDisable(int port);
- *           int port           : port number (0 - 127)
- *
- *
- *      Function 29:    Enable port data transmission.
- *      Syntax:
- *      void MoxaPortTxEnable(int port);
- *           int port           : port number (0 - 127)
- *
- *
- *      Function 31:    Get the received BREAK signal count and reset it.
- *      Syntax:
- *      int  MoxaPortResetBrkCnt(int port);
- *           int port           : port number (0 - 127)
- *
- *           return:    0 - ..  : BREAK signal count
- *
- *
- */
-
-static void MoxaPortEnable(struct moxa_port *port)
-{
-        void __iomem *ofsAddr;
-        u16 lowwater = 512;
-
-        ofsAddr = port->tableAddr;
-        writew(lowwater, ofsAddr + Low_water);
-        if (MOXA_IS_320(port->board))
-                moxafunc(ofsAddr, FC_SetBreakIrq, 0);
-        else
-                writew(readw(ofsAddr + HostStat) | WakeupBreak,
-                                ofsAddr + HostStat);
-
-        moxafunc(ofsAddr, FC_SetLineIrq, Magic_code);
-        moxafunc(ofsAddr, FC_FlushQueue, 2);
-
-        moxafunc(ofsAddr, FC_EnableCH, Magic_code);
-        MoxaPortLineStatus(port);
-}
-
-static void MoxaPortDisable(struct moxa_port *port)
-{
-        void __iomem *ofsAddr = port->tableAddr;
-
-        moxafunc(ofsAddr, FC_SetFlowCtl, 0);    /* disable flow control */
-        moxafunc(ofsAddr, FC_ClrLineIrq, Magic_code);
-        writew(0, ofsAddr + HostStat);
-        moxafunc(ofsAddr, FC_DisableCH, Magic_code);
-}
-
-static speed_t MoxaPortSetBaud(struct moxa_port *port, speed_t baud)
-{
-        void __iomem *ofsAddr = port->tableAddr;
-        unsigned int clock, val;
-        speed_t max;
-
-        max = MOXA_IS_320(port->board) ? 460800 : 921600;
-        if (baud < 50)
-                return 0;
-        if (baud > max)
-                baud = max;
-        clock = 921600;
-        val = clock / baud;
-        moxafunc(ofsAddr, FC_SetBaud, val);
-        baud = clock / val;
-        return baud;
-}
-
-static int MoxaPortSetTermio(struct moxa_port *port, struct ktermios *termio,
-                speed_t baud)
-{
-        void __iomem *ofsAddr;
-        tcflag_t cflag;
-        tcflag_t mode = 0;
-
-        ofsAddr = port->tableAddr;
-        cflag = termio->c_cflag;        /* termio->c_cflag */
-
-        mode = termio->c_cflag & CSIZE;
-        if (mode == CS5)
-                mode = MX_CS5;
-        else if (mode == CS6)
-                mode = MX_CS6;
-        else if (mode == CS7)
-                mode = MX_CS7;
-        else if (mode == CS8)
-                mode = MX_CS8;
-
-        if (termio->c_cflag & CSTOPB) {
-                if (mode == MX_CS5)
-                        mode |= MX_STOP15;
-                else
-                        mode |= MX_STOP2;
-        } else
-                mode |= MX_STOP1;
-
-        if (termio->c_cflag & PARENB) {
-                if (termio->c_cflag & PARODD)
-                        mode |= MX_PARODD;
-                else
-                        mode |= MX_PAREVEN;
-        } else
-                mode |= MX_PARNONE;
-
-        moxafunc(ofsAddr, FC_SetDataMode, (u16)mode);
-
-        if (MOXA_IS_320(port->board) && baud >= 921600)
-                return -1;
-
-        baud = MoxaPortSetBaud(port, baud);
-
-        if (termio->c_iflag & (IXON | IXOFF | IXANY)) {
-                spin_lock_irq(&moxafunc_lock);
-                writeb(termio->c_cc[VSTART], ofsAddr + FuncArg);
-                writeb(termio->c_cc[VSTOP], ofsAddr + FuncArg1);
-                writeb(FC_SetXonXoff, ofsAddr + FuncCode);
-                moxa_wait_finish(ofsAddr);
-                spin_unlock_irq(&moxafunc_lock);
-
-        }
-        return baud;
-}
-
-static int MoxaPortGetLineOut(struct moxa_port *port, int *dtrState,
-                int *rtsState)
-{
-        if (dtrState)
-                *dtrState = !!(port->lineCtrl & DTR_ON);
-        if (rtsState)
-                *rtsState = !!(port->lineCtrl & RTS_ON);
-
-        return 0;
-}
-
-static void MoxaPortLineCtrl(struct moxa_port *port, int dtr, int rts)
-{
-        u8 mode = 0;
-
-        if (dtr)
-                mode |= DTR_ON;
-        if (rts)
-                mode |= RTS_ON;
-        port->lineCtrl = mode;
-        moxafunc(port->tableAddr, FC_LineControl, mode);
-}
-
-static void MoxaPortFlowCtrl(struct moxa_port *port, int rts, int cts,
-                int txflow, int rxflow, int txany)
-{
-        int mode = 0;
-
-        if (rts)
-                mode |= RTS_FlowCtl;
-        if (cts)
-                mode |= CTS_FlowCtl;
-        if (txflow)
-                mode |= Tx_FlowCtl;
-        if (rxflow)
-                mode |= Rx_FlowCtl;
-        if (txany)
-                mode |= IXM_IXANY;
-        moxafunc(port->tableAddr, FC_SetFlowCtl, mode);
-}
-
-static int MoxaPortLineStatus(struct moxa_port *port)
-{
-        void __iomem *ofsAddr;
-        int val;
-
-        ofsAddr = port->tableAddr;
-        if (MOXA_IS_320(port->board))
-                val = moxafuncret(ofsAddr, FC_LineStatus, 0);
-        else
-                val = readw(ofsAddr + FlagStat) >> 4;
-        val &= 0x0B;
-        if (val & 8)
-                val |= 4;
-        moxa_new_dcdstate(port, val & 8);
-        val &= 7;
-        return val;
-}
-
-static int MoxaPortWriteData(struct tty_struct *tty,
-                const unsigned char *buffer, int len)
-{
-        struct moxa_port *port = tty->driver_data;
-        void __iomem *baseAddr, *ofsAddr, *ofs;
-        unsigned int c, total;
-        u16 head, tail, tx_mask, spage, epage;
-        u16 pageno, pageofs, bufhead;
-
-        ofsAddr = port->tableAddr;
-        baseAddr = port->board->basemem;
-        tx_mask = readw(ofsAddr + TX_mask);
-        spage = readw(ofsAddr + Page_txb);
-        epage = readw(ofsAddr + EndPage_txb);
-        tail = readw(ofsAddr + TXwptr);
-        head = readw(ofsAddr + TXrptr);
-        c = (head > tail) ? (head - tail - 1) : (head - tail + tx_mask);
-        if (c > len)
-                c = len;
-        moxaLog.txcnt[port->port.tty->index] += c;
-        total = c;
-        if (spage == epage) {
-                bufhead = readw(ofsAddr + Ofs_txb);
-                writew(spage, baseAddr + Control_reg);
-                while (c > 0) {
-                        if (head > tail)
-                                len = head - tail - 1;
-                        else
-                                len = tx_mask + 1 - tail;
-                        len = (c > len) ? len : c;
-                        ofs = baseAddr + DynPage_addr + bufhead + tail;
-                        memcpy_toio(ofs, buffer, len);
-                        buffer += len;
-                        tail = (tail + len) & tx_mask;
-                        c -= len;
-                }
-        } else {
-                pageno = spage + (tail >> 13);
-                pageofs = tail & Page_mask;
-                while (c > 0) {
-                        len = Page_size - pageofs;
-                        if (len > c)
-                                len = c;
-                        writeb(pageno, baseAddr + Control_reg);
-                        ofs = baseAddr + DynPage_addr + pageofs;
-                        memcpy_toio(ofs, buffer, len);
-                        buffer += len;
-                        if (++pageno == epage)
-                                pageno = spage;
-                        pageofs = 0;
-                        c -= len;
-                }
-                tail = (tail + total) & tx_mask;
-        }
-        writew(tail, ofsAddr + TXwptr);
-        writeb(1, ofsAddr + CD180TXirq);        /* start to send */
-        return total;
-}
-
-static int MoxaPortReadData(struct moxa_port *port)
-{
-        struct tty_struct *tty = port->port.tty;
-        unsigned char *dst;
-        void __iomem *baseAddr, *ofsAddr, *ofs;
-        unsigned int count, len, total;
-        u16 tail, rx_mask, spage, epage;
-        u16 pageno, pageofs, bufhead, head;
-
-        ofsAddr = port->tableAddr;
-        baseAddr = port->board->basemem;
-        head = readw(ofsAddr + RXrptr);
-        tail = readw(ofsAddr + RXwptr);
-        rx_mask = readw(ofsAddr + RX_mask);
-        spage = readw(ofsAddr + Page_rxb);
-        epage = readw(ofsAddr + EndPage_rxb);
-        count = (tail >= head) ? (tail - head) : (tail - head + rx_mask + 1);
-        if (count == 0)
-                return 0;
-
-        total = count;
-        moxaLog.rxcnt[tty->index] += total;
-        if (spage == epage) {
-                bufhead = readw(ofsAddr + Ofs_rxb);
-                writew(spage, baseAddr + Control_reg);
-                while (count > 0) {
-                        ofs = baseAddr + DynPage_addr + bufhead + head;
-                        len = (tail >= head) ? (tail - head) :
-                                        (rx_mask + 1 - head);
-                        len = tty_prepare_flip_string(tty, &dst,
-                                        min(len, count));
-                        memcpy_fromio(dst, ofs, len);
-                        head = (head + len) & rx_mask;
-                        count -= len;
-                }
-        } else {
-                pageno = spage + (head >> 13);
-                pageofs = head & Page_mask;
-                while (count > 0) {
-                        writew(pageno, baseAddr + Control_reg);
-                        ofs = baseAddr + DynPage_addr + pageofs;
-                        len = tty_prepare_flip_string(tty, &dst,
-                                        min(Page_size - pageofs, count));
-                        memcpy_fromio(dst, ofs, len);
-
-                        count -= len;
-                        pageofs = (pageofs + len) & Page_mask;
-                        if (pageofs == 0 && ++pageno == epage)
-                                pageno = spage;
-                }
-                head = (head + total) & rx_mask;
-        }
-        writew(head, ofsAddr + RXrptr);
-        if (readb(ofsAddr + FlagStat) & Xoff_state) {
-                moxaLowWaterChk = 1;
-                port->lowChkFlag = 1;
-        }
-        return total;
-}
-
-
-static int MoxaPortTxQueue(struct moxa_port *port)
-{
-        void __iomem *ofsAddr = port->tableAddr;
-        u16 rptr, wptr, mask;
-
-        rptr = readw(ofsAddr + TXrptr);
-        wptr = readw(ofsAddr + TXwptr);
-        mask = readw(ofsAddr + TX_mask);
-        return (wptr - rptr) & mask;
-}
-
-static int MoxaPortTxFree(struct moxa_port *port)
-{
-        void __iomem *ofsAddr = port->tableAddr;
-        u16 rptr, wptr, mask;
-
-        rptr = readw(ofsAddr + TXrptr);
-        wptr = readw(ofsAddr + TXwptr);
-        mask = readw(ofsAddr + TX_mask);
-        return mask - ((wptr - rptr) & mask);
-}
-
-static int MoxaPortRxQueue(struct moxa_port *port)
-{
-        void __iomem *ofsAddr = port->tableAddr;
-        u16 rptr, wptr, mask;
-
-        rptr = readw(ofsAddr + RXrptr);
-        wptr = readw(ofsAddr + RXwptr);
-        mask = readw(ofsAddr + RX_mask);
-        return (wptr - rptr) & mask;
-}
-
-static void MoxaPortTxDisable(struct moxa_port *port)
-{
-        moxafunc(port->tableAddr, FC_SetXoffState, Magic_code);
-}
-
-static void MoxaPortTxEnable(struct moxa_port *port)
-{
-        moxafunc(port->tableAddr, FC_SetXonState, Magic_code);
-}
-
-static int moxa_get_serial_info(struct moxa_port *info,
-                struct serial_struct __user *retinfo)
-{
-        struct serial_struct tmp = {
-                .type = info->type,
-                .line = info->port.tty->index,
-                .flags = info->port.flags,
-                .baud_base = 921600,
-                .close_delay = info->port.close_delay
-        };
-        return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;
-}
-
-
-static int moxa_set_serial_info(struct moxa_port *info,
-                struct serial_struct __user *new_info)
-{
-        struct serial_struct new_serial;
-
-        if (copy_from_user(&new_serial, new_info, sizeof(new_serial)))
-                return -EFAULT;
-
-        if (new_serial.irq != 0 || new_serial.port != 0 ||
-                        new_serial.custom_divisor != 0 ||
-                        new_serial.baud_base != 921600)
-                return -EPERM;
-
-        if (!capable(CAP_SYS_ADMIN)) {
-                if (((new_serial.flags & ~ASYNC_USR_MASK) !=
-                     (info->port.flags & ~ASYNC_USR_MASK)))
-                        return -EPERM;
-        } else
-                info->port.close_delay = new_serial.close_delay * HZ / 100;
-
-        new_serial.flags = (new_serial.flags & ~ASYNC_FLAGS);
-        new_serial.flags |= (info->port.flags & ASYNC_FLAGS);
-
-        MoxaSetFifo(info, new_serial.type == PORT_16550A);
-
-        info->type = new_serial.type;
-        return 0;
-}
-
-
-
-/*****************************************************************************
- *      Static local functions:                                              *
- *****************************************************************************/
-
-static void MoxaSetFifo(struct moxa_port *port, int enable)
-{
-        void __iomem *ofsAddr = port->tableAddr;
-
-        if (!enable) {
-                moxafunc(ofsAddr, FC_SetRxFIFOTrig, 0);
-                moxafunc(ofsAddr, FC_SetTxFIFOCnt, 1);
-        } else {
-                moxafunc(ofsAddr, FC_SetRxFIFOTrig, 3);
-                moxafunc(ofsAddr, FC_SetTxFIFOCnt, 16);
-        }
-}
diff --git a/drivers/char/moxa.h b/drivers/char/moxa.h
deleted file mode 100644
index 87d16ce57be7..000000000000
--- a/drivers/char/moxa.h
+++ /dev/null
@@ -1,304 +0,0 @@
-#ifndef MOXA_H_FILE
-#define MOXA_H_FILE
-
-#define MOXA            0x400
-#define MOXA_GET_IQUEUE         (MOXA + 1)      /* get input buffered count */
-#define MOXA_GET_OQUEUE         (MOXA + 2)      /* get output buffered count */
-#define MOXA_GETDATACOUNT       (MOXA + 23)
-#define MOXA_GET_IOQUEUE        (MOXA + 27)
-#define MOXA_FLUSH_QUEUE        (MOXA + 28)
-#define MOXA_GETMSTATUS         (MOXA + 65)
-
-/*
- *    System Configuration
- */
-
-#define Magic_code      0x404
-
-/*
- *    for C218 BIOS initialization
- */
-#define C218_ConfBase   0x800
-#define C218_status     (C218_ConfBase + 0)     /* BIOS running status    */
-#define C218_diag       (C218_ConfBase + 2)     /* diagnostic status      */
-#define C218_key        (C218_ConfBase + 4)     /* WORD (0x218 for C218) */
-#define C218DLoad_len   (C218_ConfBase + 6)     /* WORD           */
-#define C218check_sum   (C218_ConfBase + 8)     /* BYTE           */
-#define C218chksum_ok   (C218_ConfBase + 0x0a)  /* BYTE (1:ok)            */
-#define C218_TestRx     (C218_ConfBase + 0x10)  /* 8 bytes for 8 ports    */
-#define C218_TestTx     (C218_ConfBase + 0x18)  /* 8 bytes for 8 ports    */
-#define C218_RXerr      (C218_ConfBase + 0x20)  /* 8 bytes for 8 ports    */
-#define C218_ErrFlag    (C218_ConfBase + 0x28)  /* 8 bytes for 8 ports    */
-
-#define C218_LoadBuf    0x0F00
-#define C218_KeyCode    0x218
-#define CP204J_KeyCode  0x204
-
-/*
- *    for C320 BIOS initialization
- */
-#define C320_ConfBase   0x800
-#define C320_LoadBuf    0x0f00
-#define STS_init        0x05    /* for C320_status        */
-
-#define C320_status     C320_ConfBase + 0       /* BIOS running status    */
-#define C320_diag       C320_ConfBase + 2       /* diagnostic status      */
-#define C320_key        C320_ConfBase + 4       /* WORD (0320H for C320) */
-#define C320DLoad_len   C320_ConfBase + 6       /* WORD           */
-#define C320check_sum   C320_ConfBase + 8       /* WORD           */
-#define C320chksum_ok   C320_ConfBase + 0x0a    /* WORD (1:ok)            */
-#define C320bapi_len    C320_ConfBase + 0x0c    /* WORD           */
-#define C320UART_no     C320_ConfBase + 0x0e    /* WORD           */
-
-#define C320_KeyCode    0x320
-
-#define FixPage_addr    0x0000  /* starting addr of static page  */
-#define DynPage_addr    0x2000  /* starting addr of dynamic page */
-#define C218_start      0x3000  /* starting addr of C218 BIOS prg */
-#define Control_reg     0x1ff0  /* select page and reset control */
-#define HW_reset        0x80
-
-/*
- *    Function Codes
- */
-#define FC_CardReset    0x80
-#define FC_ChannelReset 1       /* C320 firmware not supported */
-#define FC_EnableCH     2
-#define FC_DisableCH    3
-#define FC_SetParam     4
-#define FC_SetMode      5
-#define FC_SetRate      6
-#define FC_LineControl  7
-#define FC_LineStatus   8
-#define FC_XmitControl  9
-#define FC_FlushQueue   10
-#define FC_SendBreak    11
-#define FC_StopBreak    12
-#define FC_LoopbackON   13
-#define FC_LoopbackOFF  14
-#define FC_ClrIrqTable  15
-#define FC_SendXon      16
-#define FC_SetTermIrq   17      /* C320 firmware not supported */
-#define FC_SetCntIrq    18      /* C320 firmware not supported */
-#define FC_SetBreakIrq  19
-#define FC_SetLineIrq   20
-#define FC_SetFlowCtl   21
-#define FC_GenIrq       22
-#define FC_InCD180      23
-#define FC_OutCD180     24
-#define FC_InUARTreg    23
-#define FC_OutUARTreg   24
-#define FC_SetXonXoff   25
-#define FC_OutCD180CCR  26
-#define FC_ExtIQueue    27
-#define FC_ExtOQueue    28
-#define FC_ClrLineIrq   29
-#define FC_HWFlowCtl    30
-#define FC_GetClockRate 35
-#define FC_SetBaud      36
-#define FC_SetDataMode  41
-#define FC_GetCCSR      43
-#define FC_GetDataError 45
-#define FC_RxControl    50
-#define FC_ImmSend      51
-#define FC_SetXonState  52
-#define FC_SetXoffState 53
-#define FC_SetRxFIFOTrig 54
-#define FC_SetTxFIFOCnt 55
-#define FC_UnixRate     56
-#define FC_UnixResetTimer 57
-
-#define RxFIFOTrig1     0
-#define RxFIFOTrig4     1
-#define RxFIFOTrig8     2
-#define RxFIFOTrig14    3
-
-/*
- *    Dual-Ported RAM
- */
-#define DRAM_global     0
-#define INT_data        (DRAM_global + 0)
-#define Config_base     (DRAM_global + 0x108)
-
-#define IRQindex        (INT_data + 0)
-#define IRQpending      (INT_data + 4)
-#define IRQtable        (INT_data + 8)
-
-/*
- *    Interrupt Status
- */
-#define IntrRx          0x01    /* receiver data O.K.             */
-#define IntrTx          0x02    /* transmit buffer empty  */
-#define IntrFunc        0x04    /* function complete              */
-#define IntrBreak       0x08    /* received break         */
-#define IntrLine        0x10    /* line status change
-                                   for transmitter                */
-#define IntrIntr        0x20    /* received INTR code             */
-#define IntrQuit        0x40    /* received QUIT code             */
-#define IntrEOF         0x80    /* received EOF code              */
-
-#define IntrRxTrigger   0x100   /* rx data count reach tigger value */
-#define IntrTxTrigger   0x200   /* tx data count below trigger value */
-
-#define Magic_no        (Config_base + 0)
-#define Card_model_no   (Config_base + 2)
-#define Total_ports     (Config_base + 4)
-#define Module_cnt      (Config_base + 8)
-#define Module_no       (Config_base + 10)
-#define Timer_10ms      (Config_base + 14)
-#define Disable_IRQ     (Config_base + 20)
-#define TMS320_PORT1    (Config_base + 22)
-#define TMS320_PORT2    (Config_base + 24)
-#define TMS320_CLOCK    (Config_base + 26)
-
-/*
- *    DATA BUFFER in DRAM
- */
-#define Extern_table    0x400   /* Base address of the external table
-                                   (24 words *    64) total 3K bytes
-                                   (24 words * 128) total 6K bytes */
-#define Extern_size     0x60    /* 96 bytes                       */
-#define RXrptr          0x00    /* read pointer for RX buffer     */
-#define RXwptr          0x02    /* write pointer for RX buffer    */
-#define TXrptr          0x04    /* read pointer for TX buffer     */
-#define TXwptr          0x06    /* write pointer for TX buffer    */
-#define HostStat        0x08    /* IRQ flag and general flag      */
-#define FlagStat        0x0A
-#define FlowControl     0x0C    /* B7 B6 B5 B4 B3 B2 B1 B0              */
-                                /*  x  x  x  x  |  |  |  |            */
-                                /*              |  |  |  + CTS flow   */
-                                /*              |  |  +--- RTS flow   */
-                                /*              |  +------ TX Xon/Xoff */
-                                /*              +--------- RX Xon/Xoff */
-#define Break_cnt       0x0E    /* received break count   */
-#define CD180TXirq      0x10    /* if non-0: enable TX irq        */
-#define RX_mask         0x12
-#define TX_mask         0x14
-#define Ofs_rxb         0x16
-#define Ofs_txb         0x18
-#define Page_rxb        0x1A
-#define Page_txb        0x1C
-#define EndPage_rxb     0x1E
-#define EndPage_txb     0x20
-#define Data_error      0x22
-#define RxTrigger       0x28
-#define TxTrigger       0x2a
-
-#define rRXwptr         0x34
-#define Low_water       0x36
-
-#define FuncCode        0x40
-#define FuncArg         0x42
-#define FuncArg1        0x44
-
-#define C218rx_size     0x2000  /* 8K bytes */
-#define C218tx_size     0x8000  /* 32K bytes */
-
-#define C218rx_mask     (C218rx_size - 1)
-#define C218tx_mask     (C218tx_size - 1)
-
-#define C320p8rx_size   0x2000
-#define C320p8tx_size   0x8000
-#define C320p8rx_mask   (C320p8rx_size - 1)
-#define C320p8tx_mask   (C320p8tx_size - 1)
-
-#define C320p16rx_size  0x2000
-#define C320p16tx_size  0x4000
-#define C320p16rx_mask  (C320p16rx_size - 1)
-#define C320p16tx_mask  (C320p16tx_size - 1)
-
-#define C320p24rx_size  0x2000
-#define C320p24tx_size  0x2000
-#define C320p24rx_mask  (C320p24rx_size - 1)
-#define C320p24tx_mask  (C320p24tx_size - 1)
-
-#define C320p32rx_size  0x1000
-#define C320p32tx_size  0x1000
-#define C320p32rx_mask  (C320p32rx_size - 1)
-#define C320p32tx_mask  (C320p32tx_size - 1)
-
-#define Page_size       0x2000U
-#define Page_mask       (Page_size - 1)
-#define C218rx_spage    3
-#define C218tx_spage    4
-#define C218rx_pageno   1
-#define C218tx_pageno   4
-#define C218buf_pageno  5
-
-#define C320p8rx_spage  3
-#define C320p8tx_spage  4
-#define C320p8rx_pgno   1
-#define C320p8tx_pgno   4
-#define C320p8buf_pgno  5
-
-#define C320p16rx_spage 3
-#define C320p16tx_spage 4
-#define C320p16rx_pgno  1
-#define C320p16tx_pgno  2
-#define C320p16buf_pgno 3
-
-#define C320p24rx_spage 3
-#define C320p24tx_spage 4
-#define C320p24rx_pgno  1
-#define C320p24tx_pgno  1
-#define C320p24buf_pgno 2
-
-#define C320p32rx_spage 3
-#define C320p32tx_ofs   C320p32rx_size
-#define C320p32tx_spage 3
-#define C320p32buf_pgno 1
-
-/*
- *    Host Status
- */
-#define WakeupRx        0x01
-#define WakeupTx        0x02
-#define WakeupBreak     0x08
-#define WakeupLine      0x10
-#define WakeupIntr      0x20
-#define WakeupQuit      0x40
-#define WakeupEOF       0x80    /* used in VTIME control */
-#define WakeupRxTrigger 0x100
-#define WakeupTxTrigger 0x200
-/*
- *    Flag status
- */
-#define Rx_over         0x01
-#define Xoff_state      0x02
-#define Tx_flowOff      0x04
-#define Tx_enable       0x08
-#define CTS_state       0x10
-#define DSR_state       0x20
-#define DCD_state       0x80
-/*
- *    FlowControl
- */
-#define CTS_FlowCtl     1
-#define RTS_FlowCtl     2
-#define Tx_FlowCtl      4
-#define Rx_FlowCtl      8
-#define IXM_IXANY       0x10
-
-#define LowWater        128
-
-#define DTR_ON          1
-#define RTS_ON          2
-#define CTS_ON          1
-#define DSR_ON          2
-#define DCD_ON          8
-
-/* mode definition */
-#define MX_CS8          0x03
-#define MX_CS7          0x02
-#define MX_CS6          0x01
-#define MX_CS5          0x00
-
-#define MX_STOP1        0x00
-#define MX_STOP15       0x04
-#define MX_STOP2        0x08
-
-#define MX_PARNONE      0x00
-#define MX_PAREVEN      0x40
-#define MX_PARODD       0xC0
-
-#endif
diff --git a/drivers/char/msm_smd_pkt.c b/drivers/char/msm_smd_pkt.c
new file mode 100644
index 000000000000..b6f8a65c9960
--- /dev/null
+++ b/drivers/char/msm_smd_pkt.c
@@ -0,0 +1,466 @@
+/* Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ */
+/*
+ * SMD Packet Driver -- Provides userspace interface to SMD packet ports.
+ */
+
+#include <linux/slab.h>
+#include <linux/cdev.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/device.h>
+#include <linux/sched.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
+#include <linux/uaccess.h>
+#include <linux/workqueue.h>
+#include <linux/poll.h>
+
+#include <mach/msm_smd.h>
+
+#define NUM_SMD_PKT_PORTS 9
+#define DEVICE_NAME "smdpkt"
+#define MAX_BUF_SIZE 2048
+
+struct smd_pkt_dev {
+        struct cdev cdev;
+        struct device *devicep;
+
+        struct smd_channel *ch;
+        int open_count;
+        struct mutex ch_lock;
+        struct mutex rx_lock;
+        struct mutex tx_lock;
+        wait_queue_head_t ch_read_wait_queue;
+        wait_queue_head_t ch_opened_wait_queue;
+
+        int i;
+
+        unsigned char tx_buf[MAX_BUF_SIZE];
+        unsigned char rx_buf[MAX_BUF_SIZE];
+        int remote_open;
+
+} *smd_pkt_devp[NUM_SMD_PKT_PORTS];
+
+struct class *smd_pkt_classp;
+static dev_t smd_pkt_number;
+
+static int msm_smd_pkt_debug_enable;
+module_param_named(debug_enable, msm_smd_pkt_debug_enable,
+                   int, S_IRUGO | S_IWUSR | S_IWGRP);
+
+#ifdef DEBUG
+#define D_DUMP_BUFFER(prestr, cnt, buf) do {                    \
+                int i;                                          \
+                if (msm_smd_pkt_debug_enable) {                 \
+                        pr_debug("%s", prestr);                 \
+                        for (i = 0; i < cnt; i++)               \
+                                pr_debug("%.2x", buf[i]);       \
+                        pr_debug("\n");                         \
+                }                                               \
+        } while (0)
+#else
+#define D_DUMP_BUFFER(prestr, cnt, buf) do {} while (0)
+#endif
+
+#ifdef DEBUG
+#define DBG(x...) do {                  \
+        if (msm_smd_pkt_debug_enable)   \
+                pr_debug(x);            \
+        } while (0)
+#else
+#define DBG(x...) do {} while (0)
+#endif
+
+static void check_and_wakeup_reader(struct smd_pkt_dev *smd_pkt_devp)
+{
+        int sz;
+
+        if (!smd_pkt_devp || !smd_pkt_devp->ch)
+                return;
+
+        sz = smd_cur_packet_size(smd_pkt_devp->ch);
+        if (sz == 0) {
+                DBG("no packet\n");
+                return;
+        }
+        if (sz > smd_read_avail(smd_pkt_devp->ch)) {
+                DBG("incomplete packet\n");
+                return;
+        }
+
+        DBG("waking up reader\n");
+        wake_up_interruptible(&smd_pkt_devp->ch_read_wait_queue);
+}
+
+static int smd_pkt_read(struct file *file, char __user *buf,
+                        size_t count, loff_t *ppos)
+{
+        int r, bytes_read;
+        struct smd_pkt_dev *smd_pkt_devp;
+        struct smd_channel *chl;
+
+        DBG("read %d bytes\n", count);
+        if (count > MAX_BUF_SIZE)
+                return -EINVAL;
+
+        smd_pkt_devp = file->private_data;
+        if (!smd_pkt_devp || !smd_pkt_devp->ch)
+                return -EINVAL;
+
+        chl = smd_pkt_devp->ch;
+wait_for_packet:
+        r = wait_event_interruptible(smd_pkt_devp->ch_read_wait_queue,
+                                     (smd_cur_packet_size(chl) > 0 &&
+                                      smd_read_avail(chl) >=
+                                      smd_cur_packet_size(chl)));
+
+        if (r < 0) {
+                if (r != -ERESTARTSYS)
+                        pr_err("wait returned %d\n", r);
+                return r;
+        }
+
+        mutex_lock(&smd_pkt_devp->rx_lock);
+
+        bytes_read = smd_cur_packet_size(smd_pkt_devp->ch);
+        if (bytes_read == 0 ||
+            bytes_read < smd_read_avail(smd_pkt_devp->ch)) {
+                mutex_unlock(&smd_pkt_devp->rx_lock);
+                DBG("Nothing to read\n");
+                goto wait_for_packet;
+        }
+
+        if (bytes_read > count) {
+                mutex_unlock(&smd_pkt_devp->rx_lock);
+                pr_info("packet size %d > buffer size %d", bytes_read, count);
+                return -EINVAL;
+        }
+
+        r = smd_read(smd_pkt_devp->ch, smd_pkt_devp->rx_buf, bytes_read);
+        if (r != bytes_read) {
+                mutex_unlock(&smd_pkt_devp->rx_lock);
+                pr_err("smd_read failed to read %d bytes: %d\n", bytes_read, r);
+                return -EIO;
+        }
+
+        D_DUMP_BUFFER("read: ", bytes_read, smd_pkt_devp->rx_buf);
+        r = copy_to_user(buf, smd_pkt_devp->rx_buf, bytes_read);
+        mutex_unlock(&smd_pkt_devp->rx_lock);
+        if (r) {
+                pr_err("copy_to_user failed %d\n", r);
+                return -EFAULT;
+        }
+
+        DBG("read complete %d bytes\n", bytes_read);
+        check_and_wakeup_reader(smd_pkt_devp);
+
+        return bytes_read;
+}
+
+static int smd_pkt_write(struct file *file, const char __user *buf,
+                         size_t count, loff_t *ppos)
+{
+        int r;
+        struct smd_pkt_dev *smd_pkt_devp;
+
+        if (count > MAX_BUF_SIZE)
+                return -EINVAL;
+
+        DBG("writting %d bytes\n", count);
+
+        smd_pkt_devp = file->private_data;
+        if (!smd_pkt_devp || !smd_pkt_devp->ch)
+                return -EINVAL;
+
+        mutex_lock(&smd_pkt_devp->tx_lock);
+        if (smd_write_avail(smd_pkt_devp->ch) < count) {
+                mutex_unlock(&smd_pkt_devp->tx_lock);
+                DBG("Not enough space to write\n");
+                return -ENOMEM;
+        }
+
+        D_DUMP_BUFFER("write: ", count, buf);
+        r = copy_from_user(smd_pkt_devp->tx_buf, buf, count);
+        if (r) {
+                mutex_unlock(&smd_pkt_devp->tx_lock);
+                pr_err("copy_from_user failed %d\n", r);
+                return -EFAULT;
+        }
+
+        r = smd_write(smd_pkt_devp->ch, smd_pkt_devp->tx_buf, count);
+        if (r != count) {
+                mutex_unlock(&smd_pkt_devp->tx_lock);
+                pr_err("smd_write failed to write %d bytes: %d.\n", count, r);
+                return -EIO;
+        }
+        mutex_unlock(&smd_pkt_devp->tx_lock);
+
+        DBG("wrote %d bytes\n", count);
+        return count;
+}
+
+static unsigned int smd_pkt_poll(struct file *file, poll_table *wait)
+{
+        struct smd_pkt_dev *smd_pkt_devp;
+        unsigned int mask = 0;
+
+        smd_pkt_devp = file->private_data;
+        if (!smd_pkt_devp)
+                return POLLERR;
+
+        DBG("poll waiting\n");
+        poll_wait(file, &smd_pkt_devp->ch_read_wait_queue, wait);
+        if (smd_read_avail(smd_pkt_devp->ch))
+                mask |= POLLIN | POLLRDNORM;
+
+        DBG("poll return\n");
+        return mask;
+}
+
+static void smd_pkt_ch_notify(void *priv, unsigned event)
+{
+        struct smd_pkt_dev *smd_pkt_devp = priv;
+
+        if (smd_pkt_devp->ch == 0)
+                return;
+
+        switch (event) {
+        case SMD_EVENT_DATA:
+                DBG("data\n");
+                check_and_wakeup_reader(smd_pkt_devp);
+                break;
+
+        case SMD_EVENT_OPEN:
+                DBG("remote open\n");
+                smd_pkt_devp->remote_open = 1;
+                wake_up_interruptible(&smd_pkt_devp->ch_opened_wait_queue);
+                break;
+
+        case SMD_EVENT_CLOSE:
+                smd_pkt_devp->remote_open = 0;
+                pr_info("remote closed\n");
+                break;
+
+        default:
+                pr_err("unknown event %d\n", event);
+                break;
+        }
+}
+
+static char *smd_pkt_dev_name[] = {
+        "smdcntl0",
+        "smdcntl1",
+        "smdcntl2",
+        "smdcntl3",
+        "smdcntl4",
+        "smdcntl5",
+        "smdcntl6",
+        "smdcntl7",
+        "smd22",
+};
+
+static char *smd_ch_name[] = {
+        "DATA5_CNTL",
+        "DATA6_CNTL",
+        "DATA7_CNTL",
+        "DATA8_CNTL",
+        "DATA9_CNTL",
+        "DATA12_CNTL",
+        "DATA13_CNTL",
+        "DATA14_CNTL",
+        "DATA22",
+};
+
+static int smd_pkt_open(struct inode *inode, struct file *file)
+{
+        int r = 0;
+        struct smd_pkt_dev *smd_pkt_devp;
+
+        smd_pkt_devp = container_of(inode->i_cdev, struct smd_pkt_dev, cdev);
+        if (!smd_pkt_devp)
+                return -EINVAL;
+
+        file->private_data = smd_pkt_devp;
+
+        mutex_lock(&smd_pkt_devp->ch_lock);
+        if (smd_pkt_devp->open_count == 0) {
+                r = smd_open(smd_ch_name[smd_pkt_devp->i],
+                             &smd_pkt_devp->ch, smd_pkt_devp,
+                             smd_pkt_ch_notify);
+                if (r < 0) {
+                        pr_err("smd_open failed for %s, %d\n",
+                               smd_ch_name[smd_pkt_devp->i], r);
+                        goto out;
+                }
+
+                r = wait_event_interruptible_timeout(
+                                smd_pkt_devp->ch_opened_wait_queue,
+                                smd_pkt_devp->remote_open,
+                                msecs_to_jiffies(2 * HZ));
+                if (r == 0)
+                        r = -ETIMEDOUT;
+
+                if (r < 0) {
+                        pr_err("wait returned %d\n", r);
+                        smd_close(smd_pkt_devp->ch);
+                        smd_pkt_devp->ch = 0;
+                } else {
+                        smd_pkt_devp->open_count++;
+                        r = 0;
+                }
+        }
+out:
+        mutex_unlock(&smd_pkt_devp->ch_lock);
+        return r;
+}
+
+static int smd_pkt_release(struct inode *inode, struct file *file)
+{
+        int r = 0;
+        struct smd_pkt_dev *smd_pkt_devp = file->private_data;
+
+        if (!smd_pkt_devp)
+                return -EINVAL;
+
+        mutex_lock(&smd_pkt_devp->ch_lock);
+        if (--smd_pkt_devp->open_count == 0) {
+                r = smd_close(smd_pkt_devp->ch);
+                smd_pkt_devp->ch = 0;
+        }
+        mutex_unlock(&smd_pkt_devp->ch_lock);
+
+        return r;
+}
+
+static const struct file_operations smd_pkt_fops = {
+        .owner = THIS_MODULE,
+        .open = smd_pkt_open,
+        .release = smd_pkt_release,
+        .read = smd_pkt_read,
+        .write = smd_pkt_write,
+        .poll = smd_pkt_poll,
+};
+
+static int __init smd_pkt_init(void)
+{
+        int i;
+        int r;
+
+        r = alloc_chrdev_region(&smd_pkt_number, 0,
+                                NUM_SMD_PKT_PORTS, DEVICE_NAME);
+        if (r) {
+                pr_err("alloc_chrdev_region() failed %d\n", r);
+                return r;
+        }
+
+        smd_pkt_classp = class_create(THIS_MODULE, DEVICE_NAME);
+        if (IS_ERR(smd_pkt_classp)) {
+                r = PTR_ERR(smd_pkt_classp);
+                pr_err("class_create() failed %d\n", r);
+                goto unreg_chardev;
+        }
+
+        for (i = 0; i < NUM_SMD_PKT_PORTS; ++i) {
+                smd_pkt_devp[i] = kzalloc(sizeof(struct smd_pkt_dev),
+                                          GFP_KERNEL);
+                if (IS_ERR(smd_pkt_devp[i])) {
+                        r = PTR_ERR(smd_pkt_devp[i]);
+                        pr_err("kmalloc() failed %d\n", r);
+                        goto clean_cdevs;
+                }
+
+                smd_pkt_devp[i]->i = i;
+
+                init_waitqueue_head(&smd_pkt_devp[i]->ch_read_wait_queue);
+                smd_pkt_devp[i]->remote_open = 0;
+                init_waitqueue_head(&smd_pkt_devp[i]->ch_opened_wait_queue);
+
+                mutex_init(&smd_pkt_devp[i]->ch_lock);
+                mutex_init(&smd_pkt_devp[i]->rx_lock);
+                mutex_init(&smd_pkt_devp[i]->tx_lock);
+
+                cdev_init(&smd_pkt_devp[i]->cdev, &smd_pkt_fops);
+                smd_pkt_devp[i]->cdev.owner = THIS_MODULE;
+
+                r = cdev_add(&smd_pkt_devp[i]->cdev,
+                             (smd_pkt_number + i), 1);
+                if (r) {
+                        pr_err("cdev_add() failed %d\n", r);
+                        kfree(smd_pkt_devp[i]);
+                        goto clean_cdevs;
+                }
+
+                smd_pkt_devp[i]->devicep =
+                        device_create(smd_pkt_classp, NULL,
+                                      (smd_pkt_number + i), NULL,
+                                      smd_pkt_dev_name[i]);
+                if (IS_ERR(smd_pkt_devp[i]->devicep)) {
+                        r = PTR_ERR(smd_pkt_devp[i]->devicep);
+                        pr_err("device_create() failed %d\n", r);
+                        cdev_del(&smd_pkt_devp[i]->cdev);
+                        kfree(smd_pkt_devp[i]);
+                        goto clean_cdevs;
+                }
+
+        }
+
+        pr_info("SMD Packet Port Driver Initialized.\n");
+        return 0;
+
+clean_cdevs:
+        if (i > 0) {
+                while (--i >= 0) {
+                        mutex_destroy(&smd_pkt_devp[i]->ch_lock);
+                        mutex_destroy(&smd_pkt_devp[i]->rx_lock);
+                        mutex_destroy(&smd_pkt_devp[i]->tx_lock);
+                        cdev_del(&smd_pkt_devp[i]->cdev);
+                        kfree(smd_pkt_devp[i]);
+                        device_destroy(smd_pkt_classp,
+                                       MKDEV(MAJOR(smd_pkt_number), i));
+                }
+        }
+
+        class_destroy(smd_pkt_classp);
+unreg_chardev:
+        unregister_chrdev_region(MAJOR(smd_pkt_number), NUM_SMD_PKT_PORTS);
+        return r;
+}
+module_init(smd_pkt_init);
+
+static void __exit smd_pkt_cleanup(void)
+{
+        int i;
+
+        for (i = 0; i < NUM_SMD_PKT_PORTS; ++i) {
+                mutex_destroy(&smd_pkt_devp[i]->ch_lock);
+                mutex_destroy(&smd_pkt_devp[i]->rx_lock);
+                mutex_destroy(&smd_pkt_devp[i]->tx_lock);
+                cdev_del(&smd_pkt_devp[i]->cdev);
+                kfree(smd_pkt_devp[i]);
+                device_destroy(smd_pkt_classp,
+                               MKDEV(MAJOR(smd_pkt_number), i));
+        }
+
+        class_destroy(smd_pkt_classp);
+        unregister_chrdev_region(MAJOR(smd_pkt_number), NUM_SMD_PKT_PORTS);
+}
+module_exit(smd_pkt_cleanup);
+
+MODULE_DESCRIPTION("MSM Shared Memory Packet Port");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c
index ecb89d798e35..25d139c9dbed 100644
--- a/drivers/char/mspec.c
+++ b/drivers/char/mspec.c
@@ -271,14 +271,13 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma,
         pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
         vdata_size = sizeof(struct vma_data) + pages * sizeof(long);
         if (vdata_size <= PAGE_SIZE)
-                vdata = kmalloc(vdata_size, GFP_KERNEL);
+                vdata = kzalloc(vdata_size, GFP_KERNEL);
         else {
-                vdata = vmalloc(vdata_size);
+                vdata = vzalloc(vdata_size);
                 flags = VMD_VMALLOCED;
         }
         if (!vdata)
                 return -ENOMEM;
-        memset(vdata, 0, vdata_size);
 
         vdata->vm_start = vma->vm_start;
         vdata->vm_end = vma->vm_end;
@@ -316,7 +315,8 @@ uncached_mmap(struct file *file, struct vm_area_struct *vma)
 
 static const struct file_operations fetchop_fops = {
         .owner = THIS_MODULE,
-        .mmap = fetchop_mmap
+        .mmap = fetchop_mmap,
+        .llseek = noop_llseek,
 };
 
 static struct miscdevice fetchop_miscdev = {
@@ -327,7 +327,8 @@ static struct miscdevice fetchop_miscdev = {
 
 static const struct file_operations cached_fops = {
         .owner = THIS_MODULE,
-        .mmap = cached_mmap
+        .mmap = cached_mmap,
+        .llseek = noop_llseek,
 };
 
 static struct miscdevice cached_miscdev = {
@@ -338,7 +339,8 @@ static struct miscdevice cached_miscdev = {
 
 static const struct file_operations uncached_fops = {
         .owner = THIS_MODULE,
-        .mmap = uncached_mmap
+        .mmap = uncached_mmap,
+        .llseek = noop_llseek,
 };
 
 static struct miscdevice uncached_miscdev = {
diff --git a/drivers/char/mwave/3780i.h b/drivers/char/mwave/3780i.h
index 270431ca7dae..fba6ab1160ce 100644
--- a/drivers/char/mwave/3780i.h
+++ b/drivers/char/mwave/3780i.h
@@ -122,7 +122,7 @@ typedef struct {
 typedef struct {
         unsigned char Dma:3;    /* RW: DMA channel selection */
         unsigned char NumTransfers:2;   /* RW: Maximum # of transfers once being granted the ISA bus */
-        unsigned char ReRequest:2;      /* RW: Minumum delay between releasing the ISA bus and requesting it again */
+        unsigned char ReRequest:2;      /* RW: Minimum delay between releasing the ISA bus and requesting it again */
         unsigned char MEMCS16:1;        /* RW: ISA signal MEMCS16: 0=disabled, 1=enabled */
 } DSP_BUSMASTER_CFG_1;
 
diff --git a/drivers/char/mwave/Makefile b/drivers/char/mwave/Makefile
index 754c9e2058ed..efa6a82e543d 100644
--- a/drivers/char/mwave/Makefile
+++ b/drivers/char/mwave/Makefile
@@ -6,10 +6,10 @@
 
 obj-$(CONFIG_MWAVE) += mwave.o
 
-mwave-objs := mwavedd.o smapi.o tp3780i.o 3780i.o
+mwave-y := mwavedd.o smapi.o tp3780i.o 3780i.o
 
 # To have the mwave driver disable other uarts if necessary
-# EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES
+# ccflags-y := -DMWAVE_FUTZ_WITH_OTHER_DEVICES
 
 # To compile in lots (~20 KiB) of run-time enablable printk()s for debugging:
-EXTRA_CFLAGS += -DMW_TRACE
+ccflags-y += -DMW_TRACE
diff --git a/drivers/char/mwave/README b/drivers/char/mwave/README
index 480251fc78e2..c2a58f428bc8 100644
--- a/drivers/char/mwave/README
+++ b/drivers/char/mwave/README
@@ -11,7 +11,7 @@ are not saved by the BIOS and so do not persist after unload and reload.
         0x0008 tp3780i tracing
 
         Tracing only occurs if the driver has been compiled with the
-        MW_TRACE macro #defined  (i.e. let EXTRA_CFLAGS += -DMW_TRACE
+        MW_TRACE macro #defined  (i.e. let ccflags-y := -DMW_TRACE
         in the Makefile).
 
   mwave_3780i_irq=5/7/10/11/15
diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c
index a4ec50c95072..1d82d5838f0c 100644
--- a/drivers/char/mwave/mwavedd.c
+++ b/drivers/char/mwave/mwavedd.c
@@ -56,7 +56,7 @@
 #include <linux/serial.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/delay.h>
 #include <linux/serial_8250.h>
 #include "smapi.h"
@@ -73,6 +73,7 @@ MODULE_LICENSE("GPL");
 * checks are made against other devices (ie. superio) for conflicts.
 * We'll depend on users using the tpctl utility to do that for now
 */
+static DEFINE_MUTEX(mwave_mutex);
 int mwave_debug = 0;
 int mwave_3780i_irq = 0;
 int mwave_3780i_io = 0;
@@ -101,7 +102,6 @@ static int mwave_open(struct inode *inode, struct file *file)
         PRINTK_2(TRACE_MWAVE,
                 "mwavedd::mwave_open, exit return retval %x\n", retval);
 
-        cycle_kernel_lock();
         return retval;
 }
 
@@ -136,9 +136,9 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd,
                         PRINTK_1(TRACE_MWAVE,
                                 "mwavedd::mwave_ioctl, IOCTL_MW_RESET"
                                 " calling tp3780I_ResetDSP\n");
-                        lock_kernel();
+                        mutex_lock(&mwave_mutex);
                         retval = tp3780I_ResetDSP(&pDrvData->rBDData);
-                        unlock_kernel();
+                        mutex_unlock(&mwave_mutex);
                         PRINTK_2(TRACE_MWAVE,
                                 "mwavedd::mwave_ioctl, IOCTL_MW_RESET"
                                 " retval %x from tp3780I_ResetDSP\n",
@@ -149,9 +149,9 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd,
                         PRINTK_1(TRACE_MWAVE,
                                 "mwavedd::mwave_ioctl, IOCTL_MW_RUN"
                                 " calling tp3780I_StartDSP\n");
-                        lock_kernel();
+                        mutex_lock(&mwave_mutex);
                         retval = tp3780I_StartDSP(&pDrvData->rBDData);
-                        unlock_kernel();
+                        mutex_unlock(&mwave_mutex);
                         PRINTK_2(TRACE_MWAVE,
                                 "mwavedd::mwave_ioctl, IOCTL_MW_RUN"
                                 " retval %x from tp3780I_StartDSP\n",
@@ -165,10 +165,10 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd,
                                 "mwavedd::mwave_ioctl,"
                                 " IOCTL_MW_DSP_ABILITIES calling"
                                 " tp3780I_QueryAbilities\n");
-                        lock_kernel();
+                        mutex_lock(&mwave_mutex);
                         retval = tp3780I_QueryAbilities(&pDrvData->rBDData,
                                         &rAbilities);
-                        unlock_kernel();
+                        mutex_unlock(&mwave_mutex);
                         PRINTK_2(TRACE_MWAVE,
                                 "mwavedd::mwave_ioctl, IOCTL_MW_DSP_ABILITIES"
                                 " retval %x from tp3780I_QueryAbilities\n",
@@ -199,13 +199,13 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd,
                                 "mwavedd::mwave_ioctl IOCTL_MW_READ_DATA,"
                                 " size %lx, ioarg %lx pusBuffer %p\n",
                                 rReadData.ulDataLength, ioarg, pusBuffer);
-                        lock_kernel();
+                        mutex_lock(&mwave_mutex);
                         retval = tp3780I_ReadWriteDspDStore(&pDrvData->rBDData,
                                         iocmd,
                                         pusBuffer,
                                         rReadData.ulDataLength,
                                         rReadData.usDspAddress);
-                        unlock_kernel();
+                        mutex_unlock(&mwave_mutex);
                 }
                         break;
         
@@ -223,12 +223,12 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd,
                                 " size %lx, ioarg %lx pusBuffer %p\n",
                                 rReadData.ulDataLength / 2, ioarg,
                                 pusBuffer);
-                        lock_kernel();
+                        mutex_lock(&mwave_mutex);
                         retval = tp3780I_ReadWriteDspDStore(&pDrvData->rBDData,
                                 iocmd, pusBuffer,
                                 rReadData.ulDataLength / 2,
                                 rReadData.usDspAddress);
-                        unlock_kernel();
+                        mutex_unlock(&mwave_mutex);
                 }
                         break;
         
@@ -246,12 +246,12 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd,
                                 " size %lx, ioarg %lx pusBuffer %p\n",
                                 rWriteData.ulDataLength, ioarg,
                                 pusBuffer);
-                        lock_kernel();
+                        mutex_lock(&mwave_mutex);
                         retval = tp3780I_ReadWriteDspDStore(&pDrvData->rBDData,
                                         iocmd, pusBuffer,
                                         rWriteData.ulDataLength,
                                         rWriteData.usDspAddress);
-                        unlock_kernel();
+                        mutex_unlock(&mwave_mutex);
                 }
                         break;
         
@@ -269,12 +269,12 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd,
                                 " size %lx, ioarg %lx pusBuffer %p\n",
                                 rWriteData.ulDataLength, ioarg,
                                 pusBuffer);
-                        lock_kernel();
+                        mutex_lock(&mwave_mutex);
                         retval = tp3780I_ReadWriteDspIStore(&pDrvData->rBDData,
                                         iocmd, pusBuffer,
                                         rWriteData.ulDataLength,
                                         rWriteData.usDspAddress);
-                        unlock_kernel();
+                        mutex_unlock(&mwave_mutex);
                 }
                         break;
         
@@ -295,10 +295,10 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd,
                                 ipcnum,
                                 pDrvData->IPCs[ipcnum].usIntCount);
 
-                        lock_kernel();
+                        mutex_lock(&mwave_mutex);
                         pDrvData->IPCs[ipcnum].bIsHere = FALSE;
                         pDrvData->IPCs[ipcnum].bIsEnabled = TRUE;
-                        unlock_kernel();
+                        mutex_unlock(&mwave_mutex);
         
                         PRINTK_2(TRACE_MWAVE,
                                 "mwavedd::mwave_ioctl IOCTL_MW_REGISTER_IPC"
@@ -323,7 +323,7 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd,
                                 ipcnum,
                                 pDrvData->IPCs[ipcnum].usIntCount);
         
-                        lock_kernel();
+                        mutex_lock(&mwave_mutex);
                         if (pDrvData->IPCs[ipcnum].bIsEnabled == TRUE) {
                                 DECLARE_WAITQUEUE(wait, current);
 
@@ -364,7 +364,7 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd,
                                         " processing\n",
                                         ipcnum);
                         }
-                        unlock_kernel();
+                        mutex_unlock(&mwave_mutex);
                 }
                         break;
         
@@ -383,14 +383,14 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd,
                                                 ipcnum);
                                 return -EINVAL;
                         }
-                        lock_kernel();
+                        mutex_lock(&mwave_mutex);
                         if (pDrvData->IPCs[ipcnum].bIsEnabled == TRUE) {
                                 pDrvData->IPCs[ipcnum].bIsEnabled = FALSE;
                                 if (pDrvData->IPCs[ipcnum].bIsHere == TRUE) {
                                         wake_up_interruptible(&pDrvData->IPCs[ipcnum].ipc_wait_queue);
                                 }
                         }
-                        unlock_kernel();
+                        mutex_unlock(&mwave_mutex);
                 }
                         break;
         
@@ -479,7 +479,8 @@ static const struct file_operations mwave_fops = {
         .write          = mwave_write,
         .unlocked_ioctl = mwave_ioctl,
         .open           = mwave_open,
-        .release        = mwave_close
+        .release        = mwave_close,
+        .llseek         = default_llseek,
 };
 
 
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
deleted file mode 100644
index 3fc89da856ae..000000000000
--- a/drivers/char/mxser.c
+++ /dev/null
@@ -1,2748 +0,0 @@
-/*
- *          mxser.c  -- MOXA Smartio/Industio family multiport serial driver.
- *
- *      Copyright (C) 1999-2006  Moxa Technologies (support@moxa.com).
- *      Copyright (C) 2006-2008  Jiri Slaby <jirislaby@gmail.com>
- *
- *      This code is loosely based on the 1.8 moxa driver which is based on
- *      Linux serial driver, written by Linus Torvalds, Theodore T'so and
- *      others.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      Fed through a cleanup, indent and remove of non 2.6 code by Alan Cox
- *      <alan@lxorguk.ukuu.org.uk>. The original 1.8 code is available on
- *      www.moxa.com.
- *      - Fixed x86_64 cleanness
- */
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial.h>
-#include <linux/serial_reg.h>
-#include <linux/major.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/ioport.h>
-#include <linux/mm.h>
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/bitops.h>
-#include <linux/slab.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-
-#include "mxser.h"
-
-#define MXSER_VERSION   "2.0.5"         /* 1.14 */
-#define MXSERMAJOR       174
-
-#define MXSER_BOARDS            4       /* Max. boards */
-#define MXSER_PORTS_PER_BOARD   8       /* Max. ports per board */
-#define MXSER_PORTS             (MXSER_BOARDS * MXSER_PORTS_PER_BOARD)
-#define MXSER_ISR_PASS_LIMIT    100
-
-/*CheckIsMoxaMust return value*/
-#define MOXA_OTHER_UART         0x00
-#define MOXA_MUST_MU150_HWID    0x01
-#define MOXA_MUST_MU860_HWID    0x02
-
-#define WAKEUP_CHARS            256
-
-#define UART_MCR_AFE            0x20
-#define UART_LSR_SPECIAL        0x1E
-
-#define PCI_DEVICE_ID_POS104UL  0x1044
-#define PCI_DEVICE_ID_CB108     0x1080
-#define PCI_DEVICE_ID_CP102UF   0x1023
-#define PCI_DEVICE_ID_CP112UL   0x1120
-#define PCI_DEVICE_ID_CB114     0x1142
-#define PCI_DEVICE_ID_CP114UL   0x1143
-#define PCI_DEVICE_ID_CB134I    0x1341
-#define PCI_DEVICE_ID_CP138U    0x1380
-
-
-#define C168_ASIC_ID    1
-#define C104_ASIC_ID    2
-#define C102_ASIC_ID    0xB
-#define CI132_ASIC_ID   4
-#define CI134_ASIC_ID   3
-#define CI104J_ASIC_ID  5
-
-#define MXSER_HIGHBAUD  1
-#define MXSER_HAS2      2
-
-/* This is only for PCI */
-static const struct {
-        int type;
-        int tx_fifo;
-        int rx_fifo;
-        int xmit_fifo_size;
-        int rx_high_water;
-        int rx_trigger;
-        int rx_low_water;
-        long max_baud;
-} Gpci_uart_info[] = {
-        {MOXA_OTHER_UART, 16, 16, 16, 14, 14, 1, 921600L},
-        {MOXA_MUST_MU150_HWID, 64, 64, 64, 48, 48, 16, 230400L},
-        {MOXA_MUST_MU860_HWID, 128, 128, 128, 96, 96, 32, 921600L}
-};
-#define UART_INFO_NUM   ARRAY_SIZE(Gpci_uart_info)
-
-struct mxser_cardinfo {
-        char *name;
-        unsigned int nports;
-        unsigned int flags;
-};
-
-static const struct mxser_cardinfo mxser_cards[] = {
-/* 0*/  { "C168 series",        8, },
-        { "C104 series",        4, },
-        { "CI-104J series",     4, },
-        { "C168H/PCI series",   8, },
-        { "C104H/PCI series",   4, },
-/* 5*/  { "C102 series",        4, MXSER_HAS2 },        /* C102-ISA */
-        { "CI-132 series",      4, MXSER_HAS2 },
-        { "CI-134 series",      4, },
-        { "CP-132 series",      2, },
-        { "CP-114 series",      4, },
-/*10*/  { "CT-114 series",      4, },
-        { "CP-102 series",      2, MXSER_HIGHBAUD },
-        { "CP-104U series",     4, },
-        { "CP-168U series",     8, },
-        { "CP-132U series",     2, },
-/*15*/  { "CP-134U series",     4, },
-        { "CP-104JU series",    4, },
-        { "Moxa UC7000 Serial", 8, },           /* RC7000 */
-        { "CP-118U series",     8, },
-        { "CP-102UL series",    2, },
-/*20*/  { "CP-102U series",     2, },
-        { "CP-118EL series",    8, },
-        { "CP-168EL series",    8, },
-        { "CP-104EL series",    4, },
-        { "CB-108 series",      8, },
-/*25*/  { "CB-114 series",      4, },
-        { "CB-134I series",     4, },
-        { "CP-138U series",     8, },
-        { "POS-104UL series",   4, },
-        { "CP-114UL series",    4, },
-/*30*/  { "CP-102UF series",    2, },
-        { "CP-112UL series",    2, },
-};
-
-/* driver_data correspond to the lines in the structure above
-   see also ISA probe function before you change something */
-static struct pci_device_id mxser_pcibrds[] = {
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_C168),   .driver_data = 3 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_C104),   .driver_data = 4 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132),  .driver_data = 8 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP114),  .driver_data = 9 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CT114),  .driver_data = 10 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102),  .driver_data = 11 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104U), .driver_data = 12 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168U), .driver_data = 13 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132U), .driver_data = 14 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP134U), .driver_data = 15 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104JU),.driver_data = 16 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_RC7000), .driver_data = 17 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118U), .driver_data = 18 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102UL),.driver_data = 19 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102U), .driver_data = 20 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118EL),.driver_data = 21 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168EL),.driver_data = 22 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104EL),.driver_data = 23 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB108),       .driver_data = 24 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB114),       .driver_data = 25 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB134I),      .driver_data = 26 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP138U),      .driver_data = 27 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_POS104UL),    .driver_data = 28 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP114UL),     .driver_data = 29 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP102UF),     .driver_data = 30 },
-        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP112UL),     .driver_data = 31 },
-        { }
-};
-MODULE_DEVICE_TABLE(pci, mxser_pcibrds);
-
-static unsigned long ioaddr[MXSER_BOARDS];
-static int ttymajor = MXSERMAJOR;
-
-/* Variables for insmod */
-
-MODULE_AUTHOR("Casper Yang");
-MODULE_DESCRIPTION("MOXA Smartio/Industio Family Multiport Board Device Driver");
-module_param_array(ioaddr, ulong, NULL, 0);
-MODULE_PARM_DESC(ioaddr, "ISA io addresses to look for a moxa board");
-module_param(ttymajor, int, 0);
-MODULE_LICENSE("GPL");
-
-struct mxser_log {
-        int tick;
-        unsigned long rxcnt[MXSER_PORTS];
-        unsigned long txcnt[MXSER_PORTS];
-};
-
-struct mxser_mon {
-        unsigned long rxcnt;
-        unsigned long txcnt;
-        unsigned long up_rxcnt;
-        unsigned long up_txcnt;
-        int modem_status;
-        unsigned char hold_reason;
-};
-
-struct mxser_mon_ext {
-        unsigned long rx_cnt[32];
-        unsigned long tx_cnt[32];
-        unsigned long up_rxcnt[32];
-        unsigned long up_txcnt[32];
-        int modem_status[32];
-
-        long baudrate[32];
-        int databits[32];
-        int stopbits[32];
-        int parity[32];
-        int flowctrl[32];
-        int fifo[32];
-        int iftype[32];
-};
-
-struct mxser_board;
-
-struct mxser_port {
-        struct tty_port port;
-        struct mxser_board *board;
-
-        unsigned long ioaddr;
-        unsigned long opmode_ioaddr;
-        int max_baud;
-
-        int rx_high_water;
-        int rx_trigger;         /* Rx fifo trigger level */
-        int rx_low_water;
-        int baud_base;          /* max. speed */
-        int type;               /* UART type */
-
-        int x_char;             /* xon/xoff character */
-        int IER;                /* Interrupt Enable Register */
-        int MCR;                /* Modem control register */
-
-        unsigned char stop_rx;
-        unsigned char ldisc_stop_rx;
-
-        int custom_divisor;
-        unsigned char err_shadow;
-
-        struct async_icount icount; /* kernel counters for 4 input interrupts */
-        int timeout;
-
-        int read_status_mask;
-        int ignore_status_mask;
-        int xmit_fifo_size;
-        int xmit_head;
-        int xmit_tail;
-        int xmit_cnt;
-
-        struct ktermios normal_termios;
-
-        struct mxser_mon mon_data;
-
-        spinlock_t slock;
-};
-
-struct mxser_board {
-        unsigned int idx;
-        int irq;
-        const struct mxser_cardinfo *info;
-        unsigned long vector;
-        unsigned long vector_mask;
-
-        int chip_flag;
-        int uart_type;
-
-        struct mxser_port ports[MXSER_PORTS_PER_BOARD];
-};
-
-struct mxser_mstatus {
-        tcflag_t cflag;
-        int cts;
-        int dsr;
-        int ri;
-        int dcd;
-};
-
-static struct mxser_board mxser_boards[MXSER_BOARDS];
-static struct tty_driver *mxvar_sdriver;
-static struct mxser_log mxvar_log;
-static int mxser_set_baud_method[MXSER_PORTS + 1];
-
-static void mxser_enable_must_enchance_mode(unsigned long baseio)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(baseio + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, baseio + UART_LCR);
-
-        efr = inb(baseio + MOXA_MUST_EFR_REGISTER);
-        efr |= MOXA_MUST_EFR_EFRB_ENABLE;
-
-        outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
-        outb(oldlcr, baseio + UART_LCR);
-}
-
-static void mxser_disable_must_enchance_mode(unsigned long baseio)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(baseio + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, baseio + UART_LCR);
-
-        efr = inb(baseio + MOXA_MUST_EFR_REGISTER);
-        efr &= ~MOXA_MUST_EFR_EFRB_ENABLE;
-
-        outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
-        outb(oldlcr, baseio + UART_LCR);
-}
-
-static void mxser_set_must_xon1_value(unsigned long baseio, u8 value)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(baseio + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, baseio + UART_LCR);
-
-        efr = inb(baseio + MOXA_MUST_EFR_REGISTER);
-        efr &= ~MOXA_MUST_EFR_BANK_MASK;
-        efr |= MOXA_MUST_EFR_BANK0;
-
-        outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
-        outb(value, baseio + MOXA_MUST_XON1_REGISTER);
-        outb(oldlcr, baseio + UART_LCR);
-}
-
-static void mxser_set_must_xoff1_value(unsigned long baseio, u8 value)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(baseio + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, baseio + UART_LCR);
-
-        efr = inb(baseio + MOXA_MUST_EFR_REGISTER);
-        efr &= ~MOXA_MUST_EFR_BANK_MASK;
-        efr |= MOXA_MUST_EFR_BANK0;
-
-        outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
-        outb(value, baseio + MOXA_MUST_XOFF1_REGISTER);
-        outb(oldlcr, baseio + UART_LCR);
-}
-
-static void mxser_set_must_fifo_value(struct mxser_port *info)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(info->ioaddr + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, info->ioaddr + UART_LCR);
-
-        efr = inb(info->ioaddr + MOXA_MUST_EFR_REGISTER);
-        efr &= ~MOXA_MUST_EFR_BANK_MASK;
-        efr |= MOXA_MUST_EFR_BANK1;
-
-        outb(efr, info->ioaddr + MOXA_MUST_EFR_REGISTER);
-        outb((u8)info->rx_high_water, info->ioaddr + MOXA_MUST_RBRTH_REGISTER);
-        outb((u8)info->rx_trigger, info->ioaddr + MOXA_MUST_RBRTI_REGISTER);
-        outb((u8)info->rx_low_water, info->ioaddr + MOXA_MUST_RBRTL_REGISTER);
-        outb(oldlcr, info->ioaddr + UART_LCR);
-}
-
-static void mxser_set_must_enum_value(unsigned long baseio, u8 value)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(baseio + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, baseio + UART_LCR);
-
-        efr = inb(baseio + MOXA_MUST_EFR_REGISTER);
-        efr &= ~MOXA_MUST_EFR_BANK_MASK;
-        efr |= MOXA_MUST_EFR_BANK2;
-
-        outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
-        outb(value, baseio + MOXA_MUST_ENUM_REGISTER);
-        outb(oldlcr, baseio + UART_LCR);
-}
-
-static void mxser_get_must_hardware_id(unsigned long baseio, u8 *pId)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(baseio + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, baseio + UART_LCR);
-
-        efr = inb(baseio + MOXA_MUST_EFR_REGISTER);
-        efr &= ~MOXA_MUST_EFR_BANK_MASK;
-        efr |= MOXA_MUST_EFR_BANK2;
-
-        outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
-        *pId = inb(baseio + MOXA_MUST_HWID_REGISTER);
-        outb(oldlcr, baseio + UART_LCR);
-}
-
-static void SET_MOXA_MUST_NO_SOFTWARE_FLOW_CONTROL(unsigned long baseio)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(baseio + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, baseio + UART_LCR);
-
-        efr = inb(baseio + MOXA_MUST_EFR_REGISTER);
-        efr &= ~MOXA_MUST_EFR_SF_MASK;
-
-        outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
-        outb(oldlcr, baseio + UART_LCR);
-}
-
-static void mxser_enable_must_tx_software_flow_control(unsigned long baseio)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(baseio + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, baseio + UART_LCR);
-
-        efr = inb(baseio + MOXA_MUST_EFR_REGISTER);
-        efr &= ~MOXA_MUST_EFR_SF_TX_MASK;
-        efr |= MOXA_MUST_EFR_SF_TX1;
-
-        outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
-        outb(oldlcr, baseio + UART_LCR);
-}
-
-static void mxser_disable_must_tx_software_flow_control(unsigned long baseio)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(baseio + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, baseio + UART_LCR);
-
-        efr = inb(baseio + MOXA_MUST_EFR_REGISTER);
-        efr &= ~MOXA_MUST_EFR_SF_TX_MASK;
-
-        outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
-        outb(oldlcr, baseio + UART_LCR);
-}
-
-static void mxser_enable_must_rx_software_flow_control(unsigned long baseio)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(baseio + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, baseio + UART_LCR);
-
-        efr = inb(baseio + MOXA_MUST_EFR_REGISTER);
-        efr &= ~MOXA_MUST_EFR_SF_RX_MASK;
-        efr |= MOXA_MUST_EFR_SF_RX1;
-
-        outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
-        outb(oldlcr, baseio + UART_LCR);
-}
-
-static void mxser_disable_must_rx_software_flow_control(unsigned long baseio)
-{
-        u8 oldlcr;
-        u8 efr;
-
-        oldlcr = inb(baseio + UART_LCR);
-        outb(MOXA_MUST_ENTER_ENCHANCE, baseio + UART_LCR);
-
-        efr = inb(baseio + MOXA_MUST_EFR_REGISTER);
-        efr &= ~MOXA_MUST_EFR_SF_RX_MASK;
-
-        outb(efr, baseio + MOXA_MUST_EFR_REGISTER);
-        outb(oldlcr, baseio + UART_LCR);
-}
-
-#ifdef CONFIG_PCI
-static int __devinit CheckIsMoxaMust(unsigned long io)
-{
-        u8 oldmcr, hwid;
-        int i;
-
-        outb(0, io + UART_LCR);
-        mxser_disable_must_enchance_mode(io);
-        oldmcr = inb(io + UART_MCR);
-        outb(0, io + UART_MCR);
-        mxser_set_must_xon1_value(io, 0x11);
-        if ((hwid = inb(io + UART_MCR)) != 0) {
-                outb(oldmcr, io + UART_MCR);
-                return MOXA_OTHER_UART;
-        }
-
-        mxser_get_must_hardware_id(io, &hwid);
-        for (i = 1; i < UART_INFO_NUM; i++) { /* 0 = OTHER_UART */
-                if (hwid == Gpci_uart_info[i].type)
-                        return (int)hwid;
-        }
-        return MOXA_OTHER_UART;
-}
-#endif
-
-static void process_txrx_fifo(struct mxser_port *info)
-{
-        int i;
-
-        if ((info->type == PORT_16450) || (info->type == PORT_8250)) {
-                info->rx_trigger = 1;
-                info->rx_high_water = 1;
-                info->rx_low_water = 1;
-                info->xmit_fifo_size = 1;
-        } else
-                for (i = 0; i < UART_INFO_NUM; i++)
-                        if (info->board->chip_flag == Gpci_uart_info[i].type) {
-                                info->rx_trigger = Gpci_uart_info[i].rx_trigger;
-                                info->rx_low_water = Gpci_uart_info[i].rx_low_water;
-                                info->rx_high_water = Gpci_uart_info[i].rx_high_water;
-                                info->xmit_fifo_size = Gpci_uart_info[i].xmit_fifo_size;
-                                break;
-                        }
-}
-
-static unsigned char mxser_get_msr(int baseaddr, int mode, int port)
-{
-        static unsigned char mxser_msr[MXSER_PORTS + 1];
-        unsigned char status = 0;
-
-        status = inb(baseaddr + UART_MSR);
-
-        mxser_msr[port] &= 0x0F;
-        mxser_msr[port] |= status;
-        status = mxser_msr[port];
-        if (mode)
-                mxser_msr[port] = 0;
-
-        return status;
-}
-
-static int mxser_carrier_raised(struct tty_port *port)
-{
-        struct mxser_port *mp = container_of(port, struct mxser_port, port);
-        return (inb(mp->ioaddr + UART_MSR) & UART_MSR_DCD)?1:0;
-}
-
-static void mxser_dtr_rts(struct tty_port *port, int on)
-{
-        struct mxser_port *mp = container_of(port, struct mxser_port, port);
-        unsigned long flags;
-
-        spin_lock_irqsave(&mp->slock, flags);
-        if (on)
-                outb(inb(mp->ioaddr + UART_MCR) |
-                        UART_MCR_DTR | UART_MCR_RTS, mp->ioaddr + UART_MCR);
-        else
-                outb(inb(mp->ioaddr + UART_MCR)&~(UART_MCR_DTR | UART_MCR_RTS),
-                        mp->ioaddr + UART_MCR);
-        spin_unlock_irqrestore(&mp->slock, flags);
-}
-
-static int mxser_set_baud(struct tty_struct *tty, long newspd)
-{
-        struct mxser_port *info = tty->driver_data;
-        int quot = 0, baud;
-        unsigned char cval;
-
-        if (!info->ioaddr)
-                return -1;
-
-        if (newspd > info->max_baud)
-                return -1;
-
-        if (newspd == 134) {
-                quot = 2 * info->baud_base / 269;
-                tty_encode_baud_rate(tty, 134, 134);
-        } else if (newspd) {
-                quot = info->baud_base / newspd;
-                if (quot == 0)
-                        quot = 1;
-                baud = info->baud_base/quot;
-                tty_encode_baud_rate(tty, baud, baud);
-        } else {
-                quot = 0;
-        }
-
-        info->timeout = ((info->xmit_fifo_size * HZ * 10 * quot) / info->baud_base);
-        info->timeout += HZ / 50;       /* Add .02 seconds of slop */
-
-        if (quot) {
-                info->MCR |= UART_MCR_DTR;
-                outb(info->MCR, info->ioaddr + UART_MCR);
-        } else {
-                info->MCR &= ~UART_MCR_DTR;
-                outb(info->MCR, info->ioaddr + UART_MCR);
-                return 0;
-        }
-
-        cval = inb(info->ioaddr + UART_LCR);
-
-        outb(cval | UART_LCR_DLAB, info->ioaddr + UART_LCR);    /* set DLAB */
-
-        outb(quot & 0xff, info->ioaddr + UART_DLL);     /* LS of divisor */
-        outb(quot >> 8, info->ioaddr + UART_DLM);       /* MS of divisor */
-        outb(cval, info->ioaddr + UART_LCR);    /* reset DLAB */
-
-#ifdef BOTHER
-        if (C_BAUD(tty) == BOTHER) {
-                quot = info->baud_base % newspd;
-                quot *= 8;
-                if (quot % newspd > newspd / 2) {
-                        quot /= newspd;
-                        quot++;
-                } else
-                        quot /= newspd;
-
-                mxser_set_must_enum_value(info->ioaddr, quot);
-        } else
-#endif
-                mxser_set_must_enum_value(info->ioaddr, 0);
-
-        return 0;
-}
-
-/*
- * This routine is called to set the UART divisor registers to match
- * the specified baud rate for a serial port.
- */
-static int mxser_change_speed(struct tty_struct *tty,
-                                        struct ktermios *old_termios)
-{
-        struct mxser_port *info = tty->driver_data;
-        unsigned cflag, cval, fcr;
-        int ret = 0;
-        unsigned char status;
-
-        cflag = tty->termios->c_cflag;
-        if (!info->ioaddr)
-                return ret;
-
-        if (mxser_set_baud_method[tty->index] == 0)
-                mxser_set_baud(tty, tty_get_baud_rate(tty));
-
-        /* byte size and parity */
-        switch (cflag & CSIZE) {
-        case CS5:
-                cval = 0x00;
-                break;
-        case CS6:
-                cval = 0x01;
-                break;
-        case CS7:
-                cval = 0x02;
-                break;
-        case CS8:
-                cval = 0x03;
-                break;
-        default:
-                cval = 0x00;
-                break;          /* too keep GCC shut... */
-        }
-        if (cflag & CSTOPB)
-                cval |= 0x04;
-        if (cflag & PARENB)
-                cval |= UART_LCR_PARITY;
-        if (!(cflag & PARODD))
-                cval |= UART_LCR_EPAR;
-        if (cflag & CMSPAR)
-                cval |= UART_LCR_SPAR;
-
-        if ((info->type == PORT_8250) || (info->type == PORT_16450)) {
-                if (info->board->chip_flag) {
-                        fcr = UART_FCR_ENABLE_FIFO;
-                        fcr |= MOXA_MUST_FCR_GDA_MODE_ENABLE;
-                        mxser_set_must_fifo_value(info);
-                } else
-                        fcr = 0;
-        } else {
-                fcr = UART_FCR_ENABLE_FIFO;
-                if (info->board->chip_flag) {
-                        fcr |= MOXA_MUST_FCR_GDA_MODE_ENABLE;
-                        mxser_set_must_fifo_value(info);
-                } else {
-                        switch (info->rx_trigger) {
-                        case 1:
-                                fcr |= UART_FCR_TRIGGER_1;
-                                break;
-                        case 4:
-                                fcr |= UART_FCR_TRIGGER_4;
-                                break;
-                        case 8:
-                                fcr |= UART_FCR_TRIGGER_8;
-                                break;
-                        default:
-                                fcr |= UART_FCR_TRIGGER_14;
-                                break;
-                        }
-                }
-        }
-
-        /* CTS flow control flag and modem status interrupts */
-        info->IER &= ~UART_IER_MSI;
-        info->MCR &= ~UART_MCR_AFE;
-        if (cflag & CRTSCTS) {
-                info->port.flags |= ASYNC_CTS_FLOW;
-                info->IER |= UART_IER_MSI;
-                if ((info->type == PORT_16550A) || (info->board->chip_flag)) {
-                        info->MCR |= UART_MCR_AFE;
-                } else {
-                        status = inb(info->ioaddr + UART_MSR);
-                        if (tty->hw_stopped) {
-                                if (status & UART_MSR_CTS) {
-                                        tty->hw_stopped = 0;
-                                        if (info->type != PORT_16550A &&
-                                                        !info->board->chip_flag) {
-                                                outb(info->IER & ~UART_IER_THRI,
-                                                        info->ioaddr +
-                                                        UART_IER);
-                                                info->IER |= UART_IER_THRI;
-                                                outb(info->IER, info->ioaddr +
-                                                                UART_IER);
-                                        }
-                                        tty_wakeup(tty);
-                                }
-                        } else {
-                                if (!(status & UART_MSR_CTS)) {
-                                        tty->hw_stopped = 1;
-                                        if ((info->type != PORT_16550A) &&
-                                                        (!info->board->chip_flag)) {
-                                                info->IER &= ~UART_IER_THRI;
-                                                outb(info->IER, info->ioaddr +
-                                                                UART_IER);
-                                        }
-                                }
-                        }
-                }
-        } else {
-                info->port.flags &= ~ASYNC_CTS_FLOW;
-        }
-        outb(info->MCR, info->ioaddr + UART_MCR);
-        if (cflag & CLOCAL) {
-                info->port.flags &= ~ASYNC_CHECK_CD;
-        } else {
-                info->port.flags |= ASYNC_CHECK_CD;
-                info->IER |= UART_IER_MSI;
-        }
-        outb(info->IER, info->ioaddr + UART_IER);
-
-        /*
-         * Set up parity check flag
-         */
-        info->read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
-        if (I_INPCK(tty))
-                info->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (I_BRKINT(tty) || I_PARMRK(tty))
-                info->read_status_mask |= UART_LSR_BI;
-
-        info->ignore_status_mask = 0;
-
-        if (I_IGNBRK(tty)) {
-                info->ignore_status_mask |= UART_LSR_BI;
-                info->read_status_mask |= UART_LSR_BI;
-                /*
-                 * If we're ignore parity and break indicators, ignore
-                 * overruns too.  (For real raw support).
-                 */
-                if (I_IGNPAR(tty)) {
-                        info->ignore_status_mask |=
-                                                UART_LSR_OE |
-                                                UART_LSR_PE |
-                                                UART_LSR_FE;
-                        info->read_status_mask |=
-                                                UART_LSR_OE |
-                                                UART_LSR_PE |
-                                                UART_LSR_FE;
-                }
-        }
-        if (info->board->chip_flag) {
-                mxser_set_must_xon1_value(info->ioaddr, START_CHAR(tty));
-                mxser_set_must_xoff1_value(info->ioaddr, STOP_CHAR(tty));
-                if (I_IXON(tty)) {
-                        mxser_enable_must_rx_software_flow_control(
-                                        info->ioaddr);
-                } else {
-                        mxser_disable_must_rx_software_flow_control(
-                                        info->ioaddr);
-                }
-                if (I_IXOFF(tty)) {
-                        mxser_enable_must_tx_software_flow_control(
-                                        info->ioaddr);
-                } else {
-                        mxser_disable_must_tx_software_flow_control(
-                                        info->ioaddr);
-                }
-        }
-
-
-        outb(fcr, info->ioaddr + UART_FCR);     /* set fcr */
-        outb(cval, info->ioaddr + UART_LCR);
-
-        return ret;
-}
-
-static void mxser_check_modem_status(struct tty_struct *tty,
-                                struct mxser_port *port, int status)
-{
-        /* update input line counters */
-        if (status & UART_MSR_TERI)
-                port->icount.rng++;
-        if (status & UART_MSR_DDSR)
-                port->icount.dsr++;
-        if (status & UART_MSR_DDCD)
-                port->icount.dcd++;
-        if (status & UART_MSR_DCTS)
-                port->icount.cts++;
-        port->mon_data.modem_status = status;
-        wake_up_interruptible(&port->port.delta_msr_wait);
-
-        if ((port->port.flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
-                if (status & UART_MSR_DCD)
-                        wake_up_interruptible(&port->port.open_wait);
-        }
-
-        if (port->port.flags & ASYNC_CTS_FLOW) {
-                if (tty->hw_stopped) {
-                        if (status & UART_MSR_CTS) {
-                                tty->hw_stopped = 0;
-
-                                if ((port->type != PORT_16550A) &&
-                                                (!port->board->chip_flag)) {
-                                        outb(port->IER & ~UART_IER_THRI,
-                                                port->ioaddr + UART_IER);
-                                        port->IER |= UART_IER_THRI;
-                                        outb(port->IER, port->ioaddr +
-                                                        UART_IER);
-                                }
-                                tty_wakeup(tty);
-                        }
-                } else {
-                        if (!(status & UART_MSR_CTS)) {
-                                tty->hw_stopped = 1;
-                                if (port->type != PORT_16550A &&
-                                                !port->board->chip_flag) {
-                                        port->IER &= ~UART_IER_THRI;
-                                        outb(port->IER, port->ioaddr +
-                                                        UART_IER);
-                                }
-                        }
-                }
-        }
-}
-
-static int mxser_activate(struct tty_port *port, struct tty_struct *tty)
-{
-        struct mxser_port *info = container_of(port, struct mxser_port, port);
-        unsigned long page;
-        unsigned long flags;
-
-        page = __get_free_page(GFP_KERNEL);
-        if (!page)
-                return -ENOMEM;
-
-        spin_lock_irqsave(&info->slock, flags);
-
-        if (!info->ioaddr || !info->type) {
-                set_bit(TTY_IO_ERROR, &tty->flags);
-                free_page(page);
-                spin_unlock_irqrestore(&info->slock, flags);
-                return 0;
-        }
-        info->port.xmit_buf = (unsigned char *) page;
-
-        /*
-         * Clear the FIFO buffers and disable them
-         * (they will be reenabled in mxser_change_speed())
-         */
-        if (info->board->chip_flag)
-                outb((UART_FCR_CLEAR_RCVR |
-                        UART_FCR_CLEAR_XMIT |
-                        MOXA_MUST_FCR_GDA_MODE_ENABLE), info->ioaddr + UART_FCR);
-        else
-                outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT),
-                        info->ioaddr + UART_FCR);
-
-        /*
-         * At this point there's no way the LSR could still be 0xFF;
-         * if it is, then bail out, because there's likely no UART
-         * here.
-         */
-        if (inb(info->ioaddr + UART_LSR) == 0xff) {
-                spin_unlock_irqrestore(&info->slock, flags);
-                if (capable(CAP_SYS_ADMIN)) {
-                        set_bit(TTY_IO_ERROR, &tty->flags);
-                        return 0;
-                } else
-                        return -ENODEV;
-        }
-
-        /*
-         * Clear the interrupt registers.
-         */
-        (void) inb(info->ioaddr + UART_LSR);
-        (void) inb(info->ioaddr + UART_RX);
-        (void) inb(info->ioaddr + UART_IIR);
-        (void) inb(info->ioaddr + UART_MSR);
-
-        /*
-         * Now, initialize the UART
-         */
-        outb(UART_LCR_WLEN8, info->ioaddr + UART_LCR);  /* reset DLAB */
-        info->MCR = UART_MCR_DTR | UART_MCR_RTS;
-        outb(info->MCR, info->ioaddr + UART_MCR);
-
-        /*
-         * Finally, enable interrupts
-         */
-        info->IER = UART_IER_MSI | UART_IER_RLSI | UART_IER_RDI;
-
-        if (info->board->chip_flag)
-                info->IER |= MOXA_MUST_IER_EGDAI;
-        outb(info->IER, info->ioaddr + UART_IER);       /* enable interrupts */
-
-        /*
-         * And clear the interrupt registers again for luck.
-         */
-        (void) inb(info->ioaddr + UART_LSR);
-        (void) inb(info->ioaddr + UART_RX);
-        (void) inb(info->ioaddr + UART_IIR);
-        (void) inb(info->ioaddr + UART_MSR);
-
-        clear_bit(TTY_IO_ERROR, &tty->flags);
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-
-        /*
-         * and set the speed of the serial port
-         */
-        mxser_change_speed(tty, NULL);
-        spin_unlock_irqrestore(&info->slock, flags);
-
-        return 0;
-}
-
-/*
- * This routine will shutdown a serial port
- */
-static void mxser_shutdown_port(struct tty_port *port)
-{
-        struct mxser_port *info = container_of(port, struct mxser_port, port);
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->slock, flags);
-
-        /*
-         * clear delta_msr_wait queue to avoid mem leaks: we may free the irq
-         * here so the queue might never be waken up
-         */
-        wake_up_interruptible(&info->port.delta_msr_wait);
-
-        /*
-         * Free the xmit buffer, if necessary
-         */
-        if (info->port.xmit_buf) {
-                free_page((unsigned long) info->port.xmit_buf);
-                info->port.xmit_buf = NULL;
-        }
-
-        info->IER = 0;
-        outb(0x00, info->ioaddr + UART_IER);
-
-        /* clear Rx/Tx FIFO's */
-        if (info->board->chip_flag)
-                outb(UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT |
-                                MOXA_MUST_FCR_GDA_MODE_ENABLE,
-                                info->ioaddr + UART_FCR);
-        else
-                outb(UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT,
-                        info->ioaddr + UART_FCR);
-
-        /* read data port to reset things */
-        (void) inb(info->ioaddr + UART_RX);
-
-
-        if (info->board->chip_flag)
-                SET_MOXA_MUST_NO_SOFTWARE_FLOW_CONTROL(info->ioaddr);
-
-        spin_unlock_irqrestore(&info->slock, flags);
-}
-
-/*
- * This routine is called whenever a serial port is opened.  It
- * enables interrupts for a serial port, linking in its async structure into
- * the IRQ chain.   It also performs the serial-specific
- * initialization for the tty structure.
- */
-static int mxser_open(struct tty_struct *tty, struct file *filp)
-{
-        struct mxser_port *info;
-        int line;
-
-        line = tty->index;
-        if (line == MXSER_PORTS)
-                return 0;
-        if (line < 0 || line > MXSER_PORTS)
-                return -ENODEV;
-        info = &mxser_boards[line / MXSER_PORTS_PER_BOARD].ports[line % MXSER_PORTS_PER_BOARD];
-        if (!info->ioaddr)
-                return -ENODEV;
-
-        tty->driver_data = info;
-        return tty_port_open(&info->port, tty, filp);
-}
-
-static void mxser_flush_buffer(struct tty_struct *tty)
-{
-        struct mxser_port *info = tty->driver_data;
-        char fcr;
-        unsigned long flags;
-
-
-        spin_lock_irqsave(&info->slock, flags);
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-
-        fcr = inb(info->ioaddr + UART_FCR);
-        outb((fcr | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT),
-                info->ioaddr + UART_FCR);
-        outb(fcr, info->ioaddr + UART_FCR);
-
-        spin_unlock_irqrestore(&info->slock, flags);
-
-        tty_wakeup(tty);
-}
-
-
-static void mxser_close_port(struct tty_port *port)
-{
-        struct mxser_port *info = container_of(port, struct mxser_port, port);
-        unsigned long timeout;
-        /*
-         * At this point we stop accepting input.  To do this, we
-         * disable the receive line status interrupts, and tell the
-         * interrupt driver to stop checking the data ready bit in the
-         * line status register.
-         */
-        info->IER &= ~UART_IER_RLSI;
-        if (info->board->chip_flag)
-                info->IER &= ~MOXA_MUST_RECV_ISR;
-
-        outb(info->IER, info->ioaddr + UART_IER);
-        /*
-         * Before we drop DTR, make sure the UART transmitter
-         * has completely drained; this is especially
-         * important if there is a transmit FIFO!
-         */
-        timeout = jiffies + HZ;
-        while (!(inb(info->ioaddr + UART_LSR) & UART_LSR_TEMT)) {
-                schedule_timeout_interruptible(5);
-                if (time_after(jiffies, timeout))
-                        break;
-        }
-}
-
-/*
- * This routine is called when the serial port gets closed.  First, we
- * wait for the last remaining data to be sent.  Then, we unlink its
- * async structure from the interrupt chain if necessary, and we free
- * that IRQ if nothing is left in the chain.
- */
-static void mxser_close(struct tty_struct *tty, struct file *filp)
-{
-        struct mxser_port *info = tty->driver_data;
-        struct tty_port *port = &info->port;
-
-        if (tty->index == MXSER_PORTS || info == NULL)
-                return;
-        if (tty_port_close_start(port, tty, filp) == 0)
-                return;
-        mutex_lock(&port->mutex);
-        mxser_close_port(port);
-        mxser_flush_buffer(tty);
-        mxser_shutdown_port(port);
-        clear_bit(ASYNCB_INITIALIZED, &port->flags);
-        mutex_unlock(&port->mutex);
-        /* Right now the tty_port set is done outside of the close_end helper
-           as we don't yet have everyone using refcounts */     
-        tty_port_close_end(port, tty);
-        tty_port_tty_set(port, NULL);
-}
-
-static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int count)
-{
-        int c, total = 0;
-        struct mxser_port *info = tty->driver_data;
-        unsigned long flags;
-
-        if (!info->port.xmit_buf)
-                return 0;
-
-        while (1) {
-                c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
-                                          SERIAL_XMIT_SIZE - info->xmit_head));
-                if (c <= 0)
-                        break;
-
-                memcpy(info->port.xmit_buf + info->xmit_head, buf, c);
-                spin_lock_irqsave(&info->slock, flags);
-                info->xmit_head = (info->xmit_head + c) &
-                                  (SERIAL_XMIT_SIZE - 1);
-                info->xmit_cnt += c;
-                spin_unlock_irqrestore(&info->slock, flags);
-
-                buf += c;
-                count -= c;
-                total += c;
-        }
-
-        if (info->xmit_cnt && !tty->stopped) {
-                if (!tty->hw_stopped ||
-                                (info->type == PORT_16550A) ||
-                                (info->board->chip_flag)) {
-                        spin_lock_irqsave(&info->slock, flags);
-                        outb(info->IER & ~UART_IER_THRI, info->ioaddr +
-                                        UART_IER);
-                        info->IER |= UART_IER_THRI;
-                        outb(info->IER, info->ioaddr + UART_IER);
-                        spin_unlock_irqrestore(&info->slock, flags);
-                }
-        }
-        return total;
-}
-
-static int mxser_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        struct mxser_port *info = tty->driver_data;
-        unsigned long flags;
-
-        if (!info->port.xmit_buf)
-                return 0;
-
-        if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1)
-                return 0;
-
-        spin_lock_irqsave(&info->slock, flags);
-        info->port.xmit_buf[info->xmit_head++] = ch;
-        info->xmit_head &= SERIAL_XMIT_SIZE - 1;
-        info->xmit_cnt++;
-        spin_unlock_irqrestore(&info->slock, flags);
-        if (!tty->stopped) {
-                if (!tty->hw_stopped ||
-                                (info->type == PORT_16550A) ||
-                                info->board->chip_flag) {
-                        spin_lock_irqsave(&info->slock, flags);
-                        outb(info->IER & ~UART_IER_THRI, info->ioaddr + UART_IER);
-                        info->IER |= UART_IER_THRI;
-                        outb(info->IER, info->ioaddr + UART_IER);
-                        spin_unlock_irqrestore(&info->slock, flags);
-                }
-        }
-        return 1;
-}
-
-
-static void mxser_flush_chars(struct tty_struct *tty)
-{
-        struct mxser_port *info = tty->driver_data;
-        unsigned long flags;
-
-        if (info->xmit_cnt <= 0 || tty->stopped || !info->port.xmit_buf ||
-                        (tty->hw_stopped && info->type != PORT_16550A &&
-                         !info->board->chip_flag))
-                return;
-
-        spin_lock_irqsave(&info->slock, flags);
-
-        outb(info->IER & ~UART_IER_THRI, info->ioaddr + UART_IER);
-        info->IER |= UART_IER_THRI;
-        outb(info->IER, info->ioaddr + UART_IER);
-
-        spin_unlock_irqrestore(&info->slock, flags);
-}
-
-static int mxser_write_room(struct tty_struct *tty)
-{
-        struct mxser_port *info = tty->driver_data;
-        int ret;
-
-        ret = SERIAL_XMIT_SIZE - info->xmit_cnt - 1;
-        return ret < 0 ? 0 : ret;
-}
-
-static int mxser_chars_in_buffer(struct tty_struct *tty)
-{
-        struct mxser_port *info = tty->driver_data;
-        return info->xmit_cnt;
-}
-
-/*
- * ------------------------------------------------------------
- * friends of mxser_ioctl()
- * ------------------------------------------------------------
- */
-static int mxser_get_serial_info(struct tty_struct *tty,
-                struct serial_struct __user *retinfo)
-{
-        struct mxser_port *info = tty->driver_data;
-        struct serial_struct tmp = {
-                .type = info->type,
-                .line = tty->index,
-                .port = info->ioaddr,
-                .irq = info->board->irq,
-                .flags = info->port.flags,
-                .baud_base = info->baud_base,
-                .close_delay = info->port.close_delay,
-                .closing_wait = info->port.closing_wait,
-                .custom_divisor = info->custom_divisor,
-                .hub6 = 0
-        };
-        if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
-                return -EFAULT;
-        return 0;
-}
-
-static int mxser_set_serial_info(struct tty_struct *tty,
-                struct serial_struct __user *new_info)
-{
-        struct mxser_port *info = tty->driver_data;
-        struct tty_port *port = &info->port;
-        struct serial_struct new_serial;
-        speed_t baud;
-        unsigned long sl_flags;
-        unsigned int flags;
-        int retval = 0;
-
-        if (!new_info || !info->ioaddr)
-                return -ENODEV;
-        if (copy_from_user(&new_serial, new_info, sizeof(new_serial)))
-                return -EFAULT;
-
-        if (new_serial.irq != info->board->irq ||
-                        new_serial.port != info->ioaddr)
-                return -EINVAL;
-
-        flags = port->flags & ASYNC_SPD_MASK;
-
-        if (!capable(CAP_SYS_ADMIN)) {
-                if ((new_serial.baud_base != info->baud_base) ||
-                                (new_serial.close_delay != info->port.close_delay) ||
-                                ((new_serial.flags & ~ASYNC_USR_MASK) != (info->port.flags & ~ASYNC_USR_MASK)))
-                        return -EPERM;
-                info->port.flags = ((info->port.flags & ~ASYNC_USR_MASK) |
-                                (new_serial.flags & ASYNC_USR_MASK));
-        } else {
-                /*
-                 * OK, past this point, all the error checking has been done.
-                 * At this point, we start making changes.....
-                 */
-                port->flags = ((port->flags & ~ASYNC_FLAGS) |
-                                (new_serial.flags & ASYNC_FLAGS));
-                port->close_delay = new_serial.close_delay * HZ / 100;
-                port->closing_wait = new_serial.closing_wait * HZ / 100;
-                tty->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-                if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST &&
-                                (new_serial.baud_base != info->baud_base ||
-                                new_serial.custom_divisor !=
-                                info->custom_divisor)) {
-                        if (new_serial.custom_divisor == 0)
-                                return -EINVAL;
-                        baud = new_serial.baud_base / new_serial.custom_divisor;
-                        tty_encode_baud_rate(tty, baud, baud);
-                }
-        }
-
-        info->type = new_serial.type;
-
-        process_txrx_fifo(info);
-
-        if (test_bit(ASYNCB_INITIALIZED, &port->flags)) {
-                if (flags != (port->flags & ASYNC_SPD_MASK)) {
-                        spin_lock_irqsave(&info->slock, sl_flags);
-                        mxser_change_speed(tty, NULL);
-                        spin_unlock_irqrestore(&info->slock, sl_flags);
-                }
-        } else {
-                retval = mxser_activate(port, tty);
-                if (retval == 0)
-                        set_bit(ASYNCB_INITIALIZED, &port->flags);
-        }
-        return retval;
-}
-
-/*
- * mxser_get_lsr_info - get line status register info
- *
- * Purpose: Let user call ioctl() to get info when the UART physically
- *          is emptied.  On bus types like RS485, the transmitter must
- *          release the bus after transmitting. This must be done when
- *          the transmit shift register is empty, not be done when the
- *          transmit holding register is empty.  This functionality
- *          allows an RS485 driver to be written in user space.
- */
-static int mxser_get_lsr_info(struct mxser_port *info,
-                unsigned int __user *value)
-{
-        unsigned char status;
-        unsigned int result;
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->slock, flags);
-        status = inb(info->ioaddr + UART_LSR);
-        spin_unlock_irqrestore(&info->slock, flags);
-        result = ((status & UART_LSR_TEMT) ? TIOCSER_TEMT : 0);
-        return put_user(result, value);
-}
-
-static int mxser_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct mxser_port *info = tty->driver_data;
-        unsigned char control, status;
-        unsigned long flags;
-
-
-        if (tty->index == MXSER_PORTS)
-                return -ENOIOCTLCMD;
-        if (test_bit(TTY_IO_ERROR, &tty->flags))
-                return -EIO;
-
-        control = info->MCR;
-
-        spin_lock_irqsave(&info->slock, flags);
-        status = inb(info->ioaddr + UART_MSR);
-        if (status & UART_MSR_ANY_DELTA)
-                mxser_check_modem_status(tty, info, status);
-        spin_unlock_irqrestore(&info->slock, flags);
-        return ((control & UART_MCR_RTS) ? TIOCM_RTS : 0) |
-                    ((control & UART_MCR_DTR) ? TIOCM_DTR : 0) |
-                    ((status & UART_MSR_DCD) ? TIOCM_CAR : 0) |
-                    ((status & UART_MSR_RI) ? TIOCM_RNG : 0) |
-                    ((status & UART_MSR_DSR) ? TIOCM_DSR : 0) |
-                    ((status & UART_MSR_CTS) ? TIOCM_CTS : 0);
-}
-
-static int mxser_tiocmset(struct tty_struct *tty, struct file *file,
-                unsigned int set, unsigned int clear)
-{
-        struct mxser_port *info = tty->driver_data;
-        unsigned long flags;
-
-
-        if (tty->index == MXSER_PORTS)
-                return -ENOIOCTLCMD;
-        if (test_bit(TTY_IO_ERROR, &tty->flags))
-                return -EIO;
-
-        spin_lock_irqsave(&info->slock, flags);
-
-        if (set & TIOCM_RTS)
-                info->MCR |= UART_MCR_RTS;
-        if (set & TIOCM_DTR)
-                info->MCR |= UART_MCR_DTR;
-
-        if (clear & TIOCM_RTS)
-                info->MCR &= ~UART_MCR_RTS;
-        if (clear & TIOCM_DTR)
-                info->MCR &= ~UART_MCR_DTR;
-
-        outb(info->MCR, info->ioaddr + UART_MCR);
-        spin_unlock_irqrestore(&info->slock, flags);
-        return 0;
-}
-
-static int __init mxser_program_mode(int port)
-{
-        int id, i, j, n;
-
-        outb(0, port);
-        outb(0, port);
-        outb(0, port);
-        (void)inb(port);
-        (void)inb(port);
-        outb(0, port);
-        (void)inb(port);
-
-        id = inb(port + 1) & 0x1F;
-        if ((id != C168_ASIC_ID) &&
-                        (id != C104_ASIC_ID) &&
-                        (id != C102_ASIC_ID) &&
-                        (id != CI132_ASIC_ID) &&
-                        (id != CI134_ASIC_ID) &&
-                        (id != CI104J_ASIC_ID))
-                return -1;
-        for (i = 0, j = 0; i < 4; i++) {
-                n = inb(port + 2);
-                if (n == 'M') {
-                        j = 1;
-                } else if ((j == 1) && (n == 1)) {
-                        j = 2;
-                        break;
-                } else
-                        j = 0;
-        }
-        if (j != 2)
-                id = -2;
-        return id;
-}
-
-static void __init mxser_normal_mode(int port)
-{
-        int i, n;
-
-        outb(0xA5, port + 1);
-        outb(0x80, port + 3);
-        outb(12, port + 0);     /* 9600 bps */
-        outb(0, port + 1);
-        outb(0x03, port + 3);   /* 8 data bits */
-        outb(0x13, port + 4);   /* loop back mode */
-        for (i = 0; i < 16; i++) {
-                n = inb(port + 5);
-                if ((n & 0x61) == 0x60)
-                        break;
-                if ((n & 1) == 1)
-                        (void)inb(port);
-        }
-        outb(0x00, port + 4);
-}
-
-#define CHIP_SK         0x01    /* Serial Data Clock  in Eprom */
-#define CHIP_DO         0x02    /* Serial Data Output in Eprom */
-#define CHIP_CS         0x04    /* Serial Chip Select in Eprom */
-#define CHIP_DI         0x08    /* Serial Data Input  in Eprom */
-#define EN_CCMD         0x000   /* Chip's command register     */
-#define EN0_RSARLO      0x008   /* Remote start address reg 0  */
-#define EN0_RSARHI      0x009   /* Remote start address reg 1  */
-#define EN0_RCNTLO      0x00A   /* Remote byte count reg WR    */
-#define EN0_RCNTHI      0x00B   /* Remote byte count reg WR    */
-#define EN0_DCFG        0x00E   /* Data configuration reg WR   */
-#define EN0_PORT        0x010   /* Rcv missed frame error counter RD */
-#define ENC_PAGE0       0x000   /* Select page 0 of chip registers   */
-#define ENC_PAGE3       0x0C0   /* Select page 3 of chip registers   */
-static int __init mxser_read_register(int port, unsigned short *regs)
-{
-        int i, k, value, id;
-        unsigned int j;
-
-        id = mxser_program_mode(port);
-        if (id < 0)
-                return id;
-        for (i = 0; i < 14; i++) {
-                k = (i & 0x3F) | 0x180;
-                for (j = 0x100; j > 0; j >>= 1) {
-                        outb(CHIP_CS, port);
-                        if (k & j) {
-                                outb(CHIP_CS | CHIP_DO, port);
-                                outb(CHIP_CS | CHIP_DO | CHIP_SK, port);        /* A? bit of read */
-                        } else {
-                                outb(CHIP_CS, port);
-                                outb(CHIP_CS | CHIP_SK, port);  /* A? bit of read */
-                        }
-                }
-                (void)inb(port);
-                value = 0;
-                for (k = 0, j = 0x8000; k < 16; k++, j >>= 1) {
-                        outb(CHIP_CS, port);
-                        outb(CHIP_CS | CHIP_SK, port);
-                        if (inb(port) & CHIP_DI)
-                                value |= j;
-                }
-                regs[i] = value;
-                outb(0, port);
-        }
-        mxser_normal_mode(port);
-        return id;
-}
-
-static int mxser_ioctl_special(unsigned int cmd, void __user *argp)
-{
-        struct mxser_port *ip;
-        struct tty_port *port;
-        struct tty_struct *tty;
-        int result, status;
-        unsigned int i, j;
-        int ret = 0;
-
-        switch (cmd) {
-        case MOXA_GET_MAJOR:
-                if (printk_ratelimit())
-                        printk(KERN_WARNING "mxser: '%s' uses deprecated ioctl "
-                                        "%x (GET_MAJOR), fix your userspace\n",
-                                        current->comm, cmd);
-                return put_user(ttymajor, (int __user *)argp);
-
-        case MOXA_CHKPORTENABLE:
-                result = 0;
-                for (i = 0; i < MXSER_BOARDS; i++)
-                        for (j = 0; j < MXSER_PORTS_PER_BOARD; j++)
-                                if (mxser_boards[i].ports[j].ioaddr)
-                                        result |= (1 << i);
-                return put_user(result, (unsigned long __user *)argp);
-        case MOXA_GETDATACOUNT:
-                /* The receive side is locked by port->slock but it isn't
-                   clear that an exact snapshot is worth copying here */
-                if (copy_to_user(argp, &mxvar_log, sizeof(mxvar_log)))
-                        ret = -EFAULT;
-                return ret;
-        case MOXA_GETMSTATUS: {
-                struct mxser_mstatus ms, __user *msu = argp;
-                for (i = 0; i < MXSER_BOARDS; i++)
-                        for (j = 0; j < MXSER_PORTS_PER_BOARD; j++) {
-                                ip = &mxser_boards[i].ports[j];
-                                port = &ip->port;
-                                memset(&ms, 0, sizeof(ms));
-
-                                mutex_lock(&port->mutex);
-                                if (!ip->ioaddr)
-                                        goto copy;
-                                
-                                tty = tty_port_tty_get(port);
-
-                                if (!tty || !tty->termios)
-                                        ms.cflag = ip->normal_termios.c_cflag;
-                                else
-                                        ms.cflag = tty->termios->c_cflag;
-                                tty_kref_put(tty);
-                                spin_lock_irq(&ip->slock);
-                                status = inb(ip->ioaddr + UART_MSR);
-                                spin_unlock_irq(&ip->slock);
-                                if (status & UART_MSR_DCD)
-                                        ms.dcd = 1;
-                                if (status & UART_MSR_DSR)
-                                        ms.dsr = 1;
-                                if (status & UART_MSR_CTS)
-                                        ms.cts = 1;
-                        copy:
-                                mutex_unlock(&port->mutex);
-                                if (copy_to_user(msu, &ms, sizeof(ms)))
-                                        return -EFAULT;
-                                msu++;
-                        }
-                return 0;
-        }
-        case MOXA_ASPP_MON_EXT: {
-                struct mxser_mon_ext *me; /* it's 2k, stack unfriendly */
-                unsigned int cflag, iflag, p;
-                u8 opmode;
-
-                me = kzalloc(sizeof(*me), GFP_KERNEL);
-                if (!me)
-                        return -ENOMEM;
-
-                for (i = 0, p = 0; i < MXSER_BOARDS; i++) {
-                        for (j = 0; j < MXSER_PORTS_PER_BOARD; j++, p++) {
-                                if (p >= ARRAY_SIZE(me->rx_cnt)) {
-                                        i = MXSER_BOARDS;
-                                        break;
-                                }
-                                ip = &mxser_boards[i].ports[j];
-                                port = &ip->port;
-
-                                mutex_lock(&port->mutex);
-                                if (!ip->ioaddr) {
-                                        mutex_unlock(&port->mutex);
-                                        continue;
-                                }
-
-                                spin_lock_irq(&ip->slock);
-                                status = mxser_get_msr(ip->ioaddr, 0, p);
-
-                                if (status & UART_MSR_TERI)
-                                        ip->icount.rng++;
-                                if (status & UART_MSR_DDSR)
-                                        ip->icount.dsr++;
-                                if (status & UART_MSR_DDCD)
-                                        ip->icount.dcd++;
-                                if (status & UART_MSR_DCTS)
-                                        ip->icount.cts++;
-
-                                ip->mon_data.modem_status = status;
-                                me->rx_cnt[p] = ip->mon_data.rxcnt;
-                                me->tx_cnt[p] = ip->mon_data.txcnt;
-                                me->up_rxcnt[p] = ip->mon_data.up_rxcnt;
-                                me->up_txcnt[p] = ip->mon_data.up_txcnt;
-                                me->modem_status[p] =
-                                        ip->mon_data.modem_status;
-                                spin_unlock_irq(&ip->slock);
-
-                                tty = tty_port_tty_get(&ip->port);
-
-                                if (!tty || !tty->termios) {
-                                        cflag = ip->normal_termios.c_cflag;
-                                        iflag = ip->normal_termios.c_iflag;
-                                        me->baudrate[p] = tty_termios_baud_rate(&ip->normal_termios);
-                                } else {
-                                        cflag = tty->termios->c_cflag;
-                                        iflag = tty->termios->c_iflag;
-                                        me->baudrate[p] = tty_get_baud_rate(tty);
-                                }
-                                tty_kref_put(tty);
-
-                                me->databits[p] = cflag & CSIZE;
-                                me->stopbits[p] = cflag & CSTOPB;
-                                me->parity[p] = cflag & (PARENB | PARODD |
-                                                CMSPAR);
-
-                                if (cflag & CRTSCTS)
-                                        me->flowctrl[p] |= 0x03;
-
-                                if (iflag & (IXON | IXOFF))
-                                        me->flowctrl[p] |= 0x0C;
-
-                                if (ip->type == PORT_16550A)
-                                        me->fifo[p] = 1;
-
-                                opmode = inb(ip->opmode_ioaddr)>>((p % 4) * 2);
-                                opmode &= OP_MODE_MASK;
-                                me->iftype[p] = opmode;
-                                mutex_unlock(&port->mutex);
-                        }
-                }
-                if (copy_to_user(argp, me, sizeof(*me)))
-                        ret = -EFAULT;
-                kfree(me);
-                return ret;
-        }
-        default:
-                return -ENOIOCTLCMD;
-        }
-        return 0;
-}
-
-static int mxser_cflags_changed(struct mxser_port *info, unsigned long arg,
-                struct async_icount *cprev)
-{
-        struct async_icount cnow;
-        unsigned long flags;
-        int ret;
-
-        spin_lock_irqsave(&info->slock, flags);
-        cnow = info->icount;    /* atomic copy */
-        spin_unlock_irqrestore(&info->slock, flags);
-
-        ret =   ((arg & TIOCM_RNG) && (cnow.rng != cprev->rng)) ||
-                ((arg & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) ||
-                ((arg & TIOCM_CD)  && (cnow.dcd != cprev->dcd)) ||
-                ((arg & TIOCM_CTS) && (cnow.cts != cprev->cts));
-
-        *cprev = cnow;
-
-        return ret;
-}
-
-static int mxser_ioctl(struct tty_struct *tty, struct file *file,
-                unsigned int cmd, unsigned long arg)
-{
-        struct mxser_port *info = tty->driver_data;
-        struct tty_port *port = &info->port;
-        struct async_icount cnow;
-        unsigned long flags;
-        void __user *argp = (void __user *)arg;
-        int retval;
-
-        if (tty->index == MXSER_PORTS)
-                return mxser_ioctl_special(cmd, argp);
-
-        if (cmd == MOXA_SET_OP_MODE || cmd == MOXA_GET_OP_MODE) {
-                int p;
-                unsigned long opmode;
-                static unsigned char ModeMask[] = { 0xfc, 0xf3, 0xcf, 0x3f };
-                int shiftbit;
-                unsigned char val, mask;
-
-                p = tty->index % 4;
-                if (cmd == MOXA_SET_OP_MODE) {
-                        if (get_user(opmode, (int __user *) argp))
-                                return -EFAULT;
-                        if (opmode != RS232_MODE &&
-                                        opmode != RS485_2WIRE_MODE &&
-                                        opmode != RS422_MODE &&
-                                        opmode != RS485_4WIRE_MODE)
-                                return -EFAULT;
-                        mask = ModeMask[p];
-                        shiftbit = p * 2;
-                        spin_lock_irq(&info->slock);
-                        val = inb(info->opmode_ioaddr);
-                        val &= mask;
-                        val |= (opmode << shiftbit);
-                        outb(val, info->opmode_ioaddr);
-                        spin_unlock_irq(&info->slock);
-                } else {
-                        shiftbit = p * 2;
-                        spin_lock_irq(&info->slock);
-                        opmode = inb(info->opmode_ioaddr) >> shiftbit;
-                        spin_unlock_irq(&info->slock);
-                        opmode &= OP_MODE_MASK;
-                        if (put_user(opmode, (int __user *)argp))
-                                return -EFAULT;
-                }
-                return 0;
-        }
-
-        if (cmd != TIOCGSERIAL && cmd != TIOCMIWAIT && cmd != TIOCGICOUNT &&
-                        test_bit(TTY_IO_ERROR, &tty->flags))
-                return -EIO;
-
-        switch (cmd) {
-        case TIOCGSERIAL:
-                mutex_lock(&port->mutex);
-                retval = mxser_get_serial_info(tty, argp);
-                mutex_unlock(&port->mutex);
-                return retval;
-        case TIOCSSERIAL:
-                mutex_lock(&port->mutex);
-                retval = mxser_set_serial_info(tty, argp);
-                mutex_unlock(&port->mutex);
-                return retval;
-        case TIOCSERGETLSR:     /* Get line status register */
-                return  mxser_get_lsr_info(info, argp);
-                /*
-                 * Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change
-                 * - mask passed in arg for lines of interest
-                 *   (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
-                 * Caller should use TIOCGICOUNT to see which one it was
-                 */
-        case TIOCMIWAIT:
-                spin_lock_irqsave(&info->slock, flags);
-                cnow = info->icount;    /* note the counters on entry */
-                spin_unlock_irqrestore(&info->slock, flags);
-
-                return wait_event_interruptible(info->port.delta_msr_wait,
-                                mxser_cflags_changed(info, arg, &cnow));
-        /*
-         * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-         * Return: write counters to the user passed counter struct
-         * NB: both 1->0 and 0->1 transitions are counted except for
-         *     RI where only 0->1 is counted.
-         */
-        case TIOCGICOUNT: {
-                struct serial_icounter_struct icnt = { 0 };
-                spin_lock_irqsave(&info->slock, flags);
-                cnow = info->icount;
-                spin_unlock_irqrestore(&info->slock, flags);
-
-                icnt.frame = cnow.frame;
-                icnt.brk = cnow.brk;
-                icnt.overrun = cnow.overrun;
-                icnt.buf_overrun = cnow.buf_overrun;
-                icnt.parity = cnow.parity;
-                icnt.rx = cnow.rx;
-                icnt.tx = cnow.tx;
-                icnt.cts = cnow.cts;
-                icnt.dsr = cnow.dsr;
-                icnt.rng = cnow.rng;
-                icnt.dcd = cnow.dcd;
-
-                return copy_to_user(argp, &icnt, sizeof(icnt)) ? -EFAULT : 0;
-        }
-        case MOXA_HighSpeedOn:
-                return put_user(info->baud_base != 115200 ? 1 : 0, (int __user *)argp);
-        case MOXA_SDS_RSTICOUNTER:
-                spin_lock_irq(&info->slock);
-                info->mon_data.rxcnt = 0;
-                info->mon_data.txcnt = 0;
-                spin_unlock_irq(&info->slock);
-                return 0;
-
-        case MOXA_ASPP_OQUEUE:{
-                int len, lsr;
-
-                len = mxser_chars_in_buffer(tty);
-                spin_lock_irq(&info->slock);
-                lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_THRE;
-                spin_unlock_irq(&info->slock);
-                len += (lsr ? 0 : 1);
-
-                return put_user(len, (int __user *)argp);
-        }
-        case MOXA_ASPP_MON: {
-                int mcr, status;
-
-                spin_lock_irq(&info->slock);
-                status = mxser_get_msr(info->ioaddr, 1, tty->index);
-                mxser_check_modem_status(tty, info, status);
-
-                mcr = inb(info->ioaddr + UART_MCR);
-                spin_unlock_irq(&info->slock);
-
-                if (mcr & MOXA_MUST_MCR_XON_FLAG)
-                        info->mon_data.hold_reason &= ~NPPI_NOTIFY_XOFFHOLD;
-                else
-                        info->mon_data.hold_reason |= NPPI_NOTIFY_XOFFHOLD;
-
-                if (mcr & MOXA_MUST_MCR_TX_XON)
-                        info->mon_data.hold_reason &= ~NPPI_NOTIFY_XOFFXENT;
-                else
-                        info->mon_data.hold_reason |= NPPI_NOTIFY_XOFFXENT;
-
-                if (tty->hw_stopped)
-                        info->mon_data.hold_reason |= NPPI_NOTIFY_CTSHOLD;
-                else
-                        info->mon_data.hold_reason &= ~NPPI_NOTIFY_CTSHOLD;
-
-                if (copy_to_user(argp, &info->mon_data,
-                                sizeof(struct mxser_mon)))
-                        return -EFAULT;
-
-                return 0;
-        }
-        case MOXA_ASPP_LSTATUS: {
-                if (put_user(info->err_shadow, (unsigned char __user *)argp))
-                        return -EFAULT;
-
-                info->err_shadow = 0;
-                return 0;
-        }
-        case MOXA_SET_BAUD_METHOD: {
-                int method;
-
-                if (get_user(method, (int __user *)argp))
-                        return -EFAULT;
-                mxser_set_baud_method[tty->index] = method;
-                return put_user(method, (int __user *)argp);
-        }
-        default:
-                return -ENOIOCTLCMD;
-        }
-        return 0;
-}
-
-static void mxser_stoprx(struct tty_struct *tty)
-{
-        struct mxser_port *info = tty->driver_data;
-
-        info->ldisc_stop_rx = 1;
-        if (I_IXOFF(tty)) {
-                if (info->board->chip_flag) {
-                        info->IER &= ~MOXA_MUST_RECV_ISR;
-                        outb(info->IER, info->ioaddr + UART_IER);
-                } else {
-                        info->x_char = STOP_CHAR(tty);
-                        outb(0, info->ioaddr + UART_IER);
-                        info->IER |= UART_IER_THRI;
-                        outb(info->IER, info->ioaddr + UART_IER);
-                }
-        }
-
-        if (tty->termios->c_cflag & CRTSCTS) {
-                info->MCR &= ~UART_MCR_RTS;
-                outb(info->MCR, info->ioaddr + UART_MCR);
-        }
-}
-
-/*
- * This routine is called by the upper-layer tty layer to signal that
- * incoming characters should be throttled.
- */
-static void mxser_throttle(struct tty_struct *tty)
-{
-        mxser_stoprx(tty);
-}
-
-static void mxser_unthrottle(struct tty_struct *tty)
-{
-        struct mxser_port *info = tty->driver_data;
-
-        /* startrx */
-        info->ldisc_stop_rx = 0;
-        if (I_IXOFF(tty)) {
-                if (info->x_char)
-                        info->x_char = 0;
-                else {
-                        if (info->board->chip_flag) {
-                                info->IER |= MOXA_MUST_RECV_ISR;
-                                outb(info->IER, info->ioaddr + UART_IER);
-                        } else {
-                                info->x_char = START_CHAR(tty);
-                                outb(0, info->ioaddr + UART_IER);
-                                info->IER |= UART_IER_THRI;
-                                outb(info->IER, info->ioaddr + UART_IER);
-                        }
-                }
-        }
-
-        if (tty->termios->c_cflag & CRTSCTS) {
-                info->MCR |= UART_MCR_RTS;
-                outb(info->MCR, info->ioaddr + UART_MCR);
-        }
-}
-
-/*
- * mxser_stop() and mxser_start()
- *
- * This routines are called before setting or resetting tty->stopped.
- * They enable or disable transmitter interrupts, as necessary.
- */
-static void mxser_stop(struct tty_struct *tty)
-{
-        struct mxser_port *info = tty->driver_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->slock, flags);
-        if (info->IER & UART_IER_THRI) {
-                info->IER &= ~UART_IER_THRI;
-                outb(info->IER, info->ioaddr + UART_IER);
-        }
-        spin_unlock_irqrestore(&info->slock, flags);
-}
-
-static void mxser_start(struct tty_struct *tty)
-{
-        struct mxser_port *info = tty->driver_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->slock, flags);
-        if (info->xmit_cnt && info->port.xmit_buf) {
-                outb(info->IER & ~UART_IER_THRI, info->ioaddr + UART_IER);
-                info->IER |= UART_IER_THRI;
-                outb(info->IER, info->ioaddr + UART_IER);
-        }
-        spin_unlock_irqrestore(&info->slock, flags);
-}
-
-static void mxser_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
-{
-        struct mxser_port *info = tty->driver_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->slock, flags);
-        mxser_change_speed(tty, old_termios);
-        spin_unlock_irqrestore(&info->slock, flags);
-
-        if ((old_termios->c_cflag & CRTSCTS) &&
-                        !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-                mxser_start(tty);
-        }
-
-        /* Handle sw stopped */
-        if ((old_termios->c_iflag & IXON) &&
-                        !(tty->termios->c_iflag & IXON)) {
-                tty->stopped = 0;
-
-                if (info->board->chip_flag) {
-                        spin_lock_irqsave(&info->slock, flags);
-                        mxser_disable_must_rx_software_flow_control(
-                                        info->ioaddr);
-                        spin_unlock_irqrestore(&info->slock, flags);
-                }
-
-                mxser_start(tty);
-        }
-}
-
-/*
- * mxser_wait_until_sent() --- wait until the transmitter is empty
- */
-static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-        struct mxser_port *info = tty->driver_data;
-        unsigned long orig_jiffies, char_time;
-        unsigned long flags;
-        int lsr;
-
-        if (info->type == PORT_UNKNOWN)
-                return;
-
-        if (info->xmit_fifo_size == 0)
-                return;         /* Just in case.... */
-
-        orig_jiffies = jiffies;
-        /*
-         * Set the check interval to be 1/5 of the estimated time to
-         * send a single character, and make it at least 1.  The check
-         * interval should also be less than the timeout.
-         *
-         * Note: we have to use pretty tight timings here to satisfy
-         * the NIST-PCTS.
-         */
-        char_time = (info->timeout - HZ / 50) / info->xmit_fifo_size;
-        char_time = char_time / 5;
-        if (char_time == 0)
-                char_time = 1;
-        if (timeout && timeout < char_time)
-                char_time = timeout;
-        /*
-         * If the transmitter hasn't cleared in twice the approximate
-         * amount of time to send the entire FIFO, it probably won't
-         * ever clear.  This assumes the UART isn't doing flow
-         * control, which is currently the case.  Hence, if it ever
-         * takes longer than info->timeout, this is probably due to a
-         * UART bug of some kind.  So, we clamp the timeout parameter at
-         * 2*info->timeout.
-         */
-        if (!timeout || timeout > 2 * info->timeout)
-                timeout = 2 * info->timeout;
-#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
-        printk(KERN_DEBUG "In rs_wait_until_sent(%d) check=%lu...",
-                timeout, char_time);
-        printk("jiff=%lu...", jiffies);
-#endif
-        spin_lock_irqsave(&info->slock, flags);
-        while (!((lsr = inb(info->ioaddr + UART_LSR)) & UART_LSR_TEMT)) {
-#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
-                printk("lsr = %d (jiff=%lu)...", lsr, jiffies);
-#endif
-                spin_unlock_irqrestore(&info->slock, flags);
-                schedule_timeout_interruptible(char_time);
-                spin_lock_irqsave(&info->slock, flags);
-                if (signal_pending(current))
-                        break;
-                if (timeout && time_after(jiffies, orig_jiffies + timeout))
-                        break;
-        }
-        spin_unlock_irqrestore(&info->slock, flags);
-        set_current_state(TASK_RUNNING);
-
-#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
-        printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
-#endif
-}
-
-/*
- * This routine is called by tty_hangup() when a hangup is signaled.
- */
-static void mxser_hangup(struct tty_struct *tty)
-{
-        struct mxser_port *info = tty->driver_data;
-
-        mxser_flush_buffer(tty);
-        tty_port_hangup(&info->port);
-}
-
-/*
- * mxser_rs_break() --- routine which turns the break handling on or off
- */
-static int mxser_rs_break(struct tty_struct *tty, int break_state)
-{
-        struct mxser_port *info = tty->driver_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->slock, flags);
-        if (break_state == -1)
-                outb(inb(info->ioaddr + UART_LCR) | UART_LCR_SBC,
-                        info->ioaddr + UART_LCR);
-        else
-                outb(inb(info->ioaddr + UART_LCR) & ~UART_LCR_SBC,
-                        info->ioaddr + UART_LCR);
-        spin_unlock_irqrestore(&info->slock, flags);
-        return 0;
-}
-
-static void mxser_receive_chars(struct tty_struct *tty,
-                                struct mxser_port *port, int *status)
-{
-        unsigned char ch, gdl;
-        int ignored = 0;
-        int cnt = 0;
-        int recv_room;
-        int max = 256;
-
-        recv_room = tty->receive_room;
-        if (recv_room == 0 && !port->ldisc_stop_rx)
-                mxser_stoprx(tty);
-        if (port->board->chip_flag != MOXA_OTHER_UART) {
-
-                if (*status & UART_LSR_SPECIAL)
-                        goto intr_old;
-                if (port->board->chip_flag == MOXA_MUST_MU860_HWID &&
-                                (*status & MOXA_MUST_LSR_RERR))
-                        goto intr_old;
-                if (*status & MOXA_MUST_LSR_RERR)
-                        goto intr_old;
-
-                gdl = inb(port->ioaddr + MOXA_MUST_GDL_REGISTER);
-
-                if (port->board->chip_flag == MOXA_MUST_MU150_HWID)
-                        gdl &= MOXA_MUST_GDL_MASK;
-                if (gdl >= recv_room) {
-                        if (!port->ldisc_stop_rx)
-                                mxser_stoprx(tty);
-                }
-                while (gdl--) {
-                        ch = inb(port->ioaddr + UART_RX);
-                        tty_insert_flip_char(tty, ch, 0);
-                        cnt++;
-                }
-                goto end_intr;
-        }
-intr_old:
-
-        do {
-                if (max-- < 0)
-                        break;
-
-                ch = inb(port->ioaddr + UART_RX);
-                if (port->board->chip_flag && (*status & UART_LSR_OE))
-                        outb(0x23, port->ioaddr + UART_FCR);
-                *status &= port->read_status_mask;
-                if (*status & port->ignore_status_mask) {
-                        if (++ignored > 100)
-                                break;
-                } else {
-                        char flag = 0;
-                        if (*status & UART_LSR_SPECIAL) {
-                                if (*status & UART_LSR_BI) {
-                                        flag = TTY_BREAK;
-                                        port->icount.brk++;
-
-                                        if (port->port.flags & ASYNC_SAK)
-                                                do_SAK(tty);
-                                } else if (*status & UART_LSR_PE) {
-                                        flag = TTY_PARITY;
-                                        port->icount.parity++;
-                                } else if (*status & UART_LSR_FE) {
-                                        flag = TTY_FRAME;
-                                        port->icount.frame++;
-                                } else if (*status & UART_LSR_OE) {
-                                        flag = TTY_OVERRUN;
-                                        port->icount.overrun++;
-                                } else
-                                        flag = TTY_BREAK;
-                        }
-                        tty_insert_flip_char(tty, ch, flag);
-                        cnt++;
-                        if (cnt >= recv_room) {
-                                if (!port->ldisc_stop_rx)
-                                        mxser_stoprx(tty);
-                                break;
-                        }
-
-                }
-
-                if (port->board->chip_flag)
-                        break;
-
-                *status = inb(port->ioaddr + UART_LSR);
-        } while (*status & UART_LSR_DR);
-
-end_intr:
-        mxvar_log.rxcnt[tty->index] += cnt;
-        port->mon_data.rxcnt += cnt;
-        port->mon_data.up_rxcnt += cnt;
-
-        /*
-         * We are called from an interrupt context with &port->slock
-         * being held. Drop it temporarily in order to prevent
-         * recursive locking.
-         */
-        spin_unlock(&port->slock);
-        tty_flip_buffer_push(tty);
-        spin_lock(&port->slock);
-}
-
-static void mxser_transmit_chars(struct tty_struct *tty, struct mxser_port *port)
-{
-        int count, cnt;
-
-        if (port->x_char) {
-                outb(port->x_char, port->ioaddr + UART_TX);
-                port->x_char = 0;
-                mxvar_log.txcnt[tty->index]++;
-                port->mon_data.txcnt++;
-                port->mon_data.up_txcnt++;
-                port->icount.tx++;
-                return;
-        }
-
-        if (port->port.xmit_buf == NULL)
-                return;
-
-        if (port->xmit_cnt <= 0 || tty->stopped ||
-                        (tty->hw_stopped &&
-                        (port->type != PORT_16550A) &&
-                        (!port->board->chip_flag))) {
-                port->IER &= ~UART_IER_THRI;
-                outb(port->IER, port->ioaddr + UART_IER);
-                return;
-        }
-
-        cnt = port->xmit_cnt;
-        count = port->xmit_fifo_size;
-        do {
-                outb(port->port.xmit_buf[port->xmit_tail++],
-                        port->ioaddr + UART_TX);
-                port->xmit_tail = port->xmit_tail & (SERIAL_XMIT_SIZE - 1);
-                if (--port->xmit_cnt <= 0)
-                        break;
-        } while (--count > 0);
-        mxvar_log.txcnt[tty->index] += (cnt - port->xmit_cnt);
-
-        port->mon_data.txcnt += (cnt - port->xmit_cnt);
-        port->mon_data.up_txcnt += (cnt - port->xmit_cnt);
-        port->icount.tx += (cnt - port->xmit_cnt);
-
-        if (port->xmit_cnt < WAKEUP_CHARS)
-                tty_wakeup(tty);
-
-        if (port->xmit_cnt <= 0) {
-                port->IER &= ~UART_IER_THRI;
-                outb(port->IER, port->ioaddr + UART_IER);
-        }
-}
-
-/*
- * This is the serial driver's generic interrupt routine
- */
-static irqreturn_t mxser_interrupt(int irq, void *dev_id)
-{
-        int status, iir, i;
-        struct mxser_board *brd = NULL;
-        struct mxser_port *port;
-        int max, irqbits, bits, msr;
-        unsigned int int_cnt, pass_counter = 0;
-        int handled = IRQ_NONE;
-        struct tty_struct *tty;
-
-        for (i = 0; i < MXSER_BOARDS; i++)
-                if (dev_id == &mxser_boards[i]) {
-                        brd = dev_id;
-                        break;
-                }
-
-        if (i == MXSER_BOARDS)
-                goto irq_stop;
-        if (brd == NULL)
-                goto irq_stop;
-        max = brd->info->nports;
-        while (pass_counter++ < MXSER_ISR_PASS_LIMIT) {
-                irqbits = inb(brd->vector) & brd->vector_mask;
-                if (irqbits == brd->vector_mask)
-                        break;
-
-                handled = IRQ_HANDLED;
-                for (i = 0, bits = 1; i < max; i++, irqbits |= bits, bits <<= 1) {
-                        if (irqbits == brd->vector_mask)
-                                break;
-                        if (bits & irqbits)
-                                continue;
-                        port = &brd->ports[i];
-
-                        int_cnt = 0;
-                        spin_lock(&port->slock);
-                        do {
-                                iir = inb(port->ioaddr + UART_IIR);
-                                if (iir & UART_IIR_NO_INT)
-                                        break;
-                                iir &= MOXA_MUST_IIR_MASK;
-                                tty = tty_port_tty_get(&port->port);
-                                if (!tty ||
-                                                (port->port.flags & ASYNC_CLOSING) ||
-                                                !(port->port.flags &
-                                                        ASYNC_INITIALIZED)) {
-                                        status = inb(port->ioaddr + UART_LSR);
-                                        outb(0x27, port->ioaddr + UART_FCR);
-                                        inb(port->ioaddr + UART_MSR);
-                                        tty_kref_put(tty);
-                                        break;
-                                }
-
-                                status = inb(port->ioaddr + UART_LSR);
-
-                                if (status & UART_LSR_PE)
-                                        port->err_shadow |= NPPI_NOTIFY_PARITY;
-                                if (status & UART_LSR_FE)
-                                        port->err_shadow |= NPPI_NOTIFY_FRAMING;
-                                if (status & UART_LSR_OE)
-                                        port->err_shadow |=
-                                                NPPI_NOTIFY_HW_OVERRUN;
-                                if (status & UART_LSR_BI)
-                                        port->err_shadow |= NPPI_NOTIFY_BREAK;
-
-                                if (port->board->chip_flag) {
-                                        if (iir == MOXA_MUST_IIR_GDA ||
-                                            iir == MOXA_MUST_IIR_RDA ||
-                                            iir == MOXA_MUST_IIR_RTO ||
-                                            iir == MOXA_MUST_IIR_LSR)
-                                                mxser_receive_chars(tty, port,
-                                                                &status);
-
-                                } else {
-                                        status &= port->read_status_mask;
-                                        if (status & UART_LSR_DR)
-                                                mxser_receive_chars(tty, port,
-                                                                &status);
-                                }
-                                msr = inb(port->ioaddr + UART_MSR);
-                                if (msr & UART_MSR_ANY_DELTA)
-                                        mxser_check_modem_status(tty, port, msr);
-
-                                if (port->board->chip_flag) {
-                                        if (iir == 0x02 && (status &
-                                                                UART_LSR_THRE))
-                                                mxser_transmit_chars(tty, port);
-                                } else {
-                                        if (status & UART_LSR_THRE)
-                                                mxser_transmit_chars(tty, port);
-                                }
-                                tty_kref_put(tty);
-                        } while (int_cnt++ < MXSER_ISR_PASS_LIMIT);
-                        spin_unlock(&port->slock);
-                }
-        }
-
-irq_stop:
-        return handled;
-}
-
-static const struct tty_operations mxser_ops = {
-        .open = mxser_open,
-        .close = mxser_close,
-        .write = mxser_write,
-        .put_char = mxser_put_char,
-        .flush_chars = mxser_flush_chars,
-        .write_room = mxser_write_room,
-        .chars_in_buffer = mxser_chars_in_buffer,
-        .flush_buffer = mxser_flush_buffer,
-        .ioctl = mxser_ioctl,
-        .throttle = mxser_throttle,
-        .unthrottle = mxser_unthrottle,
-        .set_termios = mxser_set_termios,
-        .stop = mxser_stop,
-        .start = mxser_start,
-        .hangup = mxser_hangup,
-        .break_ctl = mxser_rs_break,
-        .wait_until_sent = mxser_wait_until_sent,
-        .tiocmget = mxser_tiocmget,
-        .tiocmset = mxser_tiocmset,
-};
-
-struct tty_port_operations mxser_port_ops = {
-        .carrier_raised = mxser_carrier_raised,
-        .dtr_rts = mxser_dtr_rts,
-        .activate = mxser_activate,
-        .shutdown = mxser_shutdown_port,
-};
-
-/*
- * The MOXA Smartio/Industio serial driver boot-time initialization code!
- */
-
-static void mxser_release_res(struct mxser_board *brd, struct pci_dev *pdev,
-                unsigned int irq)
-{
-        if (irq)
-                free_irq(brd->irq, brd);
-        if (pdev != NULL) {     /* PCI */
-#ifdef CONFIG_PCI
-                pci_release_region(pdev, 2);
-                pci_release_region(pdev, 3);
-#endif
-        } else {
-                release_region(brd->ports[0].ioaddr, 8 * brd->info->nports);
-                release_region(brd->vector, 1);
-        }
-}
-
-static int __devinit mxser_initbrd(struct mxser_board *brd,
-                struct pci_dev *pdev)
-{
-        struct mxser_port *info;
-        unsigned int i;
-        int retval;
-
-        printk(KERN_INFO "mxser: max. baud rate = %d bps\n",
-                        brd->ports[0].max_baud);
-
-        for (i = 0; i < brd->info->nports; i++) {
-                info = &brd->ports[i];
-                tty_port_init(&info->port);
-                info->port.ops = &mxser_port_ops;
-                info->board = brd;
-                info->stop_rx = 0;
-                info->ldisc_stop_rx = 0;
-
-                /* Enhance mode enabled here */
-                if (brd->chip_flag != MOXA_OTHER_UART)
-                        mxser_enable_must_enchance_mode(info->ioaddr);
-
-                info->port.flags = ASYNC_SHARE_IRQ;
-                info->type = brd->uart_type;
-
-                process_txrx_fifo(info);
-
-                info->custom_divisor = info->baud_base * 16;
-                info->port.close_delay = 5 * HZ / 10;
-                info->port.closing_wait = 30 * HZ;
-                info->normal_termios = mxvar_sdriver->init_termios;
-                memset(&info->mon_data, 0, sizeof(struct mxser_mon));
-                info->err_shadow = 0;
-                spin_lock_init(&info->slock);
-
-                /* before set INT ISR, disable all int */
-                outb(inb(info->ioaddr + UART_IER) & 0xf0,
-                        info->ioaddr + UART_IER);
-        }
-
-        retval = request_irq(brd->irq, mxser_interrupt, IRQF_SHARED, "mxser",
-                        brd);
-        if (retval) {
-                printk(KERN_ERR "Board %s: Request irq failed, IRQ (%d) may "
-                        "conflict with another device.\n",
-                        brd->info->name, brd->irq);
-                /* We hold resources, we need to release them. */
-                mxser_release_res(brd, pdev, 0);
-        }
-        return retval;
-}
-
-static int __init mxser_get_ISA_conf(int cap, struct mxser_board *brd)
-{
-        int id, i, bits;
-        unsigned short regs[16], irq;
-        unsigned char scratch, scratch2;
-
-        brd->chip_flag = MOXA_OTHER_UART;
-
-        id = mxser_read_register(cap, regs);
-        switch (id) {
-        case C168_ASIC_ID:
-                brd->info = &mxser_cards[0];
-                break;
-        case C104_ASIC_ID:
-                brd->info = &mxser_cards[1];
-                break;
-        case CI104J_ASIC_ID:
-                brd->info = &mxser_cards[2];
-                break;
-        case C102_ASIC_ID:
-                brd->info = &mxser_cards[5];
-                break;
-        case CI132_ASIC_ID:
-                brd->info = &mxser_cards[6];
-                break;
-        case CI134_ASIC_ID:
-                brd->info = &mxser_cards[7];
-                break;
-        default:
-                return 0;
-        }
-
-        irq = 0;
-        /* some ISA cards have 2 ports, but we want to see them as 4-port (why?)
-           Flag-hack checks if configuration should be read as 2-port here. */
-        if (brd->info->nports == 2 || (brd->info->flags & MXSER_HAS2)) {
-                irq = regs[9] & 0xF000;
-                irq = irq | (irq >> 4);
-                if (irq != (regs[9] & 0xFF00))
-                        goto err_irqconflict;
-        } else if (brd->info->nports == 4) {
-                irq = regs[9] & 0xF000;
-                irq = irq | (irq >> 4);
-                irq = irq | (irq >> 8);
-                if (irq != regs[9])
-                        goto err_irqconflict;
-        } else if (brd->info->nports == 8) {
-                irq = regs[9] & 0xF000;
-                irq = irq | (irq >> 4);
-                irq = irq | (irq >> 8);
-                if ((irq != regs[9]) || (irq != regs[10]))
-                        goto err_irqconflict;
-        }
-
-        if (!irq) {
-                printk(KERN_ERR "mxser: interrupt number unset\n");
-                return -EIO;
-        }
-        brd->irq = ((int)(irq & 0xF000) >> 12);
-        for (i = 0; i < 8; i++)
-                brd->ports[i].ioaddr = (int) regs[i + 1] & 0xFFF8;
-        if ((regs[12] & 0x80) == 0) {
-                printk(KERN_ERR "mxser: invalid interrupt vector\n");
-                return -EIO;
-        }
-        brd->vector = (int)regs[11];    /* interrupt vector */
-        if (id == 1)
-                brd->vector_mask = 0x00FF;
-        else
-                brd->vector_mask = 0x000F;
-        for (i = 7, bits = 0x0100; i >= 0; i--, bits <<= 1) {
-                if (regs[12] & bits) {
-                        brd->ports[i].baud_base = 921600;
-                        brd->ports[i].max_baud = 921600;
-                } else {
-                        brd->ports[i].baud_base = 115200;
-                        brd->ports[i].max_baud = 115200;
-                }
-        }
-        scratch2 = inb(cap + UART_LCR) & (~UART_LCR_DLAB);
-        outb(scratch2 | UART_LCR_DLAB, cap + UART_LCR);
-        outb(0, cap + UART_EFR);        /* EFR is the same as FCR */
-        outb(scratch2, cap + UART_LCR);
-        outb(UART_FCR_ENABLE_FIFO, cap + UART_FCR);
-        scratch = inb(cap + UART_IIR);
-
-        if (scratch & 0xC0)
-                brd->uart_type = PORT_16550A;
-        else
-                brd->uart_type = PORT_16450;
-        if (!request_region(brd->ports[0].ioaddr, 8 * brd->info->nports,
-                        "mxser(IO)")) {
-                printk(KERN_ERR "mxser: can't request ports I/O region: "
-                                "0x%.8lx-0x%.8lx\n",
-                                brd->ports[0].ioaddr, brd->ports[0].ioaddr +
-                                8 * brd->info->nports - 1);
-                return -EIO;
-        }
-        if (!request_region(brd->vector, 1, "mxser(vector)")) {
-                release_region(brd->ports[0].ioaddr, 8 * brd->info->nports);
-                printk(KERN_ERR "mxser: can't request interrupt vector region: "
-                                "0x%.8lx-0x%.8lx\n",
-                                brd->ports[0].ioaddr, brd->ports[0].ioaddr +
-                                8 * brd->info->nports - 1);
-                return -EIO;
-        }
-        return brd->info->nports;
-
-err_irqconflict:
-        printk(KERN_ERR "mxser: invalid interrupt number\n");
-        return -EIO;
-}
-
-static int __devinit mxser_probe(struct pci_dev *pdev,
-                const struct pci_device_id *ent)
-{
-#ifdef CONFIG_PCI
-        struct mxser_board *brd;
-        unsigned int i, j;
-        unsigned long ioaddress;
-        int retval = -EINVAL;
-
-        for (i = 0; i < MXSER_BOARDS; i++)
-                if (mxser_boards[i].info == NULL)
-                        break;
-
-        if (i >= MXSER_BOARDS) {
-                dev_err(&pdev->dev, "too many boards found (maximum %d), board "
-                                "not configured\n", MXSER_BOARDS);
-                goto err;
-        }
-
-        brd = &mxser_boards[i];
-        brd->idx = i * MXSER_PORTS_PER_BOARD;
-        dev_info(&pdev->dev, "found MOXA %s board (BusNo=%d, DevNo=%d)\n",
-                mxser_cards[ent->driver_data].name,
-                pdev->bus->number, PCI_SLOT(pdev->devfn));
-
-        retval = pci_enable_device(pdev);
-        if (retval) {
-                dev_err(&pdev->dev, "PCI enable failed\n");
-                goto err;
-        }
-
-        /* io address */
-        ioaddress = pci_resource_start(pdev, 2);
-        retval = pci_request_region(pdev, 2, "mxser(IO)");
-        if (retval)
-                goto err;
-
-        brd->info = &mxser_cards[ent->driver_data];
-        for (i = 0; i < brd->info->nports; i++)
-                brd->ports[i].ioaddr = ioaddress + 8 * i;
-
-        /* vector */
-        ioaddress = pci_resource_start(pdev, 3);
-        retval = pci_request_region(pdev, 3, "mxser(vector)");
-        if (retval)
-                goto err_relio;
-        brd->vector = ioaddress;
-
-        /* irq */
-        brd->irq = pdev->irq;
-
-        brd->chip_flag = CheckIsMoxaMust(brd->ports[0].ioaddr);
-        brd->uart_type = PORT_16550A;
-        brd->vector_mask = 0;
-
-        for (i = 0; i < brd->info->nports; i++) {
-                for (j = 0; j < UART_INFO_NUM; j++) {
-                        if (Gpci_uart_info[j].type == brd->chip_flag) {
-                                brd->ports[i].max_baud =
-                                        Gpci_uart_info[j].max_baud;
-
-                                /* exception....CP-102 */
-                                if (brd->info->flags & MXSER_HIGHBAUD)
-                                        brd->ports[i].max_baud = 921600;
-                                break;
-                        }
-                }
-        }
-
-        if (brd->chip_flag == MOXA_MUST_MU860_HWID) {
-                for (i = 0; i < brd->info->nports; i++) {
-                        if (i < 4)
-                                brd->ports[i].opmode_ioaddr = ioaddress + 4;
-                        else
-                                brd->ports[i].opmode_ioaddr = ioaddress + 0x0c;
-                }
-                outb(0, ioaddress + 4); /* default set to RS232 mode */
-                outb(0, ioaddress + 0x0c);      /* default set to RS232 mode */
-        }
-
-        for (i = 0; i < brd->info->nports; i++) {
-                brd->vector_mask |= (1 << i);
-                brd->ports[i].baud_base = 921600;
-        }
-
-        /* mxser_initbrd will hook ISR. */
-        retval = mxser_initbrd(brd, pdev);
-        if (retval)
-                goto err_null;
-
-        for (i = 0; i < brd->info->nports; i++)
-                tty_register_device(mxvar_sdriver, brd->idx + i, &pdev->dev);
-
-        pci_set_drvdata(pdev, brd);
-
-        return 0;
-err_relio:
-        pci_release_region(pdev, 2);
-err_null:
-        brd->info = NULL;
-err:
-        return retval;
-#else
-        return -ENODEV;
-#endif
-}
-
-static void __devexit mxser_remove(struct pci_dev *pdev)
-{
-        struct mxser_board *brd = pci_get_drvdata(pdev);
-        unsigned int i;
-
-        for (i = 0; i < brd->info->nports; i++)
-                tty_unregister_device(mxvar_sdriver, brd->idx + i);
-
-        mxser_release_res(brd, pdev, 1);
-        brd->info = NULL;
-}
-
-static struct pci_driver mxser_driver = {
-        .name = "mxser",
-        .id_table = mxser_pcibrds,
-        .probe = mxser_probe,
-        .remove = __devexit_p(mxser_remove)
-};
-
-static int __init mxser_module_init(void)
-{
-        struct mxser_board *brd;
-        unsigned int b, i, m;
-        int retval;
-
-        mxvar_sdriver = alloc_tty_driver(MXSER_PORTS + 1);
-        if (!mxvar_sdriver)
-                return -ENOMEM;
-
-        printk(KERN_INFO "MOXA Smartio/Industio family driver version %s\n",
-                MXSER_VERSION);
-
-        /* Initialize the tty_driver structure */
-        mxvar_sdriver->owner = THIS_MODULE;
-        mxvar_sdriver->magic = TTY_DRIVER_MAGIC;
-        mxvar_sdriver->name = "ttyMI";
-        mxvar_sdriver->major = ttymajor;
-        mxvar_sdriver->minor_start = 0;
-        mxvar_sdriver->num = MXSER_PORTS + 1;
-        mxvar_sdriver->type = TTY_DRIVER_TYPE_SERIAL;
-        mxvar_sdriver->subtype = SERIAL_TYPE_NORMAL;
-        mxvar_sdriver->init_termios = tty_std_termios;
-        mxvar_sdriver->init_termios.c_cflag = B9600|CS8|CREAD|HUPCL|CLOCAL;
-        mxvar_sdriver->flags = TTY_DRIVER_REAL_RAW|TTY_DRIVER_DYNAMIC_DEV;
-        tty_set_operations(mxvar_sdriver, &mxser_ops);
-
-        retval = tty_register_driver(mxvar_sdriver);
-        if (retval) {
-                printk(KERN_ERR "Couldn't install MOXA Smartio/Industio family "
-                                "tty driver !\n");
-                goto err_put;
-        }
-
-        /* Start finding ISA boards here */
-        for (m = 0, b = 0; b < MXSER_BOARDS; b++) {
-                if (!ioaddr[b])
-                        continue;
-
-                brd = &mxser_boards[m];
-                retval = mxser_get_ISA_conf(ioaddr[b], brd);
-                if (retval <= 0) {
-                        brd->info = NULL;
-                        continue;
-                }
-
-                printk(KERN_INFO "mxser: found MOXA %s board (CAP=0x%lx)\n",
-                                brd->info->name, ioaddr[b]);
-
-                /* mxser_initbrd will hook ISR. */
-                if (mxser_initbrd(brd, NULL) < 0) {
-                        brd->info = NULL;
-                        continue;
-                }
-
-                brd->idx = m * MXSER_PORTS_PER_BOARD;
-                for (i = 0; i < brd->info->nports; i++)
-                        tty_register_device(mxvar_sdriver, brd->idx + i, NULL);
-
-                m++;
-        }
-
-        retval = pci_register_driver(&mxser_driver);
-        if (retval) {
-                printk(KERN_ERR "mxser: can't register pci driver\n");
-                if (!m) {
-                        retval = -ENODEV;
-                        goto err_unr;
-                } /* else: we have some ISA cards under control */
-        }
-
-        return 0;
-err_unr:
-        tty_unregister_driver(mxvar_sdriver);
-err_put:
-        put_tty_driver(mxvar_sdriver);
-        return retval;
-}
-
-static void __exit mxser_module_exit(void)
-{
-        unsigned int i, j;
-
-        pci_unregister_driver(&mxser_driver);
-
-        for (i = 0; i < MXSER_BOARDS; i++) /* ISA remains */
-                if (mxser_boards[i].info != NULL)
-                        for (j = 0; j < mxser_boards[i].info->nports; j++)
-                                tty_unregister_device(mxvar_sdriver,
-                                                mxser_boards[i].idx + j);
-        tty_unregister_driver(mxvar_sdriver);
-        put_tty_driver(mxvar_sdriver);
-
-        for (i = 0; i < MXSER_BOARDS; i++)
-                if (mxser_boards[i].info != NULL)
-                        mxser_release_res(&mxser_boards[i], NULL, 1);
-}
-
-module_init(mxser_module_init);
-module_exit(mxser_module_exit);
diff --git a/drivers/char/mxser.h b/drivers/char/mxser.h
deleted file mode 100644
index 41878a69203d..000000000000
--- a/drivers/char/mxser.h
+++ /dev/null
@@ -1,150 +0,0 @@
-#ifndef _MXSER_H
-#define _MXSER_H
-
-/*
- *      Semi-public control interfaces
- */
-
-/*
- *      MOXA ioctls
- */
-
-#define MOXA                    0x400
-#define MOXA_GETDATACOUNT       (MOXA + 23)
-#define MOXA_DIAGNOSE           (MOXA + 50)
-#define MOXA_CHKPORTENABLE      (MOXA + 60)
-#define MOXA_HighSpeedOn        (MOXA + 61)
-#define MOXA_GET_MAJOR          (MOXA + 63)
-#define MOXA_GETMSTATUS         (MOXA + 65)
-#define MOXA_SET_OP_MODE        (MOXA + 66)
-#define MOXA_GET_OP_MODE        (MOXA + 67)
-
-#define RS232_MODE              0
-#define RS485_2WIRE_MODE        1
-#define RS422_MODE              2
-#define RS485_4WIRE_MODE        3
-#define OP_MODE_MASK            3
-
-#define MOXA_SDS_RSTICOUNTER    (MOXA + 69)
-#define MOXA_ASPP_OQUEUE        (MOXA + 70)
-#define MOXA_ASPP_MON           (MOXA + 73)
-#define MOXA_ASPP_LSTATUS       (MOXA + 74)
-#define MOXA_ASPP_MON_EXT       (MOXA + 75)
-#define MOXA_SET_BAUD_METHOD    (MOXA + 76)
-
-/* --------------------------------------------------- */
-
-#define NPPI_NOTIFY_PARITY      0x01
-#define NPPI_NOTIFY_FRAMING     0x02
-#define NPPI_NOTIFY_HW_OVERRUN  0x04
-#define NPPI_NOTIFY_SW_OVERRUN  0x08
-#define NPPI_NOTIFY_BREAK       0x10
-
-#define NPPI_NOTIFY_CTSHOLD         0x01        /* Tx hold by CTS low */
-#define NPPI_NOTIFY_DSRHOLD         0x02        /* Tx hold by DSR low */
-#define NPPI_NOTIFY_XOFFHOLD        0x08        /* Tx hold by Xoff received */
-#define NPPI_NOTIFY_XOFFXENT        0x10        /* Xoff Sent */
-
-/* follow just for Moxa Must chip define. */
-/* */
-/* when LCR register (offset 0x03) write following value, */
-/* the Must chip will enter enchance mode. And write value */
-/* on EFR (offset 0x02) bit 6,7 to change bank. */
-#define MOXA_MUST_ENTER_ENCHANCE        0xBF
-
-/* when enhance mode enable, access on general bank register */
-#define MOXA_MUST_GDL_REGISTER          0x07
-#define MOXA_MUST_GDL_MASK              0x7F
-#define MOXA_MUST_GDL_HAS_BAD_DATA      0x80
-
-#define MOXA_MUST_LSR_RERR              0x80    /* error in receive FIFO */
-/* enchance register bank select and enchance mode setting register */
-/* when LCR register equal to 0xBF */
-#define MOXA_MUST_EFR_REGISTER          0x02
-/* enchance mode enable */
-#define MOXA_MUST_EFR_EFRB_ENABLE       0x10
-/* enchance reister bank set 0, 1, 2 */
-#define MOXA_MUST_EFR_BANK0             0x00
-#define MOXA_MUST_EFR_BANK1             0x40
-#define MOXA_MUST_EFR_BANK2             0x80
-#define MOXA_MUST_EFR_BANK3             0xC0
-#define MOXA_MUST_EFR_BANK_MASK         0xC0
-
-/* set XON1 value register, when LCR=0xBF and change to bank0 */
-#define MOXA_MUST_XON1_REGISTER         0x04
-
-/* set XON2 value register, when LCR=0xBF and change to bank0 */
-#define MOXA_MUST_XON2_REGISTER         0x05
-
-/* set XOFF1 value register, when LCR=0xBF and change to bank0 */
-#define MOXA_MUST_XOFF1_REGISTER        0x06
-
-/* set XOFF2 value register, when LCR=0xBF and change to bank0 */
-#define MOXA_MUST_XOFF2_REGISTER        0x07
-
-#define MOXA_MUST_RBRTL_REGISTER        0x04
-#define MOXA_MUST_RBRTH_REGISTER        0x05
-#define MOXA_MUST_RBRTI_REGISTER        0x06
-#define MOXA_MUST_THRTL_REGISTER        0x07
-#define MOXA_MUST_ENUM_REGISTER         0x04
-#define MOXA_MUST_HWID_REGISTER         0x05
-#define MOXA_MUST_ECR_REGISTER          0x06
-#define MOXA_MUST_CSR_REGISTER          0x07
-
-/* good data mode enable */
-#define MOXA_MUST_FCR_GDA_MODE_ENABLE   0x20
-/* only good data put into RxFIFO */
-#define MOXA_MUST_FCR_GDA_ONLY_ENABLE   0x10
-
-/* enable CTS interrupt */
-#define MOXA_MUST_IER_ECTSI             0x80
-/* enable RTS interrupt */
-#define MOXA_MUST_IER_ERTSI             0x40
-/* enable Xon/Xoff interrupt */
-#define MOXA_MUST_IER_XINT              0x20
-/* enable GDA interrupt */
-#define MOXA_MUST_IER_EGDAI             0x10
-
-#define MOXA_MUST_RECV_ISR              (UART_IER_RDI | MOXA_MUST_IER_EGDAI)
-
-/* GDA interrupt pending */
-#define MOXA_MUST_IIR_GDA               0x1C
-#define MOXA_MUST_IIR_RDA               0x04
-#define MOXA_MUST_IIR_RTO               0x0C
-#define MOXA_MUST_IIR_LSR               0x06
-
-/* recieved Xon/Xoff or specical interrupt pending */
-#define MOXA_MUST_IIR_XSC               0x10
-
-/* RTS/CTS change state interrupt pending */
-#define MOXA_MUST_IIR_RTSCTS            0x20
-#define MOXA_MUST_IIR_MASK              0x3E
-
-#define MOXA_MUST_MCR_XON_FLAG          0x40
-#define MOXA_MUST_MCR_XON_ANY           0x80
-#define MOXA_MUST_MCR_TX_XON            0x08
-
-/* software flow control on chip mask value */
-#define MOXA_MUST_EFR_SF_MASK           0x0F
-/* send Xon1/Xoff1 */
-#define MOXA_MUST_EFR_SF_TX1            0x08
-/* send Xon2/Xoff2 */
-#define MOXA_MUST_EFR_SF_TX2            0x04
-/* send Xon1,Xon2/Xoff1,Xoff2 */
-#define MOXA_MUST_EFR_SF_TX12           0x0C
-/* don't send Xon/Xoff */
-#define MOXA_MUST_EFR_SF_TX_NO          0x00
-/* Tx software flow control mask */
-#define MOXA_MUST_EFR_SF_TX_MASK        0x0C
-/* don't receive Xon/Xoff */
-#define MOXA_MUST_EFR_SF_RX_NO          0x00
-/* receive Xon1/Xoff1 */
-#define MOXA_MUST_EFR_SF_RX1            0x02
-/* receive Xon2/Xoff2 */
-#define MOXA_MUST_EFR_SF_RX2            0x01
-/* receive Xon1,Xon2/Xoff1,Xoff2 */
-#define MOXA_MUST_EFR_SF_RX12           0x03
-/* Rx software flow control mask */
-#define MOXA_MUST_EFR_SF_RX_MASK        0x03
-
-#endif
diff --git a/drivers/char/n_gsm.c b/drivers/char/n_gsm.c
deleted file mode 100644
index 04ef3ef0a422..000000000000
--- a/drivers/char/n_gsm.c
+++ /dev/null
@@ -1,2763 +0,0 @@
-/*
- * n_gsm.c GSM 0710 tty multiplexor
- * Copyright (c) 2009/10 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *      * THIS IS A DEVELOPMENT SNAPSHOT IT IS NOT A FINAL RELEASE *
- *
- * TO DO:
- *      Mostly done:    ioctls for setting modes/timing
- *      Partly done:    hooks so you can pull off frames to non tty devs
- *      Restart DLCI 0 when it closes ?
- *      Test basic encoding
- *      Improve the tx engine
- *      Resolve tx side locking by adding a queue_head and routing
- *              all control traffic via it
- *      General tidy/document
- *      Review the locking/move to refcounts more (mux now moved to an
- *              alloc/free model ready)
- *      Use newest tty open/close port helpers and install hooks
- *      What to do about power functions ?
- *      Termios setting and negotiation
- *      Do we need a 'which mux are you' ioctl to correlate mux and tty sets
- *
- */
-
-#include <linux/types.h>
-#include <linux/major.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/fcntl.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/ctype.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/bitops.h>
-#include <linux/file.h>
-#include <linux/uaccess.h>
-#include <linux/module.h>
-#include <linux/timer.h>
-#include <linux/tty_flip.h>
-#include <linux/tty_driver.h>
-#include <linux/serial.h>
-#include <linux/kfifo.h>
-#include <linux/skbuff.h>
-#include <linux/gsmmux.h>
-
-static int debug;
-module_param(debug, int, 0600);
-
-#define T1      (HZ/10)
-#define T2      (HZ/3)
-#define N2      3
-
-/* Use long timers for testing at low speed with debug on */
-#ifdef DEBUG_TIMING
-#define T1      HZ
-#define T2      (2 * HZ)
-#endif
-
-/* Semi-arbitary buffer size limits. 0710 is normally run with 32-64 byte
-   limits so this is plenty */
-#define MAX_MRU 512
-#define MAX_MTU 512
-
-/*
- *      Each block of data we have queued to go out is in the form of
- *      a gsm_msg which holds everything we need in a link layer independant
- *      format
- */
-
-struct gsm_msg {
-        struct gsm_msg *next;
-        u8 addr;                /* DLCI address + flags */
-        u8 ctrl;                /* Control byte + flags */
-        unsigned int len;       /* Length of data block (can be zero) */
-        unsigned char *data;    /* Points into buffer but not at the start */
-        unsigned char buffer[0];
-};
-
-/*
- *      Each active data link has a gsm_dlci structure associated which ties
- *      the link layer to an optional tty (if the tty side is open). To avoid
- *      complexity right now these are only ever freed up when the mux is
- *      shut down.
- *
- *      At the moment we don't free DLCI objects until the mux is torn down
- *      this avoid object life time issues but might be worth review later.
- */
-
-struct gsm_dlci {
-        struct gsm_mux *gsm;
-        int addr;
-        int state;
-#define DLCI_CLOSED             0
-#define DLCI_OPENING            1       /* Sending SABM not seen UA */
-#define DLCI_OPEN               2       /* SABM/UA complete */
-#define DLCI_CLOSING            3       /* Sending DISC not seen UA/DM */
-
-        /* Link layer */
-        spinlock_t lock;        /* Protects the internal state */
-        struct timer_list t1;   /* Retransmit timer for SABM and UA */
-        int retries;
-        /* Uplink tty if active */
-        struct tty_port port;   /* The tty bound to this DLCI if there is one */
-        struct kfifo *fifo;     /* Queue fifo for the DLCI */
-        struct kfifo _fifo;     /* For new fifo API porting only */
-        int adaption;           /* Adaption layer in use */
-        u32 modem_rx;           /* Our incoming virtual modem lines */
-        u32 modem_tx;           /* Our outgoing modem lines */
-        int dead;               /* Refuse re-open */
-        /* Flow control */
-        int throttled;          /* Private copy of throttle state */
-        int constipated;        /* Throttle status for outgoing */
-        /* Packetised I/O */
-        struct sk_buff *skb;    /* Frame being sent */
-        struct sk_buff_head skb_list;   /* Queued frames */
-        /* Data handling callback */
-        void (*data)(struct gsm_dlci *dlci, u8 *data, int len);
-};
-
-/* DLCI 0, 62/63 are special or reseved see gsmtty_open */
-
-#define NUM_DLCI                64
-
-/*
- *      DLCI 0 is used to pass control blocks out of band of the data
- *      flow (and with a higher link priority). One command can be outstanding
- *      at a time and we use this structure to manage them. They are created
- *      and destroyed by the user context, and updated by the receive paths
- *      and timers
- */
-
-struct gsm_control {
-        u8 cmd;         /* Command we are issuing */
-        u8 *data;       /* Data for the command in case we retransmit */
-        int len;        /* Length of block for retransmission */
-        int done;       /* Done flag */
-        int error;      /* Error if any */
-};
-
-/*
- *      Each GSM mux we have is represented by this structure. If we are
- *      operating as an ldisc then we use this structure as our ldisc
- *      state. We need to sort out lifetimes and locking with respect
- *      to the gsm mux array. For now we don't free DLCI objects that
- *      have been instantiated until the mux itself is terminated.
- *
- *      To consider further: tty open versus mux shutdown.
- */
-
-struct gsm_mux {
-        struct tty_struct *tty;         /* The tty our ldisc is bound to */
-        spinlock_t lock;
-
-        /* Events on the GSM channel */
-        wait_queue_head_t event;
-
-        /* Bits for GSM mode decoding */
-
-        /* Framing Layer */
-        unsigned char *buf;
-        int state;
-#define GSM_SEARCH              0
-#define GSM_START               1
-#define GSM_ADDRESS             2
-#define GSM_CONTROL             3
-#define GSM_LEN                 4
-#define GSM_DATA                5
-#define GSM_FCS                 6
-#define GSM_OVERRUN             7
-        unsigned int len;
-        unsigned int address;
-        unsigned int count;
-        int escape;
-        int encoding;
-        u8 control;
-        u8 fcs;
-        u8 *txframe;                    /* TX framing buffer */
-
-        /* Methods for the receiver side */
-        void (*receive)(struct gsm_mux *gsm, u8 ch);
-        void (*error)(struct gsm_mux *gsm, u8 ch, u8 flag);
-        /* And transmit side */
-        int (*output)(struct gsm_mux *mux, u8 *data, int len);
-
-        /* Link Layer */
-        unsigned int mru;
-        unsigned int mtu;
-        int initiator;                  /* Did we initiate connection */
-        int dead;                       /* Has the mux been shut down */
-        struct gsm_dlci *dlci[NUM_DLCI];
-        int constipated;                /* Asked by remote to shut up */
-
-        spinlock_t tx_lock;
-        unsigned int tx_bytes;          /* TX data outstanding */
-#define TX_THRESH_HI            8192
-#define TX_THRESH_LO            2048
-        struct gsm_msg *tx_head;        /* Pending data packets */
-        struct gsm_msg *tx_tail;
-
-        /* Control messages */
-        struct timer_list t2_timer;     /* Retransmit timer for commands */
-        int cretries;                   /* Command retry counter */
-        struct gsm_control *pending_cmd;/* Our current pending command */
-        spinlock_t control_lock;        /* Protects the pending command */
-
-        /* Configuration */
-        int adaption;           /* 1 or 2 supported */
-        u8 ftype;               /* UI or UIH */
-        int t1, t2;             /* Timers in 1/100th of a sec */
-        int n2;                 /* Retry count */
-
-        /* Statistics (not currently exposed) */
-        unsigned long bad_fcs;
-        unsigned long malformed;
-        unsigned long io_error;
-        unsigned long bad_size;
-        unsigned long unsupported;
-};
-
-
-/*
- *      Mux objects - needed so that we can translate a tty index into the
- *      relevant mux and DLCI.
- */
-
-#define MAX_MUX         4                       /* 256 minors */
-static struct gsm_mux *gsm_mux[MAX_MUX];        /* GSM muxes */
-static spinlock_t gsm_mux_lock;
-
-/*
- *      This section of the driver logic implements the GSM encodings
- *      both the basic and the 'advanced'. Reliable transport is not
- *      supported.
- */
-
-#define CR                      0x02
-#define EA                      0x01
-#define PF                      0x10
-
-/* I is special: the rest are ..*/
-#define RR                      0x01
-#define UI                      0x03
-#define RNR                     0x05
-#define REJ                     0x09
-#define DM                      0x0F
-#define SABM                    0x2F
-#define DISC                    0x43
-#define UA                      0x63
-#define UIH                     0xEF
-
-/* Channel commands */
-#define CMD_NSC                 0x09
-#define CMD_TEST                0x11
-#define CMD_PSC                 0x21
-#define CMD_RLS                 0x29
-#define CMD_FCOFF               0x31
-#define CMD_PN                  0x41
-#define CMD_RPN                 0x49
-#define CMD_FCON                0x51
-#define CMD_CLD                 0x61
-#define CMD_SNC                 0x69
-#define CMD_MSC                 0x71
-
-/* Virtual modem bits */
-#define MDM_FC                  0x01
-#define MDM_RTC                 0x02
-#define MDM_RTR                 0x04
-#define MDM_IC                  0x20
-#define MDM_DV                  0x40
-
-#define GSM0_SOF                0xF9
-#define GSM1_SOF                0x7E
-#define GSM1_ESCAPE             0x7D
-#define GSM1_ESCAPE_BITS        0x20
-#define XON                     0x11
-#define XOFF                    0x13
-
-static const struct tty_port_operations gsm_port_ops;
-
-/*
- *      CRC table for GSM 0710
- */
-
-static const u8 gsm_fcs8[256] = {
-        0x00, 0x91, 0xE3, 0x72, 0x07, 0x96, 0xE4, 0x75,
-        0x0E, 0x9F, 0xED, 0x7C, 0x09, 0x98, 0xEA, 0x7B,
-        0x1C, 0x8D, 0xFF, 0x6E, 0x1B, 0x8A, 0xF8, 0x69,
-        0x12, 0x83, 0xF1, 0x60, 0x15, 0x84, 0xF6, 0x67,
-        0x38, 0xA9, 0xDB, 0x4A, 0x3F, 0xAE, 0xDC, 0x4D,
-        0x36, 0xA7, 0xD5, 0x44, 0x31, 0xA0, 0xD2, 0x43,
-        0x24, 0xB5, 0xC7, 0x56, 0x23, 0xB2, 0xC0, 0x51,
-        0x2A, 0xBB, 0xC9, 0x58, 0x2D, 0xBC, 0xCE, 0x5F,
-        0x70, 0xE1, 0x93, 0x02, 0x77, 0xE6, 0x94, 0x05,
-        0x7E, 0xEF, 0x9D, 0x0C, 0x79, 0xE8, 0x9A, 0x0B,
-        0x6C, 0xFD, 0x8F, 0x1E, 0x6B, 0xFA, 0x88, 0x19,
-        0x62, 0xF3, 0x81, 0x10, 0x65, 0xF4, 0x86, 0x17,
-        0x48, 0xD9, 0xAB, 0x3A, 0x4F, 0xDE, 0xAC, 0x3D,
-        0x46, 0xD7, 0xA5, 0x34, 0x41, 0xD0, 0xA2, 0x33,
-        0x54, 0xC5, 0xB7, 0x26, 0x53, 0xC2, 0xB0, 0x21,
-        0x5A, 0xCB, 0xB9, 0x28, 0x5D, 0xCC, 0xBE, 0x2F,
-        0xE0, 0x71, 0x03, 0x92, 0xE7, 0x76, 0x04, 0x95,
-        0xEE, 0x7F, 0x0D, 0x9C, 0xE9, 0x78, 0x0A, 0x9B,
-        0xFC, 0x6D, 0x1F, 0x8E, 0xFB, 0x6A, 0x18, 0x89,
-        0xF2, 0x63, 0x11, 0x80, 0xF5, 0x64, 0x16, 0x87,
-        0xD8, 0x49, 0x3B, 0xAA, 0xDF, 0x4E, 0x3C, 0xAD,
-        0xD6, 0x47, 0x35, 0xA4, 0xD1, 0x40, 0x32, 0xA3,
-        0xC4, 0x55, 0x27, 0xB6, 0xC3, 0x52, 0x20, 0xB1,
-        0xCA, 0x5B, 0x29, 0xB8, 0xCD, 0x5C, 0x2E, 0xBF,
-        0x90, 0x01, 0x73, 0xE2, 0x97, 0x06, 0x74, 0xE5,
-        0x9E, 0x0F, 0x7D, 0xEC, 0x99, 0x08, 0x7A, 0xEB,
-        0x8C, 0x1D, 0x6F, 0xFE, 0x8B, 0x1A, 0x68, 0xF9,
-        0x82, 0x13, 0x61, 0xF0, 0x85, 0x14, 0x66, 0xF7,
-        0xA8, 0x39, 0x4B, 0xDA, 0xAF, 0x3E, 0x4C, 0xDD,
-        0xA6, 0x37, 0x45, 0xD4, 0xA1, 0x30, 0x42, 0xD3,
-        0xB4, 0x25, 0x57, 0xC6, 0xB3, 0x22, 0x50, 0xC1,
-        0xBA, 0x2B, 0x59, 0xC8, 0xBD, 0x2C, 0x5E, 0xCF
-};
-
-#define INIT_FCS        0xFF
-#define GOOD_FCS        0xCF
-
-/**
- *      gsm_fcs_add     -       update FCS
- *      @fcs: Current FCS
- *      @c: Next data
- *
- *      Update the FCS to include c. Uses the algorithm in the specification
- *      notes.
- */
-
-static inline u8 gsm_fcs_add(u8 fcs, u8 c)
-{
-        return gsm_fcs8[fcs ^ c];
-}
-
-/**
- *      gsm_fcs_add_block       -       update FCS for a block
- *      @fcs: Current FCS
- *      @c: buffer of data
- *      @len: length of buffer
- *
- *      Update the FCS to include c. Uses the algorithm in the specification
- *      notes.
- */
-
-static inline u8 gsm_fcs_add_block(u8 fcs, u8 *c, int len)
-{
-        while (len--)
-                fcs = gsm_fcs8[fcs ^ *c++];
-        return fcs;
-}
-
-/**
- *      gsm_read_ea             -       read a byte into an EA
- *      @val: variable holding value
- *      c: byte going into the EA
- *
- *      Processes one byte of an EA. Updates the passed variable
- *      and returns 1 if the EA is now completely read
- */
-
-static int gsm_read_ea(unsigned int *val, u8 c)
-{
-        /* Add the next 7 bits into the value */
-        *val <<= 7;
-        *val |= c >> 1;
-        /* Was this the last byte of the EA 1 = yes*/
-        return c & EA;
-}
-
-/**
- *      gsm_encode_modem        -       encode modem data bits
- *      @dlci: DLCI to encode from
- *
- *      Returns the correct GSM encoded modem status bits (6 bit field) for
- *      the current status of the DLCI and attached tty object
- */
-
-static u8 gsm_encode_modem(const struct gsm_dlci *dlci)
-{
-        u8 modembits = 0;
-        /* FC is true flow control not modem bits */
-        if (dlci->throttled)
-                modembits |= MDM_FC;
-        if (dlci->modem_tx & TIOCM_DTR)
-                modembits |= MDM_RTC;
-        if (dlci->modem_tx & TIOCM_RTS)
-                modembits |= MDM_RTR;
-        if (dlci->modem_tx & TIOCM_RI)
-                modembits |= MDM_IC;
-        if (dlci->modem_tx & TIOCM_CD)
-                modembits |= MDM_DV;
-        return modembits;
-}
-
-/**
- *      gsm_print_packet        -       display a frame for debug
- *      @hdr: header to print before decode
- *      @addr: address EA from the frame
- *      @cr: C/R bit from the frame
- *      @control: control including PF bit
- *      @data: following data bytes
- *      @dlen: length of data
- *
- *      Displays a packet in human readable format for debugging purposes. The
- *      style is based on amateur radio LAP-B dump display.
- */
-
-static void gsm_print_packet(const char *hdr, int addr, int cr,
-                                        u8 control, const u8 *data, int dlen)
-{
-        if (!(debug & 1))
-                return;
-
-        printk(KERN_INFO "%s %d) %c: ", hdr, addr, "RC"[cr]);
-
-        switch (control & ~PF) {
-        case SABM:
-                printk(KERN_CONT "SABM");
-                break;
-        case UA:
-                printk(KERN_CONT "UA");
-                break;
-        case DISC:
-                printk(KERN_CONT "DISC");
-                break;
-        case DM:
-                printk(KERN_CONT "DM");
-                break;
-        case UI:
-                printk(KERN_CONT "UI");
-                break;
-        case UIH:
-                printk(KERN_CONT "UIH");
-                break;
-        default:
-                if (!(control & 0x01)) {
-                        printk(KERN_CONT "I N(S)%d N(R)%d",
-                                (control & 0x0E) >> 1, (control & 0xE)>> 5);
-                } else switch (control & 0x0F) {
-                case RR:
-                        printk("RR(%d)", (control & 0xE0) >> 5);
-                        break;
-                case RNR:
-                        printk("RNR(%d)", (control & 0xE0) >> 5);
-                        break;
-                case REJ:
-                        printk("REJ(%d)", (control & 0xE0) >> 5);
-                        break;
-                default:
-                        printk(KERN_CONT "[%02X]", control);
-                }
-        }
-
-        if (control & PF)
-                printk(KERN_CONT "(P)");
-        else
-                printk(KERN_CONT "(F)");
-
-        if (dlen) {
-                int ct = 0;
-                while (dlen--) {
-                        if (ct % 8 == 0)
-                                printk(KERN_CONT "\n    ");
-                        printk(KERN_CONT "%02X ", *data++);
-                        ct++;
-                }
-        }
-        printk(KERN_CONT "\n");
-}
-
-
-/*
- *      Link level transmission side
- */
-
-/**
- *      gsm_stuff_packet        -       bytestuff a packet
- *      @ibuf: input
- *      @obuf: output
- *      @len: length of input
- *
- *      Expand a buffer by bytestuffing it. The worst case size change
- *      is doubling and the caller is responsible for handing out
- *      suitable sized buffers.
- */
-
-static int gsm_stuff_frame(const u8 *input, u8 *output, int len)
-{
-        int olen = 0;
-        while (len--) {
-                if (*input == GSM1_SOF || *input == GSM1_ESCAPE
-                    || *input == XON || *input == XOFF) {
-                        *output++ = GSM1_ESCAPE;
-                        *output++ = *input++ ^ GSM1_ESCAPE_BITS;
-                        olen++;
-                } else
-                        *output++ = *input++;
-                olen++;
-        }
-        return olen;
-}
-
-static void hex_packet(const unsigned char *p, int len)
-{
-        int i;
-        for (i = 0; i < len; i++) {
-                if (i && (i % 16) == 0)
-                        printk("\n");
-                printk("%02X ", *p++);
-        }
-        printk("\n");
-}
-
-/**
- *      gsm_send        -       send a control frame
- *      @gsm: our GSM mux
- *      @addr: address for control frame
- *      @cr: command/response bit
- *      @control:  control byte including PF bit
- *
- *      Format up and transmit a control frame. These do not go via the
- *      queueing logic as they should be transmitted ahead of data when
- *      they are needed.
- *
- *      FIXME: Lock versus data TX path
- */
-
-static void gsm_send(struct gsm_mux *gsm, int addr, int cr, int control)
-{
-        int len;
-        u8 cbuf[10];
-        u8 ibuf[3];
-
-        switch (gsm->encoding) {
-        case 0:
-                cbuf[0] = GSM0_SOF;
-                cbuf[1] = (addr << 2) | (cr << 1) | EA;
-                cbuf[2] = control;
-                cbuf[3] = EA;   /* Length of data = 0 */
-                cbuf[4] = 0xFF - gsm_fcs_add_block(INIT_FCS, cbuf + 1, 3);
-                cbuf[5] = GSM0_SOF;
-                len = 6;
-                break;
-        case 1:
-        case 2:
-                /* Control frame + packing (but not frame stuffing) in mode 1 */
-                ibuf[0] = (addr << 2) | (cr << 1) | EA;
-                ibuf[1] = control;
-                ibuf[2] = 0xFF - gsm_fcs_add_block(INIT_FCS, ibuf, 2);
-                /* Stuffing may double the size worst case */
-                len = gsm_stuff_frame(ibuf, cbuf + 1, 3);
-                /* Now add the SOF markers */
-                cbuf[0] = GSM1_SOF;
-                cbuf[len + 1] = GSM1_SOF;
-                /* FIXME: we can omit the lead one in many cases */
-                len += 2;
-                break;
-        default:
-                WARN_ON(1);
-                return;
-        }
-        gsm->output(gsm, cbuf, len);
-        gsm_print_packet("-->", addr, cr, control, NULL, 0);
-}
-
-/**
- *      gsm_response    -       send a control response
- *      @gsm: our GSM mux
- *      @addr: address for control frame
- *      @control:  control byte including PF bit
- *
- *      Format up and transmit a link level response frame.
- */
-
-static inline void gsm_response(struct gsm_mux *gsm, int addr, int control)
-{
-        gsm_send(gsm, addr, 0, control);
-}
-
-/**
- *      gsm_command     -       send a control command
- *      @gsm: our GSM mux
- *      @addr: address for control frame
- *      @control:  control byte including PF bit
- *
- *      Format up and transmit a link level command frame.
- */
-
-static inline void gsm_command(struct gsm_mux *gsm, int addr, int control)
-{
-        gsm_send(gsm, addr, 1, control);
-}
-
-/* Data transmission */
-
-#define HDR_LEN         6       /* ADDR CTRL [LEN.2] DATA FCS */
-
-/**
- *      gsm_data_alloc          -       allocate data frame
- *      @gsm: GSM mux
- *      @addr: DLCI address
- *      @len: length excluding header and FCS
- *      @ctrl: control byte
- *
- *      Allocate a new data buffer for sending frames with data. Space is left
- *      at the front for header bytes but that is treated as an implementation
- *      detail and not for the high level code to use
- */
-
-static struct gsm_msg *gsm_data_alloc(struct gsm_mux *gsm, u8 addr, int len,
-                                                                u8 ctrl)
-{
-        struct gsm_msg *m = kmalloc(sizeof(struct gsm_msg) + len + HDR_LEN,
-                                                                GFP_ATOMIC);
-        if (m == NULL)
-                return NULL;
-        m->data = m->buffer + HDR_LEN - 1;      /* Allow for FCS */
-        m->len = len;
-        m->addr = addr;
-        m->ctrl = ctrl;
-        m->next = NULL;
-        return m;
-}
-
-/**
- *      gsm_data_kick           -       poke the queue
- *      @gsm: GSM Mux
- *
- *      The tty device has called us to indicate that room has appeared in
- *      the transmit queue. Ram more data into the pipe if we have any
- *
- *      FIXME: lock against link layer control transmissions
- */
-
-static void gsm_data_kick(struct gsm_mux *gsm)
-{
-        struct gsm_msg *msg = gsm->tx_head;
-        int len;
-        int skip_sof = 0;
-
-        /* FIXME: We need to apply this solely to data messages */
-        if (gsm->constipated)
-                return;
-
-        while (gsm->tx_head != NULL) {
-                msg = gsm->tx_head;
-                if (gsm->encoding != 0) {
-                        gsm->txframe[0] = GSM1_SOF;
-                        len = gsm_stuff_frame(msg->data,
-                                                gsm->txframe + 1, msg->len);
-                        gsm->txframe[len + 1] = GSM1_SOF;
-                        len += 2;
-                } else {
-                        gsm->txframe[0] = GSM0_SOF;
-                        memcpy(gsm->txframe + 1 , msg->data, msg->len);
-                        gsm->txframe[msg->len + 1] = GSM0_SOF;
-                        len = msg->len + 2;
-                }
-
-                if (debug & 4) {
-                        printk("gsm_data_kick: \n");
-                        hex_packet(gsm->txframe, len);
-                }
-
-                if (gsm->output(gsm, gsm->txframe + skip_sof,
-                                                len - skip_sof) < 0)
-                        break;
-                /* FIXME: Can eliminate one SOF in many more cases */
-                gsm->tx_head = msg->next;
-                if (gsm->tx_head == NULL)
-                        gsm->tx_tail = NULL;
-                gsm->tx_bytes -= msg->len;
-                kfree(msg);
-                /* For a burst of frames skip the extra SOF within the
-                   burst */
-                skip_sof = 1;
-        }
-}
-
-/**
- *      __gsm_data_queue                -       queue a UI or UIH frame
- *      @dlci: DLCI sending the data
- *      @msg: message queued
- *
- *      Add data to the transmit queue and try and get stuff moving
- *      out of the mux tty if not already doing so. The Caller must hold
- *      the gsm tx lock.
- */
-
-static void __gsm_data_queue(struct gsm_dlci *dlci, struct gsm_msg *msg)
-{
-        struct gsm_mux *gsm = dlci->gsm;
-        u8 *dp = msg->data;
-        u8 *fcs = dp + msg->len;
-
-        /* Fill in the header */
-        if (gsm->encoding == 0) {
-                if (msg->len < 128)
-                        *--dp = (msg->len << 1) | EA;
-                else {
-                        *--dp = (msg->len >> 6) | EA;
-                        *--dp = (msg->len & 127) << 1;
-                }
-        }
-
-        *--dp = msg->ctrl;
-        if (gsm->initiator)
-                *--dp = (msg->addr << 2) | 2 | EA;
-        else
-                *--dp = (msg->addr << 2) | EA;
-        *fcs = gsm_fcs_add_block(INIT_FCS, dp , msg->data - dp);
-        /* Ugly protocol layering violation */
-        if (msg->ctrl == UI || msg->ctrl == (UI|PF))
-                *fcs = gsm_fcs_add_block(*fcs, msg->data, msg->len);
-        *fcs = 0xFF - *fcs;
-
-        gsm_print_packet("Q> ", msg->addr, gsm->initiator, msg->ctrl,
-                                                        msg->data, msg->len);
-
-        /* Move the header back and adjust the length, also allow for the FCS
-           now tacked on the end */
-        msg->len += (msg->data - dp) + 1;
-        msg->data = dp;
-
-        /* Add to the actual output queue */
-        if (gsm->tx_tail)
-                gsm->tx_tail->next = msg;
-        else
-                gsm->tx_head = msg;
-        gsm->tx_tail = msg;
-        gsm->tx_bytes += msg->len;
-        gsm_data_kick(gsm);
-}
-
-/**
- *      gsm_data_queue          -       queue a UI or UIH frame
- *      @dlci: DLCI sending the data
- *      @msg: message queued
- *
- *      Add data to the transmit queue and try and get stuff moving
- *      out of the mux tty if not already doing so. Take the
- *      the gsm tx lock and dlci lock.
- */
-
-static void gsm_data_queue(struct gsm_dlci *dlci, struct gsm_msg *msg)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&dlci->gsm->tx_lock, flags);
-        __gsm_data_queue(dlci, msg);
-        spin_unlock_irqrestore(&dlci->gsm->tx_lock, flags);
-}
-
-/**
- *      gsm_dlci_data_output    -       try and push data out of a DLCI
- *      @gsm: mux
- *      @dlci: the DLCI to pull data from
- *
- *      Pull data from a DLCI and send it into the transmit queue if there
- *      is data. Keep to the MRU of the mux. This path handles the usual tty
- *      interface which is a byte stream with optional modem data.
- *
- *      Caller must hold the tx_lock of the mux.
- */
-
-static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci)
-{
-        struct gsm_msg *msg;
-        u8 *dp;
-        int len, size;
-        int h = dlci->adaption - 1;
-
-        len = kfifo_len(dlci->fifo);
-        if (len == 0)
-                return 0;
-
-        /* MTU/MRU count only the data bits */
-        if (len > gsm->mtu)
-                len = gsm->mtu;
-
-        size = len + h;
-
-        msg = gsm_data_alloc(gsm, dlci->addr, size, gsm->ftype);
-        /* FIXME: need a timer or something to kick this so it can't
-           get stuck with no work outstanding and no buffer free */
-        if (msg == NULL)
-                return -ENOMEM;
-        dp = msg->data;
-        switch (dlci->adaption) {
-        case 1: /* Unstructured */
-                break;
-        case 2: /* Unstructed with modem bits. Always one byte as we never
-                   send inline break data */
-                *dp += gsm_encode_modem(dlci);
-                len--;
-                break;
-        }
-        WARN_ON(kfifo_out_locked(dlci->fifo, dp , len, &dlci->lock) != len);
-        __gsm_data_queue(dlci, msg);
-        /* Bytes of data we used up */
-        return size;
-}
-
-/**
- *      gsm_dlci_data_output_framed  -  try and push data out of a DLCI
- *      @gsm: mux
- *      @dlci: the DLCI to pull data from
- *
- *      Pull data from a DLCI and send it into the transmit queue if there
- *      is data. Keep to the MRU of the mux. This path handles framed data
- *      queued as skbuffs to the DLCI.
- *
- *      Caller must hold the tx_lock of the mux.
- */
-
-static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,
-                                                struct gsm_dlci *dlci)
-{
-        struct gsm_msg *msg;
-        u8 *dp;
-        int len, size;
-        int last = 0, first = 0;
-        int overhead = 0;
-
-        /* One byte per frame is used for B/F flags */
-        if (dlci->adaption == 4)
-                overhead = 1;
-
-        /* dlci->skb is locked by tx_lock */
-        if (dlci->skb == NULL) {
-                dlci->skb = skb_dequeue(&dlci->skb_list);
-                if (dlci->skb == NULL)
-                        return 0;
-                first = 1;
-        }
-        len = dlci->skb->len + overhead;
-
-        /* MTU/MRU count only the data bits */
-        if (len > gsm->mtu) {
-                if (dlci->adaption == 3) {
-                        /* Over long frame, bin it */
-                        kfree_skb(dlci->skb);
-                        dlci->skb = NULL;
-                        return 0;
-                }
-                len = gsm->mtu;
-        } else
-                last = 1;
-
-        size = len + overhead;
-        msg = gsm_data_alloc(gsm, dlci->addr, size, gsm->ftype);
-
-        /* FIXME: need a timer or something to kick this so it can't
-           get stuck with no work outstanding and no buffer free */
-        if (msg == NULL)
-                return -ENOMEM;
-        dp = msg->data;
-
-        if (dlci->adaption == 4) { /* Interruptible framed (Packetised Data) */
-                /* Flag byte to carry the start/end info */
-                *dp++ = last << 7 | first << 6 | 1;     /* EA */
-                len--;
-        }
-        memcpy(dp, skb_pull(dlci->skb, len), len);
-        __gsm_data_queue(dlci, msg);
-        if (last)
-                dlci->skb = NULL;
-        return size;
-}
-
-/**
- *      gsm_dlci_data_sweep             -       look for data to send
- *      @gsm: the GSM mux
- *
- *      Sweep the GSM mux channels in priority order looking for ones with
- *      data to send. We could do with optimising this scan a bit. We aim
- *      to fill the queue totally or up to TX_THRESH_HI bytes. Once we hit
- *      TX_THRESH_LO we get called again
- *
- *      FIXME: We should round robin between groups and in theory you can
- *      renegotiate DLCI priorities with optional stuff. Needs optimising.
- */
-
-static void gsm_dlci_data_sweep(struct gsm_mux *gsm)
-{
-        int len;
-        /* Priority ordering: We should do priority with RR of the groups */
-        int i = 1;
-
-        while (i < NUM_DLCI) {
-                struct gsm_dlci *dlci;
-
-                if (gsm->tx_bytes > TX_THRESH_HI)
-                        break;
-                dlci = gsm->dlci[i];
-                if (dlci == NULL || dlci->constipated) {
-                        i++;
-                        continue;
-                }
-                if (dlci->adaption < 3)
-                        len = gsm_dlci_data_output(gsm, dlci);
-                else
-                        len = gsm_dlci_data_output_framed(gsm, dlci);
-                if (len < 0)
-                        break;
-                /* DLCI empty - try the next */
-                if (len == 0)
-                        i++;
-        }
-}
-
-/**
- *      gsm_dlci_data_kick      -       transmit if possible
- *      @dlci: DLCI to kick
- *
- *      Transmit data from this DLCI if the queue is empty. We can't rely on
- *      a tty wakeup except when we filled the pipe so we need to fire off
- *      new data ourselves in other cases.
- */
-
-static void gsm_dlci_data_kick(struct gsm_dlci *dlci)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&dlci->gsm->tx_lock, flags);
-        /* If we have nothing running then we need to fire up */
-        if (dlci->gsm->tx_bytes == 0)
-                gsm_dlci_data_output(dlci->gsm, dlci);
-        else if (dlci->gsm->tx_bytes < TX_THRESH_LO)
-                gsm_dlci_data_sweep(dlci->gsm);
-        spin_unlock_irqrestore(&dlci->gsm->tx_lock, flags);
-}
-
-/*
- *      Control message processing
- */
-
-
-/**
- *      gsm_control_reply       -       send a response frame to a control
- *      @gsm: gsm channel
- *      @cmd: the command to use
- *      @data: data to follow encoded info
- *      @dlen: length of data
- *
- *      Encode up and queue a UI/UIH frame containing our response.
- */
-
-static void gsm_control_reply(struct gsm_mux *gsm, int cmd, u8 *data,
-                                        int dlen)
-{
-        struct gsm_msg *msg;
-        msg = gsm_data_alloc(gsm, 0, dlen + 2, gsm->ftype);
-        msg->data[0] = (cmd & 0xFE) << 1 | EA;  /* Clear C/R */
-        msg->data[1] = (dlen << 1) | EA;
-        memcpy(msg->data + 2, data, dlen);
-        gsm_data_queue(gsm->dlci[0], msg);
-}
-
-/**
- *      gsm_process_modem       -       process received modem status
- *      @tty: virtual tty bound to the DLCI
- *      @dlci: DLCI to affect
- *      @modem: modem bits (full EA)
- *
- *      Used when a modem control message or line state inline in adaption
- *      layer 2 is processed. Sort out the local modem state and throttles
- */
-
-static void gsm_process_modem(struct tty_struct *tty, struct gsm_dlci *dlci,
-                                                        u32 modem)
-{
-        int  mlines = 0;
-        u8 brk = modem >> 6;
-
-        /* Flow control/ready to communicate */
-        if (modem & MDM_FC) {
-                /* Need to throttle our output on this device */
-                dlci->constipated = 1;
-        }
-        if (modem & MDM_RTC) {
-                mlines |= TIOCM_DSR | TIOCM_DTR;
-                dlci->constipated = 0;
-                gsm_dlci_data_kick(dlci);
-        }
-        /* Map modem bits */
-        if (modem & MDM_RTR)
-                mlines |= TIOCM_RTS | TIOCM_CTS;
-        if (modem & MDM_IC)
-                mlines |= TIOCM_RI;
-        if (modem & MDM_DV)
-                mlines |= TIOCM_CD;
-
-        /* Carrier drop -> hangup */
-        if (tty) {
-                if ((mlines & TIOCM_CD) == 0 && (dlci->modem_rx & TIOCM_CD))
-                        if (!(tty->termios->c_cflag & CLOCAL))
-                                tty_hangup(tty);
-                if (brk & 0x01)
-                        tty_insert_flip_char(tty, 0, TTY_BREAK);
-        }
-        dlci->modem_rx = mlines;
-}
-
-/**
- *      gsm_control_modem       -       modem status received
- *      @gsm: GSM channel
- *      @data: data following command
- *      @clen: command length
- *
- *      We have received a modem status control message. This is used by
- *      the GSM mux protocol to pass virtual modem line status and optionally
- *      to indicate break signals. Unpack it, convert to Linux representation
- *      and if need be stuff a break message down the tty.
- */
-
-static void gsm_control_modem(struct gsm_mux *gsm, u8 *data, int clen)
-{
-        unsigned int addr = 0;
-        unsigned int modem = 0;
-        struct gsm_dlci *dlci;
-        int len = clen;
-        u8 *dp = data;
-        struct tty_struct *tty;
-
-        while (gsm_read_ea(&addr, *dp++) == 0) {
-                len--;
-                if (len == 0)
-                        return;
-        }
-        /* Must be at least one byte following the EA */
-        len--;
-        if (len <= 0)
-                return;
-
-        addr >>= 1;
-        /* Closed port, or invalid ? */
-        if (addr == 0 || addr >= NUM_DLCI || gsm->dlci[addr] == NULL)
-                return;
-        dlci = gsm->dlci[addr];
-
-        while (gsm_read_ea(&modem, *dp++) == 0) {
-                len--;
-                if (len == 0)
-                        return;
-        }
-        tty = tty_port_tty_get(&dlci->port);
-        gsm_process_modem(tty, dlci, modem);
-        if (tty) {
-                tty_wakeup(tty);
-                tty_kref_put(tty);
-        }
-        gsm_control_reply(gsm, CMD_MSC, data, clen);
-}
-
-/**
- *      gsm_control_rls         -       remote line status
- *      @gsm: GSM channel
- *      @data: data bytes
- *      @clen: data length
- *
- *      The modem sends us a two byte message on the control channel whenever
- *      it wishes to send us an error state from the virtual link. Stuff
- *      this into the uplink tty if present
- */
-
-static void gsm_control_rls(struct gsm_mux *gsm, u8 *data, int clen)
-{
-        struct tty_struct *tty;
-        unsigned int addr = 0 ;
-        u8 bits;
-        int len = clen;
-        u8 *dp = data;
-
-        while (gsm_read_ea(&addr, *dp++) == 0) {
-                len--;
-                if (len == 0)
-                        return;
-        }
-        /* Must be at least one byte following ea */
-        len--;
-        if (len <= 0)
-                return;
-        addr >>= 1;
-        /* Closed port, or invalid ? */
-        if (addr == 0 || addr >= NUM_DLCI || gsm->dlci[addr] == NULL)
-                return;
-        /* No error ? */
-        bits = *dp;
-        if ((bits & 1) == 0)
-                return;
-        /* See if we have an uplink tty */
-        tty = tty_port_tty_get(&gsm->dlci[addr]->port);
-
-        if (tty) {
-                if (bits & 2)
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-                if (bits & 4)
-                        tty_insert_flip_char(tty, 0, TTY_PARITY);
-                if (bits & 8)
-                        tty_insert_flip_char(tty, 0, TTY_FRAME);
-                tty_flip_buffer_push(tty);
-                tty_kref_put(tty);
-        }
-        gsm_control_reply(gsm, CMD_RLS, data, clen);
-}
-
-static void gsm_dlci_begin_close(struct gsm_dlci *dlci);
-
-/**
- *      gsm_control_message     -       DLCI 0 control processing
- *      @gsm: our GSM mux
- *      @command:  the command EA
- *      @data: data beyond the command/length EAs
- *      @clen: length
- *
- *      Input processor for control messages from the other end of the link.
- *      Processes the incoming request and queues a response frame or an
- *      NSC response if not supported
- */
-
-static void gsm_control_message(struct gsm_mux *gsm, unsigned int command,
-                                                        u8 *data, int clen)
-{
-        u8 buf[1];
-        switch (command) {
-        case CMD_CLD: {
-                struct gsm_dlci *dlci = gsm->dlci[0];
-                /* Modem wishes to close down */
-                if (dlci) {
-                        dlci->dead = 1;
-                        gsm->dead = 1;
-                        gsm_dlci_begin_close(dlci);
-                }
-                }
-                break;
-        case CMD_TEST:
-                /* Modem wishes to test, reply with the data */
-                gsm_control_reply(gsm, CMD_TEST, data, clen);
-                break;
-        case CMD_FCON:
-                /* Modem wants us to STFU */
-                gsm->constipated = 1;
-                gsm_control_reply(gsm, CMD_FCON, NULL, 0);
-                break;
-        case CMD_FCOFF:
-                /* Modem can accept data again */
-                gsm->constipated = 0;
-                gsm_control_reply(gsm, CMD_FCOFF, NULL, 0);
-                /* Kick the link in case it is idling */
-                gsm_data_kick(gsm);
-                break;
-        case CMD_MSC:
-                /* Out of band modem line change indicator for a DLCI */
-                gsm_control_modem(gsm, data, clen);
-                break;
-        case CMD_RLS:
-                /* Out of band error reception for a DLCI */
-                gsm_control_rls(gsm, data, clen);
-                break;
-        case CMD_PSC:
-                /* Modem wishes to enter power saving state */
-                gsm_control_reply(gsm, CMD_PSC, NULL, 0);
-                break;
-                /* Optional unsupported commands */
-        case CMD_PN:    /* Parameter negotiation */
-        case CMD_RPN:   /* Remote port negotation */
-        case CMD_SNC:   /* Service negotation command */
-        default:
-                /* Reply to bad commands with an NSC */
-                buf[0] = command;
-                gsm_control_reply(gsm, CMD_NSC, buf, 1);
-                break;
-        }
-}
-
-/**
- *      gsm_control_response    -       process a response to our control
- *      @gsm: our GSM mux
- *      @command: the command (response) EA
- *      @data: data beyond the command/length EA
- *      @clen: length
- *
- *      Process a response to an outstanding command. We only allow a single
- *      control message in flight so this is fairly easy. All the clean up
- *      is done by the caller, we just update the fields, flag it as done
- *      and return
- */
-
-static void gsm_control_response(struct gsm_mux *gsm, unsigned int command,
-                                                        u8 *data, int clen)
-{
-        struct gsm_control *ctrl;
-        unsigned long flags;
-
-        spin_lock_irqsave(&gsm->control_lock, flags);
-
-        ctrl = gsm->pending_cmd;
-        /* Does the reply match our command */
-        command |= 1;
-        if (ctrl != NULL && (command == ctrl->cmd || command == CMD_NSC)) {
-                /* Our command was replied to, kill the retry timer */
-                del_timer(&gsm->t2_timer);
-                gsm->pending_cmd = NULL;
-                /* Rejected by the other end */
-                if (command == CMD_NSC)
-                        ctrl->error = -EOPNOTSUPP;
-                ctrl->done = 1;
-                wake_up(&gsm->event);
-        }
-        spin_unlock_irqrestore(&gsm->control_lock, flags);
-}
-
-/**
- *      gsm_control_transmit    -       send control packet
- *      @gsm: gsm mux
- *      @ctrl: frame to send
- *
- *      Send out a pending control command (called under control lock)
- */
-
-static void gsm_control_transmit(struct gsm_mux *gsm, struct gsm_control *ctrl)
-{
-        struct gsm_msg *msg = gsm_data_alloc(gsm, 0, ctrl->len + 1,
-                                                        gsm->ftype|PF);
-        if (msg == NULL)
-                return;
-        msg->data[0] = (ctrl->cmd << 1) | 2 | EA;       /* command */
-        memcpy(msg->data + 1, ctrl->data, ctrl->len);
-        gsm_data_queue(gsm->dlci[0], msg);
-}
-
-/**
- *      gsm_control_retransmit  -       retransmit a control frame
- *      @data: pointer to our gsm object
- *
- *      Called off the T2 timer expiry in order to retransmit control frames
- *      that have been lost in the system somewhere. The control_lock protects
- *      us from colliding with another sender or a receive completion event.
- *      In that situation the timer may still occur in a small window but
- *      gsm->pending_cmd will be NULL and we just let the timer expire.
- */
-
-static void gsm_control_retransmit(unsigned long data)
-{
-        struct gsm_mux *gsm = (struct gsm_mux *)data;
-        struct gsm_control *ctrl;
-        unsigned long flags;
-        spin_lock_irqsave(&gsm->control_lock, flags);
-        ctrl = gsm->pending_cmd;
-        if (ctrl) {
-                gsm->cretries--;
-                if (gsm->cretries == 0) {
-                        gsm->pending_cmd = NULL;
-                        ctrl->error = -ETIMEDOUT;
-                        ctrl->done = 1;
-                        spin_unlock_irqrestore(&gsm->control_lock, flags);
-                        wake_up(&gsm->event);
-                        return;
-                }
-                gsm_control_transmit(gsm, ctrl);
-                mod_timer(&gsm->t2_timer, jiffies + gsm->t2 * HZ / 100);
-        }
-        spin_unlock_irqrestore(&gsm->control_lock, flags);
-}
-
-/**
- *      gsm_control_send        -       send a control frame on DLCI 0
- *      @gsm: the GSM channel
- *      @command: command  to send including CR bit
- *      @data: bytes of data (must be kmalloced)
- *      @len: length of the block to send
- *
- *      Queue and dispatch a control command. Only one command can be
- *      active at a time. In theory more can be outstanding but the matching
- *      gets really complicated so for now stick to one outstanding.
- */
-
-static struct gsm_control *gsm_control_send(struct gsm_mux *gsm,
-                unsigned int command, u8 *data, int clen)
-{
-        struct gsm_control *ctrl = kzalloc(sizeof(struct gsm_control),
-                                                GFP_KERNEL);
-        unsigned long flags;
-        if (ctrl == NULL)
-                return NULL;
-retry:
-        wait_event(gsm->event, gsm->pending_cmd == NULL);
-        spin_lock_irqsave(&gsm->control_lock, flags);
-        if (gsm->pending_cmd != NULL) {
-                spin_unlock_irqrestore(&gsm->control_lock, flags);
-                goto retry;
-        }
-        ctrl->cmd = command;
-        ctrl->data = data;
-        ctrl->len = clen;
-        gsm->pending_cmd = ctrl;
-        gsm->cretries = gsm->n2;
-        mod_timer(&gsm->t2_timer, jiffies + gsm->t2 * HZ / 100);
-        gsm_control_transmit(gsm, ctrl);
-        spin_unlock_irqrestore(&gsm->control_lock, flags);
-        return ctrl;
-}
-
-/**
- *      gsm_control_wait        -       wait for a control to finish
- *      @gsm: GSM mux
- *      @control: control we are waiting on
- *
- *      Waits for the control to complete or time out. Frees any used
- *      resources and returns 0 for success, or an error if the remote
- *      rejected or ignored the request.
- */
-
-static int gsm_control_wait(struct gsm_mux *gsm, struct gsm_control *control)
-{
-        int err;
-        wait_event(gsm->event, control->done == 1);
-        err = control->error;
-        kfree(control);
-        return err;
-}
-
-
-/*
- *      DLCI level handling: Needs krefs
- */
-
-/*
- *      State transitions and timers
- */
-
-/**
- *      gsm_dlci_close          -       a DLCI has closed
- *      @dlci: DLCI that closed
- *
- *      Perform processing when moving a DLCI into closed state. If there
- *      is an attached tty this is hung up
- */
-
-static void gsm_dlci_close(struct gsm_dlci *dlci)
-{
-        del_timer(&dlci->t1);
-        if (debug & 8)
-                printk("DLCI %d goes closed.\n", dlci->addr);
-        dlci->state = DLCI_CLOSED;
-        if (dlci->addr != 0) {
-                struct tty_struct  *tty = tty_port_tty_get(&dlci->port);
-                if (tty) {
-                        tty_hangup(tty);
-                        tty_kref_put(tty);
-                }
-                kfifo_reset(dlci->fifo);
-        } else
-                dlci->gsm->dead = 1;
-        wake_up(&dlci->gsm->event);
-        /* A DLCI 0 close is a MUX termination so we need to kick that
-           back to userspace somehow */
-}
-
-/**
- *      gsm_dlci_open           -       a DLCI has opened
- *      @dlci: DLCI that opened
- *
- *      Perform processing when moving a DLCI into open state.
- */
-
-static void gsm_dlci_open(struct gsm_dlci *dlci)
-{
-        /* Note that SABM UA .. SABM UA first UA lost can mean that we go
-           open -> open */
-        del_timer(&dlci->t1);
-        /* This will let a tty open continue */
-        dlci->state = DLCI_OPEN;
-        if (debug & 8)
-                printk("DLCI %d goes open.\n", dlci->addr);
-        wake_up(&dlci->gsm->event);
-}
-
-/**
- *      gsm_dlci_t1             -       T1 timer expiry
- *      @dlci: DLCI that opened
- *
- *      The T1 timer handles retransmits of control frames (essentially of
- *      SABM and DISC). We resend the command until the retry count runs out
- *      in which case an opening port goes back to closed and a closing port
- *      is simply put into closed state (any further frames from the other
- *      end will get a DM response)
- */
-
-static void gsm_dlci_t1(unsigned long data)
-{
-        struct gsm_dlci *dlci = (struct gsm_dlci *)data;
-        struct gsm_mux *gsm = dlci->gsm;
-
-        switch (dlci->state) {
-        case DLCI_OPENING:
-                dlci->retries--;
-                if (dlci->retries) {
-                        gsm_command(dlci->gsm, dlci->addr, SABM|PF);
-                        mod_timer(&dlci->t1, jiffies + gsm->t1 * HZ / 100);
-                } else
-                        gsm_dlci_close(dlci);
-                break;
-        case DLCI_CLOSING:
-                dlci->retries--;
-                if (dlci->retries) {
-                        gsm_command(dlci->gsm, dlci->addr, DISC|PF);
-                        mod_timer(&dlci->t1, jiffies + gsm->t1 * HZ / 100);
-                } else
-                        gsm_dlci_close(dlci);
-                break;
-        }
-}
-
-/**
- *      gsm_dlci_begin_open     -       start channel open procedure
- *      @dlci: DLCI to open
- *
- *      Commence opening a DLCI from the Linux side. We issue SABM messages
- *      to the modem which should then reply with a UA, at which point we
- *      will move into open state. Opening is done asynchronously with retry
- *      running off timers and the responses.
- */
-
-static void gsm_dlci_begin_open(struct gsm_dlci *dlci)
-{
-        struct gsm_mux *gsm = dlci->gsm;
-        if (dlci->state == DLCI_OPEN || dlci->state == DLCI_OPENING)
-                return;
-        dlci->retries = gsm->n2;
-        dlci->state = DLCI_OPENING;
-        gsm_command(dlci->gsm, dlci->addr, SABM|PF);
-        mod_timer(&dlci->t1, jiffies + gsm->t1 * HZ / 100);
-}
-
-/**
- *      gsm_dlci_begin_close    -       start channel open procedure
- *      @dlci: DLCI to open
- *
- *      Commence closing a DLCI from the Linux side. We issue DISC messages
- *      to the modem which should then reply with a UA, at which point we
- *      will move into closed state. Closing is done asynchronously with retry
- *      off timers. We may also receive a DM reply from the other end which
- *      indicates the channel was already closed.
- */
-
-static void gsm_dlci_begin_close(struct gsm_dlci *dlci)
-{
-        struct gsm_mux *gsm = dlci->gsm;
-        if (dlci->state == DLCI_CLOSED || dlci->state == DLCI_CLOSING)
-                return;
-        dlci->retries = gsm->n2;
-        dlci->state = DLCI_CLOSING;
-        gsm_command(dlci->gsm, dlci->addr, DISC|PF);
-        mod_timer(&dlci->t1, jiffies + gsm->t1 * HZ / 100);
-}
-
-/**
- *      gsm_dlci_data           -       data arrived
- *      @dlci: channel
- *      @data: block of bytes received
- *      @len: length of received block
- *
- *      A UI or UIH frame has arrived which contains data for a channel
- *      other than the control channel. If the relevant virtual tty is
- *      open we shovel the bits down it, if not we drop them.
- */
-
-static void gsm_dlci_data(struct gsm_dlci *dlci, u8 *data, int len)
-{
-        /* krefs .. */
-        struct tty_port *port = &dlci->port;
-        struct tty_struct *tty = tty_port_tty_get(port);
-        unsigned int modem = 0;
-
-        if (debug & 16)
-                printk("%d bytes for tty %p\n", len, tty);
-        if (tty) {
-                switch (dlci->adaption)  {
-                        /* Unsupported types */
-                        /* Packetised interruptible data */
-                        case 4:
-                                break;
-                        /* Packetised uininterruptible voice/data */
-                        case 3:
-                                break;
-                        /* Asynchronous serial with line state in each frame */
-                        case 2:
-                                while (gsm_read_ea(&modem, *data++) == 0) {
-                                        len--;
-                                        if (len == 0)
-                                                return;
-                                }
-                                gsm_process_modem(tty, dlci, modem);
-                        /* Line state will go via DLCI 0 controls only */
-                        case 1:
-                        default:
-                                tty_insert_flip_string(tty, data, len);
-                                tty_flip_buffer_push(tty);
-                }
-                tty_kref_put(tty);
-        }
-}
-
-/**
- *      gsm_dlci_control        -       data arrived on control channel
- *      @dlci: channel
- *      @data: block of bytes received
- *      @len: length of received block
- *
- *      A UI or UIH frame has arrived which contains data for DLCI 0 the
- *      control channel. This should contain a command EA followed by
- *      control data bytes. The command EA contains a command/response bit
- *      and we divide up the work accordingly.
- */
-
-static void gsm_dlci_command(struct gsm_dlci *dlci, u8 *data, int len)
-{
-        /* See what command is involved */
-        unsigned int command = 0;
-        while (len-- > 0) {
-                if (gsm_read_ea(&command, *data++) == 1) {
-                        int clen = *data++;
-                        len--;
-                        /* FIXME: this is properly an EA */
-                        clen >>= 1;
-                        /* Malformed command ? */
-                        if (clen > len)
-                                return;
-                        if (command & 1)
-                                gsm_control_message(dlci->gsm, command,
-                                                                data, clen);
-                        else
-                                gsm_control_response(dlci->gsm, command,
-                                                                data, clen);
-                        return;
-                }
-        }
-}
-
-/*
- *      Allocate/Free DLCI channels
- */
-
-/**
- *      gsm_dlci_alloc          -       allocate a DLCI
- *      @gsm: GSM mux
- *      @addr: address of the DLCI
- *
- *      Allocate and install a new DLCI object into the GSM mux.
- *
- *      FIXME: review locking races
- */
-
-static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
-{
-        struct gsm_dlci *dlci = kzalloc(sizeof(struct gsm_dlci), GFP_ATOMIC);
-        if (dlci == NULL)
-                return NULL;
-        spin_lock_init(&dlci->lock);
-        dlci->fifo = &dlci->_fifo;
-        if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
-                kfree(dlci);
-                return NULL;
-        }
-
-        skb_queue_head_init(&dlci->skb_list);
-        init_timer(&dlci->t1);
-        dlci->t1.function = gsm_dlci_t1;
-        dlci->t1.data = (unsigned long)dlci;
-        tty_port_init(&dlci->port);
-        dlci->port.ops = &gsm_port_ops;
-        dlci->gsm = gsm;
-        dlci->addr = addr;
-        dlci->adaption = gsm->adaption;
-        dlci->state = DLCI_CLOSED;
-        if (addr)
-                dlci->data = gsm_dlci_data;
-        else
-                dlci->data = gsm_dlci_command;
-        gsm->dlci[addr] = dlci;
-        return dlci;
-}
-
-/**
- *      gsm_dlci_free           -       release DLCI
- *      @dlci: DLCI to destroy
- *
- *      Free up a DLCI. Currently to keep the lifetime rules sane we only
- *      clean up DLCI objects when the MUX closes rather than as the port
- *      is closed down on both the tty and mux levels.
- *
- *      Can sleep.
- */
-static void gsm_dlci_free(struct gsm_dlci *dlci)
-{
-        struct tty_struct *tty = tty_port_tty_get(&dlci->port);
-        if (tty) {
-                tty_vhangup(tty);
-                tty_kref_put(tty);
-        }
-        del_timer_sync(&dlci->t1);
-        dlci->gsm->dlci[dlci->addr] = NULL;
-        kfifo_free(dlci->fifo);
-        kfree(dlci);
-}
-
-
-/*
- *      LAPBish link layer logic
- */
-
-/**
- *      gsm_queue               -       a GSM frame is ready to process
- *      @gsm: pointer to our gsm mux
- *
- *      At this point in time a frame has arrived and been demangled from
- *      the line encoding. All the differences between the encodings have
- *      been handled below us and the frame is unpacked into the structures.
- *      The fcs holds the header FCS but any data FCS must be added here.
- */
-
-static void gsm_queue(struct gsm_mux *gsm)
-{
-        struct gsm_dlci *dlci;
-        u8 cr;
-        int address;
-        /* We have to sneak a look at the packet body to do the FCS.
-           A somewhat layering violation in the spec */
-
-        if ((gsm->control & ~PF) == UI)
-                gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf, gsm->len);
-        if (gsm->fcs != GOOD_FCS) {
-                gsm->bad_fcs++;
-                if (debug & 4)
-                        printk("BAD FCS %02x\n", gsm->fcs);
-                return;
-        }
-        address = gsm->address >> 1;
-        if (address >= NUM_DLCI)
-                goto invalid;
-
-        cr = gsm->address & 1;          /* C/R bit */
-
-        gsm_print_packet("<--", address, cr, gsm->control, gsm->buf, gsm->len);
-
-        cr ^= 1 - gsm->initiator;       /* Flip so 1 always means command */
-        dlci = gsm->dlci[address];
-
-        switch (gsm->control) {
-        case SABM|PF:
-                if (cr == 0)
-                        goto invalid;
-                if (dlci == NULL)
-                        dlci = gsm_dlci_alloc(gsm, address);
-                if (dlci == NULL)
-                        return;
-                if (dlci->dead)
-                        gsm_response(gsm, address, DM);
-                else {
-                        gsm_response(gsm, address, UA);
-                        gsm_dlci_open(dlci);
-                }
-                break;
-        case DISC|PF:
-                if (cr == 0)
-                        goto invalid;
-                if (dlci == NULL || dlci->state == DLCI_CLOSED) {
-                        gsm_response(gsm, address, DM);
-                        return;
-                }
-                /* Real close complete */
-                gsm_response(gsm, address, UA);
-                gsm_dlci_close(dlci);
-                break;
-        case UA:
-        case UA|PF:
-                if (cr == 0 || dlci == NULL)
-                        break;
-                switch (dlci->state) {
-                case DLCI_CLOSING:
-                        gsm_dlci_close(dlci);
-                        break;
-                case DLCI_OPENING:
-                        gsm_dlci_open(dlci);
-                        break;
-                }
-                break;
-        case DM:        /* DM can be valid unsolicited */
-        case DM|PF:
-                if (cr)
-                        goto invalid;
-                if (dlci == NULL)
-                        return;
-                gsm_dlci_close(dlci);
-                break;
-        case UI:
-        case UI|PF:
-        case UIH:
-        case UIH|PF:
-#if 0
-                if (cr)
-                        goto invalid;
-#endif
-                if (dlci == NULL || dlci->state != DLCI_OPEN) {
-                        gsm_command(gsm, address, DM|PF);
-                        return;
-                }
-                dlci->data(dlci, gsm->buf, gsm->len);
-                break;
-        default:
-                goto invalid;
-        }
-        return;
-invalid:
-        gsm->malformed++;
-        return;
-}
-
-
-/**
- *      gsm0_receive    -       perform processing for non-transparency
- *      @gsm: gsm data for this ldisc instance
- *      @c: character
- *
- *      Receive bytes in gsm mode 0
- */
-
-static void gsm0_receive(struct gsm_mux *gsm, unsigned char c)
-{
-        switch (gsm->state) {
-        case GSM_SEARCH:        /* SOF marker */
-                if (c == GSM0_SOF) {
-                        gsm->state = GSM_ADDRESS;
-                        gsm->address = 0;
-                        gsm->len = 0;
-                        gsm->fcs = INIT_FCS;
-                }
-                break;          /* Address EA */
-        case GSM_ADDRESS:
-                gsm->fcs = gsm_fcs_add(gsm->fcs, c);
-                if (gsm_read_ea(&gsm->address, c))
-                        gsm->state = GSM_CONTROL;
-                break;
-        case GSM_CONTROL:       /* Control Byte */
-                gsm->fcs = gsm_fcs_add(gsm->fcs, c);
-                gsm->control = c;
-                gsm->state = GSM_LEN;
-                break;
-        case GSM_LEN:           /* Length EA */
-                gsm->fcs = gsm_fcs_add(gsm->fcs, c);
-                if (gsm_read_ea(&gsm->len, c)) {
-                        if (gsm->len > gsm->mru) {
-                                gsm->bad_size++;
-                                gsm->state = GSM_SEARCH;
-                                break;
-                        }
-                        gsm->count = 0;
-                        gsm->state = GSM_DATA;
-                }
-                break;
-        case GSM_DATA:          /* Data */
-                gsm->buf[gsm->count++] = c;
-                if (gsm->count == gsm->len)
-                        gsm->state = GSM_FCS;
-                break;
-        case GSM_FCS:           /* FCS follows the packet */
-                gsm->fcs = c;
-                gsm_queue(gsm);
-                /* And then back for the next frame */
-                gsm->state = GSM_SEARCH;
-                break;
-        }
-}
-
-/**
- *      gsm0_receive    -       perform processing for non-transparency
- *      @gsm: gsm data for this ldisc instance
- *      @c: character
- *
- *      Receive bytes in mode 1 (Advanced option)
- */
-
-static void gsm1_receive(struct gsm_mux *gsm, unsigned char c)
-{
-        if (c == GSM1_SOF) {
-                /* EOF is only valid in frame if we have got to the data state
-                   and received at least one byte (the FCS) */
-                if (gsm->state == GSM_DATA && gsm->count) {
-                        /* Extract the FCS */
-                        gsm->count--;
-                        gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->buf[gsm->count]);
-                        gsm->len = gsm->count;
-                        gsm_queue(gsm);
-                        gsm->state  = GSM_START;
-                        return;
-                }
-                /* Any partial frame was a runt so go back to start */
-                if (gsm->state != GSM_START) {
-                        gsm->malformed++;
-                        gsm->state = GSM_START;
-                }
-                /* A SOF in GSM_START means we are still reading idling or
-                   framing bytes */
-                return;
-        }
-
-        if (c == GSM1_ESCAPE) {
-                gsm->escape = 1;
-                return;
-        }
-
-        /* Only an unescaped SOF gets us out of GSM search */
-        if (gsm->state == GSM_SEARCH)
-                return;
-
-        if (gsm->escape) {
-                c ^= GSM1_ESCAPE_BITS;
-                gsm->escape = 0;
-        }
-        switch (gsm->state) {
-        case GSM_START:         /* First byte after SOF */
-                gsm->address = 0;
-                gsm->state = GSM_ADDRESS;
-                gsm->fcs = INIT_FCS;
-                /* Drop through */
-        case GSM_ADDRESS:       /* Address continuation */
-                gsm->fcs = gsm_fcs_add(gsm->fcs, c);
-                if (gsm_read_ea(&gsm->address, c))
-                        gsm->state = GSM_CONTROL;
-                break;
-        case GSM_CONTROL:       /* Control Byte */
-                gsm->fcs = gsm_fcs_add(gsm->fcs, c);
-                gsm->control = c;
-                gsm->count = 0;
-                gsm->state = GSM_DATA;
-                break;
-        case GSM_DATA:          /* Data */
-                if (gsm->count > gsm->mru ) {   /* Allow one for the FCS */
-                        gsm->state = GSM_OVERRUN;
-                        gsm->bad_size++;
-                } else
-                        gsm->buf[gsm->count++] = c;
-                break;
-        case GSM_OVERRUN:       /* Over-long - eg a dropped SOF */
-                break;
-        }
-}
-
-/**
- *      gsm_error               -       handle tty error
- *      @gsm: ldisc data
- *      @data: byte received (may be invalid)
- *      @flag: error received
- *
- *      Handle an error in the receipt of data for a frame. Currently we just
- *      go back to hunting for a SOF.
- *
- *      FIXME: better diagnostics ?
- */
-
-static void gsm_error(struct gsm_mux *gsm,
-                                unsigned char data, unsigned char flag)
-{
-        gsm->state = GSM_SEARCH;
-        gsm->io_error++;
-}
-
-/**
- *      gsm_cleanup_mux         -       generic GSM protocol cleanup
- *      @gsm: our mux
- *
- *      Clean up the bits of the mux which are the same for all framing
- *      protocols. Remove the mux from the mux table, stop all the timers
- *      and then shut down each device hanging up the channels as we go.
- */
-
-void gsm_cleanup_mux(struct gsm_mux *gsm)
-{
-        int i;
-        struct gsm_dlci *dlci = gsm->dlci[0];
-        struct gsm_msg *txq;
-
-        gsm->dead = 1;
-
-        spin_lock(&gsm_mux_lock);
-        for (i = 0; i < MAX_MUX; i++) {
-                if (gsm_mux[i] == gsm) {
-                        gsm_mux[i] = NULL;
-                        break;
-                }
-        }
-        spin_unlock(&gsm_mux_lock);
-        WARN_ON(i == MAX_MUX);
-
-        del_timer_sync(&gsm->t2_timer);
-        /* Now we are sure T2 has stopped */
-        if (dlci) {
-                dlci->dead = 1;
-                gsm_dlci_begin_close(dlci);
-                wait_event_interruptible(gsm->event,
-                                        dlci->state == DLCI_CLOSED);
-        }
-        /* Free up any link layer users */
-        for (i = 0; i < NUM_DLCI; i++)
-                if (gsm->dlci[i])
-                        gsm_dlci_free(gsm->dlci[i]);
-        /* Now wipe the queues */
-        for (txq = gsm->tx_head; txq != NULL; txq = gsm->tx_head) {
-                gsm->tx_head = txq->next;
-                kfree(txq);
-        }
-        gsm->tx_tail = NULL;
-}
-EXPORT_SYMBOL_GPL(gsm_cleanup_mux);
-
-/**
- *      gsm_activate_mux        -       generic GSM setup
- *      @gsm: our mux
- *
- *      Set up the bits of the mux which are the same for all framing
- *      protocols. Add the mux to the mux table so it can be opened and
- *      finally kick off connecting to DLCI 0 on the modem.
- */
-
-int gsm_activate_mux(struct gsm_mux *gsm)
-{
-        struct gsm_dlci *dlci;
-        int i = 0;
-
-        init_timer(&gsm->t2_timer);
-        gsm->t2_timer.function = gsm_control_retransmit;
-        gsm->t2_timer.data = (unsigned long)gsm;
-        init_waitqueue_head(&gsm->event);
-        spin_lock_init(&gsm->control_lock);
-        spin_lock_init(&gsm->tx_lock);
-
-        if (gsm->encoding == 0)
-                gsm->receive = gsm0_receive;
-        else
-                gsm->receive = gsm1_receive;
-        gsm->error = gsm_error;
-
-        spin_lock(&gsm_mux_lock);
-        for (i = 0; i < MAX_MUX; i++) {
-                if (gsm_mux[i] == NULL) {
-                        gsm_mux[i] = gsm;
-                        break;
-                }
-        }
-        spin_unlock(&gsm_mux_lock);
-        if (i == MAX_MUX)
-                return -EBUSY;
-
-        dlci = gsm_dlci_alloc(gsm, 0);
-        if (dlci == NULL)
-                return -ENOMEM;
-        gsm->dead = 0;          /* Tty opens are now permissible */
-        return 0;
-}
-EXPORT_SYMBOL_GPL(gsm_activate_mux);
-
-/**
- *      gsm_free_mux            -       free up a mux
- *      @mux: mux to free
- *
- *      Dispose of allocated resources for a dead mux. No refcounting
- *      at present so the mux must be truely dead.
- */
-void gsm_free_mux(struct gsm_mux *gsm)
-{
-        kfree(gsm->txframe);
-        kfree(gsm->buf);
-        kfree(gsm);
-}
-EXPORT_SYMBOL_GPL(gsm_free_mux);
-
-/**
- *      gsm_alloc_mux           -       allocate a mux
- *
- *      Creates a new mux ready for activation.
- */
-
-struct gsm_mux *gsm_alloc_mux(void)
-{
-        struct gsm_mux *gsm = kzalloc(sizeof(struct gsm_mux), GFP_KERNEL);
-        if (gsm == NULL)
-                return NULL;
-        gsm->buf = kmalloc(MAX_MRU + 1, GFP_KERNEL);
-        if (gsm->buf == NULL) {
-                kfree(gsm);
-                return NULL;
-        }
-        gsm->txframe = kmalloc(2 * MAX_MRU + 2, GFP_KERNEL);
-        if (gsm->txframe == NULL) {
-                kfree(gsm->buf);
-                kfree(gsm);
-                return NULL;
-        }
-        spin_lock_init(&gsm->lock);
-
-        gsm->t1 = T1;
-        gsm->t2 = T2;
-        gsm->n2 = N2;
-        gsm->ftype = UIH;
-        gsm->initiator = 0;
-        gsm->adaption = 1;
-        gsm->encoding = 1;
-        gsm->mru = 64;  /* Default to encoding 1 so these should be 64 */
-        gsm->mtu = 64;
-        gsm->dead = 1;  /* Avoid early tty opens */
-
-        return gsm;
-}
-EXPORT_SYMBOL_GPL(gsm_alloc_mux);
-
-
-
-
-/**
- *      gsmld_output            -       write to link
- *      @gsm: our mux
- *      @data: bytes to output
- *      @len: size
- *
- *      Write a block of data from the GSM mux to the data channel. This
- *      will eventually be serialized from above but at the moment isn't.
- */
-
-static int gsmld_output(struct gsm_mux *gsm, u8 *data, int len)
-{
-        if (tty_write_room(gsm->tty) < len) {
-                set_bit(TTY_DO_WRITE_WAKEUP, &gsm->tty->flags);
-                return -ENOSPC;
-        }
-        if (debug & 4) {
-                printk("-->%d bytes out\n", len);
-                hex_packet(data, len);
-        }
-        gsm->tty->ops->write(gsm->tty, data, len);
-        return len;
-}
-
-/**
- *      gsmld_attach_gsm        -       mode set up
- *      @tty: our tty structure
- *      @gsm: our mux
- *
- *      Set up the MUX for basic mode and commence connecting to the
- *      modem. Currently called from the line discipline set up but
- *      will need moving to an ioctl path.
- */
-
-static int gsmld_attach_gsm(struct tty_struct *tty, struct gsm_mux *gsm)
-{
-        int ret;
-
-        gsm->tty = tty_kref_get(tty);
-        gsm->output = gsmld_output;
-        ret =  gsm_activate_mux(gsm);
-        if (ret != 0)
-                tty_kref_put(gsm->tty);
-        return ret;
-}
-
-
-/**
- *      gsmld_detach_gsm        -       stop doing 0710 mux
- *      @tty: tty atttached to the mux
- *      @gsm: mux
- *
- *      Shutdown and then clean up the resources used by the line discipline
- */
-
-static void gsmld_detach_gsm(struct tty_struct *tty, struct gsm_mux *gsm)
-{
-        WARN_ON(tty != gsm->tty);
-        gsm_cleanup_mux(gsm);
-        tty_kref_put(gsm->tty);
-        gsm->tty = NULL;
-}
-
-static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp,
-                              char *fp, int count)
-{
-        struct gsm_mux *gsm = tty->disc_data;
-        const unsigned char *dp;
-        char *f;
-        int i;
-        char buf[64];
-        char flags;
-
-        if (debug & 4) {
-                printk("Inbytes %dd\n", count);
-                hex_packet(cp, count);
-        }
-
-        for (i = count, dp = cp, f = fp; i; i--, dp++) {
-                flags = *f++;
-                switch (flags) {
-                case TTY_NORMAL:
-                        gsm->receive(gsm, *dp);
-                        break;
-                case TTY_OVERRUN:
-                case TTY_BREAK:
-                case TTY_PARITY:
-                case TTY_FRAME:
-                        gsm->error(gsm, *dp, flags);
-                        break;
-                default:
-                        printk(KERN_ERR "%s: unknown flag %d\n",
-                               tty_name(tty, buf), flags);
-                        break;
-                }
-        }
-        /* FASYNC if needed ? */
-        /* If clogged call tty_throttle(tty); */
-}
-
-/**
- *      gsmld_chars_in_buffer   -       report available bytes
- *      @tty: tty device
- *
- *      Report the number of characters buffered to be delivered to user
- *      at this instant in time.
- *
- *      Locking: gsm lock
- */
-
-static ssize_t gsmld_chars_in_buffer(struct tty_struct *tty)
-{
-        return 0;
-}
-
-/**
- *      gsmld_flush_buffer      -       clean input queue
- *      @tty:   terminal device
- *
- *      Flush the input buffer. Called when the line discipline is
- *      being closed, when the tty layer wants the buffer flushed (eg
- *      at hangup).
- */
-
-static void gsmld_flush_buffer(struct tty_struct *tty)
-{
-}
-
-/**
- *      gsmld_close             -       close the ldisc for this tty
- *      @tty: device
- *
- *      Called from the terminal layer when this line discipline is
- *      being shut down, either because of a close or becsuse of a
- *      discipline change. The function will not be called while other
- *      ldisc methods are in progress.
- */
-
-static void gsmld_close(struct tty_struct *tty)
-{
-        struct gsm_mux *gsm = tty->disc_data;
-
-        gsmld_detach_gsm(tty, gsm);
-
-        gsmld_flush_buffer(tty);
-        /* Do other clean up here */
-        gsm_free_mux(gsm);
-}
-
-/**
- *      gsmld_open              -       open an ldisc
- *      @tty: terminal to open
- *
- *      Called when this line discipline is being attached to the
- *      terminal device. Can sleep. Called serialized so that no
- *      other events will occur in parallel. No further open will occur
- *      until a close.
- */
-
-static int gsmld_open(struct tty_struct *tty)
-{
-        struct gsm_mux *gsm;
-
-        if (tty->ops->write == NULL)
-                return -EINVAL;
-
-        /* Attach our ldisc data */
-        gsm = gsm_alloc_mux();
-        if (gsm == NULL)
-                return -ENOMEM;
-
-        tty->disc_data = gsm;
-        tty->receive_room = 65536;
-
-        /* Attach the initial passive connection */
-        gsm->encoding = 1;
-        return gsmld_attach_gsm(tty, gsm);
-}
-
-/**
- *      gsmld_write_wakeup      -       asynchronous I/O notifier
- *      @tty: tty device
- *
- *      Required for the ptys, serial driver etc. since processes
- *      that attach themselves to the master and rely on ASYNC
- *      IO must be woken up
- */
-
-static void gsmld_write_wakeup(struct tty_struct *tty)
-{
-        struct gsm_mux *gsm = tty->disc_data;
-        unsigned long flags;
-
-        /* Queue poll */
-        clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
-        gsm_data_kick(gsm);
-        if (gsm->tx_bytes < TX_THRESH_LO) {
-                spin_lock_irqsave(&gsm->tx_lock, flags);
-                gsm_dlci_data_sweep(gsm);
-                spin_unlock_irqrestore(&gsm->tx_lock, flags);
-        }
-}
-
-/**
- *      gsmld_read              -       read function for tty
- *      @tty: tty device
- *      @file: file object
- *      @buf: userspace buffer pointer
- *      @nr: size of I/O
- *
- *      Perform reads for the line discipline. We are guaranteed that the
- *      line discipline will not be closed under us but we may get multiple
- *      parallel readers and must handle this ourselves. We may also get
- *      a hangup. Always called in user context, may sleep.
- *
- *      This code must be sure never to sleep through a hangup.
- */
-
-static ssize_t gsmld_read(struct tty_struct *tty, struct file *file,
-                         unsigned char __user *buf, size_t nr)
-{
-        return -EOPNOTSUPP;
-}
-
-/**
- *      gsmld_write             -       write function for tty
- *      @tty: tty device
- *      @file: file object
- *      @buf: userspace buffer pointer
- *      @nr: size of I/O
- *
- *      Called when the owner of the device wants to send a frame
- *      itself (or some other control data). The data is transferred
- *      as-is and must be properly framed and checksummed as appropriate
- *      by userspace. Frames are either sent whole or not at all as this
- *      avoids pain user side.
- */
-
-static ssize_t gsmld_write(struct tty_struct *tty, struct file *file,
-                           const unsigned char *buf, size_t nr)
-{
-        int space = tty_write_room(tty);
-        if (space >= nr)
-                return tty->ops->write(tty, buf, nr);
-        set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
-        return -ENOBUFS;
-}
-
-/**
- *      gsmld_poll              -       poll method for N_GSM0710
- *      @tty: terminal device
- *      @file: file accessing it
- *      @wait: poll table
- *
- *      Called when the line discipline is asked to poll() for data or
- *      for special events. This code is not serialized with respect to
- *      other events save open/close.
- *
- *      This code must be sure never to sleep through a hangup.
- *      Called without the kernel lock held - fine
- */
-
-static unsigned int gsmld_poll(struct tty_struct *tty, struct file *file,
-                                                        poll_table *wait)
-{
-        unsigned int mask = 0;
-        struct gsm_mux *gsm = tty->disc_data;
-
-        poll_wait(file, &tty->read_wait, wait);
-        poll_wait(file, &tty->write_wait, wait);
-        if (tty_hung_up_p(file))
-                mask |= POLLHUP;
-        if (!tty_is_writelocked(tty) && tty_write_room(tty) > 0)
-                mask |= POLLOUT | POLLWRNORM;
-        if (gsm->dead)
-                mask |= POLLHUP;
-        return mask;
-}
-
-static int gsmld_config(struct tty_struct *tty, struct gsm_mux *gsm,
-                                                        struct gsm_config *c)
-{
-        int need_close = 0;
-        int need_restart = 0;
-
-        /* Stuff we don't support yet - UI or I frame transport, windowing */
-        if ((c->adaption !=1 && c->adaption != 2) || c->k)
-                return -EOPNOTSUPP;
-        /* Check the MRU/MTU range looks sane */
-        if (c->mru > MAX_MRU || c->mtu > MAX_MTU || c->mru < 8 || c->mtu < 8)
-                return -EINVAL;
-        if (c->n2 < 3)
-                return -EINVAL;
-        if (c->encapsulation > 1)       /* Basic, advanced, no I */
-                return -EINVAL;
-        if (c->initiator > 1)
-                return -EINVAL;
-        if (c->i == 0 || c->i > 2)      /* UIH and UI only */
-                return -EINVAL;
-        /*
-         *      See what is needed for reconfiguration
-         */
-
-        /* Timing fields */
-        if (c->t1 != 0 && c->t1 != gsm->t1)
-                need_restart = 1;
-        if (c->t2 != 0 && c->t2 != gsm->t2)
-                need_restart = 1;
-        if (c->encapsulation != gsm->encoding)
-                need_restart = 1;
-        if (c->adaption != gsm->adaption)
-                need_restart = 1;
-        /* Requires care */
-        if (c->initiator != gsm->initiator)
-                need_close = 1;
-        if (c->mru != gsm->mru)
-                need_restart = 1;
-        if (c->mtu != gsm->mtu)
-                need_restart = 1;
-
-        /*
-         *      Close down what is needed, restart and initiate the new
-         *      configuration
-         */
-
-        if (need_close || need_restart) {
-                gsm_dlci_begin_close(gsm->dlci[0]);
-                /* This will timeout if the link is down due to N2 expiring */
-                wait_event_interruptible(gsm->event,
-                                gsm->dlci[0]->state == DLCI_CLOSED);
-                if (signal_pending(current))
-                        return -EINTR;
-        }
-        if (need_restart)
-                gsm_cleanup_mux(gsm);
-
-        gsm->initiator = c->initiator;
-        gsm->mru = c->mru;
-        gsm->encoding = c->encapsulation;
-        gsm->adaption = c->adaption;
-
-        if (c->i == 1)
-                gsm->ftype = UIH;
-        else if (c->i == 2)
-                gsm->ftype = UI;
-
-        if (c->t1)
-                gsm->t1 = c->t1;
-        if (c->t2)
-                gsm->t2 = c->t2;
-
-        /* FIXME: We need to separate activation/deactivation from adding
-           and removing from the mux array */
-        if (need_restart)
-                gsm_activate_mux(gsm);
-        if (gsm->initiator && need_close)
-                gsm_dlci_begin_open(gsm->dlci[0]);
-        return 0;
-}
-
-static int gsmld_ioctl(struct tty_struct *tty, struct file *file,
-                       unsigned int cmd, unsigned long arg)
-{
-        struct gsm_config c;
-        struct gsm_mux *gsm = tty->disc_data;
-
-        switch (cmd) {
-        case GSMIOC_GETCONF:
-                memset(&c, 0, sizeof(c));
-                c.adaption = gsm->adaption;
-                c.encapsulation = gsm->encoding;
-                c.initiator = gsm->initiator;
-                c.t1 = gsm->t1;
-                c.t2 = gsm->t2;
-                c.t3 = 0;       /* Not supported */
-                c.n2 = gsm->n2;
-                if (gsm->ftype == UIH)
-                        c.i = 1;
-                else
-                        c.i = 2;
-                printk("Ftype %d i %d\n", gsm->ftype, c.i);
-                c.mru = gsm->mru;
-                c.mtu = gsm->mtu;
-                c.k = 0;
-                if (copy_to_user((void *)arg, &c, sizeof(c)))
-                        return -EFAULT;
-                return 0;
-        case GSMIOC_SETCONF:
-                if (copy_from_user(&c, (void *)arg, sizeof(c)))
-                        return -EFAULT;
-                return gsmld_config(tty, gsm, &c);
-        default:
-                return n_tty_ioctl_helper(tty, file, cmd, arg);
-        }
-}
-
-
-/* Line discipline for real tty */
-struct tty_ldisc_ops tty_ldisc_packet = {
-        .owner           = THIS_MODULE,
-        .magic           = TTY_LDISC_MAGIC,
-        .name            = "n_gsm",
-        .open            = gsmld_open,
-        .close           = gsmld_close,
-        .flush_buffer    = gsmld_flush_buffer,
-        .chars_in_buffer = gsmld_chars_in_buffer,
-        .read            = gsmld_read,
-        .write           = gsmld_write,
-        .ioctl           = gsmld_ioctl,
-        .poll            = gsmld_poll,
-        .receive_buf     = gsmld_receive_buf,
-        .write_wakeup    = gsmld_write_wakeup
-};
-
-/*
- *      Virtual tty side
- */
-
-#define TX_SIZE         512
-
-static int gsmtty_modem_update(struct gsm_dlci *dlci, u8 brk)
-{
-        u8 modembits[5];
-        struct gsm_control *ctrl;
-        int len = 2;
-
-        if (brk)
-                len++;
-
-        modembits[0] = len << 1 | EA;           /* Data bytes */
-        modembits[1] = dlci->addr << 2 | 3;     /* DLCI, EA, 1 */
-        modembits[2] = gsm_encode_modem(dlci) << 1 | EA;
-        if (brk)
-                modembits[3] = brk << 4 | 2 | EA;       /* Valid, EA */
-        ctrl = gsm_control_send(dlci->gsm, CMD_MSC, modembits, len + 1);
-        if (ctrl == NULL)
-                return -ENOMEM;
-        return gsm_control_wait(dlci->gsm, ctrl);
-}
-
-static int gsm_carrier_raised(struct tty_port *port)
-{
-        struct gsm_dlci *dlci = container_of(port, struct gsm_dlci, port);
-        /* Not yet open so no carrier info */
-        if (dlci->state != DLCI_OPEN)
-                return 0;
-        if (debug & 2)
-                return 1;
-        return dlci->modem_rx & TIOCM_CD;
-}
-
-static void gsm_dtr_rts(struct tty_port *port, int onoff)
-{
-        struct gsm_dlci *dlci = container_of(port, struct gsm_dlci, port);
-        unsigned int modem_tx = dlci->modem_tx;
-        if (onoff)
-                modem_tx |= TIOCM_DTR | TIOCM_RTS;
-        else
-                modem_tx &= ~(TIOCM_DTR | TIOCM_RTS);
-        if (modem_tx != dlci->modem_tx) {
-                dlci->modem_tx = modem_tx;
-                gsmtty_modem_update(dlci, 0);
-        }
-}
-
-static const struct tty_port_operations gsm_port_ops = {
-        .carrier_raised = gsm_carrier_raised,
-        .dtr_rts = gsm_dtr_rts,
-};
-
-
-static int gsmtty_open(struct tty_struct *tty, struct file *filp)
-{
-        struct gsm_mux *gsm;
-        struct gsm_dlci *dlci;
-        struct tty_port *port;
-        unsigned int line = tty->index;
-        unsigned int mux = line >> 6;
-
-        line = line & 0x3F;
-
-        if (mux >= MAX_MUX)
-                return -ENXIO;
-        /* FIXME: we need to lock gsm_mux for lifetimes of ttys eventually */
-        if (gsm_mux[mux] == NULL)
-                return -EUNATCH;
-        if (line == 0 || line > 61)     /* 62/63 reserved */
-                return -ECHRNG;
-        gsm = gsm_mux[mux];
-        if (gsm->dead)
-                return -EL2HLT;
-        dlci = gsm->dlci[line];
-        if (dlci == NULL)
-                dlci = gsm_dlci_alloc(gsm, line);
-        if (dlci == NULL)
-                return -ENOMEM;
-        port = &dlci->port;
-        port->count++;
-        tty->driver_data = dlci;
-        tty_port_tty_set(port, tty);
-
-        dlci->modem_rx = 0;
-        /* We could in theory open and close before we wait - eg if we get
-           a DM straight back. This is ok as that will have caused a hangup */
-        set_bit(ASYNCB_INITIALIZED, &port->flags);
-        /* Start sending off SABM messages */
-        gsm_dlci_begin_open(dlci);
-        /* And wait for virtual carrier */
-        return tty_port_block_til_ready(port, tty, filp);
-}
-
-static void gsmtty_close(struct tty_struct *tty, struct file *filp)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        if (dlci == NULL)
-                return;
-        if (tty_port_close_start(&dlci->port, tty, filp) == 0)
-                return;
-        gsm_dlci_begin_close(dlci);
-        tty_port_close_end(&dlci->port, tty);
-        tty_port_tty_set(&dlci->port, NULL);
-}
-
-static void gsmtty_hangup(struct tty_struct *tty)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        tty_port_hangup(&dlci->port);
-        gsm_dlci_begin_close(dlci);
-}
-
-static int gsmtty_write(struct tty_struct *tty, const unsigned char *buf,
-                                                                    int len)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        /* Stuff the bytes into the fifo queue */
-        int sent = kfifo_in_locked(dlci->fifo, buf, len, &dlci->lock);
-        /* Need to kick the channel */
-        gsm_dlci_data_kick(dlci);
-        return sent;
-}
-
-static int gsmtty_write_room(struct tty_struct *tty)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        return TX_SIZE - kfifo_len(dlci->fifo);
-}
-
-static int gsmtty_chars_in_buffer(struct tty_struct *tty)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        return kfifo_len(dlci->fifo);
-}
-
-static void gsmtty_flush_buffer(struct tty_struct *tty)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        /* Caution needed: If we implement reliable transport classes
-           then the data being transmitted can't simply be junked once
-           it has first hit the stack. Until then we can just blow it
-           away */
-        kfifo_reset(dlci->fifo);
-        /* Need to unhook this DLCI from the transmit queue logic */
-}
-
-static void gsmtty_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-        /* The FIFO handles the queue so the kernel will do the right
-           thing waiting on chars_in_buffer before calling us. No work
-           to do here */
-}
-
-static int gsmtty_tiocmget(struct tty_struct *tty, struct file *filp)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        return dlci->modem_rx;
-}
-
-static int gsmtty_tiocmset(struct tty_struct *tty, struct file *filp,
-        unsigned int set, unsigned int clear)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        unsigned int modem_tx = dlci->modem_tx;
-
-        modem_tx &= clear;
-        modem_tx |= set;
-
-        if (modem_tx != dlci->modem_tx) {
-                dlci->modem_tx = modem_tx;
-                return gsmtty_modem_update(dlci, 0);
-        }
-        return 0;
-}
-
-
-static int gsmtty_ioctl(struct tty_struct *tty, struct file *filp,
-                        unsigned int cmd, unsigned long arg)
-{
-        return -ENOIOCTLCMD;
-}
-
-static void gsmtty_set_termios(struct tty_struct *tty, struct ktermios *old)
-{
-        /* For the moment its fixed. In actual fact the speed information
-           for the virtual channel can be propogated in both directions by
-           the RPN control message. This however rapidly gets nasty as we
-           then have to remap modem signals each way according to whether
-           our virtual cable is null modem etc .. */
-        tty_termios_copy_hw(tty->termios, old);
-}
-
-static void gsmtty_throttle(struct tty_struct *tty)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        if (tty->termios->c_cflag & CRTSCTS)
-                dlci->modem_tx &= ~TIOCM_DTR;
-        dlci->throttled = 1;
-        /* Send an MSC with DTR cleared */
-        gsmtty_modem_update(dlci, 0);
-}
-
-static void gsmtty_unthrottle(struct tty_struct *tty)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        if (tty->termios->c_cflag & CRTSCTS)
-                dlci->modem_tx |= TIOCM_DTR;
-        dlci->throttled = 0;
-        /* Send an MSC with DTR set */
-        gsmtty_modem_update(dlci, 0);
-}
-
-static int gsmtty_break_ctl(struct tty_struct *tty, int state)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        int encode = 0; /* Off */
-
-        if (state == -1)        /* "On indefinitely" - we can't encode this
-                                    properly */
-                encode = 0x0F;
-        else if (state > 0) {
-                encode = state / 200;   /* mS to encoding */
-                if (encode > 0x0F)
-                        encode = 0x0F;  /* Best effort */
-        }
-        return gsmtty_modem_update(dlci, encode);
-}
-
-static struct tty_driver *gsm_tty_driver;
-
-/* Virtual ttys for the demux */
-static const struct tty_operations gsmtty_ops = {
-        .open                   = gsmtty_open,
-        .close                  = gsmtty_close,
-        .write                  = gsmtty_write,
-        .write_room             = gsmtty_write_room,
-        .chars_in_buffer        = gsmtty_chars_in_buffer,
-        .flush_buffer           = gsmtty_flush_buffer,
-        .ioctl                  = gsmtty_ioctl,
-        .throttle               = gsmtty_throttle,
-        .unthrottle             = gsmtty_unthrottle,
-        .set_termios            = gsmtty_set_termios,
-        .hangup                 = gsmtty_hangup,
-        .wait_until_sent        = gsmtty_wait_until_sent,
-        .tiocmget               = gsmtty_tiocmget,
-        .tiocmset               = gsmtty_tiocmset,
-        .break_ctl              = gsmtty_break_ctl,
-};
-
-
-
-static int __init gsm_init(void)
-{
-        /* Fill in our line protocol discipline, and register it */
-        int status = tty_register_ldisc(N_GSM0710, &tty_ldisc_packet);
-        if (status != 0) {
-                printk(KERN_ERR "n_gsm: can't register line discipline (err = %d)\n", status);
-                return status;
-        }
-
-        gsm_tty_driver = alloc_tty_driver(256);
-        if (!gsm_tty_driver) {
-                tty_unregister_ldisc(N_GSM0710);
-                printk(KERN_ERR "gsm_init: tty allocation failed.\n");
-                return -EINVAL;
-        }
-        gsm_tty_driver->owner   = THIS_MODULE;
-        gsm_tty_driver->driver_name     = "gsmtty";
-        gsm_tty_driver->name            = "gsmtty";
-        gsm_tty_driver->major           = 0;    /* Dynamic */
-        gsm_tty_driver->minor_start     = 0;
-        gsm_tty_driver->type            = TTY_DRIVER_TYPE_SERIAL;
-        gsm_tty_driver->subtype = SERIAL_TYPE_NORMAL;
-        gsm_tty_driver->flags   = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV
-                                                        | TTY_DRIVER_HARDWARE_BREAK;
-        gsm_tty_driver->init_termios    = tty_std_termios;
-        /* Fixme */
-        gsm_tty_driver->init_termios.c_lflag &= ~ECHO;
-        tty_set_operations(gsm_tty_driver, &gsmtty_ops);
-
-        spin_lock_init(&gsm_mux_lock);
-
-        if (tty_register_driver(gsm_tty_driver)) {
-                put_tty_driver(gsm_tty_driver);
-                tty_unregister_ldisc(N_GSM0710);
-                printk(KERN_ERR "gsm_init: tty registration failed.\n");
-                return -EBUSY;
-        }
-        printk(KERN_INFO "gsm_init: loaded as %d,%d.\n", gsm_tty_driver->major, gsm_tty_driver->minor_start);
-        return 0;
-}
-
-static void __exit gsm_exit(void)
-{
-        int status = tty_unregister_ldisc(N_GSM0710);
-        if (status != 0)
-                printk(KERN_ERR "n_gsm: can't unregister line discipline (err = %d)\n", status);
-        tty_unregister_driver(gsm_tty_driver);
-        put_tty_driver(gsm_tty_driver);
-        printk(KERN_INFO "gsm_init: unloaded.\n");
-}
-
-module_init(gsm_init);
-module_exit(gsm_exit);
-
-
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_LDISC(N_GSM0710);
diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c
deleted file mode 100644
index 47d32281032c..000000000000
--- a/drivers/char/n_hdlc.c
+++ /dev/null
@@ -1,1007 +0,0 @@
-/* generic HDLC line discipline for Linux
- *
- * Written by Paul Fulghum paulkf@microgate.com
- * for Microgate Corporation
- *
- * Microgate and SyncLink are registered trademarks of Microgate Corporation
- *
- * Adapted from ppp.c, written by Michael Callahan <callahan@maths.ox.ac.uk>,
- *      Al Longyear <longyear@netcom.com>,
- *      Paul Mackerras <Paul.Mackerras@cs.anu.edu.au>
- *
- * Original release 01/11/99
- *
- * This code is released under the GNU General Public License (GPL)
- *
- * This module implements the tty line discipline N_HDLC for use with
- * tty device drivers that support bit-synchronous HDLC communications.
- *
- * All HDLC data is frame oriented which means:
- *
- * 1. tty write calls represent one complete transmit frame of data
- *    The device driver should accept the complete frame or none of 
- *    the frame (busy) in the write method. Each write call should have
- *    a byte count in the range of 2-65535 bytes (2 is min HDLC frame
- *    with 1 addr byte and 1 ctrl byte). The max byte count of 65535
- *    should include any crc bytes required. For example, when using
- *    CCITT CRC32, 4 crc bytes are required, so the maximum size frame
- *    the application may transmit is limited to 65531 bytes. For CCITT
- *    CRC16, the maximum application frame size would be 65533.
- *
- *
- * 2. receive callbacks from the device driver represents
- *    one received frame. The device driver should bypass
- *    the tty flip buffer and call the line discipline receive
- *    callback directly to avoid fragmenting or concatenating
- *    multiple frames into a single receive callback.
- *
- *    The HDLC line discipline queues the receive frames in separate
- *    buffers so complete receive frames can be returned by the
- *    tty read calls.
- *
- * 3. tty read calls returns an entire frame of data or nothing.
- *    
- * 4. all send and receive data is considered raw. No processing
- *    or translation is performed by the line discipline, regardless
- *    of the tty flags
- *
- * 5. When line discipline is queried for the amount of receive
- *    data available (FIOC), 0 is returned if no data available,
- *    otherwise the count of the next available frame is returned.
- *    (instead of the sum of all received frame counts).
- *
- * These conventions allow the standard tty programming interface
- * to be used for synchronous HDLC applications when used with
- * this line discipline (or another line discipline that is frame
- * oriented such as N_PPP).
- *
- * The SyncLink driver (synclink.c) implements both asynchronous
- * (using standard line discipline N_TTY) and synchronous HDLC
- * (using N_HDLC) communications, with the latter using the above
- * conventions.
- *
- * This implementation is very basic and does not maintain
- * any statistics. The main point is to enforce the raw data
- * and frame orientation of HDLC communications.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define HDLC_MAGIC 0x239e
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/fcntl.h>
-#include <linux/interrupt.h>
-#include <linux/ptrace.h>
-
-#undef VERSION
-#define VERSION(major,minor,patch) (((((major)<<8)+(minor))<<8)+(patch))
-
-#include <linux/poll.h>
-#include <linux/in.h>
-#include <linux/ioctl.h>
-#include <linux/slab.h>
-#include <linux/tty.h>
-#include <linux/errno.h>
-#include <linux/smp_lock.h>
-#include <linux/string.h>       /* used in new tty drivers */
-#include <linux/signal.h>       /* used in new tty drivers */
-#include <linux/if.h>
-#include <linux/bitops.h>
-
-#include <asm/system.h>
-#include <asm/termios.h>
-#include <asm/uaccess.h>
-
-/*
- * Buffers for individual HDLC frames
- */
-#define MAX_HDLC_FRAME_SIZE 65535 
-#define DEFAULT_RX_BUF_COUNT 10
-#define MAX_RX_BUF_COUNT 60
-#define DEFAULT_TX_BUF_COUNT 3
-
-struct n_hdlc_buf {
-        struct n_hdlc_buf *link;
-        int               count;
-        char              buf[1];
-};
-
-#define N_HDLC_BUF_SIZE (sizeof(struct n_hdlc_buf) + maxframe)
-
-struct n_hdlc_buf_list {
-        struct n_hdlc_buf *head;
-        struct n_hdlc_buf *tail;
-        int               count;
-        spinlock_t        spinlock;
-};
-
-/**
- * struct n_hdlc - per device instance data structure
- * @magic - magic value for structure
- * @flags - miscellaneous control flags
- * @tty - ptr to TTY structure
- * @backup_tty - TTY to use if tty gets closed
- * @tbusy - reentrancy flag for tx wakeup code
- * @woke_up - FIXME: describe this field
- * @tbuf - currently transmitting tx buffer
- * @tx_buf_list - list of pending transmit frame buffers
- * @rx_buf_list - list of received frame buffers
- * @tx_free_buf_list - list unused transmit frame buffers
- * @rx_free_buf_list - list unused received frame buffers
- */
-struct n_hdlc {
-        int                     magic;
-        __u32                   flags;
-        struct tty_struct       *tty;
-        struct tty_struct       *backup_tty;
-        int                     tbusy;
-        int                     woke_up;
-        struct n_hdlc_buf       *tbuf;
-        struct n_hdlc_buf_list  tx_buf_list;
-        struct n_hdlc_buf_list  rx_buf_list;
-        struct n_hdlc_buf_list  tx_free_buf_list;
-        struct n_hdlc_buf_list  rx_free_buf_list;
-};
-
-/*
- * HDLC buffer list manipulation functions
- */
-static void n_hdlc_buf_list_init(struct n_hdlc_buf_list *list);
-static void n_hdlc_buf_put(struct n_hdlc_buf_list *list,
-                           struct n_hdlc_buf *buf);
-static struct n_hdlc_buf *n_hdlc_buf_get(struct n_hdlc_buf_list *list);
-
-/* Local functions */
-
-static struct n_hdlc *n_hdlc_alloc (void);
-
-/* debug level can be set by insmod for debugging purposes */
-#define DEBUG_LEVEL_INFO        1
-static int debuglevel;
-
-/* max frame size for memory allocations */
-static int maxframe = 4096;
-
-/* TTY callbacks */
-
-static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,
-                           __u8 __user *buf, size_t nr);
-static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
-                            const unsigned char *buf, size_t nr);
-static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
-                            unsigned int cmd, unsigned long arg);
-static unsigned int n_hdlc_tty_poll(struct tty_struct *tty, struct file *filp,
-                                    poll_table *wait);
-static int n_hdlc_tty_open(struct tty_struct *tty);
-static void n_hdlc_tty_close(struct tty_struct *tty);
-static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *cp,
-                               char *fp, int count);
-static void n_hdlc_tty_wakeup(struct tty_struct *tty);
-
-#define bset(p,b)       ((p)[(b) >> 5] |= (1 << ((b) & 0x1f)))
-
-#define tty2n_hdlc(tty) ((struct n_hdlc *) ((tty)->disc_data))
-#define n_hdlc2tty(n_hdlc)      ((n_hdlc)->tty)
-
-static void flush_rx_queue(struct tty_struct *tty)
-{
-        struct n_hdlc *n_hdlc = tty2n_hdlc(tty);
-        struct n_hdlc_buf *buf;
-
-        while ((buf = n_hdlc_buf_get(&n_hdlc->rx_buf_list)))
-                n_hdlc_buf_put(&n_hdlc->rx_free_buf_list, buf);
-}
-
-static void flush_tx_queue(struct tty_struct *tty)
-{
-        struct n_hdlc *n_hdlc = tty2n_hdlc(tty);
-        struct n_hdlc_buf *buf;
-        unsigned long flags;
-
-        while ((buf = n_hdlc_buf_get(&n_hdlc->tx_buf_list)))
-                n_hdlc_buf_put(&n_hdlc->tx_free_buf_list, buf);
-        spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags);
-        if (n_hdlc->tbuf) {
-                n_hdlc_buf_put(&n_hdlc->tx_free_buf_list, n_hdlc->tbuf);
-                n_hdlc->tbuf = NULL;
-        }
-        spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock, flags);
-}
-
-static struct tty_ldisc_ops n_hdlc_ldisc = {
-        .owner          = THIS_MODULE,
-        .magic          = TTY_LDISC_MAGIC,
-        .name           = "hdlc",
-        .open           = n_hdlc_tty_open,
-        .close          = n_hdlc_tty_close,
-        .read           = n_hdlc_tty_read,
-        .write          = n_hdlc_tty_write,
-        .ioctl          = n_hdlc_tty_ioctl,
-        .poll           = n_hdlc_tty_poll,
-        .receive_buf    = n_hdlc_tty_receive,
-        .write_wakeup   = n_hdlc_tty_wakeup,
-        .flush_buffer   = flush_rx_queue,
-};
-
-/**
- * n_hdlc_release - release an n_hdlc per device line discipline info structure
- * @n_hdlc - per device line discipline info structure
- */
-static void n_hdlc_release(struct n_hdlc *n_hdlc)
-{
-        struct tty_struct *tty = n_hdlc2tty (n_hdlc);
-        struct n_hdlc_buf *buf;
-        
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_release() called\n",__FILE__,__LINE__);
-                
-        /* Ensure that the n_hdlcd process is not hanging on select()/poll() */
-        wake_up_interruptible (&tty->read_wait);
-        wake_up_interruptible (&tty->write_wait);
-
-        if (tty->disc_data == n_hdlc)
-                tty->disc_data = NULL;  /* Break the tty->n_hdlc link */
-
-        /* Release transmit and receive buffers */
-        for(;;) {
-                buf = n_hdlc_buf_get(&n_hdlc->rx_free_buf_list);
-                if (buf) {
-                        kfree(buf);
-                } else
-                        break;
-        }
-        for(;;) {
-                buf = n_hdlc_buf_get(&n_hdlc->tx_free_buf_list);
-                if (buf) {
-                        kfree(buf);
-                } else
-                        break;
-        }
-        for(;;) {
-                buf = n_hdlc_buf_get(&n_hdlc->rx_buf_list);
-                if (buf) {
-                        kfree(buf);
-                } else
-                        break;
-        }
-        for(;;) {
-                buf = n_hdlc_buf_get(&n_hdlc->tx_buf_list);
-                if (buf) {
-                        kfree(buf);
-                } else
-                        break;
-        }
-        kfree(n_hdlc->tbuf);
-        kfree(n_hdlc);
-        
-}       /* end of n_hdlc_release() */
-
-/**
- * n_hdlc_tty_close - line discipline close
- * @tty - pointer to tty info structure
- *
- * Called when the line discipline is changed to something
- * else, the tty is closed, or the tty detects a hangup.
- */
-static void n_hdlc_tty_close(struct tty_struct *tty)
-{
-        struct n_hdlc *n_hdlc = tty2n_hdlc (tty);
-
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_tty_close() called\n",__FILE__,__LINE__);
-                
-        if (n_hdlc != NULL) {
-                if (n_hdlc->magic != HDLC_MAGIC) {
-                        printk (KERN_WARNING"n_hdlc: trying to close unopened tty!\n");
-                        return;
-                }
-#if defined(TTY_NO_WRITE_SPLIT)
-                clear_bit(TTY_NO_WRITE_SPLIT,&tty->flags);
-#endif
-                tty->disc_data = NULL;
-                if (tty == n_hdlc->backup_tty)
-                        n_hdlc->backup_tty = NULL;
-                if (tty != n_hdlc->tty)
-                        return;
-                if (n_hdlc->backup_tty) {
-                        n_hdlc->tty = n_hdlc->backup_tty;
-                } else {
-                        n_hdlc_release (n_hdlc);
-                }
-        }
-        
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_tty_close() success\n",__FILE__,__LINE__);
-                
-}       /* end of n_hdlc_tty_close() */
-
-/**
- * n_hdlc_tty_open - called when line discipline changed to n_hdlc
- * @tty - pointer to tty info structure
- *
- * Returns 0 if success, otherwise error code
- */
-static int n_hdlc_tty_open (struct tty_struct *tty)
-{
-        struct n_hdlc *n_hdlc = tty2n_hdlc (tty);
-
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_tty_open() called (device=%s)\n",
-                __FILE__,__LINE__,
-                tty->name);
-                
-        /* There should not be an existing table for this slot. */
-        if (n_hdlc) {
-                printk (KERN_ERR"n_hdlc_tty_open:tty already associated!\n" );
-                return -EEXIST;
-        }
-        
-        n_hdlc = n_hdlc_alloc();
-        if (!n_hdlc) {
-                printk (KERN_ERR "n_hdlc_alloc failed\n");
-                return -ENFILE;
-        }
-                
-        tty->disc_data = n_hdlc;
-        n_hdlc->tty    = tty;
-        tty->receive_room = 65536;
-        
-#if defined(TTY_NO_WRITE_SPLIT)
-        /* change tty_io write() to not split large writes into 8K chunks */
-        set_bit(TTY_NO_WRITE_SPLIT,&tty->flags);
-#endif
-        
-        /* flush receive data from driver */
-        tty_driver_flush_buffer(tty);
-                
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_tty_open() success\n",__FILE__,__LINE__);
-                
-        return 0;
-        
-}       /* end of n_tty_hdlc_open() */
-
-/**
- * n_hdlc_send_frames - send frames on pending send buffer list
- * @n_hdlc - pointer to ldisc instance data
- * @tty - pointer to tty instance data
- *
- * Send frames on pending send buffer list until the driver does not accept a
- * frame (busy) this function is called after adding a frame to the send buffer
- * list and by the tty wakeup callback.
- */
-static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
-{
-        register int actual;
-        unsigned long flags;
-        struct n_hdlc_buf *tbuf;
-
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_send_frames() called\n",__FILE__,__LINE__);
- check_again:
-                
-        spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags);
-        if (n_hdlc->tbusy) {
-                n_hdlc->woke_up = 1;
-                spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock, flags);
-                return;
-        }
-        n_hdlc->tbusy = 1;
-        n_hdlc->woke_up = 0;
-        spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock, flags);
-
-        /* get current transmit buffer or get new transmit */
-        /* buffer from list of pending transmit buffers */
-                
-        tbuf = n_hdlc->tbuf;
-        if (!tbuf)
-                tbuf = n_hdlc_buf_get(&n_hdlc->tx_buf_list);
-                
-        while (tbuf) {
-                if (debuglevel >= DEBUG_LEVEL_INFO)     
-                        printk("%s(%d)sending frame %p, count=%d\n",
-                                __FILE__,__LINE__,tbuf,tbuf->count);
-                        
-                /* Send the next block of data to device */
-                tty->flags |= (1 << TTY_DO_WRITE_WAKEUP);
-                actual = tty->ops->write(tty, tbuf->buf, tbuf->count);
-
-                /* rollback was possible and has been done */
-                if (actual == -ERESTARTSYS) {
-                        n_hdlc->tbuf = tbuf;
-                        break;
-                }
-                /* if transmit error, throw frame away by */
-                /* pretending it was accepted by driver */
-                if (actual < 0)
-                        actual = tbuf->count;
-                
-                if (actual == tbuf->count) {
-                        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                                printk("%s(%d)frame %p completed\n",
-                                        __FILE__,__LINE__,tbuf);
-                                        
-                        /* free current transmit buffer */
-                        n_hdlc_buf_put(&n_hdlc->tx_free_buf_list, tbuf);
-                        
-                        /* this tx buffer is done */
-                        n_hdlc->tbuf = NULL;
-                        
-                        /* wait up sleeping writers */
-                        wake_up_interruptible(&tty->write_wait);
-        
-                        /* get next pending transmit buffer */
-                        tbuf = n_hdlc_buf_get(&n_hdlc->tx_buf_list);
-                } else {
-                        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                                printk("%s(%d)frame %p pending\n",
-                                        __FILE__,__LINE__,tbuf);
-                                        
-                        /* buffer not accepted by driver */
-                        /* set this buffer as pending buffer */
-                        n_hdlc->tbuf = tbuf;
-                        break;
-                }
-        }
-        
-        if (!tbuf)
-                tty->flags  &= ~(1 << TTY_DO_WRITE_WAKEUP);
-        
-        /* Clear the re-entry flag */
-        spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags);
-        n_hdlc->tbusy = 0;
-        spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock, flags); 
-        
-        if (n_hdlc->woke_up)
-          goto check_again;
-
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_send_frames() exit\n",__FILE__,__LINE__);
-                
-}       /* end of n_hdlc_send_frames() */
-
-/**
- * n_hdlc_tty_wakeup - Callback for transmit wakeup
- * @tty - pointer to associated tty instance data
- *
- * Called when low level device driver can accept more send data.
- */
-static void n_hdlc_tty_wakeup(struct tty_struct *tty)
-{
-        struct n_hdlc *n_hdlc = tty2n_hdlc(tty);
-
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_tty_wakeup() called\n",__FILE__,__LINE__);
-                
-        if (!n_hdlc)
-                return;
-
-        if (tty != n_hdlc->tty) {
-                tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
-                return;
-        }
-
-        n_hdlc_send_frames (n_hdlc, tty);
-                
-}       /* end of n_hdlc_tty_wakeup() */
-
-/**
- * n_hdlc_tty_receive - Called by tty driver when receive data is available
- * @tty - pointer to tty instance data
- * @data - pointer to received data
- * @flags - pointer to flags for data
- * @count - count of received data in bytes
- *
- * Called by tty low level driver when receive data is available. Data is
- * interpreted as one HDLC frame.
- */
-static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data,
-                               char *flags, int count)
-{
-        register struct n_hdlc *n_hdlc = tty2n_hdlc (tty);
-        register struct n_hdlc_buf *buf;
-
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_tty_receive() called count=%d\n",
-                        __FILE__,__LINE__, count);
-                
-        /* This can happen if stuff comes in on the backup tty */
-        if (!n_hdlc || tty != n_hdlc->tty)
-                return;
-                
-        /* verify line is using HDLC discipline */
-        if (n_hdlc->magic != HDLC_MAGIC) {
-                printk("%s(%d) line not using HDLC discipline\n",
-                        __FILE__,__LINE__);
-                return;
-        }
-        
-        if ( count>maxframe ) {
-                if (debuglevel >= DEBUG_LEVEL_INFO)     
-                        printk("%s(%d) rx count>maxframesize, data discarded\n",
-                               __FILE__,__LINE__);
-                return;
-        }
-
-        /* get a free HDLC buffer */    
-        buf = n_hdlc_buf_get(&n_hdlc->rx_free_buf_list);
-        if (!buf) {
-                /* no buffers in free list, attempt to allocate another rx buffer */
-                /* unless the maximum count has been reached */
-                if (n_hdlc->rx_buf_list.count < MAX_RX_BUF_COUNT)
-                        buf = kmalloc(N_HDLC_BUF_SIZE, GFP_ATOMIC);
-        }
-        
-        if (!buf) {
-                if (debuglevel >= DEBUG_LEVEL_INFO)     
-                        printk("%s(%d) no more rx buffers, data discarded\n",
-                               __FILE__,__LINE__);
-                return;
-        }
-                
-        /* copy received data to HDLC buffer */
-        memcpy(buf->buf,data,count);
-        buf->count=count;
-
-        /* add HDLC buffer to list of received frames */
-        n_hdlc_buf_put(&n_hdlc->rx_buf_list, buf);
-        
-        /* wake up any blocked reads and perform async signalling */
-        wake_up_interruptible (&tty->read_wait);
-        if (n_hdlc->tty->fasync != NULL)
-                kill_fasync (&n_hdlc->tty->fasync, SIGIO, POLL_IN);
-
-}       /* end of n_hdlc_tty_receive() */
-
-/**
- * n_hdlc_tty_read - Called to retrieve one frame of data (if available)
- * @tty - pointer to tty instance data
- * @file - pointer to open file object
- * @buf - pointer to returned data buffer
- * @nr - size of returned data buffer
- *      
- * Returns the number of bytes returned or error code.
- */
-static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,
-                           __u8 __user *buf, size_t nr)
-{
-        struct n_hdlc *n_hdlc = tty2n_hdlc(tty);
-        int ret;
-        struct n_hdlc_buf *rbuf;
-
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_tty_read() called\n",__FILE__,__LINE__);
-                
-        /* Validate the pointers */
-        if (!n_hdlc)
-                return -EIO;
-
-        /* verify user access to buffer */
-        if (!access_ok(VERIFY_WRITE, buf, nr)) {
-                printk(KERN_WARNING "%s(%d) n_hdlc_tty_read() can't verify user "
-                "buffer\n", __FILE__, __LINE__);
-                return -EFAULT;
-        }
-
-        tty_lock();
-
-        for (;;) {
-                if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) {
-                        tty_unlock();
-                        return -EIO;
-                }
-
-                n_hdlc = tty2n_hdlc (tty);
-                if (!n_hdlc || n_hdlc->magic != HDLC_MAGIC ||
-                         tty != n_hdlc->tty) {
-                        tty_unlock();
-                        return 0;
-                }
-
-                rbuf = n_hdlc_buf_get(&n_hdlc->rx_buf_list);
-                if (rbuf)
-                        break;
-                        
-                /* no data */
-                if (file->f_flags & O_NONBLOCK) {
-                        tty_unlock();
-                        return -EAGAIN;
-                }
-                        
-                interruptible_sleep_on (&tty->read_wait);
-                if (signal_pending(current)) {
-                        tty_unlock();
-                        return -EINTR;
-                }
-        }
-                
-        if (rbuf->count > nr)
-                /* frame too large for caller's buffer (discard frame) */
-                ret = -EOVERFLOW;
-        else {
-                /* Copy the data to the caller's buffer */
-                if (copy_to_user(buf, rbuf->buf, rbuf->count))
-                        ret = -EFAULT;
-                else
-                        ret = rbuf->count;
-        }
-        
-        /* return HDLC buffer to free list unless the free list */
-        /* count has exceeded the default value, in which case the */
-        /* buffer is freed back to the OS to conserve memory */
-        if (n_hdlc->rx_free_buf_list.count > DEFAULT_RX_BUF_COUNT)
-                kfree(rbuf);
-        else    
-                n_hdlc_buf_put(&n_hdlc->rx_free_buf_list,rbuf);
-        tty_unlock();
-        return ret;
-        
-}       /* end of n_hdlc_tty_read() */
-
-/**
- * n_hdlc_tty_write - write a single frame of data to device
- * @tty - pointer to associated tty device instance data
- * @file - pointer to file object data
- * @data - pointer to transmit data (one frame)
- * @count - size of transmit frame in bytes
- *              
- * Returns the number of bytes written (or error code).
- */
-static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
-                            const unsigned char *data, size_t count)
-{
-        struct n_hdlc *n_hdlc = tty2n_hdlc (tty);
-        int error = 0;
-        DECLARE_WAITQUEUE(wait, current);
-        struct n_hdlc_buf *tbuf;
-
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_tty_write() called count=%Zd\n",
-                        __FILE__,__LINE__,count);
-                
-        /* Verify pointers */
-        if (!n_hdlc)
-                return -EIO;
-
-        if (n_hdlc->magic != HDLC_MAGIC)
-                return -EIO;
-
-        /* verify frame size */
-        if (count > maxframe ) {
-                if (debuglevel & DEBUG_LEVEL_INFO)
-                        printk (KERN_WARNING
-                                "n_hdlc_tty_write: truncating user packet "
-                                "from %lu to %d\n", (unsigned long) count,
-                                maxframe );
-                count = maxframe;
-        }
-        
-        tty_lock();
-
-        add_wait_queue(&tty->write_wait, &wait);
-        set_current_state(TASK_INTERRUPTIBLE);
-        
-        /* Allocate transmit buffer */
-        /* sleep until transmit buffer available */             
-        while (!(tbuf = n_hdlc_buf_get(&n_hdlc->tx_free_buf_list))) {
-                if (file->f_flags & O_NONBLOCK) {
-                        error = -EAGAIN;
-                        break;
-                }
-                schedule();
-                        
-                n_hdlc = tty2n_hdlc (tty);
-                if (!n_hdlc || n_hdlc->magic != HDLC_MAGIC || 
-                    tty != n_hdlc->tty) {
-                        printk("n_hdlc_tty_write: %p invalid after wait!\n", n_hdlc);
-                        error = -EIO;
-                        break;
-                }
-                        
-                if (signal_pending(current)) {
-                        error = -EINTR;
-                        break;
-                }
-        }
-
-        set_current_state(TASK_RUNNING);
-        remove_wait_queue(&tty->write_wait, &wait);
-
-        if (!error) {           
-                /* Retrieve the user's buffer */
-                memcpy(tbuf->buf, data, count);
-
-                /* Send the data */
-                tbuf->count = error = count;
-                n_hdlc_buf_put(&n_hdlc->tx_buf_list,tbuf);
-                n_hdlc_send_frames(n_hdlc,tty);
-        }
-        tty_unlock();
-        return error;
-        
-}       /* end of n_hdlc_tty_write() */
-
-/**
- * n_hdlc_tty_ioctl - process IOCTL system call for the tty device.
- * @tty - pointer to tty instance data
- * @file - pointer to open file object for device
- * @cmd - IOCTL command code
- * @arg - argument for IOCTL call (cmd dependent)
- *
- * Returns command dependent result.
- */
-static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
-                            unsigned int cmd, unsigned long arg)
-{
-        struct n_hdlc *n_hdlc = tty2n_hdlc (tty);
-        int error = 0;
-        int count;
-        unsigned long flags;
-        
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_tty_ioctl() called %d\n",
-                        __FILE__,__LINE__,cmd);
-                
-        /* Verify the status of the device */
-        if (!n_hdlc || n_hdlc->magic != HDLC_MAGIC)
-                return -EBADF;
-
-        switch (cmd) {
-        case FIONREAD:
-                /* report count of read data available */
-                /* in next available frame (if any) */
-                spin_lock_irqsave(&n_hdlc->rx_buf_list.spinlock,flags);
-                if (n_hdlc->rx_buf_list.head)
-                        count = n_hdlc->rx_buf_list.head->count;
-                else
-                        count = 0;
-                spin_unlock_irqrestore(&n_hdlc->rx_buf_list.spinlock,flags);
-                error = put_user(count, (int __user *)arg);
-                break;
-
-        case TIOCOUTQ:
-                /* get the pending tx byte count in the driver */
-                count = tty_chars_in_buffer(tty);
-                /* add size of next output frame in queue */
-                spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock,flags);
-                if (n_hdlc->tx_buf_list.head)
-                        count += n_hdlc->tx_buf_list.head->count;
-                spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock,flags);
-                error = put_user(count, (int __user *)arg);
-                break;
-
-        case TCFLSH:
-                switch (arg) {
-                case TCIOFLUSH:
-                case TCOFLUSH:
-                        flush_tx_queue(tty);
-                }
-                /* fall through to default */
-
-        default:
-                error = n_tty_ioctl_helper(tty, file, cmd, arg);
-                break;
-        }
-        return error;
-        
-}       /* end of n_hdlc_tty_ioctl() */
-
-/**
- * n_hdlc_tty_poll - TTY callback for poll system call
- * @tty - pointer to tty instance data
- * @filp - pointer to open file object for device
- * @poll_table - wait queue for operations
- * 
- * Determine which operations (read/write) will not block and return info
- * to caller.
- * Returns a bit mask containing info on which ops will not block.
- */
-static unsigned int n_hdlc_tty_poll(struct tty_struct *tty, struct file *filp,
-                                    poll_table *wait)
-{
-        struct n_hdlc *n_hdlc = tty2n_hdlc (tty);
-        unsigned int mask = 0;
-
-        if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_tty_poll() called\n",__FILE__,__LINE__);
-                
-        if (n_hdlc && n_hdlc->magic == HDLC_MAGIC && tty == n_hdlc->tty) {
-                /* queue current process into any wait queue that */
-                /* may awaken in the future (read and write) */
-
-                poll_wait(filp, &tty->read_wait, wait);
-                poll_wait(filp, &tty->write_wait, wait);
-
-                /* set bits for operations that won't block */
-                if (n_hdlc->rx_buf_list.head)
-                        mask |= POLLIN | POLLRDNORM;    /* readable */
-                if (test_bit(TTY_OTHER_CLOSED, &tty->flags))
-                        mask |= POLLHUP;
-                if (tty_hung_up_p(filp))
-                        mask |= POLLHUP;
-                if (!tty_is_writelocked(tty) &&
-                                n_hdlc->tx_free_buf_list.head)
-                        mask |= POLLOUT | POLLWRNORM;   /* writable */
-        }
-        return mask;
-}       /* end of n_hdlc_tty_poll() */
-
-/**
- * n_hdlc_alloc - allocate an n_hdlc instance data structure
- *
- * Returns a pointer to newly created structure if success, otherwise %NULL
- */
-static struct n_hdlc *n_hdlc_alloc(void)
-{
-        struct n_hdlc_buf *buf;
-        int i;
-        struct n_hdlc *n_hdlc = kmalloc(sizeof(*n_hdlc), GFP_KERNEL);
-
-        if (!n_hdlc)
-                return NULL;
-
-        memset(n_hdlc, 0, sizeof(*n_hdlc));
-
-        n_hdlc_buf_list_init(&n_hdlc->rx_free_buf_list);
-        n_hdlc_buf_list_init(&n_hdlc->tx_free_buf_list);
-        n_hdlc_buf_list_init(&n_hdlc->rx_buf_list);
-        n_hdlc_buf_list_init(&n_hdlc->tx_buf_list);
-        
-        /* allocate free rx buffer list */
-        for(i=0;i<DEFAULT_RX_BUF_COUNT;i++) {
-                buf = kmalloc(N_HDLC_BUF_SIZE, GFP_KERNEL);
-                if (buf)
-                        n_hdlc_buf_put(&n_hdlc->rx_free_buf_list,buf);
-                else if (debuglevel >= DEBUG_LEVEL_INFO)        
-                        printk("%s(%d)n_hdlc_alloc(), kalloc() failed for rx buffer %d\n",__FILE__,__LINE__, i);
-        }
-        
-        /* allocate free tx buffer list */
-        for(i=0;i<DEFAULT_TX_BUF_COUNT;i++) {
-                buf = kmalloc(N_HDLC_BUF_SIZE, GFP_KERNEL);
-                if (buf)
-                        n_hdlc_buf_put(&n_hdlc->tx_free_buf_list,buf);
-                else if (debuglevel >= DEBUG_LEVEL_INFO)        
-                        printk("%s(%d)n_hdlc_alloc(), kalloc() failed for tx buffer %d\n",__FILE__,__LINE__, i);
-        }
-        
-        /* Initialize the control block */
-        n_hdlc->magic  = HDLC_MAGIC;
-        n_hdlc->flags  = 0;
-        
-        return n_hdlc;
-        
-}       /* end of n_hdlc_alloc() */
-
-/**
- * n_hdlc_buf_list_init - initialize specified HDLC buffer list
- * @list - pointer to buffer list
- */
-static void n_hdlc_buf_list_init(struct n_hdlc_buf_list *list)
-{
-        memset(list, 0, sizeof(*list));
-        spin_lock_init(&list->spinlock);
-}       /* end of n_hdlc_buf_list_init() */
-
-/**
- * n_hdlc_buf_put - add specified HDLC buffer to tail of specified list
- * @list - pointer to buffer list
- * @buf - pointer to buffer
- */
-static void n_hdlc_buf_put(struct n_hdlc_buf_list *list,
-                           struct n_hdlc_buf *buf)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&list->spinlock,flags);
-        
-        buf->link=NULL;
-        if (list->tail)
-                list->tail->link = buf;
-        else
-                list->head = buf;
-        list->tail = buf;
-        (list->count)++;
-        
-        spin_unlock_irqrestore(&list->spinlock,flags);
-        
-}       /* end of n_hdlc_buf_put() */
-
-/**
- * n_hdlc_buf_get - remove and return an HDLC buffer from list
- * @list - pointer to HDLC buffer list
- * 
- * Remove and return an HDLC buffer from the head of the specified HDLC buffer
- * list.
- * Returns a pointer to HDLC buffer if available, otherwise %NULL.
- */
-static struct n_hdlc_buf* n_hdlc_buf_get(struct n_hdlc_buf_list *list)
-{
-        unsigned long flags;
-        struct n_hdlc_buf *buf;
-        spin_lock_irqsave(&list->spinlock,flags);
-        
-        buf = list->head;
-        if (buf) {
-                list->head = buf->link;
-                (list->count)--;
-        }
-        if (!list->head)
-                list->tail = NULL;
-        
-        spin_unlock_irqrestore(&list->spinlock,flags);
-        return buf;
-        
-}       /* end of n_hdlc_buf_get() */
-
-static char hdlc_banner[] __initdata =
-        KERN_INFO "HDLC line discipline maxframe=%u\n";
-static char hdlc_register_ok[] __initdata =
-        KERN_INFO "N_HDLC line discipline registered.\n";
-static char hdlc_register_fail[] __initdata =
-        KERN_ERR "error registering line discipline: %d\n";
-static char hdlc_init_fail[] __initdata =
-        KERN_INFO "N_HDLC: init failure %d\n";
-
-static int __init n_hdlc_init(void)
-{
-        int status;
-
-        /* range check maxframe arg */
-        if (maxframe < 4096)
-                maxframe = 4096;
-        else if (maxframe > 65535)
-                maxframe = 65535;
-
-        printk(hdlc_banner, maxframe);
-
-        status = tty_register_ldisc(N_HDLC, &n_hdlc_ldisc);
-        if (!status)
-                printk(hdlc_register_ok);
-        else
-                printk(hdlc_register_fail, status);
-
-        if (status)
-                printk(hdlc_init_fail, status);
-        return status;
-        
-}       /* end of init_module() */
-
-static char hdlc_unregister_ok[] __exitdata =
-        KERN_INFO "N_HDLC: line discipline unregistered\n";
-static char hdlc_unregister_fail[] __exitdata =
-        KERN_ERR "N_HDLC: can't unregister line discipline (err = %d)\n";
-
-static void __exit n_hdlc_exit(void)
-{
-        /* Release tty registration of line discipline */
-        int status = tty_unregister_ldisc(N_HDLC);
-
-        if (status)
-                printk(hdlc_unregister_fail, status);
-        else
-                printk(hdlc_unregister_ok);
-}
-
-module_init(n_hdlc_init);
-module_exit(n_hdlc_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Paul Fulghum paulkf@microgate.com");
-module_param(debuglevel, int, 0);
-module_param(maxframe, int, 0);
-MODULE_ALIAS_LDISC(N_HDLC);
diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c
deleted file mode 100644
index a98290d7a2c5..000000000000
--- a/drivers/char/n_r3964.c
+++ /dev/null
@@ -1,1265 +0,0 @@
-/* r3964 linediscipline for linux
- *
- * -----------------------------------------------------------
- * Copyright by 
- * Philips Automation Projects
- * Kassel (Germany)
- * http://www.pap-philips.de
- * -----------------------------------------------------------
- * This software may be used and distributed according to the terms of
- * the GNU General Public License, incorporated herein by reference.
- *
- * Author:
- * L. Haag
- *
- * $Log: n_r3964.c,v $
- * Revision 1.10  2001/03/18 13:02:24  dwmw2
- * Fix timer usage, use spinlocks properly.
- *
- * Revision 1.9  2001/03/18 12:52:14  dwmw2
- * Merge changes in 2.4.2
- *
- * Revision 1.8  2000/03/23 14:14:54  dwmw2
- * Fix race in sleeping in r3964_read()
- *
- * Revision 1.7  1999/28/08 11:41:50  dwmw2
- * Port to 2.3 kernel
- *
- * Revision 1.6  1998/09/30 00:40:40  dwmw2
- * Fixed compilation on 2.0.x kernels
- * Updated to newly registered tty-ldisc number 9
- *
- * Revision 1.5  1998/09/04 21:57:36  dwmw2
- * Signal handling bug fixes, port to 2.1.x.
- *
- * Revision 1.4  1998/04/02 20:26:59  lhaag
- * select, blocking, ...
- *
- * Revision 1.3  1998/02/12 18:58:43  root
- * fixed some memory leaks
- * calculation of checksum characters
- *
- * Revision 1.2  1998/02/07 13:03:34  root
- * ioctl read_telegram
- *
- * Revision 1.1  1998/02/06 19:21:03  root
- * Initial revision
- *
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/fcntl.h>
-#include <linux/interrupt.h>
-#include <linux/ptrace.h>
-#include <linux/ioport.h>
-#include <linux/in.h>
-#include <linux/slab.h>
-#include <linux/smp_lock.h>
-#include <linux/tty.h>
-#include <linux/errno.h>
-#include <linux/string.h>       /* used in new tty drivers */
-#include <linux/signal.h>       /* used in new tty drivers */
-#include <linux/ioctl.h>
-#include <linux/n_r3964.h>
-#include <linux/poll.h>
-#include <linux/init.h>
-#include <asm/uaccess.h>
-
-/*#define DEBUG_QUEUE*/
-
-/* Log successful handshake and protocol operations  */
-/*#define DEBUG_PROTO_S*/
-
-/* Log handshake and protocol errors: */
-/*#define DEBUG_PROTO_E*/
-
-/* Log Linediscipline operations (open, close, read, write...): */
-/*#define DEBUG_LDISC*/
-
-/* Log module and memory operations (init, cleanup; kmalloc, kfree): */
-/*#define DEBUG_MODUL*/
-
-/* Macro helpers for debug output: */
-#define TRACE(format, args...) printk("r3964: " format "\n" , ## args)
-
-#ifdef DEBUG_MODUL
-#define TRACE_M(format, args...) printk("r3964: " format "\n" , ## args)
-#else
-#define TRACE_M(fmt, arg...) do {} while (0)
-#endif
-#ifdef DEBUG_PROTO_S
-#define TRACE_PS(format, args...) printk("r3964: " format "\n" , ## args)
-#else
-#define TRACE_PS(fmt, arg...) do {} while (0)
-#endif
-#ifdef DEBUG_PROTO_E
-#define TRACE_PE(format, args...) printk("r3964: " format "\n" , ## args)
-#else
-#define TRACE_PE(fmt, arg...) do {} while (0)
-#endif
-#ifdef DEBUG_LDISC
-#define TRACE_L(format, args...) printk("r3964: " format "\n" , ## args)
-#else
-#define TRACE_L(fmt, arg...) do {} while (0)
-#endif
-#ifdef DEBUG_QUEUE
-#define TRACE_Q(format, args...) printk("r3964: " format "\n" , ## args)
-#else
-#define TRACE_Q(fmt, arg...) do {} while (0)
-#endif
-static void add_tx_queue(struct r3964_info *, struct r3964_block_header *);
-static void remove_from_tx_queue(struct r3964_info *pInfo, int error_code);
-static void put_char(struct r3964_info *pInfo, unsigned char ch);
-static void trigger_transmit(struct r3964_info *pInfo);
-static void retry_transmit(struct r3964_info *pInfo);
-static void transmit_block(struct r3964_info *pInfo);
-static void receive_char(struct r3964_info *pInfo, const unsigned char c);
-static void receive_error(struct r3964_info *pInfo, const char flag);
-static void on_timeout(unsigned long priv);
-static int enable_signals(struct r3964_info *pInfo, struct pid *pid, int arg);
-static int read_telegram(struct r3964_info *pInfo, struct pid *pid,
-                unsigned char __user * buf);
-static void add_msg(struct r3964_client_info *pClient, int msg_id, int arg,
-                int error_code, struct r3964_block_header *pBlock);
-static struct r3964_message *remove_msg(struct r3964_info *pInfo,
-                struct r3964_client_info *pClient);
-static void remove_client_block(struct r3964_info *pInfo,
-                struct r3964_client_info *pClient);
-
-static int r3964_open(struct tty_struct *tty);
-static void r3964_close(struct tty_struct *tty);
-static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
-                unsigned char __user * buf, size_t nr);
-static ssize_t r3964_write(struct tty_struct *tty, struct file *file,
-                const unsigned char *buf, size_t nr);
-static int r3964_ioctl(struct tty_struct *tty, struct file *file,
-                unsigned int cmd, unsigned long arg);
-static void r3964_set_termios(struct tty_struct *tty, struct ktermios *old);
-static unsigned int r3964_poll(struct tty_struct *tty, struct file *file,
-                struct poll_table_struct *wait);
-static void r3964_receive_buf(struct tty_struct *tty, const unsigned char *cp,
-                char *fp, int count);
-
-static struct tty_ldisc_ops tty_ldisc_N_R3964 = {
-        .owner = THIS_MODULE,
-        .magic = TTY_LDISC_MAGIC,
-        .name = "R3964",
-        .open = r3964_open,
-        .close = r3964_close,
-        .read = r3964_read,
-        .write = r3964_write,
-        .ioctl = r3964_ioctl,
-        .set_termios = r3964_set_termios,
-        .poll = r3964_poll,
-        .receive_buf = r3964_receive_buf,
-};
-
-static void dump_block(const unsigned char *block, unsigned int length)
-{
-        unsigned int i, j;
-        char linebuf[16 * 3 + 1];
-
-        for (i = 0; i < length; i += 16) {
-                for (j = 0; (j < 16) && (j + i < length); j++) {
-                        sprintf(linebuf + 3 * j, "%02x ", block[i + j]);
-                }
-                linebuf[3 * j] = '\0';
-                TRACE_PS("%s", linebuf);
-        }
-}
-
-/*************************************************************
- * Driver initialisation
- *************************************************************/
-
-/*************************************************************
- * Module support routines
- *************************************************************/
-
-static void __exit r3964_exit(void)
-{
-        int status;
-
-        TRACE_M("cleanup_module()");
-
-        status = tty_unregister_ldisc(N_R3964);
-
-        if (status != 0) {
-                printk(KERN_ERR "r3964: error unregistering linediscipline: "
-                                "%d\n", status);
-        } else {
-                TRACE_L("linediscipline successfully unregistered");
-        }
-}
-
-static int __init r3964_init(void)
-{
-        int status;
-
-        printk("r3964: Philips r3964 Driver $Revision: 1.10 $\n");
-
-        /*
-         * Register the tty line discipline
-         */
-
-        status = tty_register_ldisc(N_R3964, &tty_ldisc_N_R3964);
-        if (status == 0) {
-                TRACE_L("line discipline %d registered", N_R3964);
-                TRACE_L("flags=%x num=%x", tty_ldisc_N_R3964.flags,
-                        tty_ldisc_N_R3964.num);
-                TRACE_L("open=%p", tty_ldisc_N_R3964.open);
-                TRACE_L("tty_ldisc_N_R3964 = %p", &tty_ldisc_N_R3964);
-        } else {
-                printk(KERN_ERR "r3964: error registering line discipline: "
-                                "%d\n", status);
-        }
-        return status;
-}
-
-module_init(r3964_init);
-module_exit(r3964_exit);
-
-/*************************************************************
- * Protocol implementation routines
- *************************************************************/
-
-static void add_tx_queue(struct r3964_info *pInfo,
-                         struct r3964_block_header *pHeader)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&pInfo->lock, flags);
-
-        pHeader->next = NULL;
-
-        if (pInfo->tx_last == NULL) {
-                pInfo->tx_first = pInfo->tx_last = pHeader;
-        } else {
-                pInfo->tx_last->next = pHeader;
-                pInfo->tx_last = pHeader;
-        }
-
-        spin_unlock_irqrestore(&pInfo->lock, flags);
-
-        TRACE_Q("add_tx_queue %p, length %d, tx_first = %p",
-                pHeader, pHeader->length, pInfo->tx_first);
-}
-
-static void remove_from_tx_queue(struct r3964_info *pInfo, int error_code)
-{
-        struct r3964_block_header *pHeader;
-        unsigned long flags;
-#ifdef DEBUG_QUEUE
-        struct r3964_block_header *pDump;
-#endif
-
-        pHeader = pInfo->tx_first;
-
-        if (pHeader == NULL)
-                return;
-
-#ifdef DEBUG_QUEUE
-        printk("r3964: remove_from_tx_queue: %p, length %u - ",
-                pHeader, pHeader->length);
-        for (pDump = pHeader; pDump; pDump = pDump->next)
-                printk("%p ", pDump);
-        printk("\n");
-#endif
-
-        if (pHeader->owner) {
-                if (error_code) {
-                        add_msg(pHeader->owner, R3964_MSG_ACK, 0,
-                                error_code, NULL);
-                } else {
-                        add_msg(pHeader->owner, R3964_MSG_ACK, pHeader->length,
-                                error_code, NULL);
-                }
-                wake_up_interruptible(&pInfo->read_wait);
-        }
-
-        spin_lock_irqsave(&pInfo->lock, flags);
-
-        pInfo->tx_first = pHeader->next;
-        if (pInfo->tx_first == NULL) {
-                pInfo->tx_last = NULL;
-        }
-
-        spin_unlock_irqrestore(&pInfo->lock, flags);
-
-        kfree(pHeader);
-        TRACE_M("remove_from_tx_queue - kfree %p", pHeader);
-
-        TRACE_Q("remove_from_tx_queue: tx_first = %p, tx_last = %p",
-                pInfo->tx_first, pInfo->tx_last);
-}
-
-static void add_rx_queue(struct r3964_info *pInfo,
-                         struct r3964_block_header *pHeader)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&pInfo->lock, flags);
-
-        pHeader->next = NULL;
-
-        if (pInfo->rx_last == NULL) {
-                pInfo->rx_first = pInfo->rx_last = pHeader;
-        } else {
-                pInfo->rx_last->next = pHeader;
-                pInfo->rx_last = pHeader;
-        }
-        pInfo->blocks_in_rx_queue++;
-
-        spin_unlock_irqrestore(&pInfo->lock, flags);
-
-        TRACE_Q("add_rx_queue: %p, length = %d, rx_first = %p, count = %d",
-                pHeader, pHeader->length,
-                pInfo->rx_first, pInfo->blocks_in_rx_queue);
-}
-
-static void remove_from_rx_queue(struct r3964_info *pInfo,
-                                 struct r3964_block_header *pHeader)
-{
-        unsigned long flags;
-        struct r3964_block_header *pFind;
-
-        if (pHeader == NULL)
-                return;
-
-        TRACE_Q("remove_from_rx_queue: rx_first = %p, rx_last = %p, count = %d",
-                pInfo->rx_first, pInfo->rx_last, pInfo->blocks_in_rx_queue);
-        TRACE_Q("remove_from_rx_queue: %p, length %u",
-                pHeader, pHeader->length);
-
-        spin_lock_irqsave(&pInfo->lock, flags);
-
-        if (pInfo->rx_first == pHeader) {
-                /* Remove the first block in the linked list: */
-                pInfo->rx_first = pHeader->next;
-
-                if (pInfo->rx_first == NULL) {
-                        pInfo->rx_last = NULL;
-                }
-                pInfo->blocks_in_rx_queue--;
-        } else {
-                /* Find block to remove: */
-                for (pFind = pInfo->rx_first; pFind; pFind = pFind->next) {
-                        if (pFind->next == pHeader) {
-                                /* Got it. */
-                                pFind->next = pHeader->next;
-                                pInfo->blocks_in_rx_queue--;
-                                if (pFind->next == NULL) {
-                                        /* Oh, removed the last one! */
-                                        pInfo->rx_last = pFind;
-                                }
-                                break;
-                        }
-                }
-        }
-
-        spin_unlock_irqrestore(&pInfo->lock, flags);
-
-        kfree(pHeader);
-        TRACE_M("remove_from_rx_queue - kfree %p", pHeader);
-
-        TRACE_Q("remove_from_rx_queue: rx_first = %p, rx_last = %p, count = %d",
-                pInfo->rx_first, pInfo->rx_last, pInfo->blocks_in_rx_queue);
-}
-
-static void put_char(struct r3964_info *pInfo, unsigned char ch)
-{
-        struct tty_struct *tty = pInfo->tty;
-        /* FIXME: put_char should not be called from an IRQ */
-        tty_put_char(tty, ch);
-        pInfo->bcc ^= ch;
-}
-
-static void flush(struct r3964_info *pInfo)
-{
-        struct tty_struct *tty = pInfo->tty;
-
-        if (tty == NULL || tty->ops->flush_chars == NULL)
-                return;
-        tty->ops->flush_chars(tty);
-}
-
-static void trigger_transmit(struct r3964_info *pInfo)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&pInfo->lock, flags);
-
-        if ((pInfo->state == R3964_IDLE) && (pInfo->tx_first != NULL)) {
-                pInfo->state = R3964_TX_REQUEST;
-                pInfo->nRetry = 0;
-                pInfo->flags &= ~R3964_ERROR;
-                mod_timer(&pInfo->tmr, jiffies + R3964_TO_QVZ);
-
-                spin_unlock_irqrestore(&pInfo->lock, flags);
-
-                TRACE_PS("trigger_transmit - sent STX");
-
-                put_char(pInfo, STX);
-                flush(pInfo);
-
-                pInfo->bcc = 0;
-        } else {
-                spin_unlock_irqrestore(&pInfo->lock, flags);
-        }
-}
-
-static void retry_transmit(struct r3964_info *pInfo)
-{
-        if (pInfo->nRetry < R3964_MAX_RETRIES) {
-                TRACE_PE("transmission failed. Retry #%d", pInfo->nRetry);
-                pInfo->bcc = 0;
-                put_char(pInfo, STX);
-                flush(pInfo);
-                pInfo->state = R3964_TX_REQUEST;
-                pInfo->nRetry++;
-                mod_timer(&pInfo->tmr, jiffies + R3964_TO_QVZ);
-        } else {
-                TRACE_PE("transmission failed after %d retries",
-                         R3964_MAX_RETRIES);
-
-                remove_from_tx_queue(pInfo, R3964_TX_FAIL);
-
-                put_char(pInfo, NAK);
-                flush(pInfo);
-                pInfo->state = R3964_IDLE;
-
-                trigger_transmit(pInfo);
-        }
-}
-
-static void transmit_block(struct r3964_info *pInfo)
-{
-        struct tty_struct *tty = pInfo->tty;
-        struct r3964_block_header *pBlock = pInfo->tx_first;
-        int room = 0;
-
-        if (tty == NULL || pBlock == NULL) {
-                return;
-        }
-
-        room = tty_write_room(tty);
-
-        TRACE_PS("transmit_block %p, room %d, length %d",
-                 pBlock, room, pBlock->length);
-
-        while (pInfo->tx_position < pBlock->length) {
-                if (room < 2)
-                        break;
-
-                if (pBlock->data[pInfo->tx_position] == DLE) {
-                        /* send additional DLE char: */
-                        put_char(pInfo, DLE);
-                }
-                put_char(pInfo, pBlock->data[pInfo->tx_position++]);
-
-                room--;
-        }
-
-        if ((pInfo->tx_position == pBlock->length) && (room >= 3)) {
-                put_char(pInfo, DLE);
-                put_char(pInfo, ETX);
-                if (pInfo->flags & R3964_BCC) {
-                        put_char(pInfo, pInfo->bcc);
-                }
-                pInfo->state = R3964_WAIT_FOR_TX_ACK;
-                mod_timer(&pInfo->tmr, jiffies + R3964_TO_QVZ);
-        }
-        flush(pInfo);
-}
-
-static void on_receive_block(struct r3964_info *pInfo)
-{
-        unsigned int length;
-        struct r3964_client_info *pClient;
-        struct r3964_block_header *pBlock;
-
-        length = pInfo->rx_position;
-
-        /* compare byte checksum characters: */
-        if (pInfo->flags & R3964_BCC) {
-                if (pInfo->bcc != pInfo->last_rx) {
-                        TRACE_PE("checksum error - got %x but expected %x",
-                                 pInfo->last_rx, pInfo->bcc);
-                        pInfo->flags |= R3964_CHECKSUM;
-                }
-        }
-
-        /* check for errors (parity, overrun,...): */
-        if (pInfo->flags & R3964_ERROR) {
-                TRACE_PE("on_receive_block - transmission failed error %x",
-                         pInfo->flags & R3964_ERROR);
-
-                put_char(pInfo, NAK);
-                flush(pInfo);
-                if (pInfo->nRetry < R3964_MAX_RETRIES) {
-                        pInfo->state = R3964_WAIT_FOR_RX_REPEAT;
-                        pInfo->nRetry++;
-                        mod_timer(&pInfo->tmr, jiffies + R3964_TO_RX_PANIC);
-                } else {
-                        TRACE_PE("on_receive_block - failed after max retries");
-                        pInfo->state = R3964_IDLE;
-                }
-                return;
-        }
-
-        /* received block; submit DLE: */
-        put_char(pInfo, DLE);
-        flush(pInfo);
-        del_timer_sync(&pInfo->tmr);
-        TRACE_PS(" rx success: got %d chars", length);
-
-        /* prepare struct r3964_block_header: */
-        pBlock = kmalloc(length + sizeof(struct r3964_block_header),
-                        GFP_KERNEL);
-        TRACE_M("on_receive_block - kmalloc %p", pBlock);
-
-        if (pBlock == NULL)
-                return;
-
-        pBlock->length = length;
-        pBlock->data = ((unsigned char *)pBlock) +
-                        sizeof(struct r3964_block_header);
-        pBlock->locks = 0;
-        pBlock->next = NULL;
-        pBlock->owner = NULL;
-
-        memcpy(pBlock->data, pInfo->rx_buf, length);
-
-        /* queue block into rx_queue: */
-        add_rx_queue(pInfo, pBlock);
-
-        /* notify attached client processes: */
-        for (pClient = pInfo->firstClient; pClient; pClient = pClient->next) {
-                if (pClient->sig_flags & R3964_SIG_DATA) {
-                        add_msg(pClient, R3964_MSG_DATA, length, R3964_OK,
-                                pBlock);
-                }
-        }
-        wake_up_interruptible(&pInfo->read_wait);
-
-        pInfo->state = R3964_IDLE;
-
-        trigger_transmit(pInfo);
-}
-
-static void receive_char(struct r3964_info *pInfo, const unsigned char c)
-{
-        switch (pInfo->state) {
-        case R3964_TX_REQUEST:
-                if (c == DLE) {
-                        TRACE_PS("TX_REQUEST - got DLE");
-
-                        pInfo->state = R3964_TRANSMITTING;
-                        pInfo->tx_position = 0;
-
-                        transmit_block(pInfo);
-                } else if (c == STX) {
-                        if (pInfo->nRetry == 0) {
-                                TRACE_PE("TX_REQUEST - init conflict");
-                                if (pInfo->priority == R3964_SLAVE) {
-                                        goto start_receiving;
-                                }
-                        } else {
-                                TRACE_PE("TX_REQUEST - secondary init "
-                                        "conflict!? Switching to SLAVE mode "
-                                        "for next rx.");
-                                goto start_receiving;
-                        }
-                } else {
-                        TRACE_PE("TX_REQUEST - char != DLE: %x", c);
-                        retry_transmit(pInfo);
-                }
-                break;
-        case R3964_TRANSMITTING:
-                if (c == NAK) {
-                        TRACE_PE("TRANSMITTING - got NAK");
-                        retry_transmit(pInfo);
-                } else {
-                        TRACE_PE("TRANSMITTING - got invalid char");
-
-                        pInfo->state = R3964_WAIT_ZVZ_BEFORE_TX_RETRY;
-                        mod_timer(&pInfo->tmr, jiffies + R3964_TO_ZVZ);
-                }
-                break;
-        case R3964_WAIT_FOR_TX_ACK:
-                if (c == DLE) {
-                        TRACE_PS("WAIT_FOR_TX_ACK - got DLE");
-                        remove_from_tx_queue(pInfo, R3964_OK);
-
-                        pInfo->state = R3964_IDLE;
-                        trigger_transmit(pInfo);
-                } else {
-                        retry_transmit(pInfo);
-                }
-                break;
-        case R3964_WAIT_FOR_RX_REPEAT:
-                /* FALLTHROUGH */
-        case R3964_IDLE:
-                if (c == STX) {
-                        /* Prevent rx_queue from overflow: */
-                        if (pInfo->blocks_in_rx_queue >=
-                            R3964_MAX_BLOCKS_IN_RX_QUEUE) {
-                                TRACE_PE("IDLE - got STX but no space in "
-                                                "rx_queue!");
-                                pInfo->state = R3964_WAIT_FOR_RX_BUF;
-                                mod_timer(&pInfo->tmr,
-                                          jiffies + R3964_TO_NO_BUF);
-                                break;
-                        }
-start_receiving:
-                        /* Ok, start receiving: */
-                        TRACE_PS("IDLE - got STX");
-                        pInfo->rx_position = 0;
-                        pInfo->last_rx = 0;
-                        pInfo->flags &= ~R3964_ERROR;
-                        pInfo->state = R3964_RECEIVING;
-                        mod_timer(&pInfo->tmr, jiffies + R3964_TO_ZVZ);
-                        pInfo->nRetry = 0;
-                        put_char(pInfo, DLE);
-                        flush(pInfo);
-                        pInfo->bcc = 0;
-                }
-                break;
-        case R3964_RECEIVING:
-                if (pInfo->rx_position < RX_BUF_SIZE) {
-                        pInfo->bcc ^= c;
-
-                        if (c == DLE) {
-                                if (pInfo->last_rx == DLE) {
-                                        pInfo->last_rx = 0;
-                                        goto char_to_buf;
-                                }
-                                pInfo->last_rx = DLE;
-                                break;
-                        } else if ((c == ETX) && (pInfo->last_rx == DLE)) {
-                                if (pInfo->flags & R3964_BCC) {
-                                        pInfo->state = R3964_WAIT_FOR_BCC;
-                                        mod_timer(&pInfo->tmr,
-                                                  jiffies + R3964_TO_ZVZ);
-                                } else {
-                                        on_receive_block(pInfo);
-                                }
-                        } else {
-                                pInfo->last_rx = c;
-char_to_buf:
-                                pInfo->rx_buf[pInfo->rx_position++] = c;
-                                mod_timer(&pInfo->tmr, jiffies + R3964_TO_ZVZ);
-                        }
-                }
-                /* else: overflow-msg? BUF_SIZE>MTU; should not happen? */
-                break;
-        case R3964_WAIT_FOR_BCC:
-                pInfo->last_rx = c;
-                on_receive_block(pInfo);
-                break;
-        }
-}
-
-static void receive_error(struct r3964_info *pInfo, const char flag)
-{
-        switch (flag) {
-        case TTY_NORMAL:
-                break;
-        case TTY_BREAK:
-                TRACE_PE("received break");
-                pInfo->flags |= R3964_BREAK;
-                break;
-        case TTY_PARITY:
-                TRACE_PE("parity error");
-                pInfo->flags |= R3964_PARITY;
-                break;
-        case TTY_FRAME:
-                TRACE_PE("frame error");
-                pInfo->flags |= R3964_FRAME;
-                break;
-        case TTY_OVERRUN:
-                TRACE_PE("frame overrun");
-                pInfo->flags |= R3964_OVERRUN;
-                break;
-        default:
-                TRACE_PE("receive_error - unknown flag %d", flag);
-                pInfo->flags |= R3964_UNKNOWN;
-                break;
-        }
-}
-
-static void on_timeout(unsigned long priv)
-{
-        struct r3964_info *pInfo = (void *)priv;
-
-        switch (pInfo->state) {
-        case R3964_TX_REQUEST:
-                TRACE_PE("TX_REQUEST - timeout");
-                retry_transmit(pInfo);
-                break;
-        case R3964_WAIT_ZVZ_BEFORE_TX_RETRY:
-                put_char(pInfo, NAK);
-                flush(pInfo);
-                retry_transmit(pInfo);
-                break;
-        case R3964_WAIT_FOR_TX_ACK:
-                TRACE_PE("WAIT_FOR_TX_ACK - timeout");
-                retry_transmit(pInfo);
-                break;
-        case R3964_WAIT_FOR_RX_BUF:
-                TRACE_PE("WAIT_FOR_RX_BUF - timeout");
-                put_char(pInfo, NAK);
-                flush(pInfo);
-                pInfo->state = R3964_IDLE;
-                break;
-        case R3964_RECEIVING:
-                TRACE_PE("RECEIVING - timeout after %d chars",
-                         pInfo->rx_position);
-                put_char(pInfo, NAK);
-                flush(pInfo);
-                pInfo->state = R3964_IDLE;
-                break;
-        case R3964_WAIT_FOR_RX_REPEAT:
-                TRACE_PE("WAIT_FOR_RX_REPEAT - timeout");
-                pInfo->state = R3964_IDLE;
-                break;
-        case R3964_WAIT_FOR_BCC:
-                TRACE_PE("WAIT_FOR_BCC - timeout");
-                put_char(pInfo, NAK);
-                flush(pInfo);
-                pInfo->state = R3964_IDLE;
-                break;
-        }
-}
-
-static struct r3964_client_info *findClient(struct r3964_info *pInfo,
-                struct pid *pid)
-{
-        struct r3964_client_info *pClient;
-
-        for (pClient = pInfo->firstClient; pClient; pClient = pClient->next) {
-                if (pClient->pid == pid) {
-                        return pClient;
-                }
-        }
-        return NULL;
-}
-
-static int enable_signals(struct r3964_info *pInfo, struct pid *pid, int arg)
-{
-        struct r3964_client_info *pClient;
-        struct r3964_client_info **ppClient;
-        struct r3964_message *pMsg;
-
-        if ((arg & R3964_SIG_ALL) == 0) {
-                /* Remove client from client list */
-                for (ppClient = &pInfo->firstClient; *ppClient;
-                     ppClient = &(*ppClient)->next) {
-                        pClient = *ppClient;
-
-                        if (pClient->pid == pid) {
-                                TRACE_PS("removing client %d from client list",
-                                         pid_nr(pid));
-                                *ppClient = pClient->next;
-                                while (pClient->msg_count) {
-                                        pMsg = remove_msg(pInfo, pClient);
-                                        if (pMsg) {
-                                                kfree(pMsg);
-                                                TRACE_M("enable_signals - msg "
-                                                        "kfree %p", pMsg);
-                                        }
-                                }
-                                put_pid(pClient->pid);
-                                kfree(pClient);
-                                TRACE_M("enable_signals - kfree %p", pClient);
-                                return 0;
-                        }
-                }
-                return -EINVAL;
-        } else {
-                pClient = findClient(pInfo, pid);
-                if (pClient) {
-                        /* update signal options */
-                        pClient->sig_flags = arg;
-                } else {
-                        /* add client to client list */
-                        pClient = kmalloc(sizeof(struct r3964_client_info),
-                                        GFP_KERNEL);
-                        TRACE_M("enable_signals - kmalloc %p", pClient);
-                        if (pClient == NULL)
-                                return -ENOMEM;
-
-                        TRACE_PS("add client %d to client list", pid_nr(pid));
-                        spin_lock_init(&pClient->lock);
-                        pClient->sig_flags = arg;
-                        pClient->pid = get_pid(pid);
-                        pClient->next = pInfo->firstClient;
-                        pClient->first_msg = NULL;
-                        pClient->last_msg = NULL;
-                        pClient->next_block_to_read = NULL;
-                        pClient->msg_count = 0;
-                        pInfo->firstClient = pClient;
-                }
-        }
-
-        return 0;
-}
-
-static int read_telegram(struct r3964_info *pInfo, struct pid *pid,
-                         unsigned char __user * buf)
-{
-        struct r3964_client_info *pClient;
-        struct r3964_block_header *block;
-
-        if (!buf) {
-                return -EINVAL;
-        }
-
-        pClient = findClient(pInfo, pid);
-        if (pClient == NULL) {
-                return -EINVAL;
-        }
-
-        block = pClient->next_block_to_read;
-        if (!block) {
-                return 0;
-        } else {
-                if (copy_to_user(buf, block->data, block->length))
-                        return -EFAULT;
-
-                remove_client_block(pInfo, pClient);
-                return block->length;
-        }
-
-        return -EINVAL;
-}
-
-static void add_msg(struct r3964_client_info *pClient, int msg_id, int arg,
-                int error_code, struct r3964_block_header *pBlock)
-{
-        struct r3964_message *pMsg;
-        unsigned long flags;
-
-        if (pClient->msg_count < R3964_MAX_MSG_COUNT - 1) {
-queue_the_message:
-
-                pMsg = kmalloc(sizeof(struct r3964_message),
-                                error_code ? GFP_ATOMIC : GFP_KERNEL);
-                TRACE_M("add_msg - kmalloc %p", pMsg);
-                if (pMsg == NULL) {
-                        return;
-                }
-
-                spin_lock_irqsave(&pClient->lock, flags);
-
-                pMsg->msg_id = msg_id;
-                pMsg->arg = arg;
-                pMsg->error_code = error_code;
-                pMsg->block = pBlock;
-                pMsg->next = NULL;
-
-                if (pClient->last_msg == NULL) {
-                        pClient->first_msg = pClient->last_msg = pMsg;
-                } else {
-                        pClient->last_msg->next = pMsg;
-                        pClient->last_msg = pMsg;
-                }
-
-                pClient->msg_count++;
-
-                if (pBlock != NULL) {
-                        pBlock->locks++;
-                }
-                spin_unlock_irqrestore(&pClient->lock, flags);
-        } else {
-                if ((pClient->last_msg->msg_id == R3964_MSG_ACK)
-                    && (pClient->last_msg->error_code == R3964_OVERFLOW)) {
-                        pClient->last_msg->arg++;
-                        TRACE_PE("add_msg - inc prev OVERFLOW-msg");
-                } else {
-                        msg_id = R3964_MSG_ACK;
-                        arg = 0;
-                        error_code = R3964_OVERFLOW;
-                        pBlock = NULL;
-                        TRACE_PE("add_msg - queue OVERFLOW-msg");
-                        goto queue_the_message;
-                }
-        }
-        /* Send SIGIO signal to client process: */
-        if (pClient->sig_flags & R3964_USE_SIGIO) {
-                kill_pid(pClient->pid, SIGIO, 1);
-        }
-}
-
-static struct r3964_message *remove_msg(struct r3964_info *pInfo,
-                                        struct r3964_client_info *pClient)
-{
-        struct r3964_message *pMsg = NULL;
-        unsigned long flags;
-
-        if (pClient->first_msg) {
-                spin_lock_irqsave(&pClient->lock, flags);
-
-                pMsg = pClient->first_msg;
-                pClient->first_msg = pMsg->next;
-                if (pClient->first_msg == NULL) {
-                        pClient->last_msg = NULL;
-                }
-
-                pClient->msg_count--;
-                if (pMsg->block) {
-                        remove_client_block(pInfo, pClient);
-                        pClient->next_block_to_read = pMsg->block;
-                }
-                spin_unlock_irqrestore(&pClient->lock, flags);
-        }
-        return pMsg;
-}
-
-static void remove_client_block(struct r3964_info *pInfo,
-                                struct r3964_client_info *pClient)
-{
-        struct r3964_block_header *block;
-
-        TRACE_PS("remove_client_block PID %d", pid_nr(pClient->pid));
-
-        block = pClient->next_block_to_read;
-        if (block) {
-                block->locks--;
-                if (block->locks == 0) {
-                        remove_from_rx_queue(pInfo, block);
-                }
-        }
-        pClient->next_block_to_read = NULL;
-}
-
-/*************************************************************
- * Line discipline routines
- *************************************************************/
-
-static int r3964_open(struct tty_struct *tty)
-{
-        struct r3964_info *pInfo;
-
-        TRACE_L("open");
-        TRACE_L("tty=%p, PID=%d, disc_data=%p",
-                tty, current->pid, tty->disc_data);
-
-        pInfo = kmalloc(sizeof(struct r3964_info), GFP_KERNEL);
-        TRACE_M("r3964_open - info kmalloc %p", pInfo);
-
-        if (!pInfo) {
-                printk(KERN_ERR "r3964: failed to alloc info structure\n");
-                return -ENOMEM;
-        }
-
-        pInfo->rx_buf = kmalloc(RX_BUF_SIZE, GFP_KERNEL);
-        TRACE_M("r3964_open - rx_buf kmalloc %p", pInfo->rx_buf);
-
-        if (!pInfo->rx_buf) {
-                printk(KERN_ERR "r3964: failed to alloc receive buffer\n");
-                kfree(pInfo);
-                TRACE_M("r3964_open - info kfree %p", pInfo);
-                return -ENOMEM;
-        }
-
-        pInfo->tx_buf = kmalloc(TX_BUF_SIZE, GFP_KERNEL);
-        TRACE_M("r3964_open - tx_buf kmalloc %p", pInfo->tx_buf);
-
-        if (!pInfo->tx_buf) {
-                printk(KERN_ERR "r3964: failed to alloc transmit buffer\n");
-                kfree(pInfo->rx_buf);
-                TRACE_M("r3964_open - rx_buf kfree %p", pInfo->rx_buf);
-                kfree(pInfo);
-                TRACE_M("r3964_open - info kfree %p", pInfo);
-                return -ENOMEM;
-        }
-
-        spin_lock_init(&pInfo->lock);
-        pInfo->tty = tty;
-        init_waitqueue_head(&pInfo->read_wait);
-        pInfo->priority = R3964_MASTER;
-        pInfo->rx_first = pInfo->rx_last = NULL;
-        pInfo->tx_first = pInfo->tx_last = NULL;
-        pInfo->rx_position = 0;
-        pInfo->tx_position = 0;
-        pInfo->last_rx = 0;
-        pInfo->blocks_in_rx_queue = 0;
-        pInfo->firstClient = NULL;
-        pInfo->state = R3964_IDLE;
-        pInfo->flags = R3964_DEBUG;
-        pInfo->nRetry = 0;
-
-        tty->disc_data = pInfo;
-        tty->receive_room = 65536;
-
-        setup_timer(&pInfo->tmr, on_timeout, (unsigned long)pInfo);
-
-        return 0;
-}
-
-static void r3964_close(struct tty_struct *tty)
-{
-        struct r3964_info *pInfo = tty->disc_data;
-        struct r3964_client_info *pClient, *pNext;
-        struct r3964_message *pMsg;
-        struct r3964_block_header *pHeader, *pNextHeader;
-        unsigned long flags;
-
-        TRACE_L("close");
-
-        /*
-         * Make sure that our task queue isn't activated.  If it
-         * is, take it out of the linked list.
-         */
-        del_timer_sync(&pInfo->tmr);
-
-        /* Remove client-structs and message queues: */
-        pClient = pInfo->firstClient;
-        while (pClient) {
-                pNext = pClient->next;
-                while (pClient->msg_count) {
-                        pMsg = remove_msg(pInfo, pClient);
-                        if (pMsg) {
-                                kfree(pMsg);
-                                TRACE_M("r3964_close - msg kfree %p", pMsg);
-                        }
-                }
-                put_pid(pClient->pid);
-                kfree(pClient);
-                TRACE_M("r3964_close - client kfree %p", pClient);
-                pClient = pNext;
-        }
-        /* Remove jobs from tx_queue: */
-        spin_lock_irqsave(&pInfo->lock, flags);
-        pHeader = pInfo->tx_first;
-        pInfo->tx_first = pInfo->tx_last = NULL;
-        spin_unlock_irqrestore(&pInfo->lock, flags);
-
-        while (pHeader) {
-                pNextHeader = pHeader->next;
-                kfree(pHeader);
-                pHeader = pNextHeader;
-        }
-
-        /* Free buffers: */
-        wake_up_interruptible(&pInfo->read_wait);
-        kfree(pInfo->rx_buf);
-        TRACE_M("r3964_close - rx_buf kfree %p", pInfo->rx_buf);
-        kfree(pInfo->tx_buf);
-        TRACE_M("r3964_close - tx_buf kfree %p", pInfo->tx_buf);
-        kfree(pInfo);
-        TRACE_M("r3964_close - info kfree %p", pInfo);
-}
-
-static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
-                          unsigned char __user * buf, size_t nr)
-{
-        struct r3964_info *pInfo = tty->disc_data;
-        struct r3964_client_info *pClient;
-        struct r3964_message *pMsg;
-        struct r3964_client_message theMsg;
-        int ret;
-
-        TRACE_L("read()");
-
-        tty_lock();
-
-        pClient = findClient(pInfo, task_pid(current));
-        if (pClient) {
-                pMsg = remove_msg(pInfo, pClient);
-                if (pMsg == NULL) {
-                        /* no messages available. */
-                        if (file->f_flags & O_NONBLOCK) {
-                                ret = -EAGAIN;
-                                goto unlock;
-                        }
-                        /* block until there is a message: */
-                        wait_event_interruptible_tty(pInfo->read_wait,
-                                        (pMsg = remove_msg(pInfo, pClient)));
-                }
-
-                /* If we still haven't got a message, we must have been signalled */
-
-                if (!pMsg) {
-                        ret = -EINTR;
-                        goto unlock;
-                }
-
-                /* deliver msg to client process: */
-                theMsg.msg_id = pMsg->msg_id;
-                theMsg.arg = pMsg->arg;
-                theMsg.error_code = pMsg->error_code;
-                ret = sizeof(struct r3964_client_message);
-
-                kfree(pMsg);
-                TRACE_M("r3964_read - msg kfree %p", pMsg);
-
-                if (copy_to_user(buf, &theMsg, ret)) {
-                        ret = -EFAULT;
-                        goto unlock;
-                }
-
-                TRACE_PS("read - return %d", ret);
-                goto unlock;
-        }
-        ret = -EPERM;
-unlock:
-        tty_unlock();
-        return ret;
-}
-
-static ssize_t r3964_write(struct tty_struct *tty, struct file *file,
-                           const unsigned char *data, size_t count)
-{
-        struct r3964_info *pInfo = tty->disc_data;
-        struct r3964_block_header *pHeader;
-        struct r3964_client_info *pClient;
-        unsigned char *new_data;
-
-        TRACE_L("write request, %d characters", count);
-/* 
- * Verify the pointers 
- */
-
-        if (!pInfo)
-                return -EIO;
-
-/*
- * Ensure that the caller does not wish to send too much.
- */
-        if (count > R3964_MTU) {
-                if (pInfo->flags & R3964_DEBUG) {
-                        TRACE_L(KERN_WARNING "r3964_write: truncating user "
-                                "packet from %u to mtu %d", count, R3964_MTU);
-                }
-                count = R3964_MTU;
-        }
-/*
- * Allocate a buffer for the data and copy it from the buffer with header prepended
- */
-        new_data = kmalloc(count + sizeof(struct r3964_block_header),
-                        GFP_KERNEL);
-        TRACE_M("r3964_write - kmalloc %p", new_data);
-        if (new_data == NULL) {
-                if (pInfo->flags & R3964_DEBUG) {
-                        printk(KERN_ERR "r3964_write: no memory\n");
-                }
-                return -ENOSPC;
-        }
-
-        pHeader = (struct r3964_block_header *)new_data;
-        pHeader->data = new_data + sizeof(struct r3964_block_header);
-        pHeader->length = count;
-        pHeader->locks = 0;
-        pHeader->owner = NULL;
-
-        tty_lock();
-
-        pClient = findClient(pInfo, task_pid(current));
-        if (pClient) {
-                pHeader->owner = pClient;
-        }
-
-        memcpy(pHeader->data, data, count);     /* We already verified this */
-
-        if (pInfo->flags & R3964_DEBUG) {
-                dump_block(pHeader->data, count);
-        }
-
-/*
- * Add buffer to transmit-queue:
- */
-        add_tx_queue(pInfo, pHeader);
-        trigger_transmit(pInfo);
-
-        tty_unlock();
-
-        return 0;
-}
-
-static int r3964_ioctl(struct tty_struct *tty, struct file *file,
-                unsigned int cmd, unsigned long arg)
-{
-        struct r3964_info *pInfo = tty->disc_data;
-        if (pInfo == NULL)
-                return -EINVAL;
-        switch (cmd) {
-        case R3964_ENABLE_SIGNALS:
-                return enable_signals(pInfo, task_pid(current), arg);
-        case R3964_SETPRIORITY:
-                if (arg < R3964_MASTER || arg > R3964_SLAVE)
-                        return -EINVAL;
-                pInfo->priority = arg & 0xff;
-                return 0;
-        case R3964_USE_BCC:
-                if (arg)
-                        pInfo->flags |= R3964_BCC;
-                else
-                        pInfo->flags &= ~R3964_BCC;
-                return 0;
-        case R3964_READ_TELEGRAM:
-                return read_telegram(pInfo, task_pid(current),
-                                (unsigned char __user *)arg);
-        default:
-                return -ENOIOCTLCMD;
-        }
-}
-
-static void r3964_set_termios(struct tty_struct *tty, struct ktermios *old)
-{
-        TRACE_L("set_termios");
-}
-
-/* Called without the kernel lock held - fine */
-static unsigned int r3964_poll(struct tty_struct *tty, struct file *file,
-                        struct poll_table_struct *wait)
-{
-        struct r3964_info *pInfo = tty->disc_data;
-        struct r3964_client_info *pClient;
-        struct r3964_message *pMsg = NULL;
-        unsigned long flags;
-        int result = POLLOUT;
-
-        TRACE_L("POLL");
-
-        pClient = findClient(pInfo, task_pid(current));
-        if (pClient) {
-                poll_wait(file, &pInfo->read_wait, wait);
-                spin_lock_irqsave(&pInfo->lock, flags);
-                pMsg = pClient->first_msg;
-                spin_unlock_irqrestore(&pInfo->lock, flags);
-                if (pMsg)
-                        result |= POLLIN | POLLRDNORM;
-        } else {
-                result = -EINVAL;
-        }
-        return result;
-}
-
-static void r3964_receive_buf(struct tty_struct *tty, const unsigned char *cp,
-                        char *fp, int count)
-{
-        struct r3964_info *pInfo = tty->disc_data;
-        const unsigned char *p;
-        char *f, flags = 0;
-        int i;
-
-        for (i = count, p = cp, f = fp; i; i--, p++) {
-                if (f)
-                        flags = *f++;
-                if (flags == TTY_NORMAL) {
-                        receive_char(pInfo, *p);
-                } else {
-                        receive_error(pInfo, flags);
-                }
-
-        }
-}
-
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_LDISC(N_R3964);
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
deleted file mode 100644
index 428f4fe0b5f7..000000000000
--- a/drivers/char/n_tty.c
+++ /dev/null
@@ -1,2121 +0,0 @@
-/*
- * n_tty.c --- implements the N_TTY line discipline.
- *
- * This code used to be in tty_io.c, but things are getting hairy
- * enough that it made sense to split things off.  (The N_TTY
- * processing has changed so much that it's hardly recognizable,
- * anyway...)
- *
- * Note that the open routine for N_TTY is guaranteed never to return
- * an error.  This is because Linux will fall back to setting a line
- * to N_TTY if it can not switch to any other line discipline.
- *
- * Written by Theodore Ts'o, Copyright 1994.
- *
- * This file also contains code originally written by Linus Torvalds,
- * Copyright 1991, 1992, 1993, and by Julian Cowley, Copyright 1994.
- *
- * This file may be redistributed under the terms of the GNU General Public
- * License.
- *
- * Reduced memory usage for older ARM systems  - Russell King.
- *
- * 2000/01/20   Fixed SMP locking on put_tty_queue using bits of
- *              the patch by Andrew J. Kroll <ag784@freenet.buffalo.edu>
- *              who actually finally proved there really was a race.
- *
- * 2002/03/18   Implemented n_tty_wakeup to send SIGIO POLL_OUTs to
- *              waiting writing processes-Sapan Bhatia <sapan@corewars.org>.
- *              Also fixed a bug in BLOCKING mode where n_tty_write returns
- *              EAGAIN
- */
-
-#include <linux/types.h>
-#include <linux/major.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/fcntl.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/bitops.h>
-#include <linux/audit.h>
-#include <linux/file.h>
-#include <linux/uaccess.h>
-#include <linux/module.h>
-
-#include <asm/system.h>
-
-/* number of characters left in xmit buffer before select has we have room */
-#define WAKEUP_CHARS 256
-
-/*
- * This defines the low- and high-watermarks for throttling and
- * unthrottling the TTY driver.  These watermarks are used for
- * controlling the space in the read buffer.
- */
-#define TTY_THRESHOLD_THROTTLE          128 /* now based on remaining room */
-#define TTY_THRESHOLD_UNTHROTTLE        128
-
-/*
- * Special byte codes used in the echo buffer to represent operations
- * or special handling of characters.  Bytes in the echo buffer that
- * are not part of such special blocks are treated as normal character
- * codes.
- */
-#define ECHO_OP_START 0xff
-#define ECHO_OP_MOVE_BACK_COL 0x80
-#define ECHO_OP_SET_CANON_COL 0x81
-#define ECHO_OP_ERASE_TAB 0x82
-
-static inline int tty_put_user(struct tty_struct *tty, unsigned char x,
-                               unsigned char __user *ptr)
-{
-        tty_audit_add_data(tty, &x, 1);
-        return put_user(x, ptr);
-}
-
-/**
- *      n_tty_set__room -       receive space
- *      @tty: terminal
- *
- *      Called by the driver to find out how much data it is
- *      permitted to feed to the line discipline without any being lost
- *      and thus to manage flow control. Not serialized. Answers for the
- *      "instant".
- */
-
-static void n_tty_set_room(struct tty_struct *tty)
-{
-        /* tty->read_cnt is not read locked ? */
-        int     left = N_TTY_BUF_SIZE - tty->read_cnt - 1;
-
-        /*
-         * If we are doing input canonicalization, and there are no
-         * pending newlines, let characters through without limit, so
-         * that erase characters will be handled.  Other excess
-         * characters will be beeped.
-         */
-        if (left <= 0)
-                left = tty->icanon && !tty->canon_data;
-        tty->receive_room = left;
-}
-
-static void put_tty_queue_nolock(unsigned char c, struct tty_struct *tty)
-{
-        if (tty->read_cnt < N_TTY_BUF_SIZE) {
-                tty->read_buf[tty->read_head] = c;
-                tty->read_head = (tty->read_head + 1) & (N_TTY_BUF_SIZE-1);
-                tty->read_cnt++;
-        }
-}
-
-/**
- *      put_tty_queue           -       add character to tty
- *      @c: character
- *      @tty: tty device
- *
- *      Add a character to the tty read_buf queue. This is done under the
- *      read_lock to serialize character addition and also to protect us
- *      against parallel reads or flushes
- */
-
-static void put_tty_queue(unsigned char c, struct tty_struct *tty)
-{
-        unsigned long flags;
-        /*
-         *      The problem of stomping on the buffers ends here.
-         *      Why didn't anyone see this one coming? --AJK
-        */
-        spin_lock_irqsave(&tty->read_lock, flags);
-        put_tty_queue_nolock(c, tty);
-        spin_unlock_irqrestore(&tty->read_lock, flags);
-}
-
-/**
- *      check_unthrottle        -       allow new receive data
- *      @tty; tty device
- *
- *      Check whether to call the driver unthrottle functions
- *
- *      Can sleep, may be called under the atomic_read_lock mutex but
- *      this is not guaranteed.
- */
-static void check_unthrottle(struct tty_struct *tty)
-{
-        if (tty->count)
-                tty_unthrottle(tty);
-}
-
-/**
- *      reset_buffer_flags      -       reset buffer state
- *      @tty: terminal to reset
- *
- *      Reset the read buffer counters, clear the flags,
- *      and make sure the driver is unthrottled. Called
- *      from n_tty_open() and n_tty_flush_buffer().
- *
- *      Locking: tty_read_lock for read fields.
- */
-
-static void reset_buffer_flags(struct tty_struct *tty)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&tty->read_lock, flags);
-        tty->read_head = tty->read_tail = tty->read_cnt = 0;
-        spin_unlock_irqrestore(&tty->read_lock, flags);
-
-        mutex_lock(&tty->echo_lock);
-        tty->echo_pos = tty->echo_cnt = tty->echo_overrun = 0;
-        mutex_unlock(&tty->echo_lock);
-
-        tty->canon_head = tty->canon_data = tty->erasing = 0;
-        memset(&tty->read_flags, 0, sizeof tty->read_flags);
-        n_tty_set_room(tty);
-        check_unthrottle(tty);
-}
-
-/**
- *      n_tty_flush_buffer      -       clean input queue
- *      @tty:   terminal device
- *
- *      Flush the input buffer. Called when the line discipline is
- *      being closed, when the tty layer wants the buffer flushed (eg
- *      at hangup) or when the N_TTY line discipline internally has to
- *      clean the pending queue (for example some signals).
- *
- *      Locking: ctrl_lock, read_lock.
- */
-
-static void n_tty_flush_buffer(struct tty_struct *tty)
-{
-        unsigned long flags;
-        /* clear everything and unthrottle the driver */
-        reset_buffer_flags(tty);
-
-        if (!tty->link)
-                return;
-
-        spin_lock_irqsave(&tty->ctrl_lock, flags);
-        if (tty->link->packet) {
-                tty->ctrl_status |= TIOCPKT_FLUSHREAD;
-                wake_up_interruptible(&tty->link->read_wait);
-        }
-        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-}
-
-/**
- *      n_tty_chars_in_buffer   -       report available bytes
- *      @tty: tty device
- *
- *      Report the number of characters buffered to be delivered to user
- *      at this instant in time.
- *
- *      Locking: read_lock
- */
-
-static ssize_t n_tty_chars_in_buffer(struct tty_struct *tty)
-{
-        unsigned long flags;
-        ssize_t n = 0;
-
-        spin_lock_irqsave(&tty->read_lock, flags);
-        if (!tty->icanon) {
-                n = tty->read_cnt;
-        } else if (tty->canon_data) {
-                n = (tty->canon_head > tty->read_tail) ?
-                        tty->canon_head - tty->read_tail :
-                        tty->canon_head + (N_TTY_BUF_SIZE - tty->read_tail);
-        }
-        spin_unlock_irqrestore(&tty->read_lock, flags);
-        return n;
-}
-
-/**
- *      is_utf8_continuation    -       utf8 multibyte check
- *      @c: byte to check
- *
- *      Returns true if the utf8 character 'c' is a multibyte continuation
- *      character. We use this to correctly compute the on screen size
- *      of the character when printing
- */
-
-static inline int is_utf8_continuation(unsigned char c)
-{
-        return (c & 0xc0) == 0x80;
-}
-
-/**
- *      is_continuation         -       multibyte check
- *      @c: byte to check
- *
- *      Returns true if the utf8 character 'c' is a multibyte continuation
- *      character and the terminal is in unicode mode.
- */
-
-static inline int is_continuation(unsigned char c, struct tty_struct *tty)
-{
-        return I_IUTF8(tty) && is_utf8_continuation(c);
-}
-
-/**
- *      do_output_char                  -       output one character
- *      @c: character (or partial unicode symbol)
- *      @tty: terminal device
- *      @space: space available in tty driver write buffer
- *
- *      This is a helper function that handles one output character
- *      (including special characters like TAB, CR, LF, etc.),
- *      doing OPOST processing and putting the results in the
- *      tty driver's write buffer.
- *
- *      Note that Linux currently ignores TABDLY, CRDLY, VTDLY, FFDLY
- *      and NLDLY.  They simply aren't relevant in the world today.
- *      If you ever need them, add them here.
- *
- *      Returns the number of bytes of buffer space used or -1 if
- *      no space left.
- *
- *      Locking: should be called under the output_lock to protect
- *               the column state and space left in the buffer
- */
-
-static int do_output_char(unsigned char c, struct tty_struct *tty, int space)
-{
-        int     spaces;
-
-        if (!space)
-                return -1;
-
-        switch (c) {
-        case '\n':
-                if (O_ONLRET(tty))
-                        tty->column = 0;
-                if (O_ONLCR(tty)) {
-                        if (space < 2)
-                                return -1;
-                        tty->canon_column = tty->column = 0;
-                        tty->ops->write(tty, "\r\n", 2);
-                        return 2;
-                }
-                tty->canon_column = tty->column;
-                break;
-        case '\r':
-                if (O_ONOCR(tty) && tty->column == 0)
-                        return 0;
-                if (O_OCRNL(tty)) {
-                        c = '\n';
-                        if (O_ONLRET(tty))
-                                tty->canon_column = tty->column = 0;
-                        break;
-                }
-                tty->canon_column = tty->column = 0;
-                break;
-        case '\t':
-                spaces = 8 - (tty->column & 7);
-                if (O_TABDLY(tty) == XTABS) {
-                        if (space < spaces)
-                                return -1;
-                        tty->column += spaces;
-                        tty->ops->write(tty, "        ", spaces);
-                        return spaces;
-                }
-                tty->column += spaces;
-                break;
-        case '\b':
-                if (tty->column > 0)
-                        tty->column--;
-                break;
-        default:
-                if (!iscntrl(c)) {
-                        if (O_OLCUC(tty))
-                                c = toupper(c);
-                        if (!is_continuation(c, tty))
-                                tty->column++;
-                }
-                break;
-        }
-
-        tty_put_char(tty, c);
-        return 1;
-}
-
-/**
- *      process_output                  -       output post processor
- *      @c: character (or partial unicode symbol)
- *      @tty: terminal device
- *
- *      Output one character with OPOST processing.
- *      Returns -1 when the output device is full and the character
- *      must be retried.
- *
- *      Locking: output_lock to protect column state and space left
- *               (also, this is called from n_tty_write under the
- *                tty layer write lock)
- */
-
-static int process_output(unsigned char c, struct tty_struct *tty)
-{
-        int     space, retval;
-
-        mutex_lock(&tty->output_lock);
-
-        space = tty_write_room(tty);
-        retval = do_output_char(c, tty, space);
-
-        mutex_unlock(&tty->output_lock);
-        if (retval < 0)
-                return -1;
-        else
-                return 0;
-}
-
-/**
- *      process_output_block            -       block post processor
- *      @tty: terminal device
- *      @buf: character buffer
- *      @nr: number of bytes to output
- *
- *      Output a block of characters with OPOST processing.
- *      Returns the number of characters output.
- *
- *      This path is used to speed up block console writes, among other
- *      things when processing blocks of output data. It handles only
- *      the simple cases normally found and helps to generate blocks of
- *      symbols for the console driver and thus improve performance.
- *
- *      Locking: output_lock to protect column state and space left
- *               (also, this is called from n_tty_write under the
- *                tty layer write lock)
- */
-
-static ssize_t process_output_block(struct tty_struct *tty,
-                                    const unsigned char *buf, unsigned int nr)
-{
-        int     space;
-        int     i;
-        const unsigned char *cp;
-
-        mutex_lock(&tty->output_lock);
-
-        space = tty_write_room(tty);
-        if (!space) {
-                mutex_unlock(&tty->output_lock);
-                return 0;
-        }
-        if (nr > space)
-                nr = space;
-
-        for (i = 0, cp = buf; i < nr; i++, cp++) {
-                unsigned char c = *cp;
-
-                switch (c) {
-                case '\n':
-                        if (O_ONLRET(tty))
-                                tty->column = 0;
-                        if (O_ONLCR(tty))
-                                goto break_out;
-                        tty->canon_column = tty->column;
-                        break;
-                case '\r':
-                        if (O_ONOCR(tty) && tty->column == 0)
-                                goto break_out;
-                        if (O_OCRNL(tty))
-                                goto break_out;
-                        tty->canon_column = tty->column = 0;
-                        break;
-                case '\t':
-                        goto break_out;
-                case '\b':
-                        if (tty->column > 0)
-                                tty->column--;
-                        break;
-                default:
-                        if (!iscntrl(c)) {
-                                if (O_OLCUC(tty))
-                                        goto break_out;
-                                if (!is_continuation(c, tty))
-                                        tty->column++;
-                        }
-                        break;
-                }
-        }
-break_out:
-        i = tty->ops->write(tty, buf, i);
-
-        mutex_unlock(&tty->output_lock);
-        return i;
-}
-
-/**
- *      process_echoes  -       write pending echo characters
- *      @tty: terminal device
- *
- *      Write previously buffered echo (and other ldisc-generated)
- *      characters to the tty.
- *
- *      Characters generated by the ldisc (including echoes) need to
- *      be buffered because the driver's write buffer can fill during
- *      heavy program output.  Echoing straight to the driver will
- *      often fail under these conditions, causing lost characters and
- *      resulting mismatches of ldisc state information.
- *
- *      Since the ldisc state must represent the characters actually sent
- *      to the driver at the time of the write, operations like certain
- *      changes in column state are also saved in the buffer and executed
- *      here.
- *
- *      A circular fifo buffer is used so that the most recent characters
- *      are prioritized.  Also, when control characters are echoed with a
- *      prefixed "^", the pair is treated atomically and thus not separated.
- *
- *      Locking: output_lock to protect column state and space left,
- *               echo_lock to protect the echo buffer
- */
-
-static void process_echoes(struct tty_struct *tty)
-{
-        int     space, nr;
-        unsigned char c;
-        unsigned char *cp, *buf_end;
-
-        if (!tty->echo_cnt)
-                return;
-
-        mutex_lock(&tty->output_lock);
-        mutex_lock(&tty->echo_lock);
-
-        space = tty_write_room(tty);
-
-        buf_end = tty->echo_buf + N_TTY_BUF_SIZE;
-        cp = tty->echo_buf + tty->echo_pos;
-        nr = tty->echo_cnt;
-        while (nr > 0) {
-                c = *cp;
-                if (c == ECHO_OP_START) {
-                        unsigned char op;
-                        unsigned char *opp;
-                        int no_space_left = 0;
-
-                        /*
-                         * If the buffer byte is the start of a multi-byte
-                         * operation, get the next byte, which is either the
-                         * op code or a control character value.
-                         */
-                        opp = cp + 1;
-                        if (opp == buf_end)
-                                opp -= N_TTY_BUF_SIZE;
-                        op = *opp;
-
-                        switch (op) {
-                                unsigned int num_chars, num_bs;
-
-                        case ECHO_OP_ERASE_TAB:
-                                if (++opp == buf_end)
-                                        opp -= N_TTY_BUF_SIZE;
-                                num_chars = *opp;
-
-                                /*
-                                 * Determine how many columns to go back
-                                 * in order to erase the tab.
-                                 * This depends on the number of columns
-                                 * used by other characters within the tab
-                                 * area.  If this (modulo 8) count is from
-                                 * the start of input rather than from a
-                                 * previous tab, we offset by canon column.
-                                 * Otherwise, tab spacing is normal.
-                                 */
-                                if (!(num_chars & 0x80))
-                                        num_chars += tty->canon_column;
-                                num_bs = 8 - (num_chars & 7);
-
-                                if (num_bs > space) {
-                                        no_space_left = 1;
-                                        break;
-                                }
-                                space -= num_bs;
-                                while (num_bs--) {
-                                        tty_put_char(tty, '\b');
-                                        if (tty->column > 0)
-                                                tty->column--;
-                                }
-                                cp += 3;
-                                nr -= 3;
-                                break;
-
-                        case ECHO_OP_SET_CANON_COL:
-                                tty->canon_column = tty->column;
-                                cp += 2;
-                                nr -= 2;
-                                break;
-
-                        case ECHO_OP_MOVE_BACK_COL:
-                                if (tty->column > 0)
-                                        tty->column--;
-                                cp += 2;
-                                nr -= 2;
-                                break;
-
-                        case ECHO_OP_START:
-                                /* This is an escaped echo op start code */
-                                if (!space) {
-                                        no_space_left = 1;
-                                        break;
-                                }
-                                tty_put_char(tty, ECHO_OP_START);
-                                tty->column++;
-                                space--;
-                                cp += 2;
-                                nr -= 2;
-                                break;
-
-                        default:
-                                /*
-                                 * If the op is not a special byte code,
-                                 * it is a ctrl char tagged to be echoed
-                                 * as "^X" (where X is the letter
-                                 * representing the control char).
-                                 * Note that we must ensure there is
-                                 * enough space for the whole ctrl pair.
-                                 *
-                                 */
-                                if (space < 2) {
-                                        no_space_left = 1;
-                                        break;
-                                }
-                                tty_put_char(tty, '^');
-                                tty_put_char(tty, op ^ 0100);
-                                tty->column += 2;
-                                space -= 2;
-                                cp += 2;
-                                nr -= 2;
-                        }
-
-                        if (no_space_left)
-                                break;
-                } else {
-                        if (O_OPOST(tty) &&
-                            !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) {
-                                int retval = do_output_char(c, tty, space);
-                                if (retval < 0)
-                                        break;
-                                space -= retval;
-                        } else {
-                                if (!space)
-                                        break;
-                                tty_put_char(tty, c);
-                                space -= 1;
-                        }
-                        cp += 1;
-                        nr -= 1;
-                }
-
-                /* When end of circular buffer reached, wrap around */
-                if (cp >= buf_end)
-                        cp -= N_TTY_BUF_SIZE;
-        }
-
-        if (nr == 0) {
-                tty->echo_pos = 0;
-                tty->echo_cnt = 0;
-                tty->echo_overrun = 0;
-        } else {
-                int num_processed = tty->echo_cnt - nr;
-                tty->echo_pos += num_processed;
-                tty->echo_pos &= N_TTY_BUF_SIZE - 1;
-                tty->echo_cnt = nr;
-                if (num_processed > 0)
-                        tty->echo_overrun = 0;
-        }
-
-        mutex_unlock(&tty->echo_lock);
-        mutex_unlock(&tty->output_lock);
-
-        if (tty->ops->flush_chars)
-                tty->ops->flush_chars(tty);
-}
-
-/**
- *      add_echo_byte   -       add a byte to the echo buffer
- *      @c: unicode byte to echo
- *      @tty: terminal device
- *
- *      Add a character or operation byte to the echo buffer.
- *
- *      Should be called under the echo lock to protect the echo buffer.
- */
-
-static void add_echo_byte(unsigned char c, struct tty_struct *tty)
-{
-        int     new_byte_pos;
-
-        if (tty->echo_cnt == N_TTY_BUF_SIZE) {
-                /* Circular buffer is already at capacity */
-                new_byte_pos = tty->echo_pos;
-
-                /*
-                 * Since the buffer start position needs to be advanced,
-                 * be sure to step by a whole operation byte group.
-                 */
-                if (tty->echo_buf[tty->echo_pos] == ECHO_OP_START) {
-                        if (tty->echo_buf[(tty->echo_pos + 1) &
-                                          (N_TTY_BUF_SIZE - 1)] ==
-                                                ECHO_OP_ERASE_TAB) {
-                                tty->echo_pos += 3;
-                                tty->echo_cnt -= 2;
-                        } else {
-                                tty->echo_pos += 2;
-                                tty->echo_cnt -= 1;
-                        }
-                } else {
-                        tty->echo_pos++;
-                }
-                tty->echo_pos &= N_TTY_BUF_SIZE - 1;
-
-                tty->echo_overrun = 1;
-        } else {
-                new_byte_pos = tty->echo_pos + tty->echo_cnt;
-                new_byte_pos &= N_TTY_BUF_SIZE - 1;
-                tty->echo_cnt++;
-        }
-
-        tty->echo_buf[new_byte_pos] = c;
-}
-
-/**
- *      echo_move_back_col      -       add operation to move back a column
- *      @tty: terminal device
- *
- *      Add an operation to the echo buffer to move back one column.
- *
- *      Locking: echo_lock to protect the echo buffer
- */
-
-static void echo_move_back_col(struct tty_struct *tty)
-{
-        mutex_lock(&tty->echo_lock);
-
-        add_echo_byte(ECHO_OP_START, tty);
-        add_echo_byte(ECHO_OP_MOVE_BACK_COL, tty);
-
-        mutex_unlock(&tty->echo_lock);
-}
-
-/**
- *      echo_set_canon_col      -       add operation to set the canon column
- *      @tty: terminal device
- *
- *      Add an operation to the echo buffer to set the canon column
- *      to the current column.
- *
- *      Locking: echo_lock to protect the echo buffer
- */
-
-static void echo_set_canon_col(struct tty_struct *tty)
-{
-        mutex_lock(&tty->echo_lock);
-
-        add_echo_byte(ECHO_OP_START, tty);
-        add_echo_byte(ECHO_OP_SET_CANON_COL, tty);
-
-        mutex_unlock(&tty->echo_lock);
-}
-
-/**
- *      echo_erase_tab  -       add operation to erase a tab
- *      @num_chars: number of character columns already used
- *      @after_tab: true if num_chars starts after a previous tab
- *      @tty: terminal device
- *
- *      Add an operation to the echo buffer to erase a tab.
- *
- *      Called by the eraser function, which knows how many character
- *      columns have been used since either a previous tab or the start
- *      of input.  This information will be used later, along with
- *      canon column (if applicable), to go back the correct number
- *      of columns.
- *
- *      Locking: echo_lock to protect the echo buffer
- */
-
-static void echo_erase_tab(unsigned int num_chars, int after_tab,
-                           struct tty_struct *tty)
-{
-        mutex_lock(&tty->echo_lock);
-
-        add_echo_byte(ECHO_OP_START, tty);
-        add_echo_byte(ECHO_OP_ERASE_TAB, tty);
-
-        /* We only need to know this modulo 8 (tab spacing) */
-        num_chars &= 7;
-
-        /* Set the high bit as a flag if num_chars is after a previous tab */
-        if (after_tab)
-                num_chars |= 0x80;
-
-        add_echo_byte(num_chars, tty);
-
-        mutex_unlock(&tty->echo_lock);
-}
-
-/**
- *      echo_char_raw   -       echo a character raw
- *      @c: unicode byte to echo
- *      @tty: terminal device
- *
- *      Echo user input back onto the screen. This must be called only when
- *      L_ECHO(tty) is true. Called from the driver receive_buf path.
- *
- *      This variant does not treat control characters specially.
- *
- *      Locking: echo_lock to protect the echo buffer
- */
-
-static void echo_char_raw(unsigned char c, struct tty_struct *tty)
-{
-        mutex_lock(&tty->echo_lock);
-
-        if (c == ECHO_OP_START) {
-                add_echo_byte(ECHO_OP_START, tty);
-                add_echo_byte(ECHO_OP_START, tty);
-        } else {
-                add_echo_byte(c, tty);
-        }
-
-        mutex_unlock(&tty->echo_lock);
-}
-
-/**
- *      echo_char       -       echo a character
- *      @c: unicode byte to echo
- *      @tty: terminal device
- *
- *      Echo user input back onto the screen. This must be called only when
- *      L_ECHO(tty) is true. Called from the driver receive_buf path.
- *
- *      This variant tags control characters to be echoed as "^X"
- *      (where X is the letter representing the control char).
- *
- *      Locking: echo_lock to protect the echo buffer
- */
-
-static void echo_char(unsigned char c, struct tty_struct *tty)
-{
-        mutex_lock(&tty->echo_lock);
-
-        if (c == ECHO_OP_START) {
-                add_echo_byte(ECHO_OP_START, tty);
-                add_echo_byte(ECHO_OP_START, tty);
-        } else {
-                if (L_ECHOCTL(tty) && iscntrl(c) && c != '\t')
-                        add_echo_byte(ECHO_OP_START, tty);
-                add_echo_byte(c, tty);
-        }
-
-        mutex_unlock(&tty->echo_lock);
-}
-
-/**
- *      finish_erasing          -       complete erase
- *      @tty: tty doing the erase
- */
-
-static inline void finish_erasing(struct tty_struct *tty)
-{
-        if (tty->erasing) {
-                echo_char_raw('/', tty);
-                tty->erasing = 0;
-        }
-}
-
-/**
- *      eraser          -       handle erase function
- *      @c: character input
- *      @tty: terminal device
- *
- *      Perform erase and necessary output when an erase character is
- *      present in the stream from the driver layer. Handles the complexities
- *      of UTF-8 multibyte symbols.
- *
- *      Locking: read_lock for tty buffers
- */
-
-static void eraser(unsigned char c, struct tty_struct *tty)
-{
-        enum { ERASE, WERASE, KILL } kill_type;
-        int head, seen_alnums, cnt;
-        unsigned long flags;
-
-        /* FIXME: locking needed ? */
-        if (tty->read_head == tty->canon_head) {
-                /* process_output('\a', tty); */ /* what do you think? */
-                return;
-        }
-        if (c == ERASE_CHAR(tty))
-                kill_type = ERASE;
-        else if (c == WERASE_CHAR(tty))
-                kill_type = WERASE;
-        else {
-                if (!L_ECHO(tty)) {
-                        spin_lock_irqsave(&tty->read_lock, flags);
-                        tty->read_cnt -= ((tty->read_head - tty->canon_head) &
-                                          (N_TTY_BUF_SIZE - 1));
-                        tty->read_head = tty->canon_head;
-                        spin_unlock_irqrestore(&tty->read_lock, flags);
-                        return;
-                }
-                if (!L_ECHOK(tty) || !L_ECHOKE(tty) || !L_ECHOE(tty)) {
-                        spin_lock_irqsave(&tty->read_lock, flags);
-                        tty->read_cnt -= ((tty->read_head - tty->canon_head) &
-                                          (N_TTY_BUF_SIZE - 1));
-                        tty->read_head = tty->canon_head;
-                        spin_unlock_irqrestore(&tty->read_lock, flags);
-                        finish_erasing(tty);
-                        echo_char(KILL_CHAR(tty), tty);
-                        /* Add a newline if ECHOK is on and ECHOKE is off. */
-                        if (L_ECHOK(tty))
-                                echo_char_raw('\n', tty);
-                        return;
-                }
-                kill_type = KILL;
-        }
-
-        seen_alnums = 0;
-        /* FIXME: Locking ?? */
-        while (tty->read_head != tty->canon_head) {
-                head = tty->read_head;
-
-                /* erase a single possibly multibyte character */
-                do {
-                        head = (head - 1) & (N_TTY_BUF_SIZE-1);
-                        c = tty->read_buf[head];
-                } while (is_continuation(c, tty) && head != tty->canon_head);
-
-                /* do not partially erase */
-                if (is_continuation(c, tty))
-                        break;
-
-                if (kill_type == WERASE) {
-                        /* Equivalent to BSD's ALTWERASE. */
-                        if (isalnum(c) || c == '_')
-                                seen_alnums++;
-                        else if (seen_alnums)
-                                break;
-                }
-                cnt = (tty->read_head - head) & (N_TTY_BUF_SIZE-1);
-                spin_lock_irqsave(&tty->read_lock, flags);
-                tty->read_head = head;
-                tty->read_cnt -= cnt;
-                spin_unlock_irqrestore(&tty->read_lock, flags);
-                if (L_ECHO(tty)) {
-                        if (L_ECHOPRT(tty)) {
-                                if (!tty->erasing) {
-                                        echo_char_raw('\\', tty);
-                                        tty->erasing = 1;
-                                }
-                                /* if cnt > 1, output a multi-byte character */
-                                echo_char(c, tty);
-                                while (--cnt > 0) {
-                                        head = (head+1) & (N_TTY_BUF_SIZE-1);
-                                        echo_char_raw(tty->read_buf[head], tty);
-                                        echo_move_back_col(tty);
-                                }
-                        } else if (kill_type == ERASE && !L_ECHOE(tty)) {
-                                echo_char(ERASE_CHAR(tty), tty);
-                        } else if (c == '\t') {
-                                unsigned int num_chars = 0;
-                                int after_tab = 0;
-                                unsigned long tail = tty->read_head;
-
-                                /*
-                                 * Count the columns used for characters
-                                 * since the start of input or after a
-                                 * previous tab.
-                                 * This info is used to go back the correct
-                                 * number of columns.
-                                 */
-                                while (tail != tty->canon_head) {
-                                        tail = (tail-1) & (N_TTY_BUF_SIZE-1);
-                                        c = tty->read_buf[tail];
-                                        if (c == '\t') {
-                                                after_tab = 1;
-                                                break;
-                                        } else if (iscntrl(c)) {
-                                                if (L_ECHOCTL(tty))
-                                                        num_chars += 2;
-                                        } else if (!is_continuation(c, tty)) {
-                                                num_chars++;
-                                        }
-                                }
-                                echo_erase_tab(num_chars, after_tab, tty);
-                        } else {
-                                if (iscntrl(c) && L_ECHOCTL(tty)) {
-                                        echo_char_raw('\b', tty);
-                                        echo_char_raw(' ', tty);
-                                        echo_char_raw('\b', tty);
-                                }
-                                if (!iscntrl(c) || L_ECHOCTL(tty)) {
-                                        echo_char_raw('\b', tty);
-                                        echo_char_raw(' ', tty);
-                                        echo_char_raw('\b', tty);
-                                }
-                        }
-                }
-                if (kill_type == ERASE)
-                        break;
-        }
-        if (tty->read_head == tty->canon_head && L_ECHO(tty))
-                finish_erasing(tty);
-}
-
-/**
- *      isig            -       handle the ISIG optio
- *      @sig: signal
- *      @tty: terminal
- *      @flush: force flush
- *
- *      Called when a signal is being sent due to terminal input. This
- *      may caus terminal flushing to take place according to the termios
- *      settings and character used. Called from the driver receive_buf
- *      path so serialized.
- *
- *      Locking: ctrl_lock, read_lock (both via flush buffer)
- */
-
-static inline void isig(int sig, struct tty_struct *tty, int flush)
-{
-        if (tty->pgrp)
-                kill_pgrp(tty->pgrp, sig, 1);
-        if (flush || !L_NOFLSH(tty)) {
-                n_tty_flush_buffer(tty);
-                tty_driver_flush_buffer(tty);
-        }
-}
-
-/**
- *      n_tty_receive_break     -       handle break
- *      @tty: terminal
- *
- *      An RS232 break event has been hit in the incoming bitstream. This
- *      can cause a variety of events depending upon the termios settings.
- *
- *      Called from the receive_buf path so single threaded.
- */
-
-static inline void n_tty_receive_break(struct tty_struct *tty)
-{
-        if (I_IGNBRK(tty))
-                return;
-        if (I_BRKINT(tty)) {
-                isig(SIGINT, tty, 1);
-                return;
-        }
-        if (I_PARMRK(tty)) {
-                put_tty_queue('\377', tty);
-                put_tty_queue('\0', tty);
-        }
-        put_tty_queue('\0', tty);
-        wake_up_interruptible(&tty->read_wait);
-}
-
-/**
- *      n_tty_receive_overrun   -       handle overrun reporting
- *      @tty: terminal
- *
- *      Data arrived faster than we could process it. While the tty
- *      driver has flagged this the bits that were missed are gone
- *      forever.
- *
- *      Called from the receive_buf path so single threaded. Does not
- *      need locking as num_overrun and overrun_time are function
- *      private.
- */
-
-static inline void n_tty_receive_overrun(struct tty_struct *tty)
-{
-        char buf[64];
-
-        tty->num_overrun++;
-        if (time_before(tty->overrun_time, jiffies - HZ) ||
-                        time_after(tty->overrun_time, jiffies)) {
-                printk(KERN_WARNING "%s: %d input overrun(s)\n",
-                        tty_name(tty, buf),
-                        tty->num_overrun);
-                tty->overrun_time = jiffies;
-                tty->num_overrun = 0;
-        }
-}
-
-/**
- *      n_tty_receive_parity_error      -       error notifier
- *      @tty: terminal device
- *      @c: character
- *
- *      Process a parity error and queue the right data to indicate
- *      the error case if necessary. Locking as per n_tty_receive_buf.
- */
-static inline void n_tty_receive_parity_error(struct tty_struct *tty,
-                                              unsigned char c)
-{
-        if (I_IGNPAR(tty))
-                return;
-        if (I_PARMRK(tty)) {
-                put_tty_queue('\377', tty);
-                put_tty_queue('\0', tty);
-                put_tty_queue(c, tty);
-        } else  if (I_INPCK(tty))
-                put_tty_queue('\0', tty);
-        else
-                put_tty_queue(c, tty);
-        wake_up_interruptible(&tty->read_wait);
-}
-
-/**
- *      n_tty_receive_char      -       perform processing
- *      @tty: terminal device
- *      @c: character
- *
- *      Process an individual character of input received from the driver.
- *      This is serialized with respect to itself by the rules for the
- *      driver above.
- */
-
-static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
-{
-        unsigned long flags;
-        int parmrk;
-
-        if (tty->raw) {
-                put_tty_queue(c, tty);
-                return;
-        }
-
-        if (I_ISTRIP(tty))
-                c &= 0x7f;
-        if (I_IUCLC(tty) && L_IEXTEN(tty))
-                c = tolower(c);
-
-        if (L_EXTPROC(tty)) {
-                put_tty_queue(c, tty);
-                return;
-        }
-
-        if (tty->stopped && !tty->flow_stopped && I_IXON(tty) &&
-            I_IXANY(tty) && c != START_CHAR(tty) && c != STOP_CHAR(tty) &&
-            c != INTR_CHAR(tty) && c != QUIT_CHAR(tty) && c != SUSP_CHAR(tty)) {
-                start_tty(tty);
-                process_echoes(tty);
-        }
-
-        if (tty->closing) {
-                if (I_IXON(tty)) {
-                        if (c == START_CHAR(tty)) {
-                                start_tty(tty);
-                                process_echoes(tty);
-                        } else if (c == STOP_CHAR(tty))
-                                stop_tty(tty);
-                }
-                return;
-        }
-
-        /*
-         * If the previous character was LNEXT, or we know that this
-         * character is not one of the characters that we'll have to
-         * handle specially, do shortcut processing to speed things
-         * up.
-         */
-        if (!test_bit(c, tty->process_char_map) || tty->lnext) {
-                tty->lnext = 0;
-                parmrk = (c == (unsigned char) '\377' && I_PARMRK(tty)) ? 1 : 0;
-                if (tty->read_cnt >= (N_TTY_BUF_SIZE - parmrk - 1)) {
-                        /* beep if no space */
-                        if (L_ECHO(tty))
-                                process_output('\a', tty);
-                        return;
-                }
-                if (L_ECHO(tty)) {
-                        finish_erasing(tty);
-                        /* Record the column of first canon char. */
-                        if (tty->canon_head == tty->read_head)
-                                echo_set_canon_col(tty);
-                        echo_char(c, tty);
-                        process_echoes(tty);
-                }
-                if (parmrk)
-                        put_tty_queue(c, tty);
-                put_tty_queue(c, tty);
-                return;
-        }
-
-        if (I_IXON(tty)) {
-                if (c == START_CHAR(tty)) {
-                        start_tty(tty);
-                        process_echoes(tty);
-                        return;
-                }
-                if (c == STOP_CHAR(tty)) {
-                        stop_tty(tty);
-                        return;
-                }
-        }
-
-        if (L_ISIG(tty)) {
-                int signal;
-                signal = SIGINT;
-                if (c == INTR_CHAR(tty))
-                        goto send_signal;
-                signal = SIGQUIT;
-                if (c == QUIT_CHAR(tty))
-                        goto send_signal;
-                signal = SIGTSTP;
-                if (c == SUSP_CHAR(tty)) {
-send_signal:
-                        /*
-                         * Note that we do not use isig() here because we want
-                         * the order to be:
-                         * 1) flush, 2) echo, 3) signal
-                         */
-                        if (!L_NOFLSH(tty)) {
-                                n_tty_flush_buffer(tty);
-                                tty_driver_flush_buffer(tty);
-                        }
-                        if (I_IXON(tty))
-                                start_tty(tty);
-                        if (L_ECHO(tty)) {
-                                echo_char(c, tty);
-                                process_echoes(tty);
-                        }
-                        if (tty->pgrp)
-                                kill_pgrp(tty->pgrp, signal, 1);
-                        return;
-                }
-        }
-
-        if (c == '\r') {
-                if (I_IGNCR(tty))
-                        return;
-                if (I_ICRNL(tty))
-                        c = '\n';
-        } else if (c == '\n' && I_INLCR(tty))
-                c = '\r';
-
-        if (tty->icanon) {
-                if (c == ERASE_CHAR(tty) || c == KILL_CHAR(tty) ||
-                    (c == WERASE_CHAR(tty) && L_IEXTEN(tty))) {
-                        eraser(c, tty);
-                        process_echoes(tty);
-                        return;
-                }
-                if (c == LNEXT_CHAR(tty) && L_IEXTEN(tty)) {
-                        tty->lnext = 1;
-                        if (L_ECHO(tty)) {
-                                finish_erasing(tty);
-                                if (L_ECHOCTL(tty)) {
-                                        echo_char_raw('^', tty);
-                                        echo_char_raw('\b', tty);
-                                        process_echoes(tty);
-                                }
-                        }
-                        return;
-                }
-                if (c == REPRINT_CHAR(tty) && L_ECHO(tty) &&
-                    L_IEXTEN(tty)) {
-                        unsigned long tail = tty->canon_head;
-
-                        finish_erasing(tty);
-                        echo_char(c, tty);
-                        echo_char_raw('\n', tty);
-                        while (tail != tty->read_head) {
-                                echo_char(tty->read_buf[tail], tty);
-                                tail = (tail+1) & (N_TTY_BUF_SIZE-1);
-                        }
-                        process_echoes(tty);
-                        return;
-                }
-                if (c == '\n') {
-                        if (tty->read_cnt >= N_TTY_BUF_SIZE) {
-                                if (L_ECHO(tty))
-                                        process_output('\a', tty);
-                                return;
-                        }
-                        if (L_ECHO(tty) || L_ECHONL(tty)) {
-                                echo_char_raw('\n', tty);
-                                process_echoes(tty);
-                        }
-                        goto handle_newline;
-                }
-                if (c == EOF_CHAR(tty)) {
-                        if (tty->read_cnt >= N_TTY_BUF_SIZE)
-                                return;
-                        if (tty->canon_head != tty->read_head)
-                                set_bit(TTY_PUSH, &tty->flags);
-                        c = __DISABLED_CHAR;
-                        goto handle_newline;
-                }
-                if ((c == EOL_CHAR(tty)) ||
-                    (c == EOL2_CHAR(tty) && L_IEXTEN(tty))) {
-                        parmrk = (c == (unsigned char) '\377' && I_PARMRK(tty))
-                                 ? 1 : 0;
-                        if (tty->read_cnt >= (N_TTY_BUF_SIZE - parmrk)) {
-                                if (L_ECHO(tty))
-                                        process_output('\a', tty);
-                                return;
-                        }
-                        /*
-                         * XXX are EOL_CHAR and EOL2_CHAR echoed?!?
-                         */
-                        if (L_ECHO(tty)) {
-                                /* Record the column of first canon char. */
-                                if (tty->canon_head == tty->read_head)
-                                        echo_set_canon_col(tty);
-                                echo_char(c, tty);
-                                process_echoes(tty);
-                        }
-                        /*
-                         * XXX does PARMRK doubling happen for
-                         * EOL_CHAR and EOL2_CHAR?
-                         */
-                        if (parmrk)
-                                put_tty_queue(c, tty);
-
-handle_newline:
-                        spin_lock_irqsave(&tty->read_lock, flags);
-                        set_bit(tty->read_head, tty->read_flags);
-                        put_tty_queue_nolock(c, tty);
-                        tty->canon_head = tty->read_head;
-                        tty->canon_data++;
-                        spin_unlock_irqrestore(&tty->read_lock, flags);
-                        kill_fasync(&tty->fasync, SIGIO, POLL_IN);
-                        if (waitqueue_active(&tty->read_wait))
-                                wake_up_interruptible(&tty->read_wait);
-                        return;
-                }
-        }
-
-        parmrk = (c == (unsigned char) '\377' && I_PARMRK(tty)) ? 1 : 0;
-        if (tty->read_cnt >= (N_TTY_BUF_SIZE - parmrk - 1)) {
-                /* beep if no space */
-                if (L_ECHO(tty))
-                        process_output('\a', tty);
-                return;
-        }
-        if (L_ECHO(tty)) {
-                finish_erasing(tty);
-                if (c == '\n')
-                        echo_char_raw('\n', tty);
-                else {
-                        /* Record the column of first canon char. */
-                        if (tty->canon_head == tty->read_head)
-                                echo_set_canon_col(tty);
-                        echo_char(c, tty);
-                }
-                process_echoes(tty);
-        }
-
-        if (parmrk)
-                put_tty_queue(c, tty);
-
-        put_tty_queue(c, tty);
-}
-
-
-/**
- *      n_tty_write_wakeup      -       asynchronous I/O notifier
- *      @tty: tty device
- *
- *      Required for the ptys, serial driver etc. since processes
- *      that attach themselves to the master and rely on ASYNC
- *      IO must be woken up
- */
-
-static void n_tty_write_wakeup(struct tty_struct *tty)
-{
-        if (tty->fasync && test_and_clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags))
-                kill_fasync(&tty->fasync, SIGIO, POLL_OUT);
-}
-
-/**
- *      n_tty_receive_buf       -       data receive
- *      @tty: terminal device
- *      @cp: buffer
- *      @fp: flag buffer
- *      @count: characters
- *
- *      Called by the terminal driver when a block of characters has
- *      been received. This function must be called from soft contexts
- *      not from interrupt context. The driver is responsible for making
- *      calls one at a time and in order (or using flush_to_ldisc)
- */
-
-static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
-                              char *fp, int count)
-{
-        const unsigned char *p;
-        char *f, flags = TTY_NORMAL;
-        int     i;
-        char    buf[64];
-        unsigned long cpuflags;
-
-        if (!tty->read_buf)
-                return;
-
-        if (tty->real_raw) {
-                spin_lock_irqsave(&tty->read_lock, cpuflags);
-                i = min(N_TTY_BUF_SIZE - tty->read_cnt,
-                        N_TTY_BUF_SIZE - tty->read_head);
-                i = min(count, i);
-                memcpy(tty->read_buf + tty->read_head, cp, i);
-                tty->read_head = (tty->read_head + i) & (N_TTY_BUF_SIZE-1);
-                tty->read_cnt += i;
-                cp += i;
-                count -= i;
-
-                i = min(N_TTY_BUF_SIZE - tty->read_cnt,
-                        N_TTY_BUF_SIZE - tty->read_head);
-                i = min(count, i);
-                memcpy(tty->read_buf + tty->read_head, cp, i);
-                tty->read_head = (tty->read_head + i) & (N_TTY_BUF_SIZE-1);
-                tty->read_cnt += i;
-                spin_unlock_irqrestore(&tty->read_lock, cpuflags);
-        } else {
-                for (i = count, p = cp, f = fp; i; i--, p++) {
-                        if (f)
-                                flags = *f++;
-                        switch (flags) {
-                        case TTY_NORMAL:
-                                n_tty_receive_char(tty, *p);
-                                break;
-                        case TTY_BREAK:
-                                n_tty_receive_break(tty);
-                                break;
-                        case TTY_PARITY:
-                        case TTY_FRAME:
-                                n_tty_receive_parity_error(tty, *p);
-                                break;
-                        case TTY_OVERRUN:
-                                n_tty_receive_overrun(tty);
-                                break;
-                        default:
-                                printk(KERN_ERR "%s: unknown flag %d\n",
-                                       tty_name(tty, buf), flags);
-                                break;
-                        }
-                }
-                if (tty->ops->flush_chars)
-                        tty->ops->flush_chars(tty);
-        }
-
-        n_tty_set_room(tty);
-
-        if ((!tty->icanon && (tty->read_cnt >= tty->minimum_to_wake)) ||
-                L_EXTPROC(tty)) {
-                kill_fasync(&tty->fasync, SIGIO, POLL_IN);
-                if (waitqueue_active(&tty->read_wait))
-                        wake_up_interruptible(&tty->read_wait);
-        }
-
-        /*
-         * Check the remaining room for the input canonicalization
-         * mode.  We don't want to throttle the driver if we're in
-         * canonical mode and don't have a newline yet!
-         */
-        if (tty->receive_room < TTY_THRESHOLD_THROTTLE)
-                tty_throttle(tty);
-}
-
-int is_ignored(int sig)
-{
-        return (sigismember(&current->blocked, sig) ||
-                current->sighand->action[sig-1].sa.sa_handler == SIG_IGN);
-}
-
-/**
- *      n_tty_set_termios       -       termios data changed
- *      @tty: terminal
- *      @old: previous data
- *
- *      Called by the tty layer when the user changes termios flags so
- *      that the line discipline can plan ahead. This function cannot sleep
- *      and is protected from re-entry by the tty layer. The user is
- *      guaranteed that this function will not be re-entered or in progress
- *      when the ldisc is closed.
- *
- *      Locking: Caller holds tty->termios_mutex
- */
-
-static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
-{
-        int canon_change = 1;
-        BUG_ON(!tty);
-
-        if (old)
-                canon_change = (old->c_lflag ^ tty->termios->c_lflag) & ICANON;
-        if (canon_change) {
-                memset(&tty->read_flags, 0, sizeof tty->read_flags);
-                tty->canon_head = tty->read_tail;
-                tty->canon_data = 0;
-                tty->erasing = 0;
-        }
-
-        if (canon_change && !L_ICANON(tty) && tty->read_cnt)
-                wake_up_interruptible(&tty->read_wait);
-
-        tty->icanon = (L_ICANON(tty) != 0);
-        if (test_bit(TTY_HW_COOK_IN, &tty->flags)) {
-                tty->raw = 1;
-                tty->real_raw = 1;
-                n_tty_set_room(tty);
-                return;
-        }
-        if (I_ISTRIP(tty) || I_IUCLC(tty) || I_IGNCR(tty) ||
-            I_ICRNL(tty) || I_INLCR(tty) || L_ICANON(tty) ||
-            I_IXON(tty) || L_ISIG(tty) || L_ECHO(tty) ||
-            I_PARMRK(tty)) {
-                memset(tty->process_char_map, 0, 256/8);
-
-                if (I_IGNCR(tty) || I_ICRNL(tty))
-                        set_bit('\r', tty->process_char_map);
-                if (I_INLCR(tty))
-                        set_bit('\n', tty->process_char_map);
-
-                if (L_ICANON(tty)) {
-                        set_bit(ERASE_CHAR(tty), tty->process_char_map);
-                        set_bit(KILL_CHAR(tty), tty->process_char_map);
-                        set_bit(EOF_CHAR(tty), tty->process_char_map);
-                        set_bit('\n', tty->process_char_map);
-                        set_bit(EOL_CHAR(tty), tty->process_char_map);
-                        if (L_IEXTEN(tty)) {
-                                set_bit(WERASE_CHAR(tty),
-                                        tty->process_char_map);
-                                set_bit(LNEXT_CHAR(tty),
-                                        tty->process_char_map);
-                                set_bit(EOL2_CHAR(tty),
-                                        tty->process_char_map);
-                                if (L_ECHO(tty))
-                                        set_bit(REPRINT_CHAR(tty),
-                                                tty->process_char_map);
-                        }
-                }
-                if (I_IXON(tty)) {
-                        set_bit(START_CHAR(tty), tty->process_char_map);
-                        set_bit(STOP_CHAR(tty), tty->process_char_map);
-                }
-                if (L_ISIG(tty)) {
-                        set_bit(INTR_CHAR(tty), tty->process_char_map);
-                        set_bit(QUIT_CHAR(tty), tty->process_char_map);
-                        set_bit(SUSP_CHAR(tty), tty->process_char_map);
-                }
-                clear_bit(__DISABLED_CHAR, tty->process_char_map);
-                tty->raw = 0;
-                tty->real_raw = 0;
-        } else {
-                tty->raw = 1;
-                if ((I_IGNBRK(tty) || (!I_BRKINT(tty) && !I_PARMRK(tty))) &&
-                    (I_IGNPAR(tty) || !I_INPCK(tty)) &&
-                    (tty->driver->flags & TTY_DRIVER_REAL_RAW))
-                        tty->real_raw = 1;
-                else
-                        tty->real_raw = 0;
-        }
-        n_tty_set_room(tty);
-        /* The termios change make the tty ready for I/O */
-        wake_up_interruptible(&tty->write_wait);
-        wake_up_interruptible(&tty->read_wait);
-}
-
-/**
- *      n_tty_close             -       close the ldisc for this tty
- *      @tty: device
- *
- *      Called from the terminal layer when this line discipline is
- *      being shut down, either because of a close or becsuse of a
- *      discipline change. The function will not be called while other
- *      ldisc methods are in progress.
- */
-
-static void n_tty_close(struct tty_struct *tty)
-{
-        n_tty_flush_buffer(tty);
-        if (tty->read_buf) {
-                kfree(tty->read_buf);
-                tty->read_buf = NULL;
-        }
-        if (tty->echo_buf) {
-                kfree(tty->echo_buf);
-                tty->echo_buf = NULL;
-        }
-}
-
-/**
- *      n_tty_open              -       open an ldisc
- *      @tty: terminal to open
- *
- *      Called when this line discipline is being attached to the
- *      terminal device. Can sleep. Called serialized so that no
- *      other events will occur in parallel. No further open will occur
- *      until a close.
- */
-
-static int n_tty_open(struct tty_struct *tty)
-{
-        if (!tty)
-                return -EINVAL;
-
-        /* These are ugly. Currently a malloc failure here can panic */
-        if (!tty->read_buf) {
-                tty->read_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
-                if (!tty->read_buf)
-                        return -ENOMEM;
-        }
-        if (!tty->echo_buf) {
-                tty->echo_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
-
-                if (!tty->echo_buf)
-                        return -ENOMEM;
-        }
-        reset_buffer_flags(tty);
-        tty->column = 0;
-        n_tty_set_termios(tty, NULL);
-        tty->minimum_to_wake = 1;
-        tty->closing = 0;
-        return 0;
-}
-
-static inline int input_available_p(struct tty_struct *tty, int amt)
-{
-        tty_flush_to_ldisc(tty);
-        if (tty->icanon && !L_EXTPROC(tty)) {
-                if (tty->canon_data)
-                        return 1;
-        } else if (tty->read_cnt >= (amt ? amt : 1))
-                return 1;
-
-        return 0;
-}
-
-/**
- *      copy_from_read_buf      -       copy read data directly
- *      @tty: terminal device
- *      @b: user data
- *      @nr: size of data
- *
- *      Helper function to speed up n_tty_read.  It is only called when
- *      ICANON is off; it copies characters straight from the tty queue to
- *      user space directly.  It can be profitably called twice; once to
- *      drain the space from the tail pointer to the (physical) end of the
- *      buffer, and once to drain the space from the (physical) beginning of
- *      the buffer to head pointer.
- *
- *      Called under the tty->atomic_read_lock sem
- *
- */
-
-static int copy_from_read_buf(struct tty_struct *tty,
-                                      unsigned char __user **b,
-                                      size_t *nr)
-
-{
-        int retval;
-        size_t n;
-        unsigned long flags;
-
-        retval = 0;
-        spin_lock_irqsave(&tty->read_lock, flags);
-        n = min(tty->read_cnt, N_TTY_BUF_SIZE - tty->read_tail);
-        n = min(*nr, n);
-        spin_unlock_irqrestore(&tty->read_lock, flags);
-        if (n) {
-                retval = copy_to_user(*b, &tty->read_buf[tty->read_tail], n);
-                n -= retval;
-                tty_audit_add_data(tty, &tty->read_buf[tty->read_tail], n);
-                spin_lock_irqsave(&tty->read_lock, flags);
-                tty->read_tail = (tty->read_tail + n) & (N_TTY_BUF_SIZE-1);
-                tty->read_cnt -= n;
-                /* Turn single EOF into zero-length read */
-                if (L_EXTPROC(tty) && tty->icanon && n == 1) {
-                        if (!tty->read_cnt && (*b)[n-1] == EOF_CHAR(tty))
-                                n--;
-                }
-                spin_unlock_irqrestore(&tty->read_lock, flags);
-                *b += n;
-                *nr -= n;
-        }
-        return retval;
-}
-
-extern ssize_t redirected_tty_write(struct file *, const char __user *,
-                                                        size_t, loff_t *);
-
-/**
- *      job_control             -       check job control
- *      @tty: tty
- *      @file: file handle
- *
- *      Perform job control management checks on this file/tty descriptor
- *      and if appropriate send any needed signals and return a negative
- *      error code if action should be taken.
- *
- *      FIXME:
- *      Locking: None - redirected write test is safe, testing
- *      current->signal should possibly lock current->sighand
- *      pgrp locking ?
- */
-
-static int job_control(struct tty_struct *tty, struct file *file)
-{
-        /* Job control check -- must be done at start and after
-           every sleep (POSIX.1 7.1.1.4). */
-        /* NOTE: not yet done after every sleep pending a thorough
-           check of the logic of this change. -- jlc */
-        /* don't stop on /dev/console */
-        if (file->f_op->write != redirected_tty_write &&
-            current->signal->tty == tty) {
-                if (!tty->pgrp)
-                        printk(KERN_ERR "n_tty_read: no tty->pgrp!\n");
-                else if (task_pgrp(current) != tty->pgrp) {
-                        if (is_ignored(SIGTTIN) ||
-                            is_current_pgrp_orphaned())
-                                return -EIO;
-                        kill_pgrp(task_pgrp(current), SIGTTIN, 1);
-                        set_thread_flag(TIF_SIGPENDING);
-                        return -ERESTARTSYS;
-                }
-        }
-        return 0;
-}
-
-
-/**
- *      n_tty_read              -       read function for tty
- *      @tty: tty device
- *      @file: file object
- *      @buf: userspace buffer pointer
- *      @nr: size of I/O
- *
- *      Perform reads for the line discipline. We are guaranteed that the
- *      line discipline will not be closed under us but we may get multiple
- *      parallel readers and must handle this ourselves. We may also get
- *      a hangup. Always called in user context, may sleep.
- *
- *      This code must be sure never to sleep through a hangup.
- */
-
-static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
-                         unsigned char __user *buf, size_t nr)
-{
-        unsigned char __user *b = buf;
-        DECLARE_WAITQUEUE(wait, current);
-        int c;
-        int minimum, time;
-        ssize_t retval = 0;
-        ssize_t size;
-        long timeout;
-        unsigned long flags;
-        int packet;
-
-do_it_again:
-
-        BUG_ON(!tty->read_buf);
-
-        c = job_control(tty, file);
-        if (c < 0)
-                return c;
-
-        minimum = time = 0;
-        timeout = MAX_SCHEDULE_TIMEOUT;
-        if (!tty->icanon) {
-                time = (HZ / 10) * TIME_CHAR(tty);
-                minimum = MIN_CHAR(tty);
-                if (minimum) {
-                        if (time)
-                                tty->minimum_to_wake = 1;
-                        else if (!waitqueue_active(&tty->read_wait) ||
-                                 (tty->minimum_to_wake > minimum))
-                                tty->minimum_to_wake = minimum;
-                } else {
-                        timeout = 0;
-                        if (time) {
-                                timeout = time;
-                                time = 0;
-                        }
-                        tty->minimum_to_wake = minimum = 1;
-                }
-        }
-
-        /*
-         *      Internal serialization of reads.
-         */
-        if (file->f_flags & O_NONBLOCK) {
-                if (!mutex_trylock(&tty->atomic_read_lock))
-                        return -EAGAIN;
-        } else {
-                if (mutex_lock_interruptible(&tty->atomic_read_lock))
-                        return -ERESTARTSYS;
-        }
-        packet = tty->packet;
-
-        add_wait_queue(&tty->read_wait, &wait);
-        while (nr) {
-                /* First test for status change. */
-                if (packet && tty->link->ctrl_status) {
-                        unsigned char cs;
-                        if (b != buf)
-                                break;
-                        spin_lock_irqsave(&tty->link->ctrl_lock, flags);
-                        cs = tty->link->ctrl_status;
-                        tty->link->ctrl_status = 0;
-                        spin_unlock_irqrestore(&tty->link->ctrl_lock, flags);
-                        if (tty_put_user(tty, cs, b++)) {
-                                retval = -EFAULT;
-                                b--;
-                                break;
-                        }
-                        nr--;
-                        break;
-                }
-                /* This statement must be first before checking for input
-                   so that any interrupt will set the state back to
-                   TASK_RUNNING. */
-                set_current_state(TASK_INTERRUPTIBLE);
-
-                if (((minimum - (b - buf)) < tty->minimum_to_wake) &&
-                    ((minimum - (b - buf)) >= 1))
-                        tty->minimum_to_wake = (minimum - (b - buf));
-
-                if (!input_available_p(tty, 0)) {
-                        if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) {
-                                retval = -EIO;
-                                break;
-                        }
-                        if (tty_hung_up_p(file))
-                                break;
-                        if (!timeout)
-                                break;
-                        if (file->f_flags & O_NONBLOCK) {
-                                retval = -EAGAIN;
-                                break;
-                        }
-                        if (signal_pending(current)) {
-                                retval = -ERESTARTSYS;
-                                break;
-                        }
-                        /* FIXME: does n_tty_set_room need locking ? */
-                        n_tty_set_room(tty);
-                        timeout = schedule_timeout(timeout);
-                        continue;
-                }
-                __set_current_state(TASK_RUNNING);
-
-                /* Deal with packet mode. */
-                if (packet && b == buf) {
-                        if (tty_put_user(tty, TIOCPKT_DATA, b++)) {
-                                retval = -EFAULT;
-                                b--;
-                                break;
-                        }
-                        nr--;
-                }
-
-                if (tty->icanon && !L_EXTPROC(tty)) {
-                        /* N.B. avoid overrun if nr == 0 */
-                        while (nr && tty->read_cnt) {
-                                int eol;
-
-                                eol = test_and_clear_bit(tty->read_tail,
-                                                tty->read_flags);
-                                c = tty->read_buf[tty->read_tail];
-                                spin_lock_irqsave(&tty->read_lock, flags);
-                                tty->read_tail = ((tty->read_tail+1) &
-                                                  (N_TTY_BUF_SIZE-1));
-                                tty->read_cnt--;
-                                if (eol) {
-                                        /* this test should be redundant:
-                                         * we shouldn't be reading data if
-                                         * canon_data is 0
-                                         */
-                                        if (--tty->canon_data < 0)
-                                                tty->canon_data = 0;
-                                }
-                                spin_unlock_irqrestore(&tty->read_lock, flags);
-
-                                if (!eol || (c != __DISABLED_CHAR)) {
-                                        if (tty_put_user(tty, c, b++)) {
-                                                retval = -EFAULT;
-                                                b--;
-                                                break;
-                                        }
-                                        nr--;
-                                }
-                                if (eol) {
-                                        tty_audit_push(tty);
-                                        break;
-                                }
-                        }
-                        if (retval)
-                                break;
-                } else {
-                        int uncopied;
-                        /* The copy function takes the read lock and handles
-                           locking internally for this case */
-                        uncopied = copy_from_read_buf(tty, &b, &nr);
-                        uncopied += copy_from_read_buf(tty, &b, &nr);
-                        if (uncopied) {
-                                retval = -EFAULT;
-                                break;
-                        }
-                }
-
-                /* If there is enough space in the read buffer now, let the
-                 * low-level driver know. We use n_tty_chars_in_buffer() to
-                 * check the buffer, as it now knows about canonical mode.
-                 * Otherwise, if the driver is throttled and the line is
-                 * longer than TTY_THRESHOLD_UNTHROTTLE in canonical mode,
-                 * we won't get any more characters.
-                 */
-                if (n_tty_chars_in_buffer(tty) <= TTY_THRESHOLD_UNTHROTTLE) {
-                        n_tty_set_room(tty);
-                        check_unthrottle(tty);
-                }
-
-                if (b - buf >= minimum)
-                        break;
-                if (time)
-                        timeout = time;
-        }
-        mutex_unlock(&tty->atomic_read_lock);
-        remove_wait_queue(&tty->read_wait, &wait);
-
-        if (!waitqueue_active(&tty->read_wait))
-                tty->minimum_to_wake = minimum;
-
-        __set_current_state(TASK_RUNNING);
-        size = b - buf;
-        if (size) {
-                retval = size;
-                if (nr)
-                        clear_bit(TTY_PUSH, &tty->flags);
-        } else if (test_and_clear_bit(TTY_PUSH, &tty->flags))
-                 goto do_it_again;
-
-        n_tty_set_room(tty);
-        return retval;
-}
-
-/**
- *      n_tty_write             -       write function for tty
- *      @tty: tty device
- *      @file: file object
- *      @buf: userspace buffer pointer
- *      @nr: size of I/O
- *
- *      Write function of the terminal device.  This is serialized with
- *      respect to other write callers but not to termios changes, reads
- *      and other such events.  Since the receive code will echo characters,
- *      thus calling driver write methods, the output_lock is used in
- *      the output processing functions called here as well as in the
- *      echo processing function to protect the column state and space
- *      left in the buffer.
- *
- *      This code must be sure never to sleep through a hangup.
- *
- *      Locking: output_lock to protect column state and space left
- *               (note that the process_output*() functions take this
- *                lock themselves)
- */
-
-static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
-                           const unsigned char *buf, size_t nr)
-{
-        const unsigned char *b = buf;
-        DECLARE_WAITQUEUE(wait, current);
-        int c;
-        ssize_t retval = 0;
-
-        /* Job control check -- must be done at start (POSIX.1 7.1.1.4). */
-        if (L_TOSTOP(tty) && file->f_op->write != redirected_tty_write) {
-                retval = tty_check_change(tty);
-                if (retval)
-                        return retval;
-        }
-
-        /* Write out any echoed characters that are still pending */
-        process_echoes(tty);
-
-        add_wait_queue(&tty->write_wait, &wait);
-        while (1) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-                if (tty_hung_up_p(file) || (tty->link && !tty->link->count)) {
-                        retval = -EIO;
-                        break;
-                }
-                if (O_OPOST(tty) && !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) {
-                        while (nr > 0) {
-                                ssize_t num = process_output_block(tty, b, nr);
-                                if (num < 0) {
-                                        if (num == -EAGAIN)
-                                                break;
-                                        retval = num;
-                                        goto break_out;
-                                }
-                                b += num;
-                                nr -= num;
-                                if (nr == 0)
-                                        break;
-                                c = *b;
-                                if (process_output(c, tty) < 0)
-                                        break;
-                                b++; nr--;
-                        }
-                        if (tty->ops->flush_chars)
-                                tty->ops->flush_chars(tty);
-                } else {
-                        while (nr > 0) {
-                                c = tty->ops->write(tty, b, nr);
-                                if (c < 0) {
-                                        retval = c;
-                                        goto break_out;
-                                }
-                                if (!c)
-                                        break;
-                                b += c;
-                                nr -= c;
-                        }
-                }
-                if (!nr)
-                        break;
-                if (file->f_flags & O_NONBLOCK) {
-                        retval = -EAGAIN;
-                        break;
-                }
-                schedule();
-        }
-break_out:
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&tty->write_wait, &wait);
-        if (b - buf != nr && tty->fasync)
-                set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
-        return (b - buf) ? b - buf : retval;
-}
-
-/**
- *      n_tty_poll              -       poll method for N_TTY
- *      @tty: terminal device
- *      @file: file accessing it
- *      @wait: poll table
- *
- *      Called when the line discipline is asked to poll() for data or
- *      for special events. This code is not serialized with respect to
- *      other events save open/close.
- *
- *      This code must be sure never to sleep through a hangup.
- *      Called without the kernel lock held - fine
- */
-
-static unsigned int n_tty_poll(struct tty_struct *tty, struct file *file,
-                                                        poll_table *wait)
-{
-        unsigned int mask = 0;
-
-        poll_wait(file, &tty->read_wait, wait);
-        poll_wait(file, &tty->write_wait, wait);
-        if (input_available_p(tty, TIME_CHAR(tty) ? 0 : MIN_CHAR(tty)))
-                mask |= POLLIN | POLLRDNORM;
-        if (tty->packet && tty->link->ctrl_status)
-                mask |= POLLPRI | POLLIN | POLLRDNORM;
-        if (test_bit(TTY_OTHER_CLOSED, &tty->flags))
-                mask |= POLLHUP;
-        if (tty_hung_up_p(file))
-                mask |= POLLHUP;
-        if (!(mask & (POLLHUP | POLLIN | POLLRDNORM))) {
-                if (MIN_CHAR(tty) && !TIME_CHAR(tty))
-                        tty->minimum_to_wake = MIN_CHAR(tty);
-                else
-                        tty->minimum_to_wake = 1;
-        }
-        if (tty->ops->write && !tty_is_writelocked(tty) &&
-                        tty_chars_in_buffer(tty) < WAKEUP_CHARS &&
-                        tty_write_room(tty) > 0)
-                mask |= POLLOUT | POLLWRNORM;
-        return mask;
-}
-
-static unsigned long inq_canon(struct tty_struct *tty)
-{
-        int nr, head, tail;
-
-        if (!tty->canon_data)
-                return 0;
-        head = tty->canon_head;
-        tail = tty->read_tail;
-        nr = (head - tail) & (N_TTY_BUF_SIZE-1);
-        /* Skip EOF-chars.. */
-        while (head != tail) {
-                if (test_bit(tail, tty->read_flags) &&
-                    tty->read_buf[tail] == __DISABLED_CHAR)
-                        nr--;
-                tail = (tail+1) & (N_TTY_BUF_SIZE-1);
-        }
-        return nr;
-}
-
-static int n_tty_ioctl(struct tty_struct *tty, struct file *file,
-                       unsigned int cmd, unsigned long arg)
-{
-        int retval;
-
-        switch (cmd) {
-        case TIOCOUTQ:
-                return put_user(tty_chars_in_buffer(tty), (int __user *) arg);
-        case TIOCINQ:
-                /* FIXME: Locking */
-                retval = tty->read_cnt;
-                if (L_ICANON(tty))
-                        retval = inq_canon(tty);
-                return put_user(retval, (unsigned int __user *) arg);
-        default:
-                return n_tty_ioctl_helper(tty, file, cmd, arg);
-        }
-}
-
-struct tty_ldisc_ops tty_ldisc_N_TTY = {
-        .magic           = TTY_LDISC_MAGIC,
-        .name            = "n_tty",
-        .open            = n_tty_open,
-        .close           = n_tty_close,
-        .flush_buffer    = n_tty_flush_buffer,
-        .chars_in_buffer = n_tty_chars_in_buffer,
-        .read            = n_tty_read,
-        .write           = n_tty_write,
-        .ioctl           = n_tty_ioctl,
-        .set_termios     = n_tty_set_termios,
-        .poll            = n_tty_poll,
-        .receive_buf     = n_tty_receive_buf,
-        .write_wakeup    = n_tty_write_wakeup
-};
-
-/**
- *      n_tty_inherit_ops       -       inherit N_TTY methods
- *      @ops: struct tty_ldisc_ops where to save N_TTY methods
- *
- *      Used by a generic struct tty_ldisc_ops to easily inherit N_TTY
- *      methods.
- */
-
-void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
-{
-        *ops = tty_ldisc_N_TTY;
-        ops->owner = NULL;
-        ops->refcount = ops->flags = 0;
-}
-EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
deleted file mode 100644
index 817169cbb245..000000000000
--- a/drivers/char/nozomi.c
+++ /dev/null
@@ -1,1995 +0,0 @@
-/*
- * nozomi.c  -- HSDPA driver Broadband Wireless Data Card - Globe Trotter
- *
- * Written by: Ulf Jakobsson,
- *             Jan Ã…kerfeldt,
- *             Stefan Thomasson,
- *
- * Maintained by: Paul Hardwick (p.hardwick@option.com)
- *
- * Patches:
- *          Locking code changes for Vodafone by Sphere Systems Ltd,
- *                              Andrew Bird (ajb@spheresystems.co.uk )
- *                              & Phil Sanderson
- *
- * Source has been ported from an implementation made by Filip Aben @ Option
- *
- * --------------------------------------------------------------------------
- *
- * Copyright (c) 2005,2006 Option Wireless Sweden AB
- * Copyright (c) 2006 Sphere Systems Ltd
- * Copyright (c) 2006 Option Wireless n/v
- * All rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * --------------------------------------------------------------------------
- */
-
-/* Enable this to have a lot of debug printouts */
-#define DEBUG
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/ioport.h>
-#include <linux/tty.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <linux/sched.h>
-#include <linux/serial.h>
-#include <linux/interrupt.h>
-#include <linux/kmod.h>
-#include <linux/init.h>
-#include <linux/kfifo.h>
-#include <linux/uaccess.h>
-#include <linux/slab.h>
-#include <asm/byteorder.h>
-
-#include <linux/delay.h>
-
-
-#define VERSION_STRING DRIVER_DESC " 2.1d (build date: " \
-                                        __DATE__ " " __TIME__ ")"
-
-/*    Macros definitions */
-
-/* Default debug printout level */
-#define NOZOMI_DEBUG_LEVEL 0x00
-
-#define P_BUF_SIZE 128
-#define NFO(_err_flag_, args...)                                \
-do {                                                            \
-        char tmp[P_BUF_SIZE];                                   \
-        snprintf(tmp, sizeof(tmp), ##args);                     \
-        printk(_err_flag_ "[%d] %s(): %s\n", __LINE__,          \
-                __func__, tmp);                         \
-} while (0)
-
-#define DBG1(args...) D_(0x01, ##args)
-#define DBG2(args...) D_(0x02, ##args)
-#define DBG3(args...) D_(0x04, ##args)
-#define DBG4(args...) D_(0x08, ##args)
-#define DBG5(args...) D_(0x10, ##args)
-#define DBG6(args...) D_(0x20, ##args)
-#define DBG7(args...) D_(0x40, ##args)
-#define DBG8(args...) D_(0x80, ##args)
-
-#ifdef DEBUG
-/* Do we need this settable at runtime? */
-static int debug = NOZOMI_DEBUG_LEVEL;
-
-#define D(lvl, args...)  do \
-                        {if (lvl & debug) NFO(KERN_DEBUG, ##args); } \
-                        while (0)
-#define D_(lvl, args...) D(lvl, ##args)
-
-/* These printouts are always printed */
-
-#else
-static int debug;
-#define D_(lvl, args...)
-#endif
-
-/* TODO: rewrite to optimize macros... */
-
-#define TMP_BUF_MAX 256
-
-#define DUMP(buf__,len__) \
-  do {  \
-    char tbuf[TMP_BUF_MAX] = {0};\
-    if (len__ > 1) {\
-        snprintf(tbuf, len__ > TMP_BUF_MAX ? TMP_BUF_MAX : len__, "%s", buf__);\
-        if (tbuf[len__-2] == '\r') {\
-                tbuf[len__-2] = 'r';\
-        } \
-        DBG1("SENDING: '%s' (%d+n)", tbuf, len__);\
-    } else {\
-        DBG1("SENDING: '%s' (%d)", tbuf, len__);\
-    } \
-} while (0)
-
-/*    Defines */
-#define NOZOMI_NAME             "nozomi"
-#define NOZOMI_NAME_TTY         "nozomi_tty"
-#define DRIVER_DESC             "Nozomi driver"
-
-#define NTTY_TTY_MAXMINORS      256
-#define NTTY_FIFO_BUFFER_SIZE   8192
-
-/* Must be power of 2 */
-#define FIFO_BUFFER_SIZE_UL     8192
-
-/* Size of tmp send buffer to card */
-#define SEND_BUF_MAX            1024
-#define RECEIVE_BUF_MAX         4
-
-
-#define R_IIR           0x0000  /* Interrupt Identity Register */
-#define R_FCR           0x0000  /* Flow Control Register */
-#define R_IER           0x0004  /* Interrupt Enable Register */
-
-#define CONFIG_MAGIC    0xEFEFFEFE
-#define TOGGLE_VALID    0x0000
-
-/* Definition of interrupt tokens */
-#define MDM_DL1         0x0001
-#define MDM_UL1         0x0002
-#define MDM_DL2         0x0004
-#define MDM_UL2         0x0008
-#define DIAG_DL1        0x0010
-#define DIAG_DL2        0x0020
-#define DIAG_UL         0x0040
-#define APP1_DL         0x0080
-#define APP1_UL         0x0100
-#define APP2_DL         0x0200
-#define APP2_UL         0x0400
-#define CTRL_DL         0x0800
-#define CTRL_UL         0x1000
-#define RESET           0x8000
-
-#define MDM_DL          (MDM_DL1  | MDM_DL2)
-#define MDM_UL          (MDM_UL1  | MDM_UL2)
-#define DIAG_DL         (DIAG_DL1 | DIAG_DL2)
-
-/* modem signal definition */
-#define CTRL_DSR        0x0001
-#define CTRL_DCD        0x0002
-#define CTRL_RI         0x0004
-#define CTRL_CTS        0x0008
-
-#define CTRL_DTR        0x0001
-#define CTRL_RTS        0x0002
-
-#define MAX_PORT                4
-#define NOZOMI_MAX_PORTS        5
-#define NOZOMI_MAX_CARDS        (NTTY_TTY_MAXMINORS / MAX_PORT)
-
-/*    Type definitions */
-
-/*
- * There are two types of nozomi cards,
- * one with 2048 memory and with 8192 memory
- */
-enum card_type {
-        F32_2 = 2048,   /* 512 bytes downlink + uplink * 2 -> 2048 */
-        F32_8 = 8192,   /* 3072 bytes downl. + 1024 bytes uplink * 2 -> 8192 */
-};
-
-/* Initialization states a card can be in */
-enum card_state {
-        NOZOMI_STATE_UKNOWN     = 0,
-        NOZOMI_STATE_ENABLED    = 1,    /* pci device enabled */
-        NOZOMI_STATE_ALLOCATED  = 2,    /* config setup done */
-        NOZOMI_STATE_READY      = 3,    /* flowcontrols received */
-};
-
-/* Two different toggle channels exist */
-enum channel_type {
-        CH_A = 0,
-        CH_B = 1,
-};
-
-/* Port definition for the card regarding flow control */
-enum ctrl_port_type {
-        CTRL_CMD        = 0,
-        CTRL_MDM        = 1,
-        CTRL_DIAG       = 2,
-        CTRL_APP1       = 3,
-        CTRL_APP2       = 4,
-        CTRL_ERROR      = -1,
-};
-
-/* Ports that the nozomi has */
-enum port_type {
-        PORT_MDM        = 0,
-        PORT_DIAG       = 1,
-        PORT_APP1       = 2,
-        PORT_APP2       = 3,
-        PORT_CTRL       = 4,
-        PORT_ERROR      = -1,
-};
-
-#ifdef __BIG_ENDIAN
-/* Big endian */
-
-struct toggles {
-        unsigned int enabled:5; /*
-                                 * Toggle fields are valid if enabled is 0,
-                                 * else A-channels must always be used.
-                                 */
-        unsigned int diag_dl:1;
-        unsigned int mdm_dl:1;
-        unsigned int mdm_ul:1;
-} __attribute__ ((packed));
-
-/* Configuration table to read at startup of card */
-/* Is for now only needed during initialization phase */
-struct config_table {
-        u32 signature;
-        u16 product_information;
-        u16 version;
-        u8 pad3[3];
-        struct toggles toggle;
-        u8 pad1[4];
-        u16 dl_mdm_len1;        /*
-                                 * If this is 64, it can hold
-                                 * 60 bytes + 4 that is length field
-                                 */
-        u16 dl_start;
-
-        u16 dl_diag_len1;
-        u16 dl_mdm_len2;        /*
-                                 * If this is 64, it can hold
-                                 * 60 bytes + 4 that is length field
-                                 */
-        u16 dl_app1_len;
-
-        u16 dl_diag_len2;
-        u16 dl_ctrl_len;
-        u16 dl_app2_len;
-        u8 pad2[16];
-        u16 ul_mdm_len1;
-        u16 ul_start;
-        u16 ul_diag_len;
-        u16 ul_mdm_len2;
-        u16 ul_app1_len;
-        u16 ul_app2_len;
-        u16 ul_ctrl_len;
-} __attribute__ ((packed));
-
-/* This stores all control downlink flags */
-struct ctrl_dl {
-        u8 port;
-        unsigned int reserved:4;
-        unsigned int CTS:1;
-        unsigned int RI:1;
-        unsigned int DCD:1;
-        unsigned int DSR:1;
-} __attribute__ ((packed));
-
-/* This stores all control uplink flags */
-struct ctrl_ul {
-        u8 port;
-        unsigned int reserved:6;
-        unsigned int RTS:1;
-        unsigned int DTR:1;
-} __attribute__ ((packed));
-
-#else
-/* Little endian */
-
-/* This represents the toggle information */
-struct toggles {
-        unsigned int mdm_ul:1;
-        unsigned int mdm_dl:1;
-        unsigned int diag_dl:1;
-        unsigned int enabled:5; /*
-                                 * Toggle fields are valid if enabled is 0,
-                                 * else A-channels must always be used.
-                                 */
-} __attribute__ ((packed));
-
-/* Configuration table to read at startup of card */
-struct config_table {
-        u32 signature;
-        u16 version;
-        u16 product_information;
-        struct toggles toggle;
-        u8 pad1[7];
-        u16 dl_start;
-        u16 dl_mdm_len1;        /*
-                                 * If this is 64, it can hold
-                                 * 60 bytes + 4 that is length field
-                                 */
-        u16 dl_mdm_len2;
-        u16 dl_diag_len1;
-        u16 dl_diag_len2;
-        u16 dl_app1_len;
-        u16 dl_app2_len;
-        u16 dl_ctrl_len;
-        u8 pad2[16];
-        u16 ul_start;
-        u16 ul_mdm_len2;
-        u16 ul_mdm_len1;
-        u16 ul_diag_len;
-        u16 ul_app1_len;
-        u16 ul_app2_len;
-        u16 ul_ctrl_len;
-} __attribute__ ((packed));
-
-/* This stores all control downlink flags */
-struct ctrl_dl {
-        unsigned int DSR:1;
-        unsigned int DCD:1;
-        unsigned int RI:1;
-        unsigned int CTS:1;
-        unsigned int reserverd:4;
-        u8 port;
-} __attribute__ ((packed));
-
-/* This stores all control uplink flags */
-struct ctrl_ul {
-        unsigned int DTR:1;
-        unsigned int RTS:1;
-        unsigned int reserved:6;
-        u8 port;
-} __attribute__ ((packed));
-#endif
-
-/* This holds all information that is needed regarding a port */
-struct port {
-        struct tty_port port;
-        u8 update_flow_control;
-        struct ctrl_ul ctrl_ul;
-        struct ctrl_dl ctrl_dl;
-        struct kfifo fifo_ul;
-        void __iomem *dl_addr[2];
-        u32 dl_size[2];
-        u8 toggle_dl;
-        void __iomem *ul_addr[2];
-        u32 ul_size[2];
-        u8 toggle_ul;
-        u16 token_dl;
-
-        /* mutex to ensure one access patch to this port */
-        struct mutex tty_sem;
-        wait_queue_head_t tty_wait;
-        struct async_icount tty_icount;
-
-        struct nozomi *dc;
-};
-
-/* Private data one for each card in the system */
-struct nozomi {
-        void __iomem *base_addr;
-        unsigned long flip;
-
-        /* Pointers to registers */
-        void __iomem *reg_iir;
-        void __iomem *reg_fcr;
-        void __iomem *reg_ier;
-
-        u16 last_ier;
-        enum card_type card_type;
-        struct config_table config_table;       /* Configuration table */
-        struct pci_dev *pdev;
-        struct port port[NOZOMI_MAX_PORTS];
-        u8 *send_buf;
-
-        spinlock_t spin_mutex;  /* secures access to registers and tty */
-
-        unsigned int index_start;
-        enum card_state state;
-        u32 open_ttys;
-};
-
-/* This is a data packet that is read or written to/from card */
-struct buffer {
-        u32 size;               /* size is the length of the data buffer */
-        u8 *data;
-} __attribute__ ((packed));
-
-/*    Global variables */
-static const struct pci_device_id nozomi_pci_tbl[] __devinitconst = {
-        {PCI_DEVICE(0x1931, 0x000c)},   /* Nozomi HSDPA */
-        {},
-};
-
-MODULE_DEVICE_TABLE(pci, nozomi_pci_tbl);
-
-static struct nozomi *ndevs[NOZOMI_MAX_CARDS];
-static struct tty_driver *ntty_driver;
-
-static const struct tty_port_operations noz_tty_port_ops;
-
-/*
- * find card by tty_index
- */
-static inline struct nozomi *get_dc_by_tty(const struct tty_struct *tty)
-{
-        return tty ? ndevs[tty->index / MAX_PORT] : NULL;
-}
-
-static inline struct port *get_port_by_tty(const struct tty_struct *tty)
-{
-        struct nozomi *ndev = get_dc_by_tty(tty);
-        return ndev ? &ndev->port[tty->index % MAX_PORT] : NULL;
-}
-
-/*
- * TODO:
- * -Optimize
- * -Rewrite cleaner
- */
-
-static void read_mem32(u32 *buf, const void __iomem *mem_addr_start,
-                        u32 size_bytes)
-{
-        u32 i = 0;
-        const u32 __iomem *ptr = mem_addr_start;
-        u16 *buf16;
-
-        if (unlikely(!ptr || !buf))
-                goto out;
-
-        /* shortcut for extremely often used cases */
-        switch (size_bytes) {
-        case 2: /* 2 bytes */
-                buf16 = (u16 *) buf;
-                *buf16 = __le16_to_cpu(readw(ptr));
-                goto out;
-                break;
-        case 4: /* 4 bytes */
-                *(buf) = __le32_to_cpu(readl(ptr));
-                goto out;
-                break;
-        }
-
-        while (i < size_bytes) {
-                if (size_bytes - i == 2) {
-                        /* Handle 2 bytes in the end */
-                        buf16 = (u16 *) buf;
-                        *(buf16) = __le16_to_cpu(readw(ptr));
-                        i += 2;
-                } else {
-                        /* Read 4 bytes */
-                        *(buf) = __le32_to_cpu(readl(ptr));
-                        i += 4;
-                }
-                buf++;
-                ptr++;
-        }
-out:
-        return;
-}
-
-/*
- * TODO:
- * -Optimize
- * -Rewrite cleaner
- */
-static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
-                        u32 size_bytes)
-{
-        u32 i = 0;
-        u32 __iomem *ptr = mem_addr_start;
-        const u16 *buf16;
-
-        if (unlikely(!ptr || !buf))
-                return 0;
-
-        /* shortcut for extremely often used cases */
-        switch (size_bytes) {
-        case 2: /* 2 bytes */
-                buf16 = (const u16 *)buf;
-                writew(__cpu_to_le16(*buf16), ptr);
-                return 2;
-                break;
-        case 1: /*
-                 * also needs to write 4 bytes in this case
-                 * so falling through..
-                 */
-        case 4: /* 4 bytes */
-                writel(__cpu_to_le32(*buf), ptr);
-                return 4;
-                break;
-        }
-
-        while (i < size_bytes) {
-                if (size_bytes - i == 2) {
-                        /* 2 bytes */
-                        buf16 = (const u16 *)buf;
-                        writew(__cpu_to_le16(*buf16), ptr);
-                        i += 2;
-                } else {
-                        /* 4 bytes */
-                        writel(__cpu_to_le32(*buf), ptr);
-                        i += 4;
-                }
-                buf++;
-                ptr++;
-        }
-        return i;
-}
-
-/* Setup pointers to different channels and also setup buffer sizes. */
-static void setup_memory(struct nozomi *dc)
-{
-        void __iomem *offset = dc->base_addr + dc->config_table.dl_start;
-        /* The length reported is including the length field of 4 bytes,
-         * hence subtract with 4.
-         */
-        const u16 buff_offset = 4;
-
-        /* Modem port dl configuration */
-        dc->port[PORT_MDM].dl_addr[CH_A] = offset;
-        dc->port[PORT_MDM].dl_addr[CH_B] =
-                                (offset += dc->config_table.dl_mdm_len1);
-        dc->port[PORT_MDM].dl_size[CH_A] =
-                                dc->config_table.dl_mdm_len1 - buff_offset;
-        dc->port[PORT_MDM].dl_size[CH_B] =
-                                dc->config_table.dl_mdm_len2 - buff_offset;
-
-        /* Diag port dl configuration */
-        dc->port[PORT_DIAG].dl_addr[CH_A] =
-                                (offset += dc->config_table.dl_mdm_len2);
-        dc->port[PORT_DIAG].dl_size[CH_A] =
-                                dc->config_table.dl_diag_len1 - buff_offset;
-        dc->port[PORT_DIAG].dl_addr[CH_B] =
-                                (offset += dc->config_table.dl_diag_len1);
-        dc->port[PORT_DIAG].dl_size[CH_B] =
-                                dc->config_table.dl_diag_len2 - buff_offset;
-
-        /* App1 port dl configuration */
-        dc->port[PORT_APP1].dl_addr[CH_A] =
-                                (offset += dc->config_table.dl_diag_len2);
-        dc->port[PORT_APP1].dl_size[CH_A] =
-                                dc->config_table.dl_app1_len - buff_offset;
-
-        /* App2 port dl configuration */
-        dc->port[PORT_APP2].dl_addr[CH_A] =
-                                (offset += dc->config_table.dl_app1_len);
-        dc->port[PORT_APP2].dl_size[CH_A] =
-                                dc->config_table.dl_app2_len - buff_offset;
-
-        /* Ctrl dl configuration */
-        dc->port[PORT_CTRL].dl_addr[CH_A] =
-                                (offset += dc->config_table.dl_app2_len);
-        dc->port[PORT_CTRL].dl_size[CH_A] =
-                                dc->config_table.dl_ctrl_len - buff_offset;
-
-        offset = dc->base_addr + dc->config_table.ul_start;
-
-        /* Modem Port ul configuration */
-        dc->port[PORT_MDM].ul_addr[CH_A] = offset;
-        dc->port[PORT_MDM].ul_size[CH_A] =
-                                dc->config_table.ul_mdm_len1 - buff_offset;
-        dc->port[PORT_MDM].ul_addr[CH_B] =
-                                (offset += dc->config_table.ul_mdm_len1);
-        dc->port[PORT_MDM].ul_size[CH_B] =
-                                dc->config_table.ul_mdm_len2 - buff_offset;
-
-        /* Diag port ul configuration */
-        dc->port[PORT_DIAG].ul_addr[CH_A] =
-                                (offset += dc->config_table.ul_mdm_len2);
-        dc->port[PORT_DIAG].ul_size[CH_A] =
-                                dc->config_table.ul_diag_len - buff_offset;
-
-        /* App1 port ul configuration */
-        dc->port[PORT_APP1].ul_addr[CH_A] =
-                                (offset += dc->config_table.ul_diag_len);
-        dc->port[PORT_APP1].ul_size[CH_A] =
-                                dc->config_table.ul_app1_len - buff_offset;
-
-        /* App2 port ul configuration */
-        dc->port[PORT_APP2].ul_addr[CH_A] =
-                                (offset += dc->config_table.ul_app1_len);
-        dc->port[PORT_APP2].ul_size[CH_A] =
-                                dc->config_table.ul_app2_len - buff_offset;
-
-        /* Ctrl ul configuration */
-        dc->port[PORT_CTRL].ul_addr[CH_A] =
-                                (offset += dc->config_table.ul_app2_len);
-        dc->port[PORT_CTRL].ul_size[CH_A] =
-                                dc->config_table.ul_ctrl_len - buff_offset;
-}
-
-/* Dump config table under initalization phase */
-#ifdef DEBUG
-static void dump_table(const struct nozomi *dc)
-{
-        DBG3("signature: 0x%08X", dc->config_table.signature);
-        DBG3("version: 0x%04X", dc->config_table.version);
-        DBG3("product_information: 0x%04X", \
-                                dc->config_table.product_information);
-        DBG3("toggle enabled: %d", dc->config_table.toggle.enabled);
-        DBG3("toggle up_mdm: %d", dc->config_table.toggle.mdm_ul);
-        DBG3("toggle dl_mdm: %d", dc->config_table.toggle.mdm_dl);
-        DBG3("toggle dl_dbg: %d", dc->config_table.toggle.diag_dl);
-
-        DBG3("dl_start: 0x%04X", dc->config_table.dl_start);
-        DBG3("dl_mdm_len0: 0x%04X, %d", dc->config_table.dl_mdm_len1,
-           dc->config_table.dl_mdm_len1);
-        DBG3("dl_mdm_len1: 0x%04X, %d", dc->config_table.dl_mdm_len2,
-           dc->config_table.dl_mdm_len2);
-        DBG3("dl_diag_len0: 0x%04X, %d", dc->config_table.dl_diag_len1,
-           dc->config_table.dl_diag_len1);
-        DBG3("dl_diag_len1: 0x%04X, %d", dc->config_table.dl_diag_len2,
-           dc->config_table.dl_diag_len2);
-        DBG3("dl_app1_len: 0x%04X, %d", dc->config_table.dl_app1_len,
-           dc->config_table.dl_app1_len);
-        DBG3("dl_app2_len: 0x%04X, %d", dc->config_table.dl_app2_len,
-           dc->config_table.dl_app2_len);
-        DBG3("dl_ctrl_len: 0x%04X, %d", dc->config_table.dl_ctrl_len,
-           dc->config_table.dl_ctrl_len);
-        DBG3("ul_start: 0x%04X, %d", dc->config_table.ul_start,
-           dc->config_table.ul_start);
-        DBG3("ul_mdm_len[0]: 0x%04X, %d", dc->config_table.ul_mdm_len1,
-           dc->config_table.ul_mdm_len1);
-        DBG3("ul_mdm_len[1]: 0x%04X, %d", dc->config_table.ul_mdm_len2,
-           dc->config_table.ul_mdm_len2);
-        DBG3("ul_diag_len: 0x%04X, %d", dc->config_table.ul_diag_len,
-           dc->config_table.ul_diag_len);
-        DBG3("ul_app1_len: 0x%04X, %d", dc->config_table.ul_app1_len,
-           dc->config_table.ul_app1_len);
-        DBG3("ul_app2_len: 0x%04X, %d", dc->config_table.ul_app2_len,
-           dc->config_table.ul_app2_len);
-        DBG3("ul_ctrl_len: 0x%04X, %d", dc->config_table.ul_ctrl_len,
-           dc->config_table.ul_ctrl_len);
-}
-#else
-static inline void dump_table(const struct nozomi *dc) { }
-#endif
-
-/*
- * Read configuration table from card under intalization phase
- * Returns 1 if ok, else 0
- */
-static int nozomi_read_config_table(struct nozomi *dc)
-{
-        read_mem32((u32 *) &dc->config_table, dc->base_addr + 0,
-                                                sizeof(struct config_table));
-
-        if (dc->config_table.signature != CONFIG_MAGIC) {
-                dev_err(&dc->pdev->dev, "ConfigTable Bad! 0x%08X != 0x%08X\n",
-                        dc->config_table.signature, CONFIG_MAGIC);
-                return 0;
-        }
-
-        if ((dc->config_table.version == 0)
-            || (dc->config_table.toggle.enabled == TOGGLE_VALID)) {
-                int i;
-                DBG1("Second phase, configuring card");
-
-                setup_memory(dc);
-
-                dc->port[PORT_MDM].toggle_ul = dc->config_table.toggle.mdm_ul;
-                dc->port[PORT_MDM].toggle_dl = dc->config_table.toggle.mdm_dl;
-                dc->port[PORT_DIAG].toggle_dl = dc->config_table.toggle.diag_dl;
-                DBG1("toggle ports: MDM UL:%d MDM DL:%d, DIAG DL:%d",
-                   dc->port[PORT_MDM].toggle_ul,
-                   dc->port[PORT_MDM].toggle_dl, dc->port[PORT_DIAG].toggle_dl);
-
-                dump_table(dc);
-
-                for (i = PORT_MDM; i < MAX_PORT; i++) {
-                        memset(&dc->port[i].ctrl_dl, 0, sizeof(struct ctrl_dl));
-                        memset(&dc->port[i].ctrl_ul, 0, sizeof(struct ctrl_ul));
-                }
-
-                /* Enable control channel */
-                dc->last_ier = dc->last_ier | CTRL_DL;
-                writew(dc->last_ier, dc->reg_ier);
-
-                dc->state = NOZOMI_STATE_ALLOCATED;
-                dev_info(&dc->pdev->dev, "Initialization OK!\n");
-                return 1;
-        }
-
-        if ((dc->config_table.version > 0)
-            && (dc->config_table.toggle.enabled != TOGGLE_VALID)) {
-                u32 offset = 0;
-                DBG1("First phase: pushing upload buffers, clearing download");
-
-                dev_info(&dc->pdev->dev, "Version of card: %d\n",
-                         dc->config_table.version);
-
-                /* Here we should disable all I/O over F32. */
-                setup_memory(dc);
-
-                /*
-                 * We should send ALL channel pair tokens back along
-                 * with reset token
-                 */
-
-                /* push upload modem buffers */
-                write_mem32(dc->port[PORT_MDM].ul_addr[CH_A],
-                        (u32 *) &offset, 4);
-                write_mem32(dc->port[PORT_MDM].ul_addr[CH_B],
-                        (u32 *) &offset, 4);
-
-                writew(MDM_UL | DIAG_DL | MDM_DL, dc->reg_fcr);
-
-                DBG1("First phase done");
-        }
-
-        return 1;
-}
-
-/* Enable uplink interrupts  */
-static void enable_transmit_ul(enum port_type port, struct nozomi *dc)
-{
-        static const u16 mask[] = {MDM_UL, DIAG_UL, APP1_UL, APP2_UL, CTRL_UL};
-
-        if (port < NOZOMI_MAX_PORTS) {
-                dc->last_ier |= mask[port];
-                writew(dc->last_ier, dc->reg_ier);
-        } else {
-                dev_err(&dc->pdev->dev, "Called with wrong port?\n");
-        }
-}
-
-/* Disable uplink interrupts  */
-static void disable_transmit_ul(enum port_type port, struct nozomi *dc)
-{
-        static const u16 mask[] =
-                {~MDM_UL, ~DIAG_UL, ~APP1_UL, ~APP2_UL, ~CTRL_UL};
-
-        if (port < NOZOMI_MAX_PORTS) {
-                dc->last_ier &= mask[port];
-                writew(dc->last_ier, dc->reg_ier);
-        } else {
-                dev_err(&dc->pdev->dev, "Called with wrong port?\n");
-        }
-}
-
-/* Enable downlink interrupts */
-static void enable_transmit_dl(enum port_type port, struct nozomi *dc)
-{
-        static const u16 mask[] = {MDM_DL, DIAG_DL, APP1_DL, APP2_DL, CTRL_DL};
-
-        if (port < NOZOMI_MAX_PORTS) {
-                dc->last_ier |= mask[port];
-                writew(dc->last_ier, dc->reg_ier);
-        } else {
-                dev_err(&dc->pdev->dev, "Called with wrong port?\n");
-        }
-}
-
-/* Disable downlink interrupts */
-static void disable_transmit_dl(enum port_type port, struct nozomi *dc)
-{
-        static const u16 mask[] =
-                {~MDM_DL, ~DIAG_DL, ~APP1_DL, ~APP2_DL, ~CTRL_DL};
-
-        if (port < NOZOMI_MAX_PORTS) {
-                dc->last_ier &= mask[port];
-                writew(dc->last_ier, dc->reg_ier);
-        } else {
-                dev_err(&dc->pdev->dev, "Called with wrong port?\n");
-        }
-}
-
-/*
- * Return 1 - send buffer to card and ack.
- * Return 0 - don't ack, don't send buffer to card.
- */
-static int send_data(enum port_type index, struct nozomi *dc)
-{
-        u32 size = 0;
-        struct port *port = &dc->port[index];
-        const u8 toggle = port->toggle_ul;
-        void __iomem *addr = port->ul_addr[toggle];
-        const u32 ul_size = port->ul_size[toggle];
-        struct tty_struct *tty = tty_port_tty_get(&port->port);
-
-        /* Get data from tty and place in buf for now */
-        size = kfifo_out(&port->fifo_ul, dc->send_buf,
-                           ul_size < SEND_BUF_MAX ? ul_size : SEND_BUF_MAX);
-
-        if (size == 0) {
-                DBG4("No more data to send, disable link:");
-                tty_kref_put(tty);
-                return 0;
-        }
-
-        /* DUMP(buf, size); */
-
-        /* Write length + data */
-        write_mem32(addr, (u32 *) &size, 4);
-        write_mem32(addr + 4, (u32 *) dc->send_buf, size);
-
-        if (tty)
-                tty_wakeup(tty);
-
-        tty_kref_put(tty);
-        return 1;
-}
-
-/* If all data has been read, return 1, else 0 */
-static int receive_data(enum port_type index, struct nozomi *dc)
-{
-        u8 buf[RECEIVE_BUF_MAX] = { 0 };
-        int size;
-        u32 offset = 4;
-        struct port *port = &dc->port[index];
-        void __iomem *addr = port->dl_addr[port->toggle_dl];
-        struct tty_struct *tty = tty_port_tty_get(&port->port);
-        int i, ret;
-
-        if (unlikely(!tty)) {
-                DBG1("tty not open for port: %d?", index);
-                return 1;
-        }
-
-        read_mem32((u32 *) &size, addr, 4);
-        /*  DBG1( "%d bytes port: %d", size, index); */
-
-        if (test_bit(TTY_THROTTLED, &tty->flags)) {
-                DBG1("No room in tty, don't read data, don't ack interrupt, "
-                        "disable interrupt");
-
-                /* disable interrupt in downlink... */
-                disable_transmit_dl(index, dc);
-                ret = 0;
-                goto put;
-        }
-
-        if (unlikely(size == 0)) {
-                dev_err(&dc->pdev->dev, "size == 0?\n");
-                ret = 1;
-                goto put;
-        }
-
-        while (size > 0) {
-                read_mem32((u32 *) buf, addr + offset, RECEIVE_BUF_MAX);
-
-                if (size == 1) {
-                        tty_insert_flip_char(tty, buf[0], TTY_NORMAL);
-                        size = 0;
-                } else if (size < RECEIVE_BUF_MAX) {
-                        size -= tty_insert_flip_string(tty, (char *) buf, size);
-                } else {
-                        i = tty_insert_flip_string(tty, \
-                                                (char *) buf, RECEIVE_BUF_MAX);
-                        size -= i;
-                        offset += i;
-                }
-        }
-
-        set_bit(index, &dc->flip);
-        ret = 1;
-put:
-        tty_kref_put(tty);
-        return ret;
-}
-
-/* Debug for interrupts */
-#ifdef DEBUG
-static char *interrupt2str(u16 interrupt)
-{
-        static char buf[TMP_BUF_MAX];
-        char *p = buf;
-
-        interrupt & MDM_DL1 ? p += snprintf(p, TMP_BUF_MAX, "MDM_DL1 ") : NULL;
-        interrupt & MDM_DL2 ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "MDM_DL2 ") : NULL;
-
-        interrupt & MDM_UL1 ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "MDM_UL1 ") : NULL;
-        interrupt & MDM_UL2 ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "MDM_UL2 ") : NULL;
-
-        interrupt & DIAG_DL1 ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "DIAG_DL1 ") : NULL;
-        interrupt & DIAG_DL2 ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "DIAG_DL2 ") : NULL;
-
-        interrupt & DIAG_UL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "DIAG_UL ") : NULL;
-
-        interrupt & APP1_DL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "APP1_DL ") : NULL;
-        interrupt & APP2_DL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "APP2_DL ") : NULL;
-
-        interrupt & APP1_UL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "APP1_UL ") : NULL;
-        interrupt & APP2_UL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "APP2_UL ") : NULL;
-
-        interrupt & CTRL_DL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "CTRL_DL ") : NULL;
-        interrupt & CTRL_UL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "CTRL_UL ") : NULL;
-
-        interrupt & RESET ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
-                                        "RESET ") : NULL;
-
-        return buf;
-}
-#endif
-
-/*
- * Receive flow control
- * Return 1 - If ok, else 0
- */
-static int receive_flow_control(struct nozomi *dc)
-{
-        enum port_type port = PORT_MDM;
-        struct ctrl_dl ctrl_dl;
-        struct ctrl_dl old_ctrl;
-        u16 enable_ier = 0;
-
-        read_mem32((u32 *) &ctrl_dl, dc->port[PORT_CTRL].dl_addr[CH_A], 2);
-
-        switch (ctrl_dl.port) {
-        case CTRL_CMD:
-                DBG1("The Base Band sends this value as a response to a "
-                        "request for IMSI detach sent over the control "
-                        "channel uplink (see section 7.6.1).");
-                break;
-        case CTRL_MDM:
-                port = PORT_MDM;
-                enable_ier = MDM_DL;
-                break;
-        case CTRL_DIAG:
-                port = PORT_DIAG;
-                enable_ier = DIAG_DL;
-                break;
-        case CTRL_APP1:
-                port = PORT_APP1;
-                enable_ier = APP1_DL;
-                break;
-        case CTRL_APP2:
-                port = PORT_APP2;
-                enable_ier = APP2_DL;
-                if (dc->state == NOZOMI_STATE_ALLOCATED) {
-                        /*
-                         * After card initialization the flow control
-                         * received for APP2 is always the last
-                         */
-                        dc->state = NOZOMI_STATE_READY;
-                        dev_info(&dc->pdev->dev, "Device READY!\n");
-                }
-                break;
-        default:
-                dev_err(&dc->pdev->dev,
-                        "ERROR: flow control received for non-existing port\n");
-                return 0;
-        };
-
-        DBG1("0x%04X->0x%04X", *((u16 *)&dc->port[port].ctrl_dl),
-           *((u16 *)&ctrl_dl));
-
-        old_ctrl = dc->port[port].ctrl_dl;
-        dc->port[port].ctrl_dl = ctrl_dl;
-
-        if (old_ctrl.CTS == 1 && ctrl_dl.CTS == 0) {
-                DBG1("Disable interrupt (0x%04X) on port: %d",
-                        enable_ier, port);
-                disable_transmit_ul(port, dc);
-
-        } else if (old_ctrl.CTS == 0 && ctrl_dl.CTS == 1) {
-
-                if (kfifo_len(&dc->port[port].fifo_ul)) {
-                        DBG1("Enable interrupt (0x%04X) on port: %d",
-                                enable_ier, port);
-                        DBG1("Data in buffer [%d], enable transmit! ",
-                                kfifo_len(&dc->port[port].fifo_ul));
-                        enable_transmit_ul(port, dc);
-                } else {
-                        DBG1("No data in buffer...");
-                }
-        }
-
-        if (*(u16 *)&old_ctrl == *(u16 *)&ctrl_dl) {
-                DBG1(" No change in mctrl");
-                return 1;
-        }
-        /* Update statistics */
-        if (old_ctrl.CTS != ctrl_dl.CTS)
-                dc->port[port].tty_icount.cts++;
-        if (old_ctrl.DSR != ctrl_dl.DSR)
-                dc->port[port].tty_icount.dsr++;
-        if (old_ctrl.RI != ctrl_dl.RI)
-                dc->port[port].tty_icount.rng++;
-        if (old_ctrl.DCD != ctrl_dl.DCD)
-                dc->port[port].tty_icount.dcd++;
-
-        wake_up_interruptible(&dc->port[port].tty_wait);
-
-        DBG1("port: %d DCD(%d), CTS(%d), RI(%d), DSR(%d)",
-           port,
-           dc->port[port].tty_icount.dcd, dc->port[port].tty_icount.cts,
-           dc->port[port].tty_icount.rng, dc->port[port].tty_icount.dsr);
-
-        return 1;
-}
-
-static enum ctrl_port_type port2ctrl(enum port_type port,
-                                        const struct nozomi *dc)
-{
-        switch (port) {
-        case PORT_MDM:
-                return CTRL_MDM;
-        case PORT_DIAG:
-                return CTRL_DIAG;
-        case PORT_APP1:
-                return CTRL_APP1;
-        case PORT_APP2:
-                return CTRL_APP2;
-        default:
-                dev_err(&dc->pdev->dev,
-                        "ERROR: send flow control " \
-                        "received for non-existing port\n");
-        };
-        return CTRL_ERROR;
-}
-
-/*
- * Send flow control, can only update one channel at a time
- * Return 0 - If we have updated all flow control
- * Return 1 - If we need to update more flow control, ack current enable more
- */
-static int send_flow_control(struct nozomi *dc)
-{
-        u32 i, more_flow_control_to_be_updated = 0;
-        u16 *ctrl;
-
-        for (i = PORT_MDM; i < MAX_PORT; i++) {
-                if (dc->port[i].update_flow_control) {
-                        if (more_flow_control_to_be_updated) {
-                                /* We have more flow control to be updated */
-                                return 1;
-                        }
-                        dc->port[i].ctrl_ul.port = port2ctrl(i, dc);
-                        ctrl = (u16 *)&dc->port[i].ctrl_ul;
-                        write_mem32(dc->port[PORT_CTRL].ul_addr[0], \
-                                (u32 *) ctrl, 2);
-                        dc->port[i].update_flow_control = 0;
-                        more_flow_control_to_be_updated = 1;
-                }
-        }
-        return 0;
-}
-
-/*
- * Handle downlink data, ports that are handled are modem and diagnostics
- * Return 1 - ok
- * Return 0 - toggle fields are out of sync
- */
-static int handle_data_dl(struct nozomi *dc, enum port_type port, u8 *toggle,
-                        u16 read_iir, u16 mask1, u16 mask2)
-{
-        if (*toggle == 0 && read_iir & mask1) {
-                if (receive_data(port, dc)) {
-                        writew(mask1, dc->reg_fcr);
-                        *toggle = !(*toggle);
-                }
-
-                if (read_iir & mask2) {
-                        if (receive_data(port, dc)) {
-                                writew(mask2, dc->reg_fcr);
-                                *toggle = !(*toggle);
-                        }
-                }
-        } else if (*toggle == 1 && read_iir & mask2) {
-                if (receive_data(port, dc)) {
-                        writew(mask2, dc->reg_fcr);
-                        *toggle = !(*toggle);
-                }
-
-                if (read_iir & mask1) {
-                        if (receive_data(port, dc)) {
-                                writew(mask1, dc->reg_fcr);
-                                *toggle = !(*toggle);
-                        }
-                }
-        } else {
-                dev_err(&dc->pdev->dev, "port out of sync!, toggle:%d\n",
-                        *toggle);
-                return 0;
-        }
-        return 1;
-}
-
-/*
- * Handle uplink data, this is currently for the modem port
- * Return 1 - ok
- * Return 0 - toggle field are out of sync
- */
-static int handle_data_ul(struct nozomi *dc, enum port_type port, u16 read_iir)
-{
-        u8 *toggle = &(dc->port[port].toggle_ul);
-
-        if (*toggle == 0 && read_iir & MDM_UL1) {
-                dc->last_ier &= ~MDM_UL;
-                writew(dc->last_ier, dc->reg_ier);
-                if (send_data(port, dc)) {
-                        writew(MDM_UL1, dc->reg_fcr);
-                        dc->last_ier = dc->last_ier | MDM_UL;
-                        writew(dc->last_ier, dc->reg_ier);
-                        *toggle = !*toggle;
-                }
-
-                if (read_iir & MDM_UL2) {
-                        dc->last_ier &= ~MDM_UL;
-                        writew(dc->last_ier, dc->reg_ier);
-                        if (send_data(port, dc)) {
-                                writew(MDM_UL2, dc->reg_fcr);
-                                dc->last_ier = dc->last_ier | MDM_UL;
-                                writew(dc->last_ier, dc->reg_ier);
-                                *toggle = !*toggle;
-                        }
-                }
-
-        } else if (*toggle == 1 && read_iir & MDM_UL2) {
-                dc->last_ier &= ~MDM_UL;
-                writew(dc->last_ier, dc->reg_ier);
-                if (send_data(port, dc)) {
-                        writew(MDM_UL2, dc->reg_fcr);
-                        dc->last_ier = dc->last_ier | MDM_UL;
-                        writew(dc->last_ier, dc->reg_ier);
-                        *toggle = !*toggle;
-                }
-
-                if (read_iir & MDM_UL1) {
-                        dc->last_ier &= ~MDM_UL;
-                        writew(dc->last_ier, dc->reg_ier);
-                        if (send_data(port, dc)) {
-                                writew(MDM_UL1, dc->reg_fcr);
-                                dc->last_ier = dc->last_ier | MDM_UL;
-                                writew(dc->last_ier, dc->reg_ier);
-                                *toggle = !*toggle;
-                        }
-                }
-        } else {
-                writew(read_iir & MDM_UL, dc->reg_fcr);
-                dev_err(&dc->pdev->dev, "port out of sync!\n");
-                return 0;
-        }
-        return 1;
-}
-
-static irqreturn_t interrupt_handler(int irq, void *dev_id)
-{
-        struct nozomi *dc = dev_id;
-        unsigned int a;
-        u16 read_iir;
-
-        if (!dc)
-                return IRQ_NONE;
-
-        spin_lock(&dc->spin_mutex);
-        read_iir = readw(dc->reg_iir);
-
-        /* Card removed */
-        if (read_iir == (u16)-1)
-                goto none;
-        /*
-         * Just handle interrupt enabled in IER
-         * (by masking with dc->last_ier)
-         */
-        read_iir &= dc->last_ier;
-
-        if (read_iir == 0)
-                goto none;
-
-
-        DBG4("%s irq:0x%04X, prev:0x%04X", interrupt2str(read_iir), read_iir,
-                dc->last_ier);
-
-        if (read_iir & RESET) {
-                if (unlikely(!nozomi_read_config_table(dc))) {
-                        dc->last_ier = 0x0;
-                        writew(dc->last_ier, dc->reg_ier);
-                        dev_err(&dc->pdev->dev, "Could not read status from "
-                                "card, we should disable interface\n");
-                } else {
-                        writew(RESET, dc->reg_fcr);
-                }
-                /* No more useful info if this was the reset interrupt. */
-                goto exit_handler;
-        }
-        if (read_iir & CTRL_UL) {
-                DBG1("CTRL_UL");
-                dc->last_ier &= ~CTRL_UL;
-                writew(dc->last_ier, dc->reg_ier);
-                if (send_flow_control(dc)) {
-                        writew(CTRL_UL, dc->reg_fcr);
-                        dc->last_ier = dc->last_ier | CTRL_UL;
-                        writew(dc->last_ier, dc->reg_ier);
-                }
-        }
-        if (read_iir & CTRL_DL) {
-                receive_flow_control(dc);
-                writew(CTRL_DL, dc->reg_fcr);
-        }
-        if (read_iir & MDM_DL) {
-                if (!handle_data_dl(dc, PORT_MDM,
-                                &(dc->port[PORT_MDM].toggle_dl), read_iir,
-                                MDM_DL1, MDM_DL2)) {
-                        dev_err(&dc->pdev->dev, "MDM_DL out of sync!\n");
-                        goto exit_handler;
-                }
-        }
-        if (read_iir & MDM_UL) {
-                if (!handle_data_ul(dc, PORT_MDM, read_iir)) {
-                        dev_err(&dc->pdev->dev, "MDM_UL out of sync!\n");
-                        goto exit_handler;
-                }
-        }
-        if (read_iir & DIAG_DL) {
-                if (!handle_data_dl(dc, PORT_DIAG,
-                                &(dc->port[PORT_DIAG].toggle_dl), read_iir,
-                                DIAG_DL1, DIAG_DL2)) {
-                        dev_err(&dc->pdev->dev, "DIAG_DL out of sync!\n");
-                        goto exit_handler;
-                }
-        }
-        if (read_iir & DIAG_UL) {
-                dc->last_ier &= ~DIAG_UL;
-                writew(dc->last_ier, dc->reg_ier);
-                if (send_data(PORT_DIAG, dc)) {
-                        writew(DIAG_UL, dc->reg_fcr);
-                        dc->last_ier = dc->last_ier | DIAG_UL;
-                        writew(dc->last_ier, dc->reg_ier);
-                }
-        }
-        if (read_iir & APP1_DL) {
-                if (receive_data(PORT_APP1, dc))
-                        writew(APP1_DL, dc->reg_fcr);
-        }
-        if (read_iir & APP1_UL) {
-                dc->last_ier &= ~APP1_UL;
-                writew(dc->last_ier, dc->reg_ier);
-                if (send_data(PORT_APP1, dc)) {
-                        writew(APP1_UL, dc->reg_fcr);
-                        dc->last_ier = dc->last_ier | APP1_UL;
-                        writew(dc->last_ier, dc->reg_ier);
-                }
-        }
-        if (read_iir & APP2_DL) {
-                if (receive_data(PORT_APP2, dc))
-                        writew(APP2_DL, dc->reg_fcr);
-        }
-        if (read_iir & APP2_UL) {
-                dc->last_ier &= ~APP2_UL;
-                writew(dc->last_ier, dc->reg_ier);
-                if (send_data(PORT_APP2, dc)) {
-                        writew(APP2_UL, dc->reg_fcr);
-                        dc->last_ier = dc->last_ier | APP2_UL;
-                        writew(dc->last_ier, dc->reg_ier);
-                }
-        }
-
-exit_handler:
-        spin_unlock(&dc->spin_mutex);
-        for (a = 0; a < NOZOMI_MAX_PORTS; a++) {
-                struct tty_struct *tty;
-                if (test_and_clear_bit(a, &dc->flip)) {
-                        tty = tty_port_tty_get(&dc->port[a].port);
-                        if (tty)
-                                tty_flip_buffer_push(tty);
-                        tty_kref_put(tty);
-                }
-        }
-        return IRQ_HANDLED;
-none:
-        spin_unlock(&dc->spin_mutex);
-        return IRQ_NONE;
-}
-
-static void nozomi_get_card_type(struct nozomi *dc)
-{
-        int i;
-        u32 size = 0;
-
-        for (i = 0; i < 6; i++)
-                size += pci_resource_len(dc->pdev, i);
-
-        /* Assume card type F32_8 if no match */
-        dc->card_type = size == 2048 ? F32_2 : F32_8;
-
-        dev_info(&dc->pdev->dev, "Card type is: %d\n", dc->card_type);
-}
-
-static void nozomi_setup_private_data(struct nozomi *dc)
-{
-        void __iomem *offset = dc->base_addr + dc->card_type / 2;
-        unsigned int i;
-
-        dc->reg_fcr = (void __iomem *)(offset + R_FCR);
-        dc->reg_iir = (void __iomem *)(offset + R_IIR);
-        dc->reg_ier = (void __iomem *)(offset + R_IER);
-        dc->last_ier = 0;
-        dc->flip = 0;
-
-        dc->port[PORT_MDM].token_dl = MDM_DL;
-        dc->port[PORT_DIAG].token_dl = DIAG_DL;
-        dc->port[PORT_APP1].token_dl = APP1_DL;
-        dc->port[PORT_APP2].token_dl = APP2_DL;
-
-        for (i = 0; i < MAX_PORT; i++)
-                init_waitqueue_head(&dc->port[i].tty_wait);
-}
-
-static ssize_t card_type_show(struct device *dev, struct device_attribute *attr,
-                          char *buf)
-{
-        const struct nozomi *dc = pci_get_drvdata(to_pci_dev(dev));
-
-        return sprintf(buf, "%d\n", dc->card_type);
-}
-static DEVICE_ATTR(card_type, S_IRUGO, card_type_show, NULL);
-
-static ssize_t open_ttys_show(struct device *dev, struct device_attribute *attr,
-                          char *buf)
-{
-        const struct nozomi *dc = pci_get_drvdata(to_pci_dev(dev));
-
-        return sprintf(buf, "%u\n", dc->open_ttys);
-}
-static DEVICE_ATTR(open_ttys, S_IRUGO, open_ttys_show, NULL);
-
-static void make_sysfs_files(struct nozomi *dc)
-{
-        if (device_create_file(&dc->pdev->dev, &dev_attr_card_type))
-                dev_err(&dc->pdev->dev,
-                        "Could not create sysfs file for card_type\n");
-        if (device_create_file(&dc->pdev->dev, &dev_attr_open_ttys))
-                dev_err(&dc->pdev->dev,
-                        "Could not create sysfs file for open_ttys\n");
-}
-
-static void remove_sysfs_files(struct nozomi *dc)
-{
-        device_remove_file(&dc->pdev->dev, &dev_attr_card_type);
-        device_remove_file(&dc->pdev->dev, &dev_attr_open_ttys);
-}
-
-/* Allocate memory for one device */
-static int __devinit nozomi_card_init(struct pci_dev *pdev,
-                                      const struct pci_device_id *ent)
-{
-        resource_size_t start;
-        int ret;
-        struct nozomi *dc = NULL;
-        int ndev_idx;
-        int i;
-
-        dev_dbg(&pdev->dev, "Init, new card found\n");
-
-        for (ndev_idx = 0; ndev_idx < ARRAY_SIZE(ndevs); ndev_idx++)
-                if (!ndevs[ndev_idx])
-                        break;
-
-        if (ndev_idx >= ARRAY_SIZE(ndevs)) {
-                dev_err(&pdev->dev, "no free tty range for this card left\n");
-                ret = -EIO;
-                goto err;
-        }
-
-        dc = kzalloc(sizeof(struct nozomi), GFP_KERNEL);
-        if (unlikely(!dc)) {
-                dev_err(&pdev->dev, "Could not allocate memory\n");
-                ret = -ENOMEM;
-                goto err_free;
-        }
-
-        dc->pdev = pdev;
-
-        ret = pci_enable_device(dc->pdev);
-        if (ret) {
-                dev_err(&pdev->dev, "Failed to enable PCI Device\n");
-                goto err_free;
-        }
-
-        ret = pci_request_regions(dc->pdev, NOZOMI_NAME);
-        if (ret) {
-                dev_err(&pdev->dev, "I/O address 0x%04x already in use\n",
-                        (int) /* nozomi_private.io_addr */ 0);
-                goto err_disable_device;
-        }
-
-        start = pci_resource_start(dc->pdev, 0);
-        if (start == 0) {
-                dev_err(&pdev->dev, "No I/O address for card detected\n");
-                ret = -ENODEV;
-                goto err_rel_regs;
-        }
-
-        /* Find out what card type it is */
-        nozomi_get_card_type(dc);
-
-        dc->base_addr = ioremap_nocache(start, dc->card_type);
-        if (!dc->base_addr) {
-                dev_err(&pdev->dev, "Unable to map card MMIO\n");
-                ret = -ENODEV;
-                goto err_rel_regs;
-        }
-
-        dc->send_buf = kmalloc(SEND_BUF_MAX, GFP_KERNEL);
-        if (!dc->send_buf) {
-                dev_err(&pdev->dev, "Could not allocate send buffer?\n");
-                ret = -ENOMEM;
-                goto err_free_sbuf;
-        }
-
-        for (i = PORT_MDM; i < MAX_PORT; i++) {
-                if (kfifo_alloc(&dc->port[i].fifo_ul,
-                      FIFO_BUFFER_SIZE_UL, GFP_ATOMIC)) {
-                        dev_err(&pdev->dev,
-                                        "Could not allocate kfifo buffer\n");
-                        ret = -ENOMEM;
-                        goto err_free_kfifo;
-                }
-        }
-
-        spin_lock_init(&dc->spin_mutex);
-
-        nozomi_setup_private_data(dc);
-
-        /* Disable all interrupts */
-        dc->last_ier = 0;
-        writew(dc->last_ier, dc->reg_ier);
-
-        ret = request_irq(pdev->irq, &interrupt_handler, IRQF_SHARED,
-                        NOZOMI_NAME, dc);
-        if (unlikely(ret)) {
-                dev_err(&pdev->dev, "can't request irq %d\n", pdev->irq);
-                goto err_free_kfifo;
-        }
-
-        DBG1("base_addr: %p", dc->base_addr);
-
-        make_sysfs_files(dc);
-
-        dc->index_start = ndev_idx * MAX_PORT;
-        ndevs[ndev_idx] = dc;
-
-        pci_set_drvdata(pdev, dc);
-
-        /* Enable RESET interrupt */
-        dc->last_ier = RESET;
-        iowrite16(dc->last_ier, dc->reg_ier);
-
-        dc->state = NOZOMI_STATE_ENABLED;
-
-        for (i = 0; i < MAX_PORT; i++) {
-                struct device *tty_dev;
-                struct port *port = &dc->port[i];
-                port->dc = dc;
-                mutex_init(&port->tty_sem);
-                tty_port_init(&port->port);
-                port->port.ops = &noz_tty_port_ops;
-                tty_dev = tty_register_device(ntty_driver, dc->index_start + i,
-                                                        &pdev->dev);
-
-                if (IS_ERR(tty_dev)) {
-                        ret = PTR_ERR(tty_dev);
-                        dev_err(&pdev->dev, "Could not allocate tty?\n");
-                        goto err_free_tty;
-                }
-        }
-
-        return 0;
-
-err_free_tty:
-        for (i = dc->index_start; i < dc->index_start + MAX_PORT; ++i)
-                tty_unregister_device(ntty_driver, i);
-err_free_kfifo:
-        for (i = 0; i < MAX_PORT; i++)
-                kfifo_free(&dc->port[i].fifo_ul);
-err_free_sbuf:
-        kfree(dc->send_buf);
-        iounmap(dc->base_addr);
-err_rel_regs:
-        pci_release_regions(pdev);
-err_disable_device:
-        pci_disable_device(pdev);
-err_free:
-        kfree(dc);
-err:
-        return ret;
-}
-
-static void __devexit tty_exit(struct nozomi *dc)
-{
-        unsigned int i;
-
-        DBG1(" ");
-
-        flush_scheduled_work();
-
-        for (i = 0; i < MAX_PORT; ++i) {
-                struct tty_struct *tty = tty_port_tty_get(&dc->port[i].port);
-                if (tty && list_empty(&tty->hangup_work.entry))
-                        tty_hangup(tty);
-                tty_kref_put(tty);
-        }
-        /* Racy below - surely should wait for scheduled work to be done or
-           complete off a hangup method ? */
-        while (dc->open_ttys)
-                msleep(1);
-        for (i = dc->index_start; i < dc->index_start + MAX_PORT; ++i)
-                tty_unregister_device(ntty_driver, i);
-}
-
-/* Deallocate memory for one device */
-static void __devexit nozomi_card_exit(struct pci_dev *pdev)
-{
-        int i;
-        struct ctrl_ul ctrl;
-        struct nozomi *dc = pci_get_drvdata(pdev);
-
-        /* Disable all interrupts */
-        dc->last_ier = 0;
-        writew(dc->last_ier, dc->reg_ier);
-
-        tty_exit(dc);
-
-        /* Send 0x0001, command card to resend the reset token.  */
-        /* This is to get the reset when the module is reloaded. */
-        ctrl.port = 0x00;
-        ctrl.reserved = 0;
-        ctrl.RTS = 0;
-        ctrl.DTR = 1;
-        DBG1("sending flow control 0x%04X", *((u16 *)&ctrl));
-
-        /* Setup dc->reg addresses to we can use defines here */
-        write_mem32(dc->port[PORT_CTRL].ul_addr[0], (u32 *)&ctrl, 2);
-        writew(CTRL_UL, dc->reg_fcr);   /* push the token to the card. */
-
-        remove_sysfs_files(dc);
-
-        free_irq(pdev->irq, dc);
-
-        for (i = 0; i < MAX_PORT; i++)
-                kfifo_free(&dc->port[i].fifo_ul);
-
-        kfree(dc->send_buf);
-
-        iounmap(dc->base_addr);
-
-        pci_release_regions(pdev);
-
-        pci_disable_device(pdev);
-
-        ndevs[dc->index_start / MAX_PORT] = NULL;
-
-        kfree(dc);
-}
-
-static void set_rts(const struct tty_struct *tty, int rts)
-{
-        struct port *port = get_port_by_tty(tty);
-
-        port->ctrl_ul.RTS = rts;
-        port->update_flow_control = 1;
-        enable_transmit_ul(PORT_CTRL, get_dc_by_tty(tty));
-}
-
-static void set_dtr(const struct tty_struct *tty, int dtr)
-{
-        struct port *port = get_port_by_tty(tty);
-
-        DBG1("SETTING DTR index: %d, dtr: %d", tty->index, dtr);
-
-        port->ctrl_ul.DTR = dtr;
-        port->update_flow_control = 1;
-        enable_transmit_ul(PORT_CTRL, get_dc_by_tty(tty));
-}
-
-/*
- * ----------------------------------------------------------------------------
- * TTY code
- * ----------------------------------------------------------------------------
- */
-
-static int ntty_install(struct tty_driver *driver, struct tty_struct *tty)
-{
-        struct port *port = get_port_by_tty(tty);
-        struct nozomi *dc = get_dc_by_tty(tty);
-        int ret;
-        if (!port || !dc || dc->state != NOZOMI_STATE_READY)
-                return -ENODEV;
-        ret = tty_init_termios(tty);
-        if (ret == 0) {
-                tty_driver_kref_get(driver);
-                tty->count++;
-                tty->driver_data = port;
-                driver->ttys[tty->index] = tty;
-        }
-        return ret;
-}
-
-static void ntty_cleanup(struct tty_struct *tty)
-{
-        tty->driver_data = NULL;
-}
-
-static int ntty_activate(struct tty_port *tport, struct tty_struct *tty)
-{
-        struct port *port = container_of(tport, struct port, port);
-        struct nozomi *dc = port->dc;
-        unsigned long flags;
-
-        DBG1("open: %d", port->token_dl);
-        spin_lock_irqsave(&dc->spin_mutex, flags);
-        dc->last_ier = dc->last_ier | port->token_dl;
-        writew(dc->last_ier, dc->reg_ier);
-        dc->open_ttys++;
-        spin_unlock_irqrestore(&dc->spin_mutex, flags);
-        printk("noz: activated %d: %p\n", tty->index, tport);
-        return 0;
-}
-
-static int ntty_open(struct tty_struct *tty, struct file *filp)
-{
-        struct port *port = tty->driver_data;
-        return tty_port_open(&port->port, tty, filp);
-}
-
-static void ntty_shutdown(struct tty_port *tport)
-{
-        struct port *port = container_of(tport, struct port, port);
-        struct nozomi *dc = port->dc;
-        unsigned long flags;
-
-        DBG1("close: %d", port->token_dl);
-        spin_lock_irqsave(&dc->spin_mutex, flags);
-        dc->last_ier &= ~(port->token_dl);
-        writew(dc->last_ier, dc->reg_ier);
-        dc->open_ttys--;
-        spin_unlock_irqrestore(&dc->spin_mutex, flags);
-        printk("noz: shutdown %p\n", tport);
-}
-
-static void ntty_close(struct tty_struct *tty, struct file *filp)
-{
-        struct port *port = tty->driver_data;
-        if (port)
-                tty_port_close(&port->port, tty, filp);
-}
-
-static void ntty_hangup(struct tty_struct *tty)
-{
-        struct port *port = tty->driver_data;
-        tty_port_hangup(&port->port);
-}
-
-/*
- * called when the userspace process writes to the tty (/dev/noz*).
- * Data is inserted into a fifo, which is then read and transfered to the modem.
- */
-static int ntty_write(struct tty_struct *tty, const unsigned char *buffer,
-                      int count)
-{
-        int rval = -EINVAL;
-        struct nozomi *dc = get_dc_by_tty(tty);
-        struct port *port = tty->driver_data;
-        unsigned long flags;
-
-        /* DBG1( "WRITEx: %d, index = %d", count, index); */
-
-        if (!dc || !port)
-                return -ENODEV;
-
-        mutex_lock(&port->tty_sem);
-
-        if (unlikely(!port->port.count)) {
-                DBG1(" ");
-                goto exit;
-        }
-
-        rval = kfifo_in(&port->fifo_ul, (unsigned char *)buffer, count);
-
-        /* notify card */
-        if (unlikely(dc == NULL)) {
-                DBG1("No device context?");
-                goto exit;
-        }
-
-        spin_lock_irqsave(&dc->spin_mutex, flags);
-        /* CTS is only valid on the modem channel */
-        if (port == &(dc->port[PORT_MDM])) {
-                if (port->ctrl_dl.CTS) {
-                        DBG4("Enable interrupt");
-                        enable_transmit_ul(tty->index % MAX_PORT, dc);
-                } else {
-                        dev_err(&dc->pdev->dev,
-                                "CTS not active on modem port?\n");
-                }
-        } else {
-                enable_transmit_ul(tty->index % MAX_PORT, dc);
-        }
-        spin_unlock_irqrestore(&dc->spin_mutex, flags);
-
-exit:
-        mutex_unlock(&port->tty_sem);
-        return rval;
-}
-
-/*
- * Calculate how much is left in device
- * This method is called by the upper tty layer.
- *   #according to sources N_TTY.c it expects a value >= 0 and
- *    does not check for negative values.
- *
- * If the port is unplugged report lots of room and let the bits
- * dribble away so we don't block anything.
- */
-static int ntty_write_room(struct tty_struct *tty)
-{
-        struct port *port = tty->driver_data;
-        int room = 4096;
-        const struct nozomi *dc = get_dc_by_tty(tty);
-
-        if (dc) {
-                mutex_lock(&port->tty_sem);
-                if (port->port.count)
-                        room = kfifo_avail(&port->fifo_ul);
-                mutex_unlock(&port->tty_sem);
-        }
-        return room;
-}
-
-/* Gets io control parameters */
-static int ntty_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        const struct port *port = tty->driver_data;
-        const struct ctrl_dl *ctrl_dl = &port->ctrl_dl;
-        const struct ctrl_ul *ctrl_ul = &port->ctrl_ul;
-
-        /* Note: these could change under us but it is not clear this
-           matters if so */
-        return  (ctrl_ul->RTS ? TIOCM_RTS : 0) |
-                (ctrl_ul->DTR ? TIOCM_DTR : 0) |
-                (ctrl_dl->DCD ? TIOCM_CAR : 0) |
-                (ctrl_dl->RI  ? TIOCM_RNG : 0) |
-                (ctrl_dl->DSR ? TIOCM_DSR : 0) |
-                (ctrl_dl->CTS ? TIOCM_CTS : 0);
-}
-
-/* Sets io controls parameters */
-static int ntty_tiocmset(struct tty_struct *tty, struct file *file,
-        unsigned int set, unsigned int clear)
-{
-        struct nozomi *dc = get_dc_by_tty(tty);
-        unsigned long flags;
-
-        spin_lock_irqsave(&dc->spin_mutex, flags);
-        if (set & TIOCM_RTS)
-                set_rts(tty, 1);
-        else if (clear & TIOCM_RTS)
-                set_rts(tty, 0);
-
-        if (set & TIOCM_DTR)
-                set_dtr(tty, 1);
-        else if (clear & TIOCM_DTR)
-                set_dtr(tty, 0);
-        spin_unlock_irqrestore(&dc->spin_mutex, flags);
-
-        return 0;
-}
-
-static int ntty_cflags_changed(struct port *port, unsigned long flags,
-                struct async_icount *cprev)
-{
-        const struct async_icount cnow = port->tty_icount;
-        int ret;
-
-        ret =   ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng)) ||
-                ((flags & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) ||
-                ((flags & TIOCM_CD)  && (cnow.dcd != cprev->dcd)) ||
-                ((flags & TIOCM_CTS) && (cnow.cts != cprev->cts));
-
-        *cprev = cnow;
-
-        return ret;
-}
-
-static int ntty_ioctl_tiocgicount(struct port *port, void __user *argp)
-{
-        const struct async_icount cnow = port->tty_icount;
-        struct serial_icounter_struct icount;
-
-        icount.cts = cnow.cts;
-        icount.dsr = cnow.dsr;
-        icount.rng = cnow.rng;
-        icount.dcd = cnow.dcd;
-        icount.rx = cnow.rx;
-        icount.tx = cnow.tx;
-        icount.frame = cnow.frame;
-        icount.overrun = cnow.overrun;
-        icount.parity = cnow.parity;
-        icount.brk = cnow.brk;
-        icount.buf_overrun = cnow.buf_overrun;
-
-        return copy_to_user(argp, &icount, sizeof(icount)) ? -EFAULT : 0;
-}
-
-static int ntty_ioctl(struct tty_struct *tty, struct file *file,
-                      unsigned int cmd, unsigned long arg)
-{
-        struct port *port = tty->driver_data;
-        void __user *argp = (void __user *)arg;
-        int rval = -ENOIOCTLCMD;
-
-        DBG1("******** IOCTL, cmd: %d", cmd);
-
-        switch (cmd) {
-        case TIOCMIWAIT: {
-                struct async_icount cprev = port->tty_icount;
-
-                rval = wait_event_interruptible(port->tty_wait,
-                                ntty_cflags_changed(port, arg, &cprev));
-                break;
-        } case TIOCGICOUNT:
-                rval = ntty_ioctl_tiocgicount(port, argp);
-                break;
-        default:
-                DBG1("ERR: 0x%08X, %d", cmd, cmd);
-                break;
-        };
-
-        return rval;
-}
-
-/*
- * Called by the upper tty layer when tty buffers are ready
- * to receive data again after a call to throttle.
- */
-static void ntty_unthrottle(struct tty_struct *tty)
-{
-        struct nozomi *dc = get_dc_by_tty(tty);
-        unsigned long flags;
-
-        DBG1("UNTHROTTLE");
-        spin_lock_irqsave(&dc->spin_mutex, flags);
-        enable_transmit_dl(tty->index % MAX_PORT, dc);
-        set_rts(tty, 1);
-
-        spin_unlock_irqrestore(&dc->spin_mutex, flags);
-}
-
-/*
- * Called by the upper tty layer when the tty buffers are almost full.
- * The driver should stop send more data.
- */
-static void ntty_throttle(struct tty_struct *tty)
-{
-        struct nozomi *dc = get_dc_by_tty(tty);
-        unsigned long flags;
-
-        DBG1("THROTTLE");
-        spin_lock_irqsave(&dc->spin_mutex, flags);
-        set_rts(tty, 0);
-        spin_unlock_irqrestore(&dc->spin_mutex, flags);
-}
-
-/* Returns number of chars in buffer, called by tty layer */
-static s32 ntty_chars_in_buffer(struct tty_struct *tty)
-{
-        struct port *port = tty->driver_data;
-        struct nozomi *dc = get_dc_by_tty(tty);
-        s32 rval = 0;
-
-        if (unlikely(!dc || !port)) {
-                goto exit_in_buffer;
-        }
-
-        if (unlikely(!port->port.count)) {
-                dev_err(&dc->pdev->dev, "No tty open?\n");
-                goto exit_in_buffer;
-        }
-
-        rval = kfifo_len(&port->fifo_ul);
-
-exit_in_buffer:
-        return rval;
-}
-
-static const struct tty_port_operations noz_tty_port_ops = {
-        .activate = ntty_activate,
-        .shutdown = ntty_shutdown,
-};
-
-static const struct tty_operations tty_ops = {
-        .ioctl = ntty_ioctl,
-        .open = ntty_open,
-        .close = ntty_close,
-        .hangup = ntty_hangup,
-        .write = ntty_write,
-        .write_room = ntty_write_room,
-        .unthrottle = ntty_unthrottle,
-        .throttle = ntty_throttle,
-        .chars_in_buffer = ntty_chars_in_buffer,
-        .tiocmget = ntty_tiocmget,
-        .tiocmset = ntty_tiocmset,
-        .install = ntty_install,
-        .cleanup = ntty_cleanup,
-};
-
-/* Module initialization */
-static struct pci_driver nozomi_driver = {
-        .name = NOZOMI_NAME,
-        .id_table = nozomi_pci_tbl,
-        .probe = nozomi_card_init,
-        .remove = __devexit_p(nozomi_card_exit),
-};
-
-static __init int nozomi_init(void)
-{
-        int ret;
-
-        printk(KERN_INFO "Initializing %s\n", VERSION_STRING);
-
-        ntty_driver = alloc_tty_driver(NTTY_TTY_MAXMINORS);
-        if (!ntty_driver)
-                return -ENOMEM;
-
-        ntty_driver->owner = THIS_MODULE;
-        ntty_driver->driver_name = NOZOMI_NAME_TTY;
-        ntty_driver->name = "noz";
-        ntty_driver->major = 0;
-        ntty_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        ntty_driver->subtype = SERIAL_TYPE_NORMAL;
-        ntty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-        ntty_driver->init_termios = tty_std_termios;
-        ntty_driver->init_termios.c_cflag = B115200 | CS8 | CREAD | \
-                                                HUPCL | CLOCAL;
-        ntty_driver->init_termios.c_ispeed = 115200;
-        ntty_driver->init_termios.c_ospeed = 115200;
-        tty_set_operations(ntty_driver, &tty_ops);
-
-        ret = tty_register_driver(ntty_driver);
-        if (ret) {
-                printk(KERN_ERR "Nozomi: failed to register ntty driver\n");
-                goto free_tty;
-        }
-
-        ret = pci_register_driver(&nozomi_driver);
-        if (ret) {
-                printk(KERN_ERR "Nozomi: can't register pci driver\n");
-                goto unr_tty;
-        }
-
-        return 0;
-unr_tty:
-        tty_unregister_driver(ntty_driver);
-free_tty:
-        put_tty_driver(ntty_driver);
-        return ret;
-}
-
-static __exit void nozomi_exit(void)
-{
-        printk(KERN_INFO "Unloading %s\n", DRIVER_DESC);
-        pci_unregister_driver(&nozomi_driver);
-        tty_unregister_driver(ntty_driver);
-        put_tty_driver(ntty_driver);
-}
-
-module_init(nozomi_init);
-module_exit(nozomi_exit);
-
-module_param(debug, int, S_IRUGO | S_IWUSR);
-
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 66d2917b003f..166f1e7aaa7e 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -109,10 +109,11 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 
 #include <asm/system.h>
 
+static DEFINE_MUTEX(nvram_mutex);
 static DEFINE_SPINLOCK(nvram_state_lock);
 static int nvram_open_cnt;      /* #times opened */
 static int nvram_open_mode;     /* special open modes */
@@ -308,7 +309,7 @@ static long nvram_ioctl(struct file *file, unsigned int cmd,
                 if (!capable(CAP_SYS_ADMIN))
                         return -EACCES;
 
-                lock_kernel();
+                mutex_lock(&nvram_mutex);
                 spin_lock_irq(&rtc_lock);
 
                 for (i = 0; i < NVRAM_BYTES; ++i)
@@ -316,7 +317,7 @@ static long nvram_ioctl(struct file *file, unsigned int cmd,
                 __nvram_set_checksum();
 
                 spin_unlock_irq(&rtc_lock);
-                unlock_kernel();
+                mutex_unlock(&nvram_mutex);
                 return 0;
 
         case NVRAM_SETCKS:
@@ -325,11 +326,11 @@ static long nvram_ioctl(struct file *file, unsigned int cmd,
                 if (!capable(CAP_SYS_ADMIN))
                         return -EACCES;
 
-                lock_kernel();
+                mutex_lock(&nvram_mutex);
                 spin_lock_irq(&rtc_lock);
                 __nvram_set_checksum();
                 spin_unlock_irq(&rtc_lock);
-                unlock_kernel();
+                mutex_unlock(&nvram_mutex);
                 return 0;
 
         default:
diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c
index 2604246501e4..04a480f86c6c 100644
--- a/drivers/char/nwbutton.c
+++ b/drivers/char/nwbutton.c
@@ -75,7 +75,7 @@ int button_add_callback (void (*callback) (void), int count)
  * with -EINVAL. If there is more than one entry with the same address,
  * because it searches the list from end to beginning, it will unregister the
  * last one to be registered first (FILO- First In Last Out).
- * Note that this is not neccessarily true if the entries are not submitted
+ * Note that this is not necessarily true if the entries are not submitted
  * at the same time, because another driver could have unregistered a callback
  * between the submissions creating a gap earlier in the list, which would
  * be filled first at submission time.
@@ -182,6 +182,7 @@ static int button_read (struct file *filp, char __user *buffer,
 static const struct file_operations button_fops = {
         .owner          = THIS_MODULE,
         .read           = button_read,
+        .llseek         = noop_llseek,
 };
 
 /* 
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c
index 043a1c7b86be..a12f52400dbc 100644
--- a/drivers/char/nwflash.c
+++ b/drivers/char/nwflash.c
@@ -25,7 +25,6 @@
 #include <linux/spinlock.h>
 #include <linux/rwsem.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 #include <linux/jiffies.h>
 
@@ -41,6 +40,7 @@
 
 #define NWFLASH_VERSION "6.4"
 
+static DEFINE_MUTEX(flash_mutex);
 static void kick_open(void);
 static int get_flash_id(void);
 static int erase_block(int nBlock);
@@ -96,7 +96,7 @@ static int get_flash_id(void)
 
 static long flash_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
 {
-        lock_kernel();
+        mutex_lock(&flash_mutex);
         switch (cmd) {
         case CMD_WRITE_DISABLE:
                 gbWriteBase64Enable = 0;
@@ -114,10 +114,10 @@ static long flash_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
         default:
                 gbWriteBase64Enable = 0;
                 gbWriteEnable = 0;
-                unlock_kernel();
+                mutex_unlock(&flash_mutex);
                 return -EINVAL;
         }
-        unlock_kernel();
+        mutex_unlock(&flash_mutex);
         return 0;
 }
 
@@ -282,7 +282,7 @@ static loff_t flash_llseek(struct file *file, loff_t offset, int orig)
 {
         loff_t ret;
 
-        lock_kernel();
+        mutex_lock(&flash_mutex);
         if (flashdebug)
                 printk(KERN_DEBUG "flash_llseek: offset=0x%X, orig=0x%X.\n",
                        (unsigned int) offset, orig);
@@ -317,7 +317,7 @@ static loff_t flash_llseek(struct file *file, loff_t offset, int orig)
         default:
                 ret = -EINVAL;
         }
-        unlock_kernel();
+        mutex_unlock(&flash_mutex);
         return ret;
 }
 
diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c
index 8ecbcc174c15..b304ec052501 100644
--- a/drivers/char/pc8736x_gpio.c
+++ b/drivers/char/pc8736x_gpio.c
@@ -234,6 +234,7 @@ static const struct file_operations pc8736x_gpio_fileops = {
         .open   = pc8736x_gpio_open,
         .write  = nsc_gpio_write,
         .read   = nsc_gpio_read,
+        .llseek = no_llseek,
 };
 
 static void __init pc8736x_init_shadow(void)
diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig
index ffa0efce0aed..6614416a8623 100644
--- a/drivers/char/pcmcia/Kconfig
+++ b/drivers/char/pcmcia/Kconfig
@@ -28,7 +28,7 @@ config CARDMAN_4000
 
           This kernel driver requires additional userspace support, either
           by the vendor-provided PC/SC ifd_handler (http://www.omnikey.com/),
-          or via the cm4000 backend of OpenCT (http://www.opensc.com/).
+          or via the cm4000 backend of OpenCT (http://www.opensc-project.org/opensc).
 
 config CARDMAN_4040
         tristate "Omnikey CardMan 4040 support"
@@ -41,7 +41,7 @@ config CARDMAN_4040
           in I/O space.  To use the kernel driver, you will need either the
           PC/SC ifdhandler provided from the Omnikey homepage
           (http://www.omnikey.com/), or a current development version of OpenCT
-          (http://www.opensc.org/).
+          (http://www.opensc-project.org/opensc).
 
 config IPWIRELESS
         tristate "IPWireless 3G UMTS PCMCIA card support"
diff --git a/drivers/char/pcmcia/Makefile b/drivers/char/pcmcia/Makefile
index be8f287aa398..0aae20985d57 100644
--- a/drivers/char/pcmcia/Makefile
+++ b/drivers/char/pcmcia/Makefile
@@ -4,8 +4,6 @@
 # Makefile for the Linux PCMCIA char device drivers.
 #
 
-obj-y += ipwireless/
-
 obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
 obj-$(CONFIG_CARDMAN_4000) += cm4000_cs.o
 obj-$(CONFIG_CARDMAN_4040) += cm4040_cs.o
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index ec73d9f6d9ed..a7584860e9a7 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -30,11 +30,10 @@
 #include <linux/fs.h>
 #include <linux/delay.h>
 #include <linux/bitrev.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ciscode.h>
@@ -55,7 +54,7 @@
                            __func__ , ## args);         \
         } while (0)
 
-static char *version = "cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte";
+static DEFINE_MUTEX(cmm_mutex);
 
 #define T_1SEC          (HZ)
 #define T_10MSEC        msecs_to_jiffies(10)
@@ -807,7 +806,7 @@ static void monitor_card(unsigned long p)
                 dev->flags1 = 0x01;
                 xoutb(dev->flags1, REG_FLAGS1(iobase));
 
-                /* atr is present (which doesnt mean it's valid) */
+                /* atr is present (which doesn't mean it's valid) */
                 set_bit(IS_ATR_PRESENT, &dev->flags);
                 if (dev->atr[0] == 0x03)
                         str_invert_revert(dev->atr, dev->atr_len);
@@ -831,8 +830,7 @@ static void monitor_card(unsigned long p)
                             test_bit(IS_ANY_T1, &dev->flags))) {
                                 DEBUGP(4, dev, "Perform AUTOPPS\n");
                                 set_bit(IS_AUTOPPS_ACT, &dev->flags);
-                                ptsreq.protocol = ptsreq.protocol =
-                                    (0x01 << dev->proto);
+                                ptsreq.protocol = (0x01 << dev->proto);
                                 ptsreq.flags = 0x01;
                                 ptsreq.pts1 = 0x00;
                                 ptsreq.pts2 = 0x00;
@@ -980,8 +978,9 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count,
                 if (dev->flags0 & 1) {
                         set_bit(IS_CMM_ABSENT, &dev->flags);
                         rc = -ENODEV;
+                } else {
+                        rc = -EIO;
                 }
-                rc = -EIO;
                 goto release_io;
         }
 
@@ -1418,7 +1417,7 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                iminor(inode), ioctl_names[_IOC_NR(cmd)]);
 #endif
 
-        lock_kernel();
+        mutex_lock(&cmm_mutex);
         rc = -ENODEV;
         link = dev_table[iminor(inode)];
         if (!pcmcia_dev_present(link)) {
@@ -1626,7 +1625,7 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 rc = -ENOTTY;
         }
 out:
-        unlock_kernel();
+        mutex_unlock(&cmm_mutex);
         return rc;
 }
 
@@ -1640,7 +1639,7 @@ static int cmm_open(struct inode *inode, struct file *filp)
         if (minor >= CM4000_MAX_DEV)
                 return -ENODEV;
 
-        lock_kernel();
+        mutex_lock(&cmm_mutex);
         link = dev_table[minor];
         if (link == NULL || !pcmcia_dev_present(link)) {
                 ret = -ENODEV;
@@ -1667,7 +1666,7 @@ static int cmm_open(struct inode *inode, struct file *filp)
         /* opening will always block since the
          * monitor will be started by open, which
          * means we have to wait for ATR becoming
-         * vaild = block until valid (or card
+         * valid = block until valid (or card
          * inserted)
          */
         if (filp->f_flags & O_NONBLOCK) {
@@ -1685,7 +1684,7 @@ static int cmm_open(struct inode *inode, struct file *filp)
         DEBUGP(2, dev, "<- cmm_open\n");
         ret = nonseekable_open(inode, filp);
 out:
-        unlock_kernel();
+        mutex_unlock(&cmm_mutex);
         return ret;
 }
 
@@ -1742,20 +1741,8 @@ static void cmm_cm4000_release(struct pcmcia_device * link)
 
 /*==== Interface to PCMCIA Layer =======================================*/
 
-static int cm4000_config_check(struct pcmcia_device *p_dev,
-                               cistpl_cftable_entry_t *cfg,
-                               cistpl_cftable_entry_t *dflt,
-                               unsigned int vcc,
-                               void *priv_data)
+static int cm4000_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
-        if (!cfg->io.nwin)
-                return -ENODEV;
-
-        p_dev->resource[0]->start = cfg->io.win[0].base;
-        p_dev->resource[0]->end = cfg->io.win[0].len;
-        p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
-        p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
-
         return pcmcia_request_io(p_dev);
 }
 
@@ -1763,13 +1750,13 @@ static int cm4000_config(struct pcmcia_device * link, int devno)
 {
         struct cm4000_dev *dev;
 
+        link->config_flags |= CONF_AUTO_SET_IO;
+
         /* read the config-tuples */
         if (pcmcia_loop_config(link, cm4000_config_check, NULL))
                 goto cs_release;
 
-        link->conf.IntType = 00000002;
-
-        if (pcmcia_request_configuration(link, &link->conf))
+        if (pcmcia_enable_device(link))
                 goto cs_release;
 
         dev = link->priv;
@@ -1829,7 +1816,6 @@ static int cm4000_probe(struct pcmcia_device *link)
 
         dev->p_dev = link;
         link->priv = dev;
-        link->conf.IntType = INT_MEMORY_AND_IO;
         dev_table[i] = link;
 
         init_waitqueue_head(&dev->devq);
@@ -1880,9 +1866,10 @@ static const struct file_operations cm4000_fops = {
         .unlocked_ioctl = cmm_ioctl,
         .open   = cmm_open,
         .release= cmm_close,
+        .llseek = no_llseek,
 };
 
-static struct pcmcia_device_id cm4000_ids[] = {
+static const struct pcmcia_device_id cm4000_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x0223, 0x0002),
         PCMCIA_DEVICE_PROD_ID12("CardMan", "4000", 0x2FB368CA, 0xA2BD8C39),
         PCMCIA_DEVICE_NULL,
@@ -1891,9 +1878,7 @@ MODULE_DEVICE_TABLE(pcmcia, cm4000_ids);
 
 static struct pcmcia_driver cm4000_driver = {
         .owner    = THIS_MODULE,
-        .drv      = {
-                .name = "cm4000_cs",
-                },
+        .name     = "cm4000_cs",
         .probe    = cm4000_probe,
         .remove   = cm4000_detach,
         .suspend  = cm4000_suspend,
@@ -1905,8 +1890,6 @@ static int __init cmm_init(void)
 {
         int rc;
 
-        printk(KERN_INFO "%s\n", version);
-
         cmm_class = class_create(THIS_MODULE, "cardman_4000");
         if (IS_ERR(cmm_class))
                 return PTR_ERR(cmm_class);
@@ -1931,7 +1914,6 @@ static int __init cmm_init(void)
 
 static void __exit cmm_exit(void)
 {
-        printk(KERN_INFO MODULE_NAME ": unloading\n");
         pcmcia_unregister_driver(&cm4000_driver);
         unregister_chrdev(major, DEVICE_NAME);
         class_destroy(cmm_class);
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 815cde1d0570..8dd48a2be911 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -24,12 +24,11 @@
 #include <linux/fs.h>
 #include <linux/delay.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/wait.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ciscode.h>
@@ -49,8 +48,7 @@
                            __func__ , ## args);         \
         } while (0)
 
-static char *version =
-"OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte";
+static DEFINE_MUTEX(cm4040_mutex);
 
 #define CCID_DRIVER_BULK_DEFAULT_TIMEOUT        (150*HZ)
 #define CCID_DRIVER_ASYNC_POWERUP_TIMEOUT       (35*HZ)
@@ -444,7 +442,7 @@ static int cm4040_open(struct inode *inode, struct file *filp)
         if (minor >= CM_MAX_DEV)
                 return -ENODEV;
 
-        lock_kernel();
+        mutex_lock(&cm4040_mutex);
         link = dev_table[minor];
         if (link == NULL || !pcmcia_dev_present(link)) {
                 ret = -ENODEV;
@@ -473,7 +471,7 @@ static int cm4040_open(struct inode *inode, struct file *filp)
         DEBUGP(2, dev, "<- cm4040_open (successfully)\n");
         ret = nonseekable_open(inode, filp);
 out:
-        unlock_kernel();
+        mutex_unlock(&cm4040_mutex);
         return ret;
 }
 
@@ -516,26 +514,9 @@ static void cm4040_reader_release(struct pcmcia_device *link)
         return;
 }
 
-static int cm4040_config_check(struct pcmcia_device *p_dev,
-                               cistpl_cftable_entry_t *cfg,
-                               cistpl_cftable_entry_t *dflt,
-                               unsigned int vcc,
-                               void *priv_data)
+static int cm4040_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
-        int rc;
-        if (!cfg->io.nwin)
-                return -ENODEV;
-
-        /* Get the IOaddr */
-        p_dev->resource[0]->start = cfg->io.win[0].base;
-        p_dev->resource[0]->end = cfg->io.win[0].len;
-        p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
-        p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
-        rc = pcmcia_request_io(p_dev);
-
-        dev_printk(KERN_INFO, &p_dev->dev,
-                   "pcmcia_request_io returned 0x%x\n", rc);
-        return rc;
+        return pcmcia_request_io(p_dev);
 }
 
 
@@ -544,15 +525,15 @@ static int reader_config(struct pcmcia_device *link, int devno)
         struct reader_dev *dev;
         int fail_rc;
 
+        link->config_flags |= CONF_AUTO_SET_IO;
+
         if (pcmcia_loop_config(link, cm4040_config_check, NULL))
                 goto cs_release;
 
-        link->conf.IntType = 00000002;
-
-        fail_rc = pcmcia_request_configuration(link, &link->conf);
+        fail_rc = pcmcia_enable_device(link);
         if (fail_rc != 0) {
                 dev_printk(KERN_INFO, &link->dev,
-                           "pcmcia_request_configuration failed 0x%x\n",
+                           "pcmcia_enable_device failed 0x%x\n",
                            fail_rc);
                 goto cs_release;
         }
@@ -599,7 +580,6 @@ static int reader_probe(struct pcmcia_device *link)
         link->priv = dev;
         dev->p_dev = link;
 
-        link->conf.IntType = INT_MEMORY_AND_IO;
         dev_table[i] = link;
 
         init_waitqueue_head(&dev->devq);
@@ -650,9 +630,10 @@ static const struct file_operations reader_fops = {
         .open           = cm4040_open,
         .release        = cm4040_close,
         .poll           = cm4040_poll,
+        .llseek         = no_llseek,
 };
 
-static struct pcmcia_device_id cm4040_ids[] = {
+static const struct pcmcia_device_id cm4040_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x0223, 0x0200),
         PCMCIA_DEVICE_PROD_ID12("OMNIKEY", "CardMan 4040",
                                 0xE32CDD8C, 0x8F23318B),
@@ -662,9 +643,7 @@ MODULE_DEVICE_TABLE(pcmcia, cm4040_ids);
 
 static struct pcmcia_driver reader_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "cm4040_cs",
-        },
+        .name           = "cm4040_cs",
         .probe          = reader_probe,
         .remove         = reader_detach,
         .id_table       = cm4040_ids,
@@ -674,7 +653,6 @@ static int __init cm4040_init(void)
 {
         int rc;
 
-        printk(KERN_INFO "%s\n", version);
         cmx_class = class_create(THIS_MODULE, "cardman_4040");
         if (IS_ERR(cmx_class))
                 return PTR_ERR(cmx_class);
@@ -699,7 +677,6 @@ static int __init cm4040_init(void)
 
 static void __exit cm4040_exit(void)
 {
-        printk(KERN_INFO MODULE_NAME ": unloading\n");
         pcmcia_unregister_driver(&reader_driver);
         unregister_chrdev(major, DEVICE_NAME);
         class_destroy(cmx_class);
diff --git a/drivers/char/pcmcia/ipwireless/Makefile b/drivers/char/pcmcia/ipwireless/Makefile
deleted file mode 100644
index b71eb593643d..000000000000
--- a/drivers/char/pcmcia/ipwireless/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# drivers/char/pcmcia/ipwireless/Makefile
-#
-# Makefile for the IPWireless driver
-#
-
-obj-$(CONFIG_IPWIRELESS) += ipwireless.o
-
-ipwireless-objs := hardware.o main.o network.o tty.o
-
diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c
deleted file mode 100644
index 99cffdab1056..000000000000
--- a/drivers/char/pcmcia/ipwireless/hardware.c
+++ /dev/null
@@ -1,1764 +0,0 @@
-/*
- * IPWireless 3G PCMCIA Network Driver
- *
- * Original code
- *   by Stephen Blackheath <stephen@blacksapphire.com>,
- *      Ben Martel <benm@symmetric.co.nz>
- *
- * Copyrighted as follows:
- *   Copyright (C) 2004 by Symmetric Systems Ltd (NZ)
- *
- * Various driver changes and rewrites, port to new kernels
- *   Copyright (C) 2006-2007 Jiri Kosina
- *
- * Misc code cleanups and updates
- *   Copyright (C) 2007 David Sterba
- */
-
-#include <linux/interrupt.h>
-#include <linux/io.h>
-#include <linux/irq.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-
-#include "hardware.h"
-#include "setup_protocol.h"
-#include "network.h"
-#include "main.h"
-
-static void ipw_send_setup_packet(struct ipw_hardware *hw);
-static void handle_received_SETUP_packet(struct ipw_hardware *ipw,
-                                         unsigned int address,
-                                         const unsigned char *data, int len,
-                                         int is_last);
-static void ipwireless_setup_timer(unsigned long data);
-static void handle_received_CTRL_packet(struct ipw_hardware *hw,
-                unsigned int channel_idx, const unsigned char *data, int len);
-
-/*#define TIMING_DIAGNOSTICS*/
-
-#ifdef TIMING_DIAGNOSTICS
-
-static struct timing_stats {
-        unsigned long last_report_time;
-        unsigned long read_time;
-        unsigned long write_time;
-        unsigned long read_bytes;
-        unsigned long write_bytes;
-        unsigned long start_time;
-};
-
-static void start_timing(void)
-{
-        timing_stats.start_time = jiffies;
-}
-
-static void end_read_timing(unsigned length)
-{
-        timing_stats.read_time += (jiffies - start_time);
-        timing_stats.read_bytes += length + 2;
-        report_timing();
-}
-
-static void end_write_timing(unsigned length)
-{
-        timing_stats.write_time += (jiffies - start_time);
-        timing_stats.write_bytes += length + 2;
-        report_timing();
-}
-
-static void report_timing(void)
-{
-        unsigned long since = jiffies - timing_stats.last_report_time;
-
-        /* If it's been more than one second... */
-        if (since >= HZ) {
-                int first = (timing_stats.last_report_time == 0);
-
-                timing_stats.last_report_time = jiffies;
-                if (!first)
-                        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                               ": %u us elapsed - read %lu bytes in %u us, wrote %lu bytes in %u us\n",
-                               jiffies_to_usecs(since),
-                               timing_stats.read_bytes,
-                               jiffies_to_usecs(timing_stats.read_time),
-                               timing_stats.write_bytes,
-                               jiffies_to_usecs(timing_stats.write_time));
-
-                timing_stats.read_time = 0;
-                timing_stats.write_time = 0;
-                timing_stats.read_bytes = 0;
-                timing_stats.write_bytes = 0;
-        }
-}
-#else
-static void start_timing(void) { }
-static void end_read_timing(unsigned length) { }
-static void end_write_timing(unsigned length) { }
-#endif
-
-/* Imported IPW definitions */
-
-#define LL_MTU_V1 318
-#define LL_MTU_V2 250
-#define LL_MTU_MAX (LL_MTU_V1 > LL_MTU_V2 ? LL_MTU_V1 : LL_MTU_V2)
-
-#define PRIO_DATA  2
-#define PRIO_CTRL  1
-#define PRIO_SETUP 0
-
-/* Addresses */
-#define ADDR_SETUP_PROT 0
-
-/* Protocol ids */
-enum {
-        /* Identifier for the Com Data protocol */
-        TL_PROTOCOLID_COM_DATA = 0,
-
-        /* Identifier for the Com Control protocol */
-        TL_PROTOCOLID_COM_CTRL = 1,
-
-        /* Identifier for the Setup protocol */
-        TL_PROTOCOLID_SETUP = 2
-};
-
-/* Number of bytes in NL packet header (cannot do
- * sizeof(nl_packet_header) since it's a bitfield) */
-#define NL_FIRST_PACKET_HEADER_SIZE        3
-
-/* Number of bytes in NL packet header (cannot do
- * sizeof(nl_packet_header) since it's a bitfield) */
-#define NL_FOLLOWING_PACKET_HEADER_SIZE    1
-
-struct nl_first_packet_header {
-        unsigned char protocol:3;
-        unsigned char address:3;
-        unsigned char packet_rank:2;
-        unsigned char length_lsb;
-        unsigned char length_msb;
-};
-
-struct nl_packet_header {
-        unsigned char protocol:3;
-        unsigned char address:3;
-        unsigned char packet_rank:2;
-};
-
-/* Value of 'packet_rank' above */
-#define NL_INTERMEDIATE_PACKET    0x0
-#define NL_LAST_PACKET            0x1
-#define NL_FIRST_PACKET           0x2
-
-union nl_packet {
-        /* Network packet header of the first packet (a special case) */
-        struct nl_first_packet_header hdr_first;
-        /* Network packet header of the following packets (if any) */
-        struct nl_packet_header hdr;
-        /* Complete network packet (header + data) */
-        unsigned char rawpkt[LL_MTU_MAX];
-} __attribute__ ((__packed__));
-
-#define HW_VERSION_UNKNOWN -1
-#define HW_VERSION_1 1
-#define HW_VERSION_2 2
-
-/* IPW I/O ports */
-#define IOIER 0x00              /* Interrupt Enable Register */
-#define IOIR  0x02              /* Interrupt Source/ACK register */
-#define IODCR 0x04              /* Data Control Register */
-#define IODRR 0x06              /* Data Read Register */
-#define IODWR 0x08              /* Data Write Register */
-#define IOESR 0x0A              /* Embedded Driver Status Register */
-#define IORXR 0x0C              /* Rx Fifo Register (Host to Embedded) */
-#define IOTXR 0x0E              /* Tx Fifo Register (Embedded to Host) */
-
-/* I/O ports and bit definitions for version 1 of the hardware */
-
-/* IER bits*/
-#define IER_RXENABLED   0x1
-#define IER_TXENABLED   0x2
-
-/* ISR bits */
-#define IR_RXINTR       0x1
-#define IR_TXINTR       0x2
-
-/* DCR bits */
-#define DCR_RXDONE      0x1
-#define DCR_TXDONE      0x2
-#define DCR_RXRESET     0x4
-#define DCR_TXRESET     0x8
-
-/* I/O ports and bit definitions for version 2 of the hardware */
-
-struct MEMCCR {
-        unsigned short reg_config_option;       /* PCCOR: Configuration Option Register */
-        unsigned short reg_config_and_status;   /* PCCSR: Configuration and Status Register */
-        unsigned short reg_pin_replacement;     /* PCPRR: Pin Replacemant Register */
-        unsigned short reg_socket_and_copy;     /* PCSCR: Socket and Copy Register */
-        unsigned short reg_ext_status;          /* PCESR: Extendend Status Register */
-        unsigned short reg_io_base;             /* PCIOB: I/O Base Register */
-};
-
-struct MEMINFREG {
-        unsigned short memreg_tx_old;   /* TX Register (R/W) */
-        unsigned short pad1;
-        unsigned short memreg_rx_done;  /* RXDone Register (R/W) */
-        unsigned short pad2;
-        unsigned short memreg_rx;       /* RX Register (R/W) */
-        unsigned short pad3;
-        unsigned short memreg_pc_interrupt_ack; /* PC intr Ack Register (W) */
-        unsigned short pad4;
-        unsigned long memreg_card_present;/* Mask for Host to check (R) for
-                                           * CARD_PRESENT_VALUE */
-        unsigned short memreg_tx_new;   /* TX2 (new) Register (R/W) */
-};
-
-#define CARD_PRESENT_VALUE (0xBEEFCAFEUL)
-
-#define MEMTX_TX                       0x0001
-#define MEMRX_RX                       0x0001
-#define MEMRX_RX_DONE                  0x0001
-#define MEMRX_PCINTACKK                0x0001
-
-#define NL_NUM_OF_PRIORITIES       3
-#define NL_NUM_OF_PROTOCOLS        3
-#define NL_NUM_OF_ADDRESSES        NO_OF_IPW_CHANNELS
-
-struct ipw_hardware {
-        unsigned int base_port;
-        short hw_version;
-        unsigned short ll_mtu;
-        spinlock_t lock;
-
-        int initializing;
-        int init_loops;
-        struct timer_list setup_timer;
-
-        /* Flag if hw is ready to send next packet */
-        int tx_ready;
-        /* Count of pending packets to be sent */
-        int tx_queued;
-        struct list_head tx_queue[NL_NUM_OF_PRIORITIES];
-
-        int rx_bytes_queued;
-        struct list_head rx_queue;
-        /* Pool of rx_packet structures that are not currently used. */
-        struct list_head rx_pool;
-        int rx_pool_size;
-        /* True if reception of data is blocked while userspace processes it. */
-        int blocking_rx;
-        /* True if there is RX data ready on the hardware. */
-        int rx_ready;
-        unsigned short last_memtx_serial;
-        /*
-         * Newer versions of the V2 card firmware send serial numbers in the
-         * MemTX register. 'serial_number_detected' is set true when we detect
-         * a non-zero serial number (indicating the new firmware).  Thereafter,
-         * the driver can safely ignore the Timer Recovery re-sends to avoid
-         * out-of-sync problems.
-         */
-        int serial_number_detected;
-        struct work_struct work_rx;
-
-        /* True if we are to send the set-up data to the hardware. */
-        int to_setup;
-
-        /* Card has been removed */
-        int removed;
-        /* Saved irq value when we disable the interrupt. */
-        int irq;
-        /* True if this driver is shutting down. */
-        int shutting_down;
-        /* Modem control lines */
-        unsigned int control_lines[NL_NUM_OF_ADDRESSES];
-        struct ipw_rx_packet *packet_assembler[NL_NUM_OF_ADDRESSES];
-
-        struct tasklet_struct tasklet;
-
-        /* The handle for the network layer, for the sending of events to it. */
-        struct ipw_network *network;
-        struct MEMINFREG __iomem *memory_info_regs;
-        struct MEMCCR __iomem *memregs_CCR;
-        void (*reboot_callback) (void *data);
-        void *reboot_callback_data;
-
-        unsigned short __iomem *memreg_tx;
-};
-
-/*
- * Packet info structure for tx packets.
- * Note: not all the fields defined here are required for all protocols
- */
-struct ipw_tx_packet {
-        struct list_head queue;
-        /* channel idx + 1 */
-        unsigned char dest_addr;
-        /* SETUP, CTRL or DATA */
-        unsigned char protocol;
-        /* Length of data block, which starts at the end of this structure */
-        unsigned short length;
-        /* Sending state */
-        /* Offset of where we've sent up to so far */
-        unsigned long offset;
-        /* Count of packet fragments, starting at 0 */
-        int fragment_count;
-
-        /* Called after packet is sent and before is freed */
-        void (*packet_callback) (void *cb_data, unsigned int packet_length);
-        void *callback_data;
-};
-
-/* Signals from DTE */
-#define COMCTRL_RTS     0
-#define COMCTRL_DTR     1
-
-/* Signals from DCE */
-#define COMCTRL_CTS     2
-#define COMCTRL_DCD     3
-#define COMCTRL_DSR     4
-#define COMCTRL_RI      5
-
-struct ipw_control_packet_body {
-        /* DTE signal or DCE signal */
-        unsigned char sig_no;
-        /* 0: set signal, 1: clear signal */
-        unsigned char value;
-} __attribute__ ((__packed__));
-
-struct ipw_control_packet {
-        struct ipw_tx_packet header;
-        struct ipw_control_packet_body body;
-};
-
-struct ipw_rx_packet {
-        struct list_head queue;
-        unsigned int capacity;
-        unsigned int length;
-        unsigned int protocol;
-        unsigned int channel_idx;
-};
-
-static char *data_type(const unsigned char *buf, unsigned length)
-{
-        struct nl_packet_header *hdr = (struct nl_packet_header *) buf;
-
-        if (length == 0)
-                return "     ";
-
-        if (hdr->packet_rank & NL_FIRST_PACKET) {
-                switch (hdr->protocol) {
-                case TL_PROTOCOLID_COM_DATA:    return "DATA ";
-                case TL_PROTOCOLID_COM_CTRL:    return "CTRL ";
-                case TL_PROTOCOLID_SETUP:       return "SETUP";
-                default: return "???? ";
-                }
-        } else
-                return "     ";
-}
-
-#define DUMP_MAX_BYTES 64
-
-static void dump_data_bytes(const char *type, const unsigned char *data,
-                            unsigned length)
-{
-        char prefix[56];
-
-        sprintf(prefix, IPWIRELESS_PCCARD_NAME ": %s %s ",
-                        type, data_type(data, length));
-        print_hex_dump_bytes(prefix, 0, (void *)data,
-                        length < DUMP_MAX_BYTES ? length : DUMP_MAX_BYTES);
-}
-
-static void swap_packet_bitfield_to_le(unsigned char *data)
-{
-#ifdef __BIG_ENDIAN_BITFIELD
-        unsigned char tmp = *data, ret = 0;
-
-        /*
-         * transform bits from aa.bbb.ccc to ccc.bbb.aa
-         */
-        ret |= tmp & 0xc0 >> 6;
-        ret |= tmp & 0x38 >> 1;
-        ret |= tmp & 0x07 << 5;
-        *data = ret & 0xff;
-#endif
-}
-
-static void swap_packet_bitfield_from_le(unsigned char *data)
-{
-#ifdef __BIG_ENDIAN_BITFIELD
-        unsigned char tmp = *data, ret = 0;
-
-        /*
-         * transform bits from ccc.bbb.aa to aa.bbb.ccc
-         */
-        ret |= tmp & 0xe0 >> 5;
-        ret |= tmp & 0x1c << 1;
-        ret |= tmp & 0x03 << 6;
-        *data = ret & 0xff;
-#endif
-}
-
-static void do_send_fragment(struct ipw_hardware *hw, unsigned char *data,
-                            unsigned length)
-{
-        unsigned i;
-        unsigned long flags;
-
-        start_timing();
-        BUG_ON(length > hw->ll_mtu);
-
-        if (ipwireless_debug)
-                dump_data_bytes("send", data, length);
-
-        spin_lock_irqsave(&hw->lock, flags);
-
-        hw->tx_ready = 0;
-        swap_packet_bitfield_to_le(data);
-
-        if (hw->hw_version == HW_VERSION_1) {
-                outw((unsigned short) length, hw->base_port + IODWR);
-
-                for (i = 0; i < length; i += 2) {
-                        unsigned short d = data[i];
-                        __le16 raw_data;
-
-                        if (i + 1 < length)
-                                d |= data[i + 1] << 8;
-                        raw_data = cpu_to_le16(d);
-                        outw(raw_data, hw->base_port + IODWR);
-                }
-
-                outw(DCR_TXDONE, hw->base_port + IODCR);
-        } else if (hw->hw_version == HW_VERSION_2) {
-                outw((unsigned short) length, hw->base_port);
-
-                for (i = 0; i < length; i += 2) {
-                        unsigned short d = data[i];
-                        __le16 raw_data;
-
-                        if (i + 1 < length)
-                                d |= data[i + 1] << 8;
-                        raw_data = cpu_to_le16(d);
-                        outw(raw_data, hw->base_port);
-                }
-                while ((i & 3) != 2) {
-                        outw((unsigned short) 0xDEAD, hw->base_port);
-                        i += 2;
-                }
-                writew(MEMRX_RX, &hw->memory_info_regs->memreg_rx);
-        }
-
-        spin_unlock_irqrestore(&hw->lock, flags);
-
-        end_write_timing(length);
-}
-
-static void do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet)
-{
-        unsigned short fragment_data_len;
-        unsigned short data_left = packet->length - packet->offset;
-        unsigned short header_size;
-        union nl_packet pkt;
-
-        header_size =
-            (packet->fragment_count == 0)
-            ? NL_FIRST_PACKET_HEADER_SIZE
-            : NL_FOLLOWING_PACKET_HEADER_SIZE;
-        fragment_data_len = hw->ll_mtu - header_size;
-        if (data_left < fragment_data_len)
-                fragment_data_len = data_left;
-
-        /*
-         * hdr_first is now in machine bitfield order, which will be swapped
-         * to le just before it goes to hw
-         */
-        pkt.hdr_first.protocol = packet->protocol;
-        pkt.hdr_first.address = packet->dest_addr;
-        pkt.hdr_first.packet_rank = 0;
-
-        /* First packet? */
-        if (packet->fragment_count == 0) {
-                pkt.hdr_first.packet_rank |= NL_FIRST_PACKET;
-                pkt.hdr_first.length_lsb = (unsigned char) packet->length;
-                pkt.hdr_first.length_msb =
-                        (unsigned char) (packet->length >> 8);
-        }
-
-        memcpy(pkt.rawpkt + header_size,
-               ((unsigned char *) packet) + sizeof(struct ipw_tx_packet) +
-               packet->offset, fragment_data_len);
-        packet->offset += fragment_data_len;
-        packet->fragment_count++;
-
-        /* Last packet? (May also be first packet.) */
-        if (packet->offset == packet->length)
-                pkt.hdr_first.packet_rank |= NL_LAST_PACKET;
-        do_send_fragment(hw, pkt.rawpkt, header_size + fragment_data_len);
-
-        /* If this packet has unsent data, then re-queue it. */
-        if (packet->offset < packet->length) {
-                /*
-                 * Re-queue it at the head of the highest priority queue so
-                 * it goes before all other packets
-                 */
-                unsigned long flags;
-
-                spin_lock_irqsave(&hw->lock, flags);
-                list_add(&packet->queue, &hw->tx_queue[0]);
-                hw->tx_queued++;
-                spin_unlock_irqrestore(&hw->lock, flags);
-        } else {
-                if (packet->packet_callback)
-                        packet->packet_callback(packet->callback_data,
-                                        packet->length);
-                kfree(packet);
-        }
-}
-
-static void ipw_setup_hardware(struct ipw_hardware *hw)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&hw->lock, flags);
-        if (hw->hw_version == HW_VERSION_1) {
-                /* Reset RX FIFO */
-                outw(DCR_RXRESET, hw->base_port + IODCR);
-                /* SB: Reset TX FIFO */
-                outw(DCR_TXRESET, hw->base_port + IODCR);
-
-                /* Enable TX and RX interrupts. */
-                outw(IER_TXENABLED | IER_RXENABLED, hw->base_port + IOIER);
-        } else {
-                /*
-                 * Set INTRACK bit (bit 0), which means we must explicitly
-                 * acknowledge interrupts by clearing bit 2 of reg_config_and_status.
-                 */
-                unsigned short csr = readw(&hw->memregs_CCR->reg_config_and_status);
-
-                csr |= 1;
-                writew(csr, &hw->memregs_CCR->reg_config_and_status);
-        }
-        spin_unlock_irqrestore(&hw->lock, flags);
-}
-
-/*
- * If 'packet' is NULL, then this function allocates a new packet, setting its
- * length to 0 and ensuring it has the specified minimum amount of free space.
- *
- * If 'packet' is not NULL, then this function enlarges it if it doesn't
- * have the specified minimum amount of free space.
- *
- */
-static struct ipw_rx_packet *pool_allocate(struct ipw_hardware *hw,
-                                           struct ipw_rx_packet *packet,
-                                           int minimum_free_space)
-{
-
-        if (!packet) {
-                unsigned long flags;
-
-                spin_lock_irqsave(&hw->lock, flags);
-                if (!list_empty(&hw->rx_pool)) {
-                        packet = list_first_entry(&hw->rx_pool,
-                                        struct ipw_rx_packet, queue);
-                        hw->rx_pool_size--;
-                        spin_unlock_irqrestore(&hw->lock, flags);
-                        list_del(&packet->queue);
-                } else {
-                        const int min_capacity =
-                                ipwireless_ppp_mru(hw->network) + 2;
-                        int new_capacity;
-
-                        spin_unlock_irqrestore(&hw->lock, flags);
-                        new_capacity =
-                                (minimum_free_space > min_capacity
-                                 ? minimum_free_space
-                                 : min_capacity);
-                        packet = kmalloc(sizeof(struct ipw_rx_packet)
-                                        + new_capacity, GFP_ATOMIC);
-                        if (!packet)
-                                return NULL;
-                        packet->capacity = new_capacity;
-                }
-                packet->length = 0;
-        }
-
-        if (packet->length + minimum_free_space > packet->capacity) {
-                struct ipw_rx_packet *old_packet = packet;
-
-                packet = kmalloc(sizeof(struct ipw_rx_packet) +
-                                old_packet->length + minimum_free_space,
-                                GFP_ATOMIC);
-                if (!packet) {
-                        kfree(old_packet);
-                        return NULL;
-                }
-                memcpy(packet, old_packet,
-                                sizeof(struct ipw_rx_packet)
-                                        + old_packet->length);
-                packet->capacity = old_packet->length + minimum_free_space;
-                kfree(old_packet);
-        }
-
-        return packet;
-}
-
-static void pool_free(struct ipw_hardware *hw, struct ipw_rx_packet *packet)
-{
-        if (hw->rx_pool_size > 6)
-                kfree(packet);
-        else {
-                hw->rx_pool_size++;
-                list_add(&packet->queue, &hw->rx_pool);
-        }
-}
-
-static void queue_received_packet(struct ipw_hardware *hw,
-                                  unsigned int protocol,
-                                  unsigned int address,
-                                  const unsigned char *data, int length,
-                                  int is_last)
-{
-        unsigned int channel_idx = address - 1;
-        struct ipw_rx_packet *packet = NULL;
-        unsigned long flags;
-
-        /* Discard packet if channel index is out of range. */
-        if (channel_idx >= NL_NUM_OF_ADDRESSES) {
-                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                       ": data packet has bad address %u\n", address);
-                return;
-        }
-
-        /*
-         * ->packet_assembler is safe to touch unlocked, this is the only place
-         */
-        if (protocol == TL_PROTOCOLID_COM_DATA) {
-                struct ipw_rx_packet **assem =
-                        &hw->packet_assembler[channel_idx];
-
-                /*
-                 * Create a new packet, or assembler already contains one
-                 * enlarge it by 'length' bytes.
-                 */
-                (*assem) = pool_allocate(hw, *assem, length);
-                if (!(*assem)) {
-                        printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                                ": no memory for incomming data packet, dropped!\n");
-                        return;
-                }
-                (*assem)->protocol = protocol;
-                (*assem)->channel_idx = channel_idx;
-
-                /* Append this packet data onto existing data. */
-                memcpy((unsigned char *)(*assem) +
-                               sizeof(struct ipw_rx_packet)
-                                + (*assem)->length, data, length);
-                (*assem)->length += length;
-                if (is_last) {
-                        packet = *assem;
-                        *assem = NULL;
-                        /* Count queued DATA bytes only */
-                        spin_lock_irqsave(&hw->lock, flags);
-                        hw->rx_bytes_queued += packet->length;
-                        spin_unlock_irqrestore(&hw->lock, flags);
-                }
-        } else {
-                /* If it's a CTRL packet, don't assemble, just queue it. */
-                packet = pool_allocate(hw, NULL, length);
-                if (!packet) {
-                        printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                                ": no memory for incomming ctrl packet, dropped!\n");
-                        return;
-                }
-                packet->protocol = protocol;
-                packet->channel_idx = channel_idx;
-                memcpy((unsigned char *)packet + sizeof(struct ipw_rx_packet),
-                                data, length);
-                packet->length = length;
-        }
-
-        /*
-         * If this is the last packet, then send the assembled packet on to the
-         * network layer.
-         */
-        if (packet) {
-                spin_lock_irqsave(&hw->lock, flags);
-                list_add_tail(&packet->queue, &hw->rx_queue);
-                /* Block reception of incoming packets if queue is full. */
-                hw->blocking_rx =
-                        (hw->rx_bytes_queued >= IPWIRELESS_RX_QUEUE_SIZE);
-
-                spin_unlock_irqrestore(&hw->lock, flags);
-                schedule_work(&hw->work_rx);
-        }
-}
-
-/*
- * Workqueue callback
- */
-static void ipw_receive_data_work(struct work_struct *work_rx)
-{
-        struct ipw_hardware *hw =
-            container_of(work_rx, struct ipw_hardware, work_rx);
-        unsigned long flags;
-
-        spin_lock_irqsave(&hw->lock, flags);
-        while (!list_empty(&hw->rx_queue)) {
-                struct ipw_rx_packet *packet =
-                        list_first_entry(&hw->rx_queue,
-                                        struct ipw_rx_packet, queue);
-
-                if (hw->shutting_down)
-                        break;
-                list_del(&packet->queue);
-
-                /*
-                 * Note: ipwireless_network_packet_received must be called in a
-                 * process context (i.e. via schedule_work) because the tty
-                 * output code can sleep in the tty_flip_buffer_push call.
-                 */
-                if (packet->protocol == TL_PROTOCOLID_COM_DATA) {
-                        if (hw->network != NULL) {
-                                /* If the network hasn't been disconnected. */
-                                spin_unlock_irqrestore(&hw->lock, flags);
-                                /*
-                                 * This must run unlocked due to tty processing
-                                 * and mutex locking
-                                 */
-                                ipwireless_network_packet_received(
-                                                hw->network,
-                                                packet->channel_idx,
-                                                (unsigned char *)packet
-                                                + sizeof(struct ipw_rx_packet),
-                                                packet->length);
-                                spin_lock_irqsave(&hw->lock, flags);
-                        }
-                        /* Count queued DATA bytes only */
-                        hw->rx_bytes_queued -= packet->length;
-                } else {
-                        /*
-                         * This is safe to be called locked, callchain does
-                         * not block
-                         */
-                        handle_received_CTRL_packet(hw, packet->channel_idx,
-                                        (unsigned char *)packet
-                                        + sizeof(struct ipw_rx_packet),
-                                        packet->length);
-                }
-                pool_free(hw, packet);
-                /*
-                 * Unblock reception of incoming packets if queue is no longer
-                 * full.
-                 */
-                hw->blocking_rx =
-                        hw->rx_bytes_queued >= IPWIRELESS_RX_QUEUE_SIZE;
-                if (hw->shutting_down)
-                        break;
-        }
-        spin_unlock_irqrestore(&hw->lock, flags);
-}
-
-static void handle_received_CTRL_packet(struct ipw_hardware *hw,
-                                        unsigned int channel_idx,
-                                        const unsigned char *data, int len)
-{
-        const struct ipw_control_packet_body *body =
-                (const struct ipw_control_packet_body *) data;
-        unsigned int changed_mask;
-
-        if (len != sizeof(struct ipw_control_packet_body)) {
-                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                       ": control packet was %d bytes - wrong size!\n",
-                       len);
-                return;
-        }
-
-        switch (body->sig_no) {
-        case COMCTRL_CTS:
-                changed_mask = IPW_CONTROL_LINE_CTS;
-                break;
-        case COMCTRL_DCD:
-                changed_mask = IPW_CONTROL_LINE_DCD;
-                break;
-        case COMCTRL_DSR:
-                changed_mask = IPW_CONTROL_LINE_DSR;
-                break;
-        case COMCTRL_RI:
-                changed_mask = IPW_CONTROL_LINE_RI;
-                break;
-        default:
-                changed_mask = 0;
-        }
-
-        if (changed_mask != 0) {
-                if (body->value)
-                        hw->control_lines[channel_idx] |= changed_mask;
-                else
-                        hw->control_lines[channel_idx] &= ~changed_mask;
-                if (hw->network)
-                        ipwireless_network_notify_control_line_change(
-                                        hw->network,
-                                        channel_idx,
-                                        hw->control_lines[channel_idx],
-                                        changed_mask);
-        }
-}
-
-static void handle_received_packet(struct ipw_hardware *hw,
-                                   const union nl_packet *packet,
-                                   unsigned short len)
-{
-        unsigned int protocol = packet->hdr.protocol;
-        unsigned int address = packet->hdr.address;
-        unsigned int header_length;
-        const unsigned char *data;
-        unsigned int data_len;
-        int is_last = packet->hdr.packet_rank & NL_LAST_PACKET;
-
-        if (packet->hdr.packet_rank & NL_FIRST_PACKET)
-                header_length = NL_FIRST_PACKET_HEADER_SIZE;
-        else
-                header_length = NL_FOLLOWING_PACKET_HEADER_SIZE;
-
-        data = packet->rawpkt + header_length;
-        data_len = len - header_length;
-        switch (protocol) {
-        case TL_PROTOCOLID_COM_DATA:
-        case TL_PROTOCOLID_COM_CTRL:
-                queue_received_packet(hw, protocol, address, data, data_len,
-                                is_last);
-                break;
-        case TL_PROTOCOLID_SETUP:
-                handle_received_SETUP_packet(hw, address, data, data_len,
-                                is_last);
-                break;
-        }
-}
-
-static void acknowledge_data_read(struct ipw_hardware *hw)
-{
-        if (hw->hw_version == HW_VERSION_1)
-                outw(DCR_RXDONE, hw->base_port + IODCR);
-        else
-                writew(MEMRX_PCINTACKK,
-                                &hw->memory_info_regs->memreg_pc_interrupt_ack);
-}
-
-/*
- * Retrieve a packet from the IPW hardware.
- */
-static void do_receive_packet(struct ipw_hardware *hw)
-{
-        unsigned len;
-        unsigned i;
-        unsigned char pkt[LL_MTU_MAX];
-
-        start_timing();
-
-        if (hw->hw_version == HW_VERSION_1) {
-                len = inw(hw->base_port + IODRR);
-                if (len > hw->ll_mtu) {
-                        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                               ": received a packet of %u bytes - longer than the MTU!\n", len);
-                        outw(DCR_RXDONE | DCR_RXRESET, hw->base_port + IODCR);
-                        return;
-                }
-
-                for (i = 0; i < len; i += 2) {
-                        __le16 raw_data = inw(hw->base_port + IODRR);
-                        unsigned short data = le16_to_cpu(raw_data);
-
-                        pkt[i] = (unsigned char) data;
-                        pkt[i + 1] = (unsigned char) (data >> 8);
-                }
-        } else {
-                len = inw(hw->base_port);
-                if (len > hw->ll_mtu) {
-                        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                               ": received a packet of %u bytes - longer than the MTU!\n", len);
-                        writew(MEMRX_PCINTACKK,
-                                &hw->memory_info_regs->memreg_pc_interrupt_ack);
-                        return;
-                }
-
-                for (i = 0; i < len; i += 2) {
-                        __le16 raw_data = inw(hw->base_port);
-                        unsigned short data = le16_to_cpu(raw_data);
-
-                        pkt[i] = (unsigned char) data;
-                        pkt[i + 1] = (unsigned char) (data >> 8);
-                }
-
-                while ((i & 3) != 2) {
-                        inw(hw->base_port);
-                        i += 2;
-                }
-        }
-
-        acknowledge_data_read(hw);
-
-        swap_packet_bitfield_from_le(pkt);
-
-        if (ipwireless_debug)
-                dump_data_bytes("recv", pkt, len);
-
-        handle_received_packet(hw, (union nl_packet *) pkt, len);
-
-        end_read_timing(len);
-}
-
-static int get_current_packet_priority(struct ipw_hardware *hw)
-{
-        /*
-         * If we're initializing, don't send anything of higher priority than
-         * PRIO_SETUP.  The network layer therefore need not care about
-         * hardware initialization - any of its stuff will simply be queued
-         * until setup is complete.
-         */
-        return (hw->to_setup || hw->initializing
-                        ? PRIO_SETUP + 1 : NL_NUM_OF_PRIORITIES);
-}
-
-/*
- * return 1 if something has been received from hw
- */
-static int get_packets_from_hw(struct ipw_hardware *hw)
-{
-        int received = 0;
-        unsigned long flags;
-
-        spin_lock_irqsave(&hw->lock, flags);
-        while (hw->rx_ready && !hw->blocking_rx) {
-                received = 1;
-                hw->rx_ready--;
-                spin_unlock_irqrestore(&hw->lock, flags);
-
-                do_receive_packet(hw);
-
-                spin_lock_irqsave(&hw->lock, flags);
-        }
-        spin_unlock_irqrestore(&hw->lock, flags);
-
-        return received;
-}
-
-/*
- * Send pending packet up to given priority, prioritize SETUP data until
- * hardware is fully setup.
- *
- * return 1 if more packets can be sent
- */
-static int send_pending_packet(struct ipw_hardware *hw, int priority_limit)
-{
-        int more_to_send = 0;
-        unsigned long flags;
-
-        spin_lock_irqsave(&hw->lock, flags);
-        if (hw->tx_queued && hw->tx_ready) {
-                int priority;
-                struct ipw_tx_packet *packet = NULL;
-
-                /* Pick a packet */
-                for (priority = 0; priority < priority_limit; priority++) {
-                        if (!list_empty(&hw->tx_queue[priority])) {
-                                packet = list_first_entry(
-                                                &hw->tx_queue[priority],
-                                                struct ipw_tx_packet,
-                                                queue);
-
-                                hw->tx_queued--;
-                                list_del(&packet->queue);
-
-                                break;
-                        }
-                }
-                if (!packet) {
-                        hw->tx_queued = 0;
-                        spin_unlock_irqrestore(&hw->lock, flags);
-                        return 0;
-                }
-
-                spin_unlock_irqrestore(&hw->lock, flags);
-
-                /* Send */
-                do_send_packet(hw, packet);
-
-                /* Check if more to send */
-                spin_lock_irqsave(&hw->lock, flags);
-                for (priority = 0; priority < priority_limit; priority++)
-                        if (!list_empty(&hw->tx_queue[priority])) {
-                                more_to_send = 1;
-                                break;
-                        }
-
-                if (!more_to_send)
-                        hw->tx_queued = 0;
-        }
-        spin_unlock_irqrestore(&hw->lock, flags);
-
-        return more_to_send;
-}
-
-/*
- * Send and receive all queued packets.
- */
-static void ipwireless_do_tasklet(unsigned long hw_)
-{
-        struct ipw_hardware *hw = (struct ipw_hardware *) hw_;
-        unsigned long flags;
-
-        spin_lock_irqsave(&hw->lock, flags);
-        if (hw->shutting_down) {
-                spin_unlock_irqrestore(&hw->lock, flags);
-                return;
-        }
-
-        if (hw->to_setup == 1) {
-                /*
-                 * Initial setup data sent to hardware
-                 */
-                hw->to_setup = 2;
-                spin_unlock_irqrestore(&hw->lock, flags);
-
-                ipw_setup_hardware(hw);
-                ipw_send_setup_packet(hw);
-
-                send_pending_packet(hw, PRIO_SETUP + 1);
-                get_packets_from_hw(hw);
-        } else {
-                int priority_limit = get_current_packet_priority(hw);
-                int again;
-
-                spin_unlock_irqrestore(&hw->lock, flags);
-
-                do {
-                        again = send_pending_packet(hw, priority_limit);
-                        again |= get_packets_from_hw(hw);
-                } while (again);
-        }
-}
-
-/*
- * return true if the card is physically present.
- */
-static int is_card_present(struct ipw_hardware *hw)
-{
-        if (hw->hw_version == HW_VERSION_1)
-                return inw(hw->base_port + IOIR) != 0xFFFF;
-        else
-                return readl(&hw->memory_info_regs->memreg_card_present) ==
-                    CARD_PRESENT_VALUE;
-}
-
-static irqreturn_t ipwireless_handle_v1_interrupt(int irq,
-                                                  struct ipw_hardware *hw)
-{
-        unsigned short irqn;
-
-        irqn = inw(hw->base_port + IOIR);
-
-        /* Check if card is present */
-        if (irqn == 0xFFFF)
-                return IRQ_NONE;
-        else if (irqn != 0) {
-                unsigned short ack = 0;
-                unsigned long flags;
-
-                /* Transmit complete. */
-                if (irqn & IR_TXINTR) {
-                        ack |= IR_TXINTR;
-                        spin_lock_irqsave(&hw->lock, flags);
-                        hw->tx_ready = 1;
-                        spin_unlock_irqrestore(&hw->lock, flags);
-                }
-                /* Received data */
-                if (irqn & IR_RXINTR) {
-                        ack |= IR_RXINTR;
-                        spin_lock_irqsave(&hw->lock, flags);
-                        hw->rx_ready++;
-                        spin_unlock_irqrestore(&hw->lock, flags);
-                }
-                if (ack != 0) {
-                        outw(ack, hw->base_port + IOIR);
-                        tasklet_schedule(&hw->tasklet);
-                }
-                return IRQ_HANDLED;
-        }
-        return IRQ_NONE;
-}
-
-static void acknowledge_pcmcia_interrupt(struct ipw_hardware *hw)
-{
-        unsigned short csr = readw(&hw->memregs_CCR->reg_config_and_status);
-
-        csr &= 0xfffd;
-        writew(csr, &hw->memregs_CCR->reg_config_and_status);
-}
-
-static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq,
-                                                     struct ipw_hardware *hw)
-{
-        int tx = 0;
-        int rx = 0;
-        int rx_repeat = 0;
-        int try_mem_tx_old;
-        unsigned long flags;
-
-        do {
-
-        unsigned short memtx = readw(hw->memreg_tx);
-        unsigned short memtx_serial;
-        unsigned short memrxdone =
-                readw(&hw->memory_info_regs->memreg_rx_done);
-
-        try_mem_tx_old = 0;
-
-        /* check whether the interrupt was generated by ipwireless card */
-        if (!(memtx & MEMTX_TX) && !(memrxdone & MEMRX_RX_DONE)) {
-
-                /* check if the card uses memreg_tx_old register */
-                if (hw->memreg_tx == &hw->memory_info_regs->memreg_tx_new) {
-                        memtx = readw(&hw->memory_info_regs->memreg_tx_old);
-                        if (memtx & MEMTX_TX) {
-                                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                                        ": Using memreg_tx_old\n");
-                                hw->memreg_tx =
-                                        &hw->memory_info_regs->memreg_tx_old;
-                        } else {
-                                return IRQ_NONE;
-                        }
-                } else
-                        return IRQ_NONE;
-        }
-
-        /*
-         * See if the card is physically present. Note that while it is
-         * powering up, it appears not to be present.
-         */
-        if (!is_card_present(hw)) {
-                acknowledge_pcmcia_interrupt(hw);
-                return IRQ_HANDLED;
-        }
-
-        memtx_serial = memtx & (unsigned short) 0xff00;
-        if (memtx & MEMTX_TX) {
-                writew(memtx_serial, hw->memreg_tx);
-
-                if (hw->serial_number_detected) {
-                        if (memtx_serial != hw->last_memtx_serial) {
-                                hw->last_memtx_serial = memtx_serial;
-                                spin_lock_irqsave(&hw->lock, flags);
-                                hw->rx_ready++;
-                                spin_unlock_irqrestore(&hw->lock, flags);
-                                rx = 1;
-                        } else
-                                /* Ignore 'Timer Recovery' duplicates. */
-                                rx_repeat = 1;
-                } else {
-                        /*
-                         * If a non-zero serial number is seen, then enable
-                         * serial number checking.
-                         */
-                        if (memtx_serial != 0) {
-                                hw->serial_number_detected = 1;
-                                printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME
-                                        ": memreg_tx serial num detected\n");
-
-                                spin_lock_irqsave(&hw->lock, flags);
-                                hw->rx_ready++;
-                                spin_unlock_irqrestore(&hw->lock, flags);
-                        }
-                        rx = 1;
-                }
-        }
-        if (memrxdone & MEMRX_RX_DONE) {
-                writew(0, &hw->memory_info_regs->memreg_rx_done);
-                spin_lock_irqsave(&hw->lock, flags);
-                hw->tx_ready = 1;
-                spin_unlock_irqrestore(&hw->lock, flags);
-                tx = 1;
-        }
-        if (tx)
-                writew(MEMRX_PCINTACKK,
-                                &hw->memory_info_regs->memreg_pc_interrupt_ack);
-
-        acknowledge_pcmcia_interrupt(hw);
-
-        if (tx || rx)
-                tasklet_schedule(&hw->tasklet);
-        else if (!rx_repeat) {
-                if (hw->memreg_tx == &hw->memory_info_regs->memreg_tx_new) {
-                        if (hw->serial_number_detected)
-                                printk(KERN_WARNING IPWIRELESS_PCCARD_NAME
-                                        ": spurious interrupt - new_tx mode\n");
-                        else {
-                                printk(KERN_WARNING IPWIRELESS_PCCARD_NAME
-                                        ": no valid memreg_tx value - switching to the old memreg_tx\n");
-                                hw->memreg_tx =
-                                        &hw->memory_info_regs->memreg_tx_old;
-                                try_mem_tx_old = 1;
-                        }
-                } else
-                        printk(KERN_WARNING IPWIRELESS_PCCARD_NAME
-                                        ": spurious interrupt - old_tx mode\n");
-        }
-
-        } while (try_mem_tx_old == 1);
-
-        return IRQ_HANDLED;
-}
-
-irqreturn_t ipwireless_interrupt(int irq, void *dev_id)
-{
-        struct ipw_dev *ipw = dev_id;
-
-        if (ipw->hardware->hw_version == HW_VERSION_1)
-                return ipwireless_handle_v1_interrupt(irq, ipw->hardware);
-        else
-                return ipwireless_handle_v2_v3_interrupt(irq, ipw->hardware);
-}
-
-static void flush_packets_to_hw(struct ipw_hardware *hw)
-{
-        int priority_limit;
-        unsigned long flags;
-
-        spin_lock_irqsave(&hw->lock, flags);
-        priority_limit = get_current_packet_priority(hw);
-        spin_unlock_irqrestore(&hw->lock, flags);
-
-        while (send_pending_packet(hw, priority_limit));
-}
-
-static void send_packet(struct ipw_hardware *hw, int priority,
-                        struct ipw_tx_packet *packet)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&hw->lock, flags);
-        list_add_tail(&packet->queue, &hw->tx_queue[priority]);
-        hw->tx_queued++;
-        spin_unlock_irqrestore(&hw->lock, flags);
-
-        flush_packets_to_hw(hw);
-}
-
-/* Create data packet, non-atomic allocation */
-static void *alloc_data_packet(int data_size,
-                                unsigned char dest_addr,
-                                unsigned char protocol)
-{
-        struct ipw_tx_packet *packet = kzalloc(
-                        sizeof(struct ipw_tx_packet) + data_size,
-                        GFP_ATOMIC);
-
-        if (!packet)
-                return NULL;
-
-        INIT_LIST_HEAD(&packet->queue);
-        packet->dest_addr = dest_addr;
-        packet->protocol = protocol;
-        packet->length = data_size;
-
-        return packet;
-}
-
-static void *alloc_ctrl_packet(int header_size,
-                               unsigned char dest_addr,
-                               unsigned char protocol,
-                               unsigned char sig_no)
-{
-        /*
-         * sig_no is located right after ipw_tx_packet struct in every
-         * CTRL or SETUP packets, we can use ipw_control_packet as a
-         * common struct
-         */
-        struct ipw_control_packet *packet = kzalloc(header_size, GFP_ATOMIC);
-
-        if (!packet)
-                return NULL;
-
-        INIT_LIST_HEAD(&packet->header.queue);
-        packet->header.dest_addr = dest_addr;
-        packet->header.protocol = protocol;
-        packet->header.length = header_size - sizeof(struct ipw_tx_packet);
-        packet->body.sig_no = sig_no;
-
-        return packet;
-}
-
-int ipwireless_send_packet(struct ipw_hardware *hw, unsigned int channel_idx,
-                            const unsigned char *data, unsigned int length,
-                            void (*callback) (void *cb, unsigned int length),
-                            void *callback_data)
-{
-        struct ipw_tx_packet *packet;
-
-        packet = alloc_data_packet(length, (channel_idx + 1),
-                        TL_PROTOCOLID_COM_DATA);
-        if (!packet)
-                return -ENOMEM;
-        packet->packet_callback = callback;
-        packet->callback_data = callback_data;
-        memcpy((unsigned char *) packet + sizeof(struct ipw_tx_packet), data,
-                        length);
-
-        send_packet(hw, PRIO_DATA, packet);
-        return 0;
-}
-
-static int set_control_line(struct ipw_hardware *hw, int prio,
-                           unsigned int channel_idx, int line, int state)
-{
-        struct ipw_control_packet *packet;
-        int protocolid = TL_PROTOCOLID_COM_CTRL;
-
-        if (prio == PRIO_SETUP)
-                protocolid = TL_PROTOCOLID_SETUP;
-
-        packet = alloc_ctrl_packet(sizeof(struct ipw_control_packet),
-                        (channel_idx + 1), protocolid, line);
-        if (!packet)
-                return -ENOMEM;
-        packet->header.length = sizeof(struct ipw_control_packet_body);
-        packet->body.value = (state == 0 ? 0 : 1);
-        send_packet(hw, prio, &packet->header);
-        return 0;
-}
-
-
-static int set_DTR(struct ipw_hardware *hw, int priority,
-                   unsigned int channel_idx, int state)
-{
-        if (state != 0)
-                hw->control_lines[channel_idx] |= IPW_CONTROL_LINE_DTR;
-        else
-                hw->control_lines[channel_idx] &= ~IPW_CONTROL_LINE_DTR;
-
-        return set_control_line(hw, priority, channel_idx, COMCTRL_DTR, state);
-}
-
-static int set_RTS(struct ipw_hardware *hw, int priority,
-                   unsigned int channel_idx, int state)
-{
-        if (state != 0)
-                hw->control_lines[channel_idx] |= IPW_CONTROL_LINE_RTS;
-        else
-                hw->control_lines[channel_idx] &= ~IPW_CONTROL_LINE_RTS;
-
-        return set_control_line(hw, priority, channel_idx, COMCTRL_RTS, state);
-}
-
-int ipwireless_set_DTR(struct ipw_hardware *hw, unsigned int channel_idx,
-                       int state)
-{
-        return set_DTR(hw, PRIO_CTRL, channel_idx, state);
-}
-
-int ipwireless_set_RTS(struct ipw_hardware *hw, unsigned int channel_idx,
-                       int state)
-{
-        return set_RTS(hw, PRIO_CTRL, channel_idx, state);
-}
-
-struct ipw_setup_get_version_query_packet {
-        struct ipw_tx_packet header;
-        struct tl_setup_get_version_qry body;
-};
-
-struct ipw_setup_config_packet {
-        struct ipw_tx_packet header;
-        struct tl_setup_config_msg body;
-};
-
-struct ipw_setup_config_done_packet {
-        struct ipw_tx_packet header;
-        struct tl_setup_config_done_msg body;
-};
-
-struct ipw_setup_open_packet {
-        struct ipw_tx_packet header;
-        struct tl_setup_open_msg body;
-};
-
-struct ipw_setup_info_packet {
-        struct ipw_tx_packet header;
-        struct tl_setup_info_msg body;
-};
-
-struct ipw_setup_reboot_msg_ack {
-        struct ipw_tx_packet header;
-        struct TlSetupRebootMsgAck body;
-};
-
-/* This handles the actual initialization of the card */
-static void __handle_setup_get_version_rsp(struct ipw_hardware *hw)
-{
-        struct ipw_setup_config_packet *config_packet;
-        struct ipw_setup_config_done_packet *config_done_packet;
-        struct ipw_setup_open_packet *open_packet;
-        struct ipw_setup_info_packet *info_packet;
-        int port;
-        unsigned int channel_idx;
-
-        /* generate config packet */
-        for (port = 1; port <= NL_NUM_OF_ADDRESSES; port++) {
-                config_packet = alloc_ctrl_packet(
-                                sizeof(struct ipw_setup_config_packet),
-                                ADDR_SETUP_PROT,
-                                TL_PROTOCOLID_SETUP,
-                                TL_SETUP_SIGNO_CONFIG_MSG);
-                if (!config_packet)
-                        goto exit_nomem;
-                config_packet->header.length = sizeof(struct tl_setup_config_msg);
-                config_packet->body.port_no = port;
-                config_packet->body.prio_data = PRIO_DATA;
-                config_packet->body.prio_ctrl = PRIO_CTRL;
-                send_packet(hw, PRIO_SETUP, &config_packet->header);
-        }
-        config_done_packet = alloc_ctrl_packet(
-                        sizeof(struct ipw_setup_config_done_packet),
-                        ADDR_SETUP_PROT,
-                        TL_PROTOCOLID_SETUP,
-                        TL_SETUP_SIGNO_CONFIG_DONE_MSG);
-        if (!config_done_packet)
-                goto exit_nomem;
-        config_done_packet->header.length = sizeof(struct tl_setup_config_done_msg);
-        send_packet(hw, PRIO_SETUP, &config_done_packet->header);
-
-        /* generate open packet */
-        for (port = 1; port <= NL_NUM_OF_ADDRESSES; port++) {
-                open_packet = alloc_ctrl_packet(
-                                sizeof(struct ipw_setup_open_packet),
-                                ADDR_SETUP_PROT,
-                                TL_PROTOCOLID_SETUP,
-                                TL_SETUP_SIGNO_OPEN_MSG);
-                if (!open_packet)
-                        goto exit_nomem;
-                open_packet->header.length = sizeof(struct tl_setup_open_msg);
-                open_packet->body.port_no = port;
-                send_packet(hw, PRIO_SETUP, &open_packet->header);
-        }
-        for (channel_idx = 0;
-                        channel_idx < NL_NUM_OF_ADDRESSES; channel_idx++) {
-                int ret;
-
-                ret = set_DTR(hw, PRIO_SETUP, channel_idx,
-                        (hw->control_lines[channel_idx] &
-                         IPW_CONTROL_LINE_DTR) != 0);
-                if (ret) {
-                        printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                                        ": error setting DTR (%d)\n", ret);
-                        return;
-                }
-
-                set_RTS(hw, PRIO_SETUP, channel_idx,
-                        (hw->control_lines [channel_idx] &
-                         IPW_CONTROL_LINE_RTS) != 0);
-                if (ret) {
-                        printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                                        ": error setting RTS (%d)\n", ret);
-                        return;
-                }
-        }
-        /*
-         * For NDIS we assume that we are using sync PPP frames, for COM async.
-         * This driver uses NDIS mode too. We don't bother with translation
-         * from async -> sync PPP.
-         */
-        info_packet = alloc_ctrl_packet(sizeof(struct ipw_setup_info_packet),
-                        ADDR_SETUP_PROT,
-                        TL_PROTOCOLID_SETUP,
-                        TL_SETUP_SIGNO_INFO_MSG);
-        if (!info_packet)
-                goto exit_nomem;
-        info_packet->header.length = sizeof(struct tl_setup_info_msg);
-        info_packet->body.driver_type = NDISWAN_DRIVER;
-        info_packet->body.major_version = NDISWAN_DRIVER_MAJOR_VERSION;
-        info_packet->body.minor_version = NDISWAN_DRIVER_MINOR_VERSION;
-        send_packet(hw, PRIO_SETUP, &info_packet->header);
-
-        /* Initialization is now complete, so we clear the 'to_setup' flag */
-        hw->to_setup = 0;
-
-        return;
-
-exit_nomem:
-        printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                        ": not enough memory to alloc control packet\n");
-        hw->to_setup = -1;
-}
-
-static void handle_setup_get_version_rsp(struct ipw_hardware *hw,
-                unsigned char vers_no)
-{
-        del_timer(&hw->setup_timer);
-        hw->initializing = 0;
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": card is ready.\n");
-
-        if (vers_no == TL_SETUP_VERSION)
-                __handle_setup_get_version_rsp(hw);
-        else
-                printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                                ": invalid hardware version no %u\n",
-                                (unsigned int) vers_no);
-}
-
-static void ipw_send_setup_packet(struct ipw_hardware *hw)
-{
-        struct ipw_setup_get_version_query_packet *ver_packet;
-
-        ver_packet = alloc_ctrl_packet(
-                        sizeof(struct ipw_setup_get_version_query_packet),
-                        ADDR_SETUP_PROT, TL_PROTOCOLID_SETUP,
-                        TL_SETUP_SIGNO_GET_VERSION_QRY);
-        ver_packet->header.length = sizeof(struct tl_setup_get_version_qry);
-
-        /*
-         * Response is handled in handle_received_SETUP_packet
-         */
-        send_packet(hw, PRIO_SETUP, &ver_packet->header);
-}
-
-static void handle_received_SETUP_packet(struct ipw_hardware *hw,
-                                         unsigned int address,
-                                         const unsigned char *data, int len,
-                                         int is_last)
-{
-        const union ipw_setup_rx_msg *rx_msg = (const union ipw_setup_rx_msg *) data;
-
-        if (address != ADDR_SETUP_PROT) {
-                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                       ": setup packet has bad address %d\n", address);
-                return;
-        }
-
-        switch (rx_msg->sig_no) {
-        case TL_SETUP_SIGNO_GET_VERSION_RSP:
-                if (hw->to_setup)
-                        handle_setup_get_version_rsp(hw,
-                                        rx_msg->version_rsp_msg.version);
-                break;
-
-        case TL_SETUP_SIGNO_OPEN_MSG:
-                if (ipwireless_debug) {
-                        unsigned int channel_idx = rx_msg->open_msg.port_no - 1;
-
-                        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                               ": OPEN_MSG [channel %u] reply received\n",
-                               channel_idx);
-                }
-                break;
-
-        case TL_SETUP_SIGNO_INFO_MSG_ACK:
-                if (ipwireless_debug)
-                        printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME
-                               ": card successfully configured as NDISWAN\n");
-                break;
-
-        case TL_SETUP_SIGNO_REBOOT_MSG:
-                if (hw->to_setup)
-                        printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME
-                               ": Setup not completed - ignoring reboot msg\n");
-                else {
-                        struct ipw_setup_reboot_msg_ack *packet;
-
-                        printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME
-                               ": Acknowledging REBOOT message\n");
-                        packet = alloc_ctrl_packet(
-                                        sizeof(struct ipw_setup_reboot_msg_ack),
-                                        ADDR_SETUP_PROT, TL_PROTOCOLID_SETUP,
-                                        TL_SETUP_SIGNO_REBOOT_MSG_ACK);
-                        packet->header.length =
-                                sizeof(struct TlSetupRebootMsgAck);
-                        send_packet(hw, PRIO_SETUP, &packet->header);
-                        if (hw->reboot_callback)
-                                hw->reboot_callback(hw->reboot_callback_data);
-                }
-                break;
-
-        default:
-                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                       ": unknown setup message %u received\n",
-                       (unsigned int) rx_msg->sig_no);
-        }
-}
-
-static void do_close_hardware(struct ipw_hardware *hw)
-{
-        unsigned int irqn;
-
-        if (hw->hw_version == HW_VERSION_1) {
-                /* Disable TX and RX interrupts. */
-                outw(0, hw->base_port + IOIER);
-
-                /* Acknowledge any outstanding interrupt requests */
-                irqn = inw(hw->base_port + IOIR);
-                if (irqn & IR_TXINTR)
-                        outw(IR_TXINTR, hw->base_port + IOIR);
-                if (irqn & IR_RXINTR)
-                        outw(IR_RXINTR, hw->base_port + IOIR);
-
-                synchronize_irq(hw->irq);
-        }
-}
-
-struct ipw_hardware *ipwireless_hardware_create(void)
-{
-        int i;
-        struct ipw_hardware *hw =
-                kzalloc(sizeof(struct ipw_hardware), GFP_KERNEL);
-
-        if (!hw)
-                return NULL;
-
-        hw->irq = -1;
-        hw->initializing = 1;
-        hw->tx_ready = 1;
-        hw->rx_bytes_queued = 0;
-        hw->rx_pool_size = 0;
-        hw->last_memtx_serial = (unsigned short) 0xffff;
-        for (i = 0; i < NL_NUM_OF_PRIORITIES; i++)
-                INIT_LIST_HEAD(&hw->tx_queue[i]);
-
-        INIT_LIST_HEAD(&hw->rx_queue);
-        INIT_LIST_HEAD(&hw->rx_pool);
-        spin_lock_init(&hw->lock);
-        tasklet_init(&hw->tasklet, ipwireless_do_tasklet, (unsigned long) hw);
-        INIT_WORK(&hw->work_rx, ipw_receive_data_work);
-        setup_timer(&hw->setup_timer, ipwireless_setup_timer,
-                        (unsigned long) hw);
-
-        return hw;
-}
-
-void ipwireless_init_hardware_v1(struct ipw_hardware *hw,
-                unsigned int base_port,
-                void __iomem *attr_memory,
-                void __iomem *common_memory,
-                int is_v2_card,
-                void (*reboot_callback) (void *data),
-                void *reboot_callback_data)
-{
-        if (hw->removed) {
-                hw->removed = 0;
-                enable_irq(hw->irq);
-        }
-        hw->base_port = base_port;
-        hw->hw_version = (is_v2_card ? HW_VERSION_2 : HW_VERSION_1);
-        hw->ll_mtu = (hw->hw_version == HW_VERSION_1 ? LL_MTU_V1 : LL_MTU_V2);
-        hw->memregs_CCR = (struct MEMCCR __iomem *)
-                        ((unsigned short __iomem *) attr_memory + 0x200);
-        hw->memory_info_regs = (struct MEMINFREG __iomem *) common_memory;
-        hw->memreg_tx = &hw->memory_info_regs->memreg_tx_new;
-        hw->reboot_callback = reboot_callback;
-        hw->reboot_callback_data = reboot_callback_data;
-}
-
-void ipwireless_init_hardware_v2_v3(struct ipw_hardware *hw)
-{
-        hw->initializing = 1;
-        hw->init_loops = 0;
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-               ": waiting for card to start up...\n");
-        ipwireless_setup_timer((unsigned long) hw);
-}
-
-static void ipwireless_setup_timer(unsigned long data)
-{
-        struct ipw_hardware *hw = (struct ipw_hardware *) data;
-
-        hw->init_loops++;
-
-        if (hw->init_loops == TL_SETUP_MAX_VERSION_QRY &&
-                        hw->hw_version == HW_VERSION_2 &&
-                        hw->memreg_tx == &hw->memory_info_regs->memreg_tx_new) {
-                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                                ": failed to startup using TX2, trying TX\n");
-
-                hw->memreg_tx = &hw->memory_info_regs->memreg_tx_old;
-                hw->init_loops = 0;
-        }
-        /* Give up after a certain number of retries */
-        if (hw->init_loops == TL_SETUP_MAX_VERSION_QRY) {
-                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                       ": card failed to start up!\n");
-                hw->initializing = 0;
-        } else {
-                /* Do not attempt to write to the board if it is not present. */
-                if (is_card_present(hw)) {
-                        unsigned long flags;
-
-                        spin_lock_irqsave(&hw->lock, flags);
-                        hw->to_setup = 1;
-                        hw->tx_ready = 1;
-                        spin_unlock_irqrestore(&hw->lock, flags);
-                        tasklet_schedule(&hw->tasklet);
-                }
-
-                mod_timer(&hw->setup_timer,
-                        jiffies + msecs_to_jiffies(TL_SETUP_VERSION_QRY_TMO));
-        }
-}
-
-/*
- * Stop any interrupts from executing so that, once this function returns,
- * other layers of the driver can be sure they won't get any more callbacks.
- * Thus must be called on a proper process context.
- */
-void ipwireless_stop_interrupts(struct ipw_hardware *hw)
-{
-        if (!hw->shutting_down) {
-                /* Tell everyone we are going down. */
-                hw->shutting_down = 1;
-                del_timer(&hw->setup_timer);
-
-                /* Prevent the hardware from sending any more interrupts */
-                do_close_hardware(hw);
-        }
-}
-
-void ipwireless_hardware_free(struct ipw_hardware *hw)
-{
-        int i;
-        struct ipw_rx_packet *rp, *rq;
-        struct ipw_tx_packet *tp, *tq;
-
-        ipwireless_stop_interrupts(hw);
-
-        flush_scheduled_work();
-
-        for (i = 0; i < NL_NUM_OF_ADDRESSES; i++)
-                if (hw->packet_assembler[i] != NULL)
-                        kfree(hw->packet_assembler[i]);
-
-        for (i = 0; i < NL_NUM_OF_PRIORITIES; i++)
-                list_for_each_entry_safe(tp, tq, &hw->tx_queue[i], queue) {
-                        list_del(&tp->queue);
-                        kfree(tp);
-                }
-
-        list_for_each_entry_safe(rp, rq, &hw->rx_queue, queue) {
-                list_del(&rp->queue);
-                kfree(rp);
-        }
-
-        list_for_each_entry_safe(rp, rq, &hw->rx_pool, queue) {
-                list_del(&rp->queue);
-                kfree(rp);
-        }
-        kfree(hw);
-}
-
-/*
- * Associate the specified network with this hardware, so it will receive events
- * from it.
- */
-void ipwireless_associate_network(struct ipw_hardware *hw,
-                                  struct ipw_network *network)
-{
-        hw->network = network;
-}
diff --git a/drivers/char/pcmcia/ipwireless/hardware.h b/drivers/char/pcmcia/ipwireless/hardware.h
deleted file mode 100644
index 90a8590e43b0..000000000000
--- a/drivers/char/pcmcia/ipwireless/hardware.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * IPWireless 3G PCMCIA Network Driver
- *
- * Original code
- *   by Stephen Blackheath <stephen@blacksapphire.com>,
- *      Ben Martel <benm@symmetric.co.nz>
- *
- * Copyrighted as follows:
- *   Copyright (C) 2004 by Symmetric Systems Ltd (NZ)
- *
- * Various driver changes and rewrites, port to new kernels
- *   Copyright (C) 2006-2007 Jiri Kosina
- *
- * Misc code cleanups and updates
- *   Copyright (C) 2007 David Sterba
- */
-
-#ifndef _IPWIRELESS_CS_HARDWARE_H_
-#define _IPWIRELESS_CS_HARDWARE_H_
-
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-
-#define IPW_CONTROL_LINE_CTS 0x0001
-#define IPW_CONTROL_LINE_DCD 0x0002
-#define IPW_CONTROL_LINE_DSR 0x0004
-#define IPW_CONTROL_LINE_RI  0x0008
-#define IPW_CONTROL_LINE_DTR 0x0010
-#define IPW_CONTROL_LINE_RTS 0x0020
-
-struct ipw_hardware;
-struct ipw_network;
-
-struct ipw_hardware *ipwireless_hardware_create(void);
-void ipwireless_hardware_free(struct ipw_hardware *hw);
-irqreturn_t ipwireless_interrupt(int irq, void *dev_id);
-int ipwireless_set_DTR(struct ipw_hardware *hw, unsigned int channel_idx,
-                int state);
-int ipwireless_set_RTS(struct ipw_hardware *hw, unsigned int channel_idx,
-                int state);
-int ipwireless_send_packet(struct ipw_hardware *hw,
-                            unsigned int channel_idx,
-                            const unsigned char *data,
-                            unsigned int length,
-                            void (*packet_sent_callback) (void *cb,
-                                                          unsigned int length),
-                            void *sent_cb_data);
-void ipwireless_associate_network(struct ipw_hardware *hw,
-                struct ipw_network *net);
-void ipwireless_stop_interrupts(struct ipw_hardware *hw);
-void ipwireless_init_hardware_v1(struct ipw_hardware *hw,
-                                 unsigned int base_port,
-                                 void __iomem *attr_memory,
-                                 void __iomem *common_memory,
-                                 int is_v2_card,
-                                 void (*reboot_cb) (void *data),
-                                 void *reboot_cb_data);
-void ipwireless_init_hardware_v2_v3(struct ipw_hardware *hw);
-void ipwireless_sleep(unsigned int tenths);
-
-#endif
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
deleted file mode 100644
index 67bdb05798b1..000000000000
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * IPWireless 3G PCMCIA Network Driver
- *
- * Original code
- *   by Stephen Blackheath <stephen@blacksapphire.com>,
- *      Ben Martel <benm@symmetric.co.nz>
- *
- * Copyrighted as follows:
- *   Copyright (C) 2004 by Symmetric Systems Ltd (NZ)
- *
- * Various driver changes and rewrites, port to new kernels
- *   Copyright (C) 2006-2007 Jiri Kosina
- *
- * Misc code cleanups and updates
- *   Copyright (C) 2007 David Sterba
- */
-
-#include "hardware.h"
-#include "network.h"
-#include "main.h"
-#include "tty.h"
-
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-
-#include <pcmcia/cisreg.h>
-#include <pcmcia/device_id.h>
-#include <pcmcia/ss.h>
-#include <pcmcia/ds.h>
-#include <pcmcia/cs.h>
-
-static struct pcmcia_device_id ipw_ids[] = {
-        PCMCIA_DEVICE_MANF_CARD(0x02f2, 0x0100),
-        PCMCIA_DEVICE_MANF_CARD(0x02f2, 0x0200),
-        PCMCIA_DEVICE_NULL
-};
-MODULE_DEVICE_TABLE(pcmcia, ipw_ids);
-
-static void ipwireless_detach(struct pcmcia_device *link);
-
-/*
- * Module params
- */
-/* Debug mode: more verbose, print sent/recv bytes */
-int ipwireless_debug;
-int ipwireless_loopback;
-int ipwireless_out_queue = 10;
-
-module_param_named(debug, ipwireless_debug, int, 0);
-module_param_named(loopback, ipwireless_loopback, int, 0);
-module_param_named(out_queue, ipwireless_out_queue, int, 0);
-MODULE_PARM_DESC(debug, "switch on debug messages [0]");
-MODULE_PARM_DESC(loopback,
-                "debug: enable ras_raw channel [0]");
-MODULE_PARM_DESC(out_queue, "debug: set size of outgoing PPP queue [10]");
-
-/* Executes in process context. */
-static void signalled_reboot_work(struct work_struct *work_reboot)
-{
-        struct ipw_dev *ipw = container_of(work_reboot, struct ipw_dev,
-                        work_reboot);
-        struct pcmcia_device *link = ipw->link;
-        pcmcia_reset_card(link->socket);
-}
-
-static void signalled_reboot_callback(void *callback_data)
-{
-        struct ipw_dev *ipw = (struct ipw_dev *) callback_data;
-
-        /* Delegate to process context. */
-        schedule_work(&ipw->work_reboot);
-}
-
-static int ipwireless_probe(struct pcmcia_device *p_dev,
-                            cistpl_cftable_entry_t *cfg,
-                            cistpl_cftable_entry_t *dflt,
-                            unsigned int vcc,
-                            void *priv_data)
-{
-        struct ipw_dev *ipw = priv_data;
-        struct resource *io_resource;
-        int ret;
-
-        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-        p_dev->resource[0]->start = cfg->io.win[0].base;
-        p_dev->resource[0]->end = cfg->io.win[0].len;
-
-        /* 0x40 causes it to generate level mode interrupts. */
-        /* 0x04 enables IREQ pin. */
-        p_dev->conf.ConfigIndex = cfg->index | 0x44;
-        p_dev->io_lines = 16;
-        ret = pcmcia_request_io(p_dev);
-        if (ret)
-                return ret;
-
-        io_resource = request_region(p_dev->resource[0]->start,
-                                resource_size(p_dev->resource[0]),
-                                IPWIRELESS_PCCARD_NAME);
-
-        if (cfg->mem.nwin == 0)
-                return 0;
-
-        ipw->request_common_memory.Attributes =
-                WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM | WIN_ENABLE;
-        ipw->request_common_memory.Base = cfg->mem.win[0].host_addr;
-        ipw->request_common_memory.Size = cfg->mem.win[0].len;
-        if (ipw->request_common_memory.Size < 0x1000)
-                ipw->request_common_memory.Size = 0x1000;
-        ipw->request_common_memory.AccessSpeed = 0;
-
-        ret = pcmcia_request_window(p_dev, &ipw->request_common_memory,
-                                &ipw->handle_common_memory);
-
-        if (ret != 0)
-                goto exit1;
-
-        ret = pcmcia_map_mem_page(p_dev, ipw->handle_common_memory,
-                                cfg->mem.win[0].card_addr);
-
-        if (ret != 0)
-                goto exit2;
-
-        ipw->is_v2_card = cfg->mem.win[0].len == 0x100;
-
-        ipw->common_memory = ioremap(ipw->request_common_memory.Base,
-                                ipw->request_common_memory.Size);
-        request_mem_region(ipw->request_common_memory.Base,
-                        ipw->request_common_memory.Size,
-                        IPWIRELESS_PCCARD_NAME);
-
-        ipw->request_attr_memory.Attributes =
-                WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM | WIN_ENABLE;
-        ipw->request_attr_memory.Base = 0;
-        ipw->request_attr_memory.Size = 0;      /* this used to be 0x1000 */
-        ipw->request_attr_memory.AccessSpeed = 0;
-
-        ret = pcmcia_request_window(p_dev, &ipw->request_attr_memory,
-                                &ipw->handle_attr_memory);
-
-        if (ret != 0)
-                goto exit2;
-
-        ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory, 0);
-        if (ret != 0)
-                goto exit3;
-
-        ipw->attr_memory = ioremap(ipw->request_attr_memory.Base,
-                                ipw->request_attr_memory.Size);
-        request_mem_region(ipw->request_attr_memory.Base,
-                        ipw->request_attr_memory.Size, IPWIRELESS_PCCARD_NAME);
-
-        return 0;
-
-exit3:
-exit2:
-        if (ipw->common_memory) {
-                release_mem_region(ipw->request_common_memory.Base,
-                                ipw->request_common_memory.Size);
-                iounmap(ipw->common_memory);
-        }
-exit1:
-        release_resource(io_resource);
-        pcmcia_disable_device(p_dev);
-        return -1;
-}
-
-static int config_ipwireless(struct ipw_dev *ipw)
-{
-        struct pcmcia_device *link = ipw->link;
-        int ret = 0;
-
-        ipw->is_v2_card = 0;
-
-        ret = pcmcia_loop_config(link, ipwireless_probe, ipw);
-        if (ret != 0)
-                return ret;
-
-        link->conf.Attributes = CONF_ENABLE_IRQ;
-        link->conf.IntType = INT_MEMORY_AND_IO;
-
-        INIT_WORK(&ipw->work_reboot, signalled_reboot_work);
-
-        ipwireless_init_hardware_v1(ipw->hardware, link->resource[0]->start,
-                                    ipw->attr_memory, ipw->common_memory,
-                                    ipw->is_v2_card, signalled_reboot_callback,
-                                    ipw);
-
-        ret = pcmcia_request_irq(link, ipwireless_interrupt);
-        if (ret != 0)
-                goto exit;
-
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n",
-                        ipw->is_v2_card ? "V2/V3" : "V1");
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                ": I/O ports %pR, irq %d\n", link->resource[0],
-                        (unsigned int) link->irq);
-        if (ipw->attr_memory && ipw->common_memory)
-                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                        ": attr memory 0x%08lx-0x%08lx, common memory 0x%08lx-0x%08lx\n",
-                        ipw->request_attr_memory.Base,
-                        ipw->request_attr_memory.Base
-                        + ipw->request_attr_memory.Size - 1,
-                        ipw->request_common_memory.Base,
-                        ipw->request_common_memory.Base
-                        + ipw->request_common_memory.Size - 1);
-
-        ipw->network = ipwireless_network_create(ipw->hardware);
-        if (!ipw->network)
-                goto exit;
-
-        ipw->tty = ipwireless_tty_create(ipw->hardware, ipw->network);
-        if (!ipw->tty)
-                goto exit;
-
-        ipwireless_init_hardware_v2_v3(ipw->hardware);
-
-        /*
-         * Do the RequestConfiguration last, because it enables interrupts.
-         * Then we don't get any interrupts before we're ready for them.
-         */
-        ret = pcmcia_request_configuration(link, &link->conf);
-
-        if (ret != 0)
-                goto exit;
-
-        return 0;
-
-exit:
-        if (ipw->attr_memory) {
-                release_mem_region(ipw->request_attr_memory.Base,
-                                ipw->request_attr_memory.Size);
-                iounmap(ipw->attr_memory);
-
-        }
-        if (ipw->common_memory) {
-                release_mem_region(ipw->request_common_memory.Base,
-                                ipw->request_common_memory.Size);
-                iounmap(ipw->common_memory);
-        }
-        pcmcia_disable_device(link);
-        return -1;
-}
-
-static void release_ipwireless(struct ipw_dev *ipw)
-{
-        if (ipw->common_memory) {
-                release_mem_region(ipw->request_common_memory.Base,
-                                ipw->request_common_memory.Size);
-                iounmap(ipw->common_memory);
-        }
-        if (ipw->attr_memory) {
-                release_mem_region(ipw->request_attr_memory.Base,
-                                ipw->request_attr_memory.Size);
-                iounmap(ipw->attr_memory);
-        }
-        pcmcia_disable_device(ipw->link);
-}
-
-/*
- * ipwireless_attach() creates an "instance" of the driver, allocating
- * local data structures for one device (one interface).  The device
- * is registered with Card Services.
- *
- * The pcmcia_device structure is initialized, but we don't actually
- * configure the card at this point -- we wait until we receive a
- * card insertion event.
- */
-static int ipwireless_attach(struct pcmcia_device *link)
-{
-        struct ipw_dev *ipw;
-        int ret;
-
-        ipw = kzalloc(sizeof(struct ipw_dev), GFP_KERNEL);
-        if (!ipw)
-                return -ENOMEM;
-
-        ipw->link = link;
-        link->priv = ipw;
-
-        ipw->hardware = ipwireless_hardware_create();
-        if (!ipw->hardware) {
-                kfree(ipw);
-                return -ENOMEM;
-        }
-        /* RegisterClient will call config_ipwireless */
-
-        ret = config_ipwireless(ipw);
-
-        if (ret != 0) {
-                ipwireless_detach(link);
-                return ret;
-        }
-
-        return 0;
-}
-
-/*
- * This deletes a driver "instance".  The device is de-registered with
- * Card Services.  If it has been released, all local data structures
- * are freed.  Otherwise, the structures will be freed when the device
- * is released.
- */
-static void ipwireless_detach(struct pcmcia_device *link)
-{
-        struct ipw_dev *ipw = link->priv;
-
-        release_ipwireless(ipw);
-
-        if (ipw->tty != NULL)
-                ipwireless_tty_free(ipw->tty);
-        if (ipw->network != NULL)
-                ipwireless_network_free(ipw->network);
-        if (ipw->hardware != NULL)
-                ipwireless_hardware_free(ipw->hardware);
-        kfree(ipw);
-}
-
-static struct pcmcia_driver me = {
-        .owner          = THIS_MODULE,
-        .probe          = ipwireless_attach,
-        .remove         = ipwireless_detach,
-        .drv = { .name  = IPWIRELESS_PCCARD_NAME },
-        .id_table       = ipw_ids
-};
-
-/*
- * Module insertion : initialisation of the module.
- * Register the card with cardmgr...
- */
-static int __init init_ipwireless(void)
-{
-        int ret;
-
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME " "
-               IPWIRELESS_PCMCIA_VERSION " by " IPWIRELESS_PCMCIA_AUTHOR "\n");
-
-        ret = ipwireless_tty_init();
-        if (ret != 0)
-                return ret;
-
-        ret = pcmcia_register_driver(&me);
-        if (ret != 0)
-                ipwireless_tty_release();
-
-        return ret;
-}
-
-/*
- * Module removal
- */
-static void __exit exit_ipwireless(void)
-{
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME " "
-                        IPWIRELESS_PCMCIA_VERSION " removed\n");
-
-        pcmcia_unregister_driver(&me);
-        ipwireless_tty_release();
-}
-
-module_init(init_ipwireless);
-module_exit(exit_ipwireless);
-
-MODULE_AUTHOR(IPWIRELESS_PCMCIA_AUTHOR);
-MODULE_DESCRIPTION(IPWIRELESS_PCCARD_NAME " " IPWIRELESS_PCMCIA_VERSION);
-MODULE_LICENSE("GPL");
diff --git a/drivers/char/pcmcia/ipwireless/main.h b/drivers/char/pcmcia/ipwireless/main.h
deleted file mode 100644
index c207be87b597..000000000000
--- a/drivers/char/pcmcia/ipwireless/main.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * IPWireless 3G PCMCIA Network Driver
- *
- * Original code
- *   by Stephen Blackheath <stephen@blacksapphire.com>,
- *      Ben Martel <benm@symmetric.co.nz>
- *
- * Copyrighted as follows:
- *   Copyright (C) 2004 by Symmetric Systems Ltd (NZ)
- *
- * Various driver changes and rewrites, port to new kernels
- *   Copyright (C) 2006-2007 Jiri Kosina
- *
- * Misc code cleanups and updates
- *   Copyright (C) 2007 David Sterba
- */
-
-#ifndef _IPWIRELESS_CS_H_
-#define _IPWIRELESS_CS_H_
-
-#include <linux/sched.h>
-#include <linux/types.h>
-
-#include <pcmcia/cs.h>
-#include <pcmcia/cistpl.h>
-#include <pcmcia/ds.h>
-
-#include "hardware.h"
-
-#define IPWIRELESS_PCCARD_NAME          "ipwireless"
-#define IPWIRELESS_PCMCIA_VERSION       "1.1"
-#define IPWIRELESS_PCMCIA_AUTHOR        \
-        "Stephen Blackheath, Ben Martel, Jiri Kosina and David Sterba"
-
-#define IPWIRELESS_TX_QUEUE_SIZE  262144
-#define IPWIRELESS_RX_QUEUE_SIZE  262144
-
-#define IPWIRELESS_STATE_DEBUG
-
-struct ipw_hardware;
-struct ipw_network;
-struct ipw_tty;
-
-struct ipw_dev {
-        struct pcmcia_device *link;
-        int is_v2_card;
-
-        window_handle_t handle_attr_memory;
-        void __iomem *attr_memory;
-        win_req_t request_attr_memory;
-
-        window_handle_t handle_common_memory;
-        void __iomem *common_memory;
-        win_req_t request_common_memory;
-
-        /* Reference to attribute memory, containing CIS data */
-        void *attribute_memory;
-
-        /* Hardware context */
-        struct ipw_hardware *hardware;
-        /* Network layer context */
-        struct ipw_network *network;
-        /* TTY device context */
-        struct ipw_tty *tty;
-        struct work_struct work_reboot;
-};
-
-/* Module parametres */
-extern int ipwireless_debug;
-extern int ipwireless_loopback;
-extern int ipwireless_out_queue;
-
-#endif
diff --git a/drivers/char/pcmcia/ipwireless/network.c b/drivers/char/pcmcia/ipwireless/network.c
deleted file mode 100644
index 9fe538347932..000000000000
--- a/drivers/char/pcmcia/ipwireless/network.c
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- * IPWireless 3G PCMCIA Network Driver
- *
- * Original code
- *   by Stephen Blackheath <stephen@blacksapphire.com>,
- *      Ben Martel <benm@symmetric.co.nz>
- *
- * Copyrighted as follows:
- *   Copyright (C) 2004 by Symmetric Systems Ltd (NZ)
- *
- * Various driver changes and rewrites, port to new kernels
- *   Copyright (C) 2006-2007 Jiri Kosina
- *
- * Misc code cleanups and updates
- *   Copyright (C) 2007 David Sterba
- */
-
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/mutex.h>
-#include <linux/netdevice.h>
-#include <linux/ppp_channel.h>
-#include <linux/ppp_defs.h>
-#include <linux/slab.h>
-#include <linux/if_ppp.h>
-#include <linux/skbuff.h>
-
-#include "network.h"
-#include "hardware.h"
-#include "main.h"
-#include "tty.h"
-
-#define MAX_ASSOCIATED_TTYS 2
-
-#define SC_RCV_BITS     (SC_RCV_B7_1|SC_RCV_B7_0|SC_RCV_ODDP|SC_RCV_EVNP)
-
-struct ipw_network {
-        /* Hardware context, used for calls to hardware layer. */
-        struct ipw_hardware *hardware;
-        /* Context for kernel 'generic_ppp' functionality */
-        struct ppp_channel *ppp_channel;
-        /* tty context connected with IPW console */
-        struct ipw_tty *associated_ttys[NO_OF_IPW_CHANNELS][MAX_ASSOCIATED_TTYS];
-        /* True if ppp needs waking up once we're ready to xmit */
-        int ppp_blocked;
-        /* Number of packets queued up in hardware module. */
-        int outgoing_packets_queued;
-        /* Spinlock to avoid interrupts during shutdown */
-        spinlock_t lock;
-        struct mutex close_lock;
-
-        /* PPP ioctl data, not actually used anywere */
-        unsigned int flags;
-        unsigned int rbits;
-        u32 xaccm[8];
-        u32 raccm;
-        int mru;
-
-        int shutting_down;
-        unsigned int ras_control_lines;
-
-        struct work_struct work_go_online;
-        struct work_struct work_go_offline;
-};
-
-static void notify_packet_sent(void *callback_data, unsigned int packet_length)
-{
-        struct ipw_network *network = callback_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&network->lock, flags);
-        network->outgoing_packets_queued--;
-        if (network->ppp_channel != NULL) {
-                if (network->ppp_blocked) {
-                        network->ppp_blocked = 0;
-                        spin_unlock_irqrestore(&network->lock, flags);
-                        ppp_output_wakeup(network->ppp_channel);
-                        if (ipwireless_debug)
-                                printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME
-                                       ": ppp unblocked\n");
-                } else
-                        spin_unlock_irqrestore(&network->lock, flags);
-        } else
-                spin_unlock_irqrestore(&network->lock, flags);
-}
-
-/*
- * Called by the ppp system when it has a packet to send to the hardware.
- */
-static int ipwireless_ppp_start_xmit(struct ppp_channel *ppp_channel,
-                                     struct sk_buff *skb)
-{
-        struct ipw_network *network = ppp_channel->private;
-        unsigned long flags;
-
-        spin_lock_irqsave(&network->lock, flags);
-        if (network->outgoing_packets_queued < ipwireless_out_queue) {
-                unsigned char *buf;
-                static unsigned char header[] = {
-                        PPP_ALLSTATIONS, /* 0xff */
-                        PPP_UI,          /* 0x03 */
-                };
-                int ret;
-
-                network->outgoing_packets_queued++;
-                spin_unlock_irqrestore(&network->lock, flags);
-
-                /*
-                 * If we have the requested amount of headroom in the skb we
-                 * were handed, then we can add the header efficiently.
-                 */
-                if (skb_headroom(skb) >= 2) {
-                        memcpy(skb_push(skb, 2), header, 2);
-                        ret = ipwireless_send_packet(network->hardware,
-                                               IPW_CHANNEL_RAS, skb->data,
-                                               skb->len,
-                                               notify_packet_sent,
-                                               network);
-                        if (ret == -1) {
-                                skb_pull(skb, 2);
-                                return 0;
-                        }
-                } else {
-                        /* Otherwise (rarely) we do it inefficiently. */
-                        buf = kmalloc(skb->len + 2, GFP_ATOMIC);
-                        if (!buf)
-                                return 0;
-                        memcpy(buf + 2, skb->data, skb->len);
-                        memcpy(buf, header, 2);
-                        ret = ipwireless_send_packet(network->hardware,
-                                               IPW_CHANNEL_RAS, buf,
-                                               skb->len + 2,
-                                               notify_packet_sent,
-                                               network);
-                        kfree(buf);
-                        if (ret == -1)
-                                return 0;
-                }
-                kfree_skb(skb);
-                return 1;
-        } else {
-                /*
-                 * Otherwise reject the packet, and flag that the ppp system
-                 * needs to be unblocked once we are ready to send.
-                 */
-                network->ppp_blocked = 1;
-                spin_unlock_irqrestore(&network->lock, flags);
-                if (ipwireless_debug)
-                        printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME ": ppp blocked\n");
-                return 0;
-        }
-}
-
-/* Handle an ioctl call that has come in via ppp. (copy of ppp_async_ioctl() */
-static int ipwireless_ppp_ioctl(struct ppp_channel *ppp_channel,
-                                unsigned int cmd, unsigned long arg)
-{
-        struct ipw_network *network = ppp_channel->private;
-        int err, val;
-        u32 accm[8];
-        int __user *user_arg = (int __user *) arg;
-
-        err = -EFAULT;
-        switch (cmd) {
-        case PPPIOCGFLAGS:
-                val = network->flags | network->rbits;
-                if (put_user(val, user_arg))
-                        break;
-                err = 0;
-                break;
-
-        case PPPIOCSFLAGS:
-                if (get_user(val, user_arg))
-                        break;
-                network->flags = val & ~SC_RCV_BITS;
-                network->rbits = val & SC_RCV_BITS;
-                err = 0;
-                break;
-
-        case PPPIOCGASYNCMAP:
-                if (put_user(network->xaccm[0], user_arg))
-                        break;
-                err = 0;
-                break;
-
-        case PPPIOCSASYNCMAP:
-                if (get_user(network->xaccm[0], user_arg))
-                        break;
-                err = 0;
-                break;
-
-        case PPPIOCGRASYNCMAP:
-                if (put_user(network->raccm, user_arg))
-                        break;
-                err = 0;
-                break;
-
-        case PPPIOCSRASYNCMAP:
-                if (get_user(network->raccm, user_arg))
-                        break;
-                err = 0;
-                break;
-
-        case PPPIOCGXASYNCMAP:
-                if (copy_to_user((void __user *) arg, network->xaccm,
-                                        sizeof(network->xaccm)))
-                        break;
-                err = 0;
-                break;
-
-        case PPPIOCSXASYNCMAP:
-                if (copy_from_user(accm, (void __user *) arg, sizeof(accm)))
-                        break;
-                accm[2] &= ~0x40000000U;        /* can't escape 0x5e */
-                accm[3] |= 0x60000000U; /* must escape 0x7d, 0x7e */
-                memcpy(network->xaccm, accm, sizeof(network->xaccm));
-                err = 0;
-                break;
-
-        case PPPIOCGMRU:
-                if (put_user(network->mru, user_arg))
-                        break;
-                err = 0;
-                break;
-
-        case PPPIOCSMRU:
-                if (get_user(val, user_arg))
-                        break;
-                if (val < PPP_MRU)
-                        val = PPP_MRU;
-                network->mru = val;
-                err = 0;
-                break;
-
-        default:
-                err = -ENOTTY;
-        }
-
-        return err;
-}
-
-static const struct ppp_channel_ops ipwireless_ppp_channel_ops = {
-        .start_xmit = ipwireless_ppp_start_xmit,
-        .ioctl      = ipwireless_ppp_ioctl
-};
-
-static void do_go_online(struct work_struct *work_go_online)
-{
-        struct ipw_network *network =
-                container_of(work_go_online, struct ipw_network,
-                                work_go_online);
-        unsigned long flags;
-
-        spin_lock_irqsave(&network->lock, flags);
-        if (!network->ppp_channel) {
-                struct ppp_channel *channel;
-
-                spin_unlock_irqrestore(&network->lock, flags);
-                channel = kzalloc(sizeof(struct ppp_channel), GFP_KERNEL);
-                if (!channel) {
-                        printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                                        ": unable to allocate PPP channel\n");
-                        return;
-                }
-                channel->private = network;
-                channel->mtu = 16384;   /* Wild guess */
-                channel->hdrlen = 2;
-                channel->ops = &ipwireless_ppp_channel_ops;
-
-                network->flags = 0;
-                network->rbits = 0;
-                network->mru = PPP_MRU;
-                memset(network->xaccm, 0, sizeof(network->xaccm));
-                network->xaccm[0] = ~0U;
-                network->xaccm[3] = 0x60000000U;
-                network->raccm = ~0U;
-                ppp_register_channel(channel);
-                spin_lock_irqsave(&network->lock, flags);
-                network->ppp_channel = channel;
-        }
-        spin_unlock_irqrestore(&network->lock, flags);
-}
-
-static void do_go_offline(struct work_struct *work_go_offline)
-{
-        struct ipw_network *network =
-                container_of(work_go_offline, struct ipw_network,
-                                work_go_offline);
-        unsigned long flags;
-
-        mutex_lock(&network->close_lock);
-        spin_lock_irqsave(&network->lock, flags);
-        if (network->ppp_channel != NULL) {
-                struct ppp_channel *channel = network->ppp_channel;
-
-                network->ppp_channel = NULL;
-                spin_unlock_irqrestore(&network->lock, flags);
-                mutex_unlock(&network->close_lock);
-                ppp_unregister_channel(channel);
-        } else {
-                spin_unlock_irqrestore(&network->lock, flags);
-                mutex_unlock(&network->close_lock);
-        }
-}
-
-void ipwireless_network_notify_control_line_change(struct ipw_network *network,
-                                                   unsigned int channel_idx,
-                                                   unsigned int control_lines,
-                                                   unsigned int changed_mask)
-{
-        int i;
-
-        if (channel_idx == IPW_CHANNEL_RAS)
-                network->ras_control_lines = control_lines;
-
-        for (i = 0; i < MAX_ASSOCIATED_TTYS; i++) {
-                struct ipw_tty *tty =
-                        network->associated_ttys[channel_idx][i];
-
-                /*
-                 * If it's associated with a tty (other than the RAS channel
-                 * when we're online), then send the data to that tty.  The RAS
-                 * channel's data is handled above - it always goes through
-                 * ppp_generic.
-                 */
-                if (tty)
-                        ipwireless_tty_notify_control_line_change(tty,
-                                                                  channel_idx,
-                                                                  control_lines,
-                                                                  changed_mask);
-        }
-}
-
-/*
- * Some versions of firmware stuff packets with 0xff 0x03 (PPP: ALLSTATIONS, UI)
- * bytes, which are required on sent packet, but not always present on received
- * packets
- */
-static struct sk_buff *ipw_packet_received_skb(unsigned char *data,
-                                               unsigned int length)
-{
-        struct sk_buff *skb;
-
-        if (length > 2 && data[0] == PPP_ALLSTATIONS && data[1] == PPP_UI) {
-                length -= 2;
-                data += 2;
-        }
-
-        skb = dev_alloc_skb(length + 4);
-        skb_reserve(skb, 2);
-        memcpy(skb_put(skb, length), data, length);
-
-        return skb;
-}
-
-void ipwireless_network_packet_received(struct ipw_network *network,
-                                        unsigned int channel_idx,
-                                        unsigned char *data,
-                                        unsigned int length)
-{
-        int i;
-        unsigned long flags;
-
-        for (i = 0; i < MAX_ASSOCIATED_TTYS; i++) {
-                struct ipw_tty *tty = network->associated_ttys[channel_idx][i];
-
-                if (!tty)
-                        continue;
-
-                /*
-                 * If it's associated with a tty (other than the RAS channel
-                 * when we're online), then send the data to that tty.  The RAS
-                 * channel's data is handled above - it always goes through
-                 * ppp_generic.
-                 */
-                if (channel_idx == IPW_CHANNEL_RAS
-                                && (network->ras_control_lines &
-                                        IPW_CONTROL_LINE_DCD) != 0
-                                && ipwireless_tty_is_modem(tty)) {
-                        /*
-                         * If data came in on the RAS channel and this tty is
-                         * the modem tty, and we are online, then we send it to
-                         * the PPP layer.
-                         */
-                        mutex_lock(&network->close_lock);
-                        spin_lock_irqsave(&network->lock, flags);
-                        if (network->ppp_channel != NULL) {
-                                struct sk_buff *skb;
-
-                                spin_unlock_irqrestore(&network->lock,
-                                                flags);
-
-                                /* Send the data to the ppp_generic module. */
-                                skb = ipw_packet_received_skb(data, length);
-                                ppp_input(network->ppp_channel, skb);
-                        } else
-                                spin_unlock_irqrestore(&network->lock,
-                                                flags);
-                        mutex_unlock(&network->close_lock);
-                }
-                /* Otherwise we send it out the tty. */
-                else
-                        ipwireless_tty_received(tty, data, length);
-        }
-}
-
-struct ipw_network *ipwireless_network_create(struct ipw_hardware *hw)
-{
-        struct ipw_network *network =
-                kzalloc(sizeof(struct ipw_network), GFP_ATOMIC);
-
-        if (!network)
-                return NULL;
-
-        spin_lock_init(&network->lock);
-        mutex_init(&network->close_lock);
-
-        network->hardware = hw;
-
-        INIT_WORK(&network->work_go_online, do_go_online);
-        INIT_WORK(&network->work_go_offline, do_go_offline);
-
-        ipwireless_associate_network(hw, network);
-
-        return network;
-}
-
-void ipwireless_network_free(struct ipw_network *network)
-{
-        network->shutting_down = 1;
-
-        ipwireless_ppp_close(network);
-        flush_scheduled_work();
-
-        ipwireless_stop_interrupts(network->hardware);
-        ipwireless_associate_network(network->hardware, NULL);
-
-        kfree(network);
-}
-
-void ipwireless_associate_network_tty(struct ipw_network *network,
-                                      unsigned int channel_idx,
-                                      struct ipw_tty *tty)
-{
-        int i;
-
-        for (i = 0; i < MAX_ASSOCIATED_TTYS; i++)
-                if (network->associated_ttys[channel_idx][i] == NULL) {
-                        network->associated_ttys[channel_idx][i] = tty;
-                        break;
-                }
-}
-
-void ipwireless_disassociate_network_ttys(struct ipw_network *network,
-                                          unsigned int channel_idx)
-{
-        int i;
-
-        for (i = 0; i < MAX_ASSOCIATED_TTYS; i++)
-                network->associated_ttys[channel_idx][i] = NULL;
-}
-
-void ipwireless_ppp_open(struct ipw_network *network)
-{
-        if (ipwireless_debug)
-                printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME ": online\n");
-        schedule_work(&network->work_go_online);
-}
-
-void ipwireless_ppp_close(struct ipw_network *network)
-{
-        /* Disconnect from the wireless network. */
-        if (ipwireless_debug)
-                printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME ": offline\n");
-        schedule_work(&network->work_go_offline);
-}
-
-int ipwireless_ppp_channel_index(struct ipw_network *network)
-{
-        int ret = -1;
-        unsigned long flags;
-
-        spin_lock_irqsave(&network->lock, flags);
-        if (network->ppp_channel != NULL)
-                ret = ppp_channel_index(network->ppp_channel);
-        spin_unlock_irqrestore(&network->lock, flags);
-
-        return ret;
-}
-
-int ipwireless_ppp_unit_number(struct ipw_network *network)
-{
-        int ret = -1;
-        unsigned long flags;
-
-        spin_lock_irqsave(&network->lock, flags);
-        if (network->ppp_channel != NULL)
-                ret = ppp_unit_number(network->ppp_channel);
-        spin_unlock_irqrestore(&network->lock, flags);
-
-        return ret;
-}
-
-int ipwireless_ppp_mru(const struct ipw_network *network)
-{
-        return network->mru;
-}
diff --git a/drivers/char/pcmcia/ipwireless/network.h b/drivers/char/pcmcia/ipwireless/network.h
deleted file mode 100644
index 561f765b3334..000000000000
--- a/drivers/char/pcmcia/ipwireless/network.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * IPWireless 3G PCMCIA Network Driver
- *
- * Original code
- *   by Stephen Blackheath <stephen@blacksapphire.com>,
- *      Ben Martel <benm@symmetric.co.nz>
- *
- * Copyrighted as follows:
- *   Copyright (C) 2004 by Symmetric Systems Ltd (NZ)
- *
- * Various driver changes and rewrites, port to new kernels
- *   Copyright (C) 2006-2007 Jiri Kosina
- *
- * Misc code cleanups and updates
- *   Copyright (C) 2007 David Sterba
- */
-
-#ifndef _IPWIRELESS_CS_NETWORK_H_
-#define _IPWIRELESS_CS_NETWORK_H_
-
-#include <linux/types.h>
-
-struct ipw_network;
-struct ipw_tty;
-struct ipw_hardware;
-
-/* Definitions of the different channels on the PCMCIA UE */
-#define IPW_CHANNEL_RAS      0
-#define IPW_CHANNEL_DIALLER  1
-#define IPW_CHANNEL_CONSOLE  2
-#define NO_OF_IPW_CHANNELS   5
-
-void ipwireless_network_notify_control_line_change(struct ipw_network *net,
-                unsigned int channel_idx, unsigned int control_lines,
-                unsigned int control_mask);
-void ipwireless_network_packet_received(struct ipw_network *net,
-                unsigned int channel_idx, unsigned char *data,
-                unsigned int length);
-struct ipw_network *ipwireless_network_create(struct ipw_hardware *hw);
-void ipwireless_network_free(struct ipw_network *net);
-void ipwireless_associate_network_tty(struct ipw_network *net,
-                unsigned int channel_idx, struct ipw_tty *tty);
-void ipwireless_disassociate_network_ttys(struct ipw_network *net,
-                unsigned int channel_idx);
-
-void ipwireless_ppp_open(struct ipw_network *net);
-
-void ipwireless_ppp_close(struct ipw_network *net);
-int ipwireless_ppp_channel_index(struct ipw_network *net);
-int ipwireless_ppp_unit_number(struct ipw_network *net);
-int ipwireless_ppp_mru(const struct ipw_network *net);
-
-#endif
diff --git a/drivers/char/pcmcia/ipwireless/setup_protocol.h b/drivers/char/pcmcia/ipwireless/setup_protocol.h
deleted file mode 100644
index 9d6bcc77c73c..000000000000
--- a/drivers/char/pcmcia/ipwireless/setup_protocol.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * IPWireless 3G PCMCIA Network Driver
- *
- * Original code
- *   by Stephen Blackheath <stephen@blacksapphire.com>,
- *      Ben Martel <benm@symmetric.co.nz>
- *
- * Copyrighted as follows:
- *   Copyright (C) 2004 by Symmetric Systems Ltd (NZ)
- *
- * Various driver changes and rewrites, port to new kernels
- *   Copyright (C) 2006-2007 Jiri Kosina
- *
- * Misc code cleanups and updates
- *   Copyright (C) 2007 David Sterba
- */
-
-#ifndef _IPWIRELESS_CS_SETUP_PROTOCOL_H_
-#define _IPWIRELESS_CS_SETUP_PROTOCOL_H_
-
-/* Version of the setup protocol and transport protocols */
-#define TL_SETUP_VERSION                1
-
-#define TL_SETUP_VERSION_QRY_TMO        1000
-#define TL_SETUP_MAX_VERSION_QRY        30
-
-/* Message numbers 0-9 are obsoleted and must not be reused! */
-#define TL_SETUP_SIGNO_GET_VERSION_QRY  10
-#define TL_SETUP_SIGNO_GET_VERSION_RSP  11
-#define TL_SETUP_SIGNO_CONFIG_MSG       12
-#define TL_SETUP_SIGNO_CONFIG_DONE_MSG  13
-#define TL_SETUP_SIGNO_OPEN_MSG         14
-#define TL_SETUP_SIGNO_CLOSE_MSG        15
-
-#define TL_SETUP_SIGNO_INFO_MSG     20
-#define TL_SETUP_SIGNO_INFO_MSG_ACK 21
-
-#define TL_SETUP_SIGNO_REBOOT_MSG      22
-#define TL_SETUP_SIGNO_REBOOT_MSG_ACK  23
-
-/* Synchronous start-messages */
-struct tl_setup_get_version_qry {
-        unsigned char sig_no;           /* TL_SETUP_SIGNO_GET_VERSION_QRY */
-} __attribute__ ((__packed__));
-
-struct tl_setup_get_version_rsp {
-        unsigned char sig_no;           /* TL_SETUP_SIGNO_GET_VERSION_RSP */
-        unsigned char version;          /* TL_SETUP_VERSION */
-} __attribute__ ((__packed__));
-
-struct tl_setup_config_msg {
-        unsigned char sig_no;           /* TL_SETUP_SIGNO_CONFIG_MSG */
-        unsigned char port_no;
-        unsigned char prio_data;
-        unsigned char prio_ctrl;
-} __attribute__ ((__packed__));
-
-struct tl_setup_config_done_msg {
-        unsigned char sig_no;           /* TL_SETUP_SIGNO_CONFIG_DONE_MSG */
-} __attribute__ ((__packed__));
-
-/* Asyncronous messages */
-struct tl_setup_open_msg {
-        unsigned char sig_no;           /* TL_SETUP_SIGNO_OPEN_MSG */
-        unsigned char port_no;
-} __attribute__ ((__packed__));
-
-struct tl_setup_close_msg {
-        unsigned char sig_no;           /* TL_SETUP_SIGNO_CLOSE_MSG */
-        unsigned char port_no;
-} __attribute__ ((__packed__));
-
-/* Driver type  - for use in tl_setup_info_msg.driver_type */
-#define COMM_DRIVER     0
-#define NDISWAN_DRIVER  1
-#define NDISWAN_DRIVER_MAJOR_VERSION  2
-#define NDISWAN_DRIVER_MINOR_VERSION  0
-
-/*
- * It should not matter when this message comes over as we just store the
- * results and send the ACK.
- */
-struct tl_setup_info_msg {
-        unsigned char sig_no;           /* TL_SETUP_SIGNO_INFO_MSG */
-        unsigned char driver_type;
-        unsigned char major_version;
-        unsigned char minor_version;
-} __attribute__ ((__packed__));
-
-struct tl_setup_info_msgAck {
-        unsigned char sig_no;           /* TL_SETUP_SIGNO_INFO_MSG_ACK */
-} __attribute__ ((__packed__));
-
-struct TlSetupRebootMsgAck {
-        unsigned char sig_no;           /* TL_SETUP_SIGNO_REBOOT_MSG_ACK */
-} __attribute__ ((__packed__));
-
-/* Define a union of all the msgs that the driver can receive from the card.*/
-union ipw_setup_rx_msg {
-        unsigned char sig_no;
-        struct tl_setup_get_version_rsp version_rsp_msg;
-        struct tl_setup_open_msg open_msg;
-        struct tl_setup_close_msg close_msg;
-        struct tl_setup_info_msg InfoMsg;
-        struct tl_setup_info_msgAck info_msg_ack;
-} __attribute__ ((__packed__));
-
-#endif                          /* _IPWIRELESS_CS_SETUP_PROTOCOL_H_ */
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
deleted file mode 100644
index 1a2c2c3b068f..000000000000
--- a/drivers/char/pcmcia/ipwireless/tty.c
+++ /dev/null
@@ -1,679 +0,0 @@
-/*
- * IPWireless 3G PCMCIA Network Driver
- *
- * Original code
- *   by Stephen Blackheath <stephen@blacksapphire.com>,
- *      Ben Martel <benm@symmetric.co.nz>
- *
- * Copyrighted as follows:
- *   Copyright (C) 2004 by Symmetric Systems Ltd (NZ)
- *
- * Various driver changes and rewrites, port to new kernels
- *   Copyright (C) 2006-2007 Jiri Kosina
- *
- * Misc code cleanups and updates
- *   Copyright (C) 2007 David Sterba
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
-#include <linux/ppp_defs.h>
-#include <linux/if.h>
-#include <linux/if_ppp.h>
-#include <linux/sched.h>
-#include <linux/serial.h>
-#include <linux/slab.h>
-#include <linux/tty.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <linux/uaccess.h>
-
-#include "tty.h"
-#include "network.h"
-#include "hardware.h"
-#include "main.h"
-
-#define IPWIRELESS_PCMCIA_START         (0)
-#define IPWIRELESS_PCMCIA_MINORS        (24)
-#define IPWIRELESS_PCMCIA_MINOR_RANGE   (8)
-
-#define TTYTYPE_MODEM    (0)
-#define TTYTYPE_MONITOR  (1)
-#define TTYTYPE_RAS_RAW  (2)
-
-struct ipw_tty {
-        int index;
-        struct ipw_hardware *hardware;
-        unsigned int channel_idx;
-        unsigned int secondary_channel_idx;
-        int tty_type;
-        struct ipw_network *network;
-        struct tty_struct *linux_tty;
-        int open_count;
-        unsigned int control_lines;
-        struct mutex ipw_tty_mutex;
-        int tx_bytes_queued;
-        int closing;
-};
-
-static struct ipw_tty *ttys[IPWIRELESS_PCMCIA_MINORS];
-
-static struct tty_driver *ipw_tty_driver;
-
-static char *tty_type_name(int tty_type)
-{
-        static char *channel_names[] = {
-                "modem",
-                "monitor",
-                "RAS-raw"
-        };
-
-        return channel_names[tty_type];
-}
-
-static void report_registering(struct ipw_tty *tty)
-{
-        char *iftype = tty_type_name(tty->tty_type);
-
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-               ": registering %s device ttyIPWp%d\n", iftype, tty->index);
-}
-
-static void report_deregistering(struct ipw_tty *tty)
-{
-        char *iftype = tty_type_name(tty->tty_type);
-
-        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-               ": deregistering %s device ttyIPWp%d\n", iftype,
-               tty->index);
-}
-
-static struct ipw_tty *get_tty(int minor)
-{
-        if (minor < ipw_tty_driver->minor_start
-                        || minor >= ipw_tty_driver->minor_start +
-                        IPWIRELESS_PCMCIA_MINORS)
-                return NULL;
-        else {
-                int minor_offset = minor - ipw_tty_driver->minor_start;
-
-                /*
-                 * The 'ras_raw' channel is only available when 'loopback' mode
-                 * is enabled.
-                 * Number of minor starts with 16 (_RANGE * _RAS_RAW).
-                 */
-                if (!ipwireless_loopback &&
-                                minor_offset >=
-                                 IPWIRELESS_PCMCIA_MINOR_RANGE * TTYTYPE_RAS_RAW)
-                        return NULL;
-
-                return ttys[minor_offset];
-        }
-}
-
-static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
-{
-        int minor = linux_tty->index;
-        struct ipw_tty *tty = get_tty(minor);
-
-        if (!tty)
-                return -ENODEV;
-
-        mutex_lock(&tty->ipw_tty_mutex);
-
-        if (tty->closing) {
-                mutex_unlock(&tty->ipw_tty_mutex);
-                return -ENODEV;
-        }
-        if (tty->open_count == 0)
-                tty->tx_bytes_queued = 0;
-
-        tty->open_count++;
-
-        tty->linux_tty = linux_tty;
-        linux_tty->driver_data = tty;
-        linux_tty->low_latency = 1;
-
-        if (tty->tty_type == TTYTYPE_MODEM)
-                ipwireless_ppp_open(tty->network);
-
-        mutex_unlock(&tty->ipw_tty_mutex);
-
-        return 0;
-}
-
-static void do_ipw_close(struct ipw_tty *tty)
-{
-        tty->open_count--;
-
-        if (tty->open_count == 0) {
-                struct tty_struct *linux_tty = tty->linux_tty;
-
-                if (linux_tty != NULL) {
-                        tty->linux_tty = NULL;
-                        linux_tty->driver_data = NULL;
-
-                        if (tty->tty_type == TTYTYPE_MODEM)
-                                ipwireless_ppp_close(tty->network);
-                }
-        }
-}
-
-static void ipw_hangup(struct tty_struct *linux_tty)
-{
-        struct ipw_tty *tty = linux_tty->driver_data;
-
-        if (!tty)
-                return;
-
-        mutex_lock(&tty->ipw_tty_mutex);
-        if (tty->open_count == 0) {
-                mutex_unlock(&tty->ipw_tty_mutex);
-                return;
-        }
-
-        do_ipw_close(tty);
-
-        mutex_unlock(&tty->ipw_tty_mutex);
-}
-
-static void ipw_close(struct tty_struct *linux_tty, struct file *filp)
-{
-        ipw_hangup(linux_tty);
-}
-
-/* Take data received from hardware, and send it out the tty */
-void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
-                        unsigned int length)
-{
-        struct tty_struct *linux_tty;
-        int work = 0;
-
-        mutex_lock(&tty->ipw_tty_mutex);
-        linux_tty = tty->linux_tty;
-        if (linux_tty == NULL) {
-                mutex_unlock(&tty->ipw_tty_mutex);
-                return;
-        }
-
-        if (!tty->open_count) {
-                mutex_unlock(&tty->ipw_tty_mutex);
-                return;
-        }
-        mutex_unlock(&tty->ipw_tty_mutex);
-
-        work = tty_insert_flip_string(linux_tty, data, length);
-
-        if (work != length)
-                printk(KERN_DEBUG IPWIRELESS_PCCARD_NAME
-                                ": %d chars not inserted to flip buffer!\n",
-                                length - work);
-
-        /*
-         * This may sleep if ->low_latency is set
-         */
-        if (work)
-                tty_flip_buffer_push(linux_tty);
-}
-
-static void ipw_write_packet_sent_callback(void *callback_data,
-                                           unsigned int packet_length)
-{
-        struct ipw_tty *tty = callback_data;
-
-        /*
-         * Packet has been sent, so we subtract the number of bytes from our
-         * tally of outstanding TX bytes.
-         */
-        tty->tx_bytes_queued -= packet_length;
-}
-
-static int ipw_write(struct tty_struct *linux_tty,
-                     const unsigned char *buf, int count)
-{
-        struct ipw_tty *tty = linux_tty->driver_data;
-        int room, ret;
-
-        if (!tty)
-                return -ENODEV;
-
-        mutex_lock(&tty->ipw_tty_mutex);
-        if (!tty->open_count) {
-                mutex_unlock(&tty->ipw_tty_mutex);
-                return -EINVAL;
-        }
-
-        room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
-        if (room < 0)
-                room = 0;
-        /* Don't allow caller to write any more than we have room for */
-        if (count > room)
-                count = room;
-
-        if (count == 0) {
-                mutex_unlock(&tty->ipw_tty_mutex);
-                return 0;
-        }
-
-        ret = ipwireless_send_packet(tty->hardware, IPW_CHANNEL_RAS,
-                               buf, count,
-                               ipw_write_packet_sent_callback, tty);
-        if (ret == -1) {
-                mutex_unlock(&tty->ipw_tty_mutex);
-                return 0;
-        }
-
-        tty->tx_bytes_queued += count;
-        mutex_unlock(&tty->ipw_tty_mutex);
-
-        return count;
-}
-
-static int ipw_write_room(struct tty_struct *linux_tty)
-{
-        struct ipw_tty *tty = linux_tty->driver_data;
-        int room;
-
-        /* FIXME: Exactly how is the tty object locked here .. */
-        if (!tty)
-                return -ENODEV;
-
-        if (!tty->open_count)
-                return -EINVAL;
-
-        room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
-        if (room < 0)
-                room = 0;
-
-        return room;
-}
-
-static int ipwireless_get_serial_info(struct ipw_tty *tty,
-                                      struct serial_struct __user *retinfo)
-{
-        struct serial_struct tmp;
-
-        if (!retinfo)
-                return (-EFAULT);
-
-        memset(&tmp, 0, sizeof(tmp));
-        tmp.type = PORT_UNKNOWN;
-        tmp.line = tty->index;
-        tmp.port = 0;
-        tmp.irq = 0;
-        tmp.flags = 0;
-        tmp.baud_base = 115200;
-        tmp.close_delay = 0;
-        tmp.closing_wait = 0;
-        tmp.custom_divisor = 0;
-        tmp.hub6 = 0;
-        if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
-                return -EFAULT;
-
-        return 0;
-}
-
-static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
-{
-        struct ipw_tty *tty = linux_tty->driver_data;
-
-        if (!tty)
-                return 0;
-
-        if (!tty->open_count)
-                return 0;
-
-        return tty->tx_bytes_queued;
-}
-
-static int get_control_lines(struct ipw_tty *tty)
-{
-        unsigned int my = tty->control_lines;
-        unsigned int out = 0;
-
-        if (my & IPW_CONTROL_LINE_RTS)
-                out |= TIOCM_RTS;
-        if (my & IPW_CONTROL_LINE_DTR)
-                out |= TIOCM_DTR;
-        if (my & IPW_CONTROL_LINE_CTS)
-                out |= TIOCM_CTS;
-        if (my & IPW_CONTROL_LINE_DSR)
-                out |= TIOCM_DSR;
-        if (my & IPW_CONTROL_LINE_DCD)
-                out |= TIOCM_CD;
-
-        return out;
-}
-
-static int set_control_lines(struct ipw_tty *tty, unsigned int set,
-                             unsigned int clear)
-{
-        int ret;
-
-        if (set & TIOCM_RTS) {
-                ret = ipwireless_set_RTS(tty->hardware, tty->channel_idx, 1);
-                if (ret)
-                        return ret;
-                if (tty->secondary_channel_idx != -1) {
-                        ret = ipwireless_set_RTS(tty->hardware,
-                                          tty->secondary_channel_idx, 1);
-                        if (ret)
-                                return ret;
-                }
-        }
-        if (set & TIOCM_DTR) {
-                ret = ipwireless_set_DTR(tty->hardware, tty->channel_idx, 1);
-                if (ret)
-                        return ret;
-                if (tty->secondary_channel_idx != -1) {
-                        ret = ipwireless_set_DTR(tty->hardware,
-                                          tty->secondary_channel_idx, 1);
-                        if (ret)
-                                return ret;
-                }
-        }
-        if (clear & TIOCM_RTS) {
-                ret = ipwireless_set_RTS(tty->hardware, tty->channel_idx, 0);
-                if (tty->secondary_channel_idx != -1) {
-                        ret = ipwireless_set_RTS(tty->hardware,
-                                          tty->secondary_channel_idx, 0);
-                        if (ret)
-                                return ret;
-                }
-        }
-        if (clear & TIOCM_DTR) {
-                ret = ipwireless_set_DTR(tty->hardware, tty->channel_idx, 0);
-                if (tty->secondary_channel_idx != -1) {
-                        ret = ipwireless_set_DTR(tty->hardware,
-                                          tty->secondary_channel_idx, 0);
-                        if (ret)
-                                return ret;
-                }
-        }
-        return 0;
-}
-
-static int ipw_tiocmget(struct tty_struct *linux_tty, struct file *file)
-{
-        struct ipw_tty *tty = linux_tty->driver_data;
-        /* FIXME: Exactly how is the tty object locked here .. */
-
-        if (!tty)
-                return -ENODEV;
-
-        if (!tty->open_count)
-                return -EINVAL;
-
-        return get_control_lines(tty);
-}
-
-static int
-ipw_tiocmset(struct tty_struct *linux_tty, struct file *file,
-             unsigned int set, unsigned int clear)
-{
-        struct ipw_tty *tty = linux_tty->driver_data;
-        /* FIXME: Exactly how is the tty object locked here .. */
-
-        if (!tty)
-                return -ENODEV;
-
-        if (!tty->open_count)
-                return -EINVAL;
-
-        return set_control_lines(tty, set, clear);
-}
-
-static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,
-                     unsigned int cmd, unsigned long arg)
-{
-        struct ipw_tty *tty = linux_tty->driver_data;
-
-        if (!tty)
-                return -ENODEV;
-
-        if (!tty->open_count)
-                return -EINVAL;
-
-        /* FIXME: Exactly how is the tty object locked here .. */
-
-        switch (cmd) {
-        case TIOCGSERIAL:
-                return ipwireless_get_serial_info(tty, (void __user *) arg);
-
-        case TIOCSSERIAL:
-                return 0;       /* Keeps the PCMCIA scripts happy. */
-        }
-
-        if (tty->tty_type == TTYTYPE_MODEM) {
-                switch (cmd) {
-                case PPPIOCGCHAN:
-                        {
-                                int chan = ipwireless_ppp_channel_index(
-                                                        tty->network);
-
-                                if (chan < 0)
-                                        return -ENODEV;
-                                if (put_user(chan, (int __user *) arg))
-                                        return -EFAULT;
-                        }
-                        return 0;
-
-                case PPPIOCGUNIT:
-                        {
-                                int unit = ipwireless_ppp_unit_number(
-                                                tty->network);
-
-                                if (unit < 0)
-                                        return -ENODEV;
-                                if (put_user(unit, (int __user *) arg))
-                                        return -EFAULT;
-                        }
-                        return 0;
-
-                case FIONREAD:
-                        {
-                                int val = 0;
-
-                                if (put_user(val, (int __user *) arg))
-                                        return -EFAULT;
-                        }
-                        return 0;
-                case TCFLSH:
-                        return tty_perform_flush(linux_tty, arg);
-                }
-        }
-        return tty_mode_ioctl(linux_tty, file, cmd , arg);
-}
-
-static int add_tty(int j,
-                    struct ipw_hardware *hardware,
-                    struct ipw_network *network, int channel_idx,
-                    int secondary_channel_idx, int tty_type)
-{
-        ttys[j] = kzalloc(sizeof(struct ipw_tty), GFP_KERNEL);
-        if (!ttys[j])
-                return -ENOMEM;
-        ttys[j]->index = j;
-        ttys[j]->hardware = hardware;
-        ttys[j]->channel_idx = channel_idx;
-        ttys[j]->secondary_channel_idx = secondary_channel_idx;
-        ttys[j]->network = network;
-        ttys[j]->tty_type = tty_type;
-        mutex_init(&ttys[j]->ipw_tty_mutex);
-
-        tty_register_device(ipw_tty_driver, j, NULL);
-        ipwireless_associate_network_tty(network, channel_idx, ttys[j]);
-
-        if (secondary_channel_idx != -1)
-                ipwireless_associate_network_tty(network,
-                                                 secondary_channel_idx,
-                                                 ttys[j]);
-        if (get_tty(j + ipw_tty_driver->minor_start) == ttys[j])
-                report_registering(ttys[j]);
-        return 0;
-}
-
-struct ipw_tty *ipwireless_tty_create(struct ipw_hardware *hardware,
-                                      struct ipw_network *network)
-{
-        int i, j;
-
-        for (i = 0; i < IPWIRELESS_PCMCIA_MINOR_RANGE; i++) {
-                int allfree = 1;
-
-                for (j = i; j < IPWIRELESS_PCMCIA_MINORS;
-                                j += IPWIRELESS_PCMCIA_MINOR_RANGE)
-                        if (ttys[j] != NULL) {
-                                allfree = 0;
-                                break;
-                        }
-
-                if (allfree) {
-                        j = i;
-
-                        if (add_tty(j, hardware, network,
-                                        IPW_CHANNEL_DIALLER, IPW_CHANNEL_RAS,
-                                        TTYTYPE_MODEM))
-                                return NULL;
-
-                        j += IPWIRELESS_PCMCIA_MINOR_RANGE;
-                        if (add_tty(j, hardware, network,
-                                        IPW_CHANNEL_DIALLER, -1,
-                                        TTYTYPE_MONITOR))
-                                return NULL;
-
-                        j += IPWIRELESS_PCMCIA_MINOR_RANGE;
-                        if (add_tty(j, hardware, network,
-                                        IPW_CHANNEL_RAS, -1,
-                                        TTYTYPE_RAS_RAW))
-                                return NULL;
-
-                        return ttys[i];
-                }
-        }
-        return NULL;
-}
-
-/*
- * Must be called before ipwireless_network_free().
- */
-void ipwireless_tty_free(struct ipw_tty *tty)
-{
-        int j;
-        struct ipw_network *network = ttys[tty->index]->network;
-
-        for (j = tty->index; j < IPWIRELESS_PCMCIA_MINORS;
-                        j += IPWIRELESS_PCMCIA_MINOR_RANGE) {
-                struct ipw_tty *ttyj = ttys[j];
-
-                if (ttyj) {
-                        mutex_lock(&ttyj->ipw_tty_mutex);
-                        if (get_tty(j + ipw_tty_driver->minor_start) == ttyj)
-                                report_deregistering(ttyj);
-                        ttyj->closing = 1;
-                        if (ttyj->linux_tty != NULL) {
-                                mutex_unlock(&ttyj->ipw_tty_mutex);
-                                tty_hangup(ttyj->linux_tty);
-                                /* Wait till the tty_hangup has completed */
-                                flush_scheduled_work();
-                                /* FIXME: Exactly how is the tty object locked here
-                                   against a parallel ioctl etc */
-                                mutex_lock(&ttyj->ipw_tty_mutex);
-                        }
-                        while (ttyj->open_count)
-                                do_ipw_close(ttyj);
-                        ipwireless_disassociate_network_ttys(network,
-                                                             ttyj->channel_idx);
-                        tty_unregister_device(ipw_tty_driver, j);
-                        ttys[j] = NULL;
-                        mutex_unlock(&ttyj->ipw_tty_mutex);
-                        kfree(ttyj);
-                }
-        }
-}
-
-static const struct tty_operations tty_ops = {
-        .open = ipw_open,
-        .close = ipw_close,
-        .hangup = ipw_hangup,
-        .write = ipw_write,
-        .write_room = ipw_write_room,
-        .ioctl = ipw_ioctl,
-        .chars_in_buffer = ipw_chars_in_buffer,
-        .tiocmget = ipw_tiocmget,
-        .tiocmset = ipw_tiocmset,
-};
-
-int ipwireless_tty_init(void)
-{
-        int result;
-
-        ipw_tty_driver = alloc_tty_driver(IPWIRELESS_PCMCIA_MINORS);
-        if (!ipw_tty_driver)
-                return -ENOMEM;
-
-        ipw_tty_driver->owner = THIS_MODULE;
-        ipw_tty_driver->driver_name = IPWIRELESS_PCCARD_NAME;
-        ipw_tty_driver->name = "ttyIPWp";
-        ipw_tty_driver->major = 0;
-        ipw_tty_driver->minor_start = IPWIRELESS_PCMCIA_START;
-        ipw_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        ipw_tty_driver->subtype = SERIAL_TYPE_NORMAL;
-        ipw_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-        ipw_tty_driver->init_termios = tty_std_termios;
-        ipw_tty_driver->init_termios.c_cflag =
-            B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        ipw_tty_driver->init_termios.c_ispeed = 9600;
-        ipw_tty_driver->init_termios.c_ospeed = 9600;
-        tty_set_operations(ipw_tty_driver, &tty_ops);
-        result = tty_register_driver(ipw_tty_driver);
-        if (result) {
-                printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                       ": failed to register tty driver\n");
-                put_tty_driver(ipw_tty_driver);
-                return result;
-        }
-
-        return 0;
-}
-
-void ipwireless_tty_release(void)
-{
-        int ret;
-
-        ret = tty_unregister_driver(ipw_tty_driver);
-        put_tty_driver(ipw_tty_driver);
-        if (ret != 0)
-                printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                        ": tty_unregister_driver failed with code %d\n", ret);
-}
-
-int ipwireless_tty_is_modem(struct ipw_tty *tty)
-{
-        return tty->tty_type == TTYTYPE_MODEM;
-}
-
-void
-ipwireless_tty_notify_control_line_change(struct ipw_tty *tty,
-                                          unsigned int channel_idx,
-                                          unsigned int control_lines,
-                                          unsigned int changed_mask)
-{
-        unsigned int old_control_lines = tty->control_lines;
-
-        tty->control_lines = (tty->control_lines & ~changed_mask)
-                | (control_lines & changed_mask);
-
-        /*
-         * If DCD is de-asserted, we close the tty so pppd can tell that we
-         * have gone offline.
-         */
-        if ((old_control_lines & IPW_CONTROL_LINE_DCD)
-                        && !(tty->control_lines & IPW_CONTROL_LINE_DCD)
-                        && tty->linux_tty) {
-                tty_hangup(tty->linux_tty);
-        }
-}
-
diff --git a/drivers/char/pcmcia/ipwireless/tty.h b/drivers/char/pcmcia/ipwireless/tty.h
deleted file mode 100644
index 3e163d4cab15..000000000000
--- a/drivers/char/pcmcia/ipwireless/tty.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * IPWireless 3G PCMCIA Network Driver
- *
- * Original code
- *   by Stephen Blackheath <stephen@blacksapphire.com>,
- *      Ben Martel <benm@symmetric.co.nz>
- *
- * Copyrighted as follows:
- *   Copyright (C) 2004 by Symmetric Systems Ltd (NZ)
- *
- * Various driver changes and rewrites, port to new kernels
- *   Copyright (C) 2006-2007 Jiri Kosina
- *
- * Misc code cleanups and updates
- *   Copyright (C) 2007 David Sterba
- */
-
-#ifndef _IPWIRELESS_CS_TTY_H_
-#define _IPWIRELESS_CS_TTY_H_
-
-#include <linux/types.h>
-#include <linux/sched.h>
-
-#include <pcmcia/cs.h>
-#include <pcmcia/cistpl.h>
-#include <pcmcia/ds.h>
-
-struct ipw_tty;
-struct ipw_network;
-struct ipw_hardware;
-
-int ipwireless_tty_init(void);
-void ipwireless_tty_release(void);
-
-struct ipw_tty *ipwireless_tty_create(struct ipw_hardware *hw,
-                                      struct ipw_network *net);
-void ipwireless_tty_free(struct ipw_tty *tty);
-void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
-                             unsigned int length);
-int ipwireless_tty_is_modem(struct ipw_tty *tty);
-void ipwireless_tty_notify_control_line_change(struct ipw_tty *tty,
-                                               unsigned int channel_idx,
-                                               unsigned int control_lines,
-                                               unsigned int changed_mask);
-
-#endif
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 9ecd6bef5d3b..15781396af25 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -70,7 +70,6 @@
 #include <linux/workqueue.h>
 #include <linux/hdlc.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
@@ -419,9 +418,9 @@ static void bh_status(MGSLPC_INFO *info);
 /*
  * ioctl handlers
  */
-static int tiocmget(struct tty_struct *tty, struct file *file);
-static int tiocmset(struct tty_struct *tty, struct file *file,
-                    unsigned int set, unsigned int clear);
+static int tiocmget(struct tty_struct *tty);
+static int tiocmset(struct tty_struct *tty,
+                                        unsigned int set, unsigned int clear);
 static int get_stats(MGSLPC_INFO *info, struct mgsl_icount __user *user_icount);
 static int get_params(MGSLPC_INFO *info, MGSL_PARAMS __user *user_params);
 static int set_params(MGSLPC_INFO *info, MGSL_PARAMS __user *new_params, struct tty_struct *tty);
@@ -550,9 +549,6 @@ static int mgslpc_probe(struct pcmcia_device *link)
 
     /* Initialize the struct pcmcia_device structure */
 
-    link->conf.Attributes = 0;
-    link->conf.IntType = INT_MEMORY_AND_IO;
-
     ret = mgslpc_config(link);
     if (ret)
             return ret;
@@ -565,20 +561,8 @@ static int mgslpc_probe(struct pcmcia_device *link)
 /* Card has been inserted.
  */
 
-static int mgslpc_ioprobe(struct pcmcia_device *p_dev,
-                          cistpl_cftable_entry_t *cfg,
-                          cistpl_cftable_entry_t *dflt,
-                          unsigned int vcc,
-                          void *priv_data)
+static int mgslpc_ioprobe(struct pcmcia_device *p_dev, void *priv_data)
 {
-        if (!cfg->io.nwin)
-                return -ENODEV;
-
-        p_dev->resource[0]->start = cfg->io.win[0].base;
-        p_dev->resource[0]->end = cfg->io.win[0].len;
-        p_dev->resource[0]->flags |= pcmcia_io_cfg_data_width(cfg->io.flags);
-        p_dev->io_lines = cfg->io.flags & CISTPL_IO_LINES_MASK;
-
         return pcmcia_request_io(p_dev);
 }
 
@@ -590,32 +574,24 @@ static int mgslpc_config(struct pcmcia_device *link)
     if (debug_level >= DEBUG_LEVEL_INFO)
             printk("mgslpc_config(0x%p)\n", link);
 
+    link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
+
     ret = pcmcia_loop_config(link, mgslpc_ioprobe, NULL);
     if (ret != 0)
             goto failed;
 
-    link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
-    link->conf.ConfigIndex = 8;
-    link->conf.Present = PRESENT_OPTION;
+    link->config_index = 8;
+    link->config_regs = PRESENT_OPTION;
 
     ret = pcmcia_request_irq(link, mgslpc_isr);
     if (ret)
             goto failed;
-    ret = pcmcia_request_configuration(link, &link->conf);
+    ret = pcmcia_enable_device(link);
     if (ret)
             goto failed;
 
     info->io_base = link->resource[0]->start;
     info->irq_level = link->irq;
-
-    dev_info(&link->dev, "index 0x%02x:",
-            link->conf.ConfigIndex);
-    if (link->conf.Attributes & CONF_ENABLE_IRQ)
-            printk(", irq %d", link->irq);
-    if (link->resource[0])
-            printk(", io %pR", link->resource[0]);
-    printk("\n");
     return 0;
 
 failed:
@@ -1314,7 +1290,7 @@ static int startup(MGSLPC_INFO * info, struct tty_struct *tty)
         /* Allocate and claim adapter resources */
         retval = claim_resources(info);
 
-        /* perform existance check and diagnostics */
+        /* perform existence check and diagnostics */
         if ( !retval )
                 retval = adapter_test(info);
 
@@ -2138,7 +2114,7 @@ static int modem_input_wait(MGSLPC_INFO *info,int arg)
 
 /* return the state of the serial control and status signals
  */
-static int tiocmget(struct tty_struct *tty, struct file *file)
+static int tiocmget(struct tty_struct *tty)
 {
         MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data;
         unsigned int result;
@@ -2163,7 +2139,7 @@ static int tiocmget(struct tty_struct *tty, struct file *file)
 
 /* set modem control signals (DTR/RTS)
  */
-static int tiocmset(struct tty_struct *tty, struct file *file,
+static int tiocmset(struct tty_struct *tty,
                     unsigned int set, unsigned int clear)
 {
         MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data;
@@ -2215,26 +2191,47 @@ static int mgslpc_break(struct tty_struct *tty, int break_state)
         return 0;
 }
 
+static int mgslpc_get_icount(struct tty_struct *tty,
+                                struct serial_icounter_struct *icount)
+{
+        MGSLPC_INFO * info = (MGSLPC_INFO *)tty->driver_data;
+        struct mgsl_icount cnow;        /* kernel counter temps */
+        unsigned long flags;
+
+        spin_lock_irqsave(&info->lock,flags);
+        cnow = info->icount;
+        spin_unlock_irqrestore(&info->lock,flags);
+
+        icount->cts = cnow.cts;
+        icount->dsr = cnow.dsr;
+        icount->rng = cnow.rng;
+        icount->dcd = cnow.dcd;
+        icount->rx = cnow.rx;
+        icount->tx = cnow.tx;
+        icount->frame = cnow.frame;
+        icount->overrun = cnow.overrun;
+        icount->parity = cnow.parity;
+        icount->brk = cnow.brk;
+        icount->buf_overrun = cnow.buf_overrun;
+
+        return 0;
+}
+
 /* Service an IOCTL request
  *
  * Arguments:
  *
  *      tty     pointer to tty instance data
- *      file    pointer to associated file object for device
  *      cmd     IOCTL command code
  *      arg     command argument/context
  *
  * Return Value:        0 if success, otherwise error code
  */
-static int mgslpc_ioctl(struct tty_struct *tty, struct file * file,
+static int mgslpc_ioctl(struct tty_struct *tty,
                         unsigned int cmd, unsigned long arg)
 {
         MGSLPC_INFO * info = (MGSLPC_INFO *)tty->driver_data;
-        int error;
-        struct mgsl_icount cnow;        /* kernel counter temps */
-        struct serial_icounter_struct __user *p_cuser;  /* user space */
         void __user *argp = (void __user *)arg;
-        unsigned long flags;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):mgslpc_ioctl %s cmd=%08X\n", __FILE__,__LINE__,
@@ -2244,7 +2241,7 @@ static int mgslpc_ioctl(struct tty_struct *tty, struct file * file,
                 return -ENODEV;
 
         if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-            (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
+            (cmd != TIOCMIWAIT)) {
                 if (tty->flags & (1 << TTY_IO_ERROR))
                     return -EIO;
         }
@@ -2274,34 +2271,6 @@ static int mgslpc_ioctl(struct tty_struct *tty, struct file * file,
                 return wait_events(info, argp);
         case TIOCMIWAIT:
                 return modem_input_wait(info,(int)arg);
-        case TIOCGICOUNT:
-                spin_lock_irqsave(&info->lock,flags);
-                cnow = info->icount;
-                spin_unlock_irqrestore(&info->lock,flags);
-                p_cuser = argp;
-                PUT_USER(error,cnow.cts, &p_cuser->cts);
-                if (error) return error;
-                PUT_USER(error,cnow.dsr, &p_cuser->dsr);
-                if (error) return error;
-                PUT_USER(error,cnow.rng, &p_cuser->rng);
-                if (error) return error;
-                PUT_USER(error,cnow.dcd, &p_cuser->dcd);
-                if (error) return error;
-                PUT_USER(error,cnow.rx, &p_cuser->rx);
-                if (error) return error;
-                PUT_USER(error,cnow.tx, &p_cuser->tx);
-                if (error) return error;
-                PUT_USER(error,cnow.frame, &p_cuser->frame);
-                if (error) return error;
-                PUT_USER(error,cnow.overrun, &p_cuser->overrun);
-                if (error) return error;
-                PUT_USER(error,cnow.parity, &p_cuser->parity);
-                if (error) return error;
-                PUT_USER(error,cnow.brk, &p_cuser->brk);
-                if (error) return error;
-                PUT_USER(error,cnow.buf_overrun, &p_cuser->buf_overrun);
-                if (error) return error;
-                return 0;
         default:
                 return -ENOIOCTLCMD;
         }
@@ -2711,7 +2680,7 @@ static void rx_free_buffers(MGSLPC_INFO *info)
 static int claim_resources(MGSLPC_INFO *info)
 {
         if (rx_alloc_buffers(info) < 0 ) {
-                printk( "Cant allocate rx buffer %s\n", info->device_name);
+                printk( "Can't allocate rx buffer %s\n", info->device_name);
                 release_resources(info);
                 return -ENODEV;
         }
@@ -2789,7 +2758,7 @@ static void mgslpc_remove_device(MGSLPC_INFO *remove_info)
         }
 }
 
-static struct pcmcia_device_id mgslpc_ids[] = {
+static const struct pcmcia_device_id mgslpc_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x02c5, 0x0050),
         PCMCIA_DEVICE_NULL
 };
@@ -2797,9 +2766,7 @@ MODULE_DEVICE_TABLE(pcmcia, mgslpc_ids);
 
 static struct pcmcia_driver mgslpc_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "synclink_cs",
-        },
+        .name           = "synclink_cs",
         .probe          = mgslpc_probe,
         .remove         = mgslpc_detach,
         .id_table       = mgslpc_ids,
@@ -2828,6 +2795,7 @@ static const struct tty_operations mgslpc_ops = {
         .hangup = mgslpc_hangup,
         .tiocmget = tiocmget,
         .tiocmset = tiocmset,
+        .get_icount = mgslpc_get_icount,
         .proc_fops = &mgslpc_proc_fops,
 };
 
@@ -2835,8 +2803,6 @@ static void synclink_cs_cleanup(void)
 {
         int rc;
 
-        printk("Unloading %s: version %s\n", driver_name, driver_version);
-
         while(mgslpc_device_list)
                 mgslpc_remove_device(mgslpc_device_list);
 
@@ -2859,8 +2825,6 @@ static int __init synclink_cs_init(void)
             BREAKPOINT();
     }
 
-    printk("%s %s\n", driver_name, driver_version);
-
     if ((rc = pcmcia_register_driver(&mgslpc_driver)) < 0)
             return rc;
 
@@ -4127,6 +4091,8 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         if (cmd != SIOCWANDEV)
                 return hdlc_ioctl(dev, ifr, cmd);
 
+        memset(&new_line, 0, size);
+
         switch(ifr->ifr_settings.type) {
         case IF_GET_IFACE: /* return current sync_serial_settings */
 
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 02abfddce45a..3fcf80ff12f2 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -67,7 +67,7 @@
 #include <linux/slab.h>
 #include <linux/major.h>
 #include <linux/ppdev.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/uaccess.h>
 
 #define PP_VERSION "ppdev: user-space parallel port driver"
@@ -97,6 +97,7 @@ struct pp_struct {
 /* ROUND_UP macro from fs/select.c */
 #define ROUND_UP(x,y) (((x)+(y)-1)/(y))
 
+static DEFINE_MUTEX(pp_do_mutex);
 static inline void pp_enable_irq (struct pp_struct *pp)
 {
         struct parport *port = pp->pdev->port;
@@ -456,6 +457,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         return -ENODEV;
 
                 modes = port->modes;
+                parport_put_port(port);
                 if (copy_to_user (argp, &modes, sizeof (modes))) {
                         return -EFAULT;
                 }
@@ -612,6 +614,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
         case PPGETTIME:
                 to_jiffies = pp->pdev->timeout;
+                memset(&par_timeout, 0, sizeof(par_timeout));
                 par_timeout.tv_sec = to_jiffies / HZ;
                 par_timeout.tv_usec = (to_jiffies % (long)HZ) * (1000000/HZ);
                 if (copy_to_user (argp, &par_timeout, sizeof(struct timeval)))
@@ -630,9 +633,9 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 static long pp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         long ret;
-        lock_kernel();
+        mutex_lock(&pp_do_mutex);
         ret = pp_do_ioctl(file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&pp_do_mutex);
         return ret;
 }
 
@@ -641,7 +644,6 @@ static int pp_open (struct inode * inode, struct file * file)
         unsigned int minor = iminor(inode);
         struct pp_struct *pp;
 
-        cycle_kernel_lock();
         if (minor >= PARPORT_MAX)
                 return -ENXIO;
 
diff --git a/drivers/char/pty.c b/drivers/char/pty.c
deleted file mode 100644
index c350d01716bd..000000000000
--- a/drivers/char/pty.c
+++ /dev/null
@@ -1,775 +0,0 @@
-/*
- *  linux/drivers/char/pty.c
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- *
- *  Added support for a Unix98-style ptmx device.
- *    -- C. Scott Ananian <cananian@alumni.princeton.edu>, 14-Jan-1998
- *
- *  When reading this code see also fs/devpts. In particular note that the
- *  driver_data field is used by the devpts side as a binding to the devpts
- *  inode.
- */
-
-#include <linux/module.h>
-
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/fcntl.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/major.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <linux/smp_lock.h>
-#include <linux/sysctl.h>
-#include <linux/device.h>
-#include <linux/uaccess.h>
-#include <linux/bitops.h>
-#include <linux/devpts_fs.h>
-#include <linux/slab.h>
-
-#include <asm/system.h>
-
-#ifdef CONFIG_UNIX98_PTYS
-static struct tty_driver *ptm_driver;
-static struct tty_driver *pts_driver;
-#endif
-
-static void pty_close(struct tty_struct *tty, struct file *filp)
-{
-        BUG_ON(!tty);
-        if (tty->driver->subtype == PTY_TYPE_MASTER)
-                WARN_ON(tty->count > 1);
-        else {
-                if (tty->count > 2)
-                        return;
-        }
-        wake_up_interruptible(&tty->read_wait);
-        wake_up_interruptible(&tty->write_wait);
-        tty->packet = 0;
-        if (!tty->link)
-                return;
-        tty->link->packet = 0;
-        set_bit(TTY_OTHER_CLOSED, &tty->link->flags);
-        wake_up_interruptible(&tty->link->read_wait);
-        wake_up_interruptible(&tty->link->write_wait);
-        if (tty->driver->subtype == PTY_TYPE_MASTER) {
-                set_bit(TTY_OTHER_CLOSED, &tty->flags);
-#ifdef CONFIG_UNIX98_PTYS
-                if (tty->driver == ptm_driver)
-                        devpts_pty_kill(tty->link);
-#endif
-                tty_unlock();
-                tty_vhangup(tty->link);
-                tty_lock();
-        }
-}
-
-/*
- * The unthrottle routine is called by the line discipline to signal
- * that it can receive more characters.  For PTY's, the TTY_THROTTLED
- * flag is always set, to force the line discipline to always call the
- * unthrottle routine when there are fewer than TTY_THRESHOLD_UNTHROTTLE
- * characters in the queue.  This is necessary since each time this
- * happens, we need to wake up any sleeping processes that could be
- * (1) trying to send data to the pty, or (2) waiting in wait_until_sent()
- * for the pty buffer to be drained.
- */
-static void pty_unthrottle(struct tty_struct *tty)
-{
-        tty_wakeup(tty->link);
-        set_bit(TTY_THROTTLED, &tty->flags);
-}
-
-/**
- *      pty_space       -       report space left for writing
- *      @to: tty we are writing into
- *
- *      The tty buffers allow 64K but we sneak a peak and clip at 8K this
- *      allows a lot of overspill room for echo and other fun messes to
- *      be handled properly
- */
-
-static int pty_space(struct tty_struct *to)
-{
-        int n = 8192 - to->buf.memory_used;
-        if (n < 0)
-                return 0;
-        return n;
-}
-
-/**
- *      pty_write               -       write to a pty
- *      @tty: the tty we write from
- *      @buf: kernel buffer of data
- *      @count: bytes to write
- *
- *      Our "hardware" write method. Data is coming from the ldisc which
- *      may be in a non sleeping state. We simply throw this at the other
- *      end of the link as if we were an IRQ handler receiving stuff for
- *      the other side of the pty/tty pair.
- */
-
-static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c)
-{
-        struct tty_struct *to = tty->link;
-
-        if (tty->stopped)
-                return 0;
-
-        if (c > 0) {
-                /* Stuff the data into the input queue of the other end */
-                c = tty_insert_flip_string(to, buf, c);
-                /* And shovel */
-                if (c) {
-                        tty_flip_buffer_push(to);
-                        tty_wakeup(tty);
-                }
-        }
-        return c;
-}
-
-/**
- *      pty_write_room  -       write space
- *      @tty: tty we are writing from
- *
- *      Report how many bytes the ldisc can send into the queue for
- *      the other device.
- */
-
-static int pty_write_room(struct tty_struct *tty)
-{
-        if (tty->stopped)
-                return 0;
-        return pty_space(tty->link);
-}
-
-/**
- *      pty_chars_in_buffer     -       characters currently in our tx queue
- *      @tty: our tty
- *
- *      Report how much we have in the transmit queue. As everything is
- *      instantly at the other end this is easy to implement.
- */
-
-static int pty_chars_in_buffer(struct tty_struct *tty)
-{
-        return 0;
-}
-
-/* Set the lock flag on a pty */
-static int pty_set_lock(struct tty_struct *tty, int __user *arg)
-{
-        int val;
-        if (get_user(val, arg))
-                return -EFAULT;
-        if (val)
-                set_bit(TTY_PTY_LOCK, &tty->flags);
-        else
-                clear_bit(TTY_PTY_LOCK, &tty->flags);
-        return 0;
-}
-
-/* Send a signal to the slave */
-static int pty_signal(struct tty_struct *tty, int sig)
-{
-        unsigned long flags;
-        struct pid *pgrp;
-
-        if (tty->link) {
-                spin_lock_irqsave(&tty->link->ctrl_lock, flags);
-                pgrp = get_pid(tty->link->pgrp);
-                spin_unlock_irqrestore(&tty->link->ctrl_lock, flags);
-
-                kill_pgrp(pgrp, sig, 1);
-                put_pid(pgrp);
-        }
-        return 0;
-}
-
-static void pty_flush_buffer(struct tty_struct *tty)
-{
-        struct tty_struct *to = tty->link;
-        unsigned long flags;
-
-        if (!to)
-                return;
-        /* tty_buffer_flush(to); FIXME */
-        if (to->packet) {
-                spin_lock_irqsave(&tty->ctrl_lock, flags);
-                tty->ctrl_status |= TIOCPKT_FLUSHWRITE;
-                wake_up_interruptible(&to->read_wait);
-                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-        }
-}
-
-static int pty_open(struct tty_struct *tty, struct file *filp)
-{
-        int     retval = -ENODEV;
-
-        if (!tty || !tty->link)
-                goto out;
-
-        retval = -EIO;
-        if (test_bit(TTY_OTHER_CLOSED, &tty->flags))
-                goto out;
-        if (test_bit(TTY_PTY_LOCK, &tty->link->flags))
-                goto out;
-        if (tty->link->count != 1)
-                goto out;
-
-        clear_bit(TTY_OTHER_CLOSED, &tty->link->flags);
-        set_bit(TTY_THROTTLED, &tty->flags);
-        retval = 0;
-out:
-        return retval;
-}
-
-static void pty_set_termios(struct tty_struct *tty,
-                                        struct ktermios *old_termios)
-{
-        tty->termios->c_cflag &= ~(CSIZE | PARENB);
-        tty->termios->c_cflag |= (CS8 | CREAD);
-}
-
-/**
- *      pty_do_resize           -       resize event
- *      @tty: tty being resized
- *      @ws: window size being set.
- *
- *      Update the termios variables and send the necessary signals to
- *      peform a terminal resize correctly
- */
-
-int pty_resize(struct tty_struct *tty,  struct winsize *ws)
-{
-        struct pid *pgrp, *rpgrp;
-        unsigned long flags;
-        struct tty_struct *pty = tty->link;
-
-        /* For a PTY we need to lock the tty side */
-        mutex_lock(&tty->termios_mutex);
-        if (!memcmp(ws, &tty->winsize, sizeof(*ws)))
-                goto done;
-
-        /* Get the PID values and reference them so we can
-           avoid holding the tty ctrl lock while sending signals.
-           We need to lock these individually however. */
-
-        spin_lock_irqsave(&tty->ctrl_lock, flags);
-        pgrp = get_pid(tty->pgrp);
-        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-
-        spin_lock_irqsave(&pty->ctrl_lock, flags);
-        rpgrp = get_pid(pty->pgrp);
-        spin_unlock_irqrestore(&pty->ctrl_lock, flags);
-
-        if (pgrp)
-                kill_pgrp(pgrp, SIGWINCH, 1);
-        if (rpgrp != pgrp && rpgrp)
-                kill_pgrp(rpgrp, SIGWINCH, 1);
-
-        put_pid(pgrp);
-        put_pid(rpgrp);
-
-        tty->winsize = *ws;
-        pty->winsize = *ws;     /* Never used so will go away soon */
-done:
-        mutex_unlock(&tty->termios_mutex);
-        return 0;
-}
-
-/* Traditional BSD devices */
-#ifdef CONFIG_LEGACY_PTYS
-
-static int pty_install(struct tty_driver *driver, struct tty_struct *tty)
-{
-        struct tty_struct *o_tty;
-        int idx = tty->index;
-        int retval;
-
-        o_tty = alloc_tty_struct();
-        if (!o_tty)
-                return -ENOMEM;
-        if (!try_module_get(driver->other->owner)) {
-                /* This cannot in fact currently happen */
-                free_tty_struct(o_tty);
-                return -ENOMEM;
-        }
-        initialize_tty_struct(o_tty, driver->other, idx);
-
-        /* We always use new tty termios data so we can do this
-           the easy way .. */
-        retval = tty_init_termios(tty);
-        if (retval)
-                goto free_mem_out;
-
-        retval = tty_init_termios(o_tty);
-        if (retval) {
-                tty_free_termios(tty);
-                goto free_mem_out;
-        }
-
-        /*
-         * Everything allocated ... set up the o_tty structure.
-         */
-        driver->other->ttys[idx] = o_tty;
-        tty_driver_kref_get(driver->other);
-        if (driver->subtype == PTY_TYPE_MASTER)
-                o_tty->count++;
-        /* Establish the links in both directions */
-        tty->link   = o_tty;
-        o_tty->link = tty;
-
-        tty_driver_kref_get(driver);
-        tty->count++;
-        driver->ttys[idx] = tty;
-        return 0;
-free_mem_out:
-        module_put(o_tty->driver->owner);
-        free_tty_struct(o_tty);
-        return -ENOMEM;
-}
-
-static int pty_bsd_ioctl(struct tty_struct *tty, struct file *file,
-                         unsigned int cmd, unsigned long arg)
-{
-        switch (cmd) {
-        case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
-                return pty_set_lock(tty, (int __user *) arg);
-        case TIOCSIG:    /* Send signal to other side of pty */
-                return pty_signal(tty, (int) arg);
-        }
-        return -ENOIOCTLCMD;
-}
-
-static int legacy_count = CONFIG_LEGACY_PTY_COUNT;
-module_param(legacy_count, int, 0);
-
-/*
- * The master side of a pty can do TIOCSPTLCK and thus
- * has pty_bsd_ioctl.
- */
-static const struct tty_operations master_pty_ops_bsd = {
-        .install = pty_install,
-        .open = pty_open,
-        .close = pty_close,
-        .write = pty_write,
-        .write_room = pty_write_room,
-        .flush_buffer = pty_flush_buffer,
-        .chars_in_buffer = pty_chars_in_buffer,
-        .unthrottle = pty_unthrottle,
-        .set_termios = pty_set_termios,
-        .ioctl = pty_bsd_ioctl,
-        .resize = pty_resize
-};
-
-static const struct tty_operations slave_pty_ops_bsd = {
-        .install = pty_install,
-        .open = pty_open,
-        .close = pty_close,
-        .write = pty_write,
-        .write_room = pty_write_room,
-        .flush_buffer = pty_flush_buffer,
-        .chars_in_buffer = pty_chars_in_buffer,
-        .unthrottle = pty_unthrottle,
-        .set_termios = pty_set_termios,
-        .resize = pty_resize
-};
-
-static void __init legacy_pty_init(void)
-{
-        struct tty_driver *pty_driver, *pty_slave_driver;
-
-        if (legacy_count <= 0)
-                return;
-
-        pty_driver = alloc_tty_driver(legacy_count);
-        if (!pty_driver)
-                panic("Couldn't allocate pty driver");
-
-        pty_slave_driver = alloc_tty_driver(legacy_count);
-        if (!pty_slave_driver)
-                panic("Couldn't allocate pty slave driver");
-
-        pty_driver->owner = THIS_MODULE;
-        pty_driver->driver_name = "pty_master";
-        pty_driver->name = "pty";
-        pty_driver->major = PTY_MASTER_MAJOR;
-        pty_driver->minor_start = 0;
-        pty_driver->type = TTY_DRIVER_TYPE_PTY;
-        pty_driver->subtype = PTY_TYPE_MASTER;
-        pty_driver->init_termios = tty_std_termios;
-        pty_driver->init_termios.c_iflag = 0;
-        pty_driver->init_termios.c_oflag = 0;
-        pty_driver->init_termios.c_cflag = B38400 | CS8 | CREAD;
-        pty_driver->init_termios.c_lflag = 0;
-        pty_driver->init_termios.c_ispeed = 38400;
-        pty_driver->init_termios.c_ospeed = 38400;
-        pty_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW;
-        pty_driver->other = pty_slave_driver;
-        tty_set_operations(pty_driver, &master_pty_ops_bsd);
-
-        pty_slave_driver->owner = THIS_MODULE;
-        pty_slave_driver->driver_name = "pty_slave";
-        pty_slave_driver->name = "ttyp";
-        pty_slave_driver->major = PTY_SLAVE_MAJOR;
-        pty_slave_driver->minor_start = 0;
-        pty_slave_driver->type = TTY_DRIVER_TYPE_PTY;
-        pty_slave_driver->subtype = PTY_TYPE_SLAVE;
-        pty_slave_driver->init_termios = tty_std_termios;
-        pty_slave_driver->init_termios.c_cflag = B38400 | CS8 | CREAD;
-        pty_slave_driver->init_termios.c_ispeed = 38400;
-        pty_slave_driver->init_termios.c_ospeed = 38400;
-        pty_slave_driver->flags = TTY_DRIVER_RESET_TERMIOS |
-                                        TTY_DRIVER_REAL_RAW;
-        pty_slave_driver->other = pty_driver;
-        tty_set_operations(pty_slave_driver, &slave_pty_ops_bsd);
-
-        if (tty_register_driver(pty_driver))
-                panic("Couldn't register pty driver");
-        if (tty_register_driver(pty_slave_driver))
-                panic("Couldn't register pty slave driver");
-}
-#else
-static inline void legacy_pty_init(void) { }
-#endif
-
-/* Unix98 devices */
-#ifdef CONFIG_UNIX98_PTYS
-/*
- * sysctl support for setting limits on the number of Unix98 ptys allocated.
- * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
- */
-int pty_limit = NR_UNIX98_PTY_DEFAULT;
-static int pty_limit_min;
-static int pty_limit_max = NR_UNIX98_PTY_MAX;
-static int pty_count;
-
-static struct cdev ptmx_cdev;
-
-static struct ctl_table pty_table[] = {
-        {
-                .procname       = "max",
-                .maxlen         = sizeof(int),
-                .mode           = 0644,
-                .data           = &pty_limit,
-                .proc_handler   = proc_dointvec_minmax,
-                .extra1         = &pty_limit_min,
-                .extra2         = &pty_limit_max,
-        }, {
-                .procname       = "nr",
-                .maxlen         = sizeof(int),
-                .mode           = 0444,
-                .data           = &pty_count,
-                .proc_handler   = proc_dointvec,
-        }, 
-        {}
-};
-
-static struct ctl_table pty_kern_table[] = {
-        {
-                .procname       = "pty",
-                .mode           = 0555,
-                .child          = pty_table,
-        },
-        {}
-};
-
-static struct ctl_table pty_root_table[] = {
-        {
-                .procname       = "kernel",
-                .mode           = 0555,
-                .child          = pty_kern_table,
-        },
-        {}
-};
-
-
-static int pty_unix98_ioctl(struct tty_struct *tty, struct file *file,
-                            unsigned int cmd, unsigned long arg)
-{
-        switch (cmd) {
-        case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
-                return pty_set_lock(tty, (int __user *)arg);
-        case TIOCGPTN: /* Get PT Number */
-                return put_user(tty->index, (unsigned int __user *)arg);
-        case TIOCSIG:    /* Send signal to other side of pty */
-                return pty_signal(tty, (int) arg);
-        }
-
-        return -ENOIOCTLCMD;
-}
-
-/**
- *      ptm_unix98_lookup       -       find a pty master
- *      @driver: ptm driver
- *      @idx: tty index
- *
- *      Look up a pty master device. Called under the tty_mutex for now.
- *      This provides our locking.
- */
-
-static struct tty_struct *ptm_unix98_lookup(struct tty_driver *driver,
-                struct inode *ptm_inode, int idx)
-{
-        struct tty_struct *tty = devpts_get_tty(ptm_inode, idx);
-        if (tty)
-                tty = tty->link;
-        return tty;
-}
-
-/**
- *      pts_unix98_lookup       -       find a pty slave
- *      @driver: pts driver
- *      @idx: tty index
- *
- *      Look up a pty master device. Called under the tty_mutex for now.
- *      This provides our locking.
- */
-
-static struct tty_struct *pts_unix98_lookup(struct tty_driver *driver,
-                struct inode *pts_inode, int idx)
-{
-        struct tty_struct *tty = devpts_get_tty(pts_inode, idx);
-        /* Master must be open before slave */
-        if (!tty)
-                return ERR_PTR(-EIO);
-        return tty;
-}
-
-static void pty_unix98_shutdown(struct tty_struct *tty)
-{
-        /* We have our own method as we don't use the tty index */
-        kfree(tty->termios);
-}
-
-/* We have no need to install and remove our tty objects as devpts does all
-   the work for us */
-
-static int pty_unix98_install(struct tty_driver *driver, struct tty_struct *tty)
-{
-        struct tty_struct *o_tty;
-        int idx = tty->index;
-
-        o_tty = alloc_tty_struct();
-        if (!o_tty)
-                return -ENOMEM;
-        if (!try_module_get(driver->other->owner)) {
-                /* This cannot in fact currently happen */
-                free_tty_struct(o_tty);
-                return -ENOMEM;
-        }
-        initialize_tty_struct(o_tty, driver->other, idx);
-
-        tty->termios = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);
-        if (tty->termios == NULL)
-                goto free_mem_out;
-        *tty->termios = driver->init_termios;
-        tty->termios_locked = tty->termios + 1;
-
-        o_tty->termios = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);
-        if (o_tty->termios == NULL)
-                goto free_mem_out;
-        *o_tty->termios = driver->other->init_termios;
-        o_tty->termios_locked = o_tty->termios + 1;
-
-        tty_driver_kref_get(driver->other);
-        if (driver->subtype == PTY_TYPE_MASTER)
-                o_tty->count++;
-        /* Establish the links in both directions */
-        tty->link   = o_tty;
-        o_tty->link = tty;
-        /*
-         * All structures have been allocated, so now we install them.
-         * Failures after this point use release_tty to clean up, so
-         * there's no need to null out the local pointers.
-         */
-        tty_driver_kref_get(driver);
-        tty->count++;
-        pty_count++;
-        return 0;
-free_mem_out:
-        kfree(o_tty->termios);
-        module_put(o_tty->driver->owner);
-        free_tty_struct(o_tty);
-        kfree(tty->termios);
-        return -ENOMEM;
-}
-
-static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
-{
-        pty_count--;
-}
-
-static const struct tty_operations ptm_unix98_ops = {
-        .lookup = ptm_unix98_lookup,
-        .install = pty_unix98_install,
-        .remove = pty_unix98_remove,
-        .open = pty_open,
-        .close = pty_close,
-        .write = pty_write,
-        .write_room = pty_write_room,
-        .flush_buffer = pty_flush_buffer,
-        .chars_in_buffer = pty_chars_in_buffer,
-        .unthrottle = pty_unthrottle,
-        .set_termios = pty_set_termios,
-        .ioctl = pty_unix98_ioctl,
-        .shutdown = pty_unix98_shutdown,
-        .resize = pty_resize
-};
-
-static const struct tty_operations pty_unix98_ops = {
-        .lookup = pts_unix98_lookup,
-        .install = pty_unix98_install,
-        .remove = pty_unix98_remove,
-        .open = pty_open,
-        .close = pty_close,
-        .write = pty_write,
-        .write_room = pty_write_room,
-        .flush_buffer = pty_flush_buffer,
-        .chars_in_buffer = pty_chars_in_buffer,
-        .unthrottle = pty_unthrottle,
-        .set_termios = pty_set_termios,
-        .shutdown = pty_unix98_shutdown
-};
-
-/**
- *      ptmx_open               -       open a unix 98 pty master
- *      @inode: inode of device file
- *      @filp: file pointer to tty
- *
- *      Allocate a unix98 pty master device from the ptmx driver.
- *
- *      Locking: tty_mutex protects the init_dev work. tty->count should
- *              protect the rest.
- *              allocated_ptys_lock handles the list of free pty numbers
- */
-
-static int ptmx_open(struct inode *inode, struct file *filp)
-{
-        struct tty_struct *tty;
-        int retval;
-        int index;
-
-        nonseekable_open(inode, filp);
-
-        /* find a device that is not in use. */
-        tty_lock();
-        index = devpts_new_index(inode);
-        tty_unlock();
-        if (index < 0)
-                return index;
-
-        mutex_lock(&tty_mutex);
-        tty_lock();
-        tty = tty_init_dev(ptm_driver, index, 1);
-        mutex_unlock(&tty_mutex);
-
-        if (IS_ERR(tty)) {
-                retval = PTR_ERR(tty);
-                goto out;
-        }
-
-        set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */
-
-        tty_add_file(tty, filp);
-
-        retval = devpts_pty_new(inode, tty->link);
-        if (retval)
-                goto out1;
-
-        retval = ptm_driver->ops->open(tty, filp);
-        if (retval)
-                goto out2;
-out1:
-        tty_unlock();
-        return retval;
-out2:
-        tty_unlock();
-        tty_release(inode, filp);
-        return retval;
-out:
-        devpts_kill_index(inode, index);
-        tty_unlock();
-        return retval;
-}
-
-static struct file_operations ptmx_fops;
-
-static void __init unix98_pty_init(void)
-{
-        ptm_driver = alloc_tty_driver(NR_UNIX98_PTY_MAX);
-        if (!ptm_driver)
-                panic("Couldn't allocate Unix98 ptm driver");
-        pts_driver = alloc_tty_driver(NR_UNIX98_PTY_MAX);
-        if (!pts_driver)
-                panic("Couldn't allocate Unix98 pts driver");
-
-        ptm_driver->owner = THIS_MODULE;
-        ptm_driver->driver_name = "pty_master";
-        ptm_driver->name = "ptm";
-        ptm_driver->major = UNIX98_PTY_MASTER_MAJOR;
-        ptm_driver->minor_start = 0;
-        ptm_driver->type = TTY_DRIVER_TYPE_PTY;
-        ptm_driver->subtype = PTY_TYPE_MASTER;
-        ptm_driver->init_termios = tty_std_termios;
-        ptm_driver->init_termios.c_iflag = 0;
-        ptm_driver->init_termios.c_oflag = 0;
-        ptm_driver->init_termios.c_cflag = B38400 | CS8 | CREAD;
-        ptm_driver->init_termios.c_lflag = 0;
-        ptm_driver->init_termios.c_ispeed = 38400;
-        ptm_driver->init_termios.c_ospeed = 38400;
-        ptm_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW |
-                TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM;
-        ptm_driver->other = pts_driver;
-        tty_set_operations(ptm_driver, &ptm_unix98_ops);
-
-        pts_driver->owner = THIS_MODULE;
-        pts_driver->driver_name = "pty_slave";
-        pts_driver->name = "pts";
-        pts_driver->major = UNIX98_PTY_SLAVE_MAJOR;
-        pts_driver->minor_start = 0;
-        pts_driver->type = TTY_DRIVER_TYPE_PTY;
-        pts_driver->subtype = PTY_TYPE_SLAVE;
-        pts_driver->init_termios = tty_std_termios;
-        pts_driver->init_termios.c_cflag = B38400 | CS8 | CREAD;
-        pts_driver->init_termios.c_ispeed = 38400;
-        pts_driver->init_termios.c_ospeed = 38400;
-        pts_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW |
-                TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM;
-        pts_driver->other = ptm_driver;
-        tty_set_operations(pts_driver, &pty_unix98_ops);
-
-        if (tty_register_driver(ptm_driver))
-                panic("Couldn't register Unix98 ptm driver");
-        if (tty_register_driver(pts_driver))
-                panic("Couldn't register Unix98 pts driver");
-
-        register_sysctl_table(pty_root_table);
-
-        /* Now create the /dev/ptmx special device */
-        tty_default_fops(&ptmx_fops);
-        ptmx_fops.open = ptmx_open;
-
-        cdev_init(&ptmx_cdev, &ptmx_fops);
-        if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
-            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
-                panic("Couldn't register /dev/ptmx driver\n");
-        device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
-}
-
-#else
-static inline void unix98_pty_init(void) { }
-#endif
-
-static int __init pty_init(void)
-{
-        legacy_pty_init();
-        unix98_pty_init();
-        return 0;
-}
-module_init(pty_init);
diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c
index 74f00b5ffa36..1a9f5f6d6ac5 100644
--- a/drivers/char/ramoops.c
+++ b/drivers/char/ramoops.c
@@ -25,11 +25,12 @@
 #include <linux/time.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/ramoops.h>
 
 #define RAMOOPS_KERNMSG_HDR "===="
-#define RAMOOPS_HEADER_SIZE   (5 + sizeof(struct timeval))
 
-#define RECORD_SIZE 4096
+#define RECORD_SIZE 4096UL
 
 static ulong mem_address;
 module_param(mem_address, ulong, 0400);
@@ -63,15 +64,22 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper,
                         struct ramoops_context, dump);
         unsigned long s1_start, s2_start;
         unsigned long l1_cpy, l2_cpy;
-        int res;
-        char *buf;
+        int res, hdr_size;
+        char *buf, *buf_orig;
         struct timeval timestamp;
 
+        if (reason != KMSG_DUMP_OOPS &&
+            reason != KMSG_DUMP_PANIC &&
+            reason != KMSG_DUMP_KEXEC)
+                return;
+
         /* Only dump oopses if dump_oops is set */
         if (reason == KMSG_DUMP_OOPS && !dump_oops)
                 return;
 
-        buf = (char *)(cxt->virt_addr + (cxt->count * RECORD_SIZE));
+        buf = cxt->virt_addr + (cxt->count * RECORD_SIZE);
+        buf_orig = buf;
+
         memset(buf, '\0', RECORD_SIZE);
         res = sprintf(buf, "%s", RAMOOPS_KERNMSG_HDR);
         buf += res;
@@ -79,8 +87,9 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper,
         res = sprintf(buf, "%lu.%lu\n", (long)timestamp.tv_sec, (long)timestamp.tv_usec);
         buf += res;
 
-        l2_cpy = min(l2, (unsigned long)(RECORD_SIZE - RAMOOPS_HEADER_SIZE));
-        l1_cpy = min(l1, (unsigned long)(RECORD_SIZE - RAMOOPS_HEADER_SIZE) - l2_cpy);
+        hdr_size = buf - buf_orig;
+        l2_cpy = min(l2, RECORD_SIZE - hdr_size);
+        l1_cpy = min(l1, RECORD_SIZE - hdr_size - l2_cpy);
 
         s2_start = l2 - l2_cpy;
         s1_start = l1 - l1_cpy;
@@ -91,11 +100,17 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper,
         cxt->count = (cxt->count + 1) % cxt->max_count;
 }
 
-static int __init ramoops_init(void)
+static int __init ramoops_probe(struct platform_device *pdev)
 {
+        struct ramoops_platform_data *pdata = pdev->dev.platform_data;
         struct ramoops_context *cxt = &oops_cxt;
         int err = -EINVAL;
 
+        if (pdata) {
+                mem_size = pdata->mem_size;
+                mem_address = pdata->mem_address;
+        }
+
         if (!mem_size) {
                 printk(KERN_ERR "ramoops: invalid size specification");
                 goto fail3;
@@ -142,7 +157,7 @@ fail3:
         return err;
 }
 
-static void __exit ramoops_exit(void)
+static int __exit ramoops_remove(struct platform_device *pdev)
 {
         struct ramoops_context *cxt = &oops_cxt;
 
@@ -151,8 +166,26 @@ static void __exit ramoops_exit(void)
 
         iounmap(cxt->virt_addr);
         release_mem_region(cxt->phys_addr, cxt->size);
+        return 0;
 }
 
+static struct platform_driver ramoops_driver = {
+        .remove         = __exit_p(ramoops_remove),
+        .driver         = {
+                .name   = "ramoops",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init ramoops_init(void)
+{
+        return platform_driver_probe(&ramoops_driver, ramoops_probe);
+}
+
+static void __exit ramoops_exit(void)
+{
+        platform_driver_unregister(&ramoops_driver);
+}
 
 module_init(ramoops_init);
 module_exit(ramoops_exit);
diff --git a/drivers/char/random.c b/drivers/char/random.c
index caef35a46890..d4ddeba56682 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -128,6 +128,7 @@
  *      void add_input_randomness(unsigned int type, unsigned int code,
  *                                unsigned int value);
  *      void add_interrupt_randomness(int irq);
+ *      void add_disk_randomness(struct gendisk *disk);
  *
  * add_input_randomness() uses the input layer interrupt timing, as well as
  * the event type information from the hardware.
@@ -136,9 +137,15 @@
  * inputs to the entropy pool.  Note that not all interrupts are good
  * sources of randomness!  For example, the timer interrupts is not a
  * good choice, because the periodicity of the interrupts is too
- * regular, and hence predictable to an attacker.  Disk interrupts are
- * a better measure, since the timing of the disk interrupts are more
- * unpredictable.
+ * regular, and hence predictable to an attacker.  Network Interface
+ * Controller interrupts are a better measure, since the timing of the
+ * NIC interrupts are more unpredictable.
+ *
+ * add_disk_randomness() uses what amounts to the seek time of block
+ * layer request events, on a per-disk_devt basis, as input to the
+ * entropy pool. Note that high-speed solid state drives with very low
+ * seek times do not make for good sources of entropy, as their seek
+ * times are usually fairly consistent.
  *
  * All of these routines try to estimate how many bits of randomness a
  * particular randomness source.  They do this by keeping track of the
@@ -626,7 +633,7 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
         preempt_disable();
         /* if over the trickle threshold, use only 1 in 4096 samples */
         if (input_pool.entropy_count > trickle_thresh &&
-            (__get_cpu_var(trickle_count)++ & 0xfff))
+            ((__this_cpu_inc_return(trickle_count) - 1) & 0xfff))
                 goto out;
 
         sample.jiffies = jiffies;
@@ -725,7 +732,7 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf,
                                size_t nbytes, int min, int rsvd);
 
 /*
- * This utility inline function is responsible for transfering entropy
+ * This utility inline function is responsible for transferring entropy
  * from the primary pool to the secondary extraction pool. We make
  * sure we pull enough for a 'catastrophic reseed'.
  */
@@ -1165,6 +1172,7 @@ const struct file_operations random_fops = {
         .poll  = random_poll,
         .unlocked_ioctl = random_ioctl,
         .fasync = random_fasync,
+        .llseek = noop_llseek,
 };
 
 const struct file_operations urandom_fops = {
@@ -1172,6 +1180,7 @@ const struct file_operations urandom_fops = {
         .write = random_write,
         .unlocked_ioctl = random_ioctl,
         .fasync = random_fasync,
+        .llseek = noop_llseek,
 };
 
 /***************************************************************
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index b38942f6bf31..b33e8ea314ed 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -19,8 +19,9 @@
 #include <linux/cdev.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
-#include <linux/smp_lock.h>
 #include <linux/gfp.h>
+#include <linux/compat.h>
+#include <linux/vmalloc.h>
 
 #include <asm/uaccess.h>
 
@@ -30,10 +31,15 @@ struct raw_device_data {
 };
 
 static struct class *raw_class;
-static struct raw_device_data raw_devices[MAX_RAW_MINORS];
+static struct raw_device_data *raw_devices;
 static DEFINE_MUTEX(raw_mutex);
 static const struct file_operations raw_ctl_fops; /* forward declaration */
 
+static int max_raw_minors = MAX_RAW_MINORS;
+
+module_param(max_raw_minors, int, 0);
+MODULE_PARM_DESC(max_raw_minors, "Maximum number of raw devices (1-65536)");
+
 /*
  * Open/close code for raw IO.
  *
@@ -55,7 +61,6 @@ static int raw_open(struct inode *inode, struct file *filp)
                 return 0;
         }
 
-        lock_kernel();
         mutex_lock(&raw_mutex);
 
         /*
@@ -66,15 +71,12 @@ static int raw_open(struct inode *inode, struct file *filp)
         if (!bdev)
                 goto out;
         igrab(bdev->bd_inode);
-        err = blkdev_get(bdev, filp->f_mode);
+        err = blkdev_get(bdev, filp->f_mode | FMODE_EXCL, raw_open);
         if (err)
                 goto out;
-        err = bd_claim(bdev, raw_open);
-        if (err)
-                goto out1;
         err = set_blocksize(bdev, bdev_logical_block_size(bdev));
         if (err)
-                goto out2;
+                goto out1;
         filp->f_flags |= O_DIRECT;
         filp->f_mapping = bdev->bd_inode->i_mapping;
         if (++raw_devices[minor].inuse == 1)
@@ -82,16 +84,12 @@ static int raw_open(struct inode *inode, struct file *filp)
                         bdev->bd_inode->i_mapping;
         filp->private_data = bdev;
         mutex_unlock(&raw_mutex);
-        unlock_kernel();
         return 0;
 
-out2:
-        bd_release(bdev);
 out1:
-        blkdev_put(bdev, filp->f_mode);
+        blkdev_put(bdev, filp->f_mode | FMODE_EXCL);
 out:
         mutex_unlock(&raw_mutex);
-        unlock_kernel();
         return err;
 }
 
@@ -113,8 +111,7 @@ static int raw_release(struct inode *inode, struct file *filp)
         }
         mutex_unlock(&raw_mutex);
 
-        bd_release(bdev);
-        blkdev_put(bdev, filp->f_mode);
+        blkdev_put(bdev, filp->f_mode | FMODE_EXCL);
         return 0;
 }
 
@@ -125,20 +122,84 @@ static long
 raw_ioctl(struct file *filp, unsigned int command, unsigned long arg)
 {
         struct block_device *bdev = filp->private_data;
-        int ret;
+        return blkdev_ioctl(bdev, 0, command, arg);
+}
 
-        lock_kernel();
-        ret = blkdev_ioctl(bdev, 0, command, arg);
-        unlock_kernel();
+static int bind_set(int number, u64 major, u64 minor)
+{
+        dev_t dev = MKDEV(major, minor);
+        struct raw_device_data *rawdev;
+        int err = 0;
 
-        return ret;
+        if (number <= 0 || number >= max_raw_minors)
+                return -EINVAL;
+
+        if (MAJOR(dev) != major || MINOR(dev) != minor)
+                return -EINVAL;
+
+        rawdev = &raw_devices[number];
+
+        /*
+         * This is like making block devices, so demand the
+         * same capability
+         */
+        if (!capable(CAP_SYS_ADMIN))
+                return -EPERM;
+
+        /*
+         * For now, we don't need to check that the underlying
+         * block device is present or not: we can do that when
+         * the raw device is opened.  Just check that the
+         * major/minor numbers make sense.
+         */
+
+        if (MAJOR(dev) == 0 && dev != 0)
+                return -EINVAL;
+
+        mutex_lock(&raw_mutex);
+        if (rawdev->inuse) {
+                mutex_unlock(&raw_mutex);
+                return -EBUSY;
+        }
+        if (rawdev->binding) {
+                bdput(rawdev->binding);
+                module_put(THIS_MODULE);
+        }
+        if (!dev) {
+                /* unbind */
+                rawdev->binding = NULL;
+                device_destroy(raw_class, MKDEV(RAW_MAJOR, number));
+        } else {
+                rawdev->binding = bdget(dev);
+                if (rawdev->binding == NULL) {
+                        err = -ENOMEM;
+                } else {
+                        dev_t raw = MKDEV(RAW_MAJOR, number);
+                        __module_get(THIS_MODULE);
+                        device_destroy(raw_class, raw);
+                        device_create(raw_class, NULL, raw, NULL,
+                                      "raw%d", number);
+                }
+        }
+        mutex_unlock(&raw_mutex);
+        return err;
 }
 
-static void bind_device(struct raw_config_request *rq)
+static int bind_get(int number, dev_t *dev)
 {
-        device_destroy(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor));
-        device_create(raw_class, NULL, MKDEV(RAW_MAJOR, rq->raw_minor), NULL,
-                      "raw%d", rq->raw_minor);
+        struct raw_device_data *rawdev;
+        struct block_device *bdev;
+
+        if (number <= 0 || number >= MAX_RAW_MINORS)
+                return -EINVAL;
+
+        rawdev = &raw_devices[number];
+
+        mutex_lock(&raw_mutex);
+        bdev = rawdev->binding;
+        *dev = bdev ? bdev->bd_dev : 0;
+        mutex_unlock(&raw_mutex);
+        return 0;
 }
 
 /*
@@ -149,106 +210,79 @@ static long raw_ctl_ioctl(struct file *filp, unsigned int command,
                           unsigned long arg)
 {
         struct raw_config_request rq;
-        struct raw_device_data *rawdev;
-        int err = 0;
+        dev_t dev;
+        int err;
 
-        lock_kernel();
         switch (command) {
         case RAW_SETBIND:
+                if (copy_from_user(&rq, (void __user *) arg, sizeof(rq)))
+                        return -EFAULT;
+
+                return bind_set(rq.raw_minor, rq.block_major, rq.block_minor);
+
         case RAW_GETBIND:
+                if (copy_from_user(&rq, (void __user *) arg, sizeof(rq)))
+                        return -EFAULT;
 
-                /* First, find out which raw minor we want */
+                err = bind_get(rq.raw_minor, &dev);
+                if (err)
+                        return err;
 
-                if (copy_from_user(&rq, (void __user *) arg, sizeof(rq))) {
-                        err = -EFAULT;
-                        goto out;
-                }
+                rq.block_major = MAJOR(dev);
+                rq.block_minor = MINOR(dev);
 
-                if (rq.raw_minor <= 0 || rq.raw_minor >= MAX_RAW_MINORS) {
-                        err = -EINVAL;
-                        goto out;
-                }
-                rawdev = &raw_devices[rq.raw_minor];
-
-                if (command == RAW_SETBIND) {
-                        dev_t dev;
-
-                        /*
-                         * This is like making block devices, so demand the
-                         * same capability
-                         */
-                        if (!capable(CAP_SYS_ADMIN)) {
-                                err = -EPERM;
-                                goto out;
-                        }
-
-                        /*
-                         * For now, we don't need to check that the underlying
-                         * block device is present or not: we can do that when
-                         * the raw device is opened.  Just check that the
-                         * major/minor numbers make sense.
-                         */
-
-                        dev = MKDEV(rq.block_major, rq.block_minor);
-                        if ((rq.block_major == 0 && rq.block_minor != 0) ||
-                                        MAJOR(dev) != rq.block_major ||
-                                        MINOR(dev) != rq.block_minor) {
-                                err = -EINVAL;
-                                goto out;
-                        }
-
-                        mutex_lock(&raw_mutex);
-                        if (rawdev->inuse) {
-                                mutex_unlock(&raw_mutex);
-                                err = -EBUSY;
-                                goto out;
-                        }
-                        if (rawdev->binding) {
-                                bdput(rawdev->binding);
-                                module_put(THIS_MODULE);
-                        }
-                        if (rq.block_major == 0 && rq.block_minor == 0) {
-                                /* unbind */
-                                rawdev->binding = NULL;
-                                device_destroy(raw_class,
-                                                MKDEV(RAW_MAJOR, rq.raw_minor));
-                        } else {
-                                rawdev->binding = bdget(dev);
-                                if (rawdev->binding == NULL)
-                                        err = -ENOMEM;
-                                else {
-                                        __module_get(THIS_MODULE);
-                                        bind_device(&rq);
-                                }
-                        }
-                        mutex_unlock(&raw_mutex);
-                } else {
-                        struct block_device *bdev;
-
-                        mutex_lock(&raw_mutex);
-                        bdev = rawdev->binding;
-                        if (bdev) {
-                                rq.block_major = MAJOR(bdev->bd_dev);
-                                rq.block_minor = MINOR(bdev->bd_dev);
-                        } else {
-                                rq.block_major = rq.block_minor = 0;
-                        }
-                        mutex_unlock(&raw_mutex);
-                        if (copy_to_user((void __user *)arg, &rq, sizeof(rq))) {
-                                err = -EFAULT;
-                                goto out;
-                        }
-                }
-                break;
-        default:
-                err = -EINVAL;
-                break;
+                if (copy_to_user((void __user *)arg, &rq, sizeof(rq)))
+                        return -EFAULT;
+
+                return 0;
         }
-out:
-        unlock_kernel();
-        return err;
+
+        return -EINVAL;
 }
 
+#ifdef CONFIG_COMPAT
+struct raw32_config_request {
+        compat_int_t    raw_minor;
+        compat_u64      block_major;
+        compat_u64      block_minor;
+};
+
+static long raw_ctl_compat_ioctl(struct file *file, unsigned int cmd,
+                                unsigned long arg)
+{
+        struct raw32_config_request __user *user_req = compat_ptr(arg);
+        struct raw32_config_request rq;
+        dev_t dev;
+        int err = 0;
+
+        switch (cmd) {
+        case RAW_SETBIND:
+                if (copy_from_user(&rq, user_req, sizeof(rq)))
+                        return -EFAULT;
+
+                return bind_set(rq.raw_minor, rq.block_major, rq.block_minor);
+
+        case RAW_GETBIND:
+                if (copy_from_user(&rq, user_req, sizeof(rq)))
+                        return -EFAULT;
+
+                err = bind_get(rq.raw_minor, &dev);
+                if (err)
+                        return err;
+
+                rq.block_major = MAJOR(dev);
+                rq.block_minor = MINOR(dev);
+
+                if (copy_to_user(user_req, &rq, sizeof(rq)))
+                        return -EFAULT;
+
+                return 0;
+        }
+
+        return -EINVAL;
+}
+#endif
+
 static const struct file_operations raw_fops = {
         .read           = do_sync_read,
         .aio_read       = generic_file_aio_read,
@@ -258,13 +292,18 @@ static const struct file_operations raw_fops = {
         .open           = raw_open,
         .release        = raw_release,
         .unlocked_ioctl = raw_ioctl,
+        .llseek         = default_llseek,
         .owner          = THIS_MODULE,
 };
 
 static const struct file_operations raw_ctl_fops = {
         .unlocked_ioctl = raw_ctl_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl   = raw_ctl_compat_ioctl,
+#endif
         .open           = raw_open,
         .owner          = THIS_MODULE,
+        .llseek         = noop_llseek,
 };
 
 static struct cdev raw_cdev;
@@ -279,14 +318,27 @@ static int __init raw_init(void)
         dev_t dev = MKDEV(RAW_MAJOR, 0);
         int ret;
 
-        ret = register_chrdev_region(dev, MAX_RAW_MINORS, "raw");
+        if (max_raw_minors < 1 || max_raw_minors > 65536) {
+                printk(KERN_WARNING "raw: invalid max_raw_minors (must be"
+                        " between 1 and 65536), using %d\n", MAX_RAW_MINORS);
+                max_raw_minors = MAX_RAW_MINORS;
+        }
+
+        raw_devices = vmalloc(sizeof(struct raw_device_data) * max_raw_minors);
+        if (!raw_devices) {
+                printk(KERN_ERR "Not enough memory for raw device structures\n");
+                ret = -ENOMEM;
+                goto error;
+        }
+        memset(raw_devices, 0, sizeof(struct raw_device_data) * max_raw_minors);
+
+        ret = register_chrdev_region(dev, max_raw_minors, "raw");
         if (ret)
                 goto error;
 
         cdev_init(&raw_cdev, &raw_fops);
-        ret = cdev_add(&raw_cdev, dev, MAX_RAW_MINORS);
+        ret = cdev_add(&raw_cdev, dev, max_raw_minors);
         if (ret) {
-                kobject_put(&raw_cdev.kobj);
                 goto error_region;
         }
 
@@ -303,8 +355,9 @@ static int __init raw_init(void)
         return 0;
 
 error_region:
-        unregister_chrdev_region(dev, MAX_RAW_MINORS);
+        unregister_chrdev_region(dev, max_raw_minors);
 error:
+        vfree(raw_devices);
         return ret;
 }
 
@@ -313,7 +366,7 @@ static void __exit raw_exit(void)
         device_destroy(raw_class, MKDEV(RAW_MAJOR, 0));
         class_destroy(raw_class);
         cdev_del(&raw_cdev);
-        unregister_chrdev_region(MKDEV(RAW_MAJOR, 0), MAX_RAW_MINORS);
+        unregister_chrdev_region(MKDEV(RAW_MAJOR, 0), max_raw_minors);
 }
 
 module_init(raw_init);
diff --git a/drivers/char/rio/Makefile b/drivers/char/rio/Makefile
deleted file mode 100644
index 2d1c5a7cba7d..000000000000
--- a/drivers/char/rio/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile for the linux rio-subsystem.
-#
-# (C) R.E.Wolff@BitWizard.nl 
-# 
-# This file is GPL. See other files for the full Blurb. I'm lazy today. 
-#
-
-obj-$(CONFIG_RIO) += rio.o
-
-rio-objs := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \
-            rioparam.o rioroute.o riotable.o riotty.o
diff --git a/drivers/char/rio/board.h b/drivers/char/rio/board.h
deleted file mode 100644
index bdea633a9076..000000000000
--- a/drivers/char/rio/board.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources. 
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : board.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 11:34:07
-**      Retrieved       : 11/6/98 11:34:20
-**
-**  ident @(#)board.h   1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_board_h__
-#define __rio_board_h__
-
-/*
-** board.h contains the definitions for the *hardware* of the host cards.
-** It describes the memory overlay for the dual port RAM area.
-*/
-
-#define DP_SRAM1_SIZE   0x7C00
-#define DP_SRAM2_SIZE   0x0200
-#define DP_SRAM3_SIZE   0x7000
-#define DP_SCRATCH_SIZE 0x1000
-#define DP_PARMMAP_ADDR 0x01FE  /* offset into SRAM2 */
-#define DP_STARTUP_ADDR 0x01F8  /* offset into SRAM2 */
-
-/*
-**      The shape of the Host Control area, at offset 0x7C00, Write Only
-*/
-struct s_Ctrl {
-        u8 DpCtl;               /* 7C00 */
-        u8 Dp_Unused2_[127];
-        u8 DpIntSet;            /* 7C80 */
-        u8 Dp_Unused3_[127];
-        u8 DpTpuReset;  /* 7D00 */
-        u8 Dp_Unused4_[127];
-        u8 DpIntReset;  /* 7D80 */
-        u8 Dp_Unused5_[127];
-};
-
-/*
-** The PROM data area on the host (0x7C00), Read Only
-*/
-struct s_Prom {
-        u16 DpSlxCode[2];
-        u16 DpRev;
-        u16 Dp_Unused6_;
-        u16 DpUniq[4];
-        u16 DpJahre;
-        u16 DpWoche;
-        u16 DpHwFeature[5];
-        u16 DpOemId;
-        u16 DpSiggy[16];
-};
-
-/*
-** Union of the Ctrl and Prom areas
-*/
-union u_CtrlProm {              /* This is the control/PROM area (0x7C00) */
-        struct s_Ctrl DpCtrl;
-        struct s_Prom DpProm;
-};
-
-/*
-** The top end of memory!
-*/
-struct s_ParmMapS {             /* Area containing Parm Map Pointer */
-        u8 Dp_Unused8_[DP_PARMMAP_ADDR];
-        u16 DpParmMapAd;
-};
-
-struct s_StartUpS {
-        u8 Dp_Unused9_[DP_STARTUP_ADDR];
-        u8 Dp_LongJump[0x4];
-        u8 Dp_Unused10_[2];
-        u8 Dp_ShortJump[0x2];
-};
-
-union u_Sram2ParmMap {          /* This is the top of memory (0x7E00-0x7FFF) */
-        u8 DpSramMem[DP_SRAM2_SIZE];
-        struct s_ParmMapS DpParmMapS;
-        struct s_StartUpS DpStartUpS;
-};
-
-/*
-**      This is the DP RAM overlay.
-*/
-struct DpRam {
-        u8 DpSram1[DP_SRAM1_SIZE];      /* 0000 - 7BFF */
-        union u_CtrlProm DpCtrlProm;    /* 7C00 - 7DFF */
-        union u_Sram2ParmMap DpSram2ParmMap;    /* 7E00 - 7FFF */
-        u8 DpScratch[DP_SCRATCH_SIZE];  /* 8000 - 8FFF */
-        u8 DpSram3[DP_SRAM3_SIZE];      /* 9000 - FFFF */
-};
-
-#define DpControl       DpCtrlProm.DpCtrl.DpCtl
-#define DpSetInt        DpCtrlProm.DpCtrl.DpIntSet
-#define DpResetTpu      DpCtrlProm.DpCtrl.DpTpuReset
-#define DpResetInt      DpCtrlProm.DpCtrl.DpIntReset
-
-#define DpSlx           DpCtrlProm.DpProm.DpSlxCode
-#define DpRevision      DpCtrlProm.DpProm.DpRev
-#define DpUnique        DpCtrlProm.DpProm.DpUniq
-#define DpYear          DpCtrlProm.DpProm.DpJahre
-#define DpWeek          DpCtrlProm.DpProm.DpWoche
-#define DpSignature     DpCtrlProm.DpProm.DpSiggy
-
-#define DpParmMapR      DpSram2ParmMap.DpParmMapS.DpParmMapAd
-#define DpSram2         DpSram2ParmMap.DpSramMem
-
-#endif
diff --git a/drivers/char/rio/cirrus.h b/drivers/char/rio/cirrus.h
deleted file mode 100644
index 5ab51679caa2..000000000000
--- a/drivers/char/rio/cirrus.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/****************************************************************************
- *******                                                              *******
- *******                CIRRUS.H                                      *******
- *******                                                              *******
- ****************************************************************************
-
- Author  : Jeremy Rolls
- Date    : 3 Aug 1990
-
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- Version : 0.01
-
-
-                            Mods
- ----------------------------------------------------------------------------
-  Date     By                Description
- ----------------------------------------------------------------------------
-
- ***************************************************************************/
-
-#ifndef _cirrus_h
-#define _cirrus_h 1
-
-/* Bit fields for particular registers shared with driver */
-
-/* COR1 - driver and RTA */
-#define RIOC_COR1_ODD           0x80    /* Odd parity */
-#define RIOC_COR1_EVEN          0x00    /* Even parity */
-#define RIOC_COR1_NOP           0x00    /* No parity */
-#define RIOC_COR1_FORCE         0x20    /* Force parity */
-#define RIOC_COR1_NORMAL        0x40    /* With parity */
-#define RIOC_COR1_1STOP         0x00    /* 1 stop bit */
-#define RIOC_COR1_15STOP        0x04    /* 1.5 stop bits */
-#define RIOC_COR1_2STOP         0x08    /* 2 stop bits */
-#define RIOC_COR1_5BITS         0x00    /* 5 data bits */
-#define RIOC_COR1_6BITS         0x01    /* 6 data bits */
-#define RIOC_COR1_7BITS         0x02    /* 7 data bits */
-#define RIOC_COR1_8BITS         0x03    /* 8 data bits */
-
-#define RIOC_COR1_HOST          0xef    /* Safe host bits */
-
-/* RTA only */
-#define RIOC_COR1_CINPCK        0x00    /* Check parity of received characters */
-#define RIOC_COR1_CNINPCK       0x10    /* Don't check parity */
-
-/* COR2 bits for both RTA and driver use */
-#define RIOC_COR2_IXANY         0x80    /* IXANY - any character is XON */
-#define RIOC_COR2_IXON          0x40    /* IXON - enable tx soft flowcontrol */
-#define RIOC_COR2_RTSFLOW       0x02    /* Enable tx hardware flow control */
-
-/* Additional driver bits */
-#define RIOC_COR2_HUPCL         0x20    /* Hang up on close */
-#define RIOC_COR2_CTSFLOW       0x04    /* Enable rx hardware flow control */
-#define RIOC_COR2_IXOFF         0x01    /* Enable rx software flow control */
-#define RIOC_COR2_DTRFLOW       0x08    /* Enable tx hardware flow control */
-
-/* RTA use only */
-#define RIOC_COR2_ETC           0x20    /* Embedded transmit options */
-#define RIOC_COR2_LOCAL         0x10    /* Local loopback mode */
-#define RIOC_COR2_REMOTE        0x08    /* Remote loopback mode */
-#define RIOC_COR2_HOST          0xc2    /* Safe host bits */
-
-/* COR3 - RTA use only */
-#define RIOC_COR3_SCDRNG        0x80    /* Enable special char detect for range */
-#define RIOC_COR3_SCD34         0x40    /* Special character detect for SCHR's 3 + 4 */
-#define RIOC_COR3_FCT           0x20    /* Flow control transparency */
-#define RIOC_COR3_SCD12         0x10    /* Special character detect for SCHR's 1 + 2 */
-#define RIOC_COR3_FIFO12        0x0c    /* 12 chars for receive FIFO threshold */
-#define RIOC_COR3_FIFO10        0x0a    /* 10 chars for receive FIFO threshold */
-#define RIOC_COR3_FIFO8         0x08    /* 8 chars for receive FIFO threshold */
-#define RIOC_COR3_FIFO6         0x06    /* 6 chars for receive FIFO threshold */
-
-#define RIOC_COR3_THRESHOLD     RIOC_COR3_FIFO8 /* MUST BE LESS THAN MCOR_THRESHOLD */
-
-#define RIOC_COR3_DEFAULT       (RIOC_COR3_FCT | RIOC_COR3_THRESHOLD)
-                                /* Default bits for COR3 */
-
-/* COR4 driver and RTA use */
-#define RIOC_COR4_IGNCR         0x80    /* Throw away CR's on input */
-#define RIOC_COR4_ICRNL         0x40    /* Map CR -> NL on input */
-#define RIOC_COR4_INLCR         0x20    /* Map NL -> CR on input */
-#define RIOC_COR4_IGNBRK        0x10    /* Ignore Break */
-#define RIOC_COR4_NBRKINT       0x08    /* No interrupt on break (-BRKINT) */
-#define RIOC_COR4_RAISEMOD      0x01    /* Raise modem output lines on non-zero baud */
-
-
-/* COR4 driver only */
-#define RIOC_COR4_IGNPAR        0x04    /* IGNPAR (ignore characters with errors) */
-#define RIOC_COR4_PARMRK        0x02    /* PARMRK */
-
-#define RIOC_COR4_HOST          0xf8    /* Safe host bits */
-
-/* COR4 RTA only */
-#define RIOC_COR4_CIGNPAR       0x02    /* Thrown away bad characters */
-#define RIOC_COR4_CPARMRK       0x04    /* PARMRK characters */
-#define RIOC_COR4_CNPARMRK      0x03    /* Don't PARMRK */
-
-/* COR5 driver and RTA use */
-#define RIOC_COR5_ISTRIP        0x80    /* Strip input chars to 7 bits */
-#define RIOC_COR5_LNE           0x40    /* Enable LNEXT processing */
-#define RIOC_COR5_CMOE          0x20    /* Match good and errored characters */
-#define RIOC_COR5_ONLCR         0x02    /* NL -> CR NL on output */
-#define RIOC_COR5_OCRNL         0x01    /* CR -> NL on output */
-
-/*
-** Spare bits - these are not used in the CIRRUS registers, so we use
-** them to set various other features.
-*/
-/*
-** tstop and tbusy indication
-*/
-#define RIOC_COR5_TSTATE_ON     0x08    /* Turn on monitoring of tbusy and tstop */
-#define RIOC_COR5_TSTATE_OFF    0x04    /* Turn off monitoring of tbusy and tstop */
-/*
-** TAB3
-*/
-#define RIOC_COR5_TAB3          0x10    /* TAB3 mode */
-
-#define RIOC_COR5_HOST          0xc3    /* Safe host bits */
-
-/* CCSR */
-#define RIOC_CCSR_TXFLOFF       0x04    /* Tx is xoffed */
-
-/* MSVR1 */
-/* NB. DTR / CD swapped from Cirrus spec as the pins are also reversed on the
-   RTA. This is because otherwise DCD would get lost on the 1 parallel / 3
-   serial option.
-*/
-#define RIOC_MSVR1_CD           0x80    /* CD (DSR on Cirrus) */
-#define RIOC_MSVR1_RTS          0x40    /* RTS (CTS on Cirrus) */
-#define RIOC_MSVR1_RI           0x20    /* RI */
-#define RIOC_MSVR1_DTR          0x10    /* DTR (CD on Cirrus) */
-#define RIOC_MSVR1_CTS          0x01    /* CTS output pin (RTS on Cirrus) */
-/* Next two used to indicate state of tbusy and tstop to driver */
-#define RIOC_MSVR1_TSTOP        0x08    /* Set if port flow controlled */
-#define RIOC_MSVR1_TEMPTY       0x04    /* Set if port tx buffer empty */
-
-#define RIOC_MSVR1_HOST         0xf3    /* The bits the host wants */
-
-/* Defines for the subscripts of a CONFIG packet */
-#define RIOC_CONFIG_COR1        1       /* Option register 1 */
-#define RIOC_CONFIG_COR2        2       /* Option register 2 */
-#define RIOC_CONFIG_COR4        3       /* Option register 4 */
-#define RIOC_CONFIG_COR5        4       /* Option register 5 */
-#define RIOC_CONFIG_TXXON       5       /* Tx XON character */
-#define RIOC_CONFIG_TXXOFF      6       /* Tx XOFF character */
-#define RIOC_CONFIG_RXXON       7       /* Rx XON character */
-#define RIOC_CONFIG_RXXOFF      8       /* Rx XOFF character */
-#define RIOC_CONFIG_LNEXT       9       /* LNEXT character */
-#define RIOC_CONFIG_TXBAUD      10      /* Tx baud rate */
-#define RIOC_CONFIG_RXBAUD      11      /* Rx baud rate */
-
-#define RIOC_PRE_EMPTIVE        0x80    /* Pre-emptive bit in command field */
-
-/* Packet types going from Host to remote - with the exception of OPEN, MOPEN,
-   CONFIG, SBREAK and MEMDUMP the remaining bytes of the data array will not
-   be used 
-*/
-#define RIOC_OPEN               0x00    /* Open a port */
-#define RIOC_CONFIG             0x01    /* Configure a port */
-#define RIOC_MOPEN              0x02    /* Modem open (block for DCD) */
-#define RIOC_CLOSE              0x03    /* Close a port */
-#define RIOC_WFLUSH             (0x04 | RIOC_PRE_EMPTIVE)       /* Write flush */
-#define RIOC_RFLUSH             (0x05 | RIOC_PRE_EMPTIVE)       /* Read flush */
-#define RIOC_RESUME             (0x06 | RIOC_PRE_EMPTIVE)       /* Resume if xoffed */
-#define RIOC_SBREAK             0x07    /* Start break */
-#define RIOC_EBREAK             0x08    /* End break */
-#define RIOC_SUSPEND            (0x09 | RIOC_PRE_EMPTIVE)       /* Susp op (behave as tho xoffed) */
-#define RIOC_FCLOSE             (0x0a | RIOC_PRE_EMPTIVE)       /* Force close */
-#define RIOC_XPRINT             0x0b    /* Xprint packet */
-#define RIOC_MBIS               (0x0c | RIOC_PRE_EMPTIVE)       /* Set modem lines */
-#define RIOC_MBIC               (0x0d | RIOC_PRE_EMPTIVE)       /* Clear modem lines */
-#define RIOC_MSET               (0x0e | RIOC_PRE_EMPTIVE)       /* Set modem lines */
-#define RIOC_PCLOSE             0x0f    /* Pseudo close - Leaves rx/tx enabled */
-#define RIOC_MGET               (0x10 | RIOC_PRE_EMPTIVE)       /* Force update of modem status */
-#define RIOC_MEMDUMP            (0x11 | RIOC_PRE_EMPTIVE)       /* Send back mem from addr supplied */
-#define RIOC_READ_REGISTER      (0x12 | RIOC_PRE_EMPTIVE)       /* Read CD1400 register (debug) */
-
-/* "Command" packets going from remote to host COMPLETE and MODEM_STATUS
-   use data[4] / data[3] to indicate current state and modem status respectively
-*/
-
-#define RIOC_COMPLETE           (0x20 | RIOC_PRE_EMPTIVE)
-                                /* Command complete */
-#define RIOC_BREAK_RECEIVED     (0x21 | RIOC_PRE_EMPTIVE)
-                                /* Break received */
-#define RIOC_MODEM_STATUS       (0x22 | RIOC_PRE_EMPTIVE)
-                                /* Change in modem status */
-
-/* "Command" packet that could go either way - handshake wake-up */
-#define RIOC_HANDSHAKE          (0x23 | RIOC_PRE_EMPTIVE)
-                                /* Wake-up to HOST / RTA */
-
-#endif
diff --git a/drivers/char/rio/cmdblk.h b/drivers/char/rio/cmdblk.h
deleted file mode 100644
index 9ed4f861675a..000000000000
--- a/drivers/char/rio/cmdblk.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : cmdblk.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 11:34:09
-**      Retrieved       : 11/6/98 11:34:20
-**
-**  ident @(#)cmdblk.h  1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_cmdblk_h__
-#define __rio_cmdblk_h__
-
-/*
-** the structure of a command block, used to queue commands destined for
-** a rup.
-*/
-
-struct CmdBlk {
-        struct CmdBlk *NextP;   /* Pointer to next command block */
-        struct PKT Packet;      /* A packet, to copy to the rup */
-        /* The func to call to check if OK */
-        int (*PreFuncP) (unsigned long, struct CmdBlk *);
-        int PreArg;             /* The arg for the func */
-        /* The func to call when completed */
-        int (*PostFuncP) (unsigned long, struct CmdBlk *);
-        int PostArg;            /* The arg for the func */
-};
-
-#define NUM_RIO_CMD_BLKS (3 * (MAX_RUP * 4 + LINKS_PER_UNIT * 4))
-#endif
diff --git a/drivers/char/rio/cmdpkt.h b/drivers/char/rio/cmdpkt.h
deleted file mode 100644
index c1e7a2798070..000000000000
--- a/drivers/char/rio/cmdpkt.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : cmdpkt.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 11:34:09
-**      Retrieved       : 11/6/98 11:34:20
-**
-**  ident @(#)cmdpkt.h  1.2
-**
-** -----------------------------------------------------------------------------
-*/
-#ifndef __rio_cmdpkt_h__
-#define __rio_cmdpkt_h__
-
-/*
-** overlays for the data area of a packet. Used in both directions
-** (to build a packet to send, and to interpret a packet that arrives)
-** and is very inconvenient for MIPS, so they appear as two separate
-** structures - those used for modifying/reading packets on the card
-** and those for modifying/reading packets in real memory, which have an _M
-** suffix.
-*/
-
-#define RTA_BOOT_DATA_SIZE (PKT_MAX_DATA_LEN-2)
-
-/*
-** The boot information packet looks like this:
-** This structure overlays a PktCmd->CmdData structure, and so starts
-** at Data[2] in the actual pkt!
-*/
-struct BootSequence {
-        u16 NumPackets;
-        u16 LoadBase;
-        u16 CodeSize;
-};
-
-#define BOOT_SEQUENCE_LEN       8
-
-struct SamTop {
-        u8 Unit;
-        u8 Link;
-};
-
-struct CmdHdr {
-        u8 PcCommand;
-        union {
-                u8 PcPhbNum;
-                u8 PcLinkNum;
-                u8 PcIDNum;
-        } U0;
-};
-
-
-struct PktCmd {
-        union {
-                struct {
-                        struct CmdHdr CmdHdr;
-                        struct BootSequence PcBootSequence;
-                } S1;
-                struct {
-                        u16 PcSequence;
-                        u8 PcBootData[RTA_BOOT_DATA_SIZE];
-                } S2;
-                struct {
-                        u16 __crud__;
-                        u8 PcUniqNum[4];        /* this is really a uint. */
-                        u8 PcModuleTypes;       /* what modules are fitted */
-                } S3;
-                struct {
-                        struct CmdHdr CmdHdr;
-                        u8 __undefined__;
-                        u8 PcModemStatus;
-                        u8 PcPortStatus;
-                        u8 PcSubCommand;        /* commands like mem or register dump */
-                        u16 PcSubAddr;  /* Address for command */
-                        u8 PcSubData[64];       /* Date area for command */
-                } S4;
-                struct {
-                        struct CmdHdr CmdHdr;
-                        u8 PcCommandText[1];
-                        u8 __crud__[20];
-                        u8 PcIDNum2;    /* It had to go somewhere! */
-                } S5;
-                struct {
-                        struct CmdHdr CmdHdr;
-                        struct SamTop Topology[LINKS_PER_UNIT];
-                } S6;
-        } U1;
-};
-
-struct PktCmd_M {
-        union {
-                struct {
-                        struct {
-                                u8 PcCommand;
-                                union {
-                                        u8 PcPhbNum;
-                                        u8 PcLinkNum;
-                                        u8 PcIDNum;
-                                } U0;
-                        } CmdHdr;
-                        struct {
-                                u16 NumPackets;
-                                u16 LoadBase;
-                                u16 CodeSize;
-                        } PcBootSequence;
-                } S1;
-                struct {
-                        u16 PcSequence;
-                        u8 PcBootData[RTA_BOOT_DATA_SIZE];
-                } S2;
-                struct {
-                        u16 __crud__;
-                        u8 PcUniqNum[4];        /* this is really a uint. */
-                        u8 PcModuleTypes;       /* what modules are fitted */
-                } S3;
-                struct {
-                        u16 __cmd_hdr__;
-                        u8 __undefined__;
-                        u8 PcModemStatus;
-                        u8 PcPortStatus;
-                        u8 PcSubCommand;
-                        u16 PcSubAddr;
-                        u8 PcSubData[64];
-                } S4;
-                struct {
-                        u16 __cmd_hdr__;
-                        u8 PcCommandText[1];
-                        u8 __crud__[20];
-                        u8 PcIDNum2;    /* Tacked on end */
-                } S5;
-                struct {
-                        u16 __cmd_hdr__;
-                        struct Top Topology[LINKS_PER_UNIT];
-                } S6;
-        } U1;
-};
-
-#define Command         U1.S1.CmdHdr.PcCommand
-#define PhbNum          U1.S1.CmdHdr.U0.PcPhbNum
-#define IDNum           U1.S1.CmdHdr.U0.PcIDNum
-#define IDNum2          U1.S5.PcIDNum2
-#define LinkNum         U1.S1.CmdHdr.U0.PcLinkNum
-#define Sequence        U1.S2.PcSequence
-#define BootData        U1.S2.PcBootData
-#define BootSequence    U1.S1.PcBootSequence
-#define UniqNum         U1.S3.PcUniqNum
-#define ModemStatus     U1.S4.PcModemStatus
-#define PortStatus      U1.S4.PcPortStatus
-#define SubCommand      U1.S4.PcSubCommand
-#define SubAddr         U1.S4.PcSubAddr
-#define SubData         U1.S4.PcSubData
-#define CommandText     U1.S5.PcCommandText
-#define RouteTopology   U1.S6.Topology
-#define ModuleTypes     U1.S3.PcModuleTypes
-
-#endif
diff --git a/drivers/char/rio/daemon.h b/drivers/char/rio/daemon.h
deleted file mode 100644
index 4af90323fd00..000000000000
--- a/drivers/char/rio/daemon.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : daemon.h
-**      SID             : 1.3
-**      Last Modified   : 11/6/98 11:34:09
-**      Retrieved       : 11/6/98 11:34:21
-**
-**  ident @(#)daemon.h  1.3
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_daemon_h__
-#define __rio_daemon_h__
-
-
-/*
-** structures used on /dev/rio
-*/
-
-struct Error {
-        unsigned int Error;
-        unsigned int Entry;
-        unsigned int Other;
-};
-
-struct DownLoad {
-        char __user *DataP;
-        unsigned int Count;
-        unsigned int ProductCode;
-};
-
-/*
-** A few constants....
-*/
-#ifndef MAX_VERSION_LEN
-#define MAX_VERSION_LEN 256
-#endif
-
-#ifndef MAX_XP_CTRL_LEN
-#define MAX_XP_CTRL_LEN 16      /* ALSO IN PORT.H */
-#endif
-
-struct PortSetup {
-        unsigned int From;              /* Set/Clear XP & IXANY Control from this port.... */
-        unsigned int To;                /* .... to this port */
-        unsigned int XpCps;             /* at this speed */
-        char XpOn[MAX_XP_CTRL_LEN];     /* this is the start string */
-        char XpOff[MAX_XP_CTRL_LEN];    /* this is the stop string */
-        u8 IxAny;                       /* enable/disable IXANY */
-        u8 IxOn;                        /* enable/disable IXON */
-        u8 Lock;                        /* lock port params */
-        u8 Store;                       /* store params across closes */
-        u8 Drain;                       /* close only when drained */
-};
-
-struct LpbReq {
-        unsigned int Host;
-        unsigned int Link;
-        struct LPB __user *LpbP;
-};
-
-struct RupReq {
-        unsigned int HostNum;
-        unsigned int RupNum;
-        struct RUP __user *RupP;
-};
-
-struct PortReq {
-        unsigned int SysPort;
-        struct Port __user *PortP;
-};
-
-struct StreamInfo {
-        unsigned int SysPort;
-        int RQueue;
-        int WQueue;
-};
-
-struct HostReq {
-        unsigned int HostNum;
-        struct Host __user *HostP;
-};
-
-struct HostDpRam {
-        unsigned int HostNum;
-        struct DpRam __user *DpRamP;
-};
-
-struct DebugCtrl {
-        unsigned int SysPort;
-        unsigned int Debug;
-        unsigned int Wait;
-};
-
-struct MapInfo {
-        unsigned int FirstPort;         /* 8 ports, starting from this (tty) number */
-        unsigned int RtaUnique;         /* reside on this RTA (unique number) */
-};
-
-struct MapIn {
-        unsigned int NumEntries;        /* How many port sets are we mapping? */
-        struct MapInfo *MapInfoP;       /* Pointer to (user space) info */
-};
-
-struct SendPack {
-        unsigned int PortNum;
-        unsigned char Len;
-        unsigned char Data[PKT_MAX_DATA_LEN];
-};
-
-struct SpecialRupCmd {
-        struct PKT Packet;
-        unsigned short Host;
-        unsigned short RupNum;
-};
-
-struct IdentifyRta {
-        unsigned long RtaUnique;
-        u8 ID;
-};
-
-struct KillNeighbour {
-        unsigned long UniqueNum;
-        u8 Link;
-};
-
-struct rioVersion {
-        char version[MAX_VERSION_LEN];
-        char relid[MAX_VERSION_LEN];
-        int buildLevel;
-        char buildDate[MAX_VERSION_LEN];
-};
-
-
-/*
-**      RIOC commands are for the daemon type operations
-**
-** 09.12.1998 ARG - ESIL 0776 part fix
-** Definition for 'RIOC' also appears in rioioctl.h, so we'd better do a
-** #ifndef here first.
-** rioioctl.h also now has #define 'RIO_QUICK_CHECK' as this ioctl is now
-** allowed to be used by customers.
-*/
-#ifndef RIOC
-#define RIOC    ('R'<<8)|('i'<<16)|('o'<<24)
-#endif
-
-/*
-** Boot stuff
-*/
-#define RIO_GET_TABLE     (RIOC | 100)
-#define RIO_PUT_TABLE     (RIOC | 101)
-#define RIO_ASSIGN_RTA    (RIOC | 102)
-#define RIO_DELETE_RTA    (RIOC | 103)
-#define RIO_HOST_FOAD     (RIOC | 104)
-#define RIO_QUICK_CHECK   (RIOC | 105)
-#define RIO_SIGNALS_ON    (RIOC | 106)
-#define RIO_SIGNALS_OFF   (RIOC | 107)
-#define RIO_CHANGE_NAME   (RIOC | 108)
-#define RIO_DOWNLOAD      (RIOC | 109)
-#define RIO_GET_LOG       (RIOC | 110)
-#define RIO_SETUP_PORTS   (RIOC | 111)
-#define RIO_ALL_MODEM     (RIOC | 112)
-
-/*
-** card state, debug stuff
-*/
-#define RIO_NUM_HOSTS     (RIOC | 120)
-#define RIO_HOST_LPB      (RIOC | 121)
-#define RIO_HOST_RUP      (RIOC | 122)
-#define RIO_HOST_PORT     (RIOC | 123)
-#define RIO_PARMS         (RIOC | 124)
-#define RIO_HOST_REQ      (RIOC | 125)
-#define RIO_READ_CONFIG   (RIOC | 126)
-#define RIO_SET_CONFIG    (RIOC | 127)
-#define RIO_VERSID        (RIOC | 128)
-#define RIO_FLAGS         (RIOC | 129)
-#define RIO_SETDEBUG      (RIOC | 130)
-#define RIO_GETDEBUG      (RIOC | 131)
-#define RIO_READ_LEVELS   (RIOC | 132)
-#define RIO_SET_FAST_BUS  (RIOC | 133)
-#define RIO_SET_SLOW_BUS  (RIOC | 134)
-#define RIO_SET_BYTE_MODE (RIOC | 135)
-#define RIO_SET_WORD_MODE (RIOC | 136)
-#define RIO_STREAM_INFO   (RIOC | 137)
-#define RIO_START_POLLER  (RIOC | 138)
-#define RIO_STOP_POLLER   (RIOC | 139)
-#define RIO_LAST_ERROR    (RIOC | 140)
-#define RIO_TICK          (RIOC | 141)
-#define RIO_TOCK          (RIOC | 241)  /* I did this on purpose, you know. */
-#define RIO_SEND_PACKET   (RIOC | 142)
-#define RIO_SET_BUSY      (RIOC | 143)
-#define SPECIAL_RUP_CMD   (RIOC | 144)
-#define RIO_FOAD_RTA      (RIOC | 145)
-#define RIO_ZOMBIE_RTA    (RIOC | 146)
-#define RIO_IDENTIFY_RTA  (RIOC | 147)
-#define RIO_KILL_NEIGHBOUR (RIOC | 148)
-#define RIO_DEBUG_MEM     (RIOC | 149)
-/*
-** 150 - 167 used.....   See below
-*/
-#define RIO_GET_PORT_SETUP (RIOC | 168)
-#define RIO_RESUME        (RIOC | 169)
-#define RIO_MESG        (RIOC | 170)
-#define RIO_NO_MESG     (RIOC | 171)
-#define RIO_WHAT_MESG   (RIOC | 172)
-#define RIO_HOST_DPRAM  (RIOC | 173)
-#define RIO_MAP_B50_TO_50       (RIOC | 174)
-#define RIO_MAP_B50_TO_57600    (RIOC | 175)
-#define RIO_MAP_B110_TO_110     (RIOC | 176)
-#define RIO_MAP_B110_TO_115200  (RIOC | 177)
-#define RIO_GET_PORT_PARAMS     (RIOC | 178)
-#define RIO_SET_PORT_PARAMS     (RIOC | 179)
-#define RIO_GET_PORT_TTY        (RIOC | 180)
-#define RIO_SET_PORT_TTY        (RIOC | 181)
-#define RIO_SYSLOG_ONLY (RIOC | 182)
-#define RIO_SYSLOG_CONS (RIOC | 183)
-#define RIO_CONS_ONLY   (RIOC | 184)
-#define RIO_BLOCK_OPENS (RIOC | 185)
-
-/*
-** 02.03.1999 ARG - ESIL 0820 fix :
-** RIOBootMode is no longer use by the driver, so these ioctls
-** are now obsolete :
-**
-#define RIO_GET_BOOT_MODE       (RIOC | 186)
-#define RIO_SET_BOOT_MODE       (RIOC | 187)
-**
-*/
-
-#define RIO_MEM_DUMP    (RIOC | 189)
-#define RIO_READ_REGISTER       (RIOC | 190)
-#define RIO_GET_MODTYPE (RIOC | 191)
-#define RIO_SET_TIMER   (RIOC | 192)
-#define RIO_READ_CHECK  (RIOC | 196)
-#define RIO_WAITING_FOR_RESTART (RIOC | 197)
-#define RIO_BIND_RTA    (RIOC | 198)
-#define RIO_GET_BINDINGS        (RIOC | 199)
-#define RIO_PUT_BINDINGS        (RIOC | 200)
-
-#define RIO_MAKE_DEV            (RIOC | 201)
-#define RIO_MINOR               (RIOC | 202)
-
-#define RIO_IDENTIFY_DRIVER     (RIOC | 203)
-#define RIO_DISPLAY_HOST_CFG    (RIOC | 204)
-
-
-/*
-** MAKE_DEV / MINOR stuff
-*/
-#define RIO_DEV_DIRECT          0x0000
-#define RIO_DEV_MODEM           0x0200
-#define RIO_DEV_XPRINT          0x0400
-#define RIO_DEV_MASK            0x0600
-
-/*
-** port management, xprint stuff
-*/
-#define rIOCN(N)        (RIOC|(N))
-#define rIOCR(N,T)      (RIOC|(N))
-#define rIOCW(N,T)      (RIOC|(N))
-
-#define RIO_GET_XP_ON     rIOCR(150,char[16])   /* start xprint string */
-#define RIO_SET_XP_ON     rIOCW(151,char[16])
-#define RIO_GET_XP_OFF    rIOCR(152,char[16])   /* finish xprint string */
-#define RIO_SET_XP_OFF    rIOCW(153,char[16])
-#define RIO_GET_XP_CPS    rIOCR(154,int)        /* xprint CPS */
-#define RIO_SET_XP_CPS    rIOCW(155,int)
-#define RIO_GET_IXANY     rIOCR(156,int)        /* ixany allowed? */
-#define RIO_SET_IXANY     rIOCW(157,int)
-#define RIO_SET_IXANY_ON  rIOCN(158)    /* allow ixany */
-#define RIO_SET_IXANY_OFF rIOCN(159)    /* disallow ixany */
-#define RIO_GET_MODEM     rIOCR(160,int)        /* port is modem/direct line? */
-#define RIO_SET_MODEM     rIOCW(161,int)
-#define RIO_SET_MODEM_ON  rIOCN(162)    /* port is a modem */
-#define RIO_SET_MODEM_OFF rIOCN(163)    /* port is direct */
-#define RIO_GET_IXON      rIOCR(164,int)        /* ixon allowed? */
-#define RIO_SET_IXON      rIOCW(165,int)
-#define RIO_SET_IXON_ON   rIOCN(166)    /* allow ixon */
-#define RIO_SET_IXON_OFF  rIOCN(167)    /* disallow ixon */
-
-#define RIO_GET_SIVIEW    ((('s')<<8) | 106)    /* backwards compatible with SI */
-
-#define RIO_IOCTL_UNKNOWN       -2
-
-#endif
diff --git a/drivers/char/rio/errors.h b/drivers/char/rio/errors.h
deleted file mode 100644
index bdb05234090a..000000000000
--- a/drivers/char/rio/errors.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : errors.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 11:34:10
-**      Retrieved       : 11/6/98 11:34:21
-**
-**  ident @(#)errors.h  1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_errors_h__
-#define __rio_errors_h__
-
-/*
-** error codes
-*/
-
-#define NOTHING_WRONG_AT_ALL            0
-#define BAD_CHARACTER_IN_NAME           1
-#define TABLE_ENTRY_ISNT_PROPERLY_NULL  2
-#define UNKNOWN_HOST_NUMBER             3
-#define ZERO_RTA_ID                     4
-#define BAD_RTA_ID                      5
-#define DUPLICATED_RTA_ID               6
-#define DUPLICATE_UNIQUE_NUMBER         7
-#define BAD_TTY_NUMBER                  8
-#define TTY_NUMBER_IN_USE               9
-#define NAME_USED_TWICE                 10
-#define HOST_ID_NOT_ZERO                11
-#define BOOT_IN_PROGRESS                12
-#define COPYIN_FAILED                   13
-#define HOST_FILE_TOO_LARGE             14
-#define COPYOUT_FAILED                  15
-#define NOT_SUPER_USER                  16
-#define RIO_ALREADY_POLLING             17
-
-#define ID_NUMBER_OUT_OF_RANGE          18
-#define PORT_NUMBER_OUT_OF_RANGE        19
-#define HOST_NUMBER_OUT_OF_RANGE        20
-#define RUP_NUMBER_OUT_OF_RANGE         21
-#define TTY_NUMBER_OUT_OF_RANGE         22
-#define LINK_NUMBER_OUT_OF_RANGE        23
-
-#define HOST_NOT_RUNNING                24
-#define IOCTL_COMMAND_UNKNOWN           25
-#define RIO_SYSTEM_HALTED               26
-#define WAIT_FOR_DRAIN_BROKEN           27
-#define PORT_NOT_MAPPED_INTO_SYSTEM     28
-#define EXCLUSIVE_USE_SET               29
-#define WAIT_FOR_NOT_CLOSING_BROKEN     30
-#define WAIT_FOR_PORT_TO_OPEN_BROKEN    31
-#define WAIT_FOR_CARRIER_BROKEN         32
-#define WAIT_FOR_NOT_IN_USE_BROKEN      33
-#define WAIT_FOR_CAN_ADD_COMMAND_BROKEN 34
-#define WAIT_FOR_ADD_COMMAND_BROKEN     35
-#define WAIT_FOR_NOT_PARAM_BROKEN       36
-#define WAIT_FOR_RETRY_BROKEN           37
-#define HOST_HAS_ALREADY_BEEN_BOOTED    38
-#define UNIT_IS_IN_USE                  39
-#define COULDNT_FIND_ENTRY              40
-#define RTA_UNIQUE_NUMBER_ZERO          41
-#define CLOSE_COMMAND_FAILED            42
-#define WAIT_FOR_CLOSE_BROKEN           43
-#define CPS_VALUE_OUT_OF_RANGE          44
-#define ID_ALREADY_IN_USE               45
-#define SIGNALS_ALREADY_SET             46
-#define NOT_RECEIVING_PROCESS           47
-#define RTA_NUMBER_WRONG                48
-#define NO_SUCH_PRODUCT                 49
-#define HOST_SYSPORT_BAD                50
-#define ID_NOT_TENTATIVE                51
-#define XPRINT_CPS_OUT_OF_RANGE         52
-#define NOT_ENOUGH_CORE_FOR_PCI_COPY    53
-
-
-#endif                          /* __rio_errors_h__ */
diff --git a/drivers/char/rio/func.h b/drivers/char/rio/func.h
deleted file mode 100644
index 078d44f85e45..000000000000
--- a/drivers/char/rio/func.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : func.h
-**      SID             : 1.3
-**      Last Modified   : 11/6/98 11:34:10
-**      Retrieved       : 11/6/98 11:34:21
-**
-**  ident @(#)func.h    1.3
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __func_h_def
-#define __func_h_def
-
-#include <linux/kdev_t.h>
-
-/* rioboot.c */
-int RIOBootCodeRTA(struct rio_info *, struct DownLoad *);
-int RIOBootCodeHOST(struct rio_info *, struct DownLoad *);
-int RIOBootCodeUNKNOWN(struct rio_info *, struct DownLoad *);
-void msec_timeout(struct Host *);
-int RIOBootRup(struct rio_info *, unsigned int, struct Host *, struct PKT __iomem *);
-int RIOBootOk(struct rio_info *, struct Host *, unsigned long);
-int RIORtaBound(struct rio_info *, unsigned int);
-void rio_fill_host_slot(int, int, unsigned int, struct Host *);
-
-/* riocmd.c */
-int RIOFoadRta(struct Host *, struct Map *);
-int RIOZombieRta(struct Host *, struct Map *);
-int RIOCommandRta(struct rio_info *, unsigned long, int (*func) (struct Host *, struct Map *));
-int RIOIdentifyRta(struct rio_info *, void __user *);
-int RIOKillNeighbour(struct rio_info *, void __user *);
-int RIOSuspendBootRta(struct Host *, int, int);
-int RIOFoadWakeup(struct rio_info *);
-struct CmdBlk *RIOGetCmdBlk(void);
-void RIOFreeCmdBlk(struct CmdBlk *);
-int RIOQueueCmdBlk(struct Host *, unsigned int, struct CmdBlk *);
-void RIOPollHostCommands(struct rio_info *, struct Host *);
-int RIOWFlushMark(unsigned long, struct CmdBlk *);
-int RIORFlushEnable(unsigned long, struct CmdBlk *);
-int RIOUnUse(unsigned long, struct CmdBlk *);
-
-/* rioctrl.c */
-int riocontrol(struct rio_info *, dev_t, int, unsigned long, int);
-
-int RIOPreemptiveCmd(struct rio_info *, struct Port *, unsigned char);
-
-/* rioinit.c */
-void rioinit(struct rio_info *, struct RioHostInfo *);
-void RIOInitHosts(struct rio_info *, struct RioHostInfo *);
-void RIOISAinit(struct rio_info *, int);
-int RIODoAT(struct rio_info *, int, int);
-caddr_t RIOCheckForATCard(int);
-int RIOAssignAT(struct rio_info *, int, void __iomem *, int);
-int RIOBoardTest(unsigned long, void __iomem *, unsigned char, int);
-void RIOAllocDataStructs(struct rio_info *);
-void RIOSetupDataStructs(struct rio_info *);
-int RIODefaultName(struct rio_info *, struct Host *, unsigned int);
-struct rioVersion *RIOVersid(void);
-void RIOHostReset(unsigned int, struct DpRam __iomem *, unsigned int);
-
-/* riointr.c */
-void RIOTxEnable(char *);
-void RIOServiceHost(struct rio_info *, struct Host *);
-int riotproc(struct rio_info *, struct ttystatics *, int, int);
-
-/* rioparam.c */
-int RIOParam(struct Port *, int, int, int);
-int RIODelay(struct Port *PortP, int);
-int RIODelay_ni(struct Port *PortP, int);
-void ms_timeout(struct Port *);
-int can_add_transmit(struct PKT __iomem **, struct Port *);
-void add_transmit(struct Port *);
-void put_free_end(struct Host *, struct PKT __iomem *);
-int can_remove_receive(struct PKT __iomem **, struct Port *);
-void remove_receive(struct Port *);
-
-/* rioroute.c */
-int RIORouteRup(struct rio_info *, unsigned int, struct Host *, struct PKT __iomem *);
-void RIOFixPhbs(struct rio_info *, struct Host *, unsigned int);
-unsigned int GetUnitType(unsigned int);
-int RIOSetChange(struct rio_info *);
-int RIOFindFreeID(struct rio_info *, struct Host *, unsigned int *, unsigned int *);
-
-
-/* riotty.c */
-
-int riotopen(struct tty_struct *tty, struct file *filp);
-int riotclose(void *ptr);
-int riotioctl(struct rio_info *, struct tty_struct *, int, caddr_t);
-void ttyseth(struct Port *, struct ttystatics *, struct old_sgttyb *sg);
-
-/* riotable.c */
-int RIONewTable(struct rio_info *);
-int RIOApel(struct rio_info *);
-int RIODeleteRta(struct rio_info *, struct Map *);
-int RIOAssignRta(struct rio_info *, struct Map *);
-int RIOReMapPorts(struct rio_info *, struct Host *, struct Map *);
-int RIOChangeName(struct rio_info *, struct Map *);
-
-#if 0
-/* riodrvr.c */
-struct rio_info *rio_install(struct RioHostInfo *);
-int rio_uninstall(struct rio_info *);
-int rio_open(struct rio_info *, int, struct file *);
-int rio_close(struct rio_info *, struct file *);
-int rio_read(struct rio_info *, struct file *, char *, int);
-int rio_write(struct rio_info *, struct file *f, char *, int);
-int rio_ioctl(struct rio_info *, struct file *, int, char *);
-int rio_select(struct rio_info *, struct file *f, int, struct sel *);
-int rio_intr(char *);
-int rio_isr_thread(char *);
-struct rio_info *rio_info_store(int cmd, struct rio_info *p);
-#endif
-
-extern void rio_copy_to_card(void *from, void __iomem *to, int len);
-extern int rio_minor(struct tty_struct *tty);
-extern int rio_ismodem(struct tty_struct *tty);
-
-extern void rio_start_card_running(struct Host *HostP);
-
-#endif                          /* __func_h_def */
diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h
deleted file mode 100644
index 78f24540c224..000000000000
--- a/drivers/char/rio/host.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : host.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 11:34:10
-**      Retrieved       : 11/6/98 11:34:21
-**
-**  ident @(#)host.h    1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_host_h__
-#define __rio_host_h__
-
-/*
-** the host structure - one per host card in the system.
-*/
-
-#define MAX_EXTRA_UNITS 64
-
-/*
-**    Host data structure. This is used for the software equiv. of
-**    the host.
-*/
-struct Host {
-        struct pci_dev *pdev;
-        unsigned char Type;             /* RIO_EISA, RIO_MCA, ... */
-        unsigned char Ivec;             /* POLLED or ivec number */
-        unsigned char Mode;             /* Control stuff */
-        unsigned char Slot;             /* Slot */
-        void  __iomem *Caddr;           /* KV address of DPRAM */
-        struct DpRam __iomem *CardP;    /* KV address of DPRAM, with overlay */
-        unsigned long PaddrP;           /* Phys. address of DPRAM */
-        char Name[MAX_NAME_LEN];        /* The name of the host */
-        unsigned int UniqueNum;         /* host unique number */
-        spinlock_t HostLock;    /* Lock structure for MPX */
-        unsigned int WorkToBeDone;      /* set to true each interrupt */
-        unsigned int InIntr;            /* Being serviced? */
-        unsigned int IntSrvDone;        /* host's interrupt has been serviced */
-        void (*Copy) (void *, void __iomem *, int);     /* copy func */
-        struct timer_list timer;
-        /*
-         **               I M P O R T A N T !
-         **
-         ** The rest of this data structure is cleared to zero after
-         ** a RIO_HOST_FOAD command.
-         */
-
-        unsigned long Flags;                    /* Whats going down */
-#define RC_WAITING            0
-#define RC_STARTUP            1
-#define RC_RUNNING            2
-#define RC_STUFFED            3
-#define RC_READY              7
-#define RUN_STATE             7
-/*
-** Boot mode applies to the way in which hosts in this system will
-** boot RTAs
-*/
-#define RC_BOOT_ALL           0x8               /* Boot all RTAs attached */
-#define RC_BOOT_OWN           0x10              /* Only boot RTAs bound to this system */
-#define RC_BOOT_NONE          0x20              /* Don't boot any RTAs (slave mode) */
-
-        struct Top Topology[LINKS_PER_UNIT];    /* one per link */
-        struct Map Mapping[MAX_RUP];            /* Mappings for host */
-        struct PHB __iomem *PhbP;               /* Pointer to the PHB array */
-        unsigned short __iomem *PhbNumP;        /* Ptr to Number of PHB's */
-        struct LPB __iomem *LinkStrP;           /* Link Structure Array */
-        struct RUP __iomem *RupP;               /* Sixteen real rups here */
-        struct PARM_MAP __iomem *ParmMapP;      /* points to the parmmap */
-        unsigned int ExtraUnits[MAX_EXTRA_UNITS];       /* unknown things */
-        unsigned int NumExtraBooted;            /* how many of the above */
-        /*
-         ** Twenty logical rups.
-         ** The first sixteen are the real Rup entries (above), the last four
-         ** are the link RUPs.
-         */
-        struct UnixRup UnixRups[MAX_RUP + LINKS_PER_UNIT];
-        int timeout_id;                         /* For calling 100 ms delays */
-        int timeout_sem;                        /* For calling 100 ms delays */
-        unsigned long locks;                    /* long req'd for set_bit --RR */
-        char ____end_marker____;
-};
-#define Control      CardP->DpControl
-#define SetInt       CardP->DpSetInt
-#define ResetTpu     CardP->DpResetTpu
-#define ResetInt     CardP->DpResetInt
-#define Signature    CardP->DpSignature
-#define Sram1        CardP->DpSram1
-#define Sram2        CardP->DpSram2
-#define Sram3        CardP->DpSram3
-#define Scratch      CardP->DpScratch
-#define __ParmMapR   CardP->DpParmMapR
-#define SLX          CardP->DpSlx
-#define Revision     CardP->DpRevision
-#define Unique       CardP->DpUnique
-#define Year         CardP->DpYear
-#define Week         CardP->DpWeek
-
-#define RIO_DUMBPARM 0x0860     /* what not to expect */
-
-#endif
diff --git a/drivers/char/rio/link.h b/drivers/char/rio/link.h
deleted file mode 100644
index f3bf11a04d41..000000000000
--- a/drivers/char/rio/link.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
- *******                                                              *******
- *******                      L I N K
- *******                                                              *******
- ****************************************************************************
-
- Author  : Ian Nandhra / Jeremy Rolls
- Date    :
-
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- Version : 0.01
-
-
-                            Mods
- ----------------------------------------------------------------------------
-  Date     By                Description
- ----------------------------------------------------------------------------
-
- ***************************************************************************/
-
-#ifndef _link_h
-#define _link_h 1
-
-/*************************************************
- * Define the Link Status stuff
- ************************************************/
-/* Boot request stuff */
-#define BOOT_REQUEST       ((ushort) 0) /* Request for a boot */
-#define BOOT_ABORT         ((ushort) 1) /* Abort a boot */
-#define BOOT_SEQUENCE      ((ushort) 2) /* Packet with the number of packets
-                                           and load address */
-#define BOOT_COMPLETED     ((ushort) 3) /* Boot completed */
-
-
-struct LPB {
-        u16 link_number;        /* Link Number */
-        u16 in_ch;      /* Link In Channel */
-        u16 out_ch;     /* Link Out Channel */
-        u8 attached_serial[4];  /* Attached serial number */
-        u8 attached_host_serial[4];
-        /* Serial number of Host who
-           booted the other end */
-        u16 descheduled;        /* Currently Descheduled */
-        u16 state;              /* Current state */
-        u16 send_poll;          /* Send a Poll Packet */
-        u16 ltt_p;      /* Process Descriptor */
-        u16 lrt_p;      /* Process Descriptor */
-        u16 lrt_status;         /* Current lrt status */
-        u16 ltt_status;         /* Current ltt status */
-        u16 timeout;            /* Timeout value */
-        u16 topology;           /* Topology bits */
-        u16 mon_ltt;
-        u16 mon_lrt;
-        u16 WaitNoBoot; /* Secs to hold off booting */
-        u16 add_packet_list;    /* Add packets to here */
-        u16 remove_packet_list; /* Send packets from here */
-
-        u16 lrt_fail_chan;      /* Lrt's failure channel */
-        u16 ltt_fail_chan;      /* Ltt's failure channel */
-
-        /* RUP structure for HOST to driver communications */
-        struct RUP rup;
-        struct RUP link_rup;    /* RUP for the link (POLL,
-                                   topology etc.) */
-        u16 attached_link;      /* Number of attached link */
-        u16 csum_errors;        /* csum errors */
-        u16 num_disconnects;    /* number of disconnects */
-        u16 num_sync_rcvd;      /* # sync's received */
-        u16 num_sync_rqst;      /* # sync requests */
-        u16 num_tx;             /* Num pkts sent */
-        u16 num_rx;             /* Num pkts received */
-        u16 module_attached;    /* Module tpyes of attached */
-        u16 led_timeout;        /* LED timeout */
-        u16 first_port;         /* First port to service */
-        u16 last_port;          /* Last port to service */
-};
-
-#endif
-
-/*********** end of file ***********/
diff --git a/drivers/char/rio/linux_compat.h b/drivers/char/rio/linux_compat.h
deleted file mode 100644
index 34c0d2899ef1..000000000000
--- a/drivers/char/rio/linux_compat.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * (C) 2000 R.E.Wolff@BitWizard.nl
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/interrupt.h>
-
-
-#define DEBUG_ALL
-
-struct ttystatics {
-        struct termios tm;
-};
-
-extern int rio_debug;
-
-#define RIO_DEBUG_INIT         0x000001
-#define RIO_DEBUG_BOOT         0x000002
-#define RIO_DEBUG_CMD          0x000004
-#define RIO_DEBUG_CTRL         0x000008
-#define RIO_DEBUG_INTR         0x000010
-#define RIO_DEBUG_PARAM        0x000020
-#define RIO_DEBUG_ROUTE        0x000040
-#define RIO_DEBUG_TABLE        0x000080
-#define RIO_DEBUG_TTY          0x000100
-#define RIO_DEBUG_FLOW         0x000200
-#define RIO_DEBUG_MODEMSIGNALS 0x000400
-#define RIO_DEBUG_PROBE        0x000800
-#define RIO_DEBUG_CLEANUP      0x001000
-#define RIO_DEBUG_IFLOW        0x002000
-#define RIO_DEBUG_PFE          0x004000
-#define RIO_DEBUG_REC          0x008000
-#define RIO_DEBUG_SPINLOCK     0x010000
-#define RIO_DEBUG_DELAY        0x020000
-#define RIO_DEBUG_MOD_COUNT    0x040000
-
-
-/* Copied over from riowinif.h . This is ugly. The winif file declares
-also much other stuff which is incompatible with the headers from
-the older driver. The older driver includes "brates.h" which shadows
-the definitions from Linux, and is incompatible... */
-
-/* RxBaud and TxBaud definitions... */
-#define RIO_B0                  0x00    /* RTS / DTR signals dropped */
-#define RIO_B50                 0x01    /* 50 baud */
-#define RIO_B75                 0x02    /* 75 baud */
-#define RIO_B110                0x03    /* 110 baud */
-#define RIO_B134                0x04    /* 134.5 baud */
-#define RIO_B150                0x05    /* 150 baud */
-#define RIO_B200                0x06    /* 200 baud */
-#define RIO_B300                0x07    /* 300 baud */
-#define RIO_B600                0x08    /* 600 baud */
-#define RIO_B1200               0x09    /* 1200 baud */
-#define RIO_B1800               0x0A    /* 1800 baud */
-#define RIO_B2400               0x0B    /* 2400 baud */
-#define RIO_B4800               0x0C    /* 4800 baud */
-#define RIO_B9600               0x0D    /* 9600 baud */
-#define RIO_B19200              0x0E    /* 19200 baud */
-#define RIO_B38400              0x0F    /* 38400 baud */
-#define RIO_B56000              0x10    /* 56000 baud */
-#define RIO_B57600              0x11    /* 57600 baud */
-#define RIO_B64000              0x12    /* 64000 baud */
-#define RIO_B115200             0x13    /* 115200 baud */
-#define RIO_B2000               0x14    /* 2000 baud */
diff --git a/drivers/char/rio/map.h b/drivers/char/rio/map.h
deleted file mode 100644
index 8366978578c1..000000000000
--- a/drivers/char/rio/map.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : map.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 11:34:11
-**      Retrieved       : 11/6/98 11:34:21
-**
-**  ident @(#)map.h     1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_map_h__
-#define __rio_map_h__
-
-/*
-** mapping structure passed to and from the config.rio program to
-** determine the current topology of the world
-*/
-
-#define MAX_MAP_ENTRY 17
-#define TOTAL_MAP_ENTRIES (MAX_MAP_ENTRY*RIO_SLOTS)
-#define MAX_NAME_LEN 32
-
-struct Map {
-        unsigned int HostUniqueNum;     /* Supporting hosts unique number */
-        unsigned int RtaUniqueNum;      /* Unique number */
-        /*
-         ** The next two IDs must be swapped on big-endian architectures
-         ** when using a v2.04 /etc/rio/config with a v3.00 driver (when
-         ** upgrading for example).
-         */
-        unsigned short ID;              /* ID used in the subnet */
-        unsigned short ID2;             /* ID of 2nd block of 8 for 16 port */
-        unsigned long Flags;            /* Booted, ID Given, Disconnected */
-        unsigned long SysPort;          /* First tty mapped to this port */
-        struct Top Topology[LINKS_PER_UNIT];    /* ID connected to each link */
-        char Name[MAX_NAME_LEN];        /* Cute name by which RTA is known */
-};
-
-/*
-** Flag values:
-*/
-#define RTA_BOOTED              0x00000001
-#define RTA_NEWBOOT             0x00000010
-#define MSG_DONE                0x00000020
-#define RTA_INTERCONNECT        0x00000040
-#define RTA16_SECOND_SLOT       0x00000080
-#define BEEN_HERE               0x00000100
-#define SLOT_TENTATIVE          0x40000000
-#define SLOT_IN_USE             0x80000000
-
-/*
-** HostUniqueNum is the unique number from the host card that this RTA
-** is to be connected to.
-** RtaUniqueNum is the unique number of the RTA concerned. It will be ZERO
-** if the slot in the table is unused. If it is the same as the HostUniqueNum
-** then this slot represents a host card.
-** Flags contains current boot/route state info
-** SysPort is a value in the range 0-504, being the number of the first tty
-** on this RTA. Each RTA supports 8 ports. The SysPort value must be modulo 8.
-** SysPort 0-127 correspond to /dev/ttyr001 to /dev/ttyr128, with minor
-** numbers 0-127. SysPort 128-255 correspond to /dev/ttyr129 to /dev/ttyr256,
-** again with minor numbers 0-127, and so on for SysPorts 256-383 and 384-511
-** ID will be in the range 0-16 for a `known' RTA. ID will be 0xFFFF for an
-** unused slot/unknown ID etc.
-** The Topology array contains the ID of the unit connected to each of the
-** four links on this unit. The entry will be 0xFFFF if NOTHING is connected
-** to the link, or will be 0xFF00 if an UNKNOWN unit is connected to the link.
-** The Name field is a null-terminated string, upto 31 characters, containing
-** the 'cute' name that the sysadmin/users know the RTA by. It is permissible
-** for this string to contain any character in the range \040 to \176 inclusive.
-** In particular, ctrl sequences and DEL (0x7F, \177) are not allowed. The
-** special character '%' IS allowable, and needs no special action.
-**
-*/
-
-#endif
diff --git a/drivers/char/rio/param.h b/drivers/char/rio/param.h
deleted file mode 100644
index 7e9b6283e8aa..000000000000
--- a/drivers/char/rio/param.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : param.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 11:34:12
-**      Retrieved       : 11/6/98 11:34:21
-**
-**  ident @(#)param.h   1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_param_h__
-#define __rio_param_h__
-
-/*
-** the param command block, as used in OPEN and PARAM calls.
-*/
-
-struct phb_param {
-        u8 Cmd;                 /* It is very important that these line up */
-        u8 Cor1;                /* with what is expected at the other end. */
-        u8 Cor2;                /* to confirm that you've got it right,    */
-        u8 Cor4;                /* check with cirrus/cirrus.h              */
-        u8 Cor5;
-        u8 TxXon;               /* Transmit X-On character */
-        u8 TxXoff;              /* Transmit X-Off character */
-        u8 RxXon;               /* Receive X-On character */
-        u8 RxXoff;              /* Receive X-Off character */
-        u8 LNext;               /* Literal-next character */
-        u8 TxBaud;              /* Transmit baudrate */
-        u8 RxBaud;              /* Receive baudrate */
-};
-
-#endif
diff --git a/drivers/char/rio/parmmap.h b/drivers/char/rio/parmmap.h
deleted file mode 100644
index acc8fa439df5..000000000000
--- a/drivers/char/rio/parmmap.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
- *******                                                              *******
- *******               H O S T   M E M O R Y  M A P
- *******                                                              *******
- ****************************************************************************
-
- Author  : Ian Nandhra / Jeremy Rolls
- Date    :
-
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- Version : 0.01
-
-
-                            Mods
- ----------------------------------------------------------------------------
-  Date     By                Description
- ----------------------------------------------------------------------------
-6/4/1991   jonb              Made changes to accommodate Mips R3230 bus
- ***************************************************************************/
-
-#ifndef _parmap_h
-#define _parmap_h
-
-typedef struct PARM_MAP PARM_MAP;
-
-struct PARM_MAP {
-        u16 phb_ptr;    /* Pointer to the PHB array */
-        u16 phb_num_ptr;        /* Ptr to Number of PHB's */
-        u16 free_list;  /* Free List pointer */
-        u16 free_list_end;      /* Free List End pointer */
-        u16 q_free_list_ptr;    /* Ptr to Q_BUF variable */
-        u16 unit_id_ptr;        /* Unit Id */
-        u16 link_str_ptr;       /* Link Structure Array */
-        u16 bootloader_1;       /* 1st Stage Boot Loader */
-        u16 bootloader_2;       /* 2nd Stage Boot Loader */
-        u16 port_route_map_ptr; /* Port Route Map */
-        u16 route_ptr;          /* Unit Route Map */
-        u16 map_present;        /* Route Map present */
-        s16 pkt_num;            /* Total number of packets */
-        s16 q_num;              /* Total number of Q packets */
-        u16 buffers_per_port;   /* Number of buffers per port */
-        u16 heap_size;          /* Initial size of heap */
-        u16 heap_left;          /* Current Heap left */
-        u16 error;              /* Error code */
-        u16 tx_max;             /* Max number of tx pkts per phb */
-        u16 rx_max;             /* Max number of rx pkts per phb */
-        u16 rx_limit;           /* For high / low watermarks */
-        s16 links;              /* Links to use */
-        s16 timer;              /* Interrupts per second */
-        u16 rups;               /* Pointer to the RUPs */
-        u16 max_phb;            /* Mostly for debugging */
-        u16 living;             /* Just increments!! */
-        u16 init_done;          /* Initialisation over */
-        u16 booting_link;
-        u16 idle_count;         /* Idle time counter */
-        u16 busy_count;         /* Busy counter */
-        u16 idle_control;       /* Control Idle Process */
-        u16 tx_intr;            /* TX interrupt pending */
-        u16 rx_intr;            /* RX interrupt pending */
-        u16 rup_intr;           /* RUP interrupt pending */
-};
-
-#endif
-
-/*********** end of file ***********/
diff --git a/drivers/char/rio/pci.h b/drivers/char/rio/pci.h
deleted file mode 100644
index 6032f9135956..000000000000
--- a/drivers/char/rio/pci.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : pci.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 11:34:12
-**      Retrieved       : 11/6/98 11:34:21
-**
-**  ident @(#)pci.h     1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_pci_h__
-#define __rio_pci_h__
-
-/*
-** PCI stuff
-*/
-
-#define PCITpFastClock          0x80
-#define PCITpSlowClock          0x00
-#define PCITpFastLinks          0x40
-#define PCITpSlowLinks          0x00
-#define PCITpIntEnable          0x04
-#define PCITpIntDisable         0x00
-#define PCITpBusEnable          0x02
-#define PCITpBusDisable         0x00
-#define PCITpBootFromRam        0x01
-#define PCITpBootFromLink       0x00
-
-#define RIO_PCI_VENDOR          0x11CB
-#define RIO_PCI_DEVICE          0x8000
-#define RIO_PCI_BASE_CLASS      0x02
-#define RIO_PCI_SUB_CLASS       0x80
-#define RIO_PCI_PROG_IFACE      0x00
-
-#define RIO_PCI_RID             0x0008
-#define RIO_PCI_BADR0           0x0010
-#define RIO_PCI_INTLN           0x003C
-#define RIO_PCI_INTPIN          0x003D
-
-#define RIO_PCI_MEM_SIZE        65536
-
-#define RIO_PCI_TURBO_TP        0x80
-#define RIO_PCI_FAST_LINKS      0x40
-#define RIO_PCI_INT_ENABLE      0x04
-#define RIO_PCI_TP_BUS_ENABLE   0x02
-#define RIO_PCI_BOOT_FROM_RAM   0x01
-
-#define RIO_PCI_DEFAULT_MODE    0x05
-
-#endif                          /* __rio_pci_h__ */
diff --git a/drivers/char/rio/phb.h b/drivers/char/rio/phb.h
deleted file mode 100644
index a4c48ae4e365..000000000000
--- a/drivers/char/rio/phb.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
- *******                                                              *******
- *******                 P H B     H E A D E R                        *******
- *******                                                              *******
- ****************************************************************************
-
- Author  : Ian Nandhra, Jeremy Rolls
- Date    : 
-
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- Version : 0.01
-
-
-                            Mods
- ----------------------------------------------------------------------------
-  Date     By                Description
- ----------------------------------------------------------------------------
-
- ***************************************************************************/
-
-#ifndef _phb_h
-#define _phb_h 1
-
-/*************************************************
- * Handshake asserted. Deasserted by the LTT(s)
- ************************************************/
-#define PHB_HANDSHAKE_SET      ((ushort) 0x001) /* Set by LRT */
-
-#define PHB_HANDSHAKE_RESET     ((ushort) 0x002)        /* Set by ISR / driver */
-
-#define PHB_HANDSHAKE_FLAGS     (PHB_HANDSHAKE_RESET | PHB_HANDSHAKE_SET)
-                                                /* Reset by ltt */
-
-
-/*************************************************
- * Maximum number of PHB's
- ************************************************/
-#define MAX_PHB               ((ushort) 128)    /* range 0-127 */
-
-/*************************************************
- * Defines for the mode fields
- ************************************************/
-#define TXPKT_INCOMPLETE        0x0001  /* Previous tx packet not completed */
-#define TXINTR_ENABLED          0x0002  /* Tx interrupt is enabled */
-#define TX_TAB3                 0x0004  /* TAB3 mode */
-#define TX_OCRNL                0x0008  /* OCRNL mode */
-#define TX_ONLCR                0x0010  /* ONLCR mode */
-#define TX_SENDSPACES           0x0020  /* Send n spaces command needs
-                                           completing */
-#define TX_SENDNULL             0x0040  /* Escaping NULL needs completing */
-#define TX_SENDLF               0x0080  /* LF -> CR LF needs completing */
-#define TX_PARALLELBUG          0x0100  /* CD1400 LF -> CR LF bug on parallel
-                                           port */
-#define TX_HANGOVER             (TX_SENDSPACES | TX_SENDLF | TX_SENDNULL)
-#define TX_DTRFLOW              0x0200  /* DTR tx flow control */
-#define TX_DTRFLOWED            0x0400  /* DTR is low - don't allow more data
-                                           into the FIFO */
-#define TX_DATAINFIFO           0x0800  /* There is data in the FIFO */
-#define TX_BUSY                 0x1000  /* Data in FIFO, shift or holding regs */
-
-#define RX_SPARE                0x0001  /* SPARE */
-#define RXINTR_ENABLED          0x0002  /* Rx interrupt enabled */
-#define RX_ICRNL                0x0008  /* ICRNL mode */
-#define RX_INLCR                0x0010  /* INLCR mode */
-#define RX_IGNCR                0x0020  /* IGNCR mode */
-#define RX_CTSFLOW              0x0040  /* CTSFLOW enabled */
-#define RX_IXOFF                0x0080  /* IXOFF enabled */
-#define RX_CTSFLOWED            0x0100  /* CTSFLOW and CTS dropped */
-#define RX_IXOFFED              0x0200  /* IXOFF and xoff sent */
-#define RX_BUFFERED             0x0400  /* Try and pass on complete packets */
-
-#define PORT_ISOPEN             0x0001  /* Port open? */
-#define PORT_HUPCL              0x0002  /* Hangup on close? */
-#define PORT_MOPENPEND          0x0004  /* Modem open pending */
-#define PORT_ISPARALLEL         0x0008  /* Parallel port */
-#define PORT_BREAK              0x0010  /* Port on break */
-#define PORT_STATUSPEND         0x0020  /* Status packet pending */
-#define PORT_BREAKPEND          0x0040  /* Break packet pending */
-#define PORT_MODEMPEND          0x0080  /* Modem status packet pending */
-#define PORT_PARALLELBUG        0x0100  /* CD1400 LF -> CR LF bug on parallel
-                                           port */
-#define PORT_FULLMODEM          0x0200  /* Full modem signals */
-#define PORT_RJ45               0x0400  /* RJ45 connector - no RI signal */
-#define PORT_RESTRICTED         0x0600  /* Restricted connector - no RI / DTR */
-
-#define PORT_MODEMBITS          0x0600  /* Mask for modem fields */
-
-#define PORT_WCLOSE             0x0800  /* Waiting for close */
-#define PORT_HANDSHAKEFIX       0x1000  /* Port has H/W flow control fix */
-#define PORT_WASPCLOSED         0x2000  /* Port closed with PCLOSE */
-#define DUMPMODE                0x4000  /* Dump RTA mem */
-#define READ_REG                0x8000  /* Read CD1400 register */
-
-
-
-/**************************************************************************
- * PHB Structure
- * A  few words.
- *
- * Normally Packets are added to the end of the list and removed from
- * the start. The pointer tx_add points to a SPACE to put a Packet.
- * The pointer tx_remove points to the next Packet to remove
- *************************************************************************/
-
-struct PHB {
-        u8 source;
-        u8 handshake;
-        u8 status;
-        u16 timeout;            /* Maximum of 1.9 seconds */
-        u8 link;                /* Send down this link */
-        u8 destination;
-        u16 tx_start;
-        u16 tx_end;
-        u16 tx_add;
-        u16 tx_remove;
-
-        u16 rx_start;
-        u16 rx_end;
-        u16 rx_add;
-        u16 rx_remove;
-
-};
-
-#endif
-
-/*********** end of file ***********/
diff --git a/drivers/char/rio/pkt.h b/drivers/char/rio/pkt.h
deleted file mode 100644
index a9458164f02f..000000000000
--- a/drivers/char/rio/pkt.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
- *******                                                              *******
- *******            P A C K E T   H E A D E R   F I L E
- *******                                                              *******
- ****************************************************************************
-
- Author  : Ian Nandhra / Jeremy Rolls
- Date    :
-
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- Version : 0.01
-
-
-                            Mods
- ----------------------------------------------------------------------------
-  Date     By                Description
- ----------------------------------------------------------------------------
-
- ***************************************************************************/
-
-#ifndef _pkt_h
-#define _pkt_h 1
-
-#define PKT_CMD_BIT     ((ushort) 0x080)
-#define PKT_CMD_DATA    ((ushort) 0x080)
-
-#define PKT_ACK         ((ushort) 0x040)
-
-#define PKT_TGL         ((ushort) 0x020)
-
-#define PKT_LEN_MASK    ((ushort) 0x07f)
-
-#define DATA_WNDW       ((ushort) 0x10)
-#define PKT_TTL_MASK    ((ushort) 0x0f)
-
-#define PKT_MAX_DATA_LEN   72
-
-#define PKT_LENGTH         sizeof(struct PKT)
-#define SYNC_PKT_LENGTH    (PKT_LENGTH + 4)
-
-#define CONTROL_PKT_LEN_MASK PKT_LEN_MASK
-#define CONTROL_PKT_CMD_BIT  PKT_CMD_BIT
-#define CONTROL_PKT_ACK (PKT_ACK << 8)
-#define CONTROL_PKT_TGL (PKT_TGL << 8)
-#define CONTROL_PKT_TTL_MASK (PKT_TTL_MASK << 8)
-#define CONTROL_DATA_WNDW  (DATA_WNDW << 8)
-
-struct PKT {
-        u8 dest_unit;           /* Destination Unit Id */
-        u8 dest_port;           /* Destination POrt */
-        u8 src_unit;            /* Source Unit Id */
-        u8 src_port;            /* Source POrt */
-        u8 len;
-        u8 control;
-        u8 data[PKT_MAX_DATA_LEN];
-        /* Actual data :-) */
-        u16 csum;               /* C-SUM */
-};
-#endif
-
-/*********** end of file ***********/
diff --git a/drivers/char/rio/port.h b/drivers/char/rio/port.h
deleted file mode 100644
index 49cf6d15ee54..000000000000
--- a/drivers/char/rio/port.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : port.h
-**      SID             : 1.3
-**      Last Modified   : 11/6/98 11:34:12
-**      Retrieved       : 11/6/98 11:34:21
-**
-**  ident @(#)port.h    1.3
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_port_h__
-#define __rio_port_h__
-
-/*
-**      Port data structure
-*/
-struct Port {
-        struct gs_port gs;
-        int PortNum;                    /* RIO port no., 0-511 */
-        struct Host *HostP;
-        void __iomem *Caddr;
-        unsigned short HostPort;        /* Port number on host card */
-        unsigned char RupNum;           /* Number of RUP for port */
-        unsigned char ID2;              /* Second ID of RTA for port */
-        unsigned long State;            /* FLAGS for open & xopen */
-#define RIO_LOPEN       0x00001         /* Local open */
-#define RIO_MOPEN       0x00002         /* Modem open */
-#define RIO_WOPEN       0x00004         /* Waiting for open */
-#define RIO_CLOSING     0x00008         /* The port is being close */
-#define RIO_XPBUSY      0x00010         /* Transparent printer busy */
-#define RIO_BREAKING    0x00020         /* Break in progress */
-#define RIO_DIRECT      0x00040         /* Doing Direct output */
-#define RIO_EXCLUSIVE   0x00080         /* Stream open for exclusive use */
-#define RIO_NDELAY      0x00100         /* Stream is open FNDELAY */
-#define RIO_CARR_ON     0x00200         /* Stream has carrier present */
-#define RIO_XPWANTR     0x00400         /* Stream wanted by Xprint */
-#define RIO_RBLK        0x00800         /* Stream is read-blocked */
-#define RIO_BUSY        0x01000         /* Stream is BUSY for write */
-#define RIO_TIMEOUT     0x02000         /* Stream timeout in progress */
-#define RIO_TXSTOP      0x04000         /* Stream output is stopped */
-#define RIO_WAITFLUSH   0x08000         /* Stream waiting for flush */
-#define RIO_DYNOROD     0x10000         /* Drain failed */
-#define RIO_DELETED     0x20000         /* RTA has been deleted */
-#define RIO_ISSCANCODE  0x40000         /* This line is in scancode mode */
-#define RIO_USING_EUC   0x100000        /* Using extended Unix chars */
-#define RIO_CAN_COOK    0x200000        /* This line can do cooking */
-#define RIO_TRIAD_MODE  0x400000        /* Enable TRIAD special ops. */
-#define RIO_TRIAD_BLOCK 0x800000        /* Next read will block */
-#define RIO_TRIAD_FUNC  0x1000000       /* Seen a function key coming in */
-#define RIO_THROTTLE_RX 0x2000000       /* RX needs to be throttled. */
-
-        unsigned long Config;           /* FLAGS for NOREAD.... */
-#define RIO_NOREAD      0x0001          /* Are not allowed to read port */
-#define RIO_NOWRITE     0x0002          /* Are not allowed to write port */
-#define RIO_NOXPRINT    0x0004          /* Are not allowed to xprint port */
-#define RIO_NOMASK      0x0007          /* All not allowed things */
-#define RIO_IXANY       0x0008          /* Port is allowed ixany */
-#define RIO_MODEM       0x0010          /* Stream is a modem device */
-#define RIO_IXON        0x0020          /* Port is allowed ixon */
-#define RIO_WAITDRAIN   0x0040          /* Wait for port to completely drain */
-#define RIO_MAP_50_TO_50        0x0080  /* Map 50 baud to 50 baud */
-#define RIO_MAP_110_TO_110      0x0100  /* Map 110 baud to 110 baud */
-
-/*
-** 15.10.1998 ARG - ESIL 0761 prt fix
-** As LynxOS does not appear to support Hardware Flow Control .....
-** Define our own flow control flags in 'Config'.
-*/
-#define RIO_CTSFLOW     0x0200          /* RIO's own CTSFLOW flag */
-#define RIO_RTSFLOW     0x0400          /* RIO's own RTSFLOW flag */
-
-
-        struct PHB __iomem *PhbP;       /* pointer to PHB for port */
-        u16 __iomem *TxAdd;             /* Add packets here */
-        u16 __iomem *TxStart;           /* Start of add array */
-        u16 __iomem *TxEnd;             /* End of add array */
-        u16 __iomem *RxRemove;          /* Remove packets here */
-        u16 __iomem *RxStart;           /* Start of remove array */
-        u16 __iomem *RxEnd;             /* End of remove array */
-        unsigned int RtaUniqueNum;      /* Unique number of RTA */
-        unsigned short PortState;       /* status of port */
-        unsigned short ModemState;      /* status of modem lines */
-        unsigned long ModemLines;       /* Modem bits sent to RTA */
-        unsigned char CookMode;         /* who expands CR/LF? */
-        unsigned char ParamSem;         /* Prevent write during param */
-        unsigned char Mapped;           /* if port mapped onto host */
-        unsigned char SecondBlock;      /* if port belongs to 2nd block
-                                                of 16 port RTA */
-        unsigned char InUse;            /* how many pre-emptive cmds */
-        unsigned char Lock;             /* if params locked */
-        unsigned char Store;            /* if params stored across closes */
-        unsigned char FirstOpen;        /* TRUE if first time port opened */
-        unsigned char FlushCmdBodge;    /* if doing a (non)flush */
-        unsigned char MagicFlags;       /* require intr processing */
-#define MAGIC_FLUSH     0x01            /* mirror of WflushFlag */
-#define MAGIC_REBOOT    0x02            /* RTA re-booted, re-open ports */
-#define MORE_OUTPUT_EYGOR 0x04          /* riotproc failed to empty clists */
-        unsigned char WflushFlag;       /* 1 How many WFLUSHs active */
-/*
-** Transparent print stuff
-*/
-        struct Xprint {
-#ifndef MAX_XP_CTRL_LEN
-#define MAX_XP_CTRL_LEN         16      /* ALSO IN DAEMON.H */
-#endif
-                unsigned int XpCps;
-                char XpOn[MAX_XP_CTRL_LEN];
-                char XpOff[MAX_XP_CTRL_LEN];
-                unsigned short XpLen;   /* strlen(XpOn)+strlen(XpOff) */
-                unsigned char XpActive;
-                unsigned char XpLastTickOk;     /* TRUE if we can process */
-#define XP_OPEN         00001
-#define XP_RUNABLE      00002
-                struct ttystatics *XttyP;
-        } Xprint;
-        unsigned char RxDataStart;
-        unsigned char Cor2Copy;         /* copy of COR2 */
-        char *Name;                     /* points to the Rta's name */
-        char *TxRingBuffer;
-        unsigned short TxBufferIn;      /* New data arrives here */
-        unsigned short TxBufferOut;     /* Intr removes data here */
-        unsigned short OldTxBufferOut;  /* Indicates if draining */
-        int TimeoutId;                  /* Timeout ID */
-        unsigned int Debug;
-        unsigned char WaitUntilBooted;  /* True if open should block */
-        unsigned int statsGather;       /* True if gathering stats */
-        unsigned long txchars;          /* Chars transmitted */
-        unsigned long rxchars;          /* Chars received */
-        unsigned long opens;            /* port open count */
-        unsigned long closes;           /* port close count */
-        unsigned long ioctls;           /* ioctl count */
-        unsigned char LastRxTgl;        /* Last state of rx toggle bit */
-        spinlock_t portSem;             /* Lock using this sem */
-        int MonitorTstate;              /* Monitoring ? */
-        int timeout_id;                 /* For calling 100 ms delays */
-        int timeout_sem;                /* For calling 100 ms delays */
-        int firstOpen;                  /* First time open ? */
-        char *p;                        /* save the global struc here .. */
-};
-
-struct ModuleInfo {
-        char *Name;
-        unsigned int Flags[4];          /* one per port on a module */
-};
-
-/*
-** This struct is required because trying to grab an entire Port structure
-** runs into problems with differing struct sizes between driver and config.
-*/
-struct PortParams {
-        unsigned int Port;
-        unsigned long Config;
-        unsigned long State;
-        struct ttystatics *TtyP;
-};
-
-#endif
diff --git a/drivers/char/rio/protsts.h b/drivers/char/rio/protsts.h
deleted file mode 100644
index 8ab79401d3ee..000000000000
--- a/drivers/char/rio/protsts.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/****************************************************************************
- *******                                                              *******
- *******      P R O T O C O L    S T A T U S   S T R U C T U R E      *******
- *******                                                              *******
- ****************************************************************************
-
- Author  : Ian Nandhra / Jeremy Rolls
- Date    :
-
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- Version : 0.01
-
-
-                            Mods
- ----------------------------------------------------------------------------
-  Date     By                Description
- ----------------------------------------------------------------------------
-
- ***************************************************************************/
-
-#ifndef _protsts_h
-#define _protsts_h 1
-
-/*************************************************
- * ACK bit. Last Packet received OK. Set by
- * rxpkt to indicate that the Packet has been
- * received OK and that the LTT must set the ACK
- * bit in the next outward bound Packet
- * and re-set by LTT's after xmit.
- *
- * Gets shoved into rx_status
- ************************************************/
-#define PHB_RX_LAST_PKT_ACKED    ((ushort) 0x080)
-
-/*******************************************************
- * The Rx TOGGLE bit.
- * Stuffed into rx_status by RXPKT
- ******************************************************/
-#define PHB_RX_DATA_WNDW         ((ushort) 0x040)
-
-/*******************************************************
- * The Rx TOGGLE bit. Matches the setting in PKT.H
- * Stuffed into rx_status
- ******************************************************/
-#define PHB_RX_TGL               ((ushort) 0x2000)
-
-
-/*************************************************
- * This bit is set by the LRT to indicate that
- * an ACK (packet) must be returned.
- *
- * Gets shoved into tx_status
- ************************************************/
-#define PHB_TX_SEND_PKT_ACK      ((ushort) 0x08)
-
-/*************************************************
- * Set by LTT to indicate that an ACK is required
- *************************************************/
-#define PHB_TX_ACK_RQRD         ((ushort) 0x01)
-
-
-/*******************************************************
- * The Tx TOGGLE bit.
- * Stuffed into tx_status by RXPKT from the PKT WndW
- * field. Looked by the LTT when the NEXT Packet
- * is going to be sent.
- ******************************************************/
-#define PHB_TX_DATA_WNDW         ((ushort) 0x04)
-
-
-/*******************************************************
- * The Tx TOGGLE bit. Matches the setting in PKT.H
- * Stuffed into tx_status
- ******************************************************/
-#define PHB_TX_TGL               ((ushort) 0x02)
-
-/*******************************************************
- * Request intr bit. Set when the queue has gone quiet
- * and the PHB has requested an interrupt.
- ******************************************************/
-#define PHB_TX_INTR             ((ushort) 0x100)
-
-/*******************************************************
- * SET if the PHB cannot send any more data down the
- * Link
- ******************************************************/
-#define PHB_TX_HANDSHAKE         ((ushort) 0x010)
-
-
-#define RUP_SEND_WNDW            ((ushort) 0x08) ;
-
-#endif
-
-/*********** end of file ***********/
diff --git a/drivers/char/rio/rio.h b/drivers/char/rio/rio.h
deleted file mode 100644
index 1bf36223a4e8..000000000000
--- a/drivers/char/rio/rio.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 1998 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : rio.h
-**      SID             : 1.3
-**      Last Modified   : 11/6/98 11:34:13
-**      Retrieved       : 11/6/98 11:34:22
-**
-**  ident @(#)rio.h     1.3
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_rio_h__
-#define __rio_rio_h__
-
-/*
-**      Maximum numbers of things
-*/
-#define RIO_SLOTS       4       /* number of configuration slots */
-#define RIO_HOSTS       4       /* number of hosts that can be found */
-#define PORTS_PER_HOST  128     /* number of ports per host */
-#define LINKS_PER_UNIT  4       /* number of links from a host */
-#define RIO_PORTS       (PORTS_PER_HOST * RIO_HOSTS)    /* max. no. of ports */
-#define RTAS_PER_HOST   (MAX_RUP)       /* number of RTAs per host */
-#define PORTS_PER_RTA   (PORTS_PER_HOST/RTAS_PER_HOST)  /* ports on a rta */
-#define PORTS_PER_MODULE 4      /* number of ports on a plug-in module */
-                                /* number of modules on an RTA */
-#define MODULES_PER_RTA  (PORTS_PER_RTA/PORTS_PER_MODULE)
-#define MAX_PRODUCT     16      /* numbr of different product codes */
-#define MAX_MODULE_TYPES 16     /* number of different types of module */
-
-#define RIO_CONTROL_DEV 128     /* minor number of host/control device */
-#define RIO_INVALID_MAJOR 0     /* test first host card's major no for validity */
-
-/*
-** number of RTAs that can be bound to a master
-*/
-#define MAX_RTA_BINDINGS (MAX_RUP * RIO_HOSTS)
-
-/*
-**      Unit types
-*/
-#define PC_RTA16        0x90000000
-#define PC_RTA8         0xe0000000
-#define TYPE_HOST       0
-#define TYPE_RTA8       1
-#define TYPE_RTA16      2
-
-/*
-**      Flag values returned by functions
-*/
-
-#define RIO_FAIL        -1
-
-/*
-** SysPort value for something that hasn't any ports
-*/
-#define NO_PORT 0xFFFFFFFF
-
-/*
-** Unit ID Of all hosts
-*/
-#define HOST_ID 0
-
-/*
-** Break bytes into nybles
-*/
-#define LONYBLE(X)      ((X) & 0xF)
-#define HINYBLE(X)      (((X)>>4) & 0xF)
-
-/*
-** Flag values passed into some functions
-*/
-#define DONT_SLEEP      0
-#define OK_TO_SLEEP     1
-
-#define DONT_PRINT      1
-#define DO_PRINT        0
-
-#define PRINT_TO_LOG_CONS       0
-#define PRINT_TO_CONS   1
-#define PRINT_TO_LOG    2
-
-/*
-** Timeout has trouble with times of less than 3 ticks...
-*/
-#define MIN_TIMEOUT     3
-
-/*
-**      Generally useful constants
-*/
-
-#define HUNDRED_MS              ((HZ/10)?(HZ/10):1)
-#define ONE_MEG                 0x100000
-#define SIXTY_FOUR_K            0x10000
-
-#define RIO_AT_MEM_SIZE         SIXTY_FOUR_K
-#define RIO_EISA_MEM_SIZE       SIXTY_FOUR_K
-#define RIO_MCA_MEM_SIZE        SIXTY_FOUR_K
-
-#define COOK_WELL               0
-#define COOK_MEDIUM             1
-#define COOK_RAW                2
-
-/*
-**      Pointer manipulation stuff
-**      RIO_PTR takes hostp->Caddr and the offset into the DP RAM area
-**      and produces a UNIX caddr_t (pointer) to the object
-**      RIO_OBJ takes hostp->Caddr and a UNIX pointer to an object and
-**      returns the offset into the DP RAM area.
-*/
-#define RIO_PTR(C,O) (((unsigned char __iomem *)(C))+(0xFFFF&(O)))
-#define RIO_OFF(C,O) ((unsigned char __iomem *)(O)-(unsigned char __iomem *)(C))
-
-/*
-**      How to convert from various different device number formats:
-**      DEV is a dev number, as passed to open, close etc - NOT a minor
-**      number!
-**/
-
-#define RIO_MODEM_MASK          0x1FF
-#define RIO_MODEM_BIT           0x200
-#define RIO_UNMODEM(DEV)        (MINOR(DEV) & RIO_MODEM_MASK)
-#define RIO_ISMODEM(DEV)        (MINOR(DEV) & RIO_MODEM_BIT)
-#define RIO_PORT(DEV,FIRST_MAJ) ( (MAJOR(DEV) - FIRST_MAJ) * PORTS_PER_HOST) \
-                                        + MINOR(DEV)
-#define CSUM(pkt_ptr)  (((u16 *)(pkt_ptr))[0] + ((u16 *)(pkt_ptr))[1] + \
-                        ((u16 *)(pkt_ptr))[2] + ((u16 *)(pkt_ptr))[3] + \
-                        ((u16 *)(pkt_ptr))[4] + ((u16 *)(pkt_ptr))[5] + \
-                        ((u16 *)(pkt_ptr))[6] + ((u16 *)(pkt_ptr))[7] + \
-                        ((u16 *)(pkt_ptr))[8] + ((u16 *)(pkt_ptr))[9] )
-
-#define RIO_LINK_ENABLE 0x80FF  /* FF is a hack, mainly for Mips, to        */
-                               /* prevent a really stupid race condition.  */
-
-#define NOT_INITIALISED 0
-#define INITIALISED     1
-
-#define NOT_POLLING     0
-#define POLLING         1
-
-#define NOT_CHANGED     0
-#define CHANGED         1
-
-#define NOT_INUSE       0
-
-#define DISCONNECT      0
-#define CONNECT         1
-
-/* ------ Control Codes ------ */
-
-#define CONTROL         '^'
-#define IFOAD           ( CONTROL + 1 )
-#define IDENTIFY        ( CONTROL + 2 )
-#define ZOMBIE          ( CONTROL + 3 )
-#define UFOAD           ( CONTROL + 4 )
-#define IWAIT           ( CONTROL + 5 )
-
-#define IFOAD_MAGIC     0xF0AD  /* of course */
-#define ZOMBIE_MAGIC    (~0xDEAD)       /* not dead -> zombie */
-#define UFOAD_MAGIC     0xD1E   /* kill-your-neighbour */
-#define IWAIT_MAGIC     0xB1DE  /* Bide your time */
-
-/* ------ Error Codes ------ */
-
-#define E_NO_ERROR                       ((ushort) 0)
-
-/* ------ Free Lists ------ */
-
-struct rio_free_list {
-        u16 next;
-        u16 prev;
-};
-
-/* NULL for card side linked lists */
-#define TPNULL  ((ushort)(0x8000))
-/* We can add another packet to a transmit queue if the packet pointer pointed
- * to by the TxAdd pointer has PKT_IN_USE clear in its address. */
-#define PKT_IN_USE    0x1
-
-/* ------ Topology ------ */
-
-struct Top {
-        u8 Unit;
-        u8 Link;
-};
-
-#endif                          /* __rio_h__ */
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c
deleted file mode 100644
index d58c2eb07f07..000000000000
--- a/drivers/char/rio/rio_linux.c
+++ /dev/null
@@ -1,1202 +0,0 @@
-
-/* rio_linux.c -- Linux driver for the Specialix RIO series cards. 
- *
- *
- *   (C) 1999 R.E.Wolff@BitWizard.nl
- *
- * Specialix pays for the development and support of this driver.
- * Please DO contact support@specialix.co.uk if you require
- * support. But please read the documentation (rio.txt) first.
- *
- *
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License as
- *      published by the Free Software Foundation; either version 2 of
- *      the License, or (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be
- *      useful, but WITHOUT ANY WARRANTY; without even the implied
- *      warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *      PURPOSE.  See the GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public
- *      License along with this program; if not, write to the Free
- *      Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
- *      USA.
- *
- * */
-
-#include <linux/module.h>
-#include <linux/kdev_t.h>
-#include <asm/io.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/mm.h>
-#include <linux/serial.h>
-#include <linux/fcntl.h>
-#include <linux/major.h>
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/smp_lock.h>
-#include <linux/miscdevice.h>
-#include <linux/init.h>
-
-#include <linux/generic_serial.h>
-#include <asm/uaccess.h>
-
-#include "linux_compat.h"
-#include "pkt.h"
-#include "daemon.h"
-#include "rio.h"
-#include "riospace.h"
-#include "cmdpkt.h"
-#include "map.h"
-#include "rup.h"
-#include "port.h"
-#include "riodrvr.h"
-#include "rioinfo.h"
-#include "func.h"
-#include "errors.h"
-#include "pci.h"
-
-#include "parmmap.h"
-#include "unixrup.h"
-#include "board.h"
-#include "host.h"
-#include "phb.h"
-#include "link.h"
-#include "cmdblk.h"
-#include "route.h"
-#include "cirrus.h"
-#include "rioioctl.h"
-#include "param.h"
-#include "protsts.h"
-#include "rioboard.h"
-
-
-#include "rio_linux.h"
-
-/* I don't think that this driver can handle more than 512 ports on
-one machine.  Specialix specifies max 4 boards in one machine. I don't
-know why. If you want to try anyway you'll have to increase the number
-of boards in rio.h.  You'll have to allocate more majors if you need
-more than 512 ports.... */
-
-#ifndef RIO_NORMAL_MAJOR0
-/* This allows overriding on the compiler commandline, or in a "major.h" 
-   include or something like that */
-#define RIO_NORMAL_MAJOR0  154
-#define RIO_NORMAL_MAJOR1  156
-#endif
-
-#ifndef PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8
-#define PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8 0x2000
-#endif
-
-#ifndef RIO_WINDOW_LEN
-#define RIO_WINDOW_LEN 0x10000
-#endif
-
-
-/* Configurable options: 
-   (Don't be too sure that it'll work if you toggle them) */
-
-/* Am I paranoid or not ? ;-) */
-#undef RIO_PARANOIA_CHECK
-
-
-/* 20 -> 2000 per second. The card should rate-limit interrupts at 1000
-   Hz, but it is user configurable. I don't recommend going above 1000
-   Hz. The interrupt ratelimit might trigger if the interrupt is
-   shared with a very active other device. 
-   undef this if you want to disable the check....
-*/
-#define IRQ_RATE_LIMIT 200
-
-
-/* These constants are derived from SCO Source */
-static struct Conf
- RIOConf = {
-        /* locator */ "RIO Config here",
-                                        /* startuptime */ HZ * 2,
-                                        /* how long to wait for card to run */
-                                /* slowcook */ 0,
-                                /* TRUE -> always use line disc. */
-                                /* intrpolltime */ 1,
-                                /* The frequency of OUR polls */
-                                /* breakinterval */ 25,
-                                /* x10 mS XXX: units seem to be 1ms not 10! -- REW */
-                                /* timer */ 10,
-                                /* mS */
-        /* RtaLoadBase */ 0x7000,
-        /* HostLoadBase */ 0x7C00,
-                                /* XpHz */ 5,
-                                /* number of Xprint hits per second */
-                                /* XpCps */ 120,
-                                /* Xprint characters per second */
-                                /* XpOn */ "\033d#",
-                                /* start Xprint for a wyse 60 */
-                                /* XpOff */ "\024",
-                                /* end Xprint for a wyse 60 */
-                                /* MaxXpCps */ 2000,
-                                /* highest Xprint speed */
-                                /* MinXpCps */ 10,
-                                /* slowest Xprint speed */
-                                /* SpinCmds */ 1,
-                                /* non-zero for mega fast boots */
-                                        /* First Addr */ 0x0A0000,
-                                        /* First address to look at */
-                                        /* Last Addr */ 0xFF0000,
-                                        /* Last address looked at */
-                                /* BufferSize */ 1024,
-                                /* Bytes per port of buffering */
-                                /* LowWater */ 256,
-                                /* how much data left before wakeup */
-                                /* LineLength */ 80,
-                                /* how wide is the console? */
-                                /* CmdTimeout */ HZ,
-                                /* how long a close command may take */
-};
-
-
-
-
-/* Function prototypes */
-
-static void rio_disable_tx_interrupts(void *ptr);
-static void rio_enable_tx_interrupts(void *ptr);
-static void rio_disable_rx_interrupts(void *ptr);
-static void rio_enable_rx_interrupts(void *ptr);
-static int rio_carrier_raised(struct tty_port *port);
-static void rio_shutdown_port(void *ptr);
-static int rio_set_real_termios(void *ptr);
-static void rio_hungup(void *ptr);
-static void rio_close(void *ptr);
-static int rio_chars_in_buffer(void *ptr);
-static long rio_fw_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
-static int rio_init_drivers(void);
-
-static void my_hd(void *addr, int len);
-
-static struct tty_driver *rio_driver, *rio_driver2;
-
-/* The name "p" is a bit non-descript. But that's what the rio-lynxos
-sources use all over the place. */
-struct rio_info *p;
-
-int rio_debug;
-
-
-/* You can have the driver poll your card. 
-    - Set rio_poll to 1 to poll every timer tick (10ms on Intel). 
-      This is used when the card cannot use an interrupt for some reason.
-*/
-static int rio_poll = 1;
-
-
-/* These are the only open spaces in my computer. Yours may have more
-   or less.... */
-static int rio_probe_addrs[] = { 0xc0000, 0xd0000, 0xe0000 };
-
-#define NR_RIO_ADDRS ARRAY_SIZE(rio_probe_addrs)
-
-
-/* Set the mask to all-ones. This alas, only supports 32 interrupts. 
-   Some architectures may need more. -- Changed to LONG to
-   support up to 64 bits on 64bit architectures. -- REW 20/06/99 */
-static long rio_irqmask = -1;
-
-MODULE_AUTHOR("Rogier Wolff <R.E.Wolff@bitwizard.nl>, Patrick van de Lageweg <patrick@bitwizard.nl>");
-MODULE_DESCRIPTION("RIO driver");
-MODULE_LICENSE("GPL");
-module_param(rio_poll, int, 0);
-module_param(rio_debug, int, 0644);
-module_param(rio_irqmask, long, 0);
-
-static struct real_driver rio_real_driver = {
-        rio_disable_tx_interrupts,
-        rio_enable_tx_interrupts,
-        rio_disable_rx_interrupts,
-        rio_enable_rx_interrupts,
-        rio_shutdown_port,
-        rio_set_real_termios,
-        rio_chars_in_buffer,
-        rio_close,
-        rio_hungup,
-        NULL
-};
-
-/* 
- *  Firmware loader driver specific routines
- *
- */
-
-static const struct file_operations rio_fw_fops = {
-        .owner = THIS_MODULE,
-        .unlocked_ioctl = rio_fw_ioctl,
-};
-
-static struct miscdevice rio_fw_device = {
-        RIOCTL_MISC_MINOR, "rioctl", &rio_fw_fops
-};
-
-
-
-
-
-#ifdef RIO_PARANOIA_CHECK
-
-/* This doesn't work. Who's paranoid around here? Not me! */
-
-static inline int rio_paranoia_check(struct rio_port const *port, char *name, const char *routine)
-{
-
-        static const char *badmagic = KERN_ERR "rio: Warning: bad rio port magic number for device %s in %s\n";
-        static const char *badinfo = KERN_ERR "rio: Warning: null rio port for device %s in %s\n";
-
-        if (!port) {
-                printk(badinfo, name, routine);
-                return 1;
-        }
-        if (port->magic != RIO_MAGIC) {
-                printk(badmagic, name, routine);
-                return 1;
-        }
-
-        return 0;
-}
-#else
-#define rio_paranoia_check(a,b,c) 0
-#endif
-
-
-#ifdef DEBUG
-static void my_hd(void *ad, int len)
-{
-        int i, j, ch;
-        unsigned char *addr = ad;
-
-        for (i = 0; i < len; i += 16) {
-                rio_dprintk(RIO_DEBUG_PARAM, "%08lx ", (unsigned long) addr + i);
-                for (j = 0; j < 16; j++) {
-                        rio_dprintk(RIO_DEBUG_PARAM, "%02x %s", addr[j + i], (j == 7) ? " " : "");
-                }
-                for (j = 0; j < 16; j++) {
-                        ch = addr[j + i];
-                        rio_dprintk(RIO_DEBUG_PARAM, "%c", (ch < 0x20) ? '.' : ((ch > 0x7f) ? '.' : ch));
-                }
-                rio_dprintk(RIO_DEBUG_PARAM, "\n");
-        }
-}
-#else
-#define my_hd(ad,len) do{/* nothing*/ } while (0)
-#endif
-
-
-/* Delay a number of jiffies, allowing a signal to interrupt */
-int RIODelay(struct Port *PortP, int njiffies)
-{
-        func_enter();
-
-        rio_dprintk(RIO_DEBUG_DELAY, "delaying %d jiffies\n", njiffies);
-        msleep_interruptible(jiffies_to_msecs(njiffies));
-        func_exit();
-
-        if (signal_pending(current))
-                return RIO_FAIL;
-        else
-                return !RIO_FAIL;
-}
-
-
-/* Delay a number of jiffies, disallowing a signal to interrupt */
-int RIODelay_ni(struct Port *PortP, int njiffies)
-{
-        func_enter();
-
-        rio_dprintk(RIO_DEBUG_DELAY, "delaying %d jiffies (ni)\n", njiffies);
-        msleep(jiffies_to_msecs(njiffies));
-        func_exit();
-        return !RIO_FAIL;
-}
-
-void rio_copy_to_card(void *from, void __iomem *to, int len)
-{
-        rio_copy_toio(to, from, len);
-}
-
-int rio_minor(struct tty_struct *tty)
-{
-        return tty->index + ((tty->driver == rio_driver) ? 0 : 256);
-}
-
-static int rio_set_real_termios(void *ptr)
-{
-        return RIOParam((struct Port *) ptr, RIOC_CONFIG, 1, 1);
-}
-
-
-static void rio_reset_interrupt(struct Host *HostP)
-{
-        func_enter();
-
-        switch (HostP->Type) {
-        case RIO_AT:
-        case RIO_MCA:
-        case RIO_PCI:
-                writeb(0xFF, &HostP->ResetInt);
-        }
-
-        func_exit();
-}
-
-
-static irqreturn_t rio_interrupt(int irq, void *ptr)
-{
-        struct Host *HostP;
-        func_enter();
-
-        HostP = ptr;                    /* &p->RIOHosts[(long)ptr]; */
-        rio_dprintk(RIO_DEBUG_IFLOW, "rio: enter rio_interrupt (%d/%d)\n", irq, HostP->Ivec);
-
-        /* AAargh! The order in which to do these things is essential and
-           not trivial.
-
-           - hardware twiddling goes before "recursive". Otherwise when we
-           poll the card, and a recursive interrupt happens, we won't
-           ack the card, so it might keep on interrupting us. (especially
-           level sensitive interrupt systems like PCI).
-
-           - Rate limit goes before hardware twiddling. Otherwise we won't
-           catch a card that has gone bonkers.
-
-           - The "initialized" test goes after the hardware twiddling. Otherwise
-           the card will stick us in the interrupt routine again.
-
-           - The initialized test goes before recursive.
-         */
-
-        rio_dprintk(RIO_DEBUG_IFLOW, "rio: We've have noticed the interrupt\n");
-        if (HostP->Ivec == irq) {
-                /* Tell the card we've noticed the interrupt. */
-                rio_reset_interrupt(HostP);
-        }
-
-        if ((HostP->Flags & RUN_STATE) != RC_RUNNING)
-                return IRQ_HANDLED;
-
-        if (test_and_set_bit(RIO_BOARD_INTR_LOCK, &HostP->locks)) {
-                printk(KERN_ERR "Recursive interrupt! (host %p/irq%d)\n", ptr, HostP->Ivec);
-                return IRQ_HANDLED;
-        }
-
-        RIOServiceHost(p, HostP);
-
-        rio_dprintk(RIO_DEBUG_IFLOW, "riointr() doing host %p type %d\n", ptr, HostP->Type);
-
-        clear_bit(RIO_BOARD_INTR_LOCK, &HostP->locks);
-        rio_dprintk(RIO_DEBUG_IFLOW, "rio: exit rio_interrupt (%d/%d)\n", irq, HostP->Ivec);
-        func_exit();
-        return IRQ_HANDLED;
-}
-
-
-static void rio_pollfunc(unsigned long data)
-{
-        func_enter();
-
-        rio_interrupt(0, &p->RIOHosts[data]);
-        mod_timer(&p->RIOHosts[data].timer, jiffies + rio_poll);
-
-        func_exit();
-}
-
-
-/* ********************************************************************** *
- *                Here are the routines that actually                     *
- *              interface with the generic_serial driver                  *
- * ********************************************************************** */
-
-/* Ehhm. I don't know how to fiddle with interrupts on the Specialix 
-   cards. ....   Hmm. Ok I figured it out. You don't.  -- REW */
-
-static void rio_disable_tx_interrupts(void *ptr)
-{
-        func_enter();
-
-        /*  port->gs.port.flags &= ~GS_TX_INTEN; */
-
-        func_exit();
-}
-
-
-static void rio_enable_tx_interrupts(void *ptr)
-{
-        struct Port *PortP = ptr;
-        /* int hn; */
-
-        func_enter();
-
-        /* hn = PortP->HostP - p->RIOHosts;
-
-           rio_dprintk (RIO_DEBUG_TTY, "Pushing host %d\n", hn);
-           rio_interrupt (-1,(void *) hn, NULL); */
-
-        RIOTxEnable((char *) PortP);
-
-        /*
-         * In general we cannot count on "tx empty" interrupts, although
-         * the interrupt routine seems to be able to tell the difference.
-         */
-        PortP->gs.port.flags &= ~GS_TX_INTEN;
-
-        func_exit();
-}
-
-
-static void rio_disable_rx_interrupts(void *ptr)
-{
-        func_enter();
-        func_exit();
-}
-
-static void rio_enable_rx_interrupts(void *ptr)
-{
-        /*  struct rio_port *port = ptr; */
-        func_enter();
-        func_exit();
-}
-
-
-/* Jeez. Isn't this simple?  */
-static int rio_carrier_raised(struct tty_port *port)
-{
-        struct Port *PortP = container_of(port, struct Port, gs.port);
-        int rv;
-
-        func_enter();
-        rv = (PortP->ModemState & RIOC_MSVR1_CD) != 0;
-
-        rio_dprintk(RIO_DEBUG_INIT, "Getting CD status: %d\n", rv);
-
-        func_exit();
-        return rv;
-}
-
-
-/* Jeez. Isn't this simple? Actually, we can sync with the actual port
-   by just pushing stuff into the queue going to the port... */
-static int rio_chars_in_buffer(void *ptr)
-{
-        func_enter();
-
-        func_exit();
-        return 0;
-}
-
-
-/* Nothing special here... */
-static void rio_shutdown_port(void *ptr)
-{
-        struct Port *PortP;
-
-        func_enter();
-
-        PortP = (struct Port *) ptr;
-        PortP->gs.port.tty = NULL;
-        func_exit();
-}
-
-
-/* I haven't the foggiest why the decrement use count has to happen
-   here. The whole linux serial drivers stuff needs to be redesigned.
-   My guess is that this is a hack to minimize the impact of a bug
-   elsewhere. Thinking about it some more. (try it sometime) Try
-   running minicom on a serial port that is driven by a modularized
-   driver. Have the modem hangup. Then remove the driver module. Then
-   exit minicom.  I expect an "oops".  -- REW */
-static void rio_hungup(void *ptr)
-{
-        struct Port *PortP;
-
-        func_enter();
-
-        PortP = (struct Port *) ptr;
-        PortP->gs.port.tty = NULL;
-
-        func_exit();
-}
-
-
-/* The standard serial_close would become shorter if you'd wrap it like
-   this. 
-   rs_close (...){save_flags;cli;real_close();dec_use_count;restore_flags;}
- */
-static void rio_close(void *ptr)
-{
-        struct Port *PortP;
-
-        func_enter();
-
-        PortP = (struct Port *) ptr;
-
-        riotclose(ptr);
-
-        if (PortP->gs.port.count) {
-                printk(KERN_ERR "WARNING port count:%d\n", PortP->gs.port.count);
-                PortP->gs.port.count = 0;
-        }
-
-        PortP->gs.port.tty = NULL;
-        func_exit();
-}
-
-
-
-static long rio_fw_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
-{
-        int rc = 0;
-        func_enter();
-
-        /* The "dev" argument isn't used. */
-        lock_kernel();
-        rc = riocontrol(p, 0, cmd, arg, capable(CAP_SYS_ADMIN));
-        unlock_kernel();
-
-        func_exit();
-        return rc;
-}
-
-extern int RIOShortCommand(struct rio_info *p, struct Port *PortP, int command, int len, int arg);
-
-static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg)
-{
-        void __user *argp = (void __user *)arg;
-        int rc;
-        struct Port *PortP;
-        int ival;
-
-        func_enter();
-
-        PortP = (struct Port *) tty->driver_data;
-
-        rc = 0;
-        switch (cmd) {
-        case TIOCSSOFTCAR:
-                if ((rc = get_user(ival, (unsigned __user *) argp)) == 0) {
-                        tty->termios->c_cflag = (tty->termios->c_cflag & ~CLOCAL) | (ival ? CLOCAL : 0);
-                }
-                break;
-        case TIOCGSERIAL:
-                rc = -EFAULT;
-                if (access_ok(VERIFY_WRITE, argp, sizeof(struct serial_struct)))
-                        rc = gs_getserial(&PortP->gs, argp);
-                break;
-        case TCSBRK:
-                if (PortP->State & RIO_DELETED) {
-                        rio_dprintk(RIO_DEBUG_TTY, "BREAK on deleted RTA\n");
-                        rc = -EIO;
-                } else {
-                        if (RIOShortCommand(p, PortP, RIOC_SBREAK, 2, 250) ==
-                                        RIO_FAIL) {
-                                rio_dprintk(RIO_DEBUG_INTR, "SBREAK RIOShortCommand failed\n");
-                                rc = -EIO;
-                        }
-                }
-                break;
-        case TCSBRKP:
-                if (PortP->State & RIO_DELETED) {
-                        rio_dprintk(RIO_DEBUG_TTY, "BREAK on deleted RTA\n");
-                        rc = -EIO;
-                } else {
-                        int l;
-                        l = arg ? arg * 100 : 250;
-                        if (l > 255)
-                                l = 255;
-                        if (RIOShortCommand(p, PortP, RIOC_SBREAK, 2,
-                                        arg ? arg * 100 : 250) == RIO_FAIL) {
-                                rio_dprintk(RIO_DEBUG_INTR, "SBREAK RIOShortCommand failed\n");
-                                rc = -EIO;
-                        }
-                }
-                break;
-        case TIOCSSERIAL:
-                rc = -EFAULT;
-                if (access_ok(VERIFY_READ, argp, sizeof(struct serial_struct)))
-                        rc = gs_setserial(&PortP->gs, argp);
-                break;
-        default:
-                rc = -ENOIOCTLCMD;
-                break;
-        }
-        func_exit();
-        return rc;
-}
-
-
-/* The throttle/unthrottle scheme for the Specialix card is different
- * from other drivers and deserves some explanation. 
- * The Specialix hardware takes care of XON/XOFF
- * and CTS/RTS flow control itself.  This means that all we have to
- * do when signalled by the upper tty layer to throttle/unthrottle is
- * to make a note of it here.  When we come to read characters from the
- * rx buffers on the card (rio_receive_chars()) we look to see if the
- * upper layer can accept more (as noted here in rio_rx_throt[]). 
- * If it can't we simply don't remove chars from the cards buffer. 
- * When the tty layer can accept chars, we again note that here and when
- * rio_receive_chars() is called it will remove them from the cards buffer.
- * The card will notice that a ports buffer has drained below some low
- * water mark and will unflow control the line itself, using whatever
- * flow control scheme is in use for that port. -- Simon Allen
- */
-
-static void rio_throttle(struct tty_struct *tty)
-{
-        struct Port *port = (struct Port *) tty->driver_data;
-
-        func_enter();
-        /* If the port is using any type of input flow
-         * control then throttle the port.
-         */
-
-        if ((tty->termios->c_cflag & CRTSCTS) || (I_IXOFF(tty))) {
-                port->State |= RIO_THROTTLE_RX;
-        }
-
-        func_exit();
-}
-
-
-static void rio_unthrottle(struct tty_struct *tty)
-{
-        struct Port *port = (struct Port *) tty->driver_data;
-
-        func_enter();
-        /* Always unthrottle even if flow control is not enabled on
-         * this port in case we disabled flow control while the port
-         * was throttled
-         */
-
-        port->State &= ~RIO_THROTTLE_RX;
-
-        func_exit();
-        return;
-}
-
-
-
-
-
-/* ********************************************************************** *
- *                    Here are the initialization routines.               *
- * ********************************************************************** */
-
-
-static struct vpd_prom *get_VPD_PROM(struct Host *hp)
-{
-        static struct vpd_prom vpdp;
-        char *p;
-        int i;
-
-        func_enter();
-        rio_dprintk(RIO_DEBUG_PROBE, "Going to verify vpd prom at %p.\n", hp->Caddr + RIO_VPD_ROM);
-
-        p = (char *) &vpdp;
-        for (i = 0; i < sizeof(struct vpd_prom); i++)
-                *p++ = readb(hp->Caddr + RIO_VPD_ROM + i * 2);
-        /* read_rio_byte (hp, RIO_VPD_ROM + i*2); */
-
-        /* Terminate the identifier string.
-         *** requires one extra byte in struct vpd_prom *** */
-        *p++ = 0;
-
-        if (rio_debug & RIO_DEBUG_PROBE)
-                my_hd((char *) &vpdp, 0x20);
-
-        func_exit();
-
-        return &vpdp;
-}
-
-static const struct tty_operations rio_ops = {
-        .open = riotopen,
-        .close = gs_close,
-        .write = gs_write,
-        .put_char = gs_put_char,
-        .flush_chars = gs_flush_chars,
-        .write_room = gs_write_room,
-        .chars_in_buffer = gs_chars_in_buffer,
-        .flush_buffer = gs_flush_buffer,
-        .ioctl = rio_ioctl,
-        .throttle = rio_throttle,
-        .unthrottle = rio_unthrottle,
-        .set_termios = gs_set_termios,
-        .stop = gs_stop,
-        .start = gs_start,
-        .hangup = gs_hangup,
-};
-
-static int rio_init_drivers(void)
-{
-        int error = -ENOMEM;
-
-        rio_driver = alloc_tty_driver(256);
-        if (!rio_driver)
-                goto out;
-        rio_driver2 = alloc_tty_driver(256);
-        if (!rio_driver2)
-                goto out1;
-
-        func_enter();
-
-        rio_driver->owner = THIS_MODULE;
-        rio_driver->driver_name = "specialix_rio";
-        rio_driver->name = "ttySR";
-        rio_driver->major = RIO_NORMAL_MAJOR0;
-        rio_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        rio_driver->subtype = SERIAL_TYPE_NORMAL;
-        rio_driver->init_termios = tty_std_termios;
-        rio_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        rio_driver->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(rio_driver, &rio_ops);
-
-        rio_driver2->owner = THIS_MODULE;
-        rio_driver2->driver_name = "specialix_rio";
-        rio_driver2->name = "ttySR";
-        rio_driver2->major = RIO_NORMAL_MAJOR1;
-        rio_driver2->type = TTY_DRIVER_TYPE_SERIAL;
-        rio_driver2->subtype = SERIAL_TYPE_NORMAL;
-        rio_driver2->init_termios = tty_std_termios;
-        rio_driver2->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        rio_driver2->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(rio_driver2, &rio_ops);
-
-        rio_dprintk(RIO_DEBUG_INIT, "set_termios = %p\n", gs_set_termios);
-
-        if ((error = tty_register_driver(rio_driver)))
-                goto out2;
-        if ((error = tty_register_driver(rio_driver2)))
-                goto out3;
-        func_exit();
-        return 0;
-      out3:
-        tty_unregister_driver(rio_driver);
-      out2:
-        put_tty_driver(rio_driver2);
-      out1:
-        put_tty_driver(rio_driver);
-      out:
-        printk(KERN_ERR "rio: Couldn't register a rio driver, error = %d\n", error);
-        return 1;
-}
-
-static const struct tty_port_operations rio_port_ops = {
-        .carrier_raised = rio_carrier_raised,
-};
-
-static int rio_init_datastructures(void)
-{
-        int i;
-        struct Port *port;
-        func_enter();
-
-        /* Many drivers statically allocate the maximum number of ports
-           There is no reason not to allocate them dynamically. Is there? -- REW */
-        /* However, the RIO driver allows users to configure their first
-           RTA as the ports numbered 504-511. We therefore need to allocate
-           the whole range. :-(   -- REW */
-
-#define RI_SZ   sizeof(struct rio_info)
-#define HOST_SZ sizeof(struct Host)
-#define PORT_SZ sizeof(struct Port *)
-#define TMIO_SZ sizeof(struct termios *)
-        rio_dprintk(RIO_DEBUG_INIT, "getting : %Zd %Zd %Zd %Zd %Zd bytes\n", RI_SZ, RIO_HOSTS * HOST_SZ, RIO_PORTS * PORT_SZ, RIO_PORTS * TMIO_SZ, RIO_PORTS * TMIO_SZ);
-
-        if (!(p = kzalloc(RI_SZ, GFP_KERNEL)))
-                goto free0;
-        if (!(p->RIOHosts = kzalloc(RIO_HOSTS * HOST_SZ, GFP_KERNEL)))
-                goto free1;
-        if (!(p->RIOPortp = kzalloc(RIO_PORTS * PORT_SZ, GFP_KERNEL)))
-                goto free2;
-        p->RIOConf = RIOConf;
-        rio_dprintk(RIO_DEBUG_INIT, "Got : %p %p %p\n", p, p->RIOHosts, p->RIOPortp);
-
-#if 1
-        for (i = 0; i < RIO_PORTS; i++) {
-                port = p->RIOPortp[i] = kzalloc(sizeof(struct Port), GFP_KERNEL);
-                if (!port) {
-                        goto free6;
-                }
-                rio_dprintk(RIO_DEBUG_INIT, "initing port %d (%d)\n", i, port->Mapped);
-                tty_port_init(&port->gs.port);
-                port->gs.port.ops = &rio_port_ops;
-                port->PortNum = i;
-                port->gs.magic = RIO_MAGIC;
-                port->gs.close_delay = HZ / 2;
-                port->gs.closing_wait = 30 * HZ;
-                port->gs.rd = &rio_real_driver;
-                spin_lock_init(&port->portSem);
-        }
-#else
-        /* We could postpone initializing them to when they are configured. */
-#endif
-
-
-
-        if (rio_debug & RIO_DEBUG_INIT) {
-                my_hd(&rio_real_driver, sizeof(rio_real_driver));
-        }
-
-
-        func_exit();
-        return 0;
-
-      free6:for (i--; i >= 0; i--)
-                kfree(p->RIOPortp[i]);
-/*free5:
- free4:
- free3:*/ kfree(p->RIOPortp);
-      free2:kfree(p->RIOHosts);
-      free1:
-        rio_dprintk(RIO_DEBUG_INIT, "Not enough memory! %p %p %p\n", p, p->RIOHosts, p->RIOPortp);
-        kfree(p);
-      free0:
-        return -ENOMEM;
-}
-
-static void __exit rio_release_drivers(void)
-{
-        func_enter();
-        tty_unregister_driver(rio_driver2);
-        tty_unregister_driver(rio_driver);
-        put_tty_driver(rio_driver2);
-        put_tty_driver(rio_driver);
-        func_exit();
-}
-
-
-#ifdef CONFIG_PCI
- /* This was written for SX, but applies to RIO too...
-    (including bugs....)
-
-    There is another bit besides Bit 17. Turning that bit off
-    (on boards shipped with the fix in the eeprom) results in a 
-    hang on the next access to the card. 
-  */
-
- /******************************************************** 
- * Setting bit 17 in the CNTRL register of the PLX 9050  * 
- * chip forces a retry on writes while a read is pending.*
- * This is to prevent the card locking up on Intel Xeon  *
- * multiprocessor systems with the NX chipset.    -- NV  *
- ********************************************************/
-
-/* Newer cards are produced with this bit set from the configuration
-   EEprom.  As the bit is read/write for the CPU, we can fix it here,
-   if we detect that it isn't set correctly. -- REW */
-
-static void fix_rio_pci(struct pci_dev *pdev)
-{
-        unsigned long hwbase;
-        unsigned char __iomem *rebase;
-        unsigned int t;
-
-#define CNTRL_REG_OFFSET        0x50
-#define CNTRL_REG_GOODVALUE     0x18260000
-
-        hwbase = pci_resource_start(pdev, 0);
-        rebase = ioremap(hwbase, 0x80);
-        t = readl(rebase + CNTRL_REG_OFFSET);
-        if (t != CNTRL_REG_GOODVALUE) {
-                printk(KERN_DEBUG "rio: performing cntrl reg fix: %08x -> %08x\n", t, CNTRL_REG_GOODVALUE);
-                writel(CNTRL_REG_GOODVALUE, rebase + CNTRL_REG_OFFSET);
-        }
-        iounmap(rebase);
-}
-#endif
-
-
-static int __init rio_init(void)
-{
-        int found = 0;
-        int i;
-        struct Host *hp;
-        int retval;
-        struct vpd_prom *vpdp;
-        int okboard;
-
-#ifdef CONFIG_PCI
-        struct pci_dev *pdev = NULL;
-        unsigned short tshort;
-#endif
-
-        func_enter();
-        rio_dprintk(RIO_DEBUG_INIT, "Initing rio module... (rio_debug=%d)\n", rio_debug);
-
-        if (abs((long) (&rio_debug) - rio_debug) < 0x10000) {
-                printk(KERN_WARNING "rio: rio_debug is an address, instead of a value. " "Assuming -1. Was %x/%p.\n", rio_debug, &rio_debug);
-                rio_debug = -1;
-        }
-
-        if (misc_register(&rio_fw_device) < 0) {
-                printk(KERN_ERR "RIO: Unable to register firmware loader driver.\n");
-                return -EIO;
-        }
-
-        retval = rio_init_datastructures();
-        if (retval < 0) {
-                misc_deregister(&rio_fw_device);
-                return retval;
-        }
-#ifdef CONFIG_PCI
-        /* First look for the JET devices: */
-        while ((pdev = pci_get_device(PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, pdev))) {
-                u32 tint;
-
-                if (pci_enable_device(pdev))
-                        continue;
-
-                /* Specialix has a whole bunch of cards with
-                   0x2000 as the device ID. They say its because
-                   the standard requires it. Stupid standard. */
-                /* It seems that reading a word doesn't work reliably on 2.0.
-                   Also, reading a non-aligned dword doesn't work. So we read the
-                   whole dword at 0x2c and extract the word at 0x2e (SUBSYSTEM_ID)
-                   ourselves */
-                pci_read_config_dword(pdev, 0x2c, &tint);
-                tshort = (tint >> 16) & 0xffff;
-                rio_dprintk(RIO_DEBUG_PROBE, "Got a specialix card: %x.\n", tint);
-                if (tshort != 0x0100) {
-                        rio_dprintk(RIO_DEBUG_PROBE, "But it's not a RIO card (%d)...\n", tshort);
-                        continue;
-                }
-                rio_dprintk(RIO_DEBUG_PROBE, "cp1\n");
-
-                hp = &p->RIOHosts[p->RIONumHosts];
-                hp->PaddrP = pci_resource_start(pdev, 2);
-                hp->Ivec = pdev->irq;
-                if (((1 << hp->Ivec) & rio_irqmask) == 0)
-                        hp->Ivec = 0;
-                hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN);
-                hp->CardP = (struct DpRam __iomem *) hp->Caddr;
-                hp->Type = RIO_PCI;
-                hp->Copy = rio_copy_to_card;
-                hp->Mode = RIO_PCI_BOOT_FROM_RAM;
-                spin_lock_init(&hp->HostLock);
-                rio_reset_interrupt(hp);
-                rio_start_card_running(hp);
-
-                rio_dprintk(RIO_DEBUG_PROBE, "Going to test it (%p/%p).\n", (void *) p->RIOHosts[p->RIONumHosts].PaddrP, p->RIOHosts[p->RIONumHosts].Caddr);
-                if (RIOBoardTest(p->RIOHosts[p->RIONumHosts].PaddrP, p->RIOHosts[p->RIONumHosts].Caddr, RIO_PCI, 0) == 0) {
-                        rio_dprintk(RIO_DEBUG_INIT, "Done RIOBoardTest\n");
-                        writeb(0xFF, &p->RIOHosts[p->RIONumHosts].ResetInt);
-                        p->RIOHosts[p->RIONumHosts].UniqueNum =
-                            ((readb(&p->RIOHosts[p->RIONumHosts].Unique[0]) & 0xFF) << 0) |
-                            ((readb(&p->RIOHosts[p->RIONumHosts].Unique[1]) & 0xFF) << 8) | ((readb(&p->RIOHosts[p->RIONumHosts].Unique[2]) & 0xFF) << 16) | ((readb(&p->RIOHosts[p->RIONumHosts].Unique[3]) & 0xFF) << 24);
-                        rio_dprintk(RIO_DEBUG_PROBE, "Hmm Tested ok, uniqid = %x.\n", p->RIOHosts[p->RIONumHosts].UniqueNum);
-
-                        fix_rio_pci(pdev);
-
-                        p->RIOHosts[p->RIONumHosts].pdev = pdev;
-                        pci_dev_get(pdev);
-
-                        p->RIOLastPCISearch = 0;
-                        p->RIONumHosts++;
-                        found++;
-                } else {
-                        iounmap(p->RIOHosts[p->RIONumHosts].Caddr);
-                        p->RIOHosts[p->RIONumHosts].Caddr = NULL;
-                }
-        }
-
-        /* Then look for the older PCI card.... : */
-
-        /* These older PCI cards have problems (only byte-mode access is
-           supported), which makes them a bit awkward to support.
-           They also have problems sharing interrupts. Be careful.
-           (The driver now refuses to share interrupts for these
-           cards. This should be sufficient).
-         */
-
-        /* Then look for the older RIO/PCI devices: */
-        while ((pdev = pci_get_device(PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_SPECIALIX_RIO, pdev))) {
-                if (pci_enable_device(pdev))
-                        continue;
-
-#ifdef CONFIG_RIO_OLDPCI
-                hp = &p->RIOHosts[p->RIONumHosts];
-                hp->PaddrP = pci_resource_start(pdev, 0);
-                hp->Ivec = pdev->irq;
-                if (((1 << hp->Ivec) & rio_irqmask) == 0)
-                        hp->Ivec = 0;
-                hp->Ivec |= 0x8000;     /* Mark as non-sharable */
-                hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN);
-                hp->CardP = (struct DpRam __iomem *) hp->Caddr;
-                hp->Type = RIO_PCI;
-                hp->Copy = rio_copy_to_card;
-                hp->Mode = RIO_PCI_BOOT_FROM_RAM;
-                spin_lock_init(&hp->HostLock);
-
-                rio_dprintk(RIO_DEBUG_PROBE, "Ivec: %x\n", hp->Ivec);
-                rio_dprintk(RIO_DEBUG_PROBE, "Mode: %x\n", hp->Mode);
-
-                rio_reset_interrupt(hp);
-                rio_start_card_running(hp);
-                rio_dprintk(RIO_DEBUG_PROBE, "Going to test it (%p/%p).\n", (void *) p->RIOHosts[p->RIONumHosts].PaddrP, p->RIOHosts[p->RIONumHosts].Caddr);
-                if (RIOBoardTest(p->RIOHosts[p->RIONumHosts].PaddrP, p->RIOHosts[p->RIONumHosts].Caddr, RIO_PCI, 0) == 0) {
-                        writeb(0xFF, &p->RIOHosts[p->RIONumHosts].ResetInt);
-                        p->RIOHosts[p->RIONumHosts].UniqueNum =
-                            ((readb(&p->RIOHosts[p->RIONumHosts].Unique[0]) & 0xFF) << 0) |
-                            ((readb(&p->RIOHosts[p->RIONumHosts].Unique[1]) & 0xFF) << 8) | ((readb(&p->RIOHosts[p->RIONumHosts].Unique[2]) & 0xFF) << 16) | ((readb(&p->RIOHosts[p->RIONumHosts].Unique[3]) & 0xFF) << 24);
-                        rio_dprintk(RIO_DEBUG_PROBE, "Hmm Tested ok, uniqid = %x.\n", p->RIOHosts[p->RIONumHosts].UniqueNum);
-
-                        p->RIOHosts[p->RIONumHosts].pdev = pdev;
-                        pci_dev_get(pdev);
-
-                        p->RIOLastPCISearch = 0;
-                        p->RIONumHosts++;
-                        found++;
-                } else {
-                        iounmap(p->RIOHosts[p->RIONumHosts].Caddr);
-                        p->RIOHosts[p->RIONumHosts].Caddr = NULL;
-                }
-#else
-                printk(KERN_ERR "Found an older RIO PCI card, but the driver is not " "compiled to support it.\n");
-#endif
-        }
-#endif                          /* PCI */
-
-        /* Now probe for ISA cards... */
-        for (i = 0; i < NR_RIO_ADDRS; i++) {
-                hp = &p->RIOHosts[p->RIONumHosts];
-                hp->PaddrP = rio_probe_addrs[i];
-                /* There was something about the IRQs of these cards. 'Forget what.--REW */
-                hp->Ivec = 0;
-                hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN);
-                hp->CardP = (struct DpRam __iomem *) hp->Caddr;
-                hp->Type = RIO_AT;
-                hp->Copy = rio_copy_to_card;    /* AT card PCI???? - PVDL
-                                         * -- YES! this is now a normal copy. Only the
-                                         * old PCI card uses the special PCI copy.
-                                         * Moreover, the ISA card will work with the
-                                         * special PCI copy anyway. -- REW */
-                hp->Mode = 0;
-                spin_lock_init(&hp->HostLock);
-
-                vpdp = get_VPD_PROM(hp);
-                rio_dprintk(RIO_DEBUG_PROBE, "Got VPD ROM\n");
-                okboard = 0;
-                if ((strncmp(vpdp->identifier, RIO_ISA_IDENT, 16) == 0) || (strncmp(vpdp->identifier, RIO_ISA2_IDENT, 16) == 0) || (strncmp(vpdp->identifier, RIO_ISA3_IDENT, 16) == 0)) {
-                        /* Board is present... */
-                        if (RIOBoardTest(hp->PaddrP, hp->Caddr, RIO_AT, 0) == 0) {
-                                /* ... and feeling fine!!!! */
-                                rio_dprintk(RIO_DEBUG_PROBE, "Hmm Tested ok, uniqid = %x.\n", p->RIOHosts[p->RIONumHosts].UniqueNum);
-                                if (RIOAssignAT(p, hp->PaddrP, hp->Caddr, 0)) {
-                                        rio_dprintk(RIO_DEBUG_PROBE, "Hmm Tested ok, host%d uniqid = %x.\n", p->RIONumHosts, p->RIOHosts[p->RIONumHosts - 1].UniqueNum);
-                                        okboard++;
-                                        found++;
-                                }
-                        }
-
-                        if (!okboard) {
-                                iounmap(hp->Caddr);
-                                hp->Caddr = NULL;
-                        }
-                }
-        }
-
-
-        for (i = 0; i < p->RIONumHosts; i++) {
-                hp = &p->RIOHosts[i];
-                if (hp->Ivec) {
-                        int mode = IRQF_SHARED;
-                        if (hp->Ivec & 0x8000) {
-                                mode = 0;
-                                hp->Ivec &= 0x7fff;
-                        }
-                        rio_dprintk(RIO_DEBUG_INIT, "Requesting interrupt hp: %p rio_interrupt: %d Mode: %x\n", hp, hp->Ivec, hp->Mode);
-                        retval = request_irq(hp->Ivec, rio_interrupt, mode, "rio", hp);
-                        rio_dprintk(RIO_DEBUG_INIT, "Return value from request_irq: %d\n", retval);
-                        if (retval) {
-                                printk(KERN_ERR "rio: Cannot allocate irq %d.\n", hp->Ivec);
-                                hp->Ivec = 0;
-                        }
-                        rio_dprintk(RIO_DEBUG_INIT, "Got irq %d.\n", hp->Ivec);
-                        if (hp->Ivec != 0) {
-                                rio_dprintk(RIO_DEBUG_INIT, "Enabling interrupts on rio card.\n");
-                                hp->Mode |= RIO_PCI_INT_ENABLE;
-                        } else
-                                hp->Mode &= ~RIO_PCI_INT_ENABLE;
-                        rio_dprintk(RIO_DEBUG_INIT, "New Mode: %x\n", hp->Mode);
-                        rio_start_card_running(hp);
-                }
-                /* Init the timer "always" to make sure that it can safely be
-                   deleted when we unload... */
-
-                setup_timer(&hp->timer, rio_pollfunc, i);
-                if (!hp->Ivec) {
-                        rio_dprintk(RIO_DEBUG_INIT, "Starting polling at %dj intervals.\n", rio_poll);
-                        mod_timer(&hp->timer, jiffies + rio_poll);
-                }
-        }
-
-        if (found) {
-                rio_dprintk(RIO_DEBUG_INIT, "rio: total of %d boards detected.\n", found);
-                rio_init_drivers();
-        } else {
-                /* deregister the misc device we created earlier */
-                misc_deregister(&rio_fw_device);
-        }
-
-        func_exit();
-        return found ? 0 : -EIO;
-}
-
-
-static void __exit rio_exit(void)
-{
-        int i;
-        struct Host *hp;
-
-        func_enter();
-
-        for (i = 0, hp = p->RIOHosts; i < p->RIONumHosts; i++, hp++) {
-                RIOHostReset(hp->Type, hp->CardP, hp->Slot);
-                if (hp->Ivec) {
-                        free_irq(hp->Ivec, hp);
-                        rio_dprintk(RIO_DEBUG_INIT, "freed irq %d.\n", hp->Ivec);
-                }
-                /* It is safe/allowed to del_timer a non-active timer */
-                del_timer_sync(&hp->timer);
-                if (hp->Caddr)
-                        iounmap(hp->Caddr);
-                if (hp->Type == RIO_PCI)
-                        pci_dev_put(hp->pdev);
-        }
-
-        if (misc_deregister(&rio_fw_device) < 0) {
-                printk(KERN_INFO "rio: couldn't deregister control-device\n");
-        }
-
-
-        rio_dprintk(RIO_DEBUG_CLEANUP, "Cleaning up drivers\n");
-
-        rio_release_drivers();
-
-        /* Release dynamically allocated memory */
-        kfree(p->RIOPortp);
-        kfree(p->RIOHosts);
-        kfree(p);
-
-        func_exit();
-}
-
-module_init(rio_init);
-module_exit(rio_exit);
diff --git a/drivers/char/rio/rio_linux.h b/drivers/char/rio/rio_linux.h
deleted file mode 100644
index 7f26cd7c815e..000000000000
--- a/drivers/char/rio/rio_linux.h
+++ /dev/null
@@ -1,197 +0,0 @@
-
-/*
- *  rio_linux.h
- *
- *  Copyright (C) 1998,1999,2000 R.E.Wolff@BitWizard.nl
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  RIO serial driver.
- *
- *  Version 1.0 -- July, 1999. 
- * 
- */
-
-#define RIO_NBOARDS        4
-#define RIO_PORTSPERBOARD 128
-#define RIO_NPORTS        (RIO_NBOARDS * RIO_PORTSPERBOARD)
-
-#define MODEM_SUPPORT
-
-#ifdef __KERNEL__
-
-#define RIO_MAGIC 0x12345678
-
-
-struct vpd_prom {
-        unsigned short id;
-        char hwrev;
-        char hwass;
-        int uniqid;
-        char myear;
-        char mweek;
-        char hw_feature[5];
-        char oem_id;
-        char identifier[16];
-};
-
-
-#define RIO_DEBUG_ALL           0xffffffff
-
-#define O_OTHER(tty)    \
-      ((O_OLCUC(tty))  ||\
-      (O_ONLCR(tty))   ||\
-      (O_OCRNL(tty))   ||\
-      (O_ONOCR(tty))   ||\
-      (O_ONLRET(tty))  ||\
-      (O_OFILL(tty))   ||\
-      (O_OFDEL(tty))   ||\
-      (O_NLDLY(tty))   ||\
-      (O_CRDLY(tty))   ||\
-      (O_TABDLY(tty))  ||\
-      (O_BSDLY(tty))   ||\
-      (O_VTDLY(tty))   ||\
-      (O_FFDLY(tty)))
-
-/* Same for input. */
-#define I_OTHER(tty)    \
-      ((I_INLCR(tty))  ||\
-      (I_IGNCR(tty))   ||\
-      (I_ICRNL(tty))   ||\
-      (I_IUCLC(tty))   ||\
-      (L_ISIG(tty)))
-
-
-#endif                          /* __KERNEL__ */
-
-
-#define RIO_BOARD_INTR_LOCK  1
-
-
-#ifndef RIOCTL_MISC_MINOR
-/* Allow others to gather this into "major.h" or something like that */
-#define RIOCTL_MISC_MINOR    169
-#endif
-
-
-/* Allow us to debug "in the field" without requiring clients to
-   recompile.... */
-#if 1
-#define rio_spin_lock_irqsave(sem, flags) do { \
-        rio_dprintk (RIO_DEBUG_SPINLOCK, "spinlockirqsave: %p %s:%d\n", \
-                                        sem, __FILE__, __LINE__);\
-        spin_lock_irqsave(sem, flags);\
-        } while (0)
-
-#define rio_spin_unlock_irqrestore(sem, flags) do { \
-        rio_dprintk (RIO_DEBUG_SPINLOCK, "spinunlockirqrestore: %p %s:%d\n",\
-                                        sem, __FILE__, __LINE__);\
-        spin_unlock_irqrestore(sem, flags);\
-        } while (0)
-
-#define rio_spin_lock(sem) do { \
-        rio_dprintk (RIO_DEBUG_SPINLOCK, "spinlock: %p %s:%d\n",\
-                                        sem, __FILE__, __LINE__);\
-        spin_lock(sem);\
-        } while (0)
-
-#define rio_spin_unlock(sem) do { \
-        rio_dprintk (RIO_DEBUG_SPINLOCK, "spinunlock: %p %s:%d\n",\
-                                        sem, __FILE__, __LINE__);\
-        spin_unlock(sem);\
-        } while (0)
-#else
-#define rio_spin_lock_irqsave(sem, flags) \
-            spin_lock_irqsave(sem, flags)
-
-#define rio_spin_unlock_irqrestore(sem, flags) \
-            spin_unlock_irqrestore(sem, flags)
-
-#define rio_spin_lock(sem) \
-            spin_lock(sem)
-
-#define rio_spin_unlock(sem) \
-            spin_unlock(sem)
-
-#endif
-
-
-
-#ifdef CONFIG_RIO_OLDPCI
-static inline void __iomem *rio_memcpy_toio(void __iomem *dummy, void __iomem *dest, void *source, int n)
-{
-        char __iomem *dst = dest;
-        char *src = source;
-
-        while (n--) {
-                writeb(*src++, dst++);
-                (void) readb(dummy);
-        }
-
-        return dest;
-}
-
-static inline void __iomem *rio_copy_toio(void __iomem *dest, void *source, int n)
-{
-        char __iomem *dst = dest;
-        char *src = source;
-
-        while (n--)
-                writeb(*src++, dst++);
-
-        return dest;
-}
-
-
-static inline void *rio_memcpy_fromio(void *dest, void __iomem *source, int n)
-{
-        char *dst = dest;
-        char __iomem *src = source;
-
-        while (n--)
-                *dst++ = readb(src++);
-
-        return dest;
-}
-
-#else
-#define rio_memcpy_toio(dummy,dest,source,n)   memcpy_toio(dest, source, n)
-#define rio_copy_toio                          memcpy_toio
-#define rio_memcpy_fromio                      memcpy_fromio
-#endif
-
-#define DEBUG 1
-
-
-/* 
-   This driver can spew a whole lot of debugging output at you. If you
-   need maximum performance, you should disable the DEBUG define. To
-   aid in debugging in the field, I'm leaving the compile-time debug
-   features enabled, and disable them "runtime". That allows me to
-   instruct people with problems to enable debugging without requiring
-   them to recompile... 
-*/
-
-#ifdef DEBUG
-#define rio_dprintk(f, str...) do { if (rio_debug & f) printk (str);} while (0)
-#define func_enter() rio_dprintk (RIO_DEBUG_FLOW, "rio: enter %s\n", __func__)
-#define func_exit()  rio_dprintk (RIO_DEBUG_FLOW, "rio: exit  %s\n", __func__)
-#define func_enter2() rio_dprintk (RIO_DEBUG_FLOW, "rio: enter %s (port %d)\n",__func__, port->line)
-#else
-#define rio_dprintk(f, str...)  /* nothing */
-#define func_enter()
-#define func_exit()
-#define func_enter2()
-#endif
diff --git a/drivers/char/rio/rioboard.h b/drivers/char/rio/rioboard.h
deleted file mode 100644
index 252230043c82..000000000000
--- a/drivers/char/rio/rioboard.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/************************************************************************/
-/*                                                                      */
-/*      Title           :       RIO Host Card Hardware Definitions      */
-/*                                                                      */
-/*      Author          :       N.P.Vassallo                            */
-/*                                                                      */
-/*      Creation        :       26th April 1999                         */
-/*                                                                      */
-/*      Version         :       1.0.0                                   */
-/*                                                                      */
-/*      Copyright       :       (c) Specialix International Ltd. 1999   *
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *                                                                      */
-/*      Description     :       Prototypes, structures and definitions  */
-/*                              describing the RIO board hardware       */
-/*                                                                      */
-/************************************************************************/
-
-#ifndef _rioboard_h             /* If RIOBOARD.H not already defined */
-#define _rioboard_h    1
-
-/*****************************************************************************
-***********************                                ***********************
-***********************   Hardware Control Registers   ***********************
-***********************                                ***********************
-*****************************************************************************/
-
-/* Hardware Registers... */
-
-#define RIO_REG_BASE    0x7C00  /* Base of control registers */
-
-#define RIO_CONFIG      RIO_REG_BASE + 0x0000   /* WRITE: Configuration Register */
-#define RIO_INTSET      RIO_REG_BASE + 0x0080   /* WRITE: Interrupt Set */
-#define RIO_RESET       RIO_REG_BASE + 0x0100   /* WRITE: Host Reset */
-#define RIO_INTRESET    RIO_REG_BASE + 0x0180   /* WRITE: Interrupt Reset */
-
-#define RIO_VPD_ROM     RIO_REG_BASE + 0x0000   /* READ: Vital Product Data ROM */
-#define RIO_INTSTAT     RIO_REG_BASE + 0x0080   /* READ: Interrupt Status (Jet boards only) */
-#define RIO_RESETSTAT   RIO_REG_BASE + 0x0100   /* READ: Reset Status (Jet boards only) */
-
-/* RIO_VPD_ROM definitions... */
-#define VPD_SLX_ID1     0x00    /* READ: Specialix Identifier #1 */
-#define VPD_SLX_ID2     0x01    /* READ: Specialix Identifier #2 */
-#define VPD_HW_REV      0x02    /* READ: Hardware Revision */
-#define VPD_HW_ASSEM    0x03    /* READ: Hardware Assembly Level */
-#define VPD_UNIQUEID4   0x04    /* READ: Unique Identifier #4 */
-#define VPD_UNIQUEID3   0x05    /* READ: Unique Identifier #3 */
-#define VPD_UNIQUEID2   0x06    /* READ: Unique Identifier #2 */
-#define VPD_UNIQUEID1   0x07    /* READ: Unique Identifier #1 */
-#define VPD_MANU_YEAR   0x08    /* READ: Year Of Manufacture (0 = 1970) */
-#define VPD_MANU_WEEK   0x09    /* READ: Week Of Manufacture (0 = week 1 Jan) */
-#define VPD_HWFEATURE1  0x0A    /* READ: Hardware Feature Byte 1 */
-#define VPD_HWFEATURE2  0x0B    /* READ: Hardware Feature Byte 2 */
-#define VPD_HWFEATURE3  0x0C    /* READ: Hardware Feature Byte 3 */
-#define VPD_HWFEATURE4  0x0D    /* READ: Hardware Feature Byte 4 */
-#define VPD_HWFEATURE5  0x0E    /* READ: Hardware Feature Byte 5 */
-#define VPD_OEMID       0x0F    /* READ: OEM Identifier */
-#define VPD_IDENT       0x10    /* READ: Identifier string (16 bytes) */
-#define VPD_IDENT_LEN   0x10
-
-/* VPD ROM Definitions... */
-#define SLX_ID1         0x4D
-#define SLX_ID2         0x98
-
-#define PRODUCT_ID(a)   ((a>>4)&0xF)    /* Use to obtain Product ID from VPD_UNIQUEID1 */
-
-#define ID_SX_ISA       0x2
-#define ID_RIO_EISA     0x3
-#define ID_SX_PCI       0x5
-#define ID_SX_EISA      0x7
-#define ID_RIO_RTA16    0x9
-#define ID_RIO_ISA      0xA
-#define ID_RIO_MCA      0xB
-#define ID_RIO_SBUS     0xC
-#define ID_RIO_PCI      0xD
-#define ID_RIO_RTA8     0xE
-
-/* Transputer bootstrap definitions... */
-
-#define BOOTLOADADDR            (0x8000 - 6)
-#define BOOTINDICATE            (0x8000 - 2)
-
-/* Firmware load position... */
-
-#define FIRMWARELOADADDR        0x7C00  /* Firmware is loaded _before_ this address */
-
-/*****************************************************************************
-*****************************                    *****************************
-*****************************   RIO (Rev1) ISA   *****************************
-*****************************                    *****************************
-*****************************************************************************/
-
-/* Control Register Definitions... */
-#define RIO_ISA_IDENT   "JBJGPGGHINSMJPJR"
-
-#define RIO_ISA_CFG_BOOTRAM     0x01    /* Boot from RAM, else Link */
-#define RIO_ISA_CFG_BUSENABLE   0x02    /* Enable processor bus */
-#define RIO_ISA_CFG_IRQMASK     0x30    /* Interrupt mask */
-#define   RIO_ISA_CFG_IRQ12     0x10    /* Interrupt Level 12 */
-#define   RIO_ISA_CFG_IRQ11     0x20    /* Interrupt Level 11 */
-#define   RIO_ISA_CFG_IRQ9      0x30    /* Interrupt Level 9 */
-#define RIO_ISA_CFG_LINK20      0x40    /* 20Mbps link, else 10Mbps */
-#define RIO_ISA_CFG_WAITSTATE0  0x80    /* 0 waitstates, else 1 */
-
-/*****************************************************************************
-*****************************                    *****************************
-*****************************   RIO (Rev2) ISA   *****************************
-*****************************                    *****************************
-*****************************************************************************/
-
-/* Control Register Definitions... */
-#define RIO_ISA2_IDENT  "JBJGPGGHINSMJPJR"
-
-#define RIO_ISA2_CFG_BOOTRAM    0x01    /* Boot from RAM, else Link */
-#define RIO_ISA2_CFG_BUSENABLE  0x02    /* Enable processor bus */
-#define RIO_ISA2_CFG_INTENABLE  0x04    /* Interrupt enable, else disable */
-#define RIO_ISA2_CFG_16BIT      0x08    /* 16bit mode, else 8bit */
-#define RIO_ISA2_CFG_IRQMASK    0x30    /* Interrupt mask */
-#define   RIO_ISA2_CFG_IRQ15    0x00    /* Interrupt Level 15 */
-#define   RIO_ISA2_CFG_IRQ12    0x10    /* Interrupt Level 12 */
-#define   RIO_ISA2_CFG_IRQ11    0x20    /* Interrupt Level 11 */
-#define   RIO_ISA2_CFG_IRQ9     0x30    /* Interrupt Level 9 */
-#define RIO_ISA2_CFG_LINK20     0x40    /* 20Mbps link, else 10Mbps */
-#define RIO_ISA2_CFG_WAITSTATE0 0x80    /* 0 waitstates, else 1 */
-
-/*****************************************************************************
-*****************************                   ******************************
-*****************************   RIO (Jet) ISA   ******************************
-*****************************                   ******************************
-*****************************************************************************/
-
-/* Control Register Definitions... */
-#define RIO_ISA3_IDENT  "JET HOST BY KEV#"
-
-#define RIO_ISA3_CFG_BUSENABLE  0x02    /* Enable processor bus */
-#define RIO_ISA3_CFG_INTENABLE  0x04    /* Interrupt enable, else disable */
-#define RIO_ISA32_CFG_IRQMASK   0xF30   /* Interrupt mask */
-#define   RIO_ISA3_CFG_IRQ15    0xF0    /* Interrupt Level 15 */
-#define   RIO_ISA3_CFG_IRQ12    0xC0    /* Interrupt Level 12 */
-#define   RIO_ISA3_CFG_IRQ11    0xB0    /* Interrupt Level 11 */
-#define   RIO_ISA3_CFG_IRQ10    0xA0    /* Interrupt Level 10 */
-#define   RIO_ISA3_CFG_IRQ9     0x90    /* Interrupt Level 9 */
-
-/*****************************************************************************
-*********************************             ********************************
-*********************************   RIO MCA   ********************************
-*********************************             ********************************
-*****************************************************************************/
-
-/* Control Register Definitions... */
-#define RIO_MCA_IDENT   "JBJGPGGHINSMJPJR"
-
-#define RIO_MCA_CFG_BOOTRAM     0x01    /* Boot from RAM, else Link */
-#define RIO_MCA_CFG_BUSENABLE   0x02    /* Enable processor bus */
-#define RIO_MCA_CFG_LINK20      0x40    /* 20Mbps link, else 10Mbps */
-
-/*****************************************************************************
-********************************              ********************************
-********************************   RIO EISA   ********************************
-********************************              ********************************
-*****************************************************************************/
-
-/* EISA Configuration Space Definitions... */
-#define EISA_PRODUCT_ID1        0xC80
-#define EISA_PRODUCT_ID2        0xC81
-#define EISA_PRODUCT_NUMBER     0xC82
-#define EISA_REVISION_NUMBER    0xC83
-#define EISA_CARD_ENABLE        0xC84
-#define EISA_VPD_UNIQUEID4      0xC88   /* READ: Unique Identifier #4 */
-#define EISA_VPD_UNIQUEID3      0xC8A   /* READ: Unique Identifier #3 */
-#define EISA_VPD_UNIQUEID2      0xC90   /* READ: Unique Identifier #2 */
-#define EISA_VPD_UNIQUEID1      0xC92   /* READ: Unique Identifier #1 */
-#define EISA_VPD_MANU_YEAR      0xC98   /* READ: Year Of Manufacture (0 = 1970) */
-#define EISA_VPD_MANU_WEEK      0xC9A   /* READ: Week Of Manufacture (0 = week 1 Jan) */
-#define EISA_MEM_ADDR_23_16     0xC00
-#define EISA_MEM_ADDR_31_24     0xC01
-#define EISA_RIO_CONFIG         0xC02   /* WRITE: Configuration Register */
-#define EISA_RIO_INTSET         0xC03   /* WRITE: Interrupt Set */
-#define EISA_RIO_INTRESET       0xC03   /* READ:  Interrupt Reset */
-
-/* Control Register Definitions... */
-#define RIO_EISA_CFG_BOOTRAM    0x01    /* Boot from RAM, else Link */
-#define RIO_EISA_CFG_LINK20     0x02    /* 20Mbps link, else 10Mbps */
-#define RIO_EISA_CFG_BUSENABLE  0x04    /* Enable processor bus */
-#define RIO_EISA_CFG_PROCRUN    0x08    /* Processor running, else reset */
-#define RIO_EISA_CFG_IRQMASK    0xF0    /* Interrupt mask */
-#define   RIO_EISA_CFG_IRQ15    0xF0    /* Interrupt Level 15 */
-#define   RIO_EISA_CFG_IRQ14    0xE0    /* Interrupt Level 14 */
-#define   RIO_EISA_CFG_IRQ12    0xC0    /* Interrupt Level 12 */
-#define   RIO_EISA_CFG_IRQ11    0xB0    /* Interrupt Level 11 */
-#define   RIO_EISA_CFG_IRQ10    0xA0    /* Interrupt Level 10 */
-#define   RIO_EISA_CFG_IRQ9     0x90    /* Interrupt Level 9 */
-#define   RIO_EISA_CFG_IRQ7     0x70    /* Interrupt Level 7 */
-#define   RIO_EISA_CFG_IRQ6     0x60    /* Interrupt Level 6 */
-#define   RIO_EISA_CFG_IRQ5     0x50    /* Interrupt Level 5 */
-#define   RIO_EISA_CFG_IRQ4     0x40    /* Interrupt Level 4 */
-#define   RIO_EISA_CFG_IRQ3     0x30    /* Interrupt Level 3 */
-
-/*****************************************************************************
-********************************              ********************************
-********************************   RIO SBus   ********************************
-********************************              ********************************
-*****************************************************************************/
-
-/* Control Register Definitions... */
-#define RIO_SBUS_IDENT  "JBPGK#\0\0\0\0\0\0\0\0\0\0"
-
-#define RIO_SBUS_CFG_BOOTRAM    0x01    /* Boot from RAM, else Link */
-#define RIO_SBUS_CFG_BUSENABLE  0x02    /* Enable processor bus */
-#define RIO_SBUS_CFG_INTENABLE  0x04    /* Interrupt enable, else disable */
-#define RIO_SBUS_CFG_IRQMASK    0x38    /* Interrupt mask */
-#define   RIO_SBUS_CFG_IRQNONE  0x00    /* No Interrupt */
-#define   RIO_SBUS_CFG_IRQ7     0x38    /* Interrupt Level 7 */
-#define   RIO_SBUS_CFG_IRQ6     0x30    /* Interrupt Level 6 */
-#define   RIO_SBUS_CFG_IRQ5     0x28    /* Interrupt Level 5 */
-#define   RIO_SBUS_CFG_IRQ4     0x20    /* Interrupt Level 4 */
-#define   RIO_SBUS_CFG_IRQ3     0x18    /* Interrupt Level 3 */
-#define   RIO_SBUS_CFG_IRQ2     0x10    /* Interrupt Level 2 */
-#define   RIO_SBUS_CFG_IRQ1     0x08    /* Interrupt Level 1 */
-#define RIO_SBUS_CFG_LINK20     0x40    /* 20Mbps link, else 10Mbps */
-#define RIO_SBUS_CFG_PROC25     0x80    /* 25Mhz processor clock, else 20Mhz */
-
-/*****************************************************************************
-*********************************             ********************************
-*********************************   RIO PCI   ********************************
-*********************************             ********************************
-*****************************************************************************/
-
-/* Control Register Definitions... */
-#define RIO_PCI_IDENT   "ECDDPGJGJHJRGSK#"
-
-#define RIO_PCI_CFG_BOOTRAM     0x01    /* Boot from RAM, else Link */
-#define RIO_PCI_CFG_BUSENABLE   0x02    /* Enable processor bus */
-#define RIO_PCI_CFG_INTENABLE   0x04    /* Interrupt enable, else disable */
-#define RIO_PCI_CFG_LINK20      0x40    /* 20Mbps link, else 10Mbps */
-#define RIO_PCI_CFG_PROC25      0x80    /* 25Mhz processor clock, else 20Mhz */
-
-/* PCI Definitions... */
-#define SPX_VENDOR_ID           0x11CB  /* Assigned by the PCI SIG */
-#define SPX_DEVICE_ID           0x8000  /* RIO bridge boards */
-#define SPX_PLXDEVICE_ID        0x2000  /* PLX bridge boards */
-#define SPX_SUB_VENDOR_ID       SPX_VENDOR_ID   /* Same as vendor id */
-#define RIO_SUB_SYS_ID          0x0800  /* RIO PCI board */
-
-/*****************************************************************************
-*****************************                   ******************************
-*****************************   RIO (Jet) PCI   ******************************
-*****************************                   ******************************
-*****************************************************************************/
-
-/* Control Register Definitions... */
-#define RIO_PCI2_IDENT  "JET HOST BY KEV#"
-
-#define RIO_PCI2_CFG_BUSENABLE  0x02    /* Enable processor bus */
-#define RIO_PCI2_CFG_INTENABLE  0x04    /* Interrupt enable, else disable */
-
-/* PCI Definitions... */
-#define RIO2_SUB_SYS_ID         0x0100  /* RIO (Jet) PCI board */
-
-#endif                                          /*_rioboard_h */
-
-/* End of RIOBOARD.H */
diff --git a/drivers/char/rio/rioboot.c b/drivers/char/rio/rioboot.c
deleted file mode 100644
index d956dd316005..000000000000
--- a/drivers/char/rio/rioboot.c
+++ /dev/null
@@ -1,1113 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : rioboot.c
-**      SID             : 1.3
-**      Last Modified   : 11/6/98 10:33:36
-**      Retrieved       : 11/6/98 10:33:48
-**
-**  ident @(#)rioboot.c 1.3
-**
-** -----------------------------------------------------------------------------
-*/
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/termios.h>
-#include <linux/serial.h>
-#include <linux/vmalloc.h>
-#include <linux/generic_serial.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/string.h>
-#include <asm/uaccess.h>
-
-
-#include "linux_compat.h"
-#include "rio_linux.h"
-#include "pkt.h"
-#include "daemon.h"
-#include "rio.h"
-#include "riospace.h"
-#include "cmdpkt.h"
-#include "map.h"
-#include "rup.h"
-#include "port.h"
-#include "riodrvr.h"
-#include "rioinfo.h"
-#include "func.h"
-#include "errors.h"
-#include "pci.h"
-
-#include "parmmap.h"
-#include "unixrup.h"
-#include "board.h"
-#include "host.h"
-#include "phb.h"
-#include "link.h"
-#include "cmdblk.h"
-#include "route.h"
-
-static int RIOBootComplete(struct rio_info *p, struct Host *HostP, unsigned int Rup, struct PktCmd __iomem *PktCmdP);
-
-static const unsigned char RIOAtVec2Ctrl[] = {
-        /* 0 */ INTERRUPT_DISABLE,
-        /* 1 */ INTERRUPT_DISABLE,
-        /* 2 */ INTERRUPT_DISABLE,
-        /* 3 */ INTERRUPT_DISABLE,
-        /* 4 */ INTERRUPT_DISABLE,
-        /* 5 */ INTERRUPT_DISABLE,
-        /* 6 */ INTERRUPT_DISABLE,
-        /* 7 */ INTERRUPT_DISABLE,
-        /* 8 */ INTERRUPT_DISABLE,
-        /* 9 */ IRQ_9 | INTERRUPT_ENABLE,
-        /* 10 */ INTERRUPT_DISABLE,
-        /* 11 */ IRQ_11 | INTERRUPT_ENABLE,
-        /* 12 */ IRQ_12 | INTERRUPT_ENABLE,
-        /* 13 */ INTERRUPT_DISABLE,
-        /* 14 */ INTERRUPT_DISABLE,
-        /* 15 */ IRQ_15 | INTERRUPT_ENABLE
-};
-
-/**
- *      RIOBootCodeRTA          -       Load RTA boot code
- *      @p: RIO to load
- *      @rbp: Download descriptor
- *
- *      Called when the user process initiates booting of the card firmware.
- *      Lads the firmware
- */
-
-int RIOBootCodeRTA(struct rio_info *p, struct DownLoad * rbp)
-{
-        int offset;
-
-        func_enter();
-
-        rio_dprintk(RIO_DEBUG_BOOT, "Data at user address %p\n", rbp->DataP);
-
-        /*
-         ** Check that we have set asside enough memory for this
-         */
-        if (rbp->Count > SIXTY_FOUR_K) {
-                rio_dprintk(RIO_DEBUG_BOOT, "RTA Boot Code Too Large!\n");
-                p->RIOError.Error = HOST_FILE_TOO_LARGE;
-                func_exit();
-                return -ENOMEM;
-        }
-
-        if (p->RIOBooting) {
-                rio_dprintk(RIO_DEBUG_BOOT, "RTA Boot Code : BUSY BUSY BUSY!\n");
-                p->RIOError.Error = BOOT_IN_PROGRESS;
-                func_exit();
-                return -EBUSY;
-        }
-
-        /*
-         ** The data we load in must end on a (RTA_BOOT_DATA_SIZE) byte boundary,
-         ** so calculate how far we have to move the data up the buffer
-         ** to achieve this.
-         */
-        offset = (RTA_BOOT_DATA_SIZE - (rbp->Count % RTA_BOOT_DATA_SIZE)) % RTA_BOOT_DATA_SIZE;
-
-        /*
-         ** Be clean, and clear the 'unused' portion of the boot buffer,
-         ** because it will (eventually) be part of the Rta run time environment
-         ** and so should be zeroed.
-         */
-        memset(p->RIOBootPackets, 0, offset);
-
-        /*
-         ** Copy the data from user space into the array
-         */
-
-        if (copy_from_user(((u8 *)p->RIOBootPackets) + offset, rbp->DataP, rbp->Count)) {
-                rio_dprintk(RIO_DEBUG_BOOT, "Bad data copy from user space\n");
-                p->RIOError.Error = COPYIN_FAILED;
-                func_exit();
-                return -EFAULT;
-        }
-
-        /*
-         ** Make sure that our copy of the size includes that offset we discussed
-         ** earlier.
-         */
-        p->RIONumBootPkts = (rbp->Count + offset) / RTA_BOOT_DATA_SIZE;
-        p->RIOBootCount = rbp->Count;
-
-        func_exit();
-        return 0;
-}
-
-/**
- *      rio_start_card_running          -       host card start
- *      @HostP: The RIO to kick off
- *
- *      Start a RIO processor unit running. Encapsulates the knowledge
- *      of the card type.
- */
-
-void rio_start_card_running(struct Host *HostP)
-{
-        switch (HostP->Type) {
-        case RIO_AT:
-                rio_dprintk(RIO_DEBUG_BOOT, "Start ISA card running\n");
-                writeb(BOOT_FROM_RAM | EXTERNAL_BUS_ON | HostP->Mode | RIOAtVec2Ctrl[HostP->Ivec & 0xF], &HostP->Control);
-                break;
-        case RIO_PCI:
-                /*
-                 ** PCI is much the same as MCA. Everything is once again memory
-                 ** mapped, so we are writing to memory registers instead of io
-                 ** ports.
-                 */
-                rio_dprintk(RIO_DEBUG_BOOT, "Start PCI card running\n");
-                writeb(PCITpBootFromRam | PCITpBusEnable | HostP->Mode, &HostP->Control);
-                break;
-        default:
-                rio_dprintk(RIO_DEBUG_BOOT, "Unknown host type %d\n", HostP->Type);
-                break;
-        }
-        return;
-}
-
-/*
-** Load in the host boot code - load it directly onto all halted hosts
-** of the correct type.
-**
-** Put your rubber pants on before messing with this code - even the magic
-** numbers have trouble understanding what they are doing here.
-*/
-
-int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)
-{
-        struct Host *HostP;
-        u8 __iomem *Cad;
-        PARM_MAP __iomem *ParmMapP;
-        int RupN;
-        int PortN;
-        unsigned int host;
-        u8 __iomem *StartP;
-        u8 __iomem *DestP;
-        int wait_count;
-        u16 OldParmMap;
-        u16 offset;             /* It is very important that this is a u16 */
-        u8 *DownCode = NULL;
-        unsigned long flags;
-
-        HostP = NULL;           /* Assure the compiler we've initialized it */
-
-
-        /* Walk the hosts */
-        for (host = 0; host < p->RIONumHosts; host++) {
-                rio_dprintk(RIO_DEBUG_BOOT, "Attempt to boot host %d\n", host);
-                HostP = &p->RIOHosts[host];
-
-                rio_dprintk(RIO_DEBUG_BOOT, "Host Type = 0x%x, Mode = 0x%x, IVec = 0x%x\n", HostP->Type, HostP->Mode, HostP->Ivec);
-
-                /* Don't boot hosts already running */
-                if ((HostP->Flags & RUN_STATE) != RC_WAITING) {
-                        rio_dprintk(RIO_DEBUG_BOOT, "%s %d already running\n", "Host", host);
-                        continue;
-                }
-
-                /*
-                 ** Grab a pointer to the card (ioremapped)
-                 */
-                Cad = HostP->Caddr;
-
-                /*
-                 ** We are going to (try) and load in rbp->Count bytes.
-                 ** The last byte will reside at p->RIOConf.HostLoadBase-1;
-                 ** Therefore, we need to start copying at address
-                 ** (caddr+p->RIOConf.HostLoadBase-rbp->Count)
-                 */
-                StartP = &Cad[p->RIOConf.HostLoadBase - rbp->Count];
-
-                rio_dprintk(RIO_DEBUG_BOOT, "kernel virtual address for host is %p\n", Cad);
-                rio_dprintk(RIO_DEBUG_BOOT, "kernel virtual address for download is %p\n", StartP);
-                rio_dprintk(RIO_DEBUG_BOOT, "host loadbase is 0x%x\n", p->RIOConf.HostLoadBase);
-                rio_dprintk(RIO_DEBUG_BOOT, "size of download is 0x%x\n", rbp->Count);
-
-                /* Make sure it fits */
-                if (p->RIOConf.HostLoadBase < rbp->Count) {
-                        rio_dprintk(RIO_DEBUG_BOOT, "Bin too large\n");
-                        p->RIOError.Error = HOST_FILE_TOO_LARGE;
-                        func_exit();
-                        return -EFBIG;
-                }
-                /*
-                 ** Ensure that the host really is stopped.
-                 ** Disable it's external bus & twang its reset line.
-                 */
-                RIOHostReset(HostP->Type, HostP->CardP, HostP->Slot);
-
-                /*
-                 ** Copy the data directly from user space to the SRAM.
-                 ** This ain't going to be none too clever if the download
-                 ** code is bigger than this segment.
-                 */
-                rio_dprintk(RIO_DEBUG_BOOT, "Copy in code\n");
-
-                /* Buffer to local memory as we want to use I/O space and
-                   some cards only do 8 or 16 bit I/O */
-
-                DownCode = vmalloc(rbp->Count);
-                if (!DownCode) {
-                        p->RIOError.Error = NOT_ENOUGH_CORE_FOR_PCI_COPY;
-                        func_exit();
-                        return -ENOMEM;
-                }
-                if (copy_from_user(DownCode, rbp->DataP, rbp->Count)) {
-                        kfree(DownCode);
-                        p->RIOError.Error = COPYIN_FAILED;
-                        func_exit();
-                        return -EFAULT;
-                }
-                HostP->Copy(DownCode, StartP, rbp->Count);
-                vfree(DownCode);
-
-                rio_dprintk(RIO_DEBUG_BOOT, "Copy completed\n");
-
-                /*
-                 **                     S T O P !
-                 **
-                 ** Upto this point the code has been fairly rational, and possibly
-                 ** even straight forward. What follows is a pile of crud that will
-                 ** magically turn into six bytes of transputer assembler. Normally
-                 ** you would expect an array or something, but, being me, I have
-                 ** chosen [been told] to use a technique whereby the startup code
-                 ** will be correct if we change the loadbase for the code. Which
-                 ** brings us onto another issue - the loadbase is the *end* of the
-                 ** code, not the start.
-                 **
-                 ** If I were you I wouldn't start from here.
-                 */
-
-                /*
-                 ** We now need to insert a short boot section into
-                 ** the memory at the end of Sram2. This is normally (de)composed
-                 ** of the last eight bytes of the download code. The
-                 ** download has been assembled/compiled to expect to be
-                 ** loaded from 0x7FFF downwards. We have loaded it
-                 ** at some other address. The startup code goes into the small
-                 ** ram window at Sram2, in the last 8 bytes, which are really
-                 ** at addresses 0x7FF8-0x7FFF.
-                 **
-                 ** If the loadbase is, say, 0x7C00, then we need to branch to
-                 ** address 0x7BFE to run the host.bin startup code. We assemble
-                 ** this jump manually.
-                 **
-                 ** The two byte sequence 60 08 is loaded into memory at address
-                 ** 0x7FFE,F. This is a local branch to location 0x7FF8 (60 is nfix 0,
-                 ** which adds '0' to the .O register, complements .O, and then shifts
-                 ** it left by 4 bit positions, 08 is a jump .O+8 instruction. This will
-                 ** add 8 to .O (which was 0xFFF0), and will branch RELATIVE to the new
-                 ** location. Now, the branch starts from the value of .PC (or .IP or
-                 ** whatever the bloody register is called on this chip), and the .PC
-                 ** will be pointing to the location AFTER the branch, in this case
-                 ** .PC == 0x8000, so the branch will be to 0x8000+0xFFF8 = 0x7FF8.
-                 **
-                 ** A long branch is coded at 0x7FF8. This consists of loading a four
-                 ** byte offset into .O using nfix (as above) and pfix operators. The
-                 ** pfix operates in exactly the same way as the nfix operator, but
-                 ** without the complement operation. The offset, of course, must be
-                 ** relative to the address of the byte AFTER the branch instruction,
-                 ** which will be (urm) 0x7FFC, so, our final destination of the branch
-                 ** (loadbase-2), has to be reached from here. Imagine that the loadbase
-                 ** is 0x7C00 (which it is), then we will need to branch to 0x7BFE (which
-                 ** is the first byte of the initial two byte short local branch of the
-                 ** download code).
-                 **
-                 ** To code a jump from 0x7FFC (which is where the branch will start
-                 ** from) to 0x7BFE, we will need to branch 0xFC02 bytes (0x7FFC+0xFC02)=
-                 ** 0x7BFE.
-                 ** This will be coded as four bytes:
-                 ** 60 2C 20 02
-                 ** being nfix .O+0
-                 **        pfix .O+C
-                 **        pfix .O+0
-                 **        jump .O+2
-                 **
-                 ** The nfix operator is used, so that the startup code will be
-                 ** compatible with the whole Tp family. (lies, damn lies, it'll never
-                 ** work in a month of Sundays).
-                 **
-                 ** The nfix nyble is the 1s complement of the nyble value you
-                 ** want to load - in this case we wanted 'F' so we nfix loaded '0'.
-                 */
-
-
-                /*
-                 ** Dest points to the top 8 bytes of Sram2. The Tp jumps
-                 ** to 0x7FFE at reset time, and starts executing. This is
-                 ** a short branch to 0x7FF8, where a long branch is coded.
-                 */
-
-                DestP = &Cad[0x7FF8];   /* <<<---- READ THE ABOVE COMMENTS */
-
-#define NFIX(N) (0x60 | (N))    /* .O  = (~(.O + N))<<4 */
-#define PFIX(N) (0x20 | (N))    /* .O  =   (.O + N)<<4  */
-#define JUMP(N) (0x00 | (N))    /* .PC =   .PC + .O      */
-
-                /*
-                 ** 0x7FFC is the address of the location following the last byte of
-                 ** the four byte jump instruction.
-                 ** READ THE ABOVE COMMENTS
-                 **
-                 ** offset is (TO-FROM) % MEMSIZE, but with compound buggering about.
-                 ** Memsize is 64K for this range of Tp, so offset is a short (unsigned,
-                 ** cos I don't understand 2's complement).
-                 */
-                offset = (p->RIOConf.HostLoadBase - 2) - 0x7FFC;
-
-                writeb(NFIX(((unsigned short) (~offset) >> (unsigned short) 12) & 0xF), DestP);
-                writeb(PFIX((offset >> 8) & 0xF), DestP + 1);
-                writeb(PFIX((offset >> 4) & 0xF), DestP + 2);
-                writeb(JUMP(offset & 0xF), DestP + 3);
-
-                writeb(NFIX(0), DestP + 6);
-                writeb(JUMP(8), DestP + 7);
-
-                rio_dprintk(RIO_DEBUG_BOOT, "host loadbase is 0x%x\n", p->RIOConf.HostLoadBase);
-                rio_dprintk(RIO_DEBUG_BOOT, "startup offset is 0x%x\n", offset);
-
-                /*
-                 ** Flag what is going on
-                 */
-                HostP->Flags &= ~RUN_STATE;
-                HostP->Flags |= RC_STARTUP;
-
-                /*
-                 ** Grab a copy of the current ParmMap pointer, so we
-                 ** can tell when it has changed.
-                 */
-                OldParmMap = readw(&HostP->__ParmMapR);
-
-                rio_dprintk(RIO_DEBUG_BOOT, "Original parmmap is 0x%x\n", OldParmMap);
-
-                /*
-                 ** And start it running (I hope).
-                 ** As there is nothing dodgy or obscure about the
-                 ** above code, this is guaranteed to work every time.
-                 */
-                rio_dprintk(RIO_DEBUG_BOOT, "Host Type = 0x%x, Mode = 0x%x, IVec = 0x%x\n", HostP->Type, HostP->Mode, HostP->Ivec);
-
-                rio_start_card_running(HostP);
-
-                rio_dprintk(RIO_DEBUG_BOOT, "Set control port\n");
-
-                /*
-                 ** Now, wait for upto five seconds for the Tp to setup the parmmap
-                 ** pointer:
-                 */
-                for (wait_count = 0; (wait_count < p->RIOConf.StartupTime) && (readw(&HostP->__ParmMapR) == OldParmMap); wait_count++) {
-                        rio_dprintk(RIO_DEBUG_BOOT, "Checkout %d, 0x%x\n", wait_count, readw(&HostP->__ParmMapR));
-                        mdelay(100);
-
-                }
-
-                /*
-                 ** If the parmmap pointer is unchanged, then the host code
-                 ** has crashed & burned in a really spectacular way
-                 */
-                if (readw(&HostP->__ParmMapR) == OldParmMap) {
-                        rio_dprintk(RIO_DEBUG_BOOT, "parmmap 0x%x\n", readw(&HostP->__ParmMapR));
-                        rio_dprintk(RIO_DEBUG_BOOT, "RIO Mesg Run Fail\n");
-                        HostP->Flags &= ~RUN_STATE;
-                        HostP->Flags |= RC_STUFFED;
-                        RIOHostReset( HostP->Type, HostP->CardP, HostP->Slot );
-                        continue;
-                }
-
-                rio_dprintk(RIO_DEBUG_BOOT, "Running 0x%x\n", readw(&HostP->__ParmMapR));
-
-                /*
-                 ** Well, the board thought it was OK, and setup its parmmap
-                 ** pointer. For the time being, we will pretend that this
-                 ** board is running, and check out what the error flag says.
-                 */
-
-                /*
-                 ** Grab a 32 bit pointer to the parmmap structure
-                 */
-                ParmMapP = (PARM_MAP __iomem *) RIO_PTR(Cad, readw(&HostP->__ParmMapR));
-                rio_dprintk(RIO_DEBUG_BOOT, "ParmMapP : %p\n", ParmMapP);
-                ParmMapP = (PARM_MAP __iomem *)(Cad + readw(&HostP->__ParmMapR));
-                rio_dprintk(RIO_DEBUG_BOOT, "ParmMapP : %p\n", ParmMapP);
-
-                /*
-                 ** The links entry should be 0xFFFF; we set it up
-                 ** with a mask to say how many PHBs to use, and
-                 ** which links to use.
-                 */
-                if (readw(&ParmMapP->links) != 0xFFFF) {
-                        rio_dprintk(RIO_DEBUG_BOOT, "RIO Mesg Run Fail %s\n", HostP->Name);
-                        rio_dprintk(RIO_DEBUG_BOOT, "Links = 0x%x\n", readw(&ParmMapP->links));
-                        HostP->Flags &= ~RUN_STATE;
-                        HostP->Flags |= RC_STUFFED;
-                        RIOHostReset( HostP->Type, HostP->CardP, HostP->Slot );
-                        continue;
-                }
-
-                writew(RIO_LINK_ENABLE, &ParmMapP->links);
-
-                /*
-                 ** now wait for the card to set all the parmmap->XXX stuff
-                 ** this is a wait of upto two seconds....
-                 */
-                rio_dprintk(RIO_DEBUG_BOOT, "Looking for init_done - %d ticks\n", p->RIOConf.StartupTime);
-                HostP->timeout_id = 0;
-                for (wait_count = 0; (wait_count < p->RIOConf.StartupTime) && !readw(&ParmMapP->init_done); wait_count++) {
-                        rio_dprintk(RIO_DEBUG_BOOT, "Waiting for init_done\n");
-                        mdelay(100);
-                }
-                rio_dprintk(RIO_DEBUG_BOOT, "OK! init_done!\n");
-
-                if (readw(&ParmMapP->error) != E_NO_ERROR || !readw(&ParmMapP->init_done)) {
-                        rio_dprintk(RIO_DEBUG_BOOT, "RIO Mesg Run Fail %s\n", HostP->Name);
-                        rio_dprintk(RIO_DEBUG_BOOT, "Timedout waiting for init_done\n");
-                        HostP->Flags &= ~RUN_STATE;
-                        HostP->Flags |= RC_STUFFED;
-                        RIOHostReset( HostP->Type, HostP->CardP, HostP->Slot );
-                        continue;
-                }
-
-                rio_dprintk(RIO_DEBUG_BOOT, "Got init_done\n");
-
-                /*
-                 ** It runs! It runs!
-                 */
-                rio_dprintk(RIO_DEBUG_BOOT, "Host ID %x Running\n", HostP->UniqueNum);
-
-                /*
-                 ** set the time period between interrupts.
-                 */
-                writew(p->RIOConf.Timer, &ParmMapP->timer);
-
-                /*
-                 ** Translate all the 16 bit pointers in the __ParmMapR into
-                 ** 32 bit pointers for the driver in ioremap space.
-                 */
-                HostP->ParmMapP = ParmMapP;
-                HostP->PhbP = (struct PHB __iomem *) RIO_PTR(Cad, readw(&ParmMapP->phb_ptr));
-                HostP->RupP = (struct RUP __iomem *) RIO_PTR(Cad, readw(&ParmMapP->rups));
-                HostP->PhbNumP = (unsigned short __iomem *) RIO_PTR(Cad, readw(&ParmMapP->phb_num_ptr));
-                HostP->LinkStrP = (struct LPB __iomem *) RIO_PTR(Cad, readw(&ParmMapP->link_str_ptr));
-
-                /*
-                 ** point the UnixRups at the real Rups
-                 */
-                for (RupN = 0; RupN < MAX_RUP; RupN++) {
-                        HostP->UnixRups[RupN].RupP = &HostP->RupP[RupN];
-                        HostP->UnixRups[RupN].Id = RupN + 1;
-                        HostP->UnixRups[RupN].BaseSysPort = NO_PORT;
-                        spin_lock_init(&HostP->UnixRups[RupN].RupLock);
-                }
-
-                for (RupN = 0; RupN < LINKS_PER_UNIT; RupN++) {
-                        HostP->UnixRups[RupN + MAX_RUP].RupP = &HostP->LinkStrP[RupN].rup;
-                        HostP->UnixRups[RupN + MAX_RUP].Id = 0;
-                        HostP->UnixRups[RupN + MAX_RUP].BaseSysPort = NO_PORT;
-                        spin_lock_init(&HostP->UnixRups[RupN + MAX_RUP].RupLock);
-                }
-
-                /*
-                 ** point the PortP->Phbs at the real Phbs
-                 */
-                for (PortN = p->RIOFirstPortsMapped; PortN < p->RIOLastPortsMapped + PORTS_PER_RTA; PortN++) {
-                        if (p->RIOPortp[PortN]->HostP == HostP) {
-                                struct Port *PortP = p->RIOPortp[PortN];
-                                struct PHB __iomem *PhbP;
-                                /* int oldspl; */
-
-                                if (!PortP->Mapped)
-                                        continue;
-
-                                PhbP = &HostP->PhbP[PortP->HostPort];
-                                rio_spin_lock_irqsave(&PortP->portSem, flags);
-
-                                PortP->PhbP = PhbP;
-
-                                PortP->TxAdd = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->tx_add));
-                                PortP->TxStart = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->tx_start));
-                                PortP->TxEnd = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->tx_end));
-                                PortP->RxRemove = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->rx_remove));
-                                PortP->RxStart = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->rx_start));
-                                PortP->RxEnd = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->rx_end));
-
-                                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                                /*
-                                 ** point the UnixRup at the base SysPort
-                                 */
-                                if (!(PortN % PORTS_PER_RTA))
-                                        HostP->UnixRups[PortP->RupNum].BaseSysPort = PortN;
-                        }
-                }
-
-                rio_dprintk(RIO_DEBUG_BOOT, "Set the card running... \n");
-                /*
-                 ** last thing - show the world that everything is in place
-                 */
-                HostP->Flags &= ~RUN_STATE;
-                HostP->Flags |= RC_RUNNING;
-        }
-        /*
-         ** MPX always uses a poller. This is actually patched into the system
-         ** configuration and called directly from each clock tick.
-         **
-         */
-        p->RIOPolling = 1;
-
-        p->RIOSystemUp++;
-
-        rio_dprintk(RIO_DEBUG_BOOT, "Done everything %x\n", HostP->Ivec);
-        func_exit();
-        return 0;
-}
-
-
-
-/**
- *      RIOBootRup              -       Boot an RTA
- *      @p: rio we are working with
- *      @Rup: Rup number
- *      @HostP: host object
- *      @PacketP: packet to use
- *
- *      If we have successfully processed this boot, then
- *      return 1. If we havent, then return 0.
- */
-
-int RIOBootRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct PKT __iomem *PacketP)
-{
-        struct PktCmd __iomem *PktCmdP = (struct PktCmd __iomem *) PacketP->data;
-        struct PktCmd_M *PktReplyP;
-        struct CmdBlk *CmdBlkP;
-        unsigned int sequence;
-
-        /*
-         ** If we haven't been told what to boot, we can't boot it.
-         */
-        if (p->RIONumBootPkts == 0) {
-                rio_dprintk(RIO_DEBUG_BOOT, "No RTA code to download yet\n");
-                return 0;
-        }
-
-        /*
-         ** Special case of boot completed - if we get one of these then we
-         ** don't need a command block. For all other cases we do, so handle
-         ** this first and then get a command block, then handle every other
-         ** case, relinquishing the command block if disaster strikes!
-         */
-        if ((readb(&PacketP->len) & PKT_CMD_BIT) && (readb(&PktCmdP->Command) == BOOT_COMPLETED))
-                return RIOBootComplete(p, HostP, Rup, PktCmdP);
-
-        /*
-         ** Try to allocate a command block. This is in kernel space
-         */
-        if (!(CmdBlkP = RIOGetCmdBlk())) {
-                rio_dprintk(RIO_DEBUG_BOOT, "No command blocks to boot RTA! come back later.\n");
-                return 0;
-        }
-
-        /*
-         ** Fill in the default info on the command block
-         */
-        CmdBlkP->Packet.dest_unit = Rup < (unsigned short) MAX_RUP ? Rup : 0;
-        CmdBlkP->Packet.dest_port = BOOT_RUP;
-        CmdBlkP->Packet.src_unit = 0;
-        CmdBlkP->Packet.src_port = BOOT_RUP;
-
-        CmdBlkP->PreFuncP = CmdBlkP->PostFuncP = NULL;
-        PktReplyP = (struct PktCmd_M *) CmdBlkP->Packet.data;
-
-        /*
-         ** process COMMANDS on the boot rup!
-         */
-        if (readb(&PacketP->len) & PKT_CMD_BIT) {
-                /*
-                 ** We only expect one type of command - a BOOT_REQUEST!
-                 */
-                if (readb(&PktCmdP->Command) != BOOT_REQUEST) {
-                        rio_dprintk(RIO_DEBUG_BOOT, "Unexpected command %d on BOOT RUP %d of host %Zd\n", readb(&PktCmdP->Command), Rup, HostP - p->RIOHosts);
-                        RIOFreeCmdBlk(CmdBlkP);
-                        return 1;
-                }
-
-                /*
-                 ** Build a Boot Sequence command block
-                 **
-                 ** We no longer need to use "Boot Mode", we'll always allow
-                 ** boot requests - the boot will not complete if the device
-                 ** appears in the bindings table.
-                 **
-                 ** We'll just (always) set the command field in packet reply
-                 ** to allow an attempted boot sequence :
-                 */
-                PktReplyP->Command = BOOT_SEQUENCE;
-
-                PktReplyP->BootSequence.NumPackets = p->RIONumBootPkts;
-                PktReplyP->BootSequence.LoadBase = p->RIOConf.RtaLoadBase;
-                PktReplyP->BootSequence.CodeSize = p->RIOBootCount;
-
-                CmdBlkP->Packet.len = BOOT_SEQUENCE_LEN | PKT_CMD_BIT;
-
-                memcpy((void *) &CmdBlkP->Packet.data[BOOT_SEQUENCE_LEN], "BOOT", 4);
-
-                rio_dprintk(RIO_DEBUG_BOOT, "Boot RTA on Host %Zd Rup %d - %d (0x%x) packets to 0x%x\n", HostP - p->RIOHosts, Rup, p->RIONumBootPkts, p->RIONumBootPkts, p->RIOConf.RtaLoadBase);
-
-                /*
-                 ** If this host is in slave mode, send the RTA an invalid boot
-                 ** sequence command block to force it to kill the boot. We wait
-                 ** for half a second before sending this packet to prevent the RTA
-                 ** attempting to boot too often. The master host should then grab
-                 ** the RTA and make it its own.
-                 */
-                p->RIOBooting++;
-                RIOQueueCmdBlk(HostP, Rup, CmdBlkP);
-                return 1;
-        }
-
-        /*
-         ** It is a request for boot data.
-         */
-        sequence = readw(&PktCmdP->Sequence);
-
-        rio_dprintk(RIO_DEBUG_BOOT, "Boot block %d on Host %Zd Rup%d\n", sequence, HostP - p->RIOHosts, Rup);
-
-        if (sequence >= p->RIONumBootPkts) {
-                rio_dprintk(RIO_DEBUG_BOOT, "Got a request for packet %d, max is %d\n", sequence, p->RIONumBootPkts);
-        }
-
-        PktReplyP->Sequence = sequence;
-        memcpy(PktReplyP->BootData, p->RIOBootPackets[p->RIONumBootPkts - sequence - 1], RTA_BOOT_DATA_SIZE);
-        CmdBlkP->Packet.len = PKT_MAX_DATA_LEN;
-        RIOQueueCmdBlk(HostP, Rup, CmdBlkP);
-        return 1;
-}
-
-/**
- *      RIOBootComplete         -       RTA boot is done
- *      @p: RIO we are working with
- *      @HostP: Host structure
- *      @Rup: RUP being used
- *      @PktCmdP: Packet command that was used
- *
- *      This function is called when an RTA been booted.
- *      If booted by a host, HostP->HostUniqueNum is the booting host.
- *      If booted by an RTA, HostP->Mapping[Rup].RtaUniqueNum is the booting RTA.
- *      RtaUniq is the booted RTA.
- */
-
-static int RIOBootComplete(struct rio_info *p, struct Host *HostP, unsigned int Rup, struct PktCmd __iomem *PktCmdP)
-{
-        struct Map *MapP = NULL;
-        struct Map *MapP2 = NULL;
-        int Flag;
-        int found;
-        int host, rta;
-        int EmptySlot = -1;
-        int entry, entry2;
-        char *MyType, *MyName;
-        unsigned int MyLink;
-        unsigned short RtaType;
-        u32 RtaUniq = (readb(&PktCmdP->UniqNum[0])) + (readb(&PktCmdP->UniqNum[1]) << 8) + (readb(&PktCmdP->UniqNum[2]) << 16) + (readb(&PktCmdP->UniqNum[3]) << 24);
-
-        p->RIOBooting = 0;
-
-        rio_dprintk(RIO_DEBUG_BOOT, "RTA Boot completed - BootInProgress now %d\n", p->RIOBooting);
-
-        /*
-         ** Determine type of unit (16/8 port RTA).
-         */
-
-        RtaType = GetUnitType(RtaUniq);
-        if (Rup >= (unsigned short) MAX_RUP)
-                rio_dprintk(RIO_DEBUG_BOOT, "RIO: Host %s has booted an RTA(%d) on link %c\n", HostP->Name, 8 * RtaType, readb(&PktCmdP->LinkNum) + 'A');
-        else
-                rio_dprintk(RIO_DEBUG_BOOT, "RIO: RTA %s has booted an RTA(%d) on link %c\n", HostP->Mapping[Rup].Name, 8 * RtaType, readb(&PktCmdP->LinkNum) + 'A');
-
-        rio_dprintk(RIO_DEBUG_BOOT, "UniqNum is 0x%x\n", RtaUniq);
-
-        if (RtaUniq == 0x00000000 || RtaUniq == 0xffffffff) {
-                rio_dprintk(RIO_DEBUG_BOOT, "Illegal RTA Uniq Number\n");
-                return 1;
-        }
-
-        /*
-         ** If this RTA has just booted an RTA which doesn't belong to this
-         ** system, or the system is in slave mode, do not attempt to create
-         ** a new table entry for it.
-         */
-
-        if (!RIOBootOk(p, HostP, RtaUniq)) {
-                MyLink = readb(&PktCmdP->LinkNum);
-                if (Rup < (unsigned short) MAX_RUP) {
-                        /*
-                         ** RtaUniq was clone booted (by this RTA). Instruct this RTA
-                         ** to hold off further attempts to boot on this link for 30
-                         ** seconds.
-                         */
-                        if (RIOSuspendBootRta(HostP, HostP->Mapping[Rup].ID, MyLink)) {
-                                rio_dprintk(RIO_DEBUG_BOOT, "RTA failed to suspend booting on link %c\n", 'A' + MyLink);
-                        }
-                } else
-                        /*
-                         ** RtaUniq was booted by this host. Set the booting link
-                         ** to hold off for 30 seconds to give another unit a
-                         ** chance to boot it.
-                         */
-                        writew(30, &HostP->LinkStrP[MyLink].WaitNoBoot);
-                rio_dprintk(RIO_DEBUG_BOOT, "RTA %x not owned - suspend booting down link %c on unit %x\n", RtaUniq, 'A' + MyLink, HostP->Mapping[Rup].RtaUniqueNum);
-                return 1;
-        }
-
-        /*
-         ** Check for a SLOT_IN_USE entry for this RTA attached to the
-         ** current host card in the driver table.
-         **
-         ** If it exists, make a note that we have booted it. Other parts of
-         ** the driver are interested in this information at a later date,
-         ** in particular when the booting RTA asks for an ID for this unit,
-         ** we must have set the BOOTED flag, and the NEWBOOT flag is used
-         ** to force an open on any ports that where previously open on this
-         ** unit.
-         */
-        for (entry = 0; entry < MAX_RUP; entry++) {
-                unsigned int sysport;
-
-                if ((HostP->Mapping[entry].Flags & SLOT_IN_USE) && (HostP->Mapping[entry].RtaUniqueNum == RtaUniq)) {
-                        HostP->Mapping[entry].Flags |= RTA_BOOTED | RTA_NEWBOOT;
-                        if ((sysport = HostP->Mapping[entry].SysPort) != NO_PORT) {
-                                if (sysport < p->RIOFirstPortsBooted)
-                                        p->RIOFirstPortsBooted = sysport;
-                                if (sysport > p->RIOLastPortsBooted)
-                                        p->RIOLastPortsBooted = sysport;
-                                /*
-                                 ** For a 16 port RTA, check the second bank of 8 ports
-                                 */
-                                if (RtaType == TYPE_RTA16) {
-                                        entry2 = HostP->Mapping[entry].ID2 - 1;
-                                        HostP->Mapping[entry2].Flags |= RTA_BOOTED | RTA_NEWBOOT;
-                                        sysport = HostP->Mapping[entry2].SysPort;
-                                        if (sysport < p->RIOFirstPortsBooted)
-                                                p->RIOFirstPortsBooted = sysport;
-                                        if (sysport > p->RIOLastPortsBooted)
-                                                p->RIOLastPortsBooted = sysport;
-                                }
-                        }
-                        if (RtaType == TYPE_RTA16)
-                                rio_dprintk(RIO_DEBUG_BOOT, "RTA will be given IDs %d+%d\n", entry + 1, entry2 + 1);
-                        else
-                                rio_dprintk(RIO_DEBUG_BOOT, "RTA will be given ID %d\n", entry + 1);
-                        return 1;
-                }
-        }
-
-        rio_dprintk(RIO_DEBUG_BOOT, "RTA not configured for this host\n");
-
-        if (Rup >= (unsigned short) MAX_RUP) {
-                /*
-                 ** It was a host that did the booting
-                 */
-                MyType = "Host";
-                MyName = HostP->Name;
-        } else {
-                /*
-                 ** It was an RTA that did the booting
-                 */
-                MyType = "RTA";
-                MyName = HostP->Mapping[Rup].Name;
-        }
-        MyLink = readb(&PktCmdP->LinkNum);
-
-        /*
-         ** There is no SLOT_IN_USE entry for this RTA attached to the current
-         ** host card in the driver table.
-         **
-         ** Check for a SLOT_TENTATIVE entry for this RTA attached to the
-         ** current host card in the driver table.
-         **
-         ** If we find one, then we re-use that slot.
-         */
-        for (entry = 0; entry < MAX_RUP; entry++) {
-                if ((HostP->Mapping[entry].Flags & SLOT_TENTATIVE) && (HostP->Mapping[entry].RtaUniqueNum == RtaUniq)) {
-                        if (RtaType == TYPE_RTA16) {
-                                entry2 = HostP->Mapping[entry].ID2 - 1;
-                                if ((HostP->Mapping[entry2].Flags & SLOT_TENTATIVE) && (HostP->Mapping[entry2].RtaUniqueNum == RtaUniq))
-                                        rio_dprintk(RIO_DEBUG_BOOT, "Found previous tentative slots (%d+%d)\n", entry, entry2);
-                                else
-                                        continue;
-                        } else
-                                rio_dprintk(RIO_DEBUG_BOOT, "Found previous tentative slot (%d)\n", entry);
-                        if (!p->RIONoMessage)
-                                printk("RTA connected to %s '%s' (%c) not configured.\n", MyType, MyName, MyLink + 'A');
-                        return 1;
-                }
-        }
-
-        /*
-         ** There is no SLOT_IN_USE or SLOT_TENTATIVE entry for this RTA
-         ** attached to the current host card in the driver table.
-         **
-         ** Check if there is a SLOT_IN_USE or SLOT_TENTATIVE entry on another
-         ** host for this RTA in the driver table.
-         **
-         ** For a SLOT_IN_USE entry on another host, we need to delete the RTA
-         ** entry from the other host and add it to this host (using some of
-         ** the functions from table.c which do this).
-         ** For a SLOT_TENTATIVE entry on another host, we must cope with the
-         ** following scenario:
-         **
-         ** + Plug 8 port RTA into host A. (This creates SLOT_TENTATIVE entry
-         **   in table)
-         ** + Unplug RTA and plug into host B. (We now have 2 SLOT_TENTATIVE
-         **   entries)
-         ** + Configure RTA on host B. (This slot now becomes SLOT_IN_USE)
-         ** + Unplug RTA and plug back into host A.
-         ** + Configure RTA on host A. We now have the same RTA configured
-         **   with different ports on two different hosts.
-         */
-        rio_dprintk(RIO_DEBUG_BOOT, "Have we seen RTA %x before?\n", RtaUniq);
-        found = 0;
-        Flag = 0;               /* Convince the compiler this variable is initialized */
-        for (host = 0; !found && (host < p->RIONumHosts); host++) {
-                for (rta = 0; rta < MAX_RUP; rta++) {
-                        if ((p->RIOHosts[host].Mapping[rta].Flags & (SLOT_IN_USE | SLOT_TENTATIVE)) && (p->RIOHosts[host].Mapping[rta].RtaUniqueNum == RtaUniq)) {
-                                Flag = p->RIOHosts[host].Mapping[rta].Flags;
-                                MapP = &p->RIOHosts[host].Mapping[rta];
-                                if (RtaType == TYPE_RTA16) {
-                                        MapP2 = &p->RIOHosts[host].Mapping[MapP->ID2 - 1];
-                                        rio_dprintk(RIO_DEBUG_BOOT, "This RTA is units %d+%d from host %s\n", rta + 1, MapP->ID2, p->RIOHosts[host].Name);
-                                } else
-                                        rio_dprintk(RIO_DEBUG_BOOT, "This RTA is unit %d from host %s\n", rta + 1, p->RIOHosts[host].Name);
-                                found = 1;
-                                break;
-                        }
-                }
-        }
-
-        /*
-         ** There is no SLOT_IN_USE or SLOT_TENTATIVE entry for this RTA
-         ** attached to the current host card in the driver table.
-         **
-         ** If we have not found a SLOT_IN_USE or SLOT_TENTATIVE entry on
-         ** another host for this RTA in the driver table...
-         **
-         ** Check for a SLOT_IN_USE entry for this RTA in the config table.
-         */
-        if (!MapP) {
-                rio_dprintk(RIO_DEBUG_BOOT, "Look for RTA %x in RIOSavedTable\n", RtaUniq);
-                for (rta = 0; rta < TOTAL_MAP_ENTRIES; rta++) {
-                        rio_dprintk(RIO_DEBUG_BOOT, "Check table entry %d (%x)", rta, p->RIOSavedTable[rta].RtaUniqueNum);
-
-                        if ((p->RIOSavedTable[rta].Flags & SLOT_IN_USE) && (p->RIOSavedTable[rta].RtaUniqueNum == RtaUniq)) {
-                                MapP = &p->RIOSavedTable[rta];
-                                Flag = p->RIOSavedTable[rta].Flags;
-                                if (RtaType == TYPE_RTA16) {
-                                        for (entry2 = rta + 1; entry2 < TOTAL_MAP_ENTRIES; entry2++) {
-                                                if (p->RIOSavedTable[entry2].RtaUniqueNum == RtaUniq)
-                                                        break;
-                                        }
-                                        MapP2 = &p->RIOSavedTable[entry2];
-                                        rio_dprintk(RIO_DEBUG_BOOT, "This RTA is from table entries %d+%d\n", rta, entry2);
-                                } else
-                                        rio_dprintk(RIO_DEBUG_BOOT, "This RTA is from table entry %d\n", rta);
-                                break;
-                        }
-                }
-        }
-
-        /*
-         ** There is no SLOT_IN_USE or SLOT_TENTATIVE entry for this RTA
-         ** attached to the current host card in the driver table.
-         **
-         ** We may have found a SLOT_IN_USE entry on another host for this
-         ** RTA in the config table, or a SLOT_IN_USE or SLOT_TENTATIVE entry
-         ** on another host for this RTA in the driver table.
-         **
-         ** Check the driver table for room to fit this newly discovered RTA.
-         ** RIOFindFreeID() first looks for free slots and if it does not
-         ** find any free slots it will then attempt to oust any
-         ** tentative entry in the table.
-         */
-        EmptySlot = 1;
-        if (RtaType == TYPE_RTA16) {
-                if (RIOFindFreeID(p, HostP, &entry, &entry2) == 0) {
-                        RIODefaultName(p, HostP, entry);
-                        rio_fill_host_slot(entry, entry2, RtaUniq, HostP);
-                        EmptySlot = 0;
-                }
-        } else {
-                if (RIOFindFreeID(p, HostP, &entry, NULL) == 0) {
-                        RIODefaultName(p, HostP, entry);
-                        rio_fill_host_slot(entry, 0, RtaUniq, HostP);
-                        EmptySlot = 0;
-                }
-        }
-
-        /*
-         ** There is no SLOT_IN_USE or SLOT_TENTATIVE entry for this RTA
-         ** attached to the current host card in the driver table.
-         **
-         ** If we found a SLOT_IN_USE entry on another host for this
-         ** RTA in the config or driver table, and there are enough free
-         ** slots in the driver table, then we need to move it over and
-         ** delete it from the other host.
-         ** If we found a SLOT_TENTATIVE entry on another host for this
-         ** RTA in the driver table, just delete the other host entry.
-         */
-        if (EmptySlot == 0) {
-                if (MapP) {
-                        if (Flag & SLOT_IN_USE) {
-                                rio_dprintk(RIO_DEBUG_BOOT, "This RTA configured on another host - move entry to current host (1)\n");
-                                HostP->Mapping[entry].SysPort = MapP->SysPort;
-                                memcpy(HostP->Mapping[entry].Name, MapP->Name, MAX_NAME_LEN);
-                                HostP->Mapping[entry].Flags = SLOT_IN_USE | RTA_BOOTED | RTA_NEWBOOT;
-                                RIOReMapPorts(p, HostP, &HostP->Mapping[entry]);
-                                if (HostP->Mapping[entry].SysPort < p->RIOFirstPortsBooted)
-                                        p->RIOFirstPortsBooted = HostP->Mapping[entry].SysPort;
-                                if (HostP->Mapping[entry].SysPort > p->RIOLastPortsBooted)
-                                        p->RIOLastPortsBooted = HostP->Mapping[entry].SysPort;
-                                rio_dprintk(RIO_DEBUG_BOOT, "SysPort %d, Name %s\n", (int) MapP->SysPort, MapP->Name);
-                        } else {
-                                rio_dprintk(RIO_DEBUG_BOOT, "This RTA has a tentative entry on another host - delete that entry (1)\n");
-                                HostP->Mapping[entry].Flags = SLOT_TENTATIVE | RTA_BOOTED | RTA_NEWBOOT;
-                        }
-                        if (RtaType == TYPE_RTA16) {
-                                if (Flag & SLOT_IN_USE) {
-                                        HostP->Mapping[entry2].Flags = SLOT_IN_USE | RTA_BOOTED | RTA_NEWBOOT | RTA16_SECOND_SLOT;
-                                        HostP->Mapping[entry2].SysPort = MapP2->SysPort;
-                                        /*
-                                         ** Map second block of ttys for 16 port RTA
-                                         */
-                                        RIOReMapPorts(p, HostP, &HostP->Mapping[entry2]);
-                                        if (HostP->Mapping[entry2].SysPort < p->RIOFirstPortsBooted)
-                                                p->RIOFirstPortsBooted = HostP->Mapping[entry2].SysPort;
-                                        if (HostP->Mapping[entry2].SysPort > p->RIOLastPortsBooted)
-                                                p->RIOLastPortsBooted = HostP->Mapping[entry2].SysPort;
-                                        rio_dprintk(RIO_DEBUG_BOOT, "SysPort %d, Name %s\n", (int) HostP->Mapping[entry2].SysPort, HostP->Mapping[entry].Name);
-                                } else
-                                        HostP->Mapping[entry2].Flags = SLOT_TENTATIVE | RTA_BOOTED | RTA_NEWBOOT | RTA16_SECOND_SLOT;
-                                memset(MapP2, 0, sizeof(struct Map));
-                        }
-                        memset(MapP, 0, sizeof(struct Map));
-                        if (!p->RIONoMessage)
-                                printk("An orphaned RTA has been adopted by %s '%s' (%c).\n", MyType, MyName, MyLink + 'A');
-                } else if (!p->RIONoMessage)
-                        printk("RTA connected to %s '%s' (%c) not configured.\n", MyType, MyName, MyLink + 'A');
-                RIOSetChange(p);
-                return 1;
-        }
-
-        /*
-         ** There is no room in the driver table to make an entry for the
-         ** booted RTA. Keep a note of its Uniq Num in the overflow table,
-         ** so we can ignore it's ID requests.
-         */
-        if (!p->RIONoMessage)
-                printk("The RTA connected to %s '%s' (%c) cannot be configured.  You cannot configure more than 128 ports to one host card.\n", MyType, MyName, MyLink + 'A');
-        for (entry = 0; entry < HostP->NumExtraBooted; entry++) {
-                if (HostP->ExtraUnits[entry] == RtaUniq) {
-                        /*
-                         ** already got it!
-                         */
-                        return 1;
-                }
-        }
-        /*
-         ** If there is room, add the unit to the list of extras
-         */
-        if (HostP->NumExtraBooted < MAX_EXTRA_UNITS)
-                HostP->ExtraUnits[HostP->NumExtraBooted++] = RtaUniq;
-        return 1;
-}
-
-
-/*
-** If the RTA or its host appears in the RIOBindTab[] structure then
-** we mustn't boot the RTA and should return 0.
-** This operation is slightly different from the other drivers for RIO
-** in that this is designed to work with the new utilities
-** not config.rio and is FAR SIMPLER.
-** We no longer support the RIOBootMode variable. It is all done from the
-** "boot/noboot" field in the rio.cf file.
-*/
-int RIOBootOk(struct rio_info *p, struct Host *HostP, unsigned long RtaUniq)
-{
-        int Entry;
-        unsigned int HostUniq = HostP->UniqueNum;
-
-        /*
-         ** Search bindings table for RTA or its parent.
-         ** If it exists, return 0, else 1.
-         */
-        for (Entry = 0; (Entry < MAX_RTA_BINDINGS) && (p->RIOBindTab[Entry] != 0); Entry++) {
-                if ((p->RIOBindTab[Entry] == HostUniq) || (p->RIOBindTab[Entry] == RtaUniq))
-                        return 0;
-        }
-        return 1;
-}
-
-/*
-** Make an empty slot tentative. If this is a 16 port RTA, make both
-** slots tentative, and the second one RTA_SECOND_SLOT as well.
-*/
-
-void rio_fill_host_slot(int entry, int entry2, unsigned int rta_uniq, struct Host *host)
-{
-        int link;
-
-        rio_dprintk(RIO_DEBUG_BOOT, "rio_fill_host_slot(%d, %d, 0x%x...)\n", entry, entry2, rta_uniq);
-
-        host->Mapping[entry].Flags = (RTA_BOOTED | RTA_NEWBOOT | SLOT_TENTATIVE);
-        host->Mapping[entry].SysPort = NO_PORT;
-        host->Mapping[entry].RtaUniqueNum = rta_uniq;
-        host->Mapping[entry].HostUniqueNum = host->UniqueNum;
-        host->Mapping[entry].ID = entry + 1;
-        host->Mapping[entry].ID2 = 0;
-        if (entry2) {
-                host->Mapping[entry2].Flags = (RTA_BOOTED | RTA_NEWBOOT | SLOT_TENTATIVE | RTA16_SECOND_SLOT);
-                host->Mapping[entry2].SysPort = NO_PORT;
-                host->Mapping[entry2].RtaUniqueNum = rta_uniq;
-                host->Mapping[entry2].HostUniqueNum = host->UniqueNum;
-                host->Mapping[entry2].Name[0] = '\0';
-                host->Mapping[entry2].ID = entry2 + 1;
-                host->Mapping[entry2].ID2 = entry + 1;
-                host->Mapping[entry].ID2 = entry2 + 1;
-        }
-        /*
-         ** Must set these up, so that utilities show
-         ** topology of 16 port RTAs correctly
-         */
-        for (link = 0; link < LINKS_PER_UNIT; link++) {
-                host->Mapping[entry].Topology[link].Unit = ROUTE_DISCONNECT;
-                host->Mapping[entry].Topology[link].Link = NO_LINK;
-                if (entry2) {
-                        host->Mapping[entry2].Topology[link].Unit = ROUTE_DISCONNECT;
-                        host->Mapping[entry2].Topology[link].Link = NO_LINK;
-                }
-        }
-}
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c
deleted file mode 100644
index f121357e5af0..000000000000
--- a/drivers/char/rio/riocmd.c
+++ /dev/null
@@ -1,939 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  ported from the existing SCO driver source
-**
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : riocmd.c
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 10:33:41
-**      Retrieved       : 11/6/98 10:33:49
-**
-**  ident @(#)riocmd.c  1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/string.h>
-#include <asm/uaccess.h>
-
-#include <linux/termios.h>
-#include <linux/serial.h>
-
-#include <linux/generic_serial.h>
-
-#include "linux_compat.h"
-#include "rio_linux.h"
-#include "pkt.h"
-#include "daemon.h"
-#include "rio.h"
-#include "riospace.h"
-#include "cmdpkt.h"
-#include "map.h"
-#include "rup.h"
-#include "port.h"
-#include "riodrvr.h"
-#include "rioinfo.h"
-#include "func.h"
-#include "errors.h"
-#include "pci.h"
-
-#include "parmmap.h"
-#include "unixrup.h"
-#include "board.h"
-#include "host.h"
-#include "phb.h"
-#include "link.h"
-#include "cmdblk.h"
-#include "route.h"
-#include "cirrus.h"
-
-
-static struct IdentifyRta IdRta;
-static struct KillNeighbour KillUnit;
-
-int RIOFoadRta(struct Host *HostP, struct Map *MapP)
-{
-        struct CmdBlk *CmdBlkP;
-
-        rio_dprintk(RIO_DEBUG_CMD, "FOAD RTA\n");
-
-        CmdBlkP = RIOGetCmdBlk();
-
-        if (!CmdBlkP) {
-                rio_dprintk(RIO_DEBUG_CMD, "FOAD RTA: GetCmdBlk failed\n");
-                return -ENXIO;
-        }
-
-        CmdBlkP->Packet.dest_unit = MapP->ID;
-        CmdBlkP->Packet.dest_port = BOOT_RUP;
-        CmdBlkP->Packet.src_unit = 0;
-        CmdBlkP->Packet.src_port = BOOT_RUP;
-        CmdBlkP->Packet.len = 0x84;
-        CmdBlkP->Packet.data[0] = IFOAD;
-        CmdBlkP->Packet.data[1] = 0;
-        CmdBlkP->Packet.data[2] = IFOAD_MAGIC & 0xFF;
-        CmdBlkP->Packet.data[3] = (IFOAD_MAGIC >> 8) & 0xFF;
-
-        if (RIOQueueCmdBlk(HostP, MapP->ID - 1, CmdBlkP) == RIO_FAIL) {
-                rio_dprintk(RIO_DEBUG_CMD, "FOAD RTA: Failed to queue foad command\n");
-                return -EIO;
-        }
-        return 0;
-}
-
-int RIOZombieRta(struct Host *HostP, struct Map *MapP)
-{
-        struct CmdBlk *CmdBlkP;
-
-        rio_dprintk(RIO_DEBUG_CMD, "ZOMBIE RTA\n");
-
-        CmdBlkP = RIOGetCmdBlk();
-
-        if (!CmdBlkP) {
-                rio_dprintk(RIO_DEBUG_CMD, "ZOMBIE RTA: GetCmdBlk failed\n");
-                return -ENXIO;
-        }
-
-        CmdBlkP->Packet.dest_unit = MapP->ID;
-        CmdBlkP->Packet.dest_port = BOOT_RUP;
-        CmdBlkP->Packet.src_unit = 0;
-        CmdBlkP->Packet.src_port = BOOT_RUP;
-        CmdBlkP->Packet.len = 0x84;
-        CmdBlkP->Packet.data[0] = ZOMBIE;
-        CmdBlkP->Packet.data[1] = 0;
-        CmdBlkP->Packet.data[2] = ZOMBIE_MAGIC & 0xFF;
-        CmdBlkP->Packet.data[3] = (ZOMBIE_MAGIC >> 8) & 0xFF;
-
-        if (RIOQueueCmdBlk(HostP, MapP->ID - 1, CmdBlkP) == RIO_FAIL) {
-                rio_dprintk(RIO_DEBUG_CMD, "ZOMBIE RTA: Failed to queue zombie command\n");
-                return -EIO;
-        }
-        return 0;
-}
-
-int RIOCommandRta(struct rio_info *p, unsigned long RtaUnique, int (*func) (struct Host * HostP, struct Map * MapP))
-{
-        unsigned int Host;
-
-        rio_dprintk(RIO_DEBUG_CMD, "Command RTA 0x%lx func %p\n", RtaUnique, func);
-
-        if (!RtaUnique)
-                return (0);
-
-        for (Host = 0; Host < p->RIONumHosts; Host++) {
-                unsigned int Rta;
-                struct Host *HostP = &p->RIOHosts[Host];
-
-                for (Rta = 0; Rta < RTAS_PER_HOST; Rta++) {
-                        struct Map *MapP = &HostP->Mapping[Rta];
-
-                        if (MapP->RtaUniqueNum == RtaUnique) {
-                                uint Link;
-
-                                /*
-                                 ** now, lets just check we have a route to it...
-                                 ** IF the routing stuff is working, then one of the
-                                 ** topology entries for this unit will have a legit
-                                 ** route *somewhere*. We care not where - if its got
-                                 ** any connections, we can get to it.
-                                 */
-                                for (Link = 0; Link < LINKS_PER_UNIT; Link++) {
-                                        if (MapP->Topology[Link].Unit <= (u8) MAX_RUP) {
-                                                /*
-                                                 ** Its worth trying the operation...
-                                                 */
-                                                return (*func) (HostP, MapP);
-                                        }
-                                }
-                        }
-                }
-        }
-        return -ENXIO;
-}
-
-
-int RIOIdentifyRta(struct rio_info *p, void __user * arg)
-{
-        unsigned int Host;
-
-        if (copy_from_user(&IdRta, arg, sizeof(IdRta))) {
-                rio_dprintk(RIO_DEBUG_CMD, "RIO_IDENTIFY_RTA copy failed\n");
-                p->RIOError.Error = COPYIN_FAILED;
-                return -EFAULT;
-        }
-
-        for (Host = 0; Host < p->RIONumHosts; Host++) {
-                unsigned int Rta;
-                struct Host *HostP = &p->RIOHosts[Host];
-
-                for (Rta = 0; Rta < RTAS_PER_HOST; Rta++) {
-                        struct Map *MapP = &HostP->Mapping[Rta];
-
-                        if (MapP->RtaUniqueNum == IdRta.RtaUnique) {
-                                uint Link;
-                                /*
-                                 ** now, lets just check we have a route to it...
-                                 ** IF the routing stuff is working, then one of the
-                                 ** topology entries for this unit will have a legit
-                                 ** route *somewhere*. We care not where - if its got
-                                 ** any connections, we can get to it.
-                                 */
-                                for (Link = 0; Link < LINKS_PER_UNIT; Link++) {
-                                        if (MapP->Topology[Link].Unit <= (u8) MAX_RUP) {
-                                                /*
-                                                 ** Its worth trying the operation...
-                                                 */
-                                                struct CmdBlk *CmdBlkP;
-
-                                                rio_dprintk(RIO_DEBUG_CMD, "IDENTIFY RTA\n");
-
-                                                CmdBlkP = RIOGetCmdBlk();
-
-                                                if (!CmdBlkP) {
-                                                        rio_dprintk(RIO_DEBUG_CMD, "IDENTIFY RTA: GetCmdBlk failed\n");
-                                                        return -ENXIO;
-                                                }
-
-                                                CmdBlkP->Packet.dest_unit = MapP->ID;
-                                                CmdBlkP->Packet.dest_port = BOOT_RUP;
-                                                CmdBlkP->Packet.src_unit = 0;
-                                                CmdBlkP->Packet.src_port = BOOT_RUP;
-                                                CmdBlkP->Packet.len = 0x84;
-                                                CmdBlkP->Packet.data[0] = IDENTIFY;
-                                                CmdBlkP->Packet.data[1] = 0;
-                                                CmdBlkP->Packet.data[2] = IdRta.ID;
-
-                                                if (RIOQueueCmdBlk(HostP, MapP->ID - 1, CmdBlkP) == RIO_FAIL) {
-                                                        rio_dprintk(RIO_DEBUG_CMD, "IDENTIFY RTA: Failed to queue command\n");
-                                                        return -EIO;
-                                                }
-                                                return 0;
-                                        }
-                                }
-                        }
-                }
-        }
-        return -ENOENT;
-}
-
-
-int RIOKillNeighbour(struct rio_info *p, void __user * arg)
-{
-        uint Host;
-        uint ID;
-        struct Host *HostP;
-        struct CmdBlk *CmdBlkP;
-
-        rio_dprintk(RIO_DEBUG_CMD, "KILL HOST NEIGHBOUR\n");
-
-        if (copy_from_user(&KillUnit, arg, sizeof(KillUnit))) {
-                rio_dprintk(RIO_DEBUG_CMD, "RIO_KILL_NEIGHBOUR copy failed\n");
-                p->RIOError.Error = COPYIN_FAILED;
-                return -EFAULT;
-        }
-
-        if (KillUnit.Link > 3)
-                return -ENXIO;
-
-        CmdBlkP = RIOGetCmdBlk();
-
-        if (!CmdBlkP) {
-                rio_dprintk(RIO_DEBUG_CMD, "UFOAD: GetCmdBlk failed\n");
-                return -ENXIO;
-        }
-
-        CmdBlkP->Packet.dest_unit = 0;
-        CmdBlkP->Packet.src_unit = 0;
-        CmdBlkP->Packet.dest_port = BOOT_RUP;
-        CmdBlkP->Packet.src_port = BOOT_RUP;
-        CmdBlkP->Packet.len = 0x84;
-        CmdBlkP->Packet.data[0] = UFOAD;
-        CmdBlkP->Packet.data[1] = KillUnit.Link;
-        CmdBlkP->Packet.data[2] = UFOAD_MAGIC & 0xFF;
-        CmdBlkP->Packet.data[3] = (UFOAD_MAGIC >> 8) & 0xFF;
-
-        for (Host = 0; Host < p->RIONumHosts; Host++) {
-                ID = 0;
-                HostP = &p->RIOHosts[Host];
-
-                if (HostP->UniqueNum == KillUnit.UniqueNum) {
-                        if (RIOQueueCmdBlk(HostP, RTAS_PER_HOST + KillUnit.Link, CmdBlkP) == RIO_FAIL) {
-                                rio_dprintk(RIO_DEBUG_CMD, "UFOAD: Failed queue command\n");
-                                return -EIO;
-                        }
-                        return 0;
-                }
-
-                for (ID = 0; ID < RTAS_PER_HOST; ID++) {
-                        if (HostP->Mapping[ID].RtaUniqueNum == KillUnit.UniqueNum) {
-                                CmdBlkP->Packet.dest_unit = ID + 1;
-                                if (RIOQueueCmdBlk(HostP, ID, CmdBlkP) == RIO_FAIL) {
-                                        rio_dprintk(RIO_DEBUG_CMD, "UFOAD: Failed queue command\n");
-                                        return -EIO;
-                                }
-                                return 0;
-                        }
-                }
-        }
-        RIOFreeCmdBlk(CmdBlkP);
-        return -ENXIO;
-}
-
-int RIOSuspendBootRta(struct Host *HostP, int ID, int Link)
-{
-        struct CmdBlk *CmdBlkP;
-
-        rio_dprintk(RIO_DEBUG_CMD, "SUSPEND BOOT ON RTA ID %d, link %c\n", ID, 'A' + Link);
-
-        CmdBlkP = RIOGetCmdBlk();
-
-        if (!CmdBlkP) {
-                rio_dprintk(RIO_DEBUG_CMD, "SUSPEND BOOT ON RTA: GetCmdBlk failed\n");
-                return -ENXIO;
-        }
-
-        CmdBlkP->Packet.dest_unit = ID;
-        CmdBlkP->Packet.dest_port = BOOT_RUP;
-        CmdBlkP->Packet.src_unit = 0;
-        CmdBlkP->Packet.src_port = BOOT_RUP;
-        CmdBlkP->Packet.len = 0x84;
-        CmdBlkP->Packet.data[0] = IWAIT;
-        CmdBlkP->Packet.data[1] = Link;
-        CmdBlkP->Packet.data[2] = IWAIT_MAGIC & 0xFF;
-        CmdBlkP->Packet.data[3] = (IWAIT_MAGIC >> 8) & 0xFF;
-
-        if (RIOQueueCmdBlk(HostP, ID - 1, CmdBlkP) == RIO_FAIL) {
-                rio_dprintk(RIO_DEBUG_CMD, "SUSPEND BOOT ON RTA: Failed to queue iwait command\n");
-                return -EIO;
-        }
-        return 0;
-}
-
-int RIOFoadWakeup(struct rio_info *p)
-{
-        int port;
-        struct Port *PortP;
-        unsigned long flags;
-
-        for (port = 0; port < RIO_PORTS; port++) {
-                PortP = p->RIOPortp[port];
-
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                PortP->Config = 0;
-                PortP->State = 0;
-                PortP->InUse = NOT_INUSE;
-                PortP->PortState = 0;
-                PortP->FlushCmdBodge = 0;
-                PortP->ModemLines = 0;
-                PortP->ModemState = 0;
-                PortP->CookMode = 0;
-                PortP->ParamSem = 0;
-                PortP->Mapped = 0;
-                PortP->WflushFlag = 0;
-                PortP->MagicFlags = 0;
-                PortP->RxDataStart = 0;
-                PortP->TxBufferIn = 0;
-                PortP->TxBufferOut = 0;
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-        }
-        return (0);
-}
-
-/*
-** Incoming command on the COMMAND_RUP to be processed.
-*/
-static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struct PKT __iomem *PacketP)
-{
-        struct PktCmd __iomem *PktCmdP = (struct PktCmd __iomem *)PacketP->data;
-        struct Port *PortP;
-        struct UnixRup *UnixRupP;
-        unsigned short SysPort;
-        unsigned short ReportedModemStatus;
-        unsigned short rup;
-        unsigned short subCommand;
-        unsigned long flags;
-
-        func_enter();
-
-        /*
-         ** 16 port RTA note:
-         ** Command rup packets coming from the RTA will have pkt->data[1] (which
-         ** translates to PktCmdP->PhbNum) set to the host port number for the
-         ** particular unit. To access the correct BaseSysPort for a 16 port RTA,
-         ** we can use PhbNum to get the rup number for the appropriate 8 port
-         ** block (for the first block, this should be equal to 'Rup').
-         */
-        rup = readb(&PktCmdP->PhbNum) / (unsigned short) PORTS_PER_RTA;
-        UnixRupP = &HostP->UnixRups[rup];
-        SysPort = UnixRupP->BaseSysPort + (readb(&PktCmdP->PhbNum) % (unsigned short) PORTS_PER_RTA);
-        rio_dprintk(RIO_DEBUG_CMD, "Command on rup %d, port %d\n", rup, SysPort);
-
-        if (UnixRupP->BaseSysPort == NO_PORT) {
-                rio_dprintk(RIO_DEBUG_CMD, "OBSCURE ERROR!\n");
-                rio_dprintk(RIO_DEBUG_CMD, "Diagnostics follow. Please WRITE THESE DOWN and report them to Specialix Technical Support\n");
-                rio_dprintk(RIO_DEBUG_CMD, "CONTROL information: Host number %Zd, name ``%s''\n", HostP - p->RIOHosts, HostP->Name);
-                rio_dprintk(RIO_DEBUG_CMD, "CONTROL information: Rup number  0x%x\n", rup);
-
-                if (Rup < (unsigned short) MAX_RUP) {
-                        rio_dprintk(RIO_DEBUG_CMD, "CONTROL information: This is the RUP for RTA ``%s''\n", HostP->Mapping[Rup].Name);
-                } else
-                        rio_dprintk(RIO_DEBUG_CMD, "CONTROL information: This is the RUP for link ``%c'' of host ``%s''\n", ('A' + Rup - MAX_RUP), HostP->Name);
-
-                rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Destination 0x%x:0x%x\n", readb(&PacketP->dest_unit), readb(&PacketP->dest_port));
-                rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Source    0x%x:0x%x\n", readb(&PacketP->src_unit), readb(&PacketP->src_port));
-                rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Length    0x%x (%d)\n", readb(&PacketP->len), readb(&PacketP->len));
-                rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Control  0x%x (%d)\n", readb(&PacketP->control), readb(&PacketP->control));
-                rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Check      0x%x (%d)\n", readw(&PacketP->csum), readw(&PacketP->csum));
-                rio_dprintk(RIO_DEBUG_CMD, "COMMAND information: Host Port Number 0x%x, " "Command Code 0x%x\n", readb(&PktCmdP->PhbNum), readb(&PktCmdP->Command));
-                return 1;
-        }
-        PortP = p->RIOPortp[SysPort];
-        rio_spin_lock_irqsave(&PortP->portSem, flags);
-        switch (readb(&PktCmdP->Command)) {
-        case RIOC_BREAK_RECEIVED:
-                rio_dprintk(RIO_DEBUG_CMD, "Received a break!\n");
-                /* If the current line disc. is not multi-threading and
-                   the current processor is not the default, reset rup_intr
-                   and return 0 to ensure that the command packet is
-                   not freed. */
-                /* Call tmgr HANGUP HERE */
-                /* Fix this later when every thing works !!!! RAMRAJ */
-                gs_got_break(&PortP->gs);
-                break;
-
-        case RIOC_COMPLETE:
-                rio_dprintk(RIO_DEBUG_CMD, "Command complete on phb %d host %Zd\n", readb(&PktCmdP->PhbNum), HostP - p->RIOHosts);
-                subCommand = 1;
-                switch (readb(&PktCmdP->SubCommand)) {
-                case RIOC_MEMDUMP:
-                        rio_dprintk(RIO_DEBUG_CMD, "Memory dump cmd (0x%x) from addr 0x%x\n", readb(&PktCmdP->SubCommand), readw(&PktCmdP->SubAddr));
-                        break;
-                case RIOC_READ_REGISTER:
-                        rio_dprintk(RIO_DEBUG_CMD, "Read register (0x%x)\n", readw(&PktCmdP->SubAddr));
-                        p->CdRegister = (readb(&PktCmdP->ModemStatus) & RIOC_MSVR1_HOST);
-                        break;
-                default:
-                        subCommand = 0;
-                        break;
-                }
-                if (subCommand)
-                        break;
-                rio_dprintk(RIO_DEBUG_CMD, "New status is 0x%x was 0x%x\n", readb(&PktCmdP->PortStatus), PortP->PortState);
-                if (PortP->PortState != readb(&PktCmdP->PortStatus)) {
-                        rio_dprintk(RIO_DEBUG_CMD, "Mark status & wakeup\n");
-                        PortP->PortState = readb(&PktCmdP->PortStatus);
-                        /* What should we do here ...
-                           wakeup( &PortP->PortState );
-                         */
-                } else
-                        rio_dprintk(RIO_DEBUG_CMD, "No change\n");
-
-                /* FALLTHROUGH */
-        case RIOC_MODEM_STATUS:
-                /*
-                 ** Knock out the tbusy and tstop bits, as these are not relevant
-                 ** to the check for modem status change (they're just there because
-                 ** it's a convenient place to put them!).
-                 */
-                ReportedModemStatus = readb(&PktCmdP->ModemStatus);
-                if ((PortP->ModemState & RIOC_MSVR1_HOST) ==
-                                (ReportedModemStatus & RIOC_MSVR1_HOST)) {
-                        rio_dprintk(RIO_DEBUG_CMD, "Modem status unchanged 0x%x\n", PortP->ModemState);
-                        /*
-                         ** Update ModemState just in case tbusy or tstop states have
-                         ** changed.
-                         */
-                        PortP->ModemState = ReportedModemStatus;
-                } else {
-                        rio_dprintk(RIO_DEBUG_CMD, "Modem status change from 0x%x to 0x%x\n", PortP->ModemState, ReportedModemStatus);
-                        PortP->ModemState = ReportedModemStatus;
-#ifdef MODEM_SUPPORT
-                        if (PortP->Mapped) {
-                                /***********************************************************\
-                                *************************************************************
-                                ***                                                                                                        ***
-                                ***               M O D E M   S T A T E   C H A N G E             ***
-                                ***                                                                                                        ***
-                                *************************************************************
-                                \***********************************************************/
-                                /*
-                                 ** If the device is a modem, then check the modem
-                                 ** carrier.
-                                 */
-                                if (PortP->gs.port.tty == NULL)
-                                        break;
-                                if (PortP->gs.port.tty->termios == NULL)
-                                        break;
-
-                                if (!(PortP->gs.port.tty->termios->c_cflag & CLOCAL) && ((PortP->State & (RIO_MOPEN | RIO_WOPEN)))) {
-
-                                        rio_dprintk(RIO_DEBUG_CMD, "Is there a Carrier?\n");
-                                        /*
-                                         ** Is there a carrier?
-                                         */
-                                        if (PortP->ModemState & RIOC_MSVR1_CD) {
-                                                /*
-                                                 ** Has carrier just appeared?
-                                                 */
-                                                if (!(PortP->State & RIO_CARR_ON)) {
-                                                        rio_dprintk(RIO_DEBUG_CMD, "Carrier just came up.\n");
-                                                        PortP->State |= RIO_CARR_ON;
-                                                        /*
-                                                         ** wakeup anyone in WOPEN
-                                                         */
-                                                        if (PortP->State & (PORT_ISOPEN | RIO_WOPEN))
-                                                                wake_up_interruptible(&PortP->gs.port.open_wait);
-                                                }
-                                        } else {
-                                                /*
-                                                 ** Has carrier just dropped?
-                                                 */
-                                                if (PortP->State & RIO_CARR_ON) {
-                                                        if (PortP->State & (PORT_ISOPEN | RIO_WOPEN | RIO_MOPEN))
-                                                                tty_hangup(PortP->gs.port.tty);
-                                                        PortP->State &= ~RIO_CARR_ON;
-                                                        rio_dprintk(RIO_DEBUG_CMD, "Carrirer just went down\n");
-                                                }
-                                        }
-                                }
-                        }
-#endif
-                }
-                break;
-
-        default:
-                rio_dprintk(RIO_DEBUG_CMD, "Unknown command %d on CMD_RUP of host %Zd\n", readb(&PktCmdP->Command), HostP - p->RIOHosts);
-                break;
-        }
-        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-
-        func_exit();
-
-        return 1;
-}
-
-/*
-** The command mechanism:
-**      Each rup has a chain of commands associated with it.
-**      This chain is maintained by routines in this file.
-**      Periodically we are called and we run a quick check of all the
-**      active chains to determine if there is a command to be executed,
-**      and if the rup is ready to accept it.
-**
-*/
-
-/*
-** Allocate an empty command block.
-*/
-struct CmdBlk *RIOGetCmdBlk(void)
-{
-        struct CmdBlk *CmdBlkP;
-
-        CmdBlkP = kzalloc(sizeof(struct CmdBlk), GFP_ATOMIC);
-        return CmdBlkP;
-}
-
-/*
-** Return a block to the head of the free list.
-*/
-void RIOFreeCmdBlk(struct CmdBlk *CmdBlkP)
-{
-        kfree(CmdBlkP);
-}
-
-/*
-** attach a command block to the list of commands to be performed for
-** a given rup.
-*/
-int RIOQueueCmdBlk(struct Host *HostP, uint Rup, struct CmdBlk *CmdBlkP)
-{
-        struct CmdBlk **Base;
-        struct UnixRup *UnixRupP;
-        unsigned long flags;
-
-        if (Rup >= (unsigned short) (MAX_RUP + LINKS_PER_UNIT)) {
-                rio_dprintk(RIO_DEBUG_CMD, "Illegal rup number %d in RIOQueueCmdBlk\n", Rup);
-                RIOFreeCmdBlk(CmdBlkP);
-                return RIO_FAIL;
-        }
-
-        UnixRupP = &HostP->UnixRups[Rup];
-
-        rio_spin_lock_irqsave(&UnixRupP->RupLock, flags);
-
-        /*
-         ** If the RUP is currently inactive, then put the request
-         ** straight on the RUP....
-         */
-        if ((UnixRupP->CmdsWaitingP == NULL) && (UnixRupP->CmdPendingP == NULL) && (readw(&UnixRupP->RupP->txcontrol) == TX_RUP_INACTIVE) && (CmdBlkP->PreFuncP ? (*CmdBlkP->PreFuncP) (CmdBlkP->PreArg, CmdBlkP)
-                                                                                                                                             : 1)) {
-                rio_dprintk(RIO_DEBUG_CMD, "RUP inactive-placing command straight on. Cmd byte is 0x%x\n", CmdBlkP->Packet.data[0]);
-
-                /*
-                 ** Whammy! blat that pack!
-                 */
-                HostP->Copy(&CmdBlkP->Packet, RIO_PTR(HostP->Caddr, readw(&UnixRupP->RupP->txpkt)), sizeof(struct PKT));
-
-                /*
-                 ** place command packet on the pending position.
-                 */
-                UnixRupP->CmdPendingP = CmdBlkP;
-
-                /*
-                 ** set the command register
-                 */
-                writew(TX_PACKET_READY, &UnixRupP->RupP->txcontrol);
-
-                rio_spin_unlock_irqrestore(&UnixRupP->RupLock, flags);
-
-                return 0;
-        }
-        rio_dprintk(RIO_DEBUG_CMD, "RUP active - en-queing\n");
-
-        if (UnixRupP->CmdsWaitingP != NULL)
-                rio_dprintk(RIO_DEBUG_CMD, "Rup active - command waiting\n");
-        if (UnixRupP->CmdPendingP != NULL)
-                rio_dprintk(RIO_DEBUG_CMD, "Rup active - command pending\n");
-        if (readw(&UnixRupP->RupP->txcontrol) != TX_RUP_INACTIVE)
-                rio_dprintk(RIO_DEBUG_CMD, "Rup active - command rup not ready\n");
-
-        Base = &UnixRupP->CmdsWaitingP;
-
-        rio_dprintk(RIO_DEBUG_CMD, "First try to queue cmdblk %p at %p\n", CmdBlkP, Base);
-
-        while (*Base) {
-                rio_dprintk(RIO_DEBUG_CMD, "Command cmdblk %p here\n", *Base);
-                Base = &((*Base)->NextP);
-                rio_dprintk(RIO_DEBUG_CMD, "Now try to queue cmd cmdblk %p at %p\n", CmdBlkP, Base);
-        }
-
-        rio_dprintk(RIO_DEBUG_CMD, "Will queue cmdblk %p at %p\n", CmdBlkP, Base);
-
-        *Base = CmdBlkP;
-
-        CmdBlkP->NextP = NULL;
-
-        rio_spin_unlock_irqrestore(&UnixRupP->RupLock, flags);
-
-        return 0;
-}
-
-/*
-** Here we go - if there is an empty rup, fill it!
-** must be called at splrio() or higher.
-*/
-void RIOPollHostCommands(struct rio_info *p, struct Host *HostP)
-{
-        struct CmdBlk *CmdBlkP;
-        struct UnixRup *UnixRupP;
-        struct PKT __iomem *PacketP;
-        unsigned short Rup;
-        unsigned long flags;
-
-
-        Rup = MAX_RUP + LINKS_PER_UNIT;
-
-        do {                    /* do this loop for each RUP */
-                /*
-                 ** locate the rup we are processing & lock it
-                 */
-                UnixRupP = &HostP->UnixRups[--Rup];
-
-                spin_lock_irqsave(&UnixRupP->RupLock, flags);
-
-                /*
-                 ** First check for incoming commands:
-                 */
-                if (readw(&UnixRupP->RupP->rxcontrol) != RX_RUP_INACTIVE) {
-                        int FreeMe;
-
-                        PacketP = (struct PKT __iomem *) RIO_PTR(HostP->Caddr, readw(&UnixRupP->RupP->rxpkt));
-
-                        switch (readb(&PacketP->dest_port)) {
-                        case BOOT_RUP:
-                                rio_dprintk(RIO_DEBUG_CMD, "Incoming Boot %s packet '%x'\n", readb(&PacketP->len) & 0x80 ? "Command" : "Data", readb(&PacketP->data[0]));
-                                rio_spin_unlock_irqrestore(&UnixRupP->RupLock, flags);
-                                FreeMe = RIOBootRup(p, Rup, HostP, PacketP);
-                                rio_spin_lock_irqsave(&UnixRupP->RupLock, flags);
-                                break;
-
-                        case COMMAND_RUP:
-                                /*
-                                 ** Free the RUP lock as loss of carrier causes a
-                                 ** ttyflush which will (eventually) call another
-                                 ** routine that uses the RUP lock.
-                                 */
-                                rio_spin_unlock_irqrestore(&UnixRupP->RupLock, flags);
-                                FreeMe = RIOCommandRup(p, Rup, HostP, PacketP);
-                                if (readb(&PacketP->data[5]) == RIOC_MEMDUMP) {
-                                        rio_dprintk(RIO_DEBUG_CMD, "Memdump from 0x%x complete\n", readw(&(PacketP->data[6])));
-                                        rio_memcpy_fromio(p->RIOMemDump, &(PacketP->data[8]), 32);
-                                }
-                                rio_spin_lock_irqsave(&UnixRupP->RupLock, flags);
-                                break;
-
-                        case ROUTE_RUP:
-                                rio_spin_unlock_irqrestore(&UnixRupP->RupLock, flags);
-                                FreeMe = RIORouteRup(p, Rup, HostP, PacketP);
-                                rio_spin_lock_irqsave(&UnixRupP->RupLock, flags);
-                                break;
-
-                        default:
-                                rio_dprintk(RIO_DEBUG_CMD, "Unknown RUP %d\n", readb(&PacketP->dest_port));
-                                FreeMe = 1;
-                                break;
-                        }
-
-                        if (FreeMe) {
-                                rio_dprintk(RIO_DEBUG_CMD, "Free processed incoming command packet\n");
-                                put_free_end(HostP, PacketP);
-
-                                writew(RX_RUP_INACTIVE, &UnixRupP->RupP->rxcontrol);
-
-                                if (readw(&UnixRupP->RupP->handshake) == PHB_HANDSHAKE_SET) {
-                                        rio_dprintk(RIO_DEBUG_CMD, "Handshake rup %d\n", Rup);
-                                        writew(PHB_HANDSHAKE_SET | PHB_HANDSHAKE_RESET, &UnixRupP->RupP->handshake);
-                                }
-                        }
-                }
-
-                /*
-                 ** IF a command was running on the port,
-                 ** and it has completed, then tidy it up.
-                 */
-                if ((CmdBlkP = UnixRupP->CmdPendingP) &&        /* ASSIGN! */
-                    (readw(&UnixRupP->RupP->txcontrol) == TX_RUP_INACTIVE)) {
-                        /*
-                         ** we are idle.
-                         ** there is a command in pending.
-                         ** Therefore, this command has finished.
-                         ** So, wakeup whoever is waiting for it (and tell them
-                         ** what happened).
-                         */
-                        if (CmdBlkP->Packet.dest_port == BOOT_RUP)
-                                rio_dprintk(RIO_DEBUG_CMD, "Free Boot %s Command Block '%x'\n", CmdBlkP->Packet.len & 0x80 ? "Command" : "Data", CmdBlkP->Packet.data[0]);
-
-                        rio_dprintk(RIO_DEBUG_CMD, "Command %p completed\n", CmdBlkP);
-
-                        /*
-                         ** Clear the Rup lock to prevent mutual exclusion.
-                         */
-                        if (CmdBlkP->PostFuncP) {
-                                rio_spin_unlock_irqrestore(&UnixRupP->RupLock, flags);
-                                (*CmdBlkP->PostFuncP) (CmdBlkP->PostArg, CmdBlkP);
-                                rio_spin_lock_irqsave(&UnixRupP->RupLock, flags);
-                        }
-
-                        /*
-                         ** ....clear the pending flag....
-                         */
-                        UnixRupP->CmdPendingP = NULL;
-
-                        /*
-                         ** ....and return the command block to the freelist.
-                         */
-                        RIOFreeCmdBlk(CmdBlkP);
-                }
-
-                /*
-                 ** If there is a command for this rup, and the rup
-                 ** is idle, then process the command
-                 */
-                if ((CmdBlkP = UnixRupP->CmdsWaitingP) &&       /* ASSIGN! */
-                    (UnixRupP->CmdPendingP == NULL) && (readw(&UnixRupP->RupP->txcontrol) == TX_RUP_INACTIVE)) {
-                        /*
-                         ** if the pre-function is non-zero, call it.
-                         ** If it returns RIO_FAIL then don't
-                         ** send this command yet!
-                         */
-                        if (!(CmdBlkP->PreFuncP ? (*CmdBlkP->PreFuncP) (CmdBlkP->PreArg, CmdBlkP) : 1)) {
-                                rio_dprintk(RIO_DEBUG_CMD, "Not ready to start command %p\n", CmdBlkP);
-                        } else {
-                                rio_dprintk(RIO_DEBUG_CMD, "Start new command %p Cmd byte is 0x%x\n", CmdBlkP, CmdBlkP->Packet.data[0]);
-                                /*
-                                 ** Whammy! blat that pack!
-                                 */
-                                HostP->Copy(&CmdBlkP->Packet, RIO_PTR(HostP->Caddr, readw(&UnixRupP->RupP->txpkt)), sizeof(struct PKT));
-
-                                /*
-                                 ** remove the command from the rup command queue...
-                                 */
-                                UnixRupP->CmdsWaitingP = CmdBlkP->NextP;
-
-                                /*
-                                 ** ...and place it on the pending position.
-                                 */
-                                UnixRupP->CmdPendingP = CmdBlkP;
-
-                                /*
-                                 ** set the command register
-                                 */
-                                writew(TX_PACKET_READY, &UnixRupP->RupP->txcontrol);
-
-                                /*
-                                 ** the command block will be freed
-                                 ** when the command has been processed.
-                                 */
-                        }
-                }
-                spin_unlock_irqrestore(&UnixRupP->RupLock, flags);
-        } while (Rup);
-}
-
-int RIOWFlushMark(unsigned long iPortP, struct CmdBlk *CmdBlkP)
-{
-        struct Port *PortP = (struct Port *) iPortP;
-        unsigned long flags;
-
-        rio_spin_lock_irqsave(&PortP->portSem, flags);
-        PortP->WflushFlag++;
-        PortP->MagicFlags |= MAGIC_FLUSH;
-        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-        return RIOUnUse(iPortP, CmdBlkP);
-}
-
-int RIORFlushEnable(unsigned long iPortP, struct CmdBlk *CmdBlkP)
-{
-        struct Port *PortP = (struct Port *) iPortP;
-        struct PKT __iomem *PacketP;
-        unsigned long flags;
-
-        rio_spin_lock_irqsave(&PortP->portSem, flags);
-
-        while (can_remove_receive(&PacketP, PortP)) {
-                remove_receive(PortP);
-                put_free_end(PortP->HostP, PacketP);
-        }
-
-        if (readw(&PortP->PhbP->handshake) == PHB_HANDSHAKE_SET) {
-                /*
-                 ** MAGIC! (Basically, handshake the RX buffer, so that
-                 ** the RTAs upstream can be re-enabled.)
-                 */
-                rio_dprintk(RIO_DEBUG_CMD, "Util: Set RX handshake bit\n");
-                writew(PHB_HANDSHAKE_SET | PHB_HANDSHAKE_RESET, &PortP->PhbP->handshake);
-        }
-        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-        return RIOUnUse(iPortP, CmdBlkP);
-}
-
-int RIOUnUse(unsigned long iPortP, struct CmdBlk *CmdBlkP)
-{
-        struct Port *PortP = (struct Port *) iPortP;
-        unsigned long flags;
-
-        rio_spin_lock_irqsave(&PortP->portSem, flags);
-
-        rio_dprintk(RIO_DEBUG_CMD, "Decrement in use count for port\n");
-
-        if (PortP->InUse) {
-                if (--PortP->InUse != NOT_INUSE) {
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        return 0;
-                }
-        }
-        /*
-         ** While PortP->InUse is set (i.e. a preemptive command has been sent to
-         ** the RTA and is awaiting completion), any transmit data is prevented from
-         ** being transferred from the write queue into the transmit packets
-         ** (add_transmit) and no furthur transmit interrupt will be sent for that
-         ** data. The next interrupt will occur up to 500ms later (RIOIntr is called
-         ** twice a second as a saftey measure). This was the case when kermit was
-         ** used to send data into a RIO port. After each packet was sent, TCFLSH
-         ** was called to flush the read queue preemptively. PortP->InUse was
-         ** incremented, thereby blocking the 6 byte acknowledgement packet
-         ** transmitted back. This acknowledgment hung around for 500ms before
-         ** being sent, thus reducing input performance substantially!.
-         ** When PortP->InUse becomes NOT_INUSE, we must ensure that any data
-         ** hanging around in the transmit buffer is sent immediately.
-         */
-        writew(1, &PortP->HostP->ParmMapP->tx_intr);
-        /* What to do here ..
-           wakeup( (caddr_t)&(PortP->InUse) );
-         */
-        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-        return 0;
-}
-
-/*
-** 
-** How to use this file:
-** 
-** To send a command down a rup, you need to allocate a command block, fill
-** in the packet information, fill in the command number, fill in the pre-
-** and post- functions and arguments, and then add the command block to the
-** queue of command blocks for the port in question. When the port is idle,
-** then the pre-function will be called. If this returns RIO_FAIL then the
-** command will be re-queued and tried again at a later date (probably in one
-** clock tick). If the pre-function returns NOT RIO_FAIL, then the command
-** packet will be queued on the RUP, and the txcontrol field set to the
-** command number. When the txcontrol field has changed from being the
-** command number, then the post-function will be called, with the argument
-** specified earlier, a pointer to the command block, and the value of
-** txcontrol.
-** 
-** To allocate a command block, call RIOGetCmdBlk(). This returns a pointer
-** to the command block structure allocated, or NULL if there aren't any.
-** The block will have been zeroed for you.
-** 
-** The structure has the following fields:
-** 
-** struct CmdBlk
-** {
-**       struct CmdBlk *NextP;            ** Pointer to next command block   **
-**       struct PKT      Packet;                ** A packet, to copy to the rup **
-**                      int      (*PreFuncP)();  ** The func to call to check if OK **
-**                      int      PreArg;                ** The arg for the func                 **
-**                      int      (*PostFuncP)(); ** The func to call when completed **
-**                      int      PostArg;          ** The arg for the func                      **
-** };
-** 
-** You need to fill in ALL fields EXCEPT NextP, which is used to link the
-** blocks together either on the free list or on the Rup list.
-** 
-** Packet is an actual packet structure to be filled in with the packet
-** information associated with the command. You need to fill in everything,
-** as the command processor doesn't process the command packet in any way.
-** 
-** The PreFuncP is called before the packet is enqueued on the host rup.
-** PreFuncP is called as (*PreFuncP)(PreArg, CmdBlkP);. PreFuncP must
-** return !RIO_FAIL to have the packet queued on the rup, and RIO_FAIL
-** if the packet is NOT to be queued.
-** 
-** The PostFuncP is called when the command has completed. It is called
-** as (*PostFuncP)(PostArg, CmdBlkP, txcontrol);. PostFuncP is not expected
-** to return a value. PostFuncP does NOT need to free the command block,
-** as this happens automatically after PostFuncP returns.
-** 
-** Once the command block has been filled in, it is attached to the correct
-** queue by calling RIOQueueCmdBlk( HostP, Rup, CmdBlkP ) where HostP is
-** a pointer to the struct Host, Rup is the NUMBER of the rup (NOT a pointer
-** to it!), and CmdBlkP is the pointer to the command block allocated using
-** RIOGetCmdBlk().
-** 
-*/
diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c
deleted file mode 100644
index 780506326a73..000000000000
--- a/drivers/char/rio/rioctrl.c
+++ /dev/null
@@ -1,1504 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : rioctrl.c
-**      SID             : 1.3
-**      Last Modified   : 11/6/98 10:33:42
-**      Retrieved       : 11/6/98 10:33:49
-**
-**  ident @(#)rioctrl.c 1.3
-**
-** -----------------------------------------------------------------------------
-*/
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/string.h>
-#include <asm/uaccess.h>
-
-#include <linux/termios.h>
-#include <linux/serial.h>
-
-#include <linux/generic_serial.h>
-
-
-#include "linux_compat.h"
-#include "rio_linux.h"
-#include "pkt.h"
-#include "daemon.h"
-#include "rio.h"
-#include "riospace.h"
-#include "cmdpkt.h"
-#include "map.h"
-#include "rup.h"
-#include "port.h"
-#include "riodrvr.h"
-#include "rioinfo.h"
-#include "func.h"
-#include "errors.h"
-#include "pci.h"
-
-#include "parmmap.h"
-#include "unixrup.h"
-#include "board.h"
-#include "host.h"
-#include "phb.h"
-#include "link.h"
-#include "cmdblk.h"
-#include "route.h"
-#include "cirrus.h"
-#include "rioioctl.h"
-
-
-static struct LpbReq LpbReq;
-static struct RupReq RupReq;
-static struct PortReq PortReq;
-static struct HostReq HostReq;  /* oh really?  global?  and no locking? */
-static struct HostDpRam HostDpRam;
-static struct DebugCtrl DebugCtrl;
-static struct Map MapEnt;
-static struct PortSetup PortSetup;
-static struct DownLoad DownLoad;
-static struct SendPack SendPack;
-/* static struct StreamInfo     StreamInfo; */
-/* static char modemtable[RIO_PORTS]; */
-static struct SpecialRupCmd SpecialRupCmd;
-static struct PortParams PortParams;
-static struct portStats portStats;
-
-static struct SubCmdStruct {
-        ushort Host;
-        ushort Rup;
-        ushort Port;
-        ushort Addr;
-} SubCmd;
-
-struct PortTty {
-        uint port;
-        struct ttystatics Tty;
-};
-
-static struct PortTty PortTty;
-typedef struct ttystatics TERMIO;
-
-/*
-** This table is used when the config.rio downloads bin code to the
-** driver. We index the table using the product code, 0-F, and call
-** the function pointed to by the entry, passing the information
-** about the boot.
-** The RIOBootCodeUNKNOWN entry is there to politely tell the calling
-** process to bog off.
-*/
-static int
- (*RIOBootTable[MAX_PRODUCT]) (struct rio_info *, struct DownLoad *) = {
-                                        /* 0 */ RIOBootCodeHOST,
-                                        /* Host Card */
-                                        /* 1 */ RIOBootCodeRTA,
-                                        /* RTA */
-};
-
-#define drv_makedev(maj, min) ((((uint) maj & 0xff) << 8) | ((uint) min & 0xff))
-
-static int copy_from_io(void __user *to, void __iomem *from, size_t size)
-{
-        void *buf = kmalloc(size, GFP_KERNEL);
-        int res = -ENOMEM;
-        if (buf) {
-                rio_memcpy_fromio(buf, from, size);
-                res = copy_to_user(to, buf, size);
-                kfree(buf);
-        }
-        return res;
-}
-
-int riocontrol(struct rio_info *p, dev_t dev, int cmd, unsigned long arg, int su)
-{
-        uint Host;              /* leave me unsigned! */
-        uint port;              /* and me! */
-        struct Host *HostP;
-        ushort loop;
-        int Entry;
-        struct Port *PortP;
-        struct PKT __iomem *PacketP;
-        int retval = 0;
-        unsigned long flags;
-        void __user *argp = (void __user *)arg;
-
-        func_enter();
-
-        /* Confuse the compiler to think that we've initialized these */
-        Host = 0;
-        PortP = NULL;
-
-        rio_dprintk(RIO_DEBUG_CTRL, "control ioctl cmd: 0x%x arg: %p\n", cmd, argp);
-
-        switch (cmd) {
-                /*
-                 ** RIO_SET_TIMER
-                 **
-                 ** Change the value of the host card interrupt timer.
-                 ** If the host card number is -1 then all host cards are changed
-                 ** otherwise just the specified host card will be changed.
-                 */
-        case RIO_SET_TIMER:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_TIMER to %ldms\n", arg);
-                {
-                        int host, value;
-                        host = (arg >> 16) & 0x0000FFFF;
-                        value = arg & 0x0000ffff;
-                        if (host == -1) {
-                                for (host = 0; host < p->RIONumHosts; host++) {
-                                        if (p->RIOHosts[host].Flags == RC_RUNNING) {
-                                                writew(value, &p->RIOHosts[host].ParmMapP->timer);
-                                        }
-                                }
-                        } else if (host >= p->RIONumHosts) {
-                                return -EINVAL;
-                        } else {
-                                if (p->RIOHosts[host].Flags == RC_RUNNING) {
-                                        writew(value, &p->RIOHosts[host].ParmMapP->timer);
-                                }
-                        }
-                }
-                return 0;
-
-        case RIO_FOAD_RTA:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_FOAD_RTA\n");
-                return RIOCommandRta(p, arg, RIOFoadRta);
-
-        case RIO_ZOMBIE_RTA:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_ZOMBIE_RTA\n");
-                return RIOCommandRta(p, arg, RIOZombieRta);
-
-        case RIO_IDENTIFY_RTA:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_IDENTIFY_RTA\n");
-                return RIOIdentifyRta(p, argp);
-
-        case RIO_KILL_NEIGHBOUR:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_KILL_NEIGHBOUR\n");
-                return RIOKillNeighbour(p, argp);
-
-        case SPECIAL_RUP_CMD:
-                {
-                        struct CmdBlk *CmdBlkP;
-
-                        rio_dprintk(RIO_DEBUG_CTRL, "SPECIAL_RUP_CMD\n");
-                        if (copy_from_user(&SpecialRupCmd, argp, sizeof(SpecialRupCmd))) {
-                                rio_dprintk(RIO_DEBUG_CTRL, "SPECIAL_RUP_CMD copy failed\n");
-                                p->RIOError.Error = COPYIN_FAILED;
-                                return -EFAULT;
-                        }
-                        CmdBlkP = RIOGetCmdBlk();
-                        if (!CmdBlkP) {
-                                rio_dprintk(RIO_DEBUG_CTRL, "SPECIAL_RUP_CMD GetCmdBlk failed\n");
-                                return -ENXIO;
-                        }
-                        CmdBlkP->Packet = SpecialRupCmd.Packet;
-                        if (SpecialRupCmd.Host >= p->RIONumHosts)
-                                SpecialRupCmd.Host = 0;
-                        rio_dprintk(RIO_DEBUG_CTRL, "Queue special rup command for host %d rup %d\n", SpecialRupCmd.Host, SpecialRupCmd.RupNum);
-                        if (RIOQueueCmdBlk(&p->RIOHosts[SpecialRupCmd.Host], SpecialRupCmd.RupNum, CmdBlkP) == RIO_FAIL) {
-                                printk(KERN_WARNING "rio: FAILED TO QUEUE SPECIAL RUP COMMAND\n");
-                        }
-                        return 0;
-                }
-
-        case RIO_DEBUG_MEM:
-                return -EPERM;
-
-        case RIO_ALL_MODEM:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_ALL_MODEM\n");
-                p->RIOError.Error = IOCTL_COMMAND_UNKNOWN;
-                return -EINVAL;
-
-        case RIO_GET_TABLE:
-                /*
-                 ** Read the routing table from the device driver to user space
-                 */
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_TABLE\n");
-
-                if ((retval = RIOApel(p)) != 0)
-                        return retval;
-
-                if (copy_to_user(argp, p->RIOConnectTable, TOTAL_MAP_ENTRIES * sizeof(struct Map))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_TABLE copy failed\n");
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-
-                {
-                        int entry;
-                        rio_dprintk(RIO_DEBUG_CTRL, "*****\nMAP ENTRIES\n");
-                        for (entry = 0; entry < TOTAL_MAP_ENTRIES; entry++) {
-                                if ((p->RIOConnectTable[entry].ID == 0) && (p->RIOConnectTable[entry].HostUniqueNum == 0) && (p->RIOConnectTable[entry].RtaUniqueNum == 0))
-                                        continue;
-
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.HostUniqueNum = 0x%x\n", entry, p->RIOConnectTable[entry].HostUniqueNum);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.RtaUniqueNum = 0x%x\n", entry, p->RIOConnectTable[entry].RtaUniqueNum);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.ID = 0x%x\n", entry, p->RIOConnectTable[entry].ID);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.ID2 = 0x%x\n", entry, p->RIOConnectTable[entry].ID2);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.Flags = 0x%x\n", entry, (int) p->RIOConnectTable[entry].Flags);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.SysPort = 0x%x\n", entry, (int) p->RIOConnectTable[entry].SysPort);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.Top[0].Unit = %x\n", entry, p->RIOConnectTable[entry].Topology[0].Unit);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.Top[0].Link = %x\n", entry, p->RIOConnectTable[entry].Topology[0].Link);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.Top[1].Unit = %x\n", entry, p->RIOConnectTable[entry].Topology[1].Unit);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.Top[1].Link = %x\n", entry, p->RIOConnectTable[entry].Topology[1].Link);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.Top[2].Unit = %x\n", entry, p->RIOConnectTable[entry].Topology[2].Unit);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.Top[2].Link = %x\n", entry, p->RIOConnectTable[entry].Topology[2].Link);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.Top[3].Unit = %x\n", entry, p->RIOConnectTable[entry].Topology[3].Unit);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.Top[4].Link = %x\n", entry, p->RIOConnectTable[entry].Topology[3].Link);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Map entry %d.Name = %s\n", entry, p->RIOConnectTable[entry].Name);
-                        }
-                        rio_dprintk(RIO_DEBUG_CTRL, "*****\nEND MAP ENTRIES\n");
-                }
-                p->RIOQuickCheck = NOT_CHANGED; /* a table has been gotten */
-                return 0;
-
-        case RIO_PUT_TABLE:
-                /*
-                 ** Write the routing table to the device driver from user space
-                 */
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_TABLE\n");
-
-                if (!su) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_TABLE !Root\n");
-                        p->RIOError.Error = NOT_SUPER_USER;
-                        return -EPERM;
-                }
-                if (copy_from_user(&p->RIOConnectTable[0], argp, TOTAL_MAP_ENTRIES * sizeof(struct Map))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_TABLE copy failed\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-/*
-***********************************
-                                {
-                                        int entry;
-                                        rio_dprint(RIO_DEBUG_CTRL,  ("*****\nMAP ENTRIES\n") );
-                                        for ( entry=0; entry<TOTAL_MAP_ENTRIES; entry++ )
-                                        {
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.HostUniqueNum = 0x%x\n", entry, p->RIOConnectTable[entry].HostUniqueNum ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.RtaUniqueNum = 0x%x\n", entry, p->RIOConnectTable[entry].RtaUniqueNum ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.ID = 0x%x\n", entry, p->RIOConnectTable[entry].ID ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.ID2 = 0x%x\n", entry, p->RIOConnectTable[entry].ID2 ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.Flags = 0x%x\n", entry, p->RIOConnectTable[entry].Flags ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.SysPort = 0x%x\n", entry, p->RIOConnectTable[entry].SysPort ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.Top[0].Unit = %b\n", entry, p->RIOConnectTable[entry].Topology[0].Unit ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.Top[0].Link = %b\n", entry, p->RIOConnectTable[entry].Topology[0].Link ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.Top[1].Unit = %b\n", entry, p->RIOConnectTable[entry].Topology[1].Unit ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.Top[1].Link = %b\n", entry, p->RIOConnectTable[entry].Topology[1].Link ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.Top[2].Unit = %b\n", entry, p->RIOConnectTable[entry].Topology[2].Unit ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.Top[2].Link = %b\n", entry, p->RIOConnectTable[entry].Topology[2].Link ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.Top[3].Unit = %b\n", entry, p->RIOConnectTable[entry].Topology[3].Unit ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.Top[4].Link = %b\n", entry, p->RIOConnectTable[entry].Topology[3].Link ) );
-                                                rio_dprint(RIO_DEBUG_CTRL,  ("Map entry %d.Name = %s\n", entry, p->RIOConnectTable[entry].Name ) );
-                                        }
-                                        rio_dprint(RIO_DEBUG_CTRL,  ("*****\nEND MAP ENTRIES\n") );
-                                }
-***********************************
-*/
-                return RIONewTable(p);
-
-        case RIO_GET_BINDINGS:
-                /*
-                 ** Send bindings table, containing unique numbers of RTAs owned
-                 ** by this system to user space
-                 */
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_BINDINGS\n");
-
-                if (!su) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_BINDINGS !Root\n");
-                        p->RIOError.Error = NOT_SUPER_USER;
-                        return -EPERM;
-                }
-                if (copy_to_user(argp, p->RIOBindTab, (sizeof(ulong) * MAX_RTA_BINDINGS))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_BINDINGS copy failed\n");
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return 0;
-
-        case RIO_PUT_BINDINGS:
-                /*
-                 ** Receive a bindings table, containing unique numbers of RTAs owned
-                 ** by this system
-                 */
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_BINDINGS\n");
-
-                if (!su) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_BINDINGS !Root\n");
-                        p->RIOError.Error = NOT_SUPER_USER;
-                        return -EPERM;
-                }
-                if (copy_from_user(&p->RIOBindTab[0], argp, (sizeof(ulong) * MAX_RTA_BINDINGS))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_BINDINGS copy failed\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                return 0;
-
-        case RIO_BIND_RTA:
-                {
-                        int EmptySlot = -1;
-                        /*
-                         ** Bind this RTA to host, so that it will be booted by
-                         ** host in 'boot owned RTAs' mode.
-                         */
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_BIND_RTA\n");
-
-                        if (!su) {
-                                rio_dprintk(RIO_DEBUG_CTRL, "RIO_BIND_RTA !Root\n");
-                                p->RIOError.Error = NOT_SUPER_USER;
-                                return -EPERM;
-                        }
-                        for (Entry = 0; Entry < MAX_RTA_BINDINGS; Entry++) {
-                                if ((EmptySlot == -1) && (p->RIOBindTab[Entry] == 0L))
-                                        EmptySlot = Entry;
-                                else if (p->RIOBindTab[Entry] == arg) {
-                                        /*
-                                         ** Already exists - delete
-                                         */
-                                        p->RIOBindTab[Entry] = 0L;
-                                        rio_dprintk(RIO_DEBUG_CTRL, "Removing Rta %ld from p->RIOBindTab\n", arg);
-                                        return 0;
-                                }
-                        }
-                        /*
-                         ** Dosen't exist - add
-                         */
-                        if (EmptySlot != -1) {
-                                p->RIOBindTab[EmptySlot] = arg;
-                                rio_dprintk(RIO_DEBUG_CTRL, "Adding Rta %lx to p->RIOBindTab\n", arg);
-                        } else {
-                                rio_dprintk(RIO_DEBUG_CTRL, "p->RIOBindTab full! - Rta %lx not added\n", arg);
-                                return -ENOMEM;
-                        }
-                        return 0;
-                }
-
-        case RIO_RESUME:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME\n");
-                port = arg;
-                if ((port < 0) || (port > 511)) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME: Bad port number %d\n", port);
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -EINVAL;
-                }
-                PortP = p->RIOPortp[port];
-                if (!PortP->Mapped) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME: Port %d not mapped\n", port);
-                        p->RIOError.Error = PORT_NOT_MAPPED_INTO_SYSTEM;
-                        return -EINVAL;
-                }
-                if (!(PortP->State & (RIO_LOPEN | RIO_MOPEN))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME: Port %d not open\n", port);
-                        return -EINVAL;
-                }
-
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                if (RIOPreemptiveCmd(p, (p->RIOPortp[port]), RIOC_RESUME) ==
-                                RIO_FAIL) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME failed\n");
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        return -EBUSY;
-                } else {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME: Port %d resumed\n", port);
-                        PortP->State |= RIO_BUSY;
-                }
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                return retval;
-
-        case RIO_ASSIGN_RTA:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_ASSIGN_RTA\n");
-                if (!su) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_ASSIGN_RTA !Root\n");
-                        p->RIOError.Error = NOT_SUPER_USER;
-                        return -EPERM;
-                }
-                if (copy_from_user(&MapEnt, argp, sizeof(MapEnt))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "Copy from user space failed\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                return RIOAssignRta(p, &MapEnt);
-
-        case RIO_CHANGE_NAME:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_CHANGE_NAME\n");
-                if (!su) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_CHANGE_NAME !Root\n");
-                        p->RIOError.Error = NOT_SUPER_USER;
-                        return -EPERM;
-                }
-                if (copy_from_user(&MapEnt, argp, sizeof(MapEnt))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "Copy from user space failed\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                return RIOChangeName(p, &MapEnt);
-
-        case RIO_DELETE_RTA:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_DELETE_RTA\n");
-                if (!su) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_DELETE_RTA !Root\n");
-                        p->RIOError.Error = NOT_SUPER_USER;
-                        return -EPERM;
-                }
-                if (copy_from_user(&MapEnt, argp, sizeof(MapEnt))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "Copy from data space failed\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                return RIODeleteRta(p, &MapEnt);
-
-        case RIO_QUICK_CHECK:
-                if (copy_to_user(argp, &p->RIORtaDisCons, sizeof(unsigned int))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return 0;
-
-        case RIO_LAST_ERROR:
-                if (copy_to_user(argp, &p->RIOError, sizeof(struct Error)))
-                        return -EFAULT;
-                return 0;
-
-        case RIO_GET_LOG:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_LOG\n");
-                return -EINVAL;
-
-        case RIO_GET_MODTYPE:
-                if (copy_from_user(&port, argp, sizeof(unsigned int))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "Get module type for port %d\n", port);
-                if (port < 0 || port > 511) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_MODTYPE: Bad port number %d\n", port);
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -EINVAL;
-                }
-                PortP = (p->RIOPortp[port]);
-                if (!PortP->Mapped) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_MODTYPE: Port %d not mapped\n", port);
-                        p->RIOError.Error = PORT_NOT_MAPPED_INTO_SYSTEM;
-                        return -EINVAL;
-                }
-                /*
-                 ** Return module type of port
-                 */
-                port = PortP->HostP->UnixRups[PortP->RupNum].ModTypes;
-                if (copy_to_user(argp, &port, sizeof(unsigned int))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return (0);
-        case RIO_BLOCK_OPENS:
-                rio_dprintk(RIO_DEBUG_CTRL, "Opens block until booted\n");
-                for (Entry = 0; Entry < RIO_PORTS; Entry++) {
-                        rio_spin_lock_irqsave(&PortP->portSem, flags);
-                        p->RIOPortp[Entry]->WaitUntilBooted = 1;
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                }
-                return 0;
-
-        case RIO_SETUP_PORTS:
-                rio_dprintk(RIO_DEBUG_CTRL, "Setup ports\n");
-                if (copy_from_user(&PortSetup, argp, sizeof(PortSetup))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        rio_dprintk(RIO_DEBUG_CTRL, "EFAULT");
-                        return -EFAULT;
-                }
-                if (PortSetup.From > PortSetup.To || PortSetup.To >= RIO_PORTS) {
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        rio_dprintk(RIO_DEBUG_CTRL, "ENXIO");
-                        return -ENXIO;
-                }
-                if (PortSetup.XpCps > p->RIOConf.MaxXpCps || PortSetup.XpCps < p->RIOConf.MinXpCps) {
-                        p->RIOError.Error = XPRINT_CPS_OUT_OF_RANGE;
-                        rio_dprintk(RIO_DEBUG_CTRL, "EINVAL");
-                        return -EINVAL;
-                }
-                if (!p->RIOPortp) {
-                        printk(KERN_ERR "rio: No p->RIOPortp array!\n");
-                        rio_dprintk(RIO_DEBUG_CTRL, "No p->RIOPortp array!\n");
-                        return -EIO;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "entering loop (%d %d)!\n", PortSetup.From, PortSetup.To);
-                for (loop = PortSetup.From; loop <= PortSetup.To; loop++) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "in loop (%d)!\n", loop);
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "after loop (%d)!\n", loop);
-                rio_dprintk(RIO_DEBUG_CTRL, "Retval:%x\n", retval);
-                return retval;
-
-        case RIO_GET_PORT_SETUP:
-                rio_dprintk(RIO_DEBUG_CTRL, "Get port setup\n");
-                if (copy_from_user(&PortSetup, argp, sizeof(PortSetup))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (PortSetup.From >= RIO_PORTS) {
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-
-                port = PortSetup.To = PortSetup.From;
-                PortSetup.IxAny = (p->RIOPortp[port]->Config & RIO_IXANY) ? 1 : 0;
-                PortSetup.IxOn = (p->RIOPortp[port]->Config & RIO_IXON) ? 1 : 0;
-                PortSetup.Drain = (p->RIOPortp[port]->Config & RIO_WAITDRAIN) ? 1 : 0;
-                PortSetup.Store = p->RIOPortp[port]->Store;
-                PortSetup.Lock = p->RIOPortp[port]->Lock;
-                PortSetup.XpCps = p->RIOPortp[port]->Xprint.XpCps;
-                memcpy(PortSetup.XpOn, p->RIOPortp[port]->Xprint.XpOn, MAX_XP_CTRL_LEN);
-                memcpy(PortSetup.XpOff, p->RIOPortp[port]->Xprint.XpOff, MAX_XP_CTRL_LEN);
-                PortSetup.XpOn[MAX_XP_CTRL_LEN - 1] = '\0';
-                PortSetup.XpOff[MAX_XP_CTRL_LEN - 1] = '\0';
-
-                if (copy_to_user(argp, &PortSetup, sizeof(PortSetup))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return retval;
-
-        case RIO_GET_PORT_PARAMS:
-                rio_dprintk(RIO_DEBUG_CTRL, "Get port params\n");
-                if (copy_from_user(&PortParams, argp, sizeof(struct PortParams))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (PortParams.Port >= RIO_PORTS) {
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-                PortP = (p->RIOPortp[PortParams.Port]);
-                PortParams.Config = PortP->Config;
-                PortParams.State = PortP->State;
-                rio_dprintk(RIO_DEBUG_CTRL, "Port %d\n", PortParams.Port);
-
-                if (copy_to_user(argp, &PortParams, sizeof(struct PortParams))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return retval;
-
-        case RIO_GET_PORT_TTY:
-                rio_dprintk(RIO_DEBUG_CTRL, "Get port tty\n");
-                if (copy_from_user(&PortTty, argp, sizeof(struct PortTty))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (PortTty.port >= RIO_PORTS) {
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-
-                rio_dprintk(RIO_DEBUG_CTRL, "Port %d\n", PortTty.port);
-                PortP = (p->RIOPortp[PortTty.port]);
-                if (copy_to_user(argp, &PortTty, sizeof(struct PortTty))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return retval;
-
-        case RIO_SET_PORT_TTY:
-                if (copy_from_user(&PortTty, argp, sizeof(struct PortTty))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "Set port %d tty\n", PortTty.port);
-                if (PortTty.port >= (ushort) RIO_PORTS) {
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-                PortP = (p->RIOPortp[PortTty.port]);
-                RIOParam(PortP, RIOC_CONFIG, PortP->State & RIO_MODEM,
-                                OK_TO_SLEEP);
-                return retval;
-
-        case RIO_SET_PORT_PARAMS:
-                rio_dprintk(RIO_DEBUG_CTRL, "Set port params\n");
-                if (copy_from_user(&PortParams, argp, sizeof(PortParams))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (PortParams.Port >= (ushort) RIO_PORTS) {
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-                PortP = (p->RIOPortp[PortParams.Port]);
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                PortP->Config = PortParams.Config;
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                return retval;
-
-        case RIO_GET_PORT_STATS:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_PORT_STATS\n");
-                if (copy_from_user(&portStats, argp, sizeof(struct portStats))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (portStats.port < 0 || portStats.port >= RIO_PORTS) {
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-                PortP = (p->RIOPortp[portStats.port]);
-                portStats.gather = PortP->statsGather;
-                portStats.txchars = PortP->txchars;
-                portStats.rxchars = PortP->rxchars;
-                portStats.opens = PortP->opens;
-                portStats.closes = PortP->closes;
-                portStats.ioctls = PortP->ioctls;
-                if (copy_to_user(argp, &portStats, sizeof(struct portStats))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return retval;
-
-        case RIO_RESET_PORT_STATS:
-                port = arg;
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESET_PORT_STATS\n");
-                if (port >= RIO_PORTS) {
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-                PortP = (p->RIOPortp[port]);
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                PortP->txchars = 0;
-                PortP->rxchars = 0;
-                PortP->opens = 0;
-                PortP->closes = 0;
-                PortP->ioctls = 0;
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                return retval;
-
-        case RIO_GATHER_PORT_STATS:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_GATHER_PORT_STATS\n");
-                if (copy_from_user(&portStats, argp, sizeof(struct portStats))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (portStats.port < 0 || portStats.port >= RIO_PORTS) {
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-                PortP = (p->RIOPortp[portStats.port]);
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                PortP->statsGather = portStats.gather;
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                return retval;
-
-        case RIO_READ_CONFIG:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_CONFIG\n");
-                if (copy_to_user(argp, &p->RIOConf, sizeof(struct Conf))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return retval;
-
-        case RIO_SET_CONFIG:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_CONFIG\n");
-                if (!su) {
-                        p->RIOError.Error = NOT_SUPER_USER;
-                        return -EPERM;
-                }
-                if (copy_from_user(&p->RIOConf, argp, sizeof(struct Conf))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                /*
-                 ** move a few value around
-                 */
-                for (Host = 0; Host < p->RIONumHosts; Host++)
-                        if ((p->RIOHosts[Host].Flags & RUN_STATE) == RC_RUNNING)
-                                writew(p->RIOConf.Timer, &p->RIOHosts[Host].ParmMapP->timer);
-                return retval;
-
-        case RIO_START_POLLER:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_START_POLLER\n");
-                return -EINVAL;
-
-        case RIO_STOP_POLLER:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_STOP_POLLER\n");
-                if (!su) {
-                        p->RIOError.Error = NOT_SUPER_USER;
-                        return -EPERM;
-                }
-                p->RIOPolling = NOT_POLLING;
-                return retval;
-
-        case RIO_SETDEBUG:
-        case RIO_GETDEBUG:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_SETDEBUG/RIO_GETDEBUG\n");
-                if (copy_from_user(&DebugCtrl, argp, sizeof(DebugCtrl))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (DebugCtrl.SysPort == NO_PORT) {
-                        if (cmd == RIO_SETDEBUG) {
-                                if (!su) {
-                                        p->RIOError.Error = NOT_SUPER_USER;
-                                        return -EPERM;
-                                }
-                                p->rio_debug = DebugCtrl.Debug;
-                                p->RIODebugWait = DebugCtrl.Wait;
-                                rio_dprintk(RIO_DEBUG_CTRL, "Set global debug to 0x%x set wait to 0x%x\n", p->rio_debug, p->RIODebugWait);
-                        } else {
-                                rio_dprintk(RIO_DEBUG_CTRL, "Get global debug 0x%x wait 0x%x\n", p->rio_debug, p->RIODebugWait);
-                                DebugCtrl.Debug = p->rio_debug;
-                                DebugCtrl.Wait = p->RIODebugWait;
-                                if (copy_to_user(argp, &DebugCtrl, sizeof(DebugCtrl))) {
-                                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET/GET DEBUG: bad port number %d\n", DebugCtrl.SysPort);
-                                        p->RIOError.Error = COPYOUT_FAILED;
-                                        return -EFAULT;
-                                }
-                        }
-                } else if (DebugCtrl.SysPort >= RIO_PORTS && DebugCtrl.SysPort != NO_PORT) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET/GET DEBUG: bad port number %d\n", DebugCtrl.SysPort);
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                } else if (cmd == RIO_SETDEBUG) {
-                        if (!su) {
-                                p->RIOError.Error = NOT_SUPER_USER;
-                                return -EPERM;
-                        }
-                        rio_spin_lock_irqsave(&PortP->portSem, flags);
-                        p->RIOPortp[DebugCtrl.SysPort]->Debug = DebugCtrl.Debug;
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_SETDEBUG 0x%x\n", p->RIOPortp[DebugCtrl.SysPort]->Debug);
-                } else {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_GETDEBUG 0x%x\n", p->RIOPortp[DebugCtrl.SysPort]->Debug);
-                        DebugCtrl.Debug = p->RIOPortp[DebugCtrl.SysPort]->Debug;
-                        if (copy_to_user(argp, &DebugCtrl, sizeof(DebugCtrl))) {
-                                rio_dprintk(RIO_DEBUG_CTRL, "RIO_GETDEBUG: Bad copy to user space\n");
-                                p->RIOError.Error = COPYOUT_FAILED;
-                                return -EFAULT;
-                        }
-                }
-                return retval;
-
-        case RIO_VERSID:
-                /*
-                 ** Enquire about the release and version.
-                 ** We return MAX_VERSION_LEN bytes, being a
-                 ** textual null terminated string.
-                 */
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_VERSID\n");
-                if (copy_to_user(argp, RIOVersid(), sizeof(struct rioVersion))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_VERSID: Bad copy to user space (host=%d)\n", Host);
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return retval;
-
-        case RIO_NUM_HOSTS:
-                /*
-                 ** Enquire as to the number of hosts located
-                 ** at init time.
-                 */
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_NUM_HOSTS\n");
-                if (copy_to_user(argp, &p->RIONumHosts, sizeof(p->RIONumHosts))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_NUM_HOSTS: Bad copy to user space\n");
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return retval;
-
-        case RIO_HOST_FOAD:
-                /*
-                 ** Kill host. This may not be in the final version...
-                 */
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_FOAD %ld\n", arg);
-                if (!su) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_FOAD: Not super user\n");
-                        p->RIOError.Error = NOT_SUPER_USER;
-                        return -EPERM;
-                }
-                p->RIOHalted = 1;
-                p->RIOSystemUp = 0;
-
-                for (Host = 0; Host < p->RIONumHosts; Host++) {
-                        (void) RIOBoardTest(p->RIOHosts[Host].PaddrP, p->RIOHosts[Host].Caddr, p->RIOHosts[Host].Type, p->RIOHosts[Host].Slot);
-                        memset(&p->RIOHosts[Host].Flags, 0, ((char *) &p->RIOHosts[Host].____end_marker____) - ((char *) &p->RIOHosts[Host].Flags));
-                        p->RIOHosts[Host].Flags = RC_WAITING;
-                }
-                RIOFoadWakeup(p);
-                p->RIONumBootPkts = 0;
-                p->RIOBooting = 0;
-                printk("HEEEEELP!\n");
-
-                for (loop = 0; loop < RIO_PORTS; loop++) {
-                        spin_lock_init(&p->RIOPortp[loop]->portSem);
-                        p->RIOPortp[loop]->InUse = NOT_INUSE;
-                }
-
-                p->RIOSystemUp = 0;
-                return retval;
-
-        case RIO_DOWNLOAD:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_DOWNLOAD\n");
-                if (!su) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_DOWNLOAD: Not super user\n");
-                        p->RIOError.Error = NOT_SUPER_USER;
-                        return -EPERM;
-                }
-                if (copy_from_user(&DownLoad, argp, sizeof(DownLoad))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_DOWNLOAD: Copy in from user space failed\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "Copied in download code for product code 0x%x\n", DownLoad.ProductCode);
-
-                /*
-                 ** It is important that the product code is an unsigned object!
-                 */
-                if (DownLoad.ProductCode >= MAX_PRODUCT) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_DOWNLOAD: Bad product code %d passed\n", DownLoad.ProductCode);
-                        p->RIOError.Error = NO_SUCH_PRODUCT;
-                        return -ENXIO;
-                }
-                /*
-                 ** do something!
-                 */
-                retval = (*(RIOBootTable[DownLoad.ProductCode])) (p, &DownLoad);
-                /* <-- Panic */
-                p->RIOHalted = 0;
-                /*
-                 ** and go back, content with a job well completed.
-                 */
-                return retval;
-
-        case RIO_PARMS:
-                {
-                        unsigned int host;
-
-                        if (copy_from_user(&host, argp, sizeof(host))) {
-                                rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ: Copy in from user space failed\n");
-                                p->RIOError.Error = COPYIN_FAILED;
-                                return -EFAULT;
-                        }
-                        /*
-                         ** Fetch the parmmap
-                         */
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_PARMS\n");
-                        if (copy_from_io(argp, p->RIOHosts[host].ParmMapP, sizeof(PARM_MAP))) {
-                                p->RIOError.Error = COPYOUT_FAILED;
-                                rio_dprintk(RIO_DEBUG_CTRL, "RIO_PARMS: Copy out to user space failed\n");
-                                return -EFAULT;
-                        }
-                }
-                return retval;
-
-        case RIO_HOST_REQ:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ\n");
-                if (copy_from_user(&HostReq, argp, sizeof(HostReq))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ: Copy in from user space failed\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (HostReq.HostNum >= p->RIONumHosts) {
-                        p->RIOError.Error = HOST_NUMBER_OUT_OF_RANGE;
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ: Illegal host number %d\n", HostReq.HostNum);
-                        return -ENXIO;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "Request for host %d\n", HostReq.HostNum);
-
-                if (copy_to_user(HostReq.HostP, &p->RIOHosts[HostReq.HostNum], sizeof(struct Host))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ: Bad copy to user space\n");
-                        return -EFAULT;
-                }
-                return retval;
-
-        case RIO_HOST_DPRAM:
-                rio_dprintk(RIO_DEBUG_CTRL, "Request for DPRAM\n");
-                if (copy_from_user(&HostDpRam, argp, sizeof(HostDpRam))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_DPRAM: Copy in from user space failed\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (HostDpRam.HostNum >= p->RIONumHosts) {
-                        p->RIOError.Error = HOST_NUMBER_OUT_OF_RANGE;
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_DPRAM: Illegal host number %d\n", HostDpRam.HostNum);
-                        return -ENXIO;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "Request for host %d\n", HostDpRam.HostNum);
-
-                if (p->RIOHosts[HostDpRam.HostNum].Type == RIO_PCI) {
-                        int off;
-                        /* It's hardware like this that really gets on my tits. */
-                        static unsigned char copy[sizeof(struct DpRam)];
-                        for (off = 0; off < sizeof(struct DpRam); off++)
-                                copy[off] = readb(p->RIOHosts[HostDpRam.HostNum].Caddr + off);
-                        if (copy_to_user(HostDpRam.DpRamP, copy, sizeof(struct DpRam))) {
-                                p->RIOError.Error = COPYOUT_FAILED;
-                                rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_DPRAM: Bad copy to user space\n");
-                                return -EFAULT;
-                        }
-                } else if (copy_from_io(HostDpRam.DpRamP, p->RIOHosts[HostDpRam.HostNum].Caddr, sizeof(struct DpRam))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_DPRAM: Bad copy to user space\n");
-                        return -EFAULT;
-                }
-                return retval;
-
-        case RIO_SET_BUSY:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_BUSY\n");
-                if (arg > 511) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_BUSY: Bad port number %ld\n", arg);
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -EINVAL;
-                }
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                p->RIOPortp[arg]->State |= RIO_BUSY;
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                return retval;
-
-        case RIO_HOST_PORT:
-                /*
-                 ** The daemon want port information
-                 ** (probably for debug reasons)
-                 */
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_PORT\n");
-                if (copy_from_user(&PortReq, argp, sizeof(PortReq))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_PORT: Copy in from user space failed\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-
-                if (PortReq.SysPort >= RIO_PORTS) {     /* SysPort is unsigned */
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_PORT: Illegal port number %d\n", PortReq.SysPort);
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "Request for port %d\n", PortReq.SysPort);
-                if (copy_to_user(PortReq.PortP, p->RIOPortp[PortReq.SysPort], sizeof(struct Port))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_PORT: Bad copy to user space\n");
-                        return -EFAULT;
-                }
-                return retval;
-
-        case RIO_HOST_RUP:
-                /*
-                 ** The daemon want rup information
-                 ** (probably for debug reasons)
-                 */
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP\n");
-                if (copy_from_user(&RupReq, argp, sizeof(RupReq))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP: Copy in from user space failed\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (RupReq.HostNum >= p->RIONumHosts) { /* host is unsigned */
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP: Illegal host number %d\n", RupReq.HostNum);
-                        p->RIOError.Error = HOST_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-                if (RupReq.RupNum >= MAX_RUP + LINKS_PER_UNIT) {        /* eek! */
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP: Illegal rup number %d\n", RupReq.RupNum);
-                        p->RIOError.Error = RUP_NUMBER_OUT_OF_RANGE;
-                        return -EINVAL;
-                }
-                HostP = &p->RIOHosts[RupReq.HostNum];
-
-                if ((HostP->Flags & RUN_STATE) != RC_RUNNING) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP: Host %d not running\n", RupReq.HostNum);
-                        p->RIOError.Error = HOST_NOT_RUNNING;
-                        return -EIO;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "Request for rup %d from host %d\n", RupReq.RupNum, RupReq.HostNum);
-
-                if (copy_from_io(RupReq.RupP, HostP->UnixRups[RupReq.RupNum].RupP, sizeof(struct RUP))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP: Bad copy to user space\n");
-                        return -EFAULT;
-                }
-                return retval;
-
-        case RIO_HOST_LPB:
-                /*
-                 ** The daemon want lpb information
-                 ** (probably for debug reasons)
-                 */
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB\n");
-                if (copy_from_user(&LpbReq, argp, sizeof(LpbReq))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB: Bad copy from user space\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (LpbReq.Host >= p->RIONumHosts) {    /* host is unsigned */
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB: Illegal host number %d\n", LpbReq.Host);
-                        p->RIOError.Error = HOST_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-                if (LpbReq.Link >= LINKS_PER_UNIT) {    /* eek! */
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB: Illegal link number %d\n", LpbReq.Link);
-                        p->RIOError.Error = LINK_NUMBER_OUT_OF_RANGE;
-                        return -EINVAL;
-                }
-                HostP = &p->RIOHosts[LpbReq.Host];
-
-                if ((HostP->Flags & RUN_STATE) != RC_RUNNING) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB: Host %d not running\n", LpbReq.Host);
-                        p->RIOError.Error = HOST_NOT_RUNNING;
-                        return -EIO;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "Request for lpb %d from host %d\n", LpbReq.Link, LpbReq.Host);
-
-                if (copy_from_io(LpbReq.LpbP, &HostP->LinkStrP[LpbReq.Link], sizeof(struct LPB))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB: Bad copy to user space\n");
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return retval;
-
-                /*
-                 ** Here 3 IOCTL's that allow us to change the way in which
-                 ** rio logs errors. send them just to syslog or send them
-                 ** to both syslog and console or send them to just the console.
-                 **
-                 ** See RioStrBuf() in util.c for the other half.
-                 */
-        case RIO_SYSLOG_ONLY:
-                p->RIOPrintLogState = PRINT_TO_LOG;     /* Just syslog */
-                return 0;
-
-        case RIO_SYSLOG_CONS:
-                p->RIOPrintLogState = PRINT_TO_LOG_CONS;        /* syslog and console */
-                return 0;
-
-        case RIO_CONS_ONLY:
-                p->RIOPrintLogState = PRINT_TO_CONS;    /* Just console */
-                return 0;
-
-        case RIO_SIGNALS_ON:
-                if (p->RIOSignalProcess) {
-                        p->RIOError.Error = SIGNALS_ALREADY_SET;
-                        return -EBUSY;
-                }
-                /* FIXME: PID tracking */
-                p->RIOSignalProcess = current->pid;
-                p->RIOPrintDisabled = DONT_PRINT;
-                return retval;
-
-        case RIO_SIGNALS_OFF:
-                if (p->RIOSignalProcess != current->pid) {
-                        p->RIOError.Error = NOT_RECEIVING_PROCESS;
-                        return -EPERM;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "Clear signal process to zero\n");
-                p->RIOSignalProcess = 0;
-                return retval;
-
-        case RIO_SET_BYTE_MODE:
-                for (Host = 0; Host < p->RIONumHosts; Host++)
-                        if (p->RIOHosts[Host].Type == RIO_AT)
-                                p->RIOHosts[Host].Mode &= ~WORD_OPERATION;
-                return retval;
-
-        case RIO_SET_WORD_MODE:
-                for (Host = 0; Host < p->RIONumHosts; Host++)
-                        if (p->RIOHosts[Host].Type == RIO_AT)
-                                p->RIOHosts[Host].Mode |= WORD_OPERATION;
-                return retval;
-
-        case RIO_SET_FAST_BUS:
-                for (Host = 0; Host < p->RIONumHosts; Host++)
-                        if (p->RIOHosts[Host].Type == RIO_AT)
-                                p->RIOHosts[Host].Mode |= FAST_AT_BUS;
-                return retval;
-
-        case RIO_SET_SLOW_BUS:
-                for (Host = 0; Host < p->RIONumHosts; Host++)
-                        if (p->RIOHosts[Host].Type == RIO_AT)
-                                p->RIOHosts[Host].Mode &= ~FAST_AT_BUS;
-                return retval;
-
-        case RIO_MAP_B50_TO_50:
-        case RIO_MAP_B50_TO_57600:
-        case RIO_MAP_B110_TO_110:
-        case RIO_MAP_B110_TO_115200:
-                rio_dprintk(RIO_DEBUG_CTRL, "Baud rate mapping\n");
-                port = arg;
-                if (port < 0 || port > 511) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "Baud rate mapping: Bad port number %d\n", port);
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -EINVAL;
-                }
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                switch (cmd) {
-                case RIO_MAP_B50_TO_50:
-                        p->RIOPortp[port]->Config |= RIO_MAP_50_TO_50;
-                        break;
-                case RIO_MAP_B50_TO_57600:
-                        p->RIOPortp[port]->Config &= ~RIO_MAP_50_TO_50;
-                        break;
-                case RIO_MAP_B110_TO_110:
-                        p->RIOPortp[port]->Config |= RIO_MAP_110_TO_110;
-                        break;
-                case RIO_MAP_B110_TO_115200:
-                        p->RIOPortp[port]->Config &= ~RIO_MAP_110_TO_110;
-                        break;
-                }
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                return retval;
-
-        case RIO_STREAM_INFO:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_STREAM_INFO\n");
-                return -EINVAL;
-
-        case RIO_SEND_PACKET:
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_SEND_PACKET\n");
-                if (copy_from_user(&SendPack, argp, sizeof(SendPack))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_SEND_PACKET: Bad copy from user space\n");
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                if (SendPack.PortNum >= 128) {
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -ENXIO;
-                }
-
-                PortP = p->RIOPortp[SendPack.PortNum];
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-
-                if (!can_add_transmit(&PacketP, PortP)) {
-                        p->RIOError.Error = UNIT_IS_IN_USE;
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        return -ENOSPC;
-                }
-
-                for (loop = 0; loop < (ushort) (SendPack.Len & 127); loop++)
-                        writeb(SendPack.Data[loop], &PacketP->data[loop]);
-
-                writeb(SendPack.Len, &PacketP->len);
-
-                add_transmit(PortP);
-                /*
-                 ** Count characters transmitted for port statistics reporting
-                 */
-                if (PortP->statsGather)
-                        PortP->txchars += (SendPack.Len & 127);
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                return retval;
-
-        case RIO_NO_MESG:
-                if (su)
-                        p->RIONoMessage = 1;
-                return su ? 0 : -EPERM;
-
-        case RIO_MESG:
-                if (su)
-                        p->RIONoMessage = 0;
-                return su ? 0 : -EPERM;
-
-        case RIO_WHAT_MESG:
-                if (copy_to_user(argp, &p->RIONoMessage, sizeof(p->RIONoMessage))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_WHAT_MESG: Bad copy to user space\n");
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return 0;
-
-        case RIO_MEM_DUMP:
-                if (copy_from_user(&SubCmd, argp, sizeof(struct SubCmdStruct))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_MEM_DUMP host %d rup %d addr %x\n", SubCmd.Host, SubCmd.Rup, SubCmd.Addr);
-
-                if (SubCmd.Rup >= MAX_RUP + LINKS_PER_UNIT) {
-                        p->RIOError.Error = RUP_NUMBER_OUT_OF_RANGE;
-                        return -EINVAL;
-                }
-
-                if (SubCmd.Host >= p->RIONumHosts) {
-                        p->RIOError.Error = HOST_NUMBER_OUT_OF_RANGE;
-                        return -EINVAL;
-                }
-
-                port = p->RIOHosts[SubCmd.Host].UnixRups[SubCmd.Rup].BaseSysPort;
-
-                PortP = p->RIOPortp[port];
-
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-
-                if (RIOPreemptiveCmd(p, PortP, RIOC_MEMDUMP) == RIO_FAIL) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_MEM_DUMP failed\n");
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        return -EBUSY;
-                } else
-                        PortP->State |= RIO_BUSY;
-
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                if (copy_to_user(argp, p->RIOMemDump, MEMDUMP_SIZE)) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_MEM_DUMP copy failed\n");
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return 0;
-
-        case RIO_TICK:
-                if (arg >= p->RIONumHosts)
-                        return -EINVAL;
-                rio_dprintk(RIO_DEBUG_CTRL, "Set interrupt for host %ld\n", arg);
-                writeb(0xFF, &p->RIOHosts[arg].SetInt);
-                return 0;
-
-        case RIO_TOCK:
-                if (arg >= p->RIONumHosts)
-                        return -EINVAL;
-                rio_dprintk(RIO_DEBUG_CTRL, "Clear interrupt for host %ld\n", arg);
-                writeb(0xFF, &p->RIOHosts[arg].ResetInt);
-                return 0;
-
-        case RIO_READ_CHECK:
-                /* Check reads for pkts with data[0] the same */
-                p->RIOReadCheck = !p->RIOReadCheck;
-                if (copy_to_user(argp, &p->RIOReadCheck, sizeof(unsigned int))) {
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return 0;
-
-        case RIO_READ_REGISTER:
-                if (copy_from_user(&SubCmd, argp, sizeof(struct SubCmdStruct))) {
-                        p->RIOError.Error = COPYIN_FAILED;
-                        return -EFAULT;
-                }
-                rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_REGISTER host %d rup %d port %d reg %x\n", SubCmd.Host, SubCmd.Rup, SubCmd.Port, SubCmd.Addr);
-
-                if (SubCmd.Port > 511) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "Baud rate mapping: Bad port number %d\n", SubCmd.Port);
-                        p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
-                        return -EINVAL;
-                }
-
-                if (SubCmd.Rup >= MAX_RUP + LINKS_PER_UNIT) {
-                        p->RIOError.Error = RUP_NUMBER_OUT_OF_RANGE;
-                        return -EINVAL;
-                }
-
-                if (SubCmd.Host >= p->RIONumHosts) {
-                        p->RIOError.Error = HOST_NUMBER_OUT_OF_RANGE;
-                        return -EINVAL;
-                }
-
-                port = p->RIOHosts[SubCmd.Host].UnixRups[SubCmd.Rup].BaseSysPort + SubCmd.Port;
-                PortP = p->RIOPortp[port];
-
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-
-                if (RIOPreemptiveCmd(p, PortP, RIOC_READ_REGISTER) ==
-                                RIO_FAIL) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_REGISTER failed\n");
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        return -EBUSY;
-                } else
-                        PortP->State |= RIO_BUSY;
-
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                if (copy_to_user(argp, &p->CdRegister, sizeof(unsigned int))) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_REGISTER copy failed\n");
-                        p->RIOError.Error = COPYOUT_FAILED;
-                        return -EFAULT;
-                }
-                return 0;
-                /*
-                 ** rio_make_dev: given port number (0-511) ORed with port type
-                 ** (RIO_DEV_DIRECT, RIO_DEV_MODEM, RIO_DEV_XPRINT) return dev_t
-                 ** value to pass to mknod to create the correct device node.
-                 */
-        case RIO_MAKE_DEV:
-                {
-                        unsigned int port = arg & RIO_MODEM_MASK;
-                        unsigned int ret;
-
-                        switch (arg & RIO_DEV_MASK) {
-                        case RIO_DEV_DIRECT:
-                                ret = drv_makedev(MAJOR(dev), port);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Makedev direct 0x%x is 0x%x\n", port, ret);
-                                return ret;
-                        case RIO_DEV_MODEM:
-                                ret = drv_makedev(MAJOR(dev), (port | RIO_MODEM_BIT));
-                                rio_dprintk(RIO_DEBUG_CTRL, "Makedev modem 0x%x is 0x%x\n", port, ret);
-                                return ret;
-                        case RIO_DEV_XPRINT:
-                                ret = drv_makedev(MAJOR(dev), port);
-                                rio_dprintk(RIO_DEBUG_CTRL, "Makedev printer 0x%x is 0x%x\n", port, ret);
-                                return ret;
-                        }
-                        rio_dprintk(RIO_DEBUG_CTRL, "MAKE Device is called\n");
-                        return -EINVAL;
-                }
-                /*
-                 ** rio_minor: given a dev_t from a stat() call, return
-                 ** the port number (0-511) ORed with the port type
-                 ** ( RIO_DEV_DIRECT, RIO_DEV_MODEM, RIO_DEV_XPRINT )
-                 */
-        case RIO_MINOR:
-                {
-                        dev_t dv;
-                        int mino;
-                        unsigned long ret;
-
-                        dv = (dev_t) (arg);
-                        mino = RIO_UNMODEM(dv);
-
-                        if (RIO_ISMODEM(dv)) {
-                                rio_dprintk(RIO_DEBUG_CTRL, "Minor for device 0x%x: modem %d\n", dv, mino);
-                                ret = mino | RIO_DEV_MODEM;
-                        } else {
-                                rio_dprintk(RIO_DEBUG_CTRL, "Minor for device 0x%x: direct %d\n", dv, mino);
-                                ret = mino | RIO_DEV_DIRECT;
-                        }
-                        return ret;
-                }
-        }
-        rio_dprintk(RIO_DEBUG_CTRL, "INVALID DAEMON IOCTL 0x%x\n", cmd);
-        p->RIOError.Error = IOCTL_COMMAND_UNKNOWN;
-
-        func_exit();
-        return -EINVAL;
-}
-
-/*
-** Pre-emptive commands go on RUPs and are only one byte long.
-*/
-int RIOPreemptiveCmd(struct rio_info *p, struct Port *PortP, u8 Cmd)
-{
-        struct CmdBlk *CmdBlkP;
-        struct PktCmd_M *PktCmdP;
-        int Ret;
-        ushort rup;
-        int port;
-
-        if (PortP->State & RIO_DELETED) {
-                rio_dprintk(RIO_DEBUG_CTRL, "Preemptive command to deleted RTA ignored\n");
-                return RIO_FAIL;
-        }
-
-        if ((PortP->InUse == (typeof(PortP->InUse))-1) ||
-                        !(CmdBlkP = RIOGetCmdBlk())) {
-                rio_dprintk(RIO_DEBUG_CTRL, "Cannot allocate command block "
-                        "for command %d on port %d\n", Cmd, PortP->PortNum);
-                return RIO_FAIL;
-        }
-
-        rio_dprintk(RIO_DEBUG_CTRL, "Command blk %p - InUse now %d\n",
-                        CmdBlkP, PortP->InUse);
-
-        PktCmdP = (struct PktCmd_M *)&CmdBlkP->Packet.data[0];
-
-        CmdBlkP->Packet.src_unit = 0;
-        if (PortP->SecondBlock)
-                rup = PortP->ID2;
-        else
-                rup = PortP->RupNum;
-        CmdBlkP->Packet.dest_unit = rup;
-        CmdBlkP->Packet.src_port = COMMAND_RUP;
-        CmdBlkP->Packet.dest_port = COMMAND_RUP;
-        CmdBlkP->Packet.len = PKT_CMD_BIT | 2;
-        CmdBlkP->PostFuncP = RIOUnUse;
-        CmdBlkP->PostArg = (unsigned long) PortP;
-        PktCmdP->Command = Cmd;
-        port = PortP->HostPort % (ushort) PORTS_PER_RTA;
-        /*
-         ** Index ports 8-15 for 2nd block of 16 port RTA.
-         */
-        if (PortP->SecondBlock)
-                port += (ushort) PORTS_PER_RTA;
-        PktCmdP->PhbNum = port;
-
-        switch (Cmd) {
-        case RIOC_MEMDUMP:
-                rio_dprintk(RIO_DEBUG_CTRL, "Queue MEMDUMP command blk %p "
-                                "(addr 0x%x)\n", CmdBlkP, (int) SubCmd.Addr);
-                PktCmdP->SubCommand = RIOC_MEMDUMP;
-                PktCmdP->SubAddr = SubCmd.Addr;
-                break;
-        case RIOC_FCLOSE:
-                rio_dprintk(RIO_DEBUG_CTRL, "Queue FCLOSE command blk %p\n",
-                                CmdBlkP);
-                break;
-        case RIOC_READ_REGISTER:
-                rio_dprintk(RIO_DEBUG_CTRL, "Queue READ_REGISTER (0x%x) "
-                                "command blk %p\n", (int) SubCmd.Addr, CmdBlkP);
-                PktCmdP->SubCommand = RIOC_READ_REGISTER;
-                PktCmdP->SubAddr = SubCmd.Addr;
-                break;
-        case RIOC_RESUME:
-                rio_dprintk(RIO_DEBUG_CTRL, "Queue RESUME command blk %p\n",
-                                CmdBlkP);
-                break;
-        case RIOC_RFLUSH:
-                rio_dprintk(RIO_DEBUG_CTRL, "Queue RFLUSH command blk %p\n",
-                                CmdBlkP);
-                CmdBlkP->PostFuncP = RIORFlushEnable;
-                break;
-        case RIOC_SUSPEND:
-                rio_dprintk(RIO_DEBUG_CTRL, "Queue SUSPEND command blk %p\n",
-                                CmdBlkP);
-                break;
-
-        case RIOC_MGET:
-                rio_dprintk(RIO_DEBUG_CTRL, "Queue MGET command blk %p\n",
-                                CmdBlkP);
-                break;
-
-        case RIOC_MSET:
-        case RIOC_MBIC:
-        case RIOC_MBIS:
-                CmdBlkP->Packet.data[4] = (char) PortP->ModemLines;
-                rio_dprintk(RIO_DEBUG_CTRL, "Queue MSET/MBIC/MBIS command "
-                                "blk %p\n", CmdBlkP);
-                break;
-
-        case RIOC_WFLUSH:
-                /*
-                 ** If we have queued up the maximum number of Write flushes
-                 ** allowed then we should not bother sending any more to the
-                 ** RTA.
-                 */
-                if (PortP->WflushFlag == (typeof(PortP->WflushFlag))-1) {
-                        rio_dprintk(RIO_DEBUG_CTRL, "Trashed WFLUSH, "
-                                        "WflushFlag about to wrap!");
-                        RIOFreeCmdBlk(CmdBlkP);
-                        return (RIO_FAIL);
-                } else {
-                        rio_dprintk(RIO_DEBUG_CTRL, "Queue WFLUSH command "
-                                        "blk %p\n", CmdBlkP);
-                        CmdBlkP->PostFuncP = RIOWFlushMark;
-                }
-                break;
-        }
-
-        PortP->InUse++;
-
-        Ret = RIOQueueCmdBlk(PortP->HostP, rup, CmdBlkP);
-
-        return Ret;
-}
diff --git a/drivers/char/rio/riodrvr.h b/drivers/char/rio/riodrvr.h
deleted file mode 100644
index 0907e711b355..000000000000
--- a/drivers/char/rio/riodrvr.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : riodrvr.h
-**      SID             : 1.3
-**      Last Modified   : 11/6/98 09:22:46
-**      Retrieved       : 11/6/98 09:22:46
-**
-**  ident @(#)riodrvr.h 1.3
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __riodrvr_h
-#define __riodrvr_h
-
-#include <asm/param.h>          /* for HZ */
-
-#define MEMDUMP_SIZE    32
-#define MOD_DISABLE     (RIO_NOREAD|RIO_NOWRITE|RIO_NOXPRINT)
-
-
-struct rio_info {
-        int mode;               /* Intr or polled, word/byte */
-        spinlock_t RIOIntrSem;  /* Interrupt thread sem */
-        int current_chan;       /* current channel */
-        int RIOFailed;          /* Not initialised ? */
-        int RIOInstallAttempts; /* no. of rio-install() calls */
-        int RIOLastPCISearch;   /* status of last search */
-        int RIONumHosts;        /* Number of RIO Hosts */
-        struct Host *RIOHosts;  /* RIO Host values */
-        struct Port **RIOPortp; /* RIO port values */
-/*
-** 02.03.1999 ARG - ESIL 0820 fix
-** We no longer use RIOBootMode
-**
-        int                     RIOBootMode;            * RIO boot mode *
-**
-*/
-        int RIOPrintDisabled;   /* RIO printing disabled ? */
-        int RIOPrintLogState;   /* RIO printing state ? */
-        int RIOPolling;         /* Polling ? */
-/*
-** 09.12.1998 ARG - ESIL 0776 part fix
-** The 'RIO_QUICK_CHECK' ioctl was using RIOHalted.
-** The fix for this ESIL introduces another member (RIORtaDisCons) here to be
-** updated in RIOConCon() - to keep track of RTA connections/disconnections.
-** 'RIO_QUICK_CHECK' now returns the value of RIORtaDisCons.
-*/
-        int RIOHalted;          /* halted ? */
-        int RIORtaDisCons;      /* RTA connections/disconnections */
-        unsigned int RIOReadCheck;      /* Rio read check */
-        unsigned int RIONoMessage;      /* To display message or not */
-        unsigned int RIONumBootPkts;    /* how many packets for an RTA */
-        unsigned int RIOBootCount;      /* size of RTA code */
-        unsigned int RIOBooting;        /* count of outstanding boots */
-        unsigned int RIOSystemUp;       /* Booted ?? */
-        unsigned int RIOCounting;       /* for counting interrupts */
-        unsigned int RIOIntCount;       /* # of intr since last check */
-        unsigned int RIOTxCount;        /* number of xmit intrs  */
-        unsigned int RIORxCount;        /* number of rx intrs */
-        unsigned int RIORupCount;       /* number of rup intrs */
-        int RIXTimer;
-        int RIOBufferSize;      /* Buffersize */
-        int RIOBufferMask;      /* Buffersize */
-
-        int RIOFirstMajor;      /* First host card's major no */
-
-        unsigned int RIOLastPortsMapped;        /* highest port number known */
-        unsigned int RIOFirstPortsMapped;       /* lowest port number known */
-
-        unsigned int RIOLastPortsBooted;        /* highest port number running */
-        unsigned int RIOFirstPortsBooted;       /* lowest port number running */
-
-        unsigned int RIOLastPortsOpened;        /* highest port number running */
-        unsigned int RIOFirstPortsOpened;       /* lowest port number running */
-
-        /* Flag to say that the topology information has been changed. */
-        unsigned int RIOQuickCheck;
-        unsigned int CdRegister;        /* ??? */
-        int RIOSignalProcess;   /* Signalling process */
-        int rio_debug;          /* To debug ... */
-        int RIODebugWait;       /* For what ??? */
-        int tpri;               /* Thread prio */
-        int tid;                /* Thread id */
-        unsigned int _RIO_Polled;       /* Counter for polling */
-        unsigned int _RIO_Interrupted;  /* Counter for interrupt */
-        int intr_tid;           /* iointset return value */
-        int TxEnSem;            /* TxEnable Semaphore */
-
-
-        struct Error RIOError;  /* to Identify what went wrong */
-        struct Conf RIOConf;    /* Configuration ??? */
-        struct ttystatics channel[RIO_PORTS];   /* channel information */
-        char RIOBootPackets[1 + (SIXTY_FOUR_K / RTA_BOOT_DATA_SIZE)]
-            [RTA_BOOT_DATA_SIZE];
-        struct Map RIOConnectTable[TOTAL_MAP_ENTRIES];
-        struct Map RIOSavedTable[TOTAL_MAP_ENTRIES];
-
-        /* RTA to host binding table for master/slave operation */
-        unsigned long RIOBindTab[MAX_RTA_BINDINGS];
-        /* RTA memory dump variable */
-        unsigned char RIOMemDump[MEMDUMP_SIZE];
-        struct ModuleInfo RIOModuleTypes[MAX_MODULE_TYPES];
-
-};
-
-
-#ifdef linux
-#define debug(x)        printk x
-#else
-#define debug(x)        kkprintf x
-#endif
-
-
-
-#define RIO_RESET_INT   0x7d80
-
-#endif                          /* __riodrvr.h */
diff --git a/drivers/char/rio/rioinfo.h b/drivers/char/rio/rioinfo.h
deleted file mode 100644
index 42ff1e79d96f..000000000000
--- a/drivers/char/rio/rioinfo.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : rioinfo.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 14:07:49
-**      Retrieved       : 11/6/98 14:07:50
-**
-**  ident @(#)rioinfo.h 1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rioinfo_h
-#define __rioinfo_h
-
-/*
-** Host card data structure
-*/
-struct RioHostInfo {
-        long location;          /* RIO Card Base I/O address */
-        long vector;            /* RIO Card IRQ vector */
-        int bus;                /* ISA/EISA/MCA/PCI */
-        int mode;               /* pointer to host mode - INTERRUPT / POLLED */
-        struct old_sgttyb
-        *Sg;                    /* pointer to default term characteristics */
-};
-
-
-/* Mode in rio device info */
-#define INTERRUPTED_MODE        0x01    /* Interrupt is generated */
-#define POLLED_MODE             0x02    /* No interrupt */
-#define AUTO_MODE               0x03    /* Auto mode */
-
-#define WORD_ACCESS_MODE        0x10    /* Word Access Mode */
-#define BYTE_ACCESS_MODE        0x20    /* Byte Access Mode */
-
-
-/* Bus type that RIO supports */
-#define ISA_BUS                 0x01    /* The card is ISA */
-#define EISA_BUS                0x02    /* The card is EISA */
-#define MCA_BUS                 0x04    /* The card is MCA */
-#define PCI_BUS                 0x08    /* The card is PCI */
-
-/*
-** 11.11.1998 ARG - ESIL ???? part fix
-** Moved definition for 'CHAN' here from rioinfo.c (it is now
-** called 'DEF_TERM_CHARACTERISTICS').
-*/
-
-#define DEF_TERM_CHARACTERISTICS \
-{ \
-        B19200, B19200,                         /* input and output speed */ \
-        'H' - '@',                              /* erase char */ \
-        -1,                                     /* 2nd erase char */ \
-        'U' - '@',                              /* kill char */ \
-        ECHO | CRMOD,                           /* mode */ \
-        'C' - '@',                              /* interrupt character */ \
-        '\\' - '@',                             /* quit char */ \
-        'Q' - '@',                              /* start char */ \
-        'S' - '@',                              /* stop char */ \
-        'D' - '@',                              /* EOF */ \
-        -1,                                     /* brk */ \
-        (LCRTBS | LCRTERA | LCRTKIL | LCTLECH), /* local mode word */ \
-        'Z' - '@',                              /* process stop */ \
-        'Y' - '@',                              /* delayed stop */ \
-        'R' - '@',                              /* reprint line */ \
-        'O' - '@',                              /* flush output */ \
-        'W' - '@',                              /* word erase */ \
-        'V' - '@'                               /* literal next char */ \
-}
-
-#endif                          /* __rioinfo_h */
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c
deleted file mode 100644
index 24a282bb89d4..000000000000
--- a/drivers/char/rio/rioinit.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : rioinit.c
-**      SID             : 1.3
-**      Last Modified   : 11/6/98 10:33:43
-**      Retrieved       : 11/6/98 10:33:49
-**
-**  ident @(#)rioinit.c 1.3
-**
-** -----------------------------------------------------------------------------
-*/
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/string.h>
-#include <asm/uaccess.h>
-
-#include <linux/termios.h>
-#include <linux/serial.h>
-
-#include <linux/generic_serial.h>
-
-
-#include "linux_compat.h"
-#include "pkt.h"
-#include "daemon.h"
-#include "rio.h"
-#include "riospace.h"
-#include "cmdpkt.h"
-#include "map.h"
-#include "rup.h"
-#include "port.h"
-#include "riodrvr.h"
-#include "rioinfo.h"
-#include "func.h"
-#include "errors.h"
-#include "pci.h"
-
-#include "parmmap.h"
-#include "unixrup.h"
-#include "board.h"
-#include "host.h"
-#include "phb.h"
-#include "link.h"
-#include "cmdblk.h"
-#include "route.h"
-#include "cirrus.h"
-#include "rioioctl.h"
-#include "rio_linux.h"
-
-int RIOPCIinit(struct rio_info *p, int Mode);
-
-static int RIOScrub(int, u8 __iomem *, int);
-
-
-/**
-** RIOAssignAT :
-**
-** Fill out the fields in the p->RIOHosts structure now we know we know
-** we have a board present.
-**
-** bits < 0 indicates 8 bit operation requested,
-** bits > 0 indicates 16 bit operation.
-*/
-
-int RIOAssignAT(struct rio_info *p, int Base, void __iomem *virtAddr, int mode)
-{
-        int             bits;
-        struct DpRam __iomem *cardp = (struct DpRam __iomem *)virtAddr;
-
-        if ((Base < ONE_MEG) || (mode & BYTE_ACCESS_MODE))
-                bits = BYTE_OPERATION;
-        else
-                bits = WORD_OPERATION;
-
-        /*
-        ** Board has passed its scrub test. Fill in all the
-        ** transient stuff.
-        */
-        p->RIOHosts[p->RIONumHosts].Caddr       = virtAddr;
-        p->RIOHosts[p->RIONumHosts].CardP       = virtAddr;
-
-        /*
-        ** Revision 01 AT host cards don't support WORD operations,
-        */
-        if (readb(&cardp->DpRevision) == 01)
-                bits = BYTE_OPERATION;
-
-        p->RIOHosts[p->RIONumHosts].Type = RIO_AT;
-        p->RIOHosts[p->RIONumHosts].Copy = rio_copy_to_card;
-                                                                                        /* set this later */
-        p->RIOHosts[p->RIONumHosts].Slot = -1;
-        p->RIOHosts[p->RIONumHosts].Mode = SLOW_LINKS | SLOW_AT_BUS | bits;
-        writeb(BOOT_FROM_RAM | EXTERNAL_BUS_OFF | p->RIOHosts[p->RIONumHosts].Mode | INTERRUPT_DISABLE ,
-                &p->RIOHosts[p->RIONumHosts].Control);
-        writeb(0xFF, &p->RIOHosts[p->RIONumHosts].ResetInt);
-        writeb(BOOT_FROM_RAM | EXTERNAL_BUS_OFF | p->RIOHosts[p->RIONumHosts].Mode | INTERRUPT_DISABLE,
-                &p->RIOHosts[p->RIONumHosts].Control);
-        writeb(0xFF, &p->RIOHosts[p->RIONumHosts].ResetInt);
-        p->RIOHosts[p->RIONumHosts].UniqueNum =
-                ((readb(&p->RIOHosts[p->RIONumHosts].Unique[0])&0xFF)<<0)|
-                ((readb(&p->RIOHosts[p->RIONumHosts].Unique[1])&0xFF)<<8)|
-                ((readb(&p->RIOHosts[p->RIONumHosts].Unique[2])&0xFF)<<16)|
-                ((readb(&p->RIOHosts[p->RIONumHosts].Unique[3])&0xFF)<<24);
-        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Uniquenum 0x%x\n",p->RIOHosts[p->RIONumHosts].UniqueNum);
-
-        p->RIONumHosts++;
-        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Tests Passed at 0x%x\n", Base);
-        return(1);
-}
-
-static  u8      val[] = {
-#ifdef VERY_LONG_TEST
-          0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
-          0xa5, 0xff, 0x5a, 0x00, 0xff, 0xc9, 0x36, 
-#endif
-          0xff, 0x00, 0x00 };
-
-#define TEST_END sizeof(val)
-
-/*
-** RAM test a board. 
-** Nothing too complicated, just enough to check it out.
-*/
-int RIOBoardTest(unsigned long paddr, void __iomem *caddr, unsigned char type, int slot)
-{
-        struct DpRam __iomem *DpRam = caddr;
-        void __iomem *ram[4];
-        int  size[4];
-        int  op, bank;
-        int  nbanks;
-
-        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Reset host type=%d, DpRam=%p, slot=%d\n",
-                        type, DpRam, slot);
-
-        RIOHostReset(type, DpRam, slot);
-
-        /*
-        ** Scrub the memory. This comes in several banks:
-        ** DPsram1      - 7000h bytes
-        ** DPsram2      - 200h  bytes
-        ** DPsram3      - 7000h bytes
-        ** scratch      - 1000h bytes
-        */
-
-        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Setup ram/size arrays\n");
-
-        size[0] = DP_SRAM1_SIZE;
-        size[1] = DP_SRAM2_SIZE;
-        size[2] = DP_SRAM3_SIZE;
-        size[3] = DP_SCRATCH_SIZE;
-
-        ram[0] = DpRam->DpSram1;
-        ram[1] = DpRam->DpSram2;
-        ram[2] = DpRam->DpSram3;
-        nbanks = (type == RIO_PCI) ? 3 : 4;
-        if (nbanks == 4)
-                ram[3] = DpRam->DpScratch;
-
-
-        if (nbanks == 3) {
-                rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Memory: %p(0x%x), %p(0x%x), %p(0x%x)\n",
-                                ram[0], size[0], ram[1], size[1], ram[2], size[2]);
-        } else {
-                rio_dprintk (RIO_DEBUG_INIT, "RIO-init: %p(0x%x), %p(0x%x), %p(0x%x), %p(0x%x)\n",
-                                ram[0], size[0], ram[1], size[1], ram[2], size[2], ram[3], size[3]);
-        }
-
-        /*
-        ** This scrub operation will test for crosstalk between
-        ** banks. TEST_END is a magic number, and relates to the offset
-        ** within the 'val' array used by Scrub.
-        */
-        for (op=0; op<TEST_END; op++) {
-                for (bank=0; bank<nbanks; bank++) {
-                        if (RIOScrub(op, ram[bank], size[bank]) == RIO_FAIL) {
-                                rio_dprintk (RIO_DEBUG_INIT, "RIO-init: RIOScrub band %d, op %d failed\n", 
-                                                        bank, op);
-                                return RIO_FAIL;
-                        }
-                }
-        }
-
-        rio_dprintk (RIO_DEBUG_INIT, "Test completed\n");
-        return 0;
-}
-
-
-/*
-** Scrub an area of RAM.
-** Define PRETEST and POSTTEST for a more thorough checking of the
-** state of the memory.
-** Call with op set to an index into the above 'val' array to determine
-** which value will be written into memory.
-** Call with op set to zero means that the RAM will not be read and checked
-** before it is written.
-** Call with op not zero and the RAM will be read and compared with val[op-1]
-** to check that the data from the previous phase was retained.
-*/
-
-static int RIOScrub(int op, u8 __iomem *ram, int size)
-{
-        int off;
-        unsigned char   oldbyte;
-        unsigned char   newbyte;
-        unsigned char   invbyte;
-        unsigned short  oldword;
-        unsigned short  newword;
-        unsigned short  invword;
-        unsigned short  swapword;
-
-        if (op) {
-                oldbyte = val[op-1];
-                oldword = oldbyte | (oldbyte<<8);
-        } else
-          oldbyte = oldword = 0; /* Tell the compiler we've initilalized them. */
-        newbyte = val[op];
-        newword = newbyte | (newbyte<<8);
-        invbyte = ~newbyte;
-        invword = invbyte | (invbyte<<8);
-
-        /*
-        ** Check that the RAM contains the value that should have been left there
-        ** by the previous test (not applicable for pass zero)
-        */
-        if (op) {
-                for (off=0; off<size; off++) {
-                        if (readb(ram + off) != oldbyte) {
-                                rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Byte Pre Check 1: BYTE at offset 0x%x should have been=%x, was=%x\n", off, oldbyte, readb(ram + off));
-                                return RIO_FAIL;
-                        }
-                }
-                for (off=0; off<size; off+=2) {
-                        if (readw(ram + off) != oldword) {
-                                rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Word Pre Check: WORD at offset 0x%x should have been=%x, was=%x\n",off,oldword, readw(ram + off));
-                                rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Word Pre Check: BYTE at offset 0x%x is %x BYTE at offset 0x%x is %x\n", off, readb(ram + off), off+1, readb(ram+off+1));
-                                return RIO_FAIL;
-                        }
-                }
-        }
-
-        /*
-        ** Now write the INVERSE of the test data into every location, using
-        ** BYTE write operations, first checking before each byte is written
-        ** that the location contains the old value still, and checking after
-        ** the write that the location contains the data specified - this is
-        ** the BYTE read/write test.
-        */
-        for (off=0; off<size; off++) {
-                if (op && (readb(ram + off) != oldbyte)) {
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Byte Pre Check 2: BYTE at offset 0x%x should have been=%x, was=%x\n", off, oldbyte, readb(ram + off));
-                        return RIO_FAIL;
-                }
-                writeb(invbyte, ram + off);
-                if (readb(ram + off) != invbyte) {
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Byte Inv Check: BYTE at offset 0x%x should have been=%x, was=%x\n", off, invbyte, readb(ram + off));
-                        return RIO_FAIL;
-                }
-        }
-
-        /*
-        ** now, use WORD operations to write the test value into every location,
-        ** check as before that the location contains the previous test value
-        ** before overwriting, and that it contains the data value written
-        ** afterwards.
-        ** This is the WORD operation test.
-        */
-        for (off=0; off<size; off+=2) {
-                if (readw(ram + off) != invword) {
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Word Inv Check: WORD at offset 0x%x should have been=%x, was=%x\n", off, invword, readw(ram + off));
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Word Inv Check: BYTE at offset 0x%x is %x BYTE at offset 0x%x is %x\n", off, readb(ram + off), off+1, readb(ram+off+1));
-                        return RIO_FAIL;
-                }
-
-                writew(newword, ram + off);
-                if ( readw(ram + off) != newword ) {
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Post Word Check 1: WORD at offset 0x%x should have been=%x, was=%x\n", off, newword, readw(ram + off));
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Post Word Check 1: BYTE at offset 0x%x is %x BYTE at offset 0x%x is %x\n", off, readb(ram + off), off+1, readb(ram + off + 1));
-                        return RIO_FAIL;
-                }
-        }
-
-        /*
-        ** now run through the block of memory again, first in byte mode
-        ** then in word mode, and check that all the locations contain the
-        ** required test data.
-        */
-        for (off=0; off<size; off++) {
-                if (readb(ram + off) != newbyte) {
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Post Byte Check: BYTE at offset 0x%x should have been=%x, was=%x\n", off, newbyte, readb(ram + off));
-                        return RIO_FAIL;
-                }
-        }
-
-        for (off=0; off<size; off+=2) {
-                if (readw(ram + off) != newword ) {
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Post Word Check 2: WORD at offset 0x%x should have been=%x, was=%x\n", off, newword, readw(ram + off));
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: Post Word Check 2: BYTE at offset 0x%x is %x BYTE at offset 0x%x is %x\n", off, readb(ram + off), off+1, readb(ram + off + 1));
-                        return RIO_FAIL;
-                }
-        }
-
-        /*
-        ** time to check out byte swapping errors
-        */
-        swapword = invbyte | (newbyte << 8);
-
-        for (off=0; off<size; off+=2) {
-                writeb(invbyte, &ram[off]);
-                writeb(newbyte, &ram[off+1]);
-        }
-
-        for ( off=0; off<size; off+=2 ) {
-                if (readw(ram + off) != swapword) {
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: SwapWord Check 1: WORD at offset 0x%x should have been=%x, was=%x\n", off, swapword, readw(ram + off));
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: SwapWord Check 1: BYTE at offset 0x%x is %x BYTE at offset 0x%x is %x\n", off, readb(ram + off), off+1, readb(ram + off + 1));
-                        return RIO_FAIL;
-                }
-                writew(~swapword, ram + off);
-        }
-
-        for (off=0; off<size; off+=2) {
-                if (readb(ram + off) != newbyte) {
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: SwapWord Check 2: BYTE at offset 0x%x should have been=%x, was=%x\n", off, newbyte, readb(ram + off));
-                        return RIO_FAIL;
-                }
-                if (readb(ram + off + 1) != invbyte) {
-                        rio_dprintk (RIO_DEBUG_INIT, "RIO-init: SwapWord Check 2: BYTE at offset 0x%x should have been=%x, was=%x\n", off+1, invbyte, readb(ram + off + 1));
-                        return RIO_FAIL;
-                }
-                writew(newword, ram + off);
-        }
-        return 0;
-}
-
-
-int RIODefaultName(struct rio_info *p, struct Host *HostP, unsigned int UnitId)
-{
-        memcpy(HostP->Mapping[UnitId].Name, "UNKNOWN RTA X-XX", 17);
-        HostP->Mapping[UnitId].Name[12]='1'+(HostP-p->RIOHosts);
-        if ((UnitId+1) > 9) {
-                HostP->Mapping[UnitId].Name[14]='0'+((UnitId+1)/10);
-                HostP->Mapping[UnitId].Name[15]='0'+((UnitId+1)%10);
-        }
-        else {
-                HostP->Mapping[UnitId].Name[14]='1'+UnitId;
-                HostP->Mapping[UnitId].Name[15]=0;
-        }
-        return 0;
-}
-
-#define RIO_RELEASE     "Linux"
-#define RELEASE_ID      "1.0"
-
-static struct rioVersion        stVersion;
-
-struct rioVersion *RIOVersid(void)
-{
-    strlcpy(stVersion.version, "RIO driver for linux V1.0",
-            sizeof(stVersion.version));
-    strlcpy(stVersion.buildDate, __DATE__,
-            sizeof(stVersion.buildDate));
-
-    return &stVersion;
-}
-
-void RIOHostReset(unsigned int Type, struct DpRam __iomem *DpRamP, unsigned int Slot)
-{
-        /*
-        ** Reset the Tpu
-        */
-        rio_dprintk (RIO_DEBUG_INIT,  "RIOHostReset: type 0x%x", Type);
-        switch ( Type ) {
-        case RIO_AT:
-                rio_dprintk (RIO_DEBUG_INIT, " (RIO_AT)\n");
-                writeb(BOOT_FROM_RAM | EXTERNAL_BUS_OFF | INTERRUPT_DISABLE | BYTE_OPERATION |
-                        SLOW_LINKS | SLOW_AT_BUS, &DpRamP->DpControl);
-                writeb(0xFF, &DpRamP->DpResetTpu);
-                udelay(3);
-                        rio_dprintk (RIO_DEBUG_INIT,  "RIOHostReset: Don't know if it worked. Try reset again\n");
-                writeb(BOOT_FROM_RAM | EXTERNAL_BUS_OFF | INTERRUPT_DISABLE |
-                        BYTE_OPERATION | SLOW_LINKS | SLOW_AT_BUS, &DpRamP->DpControl);
-                writeb(0xFF, &DpRamP->DpResetTpu);
-                udelay(3);
-                break;
-        case RIO_PCI:
-                rio_dprintk (RIO_DEBUG_INIT, " (RIO_PCI)\n");
-                writeb(RIO_PCI_BOOT_FROM_RAM, &DpRamP->DpControl);
-                writeb(0xFF, &DpRamP->DpResetInt);
-                writeb(0xFF, &DpRamP->DpResetTpu);
-                udelay(100);
-                break;
-        default:
-                rio_dprintk (RIO_DEBUG_INIT, " (UNKNOWN)\n");
-                break;
-        }
-        return;
-}
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c
deleted file mode 100644
index 2e71aecae206..000000000000
--- a/drivers/char/rio/riointr.c
+++ /dev/null
@@ -1,645 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : riointr.c
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 10:33:44
-**      Retrieved       : 11/6/98 10:33:49
-**
-**  ident @(#)riointr.c 1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/string.h>
-#include <asm/uaccess.h>
-
-#include <linux/termios.h>
-#include <linux/serial.h>
-
-#include <linux/generic_serial.h>
-
-#include <linux/delay.h>
-
-#include "linux_compat.h"
-#include "rio_linux.h"
-#include "pkt.h"
-#include "daemon.h"
-#include "rio.h"
-#include "riospace.h"
-#include "cmdpkt.h"
-#include "map.h"
-#include "rup.h"
-#include "port.h"
-#include "riodrvr.h"
-#include "rioinfo.h"
-#include "func.h"
-#include "errors.h"
-#include "pci.h"
-
-#include "parmmap.h"
-#include "unixrup.h"
-#include "board.h"
-#include "host.h"
-#include "phb.h"
-#include "link.h"
-#include "cmdblk.h"
-#include "route.h"
-#include "cirrus.h"
-#include "rioioctl.h"
-
-
-static void RIOReceive(struct rio_info *, struct Port *);
-
-
-static char *firstchars(char *p, int nch)
-{
-        static char buf[2][128];
-        static int t = 0;
-        t = !t;
-        memcpy(buf[t], p, nch);
-        buf[t][nch] = 0;
-        return buf[t];
-}
-
-
-#define INCR( P, I )    ((P) = (((P)+(I)) & p->RIOBufferMask))
-/* Enable and start the transmission of packets */
-void RIOTxEnable(char *en)
-{
-        struct Port *PortP;
-        struct rio_info *p;
-        struct tty_struct *tty;
-        int c;
-        struct PKT __iomem *PacketP;
-        unsigned long flags;
-
-        PortP = (struct Port *) en;
-        p = (struct rio_info *) PortP->p;
-        tty = PortP->gs.port.tty;
-
-
-        rio_dprintk(RIO_DEBUG_INTR, "tx port %d: %d chars queued.\n", PortP->PortNum, PortP->gs.xmit_cnt);
-
-        if (!PortP->gs.xmit_cnt)
-                return;
-
-
-        /* This routine is an order of magnitude simpler than the specialix
-           version. One of the disadvantages is that this version will send
-           an incomplete packet (usually 64 bytes instead of 72) once for
-           every 4k worth of data. Let's just say that this won't influence
-           performance significantly..... */
-
-        rio_spin_lock_irqsave(&PortP->portSem, flags);
-
-        while (can_add_transmit(&PacketP, PortP)) {
-                c = PortP->gs.xmit_cnt;
-                if (c > PKT_MAX_DATA_LEN)
-                        c = PKT_MAX_DATA_LEN;
-
-                /* Don't copy past the end of the source buffer */
-                if (c > SERIAL_XMIT_SIZE - PortP->gs.xmit_tail)
-                        c = SERIAL_XMIT_SIZE - PortP->gs.xmit_tail;
-
-                {
-                        int t;
-                        t = (c > 10) ? 10 : c;
-
-                        rio_dprintk(RIO_DEBUG_INTR, "rio: tx port %d: copying %d chars: %s - %s\n", PortP->PortNum, c, firstchars(PortP->gs.xmit_buf + PortP->gs.xmit_tail, t), firstchars(PortP->gs.xmit_buf + PortP->gs.xmit_tail + c - t, t));
-                }
-                /* If for one reason or another, we can't copy more data,
-                   we're done! */
-                if (c == 0)
-                        break;
-
-                rio_memcpy_toio(PortP->HostP->Caddr, PacketP->data, PortP->gs.xmit_buf + PortP->gs.xmit_tail, c);
-                /*    udelay (1); */
-
-                writeb(c, &(PacketP->len));
-                if (!(PortP->State & RIO_DELETED)) {
-                        add_transmit(PortP);
-                        /*
-                         ** Count chars tx'd for port statistics reporting
-                         */
-                        if (PortP->statsGather)
-                                PortP->txchars += c;
-                }
-                PortP->gs.xmit_tail = (PortP->gs.xmit_tail + c) & (SERIAL_XMIT_SIZE - 1);
-                PortP->gs.xmit_cnt -= c;
-        }
-
-        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-
-        if (PortP->gs.xmit_cnt <= (PortP->gs.wakeup_chars + 2 * PKT_MAX_DATA_LEN))
-                tty_wakeup(PortP->gs.port.tty);
-
-}
-
-
-/*
-** RIO Host Service routine. Does all the work traditionally associated with an
-** interrupt.
-*/
-static int RupIntr;
-static int RxIntr;
-static int TxIntr;
-
-void RIOServiceHost(struct rio_info *p, struct Host *HostP)
-{
-        rio_spin_lock(&HostP->HostLock);
-        if ((HostP->Flags & RUN_STATE) != RC_RUNNING) {
-                static int t = 0;
-                rio_spin_unlock(&HostP->HostLock);
-                if ((t++ % 200) == 0)
-                        rio_dprintk(RIO_DEBUG_INTR, "Interrupt but host not running. flags=%x.\n", (int) HostP->Flags);
-                return;
-        }
-        rio_spin_unlock(&HostP->HostLock);
-
-        if (readw(&HostP->ParmMapP->rup_intr)) {
-                writew(0, &HostP->ParmMapP->rup_intr);
-                p->RIORupCount++;
-                RupIntr++;
-                rio_dprintk(RIO_DEBUG_INTR, "rio: RUP interrupt on host %Zd\n", HostP - p->RIOHosts);
-                RIOPollHostCommands(p, HostP);
-        }
-
-        if (readw(&HostP->ParmMapP->rx_intr)) {
-                int port;
-
-                writew(0, &HostP->ParmMapP->rx_intr);
-                p->RIORxCount++;
-                RxIntr++;
-
-                rio_dprintk(RIO_DEBUG_INTR, "rio: RX interrupt on host %Zd\n", HostP - p->RIOHosts);
-                /*
-                 ** Loop through every port. If the port is mapped into
-                 ** the system ( i.e. has /dev/ttyXXXX associated ) then it is
-                 ** worth checking. If the port isn't open, grab any packets
-                 ** hanging on its receive queue and stuff them on the free
-                 ** list; check for commands on the way.
-                 */
-                for (port = p->RIOFirstPortsBooted; port < p->RIOLastPortsBooted + PORTS_PER_RTA; port++) {
-                        struct Port *PortP = p->RIOPortp[port];
-                        struct tty_struct *ttyP;
-                        struct PKT __iomem *PacketP;
-
-                        /*
-                         ** not mapped in - most of the RIOPortp[] information
-                         ** has not been set up!
-                         ** Optimise: ports come in bundles of eight.
-                         */
-                        if (!PortP->Mapped) {
-                                port += 7;
-                                continue;       /* with the next port */
-                        }
-
-                        /*
-                         ** If the host board isn't THIS host board, check the next one.
-                         ** optimise: ports come in bundles of eight.
-                         */
-                        if (PortP->HostP != HostP) {
-                                port += 7;
-                                continue;
-                        }
-
-                        /*
-                         ** Let us see - is the port open? If not, then don't service it.
-                         */
-                        if (!(PortP->PortState & PORT_ISOPEN)) {
-                                continue;
-                        }
-
-                        /*
-                         ** find corresponding tty structure. The process of mapping
-                         ** the ports puts these here.
-                         */
-                        ttyP = PortP->gs.port.tty;
-
-                        /*
-                         ** Lock the port before we begin working on it.
-                         */
-                        rio_spin_lock(&PortP->portSem);
-
-                        /*
-                         ** Process received data if there is any.
-                         */
-                        if (can_remove_receive(&PacketP, PortP))
-                                RIOReceive(p, PortP);
-
-                        /*
-                         ** If there is no data left to be read from the port, and
-                         ** it's handshake bit is set, then we must clear the handshake,
-                         ** so that that downstream RTA is re-enabled.
-                         */
-                        if (!can_remove_receive(&PacketP, PortP) && (readw(&PortP->PhbP->handshake) == PHB_HANDSHAKE_SET)) {
-                                /*
-                                 ** MAGIC! ( Basically, handshake the RX buffer, so that
-                                 ** the RTAs upstream can be re-enabled. )
-                                 */
-                                rio_dprintk(RIO_DEBUG_INTR, "Set RX handshake bit\n");
-                                writew(PHB_HANDSHAKE_SET | PHB_HANDSHAKE_RESET, &PortP->PhbP->handshake);
-                        }
-                        rio_spin_unlock(&PortP->portSem);
-                }
-        }
-
-        if (readw(&HostP->ParmMapP->tx_intr)) {
-                int port;
-
-                writew(0, &HostP->ParmMapP->tx_intr);
-
-                p->RIOTxCount++;
-                TxIntr++;
-                rio_dprintk(RIO_DEBUG_INTR, "rio: TX interrupt on host %Zd\n", HostP - p->RIOHosts);
-
-                /*
-                 ** Loop through every port.
-                 ** If the port is mapped into the system ( i.e. has /dev/ttyXXXX
-                 ** associated ) then it is worth checking.
-                 */
-                for (port = p->RIOFirstPortsBooted; port < p->RIOLastPortsBooted + PORTS_PER_RTA; port++) {
-                        struct Port *PortP = p->RIOPortp[port];
-                        struct tty_struct *ttyP;
-                        struct PKT __iomem *PacketP;
-
-                        /*
-                         ** not mapped in - most of the RIOPortp[] information
-                         ** has not been set up!
-                         */
-                        if (!PortP->Mapped) {
-                                port += 7;
-                                continue;       /* with the next port */
-                        }
-
-                        /*
-                         ** If the host board isn't running, then its data structures
-                         ** are no use to us - continue quietly.
-                         */
-                        if (PortP->HostP != HostP) {
-                                port += 7;
-                                continue;       /* with the next port */
-                        }
-
-                        /*
-                         ** Let us see - is the port open? If not, then don't service it.
-                         */
-                        if (!(PortP->PortState & PORT_ISOPEN)) {
-                                continue;
-                        }
-
-                        rio_dprintk(RIO_DEBUG_INTR, "rio: Looking into port %d.\n", port);
-                        /*
-                         ** Lock the port before we begin working on it.
-                         */
-                        rio_spin_lock(&PortP->portSem);
-
-                        /*
-                         ** If we can't add anything to the transmit queue, then
-                         ** we need do none of this processing.
-                         */
-                        if (!can_add_transmit(&PacketP, PortP)) {
-                                rio_dprintk(RIO_DEBUG_INTR, "Can't add to port, so skipping.\n");
-                                rio_spin_unlock(&PortP->portSem);
-                                continue;
-                        }
-
-                        /*
-                         ** find corresponding tty structure. The process of mapping
-                         ** the ports puts these here.
-                         */
-                        ttyP = PortP->gs.port.tty;
-                        /* If ttyP is NULL, the port is getting closed. Forget about it. */
-                        if (!ttyP) {
-                                rio_dprintk(RIO_DEBUG_INTR, "no tty, so skipping.\n");
-                                rio_spin_unlock(&PortP->portSem);
-                                continue;
-                        }
-                        /*
-                         ** If there is more room available we start up the transmit
-                         ** data process again. This can be direct I/O, if the cookmode
-                         ** is set to COOK_RAW or COOK_MEDIUM, or will be a call to the
-                         ** riotproc( T_OUTPUT ) if we are in COOK_WELL mode, to fetch
-                         ** characters via the line discipline. We must always call
-                         ** the line discipline,
-                         ** so that user input characters can be echoed correctly.
-                         **
-                         ** ++++ Update +++++
-                         ** With the advent of double buffering, we now see if
-                         ** TxBufferOut-In is non-zero. If so, then we copy a packet
-                         ** to the output place, and set it going. If this empties
-                         ** the buffer, then we must issue a wakeup( ) on OUT.
-                         ** If it frees space in the buffer then we must issue
-                         ** a wakeup( ) on IN.
-                         **
-                         ** ++++ Extra! Extra! If PortP->WflushFlag is set, then we
-                         ** have to send a WFLUSH command down the PHB, to mark the
-                         ** end point of a WFLUSH. We also need to clear out any
-                         ** data from the double buffer! ( note that WflushFlag is a
-                         ** *count* of the number of WFLUSH commands outstanding! )
-                         **
-                         ** ++++ And there's more!
-                         ** If an RTA is powered off, then on again, and rebooted,
-                         ** whilst it has ports open, then we need to re-open the ports.
-                         ** ( reasonable enough ). We can't do this when we spot the
-                         ** re-boot, in interrupt time, because the queue is probably
-                         ** full. So, when we come in here, we need to test if any
-                         ** ports are in this condition, and re-open the port before
-                         ** we try to send any more data to it. Now, the re-booted
-                         ** RTA will be discarding packets from the PHB until it
-                         ** receives this open packet, but don't worry tooo much
-                         ** about that. The one thing that is interesting is the
-                         ** combination of this effect and the WFLUSH effect!
-                         */
-                        /* For now don't handle RTA reboots. -- REW.
-                           Reenabled. Otherwise RTA reboots didn't work. Duh. -- REW */
-                        if (PortP->MagicFlags) {
-                                if (PortP->MagicFlags & MAGIC_REBOOT) {
-                                        /*
-                                         ** well, the RTA has been rebooted, and there is room
-                                         ** on its queue to add the open packet that is required.
-                                         **
-                                         ** The messy part of this line is trying to decide if
-                                         ** we need to call the Param function as a tty or as
-                                         ** a modem.
-                                         ** DONT USE CLOCAL AS A TEST FOR THIS!
-                                         **
-                                         ** If we can't param the port, then move on to the
-                                         ** next port.
-                                         */
-                                        PortP->InUse = NOT_INUSE;
-
-                                        rio_spin_unlock(&PortP->portSem);
-                                        if (RIOParam(PortP, RIOC_OPEN, ((PortP->Cor2Copy & (RIOC_COR2_RTSFLOW | RIOC_COR2_CTSFLOW)) == (RIOC_COR2_RTSFLOW | RIOC_COR2_CTSFLOW)) ? 1 : 0, DONT_SLEEP) == RIO_FAIL)
-                                                continue;       /* with next port */
-                                        rio_spin_lock(&PortP->portSem);
-                                        PortP->MagicFlags &= ~MAGIC_REBOOT;
-                                }
-
-                                /*
-                                 ** As mentioned above, this is a tacky hack to cope
-                                 ** with WFLUSH
-                                 */
-                                if (PortP->WflushFlag) {
-                                        rio_dprintk(RIO_DEBUG_INTR, "Want to WFLUSH mark this port\n");
-
-                                        if (PortP->InUse)
-                                                rio_dprintk(RIO_DEBUG_INTR, "FAILS - PORT IS IN USE\n");
-                                }
-
-                                while (PortP->WflushFlag && can_add_transmit(&PacketP, PortP) && (PortP->InUse == NOT_INUSE)) {
-                                        int p;
-                                        struct PktCmd __iomem *PktCmdP;
-
-                                        rio_dprintk(RIO_DEBUG_INTR, "Add WFLUSH marker to data queue\n");
-                                        /*
-                                         ** make it look just like a WFLUSH command
-                                         */
-                                        PktCmdP = (struct PktCmd __iomem *) &PacketP->data[0];
-
-                                        writeb(RIOC_WFLUSH, &PktCmdP->Command);
-
-                                        p = PortP->HostPort % (u16) PORTS_PER_RTA;
-
-                                        /*
-                                         ** If second block of ports for 16 port RTA, add 8
-                                         ** to index 8-15.
-                                         */
-                                        if (PortP->SecondBlock)
-                                                p += PORTS_PER_RTA;
-
-                                        writeb(p, &PktCmdP->PhbNum);
-
-                                        /*
-                                         ** to make debuggery easier
-                                         */
-                                        writeb('W', &PacketP->data[2]);
-                                        writeb('F', &PacketP->data[3]);
-                                        writeb('L', &PacketP->data[4]);
-                                        writeb('U', &PacketP->data[5]);
-                                        writeb('S', &PacketP->data[6]);
-                                        writeb('H', &PacketP->data[7]);
-                                        writeb(' ', &PacketP->data[8]);
-                                        writeb('0' + PortP->WflushFlag, &PacketP->data[9]);
-                                        writeb(' ', &PacketP->data[10]);
-                                        writeb(' ', &PacketP->data[11]);
-                                        writeb('\0', &PacketP->data[12]);
-
-                                        /*
-                                         ** its two bytes long!
-                                         */
-                                        writeb(PKT_CMD_BIT | 2, &PacketP->len);
-
-                                        /*
-                                         ** queue it!
-                                         */
-                                        if (!(PortP->State & RIO_DELETED)) {
-                                                add_transmit(PortP);
-                                                /*
-                                                 ** Count chars tx'd for port statistics reporting
-                                                 */
-                                                if (PortP->statsGather)
-                                                        PortP->txchars += 2;
-                                        }
-
-                                        if (--(PortP->WflushFlag) == 0) {
-                                                PortP->MagicFlags &= ~MAGIC_FLUSH;
-                                        }
-
-                                        rio_dprintk(RIO_DEBUG_INTR, "Wflush count now stands at %d\n", PortP->WflushFlag);
-                                }
-                                if (PortP->MagicFlags & MORE_OUTPUT_EYGOR) {
-                                        if (PortP->MagicFlags & MAGIC_FLUSH) {
-                                                PortP->MagicFlags |= MORE_OUTPUT_EYGOR;
-                                        } else {
-                                                if (!can_add_transmit(&PacketP, PortP)) {
-                                                        rio_spin_unlock(&PortP->portSem);
-                                                        continue;
-                                                }
-                                                rio_spin_unlock(&PortP->portSem);
-                                                RIOTxEnable((char *) PortP);
-                                                rio_spin_lock(&PortP->portSem);
-                                                PortP->MagicFlags &= ~MORE_OUTPUT_EYGOR;
-                                        }
-                                }
-                        }
-
-
-                        /*
-                         ** If we can't add anything to the transmit queue, then
-                         ** we need do none of the remaining processing.
-                         */
-                        if (!can_add_transmit(&PacketP, PortP)) {
-                                rio_spin_unlock(&PortP->portSem);
-                                continue;
-                        }
-
-                        rio_spin_unlock(&PortP->portSem);
-                        RIOTxEnable((char *) PortP);
-                }
-        }
-}
-
-/*
-** Routine for handling received data for tty drivers
-*/
-static void RIOReceive(struct rio_info *p, struct Port *PortP)
-{
-        struct tty_struct *TtyP;
-        unsigned short transCount;
-        struct PKT __iomem *PacketP;
-        register unsigned int DataCnt;
-        unsigned char __iomem *ptr;
-        unsigned char *buf;
-        int copied = 0;
-
-        static int intCount, RxIntCnt;
-
-        /*
-         ** The receive data process is to remove packets from the
-         ** PHB until there aren't any more or the current cblock
-         ** is full. When this occurs, there will be some left over
-         ** data in the packet, that we must do something with.
-         ** As we haven't unhooked the packet from the read list
-         ** yet, we can just leave the packet there, having first
-         ** made a note of how far we got. This means that we need
-         ** a pointer per port saying where we start taking the
-         ** data from - this will normally be zero, but when we
-         ** run out of space it will be set to the offset of the
-         ** next byte to copy from the packet data area. The packet
-         ** length field is decremented by the number of bytes that
-         ** we successfully removed from the packet. When this reaches
-         ** zero, we reset the offset pointer to be zero, and free
-         ** the packet from the front of the queue.
-         */
-
-        intCount++;
-
-        TtyP = PortP->gs.port.tty;
-        if (!TtyP) {
-                rio_dprintk(RIO_DEBUG_INTR, "RIOReceive: tty is null. \n");
-                return;
-        }
-
-        if (PortP->State & RIO_THROTTLE_RX) {
-                rio_dprintk(RIO_DEBUG_INTR, "RIOReceive: Throttled. Can't handle more input.\n");
-                return;
-        }
-
-        if (PortP->State & RIO_DELETED) {
-                while (can_remove_receive(&PacketP, PortP)) {
-                        remove_receive(PortP);
-                        put_free_end(PortP->HostP, PacketP);
-                }
-        } else {
-                /*
-                 ** loop, just so long as:
-                 **   i ) there's some data ( i.e. can_remove_receive )
-                 **  ii ) we haven't been blocked
-                 ** iii ) there's somewhere to put the data
-                 **  iv ) we haven't outstayed our welcome
-                 */
-                transCount = 1;
-                while (can_remove_receive(&PacketP, PortP)
-                       && transCount) {
-                        RxIntCnt++;
-
-                        /*
-                         ** check that it is not a command!
-                         */
-                        if (readb(&PacketP->len) & PKT_CMD_BIT) {
-                                rio_dprintk(RIO_DEBUG_INTR, "RIO: unexpected command packet received on PHB\n");
-                                /*      rio_dprint(RIO_DEBUG_INTR, (" sysport   = %d\n", p->RIOPortp->PortNum)); */
-                                rio_dprintk(RIO_DEBUG_INTR, " dest_unit = %d\n", readb(&PacketP->dest_unit));
-                                rio_dprintk(RIO_DEBUG_INTR, " dest_port = %d\n", readb(&PacketP->dest_port));
-                                rio_dprintk(RIO_DEBUG_INTR, " src_unit  = %d\n", readb(&PacketP->src_unit));
-                                rio_dprintk(RIO_DEBUG_INTR, " src_port  = %d\n", readb(&PacketP->src_port));
-                                rio_dprintk(RIO_DEBUG_INTR, " len          = %d\n", readb(&PacketP->len));
-                                rio_dprintk(RIO_DEBUG_INTR, " control   = %d\n", readb(&PacketP->control));
-                                rio_dprintk(RIO_DEBUG_INTR, " csum         = %d\n", readw(&PacketP->csum));
-                                rio_dprintk(RIO_DEBUG_INTR, "    data bytes: ");
-                                for (DataCnt = 0; DataCnt < PKT_MAX_DATA_LEN; DataCnt++)
-                                        rio_dprintk(RIO_DEBUG_INTR, "%d\n", readb(&PacketP->data[DataCnt]));
-                                remove_receive(PortP);
-                                put_free_end(PortP->HostP, PacketP);
-                                continue;       /* with next packet */
-                        }
-
-                        /*
-                         ** How many characters can we move 'upstream' ?
-                         **
-                         ** Determine the minimum of the amount of data
-                         ** available and the amount of space in which to
-                         ** put it.
-                         **
-                         ** 1.        Get the packet length by masking 'len'
-                         **   for only the length bits.
-                         ** 2.        Available space is [buffer size] - [space used]
-                         **
-                         ** Transfer count is the minimum of packet length
-                         ** and available space.
-                         */
-
-                        transCount = tty_buffer_request_room(TtyP, readb(&PacketP->len) & PKT_LEN_MASK);
-                        rio_dprintk(RIO_DEBUG_REC, "port %d: Copy %d bytes\n", PortP->PortNum, transCount);
-                        /*
-                         ** To use the following 'kkprintfs' for debugging - change the '#undef'
-                         ** to '#define', (this is the only place ___DEBUG_IT___ occurs in the
-                         ** driver).
-                         */
-                        ptr = (unsigned char __iomem *) PacketP->data + PortP->RxDataStart;
-
-                        tty_prepare_flip_string(TtyP, &buf, transCount);
-                        rio_memcpy_fromio(buf, ptr, transCount);
-                        PortP->RxDataStart += transCount;
-                        writeb(readb(&PacketP->len)-transCount, &PacketP->len);
-                        copied += transCount;
-
-
-
-                        if (readb(&PacketP->len) == 0) {
-                                /*
-                                 ** If we have emptied the packet, then we can
-                                 ** free it, and reset the start pointer for
-                                 ** the next packet.
-                                 */
-                                remove_receive(PortP);
-                                put_free_end(PortP->HostP, PacketP);
-                                PortP->RxDataStart = 0;
-                        }
-                }
-        }
-        if (copied) {
-                rio_dprintk(RIO_DEBUG_REC, "port %d: pushing tty flip buffer: %d total bytes copied.\n", PortP->PortNum, copied);
-                tty_flip_buffer_push(TtyP);
-        }
-
-        return;
-}
-
diff --git a/drivers/char/rio/rioioctl.h b/drivers/char/rio/rioioctl.h
deleted file mode 100644
index e8af5b30519e..000000000000
--- a/drivers/char/rio/rioioctl.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : rioioctl.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 11:34:13
-**      Retrieved       : 11/6/98 11:34:22
-**
-**  ident @(#)rioioctl.h        1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rioioctl_h__
-#define __rioioctl_h__
-
-/*
-** RIO device driver - user ioctls and associated structures.
-*/
-
-struct portStats {
-        int port;
-        int gather;
-        unsigned long txchars;
-        unsigned long rxchars;
-        unsigned long opens;
-        unsigned long closes;
-        unsigned long ioctls;
-};
-
-#define RIOC    ('R'<<8)|('i'<<16)|('o'<<24)
-
-#define RIO_QUICK_CHECK         (RIOC | 105)
-#define RIO_GATHER_PORT_STATS   (RIOC | 193)
-#define RIO_RESET_PORT_STATS    (RIOC | 194)
-#define RIO_GET_PORT_STATS      (RIOC | 195)
-
-#endif                          /* __rioioctl_h__ */
diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c
deleted file mode 100644
index 6415f3f32a72..000000000000
--- a/drivers/char/rio/rioparam.c
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : rioparam.c
-**      SID             : 1.3
-**      Last Modified   : 11/6/98 10:33:45
-**      Retrieved       : 11/6/98 10:33:50
-**
-**  ident @(#)rioparam.c        1.3
-**
-** -----------------------------------------------------------------------------
-*/
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/string.h>
-#include <asm/uaccess.h>
-
-#include <linux/termios.h>
-#include <linux/serial.h>
-
-#include <linux/generic_serial.h>
-
-
-#include "linux_compat.h"
-#include "rio_linux.h"
-#include "pkt.h"
-#include "daemon.h"
-#include "rio.h"
-#include "riospace.h"
-#include "cmdpkt.h"
-#include "map.h"
-#include "rup.h"
-#include "port.h"
-#include "riodrvr.h"
-#include "rioinfo.h"
-#include "func.h"
-#include "errors.h"
-#include "pci.h"
-
-#include "parmmap.h"
-#include "unixrup.h"
-#include "board.h"
-#include "host.h"
-#include "phb.h"
-#include "link.h"
-#include "cmdblk.h"
-#include "route.h"
-#include "cirrus.h"
-#include "rioioctl.h"
-#include "param.h"
-
-
-
-/*
-** The Scam, based on email from jeremyr@bugs.specialix.co.uk....
-**
-** To send a command on a particular port, you put a packet with the
-** command bit set onto the port. The command bit is in the len field,
-** and gets ORed in with the actual byte count.
-**
-** When you send a packet with the command bit set the first
-** data byte (data[0]) is interpreted as the command to execute.
-** It also governs what data structure overlay should accompany the packet.
-** Commands are defined in cirrus/cirrus.h
-**
-** If you want the command to pre-emt data already on the queue for the
-** port, set the pre-emptive bit in conjunction with the command bit.
-** It is not defined what will happen if you set the preemptive bit
-** on a packet that is NOT a command.
-**
-** Pre-emptive commands should be queued at the head of the queue using
-** add_start(), whereas normal commands and data are enqueued using
-** add_end().
-**
-** Most commands do not use the remaining bytes in the data array. The
-** exceptions are OPEN MOPEN and CONFIG. (NB. As with the SI CONFIG and
-** OPEN are currently analogous). With these three commands the following
-** 11 data bytes are all used to pass config information such as baud rate etc.
-** The fields are also defined in cirrus.h. Some contain straightforward
-** information such as the transmit XON character. Two contain the transmit and
-** receive baud rates respectively. For most baud rates there is a direct
-** mapping between the rates defined in <sys/termio.h> and the byte in the
-** packet. There are additional (non UNIX-standard) rates defined in
-** /u/dos/rio/cirrus/h/brates.h.
-**
-** The rest of the data fields contain approximations to the Cirrus registers
-** that are used to program number of bits etc. Each registers bit fields is
-** defined in cirrus.h.
-** 
-** NB. Only use those bits that are defined as being driver specific
-** or common to the RTA and the driver.
-** 
-** All commands going from RTA->Host will be dealt with by the Host code - you
-** will never see them. As with the SI there will be three fields to look out
-** for in each phb (not yet defined - needs defining a.s.a.p).
-** 
-** modem_status - current state of handshake pins.
-**
-** port_status   - current port status - equivalent to hi_stat for SI, indicates
-** if port is IDLE_OPEN, IDLE_CLOSED etc.
-**
-** break_status - bit X set if break has been received.
-** 
-** Happy hacking.
-** 
-*/
-
-/* 
-** RIOParam is used to open or configure a port. You pass it a PortP,
-** which will have a tty struct attached to it. You also pass a command,
-** either OPEN or CONFIG. The port's setup is taken from the t_ fields
-** of the tty struct inside the PortP, and the port is either opened
-** or re-configured. You must also tell RIOParam if the device is a modem
-** device or not (i.e. top bit of minor number set or clear - take special
-** care when deciding on this!).
-** RIOParam neither flushes nor waits for drain, and is NOT preemptive.
-**
-** RIOParam assumes it will be called at splrio(), and also assumes
-** that CookMode is set correctly in the port structure.
-**
-** NB. for MPX
-**      tty lock must NOT have been previously acquired.
-*/
-int RIOParam(struct Port *PortP, int cmd, int Modem, int SleepFlag)
-{
-        struct tty_struct *TtyP;
-        int retval;
-        struct phb_param __iomem *phb_param_ptr;
-        struct PKT __iomem *PacketP;
-        int res;
-        u8 Cor1 = 0, Cor2 = 0, Cor4 = 0, Cor5 = 0;
-        u8 TxXon = 0, TxXoff = 0, RxXon = 0, RxXoff = 0;
-        u8 LNext = 0, TxBaud = 0, RxBaud = 0;
-        int retries = 0xff;
-        unsigned long flags;
-
-        func_enter();
-
-        TtyP = PortP->gs.port.tty;
-
-        rio_dprintk(RIO_DEBUG_PARAM, "RIOParam: Port:%d cmd:%d Modem:%d SleepFlag:%d Mapped: %d, tty=%p\n", PortP->PortNum, cmd, Modem, SleepFlag, PortP->Mapped, TtyP);
-
-        if (!TtyP) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Can't call rioparam with null tty.\n");
-
-                func_exit();
-
-                return RIO_FAIL;
-        }
-        rio_spin_lock_irqsave(&PortP->portSem, flags);
-
-        if (cmd == RIOC_OPEN) {
-                /*
-                 ** If the port is set to store or lock the parameters, and it is
-                 ** paramed with OPEN, we want to restore the saved port termio, but
-                 ** only if StoredTermio has been saved, i.e. NOT 1st open after reboot.
-                 */
-        }
-
-        /*
-         ** wait for space
-         */
-        while (!(res = can_add_transmit(&PacketP, PortP)) || (PortP->InUse != NOT_INUSE)) {
-                if (retries-- <= 0) {
-                        break;
-                }
-                if (PortP->InUse != NOT_INUSE) {
-                        rio_dprintk(RIO_DEBUG_PARAM, "Port IN_USE for pre-emptive command\n");
-                }
-
-                if (!res) {
-                        rio_dprintk(RIO_DEBUG_PARAM, "Port has no space on transmit queue\n");
-                }
-
-                if (SleepFlag != OK_TO_SLEEP) {
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        func_exit();
-
-                        return RIO_FAIL;
-                }
-
-                rio_dprintk(RIO_DEBUG_PARAM, "wait for can_add_transmit\n");
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                retval = RIODelay(PortP, HUNDRED_MS);
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                if (retval == RIO_FAIL) {
-                        rio_dprintk(RIO_DEBUG_PARAM, "wait for can_add_transmit broken by signal\n");
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        func_exit();
-                        return -EINTR;
-                }
-                if (PortP->State & RIO_DELETED) {
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        func_exit();
-                        return 0;
-                }
-        }
-
-        if (!res) {
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                func_exit();
-
-                return RIO_FAIL;
-        }
-
-        rio_dprintk(RIO_DEBUG_PARAM, "can_add_transmit() returns %x\n", res);
-        rio_dprintk(RIO_DEBUG_PARAM, "Packet is %p\n", PacketP);
-
-        phb_param_ptr = (struct phb_param __iomem *) PacketP->data;
-
-
-        switch (TtyP->termios->c_cflag & CSIZE) {
-        case CS5:
-                {
-                        rio_dprintk(RIO_DEBUG_PARAM, "5 bit data\n");
-                        Cor1 |= RIOC_COR1_5BITS;
-                        break;
-                }
-        case CS6:
-                {
-                        rio_dprintk(RIO_DEBUG_PARAM, "6 bit data\n");
-                        Cor1 |= RIOC_COR1_6BITS;
-                        break;
-                }
-        case CS7:
-                {
-                        rio_dprintk(RIO_DEBUG_PARAM, "7 bit data\n");
-                        Cor1 |= RIOC_COR1_7BITS;
-                        break;
-                }
-        case CS8:
-                {
-                        rio_dprintk(RIO_DEBUG_PARAM, "8 bit data\n");
-                        Cor1 |= RIOC_COR1_8BITS;
-                        break;
-                }
-        }
-
-        if (TtyP->termios->c_cflag & CSTOPB) {
-                rio_dprintk(RIO_DEBUG_PARAM, "2 stop bits\n");
-                Cor1 |= RIOC_COR1_2STOP;
-        } else {
-                rio_dprintk(RIO_DEBUG_PARAM, "1 stop bit\n");
-                Cor1 |= RIOC_COR1_1STOP;
-        }
-
-        if (TtyP->termios->c_cflag & PARENB) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Enable parity\n");
-                Cor1 |= RIOC_COR1_NORMAL;
-        } else {
-                rio_dprintk(RIO_DEBUG_PARAM, "Disable parity\n");
-                Cor1 |= RIOC_COR1_NOP;
-        }
-        if (TtyP->termios->c_cflag & PARODD) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Odd parity\n");
-                Cor1 |= RIOC_COR1_ODD;
-        } else {
-                rio_dprintk(RIO_DEBUG_PARAM, "Even parity\n");
-                Cor1 |= RIOC_COR1_EVEN;
-        }
-
-        /*
-         ** COR 2
-         */
-        if (TtyP->termios->c_iflag & IXON) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Enable start/stop output control\n");
-                Cor2 |= RIOC_COR2_IXON;
-        } else {
-                if (PortP->Config & RIO_IXON) {
-                        rio_dprintk(RIO_DEBUG_PARAM, "Force enable start/stop output control\n");
-                        Cor2 |= RIOC_COR2_IXON;
-                } else
-                        rio_dprintk(RIO_DEBUG_PARAM, "IXON has been disabled.\n");
-        }
-
-        if (TtyP->termios->c_iflag & IXANY) {
-                if (PortP->Config & RIO_IXANY) {
-                        rio_dprintk(RIO_DEBUG_PARAM, "Enable any key to restart output\n");
-                        Cor2 |= RIOC_COR2_IXANY;
-                } else
-                        rio_dprintk(RIO_DEBUG_PARAM, "IXANY has been disabled due to sanity reasons.\n");
-        }
-
-        if (TtyP->termios->c_iflag & IXOFF) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Enable start/stop input control 2\n");
-                Cor2 |= RIOC_COR2_IXOFF;
-        }
-
-        if (TtyP->termios->c_cflag & HUPCL) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Hangup on last close\n");
-                Cor2 |= RIOC_COR2_HUPCL;
-        }
-
-        if (C_CRTSCTS(TtyP)) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Rx hardware flow control enabled\n");
-                Cor2 |= RIOC_COR2_CTSFLOW;
-                Cor2 |= RIOC_COR2_RTSFLOW;
-        } else {
-                rio_dprintk(RIO_DEBUG_PARAM, "Rx hardware flow control disabled\n");
-                Cor2 &= ~RIOC_COR2_CTSFLOW;
-                Cor2 &= ~RIOC_COR2_RTSFLOW;
-        }
-
-
-        if (TtyP->termios->c_cflag & CLOCAL) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Local line\n");
-        } else {
-                rio_dprintk(RIO_DEBUG_PARAM, "Possible Modem line\n");
-        }
-
-        /*
-         ** COR 4 (there is no COR 3)
-         */
-        if (TtyP->termios->c_iflag & IGNBRK) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Ignore break condition\n");
-                Cor4 |= RIOC_COR4_IGNBRK;
-        }
-        if (!(TtyP->termios->c_iflag & BRKINT)) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Break generates NULL condition\n");
-                Cor4 |= RIOC_COR4_NBRKINT;
-        } else {
-                rio_dprintk(RIO_DEBUG_PARAM, "Interrupt on      break condition\n");
-        }
-
-        if (TtyP->termios->c_iflag & INLCR) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Map newline to carriage return on input\n");
-                Cor4 |= RIOC_COR4_INLCR;
-        }
-
-        if (TtyP->termios->c_iflag & IGNCR) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Ignore carriage return on input\n");
-                Cor4 |= RIOC_COR4_IGNCR;
-        }
-
-        if (TtyP->termios->c_iflag & ICRNL) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Map carriage return to newline on input\n");
-                Cor4 |= RIOC_COR4_ICRNL;
-        }
-        if (TtyP->termios->c_iflag & IGNPAR) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Ignore characters with parity errors\n");
-                Cor4 |= RIOC_COR4_IGNPAR;
-        }
-        if (TtyP->termios->c_iflag & PARMRK) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Mark parity errors\n");
-                Cor4 |= RIOC_COR4_PARMRK;
-        }
-
-        /*
-         ** Set the RAISEMOD flag to ensure that the modem lines are raised
-         ** on reception of a config packet.
-         ** The download code handles the zero baud condition.
-         */
-        Cor4 |= RIOC_COR4_RAISEMOD;
-
-        /*
-         ** COR 5
-         */
-
-        Cor5 = RIOC_COR5_CMOE;
-
-        /*
-         ** Set to monitor tbusy/tstop (or not).
-         */
-
-        if (PortP->MonitorTstate)
-                Cor5 |= RIOC_COR5_TSTATE_ON;
-        else
-                Cor5 |= RIOC_COR5_TSTATE_OFF;
-
-        /*
-         ** Could set LNE here if you wanted LNext processing. SVR4 will use it.
-         */
-        if (TtyP->termios->c_iflag & ISTRIP) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Strip input characters\n");
-                if (!(PortP->State & RIO_TRIAD_MODE)) {
-                        Cor5 |= RIOC_COR5_ISTRIP;
-                }
-        }
-
-        if (TtyP->termios->c_oflag & ONLCR) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Map newline to carriage-return, newline on output\n");
-                if (PortP->CookMode == COOK_MEDIUM)
-                        Cor5 |= RIOC_COR5_ONLCR;
-        }
-        if (TtyP->termios->c_oflag & OCRNL) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Map carriage return to newline on output\n");
-                if (PortP->CookMode == COOK_MEDIUM)
-                        Cor5 |= RIOC_COR5_OCRNL;
-        }
-        if ((TtyP->termios->c_oflag & TABDLY) == TAB3) {
-                rio_dprintk(RIO_DEBUG_PARAM, "Tab delay 3 set\n");
-                if (PortP->CookMode == COOK_MEDIUM)
-                        Cor5 |= RIOC_COR5_TAB3;
-        }
-
-        /*
-         ** Flow control bytes.
-         */
-        TxXon = TtyP->termios->c_cc[VSTART];
-        TxXoff = TtyP->termios->c_cc[VSTOP];
-        RxXon = TtyP->termios->c_cc[VSTART];
-        RxXoff = TtyP->termios->c_cc[VSTOP];
-        /*
-         ** LNEXT byte
-         */
-        LNext = 0;
-
-        /*
-         ** Baud rate bytes
-         */
-        rio_dprintk(RIO_DEBUG_PARAM, "Mapping of rx/tx baud %x (%x)\n", TtyP->termios->c_cflag, CBAUD);
-
-        switch (TtyP->termios->c_cflag & CBAUD) {
-#define e(b) case B ## b : RxBaud = TxBaud = RIO_B ## b ;break
-                e(50);
-                e(75);
-                e(110);
-                e(134);
-                e(150);
-                e(200);
-                e(300);
-                e(600);
-                e(1200);
-                e(1800);
-                e(2400);
-                e(4800);
-                e(9600);
-                e(19200);
-                e(38400);
-                e(57600);
-                e(115200);      /* e(230400);e(460800); e(921600);  */
-        }
-
-        rio_dprintk(RIO_DEBUG_PARAM, "tx baud 0x%x, rx baud 0x%x\n", TxBaud, RxBaud);
-
-
-        /*
-         ** Leftovers
-         */
-        if (TtyP->termios->c_cflag & CREAD)
-                rio_dprintk(RIO_DEBUG_PARAM, "Enable receiver\n");
-#ifdef RCV1EN
-        if (TtyP->termios->c_cflag & RCV1EN)
-                rio_dprintk(RIO_DEBUG_PARAM, "RCV1EN (?)\n");
-#endif
-#ifdef XMT1EN
-        if (TtyP->termios->c_cflag & XMT1EN)
-                rio_dprintk(RIO_DEBUG_PARAM, "XMT1EN (?)\n");
-#endif
-        if (TtyP->termios->c_lflag & ISIG)
-                rio_dprintk(RIO_DEBUG_PARAM, "Input character signal generating enabled\n");
-        if (TtyP->termios->c_lflag & ICANON)
-                rio_dprintk(RIO_DEBUG_PARAM, "Canonical input: erase and kill enabled\n");
-        if (TtyP->termios->c_lflag & XCASE)
-                rio_dprintk(RIO_DEBUG_PARAM, "Canonical upper/lower presentation\n");
-        if (TtyP->termios->c_lflag & ECHO)
-                rio_dprintk(RIO_DEBUG_PARAM, "Enable input echo\n");
-        if (TtyP->termios->c_lflag & ECHOE)
-                rio_dprintk(RIO_DEBUG_PARAM, "Enable echo erase\n");
-        if (TtyP->termios->c_lflag & ECHOK)
-                rio_dprintk(RIO_DEBUG_PARAM, "Enable echo kill\n");
-        if (TtyP->termios->c_lflag & ECHONL)
-                rio_dprintk(RIO_DEBUG_PARAM, "Enable echo newline\n");
-        if (TtyP->termios->c_lflag & NOFLSH)
-                rio_dprintk(RIO_DEBUG_PARAM, "Disable flush after interrupt or quit\n");
-#ifdef TOSTOP
-        if (TtyP->termios->c_lflag & TOSTOP)
-                rio_dprintk(RIO_DEBUG_PARAM, "Send SIGTTOU for background output\n");
-#endif
-#ifdef XCLUDE
-        if (TtyP->termios->c_lflag & XCLUDE)
-                rio_dprintk(RIO_DEBUG_PARAM, "Exclusive use of this line\n");
-#endif
-        if (TtyP->termios->c_iflag & IUCLC)
-                rio_dprintk(RIO_DEBUG_PARAM, "Map uppercase to lowercase on input\n");
-        if (TtyP->termios->c_oflag & OPOST)
-                rio_dprintk(RIO_DEBUG_PARAM, "Enable output post-processing\n");
-        if (TtyP->termios->c_oflag & OLCUC)
-                rio_dprintk(RIO_DEBUG_PARAM, "Map lowercase to uppercase on output\n");
-        if (TtyP->termios->c_oflag & ONOCR)
-                rio_dprintk(RIO_DEBUG_PARAM, "No carriage return output at column 0\n");
-        if (TtyP->termios->c_oflag & ONLRET)
-                rio_dprintk(RIO_DEBUG_PARAM, "Newline performs carriage return function\n");
-        if (TtyP->termios->c_oflag & OFILL)
-                rio_dprintk(RIO_DEBUG_PARAM, "Use fill characters for delay\n");
-        if (TtyP->termios->c_oflag & OFDEL)
-                rio_dprintk(RIO_DEBUG_PARAM, "Fill character is DEL\n");
-        if (TtyP->termios->c_oflag & NLDLY)
-                rio_dprintk(RIO_DEBUG_PARAM, "Newline delay set\n");
-        if (TtyP->termios->c_oflag & CRDLY)
-                rio_dprintk(RIO_DEBUG_PARAM, "Carriage return delay set\n");
-        if (TtyP->termios->c_oflag & TABDLY)
-                rio_dprintk(RIO_DEBUG_PARAM, "Tab delay set\n");
-        /*
-         ** These things are kind of useful in a later life!
-         */
-        PortP->Cor2Copy = Cor2;
-
-        if (PortP->State & RIO_DELETED) {
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                func_exit();
-
-                return RIO_FAIL;
-        }
-
-        /*
-         ** Actually write the info into the packet to be sent
-         */
-        writeb(cmd, &phb_param_ptr->Cmd);
-        writeb(Cor1, &phb_param_ptr->Cor1);
-        writeb(Cor2, &phb_param_ptr->Cor2);
-        writeb(Cor4, &phb_param_ptr->Cor4);
-        writeb(Cor5, &phb_param_ptr->Cor5);
-        writeb(TxXon, &phb_param_ptr->TxXon);
-        writeb(RxXon, &phb_param_ptr->RxXon);
-        writeb(TxXoff, &phb_param_ptr->TxXoff);
-        writeb(RxXoff, &phb_param_ptr->RxXoff);
-        writeb(LNext, &phb_param_ptr->LNext);
-        writeb(TxBaud, &phb_param_ptr->TxBaud);
-        writeb(RxBaud, &phb_param_ptr->RxBaud);
-
-        /*
-         ** Set the length/command field
-         */
-        writeb(12 | PKT_CMD_BIT, &PacketP->len);
-
-        /*
-         ** The packet is formed - now, whack it off
-         ** to its final destination:
-         */
-        add_transmit(PortP);
-        /*
-         ** Count characters transmitted for port statistics reporting
-         */
-        if (PortP->statsGather)
-                PortP->txchars += 12;
-
-        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-
-        rio_dprintk(RIO_DEBUG_PARAM, "add_transmit returned.\n");
-        /*
-         ** job done.
-         */
-        func_exit();
-
-        return 0;
-}
-
-
-/*
-** We can add another packet to a transmit queue if the packet pointer pointed
-** to by the TxAdd pointer has PKT_IN_USE clear in its address.
-*/
-int can_add_transmit(struct PKT __iomem **PktP, struct Port *PortP)
-{
-        struct PKT __iomem *tp;
-
-        *PktP = tp = (struct PKT __iomem *) RIO_PTR(PortP->Caddr, readw(PortP->TxAdd));
-
-        return !((unsigned long) tp & PKT_IN_USE);
-}
-
-/*
-** To add a packet to the queue, you set the PKT_IN_USE bit in the address,
-** and then move the TxAdd pointer along one position to point to the next
-** packet pointer. You must wrap the pointer from the end back to the start.
-*/
-void add_transmit(struct Port *PortP)
-{
-        if (readw(PortP->TxAdd) & PKT_IN_USE) {
-                rio_dprintk(RIO_DEBUG_PARAM, "add_transmit: Packet has been stolen!");
-        }
-        writew(readw(PortP->TxAdd) | PKT_IN_USE, PortP->TxAdd);
-        PortP->TxAdd = (PortP->TxAdd == PortP->TxEnd) ? PortP->TxStart : PortP->TxAdd + 1;
-        writew(RIO_OFF(PortP->Caddr, PortP->TxAdd), &PortP->PhbP->tx_add);
-}
-
-/****************************************
- * Put a packet onto the end of the
- * free list
- ****************************************/
-void put_free_end(struct Host *HostP, struct PKT __iomem *PktP)
-{
-        struct rio_free_list __iomem *tmp_pointer;
-        unsigned short old_end, new_end;
-        unsigned long flags;
-
-        rio_spin_lock_irqsave(&HostP->HostLock, flags);
-
-         /*************************************************
-        * Put a packet back onto the back of the free list
-        *
-        ************************************************/
-
-        rio_dprintk(RIO_DEBUG_PFE, "put_free_end(PktP=%p)\n", PktP);
-
-        if ((old_end = readw(&HostP->ParmMapP->free_list_end)) != TPNULL) {
-                new_end = RIO_OFF(HostP->Caddr, PktP);
-                tmp_pointer = (struct rio_free_list __iomem *) RIO_PTR(HostP->Caddr, old_end);
-                writew(new_end, &tmp_pointer->next);
-                writew(old_end, &((struct rio_free_list __iomem *) PktP)->prev);
-                writew(TPNULL, &((struct rio_free_list __iomem *) PktP)->next);
-                writew(new_end, &HostP->ParmMapP->free_list_end);
-        } else {                /* First packet on the free list this should never happen! */
-                rio_dprintk(RIO_DEBUG_PFE, "put_free_end(): This should never happen\n");
-                writew(RIO_OFF(HostP->Caddr, PktP), &HostP->ParmMapP->free_list_end);
-                tmp_pointer = (struct rio_free_list __iomem *) PktP;
-                writew(TPNULL, &tmp_pointer->prev);
-                writew(TPNULL, &tmp_pointer->next);
-        }
-        rio_dprintk(RIO_DEBUG_CMD, "Before unlock: %p\n", &HostP->HostLock);
-        rio_spin_unlock_irqrestore(&HostP->HostLock, flags);
-}
-
-/*
-** can_remove_receive(PktP,P) returns non-zero if PKT_IN_USE is set
-** for the next packet on the queue. It will also set PktP to point to the
-** relevant packet, [having cleared the PKT_IN_USE bit]. If PKT_IN_USE is clear,
-** then can_remove_receive() returns 0.
-*/
-int can_remove_receive(struct PKT __iomem **PktP, struct Port *PortP)
-{
-        if (readw(PortP->RxRemove) & PKT_IN_USE) {
-                *PktP = (struct PKT __iomem *) RIO_PTR(PortP->Caddr, readw(PortP->RxRemove) & ~PKT_IN_USE);
-                return 1;
-        }
-        return 0;
-}
-
-/*
-** To remove a packet from the receive queue you clear its PKT_IN_USE bit,
-** and then bump the pointers. Once the pointers get to the end, they must
-** be wrapped back to the start.
-*/
-void remove_receive(struct Port *PortP)
-{
-        writew(readw(PortP->RxRemove) & ~PKT_IN_USE, PortP->RxRemove);
-        PortP->RxRemove = (PortP->RxRemove == PortP->RxEnd) ? PortP->RxStart : PortP->RxRemove + 1;
-        writew(RIO_OFF(PortP->Caddr, PortP->RxRemove), &PortP->PhbP->rx_remove);
-}
diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c
deleted file mode 100644
index f9b936ac3394..000000000000
--- a/drivers/char/rio/rioroute.c
+++ /dev/null
@@ -1,1039 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : rioroute.c
-**      SID             : 1.3
-**      Last Modified   : 11/6/98 10:33:46
-**      Retrieved       : 11/6/98 10:33:50
-**
-**  ident @(#)rioroute.c        1.3
-**
-** -----------------------------------------------------------------------------
-*/
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/string.h>
-#include <asm/uaccess.h>
-
-#include <linux/termios.h>
-#include <linux/serial.h>
-
-#include <linux/generic_serial.h>
-
-
-#include "linux_compat.h"
-#include "rio_linux.h"
-#include "pkt.h"
-#include "daemon.h"
-#include "rio.h"
-#include "riospace.h"
-#include "cmdpkt.h"
-#include "map.h"
-#include "rup.h"
-#include "port.h"
-#include "riodrvr.h"
-#include "rioinfo.h"
-#include "func.h"
-#include "errors.h"
-#include "pci.h"
-
-#include "parmmap.h"
-#include "unixrup.h"
-#include "board.h"
-#include "host.h"
-#include "phb.h"
-#include "link.h"
-#include "cmdblk.h"
-#include "route.h"
-#include "cirrus.h"
-#include "rioioctl.h"
-#include "param.h"
-
-static int RIOCheckIsolated(struct rio_info *, struct Host *, unsigned int);
-static int RIOIsolate(struct rio_info *, struct Host *, unsigned int);
-static int RIOCheck(struct Host *, unsigned int);
-static void RIOConCon(struct rio_info *, struct Host *, unsigned int, unsigned int, unsigned int, unsigned int, int);
-
-
-/*
-** Incoming on the ROUTE_RUP
-** I wrote this while I was tired. Forgive me.
-*/
-int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct PKT __iomem * PacketP)
-{
-        struct PktCmd __iomem *PktCmdP = (struct PktCmd __iomem *) PacketP->data;
-        struct PktCmd_M *PktReplyP;
-        struct CmdBlk *CmdBlkP;
-        struct Port *PortP;
-        struct Map *MapP;
-        struct Top *TopP;
-        int ThisLink, ThisLinkMin, ThisLinkMax;
-        int port;
-        int Mod, Mod1, Mod2;
-        unsigned short RtaType;
-        unsigned int RtaUniq;
-        unsigned int ThisUnit, ThisUnit2;       /* 2 ids to accommodate 16 port RTA */
-        unsigned int OldUnit, NewUnit, OldLink, NewLink;
-        char *MyType, *MyName;
-        int Lies;
-        unsigned long flags;
-
-        /*
-         ** Is this unit telling us it's current link topology?
-         */
-        if (readb(&PktCmdP->Command) == ROUTE_TOPOLOGY) {
-                MapP = HostP->Mapping;
-
-                /*
-                 ** The packet can be sent either by the host or by an RTA.
-                 ** If it comes from the host, then we need to fill in the
-                 ** Topology array in the host structure. If it came in
-                 ** from an RTA then we need to fill in the Mapping structure's
-                 ** Topology array for the unit.
-                 */
-                if (Rup >= (unsigned short) MAX_RUP) {
-                        ThisUnit = HOST_ID;
-                        TopP = HostP->Topology;
-                        MyType = "Host";
-                        MyName = HostP->Name;
-                        ThisLinkMin = ThisLinkMax = Rup - MAX_RUP;
-                } else {
-                        ThisUnit = Rup + 1;
-                        TopP = HostP->Mapping[Rup].Topology;
-                        MyType = "RTA";
-                        MyName = HostP->Mapping[Rup].Name;
-                        ThisLinkMin = 0;
-                        ThisLinkMax = LINKS_PER_UNIT - 1;
-                }
-
-                /*
-                 ** Lies will not be tolerated.
-                 ** If any pair of links claim to be connected to the same
-                 ** place, then ignore this packet completely.
-                 */
-                Lies = 0;
-                for (ThisLink = ThisLinkMin + 1; ThisLink <= ThisLinkMax; ThisLink++) {
-                        /*
-                         ** it won't lie about network interconnect, total disconnects
-                         ** and no-IDs. (or at least, it doesn't *matter* if it does)
-                         */
-                        if (readb(&PktCmdP->RouteTopology[ThisLink].Unit) > (unsigned short) MAX_RUP)
-                                continue;
-
-                        for (NewLink = ThisLinkMin; NewLink < ThisLink; NewLink++) {
-                                if ((readb(&PktCmdP->RouteTopology[ThisLink].Unit) == readb(&PktCmdP->RouteTopology[NewLink].Unit)) && (readb(&PktCmdP->RouteTopology[ThisLink].Link) == readb(&PktCmdP->RouteTopology[NewLink].Link))) {
-                                        Lies++;
-                                }
-                        }
-                }
-
-                if (Lies) {
-                        rio_dprintk(RIO_DEBUG_ROUTE, "LIES! DAMN LIES! %d LIES!\n", Lies);
-                        rio_dprintk(RIO_DEBUG_ROUTE, "%d:%c %d:%c %d:%c %d:%c\n",
-                                    readb(&PktCmdP->RouteTopology[0].Unit),
-                                    'A' + readb(&PktCmdP->RouteTopology[0].Link),
-                                    readb(&PktCmdP->RouteTopology[1].Unit),
-                                    'A' + readb(&PktCmdP->RouteTopology[1].Link), readb(&PktCmdP->RouteTopology[2].Unit), 'A' + readb(&PktCmdP->RouteTopology[2].Link), readb(&PktCmdP->RouteTopology[3].Unit), 'A' + readb(&PktCmdP->RouteTopology[3].Link));
-                        return 1;
-                }
-
-                /*
-                 ** now, process each link.
-                 */
-                for (ThisLink = ThisLinkMin; ThisLink <= ThisLinkMax; ThisLink++) {
-                        /*
-                         ** this is what it was connected to
-                         */
-                        OldUnit = TopP[ThisLink].Unit;
-                        OldLink = TopP[ThisLink].Link;
-
-                        /*
-                         ** this is what it is now connected to
-                         */
-                        NewUnit = readb(&PktCmdP->RouteTopology[ThisLink].Unit);
-                        NewLink = readb(&PktCmdP->RouteTopology[ThisLink].Link);
-
-                        if (OldUnit != NewUnit || OldLink != NewLink) {
-                                /*
-                                 ** something has changed!
-                                 */
-
-                                if (NewUnit > MAX_RUP && NewUnit != ROUTE_DISCONNECT && NewUnit != ROUTE_NO_ID && NewUnit != ROUTE_INTERCONNECT) {
-                                        rio_dprintk(RIO_DEBUG_ROUTE, "I have a link from %s %s to unit %d:%d - I don't like it.\n", MyType, MyName, NewUnit, NewLink);
-                                } else {
-                                        /*
-                                         ** put the new values in
-                                         */
-                                        TopP[ThisLink].Unit = NewUnit;
-                                        TopP[ThisLink].Link = NewLink;
-
-                                        RIOSetChange(p);
-
-                                        if (OldUnit <= MAX_RUP) {
-                                                /*
-                                                 ** If something has become bust, then re-enable them messages
-                                                 */
-                                                if (!p->RIONoMessage)
-                                                        RIOConCon(p, HostP, ThisUnit, ThisLink, OldUnit, OldLink, DISCONNECT);
-                                        }
-
-                                        if ((NewUnit <= MAX_RUP) && !p->RIONoMessage)
-                                                RIOConCon(p, HostP, ThisUnit, ThisLink, NewUnit, NewLink, CONNECT);
-
-                                        if (NewUnit == ROUTE_NO_ID)
-                                                rio_dprintk(RIO_DEBUG_ROUTE, "%s %s (%c) is connected to an unconfigured unit.\n", MyType, MyName, 'A' + ThisLink);
-
-                                        if (NewUnit == ROUTE_INTERCONNECT) {
-                                                if (!p->RIONoMessage)
-                                                        printk(KERN_DEBUG "rio: %s '%s' (%c) is connected to another network.\n", MyType, MyName, 'A' + ThisLink);
-                                        }
-
-                                        /*
-                                         ** perform an update for 'the other end', so that these messages
-                                         ** only appears once. Only disconnect the other end if it is pointing
-                                         ** at us!
-                                         */
-                                        if (OldUnit == HOST_ID) {
-                                                if (HostP->Topology[OldLink].Unit == ThisUnit && HostP->Topology[OldLink].Link == ThisLink) {
-                                                        rio_dprintk(RIO_DEBUG_ROUTE, "SETTING HOST (%c) TO DISCONNECTED!\n", OldLink + 'A');
-                                                        HostP->Topology[OldLink].Unit = ROUTE_DISCONNECT;
-                                                        HostP->Topology[OldLink].Link = NO_LINK;
-                                                } else {
-                                                        rio_dprintk(RIO_DEBUG_ROUTE, "HOST(%c) WAS NOT CONNECTED TO %s (%c)!\n", OldLink + 'A', HostP->Mapping[ThisUnit - 1].Name, ThisLink + 'A');
-                                                }
-                                        } else if (OldUnit <= MAX_RUP) {
-                                                if (HostP->Mapping[OldUnit - 1].Topology[OldLink].Unit == ThisUnit && HostP->Mapping[OldUnit - 1].Topology[OldLink].Link == ThisLink) {
-                                                        rio_dprintk(RIO_DEBUG_ROUTE, "SETTING RTA %s (%c) TO DISCONNECTED!\n", HostP->Mapping[OldUnit - 1].Name, OldLink + 'A');
-                                                        HostP->Mapping[OldUnit - 1].Topology[OldLink].Unit = ROUTE_DISCONNECT;
-                                                        HostP->Mapping[OldUnit - 1].Topology[OldLink].Link = NO_LINK;
-                                                } else {
-                                                        rio_dprintk(RIO_DEBUG_ROUTE, "RTA %s (%c) WAS NOT CONNECTED TO %s (%c)\n", HostP->Mapping[OldUnit - 1].Name, OldLink + 'A', HostP->Mapping[ThisUnit - 1].Name, ThisLink + 'A');
-                                                }
-                                        }
-                                        if (NewUnit == HOST_ID) {
-                                                rio_dprintk(RIO_DEBUG_ROUTE, "MARKING HOST (%c) CONNECTED TO %s (%c)\n", NewLink + 'A', MyName, ThisLink + 'A');
-                                                HostP->Topology[NewLink].Unit = ThisUnit;
-                                                HostP->Topology[NewLink].Link = ThisLink;
-                                        } else if (NewUnit <= MAX_RUP) {
-                                                rio_dprintk(RIO_DEBUG_ROUTE, "MARKING RTA %s (%c) CONNECTED TO %s (%c)\n", HostP->Mapping[NewUnit - 1].Name, NewLink + 'A', MyName, ThisLink + 'A');
-                                                HostP->Mapping[NewUnit - 1].Topology[NewLink].Unit = ThisUnit;
-                                                HostP->Mapping[NewUnit - 1].Topology[NewLink].Link = ThisLink;
-                                        }
-                                }
-                                RIOSetChange(p);
-                                RIOCheckIsolated(p, HostP, OldUnit);
-                        }
-                }
-                return 1;
-        }
-
-        /*
-         ** The only other command we recognise is a route_request command
-         */
-        if (readb(&PktCmdP->Command) != ROUTE_REQUEST) {
-                rio_dprintk(RIO_DEBUG_ROUTE, "Unknown command %d received on rup %d host %p ROUTE_RUP\n", readb(&PktCmdP->Command), Rup, HostP);
-                return 1;
-        }
-
-        RtaUniq = (readb(&PktCmdP->UniqNum[0])) + (readb(&PktCmdP->UniqNum[1]) << 8) + (readb(&PktCmdP->UniqNum[2]) << 16) + (readb(&PktCmdP->UniqNum[3]) << 24);
-
-        /*
-         ** Determine if 8 or 16 port RTA
-         */
-        RtaType = GetUnitType(RtaUniq);
-
-        rio_dprintk(RIO_DEBUG_ROUTE, "Received a request for an ID for serial number %x\n", RtaUniq);
-
-        Mod = readb(&PktCmdP->ModuleTypes);
-        Mod1 = LONYBLE(Mod);
-        if (RtaType == TYPE_RTA16) {
-                /*
-                 ** Only one ident is set for a 16 port RTA. To make compatible
-                 ** with 8 port, set 2nd ident in Mod2 to the same as Mod1.
-                 */
-                Mod2 = Mod1;
-                rio_dprintk(RIO_DEBUG_ROUTE, "Backplane type is %s (all ports)\n", p->RIOModuleTypes[Mod1].Name);
-        } else {
-                Mod2 = HINYBLE(Mod);
-                rio_dprintk(RIO_DEBUG_ROUTE, "Module types are %s (ports 0-3) and %s (ports 4-7)\n", p->RIOModuleTypes[Mod1].Name, p->RIOModuleTypes[Mod2].Name);
-        }
-
-        /*
-         ** try to unhook a command block from the command free list.
-         */
-        if (!(CmdBlkP = RIOGetCmdBlk())) {
-                rio_dprintk(RIO_DEBUG_ROUTE, "No command blocks to route RTA! come back later.\n");
-                return 0;
-        }
-
-        /*
-         ** Fill in the default info on the command block
-         */
-        CmdBlkP->Packet.dest_unit = Rup;
-        CmdBlkP->Packet.dest_port = ROUTE_RUP;
-        CmdBlkP->Packet.src_unit = HOST_ID;
-        CmdBlkP->Packet.src_port = ROUTE_RUP;
-        CmdBlkP->Packet.len = PKT_CMD_BIT | 1;
-        CmdBlkP->PreFuncP = CmdBlkP->PostFuncP = NULL;
-        PktReplyP = (struct PktCmd_M *) CmdBlkP->Packet.data;
-
-        if (!RIOBootOk(p, HostP, RtaUniq)) {
-                rio_dprintk(RIO_DEBUG_ROUTE, "RTA %x tried to get an ID, but does not belong - FOAD it!\n", RtaUniq);
-                PktReplyP->Command = ROUTE_FOAD;
-                memcpy(PktReplyP->CommandText, "RT_FOAD", 7);
-                RIOQueueCmdBlk(HostP, Rup, CmdBlkP);
-                return 1;
-        }
-
-        /*
-         ** Check to see if the RTA is configured for this host
-         */
-        for (ThisUnit = 0; ThisUnit < MAX_RUP; ThisUnit++) {
-                rio_dprintk(RIO_DEBUG_ROUTE, "Entry %d Flags=%s %s UniqueNum=0x%x\n",
-                            ThisUnit, HostP->Mapping[ThisUnit].Flags & SLOT_IN_USE ? "Slot-In-Use" : "Not In Use", HostP->Mapping[ThisUnit].Flags & SLOT_TENTATIVE ? "Slot-Tentative" : "Not Tentative", HostP->Mapping[ThisUnit].RtaUniqueNum);
-
-                /*
-                 ** We have an entry for it.
-                 */
-                if ((HostP->Mapping[ThisUnit].Flags & (SLOT_IN_USE | SLOT_TENTATIVE)) && (HostP->Mapping[ThisUnit].RtaUniqueNum == RtaUniq)) {
-                        if (RtaType == TYPE_RTA16) {
-                                ThisUnit2 = HostP->Mapping[ThisUnit].ID2 - 1;
-                                rio_dprintk(RIO_DEBUG_ROUTE, "Found unit 0x%x at slots %d+%d\n", RtaUniq, ThisUnit, ThisUnit2);
-                        } else
-                                rio_dprintk(RIO_DEBUG_ROUTE, "Found unit 0x%x at slot %d\n", RtaUniq, ThisUnit);
-                        /*
-                         ** If we have no knowledge of booting it, then the host has
-                         ** been re-booted, and so we must kill the RTA, so that it
-                         ** will be booted again (potentially with new bins)
-                         ** and it will then re-ask for an ID, which we will service.
-                         */
-                        if ((HostP->Mapping[ThisUnit].Flags & SLOT_IN_USE) && !(HostP->Mapping[ThisUnit].Flags & RTA_BOOTED)) {
-                                if (!(HostP->Mapping[ThisUnit].Flags & MSG_DONE)) {
-                                        if (!p->RIONoMessage)
-                                                printk(KERN_DEBUG "rio: RTA '%s' is being updated.\n", HostP->Mapping[ThisUnit].Name);
-                                        HostP->Mapping[ThisUnit].Flags |= MSG_DONE;
-                                }
-                                PktReplyP->Command = ROUTE_FOAD;
-                                memcpy(PktReplyP->CommandText, "RT_FOAD", 7);
-                                RIOQueueCmdBlk(HostP, Rup, CmdBlkP);
-                                return 1;
-                        }
-
-                        /*
-                         ** Send the ID (entry) to this RTA. The ID number is implicit as
-                         ** the offset into the table. It is worth noting at this stage
-                         ** that offset zero in the table contains the entries for the
-                         ** RTA with ID 1!!!!
-                         */
-                        PktReplyP->Command = ROUTE_ALLOCATE;
-                        PktReplyP->IDNum = ThisUnit + 1;
-                        if (RtaType == TYPE_RTA16) {
-                                if (HostP->Mapping[ThisUnit].Flags & SLOT_IN_USE)
-                                        /*
-                                         ** Adjust the phb and tx pkt dest_units for 2nd block of 8
-                                         ** only if the RTA has ports associated (SLOT_IN_USE)
-                                         */
-                                        RIOFixPhbs(p, HostP, ThisUnit2);
-                                PktReplyP->IDNum2 = ThisUnit2 + 1;
-                                rio_dprintk(RIO_DEBUG_ROUTE, "RTA '%s' has been allocated IDs %d+%d\n", HostP->Mapping[ThisUnit].Name, PktReplyP->IDNum, PktReplyP->IDNum2);
-                        } else {
-                                PktReplyP->IDNum2 = ROUTE_NO_ID;
-                                rio_dprintk(RIO_DEBUG_ROUTE, "RTA '%s' has been allocated ID %d\n", HostP->Mapping[ThisUnit].Name, PktReplyP->IDNum);
-                        }
-                        memcpy(PktReplyP->CommandText, "RT_ALLOCAT", 10);
-
-                        RIOQueueCmdBlk(HostP, Rup, CmdBlkP);
-
-                        /*
-                         ** If this is a freshly booted RTA, then we need to re-open
-                         ** the ports, if any where open, so that data may once more
-                         ** flow around the system!
-                         */
-                        if ((HostP->Mapping[ThisUnit].Flags & RTA_NEWBOOT) && (HostP->Mapping[ThisUnit].SysPort != NO_PORT)) {
-                                /*
-                                 ** look at the ports associated with this beast and
-                                 ** see if any where open. If they was, then re-open
-                                 ** them, using the info from the tty flags.
-                                 */
-                                for (port = 0; port < PORTS_PER_RTA; port++) {
-                                        PortP = p->RIOPortp[port + HostP->Mapping[ThisUnit].SysPort];
-                                        if (PortP->State & (RIO_MOPEN | RIO_LOPEN)) {
-                                                rio_dprintk(RIO_DEBUG_ROUTE, "Re-opened this port\n");
-                                                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                                                PortP->MagicFlags |= MAGIC_REBOOT;
-                                                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                                        }
-                                }
-                                if (RtaType == TYPE_RTA16) {
-                                        for (port = 0; port < PORTS_PER_RTA; port++) {
-                                                PortP = p->RIOPortp[port + HostP->Mapping[ThisUnit2].SysPort];
-                                                if (PortP->State & (RIO_MOPEN | RIO_LOPEN)) {
-                                                        rio_dprintk(RIO_DEBUG_ROUTE, "Re-opened this port\n");
-                                                        rio_spin_lock_irqsave(&PortP->portSem, flags);
-                                                        PortP->MagicFlags |= MAGIC_REBOOT;
-                                                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                                                }
-                                        }
-                                }
-                        }
-
-                        /*
-                         ** keep a copy of the module types!
-                         */
-                        HostP->UnixRups[ThisUnit].ModTypes = Mod;
-                        if (RtaType == TYPE_RTA16)
-                                HostP->UnixRups[ThisUnit2].ModTypes = Mod;
-
-                        /*
-                         ** If either of the modules on this unit is read-only or write-only
-                         ** or none-xprint, then we need to transfer that info over to the
-                         ** relevant ports.
-                         */
-                        if (HostP->Mapping[ThisUnit].SysPort != NO_PORT) {
-                                for (port = 0; port < PORTS_PER_MODULE; port++) {
-                                        p->RIOPortp[port + HostP->Mapping[ThisUnit].SysPort]->Config &= ~RIO_NOMASK;
-                                        p->RIOPortp[port + HostP->Mapping[ThisUnit].SysPort]->Config |= p->RIOModuleTypes[Mod1].Flags[port];
-                                        p->RIOPortp[port + PORTS_PER_MODULE + HostP->Mapping[ThisUnit].SysPort]->Config &= ~RIO_NOMASK;
-                                        p->RIOPortp[port + PORTS_PER_MODULE + HostP->Mapping[ThisUnit].SysPort]->Config |= p->RIOModuleTypes[Mod2].Flags[port];
-                                }
-                                if (RtaType == TYPE_RTA16) {
-                                        for (port = 0; port < PORTS_PER_MODULE; port++) {
-                                                p->RIOPortp[port + HostP->Mapping[ThisUnit2].SysPort]->Config &= ~RIO_NOMASK;
-                                                p->RIOPortp[port + HostP->Mapping[ThisUnit2].SysPort]->Config |= p->RIOModuleTypes[Mod1].Flags[port];
-                                                p->RIOPortp[port + PORTS_PER_MODULE + HostP->Mapping[ThisUnit2].SysPort]->Config &= ~RIO_NOMASK;
-                                                p->RIOPortp[port + PORTS_PER_MODULE + HostP->Mapping[ThisUnit2].SysPort]->Config |= p->RIOModuleTypes[Mod2].Flags[port];
-                                        }
-                                }
-                        }
-
-                        /*
-                         ** Job done, get on with the interrupts!
-                         */
-                        return 1;
-                }
-        }
-        /*
-         ** There is no table entry for this RTA at all.
-         **
-         ** Lets check to see if we actually booted this unit - if not,
-         ** then we reset it and it will go round the loop of being booted
-         ** we can then worry about trying to fit it into the table.
-         */
-        for (ThisUnit = 0; ThisUnit < HostP->NumExtraBooted; ThisUnit++)
-                if (HostP->ExtraUnits[ThisUnit] == RtaUniq)
-                        break;
-        if (ThisUnit == HostP->NumExtraBooted && ThisUnit != MAX_EXTRA_UNITS) {
-                /*
-                 ** if the unit wasn't in the table, and the table wasn't full, then
-                 ** we reset the unit, because we didn't boot it.
-                 ** However, if the table is full, it could be that we did boot
-                 ** this unit, and so we won't reboot it, because it isn't really
-                 ** all that disasterous to keep the old bins in most cases. This
-                 ** is a rather tacky feature, but we are on the edge of reallity
-                 ** here, because the implication is that someone has connected
-                 ** 16+MAX_EXTRA_UNITS onto one host.
-                 */
-                static int UnknownMesgDone = 0;
-
-                if (!UnknownMesgDone) {
-                        if (!p->RIONoMessage)
-                                printk(KERN_DEBUG "rio: One or more unknown RTAs are being updated.\n");
-                        UnknownMesgDone = 1;
-                }
-
-                PktReplyP->Command = ROUTE_FOAD;
-                memcpy(PktReplyP->CommandText, "RT_FOAD", 7);
-        } else {
-                /*
-                 ** we did boot it (as an extra), and there may now be a table
-                 ** slot free (because of a delete), so we will try to make
-                 ** a tentative entry for it, so that the configurator can see it
-                 ** and fill in the details for us.
-                 */
-                if (RtaType == TYPE_RTA16) {
-                        if (RIOFindFreeID(p, HostP, &ThisUnit, &ThisUnit2) == 0) {
-                                RIODefaultName(p, HostP, ThisUnit);
-                                rio_fill_host_slot(ThisUnit, ThisUnit2, RtaUniq, HostP);
-                        }
-                } else {
-                        if (RIOFindFreeID(p, HostP, &ThisUnit, NULL) == 0) {
-                                RIODefaultName(p, HostP, ThisUnit);
-                                rio_fill_host_slot(ThisUnit, 0, RtaUniq, HostP);
-                        }
-                }
-                PktReplyP->Command = ROUTE_USED;
-                memcpy(PktReplyP->CommandText, "RT_USED", 7);
-        }
-        RIOQueueCmdBlk(HostP, Rup, CmdBlkP);
-        return 1;
-}
-
-
-void RIOFixPhbs(struct rio_info *p, struct Host *HostP, unsigned int unit)
-{
-        unsigned short link, port;
-        struct Port *PortP;
-        unsigned long flags;
-        int PortN = HostP->Mapping[unit].SysPort;
-
-        rio_dprintk(RIO_DEBUG_ROUTE, "RIOFixPhbs unit %d sysport %d\n", unit, PortN);
-
-        if (PortN != -1) {
-                unsigned short dest_unit = HostP->Mapping[unit].ID2;
-
-                /*
-                 ** Get the link number used for the 1st 8 phbs on this unit.
-                 */
-                PortP = p->RIOPortp[HostP->Mapping[dest_unit - 1].SysPort];
-
-                link = readw(&PortP->PhbP->link);
-
-                for (port = 0; port < PORTS_PER_RTA; port++, PortN++) {
-                        unsigned short dest_port = port + 8;
-                        u16 __iomem *TxPktP;
-                        struct PKT __iomem *Pkt;
-
-                        PortP = p->RIOPortp[PortN];
-
-                        rio_spin_lock_irqsave(&PortP->portSem, flags);
-                        /*
-                         ** If RTA is not powered on, the tx packets will be
-                         ** unset, so go no further.
-                         */
-                        if (!PortP->TxStart) {
-                                rio_dprintk(RIO_DEBUG_ROUTE, "Tx pkts not set up yet\n");
-                                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                                break;
-                        }
-
-                        /*
-                         ** For the second slot of a 16 port RTA, the driver needs to
-                         ** sort out the phb to port mappings. The dest_unit for this
-                         ** group of 8 phbs is set to the dest_unit of the accompanying
-                         ** 8 port block. The dest_port of the second unit is set to
-                         ** be in the range 8-15 (i.e. 8 is added). Thus, for a 16 port
-                         ** RTA with IDs 5 and 6, traffic bound for port 6 of unit 6
-                         ** (being the second map ID) will be sent to dest_unit 5, port
-                         ** 14. When this RTA is deleted, dest_unit for ID 6 will be
-                         ** restored, and the dest_port will be reduced by 8.
-                         ** Transmit packets also have a destination field which needs
-                         ** adjusting in the same manner.
-                         ** Note that the unit/port bytes in 'dest' are swapped.
-                         ** We also need to adjust the phb and rup link numbers for the
-                         ** second block of 8 ttys.
-                         */
-                        for (TxPktP = PortP->TxStart; TxPktP <= PortP->TxEnd; TxPktP++) {
-                                /*
-                                 ** *TxPktP is the pointer to the transmit packet on the host
-                                 ** card. This needs to be translated into a 32 bit pointer
-                                 ** so it can be accessed from the driver.
-                                 */
-                                Pkt = (struct PKT __iomem *) RIO_PTR(HostP->Caddr, readw(TxPktP));
-
-                                /*
-                                 ** If the packet is used, reset it.
-                                 */
-                                Pkt = (struct PKT __iomem *) ((unsigned long) Pkt & ~PKT_IN_USE);
-                                writeb(dest_unit, &Pkt->dest_unit);
-                                writeb(dest_port, &Pkt->dest_port);
-                        }
-                        rio_dprintk(RIO_DEBUG_ROUTE, "phb dest: Old %x:%x New %x:%x\n", readw(&PortP->PhbP->destination) & 0xff, (readw(&PortP->PhbP->destination) >> 8) & 0xff, dest_unit, dest_port);
-                        writew(dest_unit + (dest_port << 8), &PortP->PhbP->destination);
-                        writew(link, &PortP->PhbP->link);
-
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                }
-                /*
-                 ** Now make sure the range of ports to be serviced includes
-                 ** the 2nd 8 on this 16 port RTA.
-                 */
-                if (link > 3)
-                        return;
-                if (((unit * 8) + 7) > readw(&HostP->LinkStrP[link].last_port)) {
-                        rio_dprintk(RIO_DEBUG_ROUTE, "last port on host link %d: %d\n", link, (unit * 8) + 7);
-                        writew((unit * 8) + 7, &HostP->LinkStrP[link].last_port);
-                }
-        }
-}
-
-/*
-** Check to see if the new disconnection has isolated this unit.
-** If it has, then invalidate all its link information, and tell
-** the world about it. This is done to ensure that the configurator
-** only gets up-to-date information about what is going on.
-*/
-static int RIOCheckIsolated(struct rio_info *p, struct Host *HostP, unsigned int UnitId)
-{
-        unsigned long flags;
-        rio_spin_lock_irqsave(&HostP->HostLock, flags);
-
-        if (RIOCheck(HostP, UnitId)) {
-                rio_dprintk(RIO_DEBUG_ROUTE, "Unit %d is NOT isolated\n", UnitId);
-                rio_spin_unlock_irqrestore(&HostP->HostLock, flags);
-                return (0);
-        }
-
-        RIOIsolate(p, HostP, UnitId);
-        RIOSetChange(p);
-        rio_spin_unlock_irqrestore(&HostP->HostLock, flags);
-        return 1;
-}
-
-/*
-** Invalidate all the link interconnectivity of this unit, and of
-** all the units attached to it. This will mean that the entire
-** subnet will re-introduce itself.
-*/
-static int RIOIsolate(struct rio_info *p, struct Host *HostP, unsigned int UnitId)
-{
-        unsigned int link, unit;
-
-        UnitId--;               /* this trick relies on the Unit Id being UNSIGNED! */
-
-        if (UnitId >= MAX_RUP)  /* dontcha just lurv unsigned maths! */
-                return (0);
-
-        if (HostP->Mapping[UnitId].Flags & BEEN_HERE)
-                return (0);
-
-        HostP->Mapping[UnitId].Flags |= BEEN_HERE;
-
-        if (p->RIOPrintDisabled == DO_PRINT)
-                rio_dprintk(RIO_DEBUG_ROUTE, "RIOMesgIsolated %s", HostP->Mapping[UnitId].Name);
-
-        for (link = 0; link < LINKS_PER_UNIT; link++) {
-                unit = HostP->Mapping[UnitId].Topology[link].Unit;
-                HostP->Mapping[UnitId].Topology[link].Unit = ROUTE_DISCONNECT;
-                HostP->Mapping[UnitId].Topology[link].Link = NO_LINK;
-                RIOIsolate(p, HostP, unit);
-        }
-        HostP->Mapping[UnitId].Flags &= ~BEEN_HERE;
-        return 1;
-}
-
-static int RIOCheck(struct Host *HostP, unsigned int UnitId)
-{
-        unsigned char link;
-
-/*      rio_dprint(RIO_DEBUG_ROUTE, ("Check to see if unit %d has a route to the host\n",UnitId)); */
-        rio_dprintk(RIO_DEBUG_ROUTE, "RIOCheck : UnitID = %d\n", UnitId);
-
-        if (UnitId == HOST_ID) {
-                /* rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d is NOT isolated - it IS the host!\n", UnitId)); */
-                return 1;
-        }
-
-        UnitId--;
-
-        if (UnitId >= MAX_RUP) {
-                /* rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d - ignored.\n", UnitId)); */
-                return 0;
-        }
-
-        for (link = 0; link < LINKS_PER_UNIT; link++) {
-                if (HostP->Mapping[UnitId].Topology[link].Unit == HOST_ID) {
-                        /* rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d is connected directly to host via link (%c).\n", 
-                           UnitId, 'A'+link)); */
-                        return 1;
-                }
-        }
-
-        if (HostP->Mapping[UnitId].Flags & BEEN_HERE) {
-                /* rio_dprint(RIO_DEBUG_ROUTE, ("Been to Unit %d before - ignoring\n", UnitId)); */
-                return 0;
-        }
-
-        HostP->Mapping[UnitId].Flags |= BEEN_HERE;
-
-        for (link = 0; link < LINKS_PER_UNIT; link++) {
-                /* rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d check link (%c)\n", UnitId,'A'+link)); */
-                if (RIOCheck(HostP, HostP->Mapping[UnitId].Topology[link].Unit)) {
-                        /* rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d is connected to something that knows the host via link (%c)\n", UnitId,link+'A')); */
-                        HostP->Mapping[UnitId].Flags &= ~BEEN_HERE;
-                        return 1;
-                }
-        }
-
-        HostP->Mapping[UnitId].Flags &= ~BEEN_HERE;
-
-        /* rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d DOESNT KNOW THE HOST!\n", UnitId)); */
-
-        return 0;
-}
-
-/*
-** Returns the type of unit (host, 16/8 port RTA)
-*/
-
-unsigned int GetUnitType(unsigned int Uniq)
-{
-        switch ((Uniq >> 28) & 0xf) {
-        case RIO_AT:
-        case RIO_MCA:
-        case RIO_EISA:
-        case RIO_PCI:
-                rio_dprintk(RIO_DEBUG_ROUTE, "Unit type: Host\n");
-                return (TYPE_HOST);
-        case RIO_RTA_16:
-                rio_dprintk(RIO_DEBUG_ROUTE, "Unit type: 16 port RTA\n");
-                return (TYPE_RTA16);
-        case RIO_RTA:
-                rio_dprintk(RIO_DEBUG_ROUTE, "Unit type: 8 port RTA\n");
-                return (TYPE_RTA8);
-        default:
-                rio_dprintk(RIO_DEBUG_ROUTE, "Unit type: Unrecognised\n");
-                return (99);
-        }
-}
-
-int RIOSetChange(struct rio_info *p)
-{
-        if (p->RIOQuickCheck != NOT_CHANGED)
-                return (0);
-        p->RIOQuickCheck = CHANGED;
-        if (p->RIOSignalProcess) {
-                rio_dprintk(RIO_DEBUG_ROUTE, "Send SIG-HUP");
-                /*
-                   psignal( RIOSignalProcess, SIGHUP );
-                 */
-        }
-        return (0);
-}
-
-static void RIOConCon(struct rio_info *p,
-                      struct Host *HostP,
-                      unsigned int FromId,
-                      unsigned int FromLink,
-                      unsigned int ToId,
-                      unsigned int ToLink,
-                      int Change)
-{
-        char *FromName;
-        char *FromType;
-        char *ToName;
-        char *ToType;
-        unsigned int tp;
-
-/*
-** 15.10.1998 ARG - ESIL 0759
-** (Part) fix for port being trashed when opened whilst RTA "disconnected"
-**
-** What's this doing in here anyway ?
-** It was causing the port to be 'unmapped' if opened whilst RTA "disconnected"
-**
-** 09.12.1998 ARG - ESIL 0776 - part fix
-** Okay, We've found out what this was all about now !
-** Someone had botched this to use RIOHalted to indicated the number of RTAs
-** 'disconnected'. The value in RIOHalted was then being used in the
-** 'RIO_QUICK_CHECK' ioctl. A none zero value indicating that a least one RTA
-** is 'disconnected'. The change was put in to satisfy a customer's needs.
-** Having taken this bit of code out 'RIO_QUICK_CHECK' now no longer works for
-** the customer.
-**
-    if (Change == CONNECT) {
-                if (p->RIOHalted) p->RIOHalted --;
-         }
-         else {
-                p->RIOHalted ++;
-         }
-**
-** So - we need to implement it slightly differently - a new member of the
-** rio_info struct - RIORtaDisCons (RIO RTA connections) keeps track of RTA
-** connections and disconnections. 
-*/
-        if (Change == CONNECT) {
-                if (p->RIORtaDisCons)
-                        p->RIORtaDisCons--;
-        } else {
-                p->RIORtaDisCons++;
-        }
-
-        if (p->RIOPrintDisabled == DONT_PRINT)
-                return;
-
-        if (FromId > ToId) {
-                tp = FromId;
-                FromId = ToId;
-                ToId = tp;
-                tp = FromLink;
-                FromLink = ToLink;
-                ToLink = tp;
-        }
-
-        FromName = FromId ? HostP->Mapping[FromId - 1].Name : HostP->Name;
-        FromType = FromId ? "RTA" : "HOST";
-        ToName = ToId ? HostP->Mapping[ToId - 1].Name : HostP->Name;
-        ToType = ToId ? "RTA" : "HOST";
-
-        rio_dprintk(RIO_DEBUG_ROUTE, "Link between %s '%s' (%c) and %s '%s' (%c) %s.\n", FromType, FromName, 'A' + FromLink, ToType, ToName, 'A' + ToLink, (Change == CONNECT) ? "established" : "disconnected");
-        printk(KERN_DEBUG "rio: Link between %s '%s' (%c) and %s '%s' (%c) %s.\n", FromType, FromName, 'A' + FromLink, ToType, ToName, 'A' + ToLink, (Change == CONNECT) ? "established" : "disconnected");
-}
-
-/*
-** RIORemoveFromSavedTable :
-**
-** Delete and RTA entry from the saved table given to us
-** by the configuration program.
-*/
-static int RIORemoveFromSavedTable(struct rio_info *p, struct Map *pMap)
-{
-        int entry;
-
-        /*
-         ** We loop for all entries even after finding an entry and
-         ** zeroing it because we may have two entries to delete if
-         ** it's a 16 port RTA.
-         */
-        for (entry = 0; entry < TOTAL_MAP_ENTRIES; entry++) {
-                if (p->RIOSavedTable[entry].RtaUniqueNum == pMap->RtaUniqueNum) {
-                        memset(&p->RIOSavedTable[entry], 0, sizeof(struct Map));
-                }
-        }
-        return 0;
-}
-
-
-/*
-** RIOCheckDisconnected :
-**
-** Scan the unit links to and return zero if the unit is completely
-** disconnected.
-*/
-static int RIOFreeDisconnected(struct rio_info *p, struct Host *HostP, int unit)
-{
-        int link;
-
-
-        rio_dprintk(RIO_DEBUG_ROUTE, "RIOFreeDisconnect unit %d\n", unit);
-        /*
-         ** If the slot is tentative and does not belong to the
-         ** second half of a 16 port RTA then scan to see if
-         ** is disconnected.
-         */
-        for (link = 0; link < LINKS_PER_UNIT; link++) {
-                if (HostP->Mapping[unit].Topology[link].Unit != ROUTE_DISCONNECT)
-                        break;
-        }
-
-        /*
-         ** If not all links are disconnected then we can forget about it.
-         */
-        if (link < LINKS_PER_UNIT)
-                return 1;
-
-#ifdef NEED_TO_FIX_THIS
-        /* Ok so all the links are disconnected. But we may have only just
-         ** made this slot tentative and not yet received a topology update.
-         ** Lets check how long ago we made it tentative.
-         */
-        rio_dprintk(RIO_DEBUG_ROUTE, "Just about to check LBOLT on entry %d\n", unit);
-        if (drv_getparm(LBOLT, (ulong_t *) & current_time))
-                rio_dprintk(RIO_DEBUG_ROUTE, "drv_getparm(LBOLT,....) Failed.\n");
-
-        elapse_time = current_time - TentTime[unit];
-        rio_dprintk(RIO_DEBUG_ROUTE, "elapse %d = current %d - tent %d (%d usec)\n", elapse_time, current_time, TentTime[unit], drv_hztousec(elapse_time));
-        if (drv_hztousec(elapse_time) < WAIT_TO_FINISH) {
-                rio_dprintk(RIO_DEBUG_ROUTE, "Skipping slot %d, not timed out yet %d\n", unit, drv_hztousec(elapse_time));
-                return 1;
-        }
-#endif
-
-        /*
-         ** We have found an usable slot.
-         ** If it is half of a 16 port RTA then delete the other half.
-         */
-        if (HostP->Mapping[unit].ID2 != 0) {
-                int nOther = (HostP->Mapping[unit].ID2) - 1;
-
-                rio_dprintk(RIO_DEBUG_ROUTE, "RioFreedis second slot %d.\n", nOther);
-                memset(&HostP->Mapping[nOther], 0, sizeof(struct Map));
-        }
-        RIORemoveFromSavedTable(p, &HostP->Mapping[unit]);
-
-        return 0;
-}
-
-
-/*
-** RIOFindFreeID :
-**
-** This function scans the given host table for either one
-** or two free unit ID's.
-*/
-
-int RIOFindFreeID(struct rio_info *p, struct Host *HostP, unsigned int * pID1, unsigned int * pID2)
-{
-        int unit, tempID;
-
-        /*
-         ** Initialise the ID's to MAX_RUP.
-         ** We do this to make the loop for setting the ID's as simple as
-         ** possible.
-         */
-        *pID1 = MAX_RUP;
-        if (pID2 != NULL)
-                *pID2 = MAX_RUP;
-
-        /*
-         ** Scan all entries of the host mapping table for free slots.
-         ** We scan for free slots first and then if that is not successful
-         ** we start all over again looking for tentative slots we can re-use.
-         */
-        for (unit = 0; unit < MAX_RUP; unit++) {
-                rio_dprintk(RIO_DEBUG_ROUTE, "Scanning unit %d\n", unit);
-                /*
-                 ** If the flags are zero then the slot is empty.
-                 */
-                if (HostP->Mapping[unit].Flags == 0) {
-                        rio_dprintk(RIO_DEBUG_ROUTE, "      This slot is empty.\n");
-                        /*
-                         ** If we haven't allocated the first ID then do it now.
-                         */
-                        if (*pID1 == MAX_RUP) {
-                                rio_dprintk(RIO_DEBUG_ROUTE, "Make tentative entry for first unit %d\n", unit);
-                                *pID1 = unit;
-
-                                /*
-                                 ** If the second ID is not needed then we can return
-                                 ** now.
-                                 */
-                                if (pID2 == NULL)
-                                        return 0;
-                        } else {
-                                /*
-                                 ** Allocate the second slot and return.
-                                 */
-                                rio_dprintk(RIO_DEBUG_ROUTE, "Make tentative entry for second unit %d\n", unit);
-                                *pID2 = unit;
-                                return 0;
-                        }
-                }
-        }
-
-        /*
-         ** If we manage to come out of the free slot loop then we
-         ** need to start all over again looking for tentative slots
-         ** that we can re-use.
-         */
-        rio_dprintk(RIO_DEBUG_ROUTE, "Starting to scan for tentative slots\n");
-        for (unit = 0; unit < MAX_RUP; unit++) {
-                if (((HostP->Mapping[unit].Flags & SLOT_TENTATIVE) || (HostP->Mapping[unit].Flags == 0)) && !(HostP->Mapping[unit].Flags & RTA16_SECOND_SLOT)) {
-                        rio_dprintk(RIO_DEBUG_ROUTE, "    Slot %d looks promising.\n", unit);
-
-                        if (unit == *pID1) {
-                                rio_dprintk(RIO_DEBUG_ROUTE, "    No it isn't, its the 1st half\n");
-                                continue;
-                        }
-
-                        /*
-                         ** Slot is Tentative or Empty, but not a tentative second
-                         ** slot of a 16 porter.
-                         ** Attempt to free up this slot (and its parnter if
-                         ** it is a 16 port slot. The second slot will become
-                         ** empty after a call to RIOFreeDisconnected so thats why
-                         ** we look for empty slots above  as well).
-                         */
-                        if (HostP->Mapping[unit].Flags != 0)
-                                if (RIOFreeDisconnected(p, HostP, unit) != 0)
-                                        continue;
-                        /*
-                         ** If we haven't allocated the first ID then do it now.
-                         */
-                        if (*pID1 == MAX_RUP) {
-                                rio_dprintk(RIO_DEBUG_ROUTE, "Grab tentative entry for first unit %d\n", unit);
-                                *pID1 = unit;
-
-                                /*
-                                 ** Clear out this slot now that we intend to use it.
-                                 */
-                                memset(&HostP->Mapping[unit], 0, sizeof(struct Map));
-
-                                /*
-                                 ** If the second ID is not needed then we can return
-                                 ** now.
-                                 */
-                                if (pID2 == NULL)
-                                        return 0;
-                        } else {
-                                /*
-                                 ** Allocate the second slot and return.
-                                 */
-                                rio_dprintk(RIO_DEBUG_ROUTE, "Grab tentative/empty  entry for second unit %d\n", unit);
-                                *pID2 = unit;
-
-                                /*
-                                 ** Clear out this slot now that we intend to use it.
-                                 */
-                                memset(&HostP->Mapping[unit], 0, sizeof(struct Map));
-
-                                /* At this point under the right(wrong?) conditions
-                                 ** we may have a first unit ID being higher than the
-                                 ** second unit ID. This is a bad idea if we are about
-                                 ** to fill the slots with a 16 port RTA.
-                                 ** Better check and swap them over.
-                                 */
-
-                                if (*pID1 > *pID2) {
-                                        rio_dprintk(RIO_DEBUG_ROUTE, "Swapping IDS %d %d\n", *pID1, *pID2);
-                                        tempID = *pID1;
-                                        *pID1 = *pID2;
-                                        *pID2 = tempID;
-                                }
-                                return 0;
-                        }
-                }
-        }
-
-        /*
-         ** If we manage to get to the end of the second loop then we
-         ** can give up and return a failure.
-         */
-        return 1;
-}
-
-
-/*
-** The link switch scenario.
-**
-** Rta Wun (A) is connected to Tuw (A).
-** The tables are all up to date, and the system is OK.
-**
-** If Wun (A) is now moved to Wun (B) before Wun (A) can
-** become disconnected, then the follow happens:
-**
-** Tuw (A) spots the change of unit:link at the other end
-** of its link and Tuw sends a topology packet reflecting
-** the change: Tuw (A) now disconnected from Wun (A), and
-** this is closely followed by a packet indicating that 
-** Tuw (A) is now connected to Wun (B).
-**
-** Wun (B) will spot that it has now become connected, and
-** Wun will send a topology packet, which indicates that
-** both Wun (A) and Wun (B) is connected to Tuw (A).
-**
-** Eventually Wun (A) realises that it is now disconnected
-** and Wun will send out a topology packet indicating that
-** Wun (A) is now disconnected.
-*/
diff --git a/drivers/char/rio/riospace.h b/drivers/char/rio/riospace.h
deleted file mode 100644
index ffb31d4332b9..000000000000
--- a/drivers/char/rio/riospace.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : riospace.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 11:34:13
-**      Retrieved       : 11/6/98 11:34:22
-**
-**  ident @(#)riospace.h        1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_riospace_h__
-#define __rio_riospace_h__
-
-#define RIO_LOCATOR_LEN 16
-#define MAX_RIO_BOARDS  4
-
-/*
-** DONT change this file. At all. Unless you can rebuild the entire
-** device driver, which you probably can't, then the rest of the
-** driver won't see any changes you make here. So don't make any.
-** In particular, it won't be able to see changes to RIO_SLOTS
-*/
-
-struct Conf {
-        char Locator[24];
-        unsigned int StartupTime;
-        unsigned int SlowCook;
-        unsigned int IntrPollTime;
-        unsigned int BreakInterval;
-        unsigned int Timer;
-        unsigned int RtaLoadBase;
-        unsigned int HostLoadBase;
-        unsigned int XpHz;
-        unsigned int XpCps;
-        char *XpOn;
-        char *XpOff;
-        unsigned int MaxXpCps;
-        unsigned int MinXpCps;
-        unsigned int SpinCmds;
-        unsigned int FirstAddr;
-        unsigned int LastAddr;
-        unsigned int BufferSize;
-        unsigned int LowWater;
-        unsigned int LineLength;
-        unsigned int CmdTime;
-};
-
-/*
-**      Board types - these MUST correspond to product codes!
-*/
-#define RIO_EMPTY       0x0
-#define RIO_EISA        0x3
-#define RIO_RTA_16      0x9
-#define RIO_AT          0xA
-#define RIO_MCA         0xB
-#define RIO_PCI         0xD
-#define RIO_RTA         0xE
-
-/*
-**      Board data structure. This is used for configuration info
-*/
-struct Brd {
-        unsigned char Type;     /* RIO_EISA, RIO_MCA, RIO_AT, RIO_EMPTY... */
-        unsigned char Ivec;     /* POLLED or ivec number */
-        unsigned char Mode;     /* Control stuff, see below */
-};
-
-struct Board {
-        char Locator[RIO_LOCATOR_LEN];
-        int NumSlots;
-        struct Brd Boards[MAX_RIO_BOARDS];
-};
-
-#define BOOT_FROM_LINK          0x00
-#define BOOT_FROM_RAM           0x01
-#define EXTERNAL_BUS_OFF        0x00
-#define EXTERNAL_BUS_ON         0x02
-#define INTERRUPT_DISABLE       0x00
-#define INTERRUPT_ENABLE        0x04
-#define BYTE_OPERATION          0x00
-#define WORD_OPERATION          0x08
-#define POLLED                  INTERRUPT_DISABLE
-#define IRQ_15                  (0x00 | INTERRUPT_ENABLE)
-#define IRQ_12                  (0x10 | INTERRUPT_ENABLE)
-#define IRQ_11                  (0x20 | INTERRUPT_ENABLE)
-#define IRQ_9                   (0x30 | INTERRUPT_ENABLE)
-#define SLOW_LINKS              0x00
-#define FAST_LINKS              0x40
-#define SLOW_AT_BUS             0x00
-#define FAST_AT_BUS             0x80
-#define SLOW_PCI_TP             0x00
-#define FAST_PCI_TP             0x80
-/*
-**      Debug levels
-*/
-#define DBG_NONE        0x00000000
-
-#define DBG_INIT        0x00000001
-#define DBG_OPEN        0x00000002
-#define DBG_CLOSE       0x00000004
-#define DBG_IOCTL       0x00000008
-
-#define DBG_READ        0x00000010
-#define DBG_WRITE       0x00000020
-#define DBG_INTR        0x00000040
-#define DBG_PROC        0x00000080
-
-#define DBG_PARAM       0x00000100
-#define DBG_CMD         0x00000200
-#define DBG_XPRINT      0x00000400
-#define DBG_POLL        0x00000800
-
-#define DBG_DAEMON      0x00001000
-#define DBG_FAIL        0x00002000
-#define DBG_MODEM       0x00004000
-#define DBG_LIST        0x00008000
-
-#define DBG_ROUTE       0x00010000
-#define DBG_UTIL        0x00020000
-#define DBG_BOOT        0x00040000
-#define DBG_BUFFER      0x00080000
-
-#define DBG_MON         0x00100000
-#define DBG_SPECIAL     0x00200000
-#define DBG_VPIX        0x00400000
-#define DBG_FLUSH       0x00800000
-
-#define DBG_QENABLE     0x01000000
-
-#define DBG_ALWAYS      0x80000000
-
-#endif                          /* __rio_riospace_h__ */
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c
deleted file mode 100644
index 3d15802dc0f3..000000000000
--- a/drivers/char/rio/riotable.c
+++ /dev/null
@@ -1,941 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : riotable.c
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 10:33:47
-**      Retrieved       : 11/6/98 10:33:50
-**
-**  ident @(#)riotable.c        1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/string.h>
-
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/string.h>
-#include <asm/uaccess.h>
-
-#include <linux/termios.h>
-#include <linux/serial.h>
-
-#include <linux/generic_serial.h>
-
-
-#include "linux_compat.h"
-#include "rio_linux.h"
-#include "pkt.h"
-#include "daemon.h"
-#include "rio.h"
-#include "riospace.h"
-#include "cmdpkt.h"
-#include "map.h"
-#include "rup.h"
-#include "port.h"
-#include "riodrvr.h"
-#include "rioinfo.h"
-#include "func.h"
-#include "errors.h"
-#include "pci.h"
-
-#include "parmmap.h"
-#include "unixrup.h"
-#include "board.h"
-#include "host.h"
-#include "phb.h"
-#include "link.h"
-#include "cmdblk.h"
-#include "route.h"
-#include "cirrus.h"
-#include "rioioctl.h"
-#include "param.h"
-#include "protsts.h"
-
-/*
-** A configuration table has been loaded. It is now up to us
-** to sort it out and use the information contained therein.
-*/
-int RIONewTable(struct rio_info *p)
-{
-        int Host, Host1, Host2, NameIsUnique, Entry, SubEnt;
-        struct Map *MapP;
-        struct Map *HostMapP;
-        struct Host *HostP;
-
-        char *cptr;
-
-        /*
-         ** We have been sent a new table to install. We need to break
-         ** it down into little bits and spread it around a bit to see
-         ** what we have got.
-         */
-        /*
-         ** Things to check:
-         ** (things marked 'xx' aren't checked any more!)
-         ** (1) That there are no booted Hosts/RTAs out there.
-         ** (2) That the names are properly formed
-         ** (3) That blank entries really are.
-         ** xx (4)      That hosts mentioned in the table actually exist. xx
-         ** (5) That the IDs are unique (per host).
-         ** (6) That host IDs are zero
-         ** (7) That port numbers are valid
-         ** (8) That port numbers aren't duplicated
-         ** (9) That names aren't duplicated
-         ** xx (10) That hosts that actually exist are mentioned in the table. xx
-         */
-        rio_dprintk(RIO_DEBUG_TABLE, "RIONewTable: entering(1)\n");
-        if (p->RIOSystemUp) {   /* (1) */
-                p->RIOError.Error = HOST_HAS_ALREADY_BEEN_BOOTED;
-                return -EBUSY;
-        }
-
-        p->RIOError.Error = NOTHING_WRONG_AT_ALL;
-        p->RIOError.Entry = -1;
-        p->RIOError.Other = -1;
-
-        for (Entry = 0; Entry < TOTAL_MAP_ENTRIES; Entry++) {
-                MapP = &p->RIOConnectTable[Entry];
-                if ((MapP->Flags & RTA16_SECOND_SLOT) == 0) {
-                        rio_dprintk(RIO_DEBUG_TABLE, "RIONewTable: entering(2)\n");
-                        cptr = MapP->Name;      /* (2) */
-                        cptr[MAX_NAME_LEN - 1] = '\0';
-                        if (cptr[0] == '\0') {
-                                memcpy(MapP->Name, MapP->RtaUniqueNum ? "RTA    NN" : "HOST NN", 8);
-                                MapP->Name[5] = '0' + Entry / 10;
-                                MapP->Name[6] = '0' + Entry % 10;
-                        }
-                        while (*cptr) {
-                                if (*cptr < ' ' || *cptr > '~') {
-                                        p->RIOError.Error = BAD_CHARACTER_IN_NAME;
-                                        p->RIOError.Entry = Entry;
-                                        return -ENXIO;
-                                }
-                                cptr++;
-                        }
-                }
-
-                /*
-                 ** If the entry saved was a tentative entry then just forget
-                 ** about it.
-                 */
-                if (MapP->Flags & SLOT_TENTATIVE) {
-                        MapP->HostUniqueNum = 0;
-                        MapP->RtaUniqueNum = 0;
-                        continue;
-                }
-
-                rio_dprintk(RIO_DEBUG_TABLE, "RIONewTable: entering(3)\n");
-                if (!MapP->RtaUniqueNum && !MapP->HostUniqueNum) {      /* (3) */
-                        if (MapP->ID || MapP->SysPort || MapP->Flags) {
-                                rio_dprintk(RIO_DEBUG_TABLE, "%s pretending to be empty but isn't\n", MapP->Name);
-                                p->RIOError.Error = TABLE_ENTRY_ISNT_PROPERLY_NULL;
-                                p->RIOError.Entry = Entry;
-                                return -ENXIO;
-                        }
-                        rio_dprintk(RIO_DEBUG_TABLE, "!RIO: Daemon: test (3) passes\n");
-                        continue;
-                }
-
-                rio_dprintk(RIO_DEBUG_TABLE, "RIONewTable: entering(4)\n");
-                for (Host = 0; Host < p->RIONumHosts; Host++) { /* (4) */
-                        if (p->RIOHosts[Host].UniqueNum == MapP->HostUniqueNum) {
-                                HostP = &p->RIOHosts[Host];
-                                /*
-                                 ** having done the lookup, we don't really want to do
-                                 ** it again, so hang the host number in a safe place
-                                 */
-                                MapP->Topology[0].Unit = Host;
-                                break;
-                        }
-                }
-
-                if (Host >= p->RIONumHosts) {
-                        rio_dprintk(RIO_DEBUG_TABLE, "RTA %s has unknown host unique number 0x%x\n", MapP->Name, MapP->HostUniqueNum);
-                        MapP->HostUniqueNum = 0;
-                        /* MapP->RtaUniqueNum   = 0; */
-                        /* MapP->ID                     = 0; */
-                        /* MapP->Flags           = 0; */
-                        /* MapP->SysPort                 = 0; */
-                        /* MapP->Name[0]                 = 0; */
-                        continue;
-                }
-
-                rio_dprintk(RIO_DEBUG_TABLE, "RIONewTable: entering(5)\n");
-                if (MapP->RtaUniqueNum) {       /* (5) */
-                        if (!MapP->ID) {
-                                rio_dprintk(RIO_DEBUG_TABLE, "RIO: RTA %s has been allocated an ID of zero!\n", MapP->Name);
-                                p->RIOError.Error = ZERO_RTA_ID;
-                                p->RIOError.Entry = Entry;
-                                return -ENXIO;
-                        }
-                        if (MapP->ID > MAX_RUP) {
-                                rio_dprintk(RIO_DEBUG_TABLE, "RIO: RTA %s has been allocated an invalid ID %d\n", MapP->Name, MapP->ID);
-                                p->RIOError.Error = ID_NUMBER_OUT_OF_RANGE;
-                                p->RIOError.Entry = Entry;
-                                return -ENXIO;
-                        }
-                        for (SubEnt = 0; SubEnt < Entry; SubEnt++) {
-                                if (MapP->HostUniqueNum == p->RIOConnectTable[SubEnt].HostUniqueNum && MapP->ID == p->RIOConnectTable[SubEnt].ID) {
-                                        rio_dprintk(RIO_DEBUG_TABLE, "Dupl. ID number allocated to RTA %s and RTA %s\n", MapP->Name, p->RIOConnectTable[SubEnt].Name);
-                                        p->RIOError.Error = DUPLICATED_RTA_ID;
-                                        p->RIOError.Entry = Entry;
-                                        p->RIOError.Other = SubEnt;
-                                        return -ENXIO;
-                                }
-                                /*
-                                 ** If the RtaUniqueNum is the same, it may be looking at both
-                                 ** entries for a 16 port RTA, so check the ids
-                                 */
-                                if ((MapP->RtaUniqueNum == p->RIOConnectTable[SubEnt].RtaUniqueNum)
-                                    && (MapP->ID2 != p->RIOConnectTable[SubEnt].ID)) {
-                                        rio_dprintk(RIO_DEBUG_TABLE, "RTA %s has duplicate unique number\n", MapP->Name);
-                                        rio_dprintk(RIO_DEBUG_TABLE, "RTA %s has duplicate unique number\n", p->RIOConnectTable[SubEnt].Name);
-                                        p->RIOError.Error = DUPLICATE_UNIQUE_NUMBER;
-                                        p->RIOError.Entry = Entry;
-                                        p->RIOError.Other = SubEnt;
-                                        return -ENXIO;
-                                }
-                        }
-                        rio_dprintk(RIO_DEBUG_TABLE, "RIONewTable: entering(7a)\n");
-                        /* (7a) */
-                        if ((MapP->SysPort != NO_PORT) && (MapP->SysPort % PORTS_PER_RTA)) {
-                                rio_dprintk(RIO_DEBUG_TABLE, "TTY Port number %d-RTA %s is not a multiple of %d!\n", (int) MapP->SysPort, MapP->Name, PORTS_PER_RTA);
-                                p->RIOError.Error = TTY_NUMBER_OUT_OF_RANGE;
-                                p->RIOError.Entry = Entry;
-                                return -ENXIO;
-                        }
-                        rio_dprintk(RIO_DEBUG_TABLE, "RIONewTable: entering(7b)\n");
-                        /* (7b) */
-                        if ((MapP->SysPort != NO_PORT) && (MapP->SysPort >= RIO_PORTS)) {
-                                rio_dprintk(RIO_DEBUG_TABLE, "TTY Port number %d for RTA %s is too big\n", (int) MapP->SysPort, MapP->Name);
-                                p->RIOError.Error = TTY_NUMBER_OUT_OF_RANGE;
-                                p->RIOError.Entry = Entry;
-                                return -ENXIO;
-                        }
-                        for (SubEnt = 0; SubEnt < Entry; SubEnt++) {
-                                if (p->RIOConnectTable[SubEnt].Flags & RTA16_SECOND_SLOT)
-                                        continue;
-                                if (p->RIOConnectTable[SubEnt].RtaUniqueNum) {
-                                        rio_dprintk(RIO_DEBUG_TABLE, "RIONewTable: entering(8)\n");
-                                        /* (8) */
-                                        if ((MapP->SysPort != NO_PORT) && (MapP->SysPort == p->RIOConnectTable[SubEnt].SysPort)) {
-                                                rio_dprintk(RIO_DEBUG_TABLE, "RTA %s:same TTY port # as RTA %s (%d)\n", MapP->Name, p->RIOConnectTable[SubEnt].Name, (int) MapP->SysPort);
-                                                p->RIOError.Error = TTY_NUMBER_IN_USE;
-                                                p->RIOError.Entry = Entry;
-                                                p->RIOError.Other = SubEnt;
-                                                return -ENXIO;
-                                        }
-                                        rio_dprintk(RIO_DEBUG_TABLE, "RIONewTable: entering(9)\n");
-                                        if (strcmp(MapP->Name, p->RIOConnectTable[SubEnt].Name) == 0 && !(MapP->Flags & RTA16_SECOND_SLOT)) {   /* (9) */
-                                                rio_dprintk(RIO_DEBUG_TABLE, "RTA name %s used twice\n", MapP->Name);
-                                                p->RIOError.Error = NAME_USED_TWICE;
-                                                p->RIOError.Entry = Entry;
-                                                p->RIOError.Other = SubEnt;
-                                                return -ENXIO;
-                                        }
-                                }
-                        }
-                } else {        /* (6) */
-                        rio_dprintk(RIO_DEBUG_TABLE, "RIONewTable: entering(6)\n");
-                        if (MapP->ID) {
-                                rio_dprintk(RIO_DEBUG_TABLE, "RIO:HOST %s has been allocated ID that isn't zero!\n", MapP->Name);
-                                p->RIOError.Error = HOST_ID_NOT_ZERO;
-                                p->RIOError.Entry = Entry;
-                                return -ENXIO;
-                        }
-                        if (MapP->SysPort != NO_PORT) {
-                                rio_dprintk(RIO_DEBUG_TABLE, "RIO: HOST %s has been allocated port numbers!\n", MapP->Name);
-                                p->RIOError.Error = HOST_SYSPORT_BAD;
-                                p->RIOError.Entry = Entry;
-                                return -ENXIO;
-                        }
-                }
-        }
-
-        /*
-         ** wow! if we get here then it's a goody!
-         */
-
-        /*
-         ** Zero the (old) entries for each host...
-         */
-        for (Host = 0; Host < RIO_HOSTS; Host++) {
-                for (Entry = 0; Entry < MAX_RUP; Entry++) {
-                        memset(&p->RIOHosts[Host].Mapping[Entry], 0, sizeof(struct Map));
-                }
-                memset(&p->RIOHosts[Host].Name[0], 0, sizeof(p->RIOHosts[Host].Name));
-        }
-
-        /*
-         ** Copy in the new table entries
-         */
-        for (Entry = 0; Entry < TOTAL_MAP_ENTRIES; Entry++) {
-                rio_dprintk(RIO_DEBUG_TABLE, "RIONewTable: Copy table for Host entry %d\n", Entry);
-                MapP = &p->RIOConnectTable[Entry];
-
-                /*
-                 ** Now, if it is an empty slot ignore it!
-                 */
-                if (MapP->HostUniqueNum == 0)
-                        continue;
-
-                /*
-                 ** we saved the host number earlier, so grab it back
-                 */
-                HostP = &p->RIOHosts[MapP->Topology[0].Unit];
-
-                /*
-                 ** If it is a host, then we only need to fill in the name field.
-                 */
-                if (MapP->ID == 0) {
-                        rio_dprintk(RIO_DEBUG_TABLE, "Host entry found. Name %s\n", MapP->Name);
-                        memcpy(HostP->Name, MapP->Name, MAX_NAME_LEN);
-                        continue;
-                }
-
-                /*
-                 ** Its an RTA entry, so fill in the host mapping entries for it
-                 ** and the port mapping entries. Notice that entry zero is for
-                 ** ID one.
-                 */
-                HostMapP = &HostP->Mapping[MapP->ID - 1];
-
-                if (MapP->Flags & SLOT_IN_USE) {
-                        rio_dprintk(RIO_DEBUG_TABLE, "Rta entry found. Name %s\n", MapP->Name);
-                        /*
-                         ** structure assign, then sort out the bits we shouldn't have done
-                         */
-                        *HostMapP = *MapP;
-
-                        HostMapP->Flags = SLOT_IN_USE;
-                        if (MapP->Flags & RTA16_SECOND_SLOT)
-                                HostMapP->Flags |= RTA16_SECOND_SLOT;
-
-                        RIOReMapPorts(p, HostP, HostMapP);
-                } else {
-                        rio_dprintk(RIO_DEBUG_TABLE, "TENTATIVE Rta entry found. Name %s\n", MapP->Name);
-                }
-        }
-
-        for (Entry = 0; Entry < TOTAL_MAP_ENTRIES; Entry++) {
-                p->RIOSavedTable[Entry] = p->RIOConnectTable[Entry];
-        }
-
-        for (Host = 0; Host < p->RIONumHosts; Host++) {
-                for (SubEnt = 0; SubEnt < LINKS_PER_UNIT; SubEnt++) {
-                        p->RIOHosts[Host].Topology[SubEnt].Unit = ROUTE_DISCONNECT;
-                        p->RIOHosts[Host].Topology[SubEnt].Link = NO_LINK;
-                }
-                for (Entry = 0; Entry < MAX_RUP; Entry++) {
-                        for (SubEnt = 0; SubEnt < LINKS_PER_UNIT; SubEnt++) {
-                                p->RIOHosts[Host].Mapping[Entry].Topology[SubEnt].Unit = ROUTE_DISCONNECT;
-                                p->RIOHosts[Host].Mapping[Entry].Topology[SubEnt].Link = NO_LINK;
-                        }
-                }
-                if (!p->RIOHosts[Host].Name[0]) {
-                        memcpy(p->RIOHosts[Host].Name, "HOST 1", 7);
-                        p->RIOHosts[Host].Name[5] += Host;
-                }
-                /*
-                 ** Check that default name assigned is unique.
-                 */
-                Host1 = Host;
-                NameIsUnique = 0;
-                while (!NameIsUnique) {
-                        NameIsUnique = 1;
-                        for (Host2 = 0; Host2 < p->RIONumHosts; Host2++) {
-                                if (Host2 == Host)
-                                        continue;
-                                if (strcmp(p->RIOHosts[Host].Name, p->RIOHosts[Host2].Name)
-                                    == 0) {
-                                        NameIsUnique = 0;
-                                        Host1++;
-                                        if (Host1 >= p->RIONumHosts)
-                                                Host1 = 0;
-                                        p->RIOHosts[Host].Name[5] = '1' + Host1;
-                                }
-                        }
-                }
-                /*
-                 ** Rename host if name already used.
-                 */
-                if (Host1 != Host) {
-                        rio_dprintk(RIO_DEBUG_TABLE, "Default name %s already used\n", p->RIOHosts[Host].Name);
-                        memcpy(p->RIOHosts[Host].Name, "HOST 1", 7);
-                        p->RIOHosts[Host].Name[5] += Host1;
-                }
-                rio_dprintk(RIO_DEBUG_TABLE, "Assigning default name %s\n", p->RIOHosts[Host].Name);
-        }
-        return 0;
-}
-
-/*
-** User process needs the config table - build it from first
-** principles.
-**
-*       FIXME: SMP locking
-*/
-int RIOApel(struct rio_info *p)
-{
-        int Host;
-        int link;
-        int Rup;
-        int Next = 0;
-        struct Map *MapP;
-        struct Host *HostP;
-        unsigned long flags;
-
-        rio_dprintk(RIO_DEBUG_TABLE, "Generating a table to return to config.rio\n");
-
-        memset(&p->RIOConnectTable[0], 0, sizeof(struct Map) * TOTAL_MAP_ENTRIES);
-
-        for (Host = 0; Host < RIO_HOSTS; Host++) {
-                rio_dprintk(RIO_DEBUG_TABLE, "Processing host %d\n", Host);
-                HostP = &p->RIOHosts[Host];
-                rio_spin_lock_irqsave(&HostP->HostLock, flags);
-
-                MapP = &p->RIOConnectTable[Next++];
-                MapP->HostUniqueNum = HostP->UniqueNum;
-                if ((HostP->Flags & RUN_STATE) != RC_RUNNING) {
-                        rio_spin_unlock_irqrestore(&HostP->HostLock, flags);
-                        continue;
-                }
-                MapP->RtaUniqueNum = 0;
-                MapP->ID = 0;
-                MapP->Flags = SLOT_IN_USE;
-                MapP->SysPort = NO_PORT;
-                for (link = 0; link < LINKS_PER_UNIT; link++)
-                        MapP->Topology[link] = HostP->Topology[link];
-                memcpy(MapP->Name, HostP->Name, MAX_NAME_LEN);
-                for (Rup = 0; Rup < MAX_RUP; Rup++) {
-                        if (HostP->Mapping[Rup].Flags & (SLOT_IN_USE | SLOT_TENTATIVE)) {
-                                p->RIOConnectTable[Next] = HostP->Mapping[Rup];
-                                if (HostP->Mapping[Rup].Flags & SLOT_IN_USE)
-                                        p->RIOConnectTable[Next].Flags |= SLOT_IN_USE;
-                                if (HostP->Mapping[Rup].Flags & SLOT_TENTATIVE)
-                                        p->RIOConnectTable[Next].Flags |= SLOT_TENTATIVE;
-                                if (HostP->Mapping[Rup].Flags & RTA16_SECOND_SLOT)
-                                        p->RIOConnectTable[Next].Flags |= RTA16_SECOND_SLOT;
-                                Next++;
-                        }
-                }
-                rio_spin_unlock_irqrestore(&HostP->HostLock, flags);
-        }
-        return 0;
-}
-
-/*
-** config.rio has taken a dislike to one of the gross maps entries.
-** if the entry is suitably inactive, then we can gob on it and remove
-** it from the table.
-*/
-int RIODeleteRta(struct rio_info *p, struct Map *MapP)
-{
-        int host, entry, port, link;
-        int SysPort;
-        struct Host *HostP;
-        struct Map *HostMapP;
-        struct Port *PortP;
-        int work_done = 0;
-        unsigned long lock_flags, sem_flags;
-
-        rio_dprintk(RIO_DEBUG_TABLE, "Delete entry on host %x, rta %x\n", MapP->HostUniqueNum, MapP->RtaUniqueNum);
-
-        for (host = 0; host < p->RIONumHosts; host++) {
-                HostP = &p->RIOHosts[host];
-
-                rio_spin_lock_irqsave(&HostP->HostLock, lock_flags);
-
-                if ((HostP->Flags & RUN_STATE) != RC_RUNNING) {
-                        rio_spin_unlock_irqrestore(&HostP->HostLock, lock_flags);
-                        continue;
-                }
-
-                for (entry = 0; entry < MAX_RUP; entry++) {
-                        if (MapP->RtaUniqueNum == HostP->Mapping[entry].RtaUniqueNum) {
-                                HostMapP = &HostP->Mapping[entry];
-                                rio_dprintk(RIO_DEBUG_TABLE, "Found entry offset %d on host %s\n", entry, HostP->Name);
-
-                                /*
-                                 ** Check all four links of the unit are disconnected
-                                 */
-                                for (link = 0; link < LINKS_PER_UNIT; link++) {
-                                        if (HostMapP->Topology[link].Unit != ROUTE_DISCONNECT) {
-                                                rio_dprintk(RIO_DEBUG_TABLE, "Entry is in use and cannot be deleted!\n");
-                                                p->RIOError.Error = UNIT_IS_IN_USE;
-                                                rio_spin_unlock_irqrestore(&HostP->HostLock, lock_flags);
-                                                return -EBUSY;
-                                        }
-                                }
-                                /*
-                                 ** Slot has been allocated, BUT not booted/routed/
-                                 ** connected/selected or anything else-ed
-                                 */
-                                SysPort = HostMapP->SysPort;
-
-                                if (SysPort != NO_PORT) {
-                                        for (port = SysPort; port < SysPort + PORTS_PER_RTA; port++) {
-                                                PortP = p->RIOPortp[port];
-                                                rio_dprintk(RIO_DEBUG_TABLE, "Unmap port\n");
-
-                                                rio_spin_lock_irqsave(&PortP->portSem, sem_flags);
-
-                                                PortP->Mapped = 0;
-
-                                                if (PortP->State & (RIO_MOPEN | RIO_LOPEN)) {
-
-                                                        rio_dprintk(RIO_DEBUG_TABLE, "Gob on port\n");
-                                                        PortP->TxBufferIn = PortP->TxBufferOut = 0;
-                                                        /* What should I do 
-                                                           wakeup( &PortP->TxBufferIn );
-                                                           wakeup( &PortP->TxBufferOut);
-                                                         */
-                                                        PortP->InUse = NOT_INUSE;
-                                                        /* What should I do 
-                                                           wakeup( &PortP->InUse );
-                                                           signal(PortP->TtyP->t_pgrp,SIGKILL);
-                                                           ttyflush(PortP->TtyP,(FREAD|FWRITE));
-                                                         */
-                                                        PortP->State |= RIO_CLOSING | RIO_DELETED;
-                                                }
-
-                                                /*
-                                                 ** For the second slot of a 16 port RTA, the
-                                                 ** driver needs to reset the changes made to
-                                                 ** the phb to port mappings in RIORouteRup.
-                                                 */
-                                                if (PortP->SecondBlock) {
-                                                        u16 dest_unit = HostMapP->ID;
-                                                        u16 dest_port = port - SysPort;
-                                                        u16 __iomem *TxPktP;
-                                                        struct PKT __iomem *Pkt;
-
-                                                        for (TxPktP = PortP->TxStart; TxPktP <= PortP->TxEnd; TxPktP++) {
-                                                                /*
-                                                                 ** *TxPktP is the pointer to the
-                                                                 ** transmit packet on the host card.
-                                                                 ** This needs to be translated into
-                                                                 ** a 32 bit pointer so it can be
-                                                                 ** accessed from the driver.
-                                                                 */
-                                                                Pkt = (struct PKT __iomem *) RIO_PTR(HostP->Caddr, readw(&*TxPktP));
-                                                                rio_dprintk(RIO_DEBUG_TABLE, "Tx packet (%x) destination: Old %x:%x New %x:%x\n", readw(TxPktP), readb(&Pkt->dest_unit), readb(&Pkt->dest_port), dest_unit, dest_port);
-                                                                writew(dest_unit, &Pkt->dest_unit);
-                                                                writew(dest_port, &Pkt->dest_port);
-                                                        }
-                                                        rio_dprintk(RIO_DEBUG_TABLE, "Port %d phb destination: Old %x:%x New %x:%x\n", port, readb(&PortP->PhbP->destination) & 0xff, (readb(&PortP->PhbP->destination) >> 8) & 0xff, dest_unit, dest_port);
-                                                        writew(dest_unit + (dest_port << 8), &PortP->PhbP->destination);
-                                                }
-                                                rio_spin_unlock_irqrestore(&PortP->portSem, sem_flags);
-                                        }
-                                }
-                                rio_dprintk(RIO_DEBUG_TABLE, "Entry nulled.\n");
-                                memset(HostMapP, 0, sizeof(struct Map));
-                                work_done++;
-                        }
-                }
-                rio_spin_unlock_irqrestore(&HostP->HostLock, lock_flags);
-        }
-
-        /* XXXXX lock me up */
-        for (entry = 0; entry < TOTAL_MAP_ENTRIES; entry++) {
-                if (p->RIOSavedTable[entry].RtaUniqueNum == MapP->RtaUniqueNum) {
-                        memset(&p->RIOSavedTable[entry], 0, sizeof(struct Map));
-                        work_done++;
-                }
-                if (p->RIOConnectTable[entry].RtaUniqueNum == MapP->RtaUniqueNum) {
-                        memset(&p->RIOConnectTable[entry], 0, sizeof(struct Map));
-                        work_done++;
-                }
-        }
-        if (work_done)
-                return 0;
-
-        rio_dprintk(RIO_DEBUG_TABLE, "Couldn't find entry to be deleted\n");
-        p->RIOError.Error = COULDNT_FIND_ENTRY;
-        return -ENXIO;
-}
-
-int RIOAssignRta(struct rio_info *p, struct Map *MapP)
-{
-        int host;
-        struct Map *HostMapP;
-        char *sptr;
-        int link;
-
-
-        rio_dprintk(RIO_DEBUG_TABLE, "Assign entry on host %x, rta %x, ID %d, Sysport %d\n", MapP->HostUniqueNum, MapP->RtaUniqueNum, MapP->ID, (int) MapP->SysPort);
-
-        if ((MapP->ID != (u16) - 1) && ((int) MapP->ID < (int) 1 || (int) MapP->ID > MAX_RUP)) {
-                rio_dprintk(RIO_DEBUG_TABLE, "Bad ID in map entry!\n");
-                p->RIOError.Error = ID_NUMBER_OUT_OF_RANGE;
-                return -EINVAL;
-        }
-        if (MapP->RtaUniqueNum == 0) {
-                rio_dprintk(RIO_DEBUG_TABLE, "Rta Unique number zero!\n");
-                p->RIOError.Error = RTA_UNIQUE_NUMBER_ZERO;
-                return -EINVAL;
-        }
-        if ((MapP->SysPort != NO_PORT) && (MapP->SysPort % PORTS_PER_RTA)) {
-                rio_dprintk(RIO_DEBUG_TABLE, "Port %d not multiple of %d!\n", (int) MapP->SysPort, PORTS_PER_RTA);
-                p->RIOError.Error = TTY_NUMBER_OUT_OF_RANGE;
-                return -EINVAL;
-        }
-        if ((MapP->SysPort != NO_PORT) && (MapP->SysPort >= RIO_PORTS)) {
-                rio_dprintk(RIO_DEBUG_TABLE, "Port %d not valid!\n", (int) MapP->SysPort);
-                p->RIOError.Error = TTY_NUMBER_OUT_OF_RANGE;
-                return -EINVAL;
-        }
-
-        /*
-         ** Copy the name across to the map entry.
-         */
-        MapP->Name[MAX_NAME_LEN - 1] = '\0';
-        sptr = MapP->Name;
-        while (*sptr) {
-                if (*sptr < ' ' || *sptr > '~') {
-                        rio_dprintk(RIO_DEBUG_TABLE, "Name entry contains non-printing characters!\n");
-                        p->RIOError.Error = BAD_CHARACTER_IN_NAME;
-                        return -EINVAL;
-                }
-                sptr++;
-        }
-
-        for (host = 0; host < p->RIONumHosts; host++) {
-                if (MapP->HostUniqueNum == p->RIOHosts[host].UniqueNum) {
-                        if ((p->RIOHosts[host].Flags & RUN_STATE) != RC_RUNNING) {
-                                p->RIOError.Error = HOST_NOT_RUNNING;
-                                return -ENXIO;
-                        }
-
-                        /*
-                         ** Now we have a host we need to allocate an ID
-                         ** if the entry does not already have one.
-                         */
-                        if (MapP->ID == (u16) - 1) {
-                                int nNewID;
-
-                                rio_dprintk(RIO_DEBUG_TABLE, "Attempting to get a new ID for rta \"%s\"\n", MapP->Name);
-                                /*
-                                 ** The idea here is to allow RTA's to be assigned
-                                 ** before they actually appear on the network.
-                                 ** This allows the addition of RTA's without having
-                                 ** to plug them in.
-                                 ** What we do is:
-                                 **  - Find a free ID and allocate it to the RTA.
-                                 **  - If this map entry is the second half of a
-                                 **    16 port entry then find the other half and
-                                 **    make sure the 2 cross reference each other.
-                                 */
-                                if (RIOFindFreeID(p, &p->RIOHosts[host], &nNewID, NULL) != 0) {
-                                        p->RIOError.Error = COULDNT_FIND_ENTRY;
-                                        return -EBUSY;
-                                }
-                                MapP->ID = (u16) nNewID + 1;
-                                rio_dprintk(RIO_DEBUG_TABLE, "Allocated ID %d for this new RTA.\n", MapP->ID);
-                                HostMapP = &p->RIOHosts[host].Mapping[nNewID];
-                                HostMapP->RtaUniqueNum = MapP->RtaUniqueNum;
-                                HostMapP->HostUniqueNum = MapP->HostUniqueNum;
-                                HostMapP->ID = MapP->ID;
-                                for (link = 0; link < LINKS_PER_UNIT; link++) {
-                                        HostMapP->Topology[link].Unit = ROUTE_DISCONNECT;
-                                        HostMapP->Topology[link].Link = NO_LINK;
-                                }
-                                if (MapP->Flags & RTA16_SECOND_SLOT) {
-                                        int unit;
-
-                                        for (unit = 0; unit < MAX_RUP; unit++)
-                                                if (p->RIOHosts[host].Mapping[unit].RtaUniqueNum == MapP->RtaUniqueNum)
-                                                        break;
-                                        if (unit == MAX_RUP) {
-                                                p->RIOError.Error = COULDNT_FIND_ENTRY;
-                                                return -EBUSY;
-                                        }
-                                        HostMapP->Flags |= RTA16_SECOND_SLOT;
-                                        HostMapP->ID2 = MapP->ID2 = p->RIOHosts[host].Mapping[unit].ID;
-                                        p->RIOHosts[host].Mapping[unit].ID2 = MapP->ID;
-                                        rio_dprintk(RIO_DEBUG_TABLE, "Cross referenced id %d to ID %d.\n", MapP->ID, p->RIOHosts[host].Mapping[unit].ID);
-                                }
-                        }
-
-                        HostMapP = &p->RIOHosts[host].Mapping[MapP->ID - 1];
-
-                        if (HostMapP->Flags & SLOT_IN_USE) {
-                                rio_dprintk(RIO_DEBUG_TABLE, "Map table slot for ID %d is already in use.\n", MapP->ID);
-                                p->RIOError.Error = ID_ALREADY_IN_USE;
-                                return -EBUSY;
-                        }
-
-                        /*
-                         ** Assign the sys ports and the name, and mark the slot as
-                         ** being in use.
-                         */
-                        HostMapP->SysPort = MapP->SysPort;
-                        if ((MapP->Flags & RTA16_SECOND_SLOT) == 0)
-                                memcpy(HostMapP->Name, MapP->Name, MAX_NAME_LEN);
-                        HostMapP->Flags = SLOT_IN_USE | RTA_BOOTED;
-#ifdef NEED_TO_FIX
-                        RIO_SV_BROADCAST(p->RIOHosts[host].svFlags[MapP->ID - 1]);
-#endif
-                        if (MapP->Flags & RTA16_SECOND_SLOT)
-                                HostMapP->Flags |= RTA16_SECOND_SLOT;
-
-                        RIOReMapPorts(p, &p->RIOHosts[host], HostMapP);
-                        /*
-                         ** Adjust 2nd block of 8 phbs
-                         */
-                        if (MapP->Flags & RTA16_SECOND_SLOT)
-                                RIOFixPhbs(p, &p->RIOHosts[host], HostMapP->ID - 1);
-
-                        if (HostMapP->SysPort != NO_PORT) {
-                                if (HostMapP->SysPort < p->RIOFirstPortsBooted)
-                                        p->RIOFirstPortsBooted = HostMapP->SysPort;
-                                if (HostMapP->SysPort > p->RIOLastPortsBooted)
-                                        p->RIOLastPortsBooted = HostMapP->SysPort;
-                        }
-                        if (MapP->Flags & RTA16_SECOND_SLOT)
-                                rio_dprintk(RIO_DEBUG_TABLE, "Second map of RTA %s added to configuration\n", p->RIOHosts[host].Mapping[MapP->ID2 - 1].Name);
-                        else
-                                rio_dprintk(RIO_DEBUG_TABLE, "RTA %s added to configuration\n", MapP->Name);
-                        return 0;
-                }
-        }
-        p->RIOError.Error = UNKNOWN_HOST_NUMBER;
-        rio_dprintk(RIO_DEBUG_TABLE, "Unknown host %x\n", MapP->HostUniqueNum);
-        return -ENXIO;
-}
-
-
-int RIOReMapPorts(struct rio_info *p, struct Host *HostP, struct Map *HostMapP)
-{
-        struct Port *PortP;
-        unsigned int SubEnt;
-        unsigned int HostPort;
-        unsigned int SysPort;
-        u16 RtaType;
-        unsigned long flags;
-
-        rio_dprintk(RIO_DEBUG_TABLE, "Mapping sysport %d to id %d\n", (int) HostMapP->SysPort, HostMapP->ID);
-
-        /*
-         ** We need to tell the UnixRups which sysport the rup corresponds to
-         */
-        HostP->UnixRups[HostMapP->ID - 1].BaseSysPort = HostMapP->SysPort;
-
-        if (HostMapP->SysPort == NO_PORT)
-                return (0);
-
-        RtaType = GetUnitType(HostMapP->RtaUniqueNum);
-        rio_dprintk(RIO_DEBUG_TABLE, "Mapping sysport %d-%d\n", (int) HostMapP->SysPort, (int) HostMapP->SysPort + PORTS_PER_RTA - 1);
-
-        /*
-         ** now map each of its eight ports
-         */
-        for (SubEnt = 0; SubEnt < PORTS_PER_RTA; SubEnt++) {
-                rio_dprintk(RIO_DEBUG_TABLE, "subent = %d, HostMapP->SysPort = %d\n", SubEnt, (int) HostMapP->SysPort);
-                SysPort = HostMapP->SysPort + SubEnt;   /* portnumber within system */
-                /* portnumber on host */
-
-                HostPort = (HostMapP->ID - 1) * PORTS_PER_RTA + SubEnt;
-
-                rio_dprintk(RIO_DEBUG_TABLE, "c1 p = %p, p->rioPortp = %p\n", p, p->RIOPortp);
-                PortP = p->RIOPortp[SysPort];
-                rio_dprintk(RIO_DEBUG_TABLE, "Map port\n");
-
-                /*
-                 ** Point at all the real neat data structures
-                 */
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                PortP->HostP = HostP;
-                PortP->Caddr = HostP->Caddr;
-
-                /*
-                 ** The PhbP cannot be filled in yet
-                 ** unless the host has been booted
-                 */
-                if ((HostP->Flags & RUN_STATE) == RC_RUNNING) {
-                        struct PHB __iomem *PhbP = PortP->PhbP = &HostP->PhbP[HostPort];
-                        PortP->TxAdd = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_add));
-                        PortP->TxStart = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_start));
-                        PortP->TxEnd = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_end));
-                        PortP->RxRemove = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_remove));
-                        PortP->RxStart = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_start));
-                        PortP->RxEnd = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_end));
-                } else
-                        PortP->PhbP = NULL;
-
-                /*
-                 ** port related flags
-                 */
-                PortP->HostPort = HostPort;
-                /*
-                 ** For each part of a 16 port RTA, RupNum is ID - 1.
-                 */
-                PortP->RupNum = HostMapP->ID - 1;
-                if (HostMapP->Flags & RTA16_SECOND_SLOT) {
-                        PortP->ID2 = HostMapP->ID2 - 1;
-                        PortP->SecondBlock = 1;
-                } else {
-                        PortP->ID2 = 0;
-                        PortP->SecondBlock = 0;
-                }
-                PortP->RtaUniqueNum = HostMapP->RtaUniqueNum;
-
-                /*
-                 ** If the port was already mapped then thats all we need to do.
-                 */
-                if (PortP->Mapped) {
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        continue;
-                } else
-                        HostMapP->Flags &= ~RTA_NEWBOOT;
-
-                PortP->State = 0;
-                PortP->Config = 0;
-                /*
-                 ** Check out the module type - if it is special (read only etc.)
-                 ** then we need to set flags in the PortP->Config.
-                 ** Note: For 16 port RTA, all ports are of the same type.
-                 */
-                if (RtaType == TYPE_RTA16) {
-                        PortP->Config |= p->RIOModuleTypes[HostP->UnixRups[HostMapP->ID - 1].ModTypes].Flags[SubEnt % PORTS_PER_MODULE];
-                } else {
-                        if (SubEnt < PORTS_PER_MODULE)
-                                PortP->Config |= p->RIOModuleTypes[LONYBLE(HostP->UnixRups[HostMapP->ID - 1].ModTypes)].Flags[SubEnt % PORTS_PER_MODULE];
-                        else
-                                PortP->Config |= p->RIOModuleTypes[HINYBLE(HostP->UnixRups[HostMapP->ID - 1].ModTypes)].Flags[SubEnt % PORTS_PER_MODULE];
-                }
-
-                /*
-                 ** more port related flags
-                 */
-                PortP->PortState = 0;
-                PortP->ModemLines = 0;
-                PortP->ModemState = 0;
-                PortP->CookMode = COOK_WELL;
-                PortP->ParamSem = 0;
-                PortP->FlushCmdBodge = 0;
-                PortP->WflushFlag = 0;
-                PortP->MagicFlags = 0;
-                PortP->Lock = 0;
-                PortP->Store = 0;
-                PortP->FirstOpen = 1;
-
-                /*
-                 ** Buffers 'n things
-                 */
-                PortP->RxDataStart = 0;
-                PortP->Cor2Copy = 0;
-                PortP->Name = &HostMapP->Name[0];
-                PortP->statsGather = 0;
-                PortP->txchars = 0;
-                PortP->rxchars = 0;
-                PortP->opens = 0;
-                PortP->closes = 0;
-                PortP->ioctls = 0;
-                if (PortP->TxRingBuffer)
-                        memset(PortP->TxRingBuffer, 0, p->RIOBufferSize);
-                else if (p->RIOBufferSize) {
-                        PortP->TxRingBuffer = kzalloc(p->RIOBufferSize, GFP_KERNEL);
-                }
-                PortP->TxBufferOut = 0;
-                PortP->TxBufferIn = 0;
-                PortP->Debug = 0;
-                /*
-                 ** LastRxTgl stores the state of the rx toggle bit for this
-                 ** port, to be compared with the state of the next pkt received.
-                 ** If the same, we have received the same rx pkt from the RTA
-                 ** twice. Initialise to a value not equal to PHB_RX_TGL or 0.
-                 */
-                PortP->LastRxTgl = ~(u8) PHB_RX_TGL;
-
-                /*
-                 ** and mark the port as usable
-                 */
-                PortP->Mapped = 1;
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-        }
-        if (HostMapP->SysPort < p->RIOFirstPortsMapped)
-                p->RIOFirstPortsMapped = HostMapP->SysPort;
-        if (HostMapP->SysPort > p->RIOLastPortsMapped)
-                p->RIOLastPortsMapped = HostMapP->SysPort;
-
-        return 0;
-}
-
-int RIOChangeName(struct rio_info *p, struct Map *MapP)
-{
-        int host;
-        struct Map *HostMapP;
-        char *sptr;
-
-        rio_dprintk(RIO_DEBUG_TABLE, "Change name entry on host %x, rta %x, ID %d, Sysport %d\n", MapP->HostUniqueNum, MapP->RtaUniqueNum, MapP->ID, (int) MapP->SysPort);
-
-        if (MapP->ID > MAX_RUP) {
-                rio_dprintk(RIO_DEBUG_TABLE, "Bad ID in map entry!\n");
-                p->RIOError.Error = ID_NUMBER_OUT_OF_RANGE;
-                return -EINVAL;
-        }
-
-        MapP->Name[MAX_NAME_LEN - 1] = '\0';
-        sptr = MapP->Name;
-
-        while (*sptr) {
-                if (*sptr < ' ' || *sptr > '~') {
-                        rio_dprintk(RIO_DEBUG_TABLE, "Name entry contains non-printing characters!\n");
-                        p->RIOError.Error = BAD_CHARACTER_IN_NAME;
-                        return -EINVAL;
-                }
-                sptr++;
-        }
-
-        for (host = 0; host < p->RIONumHosts; host++) {
-                if (MapP->HostUniqueNum == p->RIOHosts[host].UniqueNum) {
-                        if ((p->RIOHosts[host].Flags & RUN_STATE) != RC_RUNNING) {
-                                p->RIOError.Error = HOST_NOT_RUNNING;
-                                return -ENXIO;
-                        }
-                        if (MapP->ID == 0) {
-                                memcpy(p->RIOHosts[host].Name, MapP->Name, MAX_NAME_LEN);
-                                return 0;
-                        }
-
-                        HostMapP = &p->RIOHosts[host].Mapping[MapP->ID - 1];
-
-                        if (HostMapP->RtaUniqueNum != MapP->RtaUniqueNum) {
-                                p->RIOError.Error = RTA_NUMBER_WRONG;
-                                return -ENXIO;
-                        }
-                        memcpy(HostMapP->Name, MapP->Name, MAX_NAME_LEN);
-                        return 0;
-                }
-        }
-        p->RIOError.Error = UNKNOWN_HOST_NUMBER;
-        rio_dprintk(RIO_DEBUG_TABLE, "Unknown host %x\n", MapP->HostUniqueNum);
-        return -ENXIO;
-}
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c
deleted file mode 100644
index 8a90393faf3c..000000000000
--- a/drivers/char/rio/riotty.c
+++ /dev/null
@@ -1,654 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : riotty.c
-**      SID             : 1.3
-**      Last Modified   : 11/6/98 10:33:47
-**      Retrieved       : 11/6/98 10:33:50
-**
-**  ident @(#)riotty.c  1.3
-**
-** -----------------------------------------------------------------------------
-*/
-
-#define __EXPLICIT_DEF_H__
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/string.h>
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/string.h>
-#include <asm/uaccess.h>
-
-#include <linux/termios.h>
-
-#include <linux/serial.h>
-
-#include <linux/generic_serial.h>
-
-
-#include "linux_compat.h"
-#include "rio_linux.h"
-#include "pkt.h"
-#include "daemon.h"
-#include "rio.h"
-#include "riospace.h"
-#include "cmdpkt.h"
-#include "map.h"
-#include "rup.h"
-#include "port.h"
-#include "riodrvr.h"
-#include "rioinfo.h"
-#include "func.h"
-#include "errors.h"
-#include "pci.h"
-
-#include "parmmap.h"
-#include "unixrup.h"
-#include "board.h"
-#include "host.h"
-#include "phb.h"
-#include "link.h"
-#include "cmdblk.h"
-#include "route.h"
-#include "cirrus.h"
-#include "rioioctl.h"
-#include "param.h"
-
-static void RIOClearUp(struct Port *PortP);
-
-/* Below belongs in func.h */
-int RIOShortCommand(struct rio_info *p, struct Port *PortP, int command, int len, int arg);
-
-
-extern struct rio_info *p;
-
-
-int riotopen(struct tty_struct *tty, struct file *filp)
-{
-        unsigned int SysPort;
-        int repeat_this = 250;
-        struct Port *PortP;     /* pointer to the port structure */
-        unsigned long flags;
-        int retval = 0;
-
-        func_enter();
-
-        /* Make sure driver_data is NULL in case the rio isn't booted jet. Else gs_close
-           is going to oops.
-         */
-        tty->driver_data = NULL;
-
-        SysPort = rio_minor(tty);
-
-        if (p->RIOFailed) {
-                rio_dprintk(RIO_DEBUG_TTY, "System initialisation failed\n");
-                func_exit();
-                return -ENXIO;
-        }
-
-        rio_dprintk(RIO_DEBUG_TTY, "port open SysPort %d (mapped:%d)\n", SysPort, p->RIOPortp[SysPort]->Mapped);
-
-        /*
-         ** Validate that we have received a legitimate request.
-         ** Currently, just check that we are opening a port on
-         ** a host card that actually exists, and that the port
-         ** has been mapped onto a host.
-         */
-        if (SysPort >= RIO_PORTS) {     /* out of range ? */
-                rio_dprintk(RIO_DEBUG_TTY, "Illegal port number %d\n", SysPort);
-                func_exit();
-                return -ENXIO;
-        }
-
-        /*
-         ** Grab pointer to the port stucture
-         */
-        PortP = p->RIOPortp[SysPort];   /* Get control struc */
-        rio_dprintk(RIO_DEBUG_TTY, "PortP: %p\n", PortP);
-        if (!PortP->Mapped) {   /* we aren't mapped yet! */
-                /*
-                 ** The system doesn't know which RTA this port
-                 ** corresponds to.
-                 */
-                rio_dprintk(RIO_DEBUG_TTY, "port not mapped into system\n");
-                func_exit();
-                return -ENXIO;
-        }
-
-        tty->driver_data = PortP;
-
-        PortP->gs.port.tty = tty;
-        PortP->gs.port.count++;
-
-        rio_dprintk(RIO_DEBUG_TTY, "%d bytes in tx buffer\n", PortP->gs.xmit_cnt);
-
-        retval = gs_init_port(&PortP->gs);
-        if (retval) {
-                PortP->gs.port.count--;
-                return -ENXIO;
-        }
-        /*
-         ** If the host hasn't been booted yet, then
-         ** fail
-         */
-        if ((PortP->HostP->Flags & RUN_STATE) != RC_RUNNING) {
-                rio_dprintk(RIO_DEBUG_TTY, "Host not running\n");
-                func_exit();
-                return -ENXIO;
-        }
-
-        /*
-         ** If the RTA has not booted yet and the user has choosen to block
-         ** until the RTA is present then we must spin here waiting for
-         ** the RTA to boot.
-         */
-        /* I find the above code a bit hairy. I find the below code
-           easier to read and shorter. Now, if it works too that would
-           be great... -- REW 
-         */
-        rio_dprintk(RIO_DEBUG_TTY, "Checking if RTA has booted... \n");
-        while (!(PortP->HostP->Mapping[PortP->RupNum].Flags & RTA_BOOTED)) {
-                if (!PortP->WaitUntilBooted) {
-                        rio_dprintk(RIO_DEBUG_TTY, "RTA never booted\n");
-                        func_exit();
-                        return -ENXIO;
-                }
-
-                /* Under Linux you'd normally use a wait instead of this
-                   busy-waiting. I'll stick with the old implementation for
-                   now. --REW
-                 */
-                if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
-                        rio_dprintk(RIO_DEBUG_TTY, "RTA_wait_for_boot: EINTR in delay \n");
-                        func_exit();
-                        return -EINTR;
-                }
-                if (repeat_this-- <= 0) {
-                        rio_dprintk(RIO_DEBUG_TTY, "Waiting for RTA to boot timeout\n");
-                        func_exit();
-                        return -EIO;
-                }
-        }
-        rio_dprintk(RIO_DEBUG_TTY, "RTA has been booted\n");
-        rio_spin_lock_irqsave(&PortP->portSem, flags);
-        if (p->RIOHalted) {
-                goto bombout;
-        }
-
-        /*
-         ** If the port is in the final throws of being closed,
-         ** we should wait here (politely), waiting
-         ** for it to finish, so that it doesn't close us!
-         */
-        while ((PortP->State & RIO_CLOSING) && !p->RIOHalted) {
-                rio_dprintk(RIO_DEBUG_TTY, "Waiting for RIO_CLOSING to go away\n");
-                if (repeat_this-- <= 0) {
-                        rio_dprintk(RIO_DEBUG_TTY, "Waiting for not idle closed broken by signal\n");
-                        RIOPreemptiveCmd(p, PortP, RIOC_FCLOSE);
-                        retval = -EINTR;
-                        goto bombout;
-                }
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
-                        rio_spin_lock_irqsave(&PortP->portSem, flags);
-                        retval = -EINTR;
-                        goto bombout;
-                }
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-        }
-
-        if (!PortP->Mapped) {
-                rio_dprintk(RIO_DEBUG_TTY, "Port unmapped while closing!\n");
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                retval = -ENXIO;
-                func_exit();
-                return retval;
-        }
-
-        if (p->RIOHalted) {
-                goto bombout;
-        }
-
-/*
-** 15.10.1998 ARG - ESIL 0761 part fix
-** RIO has it's own CTSFLOW and RTSFLOW flags in 'Config' in the port structure,
-** we need to make sure that the flags are clear when the port is opened.
-*/
-        /* Uh? Suppose I turn these on and then another process opens
-           the port again? The flags get cleared! Not good. -- REW */
-        if (!(PortP->State & (RIO_LOPEN | RIO_MOPEN))) {
-                PortP->Config &= ~(RIO_CTSFLOW | RIO_RTSFLOW);
-        }
-
-        if (!(PortP->firstOpen)) {      /* First time ? */
-                rio_dprintk(RIO_DEBUG_TTY, "First open for this port\n");
-
-
-                PortP->firstOpen++;
-                PortP->CookMode = 0;    /* XXX RIOCookMode(tp); */
-                PortP->InUse = NOT_INUSE;
-
-                /* Tentative fix for bug PR27. Didn't work. */
-                /* PortP->gs.xmit_cnt = 0; */
-
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-
-                /* Someone explain to me why this delay/config is
-                   here. If I read the docs correctly the "open"
-                   command piggybacks the parameters immediately.
-                   -- REW */
-                RIOParam(PortP, RIOC_OPEN, 1, OK_TO_SLEEP); /* Open the port */
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-
-                /*
-                 ** wait for the port to be not closed.
-                 */
-                while (!(PortP->PortState & PORT_ISOPEN) && !p->RIOHalted) {
-                        rio_dprintk(RIO_DEBUG_TTY, "Waiting for PORT_ISOPEN-currently %x\n", PortP->PortState);
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
-                                rio_dprintk(RIO_DEBUG_TTY, "Waiting for open to finish broken by signal\n");
-                                RIOPreemptiveCmd(p, PortP, RIOC_FCLOSE);
-                                func_exit();
-                                return -EINTR;
-                        }
-                        rio_spin_lock_irqsave(&PortP->portSem, flags);
-                }
-
-                if (p->RIOHalted) {
-                        retval = -EIO;
-                      bombout:
-                        /*                    RIOClearUp( PortP ); */
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        return retval;
-                }
-                rio_dprintk(RIO_DEBUG_TTY, "PORT_ISOPEN found\n");
-        }
-        rio_dprintk(RIO_DEBUG_TTY, "Modem - test for carrier\n");
-        /*
-         ** ACTION
-         ** insert test for carrier here. -- ???
-         ** I already see that test here. What's the deal? -- REW
-         */
-        if ((PortP->gs.port.tty->termios->c_cflag & CLOCAL) ||
-                        (PortP->ModemState & RIOC_MSVR1_CD)) {
-                rio_dprintk(RIO_DEBUG_TTY, "open(%d) Modem carr on\n", SysPort);
-                /*
-                   tp->tm.c_state |= CARR_ON;
-                   wakeup((caddr_t) &tp->tm.c_canq);
-                 */
-                PortP->State |= RIO_CARR_ON;
-                wake_up_interruptible(&PortP->gs.port.open_wait);
-        } else {        /* no carrier - wait for DCD */
-                        /*
-                   while (!(PortP->gs.port.tty->termios->c_state & CARR_ON) &&
-                   !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted )
-                 */
-                while (!(PortP->State & RIO_CARR_ON) && !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted) {
-                                rio_dprintk(RIO_DEBUG_TTY, "open(%d) sleeping for carr on\n", SysPort);
-                        /*
-                           PortP->gs.port.tty->termios->c_state |= WOPEN;
-                         */
-                        PortP->State |= RIO_WOPEN;
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
-                                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                                /*
-                                 ** ACTION: verify that this is a good thing
-                                 ** to do here. -- ???
-                                 ** I think it's OK. -- REW
-                                 */
-                                rio_dprintk(RIO_DEBUG_TTY, "open(%d) sleeping for carr broken by signal\n", SysPort);
-                                RIOPreemptiveCmd(p, PortP, RIOC_FCLOSE);
-                                /*
-                                   tp->tm.c_state &= ~WOPEN;
-                                 */
-                                PortP->State &= ~RIO_WOPEN;
-                                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                                func_exit();
-                                return -EINTR;
-                        }
-                        rio_spin_lock_irqsave(&PortP->portSem, flags);
-                }
-                PortP->State &= ~RIO_WOPEN;
-        }
-        if (p->RIOHalted)
-                goto bombout;
-        rio_dprintk(RIO_DEBUG_TTY, "Setting RIO_MOPEN\n");
-        PortP->State |= RIO_MOPEN;
-
-        if (p->RIOHalted)
-                goto bombout;
-
-        rio_dprintk(RIO_DEBUG_TTY, "high level open done\n");
-
-        /*
-         ** Count opens for port statistics reporting
-         */
-        if (PortP->statsGather)
-                PortP->opens++;
-
-        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-        rio_dprintk(RIO_DEBUG_TTY, "Returning from open\n");
-        func_exit();
-        return 0;
-}
-
-/*
-** RIOClose the port.
-** The operating system thinks that this is last close for the device.
-** As there are two interfaces to the port (Modem and tty), we need to
-** check that both are closed before we close the device.
-*/
-int riotclose(void *ptr)
-{
-        struct Port *PortP = ptr;       /* pointer to the port structure */
-        int deleted = 0;
-        int try = -1;           /* Disable the timeouts by setting them to -1 */
-        int repeat_this = -1;   /* Congrats to those having 15 years of
-                                   uptime! (You get to break the driver.) */
-        unsigned long end_time;
-        struct tty_struct *tty;
-        unsigned long flags;
-        int rv = 0;
-
-        rio_dprintk(RIO_DEBUG_TTY, "port close SysPort %d\n", PortP->PortNum);
-
-        /* PortP = p->RIOPortp[SysPort]; */
-        rio_dprintk(RIO_DEBUG_TTY, "Port is at address %p\n", PortP);
-        /* tp = PortP->TtyP; *//* Get tty */
-        tty = PortP->gs.port.tty;
-        rio_dprintk(RIO_DEBUG_TTY, "TTY is at address %p\n", tty);
-
-        if (PortP->gs.closing_wait)
-                end_time = jiffies + PortP->gs.closing_wait;
-        else
-                end_time = jiffies + MAX_SCHEDULE_TIMEOUT;
-
-        rio_spin_lock_irqsave(&PortP->portSem, flags);
-
-        /*
-         ** Setting this flag will make any process trying to open
-         ** this port block until we are complete closing it.
-         */
-        PortP->State |= RIO_CLOSING;
-
-        if ((PortP->State & RIO_DELETED)) {
-                rio_dprintk(RIO_DEBUG_TTY, "Close on deleted RTA\n");
-                deleted = 1;
-        }
-
-        if (p->RIOHalted) {
-                RIOClearUp(PortP);
-                rv = -EIO;
-                goto close_end;
-        }
-
-        rio_dprintk(RIO_DEBUG_TTY, "Clear bits\n");
-        /*
-         ** clear the open bits for this device
-         */
-        PortP->State &= ~RIO_MOPEN;
-        PortP->State &= ~RIO_CARR_ON;
-        PortP->ModemState &= ~RIOC_MSVR1_CD;
-        /*
-         ** If the device was open as both a Modem and a tty line
-         ** then we need to wimp out here, as the port has not really
-         ** been finally closed (gee, whizz!) The test here uses the
-         ** bit for the OTHER mode of operation, to see if THAT is
-         ** still active!
-         */
-        if ((PortP->State & (RIO_LOPEN | RIO_MOPEN))) {
-                /*
-                 ** The port is still open for the other task -
-                 ** return, pretending that we are still active.
-                 */
-                rio_dprintk(RIO_DEBUG_TTY, "Channel %d still open !\n", PortP->PortNum);
-                PortP->State &= ~RIO_CLOSING;
-                if (PortP->firstOpen)
-                        PortP->firstOpen--;
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                return -EIO;
-        }
-
-        rio_dprintk(RIO_DEBUG_TTY, "Closing down - everything must go!\n");
-
-        PortP->State &= ~RIO_DYNOROD;
-
-        /*
-         ** This is where we wait for the port
-         ** to drain down before closing. Bye-bye....
-         ** (We never meant to do this)
-         */
-        rio_dprintk(RIO_DEBUG_TTY, "Timeout 1 starts\n");
-
-        if (!deleted)
-                while ((PortP->InUse != NOT_INUSE) && !p->RIOHalted && (PortP->TxBufferIn != PortP->TxBufferOut)) {
-                        if (repeat_this-- <= 0) {
-                                rv = -EINTR;
-                                rio_dprintk(RIO_DEBUG_TTY, "Waiting for not idle closed broken by signal\n");
-                                RIOPreemptiveCmd(p, PortP, RIOC_FCLOSE);
-                                goto close_end;
-                        }
-                        rio_dprintk(RIO_DEBUG_TTY, "Calling timeout to flush in closing\n");
-                        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                        if (RIODelay_ni(PortP, HUNDRED_MS * 10) == RIO_FAIL) {
-                                rio_dprintk(RIO_DEBUG_TTY, "RTA EINTR in delay \n");
-                                rv = -EINTR;
-                                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                                goto close_end;
-                        }
-                        rio_spin_lock_irqsave(&PortP->portSem, flags);
-                }
-
-        PortP->TxBufferIn = PortP->TxBufferOut = 0;
-        repeat_this = 0xff;
-
-        PortP->InUse = 0;
-        if ((PortP->State & (RIO_LOPEN | RIO_MOPEN))) {
-                /*
-                 ** The port has been re-opened for the other task -
-                 ** return, pretending that we are still active.
-                 */
-                rio_dprintk(RIO_DEBUG_TTY, "Channel %d re-open!\n", PortP->PortNum);
-                PortP->State &= ~RIO_CLOSING;
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                if (PortP->firstOpen)
-                        PortP->firstOpen--;
-                return -EIO;
-        }
-
-        if (p->RIOHalted) {
-                RIOClearUp(PortP);
-                goto close_end;
-        }
-
-        /* Can't call RIOShortCommand with the port locked. */
-        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-
-        if (RIOShortCommand(p, PortP, RIOC_CLOSE, 1, 0) == RIO_FAIL) {
-                RIOPreemptiveCmd(p, PortP, RIOC_FCLOSE);
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                goto close_end;
-        }
-
-        if (!deleted)
-                while (try && (PortP->PortState & PORT_ISOPEN)) {
-                        try--;
-                        if (time_after(jiffies, end_time)) {
-                                rio_dprintk(RIO_DEBUG_TTY, "Run out of tries - force the bugger shut!\n");
-                                RIOPreemptiveCmd(p, PortP, RIOC_FCLOSE);
-                                break;
-                        }
-                        rio_dprintk(RIO_DEBUG_TTY, "Close: PortState:ISOPEN is %d\n", PortP->PortState & PORT_ISOPEN);
-
-                        if (p->RIOHalted) {
-                                RIOClearUp(PortP);
-                                rio_spin_lock_irqsave(&PortP->portSem, flags);
-                                goto close_end;
-                        }
-                        if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
-                                rio_dprintk(RIO_DEBUG_TTY, "RTA EINTR in delay \n");
-                                RIOPreemptiveCmd(p, PortP, RIOC_FCLOSE);
-                                break;
-                        }
-                }
-        rio_spin_lock_irqsave(&PortP->portSem, flags);
-        rio_dprintk(RIO_DEBUG_TTY, "Close: try was %d on completion\n", try);
-
-        /* RIOPreemptiveCmd(p, PortP, RIOC_FCLOSE); */
-
-/*
-** 15.10.1998 ARG - ESIL 0761 part fix
-** RIO has it's own CTSFLOW and RTSFLOW flags in 'Config' in the port structure,** we need to make sure that the flags are clear when the port is opened.
-*/
-        PortP->Config &= ~(RIO_CTSFLOW | RIO_RTSFLOW);
-
-        /*
-         ** Count opens for port statistics reporting
-         */
-        if (PortP->statsGather)
-                PortP->closes++;
-
-close_end:
-        /* XXX: Why would a "DELETED" flag be reset here? I'd have
-           thought that a "deleted" flag means that the port was
-           permanently gone, but here we can make it reappear by it
-           being in close during the "deletion".
-         */
-        PortP->State &= ~(RIO_CLOSING | RIO_DELETED);
-        if (PortP->firstOpen)
-                PortP->firstOpen--;
-        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-        rio_dprintk(RIO_DEBUG_TTY, "Return from close\n");
-        return rv;
-}
-
-
-
-static void RIOClearUp(struct Port *PortP)
-{
-        rio_dprintk(RIO_DEBUG_TTY, "RIOHalted set\n");
-        PortP->Config = 0;      /* Direct semaphore */
-        PortP->PortState = 0;
-        PortP->firstOpen = 0;
-        PortP->FlushCmdBodge = 0;
-        PortP->ModemState = PortP->CookMode = 0;
-        PortP->Mapped = 0;
-        PortP->WflushFlag = 0;
-        PortP->MagicFlags = 0;
-        PortP->RxDataStart = 0;
-        PortP->TxBufferIn = 0;
-        PortP->TxBufferOut = 0;
-}
-
-/*
-** Put a command onto a port.
-** The PortPointer, command, length and arg are passed.
-** The len is the length *inclusive* of the command byte,
-** and so for a command that takes no data, len==1.
-** The arg is a single byte, and is only used if len==2.
-** Other values of len aren't allowed, and will cause
-** a panic.
-*/
-int RIOShortCommand(struct rio_info *p, struct Port *PortP, int command, int len, int arg)
-{
-        struct PKT __iomem *PacketP;
-        int retries = 20;       /* at 10 per second -> 2 seconds */
-        unsigned long flags;
-
-        rio_dprintk(RIO_DEBUG_TTY, "entering shortcommand.\n");
-
-        if (PortP->State & RIO_DELETED) {
-                rio_dprintk(RIO_DEBUG_TTY, "Short command to deleted RTA ignored\n");
-                return RIO_FAIL;
-        }
-        rio_spin_lock_irqsave(&PortP->portSem, flags);
-
-        /*
-         ** If the port is in use for pre-emptive command, then wait for it to
-         ** be free again.
-         */
-        while ((PortP->InUse != NOT_INUSE) && !p->RIOHalted) {
-                rio_dprintk(RIO_DEBUG_TTY, "Waiting for not in use (%d)\n", retries);
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                if (retries-- <= 0) {
-                        return RIO_FAIL;
-                }
-                if (RIODelay_ni(PortP, HUNDRED_MS) == RIO_FAIL) {
-                        return RIO_FAIL;
-                }
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-        }
-        if (PortP->State & RIO_DELETED) {
-                rio_dprintk(RIO_DEBUG_TTY, "Short command to deleted RTA ignored\n");
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                return RIO_FAIL;
-        }
-
-        while (!can_add_transmit(&PacketP, PortP) && !p->RIOHalted) {
-                rio_dprintk(RIO_DEBUG_TTY, "Waiting to add short command to queue (%d)\n", retries);
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                if (retries-- <= 0) {
-                        rio_dprintk(RIO_DEBUG_TTY, "out of tries. Failing\n");
-                        return RIO_FAIL;
-                }
-                if (RIODelay_ni(PortP, HUNDRED_MS) == RIO_FAIL) {
-                        return RIO_FAIL;
-                }
-                rio_spin_lock_irqsave(&PortP->portSem, flags);
-        }
-
-        if (p->RIOHalted) {
-                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-                return RIO_FAIL;
-        }
-
-        /*
-         ** set the command byte and the argument byte
-         */
-        writeb(command, &PacketP->data[0]);
-
-        if (len == 2)
-                writeb(arg, &PacketP->data[1]);
-
-        /*
-         ** set the length of the packet and set the command bit.
-         */
-        writeb(PKT_CMD_BIT | len, &PacketP->len);
-
-        add_transmit(PortP);
-        /*
-         ** Count characters transmitted for port statistics reporting
-         */
-        if (PortP->statsGather)
-                PortP->txchars += len;
-
-        rio_spin_unlock_irqrestore(&PortP->portSem, flags);
-        return p->RIOHalted ? RIO_FAIL : ~RIO_FAIL;
-}
-
-
diff --git a/drivers/char/rio/route.h b/drivers/char/rio/route.h
deleted file mode 100644
index 46e963771c30..000000000000
--- a/drivers/char/rio/route.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
- *******                                                              *******
- *******                 R O U T E     H E A D E R
- *******                                                              *******
- ****************************************************************************
-
- Author  : Ian Nandhra / Jeremy Rolls
- Date    :
-
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- Version : 0.01
-
-
-                            Mods
- ----------------------------------------------------------------------------
-  Date     By                Description
- ----------------------------------------------------------------------------
-
- ***************************************************************************/
-
-#ifndef _route_h
-#define _route_h
-
-#define MAX_LINKS 4
-#define MAX_NODES 17            /* Maximum nodes in a subnet */
-#define NODE_BYTES ((MAX_NODES / 8) + 1)        /* Number of bytes needed for
-                                                   1 bit per node */
-#define ROUTE_DATA_SIZE  (NODE_BYTES + 2)       /* Number of bytes for complete
-                                                   info about cost etc. */
-#define ROUTES_PER_PACKET ((PKT_MAX_DATA_LEN -2)/ ROUTE_DATA_SIZE)
-                                              /* Number of nodes we can squeeze
-                                                 into one packet */
-#define MAX_TOPOLOGY_PACKETS (MAX_NODES / ROUTES_PER_PACKET + 1)
-/************************************************
- * Define the types of command for the ROUTE RUP.
- ************************************************/
-#define ROUTE_REQUEST    0      /* Request an ID */
-#define ROUTE_FOAD       1      /* Kill the RTA */
-#define ROUTE_ALREADY    2      /* ID given already */
-#define ROUTE_USED       3      /* All ID's used */
-#define ROUTE_ALLOCATE   4      /* Here it is */
-#define ROUTE_REQ_TOP    5      /* I bet you didn't expect....
-                                   the Topological Inquisition */
-#define ROUTE_TOPOLOGY   6      /* Topology request answered FD */
-/*******************************************************************
- * Define the Route Map Structure
- *
- * The route map gives a pointer to a Link Structure to use.
- * This allows Disconnected Links to be checked quickly
- ******************************************************************/
-typedef struct COST_ROUTE COST_ROUTE;
-struct COST_ROUTE {
-        unsigned char cost;     /* Cost down this link */
-        unsigned char route[NODE_BYTES];        /* Nodes through this route */
-};
-
-typedef struct ROUTE_STR ROUTE_STR;
-struct ROUTE_STR {
-        COST_ROUTE cost_route[MAX_LINKS];
-        /* cost / route for this link */
-        ushort favoured;        /* favoured link */
-};
-
-
-#define NO_LINK            (short) 5    /* Link unattached */
-#define ROUTE_NO_ID        (short) 100  /* No Id */
-#define ROUTE_DISCONNECT   (ushort) 0xff        /* Not connected */
-#define ROUTE_INTERCONNECT (ushort) 0x40        /* Sub-net interconnect */
-
-
-#define SYNC_RUP         (ushort) 255
-#define COMMAND_RUP      (ushort) 254
-#define ERROR_RUP        (ushort) 253
-#define POLL_RUP         (ushort) 252
-#define BOOT_RUP         (ushort) 251
-#define ROUTE_RUP        (ushort) 250
-#define STATUS_RUP       (ushort) 249
-#define POWER_RUP        (ushort) 248
-
-#define HIGHEST_RUP      (ushort) 255   /* Set to Top one */
-#define LOWEST_RUP       (ushort) 248   /* Set to bottom one */
-
-#endif
-
-/*********** end of file ***********/
diff --git a/drivers/char/rio/rup.h b/drivers/char/rio/rup.h
deleted file mode 100644
index 4ae90cb207a9..000000000000
--- a/drivers/char/rio/rup.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
- *******                                                              *******
- *******               R U P   S T R U C T U R E
- *******                                                              *******
- ****************************************************************************
-
- Author  : Ian Nandhra
- Date    :
-
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- Version : 0.01
-
-
-                            Mods
- ----------------------------------------------------------------------------
-  Date     By                Description
- ----------------------------------------------------------------------------
-
- ***************************************************************************/
-
-#ifndef _rup_h
-#define _rup_h 1
-
-#define MAX_RUP          ((short) 16)
-#define PKTS_PER_RUP     ((short) 2)    /* They are always used in pairs */
-
-/*************************************************
- * Define all the  packet request stuff
- ************************************************/
-#define TX_RUP_INACTIVE          0      /* Nothing to transmit */
-#define TX_PACKET_READY          1      /* Transmit packet ready */
-#define TX_LOCK_RUP              2      /* Transmit side locked */
-
-#define RX_RUP_INACTIVE          0      /* Nothing received */
-#define RX_PACKET_READY          1      /* Packet received */
-
-#define RUP_NO_OWNER             0xff   /* RUP not owned by any process */
-
-struct RUP {
-        u16 txpkt;              /* Outgoing packet */
-        u16 rxpkt;              /* Incoming packet */
-        u16 link;               /* Which link to send down? */
-        u8 rup_dest_unit[2];    /* Destination unit */
-        u16 handshake;          /* For handshaking */
-        u16 timeout;            /* Timeout */
-        u16 status;             /* Status */
-        u16 txcontrol;          /* Transmit control */
-        u16 rxcontrol;          /* Receive control */
-};
-
-#endif
-
-/*********** end of file ***********/
diff --git a/drivers/char/rio/unixrup.h b/drivers/char/rio/unixrup.h
deleted file mode 100644
index 7abf0cba0f2c..000000000000
--- a/drivers/char/rio/unixrup.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-** -----------------------------------------------------------------------------
-**
-**  Perle Specialix driver for Linux
-**  Ported from existing RIO Driver for SCO sources.
- *
- *  (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-**      Module          : unixrup.h
-**      SID             : 1.2
-**      Last Modified   : 11/6/98 11:34:20
-**      Retrieved       : 11/6/98 11:34:22
-**
-**  ident @(#)unixrup.h 1.2
-**
-** -----------------------------------------------------------------------------
-*/
-
-#ifndef __rio_unixrup_h__
-#define __rio_unixrup_h__
-
-/*
-**    UnixRup data structure. This contains pointers to actual RUPs on the
-**    host card, and all the command/boot control stuff.
-*/
-struct UnixRup {
-        struct CmdBlk *CmdsWaitingP;    /* Commands waiting to be done */
-        struct CmdBlk *CmdPendingP;     /* The command currently being sent */
-        struct RUP __iomem *RupP;       /* the Rup to send it to */
-        unsigned int Id;                /* Id number */
-        unsigned int BaseSysPort;       /* SysPort of first tty on this RTA */
-        unsigned int ModTypes;          /* Modules on this RTA */
-        spinlock_t RupLock;     /* Lock structure for MPX */
-        /*    struct lockb     RupLock; *//* Lock structure for MPX */
-};
-
-#endif                          /* __rio_unixrup_h__ */
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
deleted file mode 100644
index af4de1fe8445..000000000000
--- a/drivers/char/riscom8.c
+++ /dev/null
@@ -1,1560 +0,0 @@
-/*
- *      linux/drivers/char/riscom.c  -- RISCom/8 multiport serial driver.
- *
- *      Copyright (C) 1994-1996  Dmitry Gorodchanin (pgmdsg@ibi.com)
- *
- *      This code is loosely based on the Linux serial driver, written by
- *      Linus Torvalds, Theodore T'so and others. The RISCom/8 card
- *      programming info was obtained from various drivers for other OSes
- *      (FreeBSD, ISC, etc), but no source code from those drivers were
- *      directly included in this driver.
- *
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *      Revision 1.1
- *
- *      ChangeLog:
- *      Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 27-Jun-2001
- *      - get rid of check_region and several cleanups
- */
-
-#include <linux/module.h>
-
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/mm.h>
-#include <linux/serial.h>
-#include <linux/fcntl.h>
-#include <linux/major.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/tty_flip.h>
-#include <linux/spinlock.h>
-#include <linux/device.h>
-
-#include <linux/uaccess.h>
-
-#include "riscom8.h"
-#include "riscom8_reg.h"
-
-/* Am I paranoid or not ? ;-) */
-#define RISCOM_PARANOIA_CHECK
-
-/*
- * Crazy InteliCom/8 boards sometimes have swapped CTS & DSR signals.
- * You can slightly speed up things by #undefing the following option,
- * if you are REALLY sure that your board is correct one.
- */
-
-#define RISCOM_BRAIN_DAMAGED_CTS
-
-/*
- * The following defines are mostly for testing purposes. But if you need
- * some nice reporting in your syslog, you can define them also.
- */
-#undef RC_REPORT_FIFO
-#undef RC_REPORT_OVERRUN
-
-
-#define RISCOM_LEGAL_FLAGS \
-        (ASYNC_HUP_NOTIFY   | ASYNC_SAK          | ASYNC_SPLIT_TERMIOS   | \
-         ASYNC_SPD_HI       | ASYNC_SPEED_VHI    | ASYNC_SESSION_LOCKOUT | \
-         ASYNC_PGRP_LOCKOUT | ASYNC_CALLOUT_NOHUP)
-
-static struct tty_driver *riscom_driver;
-
-static DEFINE_SPINLOCK(riscom_lock);
-
-static struct riscom_board rc_board[RC_NBOARD] =  {
-        {
-                .base   = RC_IOBASE1,
-        },
-        {
-                .base   = RC_IOBASE2,
-        },
-        {
-                .base   = RC_IOBASE3,
-        },
-        {
-                .base   = RC_IOBASE4,
-        },
-};
-
-static struct riscom_port rc_port[RC_NBOARD * RC_NPORT];
-
-/* RISCom/8 I/O ports addresses (without address translation) */
-static unsigned short rc_ioport[] =  {
-#if 1
-        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x09, 0x0a, 0x0b, 0x0c,
-#else
-        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x09, 0x0a, 0x0b, 0x0c, 0x10,
-        0x11, 0x12, 0x18, 0x28, 0x31, 0x32, 0x39, 0x3a, 0x40, 0x41, 0x61, 0x62,
-        0x63, 0x64, 0x6b, 0x70, 0x71, 0x78, 0x7a, 0x7b, 0x7f, 0x100, 0x101
-#endif
-};
-#define RC_NIOPORT      ARRAY_SIZE(rc_ioport)
-
-
-static int rc_paranoia_check(struct riscom_port const *port,
-                                    char *name, const char *routine)
-{
-#ifdef RISCOM_PARANOIA_CHECK
-        static const char badmagic[] = KERN_INFO
-                "rc: Warning: bad riscom port magic number for device %s in %s\n";
-        static const char badinfo[] = KERN_INFO
-                "rc: Warning: null riscom port for device %s in %s\n";
-
-        if (!port) {
-                printk(badinfo, name, routine);
-                return 1;
-        }
-        if (port->magic != RISCOM8_MAGIC) {
-                printk(badmagic, name, routine);
-                return 1;
-        }
-#endif
-        return 0;
-}
-
-/*
- *
- *  Service functions for RISCom/8 driver.
- *
- */
-
-/* Get board number from pointer */
-static inline int board_No(struct riscom_board const *bp)
-{
-        return bp - rc_board;
-}
-
-/* Get port number from pointer */
-static inline int port_No(struct riscom_port const *port)
-{
-        return RC_PORT(port - rc_port);
-}
-
-/* Get pointer to board from pointer to port */
-static inline struct riscom_board *port_Board(struct riscom_port const *port)
-{
-        return &rc_board[RC_BOARD(port - rc_port)];
-}
-
-/* Input Byte from CL CD180 register */
-static inline unsigned char rc_in(struct riscom_board const *bp,
-                                                        unsigned short reg)
-{
-        return inb(bp->base + RC_TO_ISA(reg));
-}
-
-/* Output Byte to CL CD180 register */
-static inline void rc_out(struct riscom_board const *bp, unsigned short reg,
-                          unsigned char val)
-{
-        outb(val, bp->base + RC_TO_ISA(reg));
-}
-
-/* Wait for Channel Command Register ready */
-static void rc_wait_CCR(struct riscom_board const *bp)
-{
-        unsigned long delay;
-
-        /* FIXME: need something more descriptive then 100000 :) */
-        for (delay = 100000; delay; delay--)
-                if (!rc_in(bp, CD180_CCR))
-                        return;
-
-        printk(KERN_INFO "rc%d: Timeout waiting for CCR.\n", board_No(bp));
-}
-
-/*
- *  RISCom/8 probe functions.
- */
-
-static int rc_request_io_range(struct riscom_board * const bp)
-{
-        int i;
-
-        for (i = 0; i < RC_NIOPORT; i++)
-                if (!request_region(RC_TO_ISA(rc_ioport[i]) + bp->base, 1,
-                                   "RISCom/8"))  {
-                        goto out_release;
-                }
-        return 0;
-out_release:
-        printk(KERN_INFO "rc%d: Skipping probe at 0x%03x. IO address in use.\n",
-                         board_No(bp), bp->base);
-        while (--i >= 0)
-                release_region(RC_TO_ISA(rc_ioport[i]) + bp->base, 1);
-        return 1;
-}
-
-static void rc_release_io_range(struct riscom_board * const bp)
-{
-        int i;
-
-        for (i = 0; i < RC_NIOPORT; i++)
-                release_region(RC_TO_ISA(rc_ioport[i]) + bp->base, 1);
-}
-
-/* Reset and setup CD180 chip */
-static void __init rc_init_CD180(struct riscom_board const *bp)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&riscom_lock, flags);
-
-        rc_out(bp, RC_CTOUT, 0);                   /* Clear timeout        */
-        rc_wait_CCR(bp);                           /* Wait for CCR ready   */
-        rc_out(bp, CD180_CCR, CCR_HARDRESET);      /* Reset CD180 chip     */
-        spin_unlock_irqrestore(&riscom_lock, flags);
-        msleep(50);                                /* Delay 0.05 sec       */
-        spin_lock_irqsave(&riscom_lock, flags);
-        rc_out(bp, CD180_GIVR, RC_ID);             /* Set ID for this chip */
-        rc_out(bp, CD180_GICR, 0);                 /* Clear all bits       */
-        rc_out(bp, CD180_PILR1, RC_ACK_MINT);      /* Prio for modem intr  */
-        rc_out(bp, CD180_PILR2, RC_ACK_TINT);      /* Prio for tx intr     */
-        rc_out(bp, CD180_PILR3, RC_ACK_RINT);      /* Prio for rx intr     */
-
-        /* Setting up prescaler. We need 4 ticks per 1 ms */
-        rc_out(bp, CD180_PPRH, (RC_OSCFREQ/(1000000/RISCOM_TPS)) >> 8);
-        rc_out(bp, CD180_PPRL, (RC_OSCFREQ/(1000000/RISCOM_TPS)) & 0xff);
-
-        spin_unlock_irqrestore(&riscom_lock, flags);
-}
-
-/* Main probing routine, also sets irq. */
-static int __init rc_probe(struct riscom_board *bp)
-{
-        unsigned char val1, val2;
-        int irqs = 0;
-        int retries;
-
-        bp->irq = 0;
-
-        if (rc_request_io_range(bp))
-                return 1;
-
-        /* Are the I/O ports here ? */
-        rc_out(bp, CD180_PPRL, 0x5a);
-        outb(0xff, 0x80);
-        val1 = rc_in(bp, CD180_PPRL);
-        rc_out(bp, CD180_PPRL, 0xa5);
-        outb(0x00, 0x80);
-        val2 = rc_in(bp, CD180_PPRL);
-
-        if ((val1 != 0x5a) || (val2 != 0xa5))  {
-                printk(KERN_ERR "rc%d: RISCom/8 Board at 0x%03x not found.\n",
-                       board_No(bp), bp->base);
-                goto out_release;
-        }
-
-        /* It's time to find IRQ for this board */
-        for (retries = 0; retries < 5 && irqs <= 0; retries++) {
-                irqs = probe_irq_on();
-                rc_init_CD180(bp);               /* Reset CD180 chip         */
-                rc_out(bp, CD180_CAR, 2);        /* Select port 2            */
-                rc_wait_CCR(bp);
-                rc_out(bp, CD180_CCR, CCR_TXEN); /* Enable transmitter       */
-                rc_out(bp, CD180_IER, IER_TXRDY);/* Enable tx empty intr     */
-                msleep(50);
-                irqs = probe_irq_off(irqs);
-                val1 = rc_in(bp, RC_BSR);       /* Get Board Status reg      */
-                val2 = rc_in(bp, RC_ACK_TINT);  /* ACK interrupt             */
-                rc_init_CD180(bp);              /* Reset CD180 again         */
-
-                if ((val1 & RC_BSR_TINT) || (val2 != (RC_ID | GIVR_IT_TX)))  {
-                        printk(KERN_ERR "rc%d: RISCom/8 Board at 0x%03x not "
-                                        "found.\n", board_No(bp), bp->base);
-                        goto out_release;
-                }
-        }
-
-        if (irqs <= 0)  {
-                printk(KERN_ERR "rc%d: Can't find IRQ for RISCom/8 board "
-                                "at 0x%03x.\n", board_No(bp), bp->base);
-                goto out_release;
-        }
-        bp->irq = irqs;
-        bp->flags |= RC_BOARD_PRESENT;
-
-        printk(KERN_INFO "rc%d: RISCom/8 Rev. %c board detected at "
-                         "0x%03x, IRQ %d.\n",
-               board_No(bp),
-               (rc_in(bp, CD180_GFRCR) & 0x0f) + 'A',   /* Board revision */
-               bp->base, bp->irq);
-
-        return 0;
-out_release:
-        rc_release_io_range(bp);
-        return 1;
-}
-
-/*
- *
- *  Interrupt processing routines.
- *
- */
-
-static struct riscom_port *rc_get_port(struct riscom_board const *bp,
-                                               unsigned char const *what)
-{
-        unsigned char channel;
-        struct riscom_port *port;
-
-        channel = rc_in(bp, CD180_GICR) >> GICR_CHAN_OFF;
-        if (channel < CD180_NCH)  {
-                port = &rc_port[board_No(bp) * RC_NPORT + channel];
-                if (port->port.flags & ASYNC_INITIALIZED)
-                        return port;
-        }
-        printk(KERN_ERR "rc%d: %s interrupt from invalid port %d\n",
-               board_No(bp), what, channel);
-        return NULL;
-}
-
-static void rc_receive_exc(struct riscom_board const *bp)
-{
-        struct riscom_port *port;
-        struct tty_struct *tty;
-        unsigned char status;
-        unsigned char ch, flag;
-
-        port = rc_get_port(bp, "Receive");
-        if (port == NULL)
-                return;
-
-        tty = tty_port_tty_get(&port->port);
-
-#ifdef RC_REPORT_OVERRUN
-        status = rc_in(bp, CD180_RCSR);
-        if (status & RCSR_OE)
-                port->overrun++;
-        status &= port->mark_mask;
-#else
-        status = rc_in(bp, CD180_RCSR) & port->mark_mask;
-#endif
-        ch = rc_in(bp, CD180_RDR);
-        if (!status)
-                goto out;
-        if (status & RCSR_TOUT)  {
-                printk(KERN_WARNING "rc%d: port %d: Receiver timeout. "
-                                    "Hardware problems ?\n",
-                       board_No(bp), port_No(port));
-                goto out;
-
-        } else if (status & RCSR_BREAK)  {
-                printk(KERN_INFO "rc%d: port %d: Handling break...\n",
-                       board_No(bp), port_No(port));
-                flag = TTY_BREAK;
-                if (tty && (port->port.flags & ASYNC_SAK))
-                        do_SAK(tty);
-
-        } else if (status & RCSR_PE)
-                flag = TTY_PARITY;
-
-        else if (status & RCSR_FE)
-                flag = TTY_FRAME;
-
-        else if (status & RCSR_OE)
-                flag = TTY_OVERRUN;
-        else
-                flag = TTY_NORMAL;
-
-        if (tty) {
-                tty_insert_flip_char(tty, ch, flag);
-                tty_flip_buffer_push(tty);
-        }
-out:
-        tty_kref_put(tty);
-}
-
-static void rc_receive(struct riscom_board const *bp)
-{
-        struct riscom_port *port;
-        struct tty_struct *tty;
-        unsigned char count;
-
-        port = rc_get_port(bp, "Receive");
-        if (port == NULL)
-                return;
-
-        tty = tty_port_tty_get(&port->port);
-
-        count = rc_in(bp, CD180_RDCR);
-
-#ifdef RC_REPORT_FIFO
-        port->hits[count > 8 ? 9 : count]++;
-#endif
-
-        while (count--)  {
-                u8 ch = rc_in(bp, CD180_RDR);
-                if (tty)
-                        tty_insert_flip_char(tty, ch, TTY_NORMAL);
-        }
-        if (tty) {
-                tty_flip_buffer_push(tty);
-                tty_kref_put(tty);
-        }
-}
-
-static void rc_transmit(struct riscom_board const *bp)
-{
-        struct riscom_port *port;
-        struct tty_struct *tty;
-        unsigned char count;
-
-        port = rc_get_port(bp, "Transmit");
-        if (port == NULL)
-                return;
-
-        tty = tty_port_tty_get(&port->port);
-
-        if (port->IER & IER_TXEMPTY) {
-                /* FIFO drained */
-                rc_out(bp, CD180_CAR, port_No(port));
-                port->IER &= ~IER_TXEMPTY;
-                rc_out(bp, CD180_IER, port->IER);
-                goto out;
-        }
-
-        if ((port->xmit_cnt <= 0 && !port->break_length)
-            || (tty && (tty->stopped || tty->hw_stopped)))  {
-                rc_out(bp, CD180_CAR, port_No(port));
-                port->IER &= ~IER_TXRDY;
-                rc_out(bp, CD180_IER, port->IER);
-                goto out;
-        }
-
-        if (port->break_length)  {
-                if (port->break_length > 0)  {
-                        if (port->COR2 & COR2_ETC)  {
-                                rc_out(bp, CD180_TDR, CD180_C_ESC);
-                                rc_out(bp, CD180_TDR, CD180_C_SBRK);
-                                port->COR2 &= ~COR2_ETC;
-                        }
-                        count = min_t(int, port->break_length, 0xff);
-                        rc_out(bp, CD180_TDR, CD180_C_ESC);
-                        rc_out(bp, CD180_TDR, CD180_C_DELAY);
-                        rc_out(bp, CD180_TDR, count);
-                        port->break_length -= count;
-                        if (port->break_length == 0)
-                                port->break_length--;
-                } else  {
-                        rc_out(bp, CD180_TDR, CD180_C_ESC);
-                        rc_out(bp, CD180_TDR, CD180_C_EBRK);
-                        rc_out(bp, CD180_COR2, port->COR2);
-                        rc_wait_CCR(bp);
-                        rc_out(bp, CD180_CCR, CCR_CORCHG2);
-                        port->break_length = 0;
-                }
-                goto out;
-        }
-
-        count = CD180_NFIFO;
-        do {
-                rc_out(bp, CD180_TDR, port->port.xmit_buf[port->xmit_tail++]);
-                port->xmit_tail = port->xmit_tail & (SERIAL_XMIT_SIZE-1);
-                if (--port->xmit_cnt <= 0)
-                        break;
-        } while (--count > 0);
-
-        if (port->xmit_cnt <= 0)  {
-                rc_out(bp, CD180_CAR, port_No(port));
-                port->IER &= ~IER_TXRDY;
-                rc_out(bp, CD180_IER, port->IER);
-        }
-        if (tty && port->xmit_cnt <= port->wakeup_chars)
-                tty_wakeup(tty);
-out:
-        tty_kref_put(tty);
-}
-
-static void rc_check_modem(struct riscom_board const *bp)
-{
-        struct riscom_port *port;
-        struct tty_struct *tty;
-        unsigned char mcr;
-
-        port = rc_get_port(bp, "Modem");
-        if (port == NULL)
-                return;
-
-        tty = tty_port_tty_get(&port->port);
-
-        mcr = rc_in(bp, CD180_MCR);
-        if (mcr & MCR_CDCHG) {
-                if (rc_in(bp, CD180_MSVR) & MSVR_CD)
-                        wake_up_interruptible(&port->port.open_wait);
-                else if (tty)
-                        tty_hangup(tty);
-        }
-
-#ifdef RISCOM_BRAIN_DAMAGED_CTS
-        if (mcr & MCR_CTSCHG)  {
-                if (rc_in(bp, CD180_MSVR) & MSVR_CTS)  {
-                        port->IER |= IER_TXRDY;
-                        if (tty) {
-                                tty->hw_stopped = 0;
-                                if (port->xmit_cnt <= port->wakeup_chars)
-                                        tty_wakeup(tty);
-                        }
-                } else  {
-                        if (tty)
-                                tty->hw_stopped = 1;
-                        port->IER &= ~IER_TXRDY;
-                }
-                rc_out(bp, CD180_IER, port->IER);
-        }
-        if (mcr & MCR_DSRCHG)  {
-                if (rc_in(bp, CD180_MSVR) & MSVR_DSR)  {
-                        port->IER |= IER_TXRDY;
-                        if (tty) {
-                                tty->hw_stopped = 0;
-                                if (port->xmit_cnt <= port->wakeup_chars)
-                                        tty_wakeup(tty);
-                        }
-                } else  {
-                        if (tty)
-                                tty->hw_stopped = 1;
-                        port->IER &= ~IER_TXRDY;
-                }
-                rc_out(bp, CD180_IER, port->IER);
-        }
-#endif /* RISCOM_BRAIN_DAMAGED_CTS */
-
-        /* Clear change bits */
-        rc_out(bp, CD180_MCR, 0);
-        tty_kref_put(tty);
-}
-
-/* The main interrupt processing routine */
-static irqreturn_t rc_interrupt(int dummy, void *dev_id)
-{
-        unsigned char status;
-        unsigned char ack;
-        struct riscom_board *bp = dev_id;
-        unsigned long loop = 0;
-        int handled = 0;
-
-        if (!(bp->flags & RC_BOARD_ACTIVE))
-                return IRQ_NONE;
-
-        while ((++loop < 16) && ((status = ~(rc_in(bp, RC_BSR))) &
-                                 (RC_BSR_TOUT | RC_BSR_TINT |
-                                  RC_BSR_MINT | RC_BSR_RINT))) {
-                handled = 1;
-                if (status & RC_BSR_TOUT)
-                        printk(KERN_WARNING "rc%d: Got timeout. Hardware "
-                                            "error?\n", board_No(bp));
-                else if (status & RC_BSR_RINT) {
-                        ack = rc_in(bp, RC_ACK_RINT);
-                        if (ack == (RC_ID | GIVR_IT_RCV))
-                                rc_receive(bp);
-                        else if (ack == (RC_ID | GIVR_IT_REXC))
-                                rc_receive_exc(bp);
-                        else
-                                printk(KERN_WARNING "rc%d: Bad receive ack "
-                                                    "0x%02x.\n",
-                                       board_No(bp), ack);
-                } else if (status & RC_BSR_TINT) {
-                        ack = rc_in(bp, RC_ACK_TINT);
-                        if (ack == (RC_ID | GIVR_IT_TX))
-                                rc_transmit(bp);
-                        else
-                                printk(KERN_WARNING "rc%d: Bad transmit ack "
-                                                    "0x%02x.\n",
-                                       board_No(bp), ack);
-                } else /* if (status & RC_BSR_MINT) */ {
-                        ack = rc_in(bp, RC_ACK_MINT);
-                        if (ack == (RC_ID | GIVR_IT_MODEM))
-                                rc_check_modem(bp);
-                        else
-                                printk(KERN_WARNING "rc%d: Bad modem ack "
-                                                    "0x%02x.\n",
-                                       board_No(bp), ack);
-                }
-                rc_out(bp, CD180_EOIR, 0);   /* Mark end of interrupt */
-                rc_out(bp, RC_CTOUT, 0);     /* Clear timeout flag    */
-        }
-        return IRQ_RETVAL(handled);
-}
-
-/*
- *  Routines for open & close processing.
- */
-
-/* Called with disabled interrupts */
-static int rc_setup_board(struct riscom_board *bp)
-{
-        int error;
-
-        if (bp->flags & RC_BOARD_ACTIVE)
-                return 0;
-
-        error = request_irq(bp->irq, rc_interrupt, IRQF_DISABLED,
-                            "RISCom/8", bp);
-        if (error)
-                return error;
-
-        rc_out(bp, RC_CTOUT, 0);                /* Just in case         */
-        bp->DTR = ~0;
-        rc_out(bp, RC_DTR, bp->DTR);            /* Drop DTR on all ports */
-
-        bp->flags |= RC_BOARD_ACTIVE;
-
-        return 0;
-}
-
-/* Called with disabled interrupts */
-static void rc_shutdown_board(struct riscom_board *bp)
-{
-        if (!(bp->flags & RC_BOARD_ACTIVE))
-                return;
-
-        bp->flags &= ~RC_BOARD_ACTIVE;
-
-        free_irq(bp->irq, NULL);
-
-        bp->DTR = ~0;
-        rc_out(bp, RC_DTR, bp->DTR);           /* Drop DTR on all ports */
-
-}
-
-/*
- * Setting up port characteristics.
- * Must be called with disabled interrupts
- */
-static void rc_change_speed(struct tty_struct *tty, struct riscom_board *bp,
-                                                struct riscom_port *port)
-{
-        unsigned long baud;
-        long tmp;
-        unsigned char cor1 = 0, cor3 = 0;
-        unsigned char mcor1 = 0, mcor2 = 0;
-
-        port->IER  = 0;
-        port->COR2 = 0;
-        port->MSVR = MSVR_RTS;
-
-        baud = tty_get_baud_rate(tty);
-
-        /* Select port on the board */
-        rc_out(bp, CD180_CAR, port_No(port));
-
-        if (!baud)  {
-                /* Drop DTR & exit */
-                bp->DTR |= (1u << port_No(port));
-                rc_out(bp, RC_DTR, bp->DTR);
-                return;
-        } else  {
-                /* Set DTR on */
-                bp->DTR &= ~(1u << port_No(port));
-                rc_out(bp, RC_DTR, bp->DTR);
-        }
-
-        /*
-         * Now we must calculate some speed depended things
-         */
-
-        /* Set baud rate for port */
-        tmp = (((RC_OSCFREQ + baud/2) / baud +
-                CD180_TPC/2) / CD180_TPC);
-
-        rc_out(bp, CD180_RBPRH, (tmp >> 8) & 0xff);
-        rc_out(bp, CD180_TBPRH, (tmp >> 8) & 0xff);
-        rc_out(bp, CD180_RBPRL, tmp & 0xff);
-        rc_out(bp, CD180_TBPRL, tmp & 0xff);
-
-        baud = (baud + 5) / 10;   /* Estimated CPS */
-
-        /* Two timer ticks seems enough to wakeup something like SLIP driver */
-        tmp = ((baud + HZ/2) / HZ) * 2 - CD180_NFIFO;
-        port->wakeup_chars = (tmp < 0) ? 0 : ((tmp >= SERIAL_XMIT_SIZE) ?
-                                              SERIAL_XMIT_SIZE - 1 : tmp);
-
-        /* Receiver timeout will be transmission time for 1.5 chars */
-        tmp = (RISCOM_TPS + RISCOM_TPS/2 + baud/2) / baud;
-        tmp = (tmp > 0xff) ? 0xff : tmp;
-        rc_out(bp, CD180_RTPR, tmp);
-
-        switch (C_CSIZE(tty)) {
-        case CS5:
-                cor1 |= COR1_5BITS;
-                break;
-        case CS6:
-                cor1 |= COR1_6BITS;
-                break;
-        case CS7:
-                cor1 |= COR1_7BITS;
-                break;
-        case CS8:
-                cor1 |= COR1_8BITS;
-                break;
-        }
-        if (C_CSTOPB(tty))
-                cor1 |= COR1_2SB;
-
-        cor1 |= COR1_IGNORE;
-        if (C_PARENB(tty)) {
-                cor1 |= COR1_NORMPAR;
-                if (C_PARODD(tty))
-                        cor1 |= COR1_ODDP;
-                if (I_INPCK(tty))
-                        cor1 &= ~COR1_IGNORE;
-        }
-        /* Set marking of some errors */
-        port->mark_mask = RCSR_OE | RCSR_TOUT;
-        if (I_INPCK(tty))
-                port->mark_mask |= RCSR_FE | RCSR_PE;
-        if (I_BRKINT(tty) || I_PARMRK(tty))
-                port->mark_mask |= RCSR_BREAK;
-        if (I_IGNPAR(tty))
-                port->mark_mask &= ~(RCSR_FE | RCSR_PE);
-        if (I_IGNBRK(tty)) {
-                port->mark_mask &= ~RCSR_BREAK;
-                if (I_IGNPAR(tty))
-                        /* Real raw mode. Ignore all */
-                        port->mark_mask &= ~RCSR_OE;
-        }
-        /* Enable Hardware Flow Control */
-        if (C_CRTSCTS(tty))  {
-#ifdef RISCOM_BRAIN_DAMAGED_CTS
-                port->IER |= IER_DSR | IER_CTS;
-                mcor1 |= MCOR1_DSRZD | MCOR1_CTSZD;
-                mcor2 |= MCOR2_DSROD | MCOR2_CTSOD;
-                tty->hw_stopped = !(rc_in(bp, CD180_MSVR) &
-                                                (MSVR_CTS|MSVR_DSR));
-#else
-                port->COR2 |= COR2_CTSAE;
-#endif
-        }
-        /* Enable Software Flow Control. FIXME: I'm not sure about this */
-        /* Some people reported that it works, but I still doubt */
-        if (I_IXON(tty))  {
-                port->COR2 |= COR2_TXIBE;
-                cor3 |= (COR3_FCT | COR3_SCDE);
-                if (I_IXANY(tty))
-                        port->COR2 |= COR2_IXM;
-                rc_out(bp, CD180_SCHR1, START_CHAR(tty));
-                rc_out(bp, CD180_SCHR2, STOP_CHAR(tty));
-                rc_out(bp, CD180_SCHR3, START_CHAR(tty));
-                rc_out(bp, CD180_SCHR4, STOP_CHAR(tty));
-        }
-        if (!C_CLOCAL(tty))  {
-                /* Enable CD check */
-                port->IER |= IER_CD;
-                mcor1 |= MCOR1_CDZD;
-                mcor2 |= MCOR2_CDOD;
-        }
-
-        if (C_CREAD(tty))
-                /* Enable receiver */
-                port->IER |= IER_RXD;
-
-        /* Set input FIFO size (1-8 bytes) */
-        cor3 |= RISCOM_RXFIFO;
-        /* Setting up CD180 channel registers */
-        rc_out(bp, CD180_COR1, cor1);
-        rc_out(bp, CD180_COR2, port->COR2);
-        rc_out(bp, CD180_COR3, cor3);
-        /* Make CD180 know about registers change */
-        rc_wait_CCR(bp);
-        rc_out(bp, CD180_CCR, CCR_CORCHG1 | CCR_CORCHG2 | CCR_CORCHG3);
-        /* Setting up modem option registers */
-        rc_out(bp, CD180_MCOR1, mcor1);
-        rc_out(bp, CD180_MCOR2, mcor2);
-        /* Enable CD180 transmitter & receiver */
-        rc_wait_CCR(bp);
-        rc_out(bp, CD180_CCR, CCR_TXEN | CCR_RXEN);
-        /* Enable interrupts */
-        rc_out(bp, CD180_IER, port->IER);
-        /* And finally set RTS on */
-        rc_out(bp, CD180_MSVR, port->MSVR);
-}
-
-/* Must be called with interrupts enabled */
-static int rc_activate_port(struct tty_port *port, struct tty_struct *tty)
-{
-        struct riscom_port *rp = container_of(port, struct riscom_port, port);
-        struct riscom_board *bp = port_Board(rp);
-        unsigned long flags;
-
-        if (tty_port_alloc_xmit_buf(port) < 0)
-                return -ENOMEM;
-
-        spin_lock_irqsave(&riscom_lock, flags);
-
-        clear_bit(TTY_IO_ERROR, &tty->flags);
-        bp->count++;
-        rp->xmit_cnt = rp->xmit_head = rp->xmit_tail = 0;
-        rc_change_speed(tty, bp, rp);
-        spin_unlock_irqrestore(&riscom_lock, flags);
-        return 0;
-}
-
-/* Must be called with interrupts disabled */
-static void rc_shutdown_port(struct tty_struct *tty,
-                        struct riscom_board *bp, struct riscom_port *port)
-{
-#ifdef RC_REPORT_OVERRUN
-        printk(KERN_INFO "rc%d: port %d: Total %ld overruns were detected.\n",
-               board_No(bp), port_No(port), port->overrun);
-#endif
-#ifdef RC_REPORT_FIFO
-        {
-                int i;
-
-                printk(KERN_INFO "rc%d: port %d: FIFO hits [ ",
-                       board_No(bp), port_No(port));
-                for (i = 0; i < 10; i++)
-                        printk("%ld ", port->hits[i]);
-                printk("].\n");
-        }
-#endif
-        tty_port_free_xmit_buf(&port->port);
-
-        /* Select port */
-        rc_out(bp, CD180_CAR, port_No(port));
-        /* Reset port */
-        rc_wait_CCR(bp);
-        rc_out(bp, CD180_CCR, CCR_SOFTRESET);
-        /* Disable all interrupts from this port */
-        port->IER = 0;
-        rc_out(bp, CD180_IER, port->IER);
-
-        set_bit(TTY_IO_ERROR, &tty->flags);
-
-        if (--bp->count < 0)  {
-                printk(KERN_INFO "rc%d: rc_shutdown_port: "
-                                 "bad board count: %d\n",
-                       board_No(bp), bp->count);
-                bp->count = 0;
-        }
-        /*
-         * If this is the last opened port on the board
-         * shutdown whole board
-         */
-        if (!bp->count)
-                rc_shutdown_board(bp);
-}
-
-static int carrier_raised(struct tty_port *port)
-{
-        struct riscom_port *p = container_of(port, struct riscom_port, port);
-        struct riscom_board *bp = port_Board(p);
-        unsigned long flags;
-        int CD;
-        
-        spin_lock_irqsave(&riscom_lock, flags);
-        rc_out(bp, CD180_CAR, port_No(p));
-        CD = rc_in(bp, CD180_MSVR) & MSVR_CD;
-        rc_out(bp, CD180_MSVR, MSVR_RTS);
-        bp->DTR &= ~(1u << port_No(p));
-        rc_out(bp, RC_DTR, bp->DTR);
-        spin_unlock_irqrestore(&riscom_lock, flags);
-        return CD;
-}
-
-static void dtr_rts(struct tty_port *port, int onoff)
-{
-        struct riscom_port *p = container_of(port, struct riscom_port, port);
-        struct riscom_board *bp = port_Board(p);
-        unsigned long flags;
-
-        spin_lock_irqsave(&riscom_lock, flags);
-        bp->DTR &= ~(1u << port_No(p));
-        if (onoff == 0)
-                bp->DTR |= (1u << port_No(p));
-        rc_out(bp, RC_DTR, bp->DTR);
-        spin_unlock_irqrestore(&riscom_lock, flags);
-}
-
-static int rc_open(struct tty_struct *tty, struct file *filp)
-{
-        int board;
-        int error;
-        struct riscom_port *port;
-        struct riscom_board *bp;
-
-        board = RC_BOARD(tty->index);
-        if (board >= RC_NBOARD || !(rc_board[board].flags & RC_BOARD_PRESENT))
-                return -ENODEV;
-
-        bp = &rc_board[board];
-        port = rc_port + board * RC_NPORT + RC_PORT(tty->index);
-        if (rc_paranoia_check(port, tty->name, "rc_open"))
-                return -ENODEV;
-
-        error = rc_setup_board(bp);
-        if (error)
-                return error;
-
-        tty->driver_data = port;
-        return tty_port_open(&port->port, tty, filp);
-}
-
-static void rc_flush_buffer(struct tty_struct *tty)
-{
-        struct riscom_port *port = tty->driver_data;
-        unsigned long flags;
-
-        if (rc_paranoia_check(port, tty->name, "rc_flush_buffer"))
-                return;
-
-        spin_lock_irqsave(&riscom_lock, flags);
-        port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
-        spin_unlock_irqrestore(&riscom_lock, flags);
-
-        tty_wakeup(tty);
-}
-
-static void rc_close_port(struct tty_port *port)
-{
-        unsigned long flags;
-        struct riscom_port *rp = container_of(port, struct riscom_port, port);
-        struct riscom_board *bp = port_Board(rp);
-        unsigned long timeout;
-        
-        /*
-         * At this point we stop accepting input.  To do this, we
-         * disable the receive line status interrupts, and tell the
-         * interrupt driver to stop checking the data ready bit in the
-         * line status register.
-         */
-
-        spin_lock_irqsave(&riscom_lock, flags);
-        rp->IER &= ~IER_RXD;
-
-        rp->IER &= ~IER_TXRDY;
-        rp->IER |= IER_TXEMPTY;
-        rc_out(bp, CD180_CAR, port_No(rp));
-        rc_out(bp, CD180_IER, rp->IER);
-        /*
-         * Before we drop DTR, make sure the UART transmitter
-         * has completely drained; this is especially
-         * important if there is a transmit FIFO!
-         */
-        timeout = jiffies + HZ;
-        while (rp->IER & IER_TXEMPTY) {
-                spin_unlock_irqrestore(&riscom_lock, flags);
-                msleep_interruptible(jiffies_to_msecs(rp->timeout));
-                spin_lock_irqsave(&riscom_lock, flags);
-                if (time_after(jiffies, timeout))
-                        break;
-        }
-        rc_shutdown_port(port->tty, bp, rp);
-        spin_unlock_irqrestore(&riscom_lock, flags);
-}
-
-static void rc_close(struct tty_struct *tty, struct file *filp)
-{
-        struct riscom_port *port = tty->driver_data;
-
-        if (!port || rc_paranoia_check(port, tty->name, "close"))
-                return;
-        tty_port_close(&port->port, tty, filp);
-}
-
-static int rc_write(struct tty_struct *tty,
-                    const unsigned char *buf, int count)
-{
-        struct riscom_port *port = tty->driver_data;
-        struct riscom_board *bp;
-        int c, total = 0;
-        unsigned long flags;
-
-        if (rc_paranoia_check(port, tty->name, "rc_write"))
-                return 0;
-
-        bp = port_Board(port);
-
-        while (1) {
-                spin_lock_irqsave(&riscom_lock, flags);
-
-                c = min_t(int, count, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
-                                          SERIAL_XMIT_SIZE - port->xmit_head));
-                if (c <= 0)
-                        break;  /* lock continues to be held */
-
-                memcpy(port->port.xmit_buf + port->xmit_head, buf, c);
-                port->xmit_head = (port->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
-                port->xmit_cnt += c;
-
-                spin_unlock_irqrestore(&riscom_lock, flags);
-
-                buf += c;
-                count -= c;
-                total += c;
-        }
-
-        if (port->xmit_cnt && !tty->stopped && !tty->hw_stopped &&
-            !(port->IER & IER_TXRDY)) {
-                port->IER |= IER_TXRDY;
-                rc_out(bp, CD180_CAR, port_No(port));
-                rc_out(bp, CD180_IER, port->IER);
-        }
-
-        spin_unlock_irqrestore(&riscom_lock, flags);
-
-        return total;
-}
-
-static int rc_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        struct riscom_port *port = tty->driver_data;
-        unsigned long flags;
-        int ret = 0;
-
-        if (rc_paranoia_check(port, tty->name, "rc_put_char"))
-                return 0;
-
-        spin_lock_irqsave(&riscom_lock, flags);
-
-        if (port->xmit_cnt >= SERIAL_XMIT_SIZE - 1)
-                goto out;
-
-        port->port.xmit_buf[port->xmit_head++] = ch;
-        port->xmit_head &= SERIAL_XMIT_SIZE - 1;
-        port->xmit_cnt++;
-        ret = 1;
-
-out:
-        spin_unlock_irqrestore(&riscom_lock, flags);
-        return ret;
-}
-
-static void rc_flush_chars(struct tty_struct *tty)
-{
-        struct riscom_port *port = tty->driver_data;
-        unsigned long flags;
-
-        if (rc_paranoia_check(port, tty->name, "rc_flush_chars"))
-                return;
-
-        if (port->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped)
-                return;
-
-        spin_lock_irqsave(&riscom_lock, flags);
-
-        port->IER |= IER_TXRDY;
-        rc_out(port_Board(port), CD180_CAR, port_No(port));
-        rc_out(port_Board(port), CD180_IER, port->IER);
-
-        spin_unlock_irqrestore(&riscom_lock, flags);
-}
-
-static int rc_write_room(struct tty_struct *tty)
-{
-        struct riscom_port *port = tty->driver_data;
-        int     ret;
-
-        if (rc_paranoia_check(port, tty->name, "rc_write_room"))
-                return 0;
-
-        ret = SERIAL_XMIT_SIZE - port->xmit_cnt - 1;
-        if (ret < 0)
-                ret = 0;
-        return ret;
-}
-
-static int rc_chars_in_buffer(struct tty_struct *tty)
-{
-        struct riscom_port *port = tty->driver_data;
-
-        if (rc_paranoia_check(port, tty->name, "rc_chars_in_buffer"))
-                return 0;
-
-        return port->xmit_cnt;
-}
-
-static int rc_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct riscom_port *port = tty->driver_data;
-        struct riscom_board *bp;
-        unsigned char status;
-        unsigned int result;
-        unsigned long flags;
-
-        if (rc_paranoia_check(port, tty->name, __func__))
-                return -ENODEV;
-
-        bp = port_Board(port);
-
-        spin_lock_irqsave(&riscom_lock, flags);
-
-        rc_out(bp, CD180_CAR, port_No(port));
-        status = rc_in(bp, CD180_MSVR);
-        result = rc_in(bp, RC_RI) & (1u << port_No(port)) ? 0 : TIOCM_RNG;
-
-        spin_unlock_irqrestore(&riscom_lock, flags);
-
-        result |= ((status & MSVR_RTS) ? TIOCM_RTS : 0)
-                | ((status & MSVR_DTR) ? TIOCM_DTR : 0)
-                | ((status & MSVR_CD)  ? TIOCM_CAR : 0)
-                | ((status & MSVR_DSR) ? TIOCM_DSR : 0)
-                | ((status & MSVR_CTS) ? TIOCM_CTS : 0);
-        return result;
-}
-
-static int rc_tiocmset(struct tty_struct *tty, struct file *file,
-                       unsigned int set, unsigned int clear)
-{
-        struct riscom_port *port = tty->driver_data;
-        unsigned long flags;
-        struct riscom_board *bp;
-
-        if (rc_paranoia_check(port, tty->name, __func__))
-                return -ENODEV;
-
-        bp = port_Board(port);
-
-        spin_lock_irqsave(&riscom_lock, flags);
-
-        if (set & TIOCM_RTS)
-                port->MSVR |= MSVR_RTS;
-        if (set & TIOCM_DTR)
-                bp->DTR &= ~(1u << port_No(port));
-
-        if (clear & TIOCM_RTS)
-                port->MSVR &= ~MSVR_RTS;
-        if (clear & TIOCM_DTR)
-                bp->DTR |= (1u << port_No(port));
-
-        rc_out(bp, CD180_CAR, port_No(port));
-        rc_out(bp, CD180_MSVR, port->MSVR);
-        rc_out(bp, RC_DTR, bp->DTR);
-
-        spin_unlock_irqrestore(&riscom_lock, flags);
-
-        return 0;
-}
-
-static int rc_send_break(struct tty_struct *tty, int length)
-{
-        struct riscom_port *port = tty->driver_data;
-        struct riscom_board *bp = port_Board(port);
-        unsigned long flags;
-
-        if (length == 0 || length == -1)
-                return -EOPNOTSUPP;
-
-        spin_lock_irqsave(&riscom_lock, flags);
-
-        port->break_length = RISCOM_TPS / HZ * length;
-        port->COR2 |= COR2_ETC;
-        port->IER  |= IER_TXRDY;
-        rc_out(bp, CD180_CAR, port_No(port));
-        rc_out(bp, CD180_COR2, port->COR2);
-        rc_out(bp, CD180_IER, port->IER);
-        rc_wait_CCR(bp);
-        rc_out(bp, CD180_CCR, CCR_CORCHG2);
-        rc_wait_CCR(bp);
-
-        spin_unlock_irqrestore(&riscom_lock, flags);
-        return 0;
-}
-
-static int rc_set_serial_info(struct tty_struct *tty, struct riscom_port *port,
-                                     struct serial_struct __user *newinfo)
-{
-        struct serial_struct tmp;
-        struct riscom_board *bp = port_Board(port);
-        int change_speed;
-
-        if (copy_from_user(&tmp, newinfo, sizeof(tmp)))
-                return -EFAULT;
-
-        mutex_lock(&port->port.mutex);
-        change_speed = ((port->port.flags & ASYNC_SPD_MASK) !=
-                        (tmp.flags & ASYNC_SPD_MASK));
-
-        if (!capable(CAP_SYS_ADMIN)) {
-                if ((tmp.close_delay != port->port.close_delay) ||
-                    (tmp.closing_wait != port->port.closing_wait) ||
-                    ((tmp.flags & ~ASYNC_USR_MASK) !=
-                     (port->port.flags & ~ASYNC_USR_MASK))) {
-                        mutex_unlock(&port->port.mutex);
-                        return -EPERM;
-                }
-                port->port.flags = ((port->port.flags & ~ASYNC_USR_MASK) |
-                               (tmp.flags & ASYNC_USR_MASK));
-        } else  {
-                port->port.flags = ((port->port.flags & ~ASYNC_FLAGS) |
-                               (tmp.flags & ASYNC_FLAGS));
-                port->port.close_delay = tmp.close_delay;
-                port->port.closing_wait = tmp.closing_wait;
-        }
-        if (change_speed)  {
-                unsigned long flags;
-
-                spin_lock_irqsave(&riscom_lock, flags);
-                rc_change_speed(tty, bp, port);
-                spin_unlock_irqrestore(&riscom_lock, flags);
-        }
-        mutex_unlock(&port->port.mutex);
-        return 0;
-}
-
-static int rc_get_serial_info(struct riscom_port *port,
-                                     struct serial_struct __user *retinfo)
-{
-        struct serial_struct tmp;
-        struct riscom_board *bp = port_Board(port);
-
-        memset(&tmp, 0, sizeof(tmp));
-        tmp.type = PORT_CIRRUS;
-        tmp.line = port - rc_port;
-
-        mutex_lock(&port->port.mutex);
-        tmp.port = bp->base;
-        tmp.irq  = bp->irq;
-        tmp.flags = port->port.flags;
-        tmp.baud_base = (RC_OSCFREQ + CD180_TPC/2) / CD180_TPC;
-        tmp.close_delay = port->port.close_delay * HZ/100;
-        tmp.closing_wait = port->port.closing_wait * HZ/100;
-        mutex_unlock(&port->port.mutex);
-        tmp.xmit_fifo_size = CD180_NFIFO;
-        return copy_to_user(retinfo, &tmp, sizeof(tmp)) ? -EFAULT : 0;
-}
-
-static int rc_ioctl(struct tty_struct *tty, struct file *filp,
-                    unsigned int cmd, unsigned long arg)
-{
-        struct riscom_port *port = tty->driver_data;
-        void __user *argp = (void __user *)arg;
-        int retval;
-
-        if (rc_paranoia_check(port, tty->name, "rc_ioctl"))
-                return -ENODEV;
-
-        switch (cmd) {
-        case TIOCGSERIAL:
-                retval = rc_get_serial_info(port, argp);
-                break;
-        case TIOCSSERIAL:
-                retval = rc_set_serial_info(tty, port, argp);
-                break;
-        default:
-                retval = -ENOIOCTLCMD;
-        }
-        return retval;
-}
-
-static void rc_throttle(struct tty_struct *tty)
-{
-        struct riscom_port *port = tty->driver_data;
-        struct riscom_board *bp;
-        unsigned long flags;
-
-        if (rc_paranoia_check(port, tty->name, "rc_throttle"))
-                return;
-        bp = port_Board(port);
-
-        spin_lock_irqsave(&riscom_lock, flags);
-        port->MSVR &= ~MSVR_RTS;
-        rc_out(bp, CD180_CAR, port_No(port));
-        if (I_IXOFF(tty)) {
-                rc_wait_CCR(bp);
-                rc_out(bp, CD180_CCR, CCR_SSCH2);
-                rc_wait_CCR(bp);
-        }
-        rc_out(bp, CD180_MSVR, port->MSVR);
-        spin_unlock_irqrestore(&riscom_lock, flags);
-}
-
-static void rc_unthrottle(struct tty_struct *tty)
-{
-        struct riscom_port *port = tty->driver_data;
-        struct riscom_board *bp;
-        unsigned long flags;
-
-        if (rc_paranoia_check(port, tty->name, "rc_unthrottle"))
-                return;
-        bp = port_Board(port);
-
-        spin_lock_irqsave(&riscom_lock, flags);
-        port->MSVR |= MSVR_RTS;
-        rc_out(bp, CD180_CAR, port_No(port));
-        if (I_IXOFF(tty))  {
-                rc_wait_CCR(bp);
-                rc_out(bp, CD180_CCR, CCR_SSCH1);
-                rc_wait_CCR(bp);
-        }
-        rc_out(bp, CD180_MSVR, port->MSVR);
-        spin_unlock_irqrestore(&riscom_lock, flags);
-}
-
-static void rc_stop(struct tty_struct *tty)
-{
-        struct riscom_port *port = tty->driver_data;
-        struct riscom_board *bp;
-        unsigned long flags;
-
-        if (rc_paranoia_check(port, tty->name, "rc_stop"))
-                return;
-
-        bp = port_Board(port);
-
-        spin_lock_irqsave(&riscom_lock, flags);
-        port->IER &= ~IER_TXRDY;
-        rc_out(bp, CD180_CAR, port_No(port));
-        rc_out(bp, CD180_IER, port->IER);
-        spin_unlock_irqrestore(&riscom_lock, flags);
-}
-
-static void rc_start(struct tty_struct *tty)
-{
-        struct riscom_port *port = tty->driver_data;
-        struct riscom_board *bp;
-        unsigned long flags;
-
-        if (rc_paranoia_check(port, tty->name, "rc_start"))
-                return;
-
-        bp = port_Board(port);
-
-        spin_lock_irqsave(&riscom_lock, flags);
-
-        if (port->xmit_cnt && port->port.xmit_buf && !(port->IER & IER_TXRDY)) {
-                port->IER |= IER_TXRDY;
-                rc_out(bp, CD180_CAR, port_No(port));
-                rc_out(bp, CD180_IER, port->IER);
-        }
-        spin_unlock_irqrestore(&riscom_lock, flags);
-}
-
-static void rc_hangup(struct tty_struct *tty)
-{
-        struct riscom_port *port = tty->driver_data;
-
-        if (rc_paranoia_check(port, tty->name, "rc_hangup"))
-                return;
-
-        tty_port_hangup(&port->port);
-}
-
-static void rc_set_termios(struct tty_struct *tty,
-                                        struct ktermios *old_termios)
-{
-        struct riscom_port *port = tty->driver_data;
-        unsigned long flags;
-
-        if (rc_paranoia_check(port, tty->name, "rc_set_termios"))
-                return;
-
-        spin_lock_irqsave(&riscom_lock, flags);
-        rc_change_speed(tty, port_Board(port), port);
-        spin_unlock_irqrestore(&riscom_lock, flags);
-
-        if ((old_termios->c_cflag & CRTSCTS) &&
-            !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-                rc_start(tty);
-        }
-}
-
-static const struct tty_operations riscom_ops = {
-        .open  = rc_open,
-        .close = rc_close,
-        .write = rc_write,
-        .put_char = rc_put_char,
-        .flush_chars = rc_flush_chars,
-        .write_room = rc_write_room,
-        .chars_in_buffer = rc_chars_in_buffer,
-        .flush_buffer = rc_flush_buffer,
-        .ioctl = rc_ioctl,
-        .throttle = rc_throttle,
-        .unthrottle = rc_unthrottle,
-        .set_termios = rc_set_termios,
-        .stop = rc_stop,
-        .start = rc_start,
-        .hangup = rc_hangup,
-        .tiocmget = rc_tiocmget,
-        .tiocmset = rc_tiocmset,
-        .break_ctl = rc_send_break,
-};
-
-static const struct tty_port_operations riscom_port_ops = {
-        .carrier_raised = carrier_raised,
-        .dtr_rts = dtr_rts,
-        .shutdown = rc_close_port,
-        .activate = rc_activate_port,
-};
-
-
-static int __init rc_init_drivers(void)
-{
-        int error;
-        int i;
-
-        riscom_driver = alloc_tty_driver(RC_NBOARD * RC_NPORT);
-        if (!riscom_driver)
-                return -ENOMEM;
-
-        riscom_driver->owner = THIS_MODULE;
-        riscom_driver->name = "ttyL";
-        riscom_driver->major = RISCOM8_NORMAL_MAJOR;
-        riscom_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        riscom_driver->subtype = SERIAL_TYPE_NORMAL;
-        riscom_driver->init_termios = tty_std_termios;
-        riscom_driver->init_termios.c_cflag =
-                B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        riscom_driver->init_termios.c_ispeed = 9600;
-        riscom_driver->init_termios.c_ospeed = 9600;
-        riscom_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_HARDWARE_BREAK;
-        tty_set_operations(riscom_driver, &riscom_ops);
-        error = tty_register_driver(riscom_driver);
-        if (error != 0) {
-                put_tty_driver(riscom_driver);
-                printk(KERN_ERR "rc: Couldn't register RISCom/8 driver, "
-                                "error = %d\n", error);
-                return 1;
-        }
-        memset(rc_port, 0, sizeof(rc_port));
-        for (i = 0; i < RC_NPORT * RC_NBOARD; i++)  {
-                tty_port_init(&rc_port[i].port);
-                rc_port[i].port.ops = &riscom_port_ops;
-                rc_port[i].magic = RISCOM8_MAGIC;
-        }
-        return 0;
-}
-
-static void rc_release_drivers(void)
-{
-        tty_unregister_driver(riscom_driver);
-        put_tty_driver(riscom_driver);
-}
-
-#ifndef MODULE
-/*
- * Called at boot time.
- *
- * You can specify IO base for up to RC_NBOARD cards,
- * using line "riscom8=0xiobase1,0xiobase2,.." at LILO prompt.
- * Note that there will be no probing at default
- * addresses in this case.
- *
- */
-static int __init riscom8_setup(char *str)
-{
-        int ints[RC_NBOARD];
-        int i;
-
-        str = get_options(str, ARRAY_SIZE(ints), ints);
-
-        for (i = 0; i < RC_NBOARD; i++) {
-                if (i < ints[0])
-                        rc_board[i].base = ints[i+1];
-                else
-                        rc_board[i].base = 0;
-        }
-        return 1;
-}
-
-__setup("riscom8=", riscom8_setup);
-#endif
-
-static char banner[] __initdata =
-        KERN_INFO "rc: SDL RISCom/8 card driver v1.1, (c) D.Gorodchanin "
-                  "1994-1996.\n";
-static char no_boards_msg[] __initdata =
-        KERN_INFO "rc: No RISCom/8 boards detected.\n";
-
-/*
- * This routine must be called by kernel at boot time
- */
-static int __init riscom8_init(void)
-{
-        int i;
-        int found = 0;
-
-        printk(banner);
-
-        if (rc_init_drivers())
-                return -EIO;
-
-        for (i = 0; i < RC_NBOARD; i++)
-                if (rc_board[i].base && !rc_probe(&rc_board[i]))
-                        found++;
-        if (!found)  {
-                rc_release_drivers();
-                printk(no_boards_msg);
-                return -EIO;
-        }
-        return 0;
-}
-
-#ifdef MODULE
-static int iobase;
-static int iobase1;
-static int iobase2;
-static int iobase3;
-module_param(iobase, int, 0);
-module_param(iobase1, int, 0);
-module_param(iobase2, int, 0);
-module_param(iobase3, int, 0);
-
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV_MAJOR(RISCOM8_NORMAL_MAJOR);
-#endif /* MODULE */
-
-/*
- * You can setup up to 4 boards (current value of RC_NBOARD)
- * by specifying "iobase=0xXXX iobase1=0xXXX ..." as insmod parameter.
- *
- */
-static int __init riscom8_init_module(void)
-{
-#ifdef MODULE
-        int i;
-
-        if (iobase || iobase1 || iobase2 || iobase3) {
-                for (i = 0; i < RC_NBOARD; i++)
-                        rc_board[i].base = 0;
-        }
-
-        if (iobase)
-                rc_board[0].base = iobase;
-        if (iobase1)
-                rc_board[1].base = iobase1;
-        if (iobase2)
-                rc_board[2].base = iobase2;
-        if (iobase3)
-                rc_board[3].base = iobase3;
-#endif /* MODULE */
-
-        return riscom8_init();
-}
-
-static void __exit riscom8_exit_module(void)
-{
-        int i;
-
-        rc_release_drivers();
-        for (i = 0; i < RC_NBOARD; i++)
-                if (rc_board[i].flags & RC_BOARD_PRESENT)
-                        rc_release_io_range(&rc_board[i]);
-
-}
-
-module_init(riscom8_init_module);
-module_exit(riscom8_exit_module);
diff --git a/drivers/char/riscom8.h b/drivers/char/riscom8.h
deleted file mode 100644
index c9876b3f9714..000000000000
--- a/drivers/char/riscom8.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *      linux/drivers/char/riscom8.h  -- RISCom/8 multiport serial driver.
- *
- *      Copyright (C) 1994-1996  Dmitry Gorodchanin (pgmdsg@ibi.com)
- *
- *      This code is loosely based on the Linux serial driver, written by
- *      Linus Torvalds, Theodore T'so and others. The RISCom/8 card 
- *      programming info was obtained from various drivers for other OSes 
- *      (FreeBSD, ISC, etc), but no source code from those drivers were 
- *      directly included in this driver.
- *
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __LINUX_RISCOM8_H
-#define __LINUX_RISCOM8_H
-
-#include <linux/serial.h>
-
-#ifdef __KERNEL__
-
-#define RC_NBOARD               4
-/* NOTE: RISCom decoder recognizes 16 addresses... */
-#define RC_NPORT                8  
-#define RC_BOARD(line)          (((line) >> 3) & 0x07)
-#define RC_PORT(line)           ((line) & (RC_NPORT - 1))
-
-/* Ticks per sec. Used for setting receiver timeout and break length */
-#define RISCOM_TPS              4000
-
-/* Yeah, after heavy testing I decided it must be 6.
- * Sure, You can change it if needed.
- */
-#define RISCOM_RXFIFO           6       /* Max. receiver FIFO size (1-8) */
-
-#define RISCOM8_MAGIC           0x0907
-
-#define RC_IOBASE1      0x220
-#define RC_IOBASE2      0x240
-#define RC_IOBASE3      0x250
-#define RC_IOBASE4      0x260
-
-struct riscom_board {
-        unsigned long   flags;
-        unsigned short  base;
-        unsigned char   irq;
-        signed   char   count;
-        unsigned char   DTR;
-};
-
-#define RC_BOARD_PRESENT        0x00000001
-#define RC_BOARD_ACTIVE         0x00000002
-        
-struct riscom_port {
-        int                     magic;
-        struct                  tty_port port;
-        int                     baud_base;
-        int                     timeout;
-        int                     custom_divisor;
-        int                     xmit_head;
-        int                     xmit_tail;
-        int                     xmit_cnt;
-        short                   wakeup_chars;
-        short                   break_length;
-        unsigned char           mark_mask;
-        unsigned char           IER;
-        unsigned char           MSVR;
-        unsigned char           COR2;
-#ifdef RC_REPORT_OVERRUN
-        unsigned long           overrun;
-#endif  
-#ifdef RC_REPORT_FIFO
-        unsigned long           hits[10];
-#endif
-};
-
-#endif /* __KERNEL__ */
-#endif /* __LINUX_RISCOM8_H */
diff --git a/drivers/char/riscom8_reg.h b/drivers/char/riscom8_reg.h
deleted file mode 100644
index a32475ed0d18..000000000000
--- a/drivers/char/riscom8_reg.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- *      linux/drivers/char/riscom8_reg.h  -- RISCom/8 multiport serial driver.
- */
-
-/*
- * Definitions for RISCom/8 Async Mux card by SDL Communications, Inc.
- */
-
-/*
- * Address mapping between Cirrus Logic CD180 chip internal registers
- * and ISA port addresses:
- *
- *      CL-CD180                A6  A5   A4  A3                      A2 A1 A0
- *      ISA             A15 A14 A13 A12  A11 A10 A9 A8  A7 A6 A5 A4  A3 A2 A1 A0
- */
-#define RC_TO_ISA(r)    ((((r)&0x07)<<1) | (((r)&~0x07)<<7))
-
-
-/* RISCom/8 On-Board Registers (assuming address translation) */
-
-#define RC_RI           0x100   /* Ring Indicator Register (R/O)           */
-#define RC_DTR          0x100   /* DTR Register (W/O)                      */
-#define RC_BSR          0x101   /* Board Status Register (R/O)             */
-#define RC_CTOUT        0x101   /* Clear Timeout (W/O)                     */
-
-
-/* Board Status Register */
-
-#define RC_BSR_TOUT     0x08     /* Hardware Timeout                       */
-#define RC_BSR_RINT     0x04     /* Receiver Interrupt                     */
-#define RC_BSR_TINT     0x02     /* Transmitter Interrupt                  */
-#define RC_BSR_MINT     0x01     /* Modem Ctl Interrupt                    */
-
-
-/* On-board oscillator frequency (in Hz) */
-#define RC_OSCFREQ      9830400
-
-/* Values of choice for Interrupt ACKs */
-#define RC_ACK_MINT     0x81    /* goes to PILR1                           */
-#define RC_ACK_RINT     0x82    /* goes to PILR3                           */
-#define RC_ACK_TINT     0x84    /* goes to PILR2                           */
-
-/* Chip ID (sorry, only one chip now) */
-#define RC_ID           0x10
-
-/* Definitions for Cirrus Logic CL-CD180 8-port async mux chip */
- 
-#define CD180_NCH       8       /* Total number of channels                */
-#define CD180_TPC       16      /* Ticks per character                     */
-#define CD180_NFIFO     8       /* TX FIFO size                            */
-
-
-/* Global registers */
-
-#define CD180_GIVR      0x40    /* Global Interrupt Vector Register        */
-#define CD180_GICR      0x41    /* Global Interrupting Channel Register    */
-#define CD180_PILR1     0x61    /* Priority Interrupt Level Register 1     */
-#define CD180_PILR2     0x62    /* Priority Interrupt Level Register 2     */
-#define CD180_PILR3     0x63    /* Priority Interrupt Level Register 3     */
-#define CD180_CAR       0x64    /* Channel Access Register                 */
-#define CD180_GFRCR     0x6b    /* Global Firmware Revision Code Register  */
-#define CD180_PPRH      0x70    /* Prescaler Period Register High          */
-#define CD180_PPRL      0x71    /* Prescaler Period Register Low           */
-#define CD180_RDR       0x78    /* Receiver Data Register                  */
-#define CD180_RCSR      0x7a    /* Receiver Character Status Register      */
-#define CD180_TDR       0x7b    /* Transmit Data Register                  */
-#define CD180_EOIR      0x7f    /* End of Interrupt Register               */
-
-
-/* Channel Registers */
-
-#define CD180_CCR       0x01    /* Channel Command Register                */
-#define CD180_IER       0x02    /* Interrupt Enable Register               */
-#define CD180_COR1      0x03    /* Channel Option Register 1               */
-#define CD180_COR2      0x04    /* Channel Option Register 2               */
-#define CD180_COR3      0x05    /* Channel Option Register 3               */
-#define CD180_CCSR      0x06    /* Channel Control Status Register         */
-#define CD180_RDCR      0x07    /* Receive Data Count Register             */
-#define CD180_SCHR1     0x09    /* Special Character Register 1            */
-#define CD180_SCHR2     0x0a    /* Special Character Register 2            */
-#define CD180_SCHR3     0x0b    /* Special Character Register 3            */
-#define CD180_SCHR4     0x0c    /* Special Character Register 4            */
-#define CD180_MCOR1     0x10    /* Modem Change Option 1 Register          */
-#define CD180_MCOR2     0x11    /* Modem Change Option 2 Register          */
-#define CD180_MCR       0x12    /* Modem Change Register                   */
-#define CD180_RTPR      0x18    /* Receive Timeout Period Register         */
-#define CD180_MSVR      0x28    /* Modem Signal Value Register             */
-#define CD180_RBPRH     0x31    /* Receive Baud Rate Period Register High  */
-#define CD180_RBPRL     0x32    /* Receive Baud Rate Period Register Low   */
-#define CD180_TBPRH     0x39    /* Transmit Baud Rate Period Register High */
-#define CD180_TBPRL     0x3a    /* Transmit Baud Rate Period Register Low  */
-
-
-/* Global Interrupt Vector Register (R/W) */
-
-#define GIVR_ITMASK     0x07     /* Interrupt type mask                     */
-#define  GIVR_IT_MODEM   0x01    /* Modem Signal Change Interrupt           */
-#define  GIVR_IT_TX      0x02    /* Transmit Data Interrupt                 */
-#define  GIVR_IT_RCV     0x03    /* Receive Good Data Interrupt             */
-#define  GIVR_IT_REXC    0x07    /* Receive Exception Interrupt             */
-
-
-/* Global Interrupt Channel Register (R/W) */
- 
-#define GICR_CHAN       0x1c    /* Channel Number Mask                     */
-#define GICR_CHAN_OFF   2       /* Channel Number Offset                   */
-
-
-/* Channel Address Register (R/W) */
-
-#define CAR_CHAN        0x07    /* Channel Number Mask                     */
-#define CAR_A7          0x08    /* A7 Address Extension (unused)           */
-
-
-/* Receive Character Status Register (R/O) */
-
-#define RCSR_TOUT       0x80    /* Rx Timeout                              */
-#define RCSR_SCDET      0x70    /* Special Character Detected Mask         */
-#define  RCSR_NO_SC      0x00   /* No Special Characters Detected          */
-#define  RCSR_SC_1       0x10   /* Special Char 1 (or 1 & 3) Detected      */
-#define  RCSR_SC_2       0x20   /* Special Char 2 (or 2 & 4) Detected      */
-#define  RCSR_SC_3       0x30   /* Special Char 3 Detected                 */
-#define  RCSR_SC_4       0x40   /* Special Char 4 Detected                 */
-#define RCSR_BREAK      0x08    /* Break has been detected                 */
-#define RCSR_PE         0x04    /* Parity Error                            */
-#define RCSR_FE         0x02    /* Frame Error                             */
-#define RCSR_OE         0x01    /* Overrun Error                           */
-
-
-/* Channel Command Register (R/W) (commands in groups can be OR-ed) */
-
-#define CCR_HARDRESET   0x81    /* Reset the chip                          */
-
-#define CCR_SOFTRESET   0x80    /* Soft Channel Reset                      */
-
-#define CCR_CORCHG1     0x42    /* Channel Option Register 1 Changed       */
-#define CCR_CORCHG2     0x44    /* Channel Option Register 2 Changed       */
-#define CCR_CORCHG3     0x48    /* Channel Option Register 3 Changed       */
-
-#define CCR_SSCH1       0x21    /* Send Special Character 1                */
-
-#define CCR_SSCH2       0x22    /* Send Special Character 2                */
-
-#define CCR_SSCH3       0x23    /* Send Special Character 3                */
-
-#define CCR_SSCH4       0x24    /* Send Special Character 4                */
-
-#define CCR_TXEN        0x18    /* Enable Transmitter                      */
-#define CCR_RXEN        0x12    /* Enable Receiver                         */
-
-#define CCR_TXDIS       0x14    /* Disable Transmitter                     */
-#define CCR_RXDIS       0x11    /* Disable Receiver                        */
-
-
-/* Interrupt Enable Register (R/W) */
-
-#define IER_DSR         0x80    /* Enable interrupt on DSR change          */
-#define IER_CD          0x40    /* Enable interrupt on CD change           */
-#define IER_CTS         0x20    /* Enable interrupt on CTS change          */
-#define IER_RXD         0x10    /* Enable interrupt on Receive Data        */
-#define IER_RXSC        0x08    /* Enable interrupt on Receive Spec. Char  */
-#define IER_TXRDY       0x04    /* Enable interrupt on TX FIFO empty       */
-#define IER_TXEMPTY     0x02    /* Enable interrupt on TX completely empty */
-#define IER_RET         0x01    /* Enable interrupt on RX Exc. Timeout     */
-
-
-/* Channel Option Register 1 (R/W) */
-
-#define COR1_ODDP       0x80    /* Odd Parity                              */
-#define COR1_PARMODE    0x60    /* Parity Mode mask                        */
-#define  COR1_NOPAR      0x00   /* No Parity                               */
-#define  COR1_FORCEPAR   0x20   /* Force Parity                            */
-#define  COR1_NORMPAR    0x40   /* Normal Parity                           */
-#define COR1_IGNORE     0x10    /* Ignore Parity on RX                     */
-#define COR1_STOPBITS   0x0c    /* Number of Stop Bits                     */
-#define  COR1_1SB        0x00   /* 1 Stop Bit                              */
-#define  COR1_15SB       0x04   /* 1.5 Stop Bits                           */
-#define  COR1_2SB        0x08   /* 2 Stop Bits                             */
-#define COR1_CHARLEN    0x03    /* Character Length                        */
-#define  COR1_5BITS      0x00   /* 5 bits                                  */
-#define  COR1_6BITS      0x01   /* 6 bits                                  */
-#define  COR1_7BITS      0x02   /* 7 bits                                  */
-#define  COR1_8BITS      0x03   /* 8 bits                                  */
-
-
-/* Channel Option Register 2 (R/W) */
-
-#define COR2_IXM        0x80    /* Implied XON mode                        */
-#define COR2_TXIBE      0x40    /* Enable In-Band (XON/XOFF) Flow Control  */
-#define COR2_ETC        0x20    /* Embedded Tx Commands Enable             */
-#define COR2_LLM        0x10    /* Local Loopback Mode                     */
-#define COR2_RLM        0x08    /* Remote Loopback Mode                    */
-#define COR2_RTSAO      0x04    /* RTS Automatic Output Enable             */
-#define COR2_CTSAE      0x02    /* CTS Automatic Enable                    */
-#define COR2_DSRAE      0x01    /* DSR Automatic Enable                    */
-
-
-/* Channel Option Register 3 (R/W) */
-
-#define COR3_XONCH      0x80    /* XON is a pair of characters (1 & 3)     */
-#define COR3_XOFFCH     0x40    /* XOFF is a pair of characters (2 & 4)    */
-#define COR3_FCT        0x20    /* Flow-Control Transparency Mode          */
-#define COR3_SCDE       0x10    /* Special Character Detection Enable      */
-#define COR3_RXTH       0x0f    /* RX FIFO Threshold value (1-8)           */
-
-
-/* Channel Control Status Register (R/O) */
-
-#define CCSR_RXEN       0x80    /* Receiver Enabled                        */
-#define CCSR_RXFLOFF    0x40    /* Receive Flow Off (XOFF was sent)        */
-#define CCSR_RXFLON     0x20    /* Receive Flow On (XON was sent)          */
-#define CCSR_TXEN       0x08    /* Transmitter Enabled                     */
-#define CCSR_TXFLOFF    0x04    /* Transmit Flow Off (got XOFF)            */
-#define CCSR_TXFLON     0x02    /* Transmit Flow On (got XON)              */
-
-
-/* Modem Change Option Register 1 (R/W) */
-
-#define MCOR1_DSRZD     0x80    /* Detect 0->1 transition of DSR           */
-#define MCOR1_CDZD      0x40    /* Detect 0->1 transition of CD            */
-#define MCOR1_CTSZD     0x20    /* Detect 0->1 transition of CTS           */
-#define MCOR1_DTRTH     0x0f    /* Auto DTR flow control Threshold (1-8)   */
-#define  MCOR1_NODTRFC   0x0     /* Automatic DTR flow control disabled     */
-
-
-/* Modem Change Option Register 2 (R/W) */
-
-#define MCOR2_DSROD     0x80    /* Detect 1->0 transition of DSR           */
-#define MCOR2_CDOD      0x40    /* Detect 1->0 transition of CD            */
-#define MCOR2_CTSOD     0x20    /* Detect 1->0 transition of CTS           */
-
-
-/* Modem Change Register (R/W) */
-
-#define MCR_DSRCHG      0x80    /* DSR Changed                             */
-#define MCR_CDCHG       0x40    /* CD Changed                              */
-#define MCR_CTSCHG      0x20    /* CTS Changed                             */
-
-
-/* Modem Signal Value Register (R/W) */
-
-#define MSVR_DSR        0x80    /* Current state of DSR input              */
-#define MSVR_CD         0x40    /* Current state of CD input               */
-#define MSVR_CTS        0x20    /* Current state of CTS input              */
-#define MSVR_DTR        0x02    /* Current state of DTR output             */
-#define MSVR_RTS        0x01    /* Current state of RTS output             */
-
-
-/* Escape characters */
-
-#define CD180_C_ESC     0x00    /* Escape character                        */
-#define CD180_C_SBRK    0x81    /* Start sending BREAK                     */
-#define CD180_C_DELAY   0x82    /* Delay output                            */
-#define CD180_C_EBRK    0x83    /* Stop sending BREAK                      */
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
deleted file mode 100644
index 7c79d243acc9..000000000000
--- a/drivers/char/rocket.c
+++ /dev/null
@@ -1,3196 +0,0 @@
-/*
- * RocketPort device driver for Linux
- *
- * Written by Theodore Ts'o, 1995, 1996, 1997, 1998, 1999, 2000.
- * 
- * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2003 by Comtrol, Inc.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * Kernel Synchronization:
- *
- * This driver has 2 kernel control paths - exception handlers (calls into the driver
- * from user mode) and the timer bottom half (tasklet).  This is a polled driver, interrupts
- * are not used.
- *
- * Critical data: 
- * -  rp_table[], accessed through passed "info" pointers, is a global (static) array of 
- *    serial port state information and the xmit_buf circular buffer.  Protected by 
- *    a per port spinlock.
- * -  xmit_flags[], an array of ints indexed by line (port) number, indicating that there
- *    is data to be transmitted.  Protected by atomic bit operations.
- * -  rp_num_ports, int indicating number of open ports, protected by atomic operations.
- * 
- * rp_write() and rp_write_char() functions use a per port semaphore to protect against
- * simultaneous access to the same port by more than one process.
- */
-
-/****** Defines ******/
-#define ROCKET_PARANOIA_CHECK
-#define ROCKET_DISABLE_SIMUSAGE
-
-#undef ROCKET_SOFT_FLOW
-#undef ROCKET_DEBUG_OPEN
-#undef ROCKET_DEBUG_INTR
-#undef ROCKET_DEBUG_WRITE
-#undef ROCKET_DEBUG_FLOW
-#undef ROCKET_DEBUG_THROTTLE
-#undef ROCKET_DEBUG_WAIT_UNTIL_SENT
-#undef ROCKET_DEBUG_RECEIVE
-#undef ROCKET_DEBUG_HANGUP
-#undef REV_PCI_ORDER
-#undef ROCKET_DEBUG_IO
-
-#define POLL_PERIOD HZ/100      /*  Polling period .01 seconds (10ms) */
-
-/****** Kernel includes ******/
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/major.h>
-#include <linux/kernel.h>
-#include <linux/signal.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <linux/serial.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/mutex.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/completion.h>
-#include <linux/wait.h>
-#include <linux/pci.h>
-#include <linux/uaccess.h>
-#include <asm/atomic.h>
-#include <asm/unaligned.h>
-#include <linux/bitops.h>
-#include <linux/spinlock.h>
-#include <linux/init.h>
-
-/****** RocketPort includes ******/
-
-#include "rocket_int.h"
-#include "rocket.h"
-
-#define ROCKET_VERSION "2.09"
-#define ROCKET_DATE "12-June-2003"
-
-/****** RocketPort Local Variables ******/
-
-static void rp_do_poll(unsigned long dummy);
-
-static struct tty_driver *rocket_driver;
-
-static struct rocket_version driver_version = { 
-        ROCKET_VERSION, ROCKET_DATE
-};
-
-static struct r_port *rp_table[MAX_RP_PORTS];          /*  The main repository of serial port state information. */
-static unsigned int xmit_flags[NUM_BOARDS];            /*  Bit significant, indicates port had data to transmit. */
-                                                       /*  eg.  Bit 0 indicates port 0 has xmit data, ...        */
-static atomic_t rp_num_ports_open;                     /*  Number of serial ports open                           */
-static DEFINE_TIMER(rocket_timer, rp_do_poll, 0, 0);
-
-static unsigned long board1;                           /* ISA addresses, retrieved from rocketport.conf          */
-static unsigned long board2;
-static unsigned long board3;
-static unsigned long board4;
-static unsigned long controller;
-static int support_low_speed;
-static unsigned long modem1;
-static unsigned long modem2;
-static unsigned long modem3;
-static unsigned long modem4;
-static unsigned long pc104_1[8];
-static unsigned long pc104_2[8];
-static unsigned long pc104_3[8];
-static unsigned long pc104_4[8];
-static unsigned long *pc104[4] = { pc104_1, pc104_2, pc104_3, pc104_4 };
-
-static int rp_baud_base[NUM_BOARDS];                   /*  Board config info (Someday make a per-board structure)  */
-static unsigned long rcktpt_io_addr[NUM_BOARDS];
-static int rcktpt_type[NUM_BOARDS];
-static int is_PCI[NUM_BOARDS];
-static rocketModel_t rocketModel[NUM_BOARDS];
-static int max_board;
-static const struct tty_port_operations rocket_port_ops;
-
-/*
- * The following arrays define the interrupt bits corresponding to each AIOP.
- * These bits are different between the ISA and regular PCI boards and the
- * Universal PCI boards.
- */
-
-static Word_t aiop_intr_bits[AIOP_CTL_SIZE] = {
-        AIOP_INTR_BIT_0,
-        AIOP_INTR_BIT_1,
-        AIOP_INTR_BIT_2,
-        AIOP_INTR_BIT_3
-};
-
-static Word_t upci_aiop_intr_bits[AIOP_CTL_SIZE] = {
-        UPCI_AIOP_INTR_BIT_0,
-        UPCI_AIOP_INTR_BIT_1,
-        UPCI_AIOP_INTR_BIT_2,
-        UPCI_AIOP_INTR_BIT_3
-};
-
-static Byte_t RData[RDATASIZE] = {
-        0x00, 0x09, 0xf6, 0x82,
-        0x02, 0x09, 0x86, 0xfb,
-        0x04, 0x09, 0x00, 0x0a,
-        0x06, 0x09, 0x01, 0x0a,
-        0x08, 0x09, 0x8a, 0x13,
-        0x0a, 0x09, 0xc5, 0x11,
-        0x0c, 0x09, 0x86, 0x85,
-        0x0e, 0x09, 0x20, 0x0a,
-        0x10, 0x09, 0x21, 0x0a,
-        0x12, 0x09, 0x41, 0xff,
-        0x14, 0x09, 0x82, 0x00,
-        0x16, 0x09, 0x82, 0x7b,
-        0x18, 0x09, 0x8a, 0x7d,
-        0x1a, 0x09, 0x88, 0x81,
-        0x1c, 0x09, 0x86, 0x7a,
-        0x1e, 0x09, 0x84, 0x81,
-        0x20, 0x09, 0x82, 0x7c,
-        0x22, 0x09, 0x0a, 0x0a
-};
-
-static Byte_t RRegData[RREGDATASIZE] = {
-        0x00, 0x09, 0xf6, 0x82, /* 00: Stop Rx processor */
-        0x08, 0x09, 0x8a, 0x13, /* 04: Tx software flow control */
-        0x0a, 0x09, 0xc5, 0x11, /* 08: XON char */
-        0x0c, 0x09, 0x86, 0x85, /* 0c: XANY */
-        0x12, 0x09, 0x41, 0xff, /* 10: Rx mask char */
-        0x14, 0x09, 0x82, 0x00, /* 14: Compare/Ignore #0 */
-        0x16, 0x09, 0x82, 0x7b, /* 18: Compare #1 */
-        0x18, 0x09, 0x8a, 0x7d, /* 1c: Compare #2 */
-        0x1a, 0x09, 0x88, 0x81, /* 20: Interrupt #1 */
-        0x1c, 0x09, 0x86, 0x7a, /* 24: Ignore/Replace #1 */
-        0x1e, 0x09, 0x84, 0x81, /* 28: Interrupt #2 */
-        0x20, 0x09, 0x82, 0x7c, /* 2c: Ignore/Replace #2 */
-        0x22, 0x09, 0x0a, 0x0a  /* 30: Rx FIFO Enable */
-};
-
-static CONTROLLER_T sController[CTL_SIZE] = {
-        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
-         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}},
-        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
-         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}},
-        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
-         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}},
-        {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0},
-         {0, 0, 0, 0}, {-1, -1, -1, -1}, {0, 0, 0, 0}}
-};
-
-static Byte_t sBitMapClrTbl[8] = {
-        0xfe, 0xfd, 0xfb, 0xf7, 0xef, 0xdf, 0xbf, 0x7f
-};
-
-static Byte_t sBitMapSetTbl[8] = {
-        0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
-};
-
-static int sClockPrescale = 0x14;
-
-/*
- *  Line number is the ttySIx number (x), the Minor number.  We 
- *  assign them sequentially, starting at zero.  The following 
- *  array keeps track of the line number assigned to a given board/aiop/channel.
- */
-static unsigned char lineNumbers[MAX_RP_PORTS];
-static unsigned long nextLineNumber;
-
-/*****  RocketPort Static Prototypes   *********/
-static int __init init_ISA(int i);
-static void rp_wait_until_sent(struct tty_struct *tty, int timeout);
-static void rp_flush_buffer(struct tty_struct *tty);
-static void rmSpeakerReset(CONTROLLER_T * CtlP, unsigned long model);
-static unsigned char GetLineNumber(int ctrl, int aiop, int ch);
-static unsigned char SetLineNumber(int ctrl, int aiop, int ch);
-static void rp_start(struct tty_struct *tty);
-static int sInitChan(CONTROLLER_T * CtlP, CHANNEL_T * ChP, int AiopNum,
-                     int ChanNum);
-static void sSetInterfaceMode(CHANNEL_T * ChP, Byte_t mode);
-static void sFlushRxFIFO(CHANNEL_T * ChP);
-static void sFlushTxFIFO(CHANNEL_T * ChP);
-static void sEnInterrupts(CHANNEL_T * ChP, Word_t Flags);
-static void sDisInterrupts(CHANNEL_T * ChP, Word_t Flags);
-static void sModemReset(CONTROLLER_T * CtlP, int chan, int on);
-static void sPCIModemReset(CONTROLLER_T * CtlP, int chan, int on);
-static int sWriteTxPrioByte(CHANNEL_T * ChP, Byte_t Data);
-static int sPCIInitController(CONTROLLER_T * CtlP, int CtlNum,
-                              ByteIO_t * AiopIOList, int AiopIOListSize,
-                              WordIO_t ConfigIO, int IRQNum, Byte_t Frequency,
-                              int PeriodicOnly, int altChanRingIndicator,
-                              int UPCIRingInd);
-static int sInitController(CONTROLLER_T * CtlP, int CtlNum, ByteIO_t MudbacIO,
-                           ByteIO_t * AiopIOList, int AiopIOListSize,
-                           int IRQNum, Byte_t Frequency, int PeriodicOnly);
-static int sReadAiopID(ByteIO_t io);
-static int sReadAiopNumChan(WordIO_t io);
-
-MODULE_AUTHOR("Theodore Ts'o");
-MODULE_DESCRIPTION("Comtrol RocketPort driver");
-module_param(board1, ulong, 0);
-MODULE_PARM_DESC(board1, "I/O port for (ISA) board #1");
-module_param(board2, ulong, 0);
-MODULE_PARM_DESC(board2, "I/O port for (ISA) board #2");
-module_param(board3, ulong, 0);
-MODULE_PARM_DESC(board3, "I/O port for (ISA) board #3");
-module_param(board4, ulong, 0);
-MODULE_PARM_DESC(board4, "I/O port for (ISA) board #4");
-module_param(controller, ulong, 0);
-MODULE_PARM_DESC(controller, "I/O port for (ISA) rocketport controller");
-module_param(support_low_speed, bool, 0);
-MODULE_PARM_DESC(support_low_speed, "1 means support 50 baud, 0 means support 460400 baud");
-module_param(modem1, ulong, 0);
-MODULE_PARM_DESC(modem1, "1 means (ISA) board #1 is a RocketModem");
-module_param(modem2, ulong, 0);
-MODULE_PARM_DESC(modem2, "1 means (ISA) board #2 is a RocketModem");
-module_param(modem3, ulong, 0);
-MODULE_PARM_DESC(modem3, "1 means (ISA) board #3 is a RocketModem");
-module_param(modem4, ulong, 0);
-MODULE_PARM_DESC(modem4, "1 means (ISA) board #4 is a RocketModem");
-module_param_array(pc104_1, ulong, NULL, 0);
-MODULE_PARM_DESC(pc104_1, "set interface types for ISA(PC104) board #1 (e.g. pc104_1=232,232,485,485,...");
-module_param_array(pc104_2, ulong, NULL, 0);
-MODULE_PARM_DESC(pc104_2, "set interface types for ISA(PC104) board #2 (e.g. pc104_2=232,232,485,485,...");
-module_param_array(pc104_3, ulong, NULL, 0);
-MODULE_PARM_DESC(pc104_3, "set interface types for ISA(PC104) board #3 (e.g. pc104_3=232,232,485,485,...");
-module_param_array(pc104_4, ulong, NULL, 0);
-MODULE_PARM_DESC(pc104_4, "set interface types for ISA(PC104) board #4 (e.g. pc104_4=232,232,485,485,...");
-
-static int rp_init(void);
-static void rp_cleanup_module(void);
-
-module_init(rp_init);
-module_exit(rp_cleanup_module);
-
-
-MODULE_LICENSE("Dual BSD/GPL");
-
-/*************************************************************************/
-/*                     Module code starts here                           */
-
-static inline int rocket_paranoia_check(struct r_port *info,
-                                        const char *routine)
-{
-#ifdef ROCKET_PARANOIA_CHECK
-        if (!info)
-                return 1;
-        if (info->magic != RPORT_MAGIC) {
-                printk(KERN_WARNING "Warning: bad magic number for rocketport "
-                                "struct in %s\n", routine);
-                return 1;
-        }
-#endif
-        return 0;
-}
-
-
-/*  Serial port receive data function.  Called (from timer poll) when an AIOPIC signals 
- *  that receive data is present on a serial port.  Pulls data from FIFO, moves it into the 
- *  tty layer.  
- */
-static void rp_do_receive(struct r_port *info,
-                          struct tty_struct *tty,
-                          CHANNEL_t * cp, unsigned int ChanStatus)
-{
-        unsigned int CharNStat;
-        int ToRecv, wRecv, space;
-        unsigned char *cbuf;
-
-        ToRecv = sGetRxCnt(cp);
-#ifdef ROCKET_DEBUG_INTR
-        printk(KERN_INFO "rp_do_receive(%d)...\n", ToRecv);
-#endif
-        if (ToRecv == 0)
-                return;
-
-        /*
-         * if status indicates there are errored characters in the
-         * FIFO, then enter status mode (a word in FIFO holds
-         * character and status).
-         */
-        if (ChanStatus & (RXFOVERFL | RXBREAK | RXFRAME | RXPARITY)) {
-                if (!(ChanStatus & STATMODE)) {
-#ifdef ROCKET_DEBUG_RECEIVE
-                        printk(KERN_INFO "Entering STATMODE...\n");
-#endif
-                        ChanStatus |= STATMODE;
-                        sEnRxStatusMode(cp);
-                }
-        }
-
-        /* 
-         * if we previously entered status mode, then read down the
-         * FIFO one word at a time, pulling apart the character and
-         * the status.  Update error counters depending on status
-         */
-        if (ChanStatus & STATMODE) {
-#ifdef ROCKET_DEBUG_RECEIVE
-                printk(KERN_INFO "Ignore %x, read %x...\n",
-                        info->ignore_status_mask, info->read_status_mask);
-#endif
-                while (ToRecv) {
-                        char flag;
-
-                        CharNStat = sInW(sGetTxRxDataIO(cp));
-#ifdef ROCKET_DEBUG_RECEIVE
-                        printk(KERN_INFO "%x...\n", CharNStat);
-#endif
-                        if (CharNStat & STMBREAKH)
-                                CharNStat &= ~(STMFRAMEH | STMPARITYH);
-                        if (CharNStat & info->ignore_status_mask) {
-                                ToRecv--;
-                                continue;
-                        }
-                        CharNStat &= info->read_status_mask;
-                        if (CharNStat & STMBREAKH)
-                                flag = TTY_BREAK;
-                        else if (CharNStat & STMPARITYH)
-                                flag = TTY_PARITY;
-                        else if (CharNStat & STMFRAMEH)
-                                flag = TTY_FRAME;
-                        else if (CharNStat & STMRCVROVRH)
-                                flag = TTY_OVERRUN;
-                        else
-                                flag = TTY_NORMAL;
-                        tty_insert_flip_char(tty, CharNStat & 0xff, flag);
-                        ToRecv--;
-                }
-
-                /*
-                 * after we've emptied the FIFO in status mode, turn
-                 * status mode back off
-                 */
-                if (sGetRxCnt(cp) == 0) {
-#ifdef ROCKET_DEBUG_RECEIVE
-                        printk(KERN_INFO "Status mode off.\n");
-#endif
-                        sDisRxStatusMode(cp);
-                }
-        } else {
-                /*
-                 * we aren't in status mode, so read down the FIFO two
-                 * characters at time by doing repeated word IO
-                 * transfer.
-                 */
-                space = tty_prepare_flip_string(tty, &cbuf, ToRecv);
-                if (space < ToRecv) {
-#ifdef ROCKET_DEBUG_RECEIVE
-                        printk(KERN_INFO "rp_do_receive:insufficient space ToRecv=%d space=%d\n", ToRecv, space);
-#endif
-                        if (space <= 0)
-                                return;
-                        ToRecv = space;
-                }
-                wRecv = ToRecv >> 1;
-                if (wRecv)
-                        sInStrW(sGetTxRxDataIO(cp), (unsigned short *) cbuf, wRecv);
-                if (ToRecv & 1)
-                        cbuf[ToRecv - 1] = sInB(sGetTxRxDataIO(cp));
-        }
-        /*  Push the data up to the tty layer */
-        tty_flip_buffer_push(tty);
-}
-
-/*
- *  Serial port transmit data function.  Called from the timer polling loop as a 
- *  result of a bit set in xmit_flags[], indicating data (from the tty layer) is ready
- *  to be sent out the serial port.  Data is buffered in rp_table[line].xmit_buf, it is 
- *  moved to the port's xmit FIFO.  *info is critical data, protected by spinlocks.
- */
-static void rp_do_transmit(struct r_port *info)
-{
-        int c;
-        CHANNEL_t *cp = &info->channel;
-        struct tty_struct *tty;
-        unsigned long flags;
-
-#ifdef ROCKET_DEBUG_INTR
-        printk(KERN_DEBUG "%s\n", __func__);
-#endif
-        if (!info)
-                return;
-        tty = tty_port_tty_get(&info->port);
-
-        if (tty == NULL) {
-                printk(KERN_WARNING "rp: WARNING %s called with tty==NULL\n", __func__);
-                clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
-                return;
-        }
-
-        spin_lock_irqsave(&info->slock, flags);
-        info->xmit_fifo_room = TXFIFO_SIZE - sGetTxCnt(cp);
-
-        /*  Loop sending data to FIFO until done or FIFO full */
-        while (1) {
-                if (tty->stopped || tty->hw_stopped)
-                        break;
-                c = min(info->xmit_fifo_room, info->xmit_cnt);
-                c = min(c, XMIT_BUF_SIZE - info->xmit_tail);
-                if (c <= 0 || info->xmit_fifo_room <= 0)
-                        break;
-                sOutStrW(sGetTxRxDataIO(cp), (unsigned short *) (info->xmit_buf + info->xmit_tail), c / 2);
-                if (c & 1)
-                        sOutB(sGetTxRxDataIO(cp), info->xmit_buf[info->xmit_tail + c - 1]);
-                info->xmit_tail += c;
-                info->xmit_tail &= XMIT_BUF_SIZE - 1;
-                info->xmit_cnt -= c;
-                info->xmit_fifo_room -= c;
-#ifdef ROCKET_DEBUG_INTR
-                printk(KERN_INFO "tx %d chars...\n", c);
-#endif
-        }
-
-        if (info->xmit_cnt == 0)
-                clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
-
-        if (info->xmit_cnt < WAKEUP_CHARS) {
-                tty_wakeup(tty);
-#ifdef ROCKETPORT_HAVE_POLL_WAIT
-                wake_up_interruptible(&tty->poll_wait);
-#endif
-        }
-
-        spin_unlock_irqrestore(&info->slock, flags);
-        tty_kref_put(tty);
-
-#ifdef ROCKET_DEBUG_INTR
-        printk(KERN_DEBUG "(%d,%d,%d,%d)...\n", info->xmit_cnt, info->xmit_head,
-               info->xmit_tail, info->xmit_fifo_room);
-#endif
-}
-
-/*
- *  Called when a serial port signals it has read data in it's RX FIFO.
- *  It checks what interrupts are pending and services them, including
- *  receiving serial data.  
- */
-static void rp_handle_port(struct r_port *info)
-{
-        CHANNEL_t *cp;
-        struct tty_struct *tty;
-        unsigned int IntMask, ChanStatus;
-
-        if (!info)
-                return;
-
-        if ((info->port.flags & ASYNC_INITIALIZED) == 0) {
-                printk(KERN_WARNING "rp: WARNING: rp_handle_port called with "
-                                "info->flags & NOT_INIT\n");
-                return;
-        }
-        tty = tty_port_tty_get(&info->port);
-        if (!tty) {
-                printk(KERN_WARNING "rp: WARNING: rp_handle_port called with "
-                                "tty==NULL\n");
-                return;
-        }
-        cp = &info->channel;
-
-        IntMask = sGetChanIntID(cp) & info->intmask;
-#ifdef ROCKET_DEBUG_INTR
-        printk(KERN_INFO "rp_interrupt %02x...\n", IntMask);
-#endif
-        ChanStatus = sGetChanStatus(cp);
-        if (IntMask & RXF_TRIG) {       /* Rx FIFO trigger level */
-                rp_do_receive(info, tty, cp, ChanStatus);
-        }
-        if (IntMask & DELTA_CD) {       /* CD change  */
-#if (defined(ROCKET_DEBUG_OPEN) || defined(ROCKET_DEBUG_INTR) || defined(ROCKET_DEBUG_HANGUP))
-                printk(KERN_INFO "ttyR%d CD now %s...\n", info->line,
-                       (ChanStatus & CD_ACT) ? "on" : "off");
-#endif
-                if (!(ChanStatus & CD_ACT) && info->cd_status) {
-#ifdef ROCKET_DEBUG_HANGUP
-                        printk(KERN_INFO "CD drop, calling hangup.\n");
-#endif
-                        tty_hangup(tty);
-                }
-                info->cd_status = (ChanStatus & CD_ACT) ? 1 : 0;
-                wake_up_interruptible(&info->port.open_wait);
-        }
-#ifdef ROCKET_DEBUG_INTR
-        if (IntMask & DELTA_CTS) {      /* CTS change */
-                printk(KERN_INFO "CTS change...\n");
-        }
-        if (IntMask & DELTA_DSR) {      /* DSR change */
-                printk(KERN_INFO "DSR change...\n");
-        }
-#endif
-        tty_kref_put(tty);
-}
-
-/*
- *  The top level polling routine.  Repeats every 1/100 HZ (10ms).
- */
-static void rp_do_poll(unsigned long dummy)
-{
-        CONTROLLER_t *ctlp;
-        int ctrl, aiop, ch, line;
-        unsigned int xmitmask, i;
-        unsigned int CtlMask;
-        unsigned char AiopMask;
-        Word_t bit;
-
-        /*  Walk through all the boards (ctrl's) */
-        for (ctrl = 0; ctrl < max_board; ctrl++) {
-                if (rcktpt_io_addr[ctrl] <= 0)
-                        continue;
-
-                /*  Get a ptr to the board's control struct */
-                ctlp = sCtlNumToCtlPtr(ctrl);
-
-                /*  Get the interrupt status from the board */
-#ifdef CONFIG_PCI
-                if (ctlp->BusType == isPCI)
-                        CtlMask = sPCIGetControllerIntStatus(ctlp);
-                else
-#endif
-                        CtlMask = sGetControllerIntStatus(ctlp);
-
-                /*  Check if any AIOP read bits are set */
-                for (aiop = 0; CtlMask; aiop++) {
-                        bit = ctlp->AiopIntrBits[aiop];
-                        if (CtlMask & bit) {
-                                CtlMask &= ~bit;
-                                AiopMask = sGetAiopIntStatus(ctlp, aiop);
-
-                                /*  Check if any port read bits are set */
-                                for (ch = 0; AiopMask;  AiopMask >>= 1, ch++) {
-                                        if (AiopMask & 1) {
-
-                                                /*  Get the line number (/dev/ttyRx number). */
-                                                /*  Read the data from the port. */
-                                                line = GetLineNumber(ctrl, aiop, ch);
-                                                rp_handle_port(rp_table[line]);
-                                        }
-                                }
-                        }
-                }
-
-                xmitmask = xmit_flags[ctrl];
-
-                /*
-                 *  xmit_flags contains bit-significant flags, indicating there is data
-                 *  to xmit on the port. Bit 0 is port 0 on this board, bit 1 is port 
-                 *  1, ... (32 total possible).  The variable i has the aiop and ch 
-                 *  numbers encoded in it (port 0-7 are aiop0, 8-15 are aiop1, etc).
-                 */
-                if (xmitmask) {
-                        for (i = 0; i < rocketModel[ctrl].numPorts; i++) {
-                                if (xmitmask & (1 << i)) {
-                                        aiop = (i & 0x18) >> 3;
-                                        ch = i & 0x07;
-                                        line = GetLineNumber(ctrl, aiop, ch);
-                                        rp_do_transmit(rp_table[line]);
-                                }
-                        }
-                }
-        }
-
-        /*
-         * Reset the timer so we get called at the next clock tick (10ms).
-         */
-        if (atomic_read(&rp_num_ports_open))
-                mod_timer(&rocket_timer, jiffies + POLL_PERIOD);
-}
-
-/*
- *  Initializes the r_port structure for a port, as well as enabling the port on 
- *  the board.  
- *  Inputs:  board, aiop, chan numbers
- */
-static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
-{
-        unsigned rocketMode;
-        struct r_port *info;
-        int line;
-        CONTROLLER_T *ctlp;
-
-        /*  Get the next available line number */
-        line = SetLineNumber(board, aiop, chan);
-
-        ctlp = sCtlNumToCtlPtr(board);
-
-        /*  Get a r_port struct for the port, fill it in and save it globally, indexed by line number */
-        info = kzalloc(sizeof (struct r_port), GFP_KERNEL);
-        if (!info) {
-                printk(KERN_ERR "Couldn't allocate info struct for line #%d\n",
-                                line);
-                return;
-        }
-
-        info->magic = RPORT_MAGIC;
-        info->line = line;
-        info->ctlp = ctlp;
-        info->board = board;
-        info->aiop = aiop;
-        info->chan = chan;
-        tty_port_init(&info->port);
-        info->port.ops = &rocket_port_ops;
-        init_completion(&info->close_wait);
-        info->flags &= ~ROCKET_MODE_MASK;
-        switch (pc104[board][line]) {
-        case 422:
-                info->flags |= ROCKET_MODE_RS422;
-                break;
-        case 485:
-                info->flags |= ROCKET_MODE_RS485;
-                break;
-        case 232:
-        default:
-                info->flags |= ROCKET_MODE_RS232;
-                break;
-        }
-
-        info->intmask = RXF_TRIG | TXFIFO_MT | SRC_INT | DELTA_CD | DELTA_CTS | DELTA_DSR;
-        if (sInitChan(ctlp, &info->channel, aiop, chan) == 0) {
-                printk(KERN_ERR "RocketPort sInitChan(%d, %d, %d) failed!\n",
-                                board, aiop, chan);
-                kfree(info);
-                return;
-        }
-
-        rocketMode = info->flags & ROCKET_MODE_MASK;
-
-        if ((info->flags & ROCKET_RTS_TOGGLE) || (rocketMode == ROCKET_MODE_RS485))
-                sEnRTSToggle(&info->channel);
-        else
-                sDisRTSToggle(&info->channel);
-
-        if (ctlp->boardType == ROCKET_TYPE_PC104) {
-                switch (rocketMode) {
-                case ROCKET_MODE_RS485:
-                        sSetInterfaceMode(&info->channel, InterfaceModeRS485);
-                        break;
-                case ROCKET_MODE_RS422:
-                        sSetInterfaceMode(&info->channel, InterfaceModeRS422);
-                        break;
-                case ROCKET_MODE_RS232:
-                default:
-                        if (info->flags & ROCKET_RTS_TOGGLE)
-                                sSetInterfaceMode(&info->channel, InterfaceModeRS232T);
-                        else
-                                sSetInterfaceMode(&info->channel, InterfaceModeRS232);
-                        break;
-                }
-        }
-        spin_lock_init(&info->slock);
-        mutex_init(&info->write_mtx);
-        rp_table[line] = info;
-        tty_register_device(rocket_driver, line, pci_dev ? &pci_dev->dev :
-                        NULL);
-}
-
-/*
- *  Configures a rocketport port according to its termio settings.  Called from 
- *  user mode into the driver (exception handler).  *info CD manipulation is spinlock protected.
- */
-static void configure_r_port(struct tty_struct *tty, struct r_port *info,
-                             struct ktermios *old_termios)
-{
-        unsigned cflag;
-        unsigned long flags;
-        unsigned rocketMode;
-        int bits, baud, divisor;
-        CHANNEL_t *cp;
-        struct ktermios *t = tty->termios;
-
-        cp = &info->channel;
-        cflag = t->c_cflag;
-
-        /* Byte size and parity */
-        if ((cflag & CSIZE) == CS8) {
-                sSetData8(cp);
-                bits = 10;
-        } else {
-                sSetData7(cp);
-                bits = 9;
-        }
-        if (cflag & CSTOPB) {
-                sSetStop2(cp);
-                bits++;
-        } else {
-                sSetStop1(cp);
-        }
-
-        if (cflag & PARENB) {
-                sEnParity(cp);
-                bits++;
-                if (cflag & PARODD) {
-                        sSetOddParity(cp);
-                } else {
-                        sSetEvenParity(cp);
-                }
-        } else {
-                sDisParity(cp);
-        }
-
-        /* baud rate */
-        baud = tty_get_baud_rate(tty);
-        if (!baud)
-                baud = 9600;
-        divisor = ((rp_baud_base[info->board] + (baud >> 1)) / baud) - 1;
-        if ((divisor >= 8192 || divisor < 0) && old_termios) {
-                baud = tty_termios_baud_rate(old_termios);
-                if (!baud)
-                        baud = 9600;
-                divisor = (rp_baud_base[info->board] / baud) - 1;
-        }
-        if (divisor >= 8192 || divisor < 0) {
-                baud = 9600;
-                divisor = (rp_baud_base[info->board] / baud) - 1;
-        }
-        info->cps = baud / bits;
-        sSetBaud(cp, divisor);
-
-        /* FIXME: Should really back compute a baud rate from the divisor */
-        tty_encode_baud_rate(tty, baud, baud);
-
-        if (cflag & CRTSCTS) {
-                info->intmask |= DELTA_CTS;
-                sEnCTSFlowCtl(cp);
-        } else {
-                info->intmask &= ~DELTA_CTS;
-                sDisCTSFlowCtl(cp);
-        }
-        if (cflag & CLOCAL) {
-                info->intmask &= ~DELTA_CD;
-        } else {
-                spin_lock_irqsave(&info->slock, flags);
-                if (sGetChanStatus(cp) & CD_ACT)
-                        info->cd_status = 1;
-                else
-                        info->cd_status = 0;
-                info->intmask |= DELTA_CD;
-                spin_unlock_irqrestore(&info->slock, flags);
-        }
-
-        /*
-         * Handle software flow control in the board
-         */
-#ifdef ROCKET_SOFT_FLOW
-        if (I_IXON(tty)) {
-                sEnTxSoftFlowCtl(cp);
-                if (I_IXANY(tty)) {
-                        sEnIXANY(cp);
-                } else {
-                        sDisIXANY(cp);
-                }
-                sSetTxXONChar(cp, START_CHAR(tty));
-                sSetTxXOFFChar(cp, STOP_CHAR(tty));
-        } else {
-                sDisTxSoftFlowCtl(cp);
-                sDisIXANY(cp);
-                sClrTxXOFF(cp);
-        }
-#endif
-
-        /*
-         * Set up ignore/read mask words
-         */
-        info->read_status_mask = STMRCVROVRH | 0xFF;
-        if (I_INPCK(tty))
-                info->read_status_mask |= STMFRAMEH | STMPARITYH;
-        if (I_BRKINT(tty) || I_PARMRK(tty))
-                info->read_status_mask |= STMBREAKH;
-
-        /*
-         * Characters to ignore
-         */
-        info->ignore_status_mask = 0;
-        if (I_IGNPAR(tty))
-                info->ignore_status_mask |= STMFRAMEH | STMPARITYH;
-        if (I_IGNBRK(tty)) {
-                info->ignore_status_mask |= STMBREAKH;
-                /*
-                 * If we're ignoring parity and break indicators,
-                 * ignore overruns too.  (For real raw support).
-                 */
-                if (I_IGNPAR(tty))
-                        info->ignore_status_mask |= STMRCVROVRH;
-        }
-
-        rocketMode = info->flags & ROCKET_MODE_MASK;
-
-        if ((info->flags & ROCKET_RTS_TOGGLE)
-            || (rocketMode == ROCKET_MODE_RS485))
-                sEnRTSToggle(cp);
-        else
-                sDisRTSToggle(cp);
-
-        sSetRTS(&info->channel);
-
-        if (cp->CtlP->boardType == ROCKET_TYPE_PC104) {
-                switch (rocketMode) {
-                case ROCKET_MODE_RS485:
-                        sSetInterfaceMode(cp, InterfaceModeRS485);
-                        break;
-                case ROCKET_MODE_RS422:
-                        sSetInterfaceMode(cp, InterfaceModeRS422);
-                        break;
-                case ROCKET_MODE_RS232:
-                default:
-                        if (info->flags & ROCKET_RTS_TOGGLE)
-                                sSetInterfaceMode(cp, InterfaceModeRS232T);
-                        else
-                                sSetInterfaceMode(cp, InterfaceModeRS232);
-                        break;
-                }
-        }
-}
-
-static int carrier_raised(struct tty_port *port)
-{
-        struct r_port *info = container_of(port, struct r_port, port);
-        return (sGetChanStatusLo(&info->channel) & CD_ACT) ? 1 : 0;
-}
-
-static void dtr_rts(struct tty_port *port, int on)
-{
-        struct r_port *info = container_of(port, struct r_port, port);
-        if (on) {
-                sSetDTR(&info->channel);
-                sSetRTS(&info->channel);
-        } else {
-                sClrDTR(&info->channel);
-                sClrRTS(&info->channel);
-        }
-}
-
-/*
- *  Exception handler that opens a serial port.  Creates xmit_buf storage, fills in 
- *  port's r_port struct.  Initializes the port hardware.  
- */
-static int rp_open(struct tty_struct *tty, struct file *filp)
-{
-        struct r_port *info;
-        struct tty_port *port;
-        int line = 0, retval;
-        CHANNEL_t *cp;
-        unsigned long page;
-
-        line = tty->index;
-        if (line < 0 || line >= MAX_RP_PORTS || ((info = rp_table[line]) == NULL))
-                return -ENXIO;
-        port = &info->port;
-        
-        page = __get_free_page(GFP_KERNEL);
-        if (!page)
-                return -ENOMEM;
-
-        if (port->flags & ASYNC_CLOSING) {
-                retval = wait_for_completion_interruptible(&info->close_wait);
-                free_page(page);
-                if (retval)
-                        return retval;
-                return ((port->flags & ASYNC_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS);
-        }
-
-        /*
-         * We must not sleep from here until the port is marked fully in use.
-         */
-        if (info->xmit_buf)
-                free_page(page);
-        else
-                info->xmit_buf = (unsigned char *) page;
-
-        tty->driver_data = info;
-        tty_port_tty_set(port, tty);
-
-        if (port->count++ == 0) {
-                atomic_inc(&rp_num_ports_open);
-
-#ifdef ROCKET_DEBUG_OPEN
-                printk(KERN_INFO "rocket mod++ = %d...\n",
-                                atomic_read(&rp_num_ports_open));
-#endif
-        }
-#ifdef ROCKET_DEBUG_OPEN
-        printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
-#endif
-
-        /*
-         * Info->count is now 1; so it's safe to sleep now.
-         */
-        if (!test_bit(ASYNCB_INITIALIZED, &port->flags)) {
-                cp = &info->channel;
-                sSetRxTrigger(cp, TRIG_1);
-                if (sGetChanStatus(cp) & CD_ACT)
-                        info->cd_status = 1;
-                else
-                        info->cd_status = 0;
-                sDisRxStatusMode(cp);
-                sFlushRxFIFO(cp);
-                sFlushTxFIFO(cp);
-
-                sEnInterrupts(cp, (TXINT_EN | MCINT_EN | RXINT_EN | SRCINT_EN | CHANINT_EN));
-                sSetRxTrigger(cp, TRIG_1);
-
-                sGetChanStatus(cp);
-                sDisRxStatusMode(cp);
-                sClrTxXOFF(cp);
-
-                sDisCTSFlowCtl(cp);
-                sDisTxSoftFlowCtl(cp);
-
-                sEnRxFIFO(cp);
-                sEnTransmit(cp);
-
-                set_bit(ASYNCB_INITIALIZED, &info->port.flags);
-
-                /*
-                 * Set up the tty->alt_speed kludge
-                 */
-                if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_HI)
-                        tty->alt_speed = 57600;
-                if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_VHI)
-                        tty->alt_speed = 115200;
-                if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_SHI)
-                        tty->alt_speed = 230400;
-                if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_WARP)
-                        tty->alt_speed = 460800;
-
-                configure_r_port(tty, info, NULL);
-                if (tty->termios->c_cflag & CBAUD) {
-                        sSetDTR(cp);
-                        sSetRTS(cp);
-                }
-        }
-        /*  Starts (or resets) the maint polling loop */
-        mod_timer(&rocket_timer, jiffies + POLL_PERIOD);
-
-        retval = tty_port_block_til_ready(port, tty, filp);
-        if (retval) {
-#ifdef ROCKET_DEBUG_OPEN
-                printk(KERN_INFO "rp_open returning after block_til_ready with %d\n", retval);
-#endif
-                return retval;
-        }
-        return 0;
-}
-
-/*
- *  Exception handler that closes a serial port. info->port.count is considered critical.
- */
-static void rp_close(struct tty_struct *tty, struct file *filp)
-{
-        struct r_port *info = tty->driver_data;
-        struct tty_port *port = &info->port;
-        int timeout;
-        CHANNEL_t *cp;
-        
-        if (rocket_paranoia_check(info, "rp_close"))
-                return;
-
-#ifdef ROCKET_DEBUG_OPEN
-        printk(KERN_INFO "rp_close ttyR%d, count = %d\n", info->line, info->port.count);
-#endif
-
-        if (tty_port_close_start(port, tty, filp) == 0)
-                return;
-
-        mutex_lock(&port->mutex);
-        cp = &info->channel;
-        /*
-         * Before we drop DTR, make sure the UART transmitter
-         * has completely drained; this is especially
-         * important if there is a transmit FIFO!
-         */
-        timeout = (sGetTxCnt(cp) + 1) * HZ / info->cps;
-        if (timeout == 0)
-                timeout = 1;
-        rp_wait_until_sent(tty, timeout);
-        clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
-
-        sDisTransmit(cp);
-        sDisInterrupts(cp, (TXINT_EN | MCINT_EN | RXINT_EN | SRCINT_EN | CHANINT_EN));
-        sDisCTSFlowCtl(cp);
-        sDisTxSoftFlowCtl(cp);
-        sClrTxXOFF(cp);
-        sFlushRxFIFO(cp);
-        sFlushTxFIFO(cp);
-        sClrRTS(cp);
-        if (C_HUPCL(tty))
-                sClrDTR(cp);
-
-        rp_flush_buffer(tty);
-                
-        tty_ldisc_flush(tty);
-
-        clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
-
-        /* We can't yet use tty_port_close_end as the buffer handling in this
-           driver is a bit different to the usual */
-
-        if (port->blocked_open) {
-                if (port->close_delay) {
-                        msleep_interruptible(jiffies_to_msecs(port->close_delay));
-                }
-                wake_up_interruptible(&port->open_wait);
-        } else {
-                if (info->xmit_buf) {
-                        free_page((unsigned long) info->xmit_buf);
-                        info->xmit_buf = NULL;
-                }
-        }
-        spin_lock_irq(&port->lock);
-        info->port.flags &= ~(ASYNC_INITIALIZED | ASYNC_CLOSING | ASYNC_NORMAL_ACTIVE);
-        tty->closing = 0;
-        spin_unlock_irq(&port->lock);
-        mutex_unlock(&port->mutex);
-        tty_port_tty_set(port, NULL);
-
-        wake_up_interruptible(&port->close_wait);
-        complete_all(&info->close_wait);
-        atomic_dec(&rp_num_ports_open);
-
-#ifdef ROCKET_DEBUG_OPEN
-        printk(KERN_INFO "rocket mod-- = %d...\n",
-                        atomic_read(&rp_num_ports_open));
-        printk(KERN_INFO "rp_close ttyR%d complete shutdown\n", info->line);
-#endif
-
-}
-
-static void rp_set_termios(struct tty_struct *tty,
-                           struct ktermios *old_termios)
-{
-        struct r_port *info = tty->driver_data;
-        CHANNEL_t *cp;
-        unsigned cflag;
-
-        if (rocket_paranoia_check(info, "rp_set_termios"))
-                return;
-
-        cflag = tty->termios->c_cflag;
-
-        /*
-         * This driver doesn't support CS5 or CS6
-         */
-        if (((cflag & CSIZE) == CS5) || ((cflag & CSIZE) == CS6))
-                tty->termios->c_cflag =
-                    ((cflag & ~CSIZE) | (old_termios->c_cflag & CSIZE));
-        /* Or CMSPAR */
-        tty->termios->c_cflag &= ~CMSPAR;
-
-        configure_r_port(tty, info, old_termios);
-
-        cp = &info->channel;
-
-        /* Handle transition to B0 status */
-        if ((old_termios->c_cflag & CBAUD) && !(tty->termios->c_cflag & CBAUD)) {
-                sClrDTR(cp);
-                sClrRTS(cp);
-        }
-
-        /* Handle transition away from B0 status */
-        if (!(old_termios->c_cflag & CBAUD) && (tty->termios->c_cflag & CBAUD)) {
-                if (!tty->hw_stopped || !(tty->termios->c_cflag & CRTSCTS))
-                        sSetRTS(cp);
-                sSetDTR(cp);
-        }
-
-        if ((old_termios->c_cflag & CRTSCTS) && !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-                rp_start(tty);
-        }
-}
-
-static int rp_break(struct tty_struct *tty, int break_state)
-{
-        struct r_port *info = tty->driver_data;
-        unsigned long flags;
-
-        if (rocket_paranoia_check(info, "rp_break"))
-                return -EINVAL;
-
-        spin_lock_irqsave(&info->slock, flags);
-        if (break_state == -1)
-                sSendBreak(&info->channel);
-        else
-                sClrBreak(&info->channel);
-        spin_unlock_irqrestore(&info->slock, flags);
-        return 0;
-}
-
-/*
- * sGetChanRI used to be a macro in rocket_int.h. When the functionality for
- * the UPCI boards was added, it was decided to make this a function because
- * the macro was getting too complicated. All cases except the first one
- * (UPCIRingInd) are taken directly from the original macro.
- */
-static int sGetChanRI(CHANNEL_T * ChP)
-{
-        CONTROLLER_t *CtlP = ChP->CtlP;
-        int ChanNum = ChP->ChanNum;
-        int RingInd = 0;
-
-        if (CtlP->UPCIRingInd)
-                RingInd = !(sInB(CtlP->UPCIRingInd) & sBitMapSetTbl[ChanNum]);
-        else if (CtlP->AltChanRingIndicator)
-                RingInd = sInB((ByteIO_t) (ChP->ChanStat + 8)) & DSR_ACT;
-        else if (CtlP->boardType == ROCKET_TYPE_PC104)
-                RingInd = !(sInB(CtlP->AiopIO[3]) & sBitMapSetTbl[ChanNum]);
-
-        return RingInd;
-}
-
-/********************************************************************************************/
-/*  Here are the routines used by rp_ioctl.  These are all called from exception handlers.  */
-
-/*
- *  Returns the state of the serial modem control lines.  These next 2 functions 
- *  are the way kernel versions > 2.5 handle modem control lines rather than IOCTLs.
- */
-static int rp_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct r_port *info = tty->driver_data;
-        unsigned int control, result, ChanStatus;
-
-        ChanStatus = sGetChanStatusLo(&info->channel);
-        control = info->channel.TxControl[3];
-        result = ((control & SET_RTS) ? TIOCM_RTS : 0) | 
-                ((control & SET_DTR) ?  TIOCM_DTR : 0) |
-                ((ChanStatus & CD_ACT) ? TIOCM_CAR : 0) |
-                (sGetChanRI(&info->channel) ? TIOCM_RNG : 0) |
-                ((ChanStatus & DSR_ACT) ? TIOCM_DSR : 0) |
-                ((ChanStatus & CTS_ACT) ? TIOCM_CTS : 0);
-
-        return result;
-}
-
-/* 
- *  Sets the modem control lines
- */
-static int rp_tiocmset(struct tty_struct *tty, struct file *file,
-                    unsigned int set, unsigned int clear)
-{
-        struct r_port *info = tty->driver_data;
-
-        if (set & TIOCM_RTS)
-                info->channel.TxControl[3] |= SET_RTS;
-        if (set & TIOCM_DTR)
-                info->channel.TxControl[3] |= SET_DTR;
-        if (clear & TIOCM_RTS)
-                info->channel.TxControl[3] &= ~SET_RTS;
-        if (clear & TIOCM_DTR)
-                info->channel.TxControl[3] &= ~SET_DTR;
-
-        out32(info->channel.IndexAddr, info->channel.TxControl);
-        return 0;
-}
-
-static int get_config(struct r_port *info, struct rocket_config __user *retinfo)
-{
-        struct rocket_config tmp;
-
-        if (!retinfo)
-                return -EFAULT;
-        memset(&tmp, 0, sizeof (tmp));
-        mutex_lock(&info->port.mutex);
-        tmp.line = info->line;
-        tmp.flags = info->flags;
-        tmp.close_delay = info->port.close_delay;
-        tmp.closing_wait = info->port.closing_wait;
-        tmp.port = rcktpt_io_addr[(info->line >> 5) & 3];
-        mutex_unlock(&info->port.mutex);
-
-        if (copy_to_user(retinfo, &tmp, sizeof (*retinfo)))
-                return -EFAULT;
-        return 0;
-}
-
-static int set_config(struct tty_struct *tty, struct r_port *info,
-                                        struct rocket_config __user *new_info)
-{
-        struct rocket_config new_serial;
-
-        if (copy_from_user(&new_serial, new_info, sizeof (new_serial)))
-                return -EFAULT;
-
-        mutex_lock(&info->port.mutex);
-        if (!capable(CAP_SYS_ADMIN))
-        {
-                if ((new_serial.flags & ~ROCKET_USR_MASK) != (info->flags & ~ROCKET_USR_MASK)) {
-                        mutex_unlock(&info->port.mutex);
-                        return -EPERM;
-                }
-                info->flags = ((info->flags & ~ROCKET_USR_MASK) | (new_serial.flags & ROCKET_USR_MASK));
-                configure_r_port(tty, info, NULL);
-                mutex_unlock(&info->port.mutex);
-                return 0;
-        }
-
-        info->flags = ((info->flags & ~ROCKET_FLAGS) | (new_serial.flags & ROCKET_FLAGS));
-        info->port.close_delay = new_serial.close_delay;
-        info->port.closing_wait = new_serial.closing_wait;
-
-        if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_HI)
-                tty->alt_speed = 57600;
-        if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_VHI)
-                tty->alt_speed = 115200;
-        if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_SHI)
-                tty->alt_speed = 230400;
-        if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_WARP)
-                tty->alt_speed = 460800;
-        mutex_unlock(&info->port.mutex);
-
-        configure_r_port(tty, info, NULL);
-        return 0;
-}
-
-/*
- *  This function fills in a rocket_ports struct with information
- *  about what boards/ports are in the system.  This info is passed
- *  to user space.  See setrocket.c where the info is used to create
- *  the /dev/ttyRx ports.
- */
-static int get_ports(struct r_port *info, struct rocket_ports __user *retports)
-{
-        struct rocket_ports tmp;
-        int board;
-
-        if (!retports)
-                return -EFAULT;
-        memset(&tmp, 0, sizeof (tmp));
-        tmp.tty_major = rocket_driver->major;
-
-        for (board = 0; board < 4; board++) {
-                tmp.rocketModel[board].model = rocketModel[board].model;
-                strcpy(tmp.rocketModel[board].modelString, rocketModel[board].modelString);
-                tmp.rocketModel[board].numPorts = rocketModel[board].numPorts;
-                tmp.rocketModel[board].loadrm2 = rocketModel[board].loadrm2;
-                tmp.rocketModel[board].startingPortNumber = rocketModel[board].startingPortNumber;
-        }
-        if (copy_to_user(retports, &tmp, sizeof (*retports)))
-                return -EFAULT;
-        return 0;
-}
-
-static int reset_rm2(struct r_port *info, void __user *arg)
-{
-        int reset;
-
-        if (!capable(CAP_SYS_ADMIN))
-                return -EPERM;
-
-        if (copy_from_user(&reset, arg, sizeof (int)))
-                return -EFAULT;
-        if (reset)
-                reset = 1;
-
-        if (rcktpt_type[info->board] != ROCKET_TYPE_MODEMII &&
-            rcktpt_type[info->board] != ROCKET_TYPE_MODEMIII)
-                return -EINVAL;
-
-        if (info->ctlp->BusType == isISA)
-                sModemReset(info->ctlp, info->chan, reset);
-        else
-                sPCIModemReset(info->ctlp, info->chan, reset);
-
-        return 0;
-}
-
-static int get_version(struct r_port *info, struct rocket_version __user *retvers)
-{
-        if (copy_to_user(retvers, &driver_version, sizeof (*retvers)))
-                return -EFAULT;
-        return 0;
-}
-
-/*  IOCTL call handler into the driver */
-static int rp_ioctl(struct tty_struct *tty, struct file *file,
-                    unsigned int cmd, unsigned long arg)
-{
-        struct r_port *info = tty->driver_data;
-        void __user *argp = (void __user *)arg;
-        int ret = 0;
-
-        if (cmd != RCKP_GET_PORTS && rocket_paranoia_check(info, "rp_ioctl"))
-                return -ENXIO;
-
-        switch (cmd) {
-        case RCKP_GET_STRUCT:
-                if (copy_to_user(argp, info, sizeof (struct r_port)))
-                        ret = -EFAULT;
-                break;
-        case RCKP_GET_CONFIG:
-                ret = get_config(info, argp);
-                break;
-        case RCKP_SET_CONFIG:
-                ret = set_config(tty, info, argp);
-                break;
-        case RCKP_GET_PORTS:
-                ret = get_ports(info, argp);
-                break;
-        case RCKP_RESET_RM2:
-                ret = reset_rm2(info, argp);
-                break;
-        case RCKP_GET_VERSION:
-                ret = get_version(info, argp);
-                break;
-        default:
-                ret = -ENOIOCTLCMD;
-        }
-        return ret;
-}
-
-static void rp_send_xchar(struct tty_struct *tty, char ch)
-{
-        struct r_port *info = tty->driver_data;
-        CHANNEL_t *cp;
-
-        if (rocket_paranoia_check(info, "rp_send_xchar"))
-                return;
-
-        cp = &info->channel;
-        if (sGetTxCnt(cp))
-                sWriteTxPrioByte(cp, ch);
-        else
-                sWriteTxByte(sGetTxRxDataIO(cp), ch);
-}
-
-static void rp_throttle(struct tty_struct *tty)
-{
-        struct r_port *info = tty->driver_data;
-        CHANNEL_t *cp;
-
-#ifdef ROCKET_DEBUG_THROTTLE
-        printk(KERN_INFO "throttle %s: %d....\n", tty->name,
-               tty->ldisc.chars_in_buffer(tty));
-#endif
-
-        if (rocket_paranoia_check(info, "rp_throttle"))
-                return;
-
-        cp = &info->channel;
-        if (I_IXOFF(tty))
-                rp_send_xchar(tty, STOP_CHAR(tty));
-
-        sClrRTS(&info->channel);
-}
-
-static void rp_unthrottle(struct tty_struct *tty)
-{
-        struct r_port *info = tty->driver_data;
-        CHANNEL_t *cp;
-#ifdef ROCKET_DEBUG_THROTTLE
-        printk(KERN_INFO "unthrottle %s: %d....\n", tty->name,
-               tty->ldisc.chars_in_buffer(tty));
-#endif
-
-        if (rocket_paranoia_check(info, "rp_throttle"))
-                return;
-
-        cp = &info->channel;
-        if (I_IXOFF(tty))
-                rp_send_xchar(tty, START_CHAR(tty));
-
-        sSetRTS(&info->channel);
-}
-
-/*
- * ------------------------------------------------------------
- * rp_stop() and rp_start()
- *
- * This routines are called before setting or resetting tty->stopped.
- * They enable or disable transmitter interrupts, as necessary.
- * ------------------------------------------------------------
- */
-static void rp_stop(struct tty_struct *tty)
-{
-        struct r_port *info = tty->driver_data;
-
-#ifdef ROCKET_DEBUG_FLOW
-        printk(KERN_INFO "stop %s: %d %d....\n", tty->name,
-               info->xmit_cnt, info->xmit_fifo_room);
-#endif
-
-        if (rocket_paranoia_check(info, "rp_stop"))
-                return;
-
-        if (sGetTxCnt(&info->channel))
-                sDisTransmit(&info->channel);
-}
-
-static void rp_start(struct tty_struct *tty)
-{
-        struct r_port *info = tty->driver_data;
-
-#ifdef ROCKET_DEBUG_FLOW
-        printk(KERN_INFO "start %s: %d %d....\n", tty->name,
-               info->xmit_cnt, info->xmit_fifo_room);
-#endif
-
-        if (rocket_paranoia_check(info, "rp_stop"))
-                return;
-
-        sEnTransmit(&info->channel);
-        set_bit((info->aiop * 8) + info->chan,
-                (void *) &xmit_flags[info->board]);
-}
-
-/*
- * rp_wait_until_sent() --- wait until the transmitter is empty
- */
-static void rp_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-        struct r_port *info = tty->driver_data;
-        CHANNEL_t *cp;
-        unsigned long orig_jiffies;
-        int check_time, exit_time;
-        int txcnt;
-
-        if (rocket_paranoia_check(info, "rp_wait_until_sent"))
-                return;
-
-        cp = &info->channel;
-
-        orig_jiffies = jiffies;
-#ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT
-        printk(KERN_INFO "In RP_wait_until_sent(%d) (jiff=%lu)...\n", timeout,
-               jiffies);
-        printk(KERN_INFO "cps=%d...\n", info->cps);
-#endif
-        while (1) {
-                txcnt = sGetTxCnt(cp);
-                if (!txcnt) {
-                        if (sGetChanStatusLo(cp) & TXSHRMT)
-                                break;
-                        check_time = (HZ / info->cps) / 5;
-                } else {
-                        check_time = HZ * txcnt / info->cps;
-                }
-                if (timeout) {
-                        exit_time = orig_jiffies + timeout - jiffies;
-                        if (exit_time <= 0)
-                                break;
-                        if (exit_time < check_time)
-                                check_time = exit_time;
-                }
-                if (check_time == 0)
-                        check_time = 1;
-#ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT
-                printk(KERN_INFO "txcnt = %d (jiff=%lu,check=%d)...\n", txcnt,
-                                jiffies, check_time);
-#endif
-                msleep_interruptible(jiffies_to_msecs(check_time));
-                if (signal_pending(current))
-                        break;
-        }
-        __set_current_state(TASK_RUNNING);
-#ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT
-        printk(KERN_INFO "txcnt = %d (jiff=%lu)...done\n", txcnt, jiffies);
-#endif
-}
-
-/*
- * rp_hangup() --- called by tty_hangup() when a hangup is signaled.
- */
-static void rp_hangup(struct tty_struct *tty)
-{
-        CHANNEL_t *cp;
-        struct r_port *info = tty->driver_data;
-        unsigned long flags;
-
-        if (rocket_paranoia_check(info, "rp_hangup"))
-                return;
-
-#if (defined(ROCKET_DEBUG_OPEN) || defined(ROCKET_DEBUG_HANGUP))
-        printk(KERN_INFO "rp_hangup of ttyR%d...\n", info->line);
-#endif
-        rp_flush_buffer(tty);
-        spin_lock_irqsave(&info->port.lock, flags);
-        if (info->port.flags & ASYNC_CLOSING) {
-                spin_unlock_irqrestore(&info->port.lock, flags);
-                return;
-        }
-        if (info->port.count)
-                atomic_dec(&rp_num_ports_open);
-        clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
-        spin_unlock_irqrestore(&info->port.lock, flags);
-
-        tty_port_hangup(&info->port);
-
-        cp = &info->channel;
-        sDisRxFIFO(cp);
-        sDisTransmit(cp);
-        sDisInterrupts(cp, (TXINT_EN | MCINT_EN | RXINT_EN | SRCINT_EN | CHANINT_EN));
-        sDisCTSFlowCtl(cp);
-        sDisTxSoftFlowCtl(cp);
-        sClrTxXOFF(cp);
-        clear_bit(ASYNCB_INITIALIZED, &info->port.flags);
-
-        wake_up_interruptible(&info->port.open_wait);
-}
-
-/*
- *  Exception handler - write char routine.  The RocketPort driver uses a
- *  double-buffering strategy, with the twist that if the in-memory CPU
- *  buffer is empty, and there's space in the transmit FIFO, the
- *  writing routines will write directly to transmit FIFO.
- *  Write buffer and counters protected by spinlocks
- */
-static int rp_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        struct r_port *info = tty->driver_data;
-        CHANNEL_t *cp;
-        unsigned long flags;
-
-        if (rocket_paranoia_check(info, "rp_put_char"))
-                return 0;
-
-        /*
-         * Grab the port write mutex, locking out other processes that try to
-         * write to this port
-         */
-        mutex_lock(&info->write_mtx);
-
-#ifdef ROCKET_DEBUG_WRITE
-        printk(KERN_INFO "rp_put_char %c...\n", ch);
-#endif
-
-        spin_lock_irqsave(&info->slock, flags);
-        cp = &info->channel;
-
-        if (!tty->stopped && !tty->hw_stopped && info->xmit_fifo_room == 0)
-                info->xmit_fifo_room = TXFIFO_SIZE - sGetTxCnt(cp);
-
-        if (tty->stopped || tty->hw_stopped || info->xmit_fifo_room == 0 || info->xmit_cnt != 0) {
-                info->xmit_buf[info->xmit_head++] = ch;
-                info->xmit_head &= XMIT_BUF_SIZE - 1;
-                info->xmit_cnt++;
-                set_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
-        } else {
-                sOutB(sGetTxRxDataIO(cp), ch);
-                info->xmit_fifo_room--;
-        }
-        spin_unlock_irqrestore(&info->slock, flags);
-        mutex_unlock(&info->write_mtx);
-        return 1;
-}
-
-/*
- *  Exception handler - write routine, called when user app writes to the device.
- *  A per port write mutex is used to protect from another process writing to
- *  this port at the same time.  This other process could be running on the other CPU
- *  or get control of the CPU if the copy_from_user() blocks due to a page fault (swapped out). 
- *  Spinlocks protect the info xmit members.
- */
-static int rp_write(struct tty_struct *tty,
-                    const unsigned char *buf, int count)
-{
-        struct r_port *info = tty->driver_data;
-        CHANNEL_t *cp;
-        const unsigned char *b;
-        int c, retval = 0;
-        unsigned long flags;
-
-        if (count <= 0 || rocket_paranoia_check(info, "rp_write"))
-                return 0;
-
-        if (mutex_lock_interruptible(&info->write_mtx))
-                return -ERESTARTSYS;
-
-#ifdef ROCKET_DEBUG_WRITE
-        printk(KERN_INFO "rp_write %d chars...\n", count);
-#endif
-        cp = &info->channel;
-
-        if (!tty->stopped && !tty->hw_stopped && info->xmit_fifo_room < count)
-                info->xmit_fifo_room = TXFIFO_SIZE - sGetTxCnt(cp);
-
-        /*
-         *  If the write queue for the port is empty, and there is FIFO space, stuff bytes 
-         *  into FIFO.  Use the write queue for temp storage.
-         */
-        if (!tty->stopped && !tty->hw_stopped && info->xmit_cnt == 0 && info->xmit_fifo_room > 0) {
-                c = min(count, info->xmit_fifo_room);
-                b = buf;
-
-                /*  Push data into FIFO, 2 bytes at a time */
-                sOutStrW(sGetTxRxDataIO(cp), (unsigned short *) b, c / 2);
-
-                /*  If there is a byte remaining, write it */
-                if (c & 1)
-                        sOutB(sGetTxRxDataIO(cp), b[c - 1]);
-
-                retval += c;
-                buf += c;
-                count -= c;
-
-                spin_lock_irqsave(&info->slock, flags);
-                info->xmit_fifo_room -= c;
-                spin_unlock_irqrestore(&info->slock, flags);
-        }
-
-        /* If count is zero, we wrote it all and are done */
-        if (!count)
-                goto end;
-
-        /*  Write remaining data into the port's xmit_buf */
-        while (1) {
-                /* Hung up ? */
-                if (!test_bit(ASYNCB_NORMAL_ACTIVE, &info->port.flags))
-                        goto end;
-                c = min(count, XMIT_BUF_SIZE - info->xmit_cnt - 1);
-                c = min(c, XMIT_BUF_SIZE - info->xmit_head);
-                if (c <= 0)
-                        break;
-
-                b = buf;
-                memcpy(info->xmit_buf + info->xmit_head, b, c);
-
-                spin_lock_irqsave(&info->slock, flags);
-                info->xmit_head =
-                    (info->xmit_head + c) & (XMIT_BUF_SIZE - 1);
-                info->xmit_cnt += c;
-                spin_unlock_irqrestore(&info->slock, flags);
-
-                buf += c;
-                count -= c;
-                retval += c;
-        }
-
-        if ((retval > 0) && !tty->stopped && !tty->hw_stopped)
-                set_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
-        
-end:
-        if (info->xmit_cnt < WAKEUP_CHARS) {
-                tty_wakeup(tty);
-#ifdef ROCKETPORT_HAVE_POLL_WAIT
-                wake_up_interruptible(&tty->poll_wait);
-#endif
-        }
-        mutex_unlock(&info->write_mtx);
-        return retval;
-}
-
-/*
- * Return the number of characters that can be sent.  We estimate
- * only using the in-memory transmit buffer only, and ignore the
- * potential space in the transmit FIFO.
- */
-static int rp_write_room(struct tty_struct *tty)
-{
-        struct r_port *info = tty->driver_data;
-        int ret;
-
-        if (rocket_paranoia_check(info, "rp_write_room"))
-                return 0;
-
-        ret = XMIT_BUF_SIZE - info->xmit_cnt - 1;
-        if (ret < 0)
-                ret = 0;
-#ifdef ROCKET_DEBUG_WRITE
-        printk(KERN_INFO "rp_write_room returns %d...\n", ret);
-#endif
-        return ret;
-}
-
-/*
- * Return the number of characters in the buffer.  Again, this only
- * counts those characters in the in-memory transmit buffer.
- */
-static int rp_chars_in_buffer(struct tty_struct *tty)
-{
-        struct r_port *info = tty->driver_data;
-        CHANNEL_t *cp;
-
-        if (rocket_paranoia_check(info, "rp_chars_in_buffer"))
-                return 0;
-
-        cp = &info->channel;
-
-#ifdef ROCKET_DEBUG_WRITE
-        printk(KERN_INFO "rp_chars_in_buffer returns %d...\n", info->xmit_cnt);
-#endif
-        return info->xmit_cnt;
-}
-
-/*
- *  Flushes the TX fifo for a port, deletes data in the xmit_buf stored in the
- *  r_port struct for the port.  Note that spinlock are used to protect info members,
- *  do not call this function if the spinlock is already held.
- */
-static void rp_flush_buffer(struct tty_struct *tty)
-{
-        struct r_port *info = tty->driver_data;
-        CHANNEL_t *cp;
-        unsigned long flags;
-
-        if (rocket_paranoia_check(info, "rp_flush_buffer"))
-                return;
-
-        spin_lock_irqsave(&info->slock, flags);
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-        spin_unlock_irqrestore(&info->slock, flags);
-
-#ifdef ROCKETPORT_HAVE_POLL_WAIT
-        wake_up_interruptible(&tty->poll_wait);
-#endif
-        tty_wakeup(tty);
-
-        cp = &info->channel;
-        sFlushTxFIFO(cp);
-}
-
-#ifdef CONFIG_PCI
-
-static struct pci_device_id __devinitdata rocket_pci_ids[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_ANY_ID) },
-        { }
-};
-MODULE_DEVICE_TABLE(pci, rocket_pci_ids);
-
-/*
- *  Called when a PCI card is found.  Retrieves and stores model information,
- *  init's aiopic and serial port hardware.
- *  Inputs:  i is the board number (0-n)
- */
-static __init int register_PCI(int i, struct pci_dev *dev)
-{
-        int num_aiops, aiop, max_num_aiops, num_chan, chan;
-        unsigned int aiopio[MAX_AIOPS_PER_BOARD];
-        char *str, *board_type;
-        CONTROLLER_t *ctlp;
-
-        int fast_clock = 0;
-        int altChanRingIndicator = 0;
-        int ports_per_aiop = 8;
-        WordIO_t ConfigIO = 0;
-        ByteIO_t UPCIRingInd = 0;
-
-        if (!dev || pci_enable_device(dev))
-                return 0;
-
-        rcktpt_io_addr[i] = pci_resource_start(dev, 0);
-
-        rcktpt_type[i] = ROCKET_TYPE_NORMAL;
-        rocketModel[i].loadrm2 = 0;
-        rocketModel[i].startingPortNumber = nextLineNumber;
-
-        /*  Depending on the model, set up some config variables */
-        switch (dev->device) {
-        case PCI_DEVICE_ID_RP4QUAD:
-                str = "Quadcable";
-                max_num_aiops = 1;
-                ports_per_aiop = 4;
-                rocketModel[i].model = MODEL_RP4QUAD;
-                strcpy(rocketModel[i].modelString, "RocketPort 4 port w/quad cable");
-                rocketModel[i].numPorts = 4;
-                break;
-        case PCI_DEVICE_ID_RP8OCTA:
-                str = "Octacable";
-                max_num_aiops = 1;
-                rocketModel[i].model = MODEL_RP8OCTA;
-                strcpy(rocketModel[i].modelString, "RocketPort 8 port w/octa cable");
-                rocketModel[i].numPorts = 8;
-                break;
-        case PCI_DEVICE_ID_URP8OCTA:
-                str = "Octacable";
-                max_num_aiops = 1;
-                rocketModel[i].model = MODEL_UPCI_RP8OCTA;
-                strcpy(rocketModel[i].modelString, "RocketPort UPCI 8 port w/octa cable");
-                rocketModel[i].numPorts = 8;
-                break;
-        case PCI_DEVICE_ID_RP8INTF:
-                str = "8";
-                max_num_aiops = 1;
-                rocketModel[i].model = MODEL_RP8INTF;
-                strcpy(rocketModel[i].modelString, "RocketPort 8 port w/external I/F");
-                rocketModel[i].numPorts = 8;
-                break;
-        case PCI_DEVICE_ID_URP8INTF:
-                str = "8";
-                max_num_aiops = 1;
-                rocketModel[i].model = MODEL_UPCI_RP8INTF;
-                strcpy(rocketModel[i].modelString, "RocketPort UPCI 8 port w/external I/F");
-                rocketModel[i].numPorts = 8;
-                break;
-        case PCI_DEVICE_ID_RP8J:
-                str = "8J";
-                max_num_aiops = 1;
-                rocketModel[i].model = MODEL_RP8J;
-                strcpy(rocketModel[i].modelString, "RocketPort 8 port w/RJ11 connectors");
-                rocketModel[i].numPorts = 8;
-                break;
-        case PCI_DEVICE_ID_RP4J:
-                str = "4J";
-                max_num_aiops = 1;
-                ports_per_aiop = 4;
-                rocketModel[i].model = MODEL_RP4J;
-                strcpy(rocketModel[i].modelString, "RocketPort 4 port w/RJ45 connectors");
-                rocketModel[i].numPorts = 4;
-                break;
-        case PCI_DEVICE_ID_RP8SNI:
-                str = "8 (DB78 Custom)";
-                max_num_aiops = 1;
-                rocketModel[i].model = MODEL_RP8SNI;
-                strcpy(rocketModel[i].modelString, "RocketPort 8 port w/ custom DB78");
-                rocketModel[i].numPorts = 8;
-                break;
-        case PCI_DEVICE_ID_RP16SNI:
-                str = "16 (DB78 Custom)";
-                max_num_aiops = 2;
-                rocketModel[i].model = MODEL_RP16SNI;
-                strcpy(rocketModel[i].modelString, "RocketPort 16 port w/ custom DB78");
-                rocketModel[i].numPorts = 16;
-                break;
-        case PCI_DEVICE_ID_RP16INTF:
-                str = "16";
-                max_num_aiops = 2;
-                rocketModel[i].model = MODEL_RP16INTF;
-                strcpy(rocketModel[i].modelString, "RocketPort 16 port w/external I/F");
-                rocketModel[i].numPorts = 16;
-                break;
-        case PCI_DEVICE_ID_URP16INTF:
-                str = "16";
-                max_num_aiops = 2;
-                rocketModel[i].model = MODEL_UPCI_RP16INTF;
-                strcpy(rocketModel[i].modelString, "RocketPort UPCI 16 port w/external I/F");
-                rocketModel[i].numPorts = 16;
-                break;
-        case PCI_DEVICE_ID_CRP16INTF:
-                str = "16";
-                max_num_aiops = 2;
-                rocketModel[i].model = MODEL_CPCI_RP16INTF;
-                strcpy(rocketModel[i].modelString, "RocketPort Compact PCI 16 port w/external I/F");
-                rocketModel[i].numPorts = 16;
-                break;
-        case PCI_DEVICE_ID_RP32INTF:
-                str = "32";
-                max_num_aiops = 4;
-                rocketModel[i].model = MODEL_RP32INTF;
-                strcpy(rocketModel[i].modelString, "RocketPort 32 port w/external I/F");
-                rocketModel[i].numPorts = 32;
-                break;
-        case PCI_DEVICE_ID_URP32INTF:
-                str = "32";
-                max_num_aiops = 4;
-                rocketModel[i].model = MODEL_UPCI_RP32INTF;
-                strcpy(rocketModel[i].modelString, "RocketPort UPCI 32 port w/external I/F");
-                rocketModel[i].numPorts = 32;
-                break;
-        case PCI_DEVICE_ID_RPP4:
-                str = "Plus Quadcable";
-                max_num_aiops = 1;
-                ports_per_aiop = 4;
-                altChanRingIndicator++;
-                fast_clock++;
-                rocketModel[i].model = MODEL_RPP4;
-                strcpy(rocketModel[i].modelString, "RocketPort Plus 4 port");
-                rocketModel[i].numPorts = 4;
-                break;
-        case PCI_DEVICE_ID_RPP8:
-                str = "Plus Octacable";
-                max_num_aiops = 2;
-                ports_per_aiop = 4;
-                altChanRingIndicator++;
-                fast_clock++;
-                rocketModel[i].model = MODEL_RPP8;
-                strcpy(rocketModel[i].modelString, "RocketPort Plus 8 port");
-                rocketModel[i].numPorts = 8;
-                break;
-        case PCI_DEVICE_ID_RP2_232:
-                str = "Plus 2 (RS-232)";
-                max_num_aiops = 1;
-                ports_per_aiop = 2;
-                altChanRingIndicator++;
-                fast_clock++;
-                rocketModel[i].model = MODEL_RP2_232;
-                strcpy(rocketModel[i].modelString, "RocketPort Plus 2 port RS232");
-                rocketModel[i].numPorts = 2;
-                break;
-        case PCI_DEVICE_ID_RP2_422:
-                str = "Plus 2 (RS-422)";
-                max_num_aiops = 1;
-                ports_per_aiop = 2;
-                altChanRingIndicator++;
-                fast_clock++;
-                rocketModel[i].model = MODEL_RP2_422;
-                strcpy(rocketModel[i].modelString, "RocketPort Plus 2 port RS422");
-                rocketModel[i].numPorts = 2;
-                break;
-        case PCI_DEVICE_ID_RP6M:
-
-                max_num_aiops = 1;
-                ports_per_aiop = 6;
-                str = "6-port";
-
-                /*  If revision is 1, the rocketmodem flash must be loaded.
-                 *  If it is 2 it is a "socketed" version. */
-                if (dev->revision == 1) {
-                        rcktpt_type[i] = ROCKET_TYPE_MODEMII;
-                        rocketModel[i].loadrm2 = 1;
-                } else {
-                        rcktpt_type[i] = ROCKET_TYPE_MODEM;
-                }
-
-                rocketModel[i].model = MODEL_RP6M;
-                strcpy(rocketModel[i].modelString, "RocketModem 6 port");
-                rocketModel[i].numPorts = 6;
-                break;
-        case PCI_DEVICE_ID_RP4M:
-                max_num_aiops = 1;
-                ports_per_aiop = 4;
-                str = "4-port";
-                if (dev->revision == 1) {
-                        rcktpt_type[i] = ROCKET_TYPE_MODEMII;
-                        rocketModel[i].loadrm2 = 1;
-                } else {
-                        rcktpt_type[i] = ROCKET_TYPE_MODEM;
-                }
-
-                rocketModel[i].model = MODEL_RP4M;
-                strcpy(rocketModel[i].modelString, "RocketModem 4 port");
-                rocketModel[i].numPorts = 4;
-                break;
-        default:
-                str = "(unknown/unsupported)";
-                max_num_aiops = 0;
-                break;
-        }
-
-        /*
-         * Check for UPCI boards.
-         */
-
-        switch (dev->device) {
-        case PCI_DEVICE_ID_URP32INTF:
-        case PCI_DEVICE_ID_URP8INTF:
-        case PCI_DEVICE_ID_URP16INTF:
-        case PCI_DEVICE_ID_CRP16INTF:
-        case PCI_DEVICE_ID_URP8OCTA:
-                rcktpt_io_addr[i] = pci_resource_start(dev, 2);
-                ConfigIO = pci_resource_start(dev, 1);
-                if (dev->device == PCI_DEVICE_ID_URP8OCTA) {
-                        UPCIRingInd = rcktpt_io_addr[i] + _PCI_9030_RING_IND;
-
-                        /*
-                         * Check for octa or quad cable.
-                         */
-                        if (!
-                            (sInW(ConfigIO + _PCI_9030_GPIO_CTRL) &
-                             PCI_GPIO_CTRL_8PORT)) {
-                                str = "Quadcable";
-                                ports_per_aiop = 4;
-                                rocketModel[i].numPorts = 4;
-                        }
-                }
-                break;
-        case PCI_DEVICE_ID_UPCI_RM3_8PORT:
-                str = "8 ports";
-                max_num_aiops = 1;
-                rocketModel[i].model = MODEL_UPCI_RM3_8PORT;
-                strcpy(rocketModel[i].modelString, "RocketModem III 8 port");
-                rocketModel[i].numPorts = 8;
-                rcktpt_io_addr[i] = pci_resource_start(dev, 2);
-                UPCIRingInd = rcktpt_io_addr[i] + _PCI_9030_RING_IND;
-                ConfigIO = pci_resource_start(dev, 1);
-                rcktpt_type[i] = ROCKET_TYPE_MODEMIII;
-                break;
-        case PCI_DEVICE_ID_UPCI_RM3_4PORT:
-                str = "4 ports";
-                max_num_aiops = 1;
-                rocketModel[i].model = MODEL_UPCI_RM3_4PORT;
-                strcpy(rocketModel[i].modelString, "RocketModem III 4 port");
-                rocketModel[i].numPorts = 4;
-                rcktpt_io_addr[i] = pci_resource_start(dev, 2);
-                UPCIRingInd = rcktpt_io_addr[i] + _PCI_9030_RING_IND;
-                ConfigIO = pci_resource_start(dev, 1);
-                rcktpt_type[i] = ROCKET_TYPE_MODEMIII;
-                break;
-        default:
-                break;
-        }
-
-        switch (rcktpt_type[i]) {
-        case ROCKET_TYPE_MODEM:
-                board_type = "RocketModem";
-                break;
-        case ROCKET_TYPE_MODEMII:
-                board_type = "RocketModem II";
-                break;
-        case ROCKET_TYPE_MODEMIII:
-                board_type = "RocketModem III";
-                break;
-        default:
-                board_type = "RocketPort";
-                break;
-        }
-
-        if (fast_clock) {
-                sClockPrescale = 0x12;  /* mod 2 (divide by 3) */
-                rp_baud_base[i] = 921600;
-        } else {
-                /*
-                 * If support_low_speed is set, use the slow clock
-                 * prescale, which supports 50 bps
-                 */
-                if (support_low_speed) {
-                        /* mod 9 (divide by 10) prescale */
-                        sClockPrescale = 0x19;
-                        rp_baud_base[i] = 230400;
-                } else {
-                        /* mod 4 (devide by 5) prescale */
-                        sClockPrescale = 0x14;
-                        rp_baud_base[i] = 460800;
-                }
-        }
-
-        for (aiop = 0; aiop < max_num_aiops; aiop++)
-                aiopio[aiop] = rcktpt_io_addr[i] + (aiop * 0x40);
-        ctlp = sCtlNumToCtlPtr(i);
-        num_aiops = sPCIInitController(ctlp, i, aiopio, max_num_aiops, ConfigIO, 0, FREQ_DIS, 0, altChanRingIndicator, UPCIRingInd);
-        for (aiop = 0; aiop < max_num_aiops; aiop++)
-                ctlp->AiopNumChan[aiop] = ports_per_aiop;
-
-        dev_info(&dev->dev, "comtrol PCI controller #%d found at "
-                "address %04lx, %d AIOP(s) (%s), creating ttyR%d - %ld\n",
-                i, rcktpt_io_addr[i], num_aiops, rocketModel[i].modelString,
-                rocketModel[i].startingPortNumber,
-                rocketModel[i].startingPortNumber + rocketModel[i].numPorts-1);
-
-        if (num_aiops <= 0) {
-                rcktpt_io_addr[i] = 0;
-                return (0);
-        }
-        is_PCI[i] = 1;
-
-        /*  Reset the AIOPIC, init the serial ports */
-        for (aiop = 0; aiop < num_aiops; aiop++) {
-                sResetAiopByNum(ctlp, aiop);
-                num_chan = ports_per_aiop;
-                for (chan = 0; chan < num_chan; chan++)
-                        init_r_port(i, aiop, chan, dev);
-        }
-
-        /*  Rocket modems must be reset */
-        if ((rcktpt_type[i] == ROCKET_TYPE_MODEM) ||
-            (rcktpt_type[i] == ROCKET_TYPE_MODEMII) ||
-            (rcktpt_type[i] == ROCKET_TYPE_MODEMIII)) {
-                num_chan = ports_per_aiop;
-                for (chan = 0; chan < num_chan; chan++)
-                        sPCIModemReset(ctlp, chan, 1);
-                msleep(500);
-                for (chan = 0; chan < num_chan; chan++)
-                        sPCIModemReset(ctlp, chan, 0);
-                msleep(500);
-                rmSpeakerReset(ctlp, rocketModel[i].model);
-        }
-        return (1);
-}
-
-/*
- *  Probes for PCI cards, inits them if found
- *  Input:   board_found = number of ISA boards already found, or the
- *           starting board number
- *  Returns: Number of PCI boards found
- */
-static int __init init_PCI(int boards_found)
-{
-        struct pci_dev *dev = NULL;
-        int count = 0;
-
-        /*  Work through the PCI device list, pulling out ours */
-        while ((dev = pci_get_device(PCI_VENDOR_ID_RP, PCI_ANY_ID, dev))) {
-                if (register_PCI(count + boards_found, dev))
-                        count++;
-        }
-        return (count);
-}
-
-#endif                          /* CONFIG_PCI */
-
-/*
- *  Probes for ISA cards
- *  Input:   i = the board number to look for
- *  Returns: 1 if board found, 0 else
- */
-static int __init init_ISA(int i)
-{
-        int num_aiops, num_chan = 0, total_num_chan = 0;
-        int aiop, chan;
-        unsigned int aiopio[MAX_AIOPS_PER_BOARD];
-        CONTROLLER_t *ctlp;
-        char *type_string;
-
-        /*  If io_addr is zero, no board configured */
-        if (rcktpt_io_addr[i] == 0)
-                return (0);
-
-        /*  Reserve the IO region */
-        if (!request_region(rcktpt_io_addr[i], 64, "Comtrol RocketPort")) {
-                printk(KERN_ERR "Unable to reserve IO region for configured "
-                                "ISA RocketPort at address 0x%lx, board not "
-                                "installed...\n", rcktpt_io_addr[i]);
-                rcktpt_io_addr[i] = 0;
-                return (0);
-        }
-
-        ctlp = sCtlNumToCtlPtr(i);
-
-        ctlp->boardType = rcktpt_type[i];
-
-        switch (rcktpt_type[i]) {
-        case ROCKET_TYPE_PC104:
-                type_string = "(PC104)";
-                break;
-        case ROCKET_TYPE_MODEM:
-                type_string = "(RocketModem)";
-                break;
-        case ROCKET_TYPE_MODEMII:
-                type_string = "(RocketModem II)";
-                break;
-        default:
-                type_string = "";
-                break;
-        }
-
-        /*
-         * If support_low_speed is set, use the slow clock prescale,
-         * which supports 50 bps
-         */
-        if (support_low_speed) {
-                sClockPrescale = 0x19;  /* mod 9 (divide by 10) prescale */
-                rp_baud_base[i] = 230400;
-        } else {
-                sClockPrescale = 0x14;  /* mod 4 (devide by 5) prescale */
-                rp_baud_base[i] = 460800;
-        }
-
-        for (aiop = 0; aiop < MAX_AIOPS_PER_BOARD; aiop++)
-                aiopio[aiop] = rcktpt_io_addr[i] + (aiop * 0x400);
-
-        num_aiops = sInitController(ctlp, i, controller + (i * 0x400), aiopio,  MAX_AIOPS_PER_BOARD, 0, FREQ_DIS, 0);
-
-        if (ctlp->boardType == ROCKET_TYPE_PC104) {
-                sEnAiop(ctlp, 2);       /* only one AIOPIC, but these */
-                sEnAiop(ctlp, 3);       /* CSels used for other stuff */
-        }
-
-        /*  If something went wrong initing the AIOP's release the ISA IO memory */
-        if (num_aiops <= 0) {
-                release_region(rcktpt_io_addr[i], 64);
-                rcktpt_io_addr[i] = 0;
-                return (0);
-        }
-  
-        rocketModel[i].startingPortNumber = nextLineNumber;
-
-        for (aiop = 0; aiop < num_aiops; aiop++) {
-                sResetAiopByNum(ctlp, aiop);
-                sEnAiop(ctlp, aiop);
-                num_chan = sGetAiopNumChan(ctlp, aiop);
-                total_num_chan += num_chan;
-                for (chan = 0; chan < num_chan; chan++)
-                        init_r_port(i, aiop, chan, NULL);
-        }
-        is_PCI[i] = 0;
-        if ((rcktpt_type[i] == ROCKET_TYPE_MODEM) || (rcktpt_type[i] == ROCKET_TYPE_MODEMII)) {
-                num_chan = sGetAiopNumChan(ctlp, 0);
-                total_num_chan = num_chan;
-                for (chan = 0; chan < num_chan; chan++)
-                        sModemReset(ctlp, chan, 1);
-                msleep(500);
-                for (chan = 0; chan < num_chan; chan++)
-                        sModemReset(ctlp, chan, 0);
-                msleep(500);
-                strcpy(rocketModel[i].modelString, "RocketModem ISA");
-        } else {
-                strcpy(rocketModel[i].modelString, "RocketPort ISA");
-        }
-        rocketModel[i].numPorts = total_num_chan;
-        rocketModel[i].model = MODEL_ISA;
-
-        printk(KERN_INFO "RocketPort ISA card #%d found at 0x%lx - %d AIOPs %s\n", 
-               i, rcktpt_io_addr[i], num_aiops, type_string);
-
-        printk(KERN_INFO "Installing %s, creating /dev/ttyR%d - %ld\n",
-               rocketModel[i].modelString,
-               rocketModel[i].startingPortNumber,
-               rocketModel[i].startingPortNumber +
-               rocketModel[i].numPorts - 1);
-
-        return (1);
-}
-
-static const struct tty_operations rocket_ops = {
-        .open = rp_open,
-        .close = rp_close,
-        .write = rp_write,
-        .put_char = rp_put_char,
-        .write_room = rp_write_room,
-        .chars_in_buffer = rp_chars_in_buffer,
-        .flush_buffer = rp_flush_buffer,
-        .ioctl = rp_ioctl,
-        .throttle = rp_throttle,
-        .unthrottle = rp_unthrottle,
-        .set_termios = rp_set_termios,
-        .stop = rp_stop,
-        .start = rp_start,
-        .hangup = rp_hangup,
-        .break_ctl = rp_break,
-        .send_xchar = rp_send_xchar,
-        .wait_until_sent = rp_wait_until_sent,
-        .tiocmget = rp_tiocmget,
-        .tiocmset = rp_tiocmset,
-};
-
-static const struct tty_port_operations rocket_port_ops = {
-        .carrier_raised = carrier_raised,
-        .dtr_rts = dtr_rts,
-};
-
-/*
- * The module "startup" routine; it's run when the module is loaded.
- */
-static int __init rp_init(void)
-{
-        int ret = -ENOMEM, pci_boards_found, isa_boards_found, i;
-
-        printk(KERN_INFO "RocketPort device driver module, version %s, %s\n",
-               ROCKET_VERSION, ROCKET_DATE);
-
-        rocket_driver = alloc_tty_driver(MAX_RP_PORTS);
-        if (!rocket_driver)
-                goto err;
-
-        /*
-         *  If board 1 is non-zero, there is at least one ISA configured.  If controller is 
-         *  zero, use the default controller IO address of board1 + 0x40.
-         */
-        if (board1) {
-                if (controller == 0)
-                        controller = board1 + 0x40;
-        } else {
-                controller = 0;  /*  Used as a flag, meaning no ISA boards */
-        }
-
-        /*  If an ISA card is configured, reserve the 4 byte IO space for the Mudbac controller */
-        if (controller && (!request_region(controller, 4, "Comtrol RocketPort"))) {
-                printk(KERN_ERR "Unable to reserve IO region for first "
-                        "configured ISA RocketPort controller 0x%lx.  "
-                        "Driver exiting\n", controller);
-                ret = -EBUSY;
-                goto err_tty;
-        }
-
-        /*  Store ISA variable retrieved from command line or .conf file. */
-        rcktpt_io_addr[0] = board1;
-        rcktpt_io_addr[1] = board2;
-        rcktpt_io_addr[2] = board3;
-        rcktpt_io_addr[3] = board4;
-
-        rcktpt_type[0] = modem1 ? ROCKET_TYPE_MODEM : ROCKET_TYPE_NORMAL;
-        rcktpt_type[0] = pc104_1[0] ? ROCKET_TYPE_PC104 : rcktpt_type[0];
-        rcktpt_type[1] = modem2 ? ROCKET_TYPE_MODEM : ROCKET_TYPE_NORMAL;
-        rcktpt_type[1] = pc104_2[0] ? ROCKET_TYPE_PC104 : rcktpt_type[1];
-        rcktpt_type[2] = modem3 ? ROCKET_TYPE_MODEM : ROCKET_TYPE_NORMAL;
-        rcktpt_type[2] = pc104_3[0] ? ROCKET_TYPE_PC104 : rcktpt_type[2];
-        rcktpt_type[3] = modem4 ? ROCKET_TYPE_MODEM : ROCKET_TYPE_NORMAL;
-        rcktpt_type[3] = pc104_4[0] ? ROCKET_TYPE_PC104 : rcktpt_type[3];
-
-        /*
-         * Set up the tty driver structure and then register this
-         * driver with the tty layer.
-         */
-
-        rocket_driver->owner = THIS_MODULE;
-        rocket_driver->flags = TTY_DRIVER_DYNAMIC_DEV;
-        rocket_driver->name = "ttyR";
-        rocket_driver->driver_name = "Comtrol RocketPort";
-        rocket_driver->major = TTY_ROCKET_MAJOR;
-        rocket_driver->minor_start = 0;
-        rocket_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        rocket_driver->subtype = SERIAL_TYPE_NORMAL;
-        rocket_driver->init_termios = tty_std_termios;
-        rocket_driver->init_termios.c_cflag =
-            B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        rocket_driver->init_termios.c_ispeed = 9600;
-        rocket_driver->init_termios.c_ospeed = 9600;
-#ifdef ROCKET_SOFT_FLOW
-        rocket_driver->flags |= TTY_DRIVER_REAL_RAW;
-#endif
-        tty_set_operations(rocket_driver, &rocket_ops);
-
-        ret = tty_register_driver(rocket_driver);
-        if (ret < 0) {
-                printk(KERN_ERR "Couldn't install tty RocketPort driver\n");
-                goto err_tty;
-        }
-
-#ifdef ROCKET_DEBUG_OPEN
-        printk(KERN_INFO "RocketPort driver is major %d\n", rocket_driver.major);
-#endif
-
-        /*
-         *  OK, let's probe each of the controllers looking for boards.  Any boards found
-         *  will be initialized here.
-         */
-        isa_boards_found = 0;
-        pci_boards_found = 0;
-
-        for (i = 0; i < NUM_BOARDS; i++) {
-                if (init_ISA(i))
-                        isa_boards_found++;
-        }
-
-#ifdef CONFIG_PCI
-        if (isa_boards_found < NUM_BOARDS)
-                pci_boards_found = init_PCI(isa_boards_found);
-#endif
-
-        max_board = pci_boards_found + isa_boards_found;
-
-        if (max_board == 0) {
-                printk(KERN_ERR "No rocketport ports found; unloading driver\n");
-                ret = -ENXIO;
-                goto err_ttyu;
-        }
-
-        return 0;
-err_ttyu:
-        tty_unregister_driver(rocket_driver);
-err_tty:
-        put_tty_driver(rocket_driver);
-err:
-        return ret;
-}
-
-
-static void rp_cleanup_module(void)
-{
-        int retval;
-        int i;
-
-        del_timer_sync(&rocket_timer);
-
-        retval = tty_unregister_driver(rocket_driver);
-        if (retval)
-                printk(KERN_ERR "Error %d while trying to unregister "
-                       "rocketport driver\n", -retval);
-
-        for (i = 0; i < MAX_RP_PORTS; i++)
-                if (rp_table[i]) {
-                        tty_unregister_device(rocket_driver, i);
-                        kfree(rp_table[i]);
-                }
-
-        put_tty_driver(rocket_driver);
-
-        for (i = 0; i < NUM_BOARDS; i++) {
-                if (rcktpt_io_addr[i] <= 0 || is_PCI[i])
-                        continue;
-                release_region(rcktpt_io_addr[i], 64);
-        }
-        if (controller)
-                release_region(controller, 4);
-}
-
-/***************************************************************************
-Function: sInitController
-Purpose:  Initialization of controller global registers and controller
-          structure.
-Call:     sInitController(CtlP,CtlNum,MudbacIO,AiopIOList,AiopIOListSize,
-                          IRQNum,Frequency,PeriodicOnly)
-          CONTROLLER_T *CtlP; Ptr to controller structure
-          int CtlNum; Controller number
-          ByteIO_t MudbacIO; Mudbac base I/O address.
-          ByteIO_t *AiopIOList; List of I/O addresses for each AIOP.
-             This list must be in the order the AIOPs will be found on the
-             controller.  Once an AIOP in the list is not found, it is
-             assumed that there are no more AIOPs on the controller.
-          int AiopIOListSize; Number of addresses in AiopIOList
-          int IRQNum; Interrupt Request number.  Can be any of the following:
-                         0: Disable global interrupts
-                         3: IRQ 3
-                         4: IRQ 4
-                         5: IRQ 5
-                         9: IRQ 9
-                         10: IRQ 10
-                         11: IRQ 11
-                         12: IRQ 12
-                         15: IRQ 15
-          Byte_t Frequency: A flag identifying the frequency
-                   of the periodic interrupt, can be any one of the following:
-                      FREQ_DIS - periodic interrupt disabled
-                      FREQ_137HZ - 137 Hertz
-                      FREQ_69HZ - 69 Hertz
-                      FREQ_34HZ - 34 Hertz
-                      FREQ_17HZ - 17 Hertz
-                      FREQ_9HZ - 9 Hertz
-                      FREQ_4HZ - 4 Hertz
-                   If IRQNum is set to 0 the Frequency parameter is
-                   overidden, it is forced to a value of FREQ_DIS.
-          int PeriodicOnly: 1 if all interrupts except the periodic
-                               interrupt are to be blocked.
-                            0 is both the periodic interrupt and
-                               other channel interrupts are allowed.
-                            If IRQNum is set to 0 the PeriodicOnly parameter is
-                               overidden, it is forced to a value of 0.
-Return:   int: Number of AIOPs on the controller, or CTLID_NULL if controller
-               initialization failed.
-
-Comments:
-          If periodic interrupts are to be disabled but AIOP interrupts
-          are allowed, set Frequency to FREQ_DIS and PeriodicOnly to 0.
-
-          If interrupts are to be completely disabled set IRQNum to 0.
-
-          Setting Frequency to FREQ_DIS and PeriodicOnly to 1 is an
-          invalid combination.
-
-          This function performs initialization of global interrupt modes,
-          but it does not actually enable global interrupts.  To enable
-          and disable global interrupts use functions sEnGlobalInt() and
-          sDisGlobalInt().  Enabling of global interrupts is normally not
-          done until all other initializations are complete.
-
-          Even if interrupts are globally enabled, they must also be
-          individually enabled for each channel that is to generate
-          interrupts.
-
-Warnings: No range checking on any of the parameters is done.
-
-          No context switches are allowed while executing this function.
-
-          After this function all AIOPs on the controller are disabled,
-          they can be enabled with sEnAiop().
-*/
-static int sInitController(CONTROLLER_T * CtlP, int CtlNum, ByteIO_t MudbacIO,
-                           ByteIO_t * AiopIOList, int AiopIOListSize,
-                           int IRQNum, Byte_t Frequency, int PeriodicOnly)
-{
-        int i;
-        ByteIO_t io;
-        int done;
-
-        CtlP->AiopIntrBits = aiop_intr_bits;
-        CtlP->AltChanRingIndicator = 0;
-        CtlP->CtlNum = CtlNum;
-        CtlP->CtlID = CTLID_0001;       /* controller release 1 */
-        CtlP->BusType = isISA;
-        CtlP->MBaseIO = MudbacIO;
-        CtlP->MReg1IO = MudbacIO + 1;
-        CtlP->MReg2IO = MudbacIO + 2;
-        CtlP->MReg3IO = MudbacIO + 3;
-#if 1
-        CtlP->MReg2 = 0;        /* interrupt disable */
-        CtlP->MReg3 = 0;        /* no periodic interrupts */
-#else
-        if (sIRQMap[IRQNum] == 0) {     /* interrupts globally disabled */
-                CtlP->MReg2 = 0;        /* interrupt disable */
-                CtlP->MReg3 = 0;        /* no periodic interrupts */
-        } else {
-                CtlP->MReg2 = sIRQMap[IRQNum];  /* set IRQ number */
-                CtlP->MReg3 = Frequency;        /* set frequency */
-                if (PeriodicOnly) {     /* periodic interrupt only */
-                        CtlP->MReg3 |= PERIODIC_ONLY;
-                }
-        }
-#endif
-        sOutB(CtlP->MReg2IO, CtlP->MReg2);
-        sOutB(CtlP->MReg3IO, CtlP->MReg3);
-        sControllerEOI(CtlP);   /* clear EOI if warm init */
-        /* Init AIOPs */
-        CtlP->NumAiop = 0;
-        for (i = done = 0; i < AiopIOListSize; i++) {
-                io = AiopIOList[i];
-                CtlP->AiopIO[i] = (WordIO_t) io;
-                CtlP->AiopIntChanIO[i] = io + _INT_CHAN;
-                sOutB(CtlP->MReg2IO, CtlP->MReg2 | (i & 0x03)); /* AIOP index */
-                sOutB(MudbacIO, (Byte_t) (io >> 6));    /* set up AIOP I/O in MUDBAC */
-                if (done)
-                        continue;
-                sEnAiop(CtlP, i);       /* enable the AIOP */
-                CtlP->AiopID[i] = sReadAiopID(io);      /* read AIOP ID */
-                if (CtlP->AiopID[i] == AIOPID_NULL)     /* if AIOP does not exist */
-                        done = 1;       /* done looking for AIOPs */
-                else {
-                        CtlP->AiopNumChan[i] = sReadAiopNumChan((WordIO_t) io); /* num channels in AIOP */
-                        sOutW((WordIO_t) io + _INDX_ADDR, _CLK_PRE);    /* clock prescaler */
-                        sOutB(io + _INDX_DATA, sClockPrescale);
-                        CtlP->NumAiop++;        /* bump count of AIOPs */
-                }
-                sDisAiop(CtlP, i);      /* disable AIOP */
-        }
-
-        if (CtlP->NumAiop == 0)
-                return (-1);
-        else
-                return (CtlP->NumAiop);
-}
-
-/***************************************************************************
-Function: sPCIInitController
-Purpose:  Initialization of controller global registers and controller
-          structure.
-Call:     sPCIInitController(CtlP,CtlNum,AiopIOList,AiopIOListSize,
-                          IRQNum,Frequency,PeriodicOnly)
-          CONTROLLER_T *CtlP; Ptr to controller structure
-          int CtlNum; Controller number
-          ByteIO_t *AiopIOList; List of I/O addresses for each AIOP.
-             This list must be in the order the AIOPs will be found on the
-             controller.  Once an AIOP in the list is not found, it is
-             assumed that there are no more AIOPs on the controller.
-          int AiopIOListSize; Number of addresses in AiopIOList
-          int IRQNum; Interrupt Request number.  Can be any of the following:
-                         0: Disable global interrupts
-                         3: IRQ 3
-                         4: IRQ 4
-                         5: IRQ 5
-                         9: IRQ 9
-                         10: IRQ 10
-                         11: IRQ 11
-                         12: IRQ 12
-                         15: IRQ 15
-          Byte_t Frequency: A flag identifying the frequency
-                   of the periodic interrupt, can be any one of the following:
-                      FREQ_DIS - periodic interrupt disabled
-                      FREQ_137HZ - 137 Hertz
-                      FREQ_69HZ - 69 Hertz
-                      FREQ_34HZ - 34 Hertz
-                      FREQ_17HZ - 17 Hertz
-                      FREQ_9HZ - 9 Hertz
-                      FREQ_4HZ - 4 Hertz
-                   If IRQNum is set to 0 the Frequency parameter is
-                   overidden, it is forced to a value of FREQ_DIS.
-          int PeriodicOnly: 1 if all interrupts except the periodic
-                               interrupt are to be blocked.
-                            0 is both the periodic interrupt and
-                               other channel interrupts are allowed.
-                            If IRQNum is set to 0 the PeriodicOnly parameter is
-                               overidden, it is forced to a value of 0.
-Return:   int: Number of AIOPs on the controller, or CTLID_NULL if controller
-               initialization failed.
-
-Comments:
-          If periodic interrupts are to be disabled but AIOP interrupts
-          are allowed, set Frequency to FREQ_DIS and PeriodicOnly to 0.
-
-          If interrupts are to be completely disabled set IRQNum to 0.
-
-          Setting Frequency to FREQ_DIS and PeriodicOnly to 1 is an
-          invalid combination.
-
-          This function performs initialization of global interrupt modes,
-          but it does not actually enable global interrupts.  To enable
-          and disable global interrupts use functions sEnGlobalInt() and
-          sDisGlobalInt().  Enabling of global interrupts is normally not
-          done until all other initializations are complete.
-
-          Even if interrupts are globally enabled, they must also be
-          individually enabled for each channel that is to generate
-          interrupts.
-
-Warnings: No range checking on any of the parameters is done.
-
-          No context switches are allowed while executing this function.
-
-          After this function all AIOPs on the controller are disabled,
-          they can be enabled with sEnAiop().
-*/
-static int sPCIInitController(CONTROLLER_T * CtlP, int CtlNum,
-                              ByteIO_t * AiopIOList, int AiopIOListSize,
-                              WordIO_t ConfigIO, int IRQNum, Byte_t Frequency,
-                              int PeriodicOnly, int altChanRingIndicator,
-                              int UPCIRingInd)
-{
-        int i;
-        ByteIO_t io;
-
-        CtlP->AltChanRingIndicator = altChanRingIndicator;
-        CtlP->UPCIRingInd = UPCIRingInd;
-        CtlP->CtlNum = CtlNum;
-        CtlP->CtlID = CTLID_0001;       /* controller release 1 */
-        CtlP->BusType = isPCI;  /* controller release 1 */
-
-        if (ConfigIO) {
-                CtlP->isUPCI = 1;
-                CtlP->PCIIO = ConfigIO + _PCI_9030_INT_CTRL;
-                CtlP->PCIIO2 = ConfigIO + _PCI_9030_GPIO_CTRL;
-                CtlP->AiopIntrBits = upci_aiop_intr_bits;
-        } else {
-                CtlP->isUPCI = 0;
-                CtlP->PCIIO =
-                    (WordIO_t) ((ByteIO_t) AiopIOList[0] + _PCI_INT_FUNC);
-                CtlP->AiopIntrBits = aiop_intr_bits;
-        }
-
-        sPCIControllerEOI(CtlP);        /* clear EOI if warm init */
-        /* Init AIOPs */
-        CtlP->NumAiop = 0;
-        for (i = 0; i < AiopIOListSize; i++) {
-                io = AiopIOList[i];
-                CtlP->AiopIO[i] = (WordIO_t) io;
-                CtlP->AiopIntChanIO[i] = io + _INT_CHAN;
-
-                CtlP->AiopID[i] = sReadAiopID(io);      /* read AIOP ID */
-                if (CtlP->AiopID[i] == AIOPID_NULL)     /* if AIOP does not exist */
-                        break;  /* done looking for AIOPs */
-
-                CtlP->AiopNumChan[i] = sReadAiopNumChan((WordIO_t) io); /* num channels in AIOP */
-                sOutW((WordIO_t) io + _INDX_ADDR, _CLK_PRE);    /* clock prescaler */
-                sOutB(io + _INDX_DATA, sClockPrescale);
-                CtlP->NumAiop++;        /* bump count of AIOPs */
-        }
-
-        if (CtlP->NumAiop == 0)
-                return (-1);
-        else
-                return (CtlP->NumAiop);
-}
-
-/***************************************************************************
-Function: sReadAiopID
-Purpose:  Read the AIOP idenfication number directly from an AIOP.
-Call:     sReadAiopID(io)
-          ByteIO_t io: AIOP base I/O address
-Return:   int: Flag AIOPID_XXXX if a valid AIOP is found, where X
-                 is replace by an identifying number.
-          Flag AIOPID_NULL if no valid AIOP is found
-Warnings: No context switches are allowed while executing this function.
-
-*/
-static int sReadAiopID(ByteIO_t io)
-{
-        Byte_t AiopID;          /* ID byte from AIOP */
-
-        sOutB(io + _CMD_REG, RESET_ALL);        /* reset AIOP */
-        sOutB(io + _CMD_REG, 0x0);
-        AiopID = sInW(io + _CHN_STAT0) & 0x07;
-        if (AiopID == 0x06)
-                return (1);
-        else                    /* AIOP does not exist */
-                return (-1);
-}
-
-/***************************************************************************
-Function: sReadAiopNumChan
-Purpose:  Read the number of channels available in an AIOP directly from
-          an AIOP.
-Call:     sReadAiopNumChan(io)
-          WordIO_t io: AIOP base I/O address
-Return:   int: The number of channels available
-Comments: The number of channels is determined by write/reads from identical
-          offsets within the SRAM address spaces for channels 0 and 4.
-          If the channel 4 space is mirrored to channel 0 it is a 4 channel
-          AIOP, otherwise it is an 8 channel.
-Warnings: No context switches are allowed while executing this function.
-*/
-static int sReadAiopNumChan(WordIO_t io)
-{
-        Word_t x;
-        static Byte_t R[4] = { 0x00, 0x00, 0x34, 0x12 };
-
-        /* write to chan 0 SRAM */
-        out32((DWordIO_t) io + _INDX_ADDR, R);
-        sOutW(io + _INDX_ADDR, 0);      /* read from SRAM, chan 0 */
-        x = sInW(io + _INDX_DATA);
-        sOutW(io + _INDX_ADDR, 0x4000); /* read from SRAM, chan 4 */
-        if (x != sInW(io + _INDX_DATA)) /* if different must be 8 chan */
-                return (8);
-        else
-                return (4);
-}
-
-/***************************************************************************
-Function: sInitChan
-Purpose:  Initialization of a channel and channel structure
-Call:     sInitChan(CtlP,ChP,AiopNum,ChanNum)
-          CONTROLLER_T *CtlP; Ptr to controller structure
-          CHANNEL_T *ChP; Ptr to channel structure
-          int AiopNum; AIOP number within controller
-          int ChanNum; Channel number within AIOP
-Return:   int: 1 if initialization succeeded, 0 if it fails because channel
-               number exceeds number of channels available in AIOP.
-Comments: This function must be called before a channel can be used.
-Warnings: No range checking on any of the parameters is done.
-
-          No context switches are allowed while executing this function.
-*/
-static int sInitChan(CONTROLLER_T * CtlP, CHANNEL_T * ChP, int AiopNum,
-                     int ChanNum)
-{
-        int i;
-        WordIO_t AiopIO;
-        WordIO_t ChIOOff;
-        Byte_t *ChR;
-        Word_t ChOff;
-        static Byte_t R[4];
-        int brd9600;
-
-        if (ChanNum >= CtlP->AiopNumChan[AiopNum])
-                return 0;       /* exceeds num chans in AIOP */
-
-        /* Channel, AIOP, and controller identifiers */
-        ChP->CtlP = CtlP;
-        ChP->ChanID = CtlP->AiopID[AiopNum];
-        ChP->AiopNum = AiopNum;
-        ChP->ChanNum = ChanNum;
-
-        /* Global direct addresses */
-        AiopIO = CtlP->AiopIO[AiopNum];
-        ChP->Cmd = (ByteIO_t) AiopIO + _CMD_REG;
-        ChP->IntChan = (ByteIO_t) AiopIO + _INT_CHAN;
-        ChP->IntMask = (ByteIO_t) AiopIO + _INT_MASK;
-        ChP->IndexAddr = (DWordIO_t) AiopIO + _INDX_ADDR;
-        ChP->IndexData = AiopIO + _INDX_DATA;
-
-        /* Channel direct addresses */
-        ChIOOff = AiopIO + ChP->ChanNum * 2;
-        ChP->TxRxData = ChIOOff + _TD0;
-        ChP->ChanStat = ChIOOff + _CHN_STAT0;
-        ChP->TxRxCount = ChIOOff + _FIFO_CNT0;
-        ChP->IntID = (ByteIO_t) AiopIO + ChP->ChanNum + _INT_ID0;
-
-        /* Initialize the channel from the RData array */
-        for (i = 0; i < RDATASIZE; i += 4) {
-                R[0] = RData[i];
-                R[1] = RData[i + 1] + 0x10 * ChanNum;
-                R[2] = RData[i + 2];
-                R[3] = RData[i + 3];
-                out32(ChP->IndexAddr, R);
-        }
-
-        ChR = ChP->R;
-        for (i = 0; i < RREGDATASIZE; i += 4) {
-                ChR[i] = RRegData[i];
-                ChR[i + 1] = RRegData[i + 1] + 0x10 * ChanNum;
-                ChR[i + 2] = RRegData[i + 2];
-                ChR[i + 3] = RRegData[i + 3];
-        }
-
-        /* Indexed registers */
-        ChOff = (Word_t) ChanNum *0x1000;
-
-        if (sClockPrescale == 0x14)
-                brd9600 = 47;
-        else
-                brd9600 = 23;
-
-        ChP->BaudDiv[0] = (Byte_t) (ChOff + _BAUD);
-        ChP->BaudDiv[1] = (Byte_t) ((ChOff + _BAUD) >> 8);
-        ChP->BaudDiv[2] = (Byte_t) brd9600;
-        ChP->BaudDiv[3] = (Byte_t) (brd9600 >> 8);
-        out32(ChP->IndexAddr, ChP->BaudDiv);
-
-        ChP->TxControl[0] = (Byte_t) (ChOff + _TX_CTRL);
-        ChP->TxControl[1] = (Byte_t) ((ChOff + _TX_CTRL) >> 8);
-        ChP->TxControl[2] = 0;
-        ChP->TxControl[3] = 0;
-        out32(ChP->IndexAddr, ChP->TxControl);
-
-        ChP->RxControl[0] = (Byte_t) (ChOff + _RX_CTRL);
-        ChP->RxControl[1] = (Byte_t) ((ChOff + _RX_CTRL) >> 8);
-        ChP->RxControl[2] = 0;
-        ChP->RxControl[3] = 0;
-        out32(ChP->IndexAddr, ChP->RxControl);
-
-        ChP->TxEnables[0] = (Byte_t) (ChOff + _TX_ENBLS);
-        ChP->TxEnables[1] = (Byte_t) ((ChOff + _TX_ENBLS) >> 8);
-        ChP->TxEnables[2] = 0;
-        ChP->TxEnables[3] = 0;
-        out32(ChP->IndexAddr, ChP->TxEnables);
-
-        ChP->TxCompare[0] = (Byte_t) (ChOff + _TXCMP1);
-        ChP->TxCompare[1] = (Byte_t) ((ChOff + _TXCMP1) >> 8);
-        ChP->TxCompare[2] = 0;
-        ChP->TxCompare[3] = 0;
-        out32(ChP->IndexAddr, ChP->TxCompare);
-
-        ChP->TxReplace1[0] = (Byte_t) (ChOff + _TXREP1B1);
-        ChP->TxReplace1[1] = (Byte_t) ((ChOff + _TXREP1B1) >> 8);
-        ChP->TxReplace1[2] = 0;
-        ChP->TxReplace1[3] = 0;
-        out32(ChP->IndexAddr, ChP->TxReplace1);
-
-        ChP->TxReplace2[0] = (Byte_t) (ChOff + _TXREP2);
-        ChP->TxReplace2[1] = (Byte_t) ((ChOff + _TXREP2) >> 8);
-        ChP->TxReplace2[2] = 0;
-        ChP->TxReplace2[3] = 0;
-        out32(ChP->IndexAddr, ChP->TxReplace2);
-
-        ChP->TxFIFOPtrs = ChOff + _TXF_OUTP;
-        ChP->TxFIFO = ChOff + _TX_FIFO;
-
-        sOutB(ChP->Cmd, (Byte_t) ChanNum | RESTXFCNT);  /* apply reset Tx FIFO count */
-        sOutB(ChP->Cmd, (Byte_t) ChanNum);      /* remove reset Tx FIFO count */
-        sOutW((WordIO_t) ChP->IndexAddr, ChP->TxFIFOPtrs);      /* clear Tx in/out ptrs */
-        sOutW(ChP->IndexData, 0);
-        ChP->RxFIFOPtrs = ChOff + _RXF_OUTP;
-        ChP->RxFIFO = ChOff + _RX_FIFO;
-
-        sOutB(ChP->Cmd, (Byte_t) ChanNum | RESRXFCNT);  /* apply reset Rx FIFO count */
-        sOutB(ChP->Cmd, (Byte_t) ChanNum);      /* remove reset Rx FIFO count */
-        sOutW((WordIO_t) ChP->IndexAddr, ChP->RxFIFOPtrs);      /* clear Rx out ptr */
-        sOutW(ChP->IndexData, 0);
-        sOutW((WordIO_t) ChP->IndexAddr, ChP->RxFIFOPtrs + 2);  /* clear Rx in ptr */
-        sOutW(ChP->IndexData, 0);
-        ChP->TxPrioCnt = ChOff + _TXP_CNT;
-        sOutW((WordIO_t) ChP->IndexAddr, ChP->TxPrioCnt);
-        sOutB(ChP->IndexData, 0);
-        ChP->TxPrioPtr = ChOff + _TXP_PNTR;
-        sOutW((WordIO_t) ChP->IndexAddr, ChP->TxPrioPtr);
-        sOutB(ChP->IndexData, 0);
-        ChP->TxPrioBuf = ChOff + _TXP_BUF;
-        sEnRxProcessor(ChP);    /* start the Rx processor */
-
-        return 1;
-}
-
-/***************************************************************************
-Function: sStopRxProcessor
-Purpose:  Stop the receive processor from processing a channel.
-Call:     sStopRxProcessor(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-
-Comments: The receive processor can be started again with sStartRxProcessor().
-          This function causes the receive processor to skip over the
-          stopped channel.  It does not stop it from processing other channels.
-
-Warnings: No context switches are allowed while executing this function.
-
-          Do not leave the receive processor stopped for more than one
-          character time.
-
-          After calling this function a delay of 4 uS is required to ensure
-          that the receive processor is no longer processing this channel.
-*/
-static void sStopRxProcessor(CHANNEL_T * ChP)
-{
-        Byte_t R[4];
-
-        R[0] = ChP->R[0];
-        R[1] = ChP->R[1];
-        R[2] = 0x0a;
-        R[3] = ChP->R[3];
-        out32(ChP->IndexAddr, R);
-}
-
-/***************************************************************************
-Function: sFlushRxFIFO
-Purpose:  Flush the Rx FIFO
-Call:     sFlushRxFIFO(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Return:   void
-Comments: To prevent data from being enqueued or dequeued in the Tx FIFO
-          while it is being flushed the receive processor is stopped
-          and the transmitter is disabled.  After these operations a
-          4 uS delay is done before clearing the pointers to allow
-          the receive processor to stop.  These items are handled inside
-          this function.
-Warnings: No context switches are allowed while executing this function.
-*/
-static void sFlushRxFIFO(CHANNEL_T * ChP)
-{
-        int i;
-        Byte_t Ch;              /* channel number within AIOP */
-        int RxFIFOEnabled;      /* 1 if Rx FIFO enabled */
-
-        if (sGetRxCnt(ChP) == 0)        /* Rx FIFO empty */
-                return;         /* don't need to flush */
-
-        RxFIFOEnabled = 0;
-        if (ChP->R[0x32] == 0x08) {     /* Rx FIFO is enabled */
-                RxFIFOEnabled = 1;
-                sDisRxFIFO(ChP);        /* disable it */
-                for (i = 0; i < 2000 / 200; i++)        /* delay 2 uS to allow proc to disable FIFO */
-                        sInB(ChP->IntChan);     /* depends on bus i/o timing */
-        }
-        sGetChanStatus(ChP);    /* clear any pending Rx errors in chan stat */
-        Ch = (Byte_t) sGetChanNum(ChP);
-        sOutB(ChP->Cmd, Ch | RESRXFCNT);        /* apply reset Rx FIFO count */
-        sOutB(ChP->Cmd, Ch);    /* remove reset Rx FIFO count */
-        sOutW((WordIO_t) ChP->IndexAddr, ChP->RxFIFOPtrs);      /* clear Rx out ptr */
-        sOutW(ChP->IndexData, 0);
-        sOutW((WordIO_t) ChP->IndexAddr, ChP->RxFIFOPtrs + 2);  /* clear Rx in ptr */
-        sOutW(ChP->IndexData, 0);
-        if (RxFIFOEnabled)
-                sEnRxFIFO(ChP); /* enable Rx FIFO */
-}
-
-/***************************************************************************
-Function: sFlushTxFIFO
-Purpose:  Flush the Tx FIFO
-Call:     sFlushTxFIFO(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Return:   void
-Comments: To prevent data from being enqueued or dequeued in the Tx FIFO
-          while it is being flushed the receive processor is stopped
-          and the transmitter is disabled.  After these operations a
-          4 uS delay is done before clearing the pointers to allow
-          the receive processor to stop.  These items are handled inside
-          this function.
-Warnings: No context switches are allowed while executing this function.
-*/
-static void sFlushTxFIFO(CHANNEL_T * ChP)
-{
-        int i;
-        Byte_t Ch;              /* channel number within AIOP */
-        int TxEnabled;          /* 1 if transmitter enabled */
-
-        if (sGetTxCnt(ChP) == 0)        /* Tx FIFO empty */
-                return;         /* don't need to flush */
-
-        TxEnabled = 0;
-        if (ChP->TxControl[3] & TX_ENABLE) {
-                TxEnabled = 1;
-                sDisTransmit(ChP);      /* disable transmitter */
-        }
-        sStopRxProcessor(ChP);  /* stop Rx processor */
-        for (i = 0; i < 4000 / 200; i++)        /* delay 4 uS to allow proc to stop */
-                sInB(ChP->IntChan);     /* depends on bus i/o timing */
-        Ch = (Byte_t) sGetChanNum(ChP);
-        sOutB(ChP->Cmd, Ch | RESTXFCNT);        /* apply reset Tx FIFO count */
-        sOutB(ChP->Cmd, Ch);    /* remove reset Tx FIFO count */
-        sOutW((WordIO_t) ChP->IndexAddr, ChP->TxFIFOPtrs);      /* clear Tx in/out ptrs */
-        sOutW(ChP->IndexData, 0);
-        if (TxEnabled)
-                sEnTransmit(ChP);       /* enable transmitter */
-        sStartRxProcessor(ChP); /* restart Rx processor */
-}
-
-/***************************************************************************
-Function: sWriteTxPrioByte
-Purpose:  Write a byte of priority transmit data to a channel
-Call:     sWriteTxPrioByte(ChP,Data)
-          CHANNEL_T *ChP; Ptr to channel structure
-          Byte_t Data; The transmit data byte
-
-Return:   int: 1 if the bytes is successfully written, otherwise 0.
-
-Comments: The priority byte is transmitted before any data in the Tx FIFO.
-
-Warnings: No context switches are allowed while executing this function.
-*/
-static int sWriteTxPrioByte(CHANNEL_T * ChP, Byte_t Data)
-{
-        Byte_t DWBuf[4];        /* buffer for double word writes */
-        Word_t *WordPtr;        /* must be far because Win SS != DS */
-        register DWordIO_t IndexAddr;
-
-        if (sGetTxCnt(ChP) > 1) {       /* write it to Tx priority buffer */
-                IndexAddr = ChP->IndexAddr;
-                sOutW((WordIO_t) IndexAddr, ChP->TxPrioCnt);    /* get priority buffer status */
-                if (sInB((ByteIO_t) ChP->IndexData) & PRI_PEND) /* priority buffer busy */
-                        return (0);     /* nothing sent */
-
-                WordPtr = (Word_t *) (&DWBuf[0]);
-                *WordPtr = ChP->TxPrioBuf;      /* data byte address */
-
-                DWBuf[2] = Data;        /* data byte value */
-                out32(IndexAddr, DWBuf);        /* write it out */
-
-                *WordPtr = ChP->TxPrioCnt;      /* Tx priority count address */
-
-                DWBuf[2] = PRI_PEND + 1;        /* indicate 1 byte pending */
-                DWBuf[3] = 0;   /* priority buffer pointer */
-                out32(IndexAddr, DWBuf);        /* write it out */
-        } else {                /* write it to Tx FIFO */
-
-                sWriteTxByte(sGetTxRxDataIO(ChP), Data);
-        }
-        return (1);             /* 1 byte sent */
-}
-
-/***************************************************************************
-Function: sEnInterrupts
-Purpose:  Enable one or more interrupts for a channel
-Call:     sEnInterrupts(ChP,Flags)
-          CHANNEL_T *ChP; Ptr to channel structure
-          Word_t Flags: Interrupt enable flags, can be any combination
-             of the following flags:
-                TXINT_EN:   Interrupt on Tx FIFO empty
-                RXINT_EN:   Interrupt on Rx FIFO at trigger level (see
-                            sSetRxTrigger())
-                SRCINT_EN:  Interrupt on SRC (Special Rx Condition)
-                MCINT_EN:   Interrupt on modem input change
-                CHANINT_EN: Allow channel interrupt signal to the AIOP's
-                            Interrupt Channel Register.
-Return:   void
-Comments: If an interrupt enable flag is set in Flags, that interrupt will be
-          enabled.  If an interrupt enable flag is not set in Flags, that
-          interrupt will not be changed.  Interrupts can be disabled with
-          function sDisInterrupts().
-
-          This function sets the appropriate bit for the channel in the AIOP's
-          Interrupt Mask Register if the CHANINT_EN flag is set.  This allows
-          this channel's bit to be set in the AIOP's Interrupt Channel Register.
-
-          Interrupts must also be globally enabled before channel interrupts
-          will be passed on to the host.  This is done with function
-          sEnGlobalInt().
-
-          In some cases it may be desirable to disable interrupts globally but
-          enable channel interrupts.  This would allow the global interrupt
-          status register to be used to determine which AIOPs need service.
-*/
-static void sEnInterrupts(CHANNEL_T * ChP, Word_t Flags)
-{
-        Byte_t Mask;            /* Interrupt Mask Register */
-
-        ChP->RxControl[2] |=
-            ((Byte_t) Flags & (RXINT_EN | SRCINT_EN | MCINT_EN));
-
-        out32(ChP->IndexAddr, ChP->RxControl);
-
-        ChP->TxControl[2] |= ((Byte_t) Flags & TXINT_EN);
-
-        out32(ChP->IndexAddr, ChP->TxControl);
-
-        if (Flags & CHANINT_EN) {
-                Mask = sInB(ChP->IntMask) | sBitMapSetTbl[ChP->ChanNum];
-                sOutB(ChP->IntMask, Mask);
-        }
-}
-
-/***************************************************************************
-Function: sDisInterrupts
-Purpose:  Disable one or more interrupts for a channel
-Call:     sDisInterrupts(ChP,Flags)
-          CHANNEL_T *ChP; Ptr to channel structure
-          Word_t Flags: Interrupt flags, can be any combination
-             of the following flags:
-                TXINT_EN:   Interrupt on Tx FIFO empty
-                RXINT_EN:   Interrupt on Rx FIFO at trigger level (see
-                            sSetRxTrigger())
-                SRCINT_EN:  Interrupt on SRC (Special Rx Condition)
-                MCINT_EN:   Interrupt on modem input change
-                CHANINT_EN: Disable channel interrupt signal to the
-                            AIOP's Interrupt Channel Register.
-Return:   void
-Comments: If an interrupt flag is set in Flags, that interrupt will be
-          disabled.  If an interrupt flag is not set in Flags, that
-          interrupt will not be changed.  Interrupts can be enabled with
-          function sEnInterrupts().
-
-          This function clears the appropriate bit for the channel in the AIOP's
-          Interrupt Mask Register if the CHANINT_EN flag is set.  This blocks
-          this channel's bit from being set in the AIOP's Interrupt Channel
-          Register.
-*/
-static void sDisInterrupts(CHANNEL_T * ChP, Word_t Flags)
-{
-        Byte_t Mask;            /* Interrupt Mask Register */
-
-        ChP->RxControl[2] &=
-            ~((Byte_t) Flags & (RXINT_EN | SRCINT_EN | MCINT_EN));
-        out32(ChP->IndexAddr, ChP->RxControl);
-        ChP->TxControl[2] &= ~((Byte_t) Flags & TXINT_EN);
-        out32(ChP->IndexAddr, ChP->TxControl);
-
-        if (Flags & CHANINT_EN) {
-                Mask = sInB(ChP->IntMask) & sBitMapClrTbl[ChP->ChanNum];
-                sOutB(ChP->IntMask, Mask);
-        }
-}
-
-static void sSetInterfaceMode(CHANNEL_T * ChP, Byte_t mode)
-{
-        sOutB(ChP->CtlP->AiopIO[2], (mode & 0x18) | ChP->ChanNum);
-}
-
-/*
- *  Not an official SSCI function, but how to reset RocketModems.
- *  ISA bus version
- */
-static void sModemReset(CONTROLLER_T * CtlP, int chan, int on)
-{
-        ByteIO_t addr;
-        Byte_t val;
-
-        addr = CtlP->AiopIO[0] + 0x400;
-        val = sInB(CtlP->MReg3IO);
-        /* if AIOP[1] is not enabled, enable it */
-        if ((val & 2) == 0) {
-                val = sInB(CtlP->MReg2IO);
-                sOutB(CtlP->MReg2IO, (val & 0xfc) | (1 & 0x03));
-                sOutB(CtlP->MBaseIO, (unsigned char) (addr >> 6));
-        }
-
-        sEnAiop(CtlP, 1);
-        if (!on)
-                addr += 8;
-        sOutB(addr + chan, 0);  /* apply or remove reset */
-        sDisAiop(CtlP, 1);
-}
-
-/*
- *  Not an official SSCI function, but how to reset RocketModems.
- *  PCI bus version
- */
-static void sPCIModemReset(CONTROLLER_T * CtlP, int chan, int on)
-{
-        ByteIO_t addr;
-
-        addr = CtlP->AiopIO[0] + 0x40;  /* 2nd AIOP */
-        if (!on)
-                addr += 8;
-        sOutB(addr + chan, 0);  /* apply or remove reset */
-}
-
-/*  Resets the speaker controller on RocketModem II and III devices */
-static void rmSpeakerReset(CONTROLLER_T * CtlP, unsigned long model)
-{
-        ByteIO_t addr;
-
-        /* RocketModem II speaker control is at the 8th port location of offset 0x40 */
-        if ((model == MODEL_RP4M) || (model == MODEL_RP6M)) {
-                addr = CtlP->AiopIO[0] + 0x4F;
-                sOutB(addr, 0);
-        }
-
-        /* RocketModem III speaker control is at the 1st port location of offset 0x80 */
-        if ((model == MODEL_UPCI_RM3_8PORT)
-            || (model == MODEL_UPCI_RM3_4PORT)) {
-                addr = CtlP->AiopIO[0] + 0x88;
-                sOutB(addr, 0);
-        }
-}
-
-/*  Returns the line number given the controller (board), aiop and channel number */
-static unsigned char GetLineNumber(int ctrl, int aiop, int ch)
-{
-        return lineNumbers[(ctrl << 5) | (aiop << 3) | ch];
-}
-
-/*
- *  Stores the line number associated with a given controller (board), aiop
- *  and channel number.  
- *  Returns:  The line number assigned 
- */
-static unsigned char SetLineNumber(int ctrl, int aiop, int ch)
-{
-        lineNumbers[(ctrl << 5) | (aiop << 3) | ch] = nextLineNumber++;
-        return (nextLineNumber - 1);
-}
diff --git a/drivers/char/rocket.h b/drivers/char/rocket.h
deleted file mode 100644
index ec863f35f1a9..000000000000
--- a/drivers/char/rocket.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * rocket.h --- the exported interface of the rocket driver to its configuration program.
- *
- * Written by Theodore Ts'o, Copyright 1997.
- * Copyright 1997 Comtrol Corporation. 
- *
- */
-
-/*  Model Information Struct */
-typedef struct {
-        unsigned long model;
-        char modelString[80];
-        unsigned long numPorts;
-        int loadrm2;
-        int startingPortNumber;
-} rocketModel_t;
-
-struct rocket_config {
-        int line;
-        int flags;
-        int closing_wait;
-        int close_delay;
-        int port;
-        int reserved[32];
-};
-
-struct rocket_ports {
-        int tty_major;
-        int callout_major;
-        rocketModel_t rocketModel[8];
-};
-
-struct rocket_version {
-        char rocket_version[32];
-        char rocket_date[32];
-        char reserved[64];
-};
-
-/*
- * Rocketport flags
- */
-/*#define ROCKET_CALLOUT_NOHUP    0x00000001 */
-#define ROCKET_FORCE_CD         0x00000002
-#define ROCKET_HUP_NOTIFY       0x00000004
-#define ROCKET_SPLIT_TERMIOS    0x00000008
-#define ROCKET_SPD_MASK         0x00000070
-#define ROCKET_SPD_HI           0x00000010      /* Use 56000 instead of 38400 bps */
-#define ROCKET_SPD_VHI          0x00000020      /* Use 115200 instead of 38400 bps */
-#define ROCKET_SPD_SHI          0x00000030      /* Use 230400 instead of 38400 bps */
-#define ROCKET_SPD_WARP         0x00000040      /* Use 460800 instead of 38400 bps */
-#define ROCKET_SAK              0x00000080
-#define ROCKET_SESSION_LOCKOUT  0x00000100
-#define ROCKET_PGRP_LOCKOUT     0x00000200
-#define ROCKET_RTS_TOGGLE       0x00000400
-#define ROCKET_MODE_MASK        0x00003000
-#define ROCKET_MODE_RS232       0x00000000
-#define ROCKET_MODE_RS485       0x00001000
-#define ROCKET_MODE_RS422       0x00002000
-#define ROCKET_FLAGS            0x00003FFF
-
-#define ROCKET_USR_MASK 0x0071  /* Legal flags that non-privileged
-                                 * users can set or reset */
-
-/*
- * For closing_wait and closing_wait2
- */
-#define ROCKET_CLOSING_WAIT_NONE        ASYNC_CLOSING_WAIT_NONE
-#define ROCKET_CLOSING_WAIT_INF         ASYNC_CLOSING_WAIT_INF
-
-/*
- * Rocketport ioctls -- "RP"
- */
-#define RCKP_GET_STRUCT         0x00525001
-#define RCKP_GET_CONFIG         0x00525002
-#define RCKP_SET_CONFIG         0x00525003
-#define RCKP_GET_PORTS          0x00525004
-#define RCKP_RESET_RM2          0x00525005
-#define RCKP_GET_VERSION        0x00525006
-
-/*  Rocketport Models */
-#define MODEL_RP32INTF        0x0001    /* RP 32 port w/external I/F   */
-#define MODEL_RP8INTF         0x0002    /* RP 8 port w/external I/F    */
-#define MODEL_RP16INTF        0x0003    /* RP 16 port w/external I/F   */
-#define MODEL_RP8OCTA         0x0005    /* RP 8 port w/octa cable      */
-#define MODEL_RP4QUAD         0x0004    /* RP 4 port w/quad cable      */
-#define MODEL_RP8J            0x0006    /* RP 8 port w/RJ11 connectors */
-#define MODEL_RP4J            0x0007    /* RP 4 port w/RJ45 connectors */
-#define MODEL_RP8SNI          0x0008    /* RP 8 port w/ DB78 SNI connector */
-#define MODEL_RP16SNI         0x0009    /* RP 16 port w/ DB78 SNI connector */
-#define MODEL_RPP4            0x000A    /* RP Plus 4 port              */
-#define MODEL_RPP8            0x000B    /* RP Plus 8 port              */
-#define MODEL_RP2_232         0x000E    /* RP Plus 2 port RS232        */
-#define MODEL_RP2_422         0x000F    /* RP Plus 2 port RS232        */
-
-/*  Rocketmodem II Models */
-#define MODEL_RP6M            0x000C    /* RM 6 port                   */
-#define MODEL_RP4M            0x000D    /* RM 4 port                   */
-
-/* Universal PCI boards */
-#define MODEL_UPCI_RP32INTF   0x0801    /* RP UPCI 32 port w/external I/F     */
-#define MODEL_UPCI_RP8INTF    0x0802    /* RP UPCI 8 port w/external I/F      */
-#define MODEL_UPCI_RP16INTF   0x0803    /* RP UPCI 16 port w/external I/F     */
-#define MODEL_UPCI_RP8OCTA    0x0805    /* RP UPCI 8 port w/octa cable        */ 
-#define MODEL_UPCI_RM3_8PORT  0x080C    /* RP UPCI Rocketmodem III 8 port     */
-#define MODEL_UPCI_RM3_4PORT  0x080C    /* RP UPCI Rocketmodem III 4 port     */
-
-/*  Compact PCI 16 port  */
-#define MODEL_CPCI_RP16INTF   0x0903    /* RP Compact PCI 16 port w/external I/F */
-
-/* All ISA boards */
-#define MODEL_ISA             0x1000
diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
deleted file mode 100644
index 67e0f1e778a2..000000000000
--- a/drivers/char/rocket_int.h
+++ /dev/null
@@ -1,1214 +0,0 @@
-/*
- * rocket_int.h --- internal header file for rocket.c
- *
- * Written by Theodore Ts'o, Copyright 1997.
- * Copyright 1997 Comtrol Corporation.  
- * 
- */
-
-/*
- * Definition of the types in rcktpt_type
- */
-#define ROCKET_TYPE_NORMAL      0
-#define ROCKET_TYPE_MODEM       1
-#define ROCKET_TYPE_MODEMII     2
-#define ROCKET_TYPE_MODEMIII    3
-#define ROCKET_TYPE_PC104       4
-
-#include <linux/mutex.h>
-
-#include <asm/io.h>
-#include <asm/byteorder.h>
-
-typedef unsigned char Byte_t;
-typedef unsigned int ByteIO_t;
-
-typedef unsigned int Word_t;
-typedef unsigned int WordIO_t;
-
-typedef unsigned int DWordIO_t;
-
-/*
- * Note!  Normally the Linux I/O macros already take care of
- * byte-swapping the I/O instructions.  However, all accesses using
- * sOutDW aren't really 32-bit accesses, but should be handled in byte
- * order.  Hence the use of the cpu_to_le32() macro to byte-swap
- * things to no-op the byte swapping done by the big-endian outl()
- * instruction.
- */
-
-static inline void sOutB(unsigned short port, unsigned char value)
-{
-#ifdef ROCKET_DEBUG_IO
-        printk(KERN_DEBUG "sOutB(%x, %x)...\n", port, value);
-#endif
-        outb_p(value, port);
-}
-
-static inline void sOutW(unsigned short port, unsigned short value)
-{
-#ifdef ROCKET_DEBUG_IO
-        printk(KERN_DEBUG "sOutW(%x, %x)...\n", port, value);
-#endif
-        outw_p(value, port);
-}
-
-static inline void out32(unsigned short port, Byte_t *p)
-{
-        u32 value = get_unaligned_le32(p);
-#ifdef ROCKET_DEBUG_IO
-        printk(KERN_DEBUG "out32(%x, %lx)...\n", port, value);
-#endif
-        outl_p(value, port);
-}
-
-static inline unsigned char sInB(unsigned short port)
-{
-        return inb_p(port);
-}
-
-static inline unsigned short sInW(unsigned short port)
-{
-        return inw_p(port);
-}
-
-/* This is used to move arrays of bytes so byte swapping isn't appropriate. */
-#define sOutStrW(port, addr, count) if (count) outsw(port, addr, count)
-#define sInStrW(port, addr, count) if (count) insw(port, addr, count)
-
-#define CTL_SIZE 8
-#define AIOP_CTL_SIZE 4
-#define CHAN_AIOP_SIZE 8
-#define MAX_PORTS_PER_AIOP 8
-#define MAX_AIOPS_PER_BOARD 4
-#define MAX_PORTS_PER_BOARD 32
-
-/* Bus type ID */
-#define isISA   0
-#define isPCI   1
-#define isMC    2
-
-/* Controller ID numbers */
-#define CTLID_NULL  -1          /* no controller exists */
-#define CTLID_0001  0x0001      /* controller release 1 */
-
-/* AIOP ID numbers, identifies AIOP type implementing channel */
-#define AIOPID_NULL -1          /* no AIOP or channel exists */
-#define AIOPID_0001 0x0001      /* AIOP release 1 */
-
-/************************************************************************
- Global Register Offsets - Direct Access - Fixed values
-************************************************************************/
-
-#define _CMD_REG   0x38         /* Command Register            8    Write */
-#define _INT_CHAN  0x39         /* Interrupt Channel Register  8    Read */
-#define _INT_MASK  0x3A         /* Interrupt Mask Register     8    Read / Write */
-#define _UNUSED    0x3B         /* Unused                      8 */
-#define _INDX_ADDR 0x3C         /* Index Register Address      16   Write */
-#define _INDX_DATA 0x3E         /* Index Register Data         8/16 Read / Write */
-
-/************************************************************************
- Channel Register Offsets for 1st channel in AIOP - Direct Access
-************************************************************************/
-#define _TD0       0x00         /* Transmit Data               16   Write */
-#define _RD0       0x00         /* Receive Data                16   Read */
-#define _CHN_STAT0 0x20         /* Channel Status              8/16 Read / Write */
-#define _FIFO_CNT0 0x10         /* Transmit/Receive FIFO Count 16   Read */
-#define _INT_ID0   0x30         /* Interrupt Identification    8    Read */
-
-/************************************************************************
- Tx Control Register Offsets - Indexed - External - Fixed
-************************************************************************/
-#define _TX_ENBLS  0x980        /* Tx Processor Enables Register 8 Read / Write */
-#define _TXCMP1    0x988        /* Transmit Compare Value #1     8 Read / Write */
-#define _TXCMP2    0x989        /* Transmit Compare Value #2     8 Read / Write */
-#define _TXREP1B1  0x98A        /* Tx Replace Value #1 - Byte 1  8 Read / Write */
-#define _TXREP1B2  0x98B        /* Tx Replace Value #1 - Byte 2  8 Read / Write */
-#define _TXREP2    0x98C        /* Transmit Replace Value #2     8 Read / Write */
-
-/************************************************************************
-Memory Controller Register Offsets - Indexed - External - Fixed
-************************************************************************/
-#define _RX_FIFO    0x000       /* Rx FIFO */
-#define _TX_FIFO    0x800       /* Tx FIFO */
-#define _RXF_OUTP   0x990       /* Rx FIFO OUT pointer        16 Read / Write */
-#define _RXF_INP    0x992       /* Rx FIFO IN pointer         16 Read / Write */
-#define _TXF_OUTP   0x994       /* Tx FIFO OUT pointer        8  Read / Write */
-#define _TXF_INP    0x995       /* Tx FIFO IN pointer         8  Read / Write */
-#define _TXP_CNT    0x996       /* Tx Priority Count          8  Read / Write */
-#define _TXP_PNTR   0x997       /* Tx Priority Pointer        8  Read / Write */
-
-#define PRI_PEND    0x80        /* Priority data pending (bit7, Tx pri cnt) */
-#define TXFIFO_SIZE 255         /* size of Tx FIFO */
-#define RXFIFO_SIZE 1023        /* size of Rx FIFO */
-
-/************************************************************************
-Tx Priority Buffer - Indexed - External - Fixed
-************************************************************************/
-#define _TXP_BUF    0x9C0       /* Tx Priority Buffer  32  Bytes   Read / Write */
-#define TXP_SIZE    0x20        /* 32 bytes */
-
-/************************************************************************
-Channel Register Offsets - Indexed - Internal - Fixed
-************************************************************************/
-
-#define _TX_CTRL    0xFF0       /* Transmit Control               16  Write */
-#define _RX_CTRL    0xFF2       /* Receive Control                 8  Write */
-#define _BAUD       0xFF4       /* Baud Rate                      16  Write */
-#define _CLK_PRE    0xFF6       /* Clock Prescaler                 8  Write */
-
-#define STMBREAK   0x08         /* BREAK */
-#define STMFRAME   0x04         /* framing error */
-#define STMRCVROVR 0x02         /* receiver over run error */
-#define STMPARITY  0x01         /* parity error */
-#define STMERROR   (STMBREAK | STMFRAME | STMPARITY)
-#define STMBREAKH   0x800       /* BREAK */
-#define STMFRAMEH   0x400       /* framing error */
-#define STMRCVROVRH 0x200       /* receiver over run error */
-#define STMPARITYH  0x100       /* parity error */
-#define STMERRORH   (STMBREAKH | STMFRAMEH | STMPARITYH)
-
-#define CTS_ACT   0x20          /* CTS input asserted */
-#define DSR_ACT   0x10          /* DSR input asserted */
-#define CD_ACT    0x08          /* CD input asserted */
-#define TXFIFOMT  0x04          /* Tx FIFO is empty */
-#define TXSHRMT   0x02          /* Tx shift register is empty */
-#define RDA       0x01          /* Rx data available */
-#define DRAINED (TXFIFOMT | TXSHRMT)    /* indicates Tx is drained */
-
-#define STATMODE  0x8000        /* status mode enable bit */
-#define RXFOVERFL 0x2000        /* receive FIFO overflow */
-#define RX2MATCH  0x1000        /* receive compare byte 2 match */
-#define RX1MATCH  0x0800        /* receive compare byte 1 match */
-#define RXBREAK   0x0400        /* received BREAK */
-#define RXFRAME   0x0200        /* received framing error */
-#define RXPARITY  0x0100        /* received parity error */
-#define STATERROR (RXBREAK | RXFRAME | RXPARITY)
-
-#define CTSFC_EN  0x80          /* CTS flow control enable bit */
-#define RTSTOG_EN 0x40          /* RTS toggle enable bit */
-#define TXINT_EN  0x10          /* transmit interrupt enable */
-#define STOP2     0x08          /* enable 2 stop bits (0 = 1 stop) */
-#define PARITY_EN 0x04          /* enable parity (0 = no parity) */
-#define EVEN_PAR  0x02          /* even parity (0 = odd parity) */
-#define DATA8BIT  0x01          /* 8 bit data (0 = 7 bit data) */
-
-#define SETBREAK  0x10          /* send break condition (must clear) */
-#define LOCALLOOP 0x08          /* local loopback set for test */
-#define SET_DTR   0x04          /* assert DTR */
-#define SET_RTS   0x02          /* assert RTS */
-#define TX_ENABLE 0x01          /* enable transmitter */
-
-#define RTSFC_EN  0x40          /* RTS flow control enable */
-#define RXPROC_EN 0x20          /* receive processor enable */
-#define TRIG_NO   0x00          /* Rx FIFO trigger level 0 (no trigger) */
-#define TRIG_1    0x08          /* trigger level 1 char */
-#define TRIG_1_2  0x10          /* trigger level 1/2 */
-#define TRIG_7_8  0x18          /* trigger level 7/8 */
-#define TRIG_MASK 0x18          /* trigger level mask */
-#define SRCINT_EN 0x04          /* special Rx condition interrupt enable */
-#define RXINT_EN  0x02          /* Rx interrupt enable */
-#define MCINT_EN  0x01          /* modem change interrupt enable */
-
-#define RXF_TRIG  0x20          /* Rx FIFO trigger level interrupt */
-#define TXFIFO_MT 0x10          /* Tx FIFO empty interrupt */
-#define SRC_INT   0x08          /* special receive condition interrupt */
-#define DELTA_CD  0x04          /* CD change interrupt */
-#define DELTA_CTS 0x02          /* CTS change interrupt */
-#define DELTA_DSR 0x01          /* DSR change interrupt */
-
-#define REP1W2_EN 0x10          /* replace byte 1 with 2 bytes enable */
-#define IGN2_EN   0x08          /* ignore byte 2 enable */
-#define IGN1_EN   0x04          /* ignore byte 1 enable */
-#define COMP2_EN  0x02          /* compare byte 2 enable */
-#define COMP1_EN  0x01          /* compare byte 1 enable */
-
-#define RESET_ALL 0x80          /* reset AIOP (all channels) */
-#define TXOVERIDE 0x40          /* Transmit software off override */
-#define RESETUART 0x20          /* reset channel's UART */
-#define RESTXFCNT 0x10          /* reset channel's Tx FIFO count register */
-#define RESRXFCNT 0x08          /* reset channel's Rx FIFO count register */
-
-#define INTSTAT0  0x01          /* AIOP 0 interrupt status */
-#define INTSTAT1  0x02          /* AIOP 1 interrupt status */
-#define INTSTAT2  0x04          /* AIOP 2 interrupt status */
-#define INTSTAT3  0x08          /* AIOP 3 interrupt status */
-
-#define INTR_EN   0x08          /* allow interrupts to host */
-#define INT_STROB 0x04          /* strobe and clear interrupt line (EOI) */
-
-/**************************************************************************
- MUDBAC remapped for PCI
-**************************************************************************/
-
-#define _CFG_INT_PCI  0x40
-#define _PCI_INT_FUNC 0x3A
-
-#define PCI_STROB 0x2000        /* bit 13 of int aiop register */
-#define INTR_EN_PCI   0x0010    /* allow interrupts to host */
-
-/*
- * Definitions for Universal PCI board registers
- */
-#define _PCI_9030_INT_CTRL      0x4c          /* Offsets from BAR1 */
-#define _PCI_9030_GPIO_CTRL     0x54
-#define PCI_INT_CTRL_AIOP       0x0001
-#define PCI_GPIO_CTRL_8PORT     0x4000
-#define _PCI_9030_RING_IND      0xc0          /* Offsets from BAR1 */
-
-#define CHAN3_EN  0x08          /* enable AIOP 3 */
-#define CHAN2_EN  0x04          /* enable AIOP 2 */
-#define CHAN1_EN  0x02          /* enable AIOP 1 */
-#define CHAN0_EN  0x01          /* enable AIOP 0 */
-#define FREQ_DIS  0x00
-#define FREQ_274HZ 0x60
-#define FREQ_137HZ 0x50
-#define FREQ_69HZ  0x40
-#define FREQ_34HZ  0x30
-#define FREQ_17HZ  0x20
-#define FREQ_9HZ   0x10
-#define PERIODIC_ONLY 0x80      /* only PERIODIC interrupt */
-
-#define CHANINT_EN 0x0100       /* flags to enable/disable channel ints */
-
-#define RDATASIZE 72
-#define RREGDATASIZE 52
-
-/*
- * AIOP interrupt bits for ISA/PCI boards and UPCI boards.
- */
-#define AIOP_INTR_BIT_0         0x0001
-#define AIOP_INTR_BIT_1         0x0002
-#define AIOP_INTR_BIT_2         0x0004
-#define AIOP_INTR_BIT_3         0x0008
-
-#define AIOP_INTR_BITS ( \
-        AIOP_INTR_BIT_0 \
-        | AIOP_INTR_BIT_1 \
-        | AIOP_INTR_BIT_2 \
-        | AIOP_INTR_BIT_3)
-
-#define UPCI_AIOP_INTR_BIT_0    0x0004
-#define UPCI_AIOP_INTR_BIT_1    0x0020
-#define UPCI_AIOP_INTR_BIT_2    0x0100
-#define UPCI_AIOP_INTR_BIT_3    0x0800
-
-#define UPCI_AIOP_INTR_BITS ( \
-        UPCI_AIOP_INTR_BIT_0 \
-        | UPCI_AIOP_INTR_BIT_1 \
-        | UPCI_AIOP_INTR_BIT_2 \
-        | UPCI_AIOP_INTR_BIT_3)
-
-/* Controller level information structure */
-typedef struct {
-        int CtlID;
-        int CtlNum;
-        int BusType;
-        int boardType;
-        int isUPCI;
-        WordIO_t PCIIO;
-        WordIO_t PCIIO2;
-        ByteIO_t MBaseIO;
-        ByteIO_t MReg1IO;
-        ByteIO_t MReg2IO;
-        ByteIO_t MReg3IO;
-        Byte_t MReg2;
-        Byte_t MReg3;
-        int NumAiop;
-        int AltChanRingIndicator;
-        ByteIO_t UPCIRingInd;
-        WordIO_t AiopIO[AIOP_CTL_SIZE];
-        ByteIO_t AiopIntChanIO[AIOP_CTL_SIZE];
-        int AiopID[AIOP_CTL_SIZE];
-        int AiopNumChan[AIOP_CTL_SIZE];
-        Word_t *AiopIntrBits;
-} CONTROLLER_T;
-
-typedef CONTROLLER_T CONTROLLER_t;
-
-/* Channel level information structure */
-typedef struct {
-        CONTROLLER_T *CtlP;
-        int AiopNum;
-        int ChanID;
-        int ChanNum;
-        int rtsToggle;
-
-        ByteIO_t Cmd;
-        ByteIO_t IntChan;
-        ByteIO_t IntMask;
-        DWordIO_t IndexAddr;
-        WordIO_t IndexData;
-
-        WordIO_t TxRxData;
-        WordIO_t ChanStat;
-        WordIO_t TxRxCount;
-        ByteIO_t IntID;
-
-        Word_t TxFIFO;
-        Word_t TxFIFOPtrs;
-        Word_t RxFIFO;
-        Word_t RxFIFOPtrs;
-        Word_t TxPrioCnt;
-        Word_t TxPrioPtr;
-        Word_t TxPrioBuf;
-
-        Byte_t R[RREGDATASIZE];
-
-        Byte_t BaudDiv[4];
-        Byte_t TxControl[4];
-        Byte_t RxControl[4];
-        Byte_t TxEnables[4];
-        Byte_t TxCompare[4];
-        Byte_t TxReplace1[4];
-        Byte_t TxReplace2[4];
-} CHANNEL_T;
-
-typedef CHANNEL_T CHANNEL_t;
-typedef CHANNEL_T *CHANPTR_T;
-
-#define InterfaceModeRS232  0x00
-#define InterfaceModeRS422  0x08
-#define InterfaceModeRS485  0x10
-#define InterfaceModeRS232T 0x18
-
-/***************************************************************************
-Function: sClrBreak
-Purpose:  Stop sending a transmit BREAK signal
-Call:     sClrBreak(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sClrBreak(ChP) \
-do { \
-   (ChP)->TxControl[3] &= ~SETBREAK; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sClrDTR
-Purpose:  Clr the DTR output
-Call:     sClrDTR(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sClrDTR(ChP) \
-do { \
-   (ChP)->TxControl[3] &= ~SET_DTR; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sClrRTS
-Purpose:  Clr the RTS output
-Call:     sClrRTS(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sClrRTS(ChP) \
-do { \
-   if ((ChP)->rtsToggle) break; \
-   (ChP)->TxControl[3] &= ~SET_RTS; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sClrTxXOFF
-Purpose:  Clear any existing transmit software flow control off condition
-Call:     sClrTxXOFF(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sClrTxXOFF(ChP) \
-do { \
-   sOutB((ChP)->Cmd,TXOVERIDE | (Byte_t)(ChP)->ChanNum); \
-   sOutB((ChP)->Cmd,(Byte_t)(ChP)->ChanNum); \
-} while (0)
-
-/***************************************************************************
-Function: sCtlNumToCtlPtr
-Purpose:  Convert a controller number to controller structure pointer
-Call:     sCtlNumToCtlPtr(CtlNum)
-          int CtlNum; Controller number
-Return:   CONTROLLER_T *: Ptr to controller structure
-*/
-#define sCtlNumToCtlPtr(CTLNUM) &sController[CTLNUM]
-
-/***************************************************************************
-Function: sControllerEOI
-Purpose:  Strobe the MUDBAC's End Of Interrupt bit.
-Call:     sControllerEOI(CtlP)
-          CONTROLLER_T *CtlP; Ptr to controller structure
-*/
-#define sControllerEOI(CTLP) sOutB((CTLP)->MReg2IO,(CTLP)->MReg2 | INT_STROB)
-
-/***************************************************************************
-Function: sPCIControllerEOI
-Purpose:  Strobe the PCI End Of Interrupt bit.
-          For the UPCI boards, toggle the AIOP interrupt enable bit
-          (this was taken from the Windows driver).
-Call:     sPCIControllerEOI(CtlP)
-          CONTROLLER_T *CtlP; Ptr to controller structure
-*/
-#define sPCIControllerEOI(CTLP) \
-do { \
-    if ((CTLP)->isUPCI) { \
-        Word_t w = sInW((CTLP)->PCIIO); \
-        sOutW((CTLP)->PCIIO, (w ^ PCI_INT_CTRL_AIOP)); \
-        sOutW((CTLP)->PCIIO, w); \
-    } \
-    else { \
-        sOutW((CTLP)->PCIIO, PCI_STROB); \
-    } \
-} while (0)
-
-/***************************************************************************
-Function: sDisAiop
-Purpose:  Disable I/O access to an AIOP
-Call:     sDisAiop(CltP)
-          CONTROLLER_T *CtlP; Ptr to controller structure
-          int AiopNum; Number of AIOP on controller
-*/
-#define sDisAiop(CTLP,AIOPNUM) \
-do { \
-   (CTLP)->MReg3 &= sBitMapClrTbl[AIOPNUM]; \
-   sOutB((CTLP)->MReg3IO,(CTLP)->MReg3); \
-} while (0)
-
-/***************************************************************************
-Function: sDisCTSFlowCtl
-Purpose:  Disable output flow control using CTS
-Call:     sDisCTSFlowCtl(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sDisCTSFlowCtl(ChP) \
-do { \
-   (ChP)->TxControl[2] &= ~CTSFC_EN; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sDisIXANY
-Purpose:  Disable IXANY Software Flow Control
-Call:     sDisIXANY(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sDisIXANY(ChP) \
-do { \
-   (ChP)->R[0x0e] = 0x86; \
-   out32((ChP)->IndexAddr,&(ChP)->R[0x0c]); \
-} while (0)
-
-/***************************************************************************
-Function: DisParity
-Purpose:  Disable parity
-Call:     sDisParity(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Comments: Function sSetParity() can be used in place of functions sEnParity(),
-          sDisParity(), sSetOddParity(), and sSetEvenParity().
-*/
-#define sDisParity(ChP) \
-do { \
-   (ChP)->TxControl[2] &= ~PARITY_EN; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sDisRTSToggle
-Purpose:  Disable RTS toggle
-Call:     sDisRTSToggle(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sDisRTSToggle(ChP) \
-do { \
-   (ChP)->TxControl[2] &= ~RTSTOG_EN; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-   (ChP)->rtsToggle = 0; \
-} while (0)
-
-/***************************************************************************
-Function: sDisRxFIFO
-Purpose:  Disable Rx FIFO
-Call:     sDisRxFIFO(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sDisRxFIFO(ChP) \
-do { \
-   (ChP)->R[0x32] = 0x0a; \
-   out32((ChP)->IndexAddr,&(ChP)->R[0x30]); \
-} while (0)
-
-/***************************************************************************
-Function: sDisRxStatusMode
-Purpose:  Disable the Rx status mode
-Call:     sDisRxStatusMode(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Comments: This takes the channel out of the receive status mode.  All
-          subsequent reads of receive data using sReadRxWord() will return
-          two data bytes.
-*/
-#define sDisRxStatusMode(ChP) sOutW((ChP)->ChanStat,0)
-
-/***************************************************************************
-Function: sDisTransmit
-Purpose:  Disable transmit
-Call:     sDisTransmit(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-          This disables movement of Tx data from the Tx FIFO into the 1 byte
-          Tx buffer.  Therefore there could be up to a 2 byte latency
-          between the time sDisTransmit() is called and the transmit buffer
-          and transmit shift register going completely empty.
-*/
-#define sDisTransmit(ChP) \
-do { \
-   (ChP)->TxControl[3] &= ~TX_ENABLE; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sDisTxSoftFlowCtl
-Purpose:  Disable Tx Software Flow Control
-Call:     sDisTxSoftFlowCtl(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sDisTxSoftFlowCtl(ChP) \
-do { \
-   (ChP)->R[0x06] = 0x8a; \
-   out32((ChP)->IndexAddr,&(ChP)->R[0x04]); \
-} while (0)
-
-/***************************************************************************
-Function: sEnAiop
-Purpose:  Enable I/O access to an AIOP
-Call:     sEnAiop(CltP)
-          CONTROLLER_T *CtlP; Ptr to controller structure
-          int AiopNum; Number of AIOP on controller
-*/
-#define sEnAiop(CTLP,AIOPNUM) \
-do { \
-   (CTLP)->MReg3 |= sBitMapSetTbl[AIOPNUM]; \
-   sOutB((CTLP)->MReg3IO,(CTLP)->MReg3); \
-} while (0)
-
-/***************************************************************************
-Function: sEnCTSFlowCtl
-Purpose:  Enable output flow control using CTS
-Call:     sEnCTSFlowCtl(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sEnCTSFlowCtl(ChP) \
-do { \
-   (ChP)->TxControl[2] |= CTSFC_EN; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sEnIXANY
-Purpose:  Enable IXANY Software Flow Control
-Call:     sEnIXANY(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sEnIXANY(ChP) \
-do { \
-   (ChP)->R[0x0e] = 0x21; \
-   out32((ChP)->IndexAddr,&(ChP)->R[0x0c]); \
-} while (0)
-
-/***************************************************************************
-Function: EnParity
-Purpose:  Enable parity
-Call:     sEnParity(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Comments: Function sSetParity() can be used in place of functions sEnParity(),
-          sDisParity(), sSetOddParity(), and sSetEvenParity().
-
-Warnings: Before enabling parity odd or even parity should be chosen using
-          functions sSetOddParity() or sSetEvenParity().
-*/
-#define sEnParity(ChP) \
-do { \
-   (ChP)->TxControl[2] |= PARITY_EN; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sEnRTSToggle
-Purpose:  Enable RTS toggle
-Call:     sEnRTSToggle(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Comments: This function will disable RTS flow control and clear the RTS
-          line to allow operation of RTS toggle.
-*/
-#define sEnRTSToggle(ChP) \
-do { \
-   (ChP)->RxControl[2] &= ~RTSFC_EN; \
-   out32((ChP)->IndexAddr,(ChP)->RxControl); \
-   (ChP)->TxControl[2] |= RTSTOG_EN; \
-   (ChP)->TxControl[3] &= ~SET_RTS; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-   (ChP)->rtsToggle = 1; \
-} while (0)
-
-/***************************************************************************
-Function: sEnRxFIFO
-Purpose:  Enable Rx FIFO
-Call:     sEnRxFIFO(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sEnRxFIFO(ChP) \
-do { \
-   (ChP)->R[0x32] = 0x08; \
-   out32((ChP)->IndexAddr,&(ChP)->R[0x30]); \
-} while (0)
-
-/***************************************************************************
-Function: sEnRxProcessor
-Purpose:  Enable the receive processor
-Call:     sEnRxProcessor(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Comments: This function is used to start the receive processor.  When
-          the channel is in the reset state the receive processor is not
-          running.  This is done to prevent the receive processor from
-          executing invalid microcode instructions prior to the
-          downloading of the microcode.
-
-Warnings: This function must be called after valid microcode has been
-          downloaded to the AIOP, and it must not be called before the
-          microcode has been downloaded.
-*/
-#define sEnRxProcessor(ChP) \
-do { \
-   (ChP)->RxControl[2] |= RXPROC_EN; \
-   out32((ChP)->IndexAddr,(ChP)->RxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sEnRxStatusMode
-Purpose:  Enable the Rx status mode
-Call:     sEnRxStatusMode(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Comments: This places the channel in the receive status mode.  All subsequent
-          reads of receive data using sReadRxWord() will return a data byte
-          in the low word and a status byte in the high word.
-
-*/
-#define sEnRxStatusMode(ChP) sOutW((ChP)->ChanStat,STATMODE)
-
-/***************************************************************************
-Function: sEnTransmit
-Purpose:  Enable transmit
-Call:     sEnTransmit(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sEnTransmit(ChP) \
-do { \
-   (ChP)->TxControl[3] |= TX_ENABLE; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sEnTxSoftFlowCtl
-Purpose:  Enable Tx Software Flow Control
-Call:     sEnTxSoftFlowCtl(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sEnTxSoftFlowCtl(ChP) \
-do { \
-   (ChP)->R[0x06] = 0xc5; \
-   out32((ChP)->IndexAddr,&(ChP)->R[0x04]); \
-} while (0)
-
-/***************************************************************************
-Function: sGetAiopIntStatus
-Purpose:  Get the AIOP interrupt status
-Call:     sGetAiopIntStatus(CtlP,AiopNum)
-          CONTROLLER_T *CtlP; Ptr to controller structure
-          int AiopNum; AIOP number
-Return:   Byte_t: The AIOP interrupt status.  Bits 0 through 7
-                         represent channels 0 through 7 respectively.  If a
-                         bit is set that channel is interrupting.
-*/
-#define sGetAiopIntStatus(CTLP,AIOPNUM) sInB((CTLP)->AiopIntChanIO[AIOPNUM])
-
-/***************************************************************************
-Function: sGetAiopNumChan
-Purpose:  Get the number of channels supported by an AIOP
-Call:     sGetAiopNumChan(CtlP,AiopNum)
-          CONTROLLER_T *CtlP; Ptr to controller structure
-          int AiopNum; AIOP number
-Return:   int: The number of channels supported by the AIOP
-*/
-#define sGetAiopNumChan(CTLP,AIOPNUM) (CTLP)->AiopNumChan[AIOPNUM]
-
-/***************************************************************************
-Function: sGetChanIntID
-Purpose:  Get a channel's interrupt identification byte
-Call:     sGetChanIntID(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Return:   Byte_t: The channel interrupt ID.  Can be any
-             combination of the following flags:
-                RXF_TRIG:     Rx FIFO trigger level interrupt
-                TXFIFO_MT:    Tx FIFO empty interrupt
-                SRC_INT:      Special receive condition interrupt
-                DELTA_CD:     CD change interrupt
-                DELTA_CTS:    CTS change interrupt
-                DELTA_DSR:    DSR change interrupt
-*/
-#define sGetChanIntID(ChP) (sInB((ChP)->IntID) & (RXF_TRIG | TXFIFO_MT | SRC_INT | DELTA_CD | DELTA_CTS | DELTA_DSR))
-
-/***************************************************************************
-Function: sGetChanNum
-Purpose:  Get the number of a channel within an AIOP
-Call:     sGetChanNum(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Return:   int: Channel number within AIOP, or NULLCHAN if channel does
-               not exist.
-*/
-#define sGetChanNum(ChP) (ChP)->ChanNum
-
-/***************************************************************************
-Function: sGetChanStatus
-Purpose:  Get the channel status
-Call:     sGetChanStatus(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Return:   Word_t: The channel status.  Can be any combination of
-             the following flags:
-                LOW BYTE FLAGS
-                CTS_ACT:      CTS input asserted
-                DSR_ACT:      DSR input asserted
-                CD_ACT:       CD input asserted
-                TXFIFOMT:     Tx FIFO is empty
-                TXSHRMT:      Tx shift register is empty
-                RDA:          Rx data available
-
-                HIGH BYTE FLAGS
-                STATMODE:     status mode enable bit
-                RXFOVERFL:    receive FIFO overflow
-                RX2MATCH:     receive compare byte 2 match
-                RX1MATCH:     receive compare byte 1 match
-                RXBREAK:      received BREAK
-                RXFRAME:      received framing error
-                RXPARITY:     received parity error
-Warnings: This function will clear the high byte flags in the Channel
-          Status Register.
-*/
-#define sGetChanStatus(ChP) sInW((ChP)->ChanStat)
-
-/***************************************************************************
-Function: sGetChanStatusLo
-Purpose:  Get the low byte only of the channel status
-Call:     sGetChanStatusLo(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Return:   Byte_t: The channel status low byte.  Can be any combination
-             of the following flags:
-                CTS_ACT:      CTS input asserted
-                DSR_ACT:      DSR input asserted
-                CD_ACT:       CD input asserted
-                TXFIFOMT:     Tx FIFO is empty
-                TXSHRMT:      Tx shift register is empty
-                RDA:          Rx data available
-*/
-#define sGetChanStatusLo(ChP) sInB((ByteIO_t)(ChP)->ChanStat)
-
-/**********************************************************************
- * Get RI status of channel
- * Defined as a function in rocket.c   -aes
- */
-#if 0
-#define sGetChanRI(ChP) ((ChP)->CtlP->AltChanRingIndicator ? \
-                          (sInB((ByteIO_t)((ChP)->ChanStat+8)) & DSR_ACT) : \
-                            (((ChP)->CtlP->boardType == ROCKET_TYPE_PC104) ? \
-                               (!(sInB((ChP)->CtlP->AiopIO[3]) & sBitMapSetTbl[(ChP)->ChanNum])) : \
-                             0))
-#endif
-
-/***************************************************************************
-Function: sGetControllerIntStatus
-Purpose:  Get the controller interrupt status
-Call:     sGetControllerIntStatus(CtlP)
-          CONTROLLER_T *CtlP; Ptr to controller structure
-Return:   Byte_t: The controller interrupt status in the lower 4
-                         bits.  Bits 0 through 3 represent AIOP's 0
-                         through 3 respectively.  If a bit is set that
-                         AIOP is interrupting.  Bits 4 through 7 will
-                         always be cleared.
-*/
-#define sGetControllerIntStatus(CTLP) (sInB((CTLP)->MReg1IO) & 0x0f)
-
-/***************************************************************************
-Function: sPCIGetControllerIntStatus
-Purpose:  Get the controller interrupt status
-Call:     sPCIGetControllerIntStatus(CtlP)
-          CONTROLLER_T *CtlP; Ptr to controller structure
-Return:   unsigned char: The controller interrupt status in the lower 4
-                         bits and bit 4.  Bits 0 through 3 represent AIOP's 0
-                         through 3 respectively. Bit 4 is set if the int 
-                         was generated from periodic. If a bit is set the
-                         AIOP is interrupting.
-*/
-#define sPCIGetControllerIntStatus(CTLP) \
-        ((CTLP)->isUPCI ? \
-          (sInW((CTLP)->PCIIO2) & UPCI_AIOP_INTR_BITS) : \
-          ((sInW((CTLP)->PCIIO) >> 8) & AIOP_INTR_BITS))
-
-/***************************************************************************
-
-Function: sGetRxCnt
-Purpose:  Get the number of data bytes in the Rx FIFO
-Call:     sGetRxCnt(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Return:   int: The number of data bytes in the Rx FIFO.
-Comments: Byte read of count register is required to obtain Rx count.
-
-*/
-#define sGetRxCnt(ChP) sInW((ChP)->TxRxCount)
-
-/***************************************************************************
-Function: sGetTxCnt
-Purpose:  Get the number of data bytes in the Tx FIFO
-Call:     sGetTxCnt(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Return:   Byte_t: The number of data bytes in the Tx FIFO.
-Comments: Byte read of count register is required to obtain Tx count.
-
-*/
-#define sGetTxCnt(ChP) sInB((ByteIO_t)(ChP)->TxRxCount)
-
-/*****************************************************************************
-Function: sGetTxRxDataIO
-Purpose:  Get the I/O address of a channel's TxRx Data register
-Call:     sGetTxRxDataIO(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Return:   WordIO_t: I/O address of a channel's TxRx Data register
-*/
-#define sGetTxRxDataIO(ChP) (ChP)->TxRxData
-
-/***************************************************************************
-Function: sInitChanDefaults
-Purpose:  Initialize a channel structure to it's default state.
-Call:     sInitChanDefaults(ChP)
-          CHANNEL_T *ChP; Ptr to the channel structure
-Comments: This function must be called once for every channel structure
-          that exists before any other SSCI calls can be made.
-
-*/
-#define sInitChanDefaults(ChP) \
-do { \
-   (ChP)->CtlP = NULLCTLPTR; \
-   (ChP)->AiopNum = NULLAIOP; \
-   (ChP)->ChanID = AIOPID_NULL; \
-   (ChP)->ChanNum = NULLCHAN; \
-} while (0)
-
-/***************************************************************************
-Function: sResetAiopByNum
-Purpose:  Reset the AIOP by number
-Call:     sResetAiopByNum(CTLP,AIOPNUM)
-        CONTROLLER_T CTLP; Ptr to controller structure
-        AIOPNUM; AIOP index 
-*/
-#define sResetAiopByNum(CTLP,AIOPNUM) \
-do { \
-   sOutB((CTLP)->AiopIO[(AIOPNUM)]+_CMD_REG,RESET_ALL); \
-   sOutB((CTLP)->AiopIO[(AIOPNUM)]+_CMD_REG,0x0); \
-} while (0)
-
-/***************************************************************************
-Function: sSendBreak
-Purpose:  Send a transmit BREAK signal
-Call:     sSendBreak(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sSendBreak(ChP) \
-do { \
-   (ChP)->TxControl[3] |= SETBREAK; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sSetBaud
-Purpose:  Set baud rate
-Call:     sSetBaud(ChP,Divisor)
-          CHANNEL_T *ChP; Ptr to channel structure
-          Word_t Divisor; 16 bit baud rate divisor for channel
-*/
-#define sSetBaud(ChP,DIVISOR) \
-do { \
-   (ChP)->BaudDiv[2] = (Byte_t)(DIVISOR); \
-   (ChP)->BaudDiv[3] = (Byte_t)((DIVISOR) >> 8); \
-   out32((ChP)->IndexAddr,(ChP)->BaudDiv); \
-} while (0)
-
-/***************************************************************************
-Function: sSetData7
-Purpose:  Set data bits to 7
-Call:     sSetData7(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sSetData7(ChP) \
-do { \
-   (ChP)->TxControl[2] &= ~DATA8BIT; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sSetData8
-Purpose:  Set data bits to 8
-Call:     sSetData8(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sSetData8(ChP) \
-do { \
-   (ChP)->TxControl[2] |= DATA8BIT; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sSetDTR
-Purpose:  Set the DTR output
-Call:     sSetDTR(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sSetDTR(ChP) \
-do { \
-   (ChP)->TxControl[3] |= SET_DTR; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sSetEvenParity
-Purpose:  Set even parity
-Call:     sSetEvenParity(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Comments: Function sSetParity() can be used in place of functions sEnParity(),
-          sDisParity(), sSetOddParity(), and sSetEvenParity().
-
-Warnings: This function has no effect unless parity is enabled with function
-          sEnParity().
-*/
-#define sSetEvenParity(ChP) \
-do { \
-   (ChP)->TxControl[2] |= EVEN_PAR; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sSetOddParity
-Purpose:  Set odd parity
-Call:     sSetOddParity(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Comments: Function sSetParity() can be used in place of functions sEnParity(),
-          sDisParity(), sSetOddParity(), and sSetEvenParity().
-
-Warnings: This function has no effect unless parity is enabled with function
-          sEnParity().
-*/
-#define sSetOddParity(ChP) \
-do { \
-   (ChP)->TxControl[2] &= ~EVEN_PAR; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sSetRTS
-Purpose:  Set the RTS output
-Call:     sSetRTS(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sSetRTS(ChP) \
-do { \
-   if ((ChP)->rtsToggle) break; \
-   (ChP)->TxControl[3] |= SET_RTS; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sSetRxTrigger
-Purpose:  Set the Rx FIFO trigger level
-Call:     sSetRxProcessor(ChP,Level)
-          CHANNEL_T *ChP; Ptr to channel structure
-          Byte_t Level; Number of characters in Rx FIFO at which the
-             interrupt will be generated.  Can be any of the following flags:
-
-             TRIG_NO:   no trigger
-             TRIG_1:    1 character in FIFO
-             TRIG_1_2:  FIFO 1/2 full
-             TRIG_7_8:  FIFO 7/8 full
-Comments: An interrupt will be generated when the trigger level is reached
-          only if function sEnInterrupt() has been called with flag
-          RXINT_EN set.  The RXF_TRIG flag in the Interrupt Idenfification
-          register will be set whenever the trigger level is reached
-          regardless of the setting of RXINT_EN.
-
-*/
-#define sSetRxTrigger(ChP,LEVEL) \
-do { \
-   (ChP)->RxControl[2] &= ~TRIG_MASK; \
-   (ChP)->RxControl[2] |= LEVEL; \
-   out32((ChP)->IndexAddr,(ChP)->RxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sSetStop1
-Purpose:  Set stop bits to 1
-Call:     sSetStop1(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sSetStop1(ChP) \
-do { \
-   (ChP)->TxControl[2] &= ~STOP2; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sSetStop2
-Purpose:  Set stop bits to 2
-Call:     sSetStop2(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-*/
-#define sSetStop2(ChP) \
-do { \
-   (ChP)->TxControl[2] |= STOP2; \
-   out32((ChP)->IndexAddr,(ChP)->TxControl); \
-} while (0)
-
-/***************************************************************************
-Function: sSetTxXOFFChar
-Purpose:  Set the Tx XOFF flow control character
-Call:     sSetTxXOFFChar(ChP,Ch)
-          CHANNEL_T *ChP; Ptr to channel structure
-          Byte_t Ch; The value to set the Tx XOFF character to
-*/
-#define sSetTxXOFFChar(ChP,CH) \
-do { \
-   (ChP)->R[0x07] = (CH); \
-   out32((ChP)->IndexAddr,&(ChP)->R[0x04]); \
-} while (0)
-
-/***************************************************************************
-Function: sSetTxXONChar
-Purpose:  Set the Tx XON flow control character
-Call:     sSetTxXONChar(ChP,Ch)
-          CHANNEL_T *ChP; Ptr to channel structure
-          Byte_t Ch; The value to set the Tx XON character to
-*/
-#define sSetTxXONChar(ChP,CH) \
-do { \
-   (ChP)->R[0x0b] = (CH); \
-   out32((ChP)->IndexAddr,&(ChP)->R[0x08]); \
-} while (0)
-
-/***************************************************************************
-Function: sStartRxProcessor
-Purpose:  Start a channel's receive processor
-Call:     sStartRxProcessor(ChP)
-          CHANNEL_T *ChP; Ptr to channel structure
-Comments: This function is used to start a Rx processor after it was
-          stopped with sStopRxProcessor() or sStopSWInFlowCtl().  It
-          will restart both the Rx processor and software input flow control.
-
-*/
-#define sStartRxProcessor(ChP) out32((ChP)->IndexAddr,&(ChP)->R[0])
-
-/***************************************************************************
-Function: sWriteTxByte
-Purpose:  Write a transmit data byte to a channel.
-          ByteIO_t io: Channel transmit register I/O address.  This can
-                           be obtained with sGetTxRxDataIO().
-          Byte_t Data; The transmit data byte.
-Warnings: This function writes the data byte without checking to see if
-          sMaxTxSize is exceeded in the Tx FIFO.
-*/
-#define sWriteTxByte(IO,DATA) sOutB(IO,DATA)
-
-/*
- * Begin Linux specific definitions for the Rocketport driver
- *
- * This code is Copyright Theodore Ts'o, 1995-1997
- */
-
-struct r_port {
-        int magic;
-        struct tty_port port;
-        int line;
-        int flags;              /* Don't yet match the ASY_ flags!! */
-        unsigned int board:3;
-        unsigned int aiop:2;
-        unsigned int chan:3;
-        CONTROLLER_t *ctlp;
-        CHANNEL_t channel;
-        int intmask;
-        int xmit_fifo_room;     /* room in xmit fifo */
-        unsigned char *xmit_buf;
-        int xmit_head;
-        int xmit_tail;
-        int xmit_cnt;
-        int cd_status;
-        int ignore_status_mask;
-        int read_status_mask;
-        int cps;
-
-        struct completion close_wait;   /* Not yet matching the core */
-        spinlock_t slock;
-        struct mutex write_mtx;
-};
-
-#define RPORT_MAGIC 0x525001
-
-#define NUM_BOARDS 8
-#define MAX_RP_PORTS (32*NUM_BOARDS)
-
-/*
- * The size of the xmit buffer is 1 page, or 4096 bytes
- */
-#define XMIT_BUF_SIZE 4096
-
-/* number of characters left in xmit buffer before we ask for more */
-#define WAKEUP_CHARS 256
-
-/*
- * Assigned major numbers for the Comtrol Rocketport
- */
-#define TTY_ROCKET_MAJOR        46
-#define CUA_ROCKET_MAJOR        47
-
-#ifdef PCI_VENDOR_ID_RP
-#undef PCI_VENDOR_ID_RP
-#undef PCI_DEVICE_ID_RP8OCTA
-#undef PCI_DEVICE_ID_RP8INTF
-#undef PCI_DEVICE_ID_RP16INTF
-#undef PCI_DEVICE_ID_RP32INTF
-#undef PCI_DEVICE_ID_URP8OCTA
-#undef PCI_DEVICE_ID_URP8INTF
-#undef PCI_DEVICE_ID_URP16INTF
-#undef PCI_DEVICE_ID_CRP16INTF
-#undef PCI_DEVICE_ID_URP32INTF
-#endif
-
-/*  Comtrol PCI Vendor ID */
-#define PCI_VENDOR_ID_RP                0x11fe
-
-/*  Comtrol Device ID's */
-#define PCI_DEVICE_ID_RP32INTF          0x0001  /* Rocketport 32 port w/external I/F     */
-#define PCI_DEVICE_ID_RP8INTF           0x0002  /* Rocketport 8 port w/external I/F      */
-#define PCI_DEVICE_ID_RP16INTF          0x0003  /* Rocketport 16 port w/external I/F     */
-#define PCI_DEVICE_ID_RP4QUAD           0x0004  /* Rocketport 4 port w/quad cable        */
-#define PCI_DEVICE_ID_RP8OCTA           0x0005  /* Rocketport 8 port w/octa cable        */
-#define PCI_DEVICE_ID_RP8J              0x0006  /* Rocketport 8 port w/RJ11 connectors   */
-#define PCI_DEVICE_ID_RP4J              0x0007  /* Rocketport 4 port w/RJ11 connectors   */
-#define PCI_DEVICE_ID_RP8SNI            0x0008  /* Rocketport 8 port w/ DB78 SNI (Siemens) connector */
-#define PCI_DEVICE_ID_RP16SNI           0x0009  /* Rocketport 16 port w/ DB78 SNI (Siemens) connector   */
-#define PCI_DEVICE_ID_RPP4              0x000A  /* Rocketport Plus 4 port                */
-#define PCI_DEVICE_ID_RPP8              0x000B  /* Rocketport Plus 8 port                */
-#define PCI_DEVICE_ID_RP6M              0x000C  /* RocketModem 6 port                    */
-#define PCI_DEVICE_ID_RP4M              0x000D  /* RocketModem 4 port                    */
-#define PCI_DEVICE_ID_RP2_232           0x000E  /* Rocketport Plus 2 port RS232          */
-#define PCI_DEVICE_ID_RP2_422           0x000F  /* Rocketport Plus 2 port RS422          */ 
-
-/* Universal PCI boards  */
-#define PCI_DEVICE_ID_URP32INTF         0x0801  /* Rocketport UPCI 32 port w/external I/F */ 
-#define PCI_DEVICE_ID_URP8INTF          0x0802  /* Rocketport UPCI 8 port w/external I/F  */
-#define PCI_DEVICE_ID_URP16INTF         0x0803  /* Rocketport UPCI 16 port w/external I/F */
-#define PCI_DEVICE_ID_URP8OCTA          0x0805  /* Rocketport UPCI 8 port w/octa cable    */
-#define PCI_DEVICE_ID_UPCI_RM3_8PORT    0x080C  /* Rocketmodem III 8 port                 */
-#define PCI_DEVICE_ID_UPCI_RM3_4PORT    0x080D  /* Rocketmodem III 4 port                 */
-
-/* Compact PCI device */ 
-#define PCI_DEVICE_ID_CRP16INTF         0x0903  /* Rocketport Compact PCI 16 port w/external I/F */
-
diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c
index 99e5272e3c53..0bc135b9b16f 100644
--- a/drivers/char/scx200_gpio.c
+++ b/drivers/char/scx200_gpio.c
@@ -67,6 +67,7 @@ static const struct file_operations scx200_gpio_fileops = {
         .read    = nsc_gpio_read,
         .open    = scx200_gpio_open,
         .release = scx200_gpio_release,
+        .llseek  = no_llseek,
 };
 
 static struct cdev scx200_gpio_cdev;  /* use 1 cdev for all pins */
diff --git a/drivers/char/selection.c b/drivers/char/selection.c
deleted file mode 100644
index ebae344ce910..000000000000
--- a/drivers/char/selection.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * linux/drivers/char/selection.c
- *
- * This module exports the functions:
- *
- *     'int set_selection(struct tiocl_selection __user *, struct tty_struct *)'
- *     'void clear_selection(void)'
- *     'int paste_selection(struct tty_struct *)'
- *     'int sel_loadlut(char __user *)'
- *
- * Now that /dev/vcs exists, most of this can disappear again.
- */
-
-#include <linux/module.h>
-#include <linux/tty.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/types.h>
-
-#include <asm/uaccess.h>
-
-#include <linux/kbd_kern.h>
-#include <linux/vt_kern.h>
-#include <linux/consolemap.h>
-#include <linux/selection.h>
-#include <linux/tiocl.h>
-#include <linux/console.h>
-#include <linux/smp_lock.h>
-
-/* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */
-#define isspace(c)      ((c) == ' ')
-
-extern void poke_blanked_console(void);
-
-/* Variables for selection control. */
-/* Use a dynamic buffer, instead of static (Dec 1994) */
-struct vc_data *sel_cons;               /* must not be deallocated */
-static int use_unicode;
-static volatile int sel_start = -1;     /* cleared by clear_selection */
-static int sel_end;
-static int sel_buffer_lth;
-static char *sel_buffer;
-
-/* clear_selection, highlight and highlight_pointer can be called
-   from interrupt (via scrollback/front) */
-
-/* set reverse video on characters s-e of console with selection. */
-static inline void highlight(const int s, const int e)
-{
-        invert_screen(sel_cons, s, e-s+2, 1);
-}
-
-/* use complementary color to show the pointer */
-static inline void highlight_pointer(const int where)
-{
-        complement_pos(sel_cons, where);
-}
-
-static u16
-sel_pos(int n)
-{
-        return inverse_translate(sel_cons, screen_glyph(sel_cons, n),
-                                use_unicode);
-}
-
-/* remove the current selection highlight, if any,
-   from the console holding the selection. */
-void
-clear_selection(void) {
-        highlight_pointer(-1); /* hide the pointer */
-        if (sel_start != -1) {
-                highlight(sel_start, sel_end);
-                sel_start = -1;
-        }
-}
-
-/*
- * User settable table: what characters are to be considered alphabetic?
- * 256 bits
- */
-static u32 inwordLut[8]={
-  0x00000000, /* control chars     */
-  0x03FF0000, /* digits            */
-  0x87FFFFFE, /* uppercase and '_' */
-  0x07FFFFFE, /* lowercase         */
-  0x00000000,
-  0x00000000,
-  0xFF7FFFFF, /* latin-1 accented letters, not multiplication sign */
-  0xFF7FFFFF  /* latin-1 accented letters, not division sign */
-};
-
-static inline int inword(const u16 c) {
-        return c > 0xff || (( inwordLut[c>>5] >> (c & 0x1F) ) & 1);
-}
-
-/* set inwordLut contents. Invoked by ioctl(). */
-int sel_loadlut(char __user *p)
-{
-        return copy_from_user(inwordLut, (u32 __user *)(p+4), 32) ? -EFAULT : 0;
-}
-
-/* does screen address p correspond to character at LH/RH edge of screen? */
-static inline int atedge(const int p, int size_row)
-{
-        return (!(p % size_row) || !((p + 2) % size_row));
-}
-
-/* constrain v such that v <= u */
-static inline unsigned short limit(const unsigned short v, const unsigned short u)
-{
-        return (v > u) ? u : v;
-}
-
-/* stores the char in UTF8 and returns the number of bytes used (1-3) */
-static int store_utf8(u16 c, char *p)
-{
-        if (c < 0x80) {
-                /*  0******* */
-                p[0] = c;
-                return 1;
-        } else if (c < 0x800) {
-                /* 110***** 10****** */
-                p[0] = 0xc0 | (c >> 6);
-                p[1] = 0x80 | (c & 0x3f);
-                return 2;
-        } else {
-                /* 1110**** 10****** 10****** */
-                p[0] = 0xe0 | (c >> 12);
-                p[1] = 0x80 | ((c >> 6) & 0x3f);
-                p[2] = 0x80 | (c & 0x3f);
-                return 3;
-        }
-}
-
-/* set the current selection. Invoked by ioctl() or by kernel code. */
-int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *tty)
-{
-        struct vc_data *vc = vc_cons[fg_console].d;
-        int sel_mode, new_sel_start, new_sel_end, spc;
-        char *bp, *obp;
-        int i, ps, pe, multiplier;
-        u16 c;
-        struct kbd_struct *kbd = kbd_table + fg_console;
-
-        poke_blanked_console();
-
-        { unsigned short xs, ys, xe, ye;
-
-          if (!access_ok(VERIFY_READ, sel, sizeof(*sel)))
-                return -EFAULT;
-          __get_user(xs, &sel->xs);
-          __get_user(ys, &sel->ys);
-          __get_user(xe, &sel->xe);
-          __get_user(ye, &sel->ye);
-          __get_user(sel_mode, &sel->sel_mode);
-          xs--; ys--; xe--; ye--;
-          xs = limit(xs, vc->vc_cols - 1);
-          ys = limit(ys, vc->vc_rows - 1);
-          xe = limit(xe, vc->vc_cols - 1);
-          ye = limit(ye, vc->vc_rows - 1);
-          ps = ys * vc->vc_size_row + (xs << 1);
-          pe = ye * vc->vc_size_row + (xe << 1);
-
-          if (sel_mode == TIOCL_SELCLEAR) {
-              /* useful for screendump without selection highlights */
-              clear_selection();
-              return 0;
-          }
-
-          if (mouse_reporting() && (sel_mode & TIOCL_SELMOUSEREPORT)) {
-              mouse_report(tty, sel_mode & TIOCL_SELBUTTONMASK, xs, ys);
-              return 0;
-          }
-        }
-
-        if (ps > pe)    /* make sel_start <= sel_end */
-        {
-                int tmp = ps;
-                ps = pe;
-                pe = tmp;
-        }
-
-        if (sel_cons != vc_cons[fg_console].d) {
-                clear_selection();
-                sel_cons = vc_cons[fg_console].d;
-        }
-        use_unicode = kbd && kbd->kbdmode == VC_UNICODE;
-
-        switch (sel_mode)
-        {
-                case TIOCL_SELCHAR:     /* character-by-character selection */
-                        new_sel_start = ps;
-                        new_sel_end = pe;
-                        break;
-                case TIOCL_SELWORD:     /* word-by-word selection */
-                        spc = isspace(sel_pos(ps));
-                        for (new_sel_start = ps; ; ps -= 2)
-                        {
-                                if ((spc && !isspace(sel_pos(ps))) ||
-                                    (!spc && !inword(sel_pos(ps))))
-                                        break;
-                                new_sel_start = ps;
-                                if (!(ps % vc->vc_size_row))
-                                        break;
-                        }
-                        spc = isspace(sel_pos(pe));
-                        for (new_sel_end = pe; ; pe += 2)
-                        {
-                                if ((spc && !isspace(sel_pos(pe))) ||
-                                    (!spc && !inword(sel_pos(pe))))
-                                        break;
-                                new_sel_end = pe;
-                                if (!((pe + 2) % vc->vc_size_row))
-                                        break;
-                        }
-                        break;
-                case TIOCL_SELLINE:     /* line-by-line selection */
-                        new_sel_start = ps - ps % vc->vc_size_row;
-                        new_sel_end = pe + vc->vc_size_row
-                                    - pe % vc->vc_size_row - 2;
-                        break;
-                case TIOCL_SELPOINTER:
-                        highlight_pointer(pe);
-                        return 0;
-                default:
-                        return -EINVAL;
-        }
-
-        /* remove the pointer */
-        highlight_pointer(-1);
-
-        /* select to end of line if on trailing space */
-        if (new_sel_end > new_sel_start &&
-                !atedge(new_sel_end, vc->vc_size_row) &&
-                isspace(sel_pos(new_sel_end))) {
-                for (pe = new_sel_end + 2; ; pe += 2)
-                        if (!isspace(sel_pos(pe)) ||
-                            atedge(pe, vc->vc_size_row))
-                                break;
-                if (isspace(sel_pos(pe)))
-                        new_sel_end = pe;
-        }
-        if (sel_start == -1)    /* no current selection */
-                highlight(new_sel_start, new_sel_end);
-        else if (new_sel_start == sel_start)
-        {
-                if (new_sel_end == sel_end)     /* no action required */
-                        return 0;
-                else if (new_sel_end > sel_end) /* extend to right */
-                        highlight(sel_end + 2, new_sel_end);
-                else                            /* contract from right */
-                        highlight(new_sel_end + 2, sel_end);
-        }
-        else if (new_sel_end == sel_end)
-        {
-                if (new_sel_start < sel_start)  /* extend to left */
-                        highlight(new_sel_start, sel_start - 2);
-                else                            /* contract from left */
-                        highlight(sel_start, new_sel_start - 2);
-        }
-        else    /* some other case; start selection from scratch */
-        {
-                clear_selection();
-                highlight(new_sel_start, new_sel_end);
-        }
-        sel_start = new_sel_start;
-        sel_end = new_sel_end;
-
-        /* Allocate a new buffer before freeing the old one ... */
-        multiplier = use_unicode ? 3 : 1;  /* chars can take up to 3 bytes */
-        bp = kmalloc(((sel_end-sel_start)/2+1)*multiplier, GFP_KERNEL);
-        if (!bp) {
-                printk(KERN_WARNING "selection: kmalloc() failed\n");
-                clear_selection();
-                return -ENOMEM;
-        }
-        kfree(sel_buffer);
-        sel_buffer = bp;
-
-        obp = bp;
-        for (i = sel_start; i <= sel_end; i += 2) {
-                c = sel_pos(i);
-                if (use_unicode)
-                        bp += store_utf8(c, bp);
-                else
-                        *bp++ = c;
-                if (!isspace(c))
-                        obp = bp;
-                if (! ((i + 2) % vc->vc_size_row)) {
-                        /* strip trailing blanks from line and add newline,
-                           unless non-space at end of line. */
-                        if (obp != bp) {
-                                bp = obp;
-                                *bp++ = '\r';
-                        }
-                        obp = bp;
-                }
-        }
-        sel_buffer_lth = bp - sel_buffer;
-        return 0;
-}
-
-/* Insert the contents of the selection buffer into the
- * queue of the tty associated with the current console.
- * Invoked by ioctl().
- */
-int paste_selection(struct tty_struct *tty)
-{
-        struct vc_data *vc = tty->driver_data;
-        int     pasted = 0;
-        unsigned int count;
-        struct  tty_ldisc *ld;
-        DECLARE_WAITQUEUE(wait, current);
-
-        /* always called with BTM from vt_ioctl */
-        WARN_ON(!tty_locked());
-
-        acquire_console_sem();
-        poke_blanked_console();
-        release_console_sem();
-
-        ld = tty_ldisc_ref(tty);
-        if (!ld) {
-                tty_unlock();
-                ld = tty_ldisc_ref_wait(tty);
-                tty_lock();
-        }
-
-        add_wait_queue(&vc->paste_wait, &wait);
-        while (sel_buffer && sel_buffer_lth > pasted) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (test_bit(TTY_THROTTLED, &tty->flags)) {
-                        schedule();
-                        continue;
-                }
-                count = sel_buffer_lth - pasted;
-                count = min(count, tty->receive_room);
-                tty->ldisc->ops->receive_buf(tty, sel_buffer + pasted,
-                                                                NULL, count);
-                pasted += count;
-        }
-        remove_wait_queue(&vc->paste_wait, &wait);
-        __set_current_state(TASK_RUNNING);
-
-        tty_ldisc_deref(ld);
-        return 0;
-}
diff --git a/drivers/char/ser_a2232.c b/drivers/char/ser_a2232.c
deleted file mode 100644
index 9610861d1f5f..000000000000
--- a/drivers/char/ser_a2232.c
+++ /dev/null
@@ -1,831 +0,0 @@
-/* drivers/char/ser_a2232.c */
-
-/* $Id: ser_a2232.c,v 0.4 2000/01/25 12:00:00 ehaase Exp $ */
-
-/* Linux serial driver for the Amiga A2232 board */
-
-/* This driver is MAINTAINED. Before applying any changes, please contact
- * the author.
- */
-
-/* Copyright (c) 2000-2001 Enver Haase    <ehaase@inf.fu-berlin.de>
- *                   alias The A2232 driver project <A2232@gmx.net>
- * All rights reserved.
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-/***************************** Documentation ************************/
-/*
- * This driver is in EXPERIMENTAL state. That means I could not find
- * someone with five A2232 boards with 35 ports running at 19200 bps
- * at the same time and test the machine's behaviour.
- * However, I know that you can performance-tweak this driver (see
- * the source code).
- * One thing to consider is the time this driver consumes during the
- * Amiga's vertical blank interrupt. Everything that is to be done
- * _IS DONE_ when entering the vertical blank interrupt handler of
- * this driver.
- * However, it would be more sane to only do the job for only ONE card
- * instead of ALL cards at a time; or, more generally, to handle only
- * SOME ports instead of ALL ports at a time.
- * However, as long as no-one runs into problems I guess I shouldn't
- * change the driver as it runs fine for me :) .
- *
- * Version history of this file:
- * 0.4  Resolved licensing issues.
- * 0.3  Inclusion in the Linux/m68k tree, small fixes.
- * 0.2  Added documentation, minor typo fixes.
- * 0.1  Initial release.
- *
- * TO DO:
- * -    Handle incoming BREAK events. I guess "Stevens: Advanced
- *      Programming in the UNIX(R) Environment" is a good reference
- *      on what is to be done.
- * -    When installing as a module, don't simply 'printk' text, but
- *      send it to the TTY used by the user.
- *
- * THANKS TO:
- * -    Jukka Marin (65EC02 code).
- * -    The other NetBSD developers on whose A2232 driver I had a
- *      pretty close look. However, I didn't copy any code so it
- *      is okay to put my code under the GPL and include it into
- *      Linux.
- */
-/***************************** End of Documentation *****************/
-
-/***************************** Defines ******************************/
-/*
- * Enables experimental 115200 (normal) 230400 (turbo) baud rate.
- * The A2232 specification states it can only operate at speeds up to
- * 19200 bits per second, and I was not able to send a file via
- * "sz"/"rz" and a null-modem cable from one A2232 port to another
- * at 115200 bits per second.
- * However, this might work for you.
- */
-#undef A2232_SPEEDHACK
-/*
- * Default is not to use RTS/CTS so you could be talked to death.
- */
-#define A2232_SUPPRESS_RTSCTS_WARNING
-/************************* End of Defines ***************************/
-
-/***************************** Includes *****************************/
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/tty.h>
-
-#include <asm/setup.h>
-#include <asm/amigaints.h>
-#include <asm/amigahw.h>
-#include <linux/zorro.h>
-#include <asm/irq.h>
-#include <linux/mutex.h>
-
-#include <linux/delay.h>
-
-#include <linux/serial.h>
-#include <linux/generic_serial.h>
-#include <linux/tty_flip.h>
-
-#include "ser_a2232.h"
-#include "ser_a2232fw.h"
-/************************* End of Includes **************************/
-
-/***************************** Prototypes ***************************/
-/* The interrupt service routine */
-static irqreturn_t a2232_vbl_inter(int irq, void *data);
-/* Initialize the port structures */
-static void a2232_init_portstructs(void);
-/* Initialize and register TTY drivers. */
-/* returns 0 IFF successful */
-static int a2232_init_drivers(void); 
-
-/* BEGIN GENERIC_SERIAL PROTOTYPES */
-static void a2232_disable_tx_interrupts(void *ptr);
-static void a2232_enable_tx_interrupts(void *ptr);
-static void a2232_disable_rx_interrupts(void *ptr);
-static void a2232_enable_rx_interrupts(void *ptr);
-static int  a2232_carrier_raised(struct tty_port *port);
-static void a2232_shutdown_port(void *ptr);
-static int  a2232_set_real_termios(void *ptr);
-static int  a2232_chars_in_buffer(void *ptr);
-static void a2232_close(void *ptr);
-static void a2232_hungup(void *ptr);
-/* static void a2232_getserial (void *ptr, struct serial_struct *sp); */
-/* END GENERIC_SERIAL PROTOTYPES */
-
-/* Functions that the TTY driver struct expects */
-static int  a2232_ioctl(struct tty_struct *tty, struct file *file,
-                                                                                unsigned int cmd, unsigned long arg);
-static void a2232_throttle(struct tty_struct *tty);
-static void a2232_unthrottle(struct tty_struct *tty);
-static int  a2232_open(struct tty_struct * tty, struct file * filp);
-/************************* End of Prototypes ************************/
-
-/***************************** Global variables *********************/
-/*---------------------------------------------------------------------------
- * Interface from generic_serial.c back here
- *--------------------------------------------------------------------------*/
-static struct real_driver a2232_real_driver = {
-        a2232_disable_tx_interrupts,
-        a2232_enable_tx_interrupts,
-        a2232_disable_rx_interrupts,
-        a2232_enable_rx_interrupts,
-        a2232_shutdown_port,
-        a2232_set_real_termios,
-        a2232_chars_in_buffer,
-        a2232_close,
-        a2232_hungup,
-        NULL    /* a2232_getserial */
-};
-
-static void *a2232_driver_ID = &a2232_driver_ID; // Some memory address WE own.
-
-/* Ports structs */
-static struct a2232_port a2232_ports[MAX_A2232_BOARDS*NUMLINES];
-
-/* TTY driver structs */
-static struct tty_driver *a2232_driver;
-
-/* nr of cards completely (all ports) and correctly configured */
-static int nr_a2232; 
-
-/* zorro_dev structs for the A2232's */
-static struct zorro_dev *zd_a2232[MAX_A2232_BOARDS]; 
-/***************************** End of Global variables **************/
-
-/* Helper functions */
-
-static inline volatile struct a2232memory *a2232mem(unsigned int board)
-{
-        return (volatile struct a2232memory *)ZTWO_VADDR(zd_a2232[board]->resource.start);
-}
-
-static inline volatile struct a2232status *a2232stat(unsigned int board,
-                                                     unsigned int portonboard)
-{
-        volatile struct a2232memory *mem = a2232mem(board);
-        return &(mem->Status[portonboard]);
-}
-
-static inline void a2232_receive_char(struct a2232_port *port, int ch, int err)
-{
-/*      Mostly stolen from other drivers.
-        Maybe one could implement a more efficient version by not only
-        transferring one character at a time.
-*/
-        struct tty_struct *tty = port->gs.port.tty;
-
-#if 0
-        switch(err) {
-        case TTY_BREAK:
-                break;
-        case TTY_PARITY:
-                break;
-        case TTY_OVERRUN:
-                break;
-        case TTY_FRAME:
-                break;
-        }
-#endif
-
-        tty_insert_flip_char(tty, ch, err);
-        tty_flip_buffer_push(tty);
-}
-
-/***************************** Functions ****************************/
-/*** BEGIN OF REAL_DRIVER FUNCTIONS ***/
-
-static void a2232_disable_tx_interrupts(void *ptr)
-{
-        struct a2232_port *port;
-        volatile struct a2232status *stat;
-        unsigned long flags;
-  
-        port = ptr;
-        stat = a2232stat(port->which_a2232, port->which_port_on_a2232);
-        stat->OutDisable = -1;
-
-        /* Does this here really have to be? */
-        local_irq_save(flags);
-        port->gs.port.flags &= ~GS_TX_INTEN;
-        local_irq_restore(flags);
-}
-
-static void a2232_enable_tx_interrupts(void *ptr)
-{
-        struct a2232_port *port;
-        volatile struct a2232status *stat;
-        unsigned long flags;
-
-        port = ptr;
-        stat = a2232stat(port->which_a2232, port->which_port_on_a2232);
-        stat->OutDisable = 0;
-
-        /* Does this here really have to be? */
-        local_irq_save(flags);
-        port->gs.port.flags |= GS_TX_INTEN;
-        local_irq_restore(flags);
-}
-
-static void a2232_disable_rx_interrupts(void *ptr)
-{
-        struct a2232_port *port;
-        port = ptr;
-        port->disable_rx = -1;
-}
-
-static void a2232_enable_rx_interrupts(void *ptr)
-{
-        struct a2232_port *port;
-        port = ptr;
-        port->disable_rx = 0;
-}
-
-static int  a2232_carrier_raised(struct tty_port *port)
-{
-        struct a2232_port *ap = container_of(port, struct a2232_port, gs.port);
-        return ap->cd_status;
-}
-
-static void a2232_shutdown_port(void *ptr)
-{
-        struct a2232_port *port;
-        volatile struct a2232status *stat;
-        unsigned long flags;
-
-        port = ptr;
-        stat = a2232stat(port->which_a2232, port->which_port_on_a2232);
-
-        local_irq_save(flags);
-
-        port->gs.port.flags &= ~GS_ACTIVE;
-        
-        if (port->gs.port.tty && port->gs.port.tty->termios->c_cflag & HUPCL) {
-                /* Set DTR and RTS to Low, flush output.
-                   The NetBSD driver "msc.c" does it this way. */
-                stat->Command = (       (stat->Command & ~A2232CMD_CMask) | 
-                                        A2232CMD_Close );
-                stat->OutFlush = -1;
-                stat->Setup = -1;
-        }
-
-        local_irq_restore(flags);
-        
-        /* After analyzing control flow, I think a2232_shutdown_port
-                is actually the last call from the system when at application
-                level someone issues a "echo Hello >>/dev/ttyY0".
-                Therefore I think the MOD_DEC_USE_COUNT should be here and
-                not in "a2232_close()". See the comment in "sx.c", too.
-                If you run into problems, compile this driver into the
-                kernel instead of compiling it as a module. */
-}
-
-static int  a2232_set_real_termios(void *ptr)
-{
-        unsigned int cflag, baud, chsize, stopb, parity, softflow;
-        int rate;
-        int a2232_param, a2232_cmd;
-        unsigned long flags;
-        unsigned int i;
-        struct a2232_port *port = ptr;
-        volatile struct a2232status *status;
-        volatile struct a2232memory *mem;
-
-        if (!port->gs.port.tty || !port->gs.port.tty->termios) return 0;
-
-        status = a2232stat(port->which_a2232, port->which_port_on_a2232);
-        mem = a2232mem(port->which_a2232);
-        
-        a2232_param = a2232_cmd = 0;
-
-        // get baud rate
-        baud = port->gs.baud;
-        if (baud == 0) {
-                /* speed == 0 -> drop DTR, do nothing else */
-                local_irq_save(flags);
-                // Clear DTR (and RTS... mhhh).
-                status->Command = (     (status->Command & ~A2232CMD_CMask) |
-                                        A2232CMD_Close );
-                status->OutFlush = -1;
-                status->Setup = -1;
-                
-                local_irq_restore(flags);
-                return 0;
-        }
-        
-        rate = A2232_BAUD_TABLE_NOAVAIL;
-        for (i=0; i < A2232_BAUD_TABLE_NUM_RATES * 3; i += 3){
-                if (a2232_baud_table[i] == baud){
-                        if (mem->Common.Crystal == A2232_TURBO) rate = a2232_baud_table[i+2];
-                        else                                    rate = a2232_baud_table[i+1];
-                }
-        }
-        if (rate == A2232_BAUD_TABLE_NOAVAIL){
-                printk("a2232: Board %d Port %d unsupported baud rate: %d baud. Using another.\n",port->which_a2232,port->which_port_on_a2232,baud);
-                // This is useful for both (turbo or normal) Crystal versions.
-                rate = A2232PARAM_B9600;
-        }
-        a2232_param |= rate;
-
-        cflag  = port->gs.port.tty->termios->c_cflag;
-
-        // get character size
-        chsize = cflag & CSIZE;
-        switch (chsize){
-                case CS8:       a2232_param |= A2232PARAM_8Bit; break;
-                case CS7:       a2232_param |= A2232PARAM_7Bit; break;
-                case CS6:       a2232_param |= A2232PARAM_6Bit; break;
-                case CS5:       a2232_param |= A2232PARAM_5Bit; break;
-                default:        printk("a2232: Board %d Port %d unsupported character size: %d. Using 8 data bits.\n",
-                                        port->which_a2232,port->which_port_on_a2232,chsize);
-                                a2232_param |= A2232PARAM_8Bit; break;
-        }
-
-        // get number of stop bits
-        stopb  = cflag & CSTOPB;
-        if (stopb){ // two stop bits instead of one
-                printk("a2232: Board %d Port %d 2 stop bits unsupported. Using 1 stop bit.\n",
-                        port->which_a2232,port->which_port_on_a2232);
-        }
-
-        // Warn if RTS/CTS not wanted
-        if (!(cflag & CRTSCTS)){
-#ifndef A2232_SUPPRESS_RTSCTS_WARNING
-                printk("a2232: Board %d Port %d cannot switch off firmware-implemented RTS/CTS hardware flow control.\n",
-                        port->which_a2232,port->which_port_on_a2232);
-#endif
-        }
-
-        /*      I think this is correct.
-                However, IXOFF means _input_ flow control and I wonder
-                if one should care about IXON _output_ flow control,
-                too. If this makes problems, one should turn the A2232
-                firmware XON/XOFF "SoftFlow" flow control off and use
-                the conventional way of inserting START/STOP characters
-                by hand in throttle()/unthrottle().
-        */
-        softflow = !!( port->gs.port.tty->termios->c_iflag & IXOFF );
-
-        // get Parity (Enabled/Disabled? If Enabled, Odd or Even?)
-        parity = cflag & (PARENB | PARODD);
-        if (parity & PARENB){
-                if (parity & PARODD){
-                        a2232_cmd |= A2232CMD_OddParity;
-                }
-                else{
-                        a2232_cmd |= A2232CMD_EvenParity;
-                }
-        }
-        else a2232_cmd |= A2232CMD_NoParity;
-
-
-        /*      Hmm. Maybe an own a2232_port structure
-                member would be cleaner?        */
-        if (cflag & CLOCAL)
-                port->gs.port.flags &= ~ASYNC_CHECK_CD;
-        else
-                port->gs.port.flags |= ASYNC_CHECK_CD;
-
-
-        /* Now we have all parameters and can go to set them: */
-        local_irq_save(flags);
-
-        status->Param = a2232_param | A2232PARAM_RcvBaud;
-        status->Command = a2232_cmd | A2232CMD_Open |  A2232CMD_Enable;
-        status->SoftFlow = softflow;
-        status->OutDisable = 0;
-        status->Setup = -1;
-
-        local_irq_restore(flags);
-        return 0;
-}
-
-static int  a2232_chars_in_buffer(void *ptr)
-{
-        struct a2232_port *port;
-        volatile struct a2232status *status; 
-        unsigned char ret; /* we need modulo-256 arithmetics */
-        port = ptr;
-        status = a2232stat(port->which_a2232, port->which_port_on_a2232);
-#if A2232_IOBUFLEN != 256
-#error "Re-Implement a2232_chars_in_buffer()!"
-#endif
-        ret = (status->OutHead - status->OutTail);
-        return ret;
-}
-
-static void a2232_close(void *ptr)
-{
-        a2232_disable_tx_interrupts(ptr);
-        a2232_disable_rx_interrupts(ptr);
-        /* see the comment in a2232_shutdown_port above. */
-}
-
-static void a2232_hungup(void *ptr)
-{
-        a2232_close(ptr);
-}
-/*** END   OF REAL_DRIVER FUNCTIONS ***/
-
-/*** BEGIN  FUNCTIONS EXPECTED BY TTY DRIVER STRUCTS ***/
-static int a2232_ioctl( struct tty_struct *tty, struct file *file,
-                        unsigned int cmd, unsigned long arg)
-{
-        return -ENOIOCTLCMD;
-}
-
-static void a2232_throttle(struct tty_struct *tty)
-{
-/* Throttle: System cannot take another chars: Drop RTS or
-             send the STOP char or whatever.
-   The A2232 firmware does RTS/CTS anyway, and XON/XOFF
-   if switched on. So the only thing we can do at this
-   layer here is not taking any characters out of the
-   A2232 buffer any more. */
-        struct a2232_port *port = tty->driver_data;
-        port->throttle_input = -1;
-}
-
-static void a2232_unthrottle(struct tty_struct *tty)
-{
-/* Unthrottle: dual to "throttle()" above. */
-        struct a2232_port *port = tty->driver_data;
-        port->throttle_input = 0;
-}
-
-static int  a2232_open(struct tty_struct * tty, struct file * filp)
-{
-/* More or less stolen from other drivers. */
-        int line;
-        int retval;
-        struct a2232_port *port;
-
-        line = tty->index;
-        port = &a2232_ports[line];
-        
-        tty->driver_data = port;
-        port->gs.port.tty = tty;
-        port->gs.port.count++;
-        retval = gs_init_port(&port->gs);
-        if (retval) {
-                port->gs.port.count--;
-                return retval;
-        }
-        port->gs.port.flags |= GS_ACTIVE;
-        retval = gs_block_til_ready(port, filp);
-
-        if (retval) {
-                port->gs.port.count--;
-                return retval;
-        }
-
-        a2232_enable_rx_interrupts(port);
-        
-        return 0;
-}
-/*** END OF FUNCTIONS EXPECTED BY TTY DRIVER STRUCTS ***/
-
-static irqreturn_t a2232_vbl_inter(int irq, void *data)
-{
-#if A2232_IOBUFLEN != 256
-#error "Re-Implement a2232_vbl_inter()!"
-#endif
-
-struct a2232_port *port;
-volatile struct a2232memory *mem;
-volatile struct a2232status *status;
-unsigned char newhead;
-unsigned char bufpos; /* Must be unsigned char. We need the modulo-256 arithmetics */
-unsigned char ncd, ocd, ccd; /* names consistent with the NetBSD driver */
-volatile u_char *ibuf, *cbuf, *obuf;
-int ch, err, n, p;
-        for (n = 0; n < nr_a2232; n++){         /* for every completely initialized A2232 board */
-                mem = a2232mem(n);
-                for (p = 0; p < NUMLINES; p++){ /* for every port on this board */
-                        err = 0;
-                        port = &a2232_ports[n*NUMLINES+p];
-                        if ( port->gs.port.flags & GS_ACTIVE ){ /* if the port is used */
-
-                                status = a2232stat(n,p);
-
-                                if (!port->disable_rx && !port->throttle_input){ /* If input is not disabled */
-                                        newhead = status->InHead;               /* 65EC02 write pointer */
-                                        bufpos = status->InTail;
-
-                                        /* check for input for this port */
-                                        if (newhead != bufpos) {
-                                                /* buffer for input chars/events */
-                                                ibuf = mem->InBuf[p];
- 
-                                                /* data types of bytes in ibuf */
-                                                cbuf = mem->InCtl[p];
- 
-                                                /* do for all chars */
-                                                while (bufpos != newhead) {
-                                                        /* which type of input data? */
-                                                        switch (cbuf[bufpos]) {
-                                                                /* switch on input event (CD, BREAK, etc.) */
-                                                        case A2232INCTL_EVENT:
-                                                                switch (ibuf[bufpos++]) {
-                                                                case A2232EVENT_Break:
-                                                                        /* TODO: Handle BREAK signal */
-                                                                        break;
-                                                                        /*      A2232EVENT_CarrierOn and A2232EVENT_CarrierOff are
-                                                                                handled in a separate queue and should not occur here. */
-                                                                case A2232EVENT_Sync:
-                                                                        printk("A2232: 65EC02 software sent SYNC event, don't know what to do. Ignoring.");
-                                                                        break;
-                                                                default:
-                                                                        printk("A2232: 65EC02 software broken, unknown event type %d occurred.\n",ibuf[bufpos-1]);
-                                                                } /* event type switch */
-                                                                break;
-                                                        case A2232INCTL_CHAR:
-                                                                /* Receive incoming char */
-                                                                a2232_receive_char(port, ibuf[bufpos], err);
-                                                                bufpos++;
-                                                                break;
-                                                        default:
-                                                                printk("A2232: 65EC02 software broken, unknown data type %d occurred.\n",cbuf[bufpos]);
-                                                                bufpos++;
-                                                        } /* switch on input data type */
-                                                } /* while there's something in the buffer */
-
-                                                status->InTail = bufpos;            /* tell 65EC02 what we've read */
-                                                
-                                        } /* if there was something in the buffer */                          
-                                } /* If input is not disabled */
-
-                                /* Now check if there's something to output */
-                                obuf = mem->OutBuf[p];
-                                bufpos = status->OutHead;
-                                while ( (port->gs.xmit_cnt > 0)         &&
-                                        (!port->gs.port.tty->stopped)   &&
-                                        (!port->gs.port.tty->hw_stopped) ){     /* While there are chars to transmit */
-                                        if (((bufpos+1) & A2232_IOBUFLENMASK) != status->OutTail) { /* If the A2232 buffer is not full */
-                                                ch = port->gs.xmit_buf[port->gs.xmit_tail];                                     /* get the next char to transmit */
-                                                port->gs.xmit_tail = (port->gs.xmit_tail+1) & (SERIAL_XMIT_SIZE-1); /* modulo-addition for the gs.xmit_buf ring-buffer */
-                                                obuf[bufpos++] = ch;                                                                                                                            /* put it into the A2232 buffer */
-                                                port->gs.xmit_cnt--;
-                                        }
-                                        else{                                                                                                                                                                                                   /* If A2232 the buffer is full */
-                                                break;                                                                                                                                                                                  /* simply stop filling it. */
-                                        }                                                                                                       
-                                }                                       
-                                status->OutHead = bufpos;
-                                        
-                                /* WakeUp if output buffer runs low */
-                                if ((port->gs.xmit_cnt <= port->gs.wakeup_chars) && port->gs.port.tty) {
-                                        tty_wakeup(port->gs.port.tty);
-                                }
-                        } // if the port is used
-                } // for every port on the board
-                        
-                /* Now check the CD message queue */
-                newhead = mem->Common.CDHead;
-                bufpos = mem->Common.CDTail;
-                if (newhead != bufpos){                         /* There are CD events in queue */
-                        ocd = mem->Common.CDStatus;             /* get old status bits */
-                        while (newhead != bufpos){              /* read all events */
-                                ncd = mem->CDBuf[bufpos++];     /* get one event */
-                                ccd = ncd ^ ocd;                /* mask of changed lines */
-                                ocd = ncd;                      /* save new status bits */
-                                for(p=0; p < NUMLINES; p++){    /* for all ports */
-                                        if (ccd & 1){           /* this one changed */
-
-                                                struct a2232_port *port = &a2232_ports[n*7+p];
-                                                port->cd_status = !(ncd & 1); /* ncd&1 <=> CD is now off */
-
-                                                if (!(port->gs.port.flags & ASYNC_CHECK_CD))
-                                                        ;       /* Don't report DCD changes */
-                                                else if (port->cd_status) { // if DCD on: DCD went UP!
-                                                        
-                                                        /* Are we blocking in open?*/
-                                                        wake_up_interruptible(&port->gs.port.open_wait);
-                                                }
-                                                else { // if DCD off: DCD went DOWN!
-                                                        if (port->gs.port.tty)
-                                                                tty_hangup (port->gs.port.tty);
-                                                }
-                                                
-                                        } // if CD changed for this port
-                                        ccd >>= 1;
-                                        ncd >>= 1;                                                                      /* Shift bits for next line */
-                                } // for every port
-                        } // while CD events in queue
-                        mem->Common.CDStatus = ocd; /* save new status */
-                        mem->Common.CDTail = bufpos; /* remove events */
-                } // if events in CD queue
-                
-        } // for every completely initialized A2232 board
-        return IRQ_HANDLED;
-}
-
-static const struct tty_port_operations a2232_port_ops = {
-        .carrier_raised = a2232_carrier_raised,
-};
-
-static void a2232_init_portstructs(void)
-{
-        struct a2232_port *port;
-        int i;
-
-        for (i = 0; i < MAX_A2232_BOARDS*NUMLINES; i++) {
-                port = a2232_ports + i;
-                tty_port_init(&port->gs.port);
-                port->gs.port.ops = &a2232_port_ops;
-                port->which_a2232 = i/NUMLINES;
-                port->which_port_on_a2232 = i%NUMLINES;
-                port->disable_rx = port->throttle_input = port->cd_status = 0;
-                port->gs.magic = A2232_MAGIC;
-                port->gs.close_delay = HZ/2;
-                port->gs.closing_wait = 30 * HZ;
-                port->gs.rd = &a2232_real_driver;
-        }
-}
-
-static const struct tty_operations a2232_ops = {
-        .open = a2232_open,
-        .close = gs_close,
-        .write = gs_write,
-        .put_char = gs_put_char,
-        .flush_chars = gs_flush_chars,
-        .write_room = gs_write_room,
-        .chars_in_buffer = gs_chars_in_buffer,
-        .flush_buffer = gs_flush_buffer,
-        .ioctl = a2232_ioctl,
-        .throttle = a2232_throttle,
-        .unthrottle = a2232_unthrottle,
-        .set_termios = gs_set_termios,
-        .stop = gs_stop,
-        .start = gs_start,
-        .hangup = gs_hangup,
-};
-
-static int a2232_init_drivers(void)
-{
-        int error;
-
-        a2232_driver = alloc_tty_driver(NUMLINES * nr_a2232);
-        if (!a2232_driver)
-                return -ENOMEM;
-        a2232_driver->owner = THIS_MODULE;
-        a2232_driver->driver_name = "commodore_a2232";
-        a2232_driver->name = "ttyY";
-        a2232_driver->major = A2232_NORMAL_MAJOR;
-        a2232_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        a2232_driver->subtype = SERIAL_TYPE_NORMAL;
-        a2232_driver->init_termios = tty_std_termios;
-        a2232_driver->init_termios.c_cflag =
-                B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        a2232_driver->init_termios.c_ispeed = 9600;
-        a2232_driver->init_termios.c_ospeed = 9600;
-        a2232_driver->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(a2232_driver, &a2232_ops);
-        if ((error = tty_register_driver(a2232_driver))) {
-                printk(KERN_ERR "A2232: Couldn't register A2232 driver, error = %d\n",
-                       error);
-                put_tty_driver(a2232_driver);
-                return 1;
-        }
-        return 0;
-}
-
-static int __init a2232board_init(void)
-{
-        struct zorro_dev *z;
-
-        unsigned int boardaddr;
-        int bcount;
-        short start;
-        u_char *from;
-        volatile u_char *to;
-        volatile struct a2232memory *mem;
-        int error, i;
-
-#ifdef CONFIG_SMP
-        return -ENODEV; /* This driver is not SMP aware. Is there an SMP ZorroII-bus-machine? */
-#endif
-
-        if (!MACH_IS_AMIGA){
-                return -ENODEV;
-        }
-
-        printk("Commodore A2232 driver initializing.\n"); /* Say that we're alive. */
-
-        z = NULL;
-        nr_a2232 = 0;
-        while ( (z = zorro_find_device(ZORRO_WILDCARD, z)) ){
-                if (    (z->id != ZORRO_PROD_CBM_A2232_PROTOTYPE) && 
-                        (z->id != ZORRO_PROD_CBM_A2232) ){
-                        continue;       // The board found was no A2232
-                }
-                if (!zorro_request_device(z,"A2232 driver"))
-                        continue;
-
-                printk("Commodore A2232 found (#%d).\n",nr_a2232);
-
-                zd_a2232[nr_a2232] = z;
-
-                boardaddr = ZTWO_VADDR( z->resource.start );
-                printk("Board is located at address 0x%x, size is 0x%x.\n", boardaddr, (unsigned int) ((z->resource.end+1) - (z->resource.start)));
-
-                mem = (volatile struct a2232memory *) boardaddr;
-
-                (void) mem->Enable6502Reset;   /* copy the code across to the board */
-                to = (u_char *)mem;  from = a2232_65EC02code; bcount = sizeof(a2232_65EC02code) - 2;
-                start = *(short *)from;
-                from += sizeof(start);
-                to += start;
-                while(bcount--) *to++ = *from++;
-                printk("65EC02 software uploaded to the A2232 memory.\n");
-  
-                mem->Common.Crystal = A2232_UNKNOWN;  /* use automatic speed check */
-  
-                /* start 6502 running */
-                (void) mem->ResetBoard;
-                printk("A2232's 65EC02 CPU up and running.\n");
-  
-                /* wait until speed detector has finished */
-                for (bcount = 0; bcount < 2000; bcount++) {
-                        udelay(1000);
-                        if (mem->Common.Crystal)
-                                break;
-                }
-                printk((mem->Common.Crystal?"A2232 oscillator crystal detected by 65EC02 software: ":"65EC02 software could not determine A2232 oscillator crystal: "));
-                switch (mem->Common.Crystal){
-                case A2232_UNKNOWN:
-                        printk("Unknown crystal.\n");
-                        break;
-                case A2232_NORMAL:
-                        printk ("Normal crystal.\n");
-                        break;
-                case A2232_TURBO:
-                        printk ("Turbo crystal.\n");
-                        break;
-                default:
-                        printk ("0x%x. Huh?\n",mem->Common.Crystal);
-                }
-
-                nr_a2232++;
-
-        }       
-
-        printk("Total: %d A2232 boards initialized.\n", nr_a2232); /* Some status report if no card was found */
-
-        a2232_init_portstructs();
-
-        /*
-                a2232_init_drivers also registers the drivers. Must be here because all boards
-                have to be detected first.
-        */
-        if (a2232_init_drivers()) return -ENODEV; // maybe we should use a different -Exxx?
-
-        error = request_irq(IRQ_AMIGA_VERTB, a2232_vbl_inter, 0,
-                            "A2232 serial VBL", a2232_driver_ID);
-        if (error) {
-                for (i = 0; i < nr_a2232; i++)
-                        zorro_release_device(zd_a2232[i]);
-                tty_unregister_driver(a2232_driver);
-                put_tty_driver(a2232_driver);
-        }
-        return error;
-}
-
-static void __exit a2232board_exit(void)
-{
-        int i;
-
-        for (i = 0; i < nr_a2232; i++) {
-                zorro_release_device(zd_a2232[i]);
-        }
-
-        tty_unregister_driver(a2232_driver);
-        put_tty_driver(a2232_driver);
-        free_irq(IRQ_AMIGA_VERTB, a2232_driver_ID);
-}
-
-module_init(a2232board_init);
-module_exit(a2232board_exit);
-
-MODULE_AUTHOR("Enver Haase");
-MODULE_DESCRIPTION("Amiga A2232 multi-serial board driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/char/ser_a2232.h b/drivers/char/ser_a2232.h
deleted file mode 100644
index bc09eb9e118b..000000000000
--- a/drivers/char/ser_a2232.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/* drivers/char/ser_a2232.h */
-
-/* $Id: ser_a2232.h,v 0.4 2000/01/25 12:00:00 ehaase Exp $ */
-
-/* Linux serial driver for the Amiga A2232 board */
-
-/* This driver is MAINTAINED. Before applying any changes, please contact
- * the author.
- */
-   
-/* Copyright (c) 2000-2001 Enver Haase    <ehaase@inf.fu-berlin.de>
- *                   alias The A2232 driver project <A2232@gmx.net>
- * All rights reserved.
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *  
- */
-
-#ifndef _SER_A2232_H_
-#define _SER_A2232_H_
-
-/*
-        How many boards are to be supported at maximum;
-        "up to five A2232 Multiport Serial Cards may be installed in a
-        single Amiga 2000" states the A2232 User's Guide. If you have
-        more slots available, you might want to change the value below.
-*/
-#define MAX_A2232_BOARDS 5
-
-#ifndef A2232_NORMAL_MAJOR
-/* This allows overriding on the compiler commandline, or in a "major.h" 
-   include or something like that */
-#define A2232_NORMAL_MAJOR  224 /* /dev/ttyY* */
-#define A2232_CALLOUT_MAJOR 225 /* /dev/cuy*  */
-#endif
-
-/* Some magic is always good - Who knows :) */
-#define A2232_MAGIC 0x000a2232
-
-/* A2232 port structure to keep track of the
-   status of every single line used */
-struct a2232_port{
-        struct gs_port gs;
-        unsigned int which_a2232;
-        unsigned int which_port_on_a2232;
-        short disable_rx;
-        short throttle_input;
-        short cd_status;
-};
-
-#define NUMLINES                7       /* number of lines per board */
-#define A2232_IOBUFLEN          256     /* number of bytes per buffer */
-#define A2232_IOBUFLENMASK      0xff    /* mask for maximum number of bytes */
-
-
-#define A2232_UNKNOWN   0       /* crystal not known */
-#define A2232_NORMAL    1       /* normal A2232 (1.8432 MHz oscillator) */
-#define A2232_TURBO     2       /* turbo A2232 (3.6864 MHz oscillator) */
-
-
-struct a2232common {
-        char   Crystal; /* normal (1) or turbo (2) board? */
-        u_char Pad_a;
-        u_char TimerH;  /* timer value after speed check */
-        u_char TimerL;
-        u_char CDHead;  /* head pointer for CD message queue */
-        u_char CDTail;  /* tail pointer for CD message queue */
-        u_char CDStatus;
-        u_char Pad_b;
-};
-
-struct a2232status {
-        u_char InHead;          /* input queue head */
-        u_char InTail;          /* input queue tail */
-        u_char OutDisable;      /* disables output */
-        u_char OutHead;         /* output queue head */
-        u_char OutTail;         /* output queue tail */
-        u_char OutCtrl;         /* soft flow control character to send */
-        u_char OutFlush;        /* flushes output buffer */
-        u_char Setup;           /* causes reconfiguration */
-        u_char Param;           /* parameter byte - see A2232PARAM */
-        u_char Command;         /* command byte - see A2232CMD */
-        u_char SoftFlow;        /* enables xon/xoff flow control */
-        /* private 65EC02 fields: */
-        u_char XonOff;          /* stores XON/XOFF enable/disable */
-};
-
-#define A2232_MEMPAD1   \
-        (0x0200 - NUMLINES * sizeof(struct a2232status) -       \
-        sizeof(struct a2232common))
-#define A2232_MEMPAD2   (0x2000 - NUMLINES * A2232_IOBUFLEN - A2232_IOBUFLEN)
-
-struct a2232memory {
-        struct a2232status Status[NUMLINES];    /* 0x0000-0x006f status areas */
-        struct a2232common Common;              /* 0x0070-0x0077 common flags */
-        u_char Dummy1[A2232_MEMPAD1];           /* 0x00XX-0x01ff */
-        u_char OutBuf[NUMLINES][A2232_IOBUFLEN];/* 0x0200-0x08ff output bufs */
-        u_char InBuf[NUMLINES][A2232_IOBUFLEN]; /* 0x0900-0x0fff input bufs */
-        u_char InCtl[NUMLINES][A2232_IOBUFLEN]; /* 0x1000-0x16ff control data */
-        u_char CDBuf[A2232_IOBUFLEN];           /* 0x1700-0x17ff CD event buffer */
-        u_char Dummy2[A2232_MEMPAD2];           /* 0x1800-0x2fff */
-        u_char Code[0x1000];                    /* 0x3000-0x3fff code area */
-        u_short InterruptAck;                   /* 0x4000        intr ack */
-        u_char Dummy3[0x3ffe];                  /* 0x4002-0x7fff */
-        u_short Enable6502Reset;                /* 0x8000 Stop board, */
-                                                /*  6502 RESET line held low */
-        u_char Dummy4[0x3ffe];                  /* 0x8002-0xbfff */
-        u_short ResetBoard;                     /* 0xc000 reset board & run, */
-                                                /*  6502 RESET line held high */
-};
-
-#undef A2232_MEMPAD1
-#undef A2232_MEMPAD2
-
-#define A2232INCTL_CHAR         0       /* corresponding byte in InBuf is a character */
-#define A2232INCTL_EVENT        1       /* corresponding byte in InBuf is an event */
-
-#define A2232EVENT_Break        1       /* break set */
-#define A2232EVENT_CarrierOn    2       /* carrier raised */
-#define A2232EVENT_CarrierOff   3       /* carrier dropped */
-#define A2232EVENT_Sync         4       /* don't know, defined in 2232.ax */
-
-#define A2232CMD_Enable         0x1     /* enable/DTR bit */
-#define A2232CMD_Close          0x2     /* close the device */
-#define A2232CMD_Open           0xb     /* open the device */
-#define A2232CMD_CMask          0xf     /* command mask */
-#define A2232CMD_RTSOff         0x0     /* turn off RTS */
-#define A2232CMD_RTSOn          0x8     /* turn on RTS */
-#define A2232CMD_Break          0xd     /* transmit a break */
-#define A2232CMD_RTSMask        0xc     /* mask for RTS stuff */
-#define A2232CMD_NoParity       0x00    /* don't use parity */
-#define A2232CMD_OddParity      0x20    /* odd parity */
-#define A2232CMD_EvenParity     0x60    /* even parity */
-#define A2232CMD_ParityMask     0xe0    /* parity mask */
-
-#define A2232PARAM_B115200      0x0     /* baud rates */
-#define A2232PARAM_B50          0x1
-#define A2232PARAM_B75          0x2
-#define A2232PARAM_B110         0x3
-#define A2232PARAM_B134         0x4
-#define A2232PARAM_B150         0x5
-#define A2232PARAM_B300         0x6
-#define A2232PARAM_B600         0x7
-#define A2232PARAM_B1200        0x8
-#define A2232PARAM_B1800        0x9
-#define A2232PARAM_B2400        0xa
-#define A2232PARAM_B3600        0xb
-#define A2232PARAM_B4800        0xc
-#define A2232PARAM_B7200        0xd
-#define A2232PARAM_B9600        0xe
-#define A2232PARAM_B19200       0xf
-#define A2232PARAM_BaudMask     0xf     /* baud rate mask */
-#define A2232PARAM_RcvBaud      0x10    /* enable receive baud rate */
-#define A2232PARAM_8Bit         0x00    /* numbers of bits */
-#define A2232PARAM_7Bit         0x20
-#define A2232PARAM_6Bit         0x40
-#define A2232PARAM_5Bit         0x60
-#define A2232PARAM_BitMask      0x60    /* numbers of bits mask */
-
-
-/* Standard speeds tables, -1 means unavailable, -2 means 0 baud: switch off line */
-#define A2232_BAUD_TABLE_NOAVAIL -1
-#define A2232_BAUD_TABLE_NUM_RATES (18)
-static int a2232_baud_table[A2232_BAUD_TABLE_NUM_RATES*3] = {
-        //Baud  //Normal                        //Turbo
-        50,     A2232PARAM_B50,                 A2232_BAUD_TABLE_NOAVAIL,
-        75,     A2232PARAM_B75,                 A2232_BAUD_TABLE_NOAVAIL,
-        110,    A2232PARAM_B110,                A2232_BAUD_TABLE_NOAVAIL,
-        134,    A2232PARAM_B134,                A2232_BAUD_TABLE_NOAVAIL,
-        150,    A2232PARAM_B150,                A2232PARAM_B75,
-        200,    A2232_BAUD_TABLE_NOAVAIL,       A2232_BAUD_TABLE_NOAVAIL,
-        300,    A2232PARAM_B300,                A2232PARAM_B150,
-        600,    A2232PARAM_B600,                A2232PARAM_B300,
-        1200,   A2232PARAM_B1200,               A2232PARAM_B600,
-        1800,   A2232PARAM_B1800,               A2232_BAUD_TABLE_NOAVAIL,
-        2400,   A2232PARAM_B2400,               A2232PARAM_B1200,
-        4800,   A2232PARAM_B4800,               A2232PARAM_B2400,
-        9600,   A2232PARAM_B9600,               A2232PARAM_B4800,
-        19200,  A2232PARAM_B19200,              A2232PARAM_B9600,
-        38400,  A2232_BAUD_TABLE_NOAVAIL,       A2232PARAM_B19200,
-        57600,  A2232_BAUD_TABLE_NOAVAIL,       A2232_BAUD_TABLE_NOAVAIL,
-#ifdef A2232_SPEEDHACK
-        115200, A2232PARAM_B115200,             A2232_BAUD_TABLE_NOAVAIL,
-        230400, A2232_BAUD_TABLE_NOAVAIL,       A2232PARAM_B115200
-#else
-        115200, A2232_BAUD_TABLE_NOAVAIL,       A2232_BAUD_TABLE_NOAVAIL,
-        230400, A2232_BAUD_TABLE_NOAVAIL,       A2232_BAUD_TABLE_NOAVAIL
-#endif
-};
-#endif
diff --git a/drivers/char/ser_a2232fw.ax b/drivers/char/ser_a2232fw.ax
deleted file mode 100644
index 736438032768..000000000000
--- a/drivers/char/ser_a2232fw.ax
+++ /dev/null
@@ -1,529 +0,0 @@
-;.lib "axm"
-;
-;begin
-;title "A2232 serial board driver"
-;
-;set modules "2232"
-;set executable "2232.bin"
-;
-;;;;set nolink
-;
-;set temporary directory "t:"
-;
-;set assembly options "-m6502 -l60:t:list"
-;set link options "bin"; loadadr"
-;;;bin2c 2232.bin msc6502.h msc6502code
-;end
-;
-;
-; ### Commodore A2232 serial board driver for NetBSD by JM v1.3 ###
-;
-; - Created 950501 by JM -
-;
-;
-; Serial board driver software.
-;
-;
-% Copyright (c) 1995 Jukka Marin <jmarin@jmp.fi>.
-% All rights reserved.
-%
-% Redistribution and use in source and binary forms, with or without
-% modification, are permitted provided that the following conditions
-% are met:
-% 1. Redistributions of source code must retain the above copyright
-%    notice, and the entire permission notice in its entirety,
-%    including the disclaimer of warranties.
-% 2. Redistributions in binary form must reproduce the above copyright
-%    notice, this list of conditions and the following disclaimer in the
-%    documentation and/or other materials provided with the distribution.
-% 3. The name of the author may not be used to endorse or promote
-%    products derived from this software without specific prior
-%    written permission.
-%
-% ALTERNATIVELY, this product may be distributed under the terms of
-% the GNU General Public License, in which case the provisions of the
-% GPL are required INSTEAD OF the above restrictions.  (This clause is
-% necessary due to a potential bad interaction between the GPL and
-% the restrictions contained in a BSD-style copyright.)
-%
-% THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
-% WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-% OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-% DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-% INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-% (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-% SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-% HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-% STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-% ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-% OF THE POSSIBILITY OF SUCH DAMAGE.
-;
-;
-; Bugs:
-;
-; - Can't send a break yet
-;
-;
-;
-; Edited:
-;
-; - 950501 by JM -> v0.1        - Created this file.
-; - 951029 by JM -> v1.3        - Carrier Detect events now queued in a separate
-;                                 queue.
-;
-;
-
-
-CODE            equ     $3800           ; start address for program code
-
-
-CTL_CHAR        equ     $00             ; byte in ibuf is a character
-CTL_EVENT       equ     $01             ; byte in ibuf is an event
-
-EVENT_BREAK     equ     $01
-EVENT_CDON      equ     $02
-EVENT_CDOFF     equ     $03
-EVENT_SYNC      equ     $04
-
-XON             equ     $11
-XOFF            equ     $13
-
-
-VARBASE         macro   *starting_address       ; was VARINIT
-_varbase        set     \1
-                endm
-
-VARDEF          macro   *name space_needs
-\1              equ     _varbase
-_varbase        set     _varbase+\2
-                endm
-
-
-stz             macro   * address
-                 db     $64,\1
-                endm
-
-stzax           macro   * address
-                 db     $9e,<\1,>\1
-                endm
-
-
-biti            macro   * immediate value
-                db      $89,\1
-                endm
-
-smb0            macro   * address
-                db      $87,\1
-                endm
-smb1            macro   * address
-                db      $97,\1
-                endm
-smb2            macro   * address
-                db      $a7,\1
-                endm
-smb3            macro   * address
-                db      $b7,\1
-                endm
-smb4            macro   * address
-                db      $c7,\1
-                endm
-smb5            macro   * address
-                db      $d7,\1
-                endm
-smb6            macro   * address
-                db      $e7,\1
-                endm
-smb7            macro   * address
-                db      $f7,\1
-                endm
-
-
-
-;-----------------------------------------------------------------------;
-;                                                                       ;
-; stuff common for all ports, non-critical (run once / loop)            ;
-;                                                                       ;
-DO_SLOW         macro   * port_number                                   ;
-                .local                  ;                               ;
-                lda     CIA+C_PA        ; check all CD inputs           ;
-                cmp     CommonCDo       ; changed from previous accptd? ;
-                beq     =over           ; nope, do nothing else here    ;
-                                        ;                               ;
-                cmp     CommonCDb       ; bouncing?                     ;
-                beq     =nobounce       ; nope ->                       ;
-                                        ;                               ;
-                sta     CommonCDb       ; save current state            ;
-                lda     #64             ; reinitialize counter          ;
-                sta     CommonCDc       ;                               ;
-                jmp     =over           ; skip CD save                  ;
-                                        ;                               ;
-=nobounce       dec     CommonCDc       ; no, decrement bounce counter  ;
-                bpl     =over           ; not done yet, so skip CD save ;
-                                        ;                               ;
-=saveCD         ldx     CDHead          ; get write index               ;
-                sta     cdbuf,x         ; save status in buffer         ;
-                inx                     ;                               ;
-                cpx     CDTail          ; buffer full?                  ;
-                .if     ne              ; no: preserve status:          ;
-                 stx    CDHead          ; update index in RAM           ;
-                 sta    CommonCDo       ; save state for the next check ;
-                .end                    ;                               ;
-=over           .end    local                                           ;
-                endm                                                    ;
-                                                                        ;
-;-----------------------------------------------------------------------;
-
-
-; port specific stuff (no data transfer)
-
-DO_PORT         macro   * port_number
-                .local                  ;                               ;
-                lda     SetUp\1         ; reconfiguration request?      ;
-                .if     ne              ; yes:                          ;
-                 lda    SoftFlow\1      ; get XON/XOFF flag             ;
-                 sta    XonOff\1        ; save it                       ;
-                 lda    Param\1         ; get parameter                 ;
-                 ora    #%00010000      ; use baud generator for Rx     ;
-                 sta    ACIA\1+A_CTRL   ; store in control register     ;
-                 stz    OutDisable\1    ; enable transmit output        ;
-                 stz    SetUp\1         ; no reconfiguration no more    ;
-                .end                    ;                               ;
-                                        ;                               ;
-                lda     InHead\1        ; get write index               ;
-                sbc     InTail\1        ; buffer full soon?             ;
-                cmp     #200            ; 200 chars or more in buffer?  ;
-                lda     Command\1       ; get Command reg value         ;
-                and     #%11110011      ; turn RTS OFF by default       ;
-                .if     cc              ; still room in buffer:         ;
-                 ora    #%00001000      ; turn RTS ON                   ;
-                .end                    ;                               ;
-                sta     ACIA\1+A_CMD    ; set/clear RTS                 ;
-                                        ;                               ;
-                lda     OutFlush\1      ; request to flush output buffer;
-                .if     ne              ; yessh!                        ;
-                 lda    OutHead\1       ; get head                      ;
-                 sta    OutTail\1       ; save as tail                  ;
-                 stz    OutDisable\1    ; enable transmit output        ;
-                 stz    OutFlush\1      ; clear request                 ;
-                .end
-                .end    local
-                endm
-
-
-DO_DATA         macro   * port number
-                .local
-                lda     ACIA\1+A_SR     ; read ACIA status register     ;
-                biti    [1<<3]          ; something received?           ;
-                .if     ne              ; yes:                          ;
-                 biti   [1<<1]          ; framing error?                ;
-                 .if    ne              ; yes:                          ;
-                  lda   ACIA\1+A_DATA   ; read received character       ;
-                  bne   =SEND           ; not break -> ignore it        ;
-                  ldx   InHead\1        ; get write pointer             ;
-                  lda   #CTL_EVENT      ; get type of byte              ;
-                  sta   ictl\1,x        ; save it in InCtl buffer       ;
-                  lda   #EVENT_BREAK    ; event code                    ;
-                  sta   ibuf\1,x        ; save it as well               ;
-                  inx                   ;                               ;
-                  cpx   InTail\1        ; still room in buffer?         ;
-                  .if   ne              ; absolutely:                   ;
-                   stx  InHead\1        ; update index in memory        ;
-                  .end                  ;                               ;
-                  jmp   =SEND           ; go check if anything to send  ;
-                 .end                   ;                               ;
-                                        ; normal char received:         ;
-                 ldx    InHead\1        ; get write index               ;
-                 lda    ACIA\1+A_DATA   ; read received character       ;
-                 sta    ibuf\1,x        ; save char in buffer           ;
-                 stzax  ictl\1          ; set type to CTL_CHAR          ;
-                 inx                    ;                               ;
-                 cpx    InTail\1        ; buffer full?                  ;
-                 .if    ne              ; no: preserve character:       ;
-                  stx   InHead\1        ; update index in RAM           ;
-                 .end                   ;                               ;
-                 and    #$7f            ; mask off parity if any        ;
-                 cmp    #XOFF           ; XOFF from remote host?        ;
-                 .if    eq              ; yes:                          ;
-                  lda   XonOff\1        ; if XON/XOFF handshaking..     ;
-                  sta   OutDisable\1    ; ..disable transmitter         ;
-                 .end                   ;                               ;
-                .end                    ;                               ;
-                                        ;                               ;
-                                        ; BUFFER FULL CHECK WAS HERE    ;
-                                        ;                               ;
-=SEND           lda     ACIA\1+A_SR     ; transmit register empty?      ;
-                and     #[1<<4]         ;                               ;
-                .if     ne              ; yes:                          ;
-                 ldx    OutCtrl\1       ; sending out XON/XOFF?         ;
-                 .if    ne              ; yes:                          ;
-                  lda   CIA+C_PB        ; check CTS signal              ;
-                  and   #[1<<\1]        ; (for this port only)          ;
-                  bne   =DONE           ; not allowed to send -> done   ;
-                  stx   ACIA\1+A_DATA   ; transmit control char         ;
-                  stz   OutCtrl\1       ; clear flag                    ;
-                  jmp   =DONE           ; and we're done                ;
-                 .end                   ;                               ;
-                                        ;                               ;
-                 ldx    OutTail\1       ; anything to transmit?         ;
-                 cpx    OutHead\1       ;                               ;
-                 .if    ne              ; yes:                          ;
-                  lda   OutDisable\1    ; allowed to transmit?          ;
-                  .if   eq              ; yes:                          ;
-                   lda  CIA+C_PB        ; check CTS signal              ;
-                   and  #[1<<\1]        ; (for this port only)          ;
-                   bne  =DONE           ; not allowed to send -> done   ;
-                   lda  obuf\1,x        ; get a char from buffer        ;
-                   sta  ACIA\1+A_DATA   ; send it away                  ;
-                   inc  OutTail\1       ; update read index             ;
-                  .end                  ;                               ;
-                 .end                   ;                               ;
-                .end                    ;                               ;
-=DONE           .end    local
-                endm
-
-
-
-PORTVAR         macro   * port number
-                VARDEF  InHead\1 1
-                VARDEF  InTail\1 1
-                VARDEF  OutDisable\1 1
-                VARDEF  OutHead\1 1
-                VARDEF  OutTail\1 1
-                VARDEF  OutCtrl\1 1
-                VARDEF  OutFlush\1 1
-                VARDEF  SetUp\1 1
-                VARDEF  Param\1 1
-                VARDEF  Command\1 1
-                VARDEF  SoftFlow\1 1
-                ; private:
-                VARDEF  XonOff\1 1
-                endm
-
-
- VARBASE 0      ; start variables at address $0000
- PORTVAR 0      ; define variables for port 0
- PORTVAR 1      ; define variables for port 1
- PORTVAR 2      ; define variables for port 2
- PORTVAR 3      ; define variables for port 3
- PORTVAR 4      ; define variables for port 4
- PORTVAR 5      ; define variables for port 5
- PORTVAR 6      ; define variables for port 6
-
-
-
- VARDEF Crystal 1       ; 0 = unknown, 1 = normal, 2 = turbo
- VARDEF Pad_a   1
- VARDEF TimerH  1
- VARDEF TimerL  1
- VARDEF CDHead  1
- VARDEF CDTail  1
- VARDEF CDStatus 1
- VARDEF Pad_b   1
-
- VARDEF CommonCDo 1     ; for carrier detect optimization
- VARDEF CommonCDc 1     ; for carrier detect debouncing
- VARDEF CommonCDb 1     ; for carrier detect debouncing
-
-
- VARBASE $0200
- VARDEF obuf0 256       ; output data (characters only)
- VARDEF obuf1 256
- VARDEF obuf2 256
- VARDEF obuf3 256
- VARDEF obuf4 256
- VARDEF obuf5 256
- VARDEF obuf6 256
-
- VARDEF ibuf0 256       ; input data (characters, events etc - see ictl)
- VARDEF ibuf1 256
- VARDEF ibuf2 256
- VARDEF ibuf3 256
- VARDEF ibuf4 256
- VARDEF ibuf5 256
- VARDEF ibuf6 256
-
- VARDEF ictl0 256       ; input control information (type of data in ibuf)
- VARDEF ictl1 256
- VARDEF ictl2 256
- VARDEF ictl3 256
- VARDEF ictl4 256
- VARDEF ictl5 256
- VARDEF ictl6 256
-
- VARDEF cdbuf 256       ; CD event queue
-
-
-ACIA0           equ     $4400
-ACIA1           equ     $4c00
-ACIA2           equ     $5400
-ACIA3           equ     $5c00
-ACIA4           equ     $6400
-ACIA5           equ     $6c00
-ACIA6           equ     $7400
-
-A_DATA          equ     $00
-A_SR            equ     $02
-A_CMD           equ     $04
-A_CTRL          equ     $06
-;  00   write transmit data     read received data
-;  02   reset ACIA              read status register
-;  04   write command register  read command register
-;  06   write control register  read control register
-
-CIA             equ     $7c00           ; 8520 CIA
-C_PA            equ     $00             ; port A data register
-C_PB            equ     $02             ; port B data register
-C_DDRA          equ     $04             ; data direction register for port A
-C_DDRB          equ     $06             ; data direction register for port B
-C_TAL           equ     $08             ; timer A
-C_TAH           equ     $0a
-C_TBL           equ     $0c             ; timer B
-C_TBH           equ     $0e
-C_TODL          equ     $10             ; TOD LSB
-C_TODM          equ     $12             ; TOD middle byte
-C_TODH          equ     $14             ; TOD MSB
-C_DATA          equ     $18             ; serial data register
-C_INTCTRL       equ     $1a             ; interrupt control register
-C_CTRLA         equ     $1c             ; control register A
-C_CTRLB         equ     $1e             ; control register B
-
-
-
-
-
-                section main,code,CODE-2
-
-                db      >CODE,<CODE
-
-;-----------------------------------------------------------------------;
-; here's the initialization code:                                       ;
-;                                                                       ;
-R_RESET         ldx     #$ff                                            ;
-                txs                     ; initialize stack pointer      ;
-                cld                     ; in case a 6502 is used...     ;
-                ldx     #0              ;                               ;
-                lda     #0              ;                               ;
-                ldy     #Crystal        ; this many bytes to clear      ;
-clr_loop        sta     0,x             ; clear zero page variables     ;
-                inx                     ;                               ;
-                dey                     ;                               ;
-                bne     clr_loop        ;                               ;
-                                        ;                               ;
-                stz     CommonCDo       ; force CD test at boot         ;
-                stz     CommonCDb       ;                               ;
-                stz     CDHead          ; clear queue                   ;
-                stz     CDTail          ;                               ;
-                                        ;                               ;
-                lda     #0              ;                               ;
-                sta     Pad_a           ;                               ;
-                lda     #170            ; test cmp                      ;
-                cmp     #100            ;                               ;
-                .if     cs              ;                               ;
-                 inc    Pad_a           ; C was set                     ;
-                .end                    ;                               ;
-                                                                        ;
-;-----------------------------------------------------------------------;
-; Speed check                                                           ;
-;-----------------------------------------------------------------------;
-                                                                        ;
-                lda     Crystal         ; speed already set?            ;
-                beq     DoSpeedy        ;                               ;
-                jmp     LOOP            ; yes, skip speed test          ;
-                                        ;                               ;
-DoSpeedy        lda     #%10011000      ; 8N1, 1200/2400 bps            ;
-                sta     ACIA0+A_CTRL    ;                               ;
-                lda     #%00001011      ; enable DTR                    ;
-                sta     ACIA0+A_CMD     ;                               ;
-                lda     ACIA0+A_SR      ; read status register          ;
-                                        ;                               ;
-                lda     #%10000000      ; disable all ints (unnecessary);
-                sta     CIA+C_INTCTRL   ;                               ;
-                lda     #255            ; program the timer             ;
-                sta     CIA+C_TAL       ;                               ;
-                sta     CIA+C_TAH       ;                               ;
-                                        ;                               ;
-                ldx     #0              ;                               ;
-                stx     ACIA0+A_DATA    ; transmit a zero               ;
-                nop                     ;                               ;
-                nop                     ;                               ;
-                lda     ACIA0+A_SR      ; read status                   ;
-                nop                     ;                               ;
-                nop                     ;                               ;
-                stx     ACIA0+A_DATA    ; transmit a zero               ;
-Speedy1         lda     ACIA0+A_SR      ; read status                   ;
-                and     #[1<<4]         ; transmit data reg empty?      ;
-                beq     Speedy1         ; not yet, wait more            ;
-                                        ;                               ;
-                lda     #%00010001      ; load & start the timer        ;
-                stx     ACIA0+A_DATA    ; transmit one more zero        ;
-                sta     CIA+C_CTRLA     ;                               ;
-Speedy2         lda     ACIA0+A_SR      ; read status                   ;
-                and     #[1<<4]         ; transmit data reg empty?      ;
-                beq     Speedy2         ; not yet, wait more            ;
-                stx     CIA+C_CTRLA     ; stop the timer                ;
-                                        ;                               ;
-                lda     CIA+C_TAL       ; copy timer value for 68k      ;
-                sta     TimerL          ;                               ;
-                lda     CIA+C_TAH       ;                               ;
-                sta     TimerH          ;                               ;
-                cmp     #$d0            ; turbo or normal?              ;
-                .if     cs              ;                               ;
-                 lda    #2              ; turbo! :-)                    ;
-                .else                   ;                               ;
-                 lda    #1              ; normal :-(                    ;
-                .end                    ;                               ;
-                sta     Crystal         ;                               ;
-                lda     #0              ;                               ;
-                sta     ACIA0+A_SR      ;                               ;
-                sta     ACIA0+A_CTRL    ; reset UART                    ;
-                sta     ACIA0+A_CMD     ;                               ;
-                                                                        ;
-                jmp     LOOP                                            ;
-                                                                        ;
-;                                                                       ;
-;-----------------------------------------------------------------------;
-;                                                                       ;
-; The Real Thing:                                                       ;
-;                                                                       ;
-LOOP            DO_SLOW                 ; do non-critical things        ;
-                jsr     do_input        ; check for received data
-                DO_PORT 0
-                jsr     do_input
-                DO_PORT 1
-                jsr     do_input
-                DO_PORT 2
-                jsr     do_input
-                DO_PORT 3
-                jsr     do_input
-                DO_PORT 4
-                jsr     do_input
-                DO_PORT 5
-                jsr     do_input
-                DO_PORT 6
-                jsr     do_input
-                jmp     LOOP
-
-
-do_input        DO_DATA 0
-                DO_DATA 1
-                DO_DATA 2
-                DO_DATA 3
-                DO_DATA 4
-                DO_DATA 5
-                DO_DATA 6
-                rts
-
-
-;-----------------------------------------------------------------------;
-                section vectors,data,$3ffa
-                dw      $d0d0
-                dw      R_RESET
-                dw      $c0ce
-;-----------------------------------------------------------------------;
-
-
-
-                end
-
-
-
diff --git a/drivers/char/ser_a2232fw.h b/drivers/char/ser_a2232fw.h
deleted file mode 100644
index e09a30acfe5c..000000000000
--- a/drivers/char/ser_a2232fw.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/* drivers/char/ser_a2232fw.h */
-
-/* $Id: ser_a2232fw.h,v 0.4 2000/01/25 12:00:00 ehaase Exp $ */
-
-/*
- * Copyright (c) 1995 Jukka Marin <jmarin@jmp.fi>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, and the entire permission notice in its entirety,
- *    including the disclaimer of warranties.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions.  (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
- *
- * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-                                      
-/* This is the 65EC02 code by Jukka Marin that is executed by
-   the A2232's 65EC02 processor (base address: 0x3800)
-   Source file: ser_a2232fw.ax
-   Version:     1.3 (951029)
-   Known Bugs:  Cannot send a break yet
-*/
-static unsigned char a2232_65EC02code[] = {
-        0x38, 0x00, 0xA2, 0xFF, 0x9A, 0xD8, 0xA2, 0x00, 
-        0xA9, 0x00, 0xA0, 0x54, 0x95, 0x00, 0xE8, 0x88, 
-        0xD0, 0xFA, 0x64, 0x5C, 0x64, 0x5E, 0x64, 0x58, 
-        0x64, 0x59, 0xA9, 0x00, 0x85, 0x55, 0xA9, 0xAA, 
-        0xC9, 0x64, 0x90, 0x02, 0xE6, 0x55, 0xA5, 0x54, 
-        0xF0, 0x03, 0x4C, 0x92, 0x38, 0xA9, 0x98, 0x8D, 
-        0x06, 0x44, 0xA9, 0x0B, 0x8D, 0x04, 0x44, 0xAD, 
-        0x02, 0x44, 0xA9, 0x80, 0x8D, 0x1A, 0x7C, 0xA9, 
-        0xFF, 0x8D, 0x08, 0x7C, 0x8D, 0x0A, 0x7C, 0xA2, 
-        0x00, 0x8E, 0x00, 0x44, 0xEA, 0xEA, 0xAD, 0x02, 
-        0x44, 0xEA, 0xEA, 0x8E, 0x00, 0x44, 0xAD, 0x02, 
-        0x44, 0x29, 0x10, 0xF0, 0xF9, 0xA9, 0x11, 0x8E, 
-        0x00, 0x44, 0x8D, 0x1C, 0x7C, 0xAD, 0x02, 0x44, 
-        0x29, 0x10, 0xF0, 0xF9, 0x8E, 0x1C, 0x7C, 0xAD, 
-        0x08, 0x7C, 0x85, 0x57, 0xAD, 0x0A, 0x7C, 0x85, 
-        0x56, 0xC9, 0xD0, 0x90, 0x05, 0xA9, 0x02, 0x4C, 
-        0x82, 0x38, 0xA9, 0x01, 0x85, 0x54, 0xA9, 0x00, 
-        0x8D, 0x02, 0x44, 0x8D, 0x06, 0x44, 0x8D, 0x04, 
-        0x44, 0x4C, 0x92, 0x38, 0xAD, 0x00, 0x7C, 0xC5, 
-        0x5C, 0xF0, 0x1F, 0xC5, 0x5E, 0xF0, 0x09, 0x85, 
-        0x5E, 0xA9, 0x40, 0x85, 0x5D, 0x4C, 0xB8, 0x38, 
-        0xC6, 0x5D, 0x10, 0x0E, 0xA6, 0x58, 0x9D, 0x00, 
-        0x17, 0xE8, 0xE4, 0x59, 0xF0, 0x04, 0x86, 0x58, 
-        0x85, 0x5C, 0x20, 0x23, 0x3A, 0xA5, 0x07, 0xF0, 
-        0x0F, 0xA5, 0x0A, 0x85, 0x0B, 0xA5, 0x08, 0x09, 
-        0x10, 0x8D, 0x06, 0x44, 0x64, 0x02, 0x64, 0x07, 
-        0xA5, 0x00, 0xE5, 0x01, 0xC9, 0xC8, 0xA5, 0x09, 
-        0x29, 0xF3, 0xB0, 0x02, 0x09, 0x08, 0x8D, 0x04, 
-        0x44, 0xA5, 0x06, 0xF0, 0x08, 0xA5, 0x03, 0x85, 
-        0x04, 0x64, 0x02, 0x64, 0x06, 0x20, 0x23, 0x3A, 
-        0xA5, 0x13, 0xF0, 0x0F, 0xA5, 0x16, 0x85, 0x17, 
-        0xA5, 0x14, 0x09, 0x10, 0x8D, 0x06, 0x4C, 0x64, 
-        0x0E, 0x64, 0x13, 0xA5, 0x0C, 0xE5, 0x0D, 0xC9, 
-        0xC8, 0xA5, 0x15, 0x29, 0xF3, 0xB0, 0x02, 0x09, 
-        0x08, 0x8D, 0x04, 0x4C, 0xA5, 0x12, 0xF0, 0x08, 
-        0xA5, 0x0F, 0x85, 0x10, 0x64, 0x0E, 0x64, 0x12, 
-        0x20, 0x23, 0x3A, 0xA5, 0x1F, 0xF0, 0x0F, 0xA5, 
-        0x22, 0x85, 0x23, 0xA5, 0x20, 0x09, 0x10, 0x8D, 
-        0x06, 0x54, 0x64, 0x1A, 0x64, 0x1F, 0xA5, 0x18, 
-        0xE5, 0x19, 0xC9, 0xC8, 0xA5, 0x21, 0x29, 0xF3, 
-        0xB0, 0x02, 0x09, 0x08, 0x8D, 0x04, 0x54, 0xA5, 
-        0x1E, 0xF0, 0x08, 0xA5, 0x1B, 0x85, 0x1C, 0x64, 
-        0x1A, 0x64, 0x1E, 0x20, 0x23, 0x3A, 0xA5, 0x2B, 
-        0xF0, 0x0F, 0xA5, 0x2E, 0x85, 0x2F, 0xA5, 0x2C, 
-        0x09, 0x10, 0x8D, 0x06, 0x5C, 0x64, 0x26, 0x64, 
-        0x2B, 0xA5, 0x24, 0xE5, 0x25, 0xC9, 0xC8, 0xA5, 
-        0x2D, 0x29, 0xF3, 0xB0, 0x02, 0x09, 0x08, 0x8D, 
-        0x04, 0x5C, 0xA5, 0x2A, 0xF0, 0x08, 0xA5, 0x27, 
-        0x85, 0x28, 0x64, 0x26, 0x64, 0x2A, 0x20, 0x23, 
-        0x3A, 0xA5, 0x37, 0xF0, 0x0F, 0xA5, 0x3A, 0x85, 
-        0x3B, 0xA5, 0x38, 0x09, 0x10, 0x8D, 0x06, 0x64, 
-        0x64, 0x32, 0x64, 0x37, 0xA5, 0x30, 0xE5, 0x31, 
-        0xC9, 0xC8, 0xA5, 0x39, 0x29, 0xF3, 0xB0, 0x02, 
-        0x09, 0x08, 0x8D, 0x04, 0x64, 0xA5, 0x36, 0xF0, 
-        0x08, 0xA5, 0x33, 0x85, 0x34, 0x64, 0x32, 0x64, 
-        0x36, 0x20, 0x23, 0x3A, 0xA5, 0x43, 0xF0, 0x0F, 
-        0xA5, 0x46, 0x85, 0x47, 0xA5, 0x44, 0x09, 0x10, 
-        0x8D, 0x06, 0x6C, 0x64, 0x3E, 0x64, 0x43, 0xA5, 
-        0x3C, 0xE5, 0x3D, 0xC9, 0xC8, 0xA5, 0x45, 0x29, 
-        0xF3, 0xB0, 0x02, 0x09, 0x08, 0x8D, 0x04, 0x6C, 
-        0xA5, 0x42, 0xF0, 0x08, 0xA5, 0x3F, 0x85, 0x40, 
-        0x64, 0x3E, 0x64, 0x42, 0x20, 0x23, 0x3A, 0xA5, 
-        0x4F, 0xF0, 0x0F, 0xA5, 0x52, 0x85, 0x53, 0xA5, 
-        0x50, 0x09, 0x10, 0x8D, 0x06, 0x74, 0x64, 0x4A, 
-        0x64, 0x4F, 0xA5, 0x48, 0xE5, 0x49, 0xC9, 0xC8, 
-        0xA5, 0x51, 0x29, 0xF3, 0xB0, 0x02, 0x09, 0x08, 
-        0x8D, 0x04, 0x74, 0xA5, 0x4E, 0xF0, 0x08, 0xA5, 
-        0x4B, 0x85, 0x4C, 0x64, 0x4A, 0x64, 0x4E, 0x20, 
-        0x23, 0x3A, 0x4C, 0x92, 0x38, 0xAD, 0x02, 0x44, 
-        0x89, 0x08, 0xF0, 0x3B, 0x89, 0x02, 0xF0, 0x1B, 
-        0xAD, 0x00, 0x44, 0xD0, 0x32, 0xA6, 0x00, 0xA9, 
-        0x01, 0x9D, 0x00, 0x10, 0xA9, 0x01, 0x9D, 0x00, 
-        0x09, 0xE8, 0xE4, 0x01, 0xF0, 0x02, 0x86, 0x00, 
-        0x4C, 0x65, 0x3A, 0xA6, 0x00, 0xAD, 0x00, 0x44, 
-        0x9D, 0x00, 0x09, 0x9E, 0x00, 0x10, 0xE8, 0xE4, 
-        0x01, 0xF0, 0x02, 0x86, 0x00, 0x29, 0x7F, 0xC9, 
-        0x13, 0xD0, 0x04, 0xA5, 0x0B, 0x85, 0x02, 0xAD, 
-        0x02, 0x44, 0x29, 0x10, 0xF0, 0x2C, 0xA6, 0x05, 
-        0xF0, 0x0F, 0xAD, 0x02, 0x7C, 0x29, 0x01, 0xD0, 
-        0x21, 0x8E, 0x00, 0x44, 0x64, 0x05, 0x4C, 0x98, 
-        0x3A, 0xA6, 0x04, 0xE4, 0x03, 0xF0, 0x13, 0xA5, 
-        0x02, 0xD0, 0x0F, 0xAD, 0x02, 0x7C, 0x29, 0x01, 
-        0xD0, 0x08, 0xBD, 0x00, 0x02, 0x8D, 0x00, 0x44, 
-        0xE6, 0x04, 0xAD, 0x02, 0x4C, 0x89, 0x08, 0xF0, 
-        0x3B, 0x89, 0x02, 0xF0, 0x1B, 0xAD, 0x00, 0x4C, 
-        0xD0, 0x32, 0xA6, 0x0C, 0xA9, 0x01, 0x9D, 0x00, 
-        0x11, 0xA9, 0x01, 0x9D, 0x00, 0x0A, 0xE8, 0xE4, 
-        0x0D, 0xF0, 0x02, 0x86, 0x0C, 0x4C, 0xDA, 0x3A, 
-        0xA6, 0x0C, 0xAD, 0x00, 0x4C, 0x9D, 0x00, 0x0A, 
-        0x9E, 0x00, 0x11, 0xE8, 0xE4, 0x0D, 0xF0, 0x02, 
-        0x86, 0x0C, 0x29, 0x7F, 0xC9, 0x13, 0xD0, 0x04, 
-        0xA5, 0x17, 0x85, 0x0E, 0xAD, 0x02, 0x4C, 0x29, 
-        0x10, 0xF0, 0x2C, 0xA6, 0x11, 0xF0, 0x0F, 0xAD, 
-        0x02, 0x7C, 0x29, 0x02, 0xD0, 0x21, 0x8E, 0x00, 
-        0x4C, 0x64, 0x11, 0x4C, 0x0D, 0x3B, 0xA6, 0x10, 
-        0xE4, 0x0F, 0xF0, 0x13, 0xA5, 0x0E, 0xD0, 0x0F, 
-        0xAD, 0x02, 0x7C, 0x29, 0x02, 0xD0, 0x08, 0xBD, 
-        0x00, 0x03, 0x8D, 0x00, 0x4C, 0xE6, 0x10, 0xAD, 
-        0x02, 0x54, 0x89, 0x08, 0xF0, 0x3B, 0x89, 0x02, 
-        0xF0, 0x1B, 0xAD, 0x00, 0x54, 0xD0, 0x32, 0xA6, 
-        0x18, 0xA9, 0x01, 0x9D, 0x00, 0x12, 0xA9, 0x01, 
-        0x9D, 0x00, 0x0B, 0xE8, 0xE4, 0x19, 0xF0, 0x02, 
-        0x86, 0x18, 0x4C, 0x4F, 0x3B, 0xA6, 0x18, 0xAD, 
-        0x00, 0x54, 0x9D, 0x00, 0x0B, 0x9E, 0x00, 0x12, 
-        0xE8, 0xE4, 0x19, 0xF0, 0x02, 0x86, 0x18, 0x29, 
-        0x7F, 0xC9, 0x13, 0xD0, 0x04, 0xA5, 0x23, 0x85, 
-        0x1A, 0xAD, 0x02, 0x54, 0x29, 0x10, 0xF0, 0x2C, 
-        0xA6, 0x1D, 0xF0, 0x0F, 0xAD, 0x02, 0x7C, 0x29, 
-        0x04, 0xD0, 0x21, 0x8E, 0x00, 0x54, 0x64, 0x1D, 
-        0x4C, 0x82, 0x3B, 0xA6, 0x1C, 0xE4, 0x1B, 0xF0, 
-        0x13, 0xA5, 0x1A, 0xD0, 0x0F, 0xAD, 0x02, 0x7C, 
-        0x29, 0x04, 0xD0, 0x08, 0xBD, 0x00, 0x04, 0x8D, 
-        0x00, 0x54, 0xE6, 0x1C, 0xAD, 0x02, 0x5C, 0x89, 
-        0x08, 0xF0, 0x3B, 0x89, 0x02, 0xF0, 0x1B, 0xAD, 
-        0x00, 0x5C, 0xD0, 0x32, 0xA6, 0x24, 0xA9, 0x01, 
-        0x9D, 0x00, 0x13, 0xA9, 0x01, 0x9D, 0x00, 0x0C, 
-        0xE8, 0xE4, 0x25, 0xF0, 0x02, 0x86, 0x24, 0x4C, 
-        0xC4, 0x3B, 0xA6, 0x24, 0xAD, 0x00, 0x5C, 0x9D, 
-        0x00, 0x0C, 0x9E, 0x00, 0x13, 0xE8, 0xE4, 0x25, 
-        0xF0, 0x02, 0x86, 0x24, 0x29, 0x7F, 0xC9, 0x13, 
-        0xD0, 0x04, 0xA5, 0x2F, 0x85, 0x26, 0xAD, 0x02, 
-        0x5C, 0x29, 0x10, 0xF0, 0x2C, 0xA6, 0x29, 0xF0, 
-        0x0F, 0xAD, 0x02, 0x7C, 0x29, 0x08, 0xD0, 0x21, 
-        0x8E, 0x00, 0x5C, 0x64, 0x29, 0x4C, 0xF7, 0x3B, 
-        0xA6, 0x28, 0xE4, 0x27, 0xF0, 0x13, 0xA5, 0x26, 
-        0xD0, 0x0F, 0xAD, 0x02, 0x7C, 0x29, 0x08, 0xD0, 
-        0x08, 0xBD, 0x00, 0x05, 0x8D, 0x00, 0x5C, 0xE6, 
-        0x28, 0xAD, 0x02, 0x64, 0x89, 0x08, 0xF0, 0x3B, 
-        0x89, 0x02, 0xF0, 0x1B, 0xAD, 0x00, 0x64, 0xD0, 
-        0x32, 0xA6, 0x30, 0xA9, 0x01, 0x9D, 0x00, 0x14, 
-        0xA9, 0x01, 0x9D, 0x00, 0x0D, 0xE8, 0xE4, 0x31, 
-        0xF0, 0x02, 0x86, 0x30, 0x4C, 0x39, 0x3C, 0xA6, 
-        0x30, 0xAD, 0x00, 0x64, 0x9D, 0x00, 0x0D, 0x9E, 
-        0x00, 0x14, 0xE8, 0xE4, 0x31, 0xF0, 0x02, 0x86, 
-        0x30, 0x29, 0x7F, 0xC9, 0x13, 0xD0, 0x04, 0xA5, 
-        0x3B, 0x85, 0x32, 0xAD, 0x02, 0x64, 0x29, 0x10, 
-        0xF0, 0x2C, 0xA6, 0x35, 0xF0, 0x0F, 0xAD, 0x02, 
-        0x7C, 0x29, 0x10, 0xD0, 0x21, 0x8E, 0x00, 0x64, 
-        0x64, 0x35, 0x4C, 0x6C, 0x3C, 0xA6, 0x34, 0xE4, 
-        0x33, 0xF0, 0x13, 0xA5, 0x32, 0xD0, 0x0F, 0xAD, 
-        0x02, 0x7C, 0x29, 0x10, 0xD0, 0x08, 0xBD, 0x00, 
-        0x06, 0x8D, 0x00, 0x64, 0xE6, 0x34, 0xAD, 0x02, 
-        0x6C, 0x89, 0x08, 0xF0, 0x3B, 0x89, 0x02, 0xF0, 
-        0x1B, 0xAD, 0x00, 0x6C, 0xD0, 0x32, 0xA6, 0x3C, 
-        0xA9, 0x01, 0x9D, 0x00, 0x15, 0xA9, 0x01, 0x9D, 
-        0x00, 0x0E, 0xE8, 0xE4, 0x3D, 0xF0, 0x02, 0x86, 
-        0x3C, 0x4C, 0xAE, 0x3C, 0xA6, 0x3C, 0xAD, 0x00, 
-        0x6C, 0x9D, 0x00, 0x0E, 0x9E, 0x00, 0x15, 0xE8, 
-        0xE4, 0x3D, 0xF0, 0x02, 0x86, 0x3C, 0x29, 0x7F, 
-        0xC9, 0x13, 0xD0, 0x04, 0xA5, 0x47, 0x85, 0x3E, 
-        0xAD, 0x02, 0x6C, 0x29, 0x10, 0xF0, 0x2C, 0xA6, 
-        0x41, 0xF0, 0x0F, 0xAD, 0x02, 0x7C, 0x29, 0x20, 
-        0xD0, 0x21, 0x8E, 0x00, 0x6C, 0x64, 0x41, 0x4C, 
-        0xE1, 0x3C, 0xA6, 0x40, 0xE4, 0x3F, 0xF0, 0x13, 
-        0xA5, 0x3E, 0xD0, 0x0F, 0xAD, 0x02, 0x7C, 0x29, 
-        0x20, 0xD0, 0x08, 0xBD, 0x00, 0x07, 0x8D, 0x00, 
-        0x6C, 0xE6, 0x40, 0xAD, 0x02, 0x74, 0x89, 0x08, 
-        0xF0, 0x3B, 0x89, 0x02, 0xF0, 0x1B, 0xAD, 0x00, 
-        0x74, 0xD0, 0x32, 0xA6, 0x48, 0xA9, 0x01, 0x9D, 
-        0x00, 0x16, 0xA9, 0x01, 0x9D, 0x00, 0x0F, 0xE8, 
-        0xE4, 0x49, 0xF0, 0x02, 0x86, 0x48, 0x4C, 0x23, 
-        0x3D, 0xA6, 0x48, 0xAD, 0x00, 0x74, 0x9D, 0x00, 
-        0x0F, 0x9E, 0x00, 0x16, 0xE8, 0xE4, 0x49, 0xF0, 
-        0x02, 0x86, 0x48, 0x29, 0x7F, 0xC9, 0x13, 0xD0, 
-        0x04, 0xA5, 0x53, 0x85, 0x4A, 0xAD, 0x02, 0x74, 
-        0x29, 0x10, 0xF0, 0x2C, 0xA6, 0x4D, 0xF0, 0x0F, 
-        0xAD, 0x02, 0x7C, 0x29, 0x40, 0xD0, 0x21, 0x8E, 
-        0x00, 0x74, 0x64, 0x4D, 0x4C, 0x56, 0x3D, 0xA6, 
-        0x4C, 0xE4, 0x4B, 0xF0, 0x13, 0xA5, 0x4A, 0xD0, 
-        0x0F, 0xAD, 0x02, 0x7C, 0x29, 0x40, 0xD0, 0x08, 
-        0xBD, 0x00, 0x08, 0x8D, 0x00, 0x74, 0xE6, 0x4C, 
-        0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-        0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xD0, 0x00, 0x38, 
-        0xCE, 0xC0, 
-};
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
deleted file mode 100644
index f646725bd567..000000000000
--- a/drivers/char/serial167.c
+++ /dev/null
@@ -1,2491 +0,0 @@
-/*
- * linux/drivers/char/serial167.c
- *
- * Driver for MVME166/7 board serial ports, which are via a CD2401.
- * Based very much on cyclades.c.
- *
- * MVME166/7 work by Richard Hirst [richard@sleepie.demon.co.uk]
- *
- * ==============================================================
- *
- * static char rcsid[] =
- * "$Revision: 1.36.1.4 $$Date: 1995/03/29 06:14:14 $";
- *
- *  linux/kernel/cyclades.c
- *
- * Maintained by Marcio Saito (cyclades@netcom.com) and
- * Randolph Bentson (bentson@grieg.seaslug.org)
- *
- * Much of the design and some of the code came from serial.c
- * which was copyright (C) 1991, 1992  Linus Torvalds.  It was
- * extensively rewritten by Theodore Ts'o, 8/16/92 -- 9/14/92,
- * and then fixed as suggested by Michael K. Johnson 12/12/92.
- *
- * This version does not support shared irq's.
- *
- * $Log: cyclades.c,v $
- * Revision 1.36.1.4  1995/03/29  06:14:14  bentson
- * disambiguate between Cyclom-16Y and Cyclom-32Ye;
- *
- * Changes:
- *
- * 200 lines of changes record removed - RGH 11-10-95, starting work on
- * converting this to drive serial ports on mvme166 (cd2401).
- *
- * Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 2000/08/25
- * - get rid of verify_area
- * - use get_user to access memory from userspace in set_threshold,
- *   set_default_threshold and set_timeout
- * - don't use the panic function in serial167_init
- * - do resource release on failure on serial167_init
- * - include missing restore_flags in mvme167_serial_console_setup
- *
- * Kars de Jong <jongk@linux-m68k.org> - 2004/09/06
- * - replace bottom half handler with task queue handler
- */
-
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/tty.h>
-#include <linux/interrupt.h>
-#include <linux/serial.h>
-#include <linux/serialP.h>
-#include <linux/smp_lock.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/serial167.h>
-#include <linux/delay.h>
-#include <linux/major.h>
-#include <linux/mm.h>
-#include <linux/console.h>
-#include <linux/module.h>
-#include <linux/bitops.h>
-#include <linux/tty_flip.h>
-#include <linux/gfp.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/mvme16xhw.h>
-#include <asm/bootinfo.h>
-#include <asm/setup.h>
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-
-#include <asm/uaccess.h>
-#include <linux/init.h>
-
-#define SERIAL_PARANOIA_CHECK
-#undef  SERIAL_DEBUG_OPEN
-#undef  SERIAL_DEBUG_THROTTLE
-#undef  SERIAL_DEBUG_OTHER
-#undef  SERIAL_DEBUG_IO
-#undef  SERIAL_DEBUG_COUNT
-#undef  SERIAL_DEBUG_DTR
-#undef  CYCLOM_16Y_HACK
-#define  CYCLOM_ENABLE_MONITORING
-
-#define WAKEUP_CHARS 256
-
-#define STD_COM_FLAGS (0)
-
-static struct tty_driver *cy_serial_driver;
-extern int serial_console;
-static struct cyclades_port *serial_console_info = NULL;
-static unsigned int serial_console_cflag = 0;
-u_char initial_console_speed;
-
-/* Base address of cd2401 chip on mvme166/7 */
-
-#define BASE_ADDR (0xfff45000)
-#define pcc2chip        ((volatile u_char *)0xfff42000)
-#define PccSCCMICR      0x1d
-#define PccSCCTICR      0x1e
-#define PccSCCRICR      0x1f
-#define PccTPIACKR      0x25
-#define PccRPIACKR      0x27
-#define PccIMLR         0x3f
-
-/* This is the per-port data structure */
-struct cyclades_port cy_port[] = {
-        /* CARD#  */
-        {-1},                   /* ttyS0 */
-        {-1},                   /* ttyS1 */
-        {-1},                   /* ttyS2 */
-        {-1},                   /* ttyS3 */
-};
-
-#define NR_PORTS        ARRAY_SIZE(cy_port)
-
-/*
- * This is used to look up the divisor speeds and the timeouts
- * We're normally limited to 15 distinct baud rates.  The extra
- * are accessed via settings in info->flags.
- *         0,     1,     2,     3,     4,     5,     6,     7,     8,     9,
- *        10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
- *                                                  HI            VHI
- */
-static int baud_table[] = {
-        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200,
-        1800, 2400, 4800, 9600, 19200, 38400, 57600, 76800, 115200, 150000,
-        0
-};
-
-#if 0
-static char baud_co[] = {       /* 25 MHz clock option table */
-        /* value =>    00    01   02    03    04 */
-        /* divide by    8    32   128   512  2048 */
-        0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03, 0x03, 0x02,
-        0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static char baud_bpr[] = {      /* 25 MHz baud rate period table */
-        0x00, 0xf5, 0xa3, 0x6f, 0x5c, 0x51, 0xf5, 0xa3, 0x51, 0xa3,
-        0x6d, 0x51, 0xa3, 0x51, 0xa3, 0x51, 0x36, 0x29, 0x1b, 0x15
-};
-#endif
-
-/* I think 166 brd clocks 2401 at 20MHz.... */
-
-/* These values are written directly to tcor, and >> 5 for writing to rcor */
-static u_char baud_co[] = {     /* 20 MHz clock option table */
-        0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x60, 0x60, 0x40,
-        0x40, 0x40, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-/* These values written directly to tbpr/rbpr */
-static u_char baud_bpr[] = {    /* 20 MHz baud rate period table */
-        0x00, 0xc0, 0x80, 0x58, 0x6c, 0x40, 0xc0, 0x81, 0x40, 0x81,
-        0x57, 0x40, 0x81, 0x40, 0x81, 0x40, 0x2b, 0x20, 0x15, 0x10
-};
-
-static u_char baud_cor4[] = {   /* receive threshold */
-        0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a,
-        0x0a, 0x0a, 0x0a, 0x09, 0x09, 0x08, 0x08, 0x08, 0x08, 0x07
-};
-
-static void shutdown(struct cyclades_port *);
-static int startup(struct cyclades_port *);
-static void cy_throttle(struct tty_struct *);
-static void cy_unthrottle(struct tty_struct *);
-static void config_setup(struct cyclades_port *);
-#ifdef CYCLOM_SHOW_STATUS
-static void show_status(int);
-#endif
-
-/*
- * I have my own version of udelay(), as it is needed when initialising
- * the chip, before the delay loop has been calibrated.  Should probably
- * reference one of the vmechip2 or pccchip2 counter for an accurate
- * delay, but this wild guess will do for now.
- */
-
-void my_udelay(long us)
-{
-        u_char x;
-        volatile u_char *p = &x;
-        int i;
-
-        while (us--)
-                for (i = 100; i; i--)
-                        x |= *p;
-}
-
-static inline int serial_paranoia_check(struct cyclades_port *info, char *name,
-                const char *routine)
-{
-#ifdef SERIAL_PARANOIA_CHECK
-        if (!info) {
-                printk("Warning: null cyclades_port for (%s) in %s\n", name,
-                                routine);
-                return 1;
-        }
-
-        if (info < &cy_port[0] || info >= &cy_port[NR_PORTS]) {
-                printk("Warning: cyclades_port out of range for (%s) in %s\n",
-                                name, routine);
-                return 1;
-        }
-
-        if (info->magic != CYCLADES_MAGIC) {
-                printk("Warning: bad magic number for serial struct (%s) in "
-                                "%s\n", name, routine);
-                return 1;
-        }
-#endif
-        return 0;
-}                               /* serial_paranoia_check */
-
-#if 0
-/* The following diagnostic routines allow the driver to spew
-   information on the screen, even (especially!) during interrupts.
- */
-void SP(char *data)
-{
-        unsigned long flags;
-        local_irq_save(flags);
-        printk(KERN_EMERG "%s", data);
-        local_irq_restore(flags);
-}
-
-char scrn[2];
-void CP(char data)
-{
-        unsigned long flags;
-        local_irq_save(flags);
-        scrn[0] = data;
-        printk(KERN_EMERG "%c", scrn);
-        local_irq_restore(flags);
-}                               /* CP */
-
-void CP1(int data)
-{
-        (data < 10) ? CP(data + '0') : CP(data + 'A' - 10);
-}                               /* CP1 */
-void CP2(int data)
-{
-        CP1((data >> 4) & 0x0f);
-        CP1(data & 0x0f);
-}                               /* CP2 */
-void CP4(int data)
-{
-        CP2((data >> 8) & 0xff);
-        CP2(data & 0xff);
-}                               /* CP4 */
-void CP8(long data)
-{
-        CP4((data >> 16) & 0xffff);
-        CP4(data & 0xffff);
-}                               /* CP8 */
-#endif
-
-/* This routine waits up to 1000 micro-seconds for the previous
-   command to the Cirrus chip to complete and then issues the
-   new command.  An error is returned if the previous command
-   didn't finish within the time limit.
- */
-u_short write_cy_cmd(volatile u_char * base_addr, u_char cmd)
-{
-        unsigned long flags;
-        volatile int i;
-
-        local_irq_save(flags);
-        /* Check to see that the previous command has completed */
-        for (i = 0; i < 100; i++) {
-                if (base_addr[CyCCR] == 0) {
-                        break;
-                }
-                my_udelay(10L);
-        }
-        /* if the CCR never cleared, the previous command
-           didn't finish within the "reasonable time" */
-        if (i == 10) {
-                local_irq_restore(flags);
-                return (-1);
-        }
-
-        /* Issue the new command */
-        base_addr[CyCCR] = cmd;
-        local_irq_restore(flags);
-        return (0);
-}                               /* write_cy_cmd */
-
-/* cy_start and cy_stop provide software output flow control as a
-   function of XON/XOFF, software CTS, and other such stuff. */
-
-static void cy_stop(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-        volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR;
-        int channel;
-        unsigned long flags;
-
-#ifdef SERIAL_DEBUG_OTHER
-        printk("cy_stop %s\n", tty->name);      /* */
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_stop"))
-                return;
-
-        channel = info->line;
-
-        local_irq_save(flags);
-        base_addr[CyCAR] = (u_char) (channel);  /* index channel */
-        base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy);
-        local_irq_restore(flags);
-}                               /* cy_stop */
-
-static void cy_start(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-        volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR;
-        int channel;
-        unsigned long flags;
-
-#ifdef SERIAL_DEBUG_OTHER
-        printk("cy_start %s\n", tty->name);     /* */
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_start"))
-                return;
-
-        channel = info->line;
-
-        local_irq_save(flags);
-        base_addr[CyCAR] = (u_char) (channel);
-        base_addr[CyIER] |= CyTxMpty;
-        local_irq_restore(flags);
-}                               /* cy_start */
-
-/* The real interrupt service routines are called
-   whenever the card wants its hand held--chars
-   received, out buffer empty, modem change, etc.
- */
-static irqreturn_t cd2401_rxerr_interrupt(int irq, void *dev_id)
-{
-        struct tty_struct *tty;
-        struct cyclades_port *info;
-        volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR;
-        unsigned char err, rfoc;
-        int channel;
-        char data;
-
-        /* determine the channel and change to that context */
-        channel = (u_short) (base_addr[CyLICR] >> 2);
-        info = &cy_port[channel];
-        info->last_active = jiffies;
-
-        if ((err = base_addr[CyRISR]) & CyTIMEOUT) {
-                /* This is a receive timeout interrupt, ignore it */
-                base_addr[CyREOIR] = CyNOTRANS;
-                return IRQ_HANDLED;
-        }
-
-        /* Read a byte of data if there is any - assume the error
-         * is associated with this character */
-
-        if ((rfoc = base_addr[CyRFOC]) != 0)
-                data = base_addr[CyRDR];
-        else
-                data = 0;
-
-        /* if there is nowhere to put the data, discard it */
-        if (info->tty == 0) {
-                base_addr[CyREOIR] = rfoc ? 0 : CyNOTRANS;
-                return IRQ_HANDLED;
-        } else {                /* there is an open port for this data */
-                tty = info->tty;
-                if (err & info->ignore_status_mask) {
-                        base_addr[CyREOIR] = rfoc ? 0 : CyNOTRANS;
-                        return IRQ_HANDLED;
-                }
-                if (tty_buffer_request_room(tty, 1) != 0) {
-                        if (err & info->read_status_mask) {
-                                if (err & CyBREAK) {
-                                        tty_insert_flip_char(tty, data,
-                                                             TTY_BREAK);
-                                        if (info->flags & ASYNC_SAK) {
-                                                do_SAK(tty);
-                                        }
-                                } else if (err & CyFRAME) {
-                                        tty_insert_flip_char(tty, data,
-                                                             TTY_FRAME);
-                                } else if (err & CyPARITY) {
-                                        tty_insert_flip_char(tty, data,
-                                                             TTY_PARITY);
-                                } else if (err & CyOVERRUN) {
-                                        tty_insert_flip_char(tty, 0,
-                                                             TTY_OVERRUN);
-                                        /*
-                                           If the flip buffer itself is
-                                           overflowing, we still lose
-                                           the next incoming character.
-                                         */
-                                        if (tty_buffer_request_room(tty, 1) !=
-                                            0) {
-                                                tty_insert_flip_char(tty, data,
-                                                                     TTY_FRAME);
-                                        }
-                                        /* These two conditions may imply */
-                                        /* a normal read should be done. */
-                                        /* else if(data & CyTIMEOUT) */
-                                        /* else if(data & CySPECHAR) */
-                                } else {
-                                        tty_insert_flip_char(tty, 0,
-                                                             TTY_NORMAL);
-                                }
-                        } else {
-                                tty_insert_flip_char(tty, data, TTY_NORMAL);
-                        }
-                } else {
-                        /* there was a software buffer overrun
-                           and nothing could be done about it!!! */
-                }
-        }
-        tty_schedule_flip(tty);
-        /* end of service */
-        base_addr[CyREOIR] = rfoc ? 0 : CyNOTRANS;
-        return IRQ_HANDLED;
-}                               /* cy_rxerr_interrupt */
-
-static irqreturn_t cd2401_modem_interrupt(int irq, void *dev_id)
-{
-        struct cyclades_port *info;
-        volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR;
-        int channel;
-        int mdm_change;
-        int mdm_status;
-
-        /* determine the channel and change to that context */
-        channel = (u_short) (base_addr[CyLICR] >> 2);
-        info = &cy_port[channel];
-        info->last_active = jiffies;
-
-        mdm_change = base_addr[CyMISR];
-        mdm_status = base_addr[CyMSVR1];
-
-        if (info->tty == 0) {   /* nowhere to put the data, ignore it */
-                ;
-        } else {
-                if ((mdm_change & CyDCD)
-                    && (info->flags & ASYNC_CHECK_CD)) {
-                        if (mdm_status & CyDCD) {
-/* CP('!'); */
-                                wake_up_interruptible(&info->open_wait);
-                        } else {
-/* CP('@'); */
-                                tty_hangup(info->tty);
-                                wake_up_interruptible(&info->open_wait);
-                                info->flags &= ~ASYNC_NORMAL_ACTIVE;
-                        }
-                }
-                if ((mdm_change & CyCTS)
-                    && (info->flags & ASYNC_CTS_FLOW)) {
-                        if (info->tty->stopped) {
-                                if (mdm_status & CyCTS) {
-                                        /* !!! cy_start isn't used because... */
-                                        info->tty->stopped = 0;
-                                        base_addr[CyIER] |= CyTxMpty;
-                                        tty_wakeup(info->tty);
-                                }
-                        } else {
-                                if (!(mdm_status & CyCTS)) {
-                                        /* !!! cy_stop isn't used because... */
-                                        info->tty->stopped = 1;
-                                        base_addr[CyIER] &=
-                                            ~(CyTxMpty | CyTxRdy);
-                                }
-                        }
-                }
-                if (mdm_status & CyDSR) {
-                }
-        }
-        base_addr[CyMEOIR] = 0;
-        return IRQ_HANDLED;
-}                               /* cy_modem_interrupt */
-
-static irqreturn_t cd2401_tx_interrupt(int irq, void *dev_id)
-{
-        struct cyclades_port *info;
-        volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR;
-        int channel;
-        int char_count, saved_cnt;
-        int outch;
-
-        /* determine the channel and change to that context */
-        channel = (u_short) (base_addr[CyLICR] >> 2);
-
-        /* validate the port number (as configured and open) */
-        if ((channel < 0) || (NR_PORTS <= channel)) {
-                base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy);
-                base_addr[CyTEOIR] = CyNOTRANS;
-                return IRQ_HANDLED;
-        }
-        info = &cy_port[channel];
-        info->last_active = jiffies;
-        if (info->tty == 0) {
-                base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy);
-                base_addr[CyTEOIR] = CyNOTRANS;
-                return IRQ_HANDLED;
-        }
-
-        /* load the on-chip space available for outbound data */
-        saved_cnt = char_count = base_addr[CyTFTC];
-
-        if (info->x_char) {     /* send special char */
-                outch = info->x_char;
-                base_addr[CyTDR] = outch;
-                char_count--;
-                info->x_char = 0;
-        }
-
-        if (info->x_break) {
-                /*  The Cirrus chip requires the "Embedded Transmit
-                   Commands" of start break, delay, and end break
-                   sequences to be sent.  The duration of the
-                   break is given in TICs, which runs at HZ
-                   (typically 100) and the PPR runs at 200 Hz,
-                   so the delay is duration * 200/HZ, and thus a
-                   break can run from 1/100 sec to about 5/4 sec.
-                   Need to check these values - RGH 141095.
-                 */
-                base_addr[CyTDR] = 0;   /* start break */
-                base_addr[CyTDR] = 0x81;
-                base_addr[CyTDR] = 0;   /* delay a bit */
-                base_addr[CyTDR] = 0x82;
-                base_addr[CyTDR] = info->x_break * 200 / HZ;
-                base_addr[CyTDR] = 0;   /* terminate break */
-                base_addr[CyTDR] = 0x83;
-                char_count -= 7;
-                info->x_break = 0;
-        }
-
-        while (char_count > 0) {
-                if (!info->xmit_cnt) {
-                        base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy);
-                        break;
-                }
-                if (info->xmit_buf == 0) {
-                        base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy);
-                        break;
-                }
-                if (info->tty->stopped || info->tty->hw_stopped) {
-                        base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy);
-                        break;
-                }
-                /* Because the Embedded Transmit Commands have been
-                   enabled, we must check to see if the escape
-                   character, NULL, is being sent.  If it is, we
-                   must ensure that there is room for it to be
-                   doubled in the output stream.  Therefore we
-                   no longer advance the pointer when the character
-                   is fetched, but rather wait until after the check
-                   for a NULL output character. (This is necessary
-                   because there may not be room for the two chars
-                   needed to send a NULL.
-                 */
-                outch = info->xmit_buf[info->xmit_tail];
-                if (outch) {
-                        info->xmit_cnt--;
-                        info->xmit_tail = (info->xmit_tail + 1)
-                            & (PAGE_SIZE - 1);
-                        base_addr[CyTDR] = outch;
-                        char_count--;
-                } else {
-                        if (char_count > 1) {
-                                info->xmit_cnt--;
-                                info->xmit_tail = (info->xmit_tail + 1)
-                                    & (PAGE_SIZE - 1);
-                                base_addr[CyTDR] = outch;
-                                base_addr[CyTDR] = 0;
-                                char_count--;
-                                char_count--;
-                        } else {
-                                break;
-                        }
-                }
-        }
-
-        if (info->xmit_cnt < WAKEUP_CHARS)
-                tty_wakeup(info->tty);
-
-        base_addr[CyTEOIR] = (char_count != saved_cnt) ? 0 : CyNOTRANS;
-        return IRQ_HANDLED;
-}                               /* cy_tx_interrupt */
-
-static irqreturn_t cd2401_rx_interrupt(int irq, void *dev_id)
-{
-        struct tty_struct *tty;
-        struct cyclades_port *info;
-        volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR;
-        int channel;
-        char data;
-        int char_count;
-        int save_cnt;
-
-        /* determine the channel and change to that context */
-        channel = (u_short) (base_addr[CyLICR] >> 2);
-        info = &cy_port[channel];
-        info->last_active = jiffies;
-        save_cnt = char_count = base_addr[CyRFOC];
-
-                /* if there is nowhere to put the data, discard it */
-        if (info->tty == 0) {
-                while (char_count--) {
-                        data = base_addr[CyRDR];
-                }
-        } else {                /* there is an open port for this data */
-                tty = info->tty;
-                /* load # characters available from the chip */
-
-#ifdef CYCLOM_ENABLE_MONITORING
-                ++info->mon.int_count;
-                info->mon.char_count += char_count;
-                if (char_count > info->mon.char_max)
-                        info->mon.char_max = char_count;
-                info->mon.char_last = char_count;
-#endif
-                while (char_count--) {
-                        data = base_addr[CyRDR];
-                        tty_insert_flip_char(tty, data, TTY_NORMAL);
-#ifdef CYCLOM_16Y_HACK
-                        udelay(10L);
-#endif
-                }
-                tty_schedule_flip(tty);
-        }
-        /* end of service */
-        base_addr[CyREOIR] = save_cnt ? 0 : CyNOTRANS;
-        return IRQ_HANDLED;
-}                               /* cy_rx_interrupt */
-
-/* This is called whenever a port becomes active;
-   interrupts are enabled and DTR & RTS are turned on.
- */
-static int startup(struct cyclades_port *info)
-{
-        unsigned long flags;
-        volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR;
-        int channel;
-
-        if (info->flags & ASYNC_INITIALIZED) {
-                return 0;
-        }
-
-        if (!info->type) {
-                if (info->tty) {
-                        set_bit(TTY_IO_ERROR, &info->tty->flags);
-                }
-                return 0;
-        }
-        if (!info->xmit_buf) {
-                info->xmit_buf = (unsigned char *)get_zeroed_page(GFP_KERNEL);
-                if (!info->xmit_buf) {
-                        return -ENOMEM;
-                }
-        }
-
-        config_setup(info);
-
-        channel = info->line;
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk("startup channel %d\n", channel);
-#endif
-
-        local_irq_save(flags);
-        base_addr[CyCAR] = (u_char) channel;
-        write_cy_cmd(base_addr, CyENB_RCVR | CyENB_XMTR);
-
-        base_addr[CyCAR] = (u_char) channel;    /* !!! Is this needed? */
-        base_addr[CyMSVR1] = CyRTS;
-/* CP('S');CP('1'); */
-        base_addr[CyMSVR2] = CyDTR;
-
-#ifdef SERIAL_DEBUG_DTR
-        printk("cyc: %d: raising DTR\n", __LINE__);
-        printk("     status: 0x%x, 0x%x\n", base_addr[CyMSVR1],
-               base_addr[CyMSVR2]);
-#endif
-
-        base_addr[CyIER] |= CyRxData;
-        info->flags |= ASYNC_INITIALIZED;
-
-        if (info->tty) {
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
-        }
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-
-        local_irq_restore(flags);
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk(" done\n");
-#endif
-        return 0;
-}                               /* startup */
-
-void start_xmit(struct cyclades_port *info)
-{
-        unsigned long flags;
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        int channel;
-
-        channel = info->line;
-        local_irq_save(flags);
-        base_addr[CyCAR] = channel;
-        base_addr[CyIER] |= CyTxMpty;
-        local_irq_restore(flags);
-}                               /* start_xmit */
-
-/*
- * This routine shuts down a serial port; interrupts are disabled,
- * and DTR is dropped if the hangup on close termio flag is on.
- */
-static void shutdown(struct cyclades_port *info)
-{
-        unsigned long flags;
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        int channel;
-
-        if (!(info->flags & ASYNC_INITIALIZED)) {
-/* CP('$'); */
-                return;
-        }
-
-        channel = info->line;
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk("shutdown channel %d\n", channel);
-#endif
-
-        /* !!! REALLY MUST WAIT FOR LAST CHARACTER TO BE
-           SENT BEFORE DROPPING THE LINE !!!  (Perhaps
-           set some flag that is read when XMTY happens.)
-           Other choices are to delay some fixed interval
-           or schedule some later processing.
-         */
-        local_irq_save(flags);
-        if (info->xmit_buf) {
-                free_page((unsigned long)info->xmit_buf);
-                info->xmit_buf = NULL;
-        }
-
-        base_addr[CyCAR] = (u_char) channel;
-        if (!info->tty || (info->tty->termios->c_cflag & HUPCL)) {
-                base_addr[CyMSVR1] = 0;
-/* CP('C');CP('1'); */
-                base_addr[CyMSVR2] = 0;
-#ifdef SERIAL_DEBUG_DTR
-                printk("cyc: %d: dropping DTR\n", __LINE__);
-                printk("     status: 0x%x, 0x%x\n", base_addr[CyMSVR1],
-                       base_addr[CyMSVR2]);
-#endif
-        }
-        write_cy_cmd(base_addr, CyDIS_RCVR);
-        /* it may be appropriate to clear _XMIT at
-           some later date (after testing)!!! */
-
-        if (info->tty) {
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
-        }
-        info->flags &= ~ASYNC_INITIALIZED;
-        local_irq_restore(flags);
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk(" done\n");
-#endif
-}                               /* shutdown */
-
-/*
- * This routine finds or computes the various line characteristics.
- */
-static void config_setup(struct cyclades_port *info)
-{
-        unsigned long flags;
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        int channel;
-        unsigned cflag;
-        int i;
-        unsigned char ti, need_init_chan = 0;
-
-        if (!info->tty || !info->tty->termios) {
-                return;
-        }
-        if (info->line == -1) {
-                return;
-        }
-        cflag = info->tty->termios->c_cflag;
-
-        /* baud rate */
-        i = cflag & CBAUD;
-#ifdef CBAUDEX
-/* Starting with kernel 1.1.65, there is direct support for
-   higher baud rates.  The following code supports those
-   changes.  The conditional aspect allows this driver to be
-   used for earlier as well as later kernel versions.  (The
-   mapping is slightly different from serial.c because there
-   is still the possibility of supporting 75 kbit/sec with
-   the Cyclades board.)
- */
-        if (i & CBAUDEX) {
-                if (i == B57600)
-                        i = 16;
-                else if (i == B115200)
-                        i = 18;
-#ifdef B78600
-                else if (i == B78600)
-                        i = 17;
-#endif
-                else
-                        info->tty->termios->c_cflag &= ~CBAUDEX;
-        }
-#endif
-        if (i == 15) {
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        i += 1;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        i += 3;
-        }
-        /* Don't ever change the speed of the console port.  It will
-         * run at the speed specified in bootinfo, or at 19.2K */
-        /* Actually, it should run at whatever speed 166Bug was using */
-        /* Note info->timeout isn't used at present */
-        if (info != serial_console_info) {
-                info->tbpr = baud_bpr[i];       /* Tx BPR */
-                info->tco = baud_co[i]; /* Tx CO */
-                info->rbpr = baud_bpr[i];       /* Rx BPR */
-                info->rco = baud_co[i] >> 5;    /* Rx CO */
-                if (baud_table[i] == 134) {
-                        info->timeout =
-                            (info->xmit_fifo_size * HZ * 30 / 269) + 2;
-                        /* get it right for 134.5 baud */
-                } else if (baud_table[i]) {
-                        info->timeout =
-                            (info->xmit_fifo_size * HZ * 15 / baud_table[i]) +
-                            2;
-                        /* this needs to be propagated into the card info */
-                } else {
-                        info->timeout = 0;
-                }
-        }
-        /* By tradition (is it a standard?) a baud rate of zero
-           implies the line should be/has been closed.  A bit
-           later in this routine such a test is performed. */
-
-        /* byte size and parity */
-        info->cor7 = 0;
-        info->cor6 = 0;
-        info->cor5 = 0;
-        info->cor4 = (info->default_threshold ? info->default_threshold : baud_cor4[i]);        /* receive threshold */
-        /* Following two lines added 101295, RGH. */
-        /* It is obviously wrong to access CyCORx, and not info->corx here,
-         * try and remember to fix it later! */
-        channel = info->line;
-        base_addr[CyCAR] = (u_char) channel;
-        if (C_CLOCAL(info->tty)) {
-                if (base_addr[CyIER] & CyMdmCh)
-                        base_addr[CyIER] &= ~CyMdmCh;   /* without modem intr */
-                /* ignore 1->0 modem transitions */
-                if (base_addr[CyCOR4] & (CyDSR | CyCTS | CyDCD))
-                        base_addr[CyCOR4] &= ~(CyDSR | CyCTS | CyDCD);
-                /* ignore 0->1 modem transitions */
-                if (base_addr[CyCOR5] & (CyDSR | CyCTS | CyDCD))
-                        base_addr[CyCOR5] &= ~(CyDSR | CyCTS | CyDCD);
-        } else {
-                if ((base_addr[CyIER] & CyMdmCh) != CyMdmCh)
-                        base_addr[CyIER] |= CyMdmCh;    /* with modem intr */
-                /* act on 1->0 modem transitions */
-                if ((base_addr[CyCOR4] & (CyDSR | CyCTS | CyDCD)) !=
-                    (CyDSR | CyCTS | CyDCD))
-                        base_addr[CyCOR4] |= CyDSR | CyCTS | CyDCD;
-                /* act on 0->1 modem transitions */
-                if ((base_addr[CyCOR5] & (CyDSR | CyCTS | CyDCD)) !=
-                    (CyDSR | CyCTS | CyDCD))
-                        base_addr[CyCOR5] |= CyDSR | CyCTS | CyDCD;
-        }
-        info->cor3 = (cflag & CSTOPB) ? Cy_2_STOP : Cy_1_STOP;
-        info->cor2 = CyETC;
-        switch (cflag & CSIZE) {
-        case CS5:
-                info->cor1 = Cy_5_BITS;
-                break;
-        case CS6:
-                info->cor1 = Cy_6_BITS;
-                break;
-        case CS7:
-                info->cor1 = Cy_7_BITS;
-                break;
-        case CS8:
-                info->cor1 = Cy_8_BITS;
-                break;
-        }
-        if (cflag & PARENB) {
-                if (cflag & PARODD) {
-                        info->cor1 |= CyPARITY_O;
-                } else {
-                        info->cor1 |= CyPARITY_E;
-                }
-        } else {
-                info->cor1 |= CyPARITY_NONE;
-        }
-
-        /* CTS flow control flag */
-#if 0
-        /* Don't complcate matters for now! RGH 141095 */
-        if (cflag & CRTSCTS) {
-                info->flags |= ASYNC_CTS_FLOW;
-                info->cor2 |= CyCtsAE;
-        } else {
-                info->flags &= ~ASYNC_CTS_FLOW;
-                info->cor2 &= ~CyCtsAE;
-        }
-#endif
-        if (cflag & CLOCAL)
-                info->flags &= ~ASYNC_CHECK_CD;
-        else
-                info->flags |= ASYNC_CHECK_CD;
-
-     /***********************************************
-        The hardware option, CyRtsAO, presents RTS when
-        the chip has characters to send.  Since most modems
-        use RTS as reverse (inbound) flow control, this
-        option is not used.  If inbound flow control is
-        necessary, DTR can be programmed to provide the
-        appropriate signals for use with a non-standard
-        cable.  Contact Marcio Saito for details.
-     ***********************************************/
-
-        channel = info->line;
-
-        local_irq_save(flags);
-        base_addr[CyCAR] = (u_char) channel;
-
-        /* CyCMR set once only in mvme167_init_serial() */
-        if (base_addr[CyLICR] != channel << 2)
-                base_addr[CyLICR] = channel << 2;
-        if (base_addr[CyLIVR] != 0x5c)
-                base_addr[CyLIVR] = 0x5c;
-
-        /* tx and rx baud rate */
-
-        if (base_addr[CyCOR1] != info->cor1)
-                need_init_chan = 1;
-        if (base_addr[CyTCOR] != info->tco)
-                base_addr[CyTCOR] = info->tco;
-        if (base_addr[CyTBPR] != info->tbpr)
-                base_addr[CyTBPR] = info->tbpr;
-        if (base_addr[CyRCOR] != info->rco)
-                base_addr[CyRCOR] = info->rco;
-        if (base_addr[CyRBPR] != info->rbpr)
-                base_addr[CyRBPR] = info->rbpr;
-
-        /* set line characteristics  according configuration */
-
-        if (base_addr[CySCHR1] != START_CHAR(info->tty))
-                base_addr[CySCHR1] = START_CHAR(info->tty);
-        if (base_addr[CySCHR2] != STOP_CHAR(info->tty))
-                base_addr[CySCHR2] = STOP_CHAR(info->tty);
-        if (base_addr[CySCRL] != START_CHAR(info->tty))
-                base_addr[CySCRL] = START_CHAR(info->tty);
-        if (base_addr[CySCRH] != START_CHAR(info->tty))
-                base_addr[CySCRH] = START_CHAR(info->tty);
-        if (base_addr[CyCOR1] != info->cor1)
-                base_addr[CyCOR1] = info->cor1;
-        if (base_addr[CyCOR2] != info->cor2)
-                base_addr[CyCOR2] = info->cor2;
-        if (base_addr[CyCOR3] != info->cor3)
-                base_addr[CyCOR3] = info->cor3;
-        if (base_addr[CyCOR4] != info->cor4)
-                base_addr[CyCOR4] = info->cor4;
-        if (base_addr[CyCOR5] != info->cor5)
-                base_addr[CyCOR5] = info->cor5;
-        if (base_addr[CyCOR6] != info->cor6)
-                base_addr[CyCOR6] = info->cor6;
-        if (base_addr[CyCOR7] != info->cor7)
-                base_addr[CyCOR7] = info->cor7;
-
-        if (need_init_chan)
-                write_cy_cmd(base_addr, CyINIT_CHAN);
-
-        base_addr[CyCAR] = (u_char) channel;    /* !!! Is this needed? */
-
-        /* 2ms default rx timeout */
-        ti = info->default_timeout ? info->default_timeout : 0x02;
-        if (base_addr[CyRTPRL] != ti)
-                base_addr[CyRTPRL] = ti;
-        if (base_addr[CyRTPRH] != 0)
-                base_addr[CyRTPRH] = 0;
-
-        /* Set up RTS here also ????? RGH 141095 */
-        if (i == 0) {           /* baud rate is zero, turn off line */
-                if ((base_addr[CyMSVR2] & CyDTR) == CyDTR)
-                        base_addr[CyMSVR2] = 0;
-#ifdef SERIAL_DEBUG_DTR
-                printk("cyc: %d: dropping DTR\n", __LINE__);
-                printk("     status: 0x%x, 0x%x\n", base_addr[CyMSVR1],
-                       base_addr[CyMSVR2]);
-#endif
-        } else {
-                if ((base_addr[CyMSVR2] & CyDTR) != CyDTR)
-                        base_addr[CyMSVR2] = CyDTR;
-#ifdef SERIAL_DEBUG_DTR
-                printk("cyc: %d: raising DTR\n", __LINE__);
-                printk("     status: 0x%x, 0x%x\n", base_addr[CyMSVR1],
-                       base_addr[CyMSVR2]);
-#endif
-        }
-
-        if (info->tty) {
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
-        }
-
-        local_irq_restore(flags);
-
-}                               /* config_setup */
-
-static int cy_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        struct cyclades_port *info = tty->driver_data;
-        unsigned long flags;
-
-#ifdef SERIAL_DEBUG_IO
-        printk("cy_put_char %s(0x%02x)\n", tty->name, ch);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_put_char"))
-                return 0;
-
-        if (!info->xmit_buf)
-                return 0;
-
-        local_irq_save(flags);
-        if (info->xmit_cnt >= PAGE_SIZE - 1) {
-                local_irq_restore(flags);
-                return 0;
-        }
-
-        info->xmit_buf[info->xmit_head++] = ch;
-        info->xmit_head &= PAGE_SIZE - 1;
-        info->xmit_cnt++;
-        local_irq_restore(flags);
-        return 1;
-}                               /* cy_put_char */
-
-static void cy_flush_chars(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-        unsigned long flags;
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        int channel;
-
-#ifdef SERIAL_DEBUG_IO
-        printk("cy_flush_chars %s\n", tty->name);       /* */
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_flush_chars"))
-                return;
-
-        if (info->xmit_cnt <= 0 || tty->stopped
-            || tty->hw_stopped || !info->xmit_buf)
-                return;
-
-        channel = info->line;
-
-        local_irq_save(flags);
-        base_addr[CyCAR] = channel;
-        base_addr[CyIER] |= CyTxMpty;
-        local_irq_restore(flags);
-}                               /* cy_flush_chars */
-
-/* This routine gets called when tty_write has put something into
-    the write_queue.  If the port is not already transmitting stuff,
-    start it off by enabling interrupts.  The interrupt service
-    routine will then ensure that the characters are sent.  If the
-    port is already active, there is no need to kick it.
- */
-static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
-{
-        struct cyclades_port *info = tty->driver_data;
-        unsigned long flags;
-        int c, total = 0;
-
-#ifdef SERIAL_DEBUG_IO
-        printk("cy_write %s\n", tty->name);     /* */
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_write")) {
-                return 0;
-        }
-
-        if (!info->xmit_buf) {
-                return 0;
-        }
-
-        while (1) {
-                local_irq_save(flags);
-                c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
-                                          SERIAL_XMIT_SIZE - info->xmit_head));
-                if (c <= 0) {
-                        local_irq_restore(flags);
-                        break;
-                }
-
-                memcpy(info->xmit_buf + info->xmit_head, buf, c);
-                info->xmit_head =
-                    (info->xmit_head + c) & (SERIAL_XMIT_SIZE - 1);
-                info->xmit_cnt += c;
-                local_irq_restore(flags);
-
-                buf += c;
-                count -= c;
-                total += c;
-        }
-
-        if (info->xmit_cnt && !tty->stopped && !tty->hw_stopped) {
-                start_xmit(info);
-        }
-        return total;
-}                               /* cy_write */
-
-static int cy_write_room(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-        int ret;
-
-#ifdef SERIAL_DEBUG_IO
-        printk("cy_write_room %s\n", tty->name);        /* */
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_write_room"))
-                return 0;
-        ret = PAGE_SIZE - info->xmit_cnt - 1;
-        if (ret < 0)
-                ret = 0;
-        return ret;
-}                               /* cy_write_room */
-
-static int cy_chars_in_buffer(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-
-#ifdef SERIAL_DEBUG_IO
-        printk("cy_chars_in_buffer %s %d\n", tty->name, info->xmit_cnt);        /* */
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_chars_in_buffer"))
-                return 0;
-
-        return info->xmit_cnt;
-}                               /* cy_chars_in_buffer */
-
-static void cy_flush_buffer(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-        unsigned long flags;
-
-#ifdef SERIAL_DEBUG_IO
-        printk("cy_flush_buffer %s\n", tty->name);      /* */
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_flush_buffer"))
-                return;
-        local_irq_save(flags);
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-        local_irq_restore(flags);
-        tty_wakeup(tty);
-}                               /* cy_flush_buffer */
-
-/* This routine is called by the upper-layer tty layer to signal
-   that incoming characters should be throttled or that the
-   throttle should be released.
- */
-static void cy_throttle(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-        unsigned long flags;
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        int channel;
-
-#ifdef SERIAL_DEBUG_THROTTLE
-        char buf[64];
-
-        printk("throttle %s: %d....\n", tty_name(tty, buf),
-               tty->ldisc.chars_in_buffer(tty));
-        printk("cy_throttle %s\n", tty->name);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_nthrottle")) {
-                return;
-        }
-
-        if (I_IXOFF(tty)) {
-                info->x_char = STOP_CHAR(tty);
-                /* Should use the "Send Special Character" feature!!! */
-        }
-
-        channel = info->line;
-
-        local_irq_save(flags);
-        base_addr[CyCAR] = (u_char) channel;
-        base_addr[CyMSVR1] = 0;
-        local_irq_restore(flags);
-}                               /* cy_throttle */
-
-static void cy_unthrottle(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-        unsigned long flags;
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        int channel;
-
-#ifdef SERIAL_DEBUG_THROTTLE
-        char buf[64];
-
-        printk("throttle %s: %d....\n", tty_name(tty, buf),
-               tty->ldisc.chars_in_buffer(tty));
-        printk("cy_unthrottle %s\n", tty->name);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_nthrottle")) {
-                return;
-        }
-
-        if (I_IXOFF(tty)) {
-                info->x_char = START_CHAR(tty);
-                /* Should use the "Send Special Character" feature!!! */
-        }
-
-        channel = info->line;
-
-        local_irq_save(flags);
-        base_addr[CyCAR] = (u_char) channel;
-        base_addr[CyMSVR1] = CyRTS;
-        local_irq_restore(flags);
-}                               /* cy_unthrottle */
-
-static int
-get_serial_info(struct cyclades_port *info,
-                struct serial_struct __user * retinfo)
-{
-        struct serial_struct tmp;
-
-/* CP('g'); */
-        if (!retinfo)
-                return -EFAULT;
-        memset(&tmp, 0, sizeof(tmp));
-        tmp.type = info->type;
-        tmp.line = info->line;
-        tmp.port = info->line;
-        tmp.irq = 0;
-        tmp.flags = info->flags;
-        tmp.baud_base = 0;      /*!!! */
-        tmp.close_delay = info->close_delay;
-        tmp.custom_divisor = 0; /*!!! */
-        tmp.hub6 = 0;           /*!!! */
-        return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;
-}                               /* get_serial_info */
-
-static int
-set_serial_info(struct cyclades_port *info,
-                struct serial_struct __user * new_info)
-{
-        struct serial_struct new_serial;
-        struct cyclades_port old_info;
-
-/* CP('s'); */
-        if (!new_info)
-                return -EFAULT;
-        if (copy_from_user(&new_serial, new_info, sizeof(new_serial)))
-                return -EFAULT;
-        old_info = *info;
-
-        if (!capable(CAP_SYS_ADMIN)) {
-                if ((new_serial.close_delay != info->close_delay) ||
-                    ((new_serial.flags & ASYNC_FLAGS & ~ASYNC_USR_MASK) !=
-                     (info->flags & ASYNC_FLAGS & ~ASYNC_USR_MASK)))
-                        return -EPERM;
-                info->flags = ((info->flags & ~ASYNC_USR_MASK) |
-                               (new_serial.flags & ASYNC_USR_MASK));
-                goto check_and_exit;
-        }
-
-        /*
-         * OK, past this point, all the error checking has been done.
-         * At this point, we start making changes.....
-         */
-
-        info->flags = ((info->flags & ~ASYNC_FLAGS) |
-                       (new_serial.flags & ASYNC_FLAGS));
-        info->close_delay = new_serial.close_delay;
-
-check_and_exit:
-        if (info->flags & ASYNC_INITIALIZED) {
-                config_setup(info);
-                return 0;
-        }
-        return startup(info);
-}                               /* set_serial_info */
-
-static int cy_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct cyclades_port *info = tty->driver_data;
-        int channel;
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        unsigned long flags;
-        unsigned char status;
-
-        channel = info->line;
-
-        local_irq_save(flags);
-        base_addr[CyCAR] = (u_char) channel;
-        status = base_addr[CyMSVR1] | base_addr[CyMSVR2];
-        local_irq_restore(flags);
-
-        return ((status & CyRTS) ? TIOCM_RTS : 0)
-            | ((status & CyDTR) ? TIOCM_DTR : 0)
-            | ((status & CyDCD) ? TIOCM_CAR : 0)
-            | ((status & CyDSR) ? TIOCM_DSR : 0)
-            | ((status & CyCTS) ? TIOCM_CTS : 0);
-}                               /* cy_tiocmget */
-
-static int
-cy_tiocmset(struct tty_struct *tty, struct file *file,
-            unsigned int set, unsigned int clear)
-{
-        struct cyclades_port *info = tty->driver_data;
-        int channel;
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        unsigned long flags;
-
-        channel = info->line;
-
-        if (set & TIOCM_RTS) {
-                local_irq_save(flags);
-                base_addr[CyCAR] = (u_char) channel;
-                base_addr[CyMSVR1] = CyRTS;
-                local_irq_restore(flags);
-        }
-        if (set & TIOCM_DTR) {
-                local_irq_save(flags);
-                base_addr[CyCAR] = (u_char) channel;
-/* CP('S');CP('2'); */
-                base_addr[CyMSVR2] = CyDTR;
-#ifdef SERIAL_DEBUG_DTR
-                printk("cyc: %d: raising DTR\n", __LINE__);
-                printk("     status: 0x%x, 0x%x\n", base_addr[CyMSVR1],
-                       base_addr[CyMSVR2]);
-#endif
-                local_irq_restore(flags);
-        }
-
-        if (clear & TIOCM_RTS) {
-                local_irq_save(flags);
-                base_addr[CyCAR] = (u_char) channel;
-                base_addr[CyMSVR1] = 0;
-                local_irq_restore(flags);
-        }
-        if (clear & TIOCM_DTR) {
-                local_irq_save(flags);
-                base_addr[CyCAR] = (u_char) channel;
-/* CP('C');CP('2'); */
-                base_addr[CyMSVR2] = 0;
-#ifdef SERIAL_DEBUG_DTR
-                printk("cyc: %d: dropping DTR\n", __LINE__);
-                printk("     status: 0x%x, 0x%x\n", base_addr[CyMSVR1],
-                       base_addr[CyMSVR2]);
-#endif
-                local_irq_restore(flags);
-        }
-
-        return 0;
-}                               /* set_modem_info */
-
-static void send_break(struct cyclades_port *info, int duration)
-{                               /* Let the transmit ISR take care of this (since it
-                                   requires stuffing characters into the output stream).
-                                 */
-        info->x_break = duration;
-        if (!info->xmit_cnt) {
-                start_xmit(info);
-        }
-}                               /* send_break */
-
-static int
-get_mon_info(struct cyclades_port *info, struct cyclades_monitor __user * mon)
-{
-
-        if (copy_to_user(mon, &info->mon, sizeof(struct cyclades_monitor)))
-                return -EFAULT;
-        info->mon.int_count = 0;
-        info->mon.char_count = 0;
-        info->mon.char_max = 0;
-        info->mon.char_last = 0;
-        return 0;
-}
-
-static int set_threshold(struct cyclades_port *info, unsigned long __user * arg)
-{
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        unsigned long value;
-        int channel;
-
-        if (get_user(value, arg))
-                return -EFAULT;
-
-        channel = info->line;
-        info->cor4 &= ~CyREC_FIFO;
-        info->cor4 |= value & CyREC_FIFO;
-        base_addr[CyCOR4] = info->cor4;
-        return 0;
-}
-
-static int
-get_threshold(struct cyclades_port *info, unsigned long __user * value)
-{
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        int channel;
-        unsigned long tmp;
-
-        channel = info->line;
-
-        tmp = base_addr[CyCOR4] & CyREC_FIFO;
-        return put_user(tmp, value);
-}
-
-static int
-set_default_threshold(struct cyclades_port *info, unsigned long __user * arg)
-{
-        unsigned long value;
-
-        if (get_user(value, arg))
-                return -EFAULT;
-
-        info->default_threshold = value & 0x0f;
-        return 0;
-}
-
-static int
-get_default_threshold(struct cyclades_port *info, unsigned long __user * value)
-{
-        return put_user(info->default_threshold, value);
-}
-
-static int set_timeout(struct cyclades_port *info, unsigned long __user * arg)
-{
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        int channel;
-        unsigned long value;
-
-        if (get_user(value, arg))
-                return -EFAULT;
-
-        channel = info->line;
-
-        base_addr[CyRTPRL] = value & 0xff;
-        base_addr[CyRTPRH] = (value >> 8) & 0xff;
-        return 0;
-}
-
-static int get_timeout(struct cyclades_port *info, unsigned long __user * value)
-{
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        int channel;
-        unsigned long tmp;
-
-        channel = info->line;
-
-        tmp = base_addr[CyRTPRL];
-        return put_user(tmp, value);
-}
-
-static int set_default_timeout(struct cyclades_port *info, unsigned long value)
-{
-        info->default_timeout = value & 0xff;
-        return 0;
-}
-
-static int
-get_default_timeout(struct cyclades_port *info, unsigned long __user * value)
-{
-        return put_user(info->default_timeout, value);
-}
-
-static int
-cy_ioctl(struct tty_struct *tty, struct file *file,
-         unsigned int cmd, unsigned long arg)
-{
-        struct cyclades_port *info = tty->driver_data;
-        int ret_val = 0;
-        void __user *argp = (void __user *)arg;
-
-#ifdef SERIAL_DEBUG_OTHER
-        printk("cy_ioctl %s, cmd = %x arg = %lx\n", tty->name, cmd, arg);       /* */
-#endif
-
-        tty_lock();
-
-        switch (cmd) {
-        case CYGETMON:
-                ret_val = get_mon_info(info, argp);
-                break;
-        case CYGETTHRESH:
-                ret_val = get_threshold(info, argp);
-                break;
-        case CYSETTHRESH:
-                ret_val = set_threshold(info, argp);
-                break;
-        case CYGETDEFTHRESH:
-                ret_val = get_default_threshold(info, argp);
-                break;
-        case CYSETDEFTHRESH:
-                ret_val = set_default_threshold(info, argp);
-                break;
-        case CYGETTIMEOUT:
-                ret_val = get_timeout(info, argp);
-                break;
-        case CYSETTIMEOUT:
-                ret_val = set_timeout(info, argp);
-                break;
-        case CYGETDEFTIMEOUT:
-                ret_val = get_default_timeout(info, argp);
-                break;
-        case CYSETDEFTIMEOUT:
-                ret_val = set_default_timeout(info, (unsigned long)arg);
-                break;
-        case TCSBRK:            /* SVID version: non-zero arg --> no break */
-                ret_val = tty_check_change(tty);
-                if (ret_val)
-                        break;
-                tty_wait_until_sent(tty, 0);
-                if (!arg)
-                        send_break(info, HZ / 4);       /* 1/4 second */
-                break;
-        case TCSBRKP:           /* support for POSIX tcsendbreak() */
-                ret_val = tty_check_change(tty);
-                if (ret_val)
-                        break;
-                tty_wait_until_sent(tty, 0);
-                send_break(info, arg ? arg * (HZ / 10) : HZ / 4);
-                break;
-
-/* The following commands are incompletely implemented!!! */
-        case TIOCGSERIAL:
-                ret_val = get_serial_info(info, argp);
-                break;
-        case TIOCSSERIAL:
-                ret_val = set_serial_info(info, argp);
-                break;
-        default:
-                ret_val = -ENOIOCTLCMD;
-        }
-        tty_unlock();
-
-#ifdef SERIAL_DEBUG_OTHER
-        printk("cy_ioctl done\n");
-#endif
-
-        return ret_val;
-}                               /* cy_ioctl */
-
-static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
-{
-        struct cyclades_port *info = tty->driver_data;
-
-#ifdef SERIAL_DEBUG_OTHER
-        printk("cy_set_termios %s\n", tty->name);
-#endif
-
-        if (tty->termios->c_cflag == old_termios->c_cflag)
-                return;
-        config_setup(info);
-
-        if ((old_termios->c_cflag & CRTSCTS) &&
-            !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->stopped = 0;
-                cy_start(tty);
-        }
-#ifdef tytso_patch_94Nov25_1726
-        if (!(old_termios->c_cflag & CLOCAL) &&
-            (tty->termios->c_cflag & CLOCAL))
-                wake_up_interruptible(&info->open_wait);
-#endif
-}                               /* cy_set_termios */
-
-static void cy_close(struct tty_struct *tty, struct file *filp)
-{
-        struct cyclades_port *info = tty->driver_data;
-
-/* CP('C'); */
-#ifdef SERIAL_DEBUG_OTHER
-        printk("cy_close %s\n", tty->name);
-#endif
-
-        if (!info || serial_paranoia_check(info, tty->name, "cy_close")) {
-                return;
-        }
-#ifdef SERIAL_DEBUG_OPEN
-        printk("cy_close %s, count = %d\n", tty->name, info->count);
-#endif
-
-        if ((tty->count == 1) && (info->count != 1)) {
-                /*
-                 * Uh, oh.  tty->count is 1, which means that the tty
-                 * structure will be freed.  Info->count should always
-                 * be one in these conditions.  If it's greater than
-                 * one, we've got real problems, since it means the
-                 * serial port won't be shutdown.
-                 */
-                printk("cy_close: bad serial port count; tty->count is 1, "
-                       "info->count is %d\n", info->count);
-                info->count = 1;
-        }
-#ifdef SERIAL_DEBUG_COUNT
-        printk("cyc: %d: decrementing count to %d\n", __LINE__,
-               info->count - 1);
-#endif
-        if (--info->count < 0) {
-                printk("cy_close: bad serial port count for ttys%d: %d\n",
-                       info->line, info->count);
-#ifdef SERIAL_DEBUG_COUNT
-                printk("cyc: %d: setting count to 0\n", __LINE__);
-#endif
-                info->count = 0;
-        }
-        if (info->count)
-                return;
-        info->flags |= ASYNC_CLOSING;
-        if (info->flags & ASYNC_INITIALIZED)
-                tty_wait_until_sent(tty, 3000); /* 30 seconds timeout */
-        shutdown(info);
-        cy_flush_buffer(tty);
-        tty_ldisc_flush(tty);
-        info->tty = NULL;
-        if (info->blocked_open) {
-                if (info->close_delay) {
-                        msleep_interruptible(jiffies_to_msecs
-                                             (info->close_delay));
-                }
-                wake_up_interruptible(&info->open_wait);
-        }
-        info->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
-        wake_up_interruptible(&info->close_wait);
-
-#ifdef SERIAL_DEBUG_OTHER
-        printk("cy_close done\n");
-#endif
-}                               /* cy_close */
-
-/*
- * cy_hangup() --- called by tty_hangup() when a hangup is signaled.
- */
-void cy_hangup(struct tty_struct *tty)
-{
-        struct cyclades_port *info = tty->driver_data;
-
-#ifdef SERIAL_DEBUG_OTHER
-        printk("cy_hangup %s\n", tty->name);    /* */
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "cy_hangup"))
-                return;
-
-        shutdown(info);
-#if 0
-        info->event = 0;
-        info->count = 0;
-#ifdef SERIAL_DEBUG_COUNT
-        printk("cyc: %d: setting count to 0\n", __LINE__);
-#endif
-        info->tty = 0;
-#endif
-        info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        wake_up_interruptible(&info->open_wait);
-}                               /* cy_hangup */
-
-/*
- * ------------------------------------------------------------
- * cy_open() and friends
- * ------------------------------------------------------------
- */
-
-static int
-block_til_ready(struct tty_struct *tty, struct file *filp,
-                struct cyclades_port *info)
-{
-        DECLARE_WAITQUEUE(wait, current);
-        unsigned long flags;
-        int channel;
-        int retval;
-        volatile u_char *base_addr = (u_char *) BASE_ADDR;
-
-        /*
-         * If the device is in the middle of being closed, then block
-         * until it's done, and then try again.
-         */
-        if (info->flags & ASYNC_CLOSING) {
-                interruptible_sleep_on(&info->close_wait);
-                if (info->flags & ASYNC_HUP_NOTIFY) {
-                        return -EAGAIN;
-                } else {
-                        return -ERESTARTSYS;
-                }
-        }
-
-        /*
-         * If non-blocking mode is set, then make the check up front
-         * and then exit.
-         */
-        if (filp->f_flags & O_NONBLOCK) {
-                info->flags |= ASYNC_NORMAL_ACTIVE;
-                return 0;
-        }
-
-        /*
-         * Block waiting for the carrier detect and the line to become
-         * free (i.e., not in use by the callout).  While we are in
-         * this loop, info->count is dropped by one, so that
-         * cy_close() knows when to free things.  We restore it upon
-         * exit, either normal or abnormal.
-         */
-        retval = 0;
-        add_wait_queue(&info->open_wait, &wait);
-#ifdef SERIAL_DEBUG_OPEN
-        printk("block_til_ready before block: %s, count = %d\n",
-               tty->name, info->count);
-        /**/
-#endif
-            info->count--;
-#ifdef SERIAL_DEBUG_COUNT
-        printk("cyc: %d: decrementing count to %d\n", __LINE__, info->count);
-#endif
-        info->blocked_open++;
-
-        channel = info->line;
-
-        while (1) {
-                local_irq_save(flags);
-                base_addr[CyCAR] = (u_char) channel;
-                base_addr[CyMSVR1] = CyRTS;
-/* CP('S');CP('4'); */
-                base_addr[CyMSVR2] = CyDTR;
-#ifdef SERIAL_DEBUG_DTR
-                printk("cyc: %d: raising DTR\n", __LINE__);
-                printk("     status: 0x%x, 0x%x\n", base_addr[CyMSVR1],
-                       base_addr[CyMSVR2]);
-#endif
-                local_irq_restore(flags);
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (tty_hung_up_p(filp)
-                    || !(info->flags & ASYNC_INITIALIZED)) {
-                        if (info->flags & ASYNC_HUP_NOTIFY) {
-                                retval = -EAGAIN;
-                        } else {
-                                retval = -ERESTARTSYS;
-                        }
-                        break;
-                }
-                local_irq_save(flags);
-                base_addr[CyCAR] = (u_char) channel;
-/* CP('L');CP1(1 && C_CLOCAL(tty)); CP1(1 && (base_addr[CyMSVR1] & CyDCD) ); */
-                if (!(info->flags & ASYNC_CLOSING)
-                    && (C_CLOCAL(tty)
-                        || (base_addr[CyMSVR1] & CyDCD))) {
-                        local_irq_restore(flags);
-                        break;
-                }
-                local_irq_restore(flags);
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-#ifdef SERIAL_DEBUG_OPEN
-                printk("block_til_ready blocking: %s, count = %d\n",
-                       tty->name, info->count);
-                /**/
-#endif
-                tty_unlock();
-                schedule();
-                tty_lock();
-        }
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&info->open_wait, &wait);
-        if (!tty_hung_up_p(filp)) {
-                info->count++;
-#ifdef SERIAL_DEBUG_COUNT
-                printk("cyc: %d: incrementing count to %d\n", __LINE__,
-                       info->count);
-#endif
-        }
-        info->blocked_open--;
-#ifdef SERIAL_DEBUG_OPEN
-        printk("block_til_ready after blocking: %s, count = %d\n",
-               tty->name, info->count);
-        /**/
-#endif
-            if (retval)
-                return retval;
-        info->flags |= ASYNC_NORMAL_ACTIVE;
-        return 0;
-}                               /* block_til_ready */
-
-/*
- * This routine is called whenever a serial port is opened.  It
- * performs the serial-specific initialization for the tty structure.
- */
-int cy_open(struct tty_struct *tty, struct file *filp)
-{
-        struct cyclades_port *info;
-        int retval, line;
-
-/* CP('O'); */
-        line = tty->index;
-        if ((line < 0) || (NR_PORTS <= line)) {
-                return -ENODEV;
-        }
-        info = &cy_port[line];
-        if (info->line < 0) {
-                return -ENODEV;
-        }
-#ifdef SERIAL_DEBUG_OTHER
-        printk("cy_open %s\n", tty->name);      /* */
-#endif
-        if (serial_paranoia_check(info, tty->name, "cy_open")) {
-                return -ENODEV;
-        }
-#ifdef SERIAL_DEBUG_OPEN
-        printk("cy_open %s, count = %d\n", tty->name, info->count);
-        /**/
-#endif
-            info->count++;
-#ifdef SERIAL_DEBUG_COUNT
-        printk("cyc: %d: incrementing count to %d\n", __LINE__, info->count);
-#endif
-        tty->driver_data = info;
-        info->tty = tty;
-
-        /*
-         * Start up serial port
-         */
-        retval = startup(info);
-        if (retval) {
-                return retval;
-        }
-
-        retval = block_til_ready(tty, filp, info);
-        if (retval) {
-#ifdef SERIAL_DEBUG_OPEN
-                printk("cy_open returning after block_til_ready with %d\n",
-                       retval);
-#endif
-                return retval;
-        }
-#ifdef SERIAL_DEBUG_OPEN
-        printk("cy_open done\n");
-        /**/
-#endif
-            return 0;
-}                               /* cy_open */
-
-/*
- * ---------------------------------------------------------------------
- * serial167_init() and friends
- *
- * serial167_init() is called at boot-time to initialize the serial driver.
- * ---------------------------------------------------------------------
- */
-
-/*
- * This routine prints out the appropriate serial driver version
- * number, and identifies which options were configured into this
- * driver.
- */
-static void show_version(void)
-{
-        printk("MVME166/167 cd2401 driver\n");
-}                               /* show_version */
-
-/* initialize chips on card -- return number of valid
-   chips (which is number of ports/4) */
-
-/*
- * This initialises the hardware to a reasonable state.  It should
- * probe the chip first so as to copy 166-Bug setup as a default for
- * port 0.  It initialises CMR to CyASYNC; that is never done again, so
- * as to limit the number of CyINIT_CHAN commands in normal running.
- *
- * ... I wonder what I should do if this fails ...
- */
-
-void mvme167_serial_console_setup(int cflag)
-{
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        int ch;
-        u_char spd;
-        u_char rcor, rbpr, badspeed = 0;
-        unsigned long flags;
-
-        local_irq_save(flags);
-
-        /*
-         * First probe channel zero of the chip, to see what speed has
-         * been selected.
-         */
-
-        base_addr[CyCAR] = 0;
-
-        rcor = base_addr[CyRCOR] << 5;
-        rbpr = base_addr[CyRBPR];
-
-        for (spd = 0; spd < sizeof(baud_bpr); spd++)
-                if (rbpr == baud_bpr[spd] && rcor == baud_co[spd])
-                        break;
-        if (spd >= sizeof(baud_bpr)) {
-                spd = 14;       /* 19200 */
-                badspeed = 1;   /* Failed to identify speed */
-        }
-        initial_console_speed = spd;
-
-        /* OK, we have chosen a speed, now reset and reinitialise */
-
-        my_udelay(20000L);      /* Allow time for any active o/p to complete */
-        if (base_addr[CyCCR] != 0x00) {
-                local_irq_restore(flags);
-                /* printk(" chip is never idle (CCR != 0)\n"); */
-                return;
-        }
-
-        base_addr[CyCCR] = CyCHIP_RESET;        /* Reset the chip */
-        my_udelay(1000L);
-
-        if (base_addr[CyGFRCR] == 0x00) {
-                local_irq_restore(flags);
-                /* printk(" chip is not responding (GFRCR stayed 0)\n"); */
-                return;
-        }
-
-        /*
-         * System clock is 20Mhz, divided by 2048, so divide by 10 for a 1.0ms
-         * tick
-         */
-
-        base_addr[CyTPR] = 10;
-
-        base_addr[CyPILR1] = 0x01;      /* Interrupt level for modem change */
-        base_addr[CyPILR2] = 0x02;      /* Interrupt level for tx ints */
-        base_addr[CyPILR3] = 0x03;      /* Interrupt level for rx ints */
-
-        /*
-         * Attempt to set up all channels to something reasonable, and
-         * bang out a INIT_CHAN command.  We should then be able to limit
-         * the amount of fiddling we have to do in normal running.
-         */
-
-        for (ch = 3; ch >= 0; ch--) {
-                base_addr[CyCAR] = (u_char) ch;
-                base_addr[CyIER] = 0;
-                base_addr[CyCMR] = CyASYNC;
-                base_addr[CyLICR] = (u_char) ch << 2;
-                base_addr[CyLIVR] = 0x5c;
-                base_addr[CyTCOR] = baud_co[spd];
-                base_addr[CyTBPR] = baud_bpr[spd];
-                base_addr[CyRCOR] = baud_co[spd] >> 5;
-                base_addr[CyRBPR] = baud_bpr[spd];
-                base_addr[CySCHR1] = 'Q' & 0x1f;
-                base_addr[CySCHR2] = 'X' & 0x1f;
-                base_addr[CySCRL] = 0;
-                base_addr[CySCRH] = 0;
-                base_addr[CyCOR1] = Cy_8_BITS | CyPARITY_NONE;
-                base_addr[CyCOR2] = 0;
-                base_addr[CyCOR3] = Cy_1_STOP;
-                base_addr[CyCOR4] = baud_cor4[spd];
-                base_addr[CyCOR5] = 0;
-                base_addr[CyCOR6] = 0;
-                base_addr[CyCOR7] = 0;
-                base_addr[CyRTPRL] = 2;
-                base_addr[CyRTPRH] = 0;
-                base_addr[CyMSVR1] = 0;
-                base_addr[CyMSVR2] = 0;
-                write_cy_cmd(base_addr, CyINIT_CHAN | CyDIS_RCVR | CyDIS_XMTR);
-        }
-
-        /*
-         * Now do specials for channel zero....
-         */
-
-        base_addr[CyMSVR1] = CyRTS;
-        base_addr[CyMSVR2] = CyDTR;
-        base_addr[CyIER] = CyRxData;
-        write_cy_cmd(base_addr, CyENB_RCVR | CyENB_XMTR);
-
-        local_irq_restore(flags);
-
-        my_udelay(20000L);      /* Let it all settle down */
-
-        printk("CD2401 initialised,  chip is rev 0x%02x\n", base_addr[CyGFRCR]);
-        if (badspeed)
-                printk
-                    ("  WARNING:  Failed to identify line speed, rcor=%02x,rbpr=%02x\n",
-                     rcor >> 5, rbpr);
-}                               /* serial_console_init */
-
-static const struct tty_operations cy_ops = {
-        .open = cy_open,
-        .close = cy_close,
-        .write = cy_write,
-        .put_char = cy_put_char,
-        .flush_chars = cy_flush_chars,
-        .write_room = cy_write_room,
-        .chars_in_buffer = cy_chars_in_buffer,
-        .flush_buffer = cy_flush_buffer,
-        .ioctl = cy_ioctl,
-        .throttle = cy_throttle,
-        .unthrottle = cy_unthrottle,
-        .set_termios = cy_set_termios,
-        .stop = cy_stop,
-        .start = cy_start,
-        .hangup = cy_hangup,
-        .tiocmget = cy_tiocmget,
-        .tiocmset = cy_tiocmset,
-};
-
-/* The serial driver boot-time initialization code!
-    Hardware I/O ports are mapped to character special devices on a
-    first found, first allocated manner.  That is, this code searches
-    for Cyclom cards in the system.  As each is found, it is probed
-    to discover how many chips (and thus how many ports) are present.
-    These ports are mapped to the tty ports 64 and upward in monotonic
-    fashion.  If an 8-port card is replaced with a 16-port card, the
-    port mapping on a following card will shift.
-
-    This approach is different from what is used in the other serial
-    device driver because the Cyclom is more properly a multiplexer,
-    not just an aggregation of serial ports on one card.
-
-    If there are more cards with more ports than have been statically
-    allocated above, a warning is printed and the extra ports are ignored.
- */
-static int __init serial167_init(void)
-{
-        struct cyclades_port *info;
-        int ret = 0;
-        int good_ports = 0;
-        int port_num = 0;
-        int index;
-        int DefSpeed;
-#ifdef notyet
-        struct sigaction sa;
-#endif
-
-        if (!(mvme16x_config & MVME16x_CONFIG_GOT_CD2401))
-                return 0;
-
-        cy_serial_driver = alloc_tty_driver(NR_PORTS);
-        if (!cy_serial_driver)
-                return -ENOMEM;
-
-#if 0
-        scrn[1] = '\0';
-#endif
-
-        show_version();
-
-        /* Has "console=0,9600n8" been used in bootinfo to change speed? */
-        if (serial_console_cflag)
-                DefSpeed = serial_console_cflag & 0017;
-        else {
-                DefSpeed = initial_console_speed;
-                serial_console_info = &cy_port[0];
-                serial_console_cflag = DefSpeed | CS8;
-#if 0
-                serial_console = 64;    /*callout_driver.minor_start */
-#endif
-        }
-
-        /* Initialize the tty_driver structure */
-
-        cy_serial_driver->owner = THIS_MODULE;
-        cy_serial_driver->name = "ttyS";
-        cy_serial_driver->major = TTY_MAJOR;
-        cy_serial_driver->minor_start = 64;
-        cy_serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        cy_serial_driver->subtype = SERIAL_TYPE_NORMAL;
-        cy_serial_driver->init_termios = tty_std_termios;
-        cy_serial_driver->init_termios.c_cflag =
-            B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        cy_serial_driver->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(cy_serial_driver, &cy_ops);
-
-        ret = tty_register_driver(cy_serial_driver);
-        if (ret) {
-                printk(KERN_ERR "Couldn't register MVME166/7 serial driver\n");
-                put_tty_driver(cy_serial_driver);
-                return ret;
-        }
-
-        port_num = 0;
-        info = cy_port;
-        for (index = 0; index < 1; index++) {
-
-                good_ports = 4;
-
-                if (port_num < NR_PORTS) {
-                        while (good_ports-- && port_num < NR_PORTS) {
-                /*** initialize port ***/
-                                info->magic = CYCLADES_MAGIC;
-                                info->type = PORT_CIRRUS;
-                                info->card = index;
-                                info->line = port_num;
-                                info->flags = STD_COM_FLAGS;
-                                info->tty = NULL;
-                                info->xmit_fifo_size = 12;
-                                info->cor1 = CyPARITY_NONE | Cy_8_BITS;
-                                info->cor2 = CyETC;
-                                info->cor3 = Cy_1_STOP;
-                                info->cor4 = 0x08;      /* _very_ small receive threshold */
-                                info->cor5 = 0;
-                                info->cor6 = 0;
-                                info->cor7 = 0;
-                                info->tbpr = baud_bpr[DefSpeed];        /* Tx BPR */
-                                info->tco = baud_co[DefSpeed];  /* Tx CO */
-                                info->rbpr = baud_bpr[DefSpeed];        /* Rx BPR */
-                                info->rco = baud_co[DefSpeed] >> 5;     /* Rx CO */
-                                info->close_delay = 0;
-                                info->x_char = 0;
-                                info->count = 0;
-#ifdef SERIAL_DEBUG_COUNT
-                                printk("cyc: %d: setting count to 0\n",
-                                       __LINE__);
-#endif
-                                info->blocked_open = 0;
-                                info->default_threshold = 0;
-                                info->default_timeout = 0;
-                                init_waitqueue_head(&info->open_wait);
-                                init_waitqueue_head(&info->close_wait);
-                                /* info->session */
-                                /* info->pgrp */
-/*** !!!!!!!! this may expose new bugs !!!!!!!!! *********/
-                                info->read_status_mask =
-                                    CyTIMEOUT | CySPECHAR | CyBREAK | CyPARITY |
-                                    CyFRAME | CyOVERRUN;
-                                /* info->timeout */
-
-                                printk("ttyS%d ", info->line);
-                                port_num++;
-                                info++;
-                                if (!(port_num & 7)) {
-                                        printk("\n               ");
-                                }
-                        }
-                }
-                printk("\n");
-        }
-        while (port_num < NR_PORTS) {
-                info->line = -1;
-                port_num++;
-                info++;
-        }
-
-        ret = request_irq(MVME167_IRQ_SER_ERR, cd2401_rxerr_interrupt, 0,
-                          "cd2401_errors", cd2401_rxerr_interrupt);
-        if (ret) {
-                printk(KERN_ERR "Could't get cd2401_errors IRQ");
-                goto cleanup_serial_driver;
-        }
-
-        ret = request_irq(MVME167_IRQ_SER_MODEM, cd2401_modem_interrupt, 0,
-                          "cd2401_modem", cd2401_modem_interrupt);
-        if (ret) {
-                printk(KERN_ERR "Could't get cd2401_modem IRQ");
-                goto cleanup_irq_cd2401_errors;
-        }
-
-        ret = request_irq(MVME167_IRQ_SER_TX, cd2401_tx_interrupt, 0,
-                          "cd2401_txints", cd2401_tx_interrupt);
-        if (ret) {
-                printk(KERN_ERR "Could't get cd2401_txints IRQ");
-                goto cleanup_irq_cd2401_modem;
-        }
-
-        ret = request_irq(MVME167_IRQ_SER_RX, cd2401_rx_interrupt, 0,
-                          "cd2401_rxints", cd2401_rx_interrupt);
-        if (ret) {
-                printk(KERN_ERR "Could't get cd2401_rxints IRQ");
-                goto cleanup_irq_cd2401_txints;
-        }
-
-        /* Now we have registered the interrupt handlers, allow the interrupts */
-
-        pcc2chip[PccSCCMICR] = 0x15;    /* Serial ints are level 5 */
-        pcc2chip[PccSCCTICR] = 0x15;
-        pcc2chip[PccSCCRICR] = 0x15;
-
-        pcc2chip[PccIMLR] = 3;  /* Allow PCC2 ints above 3!? */
-
-        return 0;
-cleanup_irq_cd2401_txints:
-        free_irq(MVME167_IRQ_SER_TX, cd2401_tx_interrupt);
-cleanup_irq_cd2401_modem:
-        free_irq(MVME167_IRQ_SER_MODEM, cd2401_modem_interrupt);
-cleanup_irq_cd2401_errors:
-        free_irq(MVME167_IRQ_SER_ERR, cd2401_rxerr_interrupt);
-cleanup_serial_driver:
-        if (tty_unregister_driver(cy_serial_driver))
-                printk(KERN_ERR
-                       "Couldn't unregister MVME166/7 serial driver\n");
-        put_tty_driver(cy_serial_driver);
-        return ret;
-}                               /* serial167_init */
-
-module_init(serial167_init);
-
-#ifdef CYCLOM_SHOW_STATUS
-static void show_status(int line_num)
-{
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        int channel;
-        struct cyclades_port *info;
-        unsigned long flags;
-
-        info = &cy_port[line_num];
-        channel = info->line;
-        printk("  channel %d\n", channel);
-        /**/ printk(" cy_port\n");
-        printk("  card line flags = %d %d %x\n",
-               info->card, info->line, info->flags);
-        printk
-            ("  *tty read_status_mask timeout xmit_fifo_size = %lx %x %x %x\n",
-             (long)info->tty, info->read_status_mask, info->timeout,
-             info->xmit_fifo_size);
-        printk("  cor1,cor2,cor3,cor4,cor5,cor6,cor7 = %x %x %x %x %x %x %x\n",
-               info->cor1, info->cor2, info->cor3, info->cor4, info->cor5,
-               info->cor6, info->cor7);
-        printk("  tbpr,tco,rbpr,rco = %d %d %d %d\n", info->tbpr, info->tco,
-               info->rbpr, info->rco);
-        printk("  close_delay event count = %d %d %d\n", info->close_delay,
-               info->event, info->count);
-        printk("  x_char blocked_open = %x %x\n", info->x_char,
-               info->blocked_open);
-        printk("  open_wait = %lx %lx %lx\n", (long)info->open_wait);
-
-        local_irq_save(flags);
-
-/* Global Registers */
-
-        printk(" CyGFRCR %x\n", base_addr[CyGFRCR]);
-        printk(" CyCAR %x\n", base_addr[CyCAR]);
-        printk(" CyRISR %x\n", base_addr[CyRISR]);
-        printk(" CyTISR %x\n", base_addr[CyTISR]);
-        printk(" CyMISR %x\n", base_addr[CyMISR]);
-        printk(" CyRIR %x\n", base_addr[CyRIR]);
-        printk(" CyTIR %x\n", base_addr[CyTIR]);
-        printk(" CyMIR %x\n", base_addr[CyMIR]);
-        printk(" CyTPR %x\n", base_addr[CyTPR]);
-
-        base_addr[CyCAR] = (u_char) channel;
-
-/* Virtual Registers */
-
-#if 0
-        printk(" CyRIVR %x\n", base_addr[CyRIVR]);
-        printk(" CyTIVR %x\n", base_addr[CyTIVR]);
-        printk(" CyMIVR %x\n", base_addr[CyMIVR]);
-        printk(" CyMISR %x\n", base_addr[CyMISR]);
-#endif
-
-/* Channel Registers */
-
-        printk(" CyCCR %x\n", base_addr[CyCCR]);
-        printk(" CyIER %x\n", base_addr[CyIER]);
-        printk(" CyCOR1 %x\n", base_addr[CyCOR1]);
-        printk(" CyCOR2 %x\n", base_addr[CyCOR2]);
-        printk(" CyCOR3 %x\n", base_addr[CyCOR3]);
-        printk(" CyCOR4 %x\n", base_addr[CyCOR4]);
-        printk(" CyCOR5 %x\n", base_addr[CyCOR5]);
-#if 0
-        printk(" CyCCSR %x\n", base_addr[CyCCSR]);
-        printk(" CyRDCR %x\n", base_addr[CyRDCR]);
-#endif
-        printk(" CySCHR1 %x\n", base_addr[CySCHR1]);
-        printk(" CySCHR2 %x\n", base_addr[CySCHR2]);
-#if 0
-        printk(" CySCHR3 %x\n", base_addr[CySCHR3]);
-        printk(" CySCHR4 %x\n", base_addr[CySCHR4]);
-        printk(" CySCRL %x\n", base_addr[CySCRL]);
-        printk(" CySCRH %x\n", base_addr[CySCRH]);
-        printk(" CyLNC %x\n", base_addr[CyLNC]);
-        printk(" CyMCOR1 %x\n", base_addr[CyMCOR1]);
-        printk(" CyMCOR2 %x\n", base_addr[CyMCOR2]);
-#endif
-        printk(" CyRTPRL %x\n", base_addr[CyRTPRL]);
-        printk(" CyRTPRH %x\n", base_addr[CyRTPRH]);
-        printk(" CyMSVR1 %x\n", base_addr[CyMSVR1]);
-        printk(" CyMSVR2 %x\n", base_addr[CyMSVR2]);
-        printk(" CyRBPR %x\n", base_addr[CyRBPR]);
-        printk(" CyRCOR %x\n", base_addr[CyRCOR]);
-        printk(" CyTBPR %x\n", base_addr[CyTBPR]);
-        printk(" CyTCOR %x\n", base_addr[CyTCOR]);
-
-        local_irq_restore(flags);
-}                               /* show_status */
-#endif
-
-#if 0
-/* Dummy routine in mvme16x/config.c for now */
-
-/* Serial console setup. Called from linux/init/main.c */
-
-void console_setup(char *str, int *ints)
-{
-        char *s;
-        int baud, bits, parity;
-        int cflag = 0;
-
-        /* Sanity check. */
-        if (ints[0] > 3 || ints[1] > 3)
-                return;
-
-        /* Get baud, bits and parity */
-        baud = 2400;
-        bits = 8;
-        parity = 'n';
-        if (ints[2])
-                baud = ints[2];
-        if ((s = strchr(str, ','))) {
-                do {
-                        s++;
-                } while (*s >= '0' && *s <= '9');
-                if (*s)
-                        parity = *s++;
-                if (*s)
-                        bits = *s - '0';
-        }
-
-        /* Now construct a cflag setting. */
-        switch (baud) {
-        case 1200:
-                cflag |= B1200;
-                break;
-        case 9600:
-                cflag |= B9600;
-                break;
-        case 19200:
-                cflag |= B19200;
-                break;
-        case 38400:
-                cflag |= B38400;
-                break;
-        case 2400:
-        default:
-                cflag |= B2400;
-                break;
-        }
-        switch (bits) {
-        case 7:
-                cflag |= CS7;
-                break;
-        default:
-        case 8:
-                cflag |= CS8;
-                break;
-        }
-        switch (parity) {
-        case 'o':
-        case 'O':
-                cflag |= PARODD;
-                break;
-        case 'e':
-        case 'E':
-                cflag |= PARENB;
-                break;
-        }
-
-        serial_console_info = &cy_port[ints[1]];
-        serial_console_cflag = cflag;
-        serial_console = ints[1] + 64;  /*callout_driver.minor_start */
-}
-#endif
-
-/*
- * The following is probably out of date for 2.1.x serial console stuff.
- *
- * The console is registered early on from arch/m68k/kernel/setup.c, and
- * it therefore relies on the chip being setup correctly by 166-Bug.  This
- * seems reasonable, as the serial port has been used to invoke the system
- * boot.  It also means that this function must not rely on any data
- * initialisation performed by serial167_init() etc.
- *
- * Of course, once the console has been registered, we had better ensure
- * that serial167_init() doesn't leave the chip non-functional.
- *
- * The console must be locked when we get here.
- */
-
-void serial167_console_write(struct console *co, const char *str,
-                             unsigned count)
-{
-        volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-        unsigned long flags;
-        volatile u_char sink;
-        u_char ier;
-        int port;
-        u_char do_lf = 0;
-        int i = 0;
-
-        local_irq_save(flags);
-
-        /* Ensure transmitter is enabled! */
-
-        port = 0;
-        base_addr[CyCAR] = (u_char) port;
-        while (base_addr[CyCCR])
-                ;
-        base_addr[CyCCR] = CyENB_XMTR;
-
-        ier = base_addr[CyIER];
-        base_addr[CyIER] = CyTxMpty;
-
-        while (1) {
-                if (pcc2chip[PccSCCTICR] & 0x20) {
-                        /* We have a Tx int. Acknowledge it */
-                        sink = pcc2chip[PccTPIACKR];
-                        if ((base_addr[CyLICR] >> 2) == port) {
-                                if (i == count) {
-                                        /* Last char of string is now output */
-                                        base_addr[CyTEOIR] = CyNOTRANS;
-                                        break;
-                                }
-                                if (do_lf) {
-                                        base_addr[CyTDR] = '\n';
-                                        str++;
-                                        i++;
-                                        do_lf = 0;
-                                } else if (*str == '\n') {
-                                        base_addr[CyTDR] = '\r';
-                                        do_lf = 1;
-                                } else {
-                                        base_addr[CyTDR] = *str++;
-                                        i++;
-                                }
-                                base_addr[CyTEOIR] = 0;
-                        } else
-                                base_addr[CyTEOIR] = CyNOTRANS;
-                }
-        }
-
-        base_addr[CyIER] = ier;
-
-        local_irq_restore(flags);
-}
-
-static struct tty_driver *serial167_console_device(struct console *c,
-                                                   int *index)
-{
-        *index = c->index;
-        return cy_serial_driver;
-}
-
-static struct console sercons = {
-        .name = "ttyS",
-        .write = serial167_console_write,
-        .device = serial167_console_device,
-        .flags = CON_PRINTBUFFER,
-        .index = -1,
-};
-
-static int __init serial167_console_init(void)
-{
-        if (vme_brdtype == VME_TYPE_MVME166 ||
-            vme_brdtype == VME_TYPE_MVME167 ||
-            vme_brdtype == VME_TYPE_MVME177) {
-                mvme167_serial_console_setup(0);
-                register_console(&sercons);
-        }
-        return 0;
-}
-
-console_initcall(serial167_console_init);
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index 32b74de18f5f..5816b39ff5a9 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -21,7 +21,7 @@
 #include <linux/poll.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <asm/sn/io.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/sn/module.h>
@@ -34,6 +34,7 @@
 #define SCDRV_BUFSZ     2048
 #define SCDRV_TIMEOUT   1000
 
+static DEFINE_MUTEX(scdrv_mutex);
 static irqreturn_t
 scdrv_interrupt(int irq, void *subch_data)
 {
@@ -105,7 +106,7 @@ scdrv_open(struct inode *inode, struct file *file)
         file->private_data = sd;
 
         /* hook this subchannel up to the system controller interrupt */
-        lock_kernel();
+        mutex_lock(&scdrv_mutex);
         rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt,
                          IRQF_SHARED | IRQF_DISABLED,
                          SYSCTL_BASENAME, sd);
@@ -113,10 +114,10 @@ scdrv_open(struct inode *inode, struct file *file)
                 ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch);
                 kfree(sd);
                 printk("%s: irq request failed (%d)\n", __func__, rv);
-                unlock_kernel();
+                mutex_unlock(&scdrv_mutex);
                 return -EBUSY;
         }
-        unlock_kernel();
+        mutex_unlock(&scdrv_mutex);
         return 0;
 }
 
@@ -357,6 +358,7 @@ static const struct file_operations scdrv_fops = {
         .poll =         scdrv_poll,
         .open =         scdrv_open,
         .release =      scdrv_release,
+        .llseek =       noop_llseek,
 };
 
 static struct class *snsc_class;
diff --git a/drivers/char/snsc.h b/drivers/char/snsc.h
index 4be62eda9fbc..e8c52c882b21 100644
--- a/drivers/char/snsc.h
+++ b/drivers/char/snsc.h
@@ -19,7 +19,6 @@
 #include <linux/types.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
-#include <linux/kobject.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
 #include <linux/semaphore.h>
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 73f66d03624d..1ee8ce7d2762 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1241,7 +1241,7 @@ static int __devinit sonypi_setup_ioports(struct sonypi_device *dev,
         while (check_ioport && check->port1) {
                 if (!request_region(check->port1,
                                    sonypi_device.region_size,
-                                   "Sony Programable I/O Device Check")) {
+                                   "Sony Programmable I/O Device Check")) {
                         printk(KERN_ERR "sonypi: ioport 0x%.4x busy, using sony-laptop? "
                                         "if not use check_ioport=0\n",
                                         check->port1);
@@ -1255,7 +1255,7 @@ static int __devinit sonypi_setup_ioports(struct sonypi_device *dev,
 
                 if (request_region(ioport_list->port1,
                                    sonypi_device.region_size,
-                                   "Sony Programable I/O Device")) {
+                                   "Sony Programmable I/O Device")) {
                         dev->ioport1 = ioport_list->port1;
                         dev->ioport2 = ioport_list->port2;
                         return 0;
@@ -1434,7 +1434,7 @@ static int __devexit sonypi_remove(struct platform_device *dev)
         sonypi_disable();
 
         synchronize_irq(sonypi_device.irq);
-        flush_scheduled_work();
+        flush_work_sync(&sonypi_device.input_work);
 
         if (useinput) {
                 input_unregister_device(sonypi_device.input_key_dev);
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
deleted file mode 100644
index 9f8495b4fc8f..000000000000
--- a/drivers/char/specialix.c
+++ /dev/null
@@ -1,2369 +0,0 @@
-/*
- *      specialix.c  -- specialix IO8+ multiport serial driver.
- *
- *      Copyright (C) 1997  Roger Wolff (R.E.Wolff@BitWizard.nl)
- *      Copyright (C) 1994-1996  Dmitry Gorodchanin (pgmdsg@ibi.com)
- *
- *      Specialix pays for the development and support of this driver.
- *      Please DO contact io8-linux@specialix.co.uk if you require
- *      support. But please read the documentation (specialix.txt)
- *      first.
- *
- *      This driver was developped in the BitWizard linux device
- *      driver service. If you require a linux device driver for your
- *      product, please contact devices@BitWizard.nl for a quote.
- *
- *      This code is firmly based on the riscom/8 serial driver,
- *      written by Dmitry Gorodchanin. The specialix IO8+ card
- *      programming information was obtained from the CL-CD1865 Data
- *      Book, and Specialix document number 6200059: IO8+ Hardware
- *      Functional Specification.
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License as
- *      published by the Free Software Foundation; either version 2 of
- *      the License, or (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be
- *      useful, but WITHOUT ANY WARRANTY; without even the implied
- *      warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *      PURPOSE.  See the GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public
- *      License along with this program; if not, write to the Free
- *      Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
- *      USA.
- *
- * Revision history:
- *
- * Revision 1.0:  April 1st 1997.
- *                Initial release for alpha testing.
- * Revision 1.1:  April 14th 1997.
- *                Incorporated Richard Hudsons suggestions,
- *                removed some debugging printk's.
- * Revision 1.2:  April 15th 1997.
- *                Ported to 2.1.x kernels.
- * Revision 1.3:  April 17th 1997
- *                Backported to 2.0. (Compatibility macros).
- * Revision 1.4:  April 18th 1997
- *                Fixed DTR/RTS bug that caused the card to indicate
- *                "don't send data" to a modem after the password prompt.
- *                Fixed bug for premature (fake) interrupts.
- * Revision 1.5:  April 19th 1997
- *                fixed a minor typo in the header file, cleanup a little.
- *                performance warnings are now MAXed at once per minute.
- * Revision 1.6:  May 23 1997
- *                Changed the specialix=... format to include interrupt.
- * Revision 1.7:  May 27 1997
- *                Made many more debug printk's a compile time option.
- * Revision 1.8:  Jul 1  1997
- *                port to linux-2.1.43 kernel.
- * Revision 1.9:  Oct 9  1998
- *                Added stuff for the IO8+/PCI version.
- * Revision 1.10: Oct 22  1999 / Jan 21 2000.
- *                Added stuff for setserial.
- *                Nicolas Mailhot (Nicolas.Mailhot@email.enst.fr)
- *
- */
-
-#define VERSION "1.11"
-
-
-/*
- * There is a bunch of documentation about the card, jumpers, config
- * settings, restrictions, cables, device names and numbers in
- * Documentation/serial/specialix.txt
- */
-
-#include <linux/module.h>
-
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/mm.h>
-#include <linux/serial.h>
-#include <linux/smp_lock.h>
-#include <linux/fcntl.h>
-#include <linux/major.h>
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/uaccess.h>
-#include <linux/gfp.h>
-
-#include "specialix_io8.h"
-#include "cd1865.h"
-
-
-/*
-   This driver can spew a whole lot of debugging output at you. If you
-   need maximum performance, you should disable the DEBUG define. To
-   aid in debugging in the field, I'm leaving the compile-time debug
-   features enabled, and disable them "runtime". That allows me to
-   instruct people with problems to enable debugging without requiring
-   them to recompile...
-*/
-#define DEBUG
-
-static int sx_debug;
-static int sx_rxfifo = SPECIALIX_RXFIFO;
-static int sx_rtscts;
-
-#ifdef DEBUG
-#define dprintk(f, str...) if (sx_debug & f) printk(str)
-#else
-#define dprintk(f, str...) /* nothing */
-#endif
-
-#define SX_DEBUG_FLOW    0x0001
-#define SX_DEBUG_DATA    0x0002
-#define SX_DEBUG_PROBE   0x0004
-#define SX_DEBUG_CHAN    0x0008
-#define SX_DEBUG_INIT    0x0010
-#define SX_DEBUG_RX      0x0020
-#define SX_DEBUG_TX      0x0040
-#define SX_DEBUG_IRQ     0x0080
-#define SX_DEBUG_OPEN    0x0100
-#define SX_DEBUG_TERMIOS 0x0200
-#define SX_DEBUG_SIGNALS 0x0400
-#define SX_DEBUG_FIFO    0x0800
-
-
-#define func_enter() dprintk(SX_DEBUG_FLOW, "io8: enter %s\n", __func__)
-#define func_exit()  dprintk(SX_DEBUG_FLOW, "io8: exit  %s\n", __func__)
-
-
-/* Configurable options: */
-
-/* Am I paranoid or not ? ;-) */
-#define SPECIALIX_PARANOIA_CHECK
-
-/*
- * The following defines are mostly for testing purposes. But if you need
- * some nice reporting in your syslog, you can define them also.
- */
-#undef SX_REPORT_FIFO
-#undef SX_REPORT_OVERRUN
-
-
-
-
-#define SPECIALIX_LEGAL_FLAGS \
-        (ASYNC_HUP_NOTIFY   | ASYNC_SAK          | ASYNC_SPLIT_TERMIOS   | \
-         ASYNC_SPD_HI       | ASYNC_SPEED_VHI    | ASYNC_SESSION_LOCKOUT | \
-         ASYNC_PGRP_LOCKOUT | ASYNC_CALLOUT_NOHUP)
-
-static struct tty_driver *specialix_driver;
-
-static struct specialix_board sx_board[SX_NBOARD] =  {
-        { 0, SX_IOBASE1,  9, },
-        { 0, SX_IOBASE2, 11, },
-        { 0, SX_IOBASE3, 12, },
-        { 0, SX_IOBASE4, 15, },
-};
-
-static struct specialix_port sx_port[SX_NBOARD * SX_NPORT];
-
-
-static int sx_paranoia_check(struct specialix_port const *port,
-                                    char *name, const char *routine)
-{
-#ifdef SPECIALIX_PARANOIA_CHECK
-        static const char *badmagic = KERN_ERR
-          "sx: Warning: bad specialix port magic number for device %s in %s\n";
-        static const char *badinfo = KERN_ERR
-          "sx: Warning: null specialix port for device %s in %s\n";
-
-        if (!port) {
-                printk(badinfo, name, routine);
-                return 1;
-        }
-        if (port->magic != SPECIALIX_MAGIC) {
-                printk(badmagic, name, routine);
-                return 1;
-        }
-#endif
-        return 0;
-}
-
-
-/*
- *
- *  Service functions for specialix IO8+ driver.
- *
- */
-
-/* Get board number from pointer */
-static inline int board_No(struct specialix_board *bp)
-{
-        return bp - sx_board;
-}
-
-
-/* Get port number from pointer */
-static inline int port_No(struct specialix_port const *port)
-{
-        return SX_PORT(port - sx_port);
-}
-
-
-/* Get pointer to board from pointer to port */
-static inline struct specialix_board *port_Board(
-                                        struct specialix_port const *port)
-{
-        return &sx_board[SX_BOARD(port - sx_port)];
-}
-
-
-/* Input Byte from CL CD186x register */
-static inline unsigned char sx_in(struct specialix_board *bp,
-                                                        unsigned short reg)
-{
-        bp->reg = reg | 0x80;
-        outb(reg | 0x80, bp->base + SX_ADDR_REG);
-        return inb(bp->base + SX_DATA_REG);
-}
-
-
-/* Output Byte to CL CD186x register */
-static inline void sx_out(struct specialix_board *bp, unsigned short reg,
-                          unsigned char val)
-{
-        bp->reg = reg | 0x80;
-        outb(reg | 0x80, bp->base + SX_ADDR_REG);
-        outb(val, bp->base + SX_DATA_REG);
-}
-
-
-/* Input Byte from CL CD186x register */
-static inline unsigned char sx_in_off(struct specialix_board *bp,
-                                unsigned short reg)
-{
-        bp->reg = reg;
-        outb(reg, bp->base + SX_ADDR_REG);
-        return inb(bp->base + SX_DATA_REG);
-}
-
-
-/* Output Byte to CL CD186x register */
-static inline void sx_out_off(struct specialix_board  *bp,
-                                unsigned short reg, unsigned char val)
-{
-        bp->reg = reg;
-        outb(reg, bp->base + SX_ADDR_REG);
-        outb(val, bp->base + SX_DATA_REG);
-}
-
-
-/* Wait for Channel Command Register ready */
-static void sx_wait_CCR(struct specialix_board  *bp)
-{
-        unsigned long delay, flags;
-        unsigned char ccr;
-
-        for (delay = SX_CCR_TIMEOUT; delay; delay--) {
-                spin_lock_irqsave(&bp->lock, flags);
-                ccr = sx_in(bp, CD186x_CCR);
-                spin_unlock_irqrestore(&bp->lock, flags);
-                if (!ccr)
-                        return;
-                udelay(1);
-        }
-
-        printk(KERN_ERR "sx%d: Timeout waiting for CCR.\n", board_No(bp));
-}
-
-
-/* Wait for Channel Command Register ready */
-static void sx_wait_CCR_off(struct specialix_board  *bp)
-{
-        unsigned long delay;
-        unsigned char crr;
-        unsigned long flags;
-
-        for (delay = SX_CCR_TIMEOUT; delay; delay--) {
-                spin_lock_irqsave(&bp->lock, flags);
-                crr = sx_in_off(bp, CD186x_CCR);
-                spin_unlock_irqrestore(&bp->lock, flags);
-                if (!crr)
-                        return;
-                udelay(1);
-        }
-
-        printk(KERN_ERR "sx%d: Timeout waiting for CCR.\n", board_No(bp));
-}
-
-
-/*
- *  specialix IO8+ IO range functions.
- */
-
-static int sx_request_io_range(struct specialix_board *bp)
-{
-        return request_region(bp->base,
-                bp->flags & SX_BOARD_IS_PCI ? SX_PCI_IO_SPACE : SX_IO_SPACE,
-                "specialix IO8+") == NULL;
-}
-
-
-static void sx_release_io_range(struct specialix_board *bp)
-{
-        release_region(bp->base, bp->flags & SX_BOARD_IS_PCI ?
-                                        SX_PCI_IO_SPACE : SX_IO_SPACE);
-}
-
-
-/* Set the IRQ using the RTS lines that run to the PAL on the board.... */
-static int sx_set_irq(struct specialix_board *bp)
-{
-        int virq;
-        int i;
-        unsigned long flags;
-
-        if (bp->flags & SX_BOARD_IS_PCI)
-                return 1;
-        switch (bp->irq) {
-        /* In the same order as in the docs... */
-        case 15:
-                virq = 0;
-                break;
-        case 12:
-                virq = 1;
-                break;
-        case 11:
-                virq = 2;
-                break;
-        case 9:
-                virq = 3;
-                break;
-        default:printk(KERN_ERR
-                            "Speclialix: cannot set irq to %d.\n", bp->irq);
-                return 0;
-        }
-        spin_lock_irqsave(&bp->lock, flags);
-        for (i = 0; i < 2; i++) {
-                sx_out(bp, CD186x_CAR, i);
-                sx_out(bp, CD186x_MSVRTS, ((virq >> i) & 0x1)? MSVR_RTS:0);
-        }
-        spin_unlock_irqrestore(&bp->lock, flags);
-        return 1;
-}
-
-
-/* Reset and setup CD186x chip */
-static int sx_init_CD186x(struct specialix_board  *bp)
-{
-        unsigned long flags;
-        int scaler;
-        int rv = 1;
-
-        func_enter();
-        sx_wait_CCR_off(bp);                       /* Wait for CCR ready        */
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out_off(bp, CD186x_CCR, CCR_HARDRESET);      /* Reset CD186x chip          */
-        spin_unlock_irqrestore(&bp->lock, flags);
-        msleep(50);                                     /* Delay 0.05 sec            */
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out_off(bp, CD186x_GIVR, SX_ID);             /* Set ID for this chip      */
-        sx_out_off(bp, CD186x_GICR, 0);                 /* Clear all bits            */
-        sx_out_off(bp, CD186x_PILR1, SX_ACK_MINT);      /* Prio for modem intr       */
-        sx_out_off(bp, CD186x_PILR2, SX_ACK_TINT);      /* Prio for transmitter intr */
-        sx_out_off(bp, CD186x_PILR3, SX_ACK_RINT);      /* Prio for receiver intr    */
-        /* Set RegAckEn */
-        sx_out_off(bp, CD186x_SRCR, sx_in(bp, CD186x_SRCR) | SRCR_REGACKEN);
-
-        /* Setting up prescaler. We need 4 ticks per 1 ms */
-        scaler =  SX_OSCFREQ/SPECIALIX_TPS;
-
-        sx_out_off(bp, CD186x_PPRH, scaler >> 8);
-        sx_out_off(bp, CD186x_PPRL, scaler & 0xff);
-        spin_unlock_irqrestore(&bp->lock, flags);
-
-        if (!sx_set_irq(bp)) {
-                /* Figure out how to pass this along... */
-                printk(KERN_ERR "Cannot set irq to %d.\n", bp->irq);
-                rv = 0;
-        }
-
-        func_exit();
-        return rv;
-}
-
-
-static int read_cross_byte(struct specialix_board *bp, int reg, int bit)
-{
-        int i;
-        int t;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bp->lock, flags);
-        for (i = 0, t = 0; i < 8; i++) {
-                sx_out_off(bp, CD186x_CAR, i);
-                if (sx_in_off(bp, reg) & bit)
-                        t |= 1 << i;
-        }
-        spin_unlock_irqrestore(&bp->lock, flags);
-
-        return t;
-}
-
-
-/* Main probing routine, also sets irq. */
-static int sx_probe(struct specialix_board *bp)
-{
-        unsigned char val1, val2;
-        int rev;
-        int chip;
-
-        func_enter();
-
-        if (sx_request_io_range(bp)) {
-                func_exit();
-                return 1;
-        }
-
-        /* Are the I/O ports here ? */
-        sx_out_off(bp, CD186x_PPRL, 0x5a);
-        udelay(1);
-        val1 = sx_in_off(bp, CD186x_PPRL);
-
-        sx_out_off(bp, CD186x_PPRL, 0xa5);
-        udelay(1);
-        val2 = sx_in_off(bp, CD186x_PPRL);
-
-
-        if (val1 != 0x5a || val2 != 0xa5) {
-                printk(KERN_INFO
-                        "sx%d: specialix IO8+ Board at 0x%03x not found.\n",
-                                                board_No(bp), bp->base);
-                sx_release_io_range(bp);
-                func_exit();
-                return 1;
-        }
-
-        /* Check the DSR lines that Specialix uses as board
-           identification */
-        val1 = read_cross_byte(bp, CD186x_MSVR, MSVR_DSR);
-        val2 = read_cross_byte(bp, CD186x_MSVR, MSVR_RTS);
-        dprintk(SX_DEBUG_INIT,
-                        "sx%d: DSR lines are: %02x, rts lines are: %02x\n",
-                                        board_No(bp), val1, val2);
-
-        /* They managed to switch the bit order between the docs and
-           the IO8+ card. The new PCI card now conforms to old docs.
-           They changed the PCI docs to reflect the situation on the
-           old card. */
-        val2 = (bp->flags & SX_BOARD_IS_PCI)?0x4d : 0xb2;
-        if (val1 != val2) {
-                printk(KERN_INFO
-                  "sx%d: specialix IO8+ ID %02x at 0x%03x not found (%02x).\n",
-                       board_No(bp), val2, bp->base, val1);
-                sx_release_io_range(bp);
-                func_exit();
-                return 1;
-        }
-
-
-        /* Reset CD186x again  */
-        if (!sx_init_CD186x(bp)) {
-                sx_release_io_range(bp);
-                func_exit();
-                return 1;
-        }
-
-        sx_request_io_range(bp);
-        bp->flags |= SX_BOARD_PRESENT;
-
-        /* Chip           revcode   pkgtype
-                          GFRCR     SRCR bit 7
-           CD180 rev B    0x81      0
-           CD180 rev C    0x82      0
-           CD1864 rev A   0x82      1
-           CD1865 rev A   0x83      1  -- Do not use!!! Does not work.
-           CD1865 rev B   0x84      1
-         -- Thanks to Gwen Wang, Cirrus Logic.
-         */
-
-        switch (sx_in_off(bp, CD186x_GFRCR)) {
-        case 0x82:
-                chip = 1864;
-                rev = 'A';
-                break;
-        case 0x83:
-                chip = 1865;
-                rev = 'A';
-                break;
-        case 0x84:
-                chip = 1865;
-                rev = 'B';
-                break;
-        case 0x85:
-                chip = 1865;
-                rev = 'C';
-                break; /* Does not exist at this time */
-        default:
-                chip = -1;
-                rev = 'x';
-        }
-
-        dprintk(SX_DEBUG_INIT, " GFCR = 0x%02x\n", sx_in_off(bp, CD186x_GFRCR));
-
-        printk(KERN_INFO
-    "sx%d: specialix IO8+ board detected at 0x%03x, IRQ %d, CD%d Rev. %c.\n",
-                                board_No(bp), bp->base, bp->irq, chip, rev);
-
-        func_exit();
-        return 0;
-}
-
-/*
- *
- *  Interrupt processing routines.
- * */
-
-static struct specialix_port *sx_get_port(struct specialix_board *bp,
-                                               unsigned char const *what)
-{
-        unsigned char channel;
-        struct specialix_port *port = NULL;
-
-        channel = sx_in(bp, CD186x_GICR) >> GICR_CHAN_OFF;
-        dprintk(SX_DEBUG_CHAN, "channel: %d\n", channel);
-        if (channel < CD186x_NCH) {
-                port = &sx_port[board_No(bp) * SX_NPORT + channel];
-                dprintk(SX_DEBUG_CHAN, "port: %d %p flags: 0x%lx\n",
-                        board_No(bp) * SX_NPORT + channel,  port,
-                        port->port.flags & ASYNC_INITIALIZED);
-
-                if (port->port.flags & ASYNC_INITIALIZED) {
-                        dprintk(SX_DEBUG_CHAN, "port: %d %p\n", channel, port);
-                        func_exit();
-                        return port;
-                }
-        }
-        printk(KERN_INFO "sx%d: %s interrupt from invalid port %d\n",
-               board_No(bp), what, channel);
-        return NULL;
-}
-
-
-static void sx_receive_exc(struct specialix_board *bp)
-{
-        struct specialix_port *port;
-        struct tty_struct *tty;
-        unsigned char status;
-        unsigned char ch, flag;
-
-        func_enter();
-
-        port = sx_get_port(bp, "Receive");
-        if (!port) {
-                dprintk(SX_DEBUG_RX, "Hmm, couldn't find port.\n");
-                func_exit();
-                return;
-        }
-        tty = port->port.tty;
-
-        status = sx_in(bp, CD186x_RCSR);
-
-        dprintk(SX_DEBUG_RX, "status: 0x%x\n", status);
-        if (status & RCSR_OE) {
-                port->overrun++;
-                dprintk(SX_DEBUG_FIFO,
-                        "sx%d: port %d: Overrun. Total %ld overruns.\n",
-                                board_No(bp), port_No(port), port->overrun);
-        }
-        status &= port->mark_mask;
-
-        /* This flip buffer check needs to be below the reading of the
-           status register to reset the chip's IRQ.... */
-        if (tty_buffer_request_room(tty, 1) == 0) {
-                dprintk(SX_DEBUG_FIFO,
-                    "sx%d: port %d: Working around flip buffer overflow.\n",
-                                        board_No(bp), port_No(port));
-                func_exit();
-                return;
-        }
-
-        ch = sx_in(bp, CD186x_RDR);
-        if (!status) {
-                func_exit();
-                return;
-        }
-        if (status & RCSR_TOUT) {
-                printk(KERN_INFO
-                    "sx%d: port %d: Receiver timeout. Hardware problems ?\n",
-                                        board_No(bp), port_No(port));
-                func_exit();
-                return;
-
-        } else if (status & RCSR_BREAK) {
-                dprintk(SX_DEBUG_RX, "sx%d: port %d: Handling break...\n",
-                       board_No(bp), port_No(port));
-                flag = TTY_BREAK;
-                if (port->port.flags & ASYNC_SAK)
-                        do_SAK(tty);
-
-        } else if (status & RCSR_PE)
-                flag = TTY_PARITY;
-
-        else if (status & RCSR_FE)
-                flag = TTY_FRAME;
-
-        else if (status & RCSR_OE)
-                flag = TTY_OVERRUN;
-
-        else
-                flag = TTY_NORMAL;
-
-        if (tty_insert_flip_char(tty, ch, flag))
-                tty_flip_buffer_push(tty);
-        func_exit();
-}
-
-
-static void sx_receive(struct specialix_board *bp)
-{
-        struct specialix_port *port;
-        struct tty_struct *tty;
-        unsigned char count;
-
-        func_enter();
-
-        port = sx_get_port(bp, "Receive");
-        if (port == NULL) {
-                dprintk(SX_DEBUG_RX, "Hmm, couldn't find port.\n");
-                func_exit();
-                return;
-        }
-        tty = port->port.tty;
-
-        count = sx_in(bp, CD186x_RDCR);
-        dprintk(SX_DEBUG_RX, "port: %p: count: %d\n", port, count);
-        port->hits[count > 8 ? 9 : count]++;
-
-        while (count--)
-                tty_insert_flip_char(tty, sx_in(bp, CD186x_RDR), TTY_NORMAL);
-        tty_flip_buffer_push(tty);
-        func_exit();
-}
-
-
-static void sx_transmit(struct specialix_board *bp)
-{
-        struct specialix_port *port;
-        struct tty_struct *tty;
-        unsigned char count;
-
-        func_enter();
-        port = sx_get_port(bp, "Transmit");
-        if (port == NULL) {
-                func_exit();
-                return;
-        }
-        dprintk(SX_DEBUG_TX, "port: %p\n", port);
-        tty = port->port.tty;
-
-        if (port->IER & IER_TXEMPTY) {
-                /* FIFO drained */
-                sx_out(bp, CD186x_CAR, port_No(port));
-                port->IER &= ~IER_TXEMPTY;
-                sx_out(bp, CD186x_IER, port->IER);
-                func_exit();
-                return;
-        }
-
-        if ((port->xmit_cnt <= 0 && !port->break_length)
-            || tty->stopped || tty->hw_stopped) {
-                sx_out(bp, CD186x_CAR, port_No(port));
-                port->IER &= ~IER_TXRDY;
-                sx_out(bp, CD186x_IER, port->IER);
-                func_exit();
-                return;
-        }
-
-        if (port->break_length) {
-                if (port->break_length > 0) {
-                        if (port->COR2 & COR2_ETC) {
-                                sx_out(bp, CD186x_TDR, CD186x_C_ESC);
-                                sx_out(bp, CD186x_TDR, CD186x_C_SBRK);
-                                port->COR2 &= ~COR2_ETC;
-                        }
-                        count = min_t(int, port->break_length, 0xff);
-                        sx_out(bp, CD186x_TDR, CD186x_C_ESC);
-                        sx_out(bp, CD186x_TDR, CD186x_C_DELAY);
-                        sx_out(bp, CD186x_TDR, count);
-                        port->break_length -= count;
-                        if (port->break_length == 0)
-                                port->break_length--;
-                } else {
-                        sx_out(bp, CD186x_TDR, CD186x_C_ESC);
-                        sx_out(bp, CD186x_TDR, CD186x_C_EBRK);
-                        sx_out(bp, CD186x_COR2, port->COR2);
-                        sx_wait_CCR(bp);
-                        sx_out(bp, CD186x_CCR, CCR_CORCHG2);
-                        port->break_length = 0;
-                }
-
-                func_exit();
-                return;
-        }
-
-        count = CD186x_NFIFO;
-        do {
-                sx_out(bp, CD186x_TDR, port->xmit_buf[port->xmit_tail++]);
-                port->xmit_tail = port->xmit_tail & (SERIAL_XMIT_SIZE-1);
-                if (--port->xmit_cnt <= 0)
-                        break;
-        } while (--count > 0);
-
-        if (port->xmit_cnt <= 0) {
-                sx_out(bp, CD186x_CAR, port_No(port));
-                port->IER &= ~IER_TXRDY;
-                sx_out(bp, CD186x_IER, port->IER);
-        }
-        if (port->xmit_cnt <= port->wakeup_chars)
-                tty_wakeup(tty);
-
-        func_exit();
-}
-
-
-static void sx_check_modem(struct specialix_board *bp)
-{
-        struct specialix_port *port;
-        struct tty_struct *tty;
-        unsigned char mcr;
-        int msvr_cd;
-
-        dprintk(SX_DEBUG_SIGNALS, "Modem intr. ");
-        port = sx_get_port(bp, "Modem");
-        if (port == NULL)
-                return;
-
-        tty = port->port.tty;
-
-        mcr = sx_in(bp, CD186x_MCR);
-
-        if ((mcr & MCR_CDCHG)) {
-                dprintk(SX_DEBUG_SIGNALS, "CD just changed... ");
-                msvr_cd = sx_in(bp, CD186x_MSVR) & MSVR_CD;
-                if (msvr_cd) {
-                        dprintk(SX_DEBUG_SIGNALS, "Waking up guys in open.\n");
-                        wake_up_interruptible(&port->port.open_wait);
-                } else {
-                        dprintk(SX_DEBUG_SIGNALS, "Sending HUP.\n");
-                        tty_hangup(tty);
-                }
-        }
-
-#ifdef SPECIALIX_BRAIN_DAMAGED_CTS
-        if (mcr & MCR_CTSCHG) {
-                if (sx_in(bp, CD186x_MSVR) & MSVR_CTS) {
-                        tty->hw_stopped = 0;
-                        port->IER |= IER_TXRDY;
-                        if (port->xmit_cnt <= port->wakeup_chars)
-                                tty_wakeup(tty);
-                } else {
-                        tty->hw_stopped = 1;
-                        port->IER &= ~IER_TXRDY;
-                }
-                sx_out(bp, CD186x_IER, port->IER);
-        }
-        if (mcr & MCR_DSSXHG) {
-                if (sx_in(bp, CD186x_MSVR) & MSVR_DSR) {
-                        tty->hw_stopped = 0;
-                        port->IER |= IER_TXRDY;
-                        if (port->xmit_cnt <= port->wakeup_chars)
-                                tty_wakeup(tty);
-                } else {
-                        tty->hw_stopped = 1;
-                        port->IER &= ~IER_TXRDY;
-                }
-                sx_out(bp, CD186x_IER, port->IER);
-        }
-#endif /* SPECIALIX_BRAIN_DAMAGED_CTS */
-
-        /* Clear change bits */
-        sx_out(bp, CD186x_MCR, 0);
-}
-
-
-/* The main interrupt processing routine */
-static irqreturn_t sx_interrupt(int dummy, void *dev_id)
-{
-        unsigned char status;
-        unsigned char ack;
-        struct specialix_board *bp = dev_id;
-        unsigned long loop = 0;
-        int saved_reg;
-        unsigned long flags;
-
-        func_enter();
-
-        spin_lock_irqsave(&bp->lock, flags);
-
-        dprintk(SX_DEBUG_FLOW, "enter %s port %d room: %ld\n", __func__,
-                port_No(sx_get_port(bp, "INT")),
-                SERIAL_XMIT_SIZE - sx_get_port(bp, "ITN")->xmit_cnt - 1);
-        if (!(bp->flags & SX_BOARD_ACTIVE)) {
-                dprintk(SX_DEBUG_IRQ, "sx: False interrupt. irq %d.\n",
-                                                                bp->irq);
-                spin_unlock_irqrestore(&bp->lock, flags);
-                func_exit();
-                return IRQ_NONE;
-        }
-
-        saved_reg = bp->reg;
-
-        while (++loop < 16) {
-                status = sx_in(bp, CD186x_SRSR) &
-                                (SRSR_RREQint | SRSR_TREQint | SRSR_MREQint);
-                if (status == 0)
-                        break;
-                if (status & SRSR_RREQint) {
-                        ack = sx_in(bp, CD186x_RRAR);
-
-                        if (ack == (SX_ID | GIVR_IT_RCV))
-                                sx_receive(bp);
-                        else if (ack == (SX_ID | GIVR_IT_REXC))
-                                sx_receive_exc(bp);
-                        else
-                                printk(KERN_ERR
-                                "sx%d: status: 0x%x Bad receive ack 0x%02x.\n",
-                                                board_No(bp), status, ack);
-
-                } else if (status & SRSR_TREQint) {
-                        ack = sx_in(bp, CD186x_TRAR);
-
-                        if (ack == (SX_ID | GIVR_IT_TX))
-                                sx_transmit(bp);
-                        else
-                                printk(KERN_ERR "sx%d: status: 0x%x Bad transmit ack 0x%02x. port: %d\n",
-                                        board_No(bp), status, ack,
-                                        port_No(sx_get_port(bp, "Int")));
-                } else if (status & SRSR_MREQint) {
-                        ack = sx_in(bp, CD186x_MRAR);
-
-                        if (ack == (SX_ID | GIVR_IT_MODEM))
-                                sx_check_modem(bp);
-                        else
-                                printk(KERN_ERR
-                                  "sx%d: status: 0x%x Bad modem ack 0x%02x.\n",
-                                       board_No(bp), status, ack);
-
-                }
-
-                sx_out(bp, CD186x_EOIR, 0);   /* Mark end of interrupt */
-        }
-        bp->reg = saved_reg;
-        outb(bp->reg, bp->base + SX_ADDR_REG);
-        spin_unlock_irqrestore(&bp->lock, flags);
-        func_exit();
-        return IRQ_HANDLED;
-}
-
-
-/*
- *  Routines for open & close processing.
- */
-
-static void turn_ints_off(struct specialix_board *bp)
-{
-        unsigned long flags;
-
-        func_enter();
-        spin_lock_irqsave(&bp->lock, flags);
-        (void) sx_in_off(bp, 0); /* Turn off interrupts. */
-        spin_unlock_irqrestore(&bp->lock, flags);
-
-        func_exit();
-}
-
-static void turn_ints_on(struct specialix_board *bp)
-{
-        unsigned long flags;
-
-        func_enter();
-
-        spin_lock_irqsave(&bp->lock, flags);
-        (void) sx_in(bp, 0); /* Turn ON interrupts. */
-        spin_unlock_irqrestore(&bp->lock, flags);
-
-        func_exit();
-}
-
-
-/* Called with disabled interrupts */
-static int sx_setup_board(struct specialix_board *bp)
-{
-        int error;
-
-        if (bp->flags & SX_BOARD_ACTIVE)
-                return 0;
-
-        if (bp->flags & SX_BOARD_IS_PCI)
-                error = request_irq(bp->irq, sx_interrupt,
-                        IRQF_DISABLED | IRQF_SHARED, "specialix IO8+", bp);
-        else
-                error = request_irq(bp->irq, sx_interrupt,
-                        IRQF_DISABLED, "specialix IO8+", bp);
-
-        if (error)
-                return error;
-
-        turn_ints_on(bp);
-        bp->flags |= SX_BOARD_ACTIVE;
-
-        return 0;
-}
-
-
-/* Called with disabled interrupts */
-static void sx_shutdown_board(struct specialix_board *bp)
-{
-        func_enter();
-
-        if (!(bp->flags & SX_BOARD_ACTIVE)) {
-                func_exit();
-                return;
-        }
-
-        bp->flags &= ~SX_BOARD_ACTIVE;
-
-        dprintk(SX_DEBUG_IRQ, "Freeing IRQ%d for board %d.\n",
-                 bp->irq, board_No(bp));
-        free_irq(bp->irq, bp);
-        turn_ints_off(bp);
-        func_exit();
-}
-
-static unsigned int sx_crtscts(struct tty_struct *tty)
-{
-        if (sx_rtscts)
-                return C_CRTSCTS(tty);
-        return 1;
-}
-
-/*
- * Setting up port characteristics.
- * Must be called with disabled interrupts
- */
-static void sx_change_speed(struct specialix_board *bp,
-                                                struct specialix_port *port)
-{
-        struct tty_struct *tty;
-        unsigned long baud;
-        long tmp;
-        unsigned char cor1 = 0, cor3 = 0;
-        unsigned char mcor1 = 0, mcor2 = 0;
-        static unsigned long again;
-        unsigned long flags;
-
-        func_enter();
-
-        tty = port->port.tty;
-        if (!tty || !tty->termios) {
-                func_exit();
-                return;
-        }
-
-        port->IER  = 0;
-        port->COR2 = 0;
-        /* Select port on the board */
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_CAR, port_No(port));
-
-        /* The Specialix board doens't implement the RTS lines.
-           They are used to set the IRQ level. Don't touch them. */
-        if (sx_crtscts(tty))
-                port->MSVR = MSVR_DTR | (sx_in(bp, CD186x_MSVR) & MSVR_RTS);
-        else
-                port->MSVR =  (sx_in(bp, CD186x_MSVR) & MSVR_RTS);
-        spin_unlock_irqrestore(&bp->lock, flags);
-        dprintk(SX_DEBUG_TERMIOS, "sx: got MSVR=%02x.\n", port->MSVR);
-        baud = tty_get_baud_rate(tty);
-
-        if (baud == 38400) {
-                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        baud = 57600;
-                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        baud = 115200;
-        }
-
-        if (!baud) {
-                /* Drop DTR & exit */
-                dprintk(SX_DEBUG_TERMIOS, "Dropping DTR...  Hmm....\n");
-                if (!sx_crtscts(tty)) {
-                        port->MSVR &= ~MSVR_DTR;
-                        spin_lock_irqsave(&bp->lock, flags);
-                        sx_out(bp, CD186x_MSVR, port->MSVR);
-                        spin_unlock_irqrestore(&bp->lock, flags);
-                } else
-                        dprintk(SX_DEBUG_TERMIOS, "Can't drop DTR: no DTR.\n");
-                return;
-        } else {
-                /* Set DTR on */
-                if (!sx_crtscts(tty))
-                        port->MSVR |= MSVR_DTR;
-        }
-
-        /*
-         * Now we must calculate some speed depended things
-         */
-
-        /* Set baud rate for port */
-        tmp = port->custom_divisor ;
-        if (tmp)
-                printk(KERN_INFO
-                        "sx%d: Using custom baud rate divisor %ld. \n"
-                        "This is an untested option, please be careful.\n",
-                                                        port_No(port), tmp);
-        else
-                tmp = (((SX_OSCFREQ + baud/2) / baud + CD186x_TPC/2) /
-                                                                CD186x_TPC);
-
-        if (tmp < 0x10 && time_before(again, jiffies)) {
-                again = jiffies + HZ * 60;
-                /* Page 48 of version 2.0 of the CL-CD1865 databook */
-                if (tmp >= 12) {
-                        printk(KERN_INFO "sx%d: Baud rate divisor is %ld. \n"
-                                "Performance degradation is possible.\n"
-                                "Read specialix.txt for more info.\n",
-                                                port_No(port), tmp);
-                } else {
-                        printk(KERN_INFO "sx%d: Baud rate divisor is %ld. \n"
-                "Warning: overstressing Cirrus chip. This might not work.\n"
-                "Read specialix.txt for more info.\n", port_No(port), tmp);
-                }
-        }
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_RBPRH, (tmp >> 8) & 0xff);
-        sx_out(bp, CD186x_TBPRH, (tmp >> 8) & 0xff);
-        sx_out(bp, CD186x_RBPRL, tmp & 0xff);
-        sx_out(bp, CD186x_TBPRL, tmp & 0xff);
-        spin_unlock_irqrestore(&bp->lock, flags);
-        if (port->custom_divisor)
-                baud = (SX_OSCFREQ + port->custom_divisor/2) /
-                                                        port->custom_divisor;
-        baud = (baud + 5) / 10;         /* Estimated CPS */
-
-        /* Two timer ticks seems enough to wakeup something like SLIP driver */
-        tmp = ((baud + HZ/2) / HZ) * 2 - CD186x_NFIFO;
-        port->wakeup_chars = (tmp < 0) ? 0 : ((tmp >= SERIAL_XMIT_SIZE) ?
-                                              SERIAL_XMIT_SIZE - 1 : tmp);
-
-        /* Receiver timeout will be transmission time for 1.5 chars */
-        tmp = (SPECIALIX_TPS + SPECIALIX_TPS/2 + baud/2) / baud;
-        tmp = (tmp > 0xff) ? 0xff : tmp;
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_RTPR, tmp);
-        spin_unlock_irqrestore(&bp->lock, flags);
-        switch (C_CSIZE(tty)) {
-        case CS5:
-                cor1 |= COR1_5BITS;
-                break;
-        case CS6:
-                cor1 |= COR1_6BITS;
-                break;
-        case CS7:
-                cor1 |= COR1_7BITS;
-                break;
-        case CS8:
-                cor1 |= COR1_8BITS;
-                break;
-        }
-
-        if (C_CSTOPB(tty))
-                cor1 |= COR1_2SB;
-
-        cor1 |= COR1_IGNORE;
-        if (C_PARENB(tty)) {
-                cor1 |= COR1_NORMPAR;
-                if (C_PARODD(tty))
-                        cor1 |= COR1_ODDP;
-                if (I_INPCK(tty))
-                        cor1 &= ~COR1_IGNORE;
-        }
-        /* Set marking of some errors */
-        port->mark_mask = RCSR_OE | RCSR_TOUT;
-        if (I_INPCK(tty))
-                port->mark_mask |= RCSR_FE | RCSR_PE;
-        if (I_BRKINT(tty) || I_PARMRK(tty))
-                port->mark_mask |= RCSR_BREAK;
-        if (I_IGNPAR(tty))
-                port->mark_mask &= ~(RCSR_FE | RCSR_PE);
-        if (I_IGNBRK(tty)) {
-                port->mark_mask &= ~RCSR_BREAK;
-                if (I_IGNPAR(tty))
-                        /* Real raw mode. Ignore all */
-                        port->mark_mask &= ~RCSR_OE;
-        }
-        /* Enable Hardware Flow Control */
-        if (C_CRTSCTS(tty)) {
-#ifdef SPECIALIX_BRAIN_DAMAGED_CTS
-                port->IER |= IER_DSR | IER_CTS;
-                mcor1 |= MCOR1_DSRZD | MCOR1_CTSZD;
-                mcor2 |= MCOR2_DSROD | MCOR2_CTSOD;
-                spin_lock_irqsave(&bp->lock, flags);
-                tty->hw_stopped = !(sx_in(bp, CD186x_MSVR) &
-                                                        (MSVR_CTS|MSVR_DSR));
-                spin_unlock_irqrestore(&bp->lock, flags);
-#else
-                port->COR2 |= COR2_CTSAE;
-#endif
-        }
-        /* Enable Software Flow Control. FIXME: I'm not sure about this */
-        /* Some people reported that it works, but I still doubt it */
-        if (I_IXON(tty)) {
-                port->COR2 |= COR2_TXIBE;
-                cor3 |= (COR3_FCT | COR3_SCDE);
-                if (I_IXANY(tty))
-                        port->COR2 |= COR2_IXM;
-                spin_lock_irqsave(&bp->lock, flags);
-                sx_out(bp, CD186x_SCHR1, START_CHAR(tty));
-                sx_out(bp, CD186x_SCHR2, STOP_CHAR(tty));
-                sx_out(bp, CD186x_SCHR3, START_CHAR(tty));
-                sx_out(bp, CD186x_SCHR4, STOP_CHAR(tty));
-                spin_unlock_irqrestore(&bp->lock, flags);
-        }
-        if (!C_CLOCAL(tty)) {
-                /* Enable CD check */
-                port->IER |= IER_CD;
-                mcor1 |= MCOR1_CDZD;
-                mcor2 |= MCOR2_CDOD;
-        }
-
-        if (C_CREAD(tty))
-                /* Enable receiver */
-                port->IER |= IER_RXD;
-
-        /* Set input FIFO size (1-8 bytes) */
-        cor3 |= sx_rxfifo;
-        /* Setting up CD186x channel registers */
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_COR1, cor1);
-        sx_out(bp, CD186x_COR2, port->COR2);
-        sx_out(bp, CD186x_COR3, cor3);
-        spin_unlock_irqrestore(&bp->lock, flags);
-        /* Make CD186x know about registers change */
-        sx_wait_CCR(bp);
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_CCR, CCR_CORCHG1 | CCR_CORCHG2 | CCR_CORCHG3);
-        /* Setting up modem option registers */
-        dprintk(SX_DEBUG_TERMIOS, "Mcor1 = %02x, mcor2 = %02x.\n",
-                                                                mcor1, mcor2);
-        sx_out(bp, CD186x_MCOR1, mcor1);
-        sx_out(bp, CD186x_MCOR2, mcor2);
-        spin_unlock_irqrestore(&bp->lock, flags);
-        /* Enable CD186x transmitter & receiver */
-        sx_wait_CCR(bp);
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_CCR, CCR_TXEN | CCR_RXEN);
-        /* Enable interrupts */
-        sx_out(bp, CD186x_IER, port->IER);
-        /* And finally set the modem lines... */
-        sx_out(bp, CD186x_MSVR, port->MSVR);
-        spin_unlock_irqrestore(&bp->lock, flags);
-
-        func_exit();
-}
-
-
-/* Must be called with interrupts enabled */
-static int sx_setup_port(struct specialix_board *bp,
-                                                struct specialix_port *port)
-{
-        unsigned long flags;
-
-        func_enter();
-
-        if (port->port.flags & ASYNC_INITIALIZED) {
-                func_exit();
-                return 0;
-        }
-
-        if (!port->xmit_buf) {
-                /* We may sleep in get_zeroed_page() */
-                unsigned long tmp;
-
-                tmp = get_zeroed_page(GFP_KERNEL);
-                if (tmp == 0L) {
-                        func_exit();
-                        return -ENOMEM;
-                }
-
-                if (port->xmit_buf) {
-                        free_page(tmp);
-                        func_exit();
-                        return -ERESTARTSYS;
-                }
-                port->xmit_buf = (unsigned char *) tmp;
-        }
-
-        spin_lock_irqsave(&port->lock, flags);
-
-        if (port->port.tty)
-                clear_bit(TTY_IO_ERROR, &port->port.tty->flags);
-
-        port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
-        sx_change_speed(bp, port);
-        port->port.flags |= ASYNC_INITIALIZED;
-
-        spin_unlock_irqrestore(&port->lock, flags);
-
-
-        func_exit();
-        return 0;
-}
-
-
-/* Must be called with interrupts disabled */
-static void sx_shutdown_port(struct specialix_board *bp,
-                                                struct specialix_port *port)
-{
-        struct tty_struct *tty;
-        int i;
-        unsigned long flags;
-
-        func_enter();
-
-        if (!(port->port.flags & ASYNC_INITIALIZED)) {
-                func_exit();
-                return;
-        }
-
-        if (sx_debug & SX_DEBUG_FIFO) {
-                dprintk(SX_DEBUG_FIFO,
-                        "sx%d: port %d: %ld overruns, FIFO hits [ ",
-                                board_No(bp), port_No(port), port->overrun);
-                for (i = 0; i < 10; i++)
-                        dprintk(SX_DEBUG_FIFO, "%ld ", port->hits[i]);
-                dprintk(SX_DEBUG_FIFO, "].\n");
-        }
-
-        if (port->xmit_buf) {
-                free_page((unsigned long) port->xmit_buf);
-                port->xmit_buf = NULL;
-        }
-
-        /* Select port */
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_CAR, port_No(port));
-
-        tty = port->port.tty;
-        if (tty == NULL || C_HUPCL(tty)) {
-                /* Drop DTR */
-                sx_out(bp, CD186x_MSVDTR, 0);
-        }
-        spin_unlock_irqrestore(&bp->lock, flags);
-        /* Reset port */
-        sx_wait_CCR(bp);
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_CCR, CCR_SOFTRESET);
-        /* Disable all interrupts from this port */
-        port->IER = 0;
-        sx_out(bp, CD186x_IER, port->IER);
-        spin_unlock_irqrestore(&bp->lock, flags);
-        if (tty)
-                set_bit(TTY_IO_ERROR, &tty->flags);
-        port->port.flags &= ~ASYNC_INITIALIZED;
-
-        if (!bp->count)
-                sx_shutdown_board(bp);
-        func_exit();
-}
-
-
-static int block_til_ready(struct tty_struct *tty, struct file *filp,
-                                                struct specialix_port *port)
-{
-        DECLARE_WAITQUEUE(wait,  current);
-        struct specialix_board *bp = port_Board(port);
-        int    retval;
-        int    do_clocal = 0;
-        int    CD;
-        unsigned long flags;
-
-        func_enter();
-
-        /*
-         * If the device is in the middle of being closed, then block
-         * until it's done, and then try again.
-         */
-        if (tty_hung_up_p(filp) || port->port.flags & ASYNC_CLOSING) {
-                interruptible_sleep_on(&port->port.close_wait);
-                if (port->port.flags & ASYNC_HUP_NOTIFY) {
-                        func_exit();
-                        return -EAGAIN;
-                } else {
-                        func_exit();
-                        return -ERESTARTSYS;
-                }
-        }
-
-        /*
-         * If non-blocking mode is set, or the port is not enabled,
-         * then make the check up front and then exit.
-         */
-        if ((filp->f_flags & O_NONBLOCK) ||
-            (tty->flags & (1 << TTY_IO_ERROR))) {
-                port->port.flags |= ASYNC_NORMAL_ACTIVE;
-                func_exit();
-                return 0;
-        }
-
-        if (C_CLOCAL(tty))
-                do_clocal = 1;
-
-        /*
-         * Block waiting for the carrier detect and the line to become
-         * free (i.e., not in use by the callout).  While we are in
-         * this loop, info->count is dropped by one, so that
-         * rs_close() knows when to free things.  We restore it upon
-         * exit, either normal or abnormal.
-         */
-        retval = 0;
-        add_wait_queue(&port->port.open_wait, &wait);
-        spin_lock_irqsave(&port->lock, flags);
-        if (!tty_hung_up_p(filp))
-                port->port.count--;
-        spin_unlock_irqrestore(&port->lock, flags);
-        port->port.blocked_open++;
-        while (1) {
-                spin_lock_irqsave(&bp->lock, flags);
-                sx_out(bp, CD186x_CAR, port_No(port));
-                CD = sx_in(bp, CD186x_MSVR) & MSVR_CD;
-                if (sx_crtscts(tty)) {
-                        /* Activate RTS */
-                        port->MSVR |= MSVR_DTR;         /* WTF? */
-                        sx_out(bp, CD186x_MSVR, port->MSVR);
-                } else {
-                        /* Activate DTR */
-                        port->MSVR |= MSVR_DTR;
-                        sx_out(bp, CD186x_MSVR, port->MSVR);
-                }
-                spin_unlock_irqrestore(&bp->lock, flags);
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (tty_hung_up_p(filp) ||
-                    !(port->port.flags & ASYNC_INITIALIZED)) {
-                        if (port->port.flags & ASYNC_HUP_NOTIFY)
-                                retval = -EAGAIN;
-                        else
-                                retval = -ERESTARTSYS;
-                        break;
-                }
-                if (!(port->port.flags & ASYNC_CLOSING) &&
-                    (do_clocal || CD))
-                        break;
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-                tty_unlock();
-                schedule();
-                tty_lock();
-        }
-
-        set_current_state(TASK_RUNNING);
-        remove_wait_queue(&port->port.open_wait, &wait);
-        spin_lock_irqsave(&port->lock, flags);
-        if (!tty_hung_up_p(filp))
-                port->port.count++;
-        port->port.blocked_open--;
-        spin_unlock_irqrestore(&port->lock, flags);
-        if (retval) {
-                func_exit();
-                return retval;
-        }
-
-        port->port.flags |= ASYNC_NORMAL_ACTIVE;
-        func_exit();
-        return 0;
-}
-
-
-static int sx_open(struct tty_struct *tty, struct file *filp)
-{
-        int board;
-        int error;
-        struct specialix_port *port;
-        struct specialix_board *bp;
-        int i;
-        unsigned long flags;
-
-        func_enter();
-
-        board = SX_BOARD(tty->index);
-
-        if (board >= SX_NBOARD || !(sx_board[board].flags & SX_BOARD_PRESENT)) {
-                func_exit();
-                return -ENODEV;
-        }
-
-        bp = &sx_board[board];
-        port = sx_port + board * SX_NPORT + SX_PORT(tty->index);
-        port->overrun = 0;
-        for (i = 0; i < 10; i++)
-                port->hits[i] = 0;
-
-        dprintk(SX_DEBUG_OPEN,
-                        "Board = %d, bp = %p, port = %p, portno = %d.\n",
-                                 board, bp, port, SX_PORT(tty->index));
-
-        if (sx_paranoia_check(port, tty->name, "sx_open")) {
-                func_enter();
-                return -ENODEV;
-        }
-
-        error = sx_setup_board(bp);
-        if (error) {
-                func_exit();
-                return error;
-        }
-
-        spin_lock_irqsave(&bp->lock, flags);
-        port->port.count++;
-        bp->count++;
-        tty->driver_data = port;
-        port->port.tty = tty;
-        spin_unlock_irqrestore(&bp->lock, flags);
-
-        error = sx_setup_port(bp, port);
-        if (error) {
-                func_enter();
-                return error;
-        }
-
-        error = block_til_ready(tty, filp, port);
-        if (error) {
-                func_enter();
-                return error;
-        }
-
-        func_exit();
-        return 0;
-}
-
-static void sx_flush_buffer(struct tty_struct *tty)
-{
-        struct specialix_port *port = tty->driver_data;
-        unsigned long flags;
-        struct specialix_board  *bp;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, "sx_flush_buffer")) {
-                func_exit();
-                return;
-        }
-
-        bp = port_Board(port);
-        spin_lock_irqsave(&port->lock, flags);
-        port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
-        spin_unlock_irqrestore(&port->lock, flags);
-        tty_wakeup(tty);
-
-        func_exit();
-}
-
-static void sx_close(struct tty_struct *tty, struct file *filp)
-{
-        struct specialix_port *port = tty->driver_data;
-        struct specialix_board *bp;
-        unsigned long flags;
-        unsigned long timeout;
-
-        func_enter();
-        if (!port || sx_paranoia_check(port, tty->name, "close")) {
-                func_exit();
-                return;
-        }
-        spin_lock_irqsave(&port->lock, flags);
-
-        if (tty_hung_up_p(filp)) {
-                spin_unlock_irqrestore(&port->lock, flags);
-                func_exit();
-                return;
-        }
-
-        bp = port_Board(port);
-        if (tty->count == 1 && port->port.count != 1) {
-                printk(KERN_ERR "sx%d: sx_close: bad port count;"
-                       " tty->count is 1, port count is %d\n",
-                       board_No(bp), port->port.count);
-                port->port.count = 1;
-        }
-
-        if (port->port.count > 1) {
-                port->port.count--;
-                bp->count--;
-
-                spin_unlock_irqrestore(&port->lock, flags);
-
-                func_exit();
-                return;
-        }
-        port->port.flags |= ASYNC_CLOSING;
-        /*
-         * Now we wait for the transmit buffer to clear; and we notify
-         * the line discipline to only process XON/XOFF characters.
-         */
-        tty->closing = 1;
-        spin_unlock_irqrestore(&port->lock, flags);
-        dprintk(SX_DEBUG_OPEN, "Closing\n");
-        if (port->port.closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, port->port.closing_wait);
-        /*
-         * At this point we stop accepting input.  To do this, we
-         * disable the receive line status interrupts, and tell the
-         * interrupt driver to stop checking the data ready bit in the
-         * line status register.
-         */
-        dprintk(SX_DEBUG_OPEN, "Closed\n");
-        port->IER &= ~IER_RXD;
-        if (port->port.flags & ASYNC_INITIALIZED) {
-                port->IER &= ~IER_TXRDY;
-                port->IER |= IER_TXEMPTY;
-                spin_lock_irqsave(&bp->lock, flags);
-                sx_out(bp, CD186x_CAR, port_No(port));
-                sx_out(bp, CD186x_IER, port->IER);
-                spin_unlock_irqrestore(&bp->lock, flags);
-                /*
-                 * Before we drop DTR, make sure the UART transmitter
-                 * has completely drained; this is especially
-                 * important if there is a transmit FIFO!
-                 */
-                timeout = jiffies+HZ;
-                while (port->IER & IER_TXEMPTY) {
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        msleep_interruptible(jiffies_to_msecs(port->timeout));
-                        if (time_after(jiffies, timeout)) {
-                                printk(KERN_INFO "Timeout waiting for close\n");
-                                break;
-                        }
-                }
-
-        }
-
-        if (--bp->count < 0) {
-                printk(KERN_ERR
-                    "sx%d: sx_shutdown_port: bad board count: %d port: %d\n",
-                                board_No(bp), bp->count, tty->index);
-                bp->count = 0;
-        }
-        if (--port->port.count < 0) {
-                printk(KERN_ERR
-                        "sx%d: sx_close: bad port count for tty%d: %d\n",
-                                board_No(bp), port_No(port), port->port.count);
-                port->port.count = 0;
-        }
-
-        sx_shutdown_port(bp, port);
-        sx_flush_buffer(tty);
-        tty_ldisc_flush(tty);
-        spin_lock_irqsave(&port->lock, flags);
-        tty->closing = 0;
-        port->port.tty = NULL;
-        spin_unlock_irqrestore(&port->lock, flags);
-        if (port->port.blocked_open) {
-                if (port->port.close_delay)
-                        msleep_interruptible(
-                                jiffies_to_msecs(port->port.close_delay));
-                wake_up_interruptible(&port->port.open_wait);
-        }
-        port->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-        wake_up_interruptible(&port->port.close_wait);
-
-        func_exit();
-}
-
-
-static int sx_write(struct tty_struct *tty,
-                                        const unsigned char *buf, int count)
-{
-        struct specialix_port *port = tty->driver_data;
-        struct specialix_board *bp;
-        int c, total = 0;
-        unsigned long flags;
-
-        func_enter();
-        if (sx_paranoia_check(port, tty->name, "sx_write")) {
-                func_exit();
-                return 0;
-        }
-
-        bp = port_Board(port);
-
-        if (!port->xmit_buf) {
-                func_exit();
-                return 0;
-        }
-
-        while (1) {
-                spin_lock_irqsave(&port->lock, flags);
-                c = min_t(int, count, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
-                                   SERIAL_XMIT_SIZE - port->xmit_head));
-                if (c <= 0) {
-                        spin_unlock_irqrestore(&port->lock, flags);
-                        break;
-                }
-                memcpy(port->xmit_buf + port->xmit_head, buf, c);
-                port->xmit_head = (port->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
-                port->xmit_cnt += c;
-                spin_unlock_irqrestore(&port->lock, flags);
-
-                buf += c;
-                count -= c;
-                total += c;
-        }
-
-        spin_lock_irqsave(&bp->lock, flags);
-        if (port->xmit_cnt && !tty->stopped && !tty->hw_stopped &&
-            !(port->IER & IER_TXRDY)) {
-                port->IER |= IER_TXRDY;
-                sx_out(bp, CD186x_CAR, port_No(port));
-                sx_out(bp, CD186x_IER, port->IER);
-        }
-        spin_unlock_irqrestore(&bp->lock, flags);
-        func_exit();
-
-        return total;
-}
-
-
-static int sx_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        struct specialix_port *port = tty->driver_data;
-        unsigned long flags;
-        struct specialix_board  *bp;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, "sx_put_char")) {
-                func_exit();
-                return 0;
-        }
-        dprintk(SX_DEBUG_TX, "check tty: %p %p\n", tty, port->xmit_buf);
-        if (!port->xmit_buf) {
-                func_exit();
-                return 0;
-        }
-        bp = port_Board(port);
-        spin_lock_irqsave(&port->lock, flags);
-
-        dprintk(SX_DEBUG_TX, "xmit_cnt: %d xmit_buf: %p\n",
-                                        port->xmit_cnt, port->xmit_buf);
-        if (port->xmit_cnt >= SERIAL_XMIT_SIZE - 1 || !port->xmit_buf) {
-                spin_unlock_irqrestore(&port->lock, flags);
-                dprintk(SX_DEBUG_TX, "Exit size\n");
-                func_exit();
-                return 0;
-        }
-        dprintk(SX_DEBUG_TX, "Handle xmit: %p %p\n", port, port->xmit_buf);
-        port->xmit_buf[port->xmit_head++] = ch;
-        port->xmit_head &= SERIAL_XMIT_SIZE - 1;
-        port->xmit_cnt++;
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        func_exit();
-        return 1;
-}
-
-
-static void sx_flush_chars(struct tty_struct *tty)
-{
-        struct specialix_port *port = tty->driver_data;
-        unsigned long flags;
-        struct specialix_board  *bp = port_Board(port);
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, "sx_flush_chars")) {
-                func_exit();
-                return;
-        }
-        if (port->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
-            !port->xmit_buf) {
-                func_exit();
-                return;
-        }
-        spin_lock_irqsave(&bp->lock, flags);
-        port->IER |= IER_TXRDY;
-        sx_out(port_Board(port), CD186x_CAR, port_No(port));
-        sx_out(port_Board(port), CD186x_IER, port->IER);
-        spin_unlock_irqrestore(&bp->lock, flags);
-
-        func_exit();
-}
-
-
-static int sx_write_room(struct tty_struct *tty)
-{
-        struct specialix_port *port = tty->driver_data;
-        int     ret;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, "sx_write_room")) {
-                func_exit();
-                return 0;
-        }
-
-        ret = SERIAL_XMIT_SIZE - port->xmit_cnt - 1;
-        if (ret < 0)
-                ret = 0;
-
-        func_exit();
-        return ret;
-}
-
-
-static int sx_chars_in_buffer(struct tty_struct *tty)
-{
-        struct specialix_port *port = tty->driver_data;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, "sx_chars_in_buffer")) {
-                func_exit();
-                return 0;
-        }
-        func_exit();
-        return port->xmit_cnt;
-}
-
-static int sx_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct specialix_port *port = tty->driver_data;
-        struct specialix_board *bp;
-        unsigned char status;
-        unsigned int result;
-        unsigned long flags;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, __func__)) {
-                func_exit();
-                return -ENODEV;
-        }
-
-        bp = port_Board(port);
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_CAR, port_No(port));
-        status = sx_in(bp, CD186x_MSVR);
-        spin_unlock_irqrestore(&bp->lock, flags);
-        dprintk(SX_DEBUG_INIT, "Got msvr[%d] = %02x, car = %d.\n",
-                        port_No(port), status, sx_in(bp, CD186x_CAR));
-        dprintk(SX_DEBUG_INIT, "sx_port = %p, port = %p\n", sx_port, port);
-        if (sx_crtscts(port->port.tty)) {
-                result  = TIOCM_DTR | TIOCM_DSR
-                          |   ((status & MSVR_DTR) ? TIOCM_RTS : 0)
-                          |   ((status & MSVR_CD)  ? TIOCM_CAR : 0)
-                          |   ((status & MSVR_CTS) ? TIOCM_CTS : 0);
-        } else {
-                result  = TIOCM_RTS | TIOCM_DSR
-                          |   ((status & MSVR_DTR) ? TIOCM_DTR : 0)
-                          |   ((status & MSVR_CD)  ? TIOCM_CAR : 0)
-                          |   ((status & MSVR_CTS) ? TIOCM_CTS : 0);
-        }
-
-        func_exit();
-
-        return result;
-}
-
-
-static int sx_tiocmset(struct tty_struct *tty, struct file *file,
-                       unsigned int set, unsigned int clear)
-{
-        struct specialix_port *port = tty->driver_data;
-        unsigned long flags;
-        struct specialix_board *bp;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, __func__)) {
-                func_exit();
-                return -ENODEV;
-        }
-
-        bp = port_Board(port);
-
-        spin_lock_irqsave(&port->lock, flags);
-        if (sx_crtscts(port->port.tty)) {
-                if (set & TIOCM_RTS)
-                        port->MSVR |= MSVR_DTR;
-        } else {
-                if (set & TIOCM_DTR)
-                        port->MSVR |= MSVR_DTR;
-        }
-        if (sx_crtscts(port->port.tty)) {
-                if (clear & TIOCM_RTS)
-                        port->MSVR &= ~MSVR_DTR;
-        } else {
-                if (clear & TIOCM_DTR)
-                        port->MSVR &= ~MSVR_DTR;
-        }
-        spin_lock(&bp->lock);
-        sx_out(bp, CD186x_CAR, port_No(port));
-        sx_out(bp, CD186x_MSVR, port->MSVR);
-        spin_unlock(&bp->lock);
-        spin_unlock_irqrestore(&port->lock, flags);
-        func_exit();
-        return 0;
-}
-
-
-static int sx_send_break(struct tty_struct *tty, int length)
-{
-        struct specialix_port *port = tty->driver_data;
-        struct specialix_board *bp = port_Board(port);
-        unsigned long flags;
-
-        func_enter();
-        if (length == 0 || length == -1)
-                return -EOPNOTSUPP;
-
-        spin_lock_irqsave(&port->lock, flags);
-        port->break_length = SPECIALIX_TPS / HZ * length;
-        port->COR2 |= COR2_ETC;
-        port->IER  |= IER_TXRDY;
-        spin_lock(&bp->lock);
-        sx_out(bp, CD186x_CAR, port_No(port));
-        sx_out(bp, CD186x_COR2, port->COR2);
-        sx_out(bp, CD186x_IER, port->IER);
-        spin_unlock(&bp->lock);
-        spin_unlock_irqrestore(&port->lock, flags);
-        sx_wait_CCR(bp);
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_CCR, CCR_CORCHG2);
-        spin_unlock_irqrestore(&bp->lock, flags);
-        sx_wait_CCR(bp);
-
-        func_exit();
-        return 0;
-}
-
-
-static int sx_set_serial_info(struct specialix_port *port,
-                                        struct serial_struct __user *newinfo)
-{
-        struct serial_struct tmp;
-        struct specialix_board *bp = port_Board(port);
-        int change_speed;
-
-        func_enter();
-
-        if (copy_from_user(&tmp, newinfo, sizeof(tmp))) {
-                func_enter();
-                return -EFAULT;
-        }
-
-        mutex_lock(&port->port.mutex);
-        change_speed = ((port->port.flags & ASYNC_SPD_MASK) !=
-                        (tmp.flags & ASYNC_SPD_MASK));
-        change_speed |= (tmp.custom_divisor != port->custom_divisor);
-
-        if (!capable(CAP_SYS_ADMIN)) {
-                if ((tmp.close_delay != port->port.close_delay) ||
-                    (tmp.closing_wait != port->port.closing_wait) ||
-                    ((tmp.flags & ~ASYNC_USR_MASK) !=
-                     (port->port.flags & ~ASYNC_USR_MASK))) {
-                        func_exit();
-                        mutex_unlock(&port->port.mutex);
-                        return -EPERM;
-                }
-                port->port.flags = ((port->port.flags & ~ASYNC_USR_MASK) |
-                                                (tmp.flags & ASYNC_USR_MASK));
-                port->custom_divisor = tmp.custom_divisor;
-        } else {
-                port->port.flags = ((port->port.flags & ~ASYNC_FLAGS) |
-                                                (tmp.flags & ASYNC_FLAGS));
-                port->port.close_delay = tmp.close_delay;
-                port->port.closing_wait = tmp.closing_wait;
-                port->custom_divisor = tmp.custom_divisor;
-        }
-        if (change_speed)
-                sx_change_speed(bp, port);
-
-        func_exit();
-        mutex_unlock(&port->port.mutex);
-        return 0;
-}
-
-
-static int sx_get_serial_info(struct specialix_port *port,
-                                     struct serial_struct __user *retinfo)
-{
-        struct serial_struct tmp;
-        struct specialix_board *bp = port_Board(port);
-
-        func_enter();
-
-        memset(&tmp, 0, sizeof(tmp));
-        mutex_lock(&port->port.mutex);
-        tmp.type = PORT_CIRRUS;
-        tmp.line = port - sx_port;
-        tmp.port = bp->base;
-        tmp.irq  = bp->irq;
-        tmp.flags = port->port.flags;
-        tmp.baud_base = (SX_OSCFREQ + CD186x_TPC/2) / CD186x_TPC;
-        tmp.close_delay = port->port.close_delay * HZ/100;
-        tmp.closing_wait = port->port.closing_wait * HZ/100;
-        tmp.custom_divisor =  port->custom_divisor;
-        tmp.xmit_fifo_size = CD186x_NFIFO;
-        mutex_unlock(&port->port.mutex);
-        if (copy_to_user(retinfo, &tmp, sizeof(tmp))) {
-                func_exit();
-                return -EFAULT;
-        }
-
-        func_exit();
-        return 0;
-}
-
-
-static int sx_ioctl(struct tty_struct *tty, struct file *filp,
-                                unsigned int cmd, unsigned long arg)
-{
-        struct specialix_port *port = tty->driver_data;
-        void __user *argp = (void __user *)arg;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, "sx_ioctl")) {
-                func_exit();
-                return -ENODEV;
-        }
-
-        switch (cmd) {
-        case TIOCGSERIAL:
-                func_exit();
-                return sx_get_serial_info(port, argp);
-        case TIOCSSERIAL:
-                func_exit();
-                return sx_set_serial_info(port, argp);
-        default:
-                func_exit();
-                return -ENOIOCTLCMD;
-        }
-        func_exit();
-        return 0;
-}
-
-
-static void sx_throttle(struct tty_struct *tty)
-{
-        struct specialix_port *port = tty->driver_data;
-        struct specialix_board *bp;
-        unsigned long flags;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, "sx_throttle")) {
-                func_exit();
-                return;
-        }
-
-        bp = port_Board(port);
-
-        /* Use DTR instead of RTS ! */
-        if (sx_crtscts(tty))
-                port->MSVR &= ~MSVR_DTR;
-        else {
-                /* Auch!!! I think the system shouldn't call this then. */
-                /* Or maybe we're supposed (allowed?) to do our side of hw
-                   handshake anyway, even when hardware handshake is off.
-                   When you see this in your logs, please report.... */
-                printk(KERN_ERR
-                   "sx%d: Need to throttle, but can't (hardware hs is off)\n",
-                                                        port_No(port));
-        }
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_CAR, port_No(port));
-        spin_unlock_irqrestore(&bp->lock, flags);
-        if (I_IXOFF(tty)) {
-                sx_wait_CCR(bp);
-                spin_lock_irqsave(&bp->lock, flags);
-                sx_out(bp, CD186x_CCR, CCR_SSCH2);
-                spin_unlock_irqrestore(&bp->lock, flags);
-                sx_wait_CCR(bp);
-        }
-        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_MSVR, port->MSVR);
-        spin_unlock_irqrestore(&bp->lock, flags);
-
-        func_exit();
-}
-
-
-static void sx_unthrottle(struct tty_struct *tty)
-{
-        struct specialix_port *port = tty->driver_data;
-        struct specialix_board *bp;
-        unsigned long flags;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, "sx_unthrottle")) {
-                func_exit();
-                return;
-        }
-
-        bp = port_Board(port);
-
-        spin_lock_irqsave(&port->lock, flags);
-        /* XXXX Use DTR INSTEAD???? */
-        if (sx_crtscts(tty))
-                port->MSVR |= MSVR_DTR;
-        /* Else clause: see remark in "sx_throttle"... */
-        spin_lock(&bp->lock);
-        sx_out(bp, CD186x_CAR, port_No(port));
-        spin_unlock(&bp->lock);
-        if (I_IXOFF(tty)) {
-                spin_unlock_irqrestore(&port->lock, flags);
-                sx_wait_CCR(bp);
-                spin_lock_irqsave(&bp->lock, flags);
-                sx_out(bp, CD186x_CCR, CCR_SSCH1);
-                spin_unlock_irqrestore(&bp->lock, flags);
-                sx_wait_CCR(bp);
-                spin_lock_irqsave(&port->lock, flags);
-        }
-        spin_lock(&bp->lock);
-        sx_out(bp, CD186x_MSVR, port->MSVR);
-        spin_unlock(&bp->lock);
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        func_exit();
-}
-
-
-static void sx_stop(struct tty_struct *tty)
-{
-        struct specialix_port *port = tty->driver_data;
-        struct specialix_board *bp;
-        unsigned long flags;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, "sx_stop")) {
-                func_exit();
-                return;
-        }
-
-        bp = port_Board(port);
-
-        spin_lock_irqsave(&port->lock, flags);
-        port->IER &= ~IER_TXRDY;
-        spin_lock(&bp->lock);
-        sx_out(bp, CD186x_CAR, port_No(port));
-        sx_out(bp, CD186x_IER, port->IER);
-        spin_unlock(&bp->lock);
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        func_exit();
-}
-
-
-static void sx_start(struct tty_struct *tty)
-{
-        struct specialix_port *port = tty->driver_data;
-        struct specialix_board *bp;
-        unsigned long flags;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, "sx_start")) {
-                func_exit();
-                return;
-        }
-
-        bp = port_Board(port);
-
-        spin_lock_irqsave(&port->lock, flags);
-        if (port->xmit_cnt && port->xmit_buf && !(port->IER & IER_TXRDY)) {
-                port->IER |= IER_TXRDY;
-                spin_lock(&bp->lock);
-                sx_out(bp, CD186x_CAR, port_No(port));
-                sx_out(bp, CD186x_IER, port->IER);
-                spin_unlock(&bp->lock);
-        }
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        func_exit();
-}
-
-static void sx_hangup(struct tty_struct *tty)
-{
-        struct specialix_port *port = tty->driver_data;
-        struct specialix_board *bp;
-        unsigned long flags;
-
-        func_enter();
-
-        if (sx_paranoia_check(port, tty->name, "sx_hangup")) {
-                func_exit();
-                return;
-        }
-
-        bp = port_Board(port);
-
-        sx_shutdown_port(bp, port);
-        spin_lock_irqsave(&port->lock, flags);
-        bp->count -= port->port.count;
-        if (bp->count < 0) {
-                printk(KERN_ERR
-                        "sx%d: sx_hangup: bad board count: %d port: %d\n",
-                                        board_No(bp), bp->count, tty->index);
-                bp->count = 0;
-        }
-        port->port.count = 0;
-        port->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-        port->port.tty = NULL;
-        spin_unlock_irqrestore(&port->lock, flags);
-        wake_up_interruptible(&port->port.open_wait);
-
-        func_exit();
-}
-
-
-static void sx_set_termios(struct tty_struct *tty,
-                                        struct ktermios *old_termios)
-{
-        struct specialix_port *port = tty->driver_data;
-        unsigned long flags;
-        struct specialix_board  *bp;
-
-        if (sx_paranoia_check(port, tty->name, "sx_set_termios"))
-                return;
-
-        bp = port_Board(port);
-        spin_lock_irqsave(&port->lock, flags);
-        sx_change_speed(port_Board(port), port);
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        if ((old_termios->c_cflag & CRTSCTS) &&
-            !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-                sx_start(tty);
-        }
-}
-
-static const struct tty_operations sx_ops = {
-        .open  = sx_open,
-        .close = sx_close,
-        .write = sx_write,
-        .put_char = sx_put_char,
-        .flush_chars = sx_flush_chars,
-        .write_room = sx_write_room,
-        .chars_in_buffer = sx_chars_in_buffer,
-        .flush_buffer = sx_flush_buffer,
-        .ioctl = sx_ioctl,
-        .throttle = sx_throttle,
-        .unthrottle = sx_unthrottle,
-        .set_termios = sx_set_termios,
-        .stop = sx_stop,
-        .start = sx_start,
-        .hangup = sx_hangup,
-        .tiocmget = sx_tiocmget,
-        .tiocmset = sx_tiocmset,
-        .break_ctl = sx_send_break,
-};
-
-static int sx_init_drivers(void)
-{
-        int error;
-        int i;
-
-        func_enter();
-
-        specialix_driver = alloc_tty_driver(SX_NBOARD * SX_NPORT);
-        if (!specialix_driver) {
-                printk(KERN_ERR "sx: Couldn't allocate tty_driver.\n");
-                func_exit();
-                return 1;
-        }
-
-        specialix_driver->owner = THIS_MODULE;
-        specialix_driver->name = "ttyW";
-        specialix_driver->major = SPECIALIX_NORMAL_MAJOR;
-        specialix_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        specialix_driver->subtype = SERIAL_TYPE_NORMAL;
-        specialix_driver->init_termios = tty_std_termios;
-        specialix_driver->init_termios.c_cflag =
-                B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        specialix_driver->init_termios.c_ispeed = 9600;
-        specialix_driver->init_termios.c_ospeed = 9600;
-        specialix_driver->flags = TTY_DRIVER_REAL_RAW |
-                                                TTY_DRIVER_HARDWARE_BREAK;
-        tty_set_operations(specialix_driver, &sx_ops);
-
-        error = tty_register_driver(specialix_driver);
-        if (error) {
-                put_tty_driver(specialix_driver);
-                printk(KERN_ERR
-                  "sx: Couldn't register specialix IO8+ driver, error = %d\n",
-                                                                error);
-                func_exit();
-                return 1;
-        }
-        memset(sx_port, 0, sizeof(sx_port));
-        for (i = 0; i < SX_NPORT * SX_NBOARD; i++) {
-                sx_port[i].magic = SPECIALIX_MAGIC;
-                tty_port_init(&sx_port[i].port);
-                spin_lock_init(&sx_port[i].lock);
-        }
-
-        func_exit();
-        return 0;
-}
-
-static void sx_release_drivers(void)
-{
-        func_enter();
-
-        tty_unregister_driver(specialix_driver);
-        put_tty_driver(specialix_driver);
-        func_exit();
-}
-
-/*
- * This routine must be called by kernel at boot time
- */
-static int __init specialix_init(void)
-{
-        int i;
-        int found = 0;
-
-        func_enter();
-
-        printk(KERN_INFO "sx: Specialix IO8+ driver v" VERSION ", (c) R.E.Wolff 1997/1998.\n");
-        printk(KERN_INFO "sx: derived from work (c) D.Gorodchanin 1994-1996.\n");
-        if (sx_rtscts)
-                printk(KERN_INFO
-                        "sx: DTR/RTS pin is RTS when CRTSCTS is on.\n");
-        else
-                printk(KERN_INFO "sx: DTR/RTS pin is always RTS.\n");
-
-        for (i = 0; i < SX_NBOARD; i++)
-                spin_lock_init(&sx_board[i].lock);
-
-        if (sx_init_drivers()) {
-                func_exit();
-                return -EIO;
-        }
-
-        for (i = 0; i < SX_NBOARD; i++)
-                if (sx_board[i].base && !sx_probe(&sx_board[i]))
-                        found++;
-
-#ifdef CONFIG_PCI
-        {
-                struct pci_dev *pdev = NULL;
-
-                i = 0;
-                while (i < SX_NBOARD) {
-                        if (sx_board[i].flags & SX_BOARD_PRESENT) {
-                                i++;
-                                continue;
-                        }
-                        pdev = pci_get_device(PCI_VENDOR_ID_SPECIALIX,
-                                        PCI_DEVICE_ID_SPECIALIX_IO8, pdev);
-                        if (!pdev)
-                                break;
-
-                        if (pci_enable_device(pdev))
-                                continue;
-
-                        sx_board[i].irq = pdev->irq;
-
-                        sx_board[i].base = pci_resource_start(pdev, 2);
-
-                        sx_board[i].flags |= SX_BOARD_IS_PCI;
-                        if (!sx_probe(&sx_board[i]))
-                                found++;
-                }
-                /* May exit pci_get sequence early with lots of boards */
-                if (pdev != NULL)
-                        pci_dev_put(pdev);
-        }
-#endif
-
-        if (!found) {
-                sx_release_drivers();
-                printk(KERN_INFO "sx: No specialix IO8+ boards detected.\n");
-                func_exit();
-                return -EIO;
-        }
-
-        func_exit();
-        return 0;
-}
-
-static int iobase[SX_NBOARD]  = {0,};
-static int irq[SX_NBOARD] = {0,};
-
-module_param_array(iobase, int, NULL, 0);
-module_param_array(irq, int, NULL, 0);
-module_param(sx_debug, int, 0);
-module_param(sx_rtscts, int, 0);
-module_param(sx_rxfifo, int, 0);
-
-/*
- * You can setup up to 4 boards.
- * by specifying "iobase=0xXXX,0xXXX ..." as insmod parameter.
- * You should specify the IRQs too in that case "irq=....,...".
- *
- * More than 4 boards in one computer is not possible, as the card can
- * only use 4 different interrupts.
- *
- */
-static int __init specialix_init_module(void)
-{
-        int i;
-
-        func_enter();
-
-        if (iobase[0] || iobase[1] || iobase[2] || iobase[3]) {
-                for (i = 0; i < SX_NBOARD; i++) {
-                        sx_board[i].base = iobase[i];
-                        sx_board[i].irq = irq[i];
-                        sx_board[i].count = 0;
-                }
-        }
-
-        func_exit();
-
-        return specialix_init();
-}
-
-static void __exit specialix_exit_module(void)
-{
-        int i;
-
-        func_enter();
-
-        sx_release_drivers();
-        for (i = 0; i < SX_NBOARD; i++)
-                if (sx_board[i].flags & SX_BOARD_PRESENT)
-                        sx_release_io_range(&sx_board[i]);
-        func_exit();
-}
-
-static struct pci_device_id specialx_pci_tbl[] __devinitdata = {
-        { PCI_DEVICE(PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_SPECIALIX_IO8) },
-        { }
-};
-MODULE_DEVICE_TABLE(pci, specialx_pci_tbl);
-
-module_init(specialix_init_module);
-module_exit(specialix_exit_module);
-
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV_MAJOR(SPECIALIX_NORMAL_MAJOR);
diff --git a/drivers/char/specialix_io8.h b/drivers/char/specialix_io8.h
deleted file mode 100644
index c63005274d9b..000000000000
--- a/drivers/char/specialix_io8.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *      linux/drivers/char/specialix_io8.h  -- 
- *                                   Specialix IO8+ multiport serial driver.
- *
- *      Copyright (C) 1997 Roger Wolff (R.E.Wolff@BitWizard.nl)
- *      Copyright (C) 1994-1996  Dmitry Gorodchanin (pgmdsg@ibi.com)
- *
- *
- *      Specialix pays for the development and support of this driver.
- *      Please DO contact io8-linux@specialix.co.uk if you require
- *      support.
- *
- *      This driver was developped in the BitWizard linux device
- *      driver service. If you require a linux device driver for your
- *      product, please contact devices@BitWizard.nl for a quote.
- *
- *      This code is firmly based on the riscom/8 serial driver,
- *      written by Dmitry Gorodchanin. The specialix IO8+ card
- *      programming information was obtained from the CL-CD1865 Data
- *      Book, and Specialix document number 6200059: IO8+ Hardware
- *      Functional Specification.
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License as
- *      published by the Free Software Foundation; either version 2 of
- *      the License, or (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be
- *      useful, but WITHOUT ANY WARRANTY; without even the implied
- *      warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *      PURPOSE.  See the GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public
- *      License along with this program; if not, write to the Free
- *      Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
- *      USA.
- * */
-
-#ifndef __LINUX_SPECIALIX_H
-#define __LINUX_SPECIALIX_H
-
-#include <linux/serial.h>
-
-#ifdef __KERNEL__
-
-/* You can have max 4 ISA cards in one PC, and I recommend not much 
-more than a few  PCI versions of the card. */
-
-#define SX_NBOARD               8
-
-/* NOTE: Specialix decoder recognizes 4 addresses, but only two are used.... */
-#define SX_IO_SPACE             4
-/* The PCI version decodes 8 addresses, but still only 2 are used. */
-#define SX_PCI_IO_SPACE         8
-
-/* eight ports per board. */
-#define SX_NPORT                8
-#define SX_BOARD(line)          ((line) / SX_NPORT)
-#define SX_PORT(line)           ((line) & (SX_NPORT - 1))
-
-
-#define SX_DATA_REG 0     /* Base+0 : Data register */
-#define SX_ADDR_REG 1     /* base+1 : Address register. */
-
-#define MHz *1000000    /* I'm ashamed of myself. */
-
-/* On-board oscillator frequency */
-#define SX_OSCFREQ      (25 MHz/2)
-/* There is a 25MHz crystal on the board, but the chip is in /2 mode */
-
-
-/* Ticks per sec. Used for setting receiver timeout and break length */
-#define SPECIALIX_TPS           4000
-
-/* Yeah, after heavy testing I decided it must be 6.
- * Sure, You can change it if needed.
- */
-#define SPECIALIX_RXFIFO        6       /* Max. receiver FIFO size (1-8) */
-
-#define SPECIALIX_MAGIC         0x0907
-
-#define SX_CCR_TIMEOUT 10000   /* CCR timeout. You may need to wait upto
-                                  10 milliseconds before the internal
-                                  processor is available again after
-                                  you give it a command */
-
-#define SX_IOBASE1      0x100
-#define SX_IOBASE2      0x180
-#define SX_IOBASE3      0x250
-#define SX_IOBASE4      0x260
-
-struct specialix_board {
-        unsigned long   flags;
-        unsigned short  base;
-        unsigned char   irq;
-        //signed   char count;
-        int count;
-        unsigned char   DTR;
-        int reg;
-        spinlock_t lock;
-};
-
-#define SX_BOARD_PRESENT        0x00000001
-#define SX_BOARD_ACTIVE         0x00000002
-#define SX_BOARD_IS_PCI         0x00000004
-
-
-struct specialix_port {
-        int                     magic;
-        struct tty_port         port;
-        int                     baud_base;
-        int                     flags;
-        int                     timeout;
-        unsigned char           * xmit_buf;
-        int                     custom_divisor;
-        int                     xmit_head;
-        int                     xmit_tail;
-        int                     xmit_cnt;
-        short                   wakeup_chars;
-        short                   break_length;
-        unsigned char           mark_mask;
-        unsigned char           IER;
-        unsigned char           MSVR;
-        unsigned char           COR2;
-        unsigned long           overrun;
-        unsigned long           hits[10];
-        spinlock_t lock;
-};
-
-#endif /* __KERNEL__ */
-#endif /* __LINUX_SPECIALIX_H */
-
-
-
-
-
-
-
-
-
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
deleted file mode 100644
index f2167f8e5aab..000000000000
--- a/drivers/char/stallion.c
+++ /dev/null
@@ -1,4652 +0,0 @@
-/*****************************************************************************/
-
-/*
- *      stallion.c  -- stallion multiport serial driver.
- *
- *      Copyright (C) 1996-1999  Stallion Technologies
- *      Copyright (C) 1994-1996  Greg Ungerer.
- *
- *      This code is loosely based on the Linux serial driver, written by
- *      Linus Torvalds, Theodore T'so and others.
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*****************************************************************************/
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial.h>
-#include <linux/seq_file.h>
-#include <linux/cd1400.h>
-#include <linux/sc26198.h>
-#include <linux/comstats.h>
-#include <linux/stallion.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/smp_lock.h>
-#include <linux/device.h>
-#include <linux/delay.h>
-#include <linux/ctype.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-
-#include <linux/pci.h>
-
-/*****************************************************************************/
-
-/*
- *      Define different board types. Use the standard Stallion "assigned"
- *      board numbers. Boards supported in this driver are abbreviated as
- *      EIO = EasyIO and ECH = EasyConnection 8/32.
- */
-#define BRD_EASYIO      20
-#define BRD_ECH         21
-#define BRD_ECHMC       22
-#define BRD_ECHPCI      26
-#define BRD_ECH64PCI    27
-#define BRD_EASYIOPCI   28
-
-struct stlconf {
-        unsigned int    brdtype;
-        int             ioaddr1;
-        int             ioaddr2;
-        unsigned long   memaddr;
-        int             irq;
-        int             irqtype;
-};
-
-static unsigned int stl_nrbrds;
-
-/*****************************************************************************/
-
-/*
- *      Define some important driver characteristics. Device major numbers
- *      allocated as per Linux Device Registry.
- */
-#ifndef STL_SIOMEMMAJOR
-#define STL_SIOMEMMAJOR         28
-#endif
-#ifndef STL_SERIALMAJOR
-#define STL_SERIALMAJOR         24
-#endif
-#ifndef STL_CALLOUTMAJOR
-#define STL_CALLOUTMAJOR        25
-#endif
-
-/*
- *      Set the TX buffer size. Bigger is better, but we don't want
- *      to chew too much memory with buffers!
- */
-#define STL_TXBUFLOW            512
-#define STL_TXBUFSIZE           4096
-
-/*****************************************************************************/
-
-/*
- *      Define our local driver identity first. Set up stuff to deal with
- *      all the local structures required by a serial tty driver.
- */
-static char     *stl_drvtitle = "Stallion Multiport Serial Driver";
-static char     *stl_drvname = "stallion";
-static char     *stl_drvversion = "5.6.0";
-
-static struct tty_driver        *stl_serial;
-
-/*
- *      Define a local default termios struct. All ports will be created
- *      with this termios initially. Basically all it defines is a raw port
- *      at 9600, 8 data bits, 1 stop bit.
- */
-static struct ktermios          stl_deftermios = {
-        .c_cflag        = (B9600 | CS8 | CREAD | HUPCL | CLOCAL),
-        .c_cc           = INIT_C_CC,
-        .c_ispeed       = 9600,
-        .c_ospeed       = 9600,
-};
-
-/*
- *      Define global place to put buffer overflow characters.
- */
-static char             stl_unwanted[SC26198_RXFIFOSIZE];
-
-/*****************************************************************************/
-
-static DEFINE_MUTEX(stl_brdslock);
-static struct stlbrd            *stl_brds[STL_MAXBRDS];
-
-static const struct tty_port_operations stl_port_ops;
-
-/*
- *      Per board state flags. Used with the state field of the board struct.
- *      Not really much here!
- */
-#define BRD_FOUND       0x1
-#define STL_PROBED      0x2
-
-
-/*
- *      Define the port structure istate flags. These set of flags are
- *      modified at interrupt time - so setting and reseting them needs
- *      to be atomic. Use the bit clear/setting routines for this.
- */
-#define ASYI_TXBUSY     1
-#define ASYI_TXLOW      2
-#define ASYI_TXFLOWED   3
-
-/*
- *      Define an array of board names as printable strings. Handy for
- *      referencing boards when printing trace and stuff.
- */
-static char     *stl_brdnames[] = {
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        "EasyIO",
-        "EC8/32-AT",
-        "EC8/32-MC",
-        NULL,
-        NULL,
-        NULL,
-        "EC8/32-PCI",
-        "EC8/64-PCI",
-        "EasyIO-PCI",
-};
-
-/*****************************************************************************/
-
-/*
- *      Define some string labels for arguments passed from the module
- *      load line. These allow for easy board definitions, and easy
- *      modification of the io, memory and irq resoucres.
- */
-static unsigned int stl_nargs;
-static char     *board0[4];
-static char     *board1[4];
-static char     *board2[4];
-static char     *board3[4];
-
-static char     **stl_brdsp[] = {
-        (char **) &board0,
-        (char **) &board1,
-        (char **) &board2,
-        (char **) &board3
-};
-
-/*
- *      Define a set of common board names, and types. This is used to
- *      parse any module arguments.
- */
-
-static struct {
-        char    *name;
-        int     type;
-} stl_brdstr[] = {
-        { "easyio", BRD_EASYIO },
-        { "eio", BRD_EASYIO },
-        { "20", BRD_EASYIO },
-        { "ec8/32", BRD_ECH },
-        { "ec8/32-at", BRD_ECH },
-        { "ec8/32-isa", BRD_ECH },
-        { "ech", BRD_ECH },
-        { "echat", BRD_ECH },
-        { "21", BRD_ECH },
-        { "ec8/32-mc", BRD_ECHMC },
-        { "ec8/32-mca", BRD_ECHMC },
-        { "echmc", BRD_ECHMC },
-        { "echmca", BRD_ECHMC },
-        { "22", BRD_ECHMC },
-        { "ec8/32-pc", BRD_ECHPCI },
-        { "ec8/32-pci", BRD_ECHPCI },
-        { "26", BRD_ECHPCI },
-        { "ec8/64-pc", BRD_ECH64PCI },
-        { "ec8/64-pci", BRD_ECH64PCI },
-        { "ech-pci", BRD_ECH64PCI },
-        { "echpci", BRD_ECH64PCI },
-        { "echpc", BRD_ECH64PCI },
-        { "27", BRD_ECH64PCI },
-        { "easyio-pc", BRD_EASYIOPCI },
-        { "easyio-pci", BRD_EASYIOPCI },
-        { "eio-pci", BRD_EASYIOPCI },
-        { "eiopci", BRD_EASYIOPCI },
-        { "28", BRD_EASYIOPCI },
-};
-
-/*
- *      Define the module agruments.
- */
-
-module_param_array(board0, charp, &stl_nargs, 0);
-MODULE_PARM_DESC(board0, "Board 0 config -> name[,ioaddr[,ioaddr2][,irq]]");
-module_param_array(board1, charp, &stl_nargs, 0);
-MODULE_PARM_DESC(board1, "Board 1 config -> name[,ioaddr[,ioaddr2][,irq]]");
-module_param_array(board2, charp, &stl_nargs, 0);
-MODULE_PARM_DESC(board2, "Board 2 config -> name[,ioaddr[,ioaddr2][,irq]]");
-module_param_array(board3, charp, &stl_nargs, 0);
-MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,ioaddr2][,irq]]");
-
-/*****************************************************************************/
-
-/*
- *      Hardware ID bits for the EasyIO and ECH boards. These defines apply
- *      to the directly accessible io ports of these boards (not the uarts -
- *      they are in cd1400.h and sc26198.h).
- */
-#define EIO_8PORTRS     0x04
-#define EIO_4PORTRS     0x05
-#define EIO_8PORTDI     0x00
-#define EIO_8PORTM      0x06
-#define EIO_MK3         0x03
-#define EIO_IDBITMASK   0x07
-
-#define EIO_BRDMASK     0xf0
-#define ID_BRD4         0x10
-#define ID_BRD8         0x20
-#define ID_BRD16        0x30
-
-#define EIO_INTRPEND    0x08
-#define EIO_INTEDGE     0x00
-#define EIO_INTLEVEL    0x08
-#define EIO_0WS         0x10
-
-#define ECH_ID          0xa0
-#define ECH_IDBITMASK   0xe0
-#define ECH_BRDENABLE   0x08
-#define ECH_BRDDISABLE  0x00
-#define ECH_INTENABLE   0x01
-#define ECH_INTDISABLE  0x00
-#define ECH_INTLEVEL    0x02
-#define ECH_INTEDGE     0x00
-#define ECH_INTRPEND    0x01
-#define ECH_BRDRESET    0x01
-
-#define ECHMC_INTENABLE 0x01
-#define ECHMC_BRDRESET  0x02
-
-#define ECH_PNLSTATUS   2
-#define ECH_PNL16PORT   0x20
-#define ECH_PNLIDMASK   0x07
-#define ECH_PNLXPID     0x40
-#define ECH_PNLINTRPEND 0x80
-
-#define ECH_ADDR2MASK   0x1e0
-
-/*
- *      Define the vector mapping bits for the programmable interrupt board
- *      hardware. These bits encode the interrupt for the board to use - it
- *      is software selectable (except the EIO-8M).
- */
-static unsigned char    stl_vecmap[] = {
-        0xff, 0xff, 0xff, 0x04, 0x06, 0x05, 0xff, 0x07,
-        0xff, 0xff, 0x00, 0x02, 0x01, 0xff, 0xff, 0x03
-};
-
-/*
- *      Lock ordering is that you may not take stallion_lock holding
- *      brd_lock.
- */
-
-static spinlock_t brd_lock;             /* Guard the board mapping */
-static spinlock_t stallion_lock;        /* Guard the tty driver */
-
-/*
- *      Set up enable and disable macros for the ECH boards. They require
- *      the secondary io address space to be activated and deactivated.
- *      This way all ECH boards can share their secondary io region.
- *      If this is an ECH-PCI board then also need to set the page pointer
- *      to point to the correct page.
- */
-#define BRDENABLE(brdnr,pagenr)                                         \
-        if (stl_brds[(brdnr)]->brdtype == BRD_ECH)                      \
-                outb((stl_brds[(brdnr)]->ioctrlval | ECH_BRDENABLE),    \
-                        stl_brds[(brdnr)]->ioctrl);                     \
-        else if (stl_brds[(brdnr)]->brdtype == BRD_ECHPCI)              \
-                outb((pagenr), stl_brds[(brdnr)]->ioctrl);
-
-#define BRDDISABLE(brdnr)                                               \
-        if (stl_brds[(brdnr)]->brdtype == BRD_ECH)                      \
-                outb((stl_brds[(brdnr)]->ioctrlval | ECH_BRDDISABLE),   \
-                        stl_brds[(brdnr)]->ioctrl);
-
-#define STL_CD1400MAXBAUD       230400
-#define STL_SC26198MAXBAUD      460800
-
-#define STL_BAUDBASE            115200
-#define STL_CLOSEDELAY          (5 * HZ / 10)
-
-/*****************************************************************************/
-
-/*
- *      Define the Stallion PCI vendor and device IDs.
- */
-#ifndef PCI_VENDOR_ID_STALLION
-#define PCI_VENDOR_ID_STALLION          0x124d
-#endif
-#ifndef PCI_DEVICE_ID_ECHPCI832
-#define PCI_DEVICE_ID_ECHPCI832         0x0000
-#endif
-#ifndef PCI_DEVICE_ID_ECHPCI864
-#define PCI_DEVICE_ID_ECHPCI864         0x0002
-#endif
-#ifndef PCI_DEVICE_ID_EIOPCI
-#define PCI_DEVICE_ID_EIOPCI            0x0003
-#endif
-
-/*
- *      Define structure to hold all Stallion PCI boards.
- */
-
-static struct pci_device_id stl_pcibrds[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_ECHPCI864),
-                .driver_data = BRD_ECH64PCI },
-        { PCI_DEVICE(PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_EIOPCI),
-                .driver_data = BRD_EASYIOPCI },
-        { PCI_DEVICE(PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_ECHPCI832),
-                .driver_data = BRD_ECHPCI },
-        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87410),
-                .driver_data = BRD_ECHPCI },
-        { }
-};
-MODULE_DEVICE_TABLE(pci, stl_pcibrds);
-
-/*****************************************************************************/
-
-/*
- *      Define macros to extract a brd/port number from a minor number.
- */
-#define MINOR2BRD(min)          (((min) & 0xc0) >> 6)
-#define MINOR2PORT(min)         ((min) & 0x3f)
-
-/*
- *      Define a baud rate table that converts termios baud rate selector
- *      into the actual baud rate value. All baud rate calculations are
- *      based on the actual baud rate required.
- */
-static unsigned int     stl_baudrates[] = {
-        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
-        9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600
-};
-
-/*****************************************************************************/
-
-/*
- *      Declare all those functions in this driver!
- */
-
-static long     stl_memioctl(struct file *fp, unsigned int cmd, unsigned long arg);
-static int      stl_brdinit(struct stlbrd *brdp);
-static int      stl_getportstats(struct tty_struct *tty, struct stlport *portp, comstats_t __user *cp);
-static int      stl_clrportstats(struct stlport *portp, comstats_t __user *cp);
-
-/*
- *      CD1400 uart specific handling functions.
- */
-static void     stl_cd1400setreg(struct stlport *portp, int regnr, int value);
-static int      stl_cd1400getreg(struct stlport *portp, int regnr);
-static int      stl_cd1400updatereg(struct stlport *portp, int regnr, int value);
-static int      stl_cd1400panelinit(struct stlbrd *brdp, struct stlpanel *panelp);
-static void     stl_cd1400portinit(struct stlbrd *brdp, struct stlpanel *panelp, struct stlport *portp);
-static void     stl_cd1400setport(struct stlport *portp, struct ktermios *tiosp);
-static int      stl_cd1400getsignals(struct stlport *portp);
-static void     stl_cd1400setsignals(struct stlport *portp, int dtr, int rts);
-static void     stl_cd1400ccrwait(struct stlport *portp);
-static void     stl_cd1400enablerxtx(struct stlport *portp, int rx, int tx);
-static void     stl_cd1400startrxtx(struct stlport *portp, int rx, int tx);
-static void     stl_cd1400disableintrs(struct stlport *portp);
-static void     stl_cd1400sendbreak(struct stlport *portp, int len);
-static void     stl_cd1400flowctrl(struct stlport *portp, int state);
-static void     stl_cd1400sendflow(struct stlport *portp, int state);
-static void     stl_cd1400flush(struct stlport *portp);
-static int      stl_cd1400datastate(struct stlport *portp);
-static void     stl_cd1400eiointr(struct stlpanel *panelp, unsigned int iobase);
-static void     stl_cd1400echintr(struct stlpanel *panelp, unsigned int iobase);
-static void     stl_cd1400txisr(struct stlpanel *panelp, int ioaddr);
-static void     stl_cd1400rxisr(struct stlpanel *panelp, int ioaddr);
-static void     stl_cd1400mdmisr(struct stlpanel *panelp, int ioaddr);
-
-static inline int       stl_cd1400breakisr(struct stlport *portp, int ioaddr);
-
-/*
- *      SC26198 uart specific handling functions.
- */
-static void     stl_sc26198setreg(struct stlport *portp, int regnr, int value);
-static int      stl_sc26198getreg(struct stlport *portp, int regnr);
-static int      stl_sc26198updatereg(struct stlport *portp, int regnr, int value);
-static int      stl_sc26198getglobreg(struct stlport *portp, int regnr);
-static int      stl_sc26198panelinit(struct stlbrd *brdp, struct stlpanel *panelp);
-static void     stl_sc26198portinit(struct stlbrd *brdp, struct stlpanel *panelp, struct stlport *portp);
-static void     stl_sc26198setport(struct stlport *portp, struct ktermios *tiosp);
-static int      stl_sc26198getsignals(struct stlport *portp);
-static void     stl_sc26198setsignals(struct stlport *portp, int dtr, int rts);
-static void     stl_sc26198enablerxtx(struct stlport *portp, int rx, int tx);
-static void     stl_sc26198startrxtx(struct stlport *portp, int rx, int tx);
-static void     stl_sc26198disableintrs(struct stlport *portp);
-static void     stl_sc26198sendbreak(struct stlport *portp, int len);
-static void     stl_sc26198flowctrl(struct stlport *portp, int state);
-static void     stl_sc26198sendflow(struct stlport *portp, int state);
-static void     stl_sc26198flush(struct stlport *portp);
-static int      stl_sc26198datastate(struct stlport *portp);
-static void     stl_sc26198wait(struct stlport *portp);
-static void     stl_sc26198txunflow(struct stlport *portp, struct tty_struct *tty);
-static void     stl_sc26198intr(struct stlpanel *panelp, unsigned int iobase);
-static void     stl_sc26198txisr(struct stlport *port);
-static void     stl_sc26198rxisr(struct stlport *port, unsigned int iack);
-static void     stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char ch);
-static void     stl_sc26198rxbadchars(struct stlport *portp);
-static void     stl_sc26198otherisr(struct stlport *port, unsigned int iack);
-
-/*****************************************************************************/
-
-/*
- *      Generic UART support structure.
- */
-typedef struct uart {
-        int     (*panelinit)(struct stlbrd *brdp, struct stlpanel *panelp);
-        void    (*portinit)(struct stlbrd *brdp, struct stlpanel *panelp, struct stlport *portp);
-        void    (*setport)(struct stlport *portp, struct ktermios *tiosp);
-        int     (*getsignals)(struct stlport *portp);
-        void    (*setsignals)(struct stlport *portp, int dtr, int rts);
-        void    (*enablerxtx)(struct stlport *portp, int rx, int tx);
-        void    (*startrxtx)(struct stlport *portp, int rx, int tx);
-        void    (*disableintrs)(struct stlport *portp);
-        void    (*sendbreak)(struct stlport *portp, int len);
-        void    (*flowctrl)(struct stlport *portp, int state);
-        void    (*sendflow)(struct stlport *portp, int state);
-        void    (*flush)(struct stlport *portp);
-        int     (*datastate)(struct stlport *portp);
-        void    (*intr)(struct stlpanel *panelp, unsigned int iobase);
-} uart_t;
-
-/*
- *      Define some macros to make calling these functions nice and clean.
- */
-#define stl_panelinit           (* ((uart_t *) panelp->uartp)->panelinit)
-#define stl_portinit            (* ((uart_t *) portp->uartp)->portinit)
-#define stl_setport             (* ((uart_t *) portp->uartp)->setport)
-#define stl_getsignals          (* ((uart_t *) portp->uartp)->getsignals)
-#define stl_setsignals          (* ((uart_t *) portp->uartp)->setsignals)
-#define stl_enablerxtx          (* ((uart_t *) portp->uartp)->enablerxtx)
-#define stl_startrxtx           (* ((uart_t *) portp->uartp)->startrxtx)
-#define stl_disableintrs        (* ((uart_t *) portp->uartp)->disableintrs)
-#define stl_sendbreak           (* ((uart_t *) portp->uartp)->sendbreak)
-#define stl_flowctrl            (* ((uart_t *) portp->uartp)->flowctrl)
-#define stl_sendflow            (* ((uart_t *) portp->uartp)->sendflow)
-#define stl_flush               (* ((uart_t *) portp->uartp)->flush)
-#define stl_datastate           (* ((uart_t *) portp->uartp)->datastate)
-
-/*****************************************************************************/
-
-/*
- *      CD1400 UART specific data initialization.
- */
-static uart_t stl_cd1400uart = {
-        stl_cd1400panelinit,
-        stl_cd1400portinit,
-        stl_cd1400setport,
-        stl_cd1400getsignals,
-        stl_cd1400setsignals,
-        stl_cd1400enablerxtx,
-        stl_cd1400startrxtx,
-        stl_cd1400disableintrs,
-        stl_cd1400sendbreak,
-        stl_cd1400flowctrl,
-        stl_cd1400sendflow,
-        stl_cd1400flush,
-        stl_cd1400datastate,
-        stl_cd1400eiointr
-};
-
-/*
- *      Define the offsets within the register bank of a cd1400 based panel.
- *      These io address offsets are common to the EasyIO board as well.
- */
-#define EREG_ADDR       0
-#define EREG_DATA       4
-#define EREG_RXACK      5
-#define EREG_TXACK      6
-#define EREG_MDACK      7
-
-#define EREG_BANKSIZE   8
-
-#define CD1400_CLK      25000000
-#define CD1400_CLK8M    20000000
-
-/*
- *      Define the cd1400 baud rate clocks. These are used when calculating
- *      what clock and divisor to use for the required baud rate. Also
- *      define the maximum baud rate allowed, and the default base baud.
- */
-static int      stl_cd1400clkdivs[] = {
-        CD1400_CLK0, CD1400_CLK1, CD1400_CLK2, CD1400_CLK3, CD1400_CLK4
-};
-
-/*****************************************************************************/
-
-/*
- *      SC26198 UART specific data initization.
- */
-static uart_t stl_sc26198uart = {
-        stl_sc26198panelinit,
-        stl_sc26198portinit,
-        stl_sc26198setport,
-        stl_sc26198getsignals,
-        stl_sc26198setsignals,
-        stl_sc26198enablerxtx,
-        stl_sc26198startrxtx,
-        stl_sc26198disableintrs,
-        stl_sc26198sendbreak,
-        stl_sc26198flowctrl,
-        stl_sc26198sendflow,
-        stl_sc26198flush,
-        stl_sc26198datastate,
-        stl_sc26198intr
-};
-
-/*
- *      Define the offsets within the register bank of a sc26198 based panel.
- */
-#define XP_DATA         0
-#define XP_ADDR         1
-#define XP_MODID        2
-#define XP_STATUS       2
-#define XP_IACK         3
-
-#define XP_BANKSIZE     4
-
-/*
- *      Define the sc26198 baud rate table. Offsets within the table
- *      represent the actual baud rate selector of sc26198 registers.
- */
-static unsigned int     sc26198_baudtable[] = {
-        50, 75, 150, 200, 300, 450, 600, 900, 1200, 1800, 2400, 3600,
-        4800, 7200, 9600, 14400, 19200, 28800, 38400, 57600, 115200,
-        230400, 460800, 921600
-};
-
-#define SC26198_NRBAUDS         ARRAY_SIZE(sc26198_baudtable)
-
-/*****************************************************************************/
-
-/*
- *      Define the driver info for a user level control device. Used mainly
- *      to get at port stats - only not using the port device itself.
- */
-static const struct file_operations     stl_fsiomem = {
-        .owner          = THIS_MODULE,
-        .unlocked_ioctl = stl_memioctl,
-};
-
-static struct class *stallion_class;
-
-static void stl_cd_change(struct stlport *portp)
-{
-        unsigned int oldsigs = portp->sigs;
-        struct tty_struct *tty = tty_port_tty_get(&portp->port);
-
-        if (!tty)
-                return;
-
-        portp->sigs = stl_getsignals(portp);
-
-        if ((portp->sigs & TIOCM_CD) && ((oldsigs & TIOCM_CD) == 0))
-                wake_up_interruptible(&portp->port.open_wait);
-
-        if ((oldsigs & TIOCM_CD) && ((portp->sigs & TIOCM_CD) == 0))
-                if (portp->port.flags & ASYNC_CHECK_CD)
-                        tty_hangup(tty);
-        tty_kref_put(tty);
-}
-
-/*
- *      Check for any arguments passed in on the module load command line.
- */
-
-/*****************************************************************************/
-
-/*
- *      Parse the supplied argument string, into the board conf struct.
- */
-
-static int __init stl_parsebrd(struct stlconf *confp, char **argp)
-{
-        char    *sp;
-        unsigned int i;
-
-        pr_debug("stl_parsebrd(confp=%p,argp=%p)\n", confp, argp);
-
-        if ((argp[0] == NULL) || (*argp[0] == 0))
-                return 0;
-
-        for (sp = argp[0], i = 0; (*sp != 0) && (i < 25); sp++, i++)
-                *sp = tolower(*sp);
-
-        for (i = 0; i < ARRAY_SIZE(stl_brdstr); i++)
-                if (strcmp(stl_brdstr[i].name, argp[0]) == 0)
-                        break;
-
-        if (i == ARRAY_SIZE(stl_brdstr)) {
-                printk("STALLION: unknown board name, %s?\n", argp[0]);
-                return 0;
-        }
-
-        confp->brdtype = stl_brdstr[i].type;
-
-        i = 1;
-        if ((argp[i] != NULL) && (*argp[i] != 0))
-                confp->ioaddr1 = simple_strtoul(argp[i], NULL, 0);
-        i++;
-        if (confp->brdtype == BRD_ECH) {
-                if ((argp[i] != NULL) && (*argp[i] != 0))
-                        confp->ioaddr2 = simple_strtoul(argp[i], NULL, 0);
-                i++;
-        }
-        if ((argp[i] != NULL) && (*argp[i] != 0))
-                confp->irq = simple_strtoul(argp[i], NULL, 0);
-        return 1;
-}
-
-/*****************************************************************************/
-
-/*
- *      Allocate a new board structure. Fill out the basic info in it.
- */
-
-static struct stlbrd *stl_allocbrd(void)
-{
-        struct stlbrd   *brdp;
-
-        brdp = kzalloc(sizeof(struct stlbrd), GFP_KERNEL);
-        if (!brdp) {
-                printk("STALLION: failed to allocate memory (size=%Zd)\n",
-                        sizeof(struct stlbrd));
-                return NULL;
-        }
-
-        brdp->magic = STL_BOARDMAGIC;
-        return brdp;
-}
-
-/*****************************************************************************/
-
-static int stl_activate(struct tty_port *port, struct tty_struct *tty)
-{
-        struct stlport *portp = container_of(port, struct stlport, port);
-        if (!portp->tx.buf) {
-                portp->tx.buf = kmalloc(STL_TXBUFSIZE, GFP_KERNEL);
-                if (!portp->tx.buf)
-                        return -ENOMEM;
-                portp->tx.head = portp->tx.buf;
-                portp->tx.tail = portp->tx.buf;
-        }
-        stl_setport(portp, tty->termios);
-        portp->sigs = stl_getsignals(portp);
-        stl_setsignals(portp, 1, 1);
-        stl_enablerxtx(portp, 1, 1);
-        stl_startrxtx(portp, 1, 0);
-        return 0;
-}
-
-static int stl_open(struct tty_struct *tty, struct file *filp)
-{
-        struct stlport  *portp;
-        struct stlbrd   *brdp;
-        unsigned int    minordev, brdnr, panelnr;
-        int             portnr;
-
-        pr_debug("stl_open(tty=%p,filp=%p): device=%s\n", tty, filp, tty->name);
-
-        minordev = tty->index;
-        brdnr = MINOR2BRD(minordev);
-        if (brdnr >= stl_nrbrds)
-                return -ENODEV;
-        brdp = stl_brds[brdnr];
-        if (brdp == NULL)
-                return -ENODEV;
-
-        minordev = MINOR2PORT(minordev);
-        for (portnr = -1, panelnr = 0; panelnr < STL_MAXPANELS; panelnr++) {
-                if (brdp->panels[panelnr] == NULL)
-                        break;
-                if (minordev < brdp->panels[panelnr]->nrports) {
-                        portnr = minordev;
-                        break;
-                }
-                minordev -= brdp->panels[panelnr]->nrports;
-        }
-        if (portnr < 0)
-                return -ENODEV;
-
-        portp = brdp->panels[panelnr]->ports[portnr];
-        if (portp == NULL)
-                return -ENODEV;
-
-        tty->driver_data = portp;
-        return tty_port_open(&portp->port, tty, filp);
-
-}
-
-/*****************************************************************************/
-
-static int stl_carrier_raised(struct tty_port *port)
-{
-        struct stlport *portp = container_of(port, struct stlport, port);
-        return (portp->sigs & TIOCM_CD) ? 1 : 0;
-}
-
-static void stl_dtr_rts(struct tty_port *port, int on)
-{
-        struct stlport *portp = container_of(port, struct stlport, port);
-        /* Takes brd_lock internally */
-        stl_setsignals(portp, on, on);
-}
-
-/*****************************************************************************/
-
-static void stl_flushbuffer(struct tty_struct *tty)
-{
-        struct stlport  *portp;
-
-        pr_debug("stl_flushbuffer(tty=%p)\n", tty);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-
-        stl_flush(portp);
-        tty_wakeup(tty);
-}
-
-/*****************************************************************************/
-
-static void stl_waituntilsent(struct tty_struct *tty, int timeout)
-{
-        struct stlport  *portp;
-        unsigned long   tend;
-
-        pr_debug("stl_waituntilsent(tty=%p,timeout=%d)\n", tty, timeout);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-
-        if (timeout == 0)
-                timeout = HZ;
-        tend = jiffies + timeout;
-
-        while (stl_datastate(portp)) {
-                if (signal_pending(current))
-                        break;
-                msleep_interruptible(20);
-                if (time_after_eq(jiffies, tend))
-                        break;
-        }
-}
-
-/*****************************************************************************/
-
-static void stl_shutdown(struct tty_port *port)
-{
-        struct stlport *portp = container_of(port, struct stlport, port);
-        stl_disableintrs(portp);
-        stl_enablerxtx(portp, 0, 0);
-        stl_flush(portp);
-        portp->istate = 0;
-        if (portp->tx.buf != NULL) {
-                kfree(portp->tx.buf);
-                portp->tx.buf = NULL;
-                portp->tx.head = NULL;
-                portp->tx.tail = NULL;
-        }
-}
-
-static void stl_close(struct tty_struct *tty, struct file *filp)
-{
-        struct stlport*portp;
-        pr_debug("stl_close(tty=%p,filp=%p)\n", tty, filp);
-
-        portp = tty->driver_data;
-        if(portp == NULL)
-                return;
-        tty_port_close(&portp->port, tty, filp);
-}
-
-/*****************************************************************************/
-
-/*
- *      Write routine. Take data and stuff it in to the TX ring queue.
- *      If transmit interrupts are not running then start them.
- */
-
-static int stl_write(struct tty_struct *tty, const unsigned char *buf, int count)
-{
-        struct stlport  *portp;
-        unsigned int    len, stlen;
-        unsigned char   *chbuf;
-        char            *head, *tail;
-
-        pr_debug("stl_write(tty=%p,buf=%p,count=%d)\n", tty, buf, count);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return 0;
-        if (portp->tx.buf == NULL)
-                return 0;
-
-/*
- *      If copying direct from user space we must cater for page faults,
- *      causing us to "sleep" here for a while. To handle this copy in all
- *      the data we need now, into a local buffer. Then when we got it all
- *      copy it into the TX buffer.
- */
-        chbuf = (unsigned char *) buf;
-
-        head = portp->tx.head;
-        tail = portp->tx.tail;
-        if (head >= tail) {
-                len = STL_TXBUFSIZE - (head - tail) - 1;
-                stlen = STL_TXBUFSIZE - (head - portp->tx.buf);
-        } else {
-                len = tail - head - 1;
-                stlen = len;
-        }
-
-        len = min(len, (unsigned int)count);
-        count = 0;
-        while (len > 0) {
-                stlen = min(len, stlen);
-                memcpy(head, chbuf, stlen);
-                len -= stlen;
-                chbuf += stlen;
-                count += stlen;
-                head += stlen;
-                if (head >= (portp->tx.buf + STL_TXBUFSIZE)) {
-                        head = portp->tx.buf;
-                        stlen = tail - head;
-                }
-        }
-        portp->tx.head = head;
-
-        clear_bit(ASYI_TXLOW, &portp->istate);
-        stl_startrxtx(portp, -1, 1);
-
-        return count;
-}
-
-/*****************************************************************************/
-
-static int stl_putchar(struct tty_struct *tty, unsigned char ch)
-{
-        struct stlport  *portp;
-        unsigned int    len;
-        char            *head, *tail;
-
-        pr_debug("stl_putchar(tty=%p,ch=%x)\n", tty, ch);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return -EINVAL;
-        if (portp->tx.buf == NULL)
-                return -EINVAL;
-
-        head = portp->tx.head;
-        tail = portp->tx.tail;
-
-        len = (head >= tail) ? (STL_TXBUFSIZE - (head - tail)) : (tail - head);
-        len--;
-
-        if (len > 0) {
-                *head++ = ch;
-                if (head >= (portp->tx.buf + STL_TXBUFSIZE))
-                        head = portp->tx.buf;
-        }       
-        portp->tx.head = head;
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      If there are any characters in the buffer then make sure that TX
- *      interrupts are on and get'em out. Normally used after the putchar
- *      routine has been called.
- */
-
-static void stl_flushchars(struct tty_struct *tty)
-{
-        struct stlport  *portp;
-
-        pr_debug("stl_flushchars(tty=%p)\n", tty);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-        if (portp->tx.buf == NULL)
-                return;
-
-        stl_startrxtx(portp, -1, 1);
-}
-
-/*****************************************************************************/
-
-static int stl_writeroom(struct tty_struct *tty)
-{
-        struct stlport  *portp;
-        char            *head, *tail;
-
-        pr_debug("stl_writeroom(tty=%p)\n", tty);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return 0;
-        if (portp->tx.buf == NULL)
-                return 0;
-
-        head = portp->tx.head;
-        tail = portp->tx.tail;
-        return (head >= tail) ? (STL_TXBUFSIZE - (head - tail) - 1) : (tail - head - 1);
-}
-
-/*****************************************************************************/
-
-/*
- *      Return number of chars in the TX buffer. Normally we would just
- *      calculate the number of chars in the buffer and return that, but if
- *      the buffer is empty and TX interrupts are still on then we return
- *      that the buffer still has 1 char in it. This way whoever called us
- *      will not think that ALL chars have drained - since the UART still
- *      must have some chars in it (we are busy after all).
- */
-
-static int stl_charsinbuffer(struct tty_struct *tty)
-{
-        struct stlport  *portp;
-        unsigned int    size;
-        char            *head, *tail;
-
-        pr_debug("stl_charsinbuffer(tty=%p)\n", tty);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return 0;
-        if (portp->tx.buf == NULL)
-                return 0;
-
-        head = portp->tx.head;
-        tail = portp->tx.tail;
-        size = (head >= tail) ? (head - tail) : (STL_TXBUFSIZE - (tail - head));
-        if ((size == 0) && test_bit(ASYI_TXBUSY, &portp->istate))
-                size = 1;
-        return size;
-}
-
-/*****************************************************************************/
-
-/*
- *      Generate the serial struct info.
- */
-
-static int stl_getserial(struct stlport *portp, struct serial_struct __user *sp)
-{
-        struct serial_struct    sio;
-        struct stlbrd           *brdp;
-
-        pr_debug("stl_getserial(portp=%p,sp=%p)\n", portp, sp);
-
-        memset(&sio, 0, sizeof(struct serial_struct));
-
-        mutex_lock(&portp->port.mutex);
-        sio.line = portp->portnr;
-        sio.port = portp->ioaddr;
-        sio.flags = portp->port.flags;
-        sio.baud_base = portp->baud_base;
-        sio.close_delay = portp->close_delay;
-        sio.closing_wait = portp->closing_wait;
-        sio.custom_divisor = portp->custom_divisor;
-        sio.hub6 = 0;
-        if (portp->uartp == &stl_cd1400uart) {
-                sio.type = PORT_CIRRUS;
-                sio.xmit_fifo_size = CD1400_TXFIFOSIZE;
-        } else {
-                sio.type = PORT_UNKNOWN;
-                sio.xmit_fifo_size = SC26198_TXFIFOSIZE;
-        }
-
-        brdp = stl_brds[portp->brdnr];
-        if (brdp != NULL)
-                sio.irq = brdp->irq;
-        mutex_unlock(&portp->port.mutex);
-
-        return copy_to_user(sp, &sio, sizeof(struct serial_struct)) ? -EFAULT : 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Set port according to the serial struct info.
- *      At this point we do not do any auto-configure stuff, so we will
- *      just quietly ignore any requests to change irq, etc.
- */
-
-static int stl_setserial(struct tty_struct *tty, struct serial_struct __user *sp)
-{
-        struct stlport *        portp = tty->driver_data;
-        struct serial_struct    sio;
-
-        pr_debug("stl_setserial(portp=%p,sp=%p)\n", portp, sp);
-
-        if (copy_from_user(&sio, sp, sizeof(struct serial_struct)))
-                return -EFAULT;
-        mutex_lock(&portp->port.mutex);
-        if (!capable(CAP_SYS_ADMIN)) {
-                if ((sio.baud_base != portp->baud_base) ||
-                    (sio.close_delay != portp->close_delay) ||
-                    ((sio.flags & ~ASYNC_USR_MASK) !=
-                    (portp->port.flags & ~ASYNC_USR_MASK))) {
-                        mutex_unlock(&portp->port.mutex);
-                        return -EPERM;
-                }
-        } 
-
-        portp->port.flags = (portp->port.flags & ~ASYNC_USR_MASK) |
-                (sio.flags & ASYNC_USR_MASK);
-        portp->baud_base = sio.baud_base;
-        portp->close_delay = sio.close_delay;
-        portp->closing_wait = sio.closing_wait;
-        portp->custom_divisor = sio.custom_divisor;
-        mutex_unlock(&portp->port.mutex);
-        stl_setport(portp, tty->termios);
-        return 0;
-}
-
-/*****************************************************************************/
-
-static int stl_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct stlport  *portp;
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return -ENODEV;
-        if (tty->flags & (1 << TTY_IO_ERROR))
-                return -EIO;
-
-        return stl_getsignals(portp);
-}
-
-static int stl_tiocmset(struct tty_struct *tty, struct file *file,
-                        unsigned int set, unsigned int clear)
-{
-        struct stlport  *portp;
-        int rts = -1, dtr = -1;
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return -ENODEV;
-        if (tty->flags & (1 << TTY_IO_ERROR))
-                return -EIO;
-
-        if (set & TIOCM_RTS)
-                rts = 1;
-        if (set & TIOCM_DTR)
-                dtr = 1;
-        if (clear & TIOCM_RTS)
-                rts = 0;
-        if (clear & TIOCM_DTR)
-                dtr = 0;
-
-        stl_setsignals(portp, dtr, rts);
-        return 0;
-}
-
-static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg)
-{
-        struct stlport  *portp;
-        int             rc;
-        void __user *argp = (void __user *)arg;
-
-        pr_debug("stl_ioctl(tty=%p,file=%p,cmd=%x,arg=%lx)\n", tty, file, cmd,
-                        arg);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return -ENODEV;
-
-        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-            (cmd != COM_GETPORTSTATS) && (cmd != COM_CLRPORTSTATS))
-                if (tty->flags & (1 << TTY_IO_ERROR))
-                        return -EIO;
-
-        rc = 0;
-
-        switch (cmd) {
-        case TIOCGSERIAL:
-                rc = stl_getserial(portp, argp);
-                break;
-        case TIOCSSERIAL:
-                rc = stl_setserial(tty, argp);
-                break;
-        case COM_GETPORTSTATS:
-                rc = stl_getportstats(tty, portp, argp);
-                break;
-        case COM_CLRPORTSTATS:
-                rc = stl_clrportstats(portp, argp);
-                break;
-        case TIOCSERCONFIG:
-        case TIOCSERGWILD:
-        case TIOCSERSWILD:
-        case TIOCSERGETLSR:
-        case TIOCSERGSTRUCT:
-        case TIOCSERGETMULTI:
-        case TIOCSERSETMULTI:
-        default:
-                rc = -ENOIOCTLCMD;
-                break;
-        }
-        return rc;
-}
-
-/*****************************************************************************/
-
-/*
- *      Start the transmitter again. Just turn TX interrupts back on.
- */
-
-static void stl_start(struct tty_struct *tty)
-{
-        struct stlport  *portp;
-
-        pr_debug("stl_start(tty=%p)\n", tty);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-        stl_startrxtx(portp, -1, 1);
-}
-
-/*****************************************************************************/
-
-static void stl_settermios(struct tty_struct *tty, struct ktermios *old)
-{
-        struct stlport  *portp;
-        struct ktermios *tiosp;
-
-        pr_debug("stl_settermios(tty=%p,old=%p)\n", tty, old);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-
-        tiosp = tty->termios;
-        if ((tiosp->c_cflag == old->c_cflag) &&
-            (tiosp->c_iflag == old->c_iflag))
-                return;
-
-        stl_setport(portp, tiosp);
-        stl_setsignals(portp, ((tiosp->c_cflag & (CBAUD & ~CBAUDEX)) ? 1 : 0),
-                -1);
-        if ((old->c_cflag & CRTSCTS) && ((tiosp->c_cflag & CRTSCTS) == 0)) {
-                tty->hw_stopped = 0;
-                stl_start(tty);
-        }
-        if (((old->c_cflag & CLOCAL) == 0) && (tiosp->c_cflag & CLOCAL))
-                wake_up_interruptible(&portp->port.open_wait);
-}
-
-/*****************************************************************************/
-
-/*
- *      Attempt to flow control who ever is sending us data. Based on termios
- *      settings use software or/and hardware flow control.
- */
-
-static void stl_throttle(struct tty_struct *tty)
-{
-        struct stlport  *portp;
-
-        pr_debug("stl_throttle(tty=%p)\n", tty);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-        stl_flowctrl(portp, 0);
-}
-
-/*****************************************************************************/
-
-/*
- *      Unflow control the device sending us data...
- */
-
-static void stl_unthrottle(struct tty_struct *tty)
-{
-        struct stlport  *portp;
-
-        pr_debug("stl_unthrottle(tty=%p)\n", tty);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-        stl_flowctrl(portp, 1);
-}
-
-/*****************************************************************************/
-
-/*
- *      Stop the transmitter. Basically to do this we will just turn TX
- *      interrupts off.
- */
-
-static void stl_stop(struct tty_struct *tty)
-{
-        struct stlport  *portp;
-
-        pr_debug("stl_stop(tty=%p)\n", tty);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-        stl_startrxtx(portp, -1, 0);
-}
-
-/*****************************************************************************/
-
-/*
- *      Hangup this port. This is pretty much like closing the port, only
- *      a little more brutal. No waiting for data to drain. Shutdown the
- *      port and maybe drop signals.
- */
-
-static void stl_hangup(struct tty_struct *tty)
-{
-        struct stlport  *portp = tty->driver_data;
-        pr_debug("stl_hangup(tty=%p)\n", tty);
-
-        if (portp == NULL)
-                return;
-        tty_port_hangup(&portp->port);
-}
-
-/*****************************************************************************/
-
-static int stl_breakctl(struct tty_struct *tty, int state)
-{
-        struct stlport  *portp;
-
-        pr_debug("stl_breakctl(tty=%p,state=%d)\n", tty, state);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return -EINVAL;
-
-        stl_sendbreak(portp, ((state == -1) ? 1 : 2));
-        return 0;
-}
-
-/*****************************************************************************/
-
-static void stl_sendxchar(struct tty_struct *tty, char ch)
-{
-        struct stlport  *portp;
-
-        pr_debug("stl_sendxchar(tty=%p,ch=%x)\n", tty, ch);
-
-        portp = tty->driver_data;
-        if (portp == NULL)
-                return;
-
-        if (ch == STOP_CHAR(tty))
-                stl_sendflow(portp, 0);
-        else if (ch == START_CHAR(tty))
-                stl_sendflow(portp, 1);
-        else
-                stl_putchar(tty, ch);
-}
-
-static void stl_portinfo(struct seq_file *m, struct stlport *portp, int portnr)
-{
-        int     sigs;
-        char sep;
-
-        seq_printf(m, "%d: uart:%s tx:%d rx:%d",
-                portnr, (portp->hwid == 1) ? "SC26198" : "CD1400",
-                (int) portp->stats.txtotal, (int) portp->stats.rxtotal);
-
-        if (portp->stats.rxframing)
-                seq_printf(m, " fe:%d", (int) portp->stats.rxframing);
-        if (portp->stats.rxparity)
-                seq_printf(m, " pe:%d", (int) portp->stats.rxparity);
-        if (portp->stats.rxbreaks)
-                seq_printf(m, " brk:%d", (int) portp->stats.rxbreaks);
-        if (portp->stats.rxoverrun)
-                seq_printf(m, " oe:%d", (int) portp->stats.rxoverrun);
-
-        sigs = stl_getsignals(portp);
-        sep = ' ';
-        if (sigs & TIOCM_RTS) {
-                seq_printf(m, "%c%s", sep, "RTS");
-                sep = '|';
-        }
-        if (sigs & TIOCM_CTS) {
-                seq_printf(m, "%c%s", sep, "CTS");
-                sep = '|';
-        }
-        if (sigs & TIOCM_DTR) {
-                seq_printf(m, "%c%s", sep, "DTR");
-                sep = '|';
-        }
-        if (sigs & TIOCM_CD) {
-                seq_printf(m, "%c%s", sep, "DCD");
-                sep = '|';
-        }
-        if (sigs & TIOCM_DSR) {
-                seq_printf(m, "%c%s", sep, "DSR");
-                sep = '|';
-        }
-        seq_putc(m, '\n');
-}
-
-/*****************************************************************************/
-
-/*
- *      Port info, read from the /proc file system.
- */
-
-static int stl_proc_show(struct seq_file *m, void *v)
-{
-        struct stlbrd   *brdp;
-        struct stlpanel *panelp;
-        struct stlport  *portp;
-        unsigned int    brdnr, panelnr, portnr;
-        int             totalport;
-
-        totalport = 0;
-
-        seq_printf(m, "%s: version %s\n", stl_drvtitle, stl_drvversion);
-
-/*
- *      We scan through for each board, panel and port. The offset is
- *      calculated on the fly, and irrelevant ports are skipped.
- */
-        for (brdnr = 0; brdnr < stl_nrbrds; brdnr++) {
-                brdp = stl_brds[brdnr];
-                if (brdp == NULL)
-                        continue;
-                if (brdp->state == 0)
-                        continue;
-
-                totalport = brdnr * STL_MAXPORTS;
-                for (panelnr = 0; panelnr < brdp->nrpanels; panelnr++) {
-                        panelp = brdp->panels[panelnr];
-                        if (panelp == NULL)
-                                continue;
-
-                        for (portnr = 0; portnr < panelp->nrports; portnr++,
-                            totalport++) {
-                                portp = panelp->ports[portnr];
-                                if (portp == NULL)
-                                        continue;
-                                stl_portinfo(m, portp, totalport);
-                        }
-                }
-        }
-        return 0;
-}
-
-static int stl_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, stl_proc_show, NULL);
-}
-
-static const struct file_operations stl_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = stl_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-/*****************************************************************************/
-
-/*
- *      All board interrupts are vectored through here first. This code then
- *      calls off to the approrpriate board interrupt handlers.
- */
-
-static irqreturn_t stl_intr(int irq, void *dev_id)
-{
-        struct stlbrd *brdp = dev_id;
-
-        pr_debug("stl_intr(brdp=%p,irq=%d)\n", brdp, brdp->irq);
-
-        return IRQ_RETVAL((* brdp->isr)(brdp));
-}
-
-/*****************************************************************************/
-
-/*
- *      Interrupt service routine for EasyIO board types.
- */
-
-static int stl_eiointr(struct stlbrd *brdp)
-{
-        struct stlpanel *panelp;
-        unsigned int    iobase;
-        int             handled = 0;
-
-        spin_lock(&brd_lock);
-        panelp = brdp->panels[0];
-        iobase = panelp->iobase;
-        while (inb(brdp->iostatus) & EIO_INTRPEND) {
-                handled = 1;
-                (* panelp->isr)(panelp, iobase);
-        }
-        spin_unlock(&brd_lock);
-        return handled;
-}
-
-/*****************************************************************************/
-
-/*
- *      Interrupt service routine for ECH-AT board types.
- */
-
-static int stl_echatintr(struct stlbrd *brdp)
-{
-        struct stlpanel *panelp;
-        unsigned int    ioaddr, bnknr;
-        int             handled = 0;
-
-        outb((brdp->ioctrlval | ECH_BRDENABLE), brdp->ioctrl);
-
-        while (inb(brdp->iostatus) & ECH_INTRPEND) {
-                handled = 1;
-                for (bnknr = 0; bnknr < brdp->nrbnks; bnknr++) {
-                        ioaddr = brdp->bnkstataddr[bnknr];
-                        if (inb(ioaddr) & ECH_PNLINTRPEND) {
-                                panelp = brdp->bnk2panel[bnknr];
-                                (* panelp->isr)(panelp, (ioaddr & 0xfffc));
-                        }
-                }
-        }
-
-        outb((brdp->ioctrlval | ECH_BRDDISABLE), brdp->ioctrl);
-
-        return handled;
-}
-
-/*****************************************************************************/
-
-/*
- *      Interrupt service routine for ECH-MCA board types.
- */
-
-static int stl_echmcaintr(struct stlbrd *brdp)
-{
-        struct stlpanel *panelp;
-        unsigned int    ioaddr, bnknr;
-        int             handled = 0;
-
-        while (inb(brdp->iostatus) & ECH_INTRPEND) {
-                handled = 1;
-                for (bnknr = 0; bnknr < brdp->nrbnks; bnknr++) {
-                        ioaddr = brdp->bnkstataddr[bnknr];
-                        if (inb(ioaddr) & ECH_PNLINTRPEND) {
-                                panelp = brdp->bnk2panel[bnknr];
-                                (* panelp->isr)(panelp, (ioaddr & 0xfffc));
-                        }
-                }
-        }
-        return handled;
-}
-
-/*****************************************************************************/
-
-/*
- *      Interrupt service routine for ECH-PCI board types.
- */
-
-static int stl_echpciintr(struct stlbrd *brdp)
-{
-        struct stlpanel *panelp;
-        unsigned int    ioaddr, bnknr, recheck;
-        int             handled = 0;
-
-        while (1) {
-                recheck = 0;
-                for (bnknr = 0; bnknr < brdp->nrbnks; bnknr++) {
-                        outb(brdp->bnkpageaddr[bnknr], brdp->ioctrl);
-                        ioaddr = brdp->bnkstataddr[bnknr];
-                        if (inb(ioaddr) & ECH_PNLINTRPEND) {
-                                panelp = brdp->bnk2panel[bnknr];
-                                (* panelp->isr)(panelp, (ioaddr & 0xfffc));
-                                recheck++;
-                                handled = 1;
-                        }
-                }
-                if (! recheck)
-                        break;
-        }
-        return handled;
-}
-
-/*****************************************************************************/
-
-/*
- *      Interrupt service routine for ECH-8/64-PCI board types.
- */
-
-static int stl_echpci64intr(struct stlbrd *brdp)
-{
-        struct stlpanel *panelp;
-        unsigned int    ioaddr, bnknr;
-        int             handled = 0;
-
-        while (inb(brdp->ioctrl) & 0x1) {
-                handled = 1;
-                for (bnknr = 0; bnknr < brdp->nrbnks; bnknr++) {
-                        ioaddr = brdp->bnkstataddr[bnknr];
-                        if (inb(ioaddr) & ECH_PNLINTRPEND) {
-                                panelp = brdp->bnk2panel[bnknr];
-                                (* panelp->isr)(panelp, (ioaddr & 0xfffc));
-                        }
-                }
-        }
-
-        return handled;
-}
-
-/*****************************************************************************/
-
-/*
- *      Initialize all the ports on a panel.
- */
-
-static int __devinit stl_initports(struct stlbrd *brdp, struct stlpanel *panelp)
-{
-        struct stlport *portp;
-        unsigned int i;
-        int chipmask;
-
-        pr_debug("stl_initports(brdp=%p,panelp=%p)\n", brdp, panelp);
-
-        chipmask = stl_panelinit(brdp, panelp);
-
-/*
- *      All UART's are initialized (if found!). Now go through and setup
- *      each ports data structures.
- */
-        for (i = 0; i < panelp->nrports; i++) {
-                portp = kzalloc(sizeof(struct stlport), GFP_KERNEL);
-                if (!portp) {
-                        printk("STALLION: failed to allocate memory "
-                                "(size=%Zd)\n", sizeof(struct stlport));
-                        break;
-                }
-                tty_port_init(&portp->port);
-                portp->port.ops = &stl_port_ops;
-                portp->magic = STL_PORTMAGIC;
-                portp->portnr = i;
-                portp->brdnr = panelp->brdnr;
-                portp->panelnr = panelp->panelnr;
-                portp->uartp = panelp->uartp;
-                portp->clk = brdp->clk;
-                portp->baud_base = STL_BAUDBASE;
-                portp->close_delay = STL_CLOSEDELAY;
-                portp->closing_wait = 30 * HZ;
-                init_waitqueue_head(&portp->port.open_wait);
-                init_waitqueue_head(&portp->port.close_wait);
-                portp->stats.brd = portp->brdnr;
-                portp->stats.panel = portp->panelnr;
-                portp->stats.port = portp->portnr;
-                panelp->ports[i] = portp;
-                stl_portinit(brdp, panelp, portp);
-        }
-
-        return 0;
-}
-
-static void stl_cleanup_panels(struct stlbrd *brdp)
-{
-        struct stlpanel *panelp;
-        struct stlport *portp;
-        unsigned int j, k;
-        struct tty_struct *tty;
-
-        for (j = 0; j < STL_MAXPANELS; j++) {
-                panelp = brdp->panels[j];
-                if (panelp == NULL)
-                        continue;
-                for (k = 0; k < STL_PORTSPERPANEL; k++) {
-                        portp = panelp->ports[k];
-                        if (portp == NULL)
-                                continue;
-                        tty = tty_port_tty_get(&portp->port);
-                        if (tty != NULL) {
-                                stl_hangup(tty);
-                                tty_kref_put(tty);
-                        }
-                        kfree(portp->tx.buf);
-                        kfree(portp);
-                }
-                kfree(panelp);
-        }
-}
-
-/*****************************************************************************/
-
-/*
- *      Try to find and initialize an EasyIO board.
- */
-
-static int __devinit stl_initeio(struct stlbrd *brdp)
-{
-        struct stlpanel *panelp;
-        unsigned int    status;
-        char            *name;
-        int             retval;
-
-        pr_debug("stl_initeio(brdp=%p)\n", brdp);
-
-        brdp->ioctrl = brdp->ioaddr1 + 1;
-        brdp->iostatus = brdp->ioaddr1 + 2;
-
-        status = inb(brdp->iostatus);
-        if ((status & EIO_IDBITMASK) == EIO_MK3)
-                brdp->ioctrl++;
-
-/*
- *      Handle board specific stuff now. The real difference is PCI
- *      or not PCI.
- */
-        if (brdp->brdtype == BRD_EASYIOPCI) {
-                brdp->iosize1 = 0x80;
-                brdp->iosize2 = 0x80;
-                name = "serial(EIO-PCI)";
-                outb(0x41, (brdp->ioaddr2 + 0x4c));
-        } else {
-                brdp->iosize1 = 8;
-                name = "serial(EIO)";
-                if ((brdp->irq < 0) || (brdp->irq > 15) ||
-                    (stl_vecmap[brdp->irq] == (unsigned char) 0xff)) {
-                        printk("STALLION: invalid irq=%d for brd=%d\n",
-                                brdp->irq, brdp->brdnr);
-                        retval = -EINVAL;
-                        goto err;
-                }
-                outb((stl_vecmap[brdp->irq] | EIO_0WS |
-                        ((brdp->irqtype) ? EIO_INTLEVEL : EIO_INTEDGE)),
-                        brdp->ioctrl);
-        }
-
-        retval = -EBUSY;
-        if (!request_region(brdp->ioaddr1, brdp->iosize1, name)) {
-                printk(KERN_WARNING "STALLION: Warning, board %d I/O address "
-                        "%x conflicts with another device\n", brdp->brdnr, 
-                        brdp->ioaddr1);
-                goto err;
-        }
-        
-        if (brdp->iosize2 > 0)
-                if (!request_region(brdp->ioaddr2, brdp->iosize2, name)) {
-                        printk(KERN_WARNING "STALLION: Warning, board %d I/O "
-                                "address %x conflicts with another device\n",
-                                brdp->brdnr, brdp->ioaddr2);
-                        printk(KERN_WARNING "STALLION: Warning, also "
-                                "releasing board %d I/O address %x \n", 
-                                brdp->brdnr, brdp->ioaddr1);
-                        goto err_rel1;
-                }
-
-/*
- *      Everything looks OK, so let's go ahead and probe for the hardware.
- */
-        brdp->clk = CD1400_CLK;
-        brdp->isr = stl_eiointr;
-
-        retval = -ENODEV;
-        switch (status & EIO_IDBITMASK) {
-        case EIO_8PORTM:
-                brdp->clk = CD1400_CLK8M;
-                /* fall thru */
-        case EIO_8PORTRS:
-        case EIO_8PORTDI:
-                brdp->nrports = 8;
-                break;
-        case EIO_4PORTRS:
-                brdp->nrports = 4;
-                break;
-        case EIO_MK3:
-                switch (status & EIO_BRDMASK) {
-                case ID_BRD4:
-                        brdp->nrports = 4;
-                        break;
-                case ID_BRD8:
-                        brdp->nrports = 8;
-                        break;
-                case ID_BRD16:
-                        brdp->nrports = 16;
-                        break;
-                default:
-                        goto err_rel2;
-                }
-                break;
-        default:
-                goto err_rel2;
-        }
-
-/*
- *      We have verified that the board is actually present, so now we
- *      can complete the setup.
- */
-
-        panelp = kzalloc(sizeof(struct stlpanel), GFP_KERNEL);
-        if (!panelp) {
-                printk(KERN_WARNING "STALLION: failed to allocate memory "
-                        "(size=%Zd)\n", sizeof(struct stlpanel));
-                retval = -ENOMEM;
-                goto err_rel2;
-        }
-
-        panelp->magic = STL_PANELMAGIC;
-        panelp->brdnr = brdp->brdnr;
-        panelp->panelnr = 0;
-        panelp->nrports = brdp->nrports;
-        panelp->iobase = brdp->ioaddr1;
-        panelp->hwid = status;
-        if ((status & EIO_IDBITMASK) == EIO_MK3) {
-                panelp->uartp = &stl_sc26198uart;
-                panelp->isr = stl_sc26198intr;
-        } else {
-                panelp->uartp = &stl_cd1400uart;
-                panelp->isr = stl_cd1400eiointr;
-        }
-
-        brdp->panels[0] = panelp;
-        brdp->nrpanels = 1;
-        brdp->state |= BRD_FOUND;
-        brdp->hwid = status;
-        if (request_irq(brdp->irq, stl_intr, IRQF_SHARED, name, brdp) != 0) {
-                printk("STALLION: failed to register interrupt "
-                    "routine for %s irq=%d\n", name, brdp->irq);
-                retval = -ENODEV;
-                goto err_fr;
-        }
-
-        return 0;
-err_fr:
-        stl_cleanup_panels(brdp);
-err_rel2:
-        if (brdp->iosize2 > 0)
-                release_region(brdp->ioaddr2, brdp->iosize2);
-err_rel1:
-        release_region(brdp->ioaddr1, brdp->iosize1);
-err:
-        return retval;
-}
-
-/*****************************************************************************/
-
-/*
- *      Try to find an ECH board and initialize it. This code is capable of
- *      dealing with all types of ECH board.
- */
-
-static int __devinit stl_initech(struct stlbrd *brdp)
-{
-        struct stlpanel *panelp;
-        unsigned int    status, nxtid, ioaddr, conflict, panelnr, banknr, i;
-        int             retval;
-        char            *name;
-
-        pr_debug("stl_initech(brdp=%p)\n", brdp);
-
-        status = 0;
-        conflict = 0;
-
-/*
- *      Set up the initial board register contents for boards. This varies a
- *      bit between the different board types. So we need to handle each
- *      separately. Also do a check that the supplied IRQ is good.
- */
-        switch (brdp->brdtype) {
-
-        case BRD_ECH:
-                brdp->isr = stl_echatintr;
-                brdp->ioctrl = brdp->ioaddr1 + 1;
-                brdp->iostatus = brdp->ioaddr1 + 1;
-                status = inb(brdp->iostatus);
-                if ((status & ECH_IDBITMASK) != ECH_ID) {
-                        retval = -ENODEV;
-                        goto err;
-                }
-                if ((brdp->irq < 0) || (brdp->irq > 15) ||
-                    (stl_vecmap[brdp->irq] == (unsigned char) 0xff)) {
-                        printk("STALLION: invalid irq=%d for brd=%d\n",
-                                brdp->irq, brdp->brdnr);
-                        retval = -EINVAL;
-                        goto err;
-                }
-                status = ((brdp->ioaddr2 & ECH_ADDR2MASK) >> 1);
-                status |= (stl_vecmap[brdp->irq] << 1);
-                outb((status | ECH_BRDRESET), brdp->ioaddr1);
-                brdp->ioctrlval = ECH_INTENABLE |
-                        ((brdp->irqtype) ? ECH_INTLEVEL : ECH_INTEDGE);
-                for (i = 0; i < 10; i++)
-                        outb((brdp->ioctrlval | ECH_BRDENABLE), brdp->ioctrl);
-                brdp->iosize1 = 2;
-                brdp->iosize2 = 32;
-                name = "serial(EC8/32)";
-                outb(status, brdp->ioaddr1);
-                break;
-
-        case BRD_ECHMC:
-                brdp->isr = stl_echmcaintr;
-                brdp->ioctrl = brdp->ioaddr1 + 0x20;
-                brdp->iostatus = brdp->ioctrl;
-                status = inb(brdp->iostatus);
-                if ((status & ECH_IDBITMASK) != ECH_ID) {
-                        retval = -ENODEV;
-                        goto err;
-                }
-                if ((brdp->irq < 0) || (brdp->irq > 15) ||
-                    (stl_vecmap[brdp->irq] == (unsigned char) 0xff)) {
-                        printk("STALLION: invalid irq=%d for brd=%d\n",
-                                brdp->irq, brdp->brdnr);
-                        retval = -EINVAL;
-                        goto err;
-                }
-                outb(ECHMC_BRDRESET, brdp->ioctrl);
-                outb(ECHMC_INTENABLE, brdp->ioctrl);
-                brdp->iosize1 = 64;
-                name = "serial(EC8/32-MC)";
-                break;
-
-        case BRD_ECHPCI:
-                brdp->isr = stl_echpciintr;
-                brdp->ioctrl = brdp->ioaddr1 + 2;
-                brdp->iosize1 = 4;
-                brdp->iosize2 = 8;
-                name = "serial(EC8/32-PCI)";
-                break;
-
-        case BRD_ECH64PCI:
-                brdp->isr = stl_echpci64intr;
-                brdp->ioctrl = brdp->ioaddr2 + 0x40;
-                outb(0x43, (brdp->ioaddr1 + 0x4c));
-                brdp->iosize1 = 0x80;
-                brdp->iosize2 = 0x80;
-                name = "serial(EC8/64-PCI)";
-                break;
-
-        default:
-                printk("STALLION: unknown board type=%d\n", brdp->brdtype);
-                retval = -EINVAL;
-                goto err;
-        }
-
-/*
- *      Check boards for possible IO address conflicts and return fail status 
- *      if an IO conflict found.
- */
-        retval = -EBUSY;
-        if (!request_region(brdp->ioaddr1, brdp->iosize1, name)) {
-                printk(KERN_WARNING "STALLION: Warning, board %d I/O address "
-                        "%x conflicts with another device\n", brdp->brdnr, 
-                        brdp->ioaddr1);
-                goto err;
-        }
-        
-        if (brdp->iosize2 > 0)
-                if (!request_region(brdp->ioaddr2, brdp->iosize2, name)) {
-                        printk(KERN_WARNING "STALLION: Warning, board %d I/O "
-                                "address %x conflicts with another device\n",
-                                brdp->brdnr, brdp->ioaddr2);
-                        printk(KERN_WARNING "STALLION: Warning, also "
-                                "releasing board %d I/O address %x \n", 
-                                brdp->brdnr, brdp->ioaddr1);
-                        goto err_rel1;
-                }
-
-/*
- *      Scan through the secondary io address space looking for panels.
- *      As we find'em allocate and initialize panel structures for each.
- */
-        brdp->clk = CD1400_CLK;
-        brdp->hwid = status;
-
-        ioaddr = brdp->ioaddr2;
-        banknr = 0;
-        panelnr = 0;
-        nxtid = 0;
-
-        for (i = 0; i < STL_MAXPANELS; i++) {
-                if (brdp->brdtype == BRD_ECHPCI) {
-                        outb(nxtid, brdp->ioctrl);
-                        ioaddr = brdp->ioaddr2;
-                }
-                status = inb(ioaddr + ECH_PNLSTATUS);
-                if ((status & ECH_PNLIDMASK) != nxtid)
-                        break;
-                panelp = kzalloc(sizeof(struct stlpanel), GFP_KERNEL);
-                if (!panelp) {
-                        printk("STALLION: failed to allocate memory "
-                                "(size=%Zd)\n", sizeof(struct stlpanel));
-                        retval = -ENOMEM;
-                        goto err_fr;
-                }
-                panelp->magic = STL_PANELMAGIC;
-                panelp->brdnr = brdp->brdnr;
-                panelp->panelnr = panelnr;
-                panelp->iobase = ioaddr;
-                panelp->pagenr = nxtid;
-                panelp->hwid = status;
-                brdp->bnk2panel[banknr] = panelp;
-                brdp->bnkpageaddr[banknr] = nxtid;
-                brdp->bnkstataddr[banknr++] = ioaddr + ECH_PNLSTATUS;
-
-                if (status & ECH_PNLXPID) {
-                        panelp->uartp = &stl_sc26198uart;
-                        panelp->isr = stl_sc26198intr;
-                        if (status & ECH_PNL16PORT) {
-                                panelp->nrports = 16;
-                                brdp->bnk2panel[banknr] = panelp;
-                                brdp->bnkpageaddr[banknr] = nxtid;
-                                brdp->bnkstataddr[banknr++] = ioaddr + 4 +
-                                        ECH_PNLSTATUS;
-                        } else
-                                panelp->nrports = 8;
-                } else {
-                        panelp->uartp = &stl_cd1400uart;
-                        panelp->isr = stl_cd1400echintr;
-                        if (status & ECH_PNL16PORT) {
-                                panelp->nrports = 16;
-                                panelp->ackmask = 0x80;
-                                if (brdp->brdtype != BRD_ECHPCI)
-                                        ioaddr += EREG_BANKSIZE;
-                                brdp->bnk2panel[banknr] = panelp;
-                                brdp->bnkpageaddr[banknr] = ++nxtid;
-                                brdp->bnkstataddr[banknr++] = ioaddr +
-                                        ECH_PNLSTATUS;
-                        } else {
-                                panelp->nrports = 8;
-                                panelp->ackmask = 0xc0;
-                        }
-                }
-
-                nxtid++;
-                ioaddr += EREG_BANKSIZE;
-                brdp->nrports += panelp->nrports;
-                brdp->panels[panelnr++] = panelp;
-                if ((brdp->brdtype != BRD_ECHPCI) &&
-                    (ioaddr >= (brdp->ioaddr2 + brdp->iosize2))) {
-                        retval = -EINVAL;
-                        goto err_fr;
-                }
-        }
-
-        brdp->nrpanels = panelnr;
-        brdp->nrbnks = banknr;
-        if (brdp->brdtype == BRD_ECH)
-                outb((brdp->ioctrlval | ECH_BRDDISABLE), brdp->ioctrl);
-
-        brdp->state |= BRD_FOUND;
-        if (request_irq(brdp->irq, stl_intr, IRQF_SHARED, name, brdp) != 0) {
-                printk("STALLION: failed to register interrupt "
-                    "routine for %s irq=%d\n", name, brdp->irq);
-                retval = -ENODEV;
-                goto err_fr;
-        }
-
-        return 0;
-err_fr:
-        stl_cleanup_panels(brdp);
-        if (brdp->iosize2 > 0)
-                release_region(brdp->ioaddr2, brdp->iosize2);
-err_rel1:
-        release_region(brdp->ioaddr1, brdp->iosize1);
-err:
-        return retval;
-}
-
-/*****************************************************************************/
-
-/*
- *      Initialize and configure the specified board.
- *      Scan through all the boards in the configuration and see what we
- *      can find. Handle EIO and the ECH boards a little differently here
- *      since the initial search and setup is very different.
- */
-
-static int __devinit stl_brdinit(struct stlbrd *brdp)
-{
-        int i, retval;
-
-        pr_debug("stl_brdinit(brdp=%p)\n", brdp);
-
-        switch (brdp->brdtype) {
-        case BRD_EASYIO:
-        case BRD_EASYIOPCI:
-                retval = stl_initeio(brdp);
-                if (retval)
-                        goto err;
-                break;
-        case BRD_ECH:
-        case BRD_ECHMC:
-        case BRD_ECHPCI:
-        case BRD_ECH64PCI:
-                retval = stl_initech(brdp);
-                if (retval)
-                        goto err;
-                break;
-        default:
-                printk("STALLION: board=%d is unknown board type=%d\n",
-                        brdp->brdnr, brdp->brdtype);
-                retval = -ENODEV;
-                goto err;
-        }
-
-        if ((brdp->state & BRD_FOUND) == 0) {
-                printk("STALLION: %s board not found, board=%d io=%x irq=%d\n",
-                        stl_brdnames[brdp->brdtype], brdp->brdnr,
-                        brdp->ioaddr1, brdp->irq);
-                goto err_free;
-        }
-
-        for (i = 0; i < STL_MAXPANELS; i++)
-                if (brdp->panels[i] != NULL)
-                        stl_initports(brdp, brdp->panels[i]);
-
-        printk("STALLION: %s found, board=%d io=%x irq=%d "
-                "nrpanels=%d nrports=%d\n", stl_brdnames[brdp->brdtype],
-                brdp->brdnr, brdp->ioaddr1, brdp->irq, brdp->nrpanels,
-                brdp->nrports);
-
-        return 0;
-err_free:
-        free_irq(brdp->irq, brdp);
-
-        stl_cleanup_panels(brdp);
-
-        release_region(brdp->ioaddr1, brdp->iosize1);
-        if (brdp->iosize2 > 0)
-                release_region(brdp->ioaddr2, brdp->iosize2);
-err:
-        return retval;
-}
-
-/*****************************************************************************/
-
-/*
- *      Find the next available board number that is free.
- */
-
-static int __devinit stl_getbrdnr(void)
-{
-        unsigned int i;
-
-        for (i = 0; i < STL_MAXBRDS; i++)
-                if (stl_brds[i] == NULL) {
-                        if (i >= stl_nrbrds)
-                                stl_nrbrds = i + 1;
-                        return i;
-                }
-
-        return -1;
-}
-
-/*****************************************************************************/
-/*
- *      We have a Stallion board. Allocate a board structure and
- *      initialize it. Read its IO and IRQ resources from PCI
- *      configuration space.
- */
-
-static int __devinit stl_pciprobe(struct pci_dev *pdev,
-                const struct pci_device_id *ent)
-{
-        struct stlbrd *brdp;
-        unsigned int i, brdtype = ent->driver_data;
-        int brdnr, retval = -ENODEV;
-
-        if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE)
-                goto err;
-
-        retval = pci_enable_device(pdev);
-        if (retval)
-                goto err;
-        brdp = stl_allocbrd();
-        if (brdp == NULL) {
-                retval = -ENOMEM;
-                goto err;
-        }
-        mutex_lock(&stl_brdslock);
-        brdnr = stl_getbrdnr();
-        if (brdnr < 0) {
-                dev_err(&pdev->dev, "too many boards found, "
-                        "maximum supported %d\n", STL_MAXBRDS);
-                mutex_unlock(&stl_brdslock);
-                retval = -ENODEV;
-                goto err_fr;
-        }
-        brdp->brdnr = (unsigned int)brdnr;
-        stl_brds[brdp->brdnr] = brdp;
-        mutex_unlock(&stl_brdslock);
-
-        brdp->brdtype = brdtype;
-        brdp->state |= STL_PROBED;
-
-/*
- *      We have all resources from the board, so let's setup the actual
- *      board structure now.
- */
-        switch (brdtype) {
-        case BRD_ECHPCI:
-                brdp->ioaddr2 = pci_resource_start(pdev, 0);
-                brdp->ioaddr1 = pci_resource_start(pdev, 1);
-                break;
-        case BRD_ECH64PCI:
-                brdp->ioaddr2 = pci_resource_start(pdev, 2);
-                brdp->ioaddr1 = pci_resource_start(pdev, 1);
-                break;
-        case BRD_EASYIOPCI:
-                brdp->ioaddr1 = pci_resource_start(pdev, 2);
-                brdp->ioaddr2 = pci_resource_start(pdev, 1);
-                break;
-        default:
-                dev_err(&pdev->dev, "unknown PCI board type=%u\n", brdtype);
-                break;
-        }
-
-        brdp->irq = pdev->irq;
-        retval = stl_brdinit(brdp);
-        if (retval)
-                goto err_null;
-
-        pci_set_drvdata(pdev, brdp);
-
-        for (i = 0; i < brdp->nrports; i++)
-                tty_register_device(stl_serial,
-                                brdp->brdnr * STL_MAXPORTS + i, &pdev->dev);
-
-        return 0;
-err_null:
-        stl_brds[brdp->brdnr] = NULL;
-err_fr:
-        kfree(brdp);
-err:
-        return retval;
-}
-
-static void __devexit stl_pciremove(struct pci_dev *pdev)
-{
-        struct stlbrd *brdp = pci_get_drvdata(pdev);
-        unsigned int i;
-
-        free_irq(brdp->irq, brdp);
-
-        stl_cleanup_panels(brdp);
-
-        release_region(brdp->ioaddr1, brdp->iosize1);
-        if (brdp->iosize2 > 0)
-                release_region(brdp->ioaddr2, brdp->iosize2);
-
-        for (i = 0; i < brdp->nrports; i++)
-                tty_unregister_device(stl_serial,
-                                brdp->brdnr * STL_MAXPORTS + i);
-
-        stl_brds[brdp->brdnr] = NULL;
-        kfree(brdp);
-}
-
-static struct pci_driver stl_pcidriver = {
-        .name = "stallion",
-        .id_table = stl_pcibrds,
-        .probe = stl_pciprobe,
-        .remove = __devexit_p(stl_pciremove)
-};
-
-/*****************************************************************************/
-
-/*
- *      Return the board stats structure to user app.
- */
-
-static int stl_getbrdstats(combrd_t __user *bp)
-{
-        combrd_t        stl_brdstats;
-        struct stlbrd   *brdp;
-        struct stlpanel *panelp;
-        unsigned int i;
-
-        if (copy_from_user(&stl_brdstats, bp, sizeof(combrd_t)))
-                return -EFAULT;
-        if (stl_brdstats.brd >= STL_MAXBRDS)
-                return -ENODEV;
-        brdp = stl_brds[stl_brdstats.brd];
-        if (brdp == NULL)
-                return -ENODEV;
-
-        memset(&stl_brdstats, 0, sizeof(combrd_t));
-        stl_brdstats.brd = brdp->brdnr;
-        stl_brdstats.type = brdp->brdtype;
-        stl_brdstats.hwid = brdp->hwid;
-        stl_brdstats.state = brdp->state;
-        stl_brdstats.ioaddr = brdp->ioaddr1;
-        stl_brdstats.ioaddr2 = brdp->ioaddr2;
-        stl_brdstats.irq = brdp->irq;
-        stl_brdstats.nrpanels = brdp->nrpanels;
-        stl_brdstats.nrports = brdp->nrports;
-        for (i = 0; i < brdp->nrpanels; i++) {
-                panelp = brdp->panels[i];
-                stl_brdstats.panels[i].panel = i;
-                stl_brdstats.panels[i].hwid = panelp->hwid;
-                stl_brdstats.panels[i].nrports = panelp->nrports;
-        }
-
-        return copy_to_user(bp, &stl_brdstats, sizeof(combrd_t)) ? -EFAULT : 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Resolve the referenced port number into a port struct pointer.
- */
-
-static struct stlport *stl_getport(int brdnr, int panelnr, int portnr)
-{
-        struct stlbrd   *brdp;
-        struct stlpanel *panelp;
-
-        if (brdnr < 0 || brdnr >= STL_MAXBRDS)
-                return NULL;
-        brdp = stl_brds[brdnr];
-        if (brdp == NULL)
-                return NULL;
-        if (panelnr < 0 || (unsigned int)panelnr >= brdp->nrpanels)
-                return NULL;
-        panelp = brdp->panels[panelnr];
-        if (panelp == NULL)
-                return NULL;
-        if (portnr < 0 || (unsigned int)portnr >= panelp->nrports)
-                return NULL;
-        return panelp->ports[portnr];
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the port stats structure to user app. A NULL port struct
- *      pointer passed in means that we need to find out from the app
- *      what port to get stats for (used through board control device).
- */
-
-static int stl_getportstats(struct tty_struct *tty, struct stlport *portp, comstats_t __user *cp)
-{
-        comstats_t      stl_comstats;
-        unsigned char   *head, *tail;
-        unsigned long   flags;
-
-        if (!portp) {
-                if (copy_from_user(&stl_comstats, cp, sizeof(comstats_t)))
-                        return -EFAULT;
-                portp = stl_getport(stl_comstats.brd, stl_comstats.panel,
-                        stl_comstats.port);
-                if (portp == NULL)
-                        return -ENODEV;
-        }
-
-        mutex_lock(&portp->port.mutex);
-        portp->stats.state = portp->istate;
-        portp->stats.flags = portp->port.flags;
-        portp->stats.hwid = portp->hwid;
-
-        portp->stats.ttystate = 0;
-        portp->stats.cflags = 0;
-        portp->stats.iflags = 0;
-        portp->stats.oflags = 0;
-        portp->stats.lflags = 0;
-        portp->stats.rxbuffered = 0;
-
-        spin_lock_irqsave(&stallion_lock, flags);
-        if (tty != NULL && portp->port.tty == tty) {
-                portp->stats.ttystate = tty->flags;
-                /* No longer available as a statistic */
-                portp->stats.rxbuffered = 1; /*tty->flip.count; */
-                if (tty->termios != NULL) {
-                        portp->stats.cflags = tty->termios->c_cflag;
-                        portp->stats.iflags = tty->termios->c_iflag;
-                        portp->stats.oflags = tty->termios->c_oflag;
-                        portp->stats.lflags = tty->termios->c_lflag;
-                }
-        }
-        spin_unlock_irqrestore(&stallion_lock, flags);
-
-        head = portp->tx.head;
-        tail = portp->tx.tail;
-        portp->stats.txbuffered = (head >= tail) ? (head - tail) :
-                (STL_TXBUFSIZE - (tail - head));
-
-        portp->stats.signals = (unsigned long) stl_getsignals(portp);
-        mutex_unlock(&portp->port.mutex);
-
-        return copy_to_user(cp, &portp->stats,
-                            sizeof(comstats_t)) ? -EFAULT : 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Clear the port stats structure. We also return it zeroed out...
- */
-
-static int stl_clrportstats(struct stlport *portp, comstats_t __user *cp)
-{
-        comstats_t      stl_comstats;
-
-        if (!portp) {
-                if (copy_from_user(&stl_comstats, cp, sizeof(comstats_t)))
-                        return -EFAULT;
-                portp = stl_getport(stl_comstats.brd, stl_comstats.panel,
-                        stl_comstats.port);
-                if (portp == NULL)
-                        return -ENODEV;
-        }
-
-        mutex_lock(&portp->port.mutex);
-        memset(&portp->stats, 0, sizeof(comstats_t));
-        portp->stats.brd = portp->brdnr;
-        portp->stats.panel = portp->panelnr;
-        portp->stats.port = portp->portnr;
-        mutex_unlock(&portp->port.mutex);
-        return copy_to_user(cp, &portp->stats,
-                            sizeof(comstats_t)) ? -EFAULT : 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the entire driver ports structure to a user app.
- */
-
-static int stl_getportstruct(struct stlport __user *arg)
-{
-        struct stlport  stl_dummyport;
-        struct stlport  *portp;
-
-        if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
-                return -EFAULT;
-        portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
-                 stl_dummyport.portnr);
-        if (!portp)
-                return -ENODEV;
-        return copy_to_user(arg, portp, sizeof(struct stlport)) ? -EFAULT : 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the entire driver board structure to a user app.
- */
-
-static int stl_getbrdstruct(struct stlbrd __user *arg)
-{
-        struct stlbrd   stl_dummybrd;
-        struct stlbrd   *brdp;
-
-        if (copy_from_user(&stl_dummybrd, arg, sizeof(struct stlbrd)))
-                return -EFAULT;
-        if (stl_dummybrd.brdnr >= STL_MAXBRDS)
-                return -ENODEV;
-        brdp = stl_brds[stl_dummybrd.brdnr];
-        if (!brdp)
-                return -ENODEV;
-        return copy_to_user(arg, brdp, sizeof(struct stlbrd)) ? -EFAULT : 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      The "staliomem" device is also required to do some special operations
- *      on the board and/or ports. In this driver it is mostly used for stats
- *      collection.
- */
-
-static long stl_memioctl(struct file *fp, unsigned int cmd, unsigned long arg)
-{
-        int     brdnr, rc;
-        void __user *argp = (void __user *)arg;
-
-        pr_debug("stl_memioctl(fp=%p,cmd=%x,arg=%lx)\n", fp, cmd,arg);
-
-        brdnr = iminor(fp->f_dentry->d_inode);
-        if (brdnr >= STL_MAXBRDS)
-                return -ENODEV;
-        rc = 0;
-
-        switch (cmd) {
-        case COM_GETPORTSTATS:
-                rc = stl_getportstats(NULL, NULL, argp);
-                break;
-        case COM_CLRPORTSTATS:
-                rc = stl_clrportstats(NULL, argp);
-                break;
-        case COM_GETBRDSTATS:
-                rc = stl_getbrdstats(argp);
-                break;
-        case COM_READPORT:
-                rc = stl_getportstruct(argp);
-                break;
-        case COM_READBOARD:
-                rc = stl_getbrdstruct(argp);
-                break;
-        default:
-                rc = -ENOIOCTLCMD;
-                break;
-        }
-        return rc;
-}
-
-static const struct tty_operations stl_ops = {
-        .open = stl_open,
-        .close = stl_close,
-        .write = stl_write,
-        .put_char = stl_putchar,
-        .flush_chars = stl_flushchars,
-        .write_room = stl_writeroom,
-        .chars_in_buffer = stl_charsinbuffer,
-        .ioctl = stl_ioctl,
-        .set_termios = stl_settermios,
-        .throttle = stl_throttle,
-        .unthrottle = stl_unthrottle,
-        .stop = stl_stop,
-        .start = stl_start,
-        .hangup = stl_hangup,
-        .flush_buffer = stl_flushbuffer,
-        .break_ctl = stl_breakctl,
-        .wait_until_sent = stl_waituntilsent,
-        .send_xchar = stl_sendxchar,
-        .tiocmget = stl_tiocmget,
-        .tiocmset = stl_tiocmset,
-        .proc_fops = &stl_proc_fops,
-};
-
-static const struct tty_port_operations stl_port_ops = {
-        .carrier_raised = stl_carrier_raised,
-        .dtr_rts = stl_dtr_rts,
-        .activate = stl_activate,
-        .shutdown = stl_shutdown,
-};
-
-/*****************************************************************************/
-/*                       CD1400 HARDWARE FUNCTIONS                           */
-/*****************************************************************************/
-
-/*
- *      These functions get/set/update the registers of the cd1400 UARTs.
- *      Access to the cd1400 registers is via an address/data io port pair.
- *      (Maybe should make this inline...)
- */
-
-static int stl_cd1400getreg(struct stlport *portp, int regnr)
-{
-        outb((regnr + portp->uartaddr), portp->ioaddr);
-        return inb(portp->ioaddr + EREG_DATA);
-}
-
-static void stl_cd1400setreg(struct stlport *portp, int regnr, int value)
-{
-        outb(regnr + portp->uartaddr, portp->ioaddr);
-        outb(value, portp->ioaddr + EREG_DATA);
-}
-
-static int stl_cd1400updatereg(struct stlport *portp, int regnr, int value)
-{
-        outb(regnr + portp->uartaddr, portp->ioaddr);
-        if (inb(portp->ioaddr + EREG_DATA) != value) {
-                outb(value, portp->ioaddr + EREG_DATA);
-                return 1;
-        }
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Inbitialize the UARTs in a panel. We don't care what sort of board
- *      these ports are on - since the port io registers are almost
- *      identical when dealing with ports.
- */
-
-static int stl_cd1400panelinit(struct stlbrd *brdp, struct stlpanel *panelp)
-{
-        unsigned int    gfrcr;
-        int             chipmask, i, j;
-        int             nrchips, uartaddr, ioaddr;
-        unsigned long   flags;
-
-        pr_debug("stl_panelinit(brdp=%p,panelp=%p)\n", brdp, panelp);
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(panelp->brdnr, panelp->pagenr);
-
-/*
- *      Check that each chip is present and started up OK.
- */
-        chipmask = 0;
-        nrchips = panelp->nrports / CD1400_PORTS;
-        for (i = 0; i < nrchips; i++) {
-                if (brdp->brdtype == BRD_ECHPCI) {
-                        outb((panelp->pagenr + (i >> 1)), brdp->ioctrl);
-                        ioaddr = panelp->iobase;
-                } else
-                        ioaddr = panelp->iobase + (EREG_BANKSIZE * (i >> 1));
-                uartaddr = (i & 0x01) ? 0x080 : 0;
-                outb((GFRCR + uartaddr), ioaddr);
-                outb(0, (ioaddr + EREG_DATA));
-                outb((CCR + uartaddr), ioaddr);
-                outb(CCR_RESETFULL, (ioaddr + EREG_DATA));
-                outb(CCR_RESETFULL, (ioaddr + EREG_DATA));
-                outb((GFRCR + uartaddr), ioaddr);
-                for (j = 0; j < CCR_MAXWAIT; j++)
-                        if ((gfrcr = inb(ioaddr + EREG_DATA)) != 0)
-                                break;
-
-                if ((j >= CCR_MAXWAIT) || (gfrcr < 0x40) || (gfrcr > 0x60)) {
-                        printk("STALLION: cd1400 not responding, "
-                                "brd=%d panel=%d chip=%d\n",
-                                panelp->brdnr, panelp->panelnr, i);
-                        continue;
-                }
-                chipmask |= (0x1 << i);
-                outb((PPR + uartaddr), ioaddr);
-                outb(PPR_SCALAR, (ioaddr + EREG_DATA));
-        }
-
-        BRDDISABLE(panelp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-        return chipmask;
-}
-
-/*****************************************************************************/
-
-/*
- *      Initialize hardware specific port registers.
- */
-
-static void stl_cd1400portinit(struct stlbrd *brdp, struct stlpanel *panelp, struct stlport *portp)
-{
-        unsigned long flags;
-        pr_debug("stl_cd1400portinit(brdp=%p,panelp=%p,portp=%p)\n", brdp,
-                        panelp, portp);
-
-        if ((brdp == NULL) || (panelp == NULL) ||
-            (portp == NULL))
-                return;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        portp->ioaddr = panelp->iobase + (((brdp->brdtype == BRD_ECHPCI) ||
-                (portp->portnr < 8)) ? 0 : EREG_BANKSIZE);
-        portp->uartaddr = (portp->portnr & 0x04) << 5;
-        portp->pagenr = panelp->pagenr + (portp->portnr >> 3);
-
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03));
-        stl_cd1400setreg(portp, LIVR, (portp->portnr << 3));
-        portp->hwid = stl_cd1400getreg(portp, GFRCR);
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Wait for the command register to be ready. We will poll this,
- *      since it won't usually take too long to be ready.
- */
-
-static void stl_cd1400ccrwait(struct stlport *portp)
-{
-        int     i;
-
-        for (i = 0; i < CCR_MAXWAIT; i++)
-                if (stl_cd1400getreg(portp, CCR) == 0)
-                        return;
-
-        printk("STALLION: cd1400 not responding, port=%d panel=%d brd=%d\n",
-                portp->portnr, portp->panelnr, portp->brdnr);
-}
-
-/*****************************************************************************/
-
-/*
- *      Set up the cd1400 registers for a port based on the termios port
- *      settings.
- */
-
-static void stl_cd1400setport(struct stlport *portp, struct ktermios *tiosp)
-{
-        struct stlbrd   *brdp;
-        unsigned long   flags;
-        unsigned int    clkdiv, baudrate;
-        unsigned char   cor1, cor2, cor3;
-        unsigned char   cor4, cor5, ccr;
-        unsigned char   srer, sreron, sreroff;
-        unsigned char   mcor1, mcor2, rtpr;
-        unsigned char   clk, div;
-
-        cor1 = 0;
-        cor2 = 0;
-        cor3 = 0;
-        cor4 = 0;
-        cor5 = 0;
-        ccr = 0;
-        rtpr = 0;
-        clk = 0;
-        div = 0;
-        mcor1 = 0;
-        mcor2 = 0;
-        sreron = 0;
-        sreroff = 0;
-
-        brdp = stl_brds[portp->brdnr];
-        if (brdp == NULL)
-                return;
-
-/*
- *      Set up the RX char ignore mask with those RX error types we
- *      can ignore. We can get the cd1400 to help us out a little here,
- *      it will ignore parity errors and breaks for us.
- */
-        portp->rxignoremsk = 0;
-        if (tiosp->c_iflag & IGNPAR) {
-                portp->rxignoremsk |= (ST_PARITY | ST_FRAMING | ST_OVERRUN);
-                cor1 |= COR1_PARIGNORE;
-        }
-        if (tiosp->c_iflag & IGNBRK) {
-                portp->rxignoremsk |= ST_BREAK;
-                cor4 |= COR4_IGNBRK;
-        }
-
-        portp->rxmarkmsk = ST_OVERRUN;
-        if (tiosp->c_iflag & (INPCK | PARMRK))
-                portp->rxmarkmsk |= (ST_PARITY | ST_FRAMING);
-        if (tiosp->c_iflag & BRKINT)
-                portp->rxmarkmsk |= ST_BREAK;
-
-/*
- *      Go through the char size, parity and stop bits and set all the
- *      option register appropriately.
- */
-        switch (tiosp->c_cflag & CSIZE) {
-        case CS5:
-                cor1 |= COR1_CHL5;
-                break;
-        case CS6:
-                cor1 |= COR1_CHL6;
-                break;
-        case CS7:
-                cor1 |= COR1_CHL7;
-                break;
-        default:
-                cor1 |= COR1_CHL8;
-                break;
-        }
-
-        if (tiosp->c_cflag & CSTOPB)
-                cor1 |= COR1_STOP2;
-        else
-                cor1 |= COR1_STOP1;
-
-        if (tiosp->c_cflag & PARENB) {
-                if (tiosp->c_cflag & PARODD)
-                        cor1 |= (COR1_PARENB | COR1_PARODD);
-                else
-                        cor1 |= (COR1_PARENB | COR1_PAREVEN);
-        } else {
-                cor1 |= COR1_PARNONE;
-        }
-
-/*
- *      Set the RX FIFO threshold at 6 chars. This gives a bit of breathing
- *      space for hardware flow control and the like. This should be set to
- *      VMIN. Also here we will set the RX data timeout to 10ms - this should
- *      really be based on VTIME.
- */
-        cor3 |= FIFO_RXTHRESHOLD;
-        rtpr = 2;
-
-/*
- *      Calculate the baud rate timers. For now we will just assume that
- *      the input and output baud are the same. Could have used a baud
- *      table here, but this way we can generate virtually any baud rate
- *      we like!
- */
-        baudrate = tiosp->c_cflag & CBAUD;
-        if (baudrate & CBAUDEX) {
-                baudrate &= ~CBAUDEX;
-                if ((baudrate < 1) || (baudrate > 4))
-                        tiosp->c_cflag &= ~CBAUDEX;
-                else
-                        baudrate += 15;
-        }
-        baudrate = stl_baudrates[baudrate];
-        if ((tiosp->c_cflag & CBAUD) == B38400) {
-                if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        baudrate = 57600;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        baudrate = 115200;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                        baudrate = 230400;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                        baudrate = 460800;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
-                        baudrate = (portp->baud_base / portp->custom_divisor);
-        }
-        if (baudrate > STL_CD1400MAXBAUD)
-                baudrate = STL_CD1400MAXBAUD;
-
-        if (baudrate > 0) {
-                for (clk = 0; clk < CD1400_NUMCLKS; clk++) {
-                        clkdiv = (portp->clk / stl_cd1400clkdivs[clk]) / baudrate;
-                        if (clkdiv < 0x100)
-                                break;
-                }
-                div = (unsigned char) clkdiv;
-        }
-
-/*
- *      Check what form of modem signaling is required and set it up.
- */
-        if ((tiosp->c_cflag & CLOCAL) == 0) {
-                mcor1 |= MCOR1_DCD;
-                mcor2 |= MCOR2_DCD;
-                sreron |= SRER_MODEM;
-                portp->port.flags |= ASYNC_CHECK_CD;
-        } else
-                portp->port.flags &= ~ASYNC_CHECK_CD;
-
-/*
- *      Setup cd1400 enhanced modes if we can. In particular we want to
- *      handle as much of the flow control as possible automatically. As
- *      well as saving a few CPU cycles it will also greatly improve flow
- *      control reliability.
- */
-        if (tiosp->c_iflag & IXON) {
-                cor2 |= COR2_TXIBE;
-                cor3 |= COR3_SCD12;
-                if (tiosp->c_iflag & IXANY)
-                        cor2 |= COR2_IXM;
-        }
-
-        if (tiosp->c_cflag & CRTSCTS) {
-                cor2 |= COR2_CTSAE;
-                mcor1 |= FIFO_RTSTHRESHOLD;
-        }
-
-/*
- *      All cd1400 register values calculated so go through and set
- *      them all up.
- */
-
-        pr_debug("SETPORT: portnr=%d panelnr=%d brdnr=%d\n",
-                portp->portnr, portp->panelnr, portp->brdnr);
-        pr_debug("    cor1=%x cor2=%x cor3=%x cor4=%x cor5=%x\n",
-                cor1, cor2, cor3, cor4, cor5);
-        pr_debug("    mcor1=%x mcor2=%x rtpr=%x sreron=%x sreroff=%x\n",
-                mcor1, mcor2, rtpr, sreron, sreroff);
-        pr_debug("    tcor=%x tbpr=%x rcor=%x rbpr=%x\n", clk, div, clk, div);
-        pr_debug("    schr1=%x schr2=%x schr3=%x schr4=%x\n",
-                tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP],
-                tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP]);
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_cd1400setreg(portp, CAR, (portp->portnr & 0x3));
-        srer = stl_cd1400getreg(portp, SRER);
-        stl_cd1400setreg(portp, SRER, 0);
-        if (stl_cd1400updatereg(portp, COR1, cor1))
-                ccr = 1;
-        if (stl_cd1400updatereg(portp, COR2, cor2))
-                ccr = 1;
-        if (stl_cd1400updatereg(portp, COR3, cor3))
-                ccr = 1;
-        if (ccr) {
-                stl_cd1400ccrwait(portp);
-                stl_cd1400setreg(portp, CCR, CCR_CORCHANGE);
-        }
-        stl_cd1400setreg(portp, COR4, cor4);
-        stl_cd1400setreg(portp, COR5, cor5);
-        stl_cd1400setreg(portp, MCOR1, mcor1);
-        stl_cd1400setreg(portp, MCOR2, mcor2);
-        if (baudrate > 0) {
-                stl_cd1400setreg(portp, TCOR, clk);
-                stl_cd1400setreg(portp, TBPR, div);
-                stl_cd1400setreg(portp, RCOR, clk);
-                stl_cd1400setreg(portp, RBPR, div);
-        }
-        stl_cd1400setreg(portp, SCHR1, tiosp->c_cc[VSTART]);
-        stl_cd1400setreg(portp, SCHR2, tiosp->c_cc[VSTOP]);
-        stl_cd1400setreg(portp, SCHR3, tiosp->c_cc[VSTART]);
-        stl_cd1400setreg(portp, SCHR4, tiosp->c_cc[VSTOP]);
-        stl_cd1400setreg(portp, RTPR, rtpr);
-        mcor1 = stl_cd1400getreg(portp, MSVR1);
-        if (mcor1 & MSVR1_DCD)
-                portp->sigs |= TIOCM_CD;
-        else
-                portp->sigs &= ~TIOCM_CD;
-        stl_cd1400setreg(portp, SRER, ((srer & ~sreroff) | sreron));
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Set the state of the DTR and RTS signals.
- */
-
-static void stl_cd1400setsignals(struct stlport *portp, int dtr, int rts)
-{
-        unsigned char   msvr1, msvr2;
-        unsigned long   flags;
-
-        pr_debug("stl_cd1400setsignals(portp=%p,dtr=%d,rts=%d)\n",
-                        portp, dtr, rts);
-
-        msvr1 = 0;
-        msvr2 = 0;
-        if (dtr > 0)
-                msvr1 = MSVR1_DTR;
-        if (rts > 0)
-                msvr2 = MSVR2_RTS;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03));
-        if (rts >= 0)
-                stl_cd1400setreg(portp, MSVR2, msvr2);
-        if (dtr >= 0)
-                stl_cd1400setreg(portp, MSVR1, msvr1);
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the state of the signals.
- */
-
-static int stl_cd1400getsignals(struct stlport *portp)
-{
-        unsigned char   msvr1, msvr2;
-        unsigned long   flags;
-        int             sigs;
-
-        pr_debug("stl_cd1400getsignals(portp=%p)\n", portp);
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03));
-        msvr1 = stl_cd1400getreg(portp, MSVR1);
-        msvr2 = stl_cd1400getreg(portp, MSVR2);
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-
-        sigs = 0;
-        sigs |= (msvr1 & MSVR1_DCD) ? TIOCM_CD : 0;
-        sigs |= (msvr1 & MSVR1_CTS) ? TIOCM_CTS : 0;
-        sigs |= (msvr1 & MSVR1_DTR) ? TIOCM_DTR : 0;
-        sigs |= (msvr2 & MSVR2_RTS) ? TIOCM_RTS : 0;
-#if 0
-        sigs |= (msvr1 & MSVR1_RI) ? TIOCM_RI : 0;
-        sigs |= (msvr1 & MSVR1_DSR) ? TIOCM_DSR : 0;
-#else
-        sigs |= TIOCM_DSR;
-#endif
-        return sigs;
-}
-
-/*****************************************************************************/
-
-/*
- *      Enable/Disable the Transmitter and/or Receiver.
- */
-
-static void stl_cd1400enablerxtx(struct stlport *portp, int rx, int tx)
-{
-        unsigned char   ccr;
-        unsigned long   flags;
-
-        pr_debug("stl_cd1400enablerxtx(portp=%p,rx=%d,tx=%d)\n", portp, rx, tx);
-
-        ccr = 0;
-
-        if (tx == 0)
-                ccr |= CCR_TXDISABLE;
-        else if (tx > 0)
-                ccr |= CCR_TXENABLE;
-        if (rx == 0)
-                ccr |= CCR_RXDISABLE;
-        else if (rx > 0)
-                ccr |= CCR_RXENABLE;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03));
-        stl_cd1400ccrwait(portp);
-        stl_cd1400setreg(portp, CCR, ccr);
-        stl_cd1400ccrwait(portp);
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Start/stop the Transmitter and/or Receiver.
- */
-
-static void stl_cd1400startrxtx(struct stlport *portp, int rx, int tx)
-{
-        unsigned char   sreron, sreroff;
-        unsigned long   flags;
-
-        pr_debug("stl_cd1400startrxtx(portp=%p,rx=%d,tx=%d)\n", portp, rx, tx);
-
-        sreron = 0;
-        sreroff = 0;
-        if (tx == 0)
-                sreroff |= (SRER_TXDATA | SRER_TXEMPTY);
-        else if (tx == 1)
-                sreron |= SRER_TXDATA;
-        else if (tx >= 2)
-                sreron |= SRER_TXEMPTY;
-        if (rx == 0)
-                sreroff |= SRER_RXDATA;
-        else if (rx > 0)
-                sreron |= SRER_RXDATA;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03));
-        stl_cd1400setreg(portp, SRER,
-                ((stl_cd1400getreg(portp, SRER) & ~sreroff) | sreron));
-        BRDDISABLE(portp->brdnr);
-        if (tx > 0)
-                set_bit(ASYI_TXBUSY, &portp->istate);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Disable all interrupts from this port.
- */
-
-static void stl_cd1400disableintrs(struct stlport *portp)
-{
-        unsigned long   flags;
-
-        pr_debug("stl_cd1400disableintrs(portp=%p)\n", portp);
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03));
-        stl_cd1400setreg(portp, SRER, 0);
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-static void stl_cd1400sendbreak(struct stlport *portp, int len)
-{
-        unsigned long   flags;
-
-        pr_debug("stl_cd1400sendbreak(portp=%p,len=%d)\n", portp, len);
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03));
-        stl_cd1400setreg(portp, SRER,
-                ((stl_cd1400getreg(portp, SRER) & ~SRER_TXDATA) |
-                SRER_TXEMPTY));
-        BRDDISABLE(portp->brdnr);
-        portp->brklen = len;
-        if (len == 1)
-                portp->stats.txbreaks++;
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Take flow control actions...
- */
-
-static void stl_cd1400flowctrl(struct stlport *portp, int state)
-{
-        struct tty_struct       *tty;
-        unsigned long           flags;
-
-        pr_debug("stl_cd1400flowctrl(portp=%p,state=%x)\n", portp, state);
-
-        if (portp == NULL)
-                return;
-        tty = tty_port_tty_get(&portp->port);
-        if (tty == NULL)
-                return;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03));
-
-        if (state) {
-                if (tty->termios->c_iflag & IXOFF) {
-                        stl_cd1400ccrwait(portp);
-                        stl_cd1400setreg(portp, CCR, CCR_SENDSCHR1);
-                        portp->stats.rxxon++;
-                        stl_cd1400ccrwait(portp);
-                }
-/*
- *              Question: should we return RTS to what it was before? It may
- *              have been set by an ioctl... Suppose not, since if you have
- *              hardware flow control set then it is pretty silly to go and
- *              set the RTS line by hand.
- */
-                if (tty->termios->c_cflag & CRTSCTS) {
-                        stl_cd1400setreg(portp, MCOR1,
-                                (stl_cd1400getreg(portp, MCOR1) |
-                                FIFO_RTSTHRESHOLD));
-                        stl_cd1400setreg(portp, MSVR2, MSVR2_RTS);
-                        portp->stats.rxrtson++;
-                }
-        } else {
-                if (tty->termios->c_iflag & IXOFF) {
-                        stl_cd1400ccrwait(portp);
-                        stl_cd1400setreg(portp, CCR, CCR_SENDSCHR2);
-                        portp->stats.rxxoff++;
-                        stl_cd1400ccrwait(portp);
-                }
-                if (tty->termios->c_cflag & CRTSCTS) {
-                        stl_cd1400setreg(portp, MCOR1,
-                                (stl_cd1400getreg(portp, MCOR1) & 0xf0));
-                        stl_cd1400setreg(portp, MSVR2, 0);
-                        portp->stats.rxrtsoff++;
-                }
-        }
-
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-        tty_kref_put(tty);
-}
-
-/*****************************************************************************/
-
-/*
- *      Send a flow control character...
- */
-
-static void stl_cd1400sendflow(struct stlport *portp, int state)
-{
-        struct tty_struct       *tty;
-        unsigned long           flags;
-
-        pr_debug("stl_cd1400sendflow(portp=%p,state=%x)\n", portp, state);
-
-        if (portp == NULL)
-                return;
-        tty = tty_port_tty_get(&portp->port);
-        if (tty == NULL)
-                return;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03));
-        if (state) {
-                stl_cd1400ccrwait(portp);
-                stl_cd1400setreg(portp, CCR, CCR_SENDSCHR1);
-                portp->stats.rxxon++;
-                stl_cd1400ccrwait(portp);
-        } else {
-                stl_cd1400ccrwait(portp);
-                stl_cd1400setreg(portp, CCR, CCR_SENDSCHR2);
-                portp->stats.rxxoff++;
-                stl_cd1400ccrwait(portp);
-        }
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-        tty_kref_put(tty);
-}
-
-/*****************************************************************************/
-
-static void stl_cd1400flush(struct stlport *portp)
-{
-        unsigned long   flags;
-
-        pr_debug("stl_cd1400flush(portp=%p)\n", portp);
-
-        if (portp == NULL)
-                return;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_cd1400setreg(portp, CAR, (portp->portnr & 0x03));
-        stl_cd1400ccrwait(portp);
-        stl_cd1400setreg(portp, CCR, CCR_TXFLUSHFIFO);
-        stl_cd1400ccrwait(portp);
-        portp->tx.tail = portp->tx.head;
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the current state of data flow on this port. This is only
- *      really interresting when determining if data has fully completed
- *      transmission or not... This is easy for the cd1400, it accurately
- *      maintains the busy port flag.
- */
-
-static int stl_cd1400datastate(struct stlport *portp)
-{
-        pr_debug("stl_cd1400datastate(portp=%p)\n", portp);
-
-        if (portp == NULL)
-                return 0;
-
-        return test_bit(ASYI_TXBUSY, &portp->istate) ? 1 : 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Interrupt service routine for cd1400 EasyIO boards.
- */
-
-static void stl_cd1400eiointr(struct stlpanel *panelp, unsigned int iobase)
-{
-        unsigned char   svrtype;
-
-        pr_debug("stl_cd1400eiointr(panelp=%p,iobase=%x)\n", panelp, iobase);
-
-        spin_lock(&brd_lock);
-        outb(SVRR, iobase);
-        svrtype = inb(iobase + EREG_DATA);
-        if (panelp->nrports > 4) {
-                outb((SVRR + 0x80), iobase);
-                svrtype |= inb(iobase + EREG_DATA);
-        }
-
-        if (svrtype & SVRR_RX)
-                stl_cd1400rxisr(panelp, iobase);
-        else if (svrtype & SVRR_TX)
-                stl_cd1400txisr(panelp, iobase);
-        else if (svrtype & SVRR_MDM)
-                stl_cd1400mdmisr(panelp, iobase);
-
-        spin_unlock(&brd_lock);
-}
-
-/*****************************************************************************/
-
-/*
- *      Interrupt service routine for cd1400 panels.
- */
-
-static void stl_cd1400echintr(struct stlpanel *panelp, unsigned int iobase)
-{
-        unsigned char   svrtype;
-
-        pr_debug("stl_cd1400echintr(panelp=%p,iobase=%x)\n", panelp, iobase);
-
-        outb(SVRR, iobase);
-        svrtype = inb(iobase + EREG_DATA);
-        outb((SVRR + 0x80), iobase);
-        svrtype |= inb(iobase + EREG_DATA);
-        if (svrtype & SVRR_RX)
-                stl_cd1400rxisr(panelp, iobase);
-        else if (svrtype & SVRR_TX)
-                stl_cd1400txisr(panelp, iobase);
-        else if (svrtype & SVRR_MDM)
-                stl_cd1400mdmisr(panelp, iobase);
-}
-
-
-/*****************************************************************************/
-
-/*
- *      Unfortunately we need to handle breaks in the TX data stream, since
- *      this is the only way to generate them on the cd1400.
- */
-
-static int stl_cd1400breakisr(struct stlport *portp, int ioaddr)
-{
-        if (portp->brklen == 1) {
-                outb((COR2 + portp->uartaddr), ioaddr);
-                outb((inb(ioaddr + EREG_DATA) | COR2_ETC),
-                        (ioaddr + EREG_DATA));
-                outb((TDR + portp->uartaddr), ioaddr);
-                outb(ETC_CMD, (ioaddr + EREG_DATA));
-                outb(ETC_STARTBREAK, (ioaddr + EREG_DATA));
-                outb((SRER + portp->uartaddr), ioaddr);
-                outb((inb(ioaddr + EREG_DATA) & ~(SRER_TXDATA | SRER_TXEMPTY)),
-                        (ioaddr + EREG_DATA));
-                return 1;
-        } else if (portp->brklen > 1) {
-                outb((TDR + portp->uartaddr), ioaddr);
-                outb(ETC_CMD, (ioaddr + EREG_DATA));
-                outb(ETC_STOPBREAK, (ioaddr + EREG_DATA));
-                portp->brklen = -1;
-                return 1;
-        } else {
-                outb((COR2 + portp->uartaddr), ioaddr);
-                outb((inb(ioaddr + EREG_DATA) & ~COR2_ETC),
-                        (ioaddr + EREG_DATA));
-                portp->brklen = 0;
-        }
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Transmit interrupt handler. This has gotta be fast!  Handling TX
- *      chars is pretty simple, stuff as many as possible from the TX buffer
- *      into the cd1400 FIFO. Must also handle TX breaks here, since they
- *      are embedded as commands in the data stream. Oh no, had to use a goto!
- *      This could be optimized more, will do when I get time...
- *      In practice it is possible that interrupts are enabled but that the
- *      port has been hung up. Need to handle not having any TX buffer here,
- *      this is done by using the side effect that head and tail will also
- *      be NULL if the buffer has been freed.
- */
-
-static void stl_cd1400txisr(struct stlpanel *panelp, int ioaddr)
-{
-        struct stlport  *portp;
-        int             len, stlen;
-        char            *head, *tail;
-        unsigned char   ioack, srer;
-        struct tty_struct *tty;
-
-        pr_debug("stl_cd1400txisr(panelp=%p,ioaddr=%x)\n", panelp, ioaddr);
-
-        ioack = inb(ioaddr + EREG_TXACK);
-        if (((ioack & panelp->ackmask) != 0) ||
-            ((ioack & ACK_TYPMASK) != ACK_TYPTX)) {
-                printk("STALLION: bad TX interrupt ack value=%x\n", ioack);
-                return;
-        }
-        portp = panelp->ports[(ioack >> 3)];
-
-/*
- *      Unfortunately we need to handle breaks in the data stream, since
- *      this is the only way to generate them on the cd1400. Do it now if
- *      a break is to be sent.
- */
-        if (portp->brklen != 0)
-                if (stl_cd1400breakisr(portp, ioaddr))
-                        goto stl_txalldone;
-
-        head = portp->tx.head;
-        tail = portp->tx.tail;
-        len = (head >= tail) ? (head - tail) : (STL_TXBUFSIZE - (tail - head));
-        if ((len == 0) || ((len < STL_TXBUFLOW) &&
-            (test_bit(ASYI_TXLOW, &portp->istate) == 0))) {
-                set_bit(ASYI_TXLOW, &portp->istate);
-                tty = tty_port_tty_get(&portp->port);
-                if (tty) {
-                        tty_wakeup(tty);
-                        tty_kref_put(tty);
-                }
-        }
-
-        if (len == 0) {
-                outb((SRER + portp->uartaddr), ioaddr);
-                srer = inb(ioaddr + EREG_DATA);
-                if (srer & SRER_TXDATA) {
-                        srer = (srer & ~SRER_TXDATA) | SRER_TXEMPTY;
-                } else {
-                        srer &= ~(SRER_TXDATA | SRER_TXEMPTY);
-                        clear_bit(ASYI_TXBUSY, &portp->istate);
-                }
-                outb(srer, (ioaddr + EREG_DATA));
-        } else {
-                len = min(len, CD1400_TXFIFOSIZE);
-                portp->stats.txtotal += len;
-                stlen = min_t(unsigned int, len,
-                                (portp->tx.buf + STL_TXBUFSIZE) - tail);
-                outb((TDR + portp->uartaddr), ioaddr);
-                outsb((ioaddr + EREG_DATA), tail, stlen);
-                len -= stlen;
-                tail += stlen;
-                if (tail >= (portp->tx.buf + STL_TXBUFSIZE))
-                        tail = portp->tx.buf;
-                if (len > 0) {
-                        outsb((ioaddr + EREG_DATA), tail, len);
-                        tail += len;
-                }
-                portp->tx.tail = tail;
-        }
-
-stl_txalldone:
-        outb((EOSRR + portp->uartaddr), ioaddr);
-        outb(0, (ioaddr + EREG_DATA));
-}
-
-/*****************************************************************************/
-
-/*
- *      Receive character interrupt handler. Determine if we have good chars
- *      or bad chars and then process appropriately. Good chars are easy
- *      just shove the lot into the RX buffer and set all status byte to 0.
- *      If a bad RX char then process as required. This routine needs to be
- *      fast!  In practice it is possible that we get an interrupt on a port
- *      that is closed. This can happen on hangups - since they completely
- *      shutdown a port not in user context. Need to handle this case.
- */
-
-static void stl_cd1400rxisr(struct stlpanel *panelp, int ioaddr)
-{
-        struct stlport          *portp;
-        struct tty_struct       *tty;
-        unsigned int            ioack, len, buflen;
-        unsigned char           status;
-        char                    ch;
-
-        pr_debug("stl_cd1400rxisr(panelp=%p,ioaddr=%x)\n", panelp, ioaddr);
-
-        ioack = inb(ioaddr + EREG_RXACK);
-        if ((ioack & panelp->ackmask) != 0) {
-                printk("STALLION: bad RX interrupt ack value=%x\n", ioack);
-                return;
-        }
-        portp = panelp->ports[(ioack >> 3)];
-        tty = tty_port_tty_get(&portp->port);
-
-        if ((ioack & ACK_TYPMASK) == ACK_TYPRXGOOD) {
-                outb((RDCR + portp->uartaddr), ioaddr);
-                len = inb(ioaddr + EREG_DATA);
-                if (tty == NULL || (buflen = tty_buffer_request_room(tty, len)) == 0) {
-                        len = min_t(unsigned int, len, sizeof(stl_unwanted));
-                        outb((RDSR + portp->uartaddr), ioaddr);
-                        insb((ioaddr + EREG_DATA), &stl_unwanted[0], len);
-                        portp->stats.rxlost += len;
-                        portp->stats.rxtotal += len;
-                } else {
-                        len = min(len, buflen);
-                        if (len > 0) {
-                                unsigned char *ptr;
-                                outb((RDSR + portp->uartaddr), ioaddr);
-                                tty_prepare_flip_string(tty, &ptr, len);
-                                insb((ioaddr + EREG_DATA), ptr, len);
-                                tty_schedule_flip(tty);
-                                portp->stats.rxtotal += len;
-                        }
-                }
-        } else if ((ioack & ACK_TYPMASK) == ACK_TYPRXBAD) {
-                outb((RDSR + portp->uartaddr), ioaddr);
-                status = inb(ioaddr + EREG_DATA);
-                ch = inb(ioaddr + EREG_DATA);
-                if (status & ST_PARITY)
-                        portp->stats.rxparity++;
-                if (status & ST_FRAMING)
-                        portp->stats.rxframing++;
-                if (status & ST_OVERRUN)
-                        portp->stats.rxoverrun++;
-                if (status & ST_BREAK)
-                        portp->stats.rxbreaks++;
-                if (status & ST_SCHARMASK) {
-                        if ((status & ST_SCHARMASK) == ST_SCHAR1)
-                                portp->stats.txxon++;
-                        if ((status & ST_SCHARMASK) == ST_SCHAR2)
-                                portp->stats.txxoff++;
-                        goto stl_rxalldone;
-                }
-                if (tty != NULL && (portp->rxignoremsk & status) == 0) {
-                        if (portp->rxmarkmsk & status) {
-                                if (status & ST_BREAK) {
-                                        status = TTY_BREAK;
-                                        if (portp->port.flags & ASYNC_SAK) {
-                                                do_SAK(tty);
-                                                BRDENABLE(portp->brdnr, portp->pagenr);
-                                        }
-                                } else if (status & ST_PARITY)
-                                        status = TTY_PARITY;
-                                else if (status & ST_FRAMING)
-                                        status = TTY_FRAME;
-                                else if(status & ST_OVERRUN)
-                                        status = TTY_OVERRUN;
-                                else
-                                        status = 0;
-                        } else
-                                status = 0;
-                        tty_insert_flip_char(tty, ch, status);
-                        tty_schedule_flip(tty);
-                }
-        } else {
-                printk("STALLION: bad RX interrupt ack value=%x\n", ioack);
-                tty_kref_put(tty);
-                return;
-        }
-
-stl_rxalldone:
-        tty_kref_put(tty);
-        outb((EOSRR + portp->uartaddr), ioaddr);
-        outb(0, (ioaddr + EREG_DATA));
-}
-
-/*****************************************************************************/
-
-/*
- *      Modem interrupt handler. The is called when the modem signal line
- *      (DCD) has changed state. Leave most of the work to the off-level
- *      processing routine.
- */
-
-static void stl_cd1400mdmisr(struct stlpanel *panelp, int ioaddr)
-{
-        struct stlport  *portp;
-        unsigned int    ioack;
-        unsigned char   misr;
-
-        pr_debug("stl_cd1400mdmisr(panelp=%p)\n", panelp);
-
-        ioack = inb(ioaddr + EREG_MDACK);
-        if (((ioack & panelp->ackmask) != 0) ||
-            ((ioack & ACK_TYPMASK) != ACK_TYPMDM)) {
-                printk("STALLION: bad MODEM interrupt ack value=%x\n", ioack);
-                return;
-        }
-        portp = panelp->ports[(ioack >> 3)];
-
-        outb((MISR + portp->uartaddr), ioaddr);
-        misr = inb(ioaddr + EREG_DATA);
-        if (misr & MISR_DCD) {
-                stl_cd_change(portp);
-                portp->stats.modem++;
-        }
-
-        outb((EOSRR + portp->uartaddr), ioaddr);
-        outb(0, (ioaddr + EREG_DATA));
-}
-
-/*****************************************************************************/
-/*                      SC26198 HARDWARE FUNCTIONS                           */
-/*****************************************************************************/
-
-/*
- *      These functions get/set/update the registers of the sc26198 UARTs.
- *      Access to the sc26198 registers is via an address/data io port pair.
- *      (Maybe should make this inline...)
- */
-
-static int stl_sc26198getreg(struct stlport *portp, int regnr)
-{
-        outb((regnr | portp->uartaddr), (portp->ioaddr + XP_ADDR));
-        return inb(portp->ioaddr + XP_DATA);
-}
-
-static void stl_sc26198setreg(struct stlport *portp, int regnr, int value)
-{
-        outb((regnr | portp->uartaddr), (portp->ioaddr + XP_ADDR));
-        outb(value, (portp->ioaddr + XP_DATA));
-}
-
-static int stl_sc26198updatereg(struct stlport *portp, int regnr, int value)
-{
-        outb((regnr | portp->uartaddr), (portp->ioaddr + XP_ADDR));
-        if (inb(portp->ioaddr + XP_DATA) != value) {
-                outb(value, (portp->ioaddr + XP_DATA));
-                return 1;
-        }
-        return 0;
-}
-
-/*****************************************************************************/
-
-/*
- *      Functions to get and set the sc26198 global registers.
- */
-
-static int stl_sc26198getglobreg(struct stlport *portp, int regnr)
-{
-        outb(regnr, (portp->ioaddr + XP_ADDR));
-        return inb(portp->ioaddr + XP_DATA);
-}
-
-#if 0
-static void stl_sc26198setglobreg(struct stlport *portp, int regnr, int value)
-{
-        outb(regnr, (portp->ioaddr + XP_ADDR));
-        outb(value, (portp->ioaddr + XP_DATA));
-}
-#endif
-
-/*****************************************************************************/
-
-/*
- *      Inbitialize the UARTs in a panel. We don't care what sort of board
- *      these ports are on - since the port io registers are almost
- *      identical when dealing with ports.
- */
-
-static int stl_sc26198panelinit(struct stlbrd *brdp, struct stlpanel *panelp)
-{
-        int     chipmask, i;
-        int     nrchips, ioaddr;
-
-        pr_debug("stl_sc26198panelinit(brdp=%p,panelp=%p)\n", brdp, panelp);
-
-        BRDENABLE(panelp->brdnr, panelp->pagenr);
-
-/*
- *      Check that each chip is present and started up OK.
- */
-        chipmask = 0;
-        nrchips = (panelp->nrports + 4) / SC26198_PORTS;
-        if (brdp->brdtype == BRD_ECHPCI)
-                outb(panelp->pagenr, brdp->ioctrl);
-
-        for (i = 0; i < nrchips; i++) {
-                ioaddr = panelp->iobase + (i * 4); 
-                outb(SCCR, (ioaddr + XP_ADDR));
-                outb(CR_RESETALL, (ioaddr + XP_DATA));
-                outb(TSTR, (ioaddr + XP_ADDR));
-                if (inb(ioaddr + XP_DATA) != 0) {
-                        printk("STALLION: sc26198 not responding, "
-                                "brd=%d panel=%d chip=%d\n",
-                                panelp->brdnr, panelp->panelnr, i);
-                        continue;
-                }
-                chipmask |= (0x1 << i);
-                outb(GCCR, (ioaddr + XP_ADDR));
-                outb(GCCR_IVRTYPCHANACK, (ioaddr + XP_DATA));
-                outb(WDTRCR, (ioaddr + XP_ADDR));
-                outb(0xff, (ioaddr + XP_DATA));
-        }
-
-        BRDDISABLE(panelp->brdnr);
-        return chipmask;
-}
-
-/*****************************************************************************/
-
-/*
- *      Initialize hardware specific port registers.
- */
-
-static void stl_sc26198portinit(struct stlbrd *brdp, struct stlpanel *panelp, struct stlport *portp)
-{
-        pr_debug("stl_sc26198portinit(brdp=%p,panelp=%p,portp=%p)\n", brdp,
-                        panelp, portp);
-
-        if ((brdp == NULL) || (panelp == NULL) ||
-            (portp == NULL))
-                return;
-
-        portp->ioaddr = panelp->iobase + ((portp->portnr < 8) ? 0 : 4);
-        portp->uartaddr = (portp->portnr & 0x07) << 4;
-        portp->pagenr = panelp->pagenr;
-        portp->hwid = 0x1;
-
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_sc26198setreg(portp, IOPCR, IOPCR_SETSIGS);
-        BRDDISABLE(portp->brdnr);
-}
-
-/*****************************************************************************/
-
-/*
- *      Set up the sc26198 registers for a port based on the termios port
- *      settings.
- */
-
-static void stl_sc26198setport(struct stlport *portp, struct ktermios *tiosp)
-{
-        struct stlbrd   *brdp;
-        unsigned long   flags;
-        unsigned int    baudrate;
-        unsigned char   mr0, mr1, mr2, clk;
-        unsigned char   imron, imroff, iopr, ipr;
-
-        mr0 = 0;
-        mr1 = 0;
-        mr2 = 0;
-        clk = 0;
-        iopr = 0;
-        imron = 0;
-        imroff = 0;
-
-        brdp = stl_brds[portp->brdnr];
-        if (brdp == NULL)
-                return;
-
-/*
- *      Set up the RX char ignore mask with those RX error types we
- *      can ignore.
- */
-        portp->rxignoremsk = 0;
-        if (tiosp->c_iflag & IGNPAR)
-                portp->rxignoremsk |= (SR_RXPARITY | SR_RXFRAMING |
-                        SR_RXOVERRUN);
-        if (tiosp->c_iflag & IGNBRK)
-                portp->rxignoremsk |= SR_RXBREAK;
-
-        portp->rxmarkmsk = SR_RXOVERRUN;
-        if (tiosp->c_iflag & (INPCK | PARMRK))
-                portp->rxmarkmsk |= (SR_RXPARITY | SR_RXFRAMING);
-        if (tiosp->c_iflag & BRKINT)
-                portp->rxmarkmsk |= SR_RXBREAK;
-
-/*
- *      Go through the char size, parity and stop bits and set all the
- *      option register appropriately.
- */
-        switch (tiosp->c_cflag & CSIZE) {
-        case CS5:
-                mr1 |= MR1_CS5;
-                break;
-        case CS6:
-                mr1 |= MR1_CS6;
-                break;
-        case CS7:
-                mr1 |= MR1_CS7;
-                break;
-        default:
-                mr1 |= MR1_CS8;
-                break;
-        }
-
-        if (tiosp->c_cflag & CSTOPB)
-                mr2 |= MR2_STOP2;
-        else
-                mr2 |= MR2_STOP1;
-
-        if (tiosp->c_cflag & PARENB) {
-                if (tiosp->c_cflag & PARODD)
-                        mr1 |= (MR1_PARENB | MR1_PARODD);
-                else
-                        mr1 |= (MR1_PARENB | MR1_PAREVEN);
-        } else
-                mr1 |= MR1_PARNONE;
-
-        mr1 |= MR1_ERRBLOCK;
-
-/*
- *      Set the RX FIFO threshold at 8 chars. This gives a bit of breathing
- *      space for hardware flow control and the like. This should be set to
- *      VMIN.
- */
-        mr2 |= MR2_RXFIFOHALF;
-
-/*
- *      Calculate the baud rate timers. For now we will just assume that
- *      the input and output baud are the same. The sc26198 has a fixed
- *      baud rate table, so only discrete baud rates possible.
- */
-        baudrate = tiosp->c_cflag & CBAUD;
-        if (baudrate & CBAUDEX) {
-                baudrate &= ~CBAUDEX;
-                if ((baudrate < 1) || (baudrate > 4))
-                        tiosp->c_cflag &= ~CBAUDEX;
-                else
-                        baudrate += 15;
-        }
-        baudrate = stl_baudrates[baudrate];
-        if ((tiosp->c_cflag & CBAUD) == B38400) {
-                if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        baudrate = 57600;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        baudrate = 115200;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                        baudrate = 230400;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                        baudrate = 460800;
-                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
-                        baudrate = (portp->baud_base / portp->custom_divisor);
-        }
-        if (baudrate > STL_SC26198MAXBAUD)
-                baudrate = STL_SC26198MAXBAUD;
-
-        if (baudrate > 0)
-                for (clk = 0; clk < SC26198_NRBAUDS; clk++)
-                        if (baudrate <= sc26198_baudtable[clk])
-                                break;
-
-/*
- *      Check what form of modem signaling is required and set it up.
- */
-        if (tiosp->c_cflag & CLOCAL) {
-                portp->port.flags &= ~ASYNC_CHECK_CD;
-        } else {
-                iopr |= IOPR_DCDCOS;
-                imron |= IR_IOPORT;
-                portp->port.flags |= ASYNC_CHECK_CD;
-        }
-
-/*
- *      Setup sc26198 enhanced modes if we can. In particular we want to
- *      handle as much of the flow control as possible automatically. As
- *      well as saving a few CPU cycles it will also greatly improve flow
- *      control reliability.
- */
-        if (tiosp->c_iflag & IXON) {
-                mr0 |= MR0_SWFTX | MR0_SWFT;
-                imron |= IR_XONXOFF;
-        } else
-                imroff |= IR_XONXOFF;
-
-        if (tiosp->c_iflag & IXOFF)
-                mr0 |= MR0_SWFRX;
-
-        if (tiosp->c_cflag & CRTSCTS) {
-                mr2 |= MR2_AUTOCTS;
-                mr1 |= MR1_AUTORTS;
-        }
-
-/*
- *      All sc26198 register values calculated so go through and set
- *      them all up.
- */
-
-        pr_debug("SETPORT: portnr=%d panelnr=%d brdnr=%d\n",
-                portp->portnr, portp->panelnr, portp->brdnr);
-        pr_debug("    mr0=%x mr1=%x mr2=%x clk=%x\n", mr0, mr1, mr2, clk);
-        pr_debug("    iopr=%x imron=%x imroff=%x\n", iopr, imron, imroff);
-        pr_debug("    schr1=%x schr2=%x schr3=%x schr4=%x\n",
-                tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP],
-                tiosp->c_cc[VSTART], tiosp->c_cc[VSTOP]);
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_sc26198setreg(portp, IMR, 0);
-        stl_sc26198updatereg(portp, MR0, mr0);
-        stl_sc26198updatereg(portp, MR1, mr1);
-        stl_sc26198setreg(portp, SCCR, CR_RXERRBLOCK);
-        stl_sc26198updatereg(portp, MR2, mr2);
-        stl_sc26198updatereg(portp, IOPIOR,
-                ((stl_sc26198getreg(portp, IOPIOR) & ~IPR_CHANGEMASK) | iopr));
-
-        if (baudrate > 0) {
-                stl_sc26198setreg(portp, TXCSR, clk);
-                stl_sc26198setreg(portp, RXCSR, clk);
-        }
-
-        stl_sc26198setreg(portp, XONCR, tiosp->c_cc[VSTART]);
-        stl_sc26198setreg(portp, XOFFCR, tiosp->c_cc[VSTOP]);
-
-        ipr = stl_sc26198getreg(portp, IPR);
-        if (ipr & IPR_DCD)
-                portp->sigs &= ~TIOCM_CD;
-        else
-                portp->sigs |= TIOCM_CD;
-
-        portp->imr = (portp->imr & ~imroff) | imron;
-        stl_sc26198setreg(portp, IMR, portp->imr);
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Set the state of the DTR and RTS signals.
- */
-
-static void stl_sc26198setsignals(struct stlport *portp, int dtr, int rts)
-{
-        unsigned char   iopioron, iopioroff;
-        unsigned long   flags;
-
-        pr_debug("stl_sc26198setsignals(portp=%p,dtr=%d,rts=%d)\n", portp,
-                        dtr, rts);
-
-        iopioron = 0;
-        iopioroff = 0;
-        if (dtr == 0)
-                iopioroff |= IPR_DTR;
-        else if (dtr > 0)
-                iopioron |= IPR_DTR;
-        if (rts == 0)
-                iopioroff |= IPR_RTS;
-        else if (rts > 0)
-                iopioron |= IPR_RTS;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_sc26198setreg(portp, IOPIOR,
-                ((stl_sc26198getreg(portp, IOPIOR) & ~iopioroff) | iopioron));
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the state of the signals.
- */
-
-static int stl_sc26198getsignals(struct stlport *portp)
-{
-        unsigned char   ipr;
-        unsigned long   flags;
-        int             sigs;
-
-        pr_debug("stl_sc26198getsignals(portp=%p)\n", portp);
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        ipr = stl_sc26198getreg(portp, IPR);
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-
-        sigs = 0;
-        sigs |= (ipr & IPR_DCD) ? 0 : TIOCM_CD;
-        sigs |= (ipr & IPR_CTS) ? 0 : TIOCM_CTS;
-        sigs |= (ipr & IPR_DTR) ? 0: TIOCM_DTR;
-        sigs |= (ipr & IPR_RTS) ? 0: TIOCM_RTS;
-        sigs |= TIOCM_DSR;
-        return sigs;
-}
-
-/*****************************************************************************/
-
-/*
- *      Enable/Disable the Transmitter and/or Receiver.
- */
-
-static void stl_sc26198enablerxtx(struct stlport *portp, int rx, int tx)
-{
-        unsigned char   ccr;
-        unsigned long   flags;
-
-        pr_debug("stl_sc26198enablerxtx(portp=%p,rx=%d,tx=%d)\n", portp, rx,tx);
-
-        ccr = portp->crenable;
-        if (tx == 0)
-                ccr &= ~CR_TXENABLE;
-        else if (tx > 0)
-                ccr |= CR_TXENABLE;
-        if (rx == 0)
-                ccr &= ~CR_RXENABLE;
-        else if (rx > 0)
-                ccr |= CR_RXENABLE;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_sc26198setreg(portp, SCCR, ccr);
-        BRDDISABLE(portp->brdnr);
-        portp->crenable = ccr;
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Start/stop the Transmitter and/or Receiver.
- */
-
-static void stl_sc26198startrxtx(struct stlport *portp, int rx, int tx)
-{
-        unsigned char   imr;
-        unsigned long   flags;
-
-        pr_debug("stl_sc26198startrxtx(portp=%p,rx=%d,tx=%d)\n", portp, rx, tx);
-
-        imr = portp->imr;
-        if (tx == 0)
-                imr &= ~IR_TXRDY;
-        else if (tx == 1)
-                imr |= IR_TXRDY;
-        if (rx == 0)
-                imr &= ~(IR_RXRDY | IR_RXBREAK | IR_RXWATCHDOG);
-        else if (rx > 0)
-                imr |= IR_RXRDY | IR_RXBREAK | IR_RXWATCHDOG;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_sc26198setreg(portp, IMR, imr);
-        BRDDISABLE(portp->brdnr);
-        portp->imr = imr;
-        if (tx > 0)
-                set_bit(ASYI_TXBUSY, &portp->istate);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Disable all interrupts from this port.
- */
-
-static void stl_sc26198disableintrs(struct stlport *portp)
-{
-        unsigned long   flags;
-
-        pr_debug("stl_sc26198disableintrs(portp=%p)\n", portp);
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        portp->imr = 0;
-        stl_sc26198setreg(portp, IMR, 0);
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-static void stl_sc26198sendbreak(struct stlport *portp, int len)
-{
-        unsigned long   flags;
-
-        pr_debug("stl_sc26198sendbreak(portp=%p,len=%d)\n", portp, len);
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        if (len == 1) {
-                stl_sc26198setreg(portp, SCCR, CR_TXSTARTBREAK);
-                portp->stats.txbreaks++;
-        } else
-                stl_sc26198setreg(portp, SCCR, CR_TXSTOPBREAK);
-
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Take flow control actions...
- */
-
-static void stl_sc26198flowctrl(struct stlport *portp, int state)
-{
-        struct tty_struct       *tty;
-        unsigned long           flags;
-        unsigned char           mr0;
-
-        pr_debug("stl_sc26198flowctrl(portp=%p,state=%x)\n", portp, state);
-
-        if (portp == NULL)
-                return;
-        tty = tty_port_tty_get(&portp->port);
-        if (tty == NULL)
-                return;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-
-        if (state) {
-                if (tty->termios->c_iflag & IXOFF) {
-                        mr0 = stl_sc26198getreg(portp, MR0);
-                        stl_sc26198setreg(portp, MR0, (mr0 & ~MR0_SWFRXTX));
-                        stl_sc26198setreg(portp, SCCR, CR_TXSENDXON);
-                        mr0 |= MR0_SWFRX;
-                        portp->stats.rxxon++;
-                        stl_sc26198wait(portp);
-                        stl_sc26198setreg(portp, MR0, mr0);
-                }
-/*
- *              Question: should we return RTS to what it was before? It may
- *              have been set by an ioctl... Suppose not, since if you have
- *              hardware flow control set then it is pretty silly to go and
- *              set the RTS line by hand.
- */
-                if (tty->termios->c_cflag & CRTSCTS) {
-                        stl_sc26198setreg(portp, MR1,
-                                (stl_sc26198getreg(portp, MR1) | MR1_AUTORTS));
-                        stl_sc26198setreg(portp, IOPIOR,
-                                (stl_sc26198getreg(portp, IOPIOR) | IOPR_RTS));
-                        portp->stats.rxrtson++;
-                }
-        } else {
-                if (tty->termios->c_iflag & IXOFF) {
-                        mr0 = stl_sc26198getreg(portp, MR0);
-                        stl_sc26198setreg(portp, MR0, (mr0 & ~MR0_SWFRXTX));
-                        stl_sc26198setreg(portp, SCCR, CR_TXSENDXOFF);
-                        mr0 &= ~MR0_SWFRX;
-                        portp->stats.rxxoff++;
-                        stl_sc26198wait(portp);
-                        stl_sc26198setreg(portp, MR0, mr0);
-                }
-                if (tty->termios->c_cflag & CRTSCTS) {
-                        stl_sc26198setreg(portp, MR1,
-                                (stl_sc26198getreg(portp, MR1) & ~MR1_AUTORTS));
-                        stl_sc26198setreg(portp, IOPIOR,
-                                (stl_sc26198getreg(portp, IOPIOR) & ~IOPR_RTS));
-                        portp->stats.rxrtsoff++;
-                }
-        }
-
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-        tty_kref_put(tty);
-}
-
-/*****************************************************************************/
-
-/*
- *      Send a flow control character.
- */
-
-static void stl_sc26198sendflow(struct stlport *portp, int state)
-{
-        struct tty_struct       *tty;
-        unsigned long           flags;
-        unsigned char           mr0;
-
-        pr_debug("stl_sc26198sendflow(portp=%p,state=%x)\n", portp, state);
-
-        if (portp == NULL)
-                return;
-        tty = tty_port_tty_get(&portp->port);
-        if (tty == NULL)
-                return;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        if (state) {
-                mr0 = stl_sc26198getreg(portp, MR0);
-                stl_sc26198setreg(portp, MR0, (mr0 & ~MR0_SWFRXTX));
-                stl_sc26198setreg(portp, SCCR, CR_TXSENDXON);
-                mr0 |= MR0_SWFRX;
-                portp->stats.rxxon++;
-                stl_sc26198wait(portp);
-                stl_sc26198setreg(portp, MR0, mr0);
-        } else {
-                mr0 = stl_sc26198getreg(portp, MR0);
-                stl_sc26198setreg(portp, MR0, (mr0 & ~MR0_SWFRXTX));
-                stl_sc26198setreg(portp, SCCR, CR_TXSENDXOFF);
-                mr0 &= ~MR0_SWFRX;
-                portp->stats.rxxoff++;
-                stl_sc26198wait(portp);
-                stl_sc26198setreg(portp, MR0, mr0);
-        }
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-        tty_kref_put(tty);
-}
-
-/*****************************************************************************/
-
-static void stl_sc26198flush(struct stlport *portp)
-{
-        unsigned long   flags;
-
-        pr_debug("stl_sc26198flush(portp=%p)\n", portp);
-
-        if (portp == NULL)
-                return;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        stl_sc26198setreg(portp, SCCR, CR_TXRESET);
-        stl_sc26198setreg(portp, SCCR, portp->crenable);
-        BRDDISABLE(portp->brdnr);
-        portp->tx.tail = portp->tx.head;
-        spin_unlock_irqrestore(&brd_lock, flags);
-}
-
-/*****************************************************************************/
-
-/*
- *      Return the current state of data flow on this port. This is only
- *      really interresting when determining if data has fully completed
- *      transmission or not... The sc26198 interrupt scheme cannot
- *      determine when all data has actually drained, so we need to
- *      check the port statusy register to be sure.
- */
-
-static int stl_sc26198datastate(struct stlport *portp)
-{
-        unsigned long   flags;
-        unsigned char   sr;
-
-        pr_debug("stl_sc26198datastate(portp=%p)\n", portp);
-
-        if (portp == NULL)
-                return 0;
-        if (test_bit(ASYI_TXBUSY, &portp->istate))
-                return 1;
-
-        spin_lock_irqsave(&brd_lock, flags);
-        BRDENABLE(portp->brdnr, portp->pagenr);
-        sr = stl_sc26198getreg(portp, SR);
-        BRDDISABLE(portp->brdnr);
-        spin_unlock_irqrestore(&brd_lock, flags);
-
-        return (sr & SR_TXEMPTY) ? 0 : 1;
-}
-
-/*****************************************************************************/
-
-/*
- *      Delay for a small amount of time, to give the sc26198 a chance
- *      to process a command...
- */
-
-static void stl_sc26198wait(struct stlport *portp)
-{
-        int     i;
-
-        pr_debug("stl_sc26198wait(portp=%p)\n", portp);
-
-        if (portp == NULL)
-                return;
-
-        for (i = 0; i < 20; i++)
-                stl_sc26198getglobreg(portp, TSTR);
-}
-
-/*****************************************************************************/
-
-/*
- *      If we are TX flow controlled and in IXANY mode then we may
- *      need to unflow control here. We gotta do this because of the
- *      automatic flow control modes of the sc26198.
- */
-
-static void stl_sc26198txunflow(struct stlport *portp, struct tty_struct *tty)
-{
-        unsigned char   mr0;
-
-        mr0 = stl_sc26198getreg(portp, MR0);
-        stl_sc26198setreg(portp, MR0, (mr0 & ~MR0_SWFRXTX));
-        stl_sc26198setreg(portp, SCCR, CR_HOSTXON);
-        stl_sc26198wait(portp);
-        stl_sc26198setreg(portp, MR0, mr0);
-        clear_bit(ASYI_TXFLOWED, &portp->istate);
-}
-
-/*****************************************************************************/
-
-/*
- *      Interrupt service routine for sc26198 panels.
- */
-
-static void stl_sc26198intr(struct stlpanel *panelp, unsigned int iobase)
-{
-        struct stlport  *portp;
-        unsigned int    iack;
-
-        spin_lock(&brd_lock);
-
-/* 
- *      Work around bug in sc26198 chip... Cannot have A6 address
- *      line of UART high, else iack will be returned as 0.
- */
-        outb(0, (iobase + 1));
-
-        iack = inb(iobase + XP_IACK);
-        portp = panelp->ports[(iack & IVR_CHANMASK) + ((iobase & 0x4) << 1)];
-
-        if (iack & IVR_RXDATA)
-                stl_sc26198rxisr(portp, iack);
-        else if (iack & IVR_TXDATA)
-                stl_sc26198txisr(portp);
-        else
-                stl_sc26198otherisr(portp, iack);
-
-        spin_unlock(&brd_lock);
-}
-
-/*****************************************************************************/
-
-/*
- *      Transmit interrupt handler. This has gotta be fast!  Handling TX
- *      chars is pretty simple, stuff as many as possible from the TX buffer
- *      into the sc26198 FIFO.
- *      In practice it is possible that interrupts are enabled but that the
- *      port has been hung up. Need to handle not having any TX buffer here,
- *      this is done by using the side effect that head and tail will also
- *      be NULL if the buffer has been freed.
- */
-
-static void stl_sc26198txisr(struct stlport *portp)
-{
-        struct tty_struct *tty;
-        unsigned int    ioaddr;
-        unsigned char   mr0;
-        int             len, stlen;
-        char            *head, *tail;
-
-        pr_debug("stl_sc26198txisr(portp=%p)\n", portp);
-
-        ioaddr = portp->ioaddr;
-        head = portp->tx.head;
-        tail = portp->tx.tail;
-        len = (head >= tail) ? (head - tail) : (STL_TXBUFSIZE - (tail - head));
-        if ((len == 0) || ((len < STL_TXBUFLOW) &&
-            (test_bit(ASYI_TXLOW, &portp->istate) == 0))) {
-                set_bit(ASYI_TXLOW, &portp->istate);
-                tty = tty_port_tty_get(&portp->port);
-                if (tty) {
-                        tty_wakeup(tty);
-                        tty_kref_put(tty);
-                }
-        }
-
-        if (len == 0) {
-                outb((MR0 | portp->uartaddr), (ioaddr + XP_ADDR));
-                mr0 = inb(ioaddr + XP_DATA);
-                if ((mr0 & MR0_TXMASK) == MR0_TXEMPTY) {
-                        portp->imr &= ~IR_TXRDY;
-                        outb((IMR | portp->uartaddr), (ioaddr + XP_ADDR));
-                        outb(portp->imr, (ioaddr + XP_DATA));
-                        clear_bit(ASYI_TXBUSY, &portp->istate);
-                } else {
-                        mr0 |= ((mr0 & ~MR0_TXMASK) | MR0_TXEMPTY);
-                        outb(mr0, (ioaddr + XP_DATA));
-                }
-        } else {
-                len = min(len, SC26198_TXFIFOSIZE);
-                portp->stats.txtotal += len;
-                stlen = min_t(unsigned int, len,
-                                (portp->tx.buf + STL_TXBUFSIZE) - tail);
-                outb(GTXFIFO, (ioaddr + XP_ADDR));
-                outsb((ioaddr + XP_DATA), tail, stlen);
-                len -= stlen;
-                tail += stlen;
-                if (tail >= (portp->tx.buf + STL_TXBUFSIZE))
-                        tail = portp->tx.buf;
-                if (len > 0) {
-                        outsb((ioaddr + XP_DATA), tail, len);
-                        tail += len;
-                }
-                portp->tx.tail = tail;
-        }
-}
-
-/*****************************************************************************/
-
-/*
- *      Receive character interrupt handler. Determine if we have good chars
- *      or bad chars and then process appropriately. Good chars are easy
- *      just shove the lot into the RX buffer and set all status byte to 0.
- *      If a bad RX char then process as required. This routine needs to be
- *      fast!  In practice it is possible that we get an interrupt on a port
- *      that is closed. This can happen on hangups - since they completely
- *      shutdown a port not in user context. Need to handle this case.
- */
-
-static void stl_sc26198rxisr(struct stlport *portp, unsigned int iack)
-{
-        struct tty_struct       *tty;
-        unsigned int            len, buflen, ioaddr;
-
-        pr_debug("stl_sc26198rxisr(portp=%p,iack=%x)\n", portp, iack);
-
-        tty = tty_port_tty_get(&portp->port);
-        ioaddr = portp->ioaddr;
-        outb(GIBCR, (ioaddr + XP_ADDR));
-        len = inb(ioaddr + XP_DATA) + 1;
-
-        if ((iack & IVR_TYPEMASK) == IVR_RXDATA) {
-                if (tty == NULL || (buflen = tty_buffer_request_room(tty, len)) == 0) {
-                        len = min_t(unsigned int, len, sizeof(stl_unwanted));
-                        outb(GRXFIFO, (ioaddr + XP_ADDR));
-                        insb((ioaddr + XP_DATA), &stl_unwanted[0], len);
-                        portp->stats.rxlost += len;
-                        portp->stats.rxtotal += len;
-                } else {
-                        len = min(len, buflen);
-                        if (len > 0) {
-                                unsigned char *ptr;
-                                outb(GRXFIFO, (ioaddr + XP_ADDR));
-                                tty_prepare_flip_string(tty, &ptr, len);
-                                insb((ioaddr + XP_DATA), ptr, len);
-                                tty_schedule_flip(tty);
-                                portp->stats.rxtotal += len;
-                        }
-                }
-        } else {
-                stl_sc26198rxbadchars(portp);
-        }
-
-/*
- *      If we are TX flow controlled and in IXANY mode then we may need
- *      to unflow control here. We gotta do this because of the automatic
- *      flow control modes of the sc26198.
- */
-        if (test_bit(ASYI_TXFLOWED, &portp->istate)) {
-                if ((tty != NULL) &&
-                    (tty->termios != NULL) &&
-                    (tty->termios->c_iflag & IXANY)) {
-                        stl_sc26198txunflow(portp, tty);
-                }
-        }
-        tty_kref_put(tty);
-}
-
-/*****************************************************************************/
-
-/*
- *      Process an RX bad character.
- */
-
-static void stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char ch)
-{
-        struct tty_struct       *tty;
-        unsigned int            ioaddr;
-
-        tty = tty_port_tty_get(&portp->port);
-        ioaddr = portp->ioaddr;
-
-        if (status & SR_RXPARITY)
-                portp->stats.rxparity++;
-        if (status & SR_RXFRAMING)
-                portp->stats.rxframing++;
-        if (status & SR_RXOVERRUN)
-                portp->stats.rxoverrun++;
-        if (status & SR_RXBREAK)
-                portp->stats.rxbreaks++;
-
-        if ((tty != NULL) &&
-            ((portp->rxignoremsk & status) == 0)) {
-                if (portp->rxmarkmsk & status) {
-                        if (status & SR_RXBREAK) {
-                                status = TTY_BREAK;
-                                if (portp->port.flags & ASYNC_SAK) {
-                                        do_SAK(tty);
-                                        BRDENABLE(portp->brdnr, portp->pagenr);
-                                }
-                        } else if (status & SR_RXPARITY)
-                                status = TTY_PARITY;
-                        else if (status & SR_RXFRAMING)
-                                status = TTY_FRAME;
-                        else if(status & SR_RXOVERRUN)
-                                status = TTY_OVERRUN;
-                        else
-                                status = 0;
-                } else
-                        status = 0;
-
-                tty_insert_flip_char(tty, ch, status);
-                tty_schedule_flip(tty);
-
-                if (status == 0)
-                        portp->stats.rxtotal++;
-        }
-        tty_kref_put(tty);
-}
-
-/*****************************************************************************/
-
-/*
- *      Process all characters in the RX FIFO of the UART. Check all char
- *      status bytes as well, and process as required. We need to check
- *      all bytes in the FIFO, in case some more enter the FIFO while we
- *      are here. To get the exact character error type we need to switch
- *      into CHAR error mode (that is why we need to make sure we empty
- *      the FIFO).
- */
-
-static void stl_sc26198rxbadchars(struct stlport *portp)
-{
-        unsigned char   status, mr1;
-        char            ch;
-
-/*
- *      To get the precise error type for each character we must switch
- *      back into CHAR error mode.
- */
-        mr1 = stl_sc26198getreg(portp, MR1);
-        stl_sc26198setreg(portp, MR1, (mr1 & ~MR1_ERRBLOCK));
-
-        while ((status = stl_sc26198getreg(portp, SR)) & SR_RXRDY) {
-                stl_sc26198setreg(portp, SCCR, CR_CLEARRXERR);
-                ch = stl_sc26198getreg(portp, RXFIFO);
-                stl_sc26198rxbadch(portp, status, ch);
-        }
-
-/*
- *      To get correct interrupt class we must switch back into BLOCK
- *      error mode.
- */
-        stl_sc26198setreg(portp, MR1, mr1);
-}
-
-/*****************************************************************************/
-
-/*
- *      Other interrupt handler. This includes modem signals, flow
- *      control actions, etc. Most stuff is left to off-level interrupt
- *      processing time.
- */
-
-static void stl_sc26198otherisr(struct stlport *portp, unsigned int iack)
-{
-        unsigned char   cir, ipr, xisr;
-
-        pr_debug("stl_sc26198otherisr(portp=%p,iack=%x)\n", portp, iack);
-
-        cir = stl_sc26198getglobreg(portp, CIR);
-
-        switch (cir & CIR_SUBTYPEMASK) {
-        case CIR_SUBCOS:
-                ipr = stl_sc26198getreg(portp, IPR);
-                if (ipr & IPR_DCDCHANGE) {
-                        stl_cd_change(portp);
-                        portp->stats.modem++;
-                }
-                break;
-        case CIR_SUBXONXOFF:
-                xisr = stl_sc26198getreg(portp, XISR);
-                if (xisr & XISR_RXXONGOT) {
-                        set_bit(ASYI_TXFLOWED, &portp->istate);
-                        portp->stats.txxoff++;
-                }
-                if (xisr & XISR_RXXOFFGOT) {
-                        clear_bit(ASYI_TXFLOWED, &portp->istate);
-                        portp->stats.txxon++;
-                }
-                break;
-        case CIR_SUBBREAK:
-                stl_sc26198setreg(portp, SCCR, CR_BREAKRESET);
-                stl_sc26198rxbadchars(portp);
-                break;
-        default:
-                break;
-        }
-}
-
-static void stl_free_isabrds(void)
-{
-        struct stlbrd *brdp;
-        unsigned int i;
-
-        for (i = 0; i < stl_nrbrds; i++) {
-                if ((brdp = stl_brds[i]) == NULL || (brdp->state & STL_PROBED))
-                        continue;
-
-                free_irq(brdp->irq, brdp);
-
-                stl_cleanup_panels(brdp);
-
-                release_region(brdp->ioaddr1, brdp->iosize1);
-                if (brdp->iosize2 > 0)
-                        release_region(brdp->ioaddr2, brdp->iosize2);
-
-                kfree(brdp);
-                stl_brds[i] = NULL;
-        }
-}
-
-/*
- *      Loadable module initialization stuff.
- */
-static int __init stallion_module_init(void)
-{
-        struct stlbrd   *brdp;
-        struct stlconf  conf;
-        unsigned int i, j;
-        int retval;
-
-        printk(KERN_INFO "%s: version %s\n", stl_drvtitle, stl_drvversion);
-
-        spin_lock_init(&stallion_lock);
-        spin_lock_init(&brd_lock);
-
-        stl_serial = alloc_tty_driver(STL_MAXBRDS * STL_MAXPORTS);
-        if (!stl_serial) {
-                retval = -ENOMEM;
-                goto err;
-        }
-
-        stl_serial->owner = THIS_MODULE;
-        stl_serial->driver_name = stl_drvname;
-        stl_serial->name = "ttyE";
-        stl_serial->major = STL_SERIALMAJOR;
-        stl_serial->minor_start = 0;
-        stl_serial->type = TTY_DRIVER_TYPE_SERIAL;
-        stl_serial->subtype = SERIAL_TYPE_NORMAL;
-        stl_serial->init_termios = stl_deftermios;
-        stl_serial->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-        tty_set_operations(stl_serial, &stl_ops);
-
-        retval = tty_register_driver(stl_serial);
-        if (retval) {
-                printk("STALLION: failed to register serial driver\n");
-                goto err_frtty;
-        }
-
-/*
- *      Find any dynamically supported boards. That is via module load
- *      line options.
- */
-        for (i = stl_nrbrds; i < stl_nargs; i++) {
-                memset(&conf, 0, sizeof(conf));
-                if (stl_parsebrd(&conf, stl_brdsp[i]) == 0)
-                        continue;
-                if ((brdp = stl_allocbrd()) == NULL)
-                        continue;
-                brdp->brdnr = i;
-                brdp->brdtype = conf.brdtype;
-                brdp->ioaddr1 = conf.ioaddr1;
-                brdp->ioaddr2 = conf.ioaddr2;
-                brdp->irq = conf.irq;
-                brdp->irqtype = conf.irqtype;
-                stl_brds[brdp->brdnr] = brdp;
-                if (stl_brdinit(brdp)) {
-                        stl_brds[brdp->brdnr] = NULL;
-                        kfree(brdp);
-                } else {
-                        for (j = 0; j < brdp->nrports; j++)
-                                tty_register_device(stl_serial,
-                                        brdp->brdnr * STL_MAXPORTS + j, NULL);
-                        stl_nrbrds = i + 1;
-                }
-        }
-
-        /* this has to be _after_ isa finding because of locking */
-        retval = pci_register_driver(&stl_pcidriver);
-        if (retval && stl_nrbrds == 0) {
-                printk(KERN_ERR "STALLION: can't register pci driver\n");
-                goto err_unrtty;
-        }
-
-/*
- *      Set up a character driver for per board stuff. This is mainly used
- *      to do stats ioctls on the ports.
- */
-        if (register_chrdev(STL_SIOMEMMAJOR, "staliomem", &stl_fsiomem))
-                printk("STALLION: failed to register serial board device\n");
-
-        stallion_class = class_create(THIS_MODULE, "staliomem");
-        if (IS_ERR(stallion_class))
-                printk("STALLION: failed to create class\n");
-        for (i = 0; i < 4; i++)
-                device_create(stallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),
-                              NULL, "staliomem%d", i);
-
-        return 0;
-err_unrtty:
-        tty_unregister_driver(stl_serial);
-err_frtty:
-        put_tty_driver(stl_serial);
-err:
-        return retval;
-}
-
-static void __exit stallion_module_exit(void)
-{
-        struct stlbrd *brdp;
-        unsigned int i, j;
-
-        pr_debug("cleanup_module()\n");
-
-        printk(KERN_INFO "Unloading %s: version %s\n", stl_drvtitle,
-                stl_drvversion);
-
-/*
- *      Free up all allocated resources used by the ports. This includes
- *      memory and interrupts. As part of this process we will also do
- *      a hangup on every open port - to try to flush out any processes
- *      hanging onto ports.
- */
-        for (i = 0; i < stl_nrbrds; i++) {
-                if ((brdp = stl_brds[i]) == NULL || (brdp->state & STL_PROBED))
-                        continue;
-                for (j = 0; j < brdp->nrports; j++)
-                        tty_unregister_device(stl_serial,
-                                brdp->brdnr * STL_MAXPORTS + j);
-        }
-
-        for (i = 0; i < 4; i++)
-                device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));
-        unregister_chrdev(STL_SIOMEMMAJOR, "staliomem");
-        class_destroy(stallion_class);
-
-        pci_unregister_driver(&stl_pcidriver);
-
-        stl_free_isabrds();
-
-        tty_unregister_driver(stl_serial);
-        put_tty_driver(stl_serial);
-}
-
-module_init(stallion_module_init);
-module_exit(stallion_module_exit);
-
-MODULE_AUTHOR("Greg Ungerer");
-MODULE_DESCRIPTION("Stallion Multiport Serial Driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
deleted file mode 100644
index 5b24db4ff7f1..000000000000
--- a/drivers/char/sx.c
+++ /dev/null
@@ -1,2894 +0,0 @@
-/* sx.c -- driver for the Specialix SX series cards. 
- *
- *  This driver will also support the older SI, and XIO cards.
- *
- *
- *   (C) 1998 - 2004  R.E.Wolff@BitWizard.nl
- *
- *  Simon Allen (simonallen@cix.compulink.co.uk) wrote a previous
- *  version of this driver. Some fragments may have been copied. (none
- *  yet :-)
- *
- * Specialix pays for the development and support of this driver.
- * Please DO contact support@specialix.co.uk if you require
- * support. But please read the documentation (sx.txt) first.
- *
- *
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License as
- *      published by the Free Software Foundation; either version 2 of
- *      the License, or (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be
- *      useful, but WITHOUT ANY WARRANTY; without even the implied
- *      warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *      PURPOSE.  See the GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public
- *      License along with this program; if not, write to the Free
- *      Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
- *      USA.
- *
- * Revision history:
- * Revision 1.33  2000/03/09 10:00:00  pvdl,wolff
- * - Fixed module and port counting
- * - Fixed signal handling
- * - Fixed an Ooops
- * 
- * Revision 1.32  2000/03/07 09:00:00  wolff,pvdl
- * - Fixed some sx_dprintk typos
- * - added detection for an invalid board/module configuration
- *
- * Revision 1.31  2000/03/06 12:00:00  wolff,pvdl
- * - Added support for EISA
- *
- * Revision 1.30  2000/01/21 17:43:06  wolff
- * - Added support for SX+
- *
- * Revision 1.26  1999/08/05 15:22:14  wolff
- * - Port to 2.3.x
- * - Reformatted to Linus' liking.
- *
- * Revision 1.25  1999/07/30 14:24:08  wolff
- * Had accidentally left "gs_debug" set to "-1" instead of "off" (=0).
- *
- * Revision 1.24  1999/07/28 09:41:52  wolff
- * - I noticed the remark about use-count straying in sx.txt. I checked
- *   sx_open, and found a few places where that could happen. I hope it's
- *   fixed now.
- *
- * Revision 1.23  1999/07/28 08:56:06  wolff
- * - Fixed crash when sx_firmware run twice.
- * - Added sx_slowpoll as a module parameter (I guess nobody really wanted
- *   to change it from the default... )
- * - Fixed a stupid editing problem I introduced in 1.22.
- * - Fixed dropping characters on a termios change.
- *
- * Revision 1.22  1999/07/26 21:01:43  wolff
- * Russell Brown noticed that I had overlooked 4 out of six modem control
- * signals in sx_getsignals. Ooops.
- *
- * Revision 1.21  1999/07/23 09:11:33  wolff
- * I forgot to free dynamically allocated memory when the driver is unloaded.
- *
- * Revision 1.20  1999/07/20 06:25:26  wolff
- * The "closing wait" wasn't honoured. Thanks to James Griffiths for
- * reporting this.
- *
- * Revision 1.19  1999/07/11 08:59:59  wolff
- * Fixed an oops in close, when an open was pending. Changed the memtest
- * a bit. Should also test the board in word-mode, however my card fails the
- * memtest then. I still have to figure out what is wrong...
- *
- * Revision 1.18  1999/06/10 09:38:42  wolff
- * Changed the format of the firmware revision from %04x to %x.%02x .
- *
- * Revision 1.17  1999/06/04 09:44:35  wolff
- * fixed problem: reference to pci stuff when config_pci was off...
- * Thanks to Jorge Novo for noticing this.
- *
- * Revision 1.16  1999/06/02 08:30:15  wolff
- * added/removed the workaround for the DCD bug in the Firmware.
- * A bit more debugging code to locate that...
- *
- * Revision 1.15  1999/06/01 11:35:30  wolff
- * when DCD is left low (floating?), on TA's the firmware first tells us
- * that DCD is high, but after a short while suddenly comes to the
- * conclusion that it is low. All this would be fine, if it weren't that
- * Unix requires us to send a "hangup" signal in that case. This usually
- * all happens BEFORE the program has had a chance to ioctl the device
- * into clocal mode..
- *
- * Revision 1.14  1999/05/25 11:18:59  wolff
- * Added PCI-fix.
- * Added checks for return code of sx_sendcommand.
- * Don't issue "reconfig" if port isn't open yet. (bit us on TA modules...)
- *
- * Revision 1.13  1999/04/29 15:18:01  wolff
- * Fixed an "oops" that showed on SuSE 6.0 systems.
- * Activate DTR again after stty 0.
- *
- * Revision 1.12  1999/04/29 07:49:52  wolff
- * Improved "stty 0" handling a bit. (used to change baud to 9600 assuming
- *     the connection would be dropped anyway. That is not always the case,
- *     and confuses people).
- * Told the card to always monitor the modem signals.
- * Added support for dynamic  gs_debug adjustments.
- * Now tells the rest of the system the number of ports.
- *
- * Revision 1.11  1999/04/24 11:11:30  wolff
- * Fixed two stupid typos in the memory test.
- *
- * Revision 1.10  1999/04/24 10:53:39  wolff
- * Added some of Christian's suggestions.
- * Fixed an HW_COOK_IN bug (ISIG was not in I_OTHER. We used to trust the
- * card to send the signal to the process.....)
- *
- * Revision 1.9  1999/04/23 07:26:38  wolff
- * Included Christian Lademann's 2.0 compile-warning fixes and interrupt
- *    assignment redesign.
- * Cleanup of some other stuff.
- *
- * Revision 1.8  1999/04/16 13:05:30  wolff
- * fixed a DCD change unnoticed bug.
- *
- * Revision 1.7  1999/04/14 22:19:51  wolff
- * Fixed typo that showed up in 2.0.x builds (get_user instead of Get_user!)
- *
- * Revision 1.6  1999/04/13 18:40:20  wolff
- * changed misc-minor to 161, as assigned by HPA.
- *
- * Revision 1.5  1999/04/13 15:12:25  wolff
- * Fixed use-count leak when "hangup" occurred.
- * Added workaround for a stupid-PCIBIOS bug.
- *
- *
- * Revision 1.4  1999/04/01 22:47:40  wolff
- * Fixed < 1M linux-2.0 problem.
- * (vremap isn't compatible with ioremap in that case)
- *
- * Revision 1.3  1999/03/31 13:45:45  wolff
- * Firmware loading is now done through a separate IOCTL.
- *
- * Revision 1.2  1999/03/28 12:22:29  wolff
- * rcs cleanup
- *
- * Revision 1.1  1999/03/28 12:10:34  wolff
- * Readying for release on 2.0.x (sorry David, 1.01 becomes 1.1 for RCS). 
- *
- * Revision 0.12  1999/03/28 09:20:10  wolff
- * Fixed problem in 0.11, continueing cleanup.
- *
- * Revision 0.11  1999/03/28 08:46:44  wolff
- * cleanup. Not good.
- *
- * Revision 0.10  1999/03/28 08:09:43  wolff
- * Fixed loosing characters on close.
- *
- * Revision 0.9  1999/03/21 22:52:01  wolff
- * Ported back to 2.2.... (minor things)
- *
- * Revision 0.8  1999/03/21 22:40:33  wolff
- * Port to 2.0
- *
- * Revision 0.7  1999/03/21 19:06:34  wolff
- * Fixed hangup processing.
- *
- * Revision 0.6  1999/02/05 08:45:14  wolff
- * fixed real_raw problems. Inclusion into kernel imminent.
- *
- * Revision 0.5  1998/12/21 23:51:06  wolff
- * Snatched a nasty bug: sx_transmit_chars was getting re-entered, and it
- * shouldn't have. THATs why I want to have transmit interrupts even when
- * the buffer is empty.
- *
- * Revision 0.4  1998/12/17 09:34:46  wolff
- * PPP works. ioctl works. Basically works!
- *
- * Revision 0.3  1998/12/15 13:05:18  wolff
- * It works! Wow! Gotta start implementing IOCTL and stuff....
- *
- * Revision 0.2  1998/12/01 08:33:53  wolff
- * moved over to 2.1.130
- *
- * Revision 0.1  1998/11/03 21:23:51  wolff
- * Initial revision. Detects SX card.
- *
- * */
-
-#define SX_VERSION      1.33
-
-#include <linux/module.h>
-#include <linux/kdev_t.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/mm.h>
-#include <linux/serial.h>
-#include <linux/fcntl.h>
-#include <linux/major.h>
-#include <linux/delay.h>
-#include <linux/eisa.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/smp_lock.h>
-#include <linux/init.h>
-#include <linux/miscdevice.h>
-#include <linux/bitops.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-
-/* The 3.0.0 version of sxboards/sxwindow.h  uses BYTE and WORD.... */
-#define BYTE u8
-#define WORD u16
-
-/* .... but the 3.0.4 version uses _u8 and _u16. */
-#define _u8 u8
-#define _u16 u16
-
-#include "sxboards.h"
-#include "sxwindow.h"
-
-#include <linux/generic_serial.h>
-#include "sx.h"
-
-/* I don't think that this driver can handle more than 256 ports on
-   one machine. You'll have to increase the number of boards in sx.h
-   if you want more than 4 boards.  */
-
-#ifndef PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8
-#define PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8 0x2000
-#endif
-
-/* Configurable options: 
-   (Don't be too sure that it'll work if you toggle them) */
-
-/* Am I paranoid or not ? ;-) */
-#undef SX_PARANOIA_CHECK
-
-/* 20 -> 2000 per second. The card should rate-limit interrupts at 100
-   Hz, but it is user configurable. I don't recommend going above 1000
-   Hz. The interrupt ratelimit might trigger if the interrupt is
-   shared with a very active other device. */
-#define IRQ_RATE_LIMIT 20
-
-/* Sharing interrupts is possible now. If the other device wants more
-   than 2000 interrupts per second, we'd gracefully decline further
-   interrupts. That's not what we want. On the other hand, if the
-   other device interrupts 2000 times a second, don't use the SX
-   interrupt. Use polling. */
-#undef IRQ_RATE_LIMIT
-
-#if 0
-/* Not implemented */
-/* 
- * The following defines are mostly for testing purposes. But if you need
- * some nice reporting in your syslog, you can define them also.
- */
-#define SX_REPORT_FIFO
-#define SX_REPORT_OVERRUN
-#endif
-
-/* Function prototypes */
-static void sx_disable_tx_interrupts(void *ptr);
-static void sx_enable_tx_interrupts(void *ptr);
-static void sx_disable_rx_interrupts(void *ptr);
-static void sx_enable_rx_interrupts(void *ptr);
-static int sx_carrier_raised(struct tty_port *port);
-static void sx_shutdown_port(void *ptr);
-static int sx_set_real_termios(void *ptr);
-static void sx_close(void *ptr);
-static int sx_chars_in_buffer(void *ptr);
-static int sx_init_board(struct sx_board *board);
-static int sx_init_portstructs(int nboards, int nports);
-static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
-                                                unsigned long arg);
-static int sx_init_drivers(void);
-
-static struct tty_driver *sx_driver;
-
-static DEFINE_MUTEX(sx_boards_lock);
-static struct sx_board boards[SX_NBOARDS];
-static struct sx_port *sx_ports;
-static int sx_initialized;
-static int sx_nports;
-static int sx_debug;
-
-/* You can have the driver poll your card. 
-    - Set sx_poll to 1 to poll every timer tick (10ms on Intel). 
-      This is used when the card cannot use an interrupt for some reason.
-
-    - set sx_slowpoll to 100 to do an extra poll once a second (on Intel). If 
-      the driver misses an interrupt (report this if it DOES happen to you!)
-      everything will continue to work.... 
- */
-static int sx_poll = 1;
-static int sx_slowpoll;
-
-/* The card limits the number of interrupts per second. 
-   At 115k2 "100" should be sufficient. 
-   If you're using higher baudrates, you can increase this...
- */
-
-static int sx_maxints = 100;
-
-#ifdef CONFIG_ISA
-
-/* These are the only open spaces in my computer. Yours may have more
-   or less.... -- REW 
-   duh: Card at 0xa0000 is possible on HP Netserver?? -- pvdl
-*/
-static int sx_probe_addrs[] = {
-        0xc0000, 0xd0000, 0xe0000,
-        0xc8000, 0xd8000, 0xe8000
-};
-static int si_probe_addrs[] = {
-        0xc0000, 0xd0000, 0xe0000,
-        0xc8000, 0xd8000, 0xe8000, 0xa0000
-};
-static int si1_probe_addrs[] = {
-        0xd0000
-};
-
-#define NR_SX_ADDRS ARRAY_SIZE(sx_probe_addrs)
-#define NR_SI_ADDRS ARRAY_SIZE(si_probe_addrs)
-#define NR_SI1_ADDRS ARRAY_SIZE(si1_probe_addrs)
-
-module_param_array(sx_probe_addrs, int, NULL, 0);
-module_param_array(si_probe_addrs, int, NULL, 0);
-#endif
-
-/* Set the mask to all-ones. This alas, only supports 32 interrupts. 
-   Some architectures may need more. */
-static int sx_irqmask = -1;
-
-module_param(sx_poll, int, 0);
-module_param(sx_slowpoll, int, 0);
-module_param(sx_maxints, int, 0);
-module_param(sx_debug, int, 0);
-module_param(sx_irqmask, int, 0);
-
-MODULE_LICENSE("GPL");
-
-static struct real_driver sx_real_driver = {
-        sx_disable_tx_interrupts,
-        sx_enable_tx_interrupts,
-        sx_disable_rx_interrupts,
-        sx_enable_rx_interrupts,
-        sx_shutdown_port,
-        sx_set_real_termios,
-        sx_chars_in_buffer,
-        sx_close,
-};
-
-/* 
-   This driver can spew a whole lot of debugging output at you. If you
-   need maximum performance, you should disable the DEBUG define. To
-   aid in debugging in the field, I'm leaving the compile-time debug
-   features enabled, and disable them "runtime". That allows me to
-   instruct people with problems to enable debugging without requiring
-   them to recompile... 
-*/
-#define DEBUG
-
-#ifdef DEBUG
-#define sx_dprintk(f, str...)   if (sx_debug & f) printk (str)
-#else
-#define sx_dprintk(f, str...)   /* nothing */
-#endif
-
-#define func_enter()    sx_dprintk(SX_DEBUG_FLOW, "sx: enter %s\n",__func__)
-#define func_exit()     sx_dprintk(SX_DEBUG_FLOW, "sx: exit  %s\n",__func__)
-
-#define func_enter2()   sx_dprintk(SX_DEBUG_FLOW, "sx: enter %s (port %d)\n", \
-                                __func__, port->line)
-
-/* 
- *  Firmware loader driver specific routines
- *
- */
-
-static const struct file_operations sx_fw_fops = {
-        .owner = THIS_MODULE,
-        .unlocked_ioctl = sx_fw_ioctl,
-};
-
-static struct miscdevice sx_fw_device = {
-        SXCTL_MISC_MINOR, "sxctl", &sx_fw_fops
-};
-
-#ifdef SX_PARANOIA_CHECK
-
-/* This doesn't work. Who's paranoid around here? Not me! */
-
-static inline int sx_paranoia_check(struct sx_port const *port,
-                                    char *name, const char *routine)
-{
-        static const char *badmagic = KERN_ERR "sx: Warning: bad sx port magic "
-                        "number for device %s in %s\n";
-        static const char *badinfo = KERN_ERR "sx: Warning: null sx port for "
-                        "device %s in %s\n";
-
-        if (!port) {
-                printk(badinfo, name, routine);
-                return 1;
-        }
-        if (port->magic != SX_MAGIC) {
-                printk(badmagic, name, routine);
-                return 1;
-        }
-
-        return 0;
-}
-#else
-#define sx_paranoia_check(a,b,c) 0
-#endif
-
-/* The timeouts. First try 30 times as fast as possible. Then give
-   the card some time to breathe between accesses. (Otherwise the
-   processor on the card might not be able to access its OWN bus... */
-
-#define TIMEOUT_1 30
-#define TIMEOUT_2 1000000
-
-#ifdef DEBUG
-static void my_hd_io(void __iomem *p, int len)
-{
-        int i, j, ch;
-        unsigned char __iomem *addr = p;
-
-        for (i = 0; i < len; i += 16) {
-                printk("%p ", addr + i);
-                for (j = 0; j < 16; j++) {
-                        printk("%02x %s", readb(addr + j + i),
-                                        (j == 7) ? " " : "");
-                }
-                for (j = 0; j < 16; j++) {
-                        ch = readb(addr + j + i);
-                        printk("%c", (ch < 0x20) ? '.' :
-                                        ((ch > 0x7f) ? '.' : ch));
-                }
-                printk("\n");
-        }
-}
-static void my_hd(void *p, int len)
-{
-        int i, j, ch;
-        unsigned char *addr = p;
-
-        for (i = 0; i < len; i += 16) {
-                printk("%p ", addr + i);
-                for (j = 0; j < 16; j++) {
-                        printk("%02x %s", addr[j + i], (j == 7) ? " " : "");
-                }
-                for (j = 0; j < 16; j++) {
-                        ch = addr[j + i];
-                        printk("%c", (ch < 0x20) ? '.' :
-                                        ((ch > 0x7f) ? '.' : ch));
-                }
-                printk("\n");
-        }
-}
-#endif
-
-/* This needs redoing for Alpha -- REW -- Done. */
-
-static inline void write_sx_byte(struct sx_board *board, int offset, u8 byte)
-{
-        writeb(byte, board->base + offset);
-}
-
-static inline u8 read_sx_byte(struct sx_board *board, int offset)
-{
-        return readb(board->base + offset);
-}
-
-static inline void write_sx_word(struct sx_board *board, int offset, u16 word)
-{
-        writew(word, board->base + offset);
-}
-
-static inline u16 read_sx_word(struct sx_board *board, int offset)
-{
-        return readw(board->base + offset);
-}
-
-static int sx_busy_wait_eq(struct sx_board *board,
-                int offset, int mask, int correctval)
-{
-        int i;
-
-        func_enter();
-
-        for (i = 0; i < TIMEOUT_1; i++)
-                if ((read_sx_byte(board, offset) & mask) == correctval) {
-                        func_exit();
-                        return 1;
-                }
-
-        for (i = 0; i < TIMEOUT_2; i++) {
-                if ((read_sx_byte(board, offset) & mask) == correctval) {
-                        func_exit();
-                        return 1;
-                }
-                udelay(1);
-        }
-
-        func_exit();
-        return 0;
-}
-
-static int sx_busy_wait_neq(struct sx_board *board,
-                int offset, int mask, int badval)
-{
-        int i;
-
-        func_enter();
-
-        for (i = 0; i < TIMEOUT_1; i++)
-                if ((read_sx_byte(board, offset) & mask) != badval) {
-                        func_exit();
-                        return 1;
-                }
-
-        for (i = 0; i < TIMEOUT_2; i++) {
-                if ((read_sx_byte(board, offset) & mask) != badval) {
-                        func_exit();
-                        return 1;
-                }
-                udelay(1);
-        }
-
-        func_exit();
-        return 0;
-}
-
-/* 5.6.4 of 6210028 r2.3 */
-static int sx_reset(struct sx_board *board)
-{
-        func_enter();
-
-        if (IS_SX_BOARD(board)) {
-
-                write_sx_byte(board, SX_CONFIG, 0);
-                write_sx_byte(board, SX_RESET, 1); /* Value doesn't matter */
-
-                if (!sx_busy_wait_eq(board, SX_RESET_STATUS, 1, 0)) {
-                        printk(KERN_INFO "sx: Card doesn't respond to "
-                                        "reset...\n");
-                        return 0;
-                }
-        } else if (IS_EISA_BOARD(board)) {
-                outb(board->irq << 4, board->eisa_base + 0xc02);
-        } else if (IS_SI1_BOARD(board)) {
-                write_sx_byte(board, SI1_ISA_RESET, 0); /*value doesn't matter*/
-        } else {
-                /* Gory details of the SI/ISA board */
-                write_sx_byte(board, SI2_ISA_RESET, SI2_ISA_RESET_SET);
-                write_sx_byte(board, SI2_ISA_IRQ11, SI2_ISA_IRQ11_CLEAR);
-                write_sx_byte(board, SI2_ISA_IRQ12, SI2_ISA_IRQ12_CLEAR);
-                write_sx_byte(board, SI2_ISA_IRQ15, SI2_ISA_IRQ15_CLEAR);
-                write_sx_byte(board, SI2_ISA_INTCLEAR, SI2_ISA_INTCLEAR_CLEAR);
-                write_sx_byte(board, SI2_ISA_IRQSET, SI2_ISA_IRQSET_CLEAR);
-        }
-
-        func_exit();
-        return 1;
-}
-
-/* This doesn't work on machines where "NULL" isn't 0 */
-/* If you have one of those, someone will need to write 
-   the equivalent of this, which will amount to about 3 lines. I don't
-   want to complicate this right now. -- REW
-   (See, I do write comments every now and then :-) */
-#define OFFSETOF(strct, elem)   ((long)&(((struct strct *)NULL)->elem))
-
-#define CHAN_OFFSET(port,elem)  (port->ch_base + OFFSETOF (_SXCHANNEL, elem))
-#define MODU_OFFSET(board,addr,elem)    (addr + OFFSETOF (_SXMODULE, elem))
-#define  BRD_OFFSET(board,elem) (OFFSETOF (_SXCARD, elem))
-
-#define sx_write_channel_byte(port, elem, val) \
-        write_sx_byte (port->board, CHAN_OFFSET (port, elem), val)
-
-#define sx_read_channel_byte(port, elem) \
-        read_sx_byte (port->board, CHAN_OFFSET (port, elem))
-
-#define sx_write_channel_word(port, elem, val) \
-        write_sx_word (port->board, CHAN_OFFSET (port, elem), val)
-
-#define sx_read_channel_word(port, elem) \
-        read_sx_word (port->board, CHAN_OFFSET (port, elem))
-
-#define sx_write_module_byte(board, addr, elem, val) \
-        write_sx_byte (board, MODU_OFFSET (board, addr, elem), val)
-
-#define sx_read_module_byte(board, addr, elem) \
-        read_sx_byte (board, MODU_OFFSET (board, addr, elem))
-
-#define sx_write_module_word(board, addr, elem, val) \
-        write_sx_word (board, MODU_OFFSET (board, addr, elem), val)
-
-#define sx_read_module_word(board, addr, elem) \
-        read_sx_word (board, MODU_OFFSET (board, addr, elem))
-
-#define sx_write_board_byte(board, elem, val) \
-        write_sx_byte (board, BRD_OFFSET (board, elem), val)
-
-#define sx_read_board_byte(board, elem) \
-        read_sx_byte (board, BRD_OFFSET (board, elem))
-
-#define sx_write_board_word(board, elem, val) \
-        write_sx_word (board, BRD_OFFSET (board, elem), val)
-
-#define sx_read_board_word(board, elem) \
-        read_sx_word (board, BRD_OFFSET (board, elem))
-
-static int sx_start_board(struct sx_board *board)
-{
-        if (IS_SX_BOARD(board)) {
-                write_sx_byte(board, SX_CONFIG, SX_CONF_BUSEN);
-        } else if (IS_EISA_BOARD(board)) {
-                write_sx_byte(board, SI2_EISA_OFF, SI2_EISA_VAL);
-                outb((board->irq << 4) | 4, board->eisa_base + 0xc02);
-        } else if (IS_SI1_BOARD(board)) {
-                write_sx_byte(board, SI1_ISA_RESET_CLEAR, 0);
-                write_sx_byte(board, SI1_ISA_INTCL, 0);
-        } else {
-                /* Don't bug me about the clear_set. 
-                   I haven't the foggiest idea what it's about -- REW */
-                write_sx_byte(board, SI2_ISA_RESET, SI2_ISA_RESET_CLEAR);
-                write_sx_byte(board, SI2_ISA_INTCLEAR, SI2_ISA_INTCLEAR_SET);
-        }
-        return 1;
-}
-
-#define SX_IRQ_REG_VAL(board) \
-        ((board->flags & SX_ISA_BOARD) ? (board->irq << 4) : 0)
-
-/* Note. The SX register is write-only. Therefore, we have to enable the
-   bus too. This is a no-op, if you don't mess with this driver... */
-static int sx_start_interrupts(struct sx_board *board)
-{
-
-        /* Don't call this with board->irq == 0 */
-
-        if (IS_SX_BOARD(board)) {
-                write_sx_byte(board, SX_CONFIG, SX_IRQ_REG_VAL(board) |
-                                SX_CONF_BUSEN | SX_CONF_HOSTIRQ);
-        } else if (IS_EISA_BOARD(board)) {
-                inb(board->eisa_base + 0xc03);
-        } else if (IS_SI1_BOARD(board)) {
-                write_sx_byte(board, SI1_ISA_INTCL, 0);
-                write_sx_byte(board, SI1_ISA_INTCL_CLEAR, 0);
-        } else {
-                switch (board->irq) {
-                case 11:
-                        write_sx_byte(board, SI2_ISA_IRQ11, SI2_ISA_IRQ11_SET);
-                        break;
-                case 12:
-                        write_sx_byte(board, SI2_ISA_IRQ12, SI2_ISA_IRQ12_SET);
-                        break;
-                case 15:
-                        write_sx_byte(board, SI2_ISA_IRQ15, SI2_ISA_IRQ15_SET);
-                        break;
-                default:
-                        printk(KERN_INFO "sx: SI/XIO card doesn't support "
-                                        "interrupt %d.\n", board->irq);
-                        return 0;
-                }
-                write_sx_byte(board, SI2_ISA_INTCLEAR, SI2_ISA_INTCLEAR_SET);
-        }
-
-        return 1;
-}
-
-static int sx_send_command(struct sx_port *port,
-                int command, int mask, int newstat)
-{
-        func_enter2();
-        write_sx_byte(port->board, CHAN_OFFSET(port, hi_hstat), command);
-        func_exit();
-        return sx_busy_wait_eq(port->board, CHAN_OFFSET(port, hi_hstat), mask,
-                        newstat);
-}
-
-static char *mod_type_s(int module_type)
-{
-        switch (module_type) {
-        case TA4:
-                return "TA4";
-        case TA8:
-                return "TA8";
-        case TA4_ASIC:
-                return "TA4_ASIC";
-        case TA8_ASIC:
-                return "TA8_ASIC";
-        case MTA_CD1400:
-                return "MTA_CD1400";
-        case SXDC:
-                return "SXDC";
-        default:
-                return "Unknown/invalid";
-        }
-}
-
-static char *pan_type_s(int pan_type)
-{
-        switch (pan_type) {
-        case MOD_RS232DB25:
-                return "MOD_RS232DB25";
-        case MOD_RS232RJ45:
-                return "MOD_RS232RJ45";
-        case MOD_RS422DB25:
-                return "MOD_RS422DB25";
-        case MOD_PARALLEL:
-                return "MOD_PARALLEL";
-        case MOD_2_RS232DB25:
-                return "MOD_2_RS232DB25";
-        case MOD_2_RS232RJ45:
-                return "MOD_2_RS232RJ45";
-        case MOD_2_RS422DB25:
-                return "MOD_2_RS422DB25";
-        case MOD_RS232DB25MALE:
-                return "MOD_RS232DB25MALE";
-        case MOD_2_PARALLEL:
-                return "MOD_2_PARALLEL";
-        case MOD_BLANK:
-                return "empty";
-        default:
-                return "invalid";
-        }
-}
-
-static int mod_compat_type(int module_type)
-{
-        return module_type >> 4;
-}
-
-static void sx_reconfigure_port(struct sx_port *port)
-{
-        if (sx_read_channel_byte(port, hi_hstat) == HS_IDLE_OPEN) {
-                if (sx_send_command(port, HS_CONFIG, -1, HS_IDLE_OPEN) != 1) {
-                        printk(KERN_WARNING "sx: Sent reconfigure command, but "
-                                        "card didn't react.\n");
-                }
-        } else {
-                sx_dprintk(SX_DEBUG_TERMIOS, "sx: Not sending reconfigure: "
-                                "port isn't open (%02x).\n",
-                                sx_read_channel_byte(port, hi_hstat));
-        }
-}
-
-static void sx_setsignals(struct sx_port *port, int dtr, int rts)
-{
-        int t;
-        func_enter2();
-
-        t = sx_read_channel_byte(port, hi_op);
-        if (dtr >= 0)
-                t = dtr ? (t | OP_DTR) : (t & ~OP_DTR);
-        if (rts >= 0)
-                t = rts ? (t | OP_RTS) : (t & ~OP_RTS);
-        sx_write_channel_byte(port, hi_op, t);
-        sx_dprintk(SX_DEBUG_MODEMSIGNALS, "setsignals: %d/%d\n", dtr, rts);
-
-        func_exit();
-}
-
-static int sx_getsignals(struct sx_port *port)
-{
-        int i_stat, o_stat;
-
-        o_stat = sx_read_channel_byte(port, hi_op);
-        i_stat = sx_read_channel_byte(port, hi_ip);
-
-        sx_dprintk(SX_DEBUG_MODEMSIGNALS, "getsignals: %d/%d  (%d/%d) "
-                        "%02x/%02x\n",
-                        (o_stat & OP_DTR) != 0, (o_stat & OP_RTS) != 0,
-                        port->c_dcd, tty_port_carrier_raised(&port->gs.port),
-                        sx_read_channel_byte(port, hi_ip),
-                        sx_read_channel_byte(port, hi_state));
-
-        return (((o_stat & OP_DTR) ? TIOCM_DTR : 0) |
-                ((o_stat & OP_RTS) ? TIOCM_RTS : 0) |
-                ((i_stat & IP_CTS) ? TIOCM_CTS : 0) |
-                ((i_stat & IP_DCD) ? TIOCM_CAR : 0) |
-                ((i_stat & IP_DSR) ? TIOCM_DSR : 0) |
-                ((i_stat & IP_RI) ? TIOCM_RNG : 0));
-}
-
-static void sx_set_baud(struct sx_port *port)
-{
-        int t;
-
-        if (port->board->ta_type == MOD_SXDC) {
-                switch (port->gs.baud) {
-                        /* Save some typing work... */
-#define e(x) case x: t = BAUD_ ## x; break
-                        e(50);
-                        e(75);
-                        e(110);
-                        e(150);
-                        e(200);
-                        e(300);
-                        e(600);
-                        e(1200);
-                        e(1800);
-                        e(2000);
-                        e(2400);
-                        e(4800);
-                        e(7200);
-                        e(9600);
-                        e(14400);
-                        e(19200);
-                        e(28800);
-                        e(38400);
-                        e(56000);
-                        e(57600);
-                        e(64000);
-                        e(76800);
-                        e(115200);
-                        e(128000);
-                        e(150000);
-                        e(230400);
-                        e(256000);
-                        e(460800);
-                        e(921600);
-                case 134:
-                        t = BAUD_134_5;
-                        break;
-                case 0:
-                        t = -1;
-                        break;
-                default:
-                        /* Can I return "invalid"? */
-                        t = BAUD_9600;
-                        printk(KERN_INFO "sx: unsupported baud rate: %d.\n",
-                                        port->gs.baud);
-                        break;
-                }
-#undef e
-                if (t > 0) {
-/* The baud rate is not set to 0, so we're enabeling DTR... -- REW */
-                        sx_setsignals(port, 1, -1);
-                        /* XXX This is not TA & MTA compatible */
-                        sx_write_channel_byte(port, hi_csr, 0xff);
-
-                        sx_write_channel_byte(port, hi_txbaud, t);
-                        sx_write_channel_byte(port, hi_rxbaud, t);
-                } else {
-                        sx_setsignals(port, 0, -1);
-                }
-        } else {
-                switch (port->gs.baud) {
-#define e(x) case x: t = CSR_ ## x; break
-                        e(75);
-                        e(150);
-                        e(300);
-                        e(600);
-                        e(1200);
-                        e(2400);
-                        e(4800);
-                        e(1800);
-                        e(9600);
-                        e(19200);
-                        e(57600);
-                        e(38400);
-/* TA supports 110, but not 115200, MTA supports 115200, but not 110 */
-                case 110:
-                        if (port->board->ta_type == MOD_TA) {
-                                t = CSR_110;
-                                break;
-                        } else {
-                                t = CSR_9600;
-                                printk(KERN_INFO "sx: Unsupported baud rate: "
-                                                "%d.\n", port->gs.baud);
-                                break;
-                        }
-                case 115200:
-                        if (port->board->ta_type == MOD_TA) {
-                                t = CSR_9600;
-                                printk(KERN_INFO "sx: Unsupported baud rate: "
-                                                "%d.\n", port->gs.baud);
-                                break;
-                        } else {
-                                t = CSR_110;
-                                break;
-                        }
-                case 0:
-                        t = -1;
-                        break;
-                default:
-                        t = CSR_9600;
-                        printk(KERN_INFO "sx: Unsupported baud rate: %d.\n",
-                                        port->gs.baud);
-                        break;
-                }
-#undef e
-                if (t >= 0) {
-                        sx_setsignals(port, 1, -1);
-                        sx_write_channel_byte(port, hi_csr, t * 0x11);
-                } else {
-                        sx_setsignals(port, 0, -1);
-                }
-        }
-}
-
-/* Simon Allen's version of this routine was 225 lines long. 85 is a lot
-   better. -- REW */
-
-static int sx_set_real_termios(void *ptr)
-{
-        struct sx_port *port = ptr;
-
-        func_enter2();
-
-        if (!port->gs.port.tty)
-                return 0;
-
-        /* What is this doing here? -- REW
-           Ha! figured it out. It is to allow you to get DTR active again
-           if you've dropped it with stty 0. Moved to set_baud, where it
-           belongs (next to the drop dtr if baud == 0) -- REW */
-        /* sx_setsignals (port, 1, -1); */
-
-        sx_set_baud(port);
-
-#define CFLAG port->gs.port.tty->termios->c_cflag
-        sx_write_channel_byte(port, hi_mr1,
-                        (C_PARENB(port->gs.port.tty) ? MR1_WITH : MR1_NONE) |
-                        (C_PARODD(port->gs.port.tty) ? MR1_ODD : MR1_EVEN) |
-                        (C_CRTSCTS(port->gs.port.tty) ? MR1_RTS_RXFLOW : 0) |
-                        (((CFLAG & CSIZE) == CS8) ? MR1_8_BITS : 0) |
-                        (((CFLAG & CSIZE) == CS7) ? MR1_7_BITS : 0) |
-                        (((CFLAG & CSIZE) == CS6) ? MR1_6_BITS : 0) |
-                        (((CFLAG & CSIZE) == CS5) ? MR1_5_BITS : 0));
-
-        sx_write_channel_byte(port, hi_mr2,
-                        (C_CRTSCTS(port->gs.port.tty) ? MR2_CTS_TXFLOW : 0) |
-                        (C_CSTOPB(port->gs.port.tty) ? MR2_2_STOP :
-                        MR2_1_STOP));
-
-        switch (CFLAG & CSIZE) {
-        case CS8:
-                sx_write_channel_byte(port, hi_mask, 0xff);
-                break;
-        case CS7:
-                sx_write_channel_byte(port, hi_mask, 0x7f);
-                break;
-        case CS6:
-                sx_write_channel_byte(port, hi_mask, 0x3f);
-                break;
-        case CS5:
-                sx_write_channel_byte(port, hi_mask, 0x1f);
-                break;
-        default:
-                printk(KERN_INFO "sx: Invalid wordsize: %u\n",
-                        (unsigned int)CFLAG & CSIZE);
-                break;
-        }
-
-        sx_write_channel_byte(port, hi_prtcl,
-                        (I_IXON(port->gs.port.tty) ? SP_TXEN : 0) |
-                        (I_IXOFF(port->gs.port.tty) ? SP_RXEN : 0) |
-                        (I_IXANY(port->gs.port.tty) ? SP_TANY : 0) | SP_DCEN);
-
-        sx_write_channel_byte(port, hi_break,
-                        (I_IGNBRK(port->gs.port.tty) ? BR_IGN : 0 |
-                        I_BRKINT(port->gs.port.tty) ? BR_INT : 0));
-
-        sx_write_channel_byte(port, hi_txon, START_CHAR(port->gs.port.tty));
-        sx_write_channel_byte(port, hi_rxon, START_CHAR(port->gs.port.tty));
-        sx_write_channel_byte(port, hi_txoff, STOP_CHAR(port->gs.port.tty));
-        sx_write_channel_byte(port, hi_rxoff, STOP_CHAR(port->gs.port.tty));
-
-        sx_reconfigure_port(port);
-
-        /* Tell line discipline whether we will do input cooking */
-        if (I_OTHER(port->gs.port.tty)) {
-                clear_bit(TTY_HW_COOK_IN, &port->gs.port.tty->flags);
-        } else {
-                set_bit(TTY_HW_COOK_IN, &port->gs.port.tty->flags);
-        }
-        sx_dprintk(SX_DEBUG_TERMIOS, "iflags: %x(%d) ",
-                        (unsigned int)port->gs.port.tty->termios->c_iflag,
-                        I_OTHER(port->gs.port.tty));
-
-/* Tell line discipline whether we will do output cooking.
- * If OPOST is set and no other output flags are set then we can do output
- * processing.  Even if only *one* other flag in the O_OTHER group is set
- * we do cooking in software.
- */
-        if (O_OPOST(port->gs.port.tty) && !O_OTHER(port->gs.port.tty)) {
-                set_bit(TTY_HW_COOK_OUT, &port->gs.port.tty->flags);
-        } else {
-                clear_bit(TTY_HW_COOK_OUT, &port->gs.port.tty->flags);
-        }
-        sx_dprintk(SX_DEBUG_TERMIOS, "oflags: %x(%d)\n",
-                        (unsigned int)port->gs.port.tty->termios->c_oflag,
-                        O_OTHER(port->gs.port.tty));
-        /* port->c_dcd = sx_get_CD (port); */
-        func_exit();
-        return 0;
-}
-
-/* ********************************************************************** *
- *                   the interrupt related routines                       *
- * ********************************************************************** */
-
-/* Note:
-   Other drivers use the macro "MIN" to calculate how much to copy.
-   This has the disadvantage that it will evaluate parts twice. That's
-   expensive when it's IO (and the compiler cannot optimize those away!).
-   Moreover, I'm not sure that you're race-free. 
-
-   I assign a value, and then only allow the value to decrease. This
-   is always safe. This makes the code a few lines longer, and you
-   know I'm dead against that, but I think it is required in this
-   case.  */
-
-static void sx_transmit_chars(struct sx_port *port)
-{
-        int c;
-        int tx_ip;
-        int txroom;
-
-        func_enter2();
-        sx_dprintk(SX_DEBUG_TRANSMIT, "Port %p: transmit %d chars\n",
-                        port, port->gs.xmit_cnt);
-
-        if (test_and_set_bit(SX_PORT_TRANSMIT_LOCK, &port->locks)) {
-                return;
-        }
-
-        while (1) {
-                c = port->gs.xmit_cnt;
-
-                sx_dprintk(SX_DEBUG_TRANSMIT, "Copying %d ", c);
-                tx_ip = sx_read_channel_byte(port, hi_txipos);
-
-                /* Took me 5 minutes to deduce this formula. 
-                   Luckily it is literally in the manual in section 6.5.4.3.5 */
-                txroom = (sx_read_channel_byte(port, hi_txopos) - tx_ip - 1) &
-                                0xff;
-
-                /* Don't copy more bytes than there is room for in the buffer */
-                if (c > txroom)
-                        c = txroom;
-                sx_dprintk(SX_DEBUG_TRANSMIT, " %d(%d) ", c, txroom);
-
-                /* Don't copy past the end of the hardware transmit buffer */
-                if (c > 0x100 - tx_ip)
-                        c = 0x100 - tx_ip;
-
-                sx_dprintk(SX_DEBUG_TRANSMIT, " %d(%d) ", c, 0x100 - tx_ip);
-
-                /* Don't copy pas the end of the source buffer */
-                if (c > SERIAL_XMIT_SIZE - port->gs.xmit_tail)
-                        c = SERIAL_XMIT_SIZE - port->gs.xmit_tail;
-
-                sx_dprintk(SX_DEBUG_TRANSMIT, " %d(%ld) \n",
-                                c, SERIAL_XMIT_SIZE - port->gs.xmit_tail);
-
-                /* If for one reason or another, we can't copy more data, we're
-                   done! */
-                if (c == 0)
-                        break;
-
-                memcpy_toio(port->board->base + CHAN_OFFSET(port, hi_txbuf) +
-                        tx_ip, port->gs.xmit_buf + port->gs.xmit_tail, c);
-
-                /* Update the pointer in the card */
-                sx_write_channel_byte(port, hi_txipos, (tx_ip + c) & 0xff);
-
-                /* Update the kernel buffer end */
-                port->gs.xmit_tail = (port->gs.xmit_tail + c) &
-                                (SERIAL_XMIT_SIZE - 1);
-
-                /* This one last. (this is essential)
-                   It would allow others to start putting more data into the
-                   buffer! */
-                port->gs.xmit_cnt -= c;
-        }
-
-        if (port->gs.xmit_cnt == 0) {
-                sx_disable_tx_interrupts(port);
-        }
-
-        if ((port->gs.xmit_cnt <= port->gs.wakeup_chars) && port->gs.port.tty) {
-                tty_wakeup(port->gs.port.tty);
-                sx_dprintk(SX_DEBUG_TRANSMIT, "Waking up.... ldisc (%d)....\n",
-                                port->gs.wakeup_chars);
-        }
-
-        clear_bit(SX_PORT_TRANSMIT_LOCK, &port->locks);
-        func_exit();
-}
-
-/* Note the symmetry between receiving chars and transmitting them!
-   Note: The kernel should have implemented both a receive buffer and
-   a transmit buffer. */
-
-/* Inlined: Called only once. Remove the inline when you add another call */
-static inline void sx_receive_chars(struct sx_port *port)
-{
-        int c;
-        int rx_op;
-        struct tty_struct *tty;
-        int copied = 0;
-        unsigned char *rp;
-
-        func_enter2();
-        tty = port->gs.port.tty;
-        while (1) {
-                rx_op = sx_read_channel_byte(port, hi_rxopos);
-                c = (sx_read_channel_byte(port, hi_rxipos) - rx_op) & 0xff;
-
-                sx_dprintk(SX_DEBUG_RECEIVE, "rxop=%d, c = %d.\n", rx_op, c);
-
-                /* Don't copy past the end of the hardware receive buffer */
-                if (rx_op + c > 0x100)
-                        c = 0x100 - rx_op;
-
-                sx_dprintk(SX_DEBUG_RECEIVE, "c = %d.\n", c);
-
-                /* Don't copy more bytes than there is room for in the buffer */
-
-                c = tty_prepare_flip_string(tty, &rp, c);
-
-                sx_dprintk(SX_DEBUG_RECEIVE, "c = %d.\n", c);
-
-                /* If for one reason or another, we can't copy more data, we're done! */
-                if (c == 0)
-                        break;
-
-                sx_dprintk(SX_DEBUG_RECEIVE, "Copying over %d chars. First is "
-                                "%d at %lx\n", c, read_sx_byte(port->board,
-                                        CHAN_OFFSET(port, hi_rxbuf) + rx_op),
-                                CHAN_OFFSET(port, hi_rxbuf));
-                memcpy_fromio(rp, port->board->base +
-                                CHAN_OFFSET(port, hi_rxbuf) + rx_op, c);
-
-                /* This one last. ( Not essential.)
-                   It allows the card to start putting more data into the
-                   buffer!
-                   Update the pointer in the card */
-                sx_write_channel_byte(port, hi_rxopos, (rx_op + c) & 0xff);
-
-                copied += c;
-        }
-        if (copied) {
-                struct timeval tv;
-
-                do_gettimeofday(&tv);
-                sx_dprintk(SX_DEBUG_RECEIVE, "pushing flipq port %d (%3d "
-                                "chars): %d.%06d  (%d/%d)\n", port->line,
-                                copied, (int)(tv.tv_sec % 60), (int)tv.tv_usec,
-                                tty->raw, tty->real_raw);
-
-                /* Tell the rest of the system the news. Great news. New
-                   characters! */
-                tty_flip_buffer_push(tty);
-                /*    tty_schedule_flip (tty); */
-        }
-
-        func_exit();
-}
-
-/* Inlined: it is called only once. Remove the inline if you add another 
-   call */
-static inline void sx_check_modem_signals(struct sx_port *port)
-{
-        int hi_state;
-        int c_dcd;
-
-        hi_state = sx_read_channel_byte(port, hi_state);
-        sx_dprintk(SX_DEBUG_MODEMSIGNALS, "Checking modem signals (%d/%d)\n",
-                        port->c_dcd, tty_port_carrier_raised(&port->gs.port));
-
-        if (hi_state & ST_BREAK) {
-                hi_state &= ~ST_BREAK;
-                sx_dprintk(SX_DEBUG_MODEMSIGNALS, "got a break.\n");
-                sx_write_channel_byte(port, hi_state, hi_state);
-                gs_got_break(&port->gs);
-        }
-        if (hi_state & ST_DCD) {
-                hi_state &= ~ST_DCD;
-                sx_dprintk(SX_DEBUG_MODEMSIGNALS, "got a DCD change.\n");
-                sx_write_channel_byte(port, hi_state, hi_state);
-                c_dcd = tty_port_carrier_raised(&port->gs.port);
-                sx_dprintk(SX_DEBUG_MODEMSIGNALS, "DCD is now %d\n", c_dcd);
-                if (c_dcd != port->c_dcd) {
-                        port->c_dcd = c_dcd;
-                        if (tty_port_carrier_raised(&port->gs.port)) {
-                                /* DCD went UP */
-                                if ((sx_read_channel_byte(port, hi_hstat) !=
-                                                HS_IDLE_CLOSED) &&
-                                                !(port->gs.port.tty->termios->
-                                                        c_cflag & CLOCAL)) {
-                                        /* Are we blocking in open? */
-                                        sx_dprintk(SX_DEBUG_MODEMSIGNALS, "DCD "
-                                                "active, unblocking open\n");
-                                        wake_up_interruptible(&port->gs.port.
-                                                        open_wait);
-                                } else {
-                                        sx_dprintk(SX_DEBUG_MODEMSIGNALS, "DCD "
-                                                "raised. Ignoring.\n");
-                                }
-                        } else {
-                                /* DCD went down! */
-                                if (!(port->gs.port.tty->termios->c_cflag & CLOCAL)){
-                                        sx_dprintk(SX_DEBUG_MODEMSIGNALS, "DCD "
-                                                "dropped. hanging up....\n");
-                                        tty_hangup(port->gs.port.tty);
-                                } else {
-                                        sx_dprintk(SX_DEBUG_MODEMSIGNALS, "DCD "
-                                                "dropped. ignoring.\n");
-                                }
-                        }
-                } else {
-                        sx_dprintk(SX_DEBUG_MODEMSIGNALS, "Hmmm. card told us "
-                                "DCD changed, but it didn't.\n");
-                }
-        }
-}
-
-/* This is what an interrupt routine should look like. 
- * Small, elegant, clear.
- */
-
-static irqreturn_t sx_interrupt(int irq, void *ptr)
-{
-        struct sx_board *board = ptr;
-        struct sx_port *port;
-        int i;
-
-        func_enter();
-        sx_dprintk(SX_DEBUG_FLOW, "sx: enter sx_interrupt (%d/%d)\n", irq,
-                        board->irq);
-
-        /* AAargh! The order in which to do these things is essential and
-           not trivial. 
-
-           - Rate limit goes before "recursive". Otherwise a series of
-           recursive calls will hang the machine in the interrupt routine.
-
-           - hardware twiddling goes before "recursive". Otherwise when we
-           poll the card, and a recursive interrupt happens, we won't
-           ack the card, so it might keep on interrupting us. (especially
-           level sensitive interrupt systems like PCI).
-
-           - Rate limit goes before hardware twiddling. Otherwise we won't
-           catch a card that has gone bonkers.
-
-           - The "initialized" test goes after the hardware twiddling. Otherwise
-           the card will stick us in the interrupt routine again.
-
-           - The initialized test goes before recursive. 
-         */
-
-#ifdef IRQ_RATE_LIMIT
-        /* Aaargh! I'm ashamed. This costs more lines-of-code than the
-           actual interrupt routine!. (Well, used to when I wrote that
-           comment) */
-        {
-                static int lastjif;
-                static int nintr = 0;
-
-                if (lastjif == jiffies) {
-                        if (++nintr > IRQ_RATE_LIMIT) {
-                                free_irq(board->irq, board);
-                                printk(KERN_ERR "sx: Too many interrupts. "
-                                                "Turning off interrupt %d.\n",
-                                                board->irq);
-                        }
-                } else {
-                        lastjif = jiffies;
-                        nintr = 0;
-                }
-        }
-#endif
-
-        if (board->irq == irq) {
-                /* Tell the card we've noticed the interrupt. */
-
-                sx_write_board_word(board, cc_int_pending, 0);
-                if (IS_SX_BOARD(board)) {
-                        write_sx_byte(board, SX_RESET_IRQ, 1);
-                } else if (IS_EISA_BOARD(board)) {
-                        inb(board->eisa_base + 0xc03);
-                        write_sx_word(board, 8, 0);
-                } else {
-                        write_sx_byte(board, SI2_ISA_INTCLEAR,
-                                        SI2_ISA_INTCLEAR_CLEAR);
-                        write_sx_byte(board, SI2_ISA_INTCLEAR,
-                                        SI2_ISA_INTCLEAR_SET);
-                }
-        }
-
-        if (!sx_initialized)
-                return IRQ_HANDLED;
-        if (!(board->flags & SX_BOARD_INITIALIZED))
-                return IRQ_HANDLED;
-
-        if (test_and_set_bit(SX_BOARD_INTR_LOCK, &board->locks)) {
-                printk(KERN_ERR "Recursive interrupt! (%d)\n", board->irq);
-                return IRQ_HANDLED;
-        }
-
-        for (i = 0; i < board->nports; i++) {
-                port = &board->ports[i];
-                if (port->gs.port.flags & GS_ACTIVE) {
-                        if (sx_read_channel_byte(port, hi_state)) {
-                                sx_dprintk(SX_DEBUG_INTERRUPTS, "Port %d: "
-                                                "modem signal change?... \n",i);
-                                sx_check_modem_signals(port);
-                        }
-                        if (port->gs.xmit_cnt) {
-                                sx_transmit_chars(port);
-                        }
-                        if (!(port->gs.port.flags & SX_RX_THROTTLE)) {
-                                sx_receive_chars(port);
-                        }
-                }
-        }
-
-        clear_bit(SX_BOARD_INTR_LOCK, &board->locks);
-
-        sx_dprintk(SX_DEBUG_FLOW, "sx: exit sx_interrupt (%d/%d)\n", irq,
-                        board->irq);
-        func_exit();
-        return IRQ_HANDLED;
-}
-
-static void sx_pollfunc(unsigned long data)
-{
-        struct sx_board *board = (struct sx_board *)data;
-
-        func_enter();
-
-        sx_interrupt(0, board);
-
-        mod_timer(&board->timer, jiffies + sx_poll);
-        func_exit();
-}
-
-/* ********************************************************************** *
- *                Here are the routines that actually                     *
- *              interface with the generic_serial driver                  *
- * ********************************************************************** */
-
-/* Ehhm. I don't know how to fiddle with interrupts on the SX card. --REW */
-/* Hmm. Ok I figured it out. You don't.  */
-
-static void sx_disable_tx_interrupts(void *ptr)
-{
-        struct sx_port *port = ptr;
-        func_enter2();
-
-        port->gs.port.flags &= ~GS_TX_INTEN;
-
-        func_exit();
-}
-
-static void sx_enable_tx_interrupts(void *ptr)
-{
-        struct sx_port *port = ptr;
-        int data_in_buffer;
-        func_enter2();
-
-        /* First transmit the characters that we're supposed to */
-        sx_transmit_chars(port);
-
-        /* The sx card will never interrupt us if we don't fill the buffer
-           past 25%. So we keep considering interrupts off if that's the case. */
-        data_in_buffer = (sx_read_channel_byte(port, hi_txipos) -
-                          sx_read_channel_byte(port, hi_txopos)) & 0xff;
-
-        /* XXX Must be "HIGH_WATER" for SI card according to doc. */
-        if (data_in_buffer < LOW_WATER)
-                port->gs.port.flags &= ~GS_TX_INTEN;
-
-        func_exit();
-}
-
-static void sx_disable_rx_interrupts(void *ptr)
-{
-        /*  struct sx_port *port = ptr; */
-        func_enter();
-
-        func_exit();
-}
-
-static void sx_enable_rx_interrupts(void *ptr)
-{
-        /*  struct sx_port *port = ptr; */
-        func_enter();
-
-        func_exit();
-}
-
-/* Jeez. Isn't this simple? */
-static int sx_carrier_raised(struct tty_port *port)
-{
-        struct sx_port *sp = container_of(port, struct sx_port, gs.port);
-        return ((sx_read_channel_byte(sp, hi_ip) & IP_DCD) != 0);
-}
-
-/* Jeez. Isn't this simple? */
-static int sx_chars_in_buffer(void *ptr)
-{
-        struct sx_port *port = ptr;
-        func_enter2();
-
-        func_exit();
-        return ((sx_read_channel_byte(port, hi_txipos) -
-                 sx_read_channel_byte(port, hi_txopos)) & 0xff);
-}
-
-static void sx_shutdown_port(void *ptr)
-{
-        struct sx_port *port = ptr;
-
-        func_enter();
-
-        port->gs.port.flags &= ~GS_ACTIVE;
-        if (port->gs.port.tty && (port->gs.port.tty->termios->c_cflag & HUPCL)) {
-                sx_setsignals(port, 0, 0);
-                sx_reconfigure_port(port);
-        }
-
-        func_exit();
-}
-
-/* ********************************************************************** *
- *                Here are the routines that actually                     *
- *               interface with the rest of the system                    *
- * ********************************************************************** */
-
-static int sx_open(struct tty_struct *tty, struct file *filp)
-{
-        struct sx_port *port;
-        int retval, line;
-        unsigned long flags;
-
-        func_enter();
-
-        if (!sx_initialized) {
-                return -EIO;
-        }
-
-        line = tty->index;
-        sx_dprintk(SX_DEBUG_OPEN, "%d: opening line %d. tty=%p ctty=%p, "
-                        "np=%d)\n", task_pid_nr(current), line, tty,
-                        current->signal->tty, sx_nports);
-
-        if ((line < 0) || (line >= SX_NPORTS) || (line >= sx_nports))
-                return -ENODEV;
-
-        port = &sx_ports[line];
-        port->c_dcd = 0; /* Make sure that the first interrupt doesn't detect a
-                            1 -> 0 transition. */
-
-        sx_dprintk(SX_DEBUG_OPEN, "port = %p c_dcd = %d\n", port, port->c_dcd);
-
-        spin_lock_irqsave(&port->gs.driver_lock, flags);
-
-        tty->driver_data = port;
-        port->gs.port.tty = tty;
-        port->gs.port.count++;
-        spin_unlock_irqrestore(&port->gs.driver_lock, flags);
-
-        sx_dprintk(SX_DEBUG_OPEN, "starting port\n");
-
-        /*
-         * Start up serial port
-         */
-        retval = gs_init_port(&port->gs);
-        sx_dprintk(SX_DEBUG_OPEN, "done gs_init\n");
-        if (retval) {
-                port->gs.port.count--;
-                return retval;
-        }
-
-        port->gs.port.flags |= GS_ACTIVE;
-        if (port->gs.port.count <= 1)
-                sx_setsignals(port, 1, 1);
-
-#if 0
-        if (sx_debug & SX_DEBUG_OPEN)
-                my_hd(port, sizeof(*port));
-#else
-        if (sx_debug & SX_DEBUG_OPEN)
-                my_hd_io(port->board->base + port->ch_base, sizeof(*port));
-#endif
-
-        if (port->gs.port.count <= 1) {
-                if (sx_send_command(port, HS_LOPEN, -1, HS_IDLE_OPEN) != 1) {
-                        printk(KERN_ERR "sx: Card didn't respond to LOPEN "
-                                        "command.\n");
-                        spin_lock_irqsave(&port->gs.driver_lock, flags);
-                        port->gs.port.count--;
-                        spin_unlock_irqrestore(&port->gs.driver_lock, flags);
-                        return -EIO;
-                }
-        }
-
-        retval = gs_block_til_ready(port, filp);
-        sx_dprintk(SX_DEBUG_OPEN, "Block til ready returned %d. Count=%d\n",
-                        retval, port->gs.port.count);
-
-        if (retval) {
-/*
- * Don't lower gs.port.count here because sx_close() will be called later
- */
-
-                return retval;
-        }
-        /* tty->low_latency = 1; */
-
-        port->c_dcd = sx_carrier_raised(&port->gs.port);
-        sx_dprintk(SX_DEBUG_OPEN, "at open: cd=%d\n", port->c_dcd);
-
-        func_exit();
-        return 0;
-
-}
-
-static void sx_close(void *ptr)
-{
-        struct sx_port *port = ptr;
-        /* Give the port 5 seconds to close down. */
-        int to = 5 * HZ;
-
-        func_enter();
-
-        sx_setsignals(port, 0, 0);
-        sx_reconfigure_port(port);
-        sx_send_command(port, HS_CLOSE, 0, 0);
-
-        while (to-- && (sx_read_channel_byte(port, hi_hstat) != HS_IDLE_CLOSED))
-                if (msleep_interruptible(10))
-                        break;
-        if (sx_read_channel_byte(port, hi_hstat) != HS_IDLE_CLOSED) {
-                if (sx_send_command(port, HS_FORCE_CLOSED, -1, HS_IDLE_CLOSED)
-                                != 1) {
-                        printk(KERN_ERR "sx: sent the force_close command, but "
-                                        "card didn't react\n");
-                } else
-                        sx_dprintk(SX_DEBUG_CLOSE, "sent the force_close "
-                                        "command.\n");
-        }
-
-        sx_dprintk(SX_DEBUG_CLOSE, "waited %d jiffies for close. count=%d\n",
-                        5 * HZ - to - 1, port->gs.port.count);
-
-        if (port->gs.port.count) {
-                sx_dprintk(SX_DEBUG_CLOSE, "WARNING port count:%d\n",
-                                port->gs.port.count);
-                /*printk("%s SETTING port count to zero: %p count: %d\n",
-                                __func__, port, port->gs.port.count);
-                port->gs.port.count = 0;*/
-        }
-
-        func_exit();
-}
-
-/* This is relatively thorough. But then again it is only 20 lines. */
-#define MARCHUP         for (i = min; i < max; i++)
-#define MARCHDOWN       for (i = max - 1; i >= min; i--)
-#define W0              write_sx_byte(board, i, 0x55)
-#define W1              write_sx_byte(board, i, 0xaa)
-#define R0              if (read_sx_byte(board, i) != 0x55) return 1
-#define R1              if (read_sx_byte(board, i) != 0xaa) return 1
-
-/* This memtest takes a human-noticable time. You normally only do it
-   once a boot, so I guess that it is worth it. */
-static int do_memtest(struct sx_board *board, int min, int max)
-{
-        int i;
-
-        /* This is a marchb. Theoretically, marchb catches much more than
-           simpler tests. In practise, the longer test just catches more
-           intermittent errors. -- REW
-           (For the theory behind memory testing see: 
-           Testing Semiconductor Memories by A.J. van de Goor.) */
-        MARCHUP {
-                W0;
-        }
-        MARCHUP {
-                R0;
-                W1;
-                R1;
-                W0;
-                R0;
-                W1;
-        }
-        MARCHUP {
-                R1;
-                W0;
-                W1;
-        }
-        MARCHDOWN {
-                R1;
-                W0;
-                W1;
-                W0;
-        }
-        MARCHDOWN {
-                R0;
-                W1;
-                W0;
-        }
-
-        return 0;
-}
-
-#undef MARCHUP
-#undef MARCHDOWN
-#undef W0
-#undef W1
-#undef R0
-#undef R1
-
-#define MARCHUP         for (i = min; i < max; i += 2)
-#define MARCHDOWN       for (i = max - 1; i >= min; i -= 2)
-#define W0              write_sx_word(board, i, 0x55aa)
-#define W1              write_sx_word(board, i, 0xaa55)
-#define R0              if (read_sx_word(board, i) != 0x55aa) return 1
-#define R1              if (read_sx_word(board, i) != 0xaa55) return 1
-
-#if 0
-/* This memtest takes a human-noticable time. You normally only do it
-   once a boot, so I guess that it is worth it. */
-static int do_memtest_w(struct sx_board *board, int min, int max)
-{
-        int i;
-
-        MARCHUP {
-                W0;
-        }
-        MARCHUP {
-                R0;
-                W1;
-                R1;
-                W0;
-                R0;
-                W1;
-        }
-        MARCHUP {
-                R1;
-                W0;
-                W1;
-        }
-        MARCHDOWN {
-                R1;
-                W0;
-                W1;
-                W0;
-        }
-        MARCHDOWN {
-                R0;
-                W1;
-                W0;
-        }
-
-        return 0;
-}
-#endif
-
-static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
-                                                        unsigned long arg)
-{
-        long rc = 0;
-        int __user *descr = (int __user *)arg;
-        int i;
-        static struct sx_board *board = NULL;
-        int nbytes, offset;
-        unsigned long data;
-        char *tmp;
-
-        func_enter();
-
-        if (!capable(CAP_SYS_RAWIO))
-                return -EPERM;
-
-        tty_lock();
-
-        sx_dprintk(SX_DEBUG_FIRMWARE, "IOCTL %x: %lx\n", cmd, arg);
-
-        if (!board)
-                board = &boards[0];
-        if (board->flags & SX_BOARD_PRESENT) {
-                sx_dprintk(SX_DEBUG_FIRMWARE, "Board present! (%x)\n",
-                                board->flags);
-        } else {
-                sx_dprintk(SX_DEBUG_FIRMWARE, "Board not present! (%x) all:",
-                                board->flags);
-                for (i = 0; i < SX_NBOARDS; i++)
-                        sx_dprintk(SX_DEBUG_FIRMWARE, "<%x> ", boards[i].flags);
-                sx_dprintk(SX_DEBUG_FIRMWARE, "\n");
-                rc = -EIO;
-                goto out;
-        }
-
-        switch (cmd) {
-        case SXIO_SET_BOARD:
-                sx_dprintk(SX_DEBUG_FIRMWARE, "set board to %ld\n", arg);
-                rc = -EIO;
-                if (arg >= SX_NBOARDS)
-                        break;
-                sx_dprintk(SX_DEBUG_FIRMWARE, "not out of range\n");
-                if (!(boards[arg].flags & SX_BOARD_PRESENT))
-                        break;
-                sx_dprintk(SX_DEBUG_FIRMWARE, ".. and present!\n");
-                board = &boards[arg];
-                rc = 0;
-                /* FIXME: And this does ... nothing?? */
-                break;
-        case SXIO_GET_TYPE:
-                rc = -ENOENT;   /* If we manage to miss one, return error. */
-                if (IS_SX_BOARD(board))
-                        rc = SX_TYPE_SX;
-                if (IS_CF_BOARD(board))
-                        rc = SX_TYPE_CF;
-                if (IS_SI_BOARD(board))
-                        rc = SX_TYPE_SI;
-                if (IS_SI1_BOARD(board))
-                        rc = SX_TYPE_SI;
-                if (IS_EISA_BOARD(board))
-                        rc = SX_TYPE_SI;
-                sx_dprintk(SX_DEBUG_FIRMWARE, "returning type= %ld\n", rc);
-                break;
-        case SXIO_DO_RAMTEST:
-                if (sx_initialized) {   /* Already initialized: better not ramtest the board.  */
-                        rc = -EPERM;
-                        break;
-                }
-                if (IS_SX_BOARD(board)) {
-                        rc = do_memtest(board, 0, 0x7000);
-                        if (!rc)
-                                rc = do_memtest(board, 0, 0x7000);
-                        /*if (!rc) rc = do_memtest_w (board, 0, 0x7000); */
-                } else {
-                        rc = do_memtest(board, 0, 0x7ff8);
-                        /* if (!rc) rc = do_memtest_w (board, 0, 0x7ff8); */
-                }
-                sx_dprintk(SX_DEBUG_FIRMWARE,
-                                "returning memtest result= %ld\n", rc);
-                break;
-        case SXIO_DOWNLOAD:
-                if (sx_initialized) {/* Already initialized */
-                        rc = -EEXIST;
-                        break;
-                }
-                if (!sx_reset(board)) {
-                        rc = -EIO;
-                        break;
-                }
-                sx_dprintk(SX_DEBUG_INIT, "reset the board...\n");
-
-                tmp = kmalloc(SX_CHUNK_SIZE, GFP_USER);
-                if (!tmp) {
-                        rc = -ENOMEM;
-                        break;
-                }
-                /* FIXME: check returns */
-                get_user(nbytes, descr++);
-                get_user(offset, descr++);
-                get_user(data, descr++);
-                while (nbytes && data) {
-                        for (i = 0; i < nbytes; i += SX_CHUNK_SIZE) {
-                                if (copy_from_user(tmp, (char __user *)data + i,
-                                                (i + SX_CHUNK_SIZE > nbytes) ?
-                                                nbytes - i : SX_CHUNK_SIZE)) {
-                                        kfree(tmp);
-                                        rc = -EFAULT;
-                                        goto out;
-                                }
-                                memcpy_toio(board->base2 + offset + i, tmp,
-                                                (i + SX_CHUNK_SIZE > nbytes) ?
-                                                nbytes - i : SX_CHUNK_SIZE);
-                        }
-
-                        get_user(nbytes, descr++);
-                        get_user(offset, descr++);
-                        get_user(data, descr++);
-                }
-                kfree(tmp);
-                sx_nports += sx_init_board(board);
-                rc = sx_nports;
-                break;
-        case SXIO_INIT:
-                if (sx_initialized) {   /* Already initialized */
-                        rc = -EEXIST;
-                        break;
-                }
-                /* This is not allowed until all boards are initialized... */
-                for (i = 0; i < SX_NBOARDS; i++) {
-                        if ((boards[i].flags & SX_BOARD_PRESENT) &&
-                                !(boards[i].flags & SX_BOARD_INITIALIZED)) {
-                                rc = -EIO;
-                                break;
-                        }
-                }
-                for (i = 0; i < SX_NBOARDS; i++)
-                        if (!(boards[i].flags & SX_BOARD_PRESENT))
-                                break;
-
-                sx_dprintk(SX_DEBUG_FIRMWARE, "initing portstructs, %d boards, "
-                                "%d channels, first board: %d ports\n",
-                                i, sx_nports, boards[0].nports);
-                rc = sx_init_portstructs(i, sx_nports);
-                sx_init_drivers();
-                if (rc >= 0)
-                        sx_initialized++;
-                break;
-        case SXIO_SETDEBUG:
-                sx_debug = arg;
-                break;
-        case SXIO_GETDEBUG:
-                rc = sx_debug;
-                break;
-        case SXIO_GETGSDEBUG:
-        case SXIO_SETGSDEBUG:
-                rc = -EINVAL;
-                break;
-        case SXIO_GETNPORTS:
-                rc = sx_nports;
-                break;
-        default:
-                rc = -ENOTTY;
-                break;
-        }
-out:
-        tty_unlock();
-        func_exit();
-        return rc;
-}
-
-static int sx_break(struct tty_struct *tty, int flag)
-{
-        struct sx_port *port = tty->driver_data;
-        int rv;
-
-        func_enter();
-        tty_lock();
-
-        if (flag)
-                rv = sx_send_command(port, HS_START, -1, HS_IDLE_BREAK);
-        else
-                rv = sx_send_command(port, HS_STOP, -1, HS_IDLE_OPEN);
-        if (rv != 1)
-                printk(KERN_ERR "sx: couldn't send break (%x).\n",
-                        read_sx_byte(port->board, CHAN_OFFSET(port, hi_hstat)));
-        tty_unlock();
-        func_exit();
-        return 0;
-}
-
-static int sx_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct sx_port *port = tty->driver_data;
-        return sx_getsignals(port);
-}
-
-static int sx_tiocmset(struct tty_struct *tty, struct file *file,
-                unsigned int set, unsigned int clear)
-{
-        struct sx_port *port = tty->driver_data;
-        int rts = -1, dtr = -1;
-
-        if (set & TIOCM_RTS)
-                rts = 1;
-        if (set & TIOCM_DTR)
-                dtr = 1;
-        if (clear & TIOCM_RTS)
-                rts = 0;
-        if (clear & TIOCM_DTR)
-                dtr = 0;
-
-        sx_setsignals(port, dtr, rts);
-        sx_reconfigure_port(port);
-        return 0;
-}
-
-static int sx_ioctl(struct tty_struct *tty, struct file *filp,
-                unsigned int cmd, unsigned long arg)
-{
-        int rc;
-        struct sx_port *port = tty->driver_data;
-        void __user *argp = (void __user *)arg;
-
-        /* func_enter2(); */
-
-        rc = 0;
-        tty_lock();
-        switch (cmd) {
-        case TIOCGSERIAL:
-                rc = gs_getserial(&port->gs, argp);
-                break;
-        case TIOCSSERIAL:
-                rc = gs_setserial(&port->gs, argp);
-                break;
-        default:
-                rc = -ENOIOCTLCMD;
-                break;
-        }
-        tty_unlock();
-
-        /* func_exit(); */
-        return rc;
-}
-
-/* The throttle/unthrottle scheme for the Specialix card is different
- * from other drivers and deserves some explanation. 
- * The Specialix hardware takes care of XON/XOFF
- * and CTS/RTS flow control itself.  This means that all we have to
- * do when signalled by the upper tty layer to throttle/unthrottle is
- * to make a note of it here.  When we come to read characters from the
- * rx buffers on the card (sx_receive_chars()) we look to see if the
- * upper layer can accept more (as noted here in sx_rx_throt[]). 
- * If it can't we simply don't remove chars from the cards buffer. 
- * When the tty layer can accept chars, we again note that here and when
- * sx_receive_chars() is called it will remove them from the cards buffer.
- * The card will notice that a ports buffer has drained below some low
- * water mark and will unflow control the line itself, using whatever
- * flow control scheme is in use for that port. -- Simon Allen
- */
-
-static void sx_throttle(struct tty_struct *tty)
-{
-        struct sx_port *port = tty->driver_data;
-
-        func_enter2();
-        /* If the port is using any type of input flow
-         * control then throttle the port.
-         */
-        if ((tty->termios->c_cflag & CRTSCTS) || (I_IXOFF(tty))) {
-                port->gs.port.flags |= SX_RX_THROTTLE;
-        }
-        func_exit();
-}
-
-static void sx_unthrottle(struct tty_struct *tty)
-{
-        struct sx_port *port = tty->driver_data;
-
-        func_enter2();
-        /* Always unthrottle even if flow control is not enabled on
-         * this port in case we disabled flow control while the port
-         * was throttled
-         */
-        port->gs.port.flags &= ~SX_RX_THROTTLE;
-        func_exit();
-        return;
-}
-
-/* ********************************************************************** *
- *                    Here are the initialization routines.               *
- * ********************************************************************** */
-
-static int sx_init_board(struct sx_board *board)
-{
-        int addr;
-        int chans;
-        int type;
-
-        func_enter();
-
-        /* This is preceded by downloading the download code. */
-
-        board->flags |= SX_BOARD_INITIALIZED;
-
-        if (read_sx_byte(board, 0))
-                /* CF boards may need this. */
-                write_sx_byte(board, 0, 0);
-
-        /* This resets the processor again, to make sure it didn't do any
-           foolish things while we were downloading the image */
-        if (!sx_reset(board))
-                return 0;
-
-        sx_start_board(board);
-        udelay(10);
-        if (!sx_busy_wait_neq(board, 0, 0xff, 0)) {
-                printk(KERN_ERR "sx: Ooops. Board won't initialize.\n");
-                return 0;
-        }
-
-        /* Ok. So now the processor on the card is running. It gathered
-           some info for us... */
-        sx_dprintk(SX_DEBUG_INIT, "The sxcard structure:\n");
-        if (sx_debug & SX_DEBUG_INIT)
-                my_hd_io(board->base, 0x10);
-        sx_dprintk(SX_DEBUG_INIT, "the first sx_module structure:\n");
-        if (sx_debug & SX_DEBUG_INIT)
-                my_hd_io(board->base + 0x80, 0x30);
-
-        sx_dprintk(SX_DEBUG_INIT, "init_status: %x, %dk memory, firmware "
-                        "V%x.%02x,\n",
-                        read_sx_byte(board, 0), read_sx_byte(board, 1),
-                        read_sx_byte(board, 5), read_sx_byte(board, 4));
-
-        if (read_sx_byte(board, 0) == 0xff) {
-                printk(KERN_INFO "sx: No modules found. Sorry.\n");
-                board->nports = 0;
-                return 0;
-        }
-
-        chans = 0;
-
-        if (IS_SX_BOARD(board)) {
-                sx_write_board_word(board, cc_int_count, sx_maxints);
-        } else {
-                if (sx_maxints)
-                        sx_write_board_word(board, cc_int_count,
-                                        SI_PROCESSOR_CLOCK / 8 / sx_maxints);
-        }
-
-        /* grab the first module type... */
-        /* board->ta_type = mod_compat_type (read_sx_byte (board, 0x80 + 0x08)); */
-        board->ta_type = mod_compat_type(sx_read_module_byte(board, 0x80,
-                                mc_chip));
-
-        /* XXX byteorder */
-        for (addr = 0x80; addr != 0; addr = read_sx_word(board, addr) & 0x7fff){
-                type = sx_read_module_byte(board, addr, mc_chip);
-                sx_dprintk(SX_DEBUG_INIT, "Module at %x: %d channels\n",
-                                addr, read_sx_byte(board, addr + 2));
-
-                chans += sx_read_module_byte(board, addr, mc_type);
-
-                sx_dprintk(SX_DEBUG_INIT, "module is an %s, which has %s/%s "
-                                "panels\n",
-                                mod_type_s(type),
-                                pan_type_s(sx_read_module_byte(board, addr,
-                                                mc_mods) & 0xf),
-                                pan_type_s(sx_read_module_byte(board, addr,
-                                                mc_mods) >> 4));
-
-                sx_dprintk(SX_DEBUG_INIT, "CD1400 versions: %x/%x, ASIC "
-                        "version: %x\n",
-                        sx_read_module_byte(board, addr, mc_rev1),
-                        sx_read_module_byte(board, addr, mc_rev2),
-                        sx_read_module_byte(board, addr, mc_mtaasic_rev));
-
-                /* The following combinations are illegal: It should theoretically
-                   work, but timing problems make the bus HANG. */
-
-                if (mod_compat_type(type) != board->ta_type) {
-                        printk(KERN_ERR "sx: This is an invalid "
-                                "configuration.\nDon't mix TA/MTA/SXDC on the "
-                                "same hostadapter.\n");
-                        chans = 0;
-                        break;
-                }
-                if ((IS_EISA_BOARD(board) ||
-                                IS_SI_BOARD(board)) &&
-                                (mod_compat_type(type) == 4)) {
-                        printk(KERN_ERR "sx: This is an invalid "
-                                "configuration.\nDon't use SXDCs on an SI/XIO "
-                                "adapter.\n");
-                        chans = 0;
-                        break;
-                }
-#if 0                           /* Problem fixed: firmware 3.05 */
-                if (IS_SX_BOARD(board) && (type == TA8)) {
-                        /* There are some issues with the firmware and the DCD/RTS
-                           lines. It might work if you tie them together or something.
-                           It might also work if you get a newer sx_firmware.   Therefore
-                           this is just a warning. */
-                        printk(KERN_WARNING
-                               "sx: The SX host doesn't work too well "
-                               "with the TA8 adapters.\nSpecialix is working on it.\n");
-                }
-#endif
-        }
-
-        if (chans) {
-                if (board->irq > 0) {
-                        /* fixed irq, probably PCI */
-                        if (sx_irqmask & (1 << board->irq)) {   /* may we use this irq? */
-                                if (request_irq(board->irq, sx_interrupt,
-                                                IRQF_SHARED | IRQF_DISABLED,
-                                                "sx", board)) {
-                                        printk(KERN_ERR "sx: Cannot allocate "
-                                                "irq %d.\n", board->irq);
-                                        board->irq = 0;
-                                }
-                        } else
-                                board->irq = 0;
-                } else if (board->irq < 0 && sx_irqmask) {
-                        /* auto-allocate irq */
-                        int irqnr;
-                        int irqmask = sx_irqmask & (IS_SX_BOARD(board) ?
-                                        SX_ISA_IRQ_MASK : SI2_ISA_IRQ_MASK);
-                        for (irqnr = 15; irqnr > 0; irqnr--)
-                                if (irqmask & (1 << irqnr))
-                                        if (!request_irq(irqnr, sx_interrupt,
-                                                IRQF_SHARED | IRQF_DISABLED,
-                                                "sx", board))
-                                                break;
-                        if (!irqnr)
-                                printk(KERN_ERR "sx: Cannot allocate IRQ.\n");
-                        board->irq = irqnr;
-                } else
-                        board->irq = 0;
-
-                if (board->irq) {
-                        /* Found a valid interrupt, start up interrupts! */
-                        sx_dprintk(SX_DEBUG_INIT, "Using irq %d.\n",
-                                        board->irq);
-                        sx_start_interrupts(board);
-                        board->poll = sx_slowpoll;
-                        board->flags |= SX_IRQ_ALLOCATED;
-                } else {
-                        /* no irq: setup board for polled operation */
-                        board->poll = sx_poll;
-                        sx_dprintk(SX_DEBUG_INIT, "Using poll-interval %d.\n",
-                                        board->poll);
-                }
-
-                /* The timer should be initialized anyway: That way we can
-                   safely del_timer it when the module is unloaded. */
-                setup_timer(&board->timer, sx_pollfunc, (unsigned long)board);
-
-                if (board->poll)
-                        mod_timer(&board->timer, jiffies + board->poll);
-        } else {
-                board->irq = 0;
-        }
-
-        board->nports = chans;
-        sx_dprintk(SX_DEBUG_INIT, "returning %d ports.", board->nports);
-
-        func_exit();
-        return chans;
-}
-
-static void __devinit printheader(void)
-{
-        static int header_printed;
-
-        if (!header_printed) {
-                printk(KERN_INFO "Specialix SX driver "
-                        "(C) 1998/1999 R.E.Wolff@BitWizard.nl\n");
-                printk(KERN_INFO "sx: version " __stringify(SX_VERSION) "\n");
-                header_printed = 1;
-        }
-}
-
-static int __devinit probe_sx(struct sx_board *board)
-{
-        struct vpd_prom vpdp;
-        char *p;
-        int i;
-
-        func_enter();
-
-        if (!IS_CF_BOARD(board)) {
-                sx_dprintk(SX_DEBUG_PROBE, "Going to verify vpd prom at %p.\n",
-                                board->base + SX_VPD_ROM);
-
-                if (sx_debug & SX_DEBUG_PROBE)
-                        my_hd_io(board->base + SX_VPD_ROM, 0x40);
-
-                p = (char *)&vpdp;
-                for (i = 0; i < sizeof(struct vpd_prom); i++)
-                        *p++ = read_sx_byte(board, SX_VPD_ROM + i * 2);
-
-                if (sx_debug & SX_DEBUG_PROBE)
-                        my_hd(&vpdp, 0x20);
-
-                sx_dprintk(SX_DEBUG_PROBE, "checking identifier...\n");
-
-                if (strncmp(vpdp.identifier, SX_VPD_IDENT_STRING, 16) != 0) {
-                        sx_dprintk(SX_DEBUG_PROBE, "Got non-SX identifier: "
-                                        "'%s'\n", vpdp.identifier);
-                        return 0;
-                }
-        }
-
-        printheader();
-
-        if (!IS_CF_BOARD(board)) {
-                printk(KERN_DEBUG "sx: Found an SX board at %lx\n",
-                        board->hw_base);
-                printk(KERN_DEBUG "sx: hw_rev: %d, assembly level: %d, "
-                                "uniq ID:%08x, ",
-                                vpdp.hwrev, vpdp.hwass, vpdp.uniqid);
-                printk("Manufactured: %d/%d\n", 1970 + vpdp.myear, vpdp.mweek);
-
-                if ((((vpdp.uniqid >> 24) & SX_UNIQUEID_MASK) !=
-                                SX_PCI_UNIQUEID1) && (((vpdp.uniqid >> 24) &
-                                SX_UNIQUEID_MASK) != SX_ISA_UNIQUEID1)) {
-                        /* This might be a bit harsh. This was the primary
-                           reason the SX/ISA card didn't work at first... */
-                        printk(KERN_ERR "sx: Hmm. Not an SX/PCI or SX/ISA "
-                                        "card. Sorry: giving up.\n");
-                        return (0);
-                }
-
-                if (((vpdp.uniqid >> 24) & SX_UNIQUEID_MASK) ==
-                                SX_ISA_UNIQUEID1) {
-                        if (((unsigned long)board->hw_base) & 0x8000) {
-                                printk(KERN_WARNING "sx: Warning: There may be "
-                                        "hardware problems with the card at "
-                                        "%lx.\n", board->hw_base);
-                                printk(KERN_WARNING "sx: Read sx.txt for more "
-                                                "info.\n");
-                        }
-                }
-        }
-
-        board->nports = -1;
-
-        /* This resets the processor, and keeps it off the bus. */
-        if (!sx_reset(board))
-                return 0;
-        sx_dprintk(SX_DEBUG_INIT, "reset the board...\n");
-
-        func_exit();
-        return 1;
-}
-
-#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
-
-/* Specialix probes for this card at 32k increments from 640k to 16M.
-   I consider machines with less than 16M unlikely nowadays, so I'm
-   not probing above 1Mb. Also, 0xa0000, 0xb0000, are taken by the VGA
-   card. 0xe0000 and 0xf0000 are taken by the BIOS. That only leaves 
-   0xc0000, 0xc8000, 0xd0000 and 0xd8000 . */
-
-static int __devinit probe_si(struct sx_board *board)
-{
-        int i;
-
-        func_enter();
-        sx_dprintk(SX_DEBUG_PROBE, "Going to verify SI signature hw %lx at "
-                "%p.\n", board->hw_base, board->base + SI2_ISA_ID_BASE);
-
-        if (sx_debug & SX_DEBUG_PROBE)
-                my_hd_io(board->base + SI2_ISA_ID_BASE, 0x8);
-
-        if (!IS_EISA_BOARD(board)) {
-                if (IS_SI1_BOARD(board)) {
-                        for (i = 0; i < 8; i++) {
-                                write_sx_byte(board, SI2_ISA_ID_BASE + 7 - i,i);
-                        }
-                }
-                for (i = 0; i < 8; i++) {
-                        if ((read_sx_byte(board, SI2_ISA_ID_BASE + 7 - i) & 7)
-                                        != i) {
-                                func_exit();
-                                return 0;
-                        }
-                }
-        }
-
-        /* Now we're pretty much convinced that there is an SI board here, 
-           but to prevent trouble, we'd better double check that we don't
-           have an SI1 board when we're probing for an SI2 board.... */
-
-        write_sx_byte(board, SI2_ISA_ID_BASE, 0x10);
-        if (IS_SI1_BOARD(board)) {
-                /* This should be an SI1 board, which has this
-                   location writable... */
-                if (read_sx_byte(board, SI2_ISA_ID_BASE) != 0x10) {
-                        func_exit();
-                        return 0;
-                }
-        } else {
-                /* This should be an SI2 board, which has the bottom
-                   3 bits non-writable... */
-                if (read_sx_byte(board, SI2_ISA_ID_BASE) == 0x10) {
-                        func_exit();
-                        return 0;
-                }
-        }
-
-        /* Now we're pretty much convinced that there is an SI board here, 
-           but to prevent trouble, we'd better double check that we don't
-           have an SI1 board when we're probing for an SI2 board.... */
-
-        write_sx_byte(board, SI2_ISA_ID_BASE, 0x10);
-        if (IS_SI1_BOARD(board)) {
-                /* This should be an SI1 board, which has this
-                   location writable... */
-                if (read_sx_byte(board, SI2_ISA_ID_BASE) != 0x10) {
-                        func_exit();
-                        return 0;
-                }
-        } else {
-                /* This should be an SI2 board, which has the bottom
-                   3 bits non-writable... */
-                if (read_sx_byte(board, SI2_ISA_ID_BASE) == 0x10) {
-                        func_exit();
-                        return 0;
-                }
-        }
-
-        printheader();
-
-        printk(KERN_DEBUG "sx: Found an SI board at %lx\n", board->hw_base);
-        /* Compared to the SX boards, it is a complete guess as to what
-           this card is up to... */
-
-        board->nports = -1;
-
-        /* This resets the processor, and keeps it off the bus. */
-        if (!sx_reset(board))
-                return 0;
-        sx_dprintk(SX_DEBUG_INIT, "reset the board...\n");
-
-        func_exit();
-        return 1;
-}
-#endif
-
-static const struct tty_operations sx_ops = {
-        .break_ctl = sx_break,
-        .open = sx_open,
-        .close = gs_close,
-        .write = gs_write,
-        .put_char = gs_put_char,
-        .flush_chars = gs_flush_chars,
-        .write_room = gs_write_room,
-        .chars_in_buffer = gs_chars_in_buffer,
-        .flush_buffer = gs_flush_buffer,
-        .ioctl = sx_ioctl,
-        .throttle = sx_throttle,
-        .unthrottle = sx_unthrottle,
-        .set_termios = gs_set_termios,
-        .stop = gs_stop,
-        .start = gs_start,
-        .hangup = gs_hangup,
-        .tiocmget = sx_tiocmget,
-        .tiocmset = sx_tiocmset,
-};
-
-static const struct tty_port_operations sx_port_ops = {
-        .carrier_raised = sx_carrier_raised,
-};
-
-static int sx_init_drivers(void)
-{
-        int error;
-
-        func_enter();
-
-        sx_driver = alloc_tty_driver(sx_nports);
-        if (!sx_driver)
-                return 1;
-        sx_driver->owner = THIS_MODULE;
-        sx_driver->driver_name = "specialix_sx";
-        sx_driver->name = "ttyX";
-        sx_driver->major = SX_NORMAL_MAJOR;
-        sx_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        sx_driver->subtype = SERIAL_TYPE_NORMAL;
-        sx_driver->init_termios = tty_std_termios;
-        sx_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        sx_driver->init_termios.c_ispeed = 9600;
-        sx_driver->init_termios.c_ospeed = 9600;
-        sx_driver->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(sx_driver, &sx_ops);
-
-        if ((error = tty_register_driver(sx_driver))) {
-                put_tty_driver(sx_driver);
-                printk(KERN_ERR "sx: Couldn't register sx driver, error = %d\n",
-                        error);
-                return 1;
-        }
-        func_exit();
-        return 0;
-}
-
-static int sx_init_portstructs(int nboards, int nports)
-{
-        struct sx_board *board;
-        struct sx_port *port;
-        int i, j;
-        int addr, chans;
-        int portno;
-
-        func_enter();
-
-        /* Many drivers statically allocate the maximum number of ports
-           There is no reason not to allocate them dynamically.
-           Is there? -- REW */
-        sx_ports = kcalloc(nports, sizeof(struct sx_port), GFP_KERNEL);
-        if (!sx_ports)
-                return -ENOMEM;
-
-        port = sx_ports;
-        for (i = 0; i < nboards; i++) {
-                board = &boards[i];
-                board->ports = port;
-                for (j = 0; j < boards[i].nports; j++) {
-                        sx_dprintk(SX_DEBUG_INIT, "initing port %d\n", j);
-                        tty_port_init(&port->gs.port);
-                        port->gs.port.ops = &sx_port_ops;
-                        port->gs.magic = SX_MAGIC;
-                        port->gs.close_delay = HZ / 2;
-                        port->gs.closing_wait = 30 * HZ;
-                        port->board = board;
-                        port->gs.rd = &sx_real_driver;
-#ifdef NEW_WRITE_LOCKING
-                        port->gs.port_write_mutex = MUTEX;
-#endif
-                        spin_lock_init(&port->gs.driver_lock);
-                        /*
-                         * Initializing wait queue
-                         */
-                        port++;
-                }
-        }
-
-        port = sx_ports;
-        portno = 0;
-        for (i = 0; i < nboards; i++) {
-                board = &boards[i];
-                board->port_base = portno;
-                /* Possibly the configuration was rejected. */
-                sx_dprintk(SX_DEBUG_PROBE, "Board has %d channels\n",
-                                board->nports);
-                if (board->nports <= 0)
-                        continue;
-                /* XXX byteorder ?? */
-                for (addr = 0x80; addr != 0;
-                                addr = read_sx_word(board, addr) & 0x7fff) {
-                        chans = sx_read_module_byte(board, addr, mc_type);
-                        sx_dprintk(SX_DEBUG_PROBE, "Module at %x: %d "
-                                        "channels\n", addr, chans);
-                        sx_dprintk(SX_DEBUG_PROBE, "Port at");
-                        for (j = 0; j < chans; j++) {
-                                /* The "sx-way" is the way it SHOULD be done.
-                                   That way in the future, the firmware may for
-                                   example pack the structures a bit more
-                                   efficient. Neil tells me it isn't going to
-                                   happen anytime soon though. */
-                                if (IS_SX_BOARD(board))
-                                        port->ch_base = sx_read_module_word(
-                                                        board, addr + j * 2,
-                                                        mc_chan_pointer);
-                                else
-                                        port->ch_base = addr + 0x100 + 0x300 *j;
-
-                                sx_dprintk(SX_DEBUG_PROBE, " %x",
-                                                port->ch_base);
-                                port->line = portno++;
-                                port++;
-                        }
-                        sx_dprintk(SX_DEBUG_PROBE, "\n");
-                }
-                /* This has to be done earlier. */
-                /* board->flags |= SX_BOARD_INITIALIZED; */
-        }
-
-        func_exit();
-        return 0;
-}
-
-static unsigned int sx_find_free_board(void)
-{
-        unsigned int i;
-
-        for (i = 0; i < SX_NBOARDS; i++)
-                if (!(boards[i].flags & SX_BOARD_PRESENT))
-                        break;
-
-        return i;
-}
-
-static void __exit sx_release_drivers(void)
-{
-        func_enter();
-        tty_unregister_driver(sx_driver);
-        put_tty_driver(sx_driver);
-        func_exit();
-}
-
-static void __devexit sx_remove_card(struct sx_board *board,
-                struct pci_dev *pdev)
-{
-        if (board->flags & SX_BOARD_INITIALIZED) {
-                /* The board should stop messing with us. (actually I mean the
-                   interrupt) */
-                sx_reset(board);
-                if ((board->irq) && (board->flags & SX_IRQ_ALLOCATED))
-                        free_irq(board->irq, board);
-
-                /* It is safe/allowed to del_timer a non-active timer */
-                del_timer(&board->timer);
-                if (pdev) {
-#ifdef CONFIG_PCI
-                        iounmap(board->base2);
-                        pci_release_region(pdev, IS_CF_BOARD(board) ? 3 : 2);
-#endif
-                } else {
-                        iounmap(board->base);
-                        release_region(board->hw_base, board->hw_len);
-                }
-
-                board->flags &= ~(SX_BOARD_INITIALIZED | SX_BOARD_PRESENT);
-        }
-}
-
-#ifdef CONFIG_EISA
-
-static int __devinit sx_eisa_probe(struct device *dev)
-{
-        struct eisa_device *edev = to_eisa_device(dev);
-        struct sx_board *board;
-        unsigned long eisa_slot = edev->base_addr;
-        unsigned int i;
-        int retval = -EIO;
-
-        mutex_lock(&sx_boards_lock);
-        i = sx_find_free_board();
-        if (i == SX_NBOARDS) {
-                mutex_unlock(&sx_boards_lock);
-                goto err;
-        }
-        board = &boards[i];
-        board->flags |= SX_BOARD_PRESENT;
-        mutex_unlock(&sx_boards_lock);
-
-        dev_info(dev, "XIO : Signature found in EISA slot %lu, "
-                 "Product %d Rev %d (REPORT THIS TO LKLM)\n",
-                 eisa_slot >> 12,
-                 inb(eisa_slot + EISA_VENDOR_ID_OFFSET + 2),
-                 inb(eisa_slot + EISA_VENDOR_ID_OFFSET + 3));
-
-        board->eisa_base = eisa_slot;
-        board->flags &= ~SX_BOARD_TYPE;
-        board->flags |= SI_EISA_BOARD;
-
-        board->hw_base = ((inb(eisa_slot + 0xc01) << 8) +
-                          inb(eisa_slot + 0xc00)) << 16;
-        board->hw_len = SI2_EISA_WINDOW_LEN;
-        if (!request_region(board->hw_base, board->hw_len, "sx")) {
-                dev_err(dev, "can't request region\n");
-                goto err_flag;
-        }
-        board->base2 =
-        board->base = ioremap_nocache(board->hw_base, SI2_EISA_WINDOW_LEN);
-        if (!board->base) {
-                dev_err(dev, "can't remap memory\n");
-                goto err_reg;
-        }
-
-        sx_dprintk(SX_DEBUG_PROBE, "IO hw_base address: %lx\n", board->hw_base);
-        sx_dprintk(SX_DEBUG_PROBE, "base: %p\n", board->base);
-        board->irq = inb(eisa_slot + 0xc02) >> 4;
-        sx_dprintk(SX_DEBUG_PROBE, "IRQ: %d\n", board->irq);
-
-        if (!probe_si(board))
-                goto err_unmap;
-
-        dev_set_drvdata(dev, board);
-
-        return 0;
-err_unmap:
-        iounmap(board->base);
-err_reg:
-        release_region(board->hw_base, board->hw_len);
-err_flag:
-        board->flags &= ~SX_BOARD_PRESENT;
-err:
-        return retval;
-}
-
-static int __devexit sx_eisa_remove(struct device *dev)
-{
-        struct sx_board *board = dev_get_drvdata(dev);
-
-        sx_remove_card(board, NULL);
-
-        return 0;
-}
-
-static struct eisa_device_id sx_eisa_tbl[] = {
-        { "SLX" },
-        { "" }
-};
-
-MODULE_DEVICE_TABLE(eisa, sx_eisa_tbl);
-
-static struct eisa_driver sx_eisadriver = {
-        .id_table = sx_eisa_tbl,
-        .driver = {
-                .name = "sx",
-                .probe = sx_eisa_probe,
-                .remove = __devexit_p(sx_eisa_remove),
-        }
-};
-
-#endif
-
-#ifdef CONFIG_PCI
- /******************************************************** 
- * Setting bit 17 in the CNTRL register of the PLX 9050  * 
- * chip forces a retry on writes while a read is pending.*
- * This is to prevent the card locking up on Intel Xeon  *
- * multiprocessor systems with the NX chipset.    -- NV  *
- ********************************************************/
-
-/* Newer cards are produced with this bit set from the configuration
-   EEprom.  As the bit is read/write for the CPU, we can fix it here,
-   if we detect that it isn't set correctly. -- REW */
-
-static void __devinit fix_sx_pci(struct pci_dev *pdev, struct sx_board *board)
-{
-        unsigned int hwbase;
-        void __iomem *rebase;
-        unsigned int t;
-
-#define CNTRL_REG_OFFSET        0x50
-#define CNTRL_REG_GOODVALUE     0x18260000
-
-        pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &hwbase);
-        hwbase &= PCI_BASE_ADDRESS_MEM_MASK;
-        rebase = ioremap_nocache(hwbase, 0x80);
-        t = readl(rebase + CNTRL_REG_OFFSET);
-        if (t != CNTRL_REG_GOODVALUE) {
-                printk(KERN_DEBUG "sx: performing cntrl reg fix: %08x -> "
-                        "%08x\n", t, CNTRL_REG_GOODVALUE);
-                writel(CNTRL_REG_GOODVALUE, rebase + CNTRL_REG_OFFSET);
-        }
-        iounmap(rebase);
-}
-#endif
-
-static int __devinit sx_pci_probe(struct pci_dev *pdev,
-                                  const struct pci_device_id *ent)
-{
-#ifdef CONFIG_PCI
-        struct sx_board *board;
-        unsigned int i, reg;
-        int retval = -EIO;
-
-        mutex_lock(&sx_boards_lock);
-        i = sx_find_free_board();
-        if (i == SX_NBOARDS) {
-                mutex_unlock(&sx_boards_lock);
-                goto err;
-        }
-        board = &boards[i];
-        board->flags |= SX_BOARD_PRESENT;
-        mutex_unlock(&sx_boards_lock);
-
-        retval = pci_enable_device(pdev);
-        if (retval)
-                goto err_flag;
-
-        board->flags &= ~SX_BOARD_TYPE;
-        board->flags |= (pdev->subsystem_vendor == 0x200) ? SX_PCI_BOARD :
-                SX_CFPCI_BOARD;
-
-        /* CF boards use base address 3.... */
-        reg = IS_CF_BOARD(board) ? 3 : 2;
-        retval = pci_request_region(pdev, reg, "sx");
-        if (retval) {
-                dev_err(&pdev->dev, "can't request region\n");
-                goto err_flag;
-        }
-        board->hw_base = pci_resource_start(pdev, reg);
-        board->base2 =
-        board->base = ioremap_nocache(board->hw_base, WINDOW_LEN(board));
-        if (!board->base) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                goto err_reg;
-        }
-
-        /* Most of the stuff on the CF board is offset by 0x18000 ....  */
-        if (IS_CF_BOARD(board))
-                board->base += 0x18000;
-
-        board->irq = pdev->irq;
-
-        dev_info(&pdev->dev, "Got a specialix card: %p(%d) %x.\n", board->base,
-                 board->irq, board->flags);
-
-        if (!probe_sx(board)) {
-                retval = -EIO;
-                goto err_unmap;
-        }
-
-        fix_sx_pci(pdev, board);
-
-        pci_set_drvdata(pdev, board);
-
-        return 0;
-err_unmap:
-        iounmap(board->base2);
-err_reg:
-        pci_release_region(pdev, reg);
-err_flag:
-        board->flags &= ~SX_BOARD_PRESENT;
-err:
-        return retval;
-#else
-        return -ENODEV;
-#endif
-}
-
-static void __devexit sx_pci_remove(struct pci_dev *pdev)
-{
-        struct sx_board *board = pci_get_drvdata(pdev);
-
-        sx_remove_card(board, pdev);
-}
-
-/* Specialix has a whole bunch of cards with 0x2000 as the device ID. They say
-   its because the standard requires it. So check for SUBVENDOR_ID. */
-static struct pci_device_id sx_pci_tbl[] = {
-        { PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8,
-                .subvendor = PCI_ANY_ID, .subdevice = 0x0200 },
-        { PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8,
-                .subvendor = PCI_ANY_ID, .subdevice = 0x0300 },
-        { 0 }
-};
-
-MODULE_DEVICE_TABLE(pci, sx_pci_tbl);
-
-static struct pci_driver sx_pcidriver = {
-        .name = "sx",
-        .id_table = sx_pci_tbl,
-        .probe = sx_pci_probe,
-        .remove = __devexit_p(sx_pci_remove)
-};
-
-static int __init sx_init(void)
-{
-#ifdef CONFIG_EISA
-        int retval1;
-#endif
-#ifdef CONFIG_ISA
-        struct sx_board *board;
-        unsigned int i;
-#endif
-        unsigned int found = 0;
-        int retval;
-
-        func_enter();
-        sx_dprintk(SX_DEBUG_INIT, "Initing sx module... (sx_debug=%d)\n",
-                        sx_debug);
-        if (abs((long)(&sx_debug) - sx_debug) < 0x10000) {
-                printk(KERN_WARNING "sx: sx_debug is an address, instead of a "
-                                "value. Assuming -1.\n(%p)\n", &sx_debug);
-                sx_debug = -1;
-        }
-
-        if (misc_register(&sx_fw_device) < 0) {
-                printk(KERN_ERR "SX: Unable to register firmware loader "
-                                "driver.\n");
-                return -EIO;
-        }
-#ifdef CONFIG_ISA
-        for (i = 0; i < NR_SX_ADDRS; i++) {
-                board = &boards[found];
-                board->hw_base = sx_probe_addrs[i];
-                board->hw_len = SX_WINDOW_LEN;
-                if (!request_region(board->hw_base, board->hw_len, "sx"))
-                        continue;
-                board->base2 =
-                board->base = ioremap_nocache(board->hw_base, board->hw_len);
-                if (!board->base)
-                        goto err_sx_reg;
-                board->flags &= ~SX_BOARD_TYPE;
-                board->flags |= SX_ISA_BOARD;
-                board->irq = sx_irqmask ? -1 : 0;
-
-                if (probe_sx(board)) {
-                        board->flags |= SX_BOARD_PRESENT;
-                        found++;
-                } else {
-                        iounmap(board->base);
-err_sx_reg:
-                        release_region(board->hw_base, board->hw_len);
-                }
-        }
-
-        for (i = 0; i < NR_SI_ADDRS; i++) {
-                board = &boards[found];
-                board->hw_base = si_probe_addrs[i];
-                board->hw_len = SI2_ISA_WINDOW_LEN;
-                if (!request_region(board->hw_base, board->hw_len, "sx"))
-                        continue;
-                board->base2 =
-                board->base = ioremap_nocache(board->hw_base, board->hw_len);
-                if (!board->base)
-                        goto err_si_reg;
-                board->flags &= ~SX_BOARD_TYPE;
-                board->flags |= SI_ISA_BOARD;
-                board->irq = sx_irqmask ? -1 : 0;
-
-                if (probe_si(board)) {
-                        board->flags |= SX_BOARD_PRESENT;
-                        found++;
-                } else {
-                        iounmap(board->base);
-err_si_reg:
-                        release_region(board->hw_base, board->hw_len);
-                }
-        }
-        for (i = 0; i < NR_SI1_ADDRS; i++) {
-                board = &boards[found];
-                board->hw_base = si1_probe_addrs[i];
-                board->hw_len = SI1_ISA_WINDOW_LEN;
-                if (!request_region(board->hw_base, board->hw_len, "sx"))
-                        continue;
-                board->base2 =
-                board->base = ioremap_nocache(board->hw_base, board->hw_len);
-                if (!board->base)
-                        goto err_si1_reg;
-                board->flags &= ~SX_BOARD_TYPE;
-                board->flags |= SI1_ISA_BOARD;
-                board->irq = sx_irqmask ? -1 : 0;
-
-                if (probe_si(board)) {
-                        board->flags |= SX_BOARD_PRESENT;
-                        found++;
-                } else {
-                        iounmap(board->base);
-err_si1_reg:
-                        release_region(board->hw_base, board->hw_len);
-                }
-        }
-#endif
-#ifdef CONFIG_EISA
-        retval1 = eisa_driver_register(&sx_eisadriver);
-#endif
-        retval = pci_register_driver(&sx_pcidriver);
-
-        if (found) {
-                printk(KERN_INFO "sx: total of %d boards detected.\n", found);
-                retval = 0;
-        } else if (retval) {
-#ifdef CONFIG_EISA
-                retval = retval1;
-                if (retval1)
-#endif
-                        misc_deregister(&sx_fw_device);
-        }
-
-        func_exit();
-        return retval;
-}
-
-static void __exit sx_exit(void)
-{
-        int i;
-
-        func_enter();
-#ifdef CONFIG_EISA
-        eisa_driver_unregister(&sx_eisadriver);
-#endif
-        pci_unregister_driver(&sx_pcidriver);
-
-        for (i = 0; i < SX_NBOARDS; i++)
-                sx_remove_card(&boards[i], NULL);
-
-        if (misc_deregister(&sx_fw_device) < 0) {
-                printk(KERN_INFO "sx: couldn't deregister firmware loader "
-                                "device\n");
-        }
-        sx_dprintk(SX_DEBUG_CLEANUP, "Cleaning up drivers (%d)\n",
-                        sx_initialized);
-        if (sx_initialized)
-                sx_release_drivers();
-
-        kfree(sx_ports);
-        func_exit();
-}
-
-module_init(sx_init);
-module_exit(sx_exit);
diff --git a/drivers/char/sx.h b/drivers/char/sx.h
deleted file mode 100644
index 87c2defdead7..000000000000
--- a/drivers/char/sx.h
+++ /dev/null
@@ -1,201 +0,0 @@
-
-/*
- *  sx.h
- *
- *  Copyright (C) 1998/1999 R.E.Wolff@BitWizard.nl
- *
- *  SX serial driver.
- *  -- Supports SI, XIO and SX host cards. 
- *  -- Supports TAs, MTAs and SXDCs.
- *
- *  Version 1.3 -- March, 1999. 
- * 
- */
-
-#define SX_NBOARDS        4
-#define SX_PORTSPERBOARD 32
-#define SX_NPORTS        (SX_NBOARDS * SX_PORTSPERBOARD)
-
-#ifdef __KERNEL__
-
-#define SX_MAGIC 0x12345678
-
-struct sx_port {
-  struct gs_port          gs;
-  struct wait_queue       *shutdown_wait;
-  int                     ch_base;
-  int                     c_dcd;
-  struct sx_board         *board;
-  int                     line;
-  unsigned long           locks;
-};
-
-struct sx_board {
-  int magic;
-  void __iomem *base;
-  void __iomem *base2;
-  unsigned long hw_base;
-  resource_size_t hw_len;
-  int eisa_base;
-  int port_base; /* Number of the first port */
-  struct sx_port *ports;
-  int nports;
-  int flags;
-  int irq;
-  int poll;
-  int ta_type;
-  struct timer_list       timer;
-  unsigned long           locks;
-};
-
-struct vpd_prom {
-  unsigned short id;
-  char hwrev;
-  char hwass;
-  int uniqid;
-  char myear;
-  char mweek;
-  char hw_feature[5];
-  char oem_id;
-  char identifier[16];
-};
-
-#ifndef MOD_RS232DB25MALE
-#define MOD_RS232DB25MALE 0x0a
-#endif
-
-#define SI_ISA_BOARD         0x00000001
-#define SX_ISA_BOARD         0x00000002
-#define SX_PCI_BOARD         0x00000004
-#define SX_CFPCI_BOARD       0x00000008
-#define SX_CFISA_BOARD       0x00000010
-#define SI_EISA_BOARD        0x00000020
-#define SI1_ISA_BOARD        0x00000040
-
-#define SX_BOARD_PRESENT     0x00001000
-#define SX_BOARD_INITIALIZED 0x00002000
-#define SX_IRQ_ALLOCATED     0x00004000
-
-#define SX_BOARD_TYPE        0x000000ff
-
-#define IS_SX_BOARD(board) (board->flags & (SX_PCI_BOARD | SX_CFPCI_BOARD | \
-                                            SX_ISA_BOARD | SX_CFISA_BOARD))
-
-#define IS_SI_BOARD(board) (board->flags & SI_ISA_BOARD)
-#define IS_SI1_BOARD(board) (board->flags & SI1_ISA_BOARD)
-
-#define IS_EISA_BOARD(board) (board->flags & SI_EISA_BOARD)
-
-#define IS_CF_BOARD(board) (board->flags & (SX_CFISA_BOARD | SX_CFPCI_BOARD))
-
-/* The SI processor clock is required to calculate the cc_int_count register
-   value for the SI cards. */
-#define SI_PROCESSOR_CLOCK 25000000
-
-
-/* port flags */
-/* Make sure these don't clash with gs flags or async flags */
-#define SX_RX_THROTTLE        0x0000001
-
-
-
-#define SX_PORT_TRANSMIT_LOCK  0
-#define SX_BOARD_INTR_LOCK     0
-
-
-
-/* Debug flags. Add these together to get more debug info. */
-
-#define SX_DEBUG_OPEN          0x00000001
-#define SX_DEBUG_SETTING       0x00000002
-#define SX_DEBUG_FLOW          0x00000004
-#define SX_DEBUG_MODEMSIGNALS  0x00000008
-#define SX_DEBUG_TERMIOS       0x00000010
-#define SX_DEBUG_TRANSMIT      0x00000020
-#define SX_DEBUG_RECEIVE       0x00000040
-#define SX_DEBUG_INTERRUPTS    0x00000080
-#define SX_DEBUG_PROBE         0x00000100
-#define SX_DEBUG_INIT          0x00000200
-#define SX_DEBUG_CLEANUP       0x00000400
-#define SX_DEBUG_CLOSE         0x00000800
-#define SX_DEBUG_FIRMWARE      0x00001000
-#define SX_DEBUG_MEMTEST       0x00002000
-
-#define SX_DEBUG_ALL           0xffffffff
-
-
-#define O_OTHER(tty)    \
-      ((O_OLCUC(tty))  ||\
-      (O_ONLCR(tty))   ||\
-      (O_OCRNL(tty))   ||\
-      (O_ONOCR(tty))   ||\
-      (O_ONLRET(tty))  ||\
-      (O_OFILL(tty))   ||\
-      (O_OFDEL(tty))   ||\
-      (O_NLDLY(tty))   ||\
-      (O_CRDLY(tty))   ||\
-      (O_TABDLY(tty))  ||\
-      (O_BSDLY(tty))   ||\
-      (O_VTDLY(tty))   ||\
-      (O_FFDLY(tty)))
-
-/* Same for input. */
-#define I_OTHER(tty)    \
-      ((I_INLCR(tty))  ||\
-      (I_IGNCR(tty))   ||\
-      (I_ICRNL(tty))   ||\
-      (I_IUCLC(tty))   ||\
-      (L_ISIG(tty)))
-
-#define MOD_TA   (        TA>>4)
-#define MOD_MTA  (MTA_CD1400>>4)
-#define MOD_SXDC (      SXDC>>4)
-
-
-/* We copy the download code over to the card in chunks of ... bytes */
-#define SX_CHUNK_SIZE 128
-
-#endif /* __KERNEL__ */
-
-
-
-/* Specialix document 6210046-11 page 3 */
-#define SPX(X) (('S'<<24) | ('P' << 16) | (X))
-
-/* Specialix-Linux specific IOCTLS. */
-#define SPXL(X) (SPX(('L' << 8) | (X)))
-
-
-#define SXIO_SET_BOARD      SPXL(0x01)
-#define SXIO_GET_TYPE       SPXL(0x02)
-#define SXIO_DOWNLOAD       SPXL(0x03)
-#define SXIO_INIT           SPXL(0x04)
-#define SXIO_SETDEBUG       SPXL(0x05)
-#define SXIO_GETDEBUG       SPXL(0x06)
-#define SXIO_DO_RAMTEST     SPXL(0x07)
-#define SXIO_SETGSDEBUG     SPXL(0x08)
-#define SXIO_GETGSDEBUG     SPXL(0x09)
-#define SXIO_GETNPORTS      SPXL(0x0a)
-
-
-#ifndef SXCTL_MISC_MINOR 
-/* Allow others to gather this into "major.h" or something like that */
-#define SXCTL_MISC_MINOR    167
-#endif
-
-#ifndef SX_NORMAL_MAJOR
-/* This allows overriding on the compiler commandline, or in a "major.h" 
-   include or something like that */
-#define SX_NORMAL_MAJOR  32
-#define SX_CALLOUT_MAJOR 33
-#endif
-
-
-#define SX_TYPE_SX          0x01
-#define SX_TYPE_SI          0x02
-#define SX_TYPE_CF          0x03
-
-
-#define WINDOW_LEN(board) (IS_CF_BOARD(board)?0x20000:SX_WINDOW_LEN)
-/*                         Need a #define for ^^^^^^^ !!! */
-
diff --git a/drivers/char/sxboards.h b/drivers/char/sxboards.h
deleted file mode 100644
index 427927dc7dbf..000000000000
--- a/drivers/char/sxboards.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/************************************************************************/
-/*                                                                      */
-/*      Title           :       SX/SI/XIO Board Hardware Definitions    */
-/*                                                                      */
-/*      Author          :       N.P.Vassallo                            */
-/*                                                                      */
-/*      Creation        :       16th March 1998                         */
-/*                                                                      */
-/*      Version         :       3.0.0                                   */
-/*                                                                      */
-/*      Copyright       :       (c) Specialix International Ltd. 1998   */
-/*                                                                      */
-/*      Description     :       Prototypes, structures and definitions  */
-/*                              describing the SX/SI/XIO board hardware */
-/*                                                                      */
-/************************************************************************/
-
-/* History...
-
-3.0.0   16/03/98 NPV    Creation.
-
-*/
-
-#ifndef _sxboards_h                             /* If SXBOARDS.H not already defined */
-#define _sxboards_h    1
-
-/*****************************************************************************
-*******************************                 ******************************
-*******************************   Board Types   ******************************
-*******************************                 ******************************
-*****************************************************************************/
-
-/* BUS types... */
-#define         BUS_ISA         0
-#define         BUS_MCA         1
-#define         BUS_EISA        2
-#define         BUS_PCI         3
-
-/* Board phases... */
-#define         SI1_Z280        1
-#define         SI2_Z280        2
-#define         SI3_T225        3
-
-/* Board types... */
-#define         CARD_TYPE(bus,phase)    (bus<<4|phase)
-#define         CARD_BUS(type)          ((type>>4)&0xF)
-#define         CARD_PHASE(type)        (type&0xF)
-
-#define         TYPE_SI1_ISA            CARD_TYPE(BUS_ISA,SI1_Z280)
-#define         TYPE_SI2_ISA            CARD_TYPE(BUS_ISA,SI2_Z280)
-#define         TYPE_SI2_EISA           CARD_TYPE(BUS_EISA,SI2_Z280)
-#define         TYPE_SI2_PCI            CARD_TYPE(BUS_PCI,SI2_Z280)
-
-#define         TYPE_SX_ISA             CARD_TYPE(BUS_ISA,SI3_T225)
-#define         TYPE_SX_PCI             CARD_TYPE(BUS_PCI,SI3_T225)
-/*****************************************************************************
-******************************                  ******************************
-******************************   Phase 1 Z280   ******************************
-******************************                  ******************************
-*****************************************************************************/
-
-/* ISA board details... */
-#define         SI1_ISA_WINDOW_LEN      0x10000         /* 64 Kbyte shared memory window */
-//#define       SI1_ISA_MEMORY_LEN      0x8000          /* Usable memory  - unused define*/
-//#define               SI1_ISA_ADDR_LOW        0x0A0000        /* Lowest address = 640 Kbyte */
-//#define               SI1_ISA_ADDR_HIGH       0xFF8000        /* Highest address = 16Mbyte - 32Kbyte */
-//#define               SI2_ISA_ADDR_STEP       SI2_ISA_WINDOW_LEN/* ISA board address step */
-//#define               SI2_ISA_IRQ_MASK        0x9800          /* IRQs 15,12,11 */
-
-/* ISA board, register definitions... */
-//#define               SI2_ISA_ID_BASE         0x7FF8                  /* READ:  Board ID string */
-#define         SI1_ISA_RESET           0x8000          /* WRITE: Host Reset */
-#define         SI1_ISA_RESET_CLEAR     0xc000          /* WRITE: Host Reset clear*/
-#define         SI1_ISA_WAIT            0x9000          /* WRITE: Host wait */
-#define         SI1_ISA_WAIT_CLEAR      0xd000          /* WRITE: Host wait clear */
-#define         SI1_ISA_INTCL           0xa000          /* WRITE: Host Reset */
-#define         SI1_ISA_INTCL_CLEAR     0xe000          /* WRITE: Host Reset */
-
-
-/*****************************************************************************
-******************************                  ******************************
-******************************   Phase 2 Z280   ******************************
-******************************                  ******************************
-*****************************************************************************/
-
-/* ISA board details... */
-#define         SI2_ISA_WINDOW_LEN      0x8000          /* 32 Kbyte shared memory window */
-#define         SI2_ISA_MEMORY_LEN      0x7FF8          /* Usable memory */
-#define         SI2_ISA_ADDR_LOW        0x0A0000        /* Lowest address = 640 Kbyte */
-#define         SI2_ISA_ADDR_HIGH       0xFF8000        /* Highest address = 16Mbyte - 32Kbyte */
-#define         SI2_ISA_ADDR_STEP       SI2_ISA_WINDOW_LEN/* ISA board address step */
-#define         SI2_ISA_IRQ_MASK        0x9800          /* IRQs 15,12,11 */
-
-/* ISA board, register definitions... */
-#define         SI2_ISA_ID_BASE         0x7FF8                  /* READ:  Board ID string */
-#define         SI2_ISA_RESET           SI2_ISA_ID_BASE         /* WRITE: Host Reset */
-#define         SI2_ISA_IRQ11           (SI2_ISA_ID_BASE+1)     /* WRITE: Set IRQ11 */
-#define         SI2_ISA_IRQ12           (SI2_ISA_ID_BASE+2)     /* WRITE: Set IRQ12 */
-#define         SI2_ISA_IRQ15           (SI2_ISA_ID_BASE+3)     /* WRITE: Set IRQ15 */
-#define         SI2_ISA_IRQSET          (SI2_ISA_ID_BASE+4)     /* WRITE: Set Host Interrupt */
-#define         SI2_ISA_INTCLEAR        (SI2_ISA_ID_BASE+5)     /* WRITE: Enable Host Interrupt */
-
-#define         SI2_ISA_IRQ11_SET       0x10
-#define         SI2_ISA_IRQ11_CLEAR     0x00
-#define         SI2_ISA_IRQ12_SET       0x10
-#define         SI2_ISA_IRQ12_CLEAR     0x00
-#define         SI2_ISA_IRQ15_SET       0x10
-#define         SI2_ISA_IRQ15_CLEAR     0x00
-#define         SI2_ISA_INTCLEAR_SET    0x10
-#define         SI2_ISA_INTCLEAR_CLEAR  0x00
-#define         SI2_ISA_IRQSET_CLEAR    0x10
-#define         SI2_ISA_IRQSET_SET      0x00
-#define         SI2_ISA_RESET_SET       0x00
-#define         SI2_ISA_RESET_CLEAR     0x10
-
-/* PCI board details... */
-#define         SI2_PCI_WINDOW_LEN      0x100000        /* 1 Mbyte memory window */
-
-/* PCI board register definitions... */
-#define         SI2_PCI_SET_IRQ         0x40001         /* Set Host Interrupt  */
-#define         SI2_PCI_RESET           0xC0001         /* Host Reset */
-
-/*****************************************************************************
-******************************                  ******************************
-******************************   Phase 3 T225   ******************************
-******************************                  ******************************
-*****************************************************************************/
-
-/* General board details... */
-#define         SX_WINDOW_LEN           64*1024         /* 64 Kbyte memory window */
-
-/* ISA board details... */
-#define         SX_ISA_ADDR_LOW         0x0A0000        /* Lowest address = 640 Kbyte */
-#define         SX_ISA_ADDR_HIGH        0xFF8000        /* Highest address = 16Mbyte - 32Kbyte */
-#define         SX_ISA_ADDR_STEP        SX_WINDOW_LEN   /* ISA board address step */
-#define         SX_ISA_IRQ_MASK         0x9E00          /* IRQs 15,12,11,10,9 */
-
-/* Hardware register definitions... */
-#define         SX_EVENT_STATUS         0x7800          /* READ:  T225 Event Status */
-#define         SX_EVENT_STROBE         0x7800          /* WRITE: T225 Event Strobe */
-#define         SX_EVENT_ENABLE         0x7880          /* WRITE: T225 Event Enable */
-#define         SX_VPD_ROM              0x7C00          /* READ:  Vital Product Data ROM */
-#define         SX_CONFIG               0x7C00          /* WRITE: Host Configuration Register */
-#define         SX_IRQ_STATUS           0x7C80          /* READ:  Host Interrupt Status */
-#define         SX_SET_IRQ              0x7C80          /* WRITE: Set Host Interrupt */
-#define         SX_RESET_STATUS         0x7D00          /* READ:  Host Reset Status */
-#define         SX_RESET                0x7D00          /* WRITE: Host Reset */
-#define         SX_RESET_IRQ            0x7D80          /* WRITE: Reset Host Interrupt */
-
-/* SX_VPD_ROM definitions... */
-#define         SX_VPD_SLX_ID1          0x00
-#define         SX_VPD_SLX_ID2          0x01
-#define         SX_VPD_HW_REV           0x02
-#define         SX_VPD_HW_ASSEM         0x03
-#define         SX_VPD_UNIQUEID4        0x04
-#define         SX_VPD_UNIQUEID3        0x05
-#define         SX_VPD_UNIQUEID2        0x06
-#define         SX_VPD_UNIQUEID1        0x07
-#define         SX_VPD_MANU_YEAR        0x08
-#define         SX_VPD_MANU_WEEK        0x09
-#define         SX_VPD_IDENT            0x10
-#define         SX_VPD_IDENT_STRING     "JET HOST BY KEV#"
-
-/* SX unique identifiers... */
-#define         SX_UNIQUEID_MASK        0xF0
-#define         SX_ISA_UNIQUEID1        0x20
-#define         SX_PCI_UNIQUEID1        0x50
-
-/* SX_CONFIG definitions... */
-#define         SX_CONF_BUSEN           0x02            /* Enable T225 memory and I/O */
-#define         SX_CONF_HOSTIRQ         0x04            /* Enable board to host interrupt */
-
-/* SX bootstrap... */
-#define         SX_BOOTSTRAP            "\x28\x20\x21\x02\x60\x0a"
-#define         SX_BOOTSTRAP_SIZE       6
-#define         SX_BOOTSTRAP_ADDR       (0x8000-SX_BOOTSTRAP_SIZE)
-
-/*****************************************************************************
-**********************************          **********************************
-**********************************   EISA   **********************************
-**********************************          **********************************
-*****************************************************************************/
-
-#define         SI2_EISA_OFF            0x42
-#define         SI2_EISA_VAL            0x01
-#define         SI2_EISA_WINDOW_LEN     0x10000
-
-/*****************************************************************************
-***********************************         **********************************
-***********************************   PCI   **********************************
-***********************************         **********************************
-*****************************************************************************/
-
-/* General definitions... */
-
-#define         SPX_VENDOR_ID           0x11CB          /* Assigned by the PCI SIG */
-#define         SPX_DEVICE_ID           0x4000          /* SI/XIO boards */
-#define         SPX_PLXDEVICE_ID        0x2000          /* SX boards */
-
-#define         SPX_SUB_VENDOR_ID       SPX_VENDOR_ID   /* Same as vendor id */
-#define         SI2_SUB_SYS_ID          0x400           /* Phase 2 (Z280) board */
-#define         SX_SUB_SYS_ID           0x200           /* Phase 3 (t225) board */
-
-#endif                                          /*_sxboards_h */
-
-/* End of SXBOARDS.H */
diff --git a/drivers/char/sxwindow.h b/drivers/char/sxwindow.h
deleted file mode 100644
index cf01b662aefc..000000000000
--- a/drivers/char/sxwindow.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/************************************************************************/
-/*                                                                      */
-/*      Title           :       SX Shared Memory Window Structure       */
-/*                                                                      */
-/*      Author          :       N.P.Vassallo                            */
-/*                                                                      */
-/*      Creation        :       16th March 1998                         */
-/*                                                                      */
-/*      Version         :       3.0.0                                   */
-/*                                                                      */
-/*      Copyright       :       (c) Specialix International Ltd. 1998   */
-/*                                                                      */
-/*      Description     :       Prototypes, structures and definitions  */
-/*                              describing the SX/SI/XIO cards shared   */
-/*                              memory window structure:                */
-/*                                      SXCARD                          */
-/*                                      SXMODULE                        */
-/*                                      SXCHANNEL                       */
-/*                                                                      */
-/************************************************************************/
-
-/* History...
-
-3.0.0   16/03/98 NPV    Creation. (based on STRUCT.H)
-
-*/
-
-#ifndef _sxwindow_h                             /* If SXWINDOW.H not already defined */
-#define _sxwindow_h    1
-
-/*****************************************************************************
-***************************                        ***************************
-***************************   Common Definitions   ***************************
-***************************                        ***************************
-*****************************************************************************/
-
-typedef struct  _SXCARD         *PSXCARD;       /* SXCARD structure pointer */
-typedef struct  _SXMODULE       *PMOD;          /* SXMODULE structure pointer */
-typedef struct  _SXCHANNEL      *PCHAN;         /* SXCHANNEL structure pointer */
-
-/*****************************************************************************
-*********************************            *********************************
-*********************************   SXCARD   *********************************
-*********************************            *********************************
-*****************************************************************************/
-
-typedef struct  _SXCARD
-{
-        BYTE    cc_init_status;                 /* 0x00 Initialisation status */
-        BYTE    cc_mem_size;                    /* 0x01 Size of memory on card */
-        WORD    cc_int_count;                   /* 0x02 Interrupt count */
-        WORD    cc_revision;                    /* 0x04 Download code revision */
-        BYTE    cc_isr_count;                   /* 0x06 Count when ISR is run */
-        BYTE    cc_main_count;                  /* 0x07 Count when main loop is run */
-        WORD    cc_int_pending;                 /* 0x08 Interrupt pending */
-        WORD    cc_poll_count;                  /* 0x0A Count when poll is run */
-        BYTE    cc_int_set_count;               /* 0x0C Count when host interrupt is set */
-        BYTE    cc_rfu[0x80 - 0x0D];            /* 0x0D Pad structure to 128 bytes (0x80) */
-
-} SXCARD;
-
-/* SXCARD.cc_init_status definitions... */
-#define         ADAPTERS_FOUND          (BYTE)0x01
-#define         NO_ADAPTERS_FOUND       (BYTE)0xFF
-
-/* SXCARD.cc_mem_size definitions... */
-#define         SX_MEMORY_SIZE          (BYTE)0x40
-
-/* SXCARD.cc_int_count definitions... */
-#define         INT_COUNT_DEFAULT       100     /* Hz */
-
-/*****************************************************************************
-********************************              ********************************
-********************************   SXMODULE   ********************************
-********************************              ********************************
-*****************************************************************************/
-
-#define TOP_POINTER(a)          ((a)|0x8000)    /* Sets top bit of word */
-#define UNTOP_POINTER(a)        ((a)&~0x8000)   /* Clears top bit of word */
-
-typedef struct  _SXMODULE
-{
-        WORD    mc_next;                        /* 0x00 Next module "pointer" (ORed with 0x8000) */
-        BYTE    mc_type;                        /* 0x02 Type of TA in terms of number of channels */
-        BYTE    mc_mod_no;                      /* 0x03 Module number on SI bus cable (0 closest to card) */
-        BYTE    mc_dtr;                         /* 0x04 Private DTR copy (TA only) */
-        BYTE    mc_rfu1;                        /* 0x05 Reserved */
-        WORD    mc_uart;                        /* 0x06 UART base address for this module */
-        BYTE    mc_chip;                        /* 0x08 Chip type / number of ports */
-        BYTE    mc_current_uart;                /* 0x09 Current uart selected for this module */
-#ifdef  DOWNLOAD
-        PCHAN   mc_chan_pointer[8];             /* 0x0A Pointer to each channel structure */
-#else
-        WORD    mc_chan_pointer[8];             /* 0x0A Define as WORD if not compiling into download */
-#endif
-        WORD    mc_rfu2;                        /* 0x1A Reserved */
-        BYTE    mc_opens1;                      /* 0x1C Number of open ports on first four ports on MTA/SXDC */
-        BYTE    mc_opens2;                      /* 0x1D Number of open ports on second four ports on MTA/SXDC */
-        BYTE    mc_mods;                        /* 0x1E Types of connector module attached to MTA/SXDC */
-        BYTE    mc_rev1;                        /* 0x1F Revision of first CD1400 on MTA/SXDC */
-        BYTE    mc_rev2;                        /* 0x20 Revision of second CD1400 on MTA/SXDC */
-        BYTE    mc_mtaasic_rev;                 /* 0x21 Revision of MTA ASIC 1..4 -> A, B, C, D */
-        BYTE    mc_rfu3[0x100 - 0x22];          /* 0x22 Pad structure to 256 bytes (0x100) */
-
-} SXMODULE;
-
-/* SXMODULE.mc_type definitions... */
-#define         FOUR_PORTS      (BYTE)4
-#define         EIGHT_PORTS     (BYTE)8
-
-/* SXMODULE.mc_chip definitions... */
-#define         CHIP_MASK       0xF0
-#define         TA              (BYTE)0
-#define         TA4             (TA | FOUR_PORTS)
-#define         TA8             (TA | EIGHT_PORTS)
-#define         TA4_ASIC        (BYTE)0x0A
-#define         TA8_ASIC        (BYTE)0x0B
-#define         MTA_CD1400      (BYTE)0x28
-#define         SXDC            (BYTE)0x48
-
-/* SXMODULE.mc_mods definitions... */
-#define         MOD_RS232DB25   0x00            /* RS232 DB25 (socket/plug) */
-#define         MOD_RS232RJ45   0x01            /* RS232 RJ45 (shielded/opto-isolated) */
-#define         MOD_RESERVED_2  0x02            /* Reserved (RS485) */
-#define         MOD_RS422DB25   0x03            /* RS422 DB25 Socket */
-#define         MOD_RESERVED_4  0x04            /* Reserved */
-#define         MOD_PARALLEL    0x05            /* Parallel */
-#define         MOD_RESERVED_6  0x06            /* Reserved (RS423) */
-#define         MOD_RESERVED_7  0x07            /* Reserved */
-#define         MOD_2_RS232DB25 0x08            /* Rev 2.0 RS232 DB25 (socket/plug) */
-#define         MOD_2_RS232RJ45 0x09            /* Rev 2.0 RS232 RJ45 */
-#define         MOD_RESERVED_A  0x0A            /* Rev 2.0 Reserved */
-#define         MOD_2_RS422DB25 0x0B            /* Rev 2.0 RS422 DB25 */
-#define         MOD_RESERVED_C  0x0C            /* Rev 2.0 Reserved */
-#define         MOD_2_PARALLEL  0x0D            /* Rev 2.0 Parallel */
-#define         MOD_RESERVED_E  0x0E            /* Rev 2.0 Reserved */
-#define         MOD_BLANK       0x0F            /* Blank Panel */
-
-/*****************************************************************************
-********************************               *******************************
-********************************   SXCHANNEL   *******************************
-********************************               *******************************
-*****************************************************************************/
-
-#define         TX_BUFF_OFFSET          0x60    /* Transmit buffer offset in channel structure */
-#define         BUFF_POINTER(a)         (((a)+TX_BUFF_OFFSET)|0x8000)
-#define         UNBUFF_POINTER(a)       (jet_channel*)(((a)&~0x8000)-TX_BUFF_OFFSET) 
-#define         BUFFER_SIZE             256
-#define         HIGH_WATER              ((BUFFER_SIZE / 4) * 3)
-#define         LOW_WATER               (BUFFER_SIZE / 4)
-
-typedef struct  _SXCHANNEL
-{
-        WORD    next_item;                      /* 0x00 Offset from window base of next channels hi_txbuf (ORred with 0x8000) */
-        WORD    addr_uart;                      /* 0x02 INTERNAL pointer to uart address. Includes FASTPATH bit */
-        WORD    module;                         /* 0x04 Offset from window base of parent SXMODULE structure */
-        BYTE    type;                           /* 0x06 Chip type / number of ports (copy of mc_chip) */
-        BYTE    chan_number;                    /* 0x07 Channel number on the TA/MTA/SXDC */
-        WORD    xc_status;                      /* 0x08 Flow control and I/O status */
-        BYTE    hi_rxipos;                      /* 0x0A Receive buffer input index */
-        BYTE    hi_rxopos;                      /* 0x0B Receive buffer output index */
-        BYTE    hi_txopos;                      /* 0x0C Transmit buffer output index */
-        BYTE    hi_txipos;                      /* 0x0D Transmit buffer input index */
-        BYTE    hi_hstat;                       /* 0x0E Command register */
-        BYTE    dtr_bit;                        /* 0x0F INTERNAL DTR control byte (TA only) */
-        BYTE    txon;                           /* 0x10 INTERNAL copy of hi_txon */
-        BYTE    txoff;                          /* 0x11 INTERNAL copy of hi_txoff */
-        BYTE    rxon;                           /* 0x12 INTERNAL copy of hi_rxon */
-        BYTE    rxoff;                          /* 0x13 INTERNAL copy of hi_rxoff */
-        BYTE    hi_mr1;                         /* 0x14 Mode Register 1 (databits,parity,RTS rx flow)*/
-        BYTE    hi_mr2;                         /* 0x15 Mode Register 2 (stopbits,local,CTS tx flow)*/
-        BYTE    hi_csr;                         /* 0x16 Clock Select Register (baud rate) */
-        BYTE    hi_op;                          /* 0x17 Modem Output Signal */
-        BYTE    hi_ip;                          /* 0x18 Modem Input Signal */
-        BYTE    hi_state;                       /* 0x19 Channel status */
-        BYTE    hi_prtcl;                       /* 0x1A Channel protocol (flow control) */
-        BYTE    hi_txon;                        /* 0x1B Transmit XON character */
-        BYTE    hi_txoff;                       /* 0x1C Transmit XOFF character */
-        BYTE    hi_rxon;                        /* 0x1D Receive XON character */
-        BYTE    hi_rxoff;                       /* 0x1E Receive XOFF character */
-        BYTE    close_prev;                     /* 0x1F INTERNAL channel previously closed flag */
-        BYTE    hi_break;                       /* 0x20 Break and error control */
-        BYTE    break_state;                    /* 0x21 INTERNAL copy of hi_break */
-        BYTE    hi_mask;                        /* 0x22 Mask for received data */
-        BYTE    mask;                           /* 0x23 INTERNAL copy of hi_mask */
-        BYTE    mod_type;                       /* 0x24 MTA/SXDC hardware module type */
-        BYTE    ccr_state;                      /* 0x25 INTERNAL MTA/SXDC state of CCR register */
-        BYTE    ip_mask;                        /* 0x26 Input handshake mask */
-        BYTE    hi_parallel;                    /* 0x27 Parallel port flag */
-        BYTE    par_error;                      /* 0x28 Error code for parallel loopback test */
-        BYTE    any_sent;                       /* 0x29 INTERNAL data sent flag */
-        BYTE    asic_txfifo_size;               /* 0x2A INTERNAL SXDC transmit FIFO size */
-        BYTE    rfu1[2];                        /* 0x2B Reserved */
-        BYTE    csr;                            /* 0x2D INTERNAL copy of hi_csr */
-#ifdef  DOWNLOAD
-        PCHAN   nextp;                          /* 0x2E Offset from window base of next channel structure */
-#else
-        WORD    nextp;                          /* 0x2E Define as WORD if not compiling into download */
-#endif
-        BYTE    prtcl;                          /* 0x30 INTERNAL copy of hi_prtcl */
-        BYTE    mr1;                            /* 0x31 INTERNAL copy of hi_mr1 */
-        BYTE    mr2;                            /* 0x32 INTERNAL copy of hi_mr2 */
-        BYTE    hi_txbaud;                      /* 0x33 Extended transmit baud rate (SXDC only if((hi_csr&0x0F)==0x0F) */
-        BYTE    hi_rxbaud;                      /* 0x34 Extended receive baud rate  (SXDC only if((hi_csr&0xF0)==0xF0) */
-        BYTE    txbreak_state;                  /* 0x35 INTERNAL MTA/SXDC transmit break state */
-        BYTE    txbaud;                         /* 0x36 INTERNAL copy of hi_txbaud */
-        BYTE    rxbaud;                         /* 0x37 INTERNAL copy of hi_rxbaud */
-        WORD    err_framing;                    /* 0x38 Count of receive framing errors */
-        WORD    err_parity;                     /* 0x3A Count of receive parity errors */
-        WORD    err_overrun;                    /* 0x3C Count of receive overrun errors */
-        WORD    err_overflow;                   /* 0x3E Count of receive buffer overflow errors */
-        BYTE    rfu2[TX_BUFF_OFFSET - 0x40];    /* 0x40 Reserved until hi_txbuf */
-        BYTE    hi_txbuf[BUFFER_SIZE];          /* 0x060 Transmit buffer */
-        BYTE    hi_rxbuf[BUFFER_SIZE];          /* 0x160 Receive buffer */
-        BYTE    rfu3[0x300 - 0x260];            /* 0x260 Reserved until 768 bytes (0x300) */
-
-} SXCHANNEL;
-
-/* SXCHANNEL.addr_uart definitions... */
-#define         FASTPATH        0x1000          /* Set to indicate fast rx/tx processing (TA only) */
-
-/* SXCHANNEL.xc_status definitions... */
-#define         X_TANY          0x0001          /* XON is any character (TA only) */
-#define         X_TION          0x0001          /* Tx interrupts on (MTA only) */
-#define         X_TXEN          0x0002          /* Tx XON/XOFF enabled (TA only) */
-#define         X_RTSEN         0x0002          /* RTS FLOW enabled (MTA only) */
-#define         X_TXRC          0x0004          /* XOFF received (TA only) */
-#define         X_RTSLOW        0x0004          /* RTS dropped (MTA only) */
-#define         X_RXEN          0x0008          /* Rx XON/XOFF enabled */
-#define         X_ANYXO         0x0010          /* XOFF pending/sent or RTS dropped */
-#define         X_RXSE          0x0020          /* Rx XOFF sent */
-#define         X_NPEND         0x0040          /* Rx XON pending or XOFF pending */
-#define         X_FPEND         0x0080          /* Rx XOFF pending */
-#define         C_CRSE          0x0100          /* Carriage return sent (TA only) */
-#define         C_TEMR          0x0100          /* Tx empty requested (MTA only) */
-#define         C_TEMA          0x0200          /* Tx empty acked (MTA only) */
-#define         C_ANYP          0x0200          /* Any protocol bar tx XON/XOFF (TA only) */
-#define         C_EN            0x0400          /* Cooking enabled (on MTA means port is also || */
-#define         C_HIGH          0x0800          /* Buffer previously hit high water */
-#define         C_CTSEN         0x1000          /* CTS automatic flow-control enabled */
-#define         C_DCDEN         0x2000          /* DCD/DTR checking enabled */
-#define         C_BREAK         0x4000          /* Break detected */
-#define         C_RTSEN         0x8000          /* RTS automatic flow control enabled (MTA only) */
-#define         C_PARITY        0x8000          /* Parity checking enabled (TA only) */
-
-/* SXCHANNEL.hi_hstat definitions... */
-#define         HS_IDLE_OPEN    0x00            /* Channel open state */
-#define         HS_LOPEN        0x02            /* Local open command (no modem monitoring) */
-#define         HS_MOPEN        0x04            /* Modem open command (wait for DCD signal) */
-#define         HS_IDLE_MPEND   0x06            /* Waiting for DCD signal state */
-#define         HS_CONFIG       0x08            /* Configuration command */
-#define         HS_CLOSE        0x0A            /* Close command */
-#define         HS_START        0x0C            /* Start transmit break command */
-#define         HS_STOP         0x0E            /* Stop transmit break command */
-#define         HS_IDLE_CLOSED  0x10            /* Closed channel state */
-#define         HS_IDLE_BREAK   0x12            /* Transmit break state */
-#define         HS_FORCE_CLOSED 0x14            /* Force close command */
-#define         HS_RESUME       0x16            /* Clear pending XOFF command */
-#define         HS_WFLUSH       0x18            /* Flush transmit buffer command */
-#define         HS_RFLUSH       0x1A            /* Flush receive buffer command */
-#define         HS_SUSPEND      0x1C            /* Suspend output command (like XOFF received) */
-#define         PARALLEL        0x1E            /* Parallel port loopback test command (Diagnostics Only) */
-#define         ENABLE_RX_INTS  0x20            /* Enable receive interrupts command (Diagnostics Only) */
-#define         ENABLE_TX_INTS  0x22            /* Enable transmit interrupts command (Diagnostics Only) */
-#define         ENABLE_MDM_INTS 0x24            /* Enable modem interrupts command (Diagnostics Only) */
-#define         DISABLE_INTS    0x26            /* Disable interrupts command (Diagnostics Only) */
-
-/* SXCHANNEL.hi_mr1 definitions... */
-#define         MR1_BITS        0x03            /* Data bits mask */
-#define         MR1_5_BITS      0x00            /* 5 data bits */
-#define         MR1_6_BITS      0x01            /* 6 data bits */
-#define         MR1_7_BITS      0x02            /* 7 data bits */
-#define         MR1_8_BITS      0x03            /* 8 data bits */
-#define         MR1_PARITY      0x1C            /* Parity mask */
-#define         MR1_ODD         0x04            /* Odd parity */
-#define         MR1_EVEN        0x00            /* Even parity */
-#define         MR1_WITH        0x00            /* Parity enabled */
-#define         MR1_FORCE       0x08            /* Force parity */
-#define         MR1_NONE        0x10            /* No parity */
-#define         MR1_NOPARITY    MR1_NONE                /* No parity */
-#define         MR1_ODDPARITY   (MR1_WITH|MR1_ODD)      /* Odd parity */
-#define         MR1_EVENPARITY  (MR1_WITH|MR1_EVEN)     /* Even parity */
-#define         MR1_MARKPARITY  (MR1_FORCE|MR1_ODD)     /* Mark parity */
-#define         MR1_SPACEPARITY (MR1_FORCE|MR1_EVEN)    /* Space parity */
-#define         MR1_RTS_RXFLOW  0x80            /* RTS receive flow control */
-
-/* SXCHANNEL.hi_mr2 definitions... */
-#define         MR2_STOP        0x0F            /* Stop bits mask */
-#define         MR2_1_STOP      0x07            /* 1 stop bit */
-#define         MR2_2_STOP      0x0F            /* 2 stop bits */
-#define         MR2_CTS_TXFLOW  0x10            /* CTS transmit flow control */
-#define         MR2_RTS_TOGGLE  0x20            /* RTS toggle on transmit */
-#define         MR2_NORMAL      0x00            /* Normal mode */
-#define         MR2_AUTO        0x40            /* Auto-echo mode (TA only) */
-#define         MR2_LOCAL       0x80            /* Local echo mode */
-#define         MR2_REMOTE      0xC0            /* Remote echo mode (TA only) */
-
-/* SXCHANNEL.hi_csr definitions... */
-#define         CSR_75          0x0             /*    75 baud */
-#define         CSR_110         0x1             /*   110 baud (TA), 115200 (MTA/SXDC) */
-#define         CSR_38400       0x2             /* 38400 baud */
-#define         CSR_150         0x3             /*   150 baud */
-#define         CSR_300         0x4             /*   300 baud */
-#define         CSR_600         0x5             /*   600 baud */
-#define         CSR_1200        0x6             /*  1200 baud */
-#define         CSR_2000        0x7             /*  2000 baud */
-#define         CSR_2400        0x8             /*  2400 baud */
-#define         CSR_4800        0x9             /*  4800 baud */
-#define         CSR_1800        0xA             /*  1800 baud */
-#define         CSR_9600        0xB             /*  9600 baud */
-#define         CSR_19200       0xC             /* 19200 baud */
-#define         CSR_57600       0xD             /* 57600 baud */
-#define         CSR_EXTBAUD     0xF             /* Extended baud rate (hi_txbaud/hi_rxbaud) */
-
-/* SXCHANNEL.hi_op definitions... */
-#define         OP_RTS          0x01            /* RTS modem output signal */
-#define         OP_DTR          0x02            /* DTR modem output signal */
-
-/* SXCHANNEL.hi_ip definitions... */
-#define         IP_CTS          0x02            /* CTS modem input signal */
-#define         IP_DCD          0x04            /* DCD modem input signal */
-#define         IP_DSR          0x20            /* DTR modem input signal */
-#define         IP_RI           0x40            /* RI modem input signal */
-
-/* SXCHANNEL.hi_state definitions... */
-#define         ST_BREAK        0x01            /* Break received (clear with config) */
-#define         ST_DCD          0x02            /* DCD signal changed state */
-
-/* SXCHANNEL.hi_prtcl definitions... */
-#define         SP_TANY         0x01            /* Transmit XON/XANY (if SP_TXEN enabled) */
-#define         SP_TXEN         0x02            /* Transmit XON/XOFF flow control */
-#define         SP_CEN          0x04            /* Cooking enabled */
-#define         SP_RXEN         0x08            /* Rx XON/XOFF enabled */
-#define         SP_DCEN         0x20            /* DCD / DTR check */
-#define         SP_DTR_RXFLOW   0x40            /* DTR receive flow control */
-#define         SP_PAEN         0x80            /* Parity checking enabled */
-
-/* SXCHANNEL.hi_break definitions... */
-#define         BR_IGN          0x01            /* Ignore any received breaks */
-#define         BR_INT          0x02            /* Interrupt on received break */
-#define         BR_PARMRK       0x04            /* Enable parmrk parity error processing */
-#define         BR_PARIGN       0x08            /* Ignore chars with parity errors */
-#define         BR_ERRINT       0x80            /* Treat parity/framing/overrun errors as exceptions */
-
-/* SXCHANNEL.par_error definitions.. */
-#define         DIAG_IRQ_RX     0x01            /* Indicate serial receive interrupt (diags only) */
-#define         DIAG_IRQ_TX     0x02            /* Indicate serial transmit interrupt (diags only) */
-#define         DIAG_IRQ_MD     0x04            /* Indicate serial modem interrupt (diags only) */
-
-/* SXCHANNEL.hi_txbaud/hi_rxbaud definitions... (SXDC only) */
-#define         BAUD_75         0x00            /*     75 baud */
-#define         BAUD_115200     0x01            /* 115200 baud */
-#define         BAUD_38400      0x02            /*  38400 baud */
-#define         BAUD_150        0x03            /*    150 baud */
-#define         BAUD_300        0x04            /*    300 baud */
-#define         BAUD_600        0x05            /*    600 baud */
-#define         BAUD_1200       0x06            /*   1200 baud */
-#define         BAUD_2000       0x07            /*   2000 baud */
-#define         BAUD_2400       0x08            /*   2400 baud */
-#define         BAUD_4800       0x09            /*   4800 baud */
-#define         BAUD_1800       0x0A            /*   1800 baud */
-#define         BAUD_9600       0x0B            /*   9600 baud */
-#define         BAUD_19200      0x0C            /*  19200 baud */
-#define         BAUD_57600      0x0D            /*  57600 baud */
-#define         BAUD_230400     0x0E            /* 230400 baud */
-#define         BAUD_460800     0x0F            /* 460800 baud */
-#define         BAUD_921600     0x10            /* 921600 baud */
-#define         BAUD_50         0x11            /*     50 baud */
-#define         BAUD_110        0x12            /*    110 baud */
-#define         BAUD_134_5      0x13            /*  134.5 baud */
-#define         BAUD_200        0x14            /*    200 baud */
-#define         BAUD_7200       0x15            /*   7200 baud */
-#define         BAUD_56000      0x16            /*  56000 baud */
-#define         BAUD_64000      0x17            /*  64000 baud */
-#define         BAUD_76800      0x18            /*  76800 baud */
-#define         BAUD_128000     0x19            /* 128000 baud */
-#define         BAUD_150000     0x1A            /* 150000 baud */
-#define         BAUD_14400      0x1B            /*  14400 baud */
-#define         BAUD_256000     0x1C            /* 256000 baud */
-#define         BAUD_28800      0x1D            /*  28800 baud */
-
-/* SXCHANNEL.txbreak_state definiions... */
-#define         TXBREAK_OFF     0               /* Not sending break */
-#define         TXBREAK_START   1               /* Begin sending break */
-#define         TXBREAK_START1  2               /* Begin sending break, part 1 */
-#define         TXBREAK_ON      3               /* Sending break */
-#define         TXBREAK_STOP    4               /* Stop sending break */
-#define         TXBREAK_STOP1   5               /* Stop sending break, part 1 */
-
-#endif                                          /* _sxwindow_h */
-
-/* End of SXWINDOW.H */
-
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
deleted file mode 100644
index a2a58004e188..000000000000
--- a/drivers/char/synclink.c
+++ /dev/null
@@ -1,8125 +0,0 @@
-/*
- * linux/drivers/char/synclink.c
- *
- * $Id: synclink.c,v 4.38 2005/11/07 16:30:34 paulkf Exp $
- *
- * Device driver for Microgate SyncLink ISA and PCI
- * high speed multiprotocol serial adapters.
- *
- * written by Paul Fulghum for Microgate Corporation
- * paulkf@microgate.com
- *
- * Microgate and SyncLink are trademarks of Microgate Corporation
- *
- * Derived from serial.c written by Theodore Ts'o and Linus Torvalds
- *
- * Original release 01/11/99
- *
- * This code is released under the GNU General Public License (GPL)
- *
- * This driver is primarily intended for use in synchronous
- * HDLC mode. Asynchronous mode is also provided.
- *
- * When operating in synchronous mode, each call to mgsl_write()
- * contains exactly one complete HDLC frame. Calling mgsl_put_char
- * will start assembling an HDLC frame that will not be sent until
- * mgsl_flush_chars or mgsl_write is called.
- * 
- * Synchronous receive data is reported as complete frames. To accomplish
- * this, the TTY flip buffer is bypassed (too small to hold largest
- * frame and may fragment frames) and the line discipline
- * receive entry point is called directly.
- *
- * This driver has been tested with a slightly modified ppp.c driver
- * for synchronous PPP.
- *
- * 2000/02/16
- * Added interface for syncppp.c driver (an alternate synchronous PPP
- * implementation that also supports Cisco HDLC). Each device instance
- * registers as a tty device AND a network device (if dosyncppp option
- * is set for the device). The functionality is determined by which
- * device interface is opened.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if defined(__i386__)
-#  define BREAKPOINT() asm("   int $3");
-#else
-#  define BREAKPOINT() { }
-#endif
-
-#define MAX_ISA_DEVICES 10
-#define MAX_PCI_DEVICES 10
-#define MAX_TOTAL_DEVICES 20
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial.h>
-#include <linux/major.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/ioport.h>
-#include <linux/mm.h>
-#include <linux/seq_file.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/vmalloc.h>
-#include <linux/init.h>
-#include <linux/ioctl.h>
-#include <linux/synclink.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/dma.h>
-#include <linux/bitops.h>
-#include <asm/types.h>
-#include <linux/termios.h>
-#include <linux/workqueue.h>
-#include <linux/hdlc.h>
-#include <linux/dma-mapping.h>
-
-#if defined(CONFIG_HDLC) || (defined(CONFIG_HDLC_MODULE) && defined(CONFIG_SYNCLINK_MODULE))
-#define SYNCLINK_GENERIC_HDLC 1
-#else
-#define SYNCLINK_GENERIC_HDLC 0
-#endif
-
-#define GET_USER(error,value,addr) error = get_user(value,addr)
-#define COPY_FROM_USER(error,dest,src,size) error = copy_from_user(dest,src,size) ? -EFAULT : 0
-#define PUT_USER(error,value,addr) error = put_user(value,addr)
-#define COPY_TO_USER(error,dest,src,size) error = copy_to_user(dest,src,size) ? -EFAULT : 0
-
-#include <asm/uaccess.h>
-
-#define RCLRVALUE 0xffff
-
-static MGSL_PARAMS default_params = {
-        MGSL_MODE_HDLC,                 /* unsigned long mode */
-        0,                              /* unsigned char loopback; */
-        HDLC_FLAG_UNDERRUN_ABORT15,     /* unsigned short flags; */
-        HDLC_ENCODING_NRZI_SPACE,       /* unsigned char encoding; */
-        0,                              /* unsigned long clock_speed; */
-        0xff,                           /* unsigned char addr_filter; */
-        HDLC_CRC_16_CCITT,              /* unsigned short crc_type; */
-        HDLC_PREAMBLE_LENGTH_8BITS,     /* unsigned char preamble_length; */
-        HDLC_PREAMBLE_PATTERN_NONE,     /* unsigned char preamble; */
-        9600,                           /* unsigned long data_rate; */
-        8,                              /* unsigned char data_bits; */
-        1,                              /* unsigned char stop_bits; */
-        ASYNC_PARITY_NONE               /* unsigned char parity; */
-};
-
-#define SHARED_MEM_ADDRESS_SIZE 0x40000
-#define BUFFERLISTSIZE 4096
-#define DMABUFFERSIZE 4096
-#define MAXRXFRAMES 7
-
-typedef struct _DMABUFFERENTRY
-{
-        u32 phys_addr;  /* 32-bit flat physical address of data buffer */
-        volatile u16 count;     /* buffer size/data count */
-        volatile u16 status;    /* Control/status field */
-        volatile u16 rcc;       /* character count field */
-        u16 reserved;   /* padding required by 16C32 */
-        u32 link;       /* 32-bit flat link to next buffer entry */
-        char *virt_addr;        /* virtual address of data buffer */
-        u32 phys_entry; /* physical address of this buffer entry */
-        dma_addr_t dma_addr;
-} DMABUFFERENTRY, *DMAPBUFFERENTRY;
-
-/* The queue of BH actions to be performed */
-
-#define BH_RECEIVE  1
-#define BH_TRANSMIT 2
-#define BH_STATUS   4
-
-#define IO_PIN_SHUTDOWN_LIMIT 100
-
-struct  _input_signal_events {
-        int     ri_up;  
-        int     ri_down;
-        int     dsr_up;
-        int     dsr_down;
-        int     dcd_up;
-        int     dcd_down;
-        int     cts_up;
-        int     cts_down;
-};
-
-/* transmit holding buffer definitions*/
-#define MAX_TX_HOLDING_BUFFERS 5
-struct tx_holding_buffer {
-        int     buffer_size;
-        unsigned char * buffer;
-};
-
-
-/*
- * Device instance data structure
- */
- 
-struct mgsl_struct {
-        int                     magic;
-        struct tty_port         port;
-        int                     line;
-        int                     hw_version;
-        
-        struct mgsl_icount      icount;
-        
-        int                     timeout;
-        int                     x_char;         /* xon/xoff character */
-        u16                     read_status_mask;
-        u16                     ignore_status_mask;     
-        unsigned char           *xmit_buf;
-        int                     xmit_head;
-        int                     xmit_tail;
-        int                     xmit_cnt;
-        
-        wait_queue_head_t       status_event_wait_q;
-        wait_queue_head_t       event_wait_q;
-        struct timer_list       tx_timer;       /* HDLC transmit timeout timer */
-        struct mgsl_struct      *next_device;   /* device list link */
-        
-        spinlock_t irq_spinlock;                /* spinlock for synchronizing with ISR */
-        struct work_struct task;                /* task structure for scheduling bh */
-
-        u32 EventMask;                  /* event trigger mask */
-        u32 RecordedEvents;             /* pending events */
-
-        u32 max_frame_size;             /* as set by device config */
-
-        u32 pending_bh;
-
-        bool bh_running;                /* Protection from multiple */
-        int isr_overflow;
-        bool bh_requested;
-        
-        int dcd_chkcount;               /* check counts to prevent */
-        int cts_chkcount;               /* too many IRQs if a signal */
-        int dsr_chkcount;               /* is floating */
-        int ri_chkcount;
-
-        char *buffer_list;              /* virtual address of Rx & Tx buffer lists */
-        u32 buffer_list_phys;
-        dma_addr_t buffer_list_dma_addr;
-
-        unsigned int rx_buffer_count;   /* count of total allocated Rx buffers */
-        DMABUFFERENTRY *rx_buffer_list; /* list of receive buffer entries */
-        unsigned int current_rx_buffer;
-
-        int num_tx_dma_buffers;         /* number of tx dma frames required */
-        int tx_dma_buffers_used;
-        unsigned int tx_buffer_count;   /* count of total allocated Tx buffers */
-        DMABUFFERENTRY *tx_buffer_list; /* list of transmit buffer entries */
-        int start_tx_dma_buffer;        /* tx dma buffer to start tx dma operation */
-        int current_tx_buffer;          /* next tx dma buffer to be loaded */
-        
-        unsigned char *intermediate_rxbuffer;
-
-        int num_tx_holding_buffers;     /* number of tx holding buffer allocated */
-        int get_tx_holding_index;       /* next tx holding buffer for adapter to load */
-        int put_tx_holding_index;       /* next tx holding buffer to store user request */
-        int tx_holding_count;           /* number of tx holding buffers waiting */
-        struct tx_holding_buffer tx_holding_buffers[MAX_TX_HOLDING_BUFFERS];
-
-        bool rx_enabled;
-        bool rx_overflow;
-        bool rx_rcc_underrun;
-
-        bool tx_enabled;
-        bool tx_active;
-        u32 idle_mode;
-
-        u16 cmr_value;
-        u16 tcsr_value;
-
-        char device_name[25];           /* device instance name */
-
-        unsigned int bus_type;  /* expansion bus type (ISA,EISA,PCI) */
-        unsigned char bus;              /* expansion bus number (zero based) */
-        unsigned char function;         /* PCI device number */
-
-        unsigned int io_base;           /* base I/O address of adapter */
-        unsigned int io_addr_size;      /* size of the I/O address range */
-        bool io_addr_requested;         /* true if I/O address requested */
-        
-        unsigned int irq_level;         /* interrupt level */
-        unsigned long irq_flags;
-        bool irq_requested;             /* true if IRQ requested */
-        
-        unsigned int dma_level;         /* DMA channel */
-        bool dma_requested;             /* true if dma channel requested */
-
-        u16 mbre_bit;
-        u16 loopback_bits;
-        u16 usc_idle_mode;
-
-        MGSL_PARAMS params;             /* communications parameters */
-
-        unsigned char serial_signals;   /* current serial signal states */
-
-        bool irq_occurred;              /* for diagnostics use */
-        unsigned int init_error;        /* Initialization startup error                 (DIAGS) */
-        int     fDiagnosticsmode;       /* Driver in Diagnostic mode?                   (DIAGS) */
-
-        u32 last_mem_alloc;
-        unsigned char* memory_base;     /* shared memory address (PCI only) */
-        u32 phys_memory_base;
-        bool shared_mem_requested;
-
-        unsigned char* lcr_base;        /* local config registers (PCI only) */
-        u32 phys_lcr_base;
-        u32 lcr_offset;
-        bool lcr_mem_requested;
-
-        u32 misc_ctrl_value;
-        char flag_buf[MAX_ASYNC_BUFFER_SIZE];
-        char char_buf[MAX_ASYNC_BUFFER_SIZE];   
-        bool drop_rts_on_tx_done;
-
-        bool loopmode_insert_requested;
-        bool loopmode_send_done_requested;
-        
-        struct  _input_signal_events    input_signal_events;
-
-        /* generic HDLC device parts */
-        int netcount;
-        spinlock_t netlock;
-
-#if SYNCLINK_GENERIC_HDLC
-        struct net_device *netdev;
-#endif
-};
-
-#define MGSL_MAGIC 0x5401
-
-/*
- * The size of the serial xmit buffer is 1 page, or 4096 bytes
- */
-#ifndef SERIAL_XMIT_SIZE
-#define SERIAL_XMIT_SIZE 4096
-#endif
-
-/*
- * These macros define the offsets used in calculating the
- * I/O address of the specified USC registers.
- */
-
-
-#define DCPIN 2         /* Bit 1 of I/O address */
-#define SDPIN 4         /* Bit 2 of I/O address */
-
-#define DCAR 0          /* DMA command/address register */
-#define CCAR SDPIN              /* channel command/address register */
-#define DATAREG DCPIN + SDPIN   /* serial data register */
-#define MSBONLY 0x41
-#define LSBONLY 0x40
-
-/*
- * These macros define the register address (ordinal number)
- * used for writing address/value pairs to the USC.
- */
-
-#define CMR     0x02    /* Channel mode Register */
-#define CCSR    0x04    /* Channel Command/status Register */
-#define CCR     0x06    /* Channel Control Register */
-#define PSR     0x08    /* Port status Register */
-#define PCR     0x0a    /* Port Control Register */
-#define TMDR    0x0c    /* Test mode Data Register */
-#define TMCR    0x0e    /* Test mode Control Register */
-#define CMCR    0x10    /* Clock mode Control Register */
-#define HCR     0x12    /* Hardware Configuration Register */
-#define IVR     0x14    /* Interrupt Vector Register */
-#define IOCR    0x16    /* Input/Output Control Register */
-#define ICR     0x18    /* Interrupt Control Register */
-#define DCCR    0x1a    /* Daisy Chain Control Register */
-#define MISR    0x1c    /* Misc Interrupt status Register */
-#define SICR    0x1e    /* status Interrupt Control Register */
-#define RDR     0x20    /* Receive Data Register */
-#define RMR     0x22    /* Receive mode Register */
-#define RCSR    0x24    /* Receive Command/status Register */
-#define RICR    0x26    /* Receive Interrupt Control Register */
-#define RSR     0x28    /* Receive Sync Register */
-#define RCLR    0x2a    /* Receive count Limit Register */
-#define RCCR    0x2c    /* Receive Character count Register */
-#define TC0R    0x2e    /* Time Constant 0 Register */
-#define TDR     0x30    /* Transmit Data Register */
-#define TMR     0x32    /* Transmit mode Register */
-#define TCSR    0x34    /* Transmit Command/status Register */
-#define TICR    0x36    /* Transmit Interrupt Control Register */
-#define TSR     0x38    /* Transmit Sync Register */
-#define TCLR    0x3a    /* Transmit count Limit Register */
-#define TCCR    0x3c    /* Transmit Character count Register */
-#define TC1R    0x3e    /* Time Constant 1 Register */
-
-
-/*
- * MACRO DEFINITIONS FOR DMA REGISTERS
- */
-
-#define DCR     0x06    /* DMA Control Register (shared) */
-#define DACR    0x08    /* DMA Array count Register (shared) */
-#define BDCR    0x12    /* Burst/Dwell Control Register (shared) */
-#define DIVR    0x14    /* DMA Interrupt Vector Register (shared) */    
-#define DICR    0x18    /* DMA Interrupt Control Register (shared) */
-#define CDIR    0x1a    /* Clear DMA Interrupt Register (shared) */
-#define SDIR    0x1c    /* Set DMA Interrupt Register (shared) */
-
-#define TDMR    0x02    /* Transmit DMA mode Register */
-#define TDIAR   0x1e    /* Transmit DMA Interrupt Arm Register */
-#define TBCR    0x2a    /* Transmit Byte count Register */
-#define TARL    0x2c    /* Transmit Address Register (low) */
-#define TARU    0x2e    /* Transmit Address Register (high) */
-#define NTBCR   0x3a    /* Next Transmit Byte count Register */
-#define NTARL   0x3c    /* Next Transmit Address Register (low) */
-#define NTARU   0x3e    /* Next Transmit Address Register (high) */
-
-#define RDMR    0x82    /* Receive DMA mode Register (non-shared) */
-#define RDIAR   0x9e    /* Receive DMA Interrupt Arm Register */
-#define RBCR    0xaa    /* Receive Byte count Register */
-#define RARL    0xac    /* Receive Address Register (low) */
-#define RARU    0xae    /* Receive Address Register (high) */
-#define NRBCR   0xba    /* Next Receive Byte count Register */
-#define NRARL   0xbc    /* Next Receive Address Register (low) */
-#define NRARU   0xbe    /* Next Receive Address Register (high) */
-
-
-/*
- * MACRO DEFINITIONS FOR MODEM STATUS BITS
- */
-
-#define MODEMSTATUS_DTR 0x80
-#define MODEMSTATUS_DSR 0x40
-#define MODEMSTATUS_RTS 0x20
-#define MODEMSTATUS_CTS 0x10
-#define MODEMSTATUS_RI  0x04
-#define MODEMSTATUS_DCD 0x01
-
-
-/*
- * Channel Command/Address Register (CCAR) Command Codes
- */
-
-#define RTCmd_Null                      0x0000
-#define RTCmd_ResetHighestIus           0x1000
-#define RTCmd_TriggerChannelLoadDma     0x2000
-#define RTCmd_TriggerRxDma              0x2800
-#define RTCmd_TriggerTxDma              0x3000
-#define RTCmd_TriggerRxAndTxDma         0x3800
-#define RTCmd_PurgeRxFifo               0x4800
-#define RTCmd_PurgeTxFifo               0x5000
-#define RTCmd_PurgeRxAndTxFifo          0x5800
-#define RTCmd_LoadRcc                   0x6800
-#define RTCmd_LoadTcc                   0x7000
-#define RTCmd_LoadRccAndTcc             0x7800
-#define RTCmd_LoadTC0                   0x8800
-#define RTCmd_LoadTC1                   0x9000
-#define RTCmd_LoadTC0AndTC1             0x9800
-#define RTCmd_SerialDataLSBFirst        0xa000
-#define RTCmd_SerialDataMSBFirst        0xa800
-#define RTCmd_SelectBigEndian           0xb000
-#define RTCmd_SelectLittleEndian        0xb800
-
-
-/*
- * DMA Command/Address Register (DCAR) Command Codes
- */
-
-#define DmaCmd_Null                     0x0000
-#define DmaCmd_ResetTxChannel           0x1000
-#define DmaCmd_ResetRxChannel           0x1200
-#define DmaCmd_StartTxChannel           0x2000
-#define DmaCmd_StartRxChannel           0x2200
-#define DmaCmd_ContinueTxChannel        0x3000
-#define DmaCmd_ContinueRxChannel        0x3200
-#define DmaCmd_PauseTxChannel           0x4000
-#define DmaCmd_PauseRxChannel           0x4200
-#define DmaCmd_AbortTxChannel           0x5000
-#define DmaCmd_AbortRxChannel           0x5200
-#define DmaCmd_InitTxChannel            0x7000
-#define DmaCmd_InitRxChannel            0x7200
-#define DmaCmd_ResetHighestDmaIus       0x8000
-#define DmaCmd_ResetAllChannels         0x9000
-#define DmaCmd_StartAllChannels         0xa000
-#define DmaCmd_ContinueAllChannels      0xb000
-#define DmaCmd_PauseAllChannels         0xc000
-#define DmaCmd_AbortAllChannels         0xd000
-#define DmaCmd_InitAllChannels          0xf000
-
-#define TCmd_Null                       0x0000
-#define TCmd_ClearTxCRC                 0x2000
-#define TCmd_SelectTicrTtsaData         0x4000
-#define TCmd_SelectTicrTxFifostatus     0x5000
-#define TCmd_SelectTicrIntLevel         0x6000
-#define TCmd_SelectTicrdma_level                0x7000
-#define TCmd_SendFrame                  0x8000
-#define TCmd_SendAbort                  0x9000
-#define TCmd_EnableDleInsertion         0xc000
-#define TCmd_DisableDleInsertion        0xd000
-#define TCmd_ClearEofEom                0xe000
-#define TCmd_SetEofEom                  0xf000
-
-#define RCmd_Null                       0x0000
-#define RCmd_ClearRxCRC                 0x2000
-#define RCmd_EnterHuntmode              0x3000
-#define RCmd_SelectRicrRtsaData         0x4000
-#define RCmd_SelectRicrRxFifostatus     0x5000
-#define RCmd_SelectRicrIntLevel         0x6000
-#define RCmd_SelectRicrdma_level                0x7000
-
-/*
- * Bits for enabling and disabling IRQs in Interrupt Control Register (ICR)
- */
- 
-#define RECEIVE_STATUS          BIT5
-#define RECEIVE_DATA            BIT4
-#define TRANSMIT_STATUS         BIT3
-#define TRANSMIT_DATA           BIT2
-#define IO_PIN                  BIT1
-#define MISC                    BIT0
-
-
-/*
- * Receive status Bits in Receive Command/status Register RCSR
- */
-
-#define RXSTATUS_SHORT_FRAME            BIT8
-#define RXSTATUS_CODE_VIOLATION         BIT8
-#define RXSTATUS_EXITED_HUNT            BIT7
-#define RXSTATUS_IDLE_RECEIVED          BIT6
-#define RXSTATUS_BREAK_RECEIVED         BIT5
-#define RXSTATUS_ABORT_RECEIVED         BIT5
-#define RXSTATUS_RXBOUND                BIT4
-#define RXSTATUS_CRC_ERROR              BIT3
-#define RXSTATUS_FRAMING_ERROR          BIT3
-#define RXSTATUS_ABORT                  BIT2
-#define RXSTATUS_PARITY_ERROR           BIT2
-#define RXSTATUS_OVERRUN                BIT1
-#define RXSTATUS_DATA_AVAILABLE         BIT0
-#define RXSTATUS_ALL                    0x01f6
-#define usc_UnlatchRxstatusBits(a,b) usc_OutReg( (a), RCSR, (u16)((b) & RXSTATUS_ALL) )
-
-/*
- * Values for setting transmit idle mode in 
- * Transmit Control/status Register (TCSR)
- */
-#define IDLEMODE_FLAGS                  0x0000
-#define IDLEMODE_ALT_ONE_ZERO           0x0100
-#define IDLEMODE_ZERO                   0x0200
-#define IDLEMODE_ONE                    0x0300
-#define IDLEMODE_ALT_MARK_SPACE         0x0500
-#define IDLEMODE_SPACE                  0x0600
-#define IDLEMODE_MARK                   0x0700
-#define IDLEMODE_MASK                   0x0700
-
-/*
- * IUSC revision identifiers
- */
-#define IUSC_SL1660                     0x4d44
-#define IUSC_PRE_SL1660                 0x4553
-
-/*
- * Transmit status Bits in Transmit Command/status Register (TCSR)
- */
-
-#define TCSR_PRESERVE                   0x0F00
-
-#define TCSR_UNDERWAIT                  BIT11
-#define TXSTATUS_PREAMBLE_SENT          BIT7
-#define TXSTATUS_IDLE_SENT              BIT6
-#define TXSTATUS_ABORT_SENT             BIT5
-#define TXSTATUS_EOF_SENT               BIT4
-#define TXSTATUS_EOM_SENT               BIT4
-#define TXSTATUS_CRC_SENT               BIT3
-#define TXSTATUS_ALL_SENT               BIT2
-#define TXSTATUS_UNDERRUN               BIT1
-#define TXSTATUS_FIFO_EMPTY             BIT0
-#define TXSTATUS_ALL                    0x00fa
-#define usc_UnlatchTxstatusBits(a,b) usc_OutReg( (a), TCSR, (u16)((a)->tcsr_value + ((b) & 0x00FF)) )
-                                
-
-#define MISCSTATUS_RXC_LATCHED          BIT15
-#define MISCSTATUS_RXC                  BIT14
-#define MISCSTATUS_TXC_LATCHED          BIT13
-#define MISCSTATUS_TXC                  BIT12
-#define MISCSTATUS_RI_LATCHED           BIT11
-#define MISCSTATUS_RI                   BIT10
-#define MISCSTATUS_DSR_LATCHED          BIT9
-#define MISCSTATUS_DSR                  BIT8
-#define MISCSTATUS_DCD_LATCHED          BIT7
-#define MISCSTATUS_DCD                  BIT6
-#define MISCSTATUS_CTS_LATCHED          BIT5
-#define MISCSTATUS_CTS                  BIT4
-#define MISCSTATUS_RCC_UNDERRUN         BIT3
-#define MISCSTATUS_DPLL_NO_SYNC         BIT2
-#define MISCSTATUS_BRG1_ZERO            BIT1
-#define MISCSTATUS_BRG0_ZERO            BIT0
-
-#define usc_UnlatchIostatusBits(a,b) usc_OutReg((a),MISR,(u16)((b) & 0xaaa0))
-#define usc_UnlatchMiscstatusBits(a,b) usc_OutReg((a),MISR,(u16)((b) & 0x000f))
-
-#define SICR_RXC_ACTIVE                 BIT15
-#define SICR_RXC_INACTIVE               BIT14
-#define SICR_RXC                        (BIT15+BIT14)
-#define SICR_TXC_ACTIVE                 BIT13
-#define SICR_TXC_INACTIVE               BIT12
-#define SICR_TXC                        (BIT13+BIT12)
-#define SICR_RI_ACTIVE                  BIT11
-#define SICR_RI_INACTIVE                BIT10
-#define SICR_RI                         (BIT11+BIT10)
-#define SICR_DSR_ACTIVE                 BIT9
-#define SICR_DSR_INACTIVE               BIT8
-#define SICR_DSR                        (BIT9+BIT8)
-#define SICR_DCD_ACTIVE                 BIT7
-#define SICR_DCD_INACTIVE               BIT6
-#define SICR_DCD                        (BIT7+BIT6)
-#define SICR_CTS_ACTIVE                 BIT5
-#define SICR_CTS_INACTIVE               BIT4
-#define SICR_CTS                        (BIT5+BIT4)
-#define SICR_RCC_UNDERFLOW              BIT3
-#define SICR_DPLL_NO_SYNC               BIT2
-#define SICR_BRG1_ZERO                  BIT1
-#define SICR_BRG0_ZERO                  BIT0
-
-void usc_DisableMasterIrqBit( struct mgsl_struct *info );
-void usc_EnableMasterIrqBit( struct mgsl_struct *info );
-void usc_EnableInterrupts( struct mgsl_struct *info, u16 IrqMask );
-void usc_DisableInterrupts( struct mgsl_struct *info, u16 IrqMask );
-void usc_ClearIrqPendingBits( struct mgsl_struct *info, u16 IrqMask );
-
-#define usc_EnableInterrupts( a, b ) \
-        usc_OutReg( (a), ICR, (u16)((usc_InReg((a),ICR) & 0xff00) + 0xc0 + (b)) )
-
-#define usc_DisableInterrupts( a, b ) \
-        usc_OutReg( (a), ICR, (u16)((usc_InReg((a),ICR) & 0xff00) + 0x80 + (b)) )
-
-#define usc_EnableMasterIrqBit(a) \
-        usc_OutReg( (a), ICR, (u16)((usc_InReg((a),ICR) & 0x0f00) + 0xb000) )
-
-#define usc_DisableMasterIrqBit(a) \
-        usc_OutReg( (a), ICR, (u16)(usc_InReg((a),ICR) & 0x7f00) )
-
-#define usc_ClearIrqPendingBits( a, b ) usc_OutReg( (a), DCCR, 0x40 + (b) )
-
-/*
- * Transmit status Bits in Transmit Control status Register (TCSR)
- * and Transmit Interrupt Control Register (TICR) (except BIT2, BIT0)
- */
-
-#define TXSTATUS_PREAMBLE_SENT  BIT7
-#define TXSTATUS_IDLE_SENT      BIT6
-#define TXSTATUS_ABORT_SENT     BIT5
-#define TXSTATUS_EOF            BIT4
-#define TXSTATUS_CRC_SENT       BIT3
-#define TXSTATUS_ALL_SENT       BIT2
-#define TXSTATUS_UNDERRUN       BIT1
-#define TXSTATUS_FIFO_EMPTY     BIT0
-
-#define DICR_MASTER             BIT15
-#define DICR_TRANSMIT           BIT0
-#define DICR_RECEIVE            BIT1
-
-#define usc_EnableDmaInterrupts(a,b) \
-        usc_OutDmaReg( (a), DICR, (u16)(usc_InDmaReg((a),DICR) | (b)) )
-
-#define usc_DisableDmaInterrupts(a,b) \
-        usc_OutDmaReg( (a), DICR, (u16)(usc_InDmaReg((a),DICR) & ~(b)) )
-
-#define usc_EnableStatusIrqs(a,b) \
-        usc_OutReg( (a), SICR, (u16)(usc_InReg((a),SICR) | (b)) )
-
-#define usc_DisablestatusIrqs(a,b) \
-        usc_OutReg( (a), SICR, (u16)(usc_InReg((a),SICR) & ~(b)) )
-
-/* Transmit status Bits in Transmit Control status Register (TCSR) */
-/* and Transmit Interrupt Control Register (TICR) (except BIT2, BIT0) */
-
-
-#define DISABLE_UNCONDITIONAL    0
-#define DISABLE_END_OF_FRAME     1
-#define ENABLE_UNCONDITIONAL     2
-#define ENABLE_AUTO_CTS          3
-#define ENABLE_AUTO_DCD          3
-#define usc_EnableTransmitter(a,b) \
-        usc_OutReg( (a), TMR, (u16)((usc_InReg((a),TMR) & 0xfffc) | (b)) )
-#define usc_EnableReceiver(a,b) \
-        usc_OutReg( (a), RMR, (u16)((usc_InReg((a),RMR) & 0xfffc) | (b)) )
-
-static u16  usc_InDmaReg( struct mgsl_struct *info, u16 Port );
-static void usc_OutDmaReg( struct mgsl_struct *info, u16 Port, u16 Value );
-static void usc_DmaCmd( struct mgsl_struct *info, u16 Cmd );
-
-static u16  usc_InReg( struct mgsl_struct *info, u16 Port );
-static void usc_OutReg( struct mgsl_struct *info, u16 Port, u16 Value );
-static void usc_RTCmd( struct mgsl_struct *info, u16 Cmd );
-void usc_RCmd( struct mgsl_struct *info, u16 Cmd );
-void usc_TCmd( struct mgsl_struct *info, u16 Cmd );
-
-#define usc_TCmd(a,b) usc_OutReg((a), TCSR, (u16)((a)->tcsr_value + (b)))
-#define usc_RCmd(a,b) usc_OutReg((a), RCSR, (b))
-
-#define usc_SetTransmitSyncChars(a,s0,s1) usc_OutReg((a), TSR, (u16)(((u16)s0<<8)|(u16)s1))
-
-static void usc_process_rxoverrun_sync( struct mgsl_struct *info );
-static void usc_start_receiver( struct mgsl_struct *info );
-static void usc_stop_receiver( struct mgsl_struct *info );
-
-static void usc_start_transmitter( struct mgsl_struct *info );
-static void usc_stop_transmitter( struct mgsl_struct *info );
-static void usc_set_txidle( struct mgsl_struct *info );
-static void usc_load_txfifo( struct mgsl_struct *info );
-
-static void usc_enable_aux_clock( struct mgsl_struct *info, u32 DataRate );
-static void usc_enable_loopback( struct mgsl_struct *info, int enable );
-
-static void usc_get_serial_signals( struct mgsl_struct *info );
-static void usc_set_serial_signals( struct mgsl_struct *info );
-
-static void usc_reset( struct mgsl_struct *info );
-
-static void usc_set_sync_mode( struct mgsl_struct *info );
-static void usc_set_sdlc_mode( struct mgsl_struct *info );
-static void usc_set_async_mode( struct mgsl_struct *info );
-static void usc_enable_async_clock( struct mgsl_struct *info, u32 DataRate );
-
-static void usc_loopback_frame( struct mgsl_struct *info );
-
-static void mgsl_tx_timeout(unsigned long context);
-
-
-static void usc_loopmode_cancel_transmit( struct mgsl_struct * info );
-static void usc_loopmode_insert_request( struct mgsl_struct * info );
-static int usc_loopmode_active( struct mgsl_struct * info);
-static void usc_loopmode_send_done( struct mgsl_struct * info );
-
-static int mgsl_ioctl_common(struct mgsl_struct *info, unsigned int cmd, unsigned long arg);
-
-#if SYNCLINK_GENERIC_HDLC
-#define dev_to_port(D) (dev_to_hdlc(D)->priv)
-static void hdlcdev_tx_done(struct mgsl_struct *info);
-static void hdlcdev_rx(struct mgsl_struct *info, char *buf, int size);
-static int  hdlcdev_init(struct mgsl_struct *info);
-static void hdlcdev_exit(struct mgsl_struct *info);
-#endif
-
-/*
- * Defines a BUS descriptor value for the PCI adapter
- * local bus address ranges.
- */
-
-#define BUS_DESCRIPTOR( WrHold, WrDly, RdDly, Nwdd, Nwad, Nxda, Nrdd, Nrad ) \
-(0x00400020 + \
-((WrHold) << 30) + \
-((WrDly)  << 28) + \
-((RdDly)  << 26) + \
-((Nwdd)   << 20) + \
-((Nwad)   << 15) + \
-((Nxda)   << 13) + \
-((Nrdd)   << 11) + \
-((Nrad)   <<  6) )
-
-static void mgsl_trace_block(struct mgsl_struct *info,const char* data, int count, int xmit);
-
-/*
- * Adapter diagnostic routines
- */
-static bool mgsl_register_test( struct mgsl_struct *info );
-static bool mgsl_irq_test( struct mgsl_struct *info );
-static bool mgsl_dma_test( struct mgsl_struct *info );
-static bool mgsl_memory_test( struct mgsl_struct *info );
-static int mgsl_adapter_test( struct mgsl_struct *info );
-
-/*
- * device and resource management routines
- */
-static int mgsl_claim_resources(struct mgsl_struct *info);
-static void mgsl_release_resources(struct mgsl_struct *info);
-static void mgsl_add_device(struct mgsl_struct *info);
-static struct mgsl_struct* mgsl_allocate_device(void);
-
-/*
- * DMA buffer manupulation functions.
- */
-static void mgsl_free_rx_frame_buffers( struct mgsl_struct *info, unsigned int StartIndex, unsigned int EndIndex );
-static bool mgsl_get_rx_frame( struct mgsl_struct *info );
-static bool mgsl_get_raw_rx_frame( struct mgsl_struct *info );
-static void mgsl_reset_rx_dma_buffers( struct mgsl_struct *info );
-static void mgsl_reset_tx_dma_buffers( struct mgsl_struct *info );
-static int num_free_tx_dma_buffers(struct mgsl_struct *info);
-static void mgsl_load_tx_dma_buffer( struct mgsl_struct *info, const char *Buffer, unsigned int BufferSize);
-static void mgsl_load_pci_memory(char* TargetPtr, const char* SourcePtr, unsigned short count);
-
-/*
- * DMA and Shared Memory buffer allocation and formatting
- */
-static int  mgsl_allocate_dma_buffers(struct mgsl_struct *info);
-static void mgsl_free_dma_buffers(struct mgsl_struct *info);
-static int  mgsl_alloc_frame_memory(struct mgsl_struct *info, DMABUFFERENTRY *BufferList,int Buffercount);
-static void mgsl_free_frame_memory(struct mgsl_struct *info, DMABUFFERENTRY *BufferList,int Buffercount);
-static int  mgsl_alloc_buffer_list_memory(struct mgsl_struct *info);
-static void mgsl_free_buffer_list_memory(struct mgsl_struct *info);
-static int mgsl_alloc_intermediate_rxbuffer_memory(struct mgsl_struct *info);
-static void mgsl_free_intermediate_rxbuffer_memory(struct mgsl_struct *info);
-static int mgsl_alloc_intermediate_txbuffer_memory(struct mgsl_struct *info);
-static void mgsl_free_intermediate_txbuffer_memory(struct mgsl_struct *info);
-static bool load_next_tx_holding_buffer(struct mgsl_struct *info);
-static int save_tx_buffer_request(struct mgsl_struct *info,const char *Buffer, unsigned int BufferSize);
-
-/*
- * Bottom half interrupt handlers
- */
-static void mgsl_bh_handler(struct work_struct *work);
-static void mgsl_bh_receive(struct mgsl_struct *info);
-static void mgsl_bh_transmit(struct mgsl_struct *info);
-static void mgsl_bh_status(struct mgsl_struct *info);
-
-/*
- * Interrupt handler routines and dispatch table.
- */
-static void mgsl_isr_null( struct mgsl_struct *info );
-static void mgsl_isr_transmit_data( struct mgsl_struct *info );
-static void mgsl_isr_receive_data( struct mgsl_struct *info );
-static void mgsl_isr_receive_status( struct mgsl_struct *info );
-static void mgsl_isr_transmit_status( struct mgsl_struct *info );
-static void mgsl_isr_io_pin( struct mgsl_struct *info );
-static void mgsl_isr_misc( struct mgsl_struct *info );
-static void mgsl_isr_receive_dma( struct mgsl_struct *info );
-static void mgsl_isr_transmit_dma( struct mgsl_struct *info );
-
-typedef void (*isr_dispatch_func)(struct mgsl_struct *);
-
-static isr_dispatch_func UscIsrTable[7] =
-{
-        mgsl_isr_null,
-        mgsl_isr_misc,
-        mgsl_isr_io_pin,
-        mgsl_isr_transmit_data,
-        mgsl_isr_transmit_status,
-        mgsl_isr_receive_data,
-        mgsl_isr_receive_status
-};
-
-/*
- * ioctl call handlers
- */
-static int tiocmget(struct tty_struct *tty, struct file *file);
-static int tiocmset(struct tty_struct *tty, struct file *file,
-                    unsigned int set, unsigned int clear);
-static int mgsl_get_stats(struct mgsl_struct * info, struct mgsl_icount
-        __user *user_icount);
-static int mgsl_get_params(struct mgsl_struct * info, MGSL_PARAMS  __user *user_params);
-static int mgsl_set_params(struct mgsl_struct * info, MGSL_PARAMS  __user *new_params);
-static int mgsl_get_txidle(struct mgsl_struct * info, int __user *idle_mode);
-static int mgsl_set_txidle(struct mgsl_struct * info, int idle_mode);
-static int mgsl_txenable(struct mgsl_struct * info, int enable);
-static int mgsl_txabort(struct mgsl_struct * info);
-static int mgsl_rxenable(struct mgsl_struct * info, int enable);
-static int mgsl_wait_event(struct mgsl_struct * info, int __user *mask);
-static int mgsl_loopmode_send_done( struct mgsl_struct * info );
-
-/* set non-zero on successful registration with PCI subsystem */
-static bool pci_registered;
-
-/*
- * Global linked list of SyncLink devices
- */
-static struct mgsl_struct *mgsl_device_list;
-static int mgsl_device_count;
-
-/*
- * Set this param to non-zero to load eax with the
- * .text section address and breakpoint on module load.
- * This is useful for use with gdb and add-symbol-file command.
- */
-static int break_on_load;
-
-/*
- * Driver major number, defaults to zero to get auto
- * assigned major number. May be forced as module parameter.
- */
-static int ttymajor;
-
-/*
- * Array of user specified options for ISA adapters.
- */
-static int io[MAX_ISA_DEVICES];
-static int irq[MAX_ISA_DEVICES];
-static int dma[MAX_ISA_DEVICES];
-static int debug_level;
-static int maxframe[MAX_TOTAL_DEVICES];
-static int txdmabufs[MAX_TOTAL_DEVICES];
-static int txholdbufs[MAX_TOTAL_DEVICES];
-        
-module_param(break_on_load, bool, 0);
-module_param(ttymajor, int, 0);
-module_param_array(io, int, NULL, 0);
-module_param_array(irq, int, NULL, 0);
-module_param_array(dma, int, NULL, 0);
-module_param(debug_level, int, 0);
-module_param_array(maxframe, int, NULL, 0);
-module_param_array(txdmabufs, int, NULL, 0);
-module_param_array(txholdbufs, int, NULL, 0);
-
-static char *driver_name = "SyncLink serial driver";
-static char *driver_version = "$Revision: 4.38 $";
-
-static int synclink_init_one (struct pci_dev *dev,
-                                     const struct pci_device_id *ent);
-static void synclink_remove_one (struct pci_dev *dev);
-
-static struct pci_device_id synclink_pci_tbl[] = {
-        { PCI_VENDOR_ID_MICROGATE, PCI_DEVICE_ID_MICROGATE_USC, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_MICROGATE, 0x0210, PCI_ANY_ID, PCI_ANY_ID, },
-        { 0, }, /* terminate list */
-};
-MODULE_DEVICE_TABLE(pci, synclink_pci_tbl);
-
-MODULE_LICENSE("GPL");
-
-static struct pci_driver synclink_pci_driver = {
-        .name           = "synclink",
-        .id_table       = synclink_pci_tbl,
-        .probe          = synclink_init_one,
-        .remove         = __devexit_p(synclink_remove_one),
-};
-
-static struct tty_driver *serial_driver;
-
-/* number of characters left in xmit buffer before we ask for more */
-#define WAKEUP_CHARS 256
-
-
-static void mgsl_change_params(struct mgsl_struct *info);
-static void mgsl_wait_until_sent(struct tty_struct *tty, int timeout);
-
-/*
- * 1st function defined in .text section. Calling this function in
- * init_module() followed by a breakpoint allows a remote debugger
- * (gdb) to get the .text address for the add-symbol-file command.
- * This allows remote debugging of dynamically loadable modules.
- */
-static void* mgsl_get_text_ptr(void)
-{
-        return mgsl_get_text_ptr;
-}
-
-static inline int mgsl_paranoia_check(struct mgsl_struct *info,
-                                        char *name, const char *routine)
-{
-#ifdef MGSL_PARANOIA_CHECK
-        static const char *badmagic =
-                "Warning: bad magic number for mgsl struct (%s) in %s\n";
-        static const char *badinfo =
-                "Warning: null mgsl_struct for (%s) in %s\n";
-
-        if (!info) {
-                printk(badinfo, name, routine);
-                return 1;
-        }
-        if (info->magic != MGSL_MAGIC) {
-                printk(badmagic, name, routine);
-                return 1;
-        }
-#else
-        if (!info)
-                return 1;
-#endif
-        return 0;
-}
-
-/**
- * line discipline callback wrappers
- *
- * The wrappers maintain line discipline references
- * while calling into the line discipline.
- *
- * ldisc_receive_buf  - pass receive data to line discipline
- */
-
-static void ldisc_receive_buf(struct tty_struct *tty,
-                              const __u8 *data, char *flags, int count)
-{
-        struct tty_ldisc *ld;
-        if (!tty)
-                return;
-        ld = tty_ldisc_ref(tty);
-        if (ld) {
-                if (ld->ops->receive_buf)
-                        ld->ops->receive_buf(tty, data, flags, count);
-                tty_ldisc_deref(ld);
-        }
-}
-
-/* mgsl_stop()          throttle (stop) transmitter
- *      
- * Arguments:           tty     pointer to tty info structure
- * Return Value:        None
- */
-static void mgsl_stop(struct tty_struct *tty)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned long flags;
-        
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_stop"))
-                return;
-        
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk("mgsl_stop(%s)\n",info->device_name);    
-                
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        if (info->tx_enabled)
-                usc_stop_transmitter(info);
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        
-}       /* end of mgsl_stop() */
-
-/* mgsl_start()         release (start) transmitter
- *      
- * Arguments:           tty     pointer to tty info structure
- * Return Value:        None
- */
-static void mgsl_start(struct tty_struct *tty)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned long flags;
-        
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_start"))
-                return;
-        
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk("mgsl_start(%s)\n",info->device_name);   
-                
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        if (!info->tx_enabled)
-                usc_start_transmitter(info);
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        
-}       /* end of mgsl_start() */
-
-/*
- * Bottom half work queue access functions
- */
-
-/* mgsl_bh_action()     Return next bottom half action to perform.
- * Return Value:        BH action code or 0 if nothing to do.
- */
-static int mgsl_bh_action(struct mgsl_struct *info)
-{
-        unsigned long flags;
-        int rc = 0;
-        
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-
-        if (info->pending_bh & BH_RECEIVE) {
-                info->pending_bh &= ~BH_RECEIVE;
-                rc = BH_RECEIVE;
-        } else if (info->pending_bh & BH_TRANSMIT) {
-                info->pending_bh &= ~BH_TRANSMIT;
-                rc = BH_TRANSMIT;
-        } else if (info->pending_bh & BH_STATUS) {
-                info->pending_bh &= ~BH_STATUS;
-                rc = BH_STATUS;
-        }
-
-        if (!rc) {
-                /* Mark BH routine as complete */
-                info->bh_running = false;
-                info->bh_requested = false;
-        }
-        
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        
-        return rc;
-}
-
-/*
- *      Perform bottom half processing of work items queued by ISR.
- */
-static void mgsl_bh_handler(struct work_struct *work)
-{
-        struct mgsl_struct *info =
-                container_of(work, struct mgsl_struct, task);
-        int action;
-
-        if (!info)
-                return;
-                
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk( "%s(%d):mgsl_bh_handler(%s) entry\n",
-                        __FILE__,__LINE__,info->device_name);
-        
-        info->bh_running = true;
-
-        while((action = mgsl_bh_action(info)) != 0) {
-        
-                /* Process work item */
-                if ( debug_level >= DEBUG_LEVEL_BH )
-                        printk( "%s(%d):mgsl_bh_handler() work item action=%d\n",
-                                __FILE__,__LINE__,action);
-
-                switch (action) {
-                
-                case BH_RECEIVE:
-                        mgsl_bh_receive(info);
-                        break;
-                case BH_TRANSMIT:
-                        mgsl_bh_transmit(info);
-                        break;
-                case BH_STATUS:
-                        mgsl_bh_status(info);
-                        break;
-                default:
-                        /* unknown work item ID */
-                        printk("Unknown work item ID=%08X!\n", action);
-                        break;
-                }
-        }
-
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk( "%s(%d):mgsl_bh_handler(%s) exit\n",
-                        __FILE__,__LINE__,info->device_name);
-}
-
-static void mgsl_bh_receive(struct mgsl_struct *info)
-{
-        bool (*get_rx_frame)(struct mgsl_struct *info) =
-                (info->params.mode == MGSL_MODE_HDLC ? mgsl_get_rx_frame : mgsl_get_raw_rx_frame);
-
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk( "%s(%d):mgsl_bh_receive(%s)\n",
-                        __FILE__,__LINE__,info->device_name);
-        
-        do
-        {
-                if (info->rx_rcc_underrun) {
-                        unsigned long flags;
-                        spin_lock_irqsave(&info->irq_spinlock,flags);
-                        usc_start_receiver(info);
-                        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-                        return;
-                }
-        } while(get_rx_frame(info));
-}
-
-static void mgsl_bh_transmit(struct mgsl_struct *info)
-{
-        struct tty_struct *tty = info->port.tty;
-        unsigned long flags;
-        
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk( "%s(%d):mgsl_bh_transmit() entry on %s\n",
-                        __FILE__,__LINE__,info->device_name);
-
-        if (tty)
-                tty_wakeup(tty);
-
-        /* if transmitter idle and loopmode_send_done_requested
-         * then start echoing RxD to TxD
-         */
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        if ( !info->tx_active && info->loopmode_send_done_requested )
-                usc_loopmode_send_done( info );
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-}
-
-static void mgsl_bh_status(struct mgsl_struct *info)
-{
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk( "%s(%d):mgsl_bh_status() entry on %s\n",
-                        __FILE__,__LINE__,info->device_name);
-
-        info->ri_chkcount = 0;
-        info->dsr_chkcount = 0;
-        info->dcd_chkcount = 0;
-        info->cts_chkcount = 0;
-}
-
-/* mgsl_isr_receive_status()
- * 
- *      Service a receive status interrupt. The type of status
- *      interrupt is indicated by the state of the RCSR.
- *      This is only used for HDLC mode.
- *
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_isr_receive_status( struct mgsl_struct *info )
-{
-        u16 status = usc_InReg( info, RCSR );
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )   
-                printk("%s(%d):mgsl_isr_receive_status status=%04X\n",
-                        __FILE__,__LINE__,status);
-                        
-        if ( (status & RXSTATUS_ABORT_RECEIVED) && 
-                info->loopmode_insert_requested &&
-                usc_loopmode_active(info) )
-        {
-                ++info->icount.rxabort;
-                info->loopmode_insert_requested = false;
- 
-                /* clear CMR:13 to start echoing RxD to TxD */
-                info->cmr_value &= ~BIT13;
-                usc_OutReg(info, CMR, info->cmr_value);
- 
-                /* disable received abort irq (no longer required) */
-                usc_OutReg(info, RICR,
-                        (usc_InReg(info, RICR) & ~RXSTATUS_ABORT_RECEIVED));
-        }
-
-        if (status & (RXSTATUS_EXITED_HUNT + RXSTATUS_IDLE_RECEIVED)) {
-                if (status & RXSTATUS_EXITED_HUNT)
-                        info->icount.exithunt++;
-                if (status & RXSTATUS_IDLE_RECEIVED)
-                        info->icount.rxidle++;
-                wake_up_interruptible(&info->event_wait_q);
-        }
-
-        if (status & RXSTATUS_OVERRUN){
-                info->icount.rxover++;
-                usc_process_rxoverrun_sync( info );
-        }
-
-        usc_ClearIrqPendingBits( info, RECEIVE_STATUS );
-        usc_UnlatchRxstatusBits( info, status );
-
-}       /* end of mgsl_isr_receive_status() */
-
-/* mgsl_isr_transmit_status()
- * 
- *      Service a transmit status interrupt
- *      HDLC mode :end of transmit frame
- *      Async mode:all data is sent
- *      transmit status is indicated by bits in the TCSR.
- * 
- * Arguments:           info           pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_isr_transmit_status( struct mgsl_struct *info )
-{
-        u16 status = usc_InReg( info, TCSR );
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )   
-                printk("%s(%d):mgsl_isr_transmit_status status=%04X\n",
-                        __FILE__,__LINE__,status);
-        
-        usc_ClearIrqPendingBits( info, TRANSMIT_STATUS );
-        usc_UnlatchTxstatusBits( info, status );
-        
-        if ( status & (TXSTATUS_UNDERRUN | TXSTATUS_ABORT_SENT) )
-        {
-                /* finished sending HDLC abort. This may leave  */
-                /* the TxFifo with data from the aborted frame  */
-                /* so purge the TxFifo. Also shutdown the DMA   */
-                /* channel in case there is data remaining in   */
-                /* the DMA buffer                               */
-                usc_DmaCmd( info, DmaCmd_ResetTxChannel );
-                usc_RTCmd( info, RTCmd_PurgeTxFifo );
-        }
- 
-        if ( status & TXSTATUS_EOF_SENT )
-                info->icount.txok++;
-        else if ( status & TXSTATUS_UNDERRUN )
-                info->icount.txunder++;
-        else if ( status & TXSTATUS_ABORT_SENT )
-                info->icount.txabort++;
-        else
-                info->icount.txunder++;
-                        
-        info->tx_active = false;
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-        del_timer(&info->tx_timer);     
-        
-        if ( info->drop_rts_on_tx_done ) {
-                usc_get_serial_signals( info );
-                if ( info->serial_signals & SerialSignal_RTS ) {
-                        info->serial_signals &= ~SerialSignal_RTS;
-                        usc_set_serial_signals( info );
-                }
-                info->drop_rts_on_tx_done = false;
-        }
-
-#if SYNCLINK_GENERIC_HDLC
-        if (info->netcount)
-                hdlcdev_tx_done(info);
-        else 
-#endif
-        {
-                if (info->port.tty->stopped || info->port.tty->hw_stopped) {
-                        usc_stop_transmitter(info);
-                        return;
-                }
-                info->pending_bh |= BH_TRANSMIT;
-        }
-
-}       /* end of mgsl_isr_transmit_status() */
-
-/* mgsl_isr_io_pin()
- * 
- *      Service an Input/Output pin interrupt. The type of
- *      interrupt is indicated by bits in the MISR
- *      
- * Arguments:           info           pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_isr_io_pin( struct mgsl_struct *info )
-{
-        struct  mgsl_icount *icount;
-        u16 status = usc_InReg( info, MISR );
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )   
-                printk("%s(%d):mgsl_isr_io_pin status=%04X\n",
-                        __FILE__,__LINE__,status);
-                        
-        usc_ClearIrqPendingBits( info, IO_PIN );
-        usc_UnlatchIostatusBits( info, status );
-
-        if (status & (MISCSTATUS_CTS_LATCHED | MISCSTATUS_DCD_LATCHED |
-                      MISCSTATUS_DSR_LATCHED | MISCSTATUS_RI_LATCHED) ) {
-                icount = &info->icount;
-                /* update input line counters */
-                if (status & MISCSTATUS_RI_LATCHED) {
-                        if ((info->ri_chkcount)++ >= IO_PIN_SHUTDOWN_LIMIT)
-                                usc_DisablestatusIrqs(info,SICR_RI);
-                        icount->rng++;
-                        if ( status & MISCSTATUS_RI )
-                                info->input_signal_events.ri_up++;      
-                        else
-                                info->input_signal_events.ri_down++;    
-                }
-                if (status & MISCSTATUS_DSR_LATCHED) {
-                        if ((info->dsr_chkcount)++ >= IO_PIN_SHUTDOWN_LIMIT)
-                                usc_DisablestatusIrqs(info,SICR_DSR);
-                        icount->dsr++;
-                        if ( status & MISCSTATUS_DSR )
-                                info->input_signal_events.dsr_up++;
-                        else
-                                info->input_signal_events.dsr_down++;
-                }
-                if (status & MISCSTATUS_DCD_LATCHED) {
-                        if ((info->dcd_chkcount)++ >= IO_PIN_SHUTDOWN_LIMIT)
-                                usc_DisablestatusIrqs(info,SICR_DCD);
-                        icount->dcd++;
-                        if (status & MISCSTATUS_DCD) {
-                                info->input_signal_events.dcd_up++;
-                        } else
-                                info->input_signal_events.dcd_down++;
-#if SYNCLINK_GENERIC_HDLC
-                        if (info->netcount) {
-                                if (status & MISCSTATUS_DCD)
-                                        netif_carrier_on(info->netdev);
-                                else
-                                        netif_carrier_off(info->netdev);
-                        }
-#endif
-                }
-                if (status & MISCSTATUS_CTS_LATCHED)
-                {
-                        if ((info->cts_chkcount)++ >= IO_PIN_SHUTDOWN_LIMIT)
-                                usc_DisablestatusIrqs(info,SICR_CTS);
-                        icount->cts++;
-                        if ( status & MISCSTATUS_CTS )
-                                info->input_signal_events.cts_up++;
-                        else
-                                info->input_signal_events.cts_down++;
-                }
-                wake_up_interruptible(&info->status_event_wait_q);
-                wake_up_interruptible(&info->event_wait_q);
-
-                if ( (info->port.flags & ASYNC_CHECK_CD) && 
-                     (status & MISCSTATUS_DCD_LATCHED) ) {
-                        if ( debug_level >= DEBUG_LEVEL_ISR )
-                                printk("%s CD now %s...", info->device_name,
-                                       (status & MISCSTATUS_DCD) ? "on" : "off");
-                        if (status & MISCSTATUS_DCD)
-                                wake_up_interruptible(&info->port.open_wait);
-                        else {
-                                if ( debug_level >= DEBUG_LEVEL_ISR )
-                                        printk("doing serial hangup...");
-                                if (info->port.tty)
-                                        tty_hangup(info->port.tty);
-                        }
-                }
-        
-                if ( (info->port.flags & ASYNC_CTS_FLOW) && 
-                     (status & MISCSTATUS_CTS_LATCHED) ) {
-                        if (info->port.tty->hw_stopped) {
-                                if (status & MISCSTATUS_CTS) {
-                                        if ( debug_level >= DEBUG_LEVEL_ISR )
-                                                printk("CTS tx start...");
-                                        if (info->port.tty)
-                                                info->port.tty->hw_stopped = 0;
-                                        usc_start_transmitter(info);
-                                        info->pending_bh |= BH_TRANSMIT;
-                                        return;
-                                }
-                        } else {
-                                if (!(status & MISCSTATUS_CTS)) {
-                                        if ( debug_level >= DEBUG_LEVEL_ISR )
-                                                printk("CTS tx stop...");
-                                        if (info->port.tty)
-                                                info->port.tty->hw_stopped = 1;
-                                        usc_stop_transmitter(info);
-                                }
-                        }
-                }
-        }
-
-        info->pending_bh |= BH_STATUS;
-        
-        /* for diagnostics set IRQ flag */
-        if ( status & MISCSTATUS_TXC_LATCHED ){
-                usc_OutReg( info, SICR,
-                        (unsigned short)(usc_InReg(info,SICR) & ~(SICR_TXC_ACTIVE+SICR_TXC_INACTIVE)) );
-                usc_UnlatchIostatusBits( info, MISCSTATUS_TXC_LATCHED );
-                info->irq_occurred = true;
-        }
-
-}       /* end of mgsl_isr_io_pin() */
-
-/* mgsl_isr_transmit_data()
- * 
- *      Service a transmit data interrupt (async mode only).
- * 
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_isr_transmit_data( struct mgsl_struct *info )
-{
-        if ( debug_level >= DEBUG_LEVEL_ISR )   
-                printk("%s(%d):mgsl_isr_transmit_data xmit_cnt=%d\n",
-                        __FILE__,__LINE__,info->xmit_cnt);
-                        
-        usc_ClearIrqPendingBits( info, TRANSMIT_DATA );
-        
-        if (info->port.tty->stopped || info->port.tty->hw_stopped) {
-                usc_stop_transmitter(info);
-                return;
-        }
-        
-        if ( info->xmit_cnt )
-                usc_load_txfifo( info );
-        else
-                info->tx_active = false;
-                
-        if (info->xmit_cnt < WAKEUP_CHARS)
-                info->pending_bh |= BH_TRANSMIT;
-
-}       /* end of mgsl_isr_transmit_data() */
-
-/* mgsl_isr_receive_data()
- * 
- *      Service a receive data interrupt. This occurs
- *      when operating in asynchronous interrupt transfer mode.
- *      The receive data FIFO is flushed to the receive data buffers. 
- * 
- * Arguments:           info            pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_isr_receive_data( struct mgsl_struct *info )
-{
-        int Fifocount;
-        u16 status;
-        int work = 0;
-        unsigned char DataByte;
-        struct tty_struct *tty = info->port.tty;
-        struct  mgsl_icount *icount = &info->icount;
-        
-        if ( debug_level >= DEBUG_LEVEL_ISR )   
-                printk("%s(%d):mgsl_isr_receive_data\n",
-                        __FILE__,__LINE__);
-
-        usc_ClearIrqPendingBits( info, RECEIVE_DATA );
-        
-        /* select FIFO status for RICR readback */
-        usc_RCmd( info, RCmd_SelectRicrRxFifostatus );
-
-        /* clear the Wordstatus bit so that status readback */
-        /* only reflects the status of this byte */
-        usc_OutReg( info, RICR+LSBONLY, (u16)(usc_InReg(info, RICR+LSBONLY) & ~BIT3 ));
-
-        /* flush the receive FIFO */
-
-        while( (Fifocount = (usc_InReg(info,RICR) >> 8)) ) {
-                int flag;
-
-                /* read one byte from RxFIFO */
-                outw( (inw(info->io_base + CCAR) & 0x0780) | (RDR+LSBONLY),
-                      info->io_base + CCAR );
-                DataByte = inb( info->io_base + CCAR );
-
-                /* get the status of the received byte */
-                status = usc_InReg(info, RCSR);
-                if ( status & (RXSTATUS_FRAMING_ERROR + RXSTATUS_PARITY_ERROR +
-                                RXSTATUS_OVERRUN + RXSTATUS_BREAK_RECEIVED) )
-                        usc_UnlatchRxstatusBits(info,RXSTATUS_ALL);
-                
-                icount->rx++;
-                
-                flag = 0;
-                if ( status & (RXSTATUS_FRAMING_ERROR + RXSTATUS_PARITY_ERROR +
-                                RXSTATUS_OVERRUN + RXSTATUS_BREAK_RECEIVED) ) {
-                        printk("rxerr=%04X\n",status);                                  
-                        /* update error statistics */
-                        if ( status & RXSTATUS_BREAK_RECEIVED ) {
-                                status &= ~(RXSTATUS_FRAMING_ERROR + RXSTATUS_PARITY_ERROR);
-                                icount->brk++;
-                        } else if (status & RXSTATUS_PARITY_ERROR) 
-                                icount->parity++;
-                        else if (status & RXSTATUS_FRAMING_ERROR)
-                                icount->frame++;
-                        else if (status & RXSTATUS_OVERRUN) {
-                                /* must issue purge fifo cmd before */
-                                /* 16C32 accepts more receive chars */
-                                usc_RTCmd(info,RTCmd_PurgeRxFifo);
-                                icount->overrun++;
-                        }
-
-                        /* discard char if tty control flags say so */                                  
-                        if (status & info->ignore_status_mask)
-                                continue;
-                                
-                        status &= info->read_status_mask;
-                
-                        if (status & RXSTATUS_BREAK_RECEIVED) {
-                                flag = TTY_BREAK;
-                                if (info->port.flags & ASYNC_SAK)
-                                        do_SAK(tty);
-                        } else if (status & RXSTATUS_PARITY_ERROR)
-                                flag = TTY_PARITY;
-                        else if (status & RXSTATUS_FRAMING_ERROR)
-                                flag = TTY_FRAME;
-                }       /* end of if (error) */
-                tty_insert_flip_char(tty, DataByte, flag);
-                if (status & RXSTATUS_OVERRUN) {
-                        /* Overrun is special, since it's
-                         * reported immediately, and doesn't
-                         * affect the current character
-                         */
-                        work += tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-                }
-        }
-
-        if ( debug_level >= DEBUG_LEVEL_ISR ) {
-                printk("%s(%d):rx=%d brk=%d parity=%d frame=%d overrun=%d\n",
-                        __FILE__,__LINE__,icount->rx,icount->brk,
-                        icount->parity,icount->frame,icount->overrun);
-        }
-                        
-        if(work)
-                tty_flip_buffer_push(tty);
-}
-
-/* mgsl_isr_misc()
- * 
- *      Service a miscellaneous interrupt source.
- *      
- * Arguments:           info            pointer to device extension (instance data)
- * Return Value:        None
- */
-static void mgsl_isr_misc( struct mgsl_struct *info )
-{
-        u16 status = usc_InReg( info, MISR );
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )   
-                printk("%s(%d):mgsl_isr_misc status=%04X\n",
-                        __FILE__,__LINE__,status);
-                        
-        if ((status & MISCSTATUS_RCC_UNDERRUN) &&
-            (info->params.mode == MGSL_MODE_HDLC)) {
-
-                /* turn off receiver and rx DMA */
-                usc_EnableReceiver(info,DISABLE_UNCONDITIONAL);
-                usc_DmaCmd(info, DmaCmd_ResetRxChannel);
-                usc_UnlatchRxstatusBits(info, RXSTATUS_ALL);
-                usc_ClearIrqPendingBits(info, RECEIVE_DATA + RECEIVE_STATUS);
-                usc_DisableInterrupts(info, RECEIVE_DATA + RECEIVE_STATUS);
-
-                /* schedule BH handler to restart receiver */
-                info->pending_bh |= BH_RECEIVE;
-                info->rx_rcc_underrun = true;
-        }
-
-        usc_ClearIrqPendingBits( info, MISC );
-        usc_UnlatchMiscstatusBits( info, status );
-
-}       /* end of mgsl_isr_misc() */
-
-/* mgsl_isr_null()
- *
- *      Services undefined interrupt vectors from the
- *      USC. (hence this function SHOULD never be called)
- * 
- * Arguments:           info            pointer to device extension (instance data)
- * Return Value:        None
- */
-static void mgsl_isr_null( struct mgsl_struct *info )
-{
-
-}       /* end of mgsl_isr_null() */
-
-/* mgsl_isr_receive_dma()
- * 
- *      Service a receive DMA channel interrupt.
- *      For this driver there are two sources of receive DMA interrupts
- *      as identified in the Receive DMA mode Register (RDMR):
- * 
- *      BIT3    EOA/EOL         End of List, all receive buffers in receive
- *                              buffer list have been filled (no more free buffers
- *                              available). The DMA controller has shut down.
- * 
- *      BIT2    EOB             End of Buffer. This interrupt occurs when a receive
- *                              DMA buffer is terminated in response to completion
- *                              of a good frame or a frame with errors. The status
- *                              of the frame is stored in the buffer entry in the
- *                              list of receive buffer entries.
- * 
- * Arguments:           info            pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_isr_receive_dma( struct mgsl_struct *info )
-{
-        u16 status;
-        
-        /* clear interrupt pending and IUS bit for Rx DMA IRQ */
-        usc_OutDmaReg( info, CDIR, BIT9+BIT1 );
-
-        /* Read the receive DMA status to identify interrupt type. */
-        /* This also clears the status bits. */
-        status = usc_InDmaReg( info, RDMR );
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )   
-                printk("%s(%d):mgsl_isr_receive_dma(%s) status=%04X\n",
-                        __FILE__,__LINE__,info->device_name,status);
-                        
-        info->pending_bh |= BH_RECEIVE;
-        
-        if ( status & BIT3 ) {
-                info->rx_overflow = true;
-                info->icount.buf_overrun++;
-        }
-
-}       /* end of mgsl_isr_receive_dma() */
-
-/* mgsl_isr_transmit_dma()
- *
- *      This function services a transmit DMA channel interrupt.
- *
- *      For this driver there is one source of transmit DMA interrupts
- *      as identified in the Transmit DMA Mode Register (TDMR):
- *
- *      BIT2  EOB       End of Buffer. This interrupt occurs when a
- *                      transmit DMA buffer has been emptied.
- *
- *      The driver maintains enough transmit DMA buffers to hold at least
- *      one max frame size transmit frame. When operating in a buffered
- *      transmit mode, there may be enough transmit DMA buffers to hold at
- *      least two or more max frame size frames. On an EOB condition,
- *      determine if there are any queued transmit buffers and copy into
- *      transmit DMA buffers if we have room.
- *
- * Arguments:           info            pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_isr_transmit_dma( struct mgsl_struct *info )
-{
-        u16 status;
-
-        /* clear interrupt pending and IUS bit for Tx DMA IRQ */
-        usc_OutDmaReg(info, CDIR, BIT8+BIT0 );
-
-        /* Read the transmit DMA status to identify interrupt type. */
-        /* This also clears the status bits. */
-
-        status = usc_InDmaReg( info, TDMR );
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):mgsl_isr_transmit_dma(%s) status=%04X\n",
-                        __FILE__,__LINE__,info->device_name,status);
-
-        if ( status & BIT2 ) {
-                --info->tx_dma_buffers_used;
-
-                /* if there are transmit frames queued,
-                 *  try to load the next one
-                 */
-                if ( load_next_tx_holding_buffer(info) ) {
-                        /* if call returns non-zero value, we have
-                         * at least one free tx holding buffer
-                         */
-                        info->pending_bh |= BH_TRANSMIT;
-                }
-        }
-
-}       /* end of mgsl_isr_transmit_dma() */
-
-/* mgsl_interrupt()
- * 
- *      Interrupt service routine entry point.
- *      
- * Arguments:
- * 
- *      irq             interrupt number that caused interrupt
- *      dev_id          device ID supplied during interrupt registration
- *      
- * Return Value: None
- */
-static irqreturn_t mgsl_interrupt(int dummy, void *dev_id)
-{
-        struct mgsl_struct *info = dev_id;
-        u16 UscVector;
-        u16 DmaVector;
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )   
-                printk(KERN_DEBUG "%s(%d):mgsl_interrupt(%d)entry.\n",
-                        __FILE__, __LINE__, info->irq_level);
-
-        spin_lock(&info->irq_spinlock);
-
-        for(;;) {
-                /* Read the interrupt vectors from hardware. */
-                UscVector = usc_InReg(info, IVR) >> 9;
-                DmaVector = usc_InDmaReg(info, DIVR);
-                
-                if ( debug_level >= DEBUG_LEVEL_ISR )   
-                        printk("%s(%d):%s UscVector=%08X DmaVector=%08X\n",
-                                __FILE__,__LINE__,info->device_name,UscVector,DmaVector);
-                        
-                if ( !UscVector && !DmaVector )
-                        break;
-                        
-                /* Dispatch interrupt vector */
-                if ( UscVector )
-                        (*UscIsrTable[UscVector])(info);
-                else if ( (DmaVector&(BIT10|BIT9)) == BIT10)
-                        mgsl_isr_transmit_dma(info);
-                else
-                        mgsl_isr_receive_dma(info);
-
-                if ( info->isr_overflow ) {
-                        printk(KERN_ERR "%s(%d):%s isr overflow irq=%d\n",
-                                __FILE__, __LINE__, info->device_name, info->irq_level);
-                        usc_DisableMasterIrqBit(info);
-                        usc_DisableDmaInterrupts(info,DICR_MASTER);
-                        break;
-                }
-        }
-        
-        /* Request bottom half processing if there's something 
-         * for it to do and the bh is not already running
-         */
-
-        if ( info->pending_bh && !info->bh_running && !info->bh_requested ) {
-                if ( debug_level >= DEBUG_LEVEL_ISR )   
-                        printk("%s(%d):%s queueing bh task.\n",
-                                __FILE__,__LINE__,info->device_name);
-                schedule_work(&info->task);
-                info->bh_requested = true;
-        }
-
-        spin_unlock(&info->irq_spinlock);
-        
-        if ( debug_level >= DEBUG_LEVEL_ISR )   
-                printk(KERN_DEBUG "%s(%d):mgsl_interrupt(%d)exit.\n",
-                        __FILE__, __LINE__, info->irq_level);
-
-        return IRQ_HANDLED;
-}       /* end of mgsl_interrupt() */
-
-/* startup()
- * 
- *      Initialize and start device.
- *      
- * Arguments:           info    pointer to device instance data
- * Return Value:        0 if success, otherwise error code
- */
-static int startup(struct mgsl_struct * info)
-{
-        int retval = 0;
-        
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk("%s(%d):mgsl_startup(%s)\n",__FILE__,__LINE__,info->device_name);
-                
-        if (info->port.flags & ASYNC_INITIALIZED)
-                return 0;
-        
-        if (!info->xmit_buf) {
-                /* allocate a page of memory for a transmit buffer */
-                info->xmit_buf = (unsigned char *)get_zeroed_page(GFP_KERNEL);
-                if (!info->xmit_buf) {
-                        printk(KERN_ERR"%s(%d):%s can't allocate transmit buffer\n",
-                                __FILE__,__LINE__,info->device_name);
-                        return -ENOMEM;
-                }
-        }
-
-        info->pending_bh = 0;
-        
-        memset(&info->icount, 0, sizeof(info->icount));
-
-        setup_timer(&info->tx_timer, mgsl_tx_timeout, (unsigned long)info);
-        
-        /* Allocate and claim adapter resources */
-        retval = mgsl_claim_resources(info);
-        
-        /* perform existence check and diagnostics */
-        if ( !retval )
-                retval = mgsl_adapter_test(info);
-                
-        if ( retval ) {
-                if (capable(CAP_SYS_ADMIN) && info->port.tty)
-                        set_bit(TTY_IO_ERROR, &info->port.tty->flags);
-                mgsl_release_resources(info);
-                return retval;
-        }
-
-        /* program hardware for current parameters */
-        mgsl_change_params(info);
-        
-        if (info->port.tty)
-                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
-
-        info->port.flags |= ASYNC_INITIALIZED;
-        
-        return 0;
-        
-}       /* end of startup() */
-
-/* shutdown()
- *
- * Called by mgsl_close() and mgsl_hangup() to shutdown hardware
- *
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void shutdown(struct mgsl_struct * info)
-{
-        unsigned long flags;
-        
-        if (!(info->port.flags & ASYNC_INITIALIZED))
-                return;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_shutdown(%s)\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        /* clear status wait queue because status changes */
-        /* can't happen after shutting down the hardware */
-        wake_up_interruptible(&info->status_event_wait_q);
-        wake_up_interruptible(&info->event_wait_q);
-
-        del_timer_sync(&info->tx_timer);
-
-        if (info->xmit_buf) {
-                free_page((unsigned long) info->xmit_buf);
-                info->xmit_buf = NULL;
-        }
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        usc_DisableMasterIrqBit(info);
-        usc_stop_receiver(info);
-        usc_stop_transmitter(info);
-        usc_DisableInterrupts(info,RECEIVE_DATA + RECEIVE_STATUS +
-                TRANSMIT_DATA + TRANSMIT_STATUS + IO_PIN + MISC );
-        usc_DisableDmaInterrupts(info,DICR_MASTER + DICR_TRANSMIT + DICR_RECEIVE);
-        
-        /* Disable DMAEN (Port 7, Bit 14) */
-        /* This disconnects the DMA request signal from the ISA bus */
-        /* on the ISA adapter. This has no effect for the PCI adapter */
-        usc_OutReg(info, PCR, (u16)((usc_InReg(info, PCR) | BIT15) | BIT14));
-        
-        /* Disable INTEN (Port 6, Bit12) */
-        /* This disconnects the IRQ request signal to the ISA bus */
-        /* on the ISA adapter. This has no effect for the PCI adapter */
-        usc_OutReg(info, PCR, (u16)((usc_InReg(info, PCR) | BIT13) | BIT12));
-        
-        if (!info->port.tty || info->port.tty->termios->c_cflag & HUPCL) {
-                info->serial_signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
-                usc_set_serial_signals(info);
-        }
-        
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-        mgsl_release_resources(info);   
-        
-        if (info->port.tty)
-                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
-
-        info->port.flags &= ~ASYNC_INITIALIZED;
-        
-}       /* end of shutdown() */
-
-static void mgsl_program_hw(struct mgsl_struct *info)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        
-        usc_stop_receiver(info);
-        usc_stop_transmitter(info);
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-        
-        if (info->params.mode == MGSL_MODE_HDLC ||
-            info->params.mode == MGSL_MODE_RAW ||
-            info->netcount)
-                usc_set_sync_mode(info);
-        else
-                usc_set_async_mode(info);
-                
-        usc_set_serial_signals(info);
-        
-        info->dcd_chkcount = 0;
-        info->cts_chkcount = 0;
-        info->ri_chkcount = 0;
-        info->dsr_chkcount = 0;
-
-        usc_EnableStatusIrqs(info,SICR_CTS+SICR_DSR+SICR_DCD+SICR_RI);          
-        usc_EnableInterrupts(info, IO_PIN);
-        usc_get_serial_signals(info);
-                
-        if (info->netcount || info->port.tty->termios->c_cflag & CREAD)
-                usc_start_receiver(info);
-                
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-}
-
-/* Reconfigure adapter based on new parameters
- */
-static void mgsl_change_params(struct mgsl_struct *info)
-{
-        unsigned cflag;
-        int bits_per_char;
-
-        if (!info->port.tty || !info->port.tty->termios)
-                return;
-                
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_change_params(%s)\n",
-                         __FILE__,__LINE__, info->device_name );
-                         
-        cflag = info->port.tty->termios->c_cflag;
-
-        /* if B0 rate (hangup) specified then negate DTR and RTS */
-        /* otherwise assert DTR and RTS */
-        if (cflag & CBAUD)
-                info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
-        else
-                info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
-        
-        /* byte size and parity */
-        
-        switch (cflag & CSIZE) {
-              case CS5: info->params.data_bits = 5; break;
-              case CS6: info->params.data_bits = 6; break;
-              case CS7: info->params.data_bits = 7; break;
-              case CS8: info->params.data_bits = 8; break;
-              /* Never happens, but GCC is too dumb to figure it out */
-              default:  info->params.data_bits = 7; break;
-              }
-              
-        if (cflag & CSTOPB)
-                info->params.stop_bits = 2;
-        else
-                info->params.stop_bits = 1;
-
-        info->params.parity = ASYNC_PARITY_NONE;
-        if (cflag & PARENB) {
-                if (cflag & PARODD)
-                        info->params.parity = ASYNC_PARITY_ODD;
-                else
-                        info->params.parity = ASYNC_PARITY_EVEN;
-#ifdef CMSPAR
-                if (cflag & CMSPAR)
-                        info->params.parity = ASYNC_PARITY_SPACE;
-#endif
-        }
-
-        /* calculate number of jiffies to transmit a full
-         * FIFO (32 bytes) at specified data rate
-         */
-        bits_per_char = info->params.data_bits + 
-                        info->params.stop_bits + 1;
-
-        /* if port data rate is set to 460800 or less then
-         * allow tty settings to override, otherwise keep the
-         * current data rate.
-         */
-        if (info->params.data_rate <= 460800)
-                info->params.data_rate = tty_get_baud_rate(info->port.tty);
-        
-        if ( info->params.data_rate ) {
-                info->timeout = (32*HZ*bits_per_char) / 
-                                info->params.data_rate;
-        }
-        info->timeout += HZ/50;         /* Add .02 seconds of slop */
-
-        if (cflag & CRTSCTS)
-                info->port.flags |= ASYNC_CTS_FLOW;
-        else
-                info->port.flags &= ~ASYNC_CTS_FLOW;
-                
-        if (cflag & CLOCAL)
-                info->port.flags &= ~ASYNC_CHECK_CD;
-        else
-                info->port.flags |= ASYNC_CHECK_CD;
-
-        /* process tty input control flags */
-        
-        info->read_status_mask = RXSTATUS_OVERRUN;
-        if (I_INPCK(info->port.tty))
-                info->read_status_mask |= RXSTATUS_PARITY_ERROR | RXSTATUS_FRAMING_ERROR;
-        if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty))
-                info->read_status_mask |= RXSTATUS_BREAK_RECEIVED;
-        
-        if (I_IGNPAR(info->port.tty))
-                info->ignore_status_mask |= RXSTATUS_PARITY_ERROR | RXSTATUS_FRAMING_ERROR;
-        if (I_IGNBRK(info->port.tty)) {
-                info->ignore_status_mask |= RXSTATUS_BREAK_RECEIVED;
-                /* If ignoring parity and break indicators, ignore 
-                 * overruns too.  (For real raw support).
-                 */
-                if (I_IGNPAR(info->port.tty))
-                        info->ignore_status_mask |= RXSTATUS_OVERRUN;
-        }
-
-        mgsl_program_hw(info);
-
-}       /* end of mgsl_change_params() */
-
-/* mgsl_put_char()
- * 
- *      Add a character to the transmit buffer.
- *      
- * Arguments:           tty     pointer to tty information structure
- *                      ch      character to add to transmit buffer
- *              
- * Return Value:        None
- */
-static int mgsl_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned long flags;
-        int ret = 0;
-
-        if (debug_level >= DEBUG_LEVEL_INFO) {
-                printk(KERN_DEBUG "%s(%d):mgsl_put_char(%d) on %s\n",
-                        __FILE__, __LINE__, ch, info->device_name);
-        }               
-        
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_put_char"))
-                return 0;
-
-        if (!info->xmit_buf)
-                return 0;
-
-        spin_lock_irqsave(&info->irq_spinlock, flags);
-        
-        if ((info->params.mode == MGSL_MODE_ASYNC ) || !info->tx_active) {
-                if (info->xmit_cnt < SERIAL_XMIT_SIZE - 1) {
-                        info->xmit_buf[info->xmit_head++] = ch;
-                        info->xmit_head &= SERIAL_XMIT_SIZE-1;
-                        info->xmit_cnt++;
-                        ret = 1;
-                }
-        }
-        spin_unlock_irqrestore(&info->irq_spinlock, flags);
-        return ret;
-        
-}       /* end of mgsl_put_char() */
-
-/* mgsl_flush_chars()
- * 
- *      Enable transmitter so remaining characters in the
- *      transmit buffer are sent.
- *      
- * Arguments:           tty     pointer to tty information structure
- * Return Value:        None
- */
-static void mgsl_flush_chars(struct tty_struct *tty)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned long flags;
-                                
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):mgsl_flush_chars() entry on %s xmit_cnt=%d\n",
-                        __FILE__,__LINE__,info->device_name,info->xmit_cnt);
-        
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_flush_chars"))
-                return;
-
-        if (info->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
-            !info->xmit_buf)
-                return;
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):mgsl_flush_chars() entry on %s starting transmitter\n",
-                        __FILE__,__LINE__,info->device_name );
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        
-        if (!info->tx_active) {
-                if ( (info->params.mode == MGSL_MODE_HDLC ||
-                        info->params.mode == MGSL_MODE_RAW) && info->xmit_cnt ) {
-                        /* operating in synchronous (frame oriented) mode */
-                        /* copy data from circular xmit_buf to */
-                        /* transmit DMA buffer. */
-                        mgsl_load_tx_dma_buffer(info,
-                                 info->xmit_buf,info->xmit_cnt);
-                }
-                usc_start_transmitter(info);
-        }
-        
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        
-}       /* end of mgsl_flush_chars() */
-
-/* mgsl_write()
- * 
- *      Send a block of data
- *      
- * Arguments:
- * 
- *      tty             pointer to tty information structure
- *      buf             pointer to buffer containing send data
- *      count           size of send data in bytes
- *      
- * Return Value:        number of characters written
- */
-static int mgsl_write(struct tty_struct * tty,
-                    const unsigned char *buf, int count)
-{
-        int     c, ret = 0;
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned long flags;
-        
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):mgsl_write(%s) count=%d\n",
-                        __FILE__,__LINE__,info->device_name,count);
-        
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_write"))
-                goto cleanup;
-
-        if (!info->xmit_buf)
-                goto cleanup;
-
-        if ( info->params.mode == MGSL_MODE_HDLC ||
-                        info->params.mode == MGSL_MODE_RAW ) {
-                /* operating in synchronous (frame oriented) mode */
-                /* operating in synchronous (frame oriented) mode */
-                if (info->tx_active) {
-
-                        if ( info->params.mode == MGSL_MODE_HDLC ) {
-                                ret = 0;
-                                goto cleanup;
-                        }
-                        /* transmitter is actively sending data -
-                         * if we have multiple transmit dma and
-                         * holding buffers, attempt to queue this
-                         * frame for transmission at a later time.
-                         */
-                        if (info->tx_holding_count >= info->num_tx_holding_buffers ) {
-                                /* no tx holding buffers available */
-                                ret = 0;
-                                goto cleanup;
-                        }
-
-                        /* queue transmit frame request */
-                        ret = count;
-                        save_tx_buffer_request(info,buf,count);
-
-                        /* if we have sufficient tx dma buffers,
-                         * load the next buffered tx request
-                         */
-                        spin_lock_irqsave(&info->irq_spinlock,flags);
-                        load_next_tx_holding_buffer(info);
-                        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-                        goto cleanup;
-                }
-        
-                /* if operating in HDLC LoopMode and the adapter  */
-                /* has yet to be inserted into the loop, we can't */
-                /* transmit                                       */
-
-                if ( (info->params.flags & HDLC_FLAG_HDLC_LOOPMODE) &&
-                        !usc_loopmode_active(info) )
-                {
-                        ret = 0;
-                        goto cleanup;
-                }
-
-                if ( info->xmit_cnt ) {
-                        /* Send accumulated from send_char() calls */
-                        /* as frame and wait before accepting more data. */
-                        ret = 0;
-                        
-                        /* copy data from circular xmit_buf to */
-                        /* transmit DMA buffer. */
-                        mgsl_load_tx_dma_buffer(info,
-                                info->xmit_buf,info->xmit_cnt);
-                        if ( debug_level >= DEBUG_LEVEL_INFO )
-                                printk( "%s(%d):mgsl_write(%s) sync xmit_cnt flushing\n",
-                                        __FILE__,__LINE__,info->device_name);
-                } else {
-                        if ( debug_level >= DEBUG_LEVEL_INFO )
-                                printk( "%s(%d):mgsl_write(%s) sync transmit accepted\n",
-                                        __FILE__,__LINE__,info->device_name);
-                        ret = count;
-                        info->xmit_cnt = count;
-                        mgsl_load_tx_dma_buffer(info,buf,count);
-                }
-        } else {
-                while (1) {
-                        spin_lock_irqsave(&info->irq_spinlock,flags);
-                        c = min_t(int, count,
-                                min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
-                                    SERIAL_XMIT_SIZE - info->xmit_head));
-                        if (c <= 0) {
-                                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-                                break;
-                        }
-                        memcpy(info->xmit_buf + info->xmit_head, buf, c);
-                        info->xmit_head = ((info->xmit_head + c) &
-                                           (SERIAL_XMIT_SIZE-1));
-                        info->xmit_cnt += c;
-                        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-                        buf += c;
-                        count -= c;
-                        ret += c;
-                }
-        }       
-        
-        if (info->xmit_cnt && !tty->stopped && !tty->hw_stopped) {
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                if (!info->tx_active)
-                        usc_start_transmitter(info);
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        }
-cleanup:        
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):mgsl_write(%s) returning=%d\n",
-                        __FILE__,__LINE__,info->device_name,ret);
-                        
-        return ret;
-        
-}       /* end of mgsl_write() */
-
-/* mgsl_write_room()
- *
- *      Return the count of free bytes in transmit buffer
- *      
- * Arguments:           tty     pointer to tty info structure
- * Return Value:        None
- */
-static int mgsl_write_room(struct tty_struct *tty)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        int     ret;
-                                
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_write_room"))
-                return 0;
-        ret = SERIAL_XMIT_SIZE - info->xmit_cnt - 1;
-        if (ret < 0)
-                ret = 0;
-                
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_write_room(%s)=%d\n",
-                         __FILE__,__LINE__, info->device_name,ret );
-                         
-        if ( info->params.mode == MGSL_MODE_HDLC ||
-                info->params.mode == MGSL_MODE_RAW ) {
-                /* operating in synchronous (frame oriented) mode */
-                if ( info->tx_active )
-                        return 0;
-                else
-                        return HDLC_MAX_FRAME_SIZE;
-        }
-        
-        return ret;
-        
-}       /* end of mgsl_write_room() */
-
-/* mgsl_chars_in_buffer()
- *
- *      Return the count of bytes in transmit buffer
- *      
- * Arguments:           tty     pointer to tty info structure
- * Return Value:        None
- */
-static int mgsl_chars_in_buffer(struct tty_struct *tty)
-{
-        struct mgsl_struct *info = tty->driver_data;
-                         
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_chars_in_buffer(%s)\n",
-                         __FILE__,__LINE__, info->device_name );
-                         
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_chars_in_buffer"))
-                return 0;
-                
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_chars_in_buffer(%s)=%d\n",
-                         __FILE__,__LINE__, info->device_name,info->xmit_cnt );
-                         
-        if ( info->params.mode == MGSL_MODE_HDLC ||
-                info->params.mode == MGSL_MODE_RAW ) {
-                /* operating in synchronous (frame oriented) mode */
-                if ( info->tx_active )
-                        return info->max_frame_size;
-                else
-                        return 0;
-        }
-                         
-        return info->xmit_cnt;
-}       /* end of mgsl_chars_in_buffer() */
-
-/* mgsl_flush_buffer()
- *
- *      Discard all data in the send buffer
- *      
- * Arguments:           tty     pointer to tty info structure
- * Return Value:        None
- */
-static void mgsl_flush_buffer(struct tty_struct *tty)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned long flags;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_flush_buffer(%s) entry\n",
-                         __FILE__,__LINE__, info->device_name );
-        
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_flush_buffer"))
-                return;
-                
-        spin_lock_irqsave(&info->irq_spinlock,flags); 
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-        del_timer(&info->tx_timer);     
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        
-        tty_wakeup(tty);
-}
-
-/* mgsl_send_xchar()
- *
- *      Send a high-priority XON/XOFF character
- *      
- * Arguments:           tty     pointer to tty info structure
- *                      ch      character to send
- * Return Value:        None
- */
-static void mgsl_send_xchar(struct tty_struct *tty, char ch)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_send_xchar(%s,%d)\n",
-                         __FILE__,__LINE__, info->device_name, ch );
-                         
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_send_xchar"))
-                return;
-
-        info->x_char = ch;
-        if (ch) {
-                /* Make sure transmit interrupts are on */
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                if (!info->tx_enabled)
-                        usc_start_transmitter(info);
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        }
-}       /* end of mgsl_send_xchar() */
-
-/* mgsl_throttle()
- * 
- *      Signal remote device to throttle send data (our receive data)
- *      
- * Arguments:           tty     pointer to tty info structure
- * Return Value:        None
- */
-static void mgsl_throttle(struct tty_struct * tty)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned long flags;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_throttle(%s) entry\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_throttle"))
-                return;
-        
-        if (I_IXOFF(tty))
-                mgsl_send_xchar(tty, STOP_CHAR(tty));
- 
-        if (tty->termios->c_cflag & CRTSCTS) {
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                info->serial_signals &= ~SerialSignal_RTS;
-                usc_set_serial_signals(info);
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        }
-}       /* end of mgsl_throttle() */
-
-/* mgsl_unthrottle()
- * 
- *      Signal remote device to stop throttling send data (our receive data)
- *      
- * Arguments:           tty     pointer to tty info structure
- * Return Value:        None
- */
-static void mgsl_unthrottle(struct tty_struct * tty)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned long flags;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_unthrottle(%s) entry\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_unthrottle"))
-                return;
-        
-        if (I_IXOFF(tty)) {
-                if (info->x_char)
-                        info->x_char = 0;
-                else
-                        mgsl_send_xchar(tty, START_CHAR(tty));
-        }
-        
-        if (tty->termios->c_cflag & CRTSCTS) {
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                info->serial_signals |= SerialSignal_RTS;
-                usc_set_serial_signals(info);
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        }
-        
-}       /* end of mgsl_unthrottle() */
-
-/* mgsl_get_stats()
- * 
- *      get the current serial parameters information
- *
- * Arguments:   info            pointer to device instance data
- *              user_icount     pointer to buffer to hold returned stats
- *      
- * Return Value:        0 if success, otherwise error code
- */
-static int mgsl_get_stats(struct mgsl_struct * info, struct mgsl_icount __user *user_icount)
-{
-        int err;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_get_params(%s)\n",
-                         __FILE__,__LINE__, info->device_name);
-                        
-        if (!user_icount) {
-                memset(&info->icount, 0, sizeof(info->icount));
-        } else {
-                mutex_lock(&info->port.mutex);
-                COPY_TO_USER(err, user_icount, &info->icount, sizeof(struct mgsl_icount));
-                mutex_unlock(&info->port.mutex);
-                if (err)
-                        return -EFAULT;
-        }
-        
-        return 0;
-        
-}       /* end of mgsl_get_stats() */
-
-/* mgsl_get_params()
- * 
- *      get the current serial parameters information
- *
- * Arguments:   info            pointer to device instance data
- *              user_params     pointer to buffer to hold returned params
- *      
- * Return Value:        0 if success, otherwise error code
- */
-static int mgsl_get_params(struct mgsl_struct * info, MGSL_PARAMS __user *user_params)
-{
-        int err;
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_get_params(%s)\n",
-                         __FILE__,__LINE__, info->device_name);
-                        
-        mutex_lock(&info->port.mutex);
-        COPY_TO_USER(err,user_params, &info->params, sizeof(MGSL_PARAMS));
-        mutex_unlock(&info->port.mutex);
-        if (err) {
-                if ( debug_level >= DEBUG_LEVEL_INFO )
-                        printk( "%s(%d):mgsl_get_params(%s) user buffer copy failed\n",
-                                __FILE__,__LINE__,info->device_name);
-                return -EFAULT;
-        }
-        
-        return 0;
-        
-}       /* end of mgsl_get_params() */
-
-/* mgsl_set_params()
- * 
- *      set the serial parameters
- *      
- * Arguments:
- * 
- *      info            pointer to device instance data
- *      new_params      user buffer containing new serial params
- *
- * Return Value:        0 if success, otherwise error code
- */
-static int mgsl_set_params(struct mgsl_struct * info, MGSL_PARAMS __user *new_params)
-{
-        unsigned long flags;
-        MGSL_PARAMS tmp_params;
-        int err;
- 
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_set_params %s\n", __FILE__,__LINE__,
-                        info->device_name );
-        COPY_FROM_USER(err,&tmp_params, new_params, sizeof(MGSL_PARAMS));
-        if (err) {
-                if ( debug_level >= DEBUG_LEVEL_INFO )
-                        printk( "%s(%d):mgsl_set_params(%s) user buffer copy failed\n",
-                                __FILE__,__LINE__,info->device_name);
-                return -EFAULT;
-        }
-        
-        mutex_lock(&info->port.mutex);
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        memcpy(&info->params,&tmp_params,sizeof(MGSL_PARAMS));
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        
-        mgsl_change_params(info);
-        mutex_unlock(&info->port.mutex);
-        
-        return 0;
-        
-}       /* end of mgsl_set_params() */
-
-/* mgsl_get_txidle()
- * 
- *      get the current transmit idle mode
- *
- * Arguments:   info            pointer to device instance data
- *              idle_mode       pointer to buffer to hold returned idle mode
- *      
- * Return Value:        0 if success, otherwise error code
- */
-static int mgsl_get_txidle(struct mgsl_struct * info, int __user *idle_mode)
-{
-        int err;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_get_txidle(%s)=%d\n",
-                         __FILE__,__LINE__, info->device_name, info->idle_mode);
-                        
-        COPY_TO_USER(err,idle_mode, &info->idle_mode, sizeof(int));
-        if (err) {
-                if ( debug_level >= DEBUG_LEVEL_INFO )
-                        printk( "%s(%d):mgsl_get_txidle(%s) user buffer copy failed\n",
-                                __FILE__,__LINE__,info->device_name);
-                return -EFAULT;
-        }
-        
-        return 0;
-        
-}       /* end of mgsl_get_txidle() */
-
-/* mgsl_set_txidle()    service ioctl to set transmit idle mode
- *      
- * Arguments:           info            pointer to device instance data
- *                      idle_mode       new idle mode
- *
- * Return Value:        0 if success, otherwise error code
- */
-static int mgsl_set_txidle(struct mgsl_struct * info, int idle_mode)
-{
-        unsigned long flags;
- 
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_set_txidle(%s,%d)\n", __FILE__,__LINE__,
-                        info->device_name, idle_mode );
-                        
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        info->idle_mode = idle_mode;
-        usc_set_txidle( info );
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        return 0;
-        
-}       /* end of mgsl_set_txidle() */
-
-/* mgsl_txenable()
- * 
- *      enable or disable the transmitter
- *      
- * Arguments:
- * 
- *      info            pointer to device instance data
- *      enable          1 = enable, 0 = disable
- *
- * Return Value:        0 if success, otherwise error code
- */
-static int mgsl_txenable(struct mgsl_struct * info, int enable)
-{
-        unsigned long flags;
- 
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_txenable(%s,%d)\n", __FILE__,__LINE__,
-                        info->device_name, enable);
-                        
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        if ( enable ) {
-                if ( !info->tx_enabled ) {
-
-                        usc_start_transmitter(info);
-                        /*--------------------------------------------------
-                         * if HDLC/SDLC Loop mode, attempt to insert the
-                         * station in the 'loop' by setting CMR:13. Upon
-                         * receipt of the next GoAhead (RxAbort) sequence,
-                         * the OnLoop indicator (CCSR:7) should go active
-                         * to indicate that we are on the loop
-                         *--------------------------------------------------*/
-                        if ( info->params.flags & HDLC_FLAG_HDLC_LOOPMODE )
-                                usc_loopmode_insert_request( info );
-                }
-        } else {
-                if ( info->tx_enabled )
-                        usc_stop_transmitter(info);
-        }
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        return 0;
-        
-}       /* end of mgsl_txenable() */
-
-/* mgsl_txabort()       abort send HDLC frame
- *      
- * Arguments:           info            pointer to device instance data
- * Return Value:        0 if success, otherwise error code
- */
-static int mgsl_txabort(struct mgsl_struct * info)
-{
-        unsigned long flags;
- 
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_txabort(%s)\n", __FILE__,__LINE__,
-                        info->device_name);
-                        
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        if ( info->tx_active && info->params.mode == MGSL_MODE_HDLC )
-        {
-                if ( info->params.flags & HDLC_FLAG_HDLC_LOOPMODE )
-                        usc_loopmode_cancel_transmit( info );
-                else
-                        usc_TCmd(info,TCmd_SendAbort);
-        }
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        return 0;
-        
-}       /* end of mgsl_txabort() */
-
-/* mgsl_rxenable()      enable or disable the receiver
- *      
- * Arguments:           info            pointer to device instance data
- *                      enable          1 = enable, 0 = disable
- * Return Value:        0 if success, otherwise error code
- */
-static int mgsl_rxenable(struct mgsl_struct * info, int enable)
-{
-        unsigned long flags;
- 
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_rxenable(%s,%d)\n", __FILE__,__LINE__,
-                        info->device_name, enable);
-                        
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        if ( enable ) {
-                if ( !info->rx_enabled )
-                        usc_start_receiver(info);
-        } else {
-                if ( info->rx_enabled )
-                        usc_stop_receiver(info);
-        }
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        return 0;
-        
-}       /* end of mgsl_rxenable() */
-
-/* mgsl_wait_event()    wait for specified event to occur
- *      
- * Arguments:           info    pointer to device instance data
- *                      mask    pointer to bitmask of events to wait for
- * Return Value:        0       if successful and bit mask updated with
- *                              of events triggerred,
- *                      otherwise error code
- */
-static int mgsl_wait_event(struct mgsl_struct * info, int __user * mask_ptr)
-{
-        unsigned long flags;
-        int s;
-        int rc=0;
-        struct mgsl_icount cprev, cnow;
-        int events;
-        int mask;
-        struct  _input_signal_events oldsigs, newsigs;
-        DECLARE_WAITQUEUE(wait, current);
-
-        COPY_FROM_USER(rc,&mask, mask_ptr, sizeof(int));
-        if (rc) {
-                return  -EFAULT;
-        }
-                 
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_wait_event(%s,%d)\n", __FILE__,__LINE__,
-                        info->device_name, mask);
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-
-        /* return immediately if state matches requested events */
-        usc_get_serial_signals(info);
-        s = info->serial_signals;
-        events = mask &
-                ( ((s & SerialSignal_DSR) ? MgslEvent_DsrActive:MgslEvent_DsrInactive) +
-                  ((s & SerialSignal_DCD) ? MgslEvent_DcdActive:MgslEvent_DcdInactive) +
-                  ((s & SerialSignal_CTS) ? MgslEvent_CtsActive:MgslEvent_CtsInactive) +
-                  ((s & SerialSignal_RI)  ? MgslEvent_RiActive :MgslEvent_RiInactive) );
-        if (events) {
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-                goto exit;
-        }
-
-        /* save current irq counts */
-        cprev = info->icount;
-        oldsigs = info->input_signal_events;
-        
-        /* enable hunt and idle irqs if needed */
-        if (mask & (MgslEvent_ExitHuntMode + MgslEvent_IdleReceived)) {
-                u16 oldreg = usc_InReg(info,RICR);
-                u16 newreg = oldreg +
-                         (mask & MgslEvent_ExitHuntMode ? RXSTATUS_EXITED_HUNT:0) +
-                         (mask & MgslEvent_IdleReceived ? RXSTATUS_IDLE_RECEIVED:0);
-                if (oldreg != newreg)
-                        usc_OutReg(info, RICR, newreg);
-        }
-        
-        set_current_state(TASK_INTERRUPTIBLE);
-        add_wait_queue(&info->event_wait_q, &wait);
-        
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        
-
-        for(;;) {
-                schedule();
-                if (signal_pending(current)) {
-                        rc = -ERESTARTSYS;
-                        break;
-                }
-                        
-                /* get current irq counts */
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                cnow = info->icount;
-                newsigs = info->input_signal_events;
-                set_current_state(TASK_INTERRUPTIBLE);
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-                /* if no change, wait aborted for some reason */
-                if (newsigs.dsr_up   == oldsigs.dsr_up   &&
-                    newsigs.dsr_down == oldsigs.dsr_down &&
-                    newsigs.dcd_up   == oldsigs.dcd_up   &&
-                    newsigs.dcd_down == oldsigs.dcd_down &&
-                    newsigs.cts_up   == oldsigs.cts_up   &&
-                    newsigs.cts_down == oldsigs.cts_down &&
-                    newsigs.ri_up    == oldsigs.ri_up    &&
-                    newsigs.ri_down  == oldsigs.ri_down  &&
-                    cnow.exithunt    == cprev.exithunt   &&
-                    cnow.rxidle      == cprev.rxidle) {
-                        rc = -EIO;
-                        break;
-                }
-
-                events = mask &
-                        ( (newsigs.dsr_up   != oldsigs.dsr_up   ? MgslEvent_DsrActive:0)   +
-                        (newsigs.dsr_down != oldsigs.dsr_down ? MgslEvent_DsrInactive:0) +
-                        (newsigs.dcd_up   != oldsigs.dcd_up   ? MgslEvent_DcdActive:0)   +
-                        (newsigs.dcd_down != oldsigs.dcd_down ? MgslEvent_DcdInactive:0) +
-                        (newsigs.cts_up   != oldsigs.cts_up   ? MgslEvent_CtsActive:0)   +
-                        (newsigs.cts_down != oldsigs.cts_down ? MgslEvent_CtsInactive:0) +
-                        (newsigs.ri_up    != oldsigs.ri_up    ? MgslEvent_RiActive:0)    +
-                        (newsigs.ri_down  != oldsigs.ri_down  ? MgslEvent_RiInactive:0)  +
-                        (cnow.exithunt    != cprev.exithunt   ? MgslEvent_ExitHuntMode:0) +
-                          (cnow.rxidle      != cprev.rxidle     ? MgslEvent_IdleReceived:0) );
-                if (events)
-                        break;
-                
-                cprev = cnow;
-                oldsigs = newsigs;
-        }
-        
-        remove_wait_queue(&info->event_wait_q, &wait);
-        set_current_state(TASK_RUNNING);
-
-        if (mask & (MgslEvent_ExitHuntMode + MgslEvent_IdleReceived)) {
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                if (!waitqueue_active(&info->event_wait_q)) {
-                        /* disable enable exit hunt mode/idle rcvd IRQs */
-                        usc_OutReg(info, RICR, usc_InReg(info,RICR) &
-                                ~(RXSTATUS_EXITED_HUNT + RXSTATUS_IDLE_RECEIVED));
-                }
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        }
-exit:
-        if ( rc == 0 )
-                PUT_USER(rc, events, mask_ptr);
-                
-        return rc;
-        
-}       /* end of mgsl_wait_event() */
-
-static int modem_input_wait(struct mgsl_struct *info,int arg)
-{
-        unsigned long flags;
-        int rc;
-        struct mgsl_icount cprev, cnow;
-        DECLARE_WAITQUEUE(wait, current);
-
-        /* save current irq counts */
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        cprev = info->icount;
-        add_wait_queue(&info->status_event_wait_q, &wait);
-        set_current_state(TASK_INTERRUPTIBLE);
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-        for(;;) {
-                schedule();
-                if (signal_pending(current)) {
-                        rc = -ERESTARTSYS;
-                        break;
-                }
-
-                /* get new irq counts */
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                cnow = info->icount;
-                set_current_state(TASK_INTERRUPTIBLE);
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-                /* if no change, wait aborted for some reason */
-                if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
-                    cnow.dcd == cprev.dcd && cnow.cts == cprev.cts) {
-                        rc = -EIO;
-                        break;
-                }
-
-                /* check for change in caller specified modem input */
-                if ((arg & TIOCM_RNG && cnow.rng != cprev.rng) ||
-                    (arg & TIOCM_DSR && cnow.dsr != cprev.dsr) ||
-                    (arg & TIOCM_CD  && cnow.dcd != cprev.dcd) ||
-                    (arg & TIOCM_CTS && cnow.cts != cprev.cts)) {
-                        rc = 0;
-                        break;
-                }
-
-                cprev = cnow;
-        }
-        remove_wait_queue(&info->status_event_wait_q, &wait);
-        set_current_state(TASK_RUNNING);
-        return rc;
-}
-
-/* return the state of the serial control and status signals
- */
-static int tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned int result;
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        usc_get_serial_signals(info);
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-        result = ((info->serial_signals & SerialSignal_RTS) ? TIOCM_RTS:0) +
-                ((info->serial_signals & SerialSignal_DTR) ? TIOCM_DTR:0) +
-                ((info->serial_signals & SerialSignal_DCD) ? TIOCM_CAR:0) +
-                ((info->serial_signals & SerialSignal_RI)  ? TIOCM_RNG:0) +
-                ((info->serial_signals & SerialSignal_DSR) ? TIOCM_DSR:0) +
-                ((info->serial_signals & SerialSignal_CTS) ? TIOCM_CTS:0);
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s tiocmget() value=%08X\n",
-                         __FILE__,__LINE__, info->device_name, result );
-        return result;
-}
-
-/* set modem control signals (DTR/RTS)
- */
-static int tiocmset(struct tty_struct *tty, struct file *file,
-                    unsigned int set, unsigned int clear)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s tiocmset(%x,%x)\n",
-                        __FILE__,__LINE__,info->device_name, set, clear);
-
-        if (set & TIOCM_RTS)
-                info->serial_signals |= SerialSignal_RTS;
-        if (set & TIOCM_DTR)
-                info->serial_signals |= SerialSignal_DTR;
-        if (clear & TIOCM_RTS)
-                info->serial_signals &= ~SerialSignal_RTS;
-        if (clear & TIOCM_DTR)
-                info->serial_signals &= ~SerialSignal_DTR;
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        usc_set_serial_signals(info);
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-        return 0;
-}
-
-/* mgsl_break()         Set or clear transmit break condition
- *
- * Arguments:           tty             pointer to tty instance data
- *                      break_state     -1=set break condition, 0=clear
- * Return Value:        error code
- */
-static int mgsl_break(struct tty_struct *tty, int break_state)
-{
-        struct mgsl_struct * info = tty->driver_data;
-        unsigned long flags;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_break(%s,%d)\n",
-                         __FILE__,__LINE__, info->device_name, break_state);
-                         
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_break"))
-                return -EINVAL;
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        if (break_state == -1)
-                usc_OutReg(info,IOCR,(u16)(usc_InReg(info,IOCR) | BIT7));
-        else 
-                usc_OutReg(info,IOCR,(u16)(usc_InReg(info,IOCR) & ~BIT7));
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        return 0;
-        
-}       /* end of mgsl_break() */
-
-/* mgsl_ioctl() Service an IOCTL request
- *      
- * Arguments:
- * 
- *      tty     pointer to tty instance data
- *      file    pointer to associated file object for device
- *      cmd     IOCTL command code
- *      arg     command argument/context
- *      
- * Return Value:        0 if success, otherwise error code
- */
-static int mgsl_ioctl(struct tty_struct *tty, struct file * file,
-                    unsigned int cmd, unsigned long arg)
-{
-        struct mgsl_struct * info = tty->driver_data;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_ioctl %s cmd=%08X\n", __FILE__,__LINE__,
-                        info->device_name, cmd );
-        
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_ioctl"))
-                return -ENODEV;
-
-        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-            (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-                if (tty->flags & (1 << TTY_IO_ERROR))
-                    return -EIO;
-        }
-
-        return mgsl_ioctl_common(info, cmd, arg);
-}
-
-static int mgsl_ioctl_common(struct mgsl_struct *info, unsigned int cmd, unsigned long arg)
-{
-        int error;
-        struct mgsl_icount cnow;        /* kernel counter temps */
-        void __user *argp = (void __user *)arg;
-        struct serial_icounter_struct __user *p_cuser;  /* user space */
-        unsigned long flags;
-        
-        switch (cmd) {
-                case MGSL_IOCGPARAMS:
-                        return mgsl_get_params(info, argp);
-                case MGSL_IOCSPARAMS:
-                        return mgsl_set_params(info, argp);
-                case MGSL_IOCGTXIDLE:
-                        return mgsl_get_txidle(info, argp);
-                case MGSL_IOCSTXIDLE:
-                        return mgsl_set_txidle(info,(int)arg);
-                case MGSL_IOCTXENABLE:
-                        return mgsl_txenable(info,(int)arg);
-                case MGSL_IOCRXENABLE:
-                        return mgsl_rxenable(info,(int)arg);
-                case MGSL_IOCTXABORT:
-                        return mgsl_txabort(info);
-                case MGSL_IOCGSTATS:
-                        return mgsl_get_stats(info, argp);
-                case MGSL_IOCWAITEVENT:
-                        return mgsl_wait_event(info, argp);
-                case MGSL_IOCLOOPTXDONE:
-                        return mgsl_loopmode_send_done(info);
-                /* Wait for modem input (DCD,RI,DSR,CTS) change
-                 * as specified by mask in arg (TIOCM_RNG/DSR/CD/CTS)
-                 */
-                case TIOCMIWAIT:
-                        return modem_input_wait(info,(int)arg);
-
-                /* 
-                 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-                 * Return: write counters to the user passed counter struct
-                 * NB: both 1->0 and 0->1 transitions are counted except for
-                 *     RI where only 0->1 is counted.
-                 */
-                case TIOCGICOUNT:
-                        spin_lock_irqsave(&info->irq_spinlock,flags);
-                        cnow = info->icount;
-                        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-                        p_cuser = argp;
-                        PUT_USER(error,cnow.cts, &p_cuser->cts);
-                        if (error) return error;
-                        PUT_USER(error,cnow.dsr, &p_cuser->dsr);
-                        if (error) return error;
-                        PUT_USER(error,cnow.rng, &p_cuser->rng);
-                        if (error) return error;
-                        PUT_USER(error,cnow.dcd, &p_cuser->dcd);
-                        if (error) return error;
-                        PUT_USER(error,cnow.rx, &p_cuser->rx);
-                        if (error) return error;
-                        PUT_USER(error,cnow.tx, &p_cuser->tx);
-                        if (error) return error;
-                        PUT_USER(error,cnow.frame, &p_cuser->frame);
-                        if (error) return error;
-                        PUT_USER(error,cnow.overrun, &p_cuser->overrun);
-                        if (error) return error;
-                        PUT_USER(error,cnow.parity, &p_cuser->parity);
-                        if (error) return error;
-                        PUT_USER(error,cnow.brk, &p_cuser->brk);
-                        if (error) return error;
-                        PUT_USER(error,cnow.buf_overrun, &p_cuser->buf_overrun);
-                        if (error) return error;
-                        return 0;
-                default:
-                        return -ENOIOCTLCMD;
-        }
-        return 0;
-}
-
-/* mgsl_set_termios()
- * 
- *      Set new termios settings
- *      
- * Arguments:
- * 
- *      tty             pointer to tty structure
- *      termios         pointer to buffer to hold returned old termios
- *      
- * Return Value:                None
- */
-static void mgsl_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
-{
-        struct mgsl_struct *info = tty->driver_data;
-        unsigned long flags;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_set_termios %s\n", __FILE__,__LINE__,
-                        tty->driver->name );
-        
-        mgsl_change_params(info);
-
-        /* Handle transition to B0 status */
-        if (old_termios->c_cflag & CBAUD &&
-            !(tty->termios->c_cflag & CBAUD)) {
-                info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                usc_set_serial_signals(info);
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        }
-        
-        /* Handle transition away from B0 status */
-        if (!(old_termios->c_cflag & CBAUD) &&
-            tty->termios->c_cflag & CBAUD) {
-                info->serial_signals |= SerialSignal_DTR;
-                if (!(tty->termios->c_cflag & CRTSCTS) || 
-                    !test_bit(TTY_THROTTLED, &tty->flags)) {
-                        info->serial_signals |= SerialSignal_RTS;
-                }
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                usc_set_serial_signals(info);
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        }
-        
-        /* Handle turning off CRTSCTS */
-        if (old_termios->c_cflag & CRTSCTS &&
-            !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-                mgsl_start(tty);
-        }
-
-}       /* end of mgsl_set_termios() */
-
-/* mgsl_close()
- * 
- *      Called when port is closed. Wait for remaining data to be
- *      sent. Disable port and free resources.
- *      
- * Arguments:
- * 
- *      tty     pointer to open tty structure
- *      filp    pointer to open file object
- *      
- * Return Value:        None
- */
-static void mgsl_close(struct tty_struct *tty, struct file * filp)
-{
-        struct mgsl_struct * info = tty->driver_data;
-
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_close"))
-                return;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
-                         __FILE__,__LINE__, info->device_name, info->port.count);
-
-        if (tty_port_close_start(&info->port, tty, filp) == 0)                   
-                goto cleanup;
-
-        mutex_lock(&info->port.mutex);
-        if (info->port.flags & ASYNC_INITIALIZED)
-                mgsl_wait_until_sent(tty, info->timeout);
-        mgsl_flush_buffer(tty);
-        tty_ldisc_flush(tty);
-        shutdown(info);
-        mutex_unlock(&info->port.mutex);
-
-        tty_port_close_end(&info->port, tty);   
-        info->port.tty = NULL;
-cleanup:                        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
-                        tty->driver->name, info->port.count);
-                        
-}       /* end of mgsl_close() */
-
-/* mgsl_wait_until_sent()
- *
- *      Wait until the transmitter is empty.
- *
- * Arguments:
- *
- *      tty             pointer to tty info structure
- *      timeout         time to wait for send completion
- *
- * Return Value:        None
- */
-static void mgsl_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-        struct mgsl_struct * info = tty->driver_data;
-        unsigned long orig_jiffies, char_time;
-
-        if (!info )
-                return;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_wait_until_sent(%s) entry\n",
-                         __FILE__,__LINE__, info->device_name );
-      
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_wait_until_sent"))
-                return;
-
-        if (!(info->port.flags & ASYNC_INITIALIZED))
-                goto exit;
-         
-        orig_jiffies = jiffies;
-      
-        /* Set check interval to 1/5 of estimated time to
-         * send a character, and make it at least 1. The check
-         * interval should also be less than the timeout.
-         * Note: use tight timings here to satisfy the NIST-PCTS.
-         */ 
-
-        if ( info->params.data_rate ) {
-                char_time = info->timeout/(32 * 5);
-                if (!char_time)
-                        char_time++;
-        } else
-                char_time = 1;
-                
-        if (timeout)
-                char_time = min_t(unsigned long, char_time, timeout);
-                
-        if ( info->params.mode == MGSL_MODE_HDLC ||
-                info->params.mode == MGSL_MODE_RAW ) {
-                while (info->tx_active) {
-                        msleep_interruptible(jiffies_to_msecs(char_time));
-                        if (signal_pending(current))
-                                break;
-                        if (timeout && time_after(jiffies, orig_jiffies + timeout))
-                                break;
-                }
-        } else {
-                while (!(usc_InReg(info,TCSR) & TXSTATUS_ALL_SENT) &&
-                        info->tx_enabled) {
-                        msleep_interruptible(jiffies_to_msecs(char_time));
-                        if (signal_pending(current))
-                                break;
-                        if (timeout && time_after(jiffies, orig_jiffies + timeout))
-                                break;
-                }
-        }
-      
-exit:
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_wait_until_sent(%s) exit\n",
-                         __FILE__,__LINE__, info->device_name );
-                         
-}       /* end of mgsl_wait_until_sent() */
-
-/* mgsl_hangup()
- *
- *      Called by tty_hangup() when a hangup is signaled.
- *      This is the same as to closing all open files for the port.
- *
- * Arguments:           tty     pointer to associated tty object
- * Return Value:        None
- */
-static void mgsl_hangup(struct tty_struct *tty)
-{
-        struct mgsl_struct * info = tty->driver_data;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_hangup(%s)\n",
-                         __FILE__,__LINE__, info->device_name );
-                         
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_hangup"))
-                return;
-
-        mgsl_flush_buffer(tty);
-        shutdown(info);
-        
-        info->port.count = 0;   
-        info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->port.tty = NULL;
-
-        wake_up_interruptible(&info->port.open_wait);
-        
-}       /* end of mgsl_hangup() */
-
-/*
- * carrier_raised()
- *
- *      Return true if carrier is raised
- */
-
-static int carrier_raised(struct tty_port *port)
-{
-        unsigned long flags;
-        struct mgsl_struct *info = container_of(port, struct mgsl_struct, port);
-        
-        spin_lock_irqsave(&info->irq_spinlock, flags);
-        usc_get_serial_signals(info);
-        spin_unlock_irqrestore(&info->irq_spinlock, flags);
-        return (info->serial_signals & SerialSignal_DCD) ? 1 : 0;
-}
-
-static void dtr_rts(struct tty_port *port, int on)
-{
-        struct mgsl_struct *info = container_of(port, struct mgsl_struct, port);
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        if (on)
-                info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
-        else
-                info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
-        usc_set_serial_signals(info);
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-}
-
-
-/* block_til_ready()
- * 
- *      Block the current process until the specified port
- *      is ready to be opened.
- *      
- * Arguments:
- * 
- *      tty             pointer to tty info structure
- *      filp            pointer to open file object
- *      info            pointer to device instance data
- *      
- * Return Value:        0 if success, otherwise error code
- */
-static int block_til_ready(struct tty_struct *tty, struct file * filp,
-                           struct mgsl_struct *info)
-{
-        DECLARE_WAITQUEUE(wait, current);
-        int             retval;
-        bool            do_clocal = false;
-        bool            extra_count = false;
-        unsigned long   flags;
-        int             dcd;
-        struct tty_port *port = &info->port;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):block_til_ready on %s\n",
-                         __FILE__,__LINE__, tty->driver->name );
-
-        if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){
-                /* nonblock mode is set or port is not enabled */
-                port->flags |= ASYNC_NORMAL_ACTIVE;
-                return 0;
-        }
-
-        if (tty->termios->c_cflag & CLOCAL)
-                do_clocal = true;
-
-        /* Wait for carrier detect and the line to become
-         * free (i.e., not in use by the callout).  While we are in
-         * this loop, port->count is dropped by one, so that
-         * mgsl_close() knows when to free things.  We restore it upon
-         * exit, either normal or abnormal.
-         */
-         
-        retval = 0;
-        add_wait_queue(&port->open_wait, &wait);
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):block_til_ready before block on %s count=%d\n",
-                         __FILE__,__LINE__, tty->driver->name, port->count );
-
-        spin_lock_irqsave(&info->irq_spinlock, flags);
-        if (!tty_hung_up_p(filp)) {
-                extra_count = true;
-                port->count--;
-        }
-        spin_unlock_irqrestore(&info->irq_spinlock, flags);
-        port->blocked_open++;
-        
-        while (1) {
-                if (tty->termios->c_cflag & CBAUD)
-                        tty_port_raise_dtr_rts(port);
-                
-                set_current_state(TASK_INTERRUPTIBLE);
-                
-                if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)){
-                        retval = (port->flags & ASYNC_HUP_NOTIFY) ?
-                                        -EAGAIN : -ERESTARTSYS;
-                        break;
-                }
-                
-                dcd = tty_port_carrier_raised(&info->port);
-                
-                if (!(port->flags & ASYNC_CLOSING) && (do_clocal || dcd))
-                        break;
-                        
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-                
-                if (debug_level >= DEBUG_LEVEL_INFO)
-                        printk("%s(%d):block_til_ready blocking on %s count=%d\n",
-                                 __FILE__,__LINE__, tty->driver->name, port->count );
-                                 
-                tty_unlock();
-                schedule();
-                tty_lock();
-        }
-        
-        set_current_state(TASK_RUNNING);
-        remove_wait_queue(&port->open_wait, &wait);
-        
-        /* FIXME: Racy on hangup during close wait */
-        if (extra_count)
-                port->count++;
-        port->blocked_open--;
-        
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
-                         __FILE__,__LINE__, tty->driver->name, port->count );
-                         
-        if (!retval)
-                port->flags |= ASYNC_NORMAL_ACTIVE;
-                
-        return retval;
-        
-}       /* end of block_til_ready() */
-
-/* mgsl_open()
- *
- *      Called when a port is opened.  Init and enable port.
- *      Perform serial-specific initialization for the tty structure.
- *
- * Arguments:           tty     pointer to tty info structure
- *                      filp    associated file pointer
- *
- * Return Value:        0 if success, otherwise error code
- */
-static int mgsl_open(struct tty_struct *tty, struct file * filp)
-{
-        struct mgsl_struct      *info;
-        int                     retval, line;
-        unsigned long flags;
-
-        /* verify range of specified line number */     
-        line = tty->index;
-        if ((line < 0) || (line >= mgsl_device_count)) {
-                printk("%s(%d):mgsl_open with invalid line #%d.\n",
-                        __FILE__,__LINE__,line);
-                return -ENODEV;
-        }
-
-        /* find the info structure for the specified line */
-        info = mgsl_device_list;
-        while(info && info->line != line)
-                info = info->next_device;
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_open"))
-                return -ENODEV;
-        
-        tty->driver_data = info;
-        info->port.tty = tty;
-                
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
-                         __FILE__,__LINE__,tty->driver->name, info->port.count);
-
-        /* If port is closing, signal caller to try again */
-        if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
-                if (info->port.flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->port.close_wait);
-                retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
-                        -EAGAIN : -ERESTARTSYS);
-                goto cleanup;
-        }
-        
-        info->port.tty->low_latency = (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-
-        spin_lock_irqsave(&info->netlock, flags);
-        if (info->netcount) {
-                retval = -EBUSY;
-                spin_unlock_irqrestore(&info->netlock, flags);
-                goto cleanup;
-        }
-        info->port.count++;
-        spin_unlock_irqrestore(&info->netlock, flags);
-
-        if (info->port.count == 1) {
-                /* 1st open on this device, init hardware */
-                retval = startup(info);
-                if (retval < 0)
-                        goto cleanup;
-        }
-
-        retval = block_til_ready(tty, filp, info);
-        if (retval) {
-                if (debug_level >= DEBUG_LEVEL_INFO)
-                        printk("%s(%d):block_til_ready(%s) returned %d\n",
-                                 __FILE__,__LINE__, info->device_name, retval);
-                goto cleanup;
-        }
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):mgsl_open(%s) success\n",
-                         __FILE__,__LINE__, info->device_name);
-        retval = 0;
-        
-cleanup:                        
-        if (retval) {
-                if (tty->count == 1)
-                        info->port.tty = NULL; /* tty layer will release tty struct */
-                if(info->port.count)
-                        info->port.count--;
-        }
-        
-        return retval;
-        
-}       /* end of mgsl_open() */
-
-/*
- * /proc fs routines....
- */
-
-static inline void line_info(struct seq_file *m, struct mgsl_struct *info)
-{
-        char    stat_buf[30];
-        unsigned long flags;
-
-        if (info->bus_type == MGSL_BUS_TYPE_PCI) {
-                seq_printf(m, "%s:PCI io:%04X irq:%d mem:%08X lcr:%08X",
-                        info->device_name, info->io_base, info->irq_level,
-                        info->phys_memory_base, info->phys_lcr_base);
-        } else {
-                seq_printf(m, "%s:(E)ISA io:%04X irq:%d dma:%d",
-                        info->device_name, info->io_base, 
-                        info->irq_level, info->dma_level);
-        }
-
-        /* output current serial signal states */
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        usc_get_serial_signals(info);
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        
-        stat_buf[0] = 0;
-        stat_buf[1] = 0;
-        if (info->serial_signals & SerialSignal_RTS)
-                strcat(stat_buf, "|RTS");
-        if (info->serial_signals & SerialSignal_CTS)
-                strcat(stat_buf, "|CTS");
-        if (info->serial_signals & SerialSignal_DTR)
-                strcat(stat_buf, "|DTR");
-        if (info->serial_signals & SerialSignal_DSR)
-                strcat(stat_buf, "|DSR");
-        if (info->serial_signals & SerialSignal_DCD)
-                strcat(stat_buf, "|CD");
-        if (info->serial_signals & SerialSignal_RI)
-                strcat(stat_buf, "|RI");
-
-        if (info->params.mode == MGSL_MODE_HDLC ||
-            info->params.mode == MGSL_MODE_RAW ) {
-                seq_printf(m, " HDLC txok:%d rxok:%d",
-                              info->icount.txok, info->icount.rxok);
-                if (info->icount.txunder)
-                        seq_printf(m, " txunder:%d", info->icount.txunder);
-                if (info->icount.txabort)
-                        seq_printf(m, " txabort:%d", info->icount.txabort);
-                if (info->icount.rxshort)
-                        seq_printf(m, " rxshort:%d", info->icount.rxshort);
-                if (info->icount.rxlong)
-                        seq_printf(m, " rxlong:%d", info->icount.rxlong);
-                if (info->icount.rxover)
-                        seq_printf(m, " rxover:%d", info->icount.rxover);
-                if (info->icount.rxcrc)
-                        seq_printf(m, " rxcrc:%d", info->icount.rxcrc);
-        } else {
-                seq_printf(m, " ASYNC tx:%d rx:%d",
-                              info->icount.tx, info->icount.rx);
-                if (info->icount.frame)
-                        seq_printf(m, " fe:%d", info->icount.frame);
-                if (info->icount.parity)
-                        seq_printf(m, " pe:%d", info->icount.parity);
-                if (info->icount.brk)
-                        seq_printf(m, " brk:%d", info->icount.brk);
-                if (info->icount.overrun)
-                        seq_printf(m, " oe:%d", info->icount.overrun);
-        }
-        
-        /* Append serial signal status to end */
-        seq_printf(m, " %s\n", stat_buf+1);
-        
-        seq_printf(m, "txactive=%d bh_req=%d bh_run=%d pending_bh=%x\n",
-         info->tx_active,info->bh_requested,info->bh_running,
-         info->pending_bh);
-         
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        {       
-        u16 Tcsr = usc_InReg( info, TCSR );
-        u16 Tdmr = usc_InDmaReg( info, TDMR );
-        u16 Ticr = usc_InReg( info, TICR );
-        u16 Rscr = usc_InReg( info, RCSR );
-        u16 Rdmr = usc_InDmaReg( info, RDMR );
-        u16 Ricr = usc_InReg( info, RICR );
-        u16 Icr = usc_InReg( info, ICR );
-        u16 Dccr = usc_InReg( info, DCCR );
-        u16 Tmr = usc_InReg( info, TMR );
-        u16 Tccr = usc_InReg( info, TCCR );
-        u16 Ccar = inw( info->io_base + CCAR );
-        seq_printf(m, "tcsr=%04X tdmr=%04X ticr=%04X rcsr=%04X rdmr=%04X\n"
-                        "ricr=%04X icr =%04X dccr=%04X tmr=%04X tccr=%04X ccar=%04X\n",
-                        Tcsr,Tdmr,Ticr,Rscr,Rdmr,Ricr,Icr,Dccr,Tmr,Tccr,Ccar );
-        }
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-}
-
-/* Called to print information about devices */
-static int mgsl_proc_show(struct seq_file *m, void *v)
-{
-        struct mgsl_struct *info;
-        
-        seq_printf(m, "synclink driver:%s\n", driver_version);
-        
-        info = mgsl_device_list;
-        while( info ) {
-                line_info(m, info);
-                info = info->next_device;
-        }
-        return 0;
-}
-
-static int mgsl_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, mgsl_proc_show, NULL);
-}
-
-static const struct file_operations mgsl_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = mgsl_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-/* mgsl_allocate_dma_buffers()
- * 
- *      Allocate and format DMA buffers (ISA adapter)
- *      or format shared memory buffers (PCI adapter).
- * 
- * Arguments:           info    pointer to device instance data
- * Return Value:        0 if success, otherwise error
- */
-static int mgsl_allocate_dma_buffers(struct mgsl_struct *info)
-{
-        unsigned short BuffersPerFrame;
-
-        info->last_mem_alloc = 0;
-
-        /* Calculate the number of DMA buffers necessary to hold the */
-        /* largest allowable frame size. Note: If the max frame size is */
-        /* not an even multiple of the DMA buffer size then we need to */
-        /* round the buffer count per frame up one. */
-
-        BuffersPerFrame = (unsigned short)(info->max_frame_size/DMABUFFERSIZE);
-        if ( info->max_frame_size % DMABUFFERSIZE )
-                BuffersPerFrame++;
-
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI ) {
-                /*
-                 * The PCI adapter has 256KBytes of shared memory to use.
-                 * This is 64 PAGE_SIZE buffers.
-                 *
-                 * The first page is used for padding at this time so the
-                 * buffer list does not begin at offset 0 of the PCI
-                 * adapter's shared memory.
-                 *
-                 * The 2nd page is used for the buffer list. A 4K buffer
-                 * list can hold 128 DMA_BUFFER structures at 32 bytes
-                 * each.
-                 *
-                 * This leaves 62 4K pages.
-                 *
-                 * The next N pages are used for transmit frame(s). We
-                 * reserve enough 4K page blocks to hold the required
-                 * number of transmit dma buffers (num_tx_dma_buffers),
-                 * each of MaxFrameSize size.
-                 *
-                 * Of the remaining pages (62-N), determine how many can
-                 * be used to receive full MaxFrameSize inbound frames
-                 */
-                info->tx_buffer_count = info->num_tx_dma_buffers * BuffersPerFrame;
-                info->rx_buffer_count = 62 - info->tx_buffer_count;
-        } else {
-                /* Calculate the number of PAGE_SIZE buffers needed for */
-                /* receive and transmit DMA buffers. */
-
-
-                /* Calculate the number of DMA buffers necessary to */
-                /* hold 7 max size receive frames and one max size transmit frame. */
-                /* The receive buffer count is bumped by one so we avoid an */
-                /* End of List condition if all receive buffers are used when */
-                /* using linked list DMA buffers. */
-
-                info->tx_buffer_count = info->num_tx_dma_buffers * BuffersPerFrame;
-                info->rx_buffer_count = (BuffersPerFrame * MAXRXFRAMES) + 6;
-                
-                /* 
-                 * limit total TxBuffers & RxBuffers to 62 4K total 
-                 * (ala PCI Allocation) 
-                 */
-                
-                if ( (info->tx_buffer_count + info->rx_buffer_count) > 62 )
-                        info->rx_buffer_count = 62 - info->tx_buffer_count;
-
-        }
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk("%s(%d):Allocating %d TX and %d RX DMA buffers.\n",
-                        __FILE__,__LINE__, info->tx_buffer_count,info->rx_buffer_count);
-        
-        if ( mgsl_alloc_buffer_list_memory( info ) < 0 ||
-                  mgsl_alloc_frame_memory(info, info->rx_buffer_list, info->rx_buffer_count) < 0 || 
-                  mgsl_alloc_frame_memory(info, info->tx_buffer_list, info->tx_buffer_count) < 0 || 
-                  mgsl_alloc_intermediate_rxbuffer_memory(info) < 0  ||
-                  mgsl_alloc_intermediate_txbuffer_memory(info) < 0 ) {
-                printk("%s(%d):Can't allocate DMA buffer memory\n",__FILE__,__LINE__);
-                return -ENOMEM;
-        }
-        
-        mgsl_reset_rx_dma_buffers( info );
-        mgsl_reset_tx_dma_buffers( info );
-
-        return 0;
-
-}       /* end of mgsl_allocate_dma_buffers() */
-
-/*
- * mgsl_alloc_buffer_list_memory()
- * 
- * Allocate a common DMA buffer for use as the
- * receive and transmit buffer lists.
- * 
- * A buffer list is a set of buffer entries where each entry contains
- * a pointer to an actual buffer and a pointer to the next buffer entry
- * (plus some other info about the buffer).
- * 
- * The buffer entries for a list are built to form a circular list so
- * that when the entire list has been traversed you start back at the
- * beginning.
- * 
- * This function allocates memory for just the buffer entries.
- * The links (pointer to next entry) are filled in with the physical
- * address of the next entry so the adapter can navigate the list
- * using bus master DMA. The pointers to the actual buffers are filled
- * out later when the actual buffers are allocated.
- * 
- * Arguments:           info    pointer to device instance data
- * Return Value:        0 if success, otherwise error
- */
-static int mgsl_alloc_buffer_list_memory( struct mgsl_struct *info )
-{
-        unsigned int i;
-
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI ) {
-                /* PCI adapter uses shared memory. */
-                info->buffer_list = info->memory_base + info->last_mem_alloc;
-                info->buffer_list_phys = info->last_mem_alloc;
-                info->last_mem_alloc += BUFFERLISTSIZE;
-        } else {
-                /* ISA adapter uses system memory. */
-                /* The buffer lists are allocated as a common buffer that both */
-                /* the processor and adapter can access. This allows the driver to */
-                /* inspect portions of the buffer while other portions are being */
-                /* updated by the adapter using Bus Master DMA. */
-
-                info->buffer_list = dma_alloc_coherent(NULL, BUFFERLISTSIZE, &info->buffer_list_dma_addr, GFP_KERNEL);
-                if (info->buffer_list == NULL)
-                        return -ENOMEM;
-                info->buffer_list_phys = (u32)(info->buffer_list_dma_addr);
-        }
-
-        /* We got the memory for the buffer entry lists. */
-        /* Initialize the memory block to all zeros. */
-        memset( info->buffer_list, 0, BUFFERLISTSIZE );
-
-        /* Save virtual address pointers to the receive and */
-        /* transmit buffer lists. (Receive 1st). These pointers will */
-        /* be used by the processor to access the lists. */
-        info->rx_buffer_list = (DMABUFFERENTRY *)info->buffer_list;
-        info->tx_buffer_list = (DMABUFFERENTRY *)info->buffer_list;
-        info->tx_buffer_list += info->rx_buffer_count;
-
-        /*
-         * Build the links for the buffer entry lists such that
-         * two circular lists are built. (Transmit and Receive).
-         *
-         * Note: the links are physical addresses
-         * which are read by the adapter to determine the next
-         * buffer entry to use.
-         */
-
-        for ( i = 0; i < info->rx_buffer_count; i++ ) {
-                /* calculate and store physical address of this buffer entry */
-                info->rx_buffer_list[i].phys_entry =
-                        info->buffer_list_phys + (i * sizeof(DMABUFFERENTRY));
-
-                /* calculate and store physical address of */
-                /* next entry in cirular list of entries */
-
-                info->rx_buffer_list[i].link = info->buffer_list_phys;
-
-                if ( i < info->rx_buffer_count - 1 )
-                        info->rx_buffer_list[i].link += (i + 1) * sizeof(DMABUFFERENTRY);
-        }
-
-        for ( i = 0; i < info->tx_buffer_count; i++ ) {
-                /* calculate and store physical address of this buffer entry */
-                info->tx_buffer_list[i].phys_entry = info->buffer_list_phys +
-                        ((info->rx_buffer_count + i) * sizeof(DMABUFFERENTRY));
-
-                /* calculate and store physical address of */
-                /* next entry in cirular list of entries */
-
-                info->tx_buffer_list[i].link = info->buffer_list_phys +
-                        info->rx_buffer_count * sizeof(DMABUFFERENTRY);
-
-                if ( i < info->tx_buffer_count - 1 )
-                        info->tx_buffer_list[i].link += (i + 1) * sizeof(DMABUFFERENTRY);
-        }
-
-        return 0;
-
-}       /* end of mgsl_alloc_buffer_list_memory() */
-
-/* Free DMA buffers allocated for use as the
- * receive and transmit buffer lists.
- * Warning:
- * 
- *      The data transfer buffers associated with the buffer list
- *      MUST be freed before freeing the buffer list itself because
- *      the buffer list contains the information necessary to free
- *      the individual buffers!
- */
-static void mgsl_free_buffer_list_memory( struct mgsl_struct *info )
-{
-        if (info->buffer_list && info->bus_type != MGSL_BUS_TYPE_PCI)
-                dma_free_coherent(NULL, BUFFERLISTSIZE, info->buffer_list, info->buffer_list_dma_addr);
-                
-        info->buffer_list = NULL;
-        info->rx_buffer_list = NULL;
-        info->tx_buffer_list = NULL;
-
-}       /* end of mgsl_free_buffer_list_memory() */
-
-/*
- * mgsl_alloc_frame_memory()
- * 
- *      Allocate the frame DMA buffers used by the specified buffer list.
- *      Each DMA buffer will be one memory page in size. This is necessary
- *      because memory can fragment enough that it may be impossible
- *      contiguous pages.
- * 
- * Arguments:
- * 
- *      info            pointer to device instance data
- *      BufferList      pointer to list of buffer entries
- *      Buffercount     count of buffer entries in buffer list
- * 
- * Return Value:        0 if success, otherwise -ENOMEM
- */
-static int mgsl_alloc_frame_memory(struct mgsl_struct *info,DMABUFFERENTRY *BufferList,int Buffercount)
-{
-        int i;
-        u32 phys_addr;
-
-        /* Allocate page sized buffers for the receive buffer list */
-
-        for ( i = 0; i < Buffercount; i++ ) {
-                if ( info->bus_type == MGSL_BUS_TYPE_PCI ) {
-                        /* PCI adapter uses shared memory buffers. */
-                        BufferList[i].virt_addr = info->memory_base + info->last_mem_alloc;
-                        phys_addr = info->last_mem_alloc;
-                        info->last_mem_alloc += DMABUFFERSIZE;
-                } else {
-                        /* ISA adapter uses system memory. */
-                        BufferList[i].virt_addr = dma_alloc_coherent(NULL, DMABUFFERSIZE, &BufferList[i].dma_addr, GFP_KERNEL);
-                        if (BufferList[i].virt_addr == NULL)
-                                return -ENOMEM;
-                        phys_addr = (u32)(BufferList[i].dma_addr);
-                }
-                BufferList[i].phys_addr = phys_addr;
-        }
-
-        return 0;
-
-}       /* end of mgsl_alloc_frame_memory() */
-
-/*
- * mgsl_free_frame_memory()
- * 
- *      Free the buffers associated with
- *      each buffer entry of a buffer list.
- * 
- * Arguments:
- * 
- *      info            pointer to device instance data
- *      BufferList      pointer to list of buffer entries
- *      Buffercount     count of buffer entries in buffer list
- * 
- * Return Value:        None
- */
-static void mgsl_free_frame_memory(struct mgsl_struct *info, DMABUFFERENTRY *BufferList, int Buffercount)
-{
-        int i;
-
-        if ( BufferList ) {
-                for ( i = 0 ; i < Buffercount ; i++ ) {
-                        if ( BufferList[i].virt_addr ) {
-                                if ( info->bus_type != MGSL_BUS_TYPE_PCI )
-                                        dma_free_coherent(NULL, DMABUFFERSIZE, BufferList[i].virt_addr, BufferList[i].dma_addr);
-                                BufferList[i].virt_addr = NULL;
-                        }
-                }
-        }
-
-}       /* end of mgsl_free_frame_memory() */
-
-/* mgsl_free_dma_buffers()
- * 
- *      Free DMA buffers
- *      
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_free_dma_buffers( struct mgsl_struct *info )
-{
-        mgsl_free_frame_memory( info, info->rx_buffer_list, info->rx_buffer_count );
-        mgsl_free_frame_memory( info, info->tx_buffer_list, info->tx_buffer_count );
-        mgsl_free_buffer_list_memory( info );
-
-}       /* end of mgsl_free_dma_buffers() */
-
-
-/*
- * mgsl_alloc_intermediate_rxbuffer_memory()
- * 
- *      Allocate a buffer large enough to hold max_frame_size. This buffer
- *      is used to pass an assembled frame to the line discipline.
- * 
- * Arguments:
- * 
- *      info            pointer to device instance data
- * 
- * Return Value:        0 if success, otherwise -ENOMEM
- */
-static int mgsl_alloc_intermediate_rxbuffer_memory(struct mgsl_struct *info)
-{
-        info->intermediate_rxbuffer = kmalloc(info->max_frame_size, GFP_KERNEL | GFP_DMA);
-        if ( info->intermediate_rxbuffer == NULL )
-                return -ENOMEM;
-
-        return 0;
-
-}       /* end of mgsl_alloc_intermediate_rxbuffer_memory() */
-
-/*
- * mgsl_free_intermediate_rxbuffer_memory()
- * 
- * 
- * Arguments:
- * 
- *      info            pointer to device instance data
- * 
- * Return Value:        None
- */
-static void mgsl_free_intermediate_rxbuffer_memory(struct mgsl_struct *info)
-{
-        kfree(info->intermediate_rxbuffer);
-        info->intermediate_rxbuffer = NULL;
-
-}       /* end of mgsl_free_intermediate_rxbuffer_memory() */
-
-/*
- * mgsl_alloc_intermediate_txbuffer_memory()
- *
- *      Allocate intermdiate transmit buffer(s) large enough to hold max_frame_size.
- *      This buffer is used to load transmit frames into the adapter's dma transfer
- *      buffers when there is sufficient space.
- *
- * Arguments:
- *
- *      info            pointer to device instance data
- *
- * Return Value:        0 if success, otherwise -ENOMEM
- */
-static int mgsl_alloc_intermediate_txbuffer_memory(struct mgsl_struct *info)
-{
-        int i;
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk("%s %s(%d)  allocating %d tx holding buffers\n",
-                                info->device_name, __FILE__,__LINE__,info->num_tx_holding_buffers);
-
-        memset(info->tx_holding_buffers,0,sizeof(info->tx_holding_buffers));
-
-        for ( i=0; i<info->num_tx_holding_buffers; ++i) {
-                info->tx_holding_buffers[i].buffer =
-                        kmalloc(info->max_frame_size, GFP_KERNEL);
-                if (info->tx_holding_buffers[i].buffer == NULL) {
-                        for (--i; i >= 0; i--) {
-                                kfree(info->tx_holding_buffers[i].buffer);
-                                info->tx_holding_buffers[i].buffer = NULL;
-                        }
-                        return -ENOMEM;
-                }
-        }
-
-        return 0;
-
-}       /* end of mgsl_alloc_intermediate_txbuffer_memory() */
-
-/*
- * mgsl_free_intermediate_txbuffer_memory()
- *
- *
- * Arguments:
- *
- *      info            pointer to device instance data
- *
- * Return Value:        None
- */
-static void mgsl_free_intermediate_txbuffer_memory(struct mgsl_struct *info)
-{
-        int i;
-
-        for ( i=0; i<info->num_tx_holding_buffers; ++i ) {
-                kfree(info->tx_holding_buffers[i].buffer);
-                info->tx_holding_buffers[i].buffer = NULL;
-        }
-
-        info->get_tx_holding_index = 0;
-        info->put_tx_holding_index = 0;
-        info->tx_holding_count = 0;
-
-}       /* end of mgsl_free_intermediate_txbuffer_memory() */
-
-
-/*
- * load_next_tx_holding_buffer()
- *
- * attempts to load the next buffered tx request into the
- * tx dma buffers
- *
- * Arguments:
- *
- *      info            pointer to device instance data
- *
- * Return Value:        true if next buffered tx request loaded
- *                      into adapter's tx dma buffer,
- *                      false otherwise
- */
-static bool load_next_tx_holding_buffer(struct mgsl_struct *info)
-{
-        bool ret = false;
-
-        if ( info->tx_holding_count ) {
-                /* determine if we have enough tx dma buffers
-                 * to accommodate the next tx frame
-                 */
-                struct tx_holding_buffer *ptx =
-                        &info->tx_holding_buffers[info->get_tx_holding_index];
-                int num_free = num_free_tx_dma_buffers(info);
-                int num_needed = ptx->buffer_size / DMABUFFERSIZE;
-                if ( ptx->buffer_size % DMABUFFERSIZE )
-                        ++num_needed;
-
-                if (num_needed <= num_free) {
-                        info->xmit_cnt = ptx->buffer_size;
-                        mgsl_load_tx_dma_buffer(info,ptx->buffer,ptx->buffer_size);
-
-                        --info->tx_holding_count;
-                        if ( ++info->get_tx_holding_index >= info->num_tx_holding_buffers)
-                                info->get_tx_holding_index=0;
-
-                        /* restart transmit timer */
-                        mod_timer(&info->tx_timer, jiffies + msecs_to_jiffies(5000));
-
-                        ret = true;
-                }
-        }
-
-        return ret;
-}
-
-/*
- * save_tx_buffer_request()
- *
- * attempt to store transmit frame request for later transmission
- *
- * Arguments:
- *
- *      info            pointer to device instance data
- *      Buffer          pointer to buffer containing frame to load
- *      BufferSize      size in bytes of frame in Buffer
- *
- * Return Value:        1 if able to store, 0 otherwise
- */
-static int save_tx_buffer_request(struct mgsl_struct *info,const char *Buffer, unsigned int BufferSize)
-{
-        struct tx_holding_buffer *ptx;
-
-        if ( info->tx_holding_count >= info->num_tx_holding_buffers ) {
-                return 0;               /* all buffers in use */
-        }
-
-        ptx = &info->tx_holding_buffers[info->put_tx_holding_index];
-        ptx->buffer_size = BufferSize;
-        memcpy( ptx->buffer, Buffer, BufferSize);
-
-        ++info->tx_holding_count;
-        if ( ++info->put_tx_holding_index >= info->num_tx_holding_buffers)
-                info->put_tx_holding_index=0;
-
-        return 1;
-}
-
-static int mgsl_claim_resources(struct mgsl_struct *info)
-{
-        if (request_region(info->io_base,info->io_addr_size,"synclink") == NULL) {
-                printk( "%s(%d):I/O address conflict on device %s Addr=%08X\n",
-                        __FILE__,__LINE__,info->device_name, info->io_base);
-                return -ENODEV;
-        }
-        info->io_addr_requested = true;
-        
-        if ( request_irq(info->irq_level,mgsl_interrupt,info->irq_flags,
-                info->device_name, info ) < 0 ) {
-                printk( "%s(%d):Cant request interrupt on device %s IRQ=%d\n",
-                        __FILE__,__LINE__,info->device_name, info->irq_level );
-                goto errout;
-        }
-        info->irq_requested = true;
-        
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI ) {
-                if (request_mem_region(info->phys_memory_base,0x40000,"synclink") == NULL) {
-                        printk( "%s(%d):mem addr conflict device %s Addr=%08X\n",
-                                __FILE__,__LINE__,info->device_name, info->phys_memory_base);
-                        goto errout;
-                }
-                info->shared_mem_requested = true;
-                if (request_mem_region(info->phys_lcr_base + info->lcr_offset,128,"synclink") == NULL) {
-                        printk( "%s(%d):lcr mem addr conflict device %s Addr=%08X\n",
-                                __FILE__,__LINE__,info->device_name, info->phys_lcr_base + info->lcr_offset);
-                        goto errout;
-                }
-                info->lcr_mem_requested = true;
-
-                info->memory_base = ioremap_nocache(info->phys_memory_base,
-                                                                0x40000);
-                if (!info->memory_base) {
-                        printk( "%s(%d):Cant map shared memory on device %s MemAddr=%08X\n",
-                                __FILE__,__LINE__,info->device_name, info->phys_memory_base );
-                        goto errout;
-                }
-                
-                if ( !mgsl_memory_test(info) ) {
-                        printk( "%s(%d):Failed shared memory test %s MemAddr=%08X\n",
-                                __FILE__,__LINE__,info->device_name, info->phys_memory_base );
-                        goto errout;
-                }
-                
-                info->lcr_base = ioremap_nocache(info->phys_lcr_base,
-                                                                PAGE_SIZE);
-                if (!info->lcr_base) {
-                        printk( "%s(%d):Cant map LCR memory on device %s MemAddr=%08X\n",
-                                __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
-                        goto errout;
-                }
-                info->lcr_base += info->lcr_offset;
-                
-        } else {
-                /* claim DMA channel */
-                
-                if (request_dma(info->dma_level,info->device_name) < 0){
-                        printk( "%s(%d):Cant request DMA channel on device %s DMA=%d\n",
-                                __FILE__,__LINE__,info->device_name, info->dma_level );
-                        mgsl_release_resources( info );
-                        return -ENODEV;
-                }
-                info->dma_requested = true;
-
-                /* ISA adapter uses bus master DMA */           
-                set_dma_mode(info->dma_level,DMA_MODE_CASCADE);
-                enable_dma(info->dma_level);
-        }
-        
-        if ( mgsl_allocate_dma_buffers(info) < 0 ) {
-                printk( "%s(%d):Cant allocate DMA buffers on device %s DMA=%d\n",
-                        __FILE__,__LINE__,info->device_name, info->dma_level );
-                goto errout;
-        }       
-        
-        return 0;
-errout:
-        mgsl_release_resources(info);
-        return -ENODEV;
-
-}       /* end of mgsl_claim_resources() */
-
-static void mgsl_release_resources(struct mgsl_struct *info)
-{
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):mgsl_release_resources(%s) entry\n",
-                        __FILE__,__LINE__,info->device_name );
-                        
-        if ( info->irq_requested ) {
-                free_irq(info->irq_level, info);
-                info->irq_requested = false;
-        }
-        if ( info->dma_requested ) {
-                disable_dma(info->dma_level);
-                free_dma(info->dma_level);
-                info->dma_requested = false;
-        }
-        mgsl_free_dma_buffers(info);
-        mgsl_free_intermediate_rxbuffer_memory(info);
-        mgsl_free_intermediate_txbuffer_memory(info);
-        
-        if ( info->io_addr_requested ) {
-                release_region(info->io_base,info->io_addr_size);
-                info->io_addr_requested = false;
-        }
-        if ( info->shared_mem_requested ) {
-                release_mem_region(info->phys_memory_base,0x40000);
-                info->shared_mem_requested = false;
-        }
-        if ( info->lcr_mem_requested ) {
-                release_mem_region(info->phys_lcr_base + info->lcr_offset,128);
-                info->lcr_mem_requested = false;
-        }
-        if (info->memory_base){
-                iounmap(info->memory_base);
-                info->memory_base = NULL;
-        }
-        if (info->lcr_base){
-                iounmap(info->lcr_base - info->lcr_offset);
-                info->lcr_base = NULL;
-        }
-        
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):mgsl_release_resources(%s) exit\n",
-                        __FILE__,__LINE__,info->device_name );
-                        
-}       /* end of mgsl_release_resources() */
-
-/* mgsl_add_device()
- * 
- *      Add the specified device instance data structure to the
- *      global linked list of devices and increment the device count.
- *      
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_add_device( struct mgsl_struct *info )
-{
-        info->next_device = NULL;
-        info->line = mgsl_device_count;
-        sprintf(info->device_name,"ttySL%d",info->line);
-        
-        if (info->line < MAX_TOTAL_DEVICES) {
-                if (maxframe[info->line])
-                        info->max_frame_size = maxframe[info->line];
-
-                if (txdmabufs[info->line]) {
-                        info->num_tx_dma_buffers = txdmabufs[info->line];
-                        if (info->num_tx_dma_buffers < 1)
-                                info->num_tx_dma_buffers = 1;
-                }
-
-                if (txholdbufs[info->line]) {
-                        info->num_tx_holding_buffers = txholdbufs[info->line];
-                        if (info->num_tx_holding_buffers < 1)
-                                info->num_tx_holding_buffers = 1;
-                        else if (info->num_tx_holding_buffers > MAX_TX_HOLDING_BUFFERS)
-                                info->num_tx_holding_buffers = MAX_TX_HOLDING_BUFFERS;
-                }
-        }
-
-        mgsl_device_count++;
-        
-        if ( !mgsl_device_list )
-                mgsl_device_list = info;
-        else {  
-                struct mgsl_struct *current_dev = mgsl_device_list;
-                while( current_dev->next_device )
-                        current_dev = current_dev->next_device;
-                current_dev->next_device = info;
-        }
-        
-        if ( info->max_frame_size < 4096 )
-                info->max_frame_size = 4096;
-        else if ( info->max_frame_size > 65535 )
-                info->max_frame_size = 65535;
-        
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI ) {
-                printk( "SyncLink PCI v%d %s: IO=%04X IRQ=%d Mem=%08X,%08X MaxFrameSize=%u\n",
-                        info->hw_version + 1, info->device_name, info->io_base, info->irq_level,
-                        info->phys_memory_base, info->phys_lcr_base,
-                        info->max_frame_size );
-        } else {
-                printk( "SyncLink ISA %s: IO=%04X IRQ=%d DMA=%d MaxFrameSize=%u\n",
-                        info->device_name, info->io_base, info->irq_level, info->dma_level,
-                        info->max_frame_size );
-        }
-
-#if SYNCLINK_GENERIC_HDLC
-        hdlcdev_init(info);
-#endif
-
-}       /* end of mgsl_add_device() */
-
-static const struct tty_port_operations mgsl_port_ops = {
-        .carrier_raised = carrier_raised,
-        .dtr_rts = dtr_rts,
-};
-
-
-/* mgsl_allocate_device()
- * 
- *      Allocate and initialize a device instance structure
- *      
- * Arguments:           none
- * Return Value:        pointer to mgsl_struct if success, otherwise NULL
- */
-static struct mgsl_struct* mgsl_allocate_device(void)
-{
-        struct mgsl_struct *info;
-        
-        info = kzalloc(sizeof(struct mgsl_struct),
-                 GFP_KERNEL);
-                 
-        if (!info) {
-                printk("Error can't allocate device instance data\n");
-        } else {
-                tty_port_init(&info->port);
-                info->port.ops = &mgsl_port_ops;
-                info->magic = MGSL_MAGIC;
-                INIT_WORK(&info->task, mgsl_bh_handler);
-                info->max_frame_size = 4096;
-                info->port.close_delay = 5*HZ/10;
-                info->port.closing_wait = 30*HZ;
-                init_waitqueue_head(&info->status_event_wait_q);
-                init_waitqueue_head(&info->event_wait_q);
-                spin_lock_init(&info->irq_spinlock);
-                spin_lock_init(&info->netlock);
-                memcpy(&info->params,&default_params,sizeof(MGSL_PARAMS));
-                info->idle_mode = HDLC_TXIDLE_FLAGS;            
-                info->num_tx_dma_buffers = 1;
-                info->num_tx_holding_buffers = 0;
-        }
-        
-        return info;
-
-}       /* end of mgsl_allocate_device()*/
-
-static const struct tty_operations mgsl_ops = {
-        .open = mgsl_open,
-        .close = mgsl_close,
-        .write = mgsl_write,
-        .put_char = mgsl_put_char,
-        .flush_chars = mgsl_flush_chars,
-        .write_room = mgsl_write_room,
-        .chars_in_buffer = mgsl_chars_in_buffer,
-        .flush_buffer = mgsl_flush_buffer,
-        .ioctl = mgsl_ioctl,
-        .throttle = mgsl_throttle,
-        .unthrottle = mgsl_unthrottle,
-        .send_xchar = mgsl_send_xchar,
-        .break_ctl = mgsl_break,
-        .wait_until_sent = mgsl_wait_until_sent,
-        .set_termios = mgsl_set_termios,
-        .stop = mgsl_stop,
-        .start = mgsl_start,
-        .hangup = mgsl_hangup,
-        .tiocmget = tiocmget,
-        .tiocmset = tiocmset,
-        .proc_fops = &mgsl_proc_fops,
-};
-
-/*
- * perform tty device initialization
- */
-static int mgsl_init_tty(void)
-{
-        int rc;
-
-        serial_driver = alloc_tty_driver(128);
-        if (!serial_driver)
-                return -ENOMEM;
-        
-        serial_driver->owner = THIS_MODULE;
-        serial_driver->driver_name = "synclink";
-        serial_driver->name = "ttySL";
-        serial_driver->major = ttymajor;
-        serial_driver->minor_start = 64;
-        serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        serial_driver->subtype = SERIAL_TYPE_NORMAL;
-        serial_driver->init_termios = tty_std_termios;
-        serial_driver->init_termios.c_cflag =
-                B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        serial_driver->init_termios.c_ispeed = 9600;
-        serial_driver->init_termios.c_ospeed = 9600;
-        serial_driver->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(serial_driver, &mgsl_ops);
-        if ((rc = tty_register_driver(serial_driver)) < 0) {
-                printk("%s(%d):Couldn't register serial driver\n",
-                        __FILE__,__LINE__);
-                put_tty_driver(serial_driver);
-                serial_driver = NULL;
-                return rc;
-        }
-                        
-        printk("%s %s, tty major#%d\n",
-                driver_name, driver_version,
-                serial_driver->major);
-        return 0;
-}
-
-/* enumerate user specified ISA adapters
- */
-static void mgsl_enum_isa_devices(void)
-{
-        struct mgsl_struct *info;
-        int i;
-                
-        /* Check for user specified ISA devices */
-        
-        for (i=0 ;(i < MAX_ISA_DEVICES) && io[i] && irq[i]; i++){
-                if ( debug_level >= DEBUG_LEVEL_INFO )
-                        printk("ISA device specified io=%04X,irq=%d,dma=%d\n",
-                                io[i], irq[i], dma[i] );
-                
-                info = mgsl_allocate_device();
-                if ( !info ) {
-                        /* error allocating device instance data */
-                        if ( debug_level >= DEBUG_LEVEL_ERROR )
-                                printk( "can't allocate device instance data.\n");
-                        continue;
-                }
-                
-                /* Copy user configuration info to device instance data */
-                info->io_base = (unsigned int)io[i];
-                info->irq_level = (unsigned int)irq[i];
-                info->irq_level = irq_canonicalize(info->irq_level);
-                info->dma_level = (unsigned int)dma[i];
-                info->bus_type = MGSL_BUS_TYPE_ISA;
-                info->io_addr_size = 16;
-                info->irq_flags = 0;
-                
-                mgsl_add_device( info );
-        }
-}
-
-static void synclink_cleanup(void)
-{
-        int rc;
-        struct mgsl_struct *info;
-        struct mgsl_struct *tmp;
-
-        printk("Unloading %s: %s\n", driver_name, driver_version);
-
-        if (serial_driver) {
-                if ((rc = tty_unregister_driver(serial_driver)))
-                        printk("%s(%d) failed to unregister tty driver err=%d\n",
-                               __FILE__,__LINE__,rc);
-                put_tty_driver(serial_driver);
-        }
-
-        info = mgsl_device_list;
-        while(info) {
-#if SYNCLINK_GENERIC_HDLC
-                hdlcdev_exit(info);
-#endif
-                mgsl_release_resources(info);
-                tmp = info;
-                info = info->next_device;
-                kfree(tmp);
-        }
-        
-        if (pci_registered)
-                pci_unregister_driver(&synclink_pci_driver);
-}
-
-static int __init synclink_init(void)
-{
-        int rc;
-
-        if (break_on_load) {
-                mgsl_get_text_ptr();
-                BREAKPOINT();
-        }
-
-        printk("%s %s\n", driver_name, driver_version);
-
-        mgsl_enum_isa_devices();
-        if ((rc = pci_register_driver(&synclink_pci_driver)) < 0)
-                printk("%s:failed to register PCI driver, error=%d\n",__FILE__,rc);
-        else
-                pci_registered = true;
-
-        if ((rc = mgsl_init_tty()) < 0)
-                goto error;
-
-        return 0;
-
-error:
-        synclink_cleanup();
-        return rc;
-}
-
-static void __exit synclink_exit(void)
-{
-        synclink_cleanup();
-}
-
-module_init(synclink_init);
-module_exit(synclink_exit);
-
-/*
- * usc_RTCmd()
- *
- * Issue a USC Receive/Transmit command to the
- * Channel Command/Address Register (CCAR).
- *
- * Notes:
- *
- *    The command is encoded in the most significant 5 bits <15..11>
- *    of the CCAR value. Bits <10..7> of the CCAR must be preserved
- *    and Bits <6..0> must be written as zeros.
- *
- * Arguments:
- *
- *    info   pointer to device information structure
- *    Cmd    command mask (use symbolic macros)
- *
- * Return Value:
- *
- *    None
- */
-static void usc_RTCmd( struct mgsl_struct *info, u16 Cmd )
-{
-        /* output command to CCAR in bits <15..11> */
-        /* preserve bits <10..7>, bits <6..0> must be zero */
-
-        outw( Cmd + info->loopback_bits, info->io_base + CCAR );
-
-        /* Read to flush write to CCAR */
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI )
-                inw( info->io_base + CCAR );
-
-}       /* end of usc_RTCmd() */
-
-/*
- * usc_DmaCmd()
- *
- *    Issue a DMA command to the DMA Command/Address Register (DCAR).
- *
- * Arguments:
- *
- *    info   pointer to device information structure
- *    Cmd    DMA command mask (usc_DmaCmd_XX Macros)
- *
- * Return Value:
- *
- *       None
- */
-static void usc_DmaCmd( struct mgsl_struct *info, u16 Cmd )
-{
-        /* write command mask to DCAR */
-        outw( Cmd + info->mbre_bit, info->io_base );
-
-        /* Read to flush write to DCAR */
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI )
-                inw( info->io_base );
-
-}       /* end of usc_DmaCmd() */
-
-/*
- * usc_OutDmaReg()
- *
- *    Write a 16-bit value to a USC DMA register
- *
- * Arguments:
- *
- *    info      pointer to device info structure
- *    RegAddr   register address (number) for write
- *    RegValue  16-bit value to write to register
- *
- * Return Value:
- *
- *    None
- *
- */
-static void usc_OutDmaReg( struct mgsl_struct *info, u16 RegAddr, u16 RegValue )
-{
-        /* Note: The DCAR is located at the adapter base address */
-        /* Note: must preserve state of BIT8 in DCAR */
-
-        outw( RegAddr + info->mbre_bit, info->io_base );
-        outw( RegValue, info->io_base );
-
-        /* Read to flush write to DCAR */
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI )
-                inw( info->io_base );
-
-}       /* end of usc_OutDmaReg() */
- 
-/*
- * usc_InDmaReg()
- *
- *    Read a 16-bit value from a DMA register
- *
- * Arguments:
- *
- *    info     pointer to device info structure
- *    RegAddr  register address (number) to read from
- *
- * Return Value:
- *
- *    The 16-bit value read from register
- *
- */
-static u16 usc_InDmaReg( struct mgsl_struct *info, u16 RegAddr )
-{
-        /* Note: The DCAR is located at the adapter base address */
-        /* Note: must preserve state of BIT8 in DCAR */
-
-        outw( RegAddr + info->mbre_bit, info->io_base );
-        return inw( info->io_base );
-
-}       /* end of usc_InDmaReg() */
-
-/*
- *
- * usc_OutReg()
- *
- *    Write a 16-bit value to a USC serial channel register 
- *
- * Arguments:
- *
- *    info      pointer to device info structure
- *    RegAddr   register address (number) to write to
- *    RegValue  16-bit value to write to register
- *
- * Return Value:
- *
- *    None
- *
- */
-static void usc_OutReg( struct mgsl_struct *info, u16 RegAddr, u16 RegValue )
-{
-        outw( RegAddr + info->loopback_bits, info->io_base + CCAR );
-        outw( RegValue, info->io_base + CCAR );
-
-        /* Read to flush write to CCAR */
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI )
-                inw( info->io_base + CCAR );
-
-}       /* end of usc_OutReg() */
-
-/*
- * usc_InReg()
- *
- *    Reads a 16-bit value from a USC serial channel register
- *
- * Arguments:
- *
- *    info       pointer to device extension
- *    RegAddr    register address (number) to read from
- *
- * Return Value:
- *
- *    16-bit value read from register
- */
-static u16 usc_InReg( struct mgsl_struct *info, u16 RegAddr )
-{
-        outw( RegAddr + info->loopback_bits, info->io_base + CCAR );
-        return inw( info->io_base + CCAR );
-
-}       /* end of usc_InReg() */
-
-/* usc_set_sdlc_mode()
- *
- *    Set up the adapter for SDLC DMA communications.
- *
- * Arguments:           info    pointer to device instance data
- * Return Value:        NONE
- */
-static void usc_set_sdlc_mode( struct mgsl_struct *info )
-{
-        u16 RegValue;
-        bool PreSL1660;
-        
-        /*
-         * determine if the IUSC on the adapter is pre-SL1660. If
-         * not, take advantage of the UnderWait feature of more
-         * modern chips. If an underrun occurs and this bit is set,
-         * the transmitter will idle the programmed idle pattern
-         * until the driver has time to service the underrun. Otherwise,
-         * the dma controller may get the cycles previously requested
-         * and begin transmitting queued tx data.
-         */
-        usc_OutReg(info,TMCR,0x1f);
-        RegValue=usc_InReg(info,TMDR);
-        PreSL1660 = (RegValue == IUSC_PRE_SL1660);
-
-        if ( info->params.flags & HDLC_FLAG_HDLC_LOOPMODE )
-        {
-           /*
-           ** Channel Mode Register (CMR)
-           **
-           ** <15..14>    10    Tx Sub Modes, Send Flag on Underrun
-           ** <13>        0     0 = Transmit Disabled (initially)
-           ** <12>        0     1 = Consecutive Idles share common 0
-           ** <11..8>     1110  Transmitter Mode = HDLC/SDLC Loop
-           ** <7..4>      0000  Rx Sub Modes, addr/ctrl field handling
-           ** <3..0>      0110  Receiver Mode = HDLC/SDLC
-           **
-           ** 1000 1110 0000 0110 = 0x8e06
-           */
-           RegValue = 0x8e06;
- 
-           /*--------------------------------------------------
-            * ignore user options for UnderRun Actions and
-            * preambles
-            *--------------------------------------------------*/
-        }
-        else
-        {       
-                /* Channel mode Register (CMR)
-                 *
-                 * <15..14>  00    Tx Sub modes, Underrun Action
-                 * <13>      0     1 = Send Preamble before opening flag
-                 * <12>      0     1 = Consecutive Idles share common 0
-                 * <11..8>   0110  Transmitter mode = HDLC/SDLC
-                 * <7..4>    0000  Rx Sub modes, addr/ctrl field handling
-                 * <3..0>    0110  Receiver mode = HDLC/SDLC
-                 *
-                 * 0000 0110 0000 0110 = 0x0606
-                 */
-                if (info->params.mode == MGSL_MODE_RAW) {
-                        RegValue = 0x0001;              /* Set Receive mode = external sync */
-
-                        usc_OutReg( info, IOCR,         /* Set IOCR DCD is RxSync Detect Input */
-                                (unsigned short)((usc_InReg(info, IOCR) & ~(BIT13|BIT12)) | BIT12));
-
-                        /*
-                         * TxSubMode:
-                         *      CMR <15>                0       Don't send CRC on Tx Underrun
-                         *      CMR <14>                x       undefined
-                         *      CMR <13>                0       Send preamble before openning sync
-                         *      CMR <12>                0       Send 8-bit syncs, 1=send Syncs per TxLength
-                         *
-                         * TxMode:
-                         *      CMR <11-8)      0100    MonoSync
-                         *
-                         *      0x00 0100 xxxx xxxx  04xx
-                         */
-                        RegValue |= 0x0400;
-                }
-                else {
-
-                RegValue = 0x0606;
-
-                if ( info->params.flags & HDLC_FLAG_UNDERRUN_ABORT15 )
-                        RegValue |= BIT14;
-                else if ( info->params.flags & HDLC_FLAG_UNDERRUN_FLAG )
-                        RegValue |= BIT15;
-                else if ( info->params.flags & HDLC_FLAG_UNDERRUN_CRC )
-                        RegValue |= BIT15 + BIT14;
-                }
-
-                if ( info->params.preamble != HDLC_PREAMBLE_PATTERN_NONE )
-                        RegValue |= BIT13;
-        }
-
-        if ( info->params.mode == MGSL_MODE_HDLC &&
-                (info->params.flags & HDLC_FLAG_SHARE_ZERO) )
-                RegValue |= BIT12;
-
-        if ( info->params.addr_filter != 0xff )
-        {
-                /* set up receive address filtering */
-                usc_OutReg( info, RSR, info->params.addr_filter );
-                RegValue |= BIT4;
-        }
-
-        usc_OutReg( info, CMR, RegValue );
-        info->cmr_value = RegValue;
-
-        /* Receiver mode Register (RMR)
-         *
-         * <15..13>  000    encoding
-         * <12..11>  00     FCS = 16bit CRC CCITT (x15 + x12 + x5 + 1)
-         * <10>      1      1 = Set CRC to all 1s (use for SDLC/HDLC)
-         * <9>       0      1 = Include Receive chars in CRC
-         * <8>       1      1 = Use Abort/PE bit as abort indicator
-         * <7..6>    00     Even parity
-         * <5>       0      parity disabled
-         * <4..2>    000    Receive Char Length = 8 bits
-         * <1..0>    00     Disable Receiver
-         *
-         * 0000 0101 0000 0000 = 0x0500
-         */
-
-        RegValue = 0x0500;
-
-        switch ( info->params.encoding ) {
-        case HDLC_ENCODING_NRZB:               RegValue |= BIT13; break;
-        case HDLC_ENCODING_NRZI_MARK:          RegValue |= BIT14; break;
-        case HDLC_ENCODING_NRZI_SPACE:         RegValue |= BIT14 + BIT13; break;
-        case HDLC_ENCODING_BIPHASE_MARK:       RegValue |= BIT15; break;
-        case HDLC_ENCODING_BIPHASE_SPACE:      RegValue |= BIT15 + BIT13; break;
-        case HDLC_ENCODING_BIPHASE_LEVEL:      RegValue |= BIT15 + BIT14; break;
-        case HDLC_ENCODING_DIFF_BIPHASE_LEVEL: RegValue |= BIT15 + BIT14 + BIT13; break;
-        }
-
-        if ( (info->params.crc_type & HDLC_CRC_MASK) == HDLC_CRC_16_CCITT )
-                RegValue |= BIT9;
-        else if ( (info->params.crc_type & HDLC_CRC_MASK) == HDLC_CRC_32_CCITT )
-                RegValue |= ( BIT12 | BIT10 | BIT9 );
-
-        usc_OutReg( info, RMR, RegValue );
-
-        /* Set the Receive count Limit Register (RCLR) to 0xffff. */
-        /* When an opening flag of an SDLC frame is recognized the */
-        /* Receive Character count (RCC) is loaded with the value in */
-        /* RCLR. The RCC is decremented for each received byte.  The */
-        /* value of RCC is stored after the closing flag of the frame */
-        /* allowing the frame size to be computed. */
-
-        usc_OutReg( info, RCLR, RCLRVALUE );
-
-        usc_RCmd( info, RCmd_SelectRicrdma_level );
-
-        /* Receive Interrupt Control Register (RICR)
-         *
-         * <15..8>      ?       RxFIFO DMA Request Level
-         * <7>          0       Exited Hunt IA (Interrupt Arm)
-         * <6>          0       Idle Received IA
-         * <5>          0       Break/Abort IA
-         * <4>          0       Rx Bound IA
-         * <3>          1       Queued status reflects oldest 2 bytes in FIFO
-         * <2>          0       Abort/PE IA
-         * <1>          1       Rx Overrun IA
-         * <0>          0       Select TC0 value for readback
-         *
-         *      0000 0000 0000 1000 = 0x000a
-         */
-
-        /* Carry over the Exit Hunt and Idle Received bits */
-        /* in case they have been armed by usc_ArmEvents.   */
-
-        RegValue = usc_InReg( info, RICR ) & 0xc0;
-
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI )
-                usc_OutReg( info, RICR, (u16)(0x030a | RegValue) );
-        else
-                usc_OutReg( info, RICR, (u16)(0x140a | RegValue) );
-
-        /* Unlatch all Rx status bits and clear Rx status IRQ Pending */
-
-        usc_UnlatchRxstatusBits( info, RXSTATUS_ALL );
-        usc_ClearIrqPendingBits( info, RECEIVE_STATUS );
-
-        /* Transmit mode Register (TMR)
-         *      
-         * <15..13>     000     encoding
-         * <12..11>     00      FCS = 16bit CRC CCITT (x15 + x12 + x5 + 1)
-         * <10>         1       1 = Start CRC as all 1s (use for SDLC/HDLC)
-         * <9>          0       1 = Tx CRC Enabled
-         * <8>          0       1 = Append CRC to end of transmit frame
-         * <7..6>       00      Transmit parity Even
-         * <5>          0       Transmit parity Disabled
-         * <4..2>       000     Tx Char Length = 8 bits
-         * <1..0>       00      Disable Transmitter
-         *
-         *      0000 0100 0000 0000 = 0x0400
-         */
-
-        RegValue = 0x0400;
-
-        switch ( info->params.encoding ) {
-        case HDLC_ENCODING_NRZB:               RegValue |= BIT13; break;
-        case HDLC_ENCODING_NRZI_MARK:          RegValue |= BIT14; break;
-        case HDLC_ENCODING_NRZI_SPACE:         RegValue |= BIT14 + BIT13; break;
-        case HDLC_ENCODING_BIPHASE_MARK:       RegValue |= BIT15; break;
-        case HDLC_ENCODING_BIPHASE_SPACE:      RegValue |= BIT15 + BIT13; break;
-        case HDLC_ENCODING_BIPHASE_LEVEL:      RegValue |= BIT15 + BIT14; break;
-        case HDLC_ENCODING_DIFF_BIPHASE_LEVEL: RegValue |= BIT15 + BIT14 + BIT13; break;
-        }
-
-        if ( (info->params.crc_type & HDLC_CRC_MASK) == HDLC_CRC_16_CCITT )
-                RegValue |= BIT9 + BIT8;
-        else if ( (info->params.crc_type & HDLC_CRC_MASK) == HDLC_CRC_32_CCITT )
-                RegValue |= ( BIT12 | BIT10 | BIT9 | BIT8);
-
-        usc_OutReg( info, TMR, RegValue );
-
-        usc_set_txidle( info );
-
-
-        usc_TCmd( info, TCmd_SelectTicrdma_level );
-
-        /* Transmit Interrupt Control Register (TICR)
-         *
-         * <15..8>      ?       Transmit FIFO DMA Level
-         * <7>          0       Present IA (Interrupt Arm)
-         * <6>          0       Idle Sent IA
-         * <5>          1       Abort Sent IA
-         * <4>          1       EOF/EOM Sent IA
-         * <3>          0       CRC Sent IA
-         * <2>          1       1 = Wait for SW Trigger to Start Frame
-         * <1>          1       Tx Underrun IA
-         * <0>          0       TC0 constant on read back
-         *
-         *      0000 0000 0011 0110 = 0x0036
-         */
-
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI )
-                usc_OutReg( info, TICR, 0x0736 );
-        else                                                            
-                usc_OutReg( info, TICR, 0x1436 );
-
-        usc_UnlatchTxstatusBits( info, TXSTATUS_ALL );
-        usc_ClearIrqPendingBits( info, TRANSMIT_STATUS );
-
-        /*
-        ** Transmit Command/Status Register (TCSR)
-        **
-        ** <15..12>     0000    TCmd
-        ** <11>         0/1     UnderWait
-        ** <10..08>     000     TxIdle
-        ** <7>          x       PreSent
-        ** <6>          x       IdleSent
-        ** <5>          x       AbortSent
-        ** <4>          x       EOF/EOM Sent
-        ** <3>          x       CRC Sent
-        ** <2>          x       All Sent
-        ** <1>          x       TxUnder
-        ** <0>          x       TxEmpty
-        ** 
-        ** 0000 0000 0000 0000 = 0x0000
-        */
-        info->tcsr_value = 0;
-
-        if ( !PreSL1660 )
-                info->tcsr_value |= TCSR_UNDERWAIT;
-                
-        usc_OutReg( info, TCSR, info->tcsr_value );
-
-        /* Clock mode Control Register (CMCR)
-         *
-         * <15..14>     00      counter 1 Source = Disabled
-         * <13..12>     00      counter 0 Source = Disabled
-         * <11..10>     11      BRG1 Input is TxC Pin
-         * <9..8>       11      BRG0 Input is TxC Pin
-         * <7..6>       01      DPLL Input is BRG1 Output
-         * <5..3>       XXX     TxCLK comes from Port 0
-         * <2..0>       XXX     RxCLK comes from Port 1
-         *
-         *      0000 1111 0111 0111 = 0x0f77
-         */
-
-        RegValue = 0x0f40;
-
-        if ( info->params.flags & HDLC_FLAG_RXC_DPLL )
-                RegValue |= 0x0003;     /* RxCLK from DPLL */
-        else if ( info->params.flags & HDLC_FLAG_RXC_BRG )
-                RegValue |= 0x0004;     /* RxCLK from BRG0 */
-        else if ( info->params.flags & HDLC_FLAG_RXC_TXCPIN)
-                RegValue |= 0x0006;     /* RxCLK from TXC Input */
-        else
-                RegValue |= 0x0007;     /* RxCLK from Port1 */
-
-        if ( info->params.flags & HDLC_FLAG_TXC_DPLL )
-                RegValue |= 0x0018;     /* TxCLK from DPLL */
-        else if ( info->params.flags & HDLC_FLAG_TXC_BRG )
-                RegValue |= 0x0020;     /* TxCLK from BRG0 */
-        else if ( info->params.flags & HDLC_FLAG_TXC_RXCPIN)
-                RegValue |= 0x0038;     /* RxCLK from TXC Input */
-        else
-                RegValue |= 0x0030;     /* TxCLK from Port0 */
-
-        usc_OutReg( info, CMCR, RegValue );
-
-
-        /* Hardware Configuration Register (HCR)
-         *
-         * <15..14>     00      CTR0 Divisor:00=32,01=16,10=8,11=4
-         * <13>         0       CTR1DSel:0=CTR0Div determines CTR0Div
-         * <12>         0       CVOK:0=report code violation in biphase
-         * <11..10>     00      DPLL Divisor:00=32,01=16,10=8,11=4
-         * <9..8>       XX      DPLL mode:00=disable,01=NRZ,10=Biphase,11=Biphase Level
-         * <7..6>       00      reserved
-         * <5>          0       BRG1 mode:0=continuous,1=single cycle
-         * <4>          X       BRG1 Enable
-         * <3..2>       00      reserved
-         * <1>          0       BRG0 mode:0=continuous,1=single cycle
-         * <0>          0       BRG0 Enable
-         */
-
-        RegValue = 0x0000;
-
-        if ( info->params.flags & (HDLC_FLAG_RXC_DPLL + HDLC_FLAG_TXC_DPLL) ) {
-                u32 XtalSpeed;
-                u32 DpllDivisor;
-                u16 Tc;
-
-                /*  DPLL is enabled. Use BRG1 to provide continuous reference clock  */
-                /*  for DPLL. DPLL mode in HCR is dependent on the encoding used. */
-
-                if ( info->bus_type == MGSL_BUS_TYPE_PCI )
-                        XtalSpeed = 11059200;
-                else
-                        XtalSpeed = 14745600;
-
-                if ( info->params.flags & HDLC_FLAG_DPLL_DIV16 ) {
-                        DpllDivisor = 16;
-                        RegValue |= BIT10;
-                }
-                else if ( info->params.flags & HDLC_FLAG_DPLL_DIV8 ) {
-                        DpllDivisor = 8;
-                        RegValue |= BIT11;
-                }
-                else
-                        DpllDivisor = 32;
-
-                /*  Tc = (Xtal/Speed) - 1 */
-                /*  If twice the remainder of (Xtal/Speed) is greater than Speed */
-                /*  then rounding up gives a more precise time constant. Instead */
-                /*  of rounding up and then subtracting 1 we just don't subtract */
-                /*  the one in this case. */
-
-                /*--------------------------------------------------
-                 * ejz: for DPLL mode, application should use the
-                 * same clock speed as the partner system, even 
-                 * though clocking is derived from the input RxData.
-                 * In case the user uses a 0 for the clock speed,
-                 * default to 0xffffffff and don't try to divide by
-                 * zero
-                 *--------------------------------------------------*/
-                if ( info->params.clock_speed )
-                {
-                        Tc = (u16)((XtalSpeed/DpllDivisor)/info->params.clock_speed);
-                        if ( !((((XtalSpeed/DpllDivisor) % info->params.clock_speed) * 2)
-                               / info->params.clock_speed) )
-                                Tc--;
-                }
-                else
-                        Tc = -1;
-                                  
-
-                /* Write 16-bit Time Constant for BRG1 */
-                usc_OutReg( info, TC1R, Tc );
-
-                RegValue |= BIT4;               /* enable BRG1 */
-
-                switch ( info->params.encoding ) {
-                case HDLC_ENCODING_NRZ:
-                case HDLC_ENCODING_NRZB:
-                case HDLC_ENCODING_NRZI_MARK:
-                case HDLC_ENCODING_NRZI_SPACE: RegValue |= BIT8; break;
-                case HDLC_ENCODING_BIPHASE_MARK:
-                case HDLC_ENCODING_BIPHASE_SPACE: RegValue |= BIT9; break;
-                case HDLC_ENCODING_BIPHASE_LEVEL:
-                case HDLC_ENCODING_DIFF_BIPHASE_LEVEL: RegValue |= BIT9 + BIT8; break;
-                }
-        }
-
-        usc_OutReg( info, HCR, RegValue );
-
-
-        /* Channel Control/status Register (CCSR)
-         *
-         * <15>         X       RCC FIFO Overflow status (RO)
-         * <14>         X       RCC FIFO Not Empty status (RO)
-         * <13>         0       1 = Clear RCC FIFO (WO)
-         * <12>         X       DPLL Sync (RW)
-         * <11>         X       DPLL 2 Missed Clocks status (RO)
-         * <10>         X       DPLL 1 Missed Clock status (RO)
-         * <9..8>       00      DPLL Resync on rising and falling edges (RW)
-         * <7>          X       SDLC Loop On status (RO)
-         * <6>          X       SDLC Loop Send status (RO)
-         * <5>          1       Bypass counters for TxClk and RxClk (RW)
-         * <4..2>       000     Last Char of SDLC frame has 8 bits (RW)
-         * <1..0>       00      reserved
-         *
-         *      0000 0000 0010 0000 = 0x0020
-         */
-
-        usc_OutReg( info, CCSR, 0x1020 );
-
-
-        if ( info->params.flags & HDLC_FLAG_AUTO_CTS ) {
-                usc_OutReg( info, SICR,
-                            (u16)(usc_InReg(info,SICR) | SICR_CTS_INACTIVE) );
-        }
-        
-
-        /* enable Master Interrupt Enable bit (MIE) */
-        usc_EnableMasterIrqBit( info );
-
-        usc_ClearIrqPendingBits( info, RECEIVE_STATUS + RECEIVE_DATA +
-                                TRANSMIT_STATUS + TRANSMIT_DATA + MISC);
-
-        /* arm RCC underflow interrupt */
-        usc_OutReg(info, SICR, (u16)(usc_InReg(info,SICR) | BIT3));
-        usc_EnableInterrupts(info, MISC);
-
-        info->mbre_bit = 0;
-        outw( 0, info->io_base );                       /* clear Master Bus Enable (DCAR) */
-        usc_DmaCmd( info, DmaCmd_ResetAllChannels );    /* disable both DMA channels */
-        info->mbre_bit = BIT8;
-        outw( BIT8, info->io_base );                    /* set Master Bus Enable (DCAR) */
-
-        if (info->bus_type == MGSL_BUS_TYPE_ISA) {
-                /* Enable DMAEN (Port 7, Bit 14) */
-                /* This connects the DMA request signal to the ISA bus */
-                usc_OutReg(info, PCR, (u16)((usc_InReg(info, PCR) | BIT15) & ~BIT14));
-        }
-
-        /* DMA Control Register (DCR)
-         *
-         * <15..14>     10      Priority mode = Alternating Tx/Rx
-         *              01      Rx has priority
-         *              00      Tx has priority
-         *
-         * <13>         1       Enable Priority Preempt per DCR<15..14>
-         *                      (WARNING DCR<11..10> must be 00 when this is 1)
-         *              0       Choose activate channel per DCR<11..10>
-         *
-         * <12>         0       Little Endian for Array/List
-         * <11..10>     00      Both Channels can use each bus grant
-         * <9..6>       0000    reserved
-         * <5>          0       7 CLK - Minimum Bus Re-request Interval
-         * <4>          0       1 = drive D/C and S/D pins
-         * <3>          1       1 = Add one wait state to all DMA cycles.
-         * <2>          0       1 = Strobe /UAS on every transfer.
-         * <1..0>       11      Addr incrementing only affects LS24 bits
-         *
-         *      0110 0000 0000 1011 = 0x600b
-         */
-
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI ) {
-                /* PCI adapter does not need DMA wait state */
-                usc_OutDmaReg( info, DCR, 0xa00b );
-        }
-        else
-                usc_OutDmaReg( info, DCR, 0x800b );
-
-
-        /* Receive DMA mode Register (RDMR)
-         *
-         * <15..14>     11      DMA mode = Linked List Buffer mode
-         * <13>         1       RSBinA/L = store Rx status Block in Arrary/List entry
-         * <12>         1       Clear count of List Entry after fetching
-         * <11..10>     00      Address mode = Increment
-         * <9>          1       Terminate Buffer on RxBound
-         * <8>          0       Bus Width = 16bits
-         * <7..0>       ?       status Bits (write as 0s)
-         *
-         * 1111 0010 0000 0000 = 0xf200
-         */
-
-        usc_OutDmaReg( info, RDMR, 0xf200 );
-
-
-        /* Transmit DMA mode Register (TDMR)
-         *
-         * <15..14>     11      DMA mode = Linked List Buffer mode
-         * <13>         1       TCBinA/L = fetch Tx Control Block from List entry
-         * <12>         1       Clear count of List Entry after fetching
-         * <11..10>     00      Address mode = Increment
-         * <9>          1       Terminate Buffer on end of frame
-         * <8>          0       Bus Width = 16bits
-         * <7..0>       ?       status Bits (Read Only so write as 0)
-         *
-         *      1111 0010 0000 0000 = 0xf200
-         */
-
-        usc_OutDmaReg( info, TDMR, 0xf200 );
-
-
-        /* DMA Interrupt Control Register (DICR)
-         *
-         * <15>         1       DMA Interrupt Enable
-         * <14>         0       1 = Disable IEO from USC
-         * <13>         0       1 = Don't provide vector during IntAck
-         * <12>         1       1 = Include status in Vector
-         * <10..2>      0       reserved, Must be 0s
-         * <1>          0       1 = Rx DMA Interrupt Enabled
-         * <0>          0       1 = Tx DMA Interrupt Enabled
-         *
-         *      1001 0000 0000 0000 = 0x9000
-         */
-
-        usc_OutDmaReg( info, DICR, 0x9000 );
-
-        usc_InDmaReg( info, RDMR );             /* clear pending receive DMA IRQ bits */
-        usc_InDmaReg( info, TDMR );             /* clear pending transmit DMA IRQ bits */
-        usc_OutDmaReg( info, CDIR, 0x0303 );    /* clear IUS and Pending for Tx and Rx */
-
-        /* Channel Control Register (CCR)
-         *
-         * <15..14>     10      Use 32-bit Tx Control Blocks (TCBs)
-         * <13>         0       Trigger Tx on SW Command Disabled
-         * <12>         0       Flag Preamble Disabled
-         * <11..10>     00      Preamble Length
-         * <9..8>       00      Preamble Pattern
-         * <7..6>       10      Use 32-bit Rx status Blocks (RSBs)
-         * <5>          0       Trigger Rx on SW Command Disabled
-         * <4..0>       0       reserved
-         *
-         *      1000 0000 1000 0000 = 0x8080
-         */
-
-        RegValue = 0x8080;
-
-        switch ( info->params.preamble_length ) {
-        case HDLC_PREAMBLE_LENGTH_16BITS: RegValue |= BIT10; break;
-        case HDLC_PREAMBLE_LENGTH_32BITS: RegValue |= BIT11; break;
-        case HDLC_PREAMBLE_LENGTH_64BITS: RegValue |= BIT11 + BIT10; break;
-        }
-
-        switch ( info->params.preamble ) {
-        case HDLC_PREAMBLE_PATTERN_FLAGS: RegValue |= BIT8 + BIT12; break;
-        case HDLC_PREAMBLE_PATTERN_ONES:  RegValue |= BIT8; break;
-        case HDLC_PREAMBLE_PATTERN_10:    RegValue |= BIT9; break;
-        case HDLC_PREAMBLE_PATTERN_01:    RegValue |= BIT9 + BIT8; break;
-        }
-
-        usc_OutReg( info, CCR, RegValue );
-
-
-        /*
-         * Burst/Dwell Control Register
-         *
-         * <15..8>      0x20    Maximum number of transfers per bus grant
-         * <7..0>       0x00    Maximum number of clock cycles per bus grant
-         */
-
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI ) {
-                /* don't limit bus occupancy on PCI adapter */
-                usc_OutDmaReg( info, BDCR, 0x0000 );
-        }
-        else
-                usc_OutDmaReg( info, BDCR, 0x2000 );
-
-        usc_stop_transmitter(info);
-        usc_stop_receiver(info);
-        
-}       /* end of usc_set_sdlc_mode() */
-
-/* usc_enable_loopback()
- *
- * Set the 16C32 for internal loopback mode.
- * The TxCLK and RxCLK signals are generated from the BRG0 and
- * the TxD is looped back to the RxD internally.
- *
- * Arguments:           info    pointer to device instance data
- *                      enable  1 = enable loopback, 0 = disable
- * Return Value:        None
- */
-static void usc_enable_loopback(struct mgsl_struct *info, int enable)
-{
-        if (enable) {
-                /* blank external TXD output */
-                usc_OutReg(info,IOCR,usc_InReg(info,IOCR) | (BIT7+BIT6));
-        
-                /* Clock mode Control Register (CMCR)
-                 *
-                 * <15..14>     00      counter 1 Disabled
-                 * <13..12>     00      counter 0 Disabled
-                 * <11..10>     11      BRG1 Input is TxC Pin
-                 * <9..8>       11      BRG0 Input is TxC Pin
-                 * <7..6>       01      DPLL Input is BRG1 Output
-                 * <5..3>       100     TxCLK comes from BRG0
-                 * <2..0>       100     RxCLK comes from BRG0
-                 *
-                 * 0000 1111 0110 0100 = 0x0f64
-                 */
-
-                usc_OutReg( info, CMCR, 0x0f64 );
-
-                /* Write 16-bit Time Constant for BRG0 */
-                /* use clock speed if available, otherwise use 8 for diagnostics */
-                if (info->params.clock_speed) {
-                        if (info->bus_type == MGSL_BUS_TYPE_PCI)
-                                usc_OutReg(info, TC0R, (u16)((11059200/info->params.clock_speed)-1));
-                        else
-                                usc_OutReg(info, TC0R, (u16)((14745600/info->params.clock_speed)-1));
-                } else
-                        usc_OutReg(info, TC0R, (u16)8);
-
-                /* Hardware Configuration Register (HCR) Clear Bit 1, BRG0
-                   mode = Continuous Set Bit 0 to enable BRG0.  */
-                usc_OutReg( info, HCR, (u16)((usc_InReg( info, HCR ) & ~BIT1) | BIT0) );
-
-                /* Input/Output Control Reg, <2..0> = 100, Drive RxC pin with BRG0 */
-                usc_OutReg(info, IOCR, (u16)((usc_InReg(info, IOCR) & 0xfff8) | 0x0004));
-
-                /* set Internal Data loopback mode */
-                info->loopback_bits = 0x300;
-                outw( 0x0300, info->io_base + CCAR );
-        } else {
-                /* enable external TXD output */
-                usc_OutReg(info,IOCR,usc_InReg(info,IOCR) & ~(BIT7+BIT6));
-        
-                /* clear Internal Data loopback mode */
-                info->loopback_bits = 0;
-                outw( 0,info->io_base + CCAR );
-        }
-        
-}       /* end of usc_enable_loopback() */
-
-/* usc_enable_aux_clock()
- *
- * Enabled the AUX clock output at the specified frequency.
- *
- * Arguments:
- *
- *      info            pointer to device extension
- *      data_rate       data rate of clock in bits per second
- *                      A data rate of 0 disables the AUX clock.
- *
- * Return Value:        None
- */
-static void usc_enable_aux_clock( struct mgsl_struct *info, u32 data_rate )
-{
-        u32 XtalSpeed;
-        u16 Tc;
-
-        if ( data_rate ) {
-                if ( info->bus_type == MGSL_BUS_TYPE_PCI )
-                        XtalSpeed = 11059200;
-                else
-                        XtalSpeed = 14745600;
-
-
-                /* Tc = (Xtal/Speed) - 1 */
-                /* If twice the remainder of (Xtal/Speed) is greater than Speed */
-                /* then rounding up gives a more precise time constant. Instead */
-                /* of rounding up and then subtracting 1 we just don't subtract */
-                /* the one in this case. */
-
-
-                Tc = (u16)(XtalSpeed/data_rate);
-                if ( !(((XtalSpeed % data_rate) * 2) / data_rate) )
-                        Tc--;
-
-                /* Write 16-bit Time Constant for BRG0 */
-                usc_OutReg( info, TC0R, Tc );
-
-                /*
-                 * Hardware Configuration Register (HCR)
-                 * Clear Bit 1, BRG0 mode = Continuous
-                 * Set Bit 0 to enable BRG0.
-                 */
-
-                usc_OutReg( info, HCR, (u16)((usc_InReg( info, HCR ) & ~BIT1) | BIT0) );
-
-                /* Input/Output Control Reg, <2..0> = 100, Drive RxC pin with BRG0 */
-                usc_OutReg( info, IOCR, (u16)((usc_InReg(info, IOCR) & 0xfff8) | 0x0004) );
-        } else {
-                /* data rate == 0 so turn off BRG0 */
-                usc_OutReg( info, HCR, (u16)(usc_InReg( info, HCR ) & ~BIT0) );
-        }
-
-}       /* end of usc_enable_aux_clock() */
-
-/*
- *
- * usc_process_rxoverrun_sync()
- *
- *              This function processes a receive overrun by resetting the
- *              receive DMA buffers and issuing a Purge Rx FIFO command
- *              to allow the receiver to continue receiving.
- *
- * Arguments:
- *
- *      info            pointer to device extension
- *
- * Return Value: None
- */
-static void usc_process_rxoverrun_sync( struct mgsl_struct *info )
-{
-        int start_index;
-        int end_index;
-        int frame_start_index;
-        bool start_of_frame_found = false;
-        bool end_of_frame_found = false;
-        bool reprogram_dma = false;
-
-        DMABUFFERENTRY *buffer_list = info->rx_buffer_list;
-        u32 phys_addr;
-
-        usc_DmaCmd( info, DmaCmd_PauseRxChannel );
-        usc_RCmd( info, RCmd_EnterHuntmode );
-        usc_RTCmd( info, RTCmd_PurgeRxFifo );
-
-        /* CurrentRxBuffer points to the 1st buffer of the next */
-        /* possibly available receive frame. */
-        
-        frame_start_index = start_index = end_index = info->current_rx_buffer;
-
-        /* Search for an unfinished string of buffers. This means */
-        /* that a receive frame started (at least one buffer with */
-        /* count set to zero) but there is no terminiting buffer */
-        /* (status set to non-zero). */
-
-        while( !buffer_list[end_index].count )
-        {
-                /* Count field has been reset to zero by 16C32. */
-                /* This buffer is currently in use. */
-
-                if ( !start_of_frame_found )
-                {
-                        start_of_frame_found = true;
-                        frame_start_index = end_index;
-                        end_of_frame_found = false;
-                }
-
-                if ( buffer_list[end_index].status )
-                {
-                        /* Status field has been set by 16C32. */
-                        /* This is the last buffer of a received frame. */
-
-                        /* We want to leave the buffers for this frame intact. */
-                        /* Move on to next possible frame. */
-
-                        start_of_frame_found = false;
-                        end_of_frame_found = true;
-                }
-
-                /* advance to next buffer entry in linked list */
-                end_index++;
-                if ( end_index == info->rx_buffer_count )
-                        end_index = 0;
-
-                if ( start_index == end_index )
-                {
-                        /* The entire list has been searched with all Counts == 0 and */
-                        /* all Status == 0. The receive buffers are */
-                        /* completely screwed, reset all receive buffers! */
-                        mgsl_reset_rx_dma_buffers( info );
-                        frame_start_index = 0;
-                        start_of_frame_found = false;
-                        reprogram_dma = true;
-                        break;
-                }
-        }
-
-        if ( start_of_frame_found && !end_of_frame_found )
-        {
-                /* There is an unfinished string of receive DMA buffers */
-                /* as a result of the receiver overrun. */
-
-                /* Reset the buffers for the unfinished frame */
-                /* and reprogram the receive DMA controller to start */
-                /* at the 1st buffer of unfinished frame. */
-
-                start_index = frame_start_index;
-
-                do
-                {
-                        *((unsigned long *)&(info->rx_buffer_list[start_index++].count)) = DMABUFFERSIZE;
-
-                        /* Adjust index for wrap around. */
-                        if ( start_index == info->rx_buffer_count )
-                                start_index = 0;
-
-                } while( start_index != end_index );
-
-                reprogram_dma = true;
-        }
-
-        if ( reprogram_dma )
-        {
-                usc_UnlatchRxstatusBits(info,RXSTATUS_ALL);
-                usc_ClearIrqPendingBits(info, RECEIVE_DATA|RECEIVE_STATUS);
-                usc_UnlatchRxstatusBits(info, RECEIVE_DATA|RECEIVE_STATUS);
-                
-                usc_EnableReceiver(info,DISABLE_UNCONDITIONAL);
-                
-                /* This empties the receive FIFO and loads the RCC with RCLR */
-                usc_OutReg( info, CCSR, (u16)(usc_InReg(info,CCSR) | BIT13) );
-
-                /* program 16C32 with physical address of 1st DMA buffer entry */
-                phys_addr = info->rx_buffer_list[frame_start_index].phys_entry;
-                usc_OutDmaReg( info, NRARL, (u16)phys_addr );
-                usc_OutDmaReg( info, NRARU, (u16)(phys_addr >> 16) );
-
-                usc_UnlatchRxstatusBits( info, RXSTATUS_ALL );
-                usc_ClearIrqPendingBits( info, RECEIVE_DATA + RECEIVE_STATUS );
-                usc_EnableInterrupts( info, RECEIVE_STATUS );
-
-                /* 1. Arm End of Buffer (EOB) Receive DMA Interrupt (BIT2 of RDIAR) */
-                /* 2. Enable Receive DMA Interrupts (BIT1 of DICR) */
-
-                usc_OutDmaReg( info, RDIAR, BIT3 + BIT2 );
-                usc_OutDmaReg( info, DICR, (u16)(usc_InDmaReg(info,DICR) | BIT1) );
-                usc_DmaCmd( info, DmaCmd_InitRxChannel );
-                if ( info->params.flags & HDLC_FLAG_AUTO_DCD )
-                        usc_EnableReceiver(info,ENABLE_AUTO_DCD);
-                else
-                        usc_EnableReceiver(info,ENABLE_UNCONDITIONAL);
-        }
-        else
-        {
-                /* This empties the receive FIFO and loads the RCC with RCLR */
-                usc_OutReg( info, CCSR, (u16)(usc_InReg(info,CCSR) | BIT13) );
-                usc_RTCmd( info, RTCmd_PurgeRxFifo );
-        }
-
-}       /* end of usc_process_rxoverrun_sync() */
-
-/* usc_stop_receiver()
- *
- *      Disable USC receiver
- *
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void usc_stop_receiver( struct mgsl_struct *info )
-{
-        if (debug_level >= DEBUG_LEVEL_ISR)
-                printk("%s(%d):usc_stop_receiver(%s)\n",
-                         __FILE__,__LINE__, info->device_name );
-                         
-        /* Disable receive DMA channel. */
-        /* This also disables receive DMA channel interrupts */
-        usc_DmaCmd( info, DmaCmd_ResetRxChannel );
-
-        usc_UnlatchRxstatusBits( info, RXSTATUS_ALL );
-        usc_ClearIrqPendingBits( info, RECEIVE_DATA + RECEIVE_STATUS );
-        usc_DisableInterrupts( info, RECEIVE_DATA + RECEIVE_STATUS );
-
-        usc_EnableReceiver(info,DISABLE_UNCONDITIONAL);
-
-        /* This empties the receive FIFO and loads the RCC with RCLR */
-        usc_OutReg( info, CCSR, (u16)(usc_InReg(info,CCSR) | BIT13) );
-        usc_RTCmd( info, RTCmd_PurgeRxFifo );
-
-        info->rx_enabled = false;
-        info->rx_overflow = false;
-        info->rx_rcc_underrun = false;
-        
-}       /* end of stop_receiver() */
-
-/* usc_start_receiver()
- *
- *      Enable the USC receiver 
- *
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void usc_start_receiver( struct mgsl_struct *info )
-{
-        u32 phys_addr;
-        
-        if (debug_level >= DEBUG_LEVEL_ISR)
-                printk("%s(%d):usc_start_receiver(%s)\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        mgsl_reset_rx_dma_buffers( info );
-        usc_stop_receiver( info );
-
-        usc_OutReg( info, CCSR, (u16)(usc_InReg(info,CCSR) | BIT13) );
-        usc_RTCmd( info, RTCmd_PurgeRxFifo );
-
-        if ( info->params.mode == MGSL_MODE_HDLC ||
-                info->params.mode == MGSL_MODE_RAW ) {
-                /* DMA mode Transfers */
-                /* Program the DMA controller. */
-                /* Enable the DMA controller end of buffer interrupt. */
-
-                /* program 16C32 with physical address of 1st DMA buffer entry */
-                phys_addr = info->rx_buffer_list[0].phys_entry;
-                usc_OutDmaReg( info, NRARL, (u16)phys_addr );
-                usc_OutDmaReg( info, NRARU, (u16)(phys_addr >> 16) );
-
-                usc_UnlatchRxstatusBits( info, RXSTATUS_ALL );
-                usc_ClearIrqPendingBits( info, RECEIVE_DATA + RECEIVE_STATUS );
-                usc_EnableInterrupts( info, RECEIVE_STATUS );
-
-                /* 1. Arm End of Buffer (EOB) Receive DMA Interrupt (BIT2 of RDIAR) */
-                /* 2. Enable Receive DMA Interrupts (BIT1 of DICR) */
-
-                usc_OutDmaReg( info, RDIAR, BIT3 + BIT2 );
-                usc_OutDmaReg( info, DICR, (u16)(usc_InDmaReg(info,DICR) | BIT1) );
-                usc_DmaCmd( info, DmaCmd_InitRxChannel );
-                if ( info->params.flags & HDLC_FLAG_AUTO_DCD )
-                        usc_EnableReceiver(info,ENABLE_AUTO_DCD);
-                else
-                        usc_EnableReceiver(info,ENABLE_UNCONDITIONAL);
-        } else {
-                usc_UnlatchRxstatusBits(info, RXSTATUS_ALL);
-                usc_ClearIrqPendingBits(info, RECEIVE_DATA + RECEIVE_STATUS);
-                usc_EnableInterrupts(info, RECEIVE_DATA);
-
-                usc_RTCmd( info, RTCmd_PurgeRxFifo );
-                usc_RCmd( info, RCmd_EnterHuntmode );
-
-                usc_EnableReceiver(info,ENABLE_UNCONDITIONAL);
-        }
-
-        usc_OutReg( info, CCSR, 0x1020 );
-
-        info->rx_enabled = true;
-
-}       /* end of usc_start_receiver() */
-
-/* usc_start_transmitter()
- *
- *      Enable the USC transmitter and send a transmit frame if
- *      one is loaded in the DMA buffers.
- *
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void usc_start_transmitter( struct mgsl_struct *info )
-{
-        u32 phys_addr;
-        unsigned int FrameSize;
-
-        if (debug_level >= DEBUG_LEVEL_ISR)
-                printk("%s(%d):usc_start_transmitter(%s)\n",
-                         __FILE__,__LINE__, info->device_name );
-                         
-        if ( info->xmit_cnt ) {
-
-                /* If auto RTS enabled and RTS is inactive, then assert */
-                /* RTS and set a flag indicating that the driver should */
-                /* negate RTS when the transmission completes. */
-
-                info->drop_rts_on_tx_done = false;
-
-                if ( info->params.flags & HDLC_FLAG_AUTO_RTS ) {
-                        usc_get_serial_signals( info );
-                        if ( !(info->serial_signals & SerialSignal_RTS) ) {
-                                info->serial_signals |= SerialSignal_RTS;
-                                usc_set_serial_signals( info );
-                                info->drop_rts_on_tx_done = true;
-                        }
-                }
-
-
-                if ( info->params.mode == MGSL_MODE_ASYNC ) {
-                        if ( !info->tx_active ) {
-                                usc_UnlatchTxstatusBits(info, TXSTATUS_ALL);
-                                usc_ClearIrqPendingBits(info, TRANSMIT_STATUS + TRANSMIT_DATA);
-                                usc_EnableInterrupts(info, TRANSMIT_DATA);
-                                usc_load_txfifo(info);
-                        }
-                } else {
-                        /* Disable transmit DMA controller while programming. */
-                        usc_DmaCmd( info, DmaCmd_ResetTxChannel );
-                        
-                        /* Transmit DMA buffer is loaded, so program USC */
-                        /* to send the frame contained in the buffers.   */
-
-                        FrameSize = info->tx_buffer_list[info->start_tx_dma_buffer].rcc;
-
-                        /* if operating in Raw sync mode, reset the rcc component
-                         * of the tx dma buffer entry, otherwise, the serial controller
-                         * will send a closing sync char after this count.
-                         */
-                        if ( info->params.mode == MGSL_MODE_RAW )
-                                info->tx_buffer_list[info->start_tx_dma_buffer].rcc = 0;
-
-                        /* Program the Transmit Character Length Register (TCLR) */
-                        /* and clear FIFO (TCC is loaded with TCLR on FIFO clear) */
-                        usc_OutReg( info, TCLR, (u16)FrameSize );
-
-                        usc_RTCmd( info, RTCmd_PurgeTxFifo );
-
-                        /* Program the address of the 1st DMA Buffer Entry in linked list */
-                        phys_addr = info->tx_buffer_list[info->start_tx_dma_buffer].phys_entry;
-                        usc_OutDmaReg( info, NTARL, (u16)phys_addr );
-                        usc_OutDmaReg( info, NTARU, (u16)(phys_addr >> 16) );
-
-                        usc_UnlatchTxstatusBits( info, TXSTATUS_ALL );
-                        usc_ClearIrqPendingBits( info, TRANSMIT_STATUS );
-                        usc_EnableInterrupts( info, TRANSMIT_STATUS );
-
-                        if ( info->params.mode == MGSL_MODE_RAW &&
-                                        info->num_tx_dma_buffers > 1 ) {
-                           /* When running external sync mode, attempt to 'stream' transmit  */
-                           /* by filling tx dma buffers as they become available. To do this */
-                           /* we need to enable Tx DMA EOB Status interrupts :               */
-                           /*                                                                */
-                           /* 1. Arm End of Buffer (EOB) Transmit DMA Interrupt (BIT2 of TDIAR) */
-                           /* 2. Enable Transmit DMA Interrupts (BIT0 of DICR) */
-
-                           usc_OutDmaReg( info, TDIAR, BIT2|BIT3 );
-                           usc_OutDmaReg( info, DICR, (u16)(usc_InDmaReg(info,DICR) | BIT0) );
-                        }
-
-                        /* Initialize Transmit DMA Channel */
-                        usc_DmaCmd( info, DmaCmd_InitTxChannel );
-                        
-                        usc_TCmd( info, TCmd_SendFrame );
-                        
-                        mod_timer(&info->tx_timer, jiffies +
-                                        msecs_to_jiffies(5000));
-                }
-                info->tx_active = true;
-        }
-
-        if ( !info->tx_enabled ) {
-                info->tx_enabled = true;
-                if ( info->params.flags & HDLC_FLAG_AUTO_CTS )
-                        usc_EnableTransmitter(info,ENABLE_AUTO_CTS);
-                else
-                        usc_EnableTransmitter(info,ENABLE_UNCONDITIONAL);
-        }
-
-}       /* end of usc_start_transmitter() */
-
-/* usc_stop_transmitter()
- *
- *      Stops the transmitter and DMA
- *
- * Arguments:           info    pointer to device isntance data
- * Return Value:        None
- */
-static void usc_stop_transmitter( struct mgsl_struct *info )
-{
-        if (debug_level >= DEBUG_LEVEL_ISR)
-                printk("%s(%d):usc_stop_transmitter(%s)\n",
-                         __FILE__,__LINE__, info->device_name );
-                         
-        del_timer(&info->tx_timer);     
-                         
-        usc_UnlatchTxstatusBits( info, TXSTATUS_ALL );
-        usc_ClearIrqPendingBits( info, TRANSMIT_STATUS + TRANSMIT_DATA );
-        usc_DisableInterrupts( info, TRANSMIT_STATUS + TRANSMIT_DATA );
-
-        usc_EnableTransmitter(info,DISABLE_UNCONDITIONAL);
-        usc_DmaCmd( info, DmaCmd_ResetTxChannel );
-        usc_RTCmd( info, RTCmd_PurgeTxFifo );
-
-        info->tx_enabled = false;
-        info->tx_active = false;
-
-}       /* end of usc_stop_transmitter() */
-
-/* usc_load_txfifo()
- *
- *      Fill the transmit FIFO until the FIFO is full or
- *      there is no more data to load.
- *
- * Arguments:           info    pointer to device extension (instance data)
- * Return Value:        None
- */
-static void usc_load_txfifo( struct mgsl_struct *info )
-{
-        int Fifocount;
-        u8 TwoBytes[2];
-        
-        if ( !info->xmit_cnt && !info->x_char )
-                return; 
-                
-        /* Select transmit FIFO status readback in TICR */
-        usc_TCmd( info, TCmd_SelectTicrTxFifostatus );
-
-        /* load the Transmit FIFO until FIFOs full or all data sent */
-
-        while( (Fifocount = usc_InReg(info, TICR) >> 8) && info->xmit_cnt ) {
-                /* there is more space in the transmit FIFO and */
-                /* there is more data in transmit buffer */
-
-                if ( (info->xmit_cnt > 1) && (Fifocount > 1) && !info->x_char ) {
-                        /* write a 16-bit word from transmit buffer to 16C32 */
-                                
-                        TwoBytes[0] = info->xmit_buf[info->xmit_tail++];
-                        info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);
-                        TwoBytes[1] = info->xmit_buf[info->xmit_tail++];
-                        info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);
-                        
-                        outw( *((u16 *)TwoBytes), info->io_base + DATAREG);
-                                
-                        info->xmit_cnt -= 2;
-                        info->icount.tx += 2;
-                } else {
-                        /* only 1 byte left to transmit or 1 FIFO slot left */
-                        
-                        outw( (inw( info->io_base + CCAR) & 0x0780) | (TDR+LSBONLY),
-                                info->io_base + CCAR );
-                        
-                        if (info->x_char) {
-                                /* transmit pending high priority char */
-                                outw( info->x_char,info->io_base + CCAR );
-                                info->x_char = 0;
-                        } else {
-                                outw( info->xmit_buf[info->xmit_tail++],info->io_base + CCAR );
-                                info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);
-                                info->xmit_cnt--;
-                        }
-                        info->icount.tx++;
-                }
-        }
-
-}       /* end of usc_load_txfifo() */
-
-/* usc_reset()
- *
- *      Reset the adapter to a known state and prepare it for further use.
- *
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void usc_reset( struct mgsl_struct *info )
-{
-        if ( info->bus_type == MGSL_BUS_TYPE_PCI ) {
-                int i;
-                u32 readval;
-
-                /* Set BIT30 of Misc Control Register */
-                /* (Local Control Register 0x50) to force reset of USC. */
-
-                volatile u32 *MiscCtrl = (u32 *)(info->lcr_base + 0x50);
-                u32 *LCR0BRDR = (u32 *)(info->lcr_base + 0x28);
-
-                info->misc_ctrl_value |= BIT30;
-                *MiscCtrl = info->misc_ctrl_value;
-
-                /*
-                 * Force at least 170ns delay before clearing 
-                 * reset bit. Each read from LCR takes at least 
-                 * 30ns so 10 times for 300ns to be safe.
-                 */
-                for(i=0;i<10;i++)
-                        readval = *MiscCtrl;
-
-                info->misc_ctrl_value &= ~BIT30;
-                *MiscCtrl = info->misc_ctrl_value;
-
-                *LCR0BRDR = BUS_DESCRIPTOR(
-                        1,              // Write Strobe Hold (0-3)
-                        2,              // Write Strobe Delay (0-3)
-                        2,              // Read Strobe Delay  (0-3)
-                        0,              // NWDD (Write data-data) (0-3)
-                        4,              // NWAD (Write Addr-data) (0-31)
-                        0,              // NXDA (Read/Write Data-Addr) (0-3)
-                        0,              // NRDD (Read Data-Data) (0-3)
-                        5               // NRAD (Read Addr-Data) (0-31)
-                        );
-        } else {
-                /* do HW reset */
-                outb( 0,info->io_base + 8 );
-        }
-
-        info->mbre_bit = 0;
-        info->loopback_bits = 0;
-        info->usc_idle_mode = 0;
-
-        /*
-         * Program the Bus Configuration Register (BCR)
-         *
-         * <15>         0       Don't use separate address
-         * <14..6>      0       reserved
-         * <5..4>       00      IAckmode = Default, don't care
-         * <3>          1       Bus Request Totem Pole output
-         * <2>          1       Use 16 Bit data bus
-         * <1>          0       IRQ Totem Pole output
-         * <0>          0       Don't Shift Right Addr
-         *
-         * 0000 0000 0000 1100 = 0x000c
-         *
-         * By writing to io_base + SDPIN the Wait/Ack pin is
-         * programmed to work as a Wait pin.
-         */
-        
-        outw( 0x000c,info->io_base + SDPIN );
-
-
-        outw( 0,info->io_base );
-        outw( 0,info->io_base + CCAR );
-
-        /* select little endian byte ordering */
-        usc_RTCmd( info, RTCmd_SelectLittleEndian );
-
-
-        /* Port Control Register (PCR)
-         *
-         * <15..14>     11      Port 7 is Output (~DMAEN, Bit 14 : 0 = Enabled)
-         * <13..12>     11      Port 6 is Output (~INTEN, Bit 12 : 0 = Enabled)
-         * <11..10>     00      Port 5 is Input (No Connect, Don't Care)
-         * <9..8>       00      Port 4 is Input (No Connect, Don't Care)
-         * <7..6>       11      Port 3 is Output (~RTS, Bit 6 : 0 = Enabled )
-         * <5..4>       11      Port 2 is Output (~DTR, Bit 4 : 0 = Enabled )
-         * <3..2>       01      Port 1 is Input (Dedicated RxC)
-         * <1..0>       01      Port 0 is Input (Dedicated TxC)
-         *
-         *      1111 0000 1111 0101 = 0xf0f5
-         */
-
-        usc_OutReg( info, PCR, 0xf0f5 );
-
-
-        /*
-         * Input/Output Control Register
-         *
-         * <15..14>     00      CTS is active low input
-         * <13..12>     00      DCD is active low input
-         * <11..10>     00      TxREQ pin is input (DSR)
-         * <9..8>       00      RxREQ pin is input (RI)
-         * <7..6>       00      TxD is output (Transmit Data)
-         * <5..3>       000     TxC Pin in Input (14.7456MHz Clock)
-         * <2..0>       100     RxC is Output (drive with BRG0)
-         *
-         *      0000 0000 0000 0100 = 0x0004
-         */
-
-        usc_OutReg( info, IOCR, 0x0004 );
-
-}       /* end of usc_reset() */
-
-/* usc_set_async_mode()
- *
- *      Program adapter for asynchronous communications.
- *
- * Arguments:           info            pointer to device instance data
- * Return Value:        None
- */
-static void usc_set_async_mode( struct mgsl_struct *info )
-{
-        u16 RegValue;
-
-        /* disable interrupts while programming USC */
-        usc_DisableMasterIrqBit( info );
-
-        outw( 0, info->io_base );                       /* clear Master Bus Enable (DCAR) */
-        usc_DmaCmd( info, DmaCmd_ResetAllChannels );    /* disable both DMA channels */
-
-        usc_loopback_frame( info );
-
-        /* Channel mode Register (CMR)
-         *
-         * <15..14>     00      Tx Sub modes, 00 = 1 Stop Bit
-         * <13..12>     00                    00 = 16X Clock
-         * <11..8>      0000    Transmitter mode = Asynchronous
-         * <7..6>       00      reserved?
-         * <5..4>       00      Rx Sub modes, 00 = 16X Clock
-         * <3..0>       0000    Receiver mode = Asynchronous
-         *
-         * 0000 0000 0000 0000 = 0x0
-         */
-
-        RegValue = 0;
-        if ( info->params.stop_bits != 1 )
-                RegValue |= BIT14;
-        usc_OutReg( info, CMR, RegValue );
-
-        
-        /* Receiver mode Register (RMR)
-         *
-         * <15..13>     000     encoding = None
-         * <12..08>     00000   reserved (Sync Only)
-         * <7..6>       00      Even parity
-         * <5>          0       parity disabled
-         * <4..2>       000     Receive Char Length = 8 bits
-         * <1..0>       00      Disable Receiver
-         *
-         * 0000 0000 0000 0000 = 0x0
-         */
-
-        RegValue = 0;
-
-        if ( info->params.data_bits != 8 )
-                RegValue |= BIT4+BIT3+BIT2;
-
-        if ( info->params.parity != ASYNC_PARITY_NONE ) {
-                RegValue |= BIT5;
-                if ( info->params.parity != ASYNC_PARITY_ODD )
-                        RegValue |= BIT6;
-        }
-
-        usc_OutReg( info, RMR, RegValue );
-
-
-        /* Set IRQ trigger level */
-
-        usc_RCmd( info, RCmd_SelectRicrIntLevel );
-
-        
-        /* Receive Interrupt Control Register (RICR)
-         *
-         * <15..8>      ?               RxFIFO IRQ Request Level
-         *
-         * Note: For async mode the receive FIFO level must be set
-         * to 0 to avoid the situation where the FIFO contains fewer bytes
-         * than the trigger level and no more data is expected.
-         *
-         * <7>          0               Exited Hunt IA (Interrupt Arm)
-         * <6>          0               Idle Received IA
-         * <5>          0               Break/Abort IA
-         * <4>          0               Rx Bound IA
-         * <3>          0               Queued status reflects oldest byte in FIFO
-         * <2>          0               Abort/PE IA
-         * <1>          0               Rx Overrun IA
-         * <0>          0               Select TC0 value for readback
-         *
-         * 0000 0000 0100 0000 = 0x0000 + (FIFOLEVEL in MSB)
-         */
-        
-        usc_OutReg( info, RICR, 0x0000 );
-
-        usc_UnlatchRxstatusBits( info, RXSTATUS_ALL );
-        usc_ClearIrqPendingBits( info, RECEIVE_STATUS );
-
-        
-        /* Transmit mode Register (TMR)
-         *
-         * <15..13>     000     encoding = None
-         * <12..08>     00000   reserved (Sync Only)
-         * <7..6>       00      Transmit parity Even
-         * <5>          0       Transmit parity Disabled
-         * <4..2>       000     Tx Char Length = 8 bits
-         * <1..0>       00      Disable Transmitter
-         *
-         * 0000 0000 0000 0000 = 0x0
-         */
-
-        RegValue = 0;
-
-        if ( info->params.data_bits != 8 )
-                RegValue |= BIT4+BIT3+BIT2;
-
-        if ( info->params.parity != ASYNC_PARITY_NONE ) {
-                RegValue |= BIT5;
-                if ( info->params.parity != ASYNC_PARITY_ODD )
-                        RegValue |= BIT6;
-        }
-
-        usc_OutReg( info, TMR, RegValue );
-
-        usc_set_txidle( info );
-
-
-        /* Set IRQ trigger level */
-
-        usc_TCmd( info, TCmd_SelectTicrIntLevel );
-
-        
-        /* Transmit Interrupt Control Register (TICR)
-         *
-         * <15..8>      ?       Transmit FIFO IRQ Level
-         * <7>          0       Present IA (Interrupt Arm)
-         * <6>          1       Idle Sent IA
-         * <5>          0       Abort Sent IA
-         * <4>          0       EOF/EOM Sent IA
-         * <3>          0       CRC Sent IA
-         * <2>          0       1 = Wait for SW Trigger to Start Frame
-         * <1>          0       Tx Underrun IA
-         * <0>          0       TC0 constant on read back
-         *
-         *      0000 0000 0100 0000 = 0x0040
-         */
-
-        usc_OutReg( info, TICR, 0x1f40 );
-
-        usc_UnlatchTxstatusBits( info, TXSTATUS_ALL );
-        usc_ClearIrqPendingBits( info, TRANSMIT_STATUS );
-
-        usc_enable_async_clock( info, info->params.data_rate );
-
-        
-        /* Channel Control/status Register (CCSR)
-         *
-         * <15>         X       RCC FIFO Overflow status (RO)
-         * <14>         X       RCC FIFO Not Empty status (RO)
-         * <13>         0       1 = Clear RCC FIFO (WO)
-         * <12>         X       DPLL in Sync status (RO)
-         * <11>         X       DPLL 2 Missed Clocks status (RO)
-         * <10>         X       DPLL 1 Missed Clock status (RO)
-         * <9..8>       00      DPLL Resync on rising and falling edges (RW)
-         * <7>          X       SDLC Loop On status (RO)
-         * <6>          X       SDLC Loop Send status (RO)
-         * <5>          1       Bypass counters for TxClk and RxClk (RW)
-         * <4..2>       000     Last Char of SDLC frame has 8 bits (RW)
-         * <1..0>       00      reserved
-         *
-         *      0000 0000 0010 0000 = 0x0020
-         */
-        
-        usc_OutReg( info, CCSR, 0x0020 );
-
-        usc_DisableInterrupts( info, TRANSMIT_STATUS + TRANSMIT_DATA +
-                              RECEIVE_DATA + RECEIVE_STATUS );
-
-        usc_ClearIrqPendingBits( info, TRANSMIT_STATUS + TRANSMIT_DATA +
-                                RECEIVE_DATA + RECEIVE_STATUS );
-
-        usc_EnableMasterIrqBit( info );
-
-        if (info->bus_type == MGSL_BUS_TYPE_ISA) {
-                /* Enable INTEN (Port 6, Bit12) */
-                /* This connects the IRQ request signal to the ISA bus */
-                usc_OutReg(info, PCR, (u16)((usc_InReg(info, PCR) | BIT13) & ~BIT12));
-        }
-
-        if (info->params.loopback) {
-                info->loopback_bits = 0x300;
-                outw(0x0300, info->io_base + CCAR);
-        }
-
-}       /* end of usc_set_async_mode() */
-
-/* usc_loopback_frame()
- *
- *      Loop back a small (2 byte) dummy SDLC frame.
- *      Interrupts and DMA are NOT used. The purpose of this is to
- *      clear any 'stale' status info left over from running in async mode.
- *
- *      The 16C32 shows the strange behaviour of marking the 1st
- *      received SDLC frame with a CRC error even when there is no
- *      CRC error. To get around this a small dummy from of 2 bytes
- *      is looped back when switching from async to sync mode.
- *
- * Arguments:           info            pointer to device instance data
- * Return Value:        None
- */
-static void usc_loopback_frame( struct mgsl_struct *info )
-{
-        int i;
-        unsigned long oldmode = info->params.mode;
-
-        info->params.mode = MGSL_MODE_HDLC;
-        
-        usc_DisableMasterIrqBit( info );
-
-        usc_set_sdlc_mode( info );
-        usc_enable_loopback( info, 1 );
-
-        /* Write 16-bit Time Constant for BRG0 */
-        usc_OutReg( info, TC0R, 0 );
-        
-        /* Channel Control Register (CCR)
-         *
-         * <15..14>     00      Don't use 32-bit Tx Control Blocks (TCBs)
-         * <13>         0       Trigger Tx on SW Command Disabled
-         * <12>         0       Flag Preamble Disabled
-         * <11..10>     00      Preamble Length = 8-Bits
-         * <9..8>       01      Preamble Pattern = flags
-         * <7..6>       10      Don't use 32-bit Rx status Blocks (RSBs)
-         * <5>          0       Trigger Rx on SW Command Disabled
-         * <4..0>       0       reserved
-         *
-         *      0000 0001 0000 0000 = 0x0100
-         */
-
-        usc_OutReg( info, CCR, 0x0100 );
-
-        /* SETUP RECEIVER */
-        usc_RTCmd( info, RTCmd_PurgeRxFifo );
-        usc_EnableReceiver(info,ENABLE_UNCONDITIONAL);
-
-        /* SETUP TRANSMITTER */
-        /* Program the Transmit Character Length Register (TCLR) */
-        /* and clear FIFO (TCC is loaded with TCLR on FIFO clear) */
-        usc_OutReg( info, TCLR, 2 );
-        usc_RTCmd( info, RTCmd_PurgeTxFifo );
-
-        /* unlatch Tx status bits, and start transmit channel. */
-        usc_UnlatchTxstatusBits(info,TXSTATUS_ALL);
-        outw(0,info->io_base + DATAREG);
-
-        /* ENABLE TRANSMITTER */
-        usc_TCmd( info, TCmd_SendFrame );
-        usc_EnableTransmitter(info,ENABLE_UNCONDITIONAL);
-                                                        
-        /* WAIT FOR RECEIVE COMPLETE */
-        for (i=0 ; i<1000 ; i++)
-                if (usc_InReg( info, RCSR ) & (BIT8 + BIT4 + BIT3 + BIT1))
-                        break;
-
-        /* clear Internal Data loopback mode */
-        usc_enable_loopback(info, 0);
-
-        usc_EnableMasterIrqBit(info);
-
-        info->params.mode = oldmode;
-
-}       /* end of usc_loopback_frame() */
-
-/* usc_set_sync_mode()  Programs the USC for SDLC communications.
- *
- * Arguments:           info    pointer to adapter info structure
- * Return Value:        None
- */
-static void usc_set_sync_mode( struct mgsl_struct *info )
-{
-        usc_loopback_frame( info );
-        usc_set_sdlc_mode( info );
-
-        if (info->bus_type == MGSL_BUS_TYPE_ISA) {
-                /* Enable INTEN (Port 6, Bit12) */
-                /* This connects the IRQ request signal to the ISA bus */
-                usc_OutReg(info, PCR, (u16)((usc_InReg(info, PCR) | BIT13) & ~BIT12));
-        }
-
-        usc_enable_aux_clock(info, info->params.clock_speed);
-
-        if (info->params.loopback)
-                usc_enable_loopback(info,1);
-
-}       /* end of mgsl_set_sync_mode() */
-
-/* usc_set_txidle()     Set the HDLC idle mode for the transmitter.
- *
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void usc_set_txidle( struct mgsl_struct *info )
-{
-        u16 usc_idle_mode = IDLEMODE_FLAGS;
-
-        /* Map API idle mode to USC register bits */
-
-        switch( info->idle_mode ){
-        case HDLC_TXIDLE_FLAGS:                 usc_idle_mode = IDLEMODE_FLAGS; break;
-        case HDLC_TXIDLE_ALT_ZEROS_ONES:        usc_idle_mode = IDLEMODE_ALT_ONE_ZERO; break;
-        case HDLC_TXIDLE_ZEROS:                 usc_idle_mode = IDLEMODE_ZERO; break;
-        case HDLC_TXIDLE_ONES:                  usc_idle_mode = IDLEMODE_ONE; break;
-        case HDLC_TXIDLE_ALT_MARK_SPACE:        usc_idle_mode = IDLEMODE_ALT_MARK_SPACE; break;
-        case HDLC_TXIDLE_SPACE:                 usc_idle_mode = IDLEMODE_SPACE; break;
-        case HDLC_TXIDLE_MARK:                  usc_idle_mode = IDLEMODE_MARK; break;
-        }
-
-        info->usc_idle_mode = usc_idle_mode;
-        //usc_OutReg(info, TCSR, usc_idle_mode);
-        info->tcsr_value &= ~IDLEMODE_MASK;     /* clear idle mode bits */
-        info->tcsr_value += usc_idle_mode;
-        usc_OutReg(info, TCSR, info->tcsr_value);
-
-        /*
-         * if SyncLink WAN adapter is running in external sync mode, the
-         * transmitter has been set to Monosync in order to try to mimic
-         * a true raw outbound bit stream. Monosync still sends an open/close
-         * sync char at the start/end of a frame. Try to match those sync
-         * patterns to the idle mode set here
-         */
-        if ( info->params.mode == MGSL_MODE_RAW ) {
-                unsigned char syncpat = 0;
-                switch( info->idle_mode ) {
-                case HDLC_TXIDLE_FLAGS:
-                        syncpat = 0x7e;
-                        break;
-                case HDLC_TXIDLE_ALT_ZEROS_ONES:
-                        syncpat = 0x55;
-                        break;
-                case HDLC_TXIDLE_ZEROS:
-                case HDLC_TXIDLE_SPACE:
-                        syncpat = 0x00;
-                        break;
-                case HDLC_TXIDLE_ONES:
-                case HDLC_TXIDLE_MARK:
-                        syncpat = 0xff;
-                        break;
-                case HDLC_TXIDLE_ALT_MARK_SPACE:
-                        syncpat = 0xaa;
-                        break;
-                }
-
-                usc_SetTransmitSyncChars(info,syncpat,syncpat);
-        }
-
-}       /* end of usc_set_txidle() */
-
-/* usc_get_serial_signals()
- *
- *      Query the adapter for the state of the V24 status (input) signals.
- *
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void usc_get_serial_signals( struct mgsl_struct *info )
-{
-        u16 status;
-
-        /* clear all serial signals except DTR and RTS */
-        info->serial_signals &= SerialSignal_DTR + SerialSignal_RTS;
-
-        /* Read the Misc Interrupt status Register (MISR) to get */
-        /* the V24 status signals. */
-
-        status = usc_InReg( info, MISR );
-
-        /* set serial signal bits to reflect MISR */
-
-        if ( status & MISCSTATUS_CTS )
-                info->serial_signals |= SerialSignal_CTS;
-
-        if ( status & MISCSTATUS_DCD )
-                info->serial_signals |= SerialSignal_DCD;
-
-        if ( status & MISCSTATUS_RI )
-                info->serial_signals |= SerialSignal_RI;
-
-        if ( status & MISCSTATUS_DSR )
-                info->serial_signals |= SerialSignal_DSR;
-
-}       /* end of usc_get_serial_signals() */
-
-/* usc_set_serial_signals()
- *
- *      Set the state of DTR and RTS based on contents of
- *      serial_signals member of device extension.
- *      
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void usc_set_serial_signals( struct mgsl_struct *info )
-{
-        u16 Control;
-        unsigned char V24Out = info->serial_signals;
-
-        /* get the current value of the Port Control Register (PCR) */
-
-        Control = usc_InReg( info, PCR );
-
-        if ( V24Out & SerialSignal_RTS )
-                Control &= ~(BIT6);
-        else
-                Control |= BIT6;
-
-        if ( V24Out & SerialSignal_DTR )
-                Control &= ~(BIT4);
-        else
-                Control |= BIT4;
-
-        usc_OutReg( info, PCR, Control );
-
-}       /* end of usc_set_serial_signals() */
-
-/* usc_enable_async_clock()
- *
- *      Enable the async clock at the specified frequency.
- *
- * Arguments:           info            pointer to device instance data
- *                      data_rate       data rate of clock in bps
- *                                      0 disables the AUX clock.
- * Return Value:        None
- */
-static void usc_enable_async_clock( struct mgsl_struct *info, u32 data_rate )
-{
-        if ( data_rate )        {
-                /*
-                 * Clock mode Control Register (CMCR)
-                 * 
-                 * <15..14>     00      counter 1 Disabled
-                 * <13..12>     00      counter 0 Disabled
-                 * <11..10>     11      BRG1 Input is TxC Pin
-                 * <9..8>       11      BRG0 Input is TxC Pin
-                 * <7..6>       01      DPLL Input is BRG1 Output
-                 * <5..3>       100     TxCLK comes from BRG0
-                 * <2..0>       100     RxCLK comes from BRG0
-                 *
-                 * 0000 1111 0110 0100 = 0x0f64
-                 */
-                
-                usc_OutReg( info, CMCR, 0x0f64 );
-
-
-                /*
-                 * Write 16-bit Time Constant for BRG0
-                 * Time Constant = (ClkSpeed / data_rate) - 1
-                 * ClkSpeed = 921600 (ISA), 691200 (PCI)
-                 */
-
-                if ( info->bus_type == MGSL_BUS_TYPE_PCI )
-                        usc_OutReg( info, TC0R, (u16)((691200/data_rate) - 1) );
-                else
-                        usc_OutReg( info, TC0R, (u16)((921600/data_rate) - 1) );
-
-                
-                /*
-                 * Hardware Configuration Register (HCR)
-                 * Clear Bit 1, BRG0 mode = Continuous
-                 * Set Bit 0 to enable BRG0.
-                 */
-
-                usc_OutReg( info, HCR,
-                            (u16)((usc_InReg( info, HCR ) & ~BIT1) | BIT0) );
-
-
-                /* Input/Output Control Reg, <2..0> = 100, Drive RxC pin with BRG0 */
-
-                usc_OutReg( info, IOCR,
-                            (u16)((usc_InReg(info, IOCR) & 0xfff8) | 0x0004) );
-        } else {
-                /* data rate == 0 so turn off BRG0 */
-                usc_OutReg( info, HCR, (u16)(usc_InReg( info, HCR ) & ~BIT0) );
-        }
-
-}       /* end of usc_enable_async_clock() */
-
-/*
- * Buffer Structures:
- *
- * Normal memory access uses virtual addresses that can make discontiguous
- * physical memory pages appear to be contiguous in the virtual address
- * space (the processors memory mapping handles the conversions).
- *
- * DMA transfers require physically contiguous memory. This is because
- * the DMA system controller and DMA bus masters deal with memory using
- * only physical addresses.
- *
- * This causes a problem under Windows NT when large DMA buffers are
- * needed. Fragmentation of the nonpaged pool prevents allocations of
- * physically contiguous buffers larger than the PAGE_SIZE.
- *
- * However the 16C32 supports Bus Master Scatter/Gather DMA which
- * allows DMA transfers to physically discontiguous buffers. Information
- * about each data transfer buffer is contained in a memory structure
- * called a 'buffer entry'. A list of buffer entries is maintained
- * to track and control the use of the data transfer buffers.
- *
- * To support this strategy we will allocate sufficient PAGE_SIZE
- * contiguous memory buffers to allow for the total required buffer
- * space.
- *
- * The 16C32 accesses the list of buffer entries using Bus Master
- * DMA. Control information is read from the buffer entries by the
- * 16C32 to control data transfers. status information is written to
- * the buffer entries by the 16C32 to indicate the status of completed
- * transfers.
- *
- * The CPU writes control information to the buffer entries to control
- * the 16C32 and reads status information from the buffer entries to
- * determine information about received and transmitted frames.
- *
- * Because the CPU and 16C32 (adapter) both need simultaneous access
- * to the buffer entries, the buffer entry memory is allocated with
- * HalAllocateCommonBuffer(). This restricts the size of the buffer
- * entry list to PAGE_SIZE.
- *
- * The actual data buffers on the other hand will only be accessed
- * by the CPU or the adapter but not by both simultaneously. This allows
- * Scatter/Gather packet based DMA procedures for using physically
- * discontiguous pages.
- */
-
-/*
- * mgsl_reset_tx_dma_buffers()
- *
- *      Set the count for all transmit buffers to 0 to indicate the
- *      buffer is available for use and set the current buffer to the
- *      first buffer. This effectively makes all buffers free and
- *      discards any data in buffers.
- *
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_reset_tx_dma_buffers( struct mgsl_struct *info )
-{
-        unsigned int i;
-
-        for ( i = 0; i < info->tx_buffer_count; i++ ) {
-                *((unsigned long *)&(info->tx_buffer_list[i].count)) = 0;
-        }
-
-        info->current_tx_buffer = 0;
-        info->start_tx_dma_buffer = 0;
-        info->tx_dma_buffers_used = 0;
-
-        info->get_tx_holding_index = 0;
-        info->put_tx_holding_index = 0;
-        info->tx_holding_count = 0;
-
-}       /* end of mgsl_reset_tx_dma_buffers() */
-
-/*
- * num_free_tx_dma_buffers()
- *
- *      returns the number of free tx dma buffers available
- *
- * Arguments:           info    pointer to device instance data
- * Return Value:        number of free tx dma buffers
- */
-static int num_free_tx_dma_buffers(struct mgsl_struct *info)
-{
-        return info->tx_buffer_count - info->tx_dma_buffers_used;
-}
-
-/*
- * mgsl_reset_rx_dma_buffers()
- * 
- *      Set the count for all receive buffers to DMABUFFERSIZE
- *      and set the current buffer to the first buffer. This effectively
- *      makes all buffers free and discards any data in buffers.
- * 
- * Arguments:           info    pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_reset_rx_dma_buffers( struct mgsl_struct *info )
-{
-        unsigned int i;
-
-        for ( i = 0; i < info->rx_buffer_count; i++ ) {
-                *((unsigned long *)&(info->rx_buffer_list[i].count)) = DMABUFFERSIZE;
-//              info->rx_buffer_list[i].count = DMABUFFERSIZE;
-//              info->rx_buffer_list[i].status = 0;
-        }
-
-        info->current_rx_buffer = 0;
-
-}       /* end of mgsl_reset_rx_dma_buffers() */
-
-/*
- * mgsl_free_rx_frame_buffers()
- * 
- *      Free the receive buffers used by a received SDLC
- *      frame such that the buffers can be reused.
- * 
- * Arguments:
- * 
- *      info                    pointer to device instance data
- *      StartIndex              index of 1st receive buffer of frame
- *      EndIndex                index of last receive buffer of frame
- * 
- * Return Value:        None
- */
-static void mgsl_free_rx_frame_buffers( struct mgsl_struct *info, unsigned int StartIndex, unsigned int EndIndex )
-{
-        bool Done = false;
-        DMABUFFERENTRY *pBufEntry;
-        unsigned int Index;
-
-        /* Starting with 1st buffer entry of the frame clear the status */
-        /* field and set the count field to DMA Buffer Size. */
-
-        Index = StartIndex;
-
-        while( !Done ) {
-                pBufEntry = &(info->rx_buffer_list[Index]);
-
-                if ( Index == EndIndex ) {
-                        /* This is the last buffer of the frame! */
-                        Done = true;
-                }
-
-                /* reset current buffer for reuse */
-//              pBufEntry->status = 0;
-//              pBufEntry->count = DMABUFFERSIZE;
-                *((unsigned long *)&(pBufEntry->count)) = DMABUFFERSIZE;
-
-                /* advance to next buffer entry in linked list */
-                Index++;
-                if ( Index == info->rx_buffer_count )
-                        Index = 0;
-        }
-
-        /* set current buffer to next buffer after last buffer of frame */
-        info->current_rx_buffer = Index;
-
-}       /* end of free_rx_frame_buffers() */
-
-/* mgsl_get_rx_frame()
- * 
- *      This function attempts to return a received SDLC frame from the
- *      receive DMA buffers. Only frames received without errors are returned.
- *
- * Arguments:           info    pointer to device extension
- * Return Value:        true if frame returned, otherwise false
- */
-static bool mgsl_get_rx_frame(struct mgsl_struct *info)
-{
-        unsigned int StartIndex, EndIndex;      /* index of 1st and last buffers of Rx frame */
-        unsigned short status;
-        DMABUFFERENTRY *pBufEntry;
-        unsigned int framesize = 0;
-        bool ReturnCode = false;
-        unsigned long flags;
-        struct tty_struct *tty = info->port.tty;
-        bool return_frame = false;
-        
-        /*
-         * current_rx_buffer points to the 1st buffer of the next available
-         * receive frame. To find the last buffer of the frame look for
-         * a non-zero status field in the buffer entries. (The status
-         * field is set by the 16C32 after completing a receive frame.
-         */
-
-        StartIndex = EndIndex = info->current_rx_buffer;
-
-        while( !info->rx_buffer_list[EndIndex].status ) {
-                /*
-                 * If the count field of the buffer entry is non-zero then
-                 * this buffer has not been used. (The 16C32 clears the count
-                 * field when it starts using the buffer.) If an unused buffer
-                 * is encountered then there are no frames available.
-                 */
-
-                if ( info->rx_buffer_list[EndIndex].count )
-                        goto Cleanup;
-
-                /* advance to next buffer entry in linked list */
-                EndIndex++;
-                if ( EndIndex == info->rx_buffer_count )
-                        EndIndex = 0;
-
-                /* if entire list searched then no frame available */
-                if ( EndIndex == StartIndex ) {
-                        /* If this occurs then something bad happened,
-                         * all buffers have been 'used' but none mark
-                         * the end of a frame. Reset buffers and receiver.
-                         */
-
-                        if ( info->rx_enabled ){
-                                spin_lock_irqsave(&info->irq_spinlock,flags);
-                                usc_start_receiver(info);
-                                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-                        }
-                        goto Cleanup;
-                }
-        }
-
-
-        /* check status of receive frame */
-        
-        status = info->rx_buffer_list[EndIndex].status;
-
-        if ( status & (RXSTATUS_SHORT_FRAME + RXSTATUS_OVERRUN +
-                        RXSTATUS_CRC_ERROR + RXSTATUS_ABORT) ) {
-                if ( status & RXSTATUS_SHORT_FRAME )
-                        info->icount.rxshort++;
-                else if ( status & RXSTATUS_ABORT )
-                        info->icount.rxabort++;
-                else if ( status & RXSTATUS_OVERRUN )
-                        info->icount.rxover++;
-                else {
-                        info->icount.rxcrc++;
-                        if ( info->params.crc_type & HDLC_CRC_RETURN_EX )
-                                return_frame = true;
-                }
-                framesize = 0;
-#if SYNCLINK_GENERIC_HDLC
-                {
-                        info->netdev->stats.rx_errors++;
-                        info->netdev->stats.rx_frame_errors++;
-                }
-#endif
-        } else
-                return_frame = true;
-
-        if ( return_frame ) {
-                /* receive frame has no errors, get frame size.
-                 * The frame size is the starting value of the RCC (which was
-                 * set to 0xffff) minus the ending value of the RCC (decremented
-                 * once for each receive character) minus 2 for the 16-bit CRC.
-                 */
-
-                framesize = RCLRVALUE - info->rx_buffer_list[EndIndex].rcc;
-
-                /* adjust frame size for CRC if any */
-                if ( info->params.crc_type == HDLC_CRC_16_CCITT )
-                        framesize -= 2;
-                else if ( info->params.crc_type == HDLC_CRC_32_CCITT )
-                        framesize -= 4;         
-        }
-
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk("%s(%d):mgsl_get_rx_frame(%s) status=%04X size=%d\n",
-                        __FILE__,__LINE__,info->device_name,status,framesize);
-                        
-        if ( debug_level >= DEBUG_LEVEL_DATA )
-                mgsl_trace_block(info,info->rx_buffer_list[StartIndex].virt_addr,
-                        min_t(int, framesize, DMABUFFERSIZE),0);
-                
-        if (framesize) {
-                if ( ( (info->params.crc_type & HDLC_CRC_RETURN_EX) &&
-                                ((framesize+1) > info->max_frame_size) ) ||
-                        (framesize > info->max_frame_size) )
-                        info->icount.rxlong++;
-                else {
-                        /* copy dma buffer(s) to contiguous intermediate buffer */
-                        int copy_count = framesize;
-                        int index = StartIndex;
-                        unsigned char *ptmp = info->intermediate_rxbuffer;
-
-                        if ( !(status & RXSTATUS_CRC_ERROR))
-                        info->icount.rxok++;
-                        
-                        while(copy_count) {
-                                int partial_count;
-                                if ( copy_count > DMABUFFERSIZE )
-                                        partial_count = DMABUFFERSIZE;
-                                else
-                                        partial_count = copy_count;
-                        
-                                pBufEntry = &(info->rx_buffer_list[index]);
-                                memcpy( ptmp, pBufEntry->virt_addr, partial_count );
-                                ptmp += partial_count;
-                                copy_count -= partial_count;
-                                
-                                if ( ++index == info->rx_buffer_count )
-                                        index = 0;
-                        }
-
-                        if ( info->params.crc_type & HDLC_CRC_RETURN_EX ) {
-                                ++framesize;
-                                *ptmp = (status & RXSTATUS_CRC_ERROR ?
-                                                RX_CRC_ERROR :
-                                                RX_OK);
-
-                                if ( debug_level >= DEBUG_LEVEL_DATA )
-                                        printk("%s(%d):mgsl_get_rx_frame(%s) rx frame status=%d\n",
-                                                __FILE__,__LINE__,info->device_name,
-                                                *ptmp);
-                        }
-
-#if SYNCLINK_GENERIC_HDLC
-                        if (info->netcount)
-                                hdlcdev_rx(info,info->intermediate_rxbuffer,framesize);
-                        else
-#endif
-                                ldisc_receive_buf(tty, info->intermediate_rxbuffer, info->flag_buf, framesize);
-                }
-        }
-        /* Free the buffers used by this frame. */
-        mgsl_free_rx_frame_buffers( info, StartIndex, EndIndex );
-
-        ReturnCode = true;
-
-Cleanup:
-
-        if ( info->rx_enabled && info->rx_overflow ) {
-                /* The receiver needs to restarted because of 
-                 * a receive overflow (buffer or FIFO). If the 
-                 * receive buffers are now empty, then restart receiver.
-                 */
-
-                if ( !info->rx_buffer_list[EndIndex].status &&
-                        info->rx_buffer_list[EndIndex].count ) {
-                        spin_lock_irqsave(&info->irq_spinlock,flags);
-                        usc_start_receiver(info);
-                        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-                }
-        }
-
-        return ReturnCode;
-
-}       /* end of mgsl_get_rx_frame() */
-
-/* mgsl_get_raw_rx_frame()
- *
- *      This function attempts to return a received frame from the
- *      receive DMA buffers when running in external loop mode. In this mode,
- *      we will return at most one DMABUFFERSIZE frame to the application.
- *      The USC receiver is triggering off of DCD going active to start a new
- *      frame, and DCD going inactive to terminate the frame (similar to
- *      processing a closing flag character).
- *
- *      In this routine, we will return DMABUFFERSIZE "chunks" at a time.
- *      If DCD goes inactive, the last Rx DMA Buffer will have a non-zero
- *      status field and the RCC field will indicate the length of the
- *      entire received frame. We take this RCC field and get the modulus
- *      of RCC and DMABUFFERSIZE to determine if number of bytes in the
- *      last Rx DMA buffer and return that last portion of the frame.
- *
- * Arguments:           info    pointer to device extension
- * Return Value:        true if frame returned, otherwise false
- */
-static bool mgsl_get_raw_rx_frame(struct mgsl_struct *info)
-{
-        unsigned int CurrentIndex, NextIndex;
-        unsigned short status;
-        DMABUFFERENTRY *pBufEntry;
-        unsigned int framesize = 0;
-        bool ReturnCode = false;
-        unsigned long flags;
-        struct tty_struct *tty = info->port.tty;
-
-        /*
-         * current_rx_buffer points to the 1st buffer of the next available
-         * receive frame. The status field is set by the 16C32 after
-         * completing a receive frame. If the status field of this buffer
-         * is zero, either the USC is still filling this buffer or this
-         * is one of a series of buffers making up a received frame.
-         *
-         * If the count field of this buffer is zero, the USC is either
-         * using this buffer or has used this buffer. Look at the count
-         * field of the next buffer. If that next buffer's count is
-         * non-zero, the USC is still actively using the current buffer.
-         * Otherwise, if the next buffer's count field is zero, the
-         * current buffer is complete and the USC is using the next
-         * buffer.
-         */
-        CurrentIndex = NextIndex = info->current_rx_buffer;
-        ++NextIndex;
-        if ( NextIndex == info->rx_buffer_count )
-                NextIndex = 0;
-
-        if ( info->rx_buffer_list[CurrentIndex].status != 0 ||
-                (info->rx_buffer_list[CurrentIndex].count == 0 &&
-                        info->rx_buffer_list[NextIndex].count == 0)) {
-                /*
-                 * Either the status field of this dma buffer is non-zero
-                 * (indicating the last buffer of a receive frame) or the next
-                 * buffer is marked as in use -- implying this buffer is complete
-                 * and an intermediate buffer for this received frame.
-                 */
-
-                status = info->rx_buffer_list[CurrentIndex].status;
-
-                if ( status & (RXSTATUS_SHORT_FRAME + RXSTATUS_OVERRUN +
-                                RXSTATUS_CRC_ERROR + RXSTATUS_ABORT) ) {
-                        if ( status & RXSTATUS_SHORT_FRAME )
-                                info->icount.rxshort++;
-                        else if ( status & RXSTATUS_ABORT )
-                                info->icount.rxabort++;
-                        else if ( status & RXSTATUS_OVERRUN )
-                                info->icount.rxover++;
-                        else
-                                info->icount.rxcrc++;
-                        framesize = 0;
-                } else {
-                        /*
-                         * A receive frame is available, get frame size and status.
-                         *
-                         * The frame size is the starting value of the RCC (which was
-                         * set to 0xffff) minus the ending value of the RCC (decremented
-                         * once for each receive character) minus 2 or 4 for the 16-bit
-                         * or 32-bit CRC.
-                         *
-                         * If the status field is zero, this is an intermediate buffer.
-                         * It's size is 4K.
-                         *
-                         * If the DMA Buffer Entry's Status field is non-zero, the
-                         * receive operation completed normally (ie: DCD dropped). The
-                         * RCC field is valid and holds the received frame size.
-                         * It is possible that the RCC field will be zero on a DMA buffer
-                         * entry with a non-zero status. This can occur if the total
-                         * frame size (number of bytes between the time DCD goes active
-                         * to the time DCD goes inactive) exceeds 65535 bytes. In this
-                         * case the 16C32 has underrun on the RCC count and appears to
-                         * stop updating this counter to let us know the actual received
-                         * frame size. If this happens (non-zero status and zero RCC),
-                         * simply return the entire RxDMA Buffer
-                         */
-                        if ( status ) {
-                                /*
-                                 * In the event that the final RxDMA Buffer is
-                                 * terminated with a non-zero status and the RCC
-                                 * field is zero, we interpret this as the RCC
-                                 * having underflowed (received frame > 65535 bytes).
-                                 *
-                                 * Signal the event to the user by passing back
-                                 * a status of RxStatus_CrcError returning the full
-                                 * buffer and let the app figure out what data is
-                                 * actually valid
-                                 */
-                                if ( info->rx_buffer_list[CurrentIndex].rcc )
-                                        framesize = RCLRVALUE - info->rx_buffer_list[CurrentIndex].rcc;
-                                else
-                                        framesize = DMABUFFERSIZE;
-                        }
-                        else
-                                framesize = DMABUFFERSIZE;
-                }
-
-                if ( framesize > DMABUFFERSIZE ) {
-                        /*
-                         * if running in raw sync mode, ISR handler for
-                         * End Of Buffer events terminates all buffers at 4K.
-                         * If this frame size is said to be >4K, get the
-                         * actual number of bytes of the frame in this buffer.
-                         */
-                        framesize = framesize % DMABUFFERSIZE;
-                }
-
-
-                if ( debug_level >= DEBUG_LEVEL_BH )
-                        printk("%s(%d):mgsl_get_raw_rx_frame(%s) status=%04X size=%d\n",
-                                __FILE__,__LINE__,info->device_name,status,framesize);
-
-                if ( debug_level >= DEBUG_LEVEL_DATA )
-                        mgsl_trace_block(info,info->rx_buffer_list[CurrentIndex].virt_addr,
-                                min_t(int, framesize, DMABUFFERSIZE),0);
-
-                if (framesize) {
-                        /* copy dma buffer(s) to contiguous intermediate buffer */
-                        /* NOTE: we never copy more than DMABUFFERSIZE bytes    */
-
-                        pBufEntry = &(info->rx_buffer_list[CurrentIndex]);
-                        memcpy( info->intermediate_rxbuffer, pBufEntry->virt_addr, framesize);
-                        info->icount.rxok++;
-
-                        ldisc_receive_buf(tty, info->intermediate_rxbuffer, info->flag_buf, framesize);
-                }
-
-                /* Free the buffers used by this frame. */
-                mgsl_free_rx_frame_buffers( info, CurrentIndex, CurrentIndex );
-
-                ReturnCode = true;
-        }
-
-
-        if ( info->rx_enabled && info->rx_overflow ) {
-                /* The receiver needs to restarted because of
-                 * a receive overflow (buffer or FIFO). If the
-                 * receive buffers are now empty, then restart receiver.
-                 */
-
-                if ( !info->rx_buffer_list[CurrentIndex].status &&
-                        info->rx_buffer_list[CurrentIndex].count ) {
-                        spin_lock_irqsave(&info->irq_spinlock,flags);
-                        usc_start_receiver(info);
-                        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-                }
-        }
-
-        return ReturnCode;
-
-}       /* end of mgsl_get_raw_rx_frame() */
-
-/* mgsl_load_tx_dma_buffer()
- * 
- *      Load the transmit DMA buffer with the specified data.
- * 
- * Arguments:
- * 
- *      info            pointer to device extension
- *      Buffer          pointer to buffer containing frame to load
- *      BufferSize      size in bytes of frame in Buffer
- * 
- * Return Value:        None
- */
-static void mgsl_load_tx_dma_buffer(struct mgsl_struct *info,
-                const char *Buffer, unsigned int BufferSize)
-{
-        unsigned short Copycount;
-        unsigned int i = 0;
-        DMABUFFERENTRY *pBufEntry;
-        
-        if ( debug_level >= DEBUG_LEVEL_DATA )
-                mgsl_trace_block(info,Buffer, min_t(int, BufferSize, DMABUFFERSIZE), 1);
-
-        if (info->params.flags & HDLC_FLAG_HDLC_LOOPMODE) {
-                /* set CMR:13 to start transmit when
-                 * next GoAhead (abort) is received
-                 */
-                info->cmr_value |= BIT13;                         
-        }
-                
-        /* begin loading the frame in the next available tx dma
-         * buffer, remember it's starting location for setting
-         * up tx dma operation
-         */
-        i = info->current_tx_buffer;
-        info->start_tx_dma_buffer = i;
-
-        /* Setup the status and RCC (Frame Size) fields of the 1st */
-        /* buffer entry in the transmit DMA buffer list. */
-
-        info->tx_buffer_list[i].status = info->cmr_value & 0xf000;
-        info->tx_buffer_list[i].rcc    = BufferSize;
-        info->tx_buffer_list[i].count  = BufferSize;
-
-        /* Copy frame data from 1st source buffer to the DMA buffers. */
-        /* The frame data may span multiple DMA buffers. */
-
-        while( BufferSize ){
-                /* Get a pointer to next DMA buffer entry. */
-                pBufEntry = &info->tx_buffer_list[i++];
-                        
-                if ( i == info->tx_buffer_count )
-                        i=0;
-
-                /* Calculate the number of bytes that can be copied from */
-                /* the source buffer to this DMA buffer. */
-                if ( BufferSize > DMABUFFERSIZE )
-                        Copycount = DMABUFFERSIZE;
-                else
-                        Copycount = BufferSize;
-
-                /* Actually copy data from source buffer to DMA buffer. */
-                /* Also set the data count for this individual DMA buffer. */
-                if ( info->bus_type == MGSL_BUS_TYPE_PCI )
-                        mgsl_load_pci_memory(pBufEntry->virt_addr, Buffer,Copycount);
-                else
-                        memcpy(pBufEntry->virt_addr, Buffer, Copycount);
-
-                pBufEntry->count = Copycount;
-
-                /* Advance source pointer and reduce remaining data count. */
-                Buffer += Copycount;
-                BufferSize -= Copycount;
-
-                ++info->tx_dma_buffers_used;
-        }
-
-        /* remember next available tx dma buffer */
-        info->current_tx_buffer = i;
-
-}       /* end of mgsl_load_tx_dma_buffer() */
-
-/*
- * mgsl_register_test()
- * 
- *      Performs a register test of the 16C32.
- *      
- * Arguments:           info    pointer to device instance data
- * Return Value:                true if test passed, otherwise false
- */
-static bool mgsl_register_test( struct mgsl_struct *info )
-{
-        static unsigned short BitPatterns[] =
-                { 0x0000, 0xffff, 0xaaaa, 0x5555, 0x1234, 0x6969, 0x9696, 0x0f0f };
-        static unsigned int Patterncount = ARRAY_SIZE(BitPatterns);
-        unsigned int i;
-        bool rc = true;
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        usc_reset(info);
-
-        /* Verify the reset state of some registers. */
-
-        if ( (usc_InReg( info, SICR ) != 0) ||
-                  (usc_InReg( info, IVR  ) != 0) ||
-                  (usc_InDmaReg( info, DIVR ) != 0) ){
-                rc = false;
-        }
-
-        if ( rc ){
-                /* Write bit patterns to various registers but do it out of */
-                /* sync, then read back and verify values. */
-
-                for ( i = 0 ; i < Patterncount ; i++ ) {
-                        usc_OutReg( info, TC0R, BitPatterns[i] );
-                        usc_OutReg( info, TC1R, BitPatterns[(i+1)%Patterncount] );
-                        usc_OutReg( info, TCLR, BitPatterns[(i+2)%Patterncount] );
-                        usc_OutReg( info, RCLR, BitPatterns[(i+3)%Patterncount] );
-                        usc_OutReg( info, RSR,  BitPatterns[(i+4)%Patterncount] );
-                        usc_OutDmaReg( info, TBCR, BitPatterns[(i+5)%Patterncount] );
-
-                        if ( (usc_InReg( info, TC0R ) != BitPatterns[i]) ||
-                                  (usc_InReg( info, TC1R ) != BitPatterns[(i+1)%Patterncount]) ||
-                                  (usc_InReg( info, TCLR ) != BitPatterns[(i+2)%Patterncount]) ||
-                                  (usc_InReg( info, RCLR ) != BitPatterns[(i+3)%Patterncount]) ||
-                                  (usc_InReg( info, RSR )  != BitPatterns[(i+4)%Patterncount]) ||
-                                  (usc_InDmaReg( info, TBCR ) != BitPatterns[(i+5)%Patterncount]) ){
-                                rc = false;
-                                break;
-                        }
-                }
-        }
-
-        usc_reset(info);
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-        return rc;
-
-}       /* end of mgsl_register_test() */
-
-/* mgsl_irq_test()      Perform interrupt test of the 16C32.
- * 
- * Arguments:           info    pointer to device instance data
- * Return Value:        true if test passed, otherwise false
- */
-static bool mgsl_irq_test( struct mgsl_struct *info )
-{
-        unsigned long EndTime;
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        usc_reset(info);
-
-        /*
-         * Setup 16C32 to interrupt on TxC pin (14MHz clock) transition. 
-         * The ISR sets irq_occurred to true.
-         */
-
-        info->irq_occurred = false;
-
-        /* Enable INTEN gate for ISA adapter (Port 6, Bit12) */
-        /* Enable INTEN (Port 6, Bit12) */
-        /* This connects the IRQ request signal to the ISA bus */
-        /* on the ISA adapter. This has no effect for the PCI adapter */
-        usc_OutReg( info, PCR, (unsigned short)((usc_InReg(info, PCR) | BIT13) & ~BIT12) );
-
-        usc_EnableMasterIrqBit(info);
-        usc_EnableInterrupts(info, IO_PIN);
-        usc_ClearIrqPendingBits(info, IO_PIN);
-        
-        usc_UnlatchIostatusBits(info, MISCSTATUS_TXC_LATCHED);
-        usc_EnableStatusIrqs(info, SICR_TXC_ACTIVE + SICR_TXC_INACTIVE);
-
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-        EndTime=100;
-        while( EndTime-- && !info->irq_occurred ) {
-                msleep_interruptible(10);
-        }
-        
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        usc_reset(info);
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        
-        return info->irq_occurred;
-
-}       /* end of mgsl_irq_test() */
-
-/* mgsl_dma_test()
- * 
- *      Perform a DMA test of the 16C32. A small frame is
- *      transmitted via DMA from a transmit buffer to a receive buffer
- *      using single buffer DMA mode.
- *      
- * Arguments:           info    pointer to device instance data
- * Return Value:        true if test passed, otherwise false
- */
-static bool mgsl_dma_test( struct mgsl_struct *info )
-{
-        unsigned short FifoLevel;
-        unsigned long phys_addr;
-        unsigned int FrameSize;
-        unsigned int i;
-        char *TmpPtr;
-        bool rc = true;
-        unsigned short status=0;
-        unsigned long EndTime;
-        unsigned long flags;
-        MGSL_PARAMS tmp_params;
-
-        /* save current port options */
-        memcpy(&tmp_params,&info->params,sizeof(MGSL_PARAMS));
-        /* load default port options */
-        memcpy(&info->params,&default_params,sizeof(MGSL_PARAMS));
-        
-#define TESTFRAMESIZE 40
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        
-        /* setup 16C32 for SDLC DMA transfer mode */
-
-        usc_reset(info);
-        usc_set_sdlc_mode(info);
-        usc_enable_loopback(info,1);
-        
-        /* Reprogram the RDMR so that the 16C32 does NOT clear the count
-         * field of the buffer entry after fetching buffer address. This
-         * way we can detect a DMA failure for a DMA read (which should be
-         * non-destructive to system memory) before we try and write to
-         * memory (where a failure could corrupt system memory).
-         */
-
-        /* Receive DMA mode Register (RDMR)
-         * 
-         * <15..14>     11      DMA mode = Linked List Buffer mode
-         * <13>         1       RSBinA/L = store Rx status Block in List entry
-         * <12>         0       1 = Clear count of List Entry after fetching
-         * <11..10>     00      Address mode = Increment
-         * <9>          1       Terminate Buffer on RxBound
-         * <8>          0       Bus Width = 16bits
-         * <7..0>               ?       status Bits (write as 0s)
-         * 
-         * 1110 0010 0000 0000 = 0xe200
-         */
-
-        usc_OutDmaReg( info, RDMR, 0xe200 );
-        
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-
-        /* SETUP TRANSMIT AND RECEIVE DMA BUFFERS */
-
-        FrameSize = TESTFRAMESIZE;
-
-        /* setup 1st transmit buffer entry: */
-        /* with frame size and transmit control word */
-
-        info->tx_buffer_list[0].count  = FrameSize;
-        info->tx_buffer_list[0].rcc    = FrameSize;
-        info->tx_buffer_list[0].status = 0x4000;
-
-        /* build a transmit frame in 1st transmit DMA buffer */
-
-        TmpPtr = info->tx_buffer_list[0].virt_addr;
-        for (i = 0; i < FrameSize; i++ )
-                *TmpPtr++ = i;
-
-        /* setup 1st receive buffer entry: */
-        /* clear status, set max receive buffer size */
-
-        info->rx_buffer_list[0].status = 0;
-        info->rx_buffer_list[0].count = FrameSize + 4;
-
-        /* zero out the 1st receive buffer */
-
-        memset( info->rx_buffer_list[0].virt_addr, 0, FrameSize + 4 );
-
-        /* Set count field of next buffer entries to prevent */
-        /* 16C32 from using buffers after the 1st one. */
-
-        info->tx_buffer_list[1].count = 0;
-        info->rx_buffer_list[1].count = 0;
-        
-
-        /***************************/
-        /* Program 16C32 receiver. */
-        /***************************/
-        
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-
-        /* setup DMA transfers */
-        usc_RTCmd( info, RTCmd_PurgeRxFifo );
-
-        /* program 16C32 receiver with physical address of 1st DMA buffer entry */
-        phys_addr = info->rx_buffer_list[0].phys_entry;
-        usc_OutDmaReg( info, NRARL, (unsigned short)phys_addr );
-        usc_OutDmaReg( info, NRARU, (unsigned short)(phys_addr >> 16) );
-
-        /* Clear the Rx DMA status bits (read RDMR) and start channel */
-        usc_InDmaReg( info, RDMR );
-        usc_DmaCmd( info, DmaCmd_InitRxChannel );
-
-        /* Enable Receiver (RMR <1..0> = 10) */
-        usc_OutReg( info, RMR, (unsigned short)((usc_InReg(info, RMR) & 0xfffc) | 0x0002) );
-        
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-
-        /*************************************************************/
-        /* WAIT FOR RECEIVER TO DMA ALL PARAMETERS FROM BUFFER ENTRY */
-        /*************************************************************/
-
-        /* Wait 100ms for interrupt. */
-        EndTime = jiffies + msecs_to_jiffies(100);
-
-        for(;;) {
-                if (time_after(jiffies, EndTime)) {
-                        rc = false;
-                        break;
-                }
-
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                status = usc_InDmaReg( info, RDMR );
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-                if ( !(status & BIT4) && (status & BIT5) ) {
-                        /* INITG (BIT 4) is inactive (no entry read in progress) AND */
-                        /* BUSY  (BIT 5) is active (channel still active). */
-                        /* This means the buffer entry read has completed. */
-                        break;
-                }
-        }
-
-
-        /******************************/
-        /* Program 16C32 transmitter. */
-        /******************************/
-        
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-
-        /* Program the Transmit Character Length Register (TCLR) */
-        /* and clear FIFO (TCC is loaded with TCLR on FIFO clear) */
-
-        usc_OutReg( info, TCLR, (unsigned short)info->tx_buffer_list[0].count );
-        usc_RTCmd( info, RTCmd_PurgeTxFifo );
-
-        /* Program the address of the 1st DMA Buffer Entry in linked list */
-
-        phys_addr = info->tx_buffer_list[0].phys_entry;
-        usc_OutDmaReg( info, NTARL, (unsigned short)phys_addr );
-        usc_OutDmaReg( info, NTARU, (unsigned short)(phys_addr >> 16) );
-
-        /* unlatch Tx status bits, and start transmit channel. */
-
-        usc_OutReg( info, TCSR, (unsigned short)(( usc_InReg(info, TCSR) & 0x0f00) | 0xfa) );
-        usc_DmaCmd( info, DmaCmd_InitTxChannel );
-
-        /* wait for DMA controller to fill transmit FIFO */
-
-        usc_TCmd( info, TCmd_SelectTicrTxFifostatus );
-        
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-
-        /**********************************/
-        /* WAIT FOR TRANSMIT FIFO TO FILL */
-        /**********************************/
-        
-        /* Wait 100ms */
-        EndTime = jiffies + msecs_to_jiffies(100);
-
-        for(;;) {
-                if (time_after(jiffies, EndTime)) {
-                        rc = false;
-                        break;
-                }
-
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                FifoLevel = usc_InReg(info, TICR) >> 8;
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-                        
-                if ( FifoLevel < 16 )
-                        break;
-                else
-                        if ( FrameSize < 32 ) {
-                                /* This frame is smaller than the entire transmit FIFO */
-                                /* so wait for the entire frame to be loaded. */
-                                if ( FifoLevel <= (32 - FrameSize) )
-                                        break;
-                        }
-        }
-
-
-        if ( rc )
-        {
-                /* Enable 16C32 transmitter. */
-
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                
-                /* Transmit mode Register (TMR), <1..0> = 10, Enable Transmitter */
-                usc_TCmd( info, TCmd_SendFrame );
-                usc_OutReg( info, TMR, (unsigned short)((usc_InReg(info, TMR) & 0xfffc) | 0x0002) );
-                
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-                                                
-                /******************************/
-                /* WAIT FOR TRANSMIT COMPLETE */
-                /******************************/
-
-                /* Wait 100ms */
-                EndTime = jiffies + msecs_to_jiffies(100);
-
-                /* While timer not expired wait for transmit complete */
-
-                spin_lock_irqsave(&info->irq_spinlock,flags);
-                status = usc_InReg( info, TCSR );
-                spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-                while ( !(status & (BIT6+BIT5+BIT4+BIT2+BIT1)) ) {
-                        if (time_after(jiffies, EndTime)) {
-                                rc = false;
-                                break;
-                        }
-
-                        spin_lock_irqsave(&info->irq_spinlock,flags);
-                        status = usc_InReg( info, TCSR );
-                        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-                }
-        }
-
-
-        if ( rc ){
-                /* CHECK FOR TRANSMIT ERRORS */
-                if ( status & (BIT5 + BIT1) ) 
-                        rc = false;
-        }
-
-        if ( rc ) {
-                /* WAIT FOR RECEIVE COMPLETE */
-
-                /* Wait 100ms */
-                EndTime = jiffies + msecs_to_jiffies(100);
-
-                /* Wait for 16C32 to write receive status to buffer entry. */
-                status=info->rx_buffer_list[0].status;
-                while ( status == 0 ) {
-                        if (time_after(jiffies, EndTime)) {
-                                rc = false;
-                                break;
-                        }
-                        status=info->rx_buffer_list[0].status;
-                }
-        }
-
-
-        if ( rc ) {
-                /* CHECK FOR RECEIVE ERRORS */
-                status = info->rx_buffer_list[0].status;
-
-                if ( status & (BIT8 + BIT3 + BIT1) ) {
-                        /* receive error has occurred */
-                        rc = false;
-                } else {
-                        if ( memcmp( info->tx_buffer_list[0].virt_addr ,
-                                info->rx_buffer_list[0].virt_addr, FrameSize ) ){
-                                rc = false;
-                        }
-                }
-        }
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        usc_reset( info );
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-        /* restore current port options */
-        memcpy(&info->params,&tmp_params,sizeof(MGSL_PARAMS));
-        
-        return rc;
-
-}       /* end of mgsl_dma_test() */
-
-/* mgsl_adapter_test()
- * 
- *      Perform the register, IRQ, and DMA tests for the 16C32.
- *      
- * Arguments:           info    pointer to device instance data
- * Return Value:        0 if success, otherwise -ENODEV
- */
-static int mgsl_adapter_test( struct mgsl_struct *info )
-{
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):Testing device %s\n",
-                        __FILE__,__LINE__,info->device_name );
-                        
-        if ( !mgsl_register_test( info ) ) {
-                info->init_error = DiagStatus_AddressFailure;
-                printk( "%s(%d):Register test failure for device %s Addr=%04X\n",
-                        __FILE__,__LINE__,info->device_name, (unsigned short)(info->io_base) );
-                return -ENODEV;
-        }
-
-        if ( !mgsl_irq_test( info ) ) {
-                info->init_error = DiagStatus_IrqFailure;
-                printk( "%s(%d):Interrupt test failure for device %s IRQ=%d\n",
-                        __FILE__,__LINE__,info->device_name, (unsigned short)(info->irq_level) );
-                return -ENODEV;
-        }
-
-        if ( !mgsl_dma_test( info ) ) {
-                info->init_error = DiagStatus_DmaFailure;
-                printk( "%s(%d):DMA test failure for device %s DMA=%d\n",
-                        __FILE__,__LINE__,info->device_name, (unsigned short)(info->dma_level) );
-                return -ENODEV;
-        }
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):device %s passed diagnostics\n",
-                        __FILE__,__LINE__,info->device_name );
-                        
-        return 0;
-
-}       /* end of mgsl_adapter_test() */
-
-/* mgsl_memory_test()
- * 
- *      Test the shared memory on a PCI adapter.
- * 
- * Arguments:           info    pointer to device instance data
- * Return Value:        true if test passed, otherwise false
- */
-static bool mgsl_memory_test( struct mgsl_struct *info )
-{
-        static unsigned long BitPatterns[] =
-                { 0x0, 0x55555555, 0xaaaaaaaa, 0x66666666, 0x99999999, 0xffffffff, 0x12345678 };
-        unsigned long Patterncount = ARRAY_SIZE(BitPatterns);
-        unsigned long i;
-        unsigned long TestLimit = SHARED_MEM_ADDRESS_SIZE/sizeof(unsigned long);
-        unsigned long * TestAddr;
-
-        if ( info->bus_type != MGSL_BUS_TYPE_PCI )
-                return true;
-
-        TestAddr = (unsigned long *)info->memory_base;
-
-        /* Test data lines with test pattern at one location. */
-
-        for ( i = 0 ; i < Patterncount ; i++ ) {
-                *TestAddr = BitPatterns[i];
-                if ( *TestAddr != BitPatterns[i] )
-                        return false;
-        }
-
-        /* Test address lines with incrementing pattern over */
-        /* entire address range. */
-
-        for ( i = 0 ; i < TestLimit ; i++ ) {
-                *TestAddr = i * 4;
-                TestAddr++;
-        }
-
-        TestAddr = (unsigned long *)info->memory_base;
-
-        for ( i = 0 ; i < TestLimit ; i++ ) {
-                if ( *TestAddr != i * 4 )
-                        return false;
-                TestAddr++;
-        }
-
-        memset( info->memory_base, 0, SHARED_MEM_ADDRESS_SIZE );
-
-        return true;
-
-}       /* End Of mgsl_memory_test() */
-
-
-/* mgsl_load_pci_memory()
- * 
- *      Load a large block of data into the PCI shared memory.
- *      Use this instead of memcpy() or memmove() to move data
- *      into the PCI shared memory.
- * 
- * Notes:
- * 
- *      This function prevents the PCI9050 interface chip from hogging
- *      the adapter local bus, which can starve the 16C32 by preventing
- *      16C32 bus master cycles.
- * 
- *      The PCI9050 documentation says that the 9050 will always release
- *      control of the local bus after completing the current read
- *      or write operation.
- * 
- *      It appears that as long as the PCI9050 write FIFO is full, the
- *      PCI9050 treats all of the writes as a single burst transaction
- *      and will not release the bus. This causes DMA latency problems
- *      at high speeds when copying large data blocks to the shared
- *      memory.
- * 
- *      This function in effect, breaks the a large shared memory write
- *      into multiple transations by interleaving a shared memory read
- *      which will flush the write FIFO and 'complete' the write
- *      transation. This allows any pending DMA request to gain control
- *      of the local bus in a timely fasion.
- * 
- * Arguments:
- * 
- *      TargetPtr       pointer to target address in PCI shared memory
- *      SourcePtr       pointer to source buffer for data
- *      count           count in bytes of data to copy
- *
- * Return Value:        None
- */
-static void mgsl_load_pci_memory( char* TargetPtr, const char* SourcePtr,
-        unsigned short count )
-{
-        /* 16 32-bit writes @ 60ns each = 960ns max latency on local bus */
-#define PCI_LOAD_INTERVAL 64
-
-        unsigned short Intervalcount = count / PCI_LOAD_INTERVAL;
-        unsigned short Index;
-        unsigned long Dummy;
-
-        for ( Index = 0 ; Index < Intervalcount ; Index++ )
-        {
-                memcpy(TargetPtr, SourcePtr, PCI_LOAD_INTERVAL);
-                Dummy = *((volatile unsigned long *)TargetPtr);
-                TargetPtr += PCI_LOAD_INTERVAL;
-                SourcePtr += PCI_LOAD_INTERVAL;
-        }
-
-        memcpy( TargetPtr, SourcePtr, count % PCI_LOAD_INTERVAL );
-
-}       /* End Of mgsl_load_pci_memory() */
-
-static void mgsl_trace_block(struct mgsl_struct *info,const char* data, int count, int xmit)
-{
-        int i;
-        int linecount;
-        if (xmit)
-                printk("%s tx data:\n",info->device_name);
-        else
-                printk("%s rx data:\n",info->device_name);
-                
-        while(count) {
-                if (count > 16)
-                        linecount = 16;
-                else
-                        linecount = count;
-                        
-                for(i=0;i<linecount;i++)
-                        printk("%02X ",(unsigned char)data[i]);
-                for(;i<17;i++)
-                        printk("   ");
-                for(i=0;i<linecount;i++) {
-                        if (data[i]>=040 && data[i]<=0176)
-                                printk("%c",data[i]);
-                        else
-                                printk(".");
-                }
-                printk("\n");
-                
-                data  += linecount;
-                count -= linecount;
-        }
-}       /* end of mgsl_trace_block() */
-
-/* mgsl_tx_timeout()
- * 
- *      called when HDLC frame times out
- *      update stats and do tx completion processing
- *      
- * Arguments:   context         pointer to device instance data
- * Return Value:        None
- */
-static void mgsl_tx_timeout(unsigned long context)
-{
-        struct mgsl_struct *info = (struct mgsl_struct*)context;
-        unsigned long flags;
-        
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):mgsl_tx_timeout(%s)\n",
-                        __FILE__,__LINE__,info->device_name);
-        if(info->tx_active &&
-           (info->params.mode == MGSL_MODE_HDLC ||
-            info->params.mode == MGSL_MODE_RAW) ) {
-                info->icount.txtimeout++;
-        }
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        info->tx_active = false;
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-
-        if ( info->params.flags & HDLC_FLAG_HDLC_LOOPMODE )
-                usc_loopmode_cancel_transmit( info );
-
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        
-#if SYNCLINK_GENERIC_HDLC
-        if (info->netcount)
-                hdlcdev_tx_done(info);
-        else
-#endif
-                mgsl_bh_transmit(info);
-        
-}       /* end of mgsl_tx_timeout() */
-
-/* signal that there are no more frames to send, so that
- * line is 'released' by echoing RxD to TxD when current
- * transmission is complete (or immediately if no tx in progress).
- */
-static int mgsl_loopmode_send_done( struct mgsl_struct * info )
-{
-        unsigned long flags;
-        
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        if (info->params.flags & HDLC_FLAG_HDLC_LOOPMODE) {
-                if (info->tx_active)
-                        info->loopmode_send_done_requested = true;
-                else
-                        usc_loopmode_send_done(info);
-        }
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-        return 0;
-}
-
-/* release the line by echoing RxD to TxD
- * upon completion of a transmit frame
- */
-static void usc_loopmode_send_done( struct mgsl_struct * info )
-{
-        info->loopmode_send_done_requested = false;
-        /* clear CMR:13 to 0 to start echoing RxData to TxData */
-        info->cmr_value &= ~BIT13;                        
-        usc_OutReg(info, CMR, info->cmr_value);
-}
-
-/* abort a transmit in progress while in HDLC LoopMode
- */
-static void usc_loopmode_cancel_transmit( struct mgsl_struct * info )
-{
-        /* reset tx dma channel and purge TxFifo */
-        usc_RTCmd( info, RTCmd_PurgeTxFifo );
-        usc_DmaCmd( info, DmaCmd_ResetTxChannel );
-        usc_loopmode_send_done( info );
-}
-
-/* for HDLC/SDLC LoopMode, setting CMR:13 after the transmitter is enabled
- * is an Insert Into Loop action. Upon receipt of a GoAhead sequence (RxAbort)
- * we must clear CMR:13 to begin repeating TxData to RxData
- */
-static void usc_loopmode_insert_request( struct mgsl_struct * info )
-{
-        info->loopmode_insert_requested = true;
- 
-        /* enable RxAbort irq. On next RxAbort, clear CMR:13 to
-         * begin repeating TxData on RxData (complete insertion)
-         */
-        usc_OutReg( info, RICR, 
-                (usc_InReg( info, RICR ) | RXSTATUS_ABORT_RECEIVED ) );
-                
-        /* set CMR:13 to insert into loop on next GoAhead (RxAbort) */
-        info->cmr_value |= BIT13;
-        usc_OutReg(info, CMR, info->cmr_value);
-}
-
-/* return 1 if station is inserted into the loop, otherwise 0
- */
-static int usc_loopmode_active( struct mgsl_struct * info)
-{
-        return usc_InReg( info, CCSR ) & BIT7 ? 1 : 0 ;
-}
-
-#if SYNCLINK_GENERIC_HDLC
-
-/**
- * called by generic HDLC layer when protocol selected (PPP, frame relay, etc.)
- * set encoding and frame check sequence (FCS) options
- *
- * dev       pointer to network device structure
- * encoding  serial encoding setting
- * parity    FCS setting
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
-                          unsigned short parity)
-{
-        struct mgsl_struct *info = dev_to_port(dev);
-        unsigned char  new_encoding;
-        unsigned short new_crctype;
-
-        /* return error if TTY interface open */
-        if (info->port.count)
-                return -EBUSY;
-
-        switch (encoding)
-        {
-        case ENCODING_NRZ:        new_encoding = HDLC_ENCODING_NRZ; break;
-        case ENCODING_NRZI:       new_encoding = HDLC_ENCODING_NRZI_SPACE; break;
-        case ENCODING_FM_MARK:    new_encoding = HDLC_ENCODING_BIPHASE_MARK; break;
-        case ENCODING_FM_SPACE:   new_encoding = HDLC_ENCODING_BIPHASE_SPACE; break;
-        case ENCODING_MANCHESTER: new_encoding = HDLC_ENCODING_BIPHASE_LEVEL; break;
-        default: return -EINVAL;
-        }
-
-        switch (parity)
-        {
-        case PARITY_NONE:            new_crctype = HDLC_CRC_NONE; break;
-        case PARITY_CRC16_PR1_CCITT: new_crctype = HDLC_CRC_16_CCITT; break;
-        case PARITY_CRC32_PR1_CCITT: new_crctype = HDLC_CRC_32_CCITT; break;
-        default: return -EINVAL;
-        }
-
-        info->params.encoding = new_encoding;
-        info->params.crc_type = new_crctype;
-
-        /* if network interface up, reprogram hardware */
-        if (info->netcount)
-                mgsl_program_hw(info);
-
-        return 0;
-}
-
-/**
- * called by generic HDLC layer to send frame
- *
- * skb  socket buffer containing HDLC frame
- * dev  pointer to network device structure
- */
-static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,
-                                      struct net_device *dev)
-{
-        struct mgsl_struct *info = dev_to_port(dev);
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk(KERN_INFO "%s:hdlc_xmit(%s)\n",__FILE__,dev->name);
-
-        /* stop sending until this frame completes */
-        netif_stop_queue(dev);
-
-        /* copy data to device buffers */
-        info->xmit_cnt = skb->len;
-        mgsl_load_tx_dma_buffer(info, skb->data, skb->len);
-
-        /* update network statistics */
-        dev->stats.tx_packets++;
-        dev->stats.tx_bytes += skb->len;
-
-        /* done with socket buffer, so free it */
-        dev_kfree_skb(skb);
-
-        /* save start time for transmit timeout detection */
-        dev->trans_start = jiffies;
-
-        /* start hardware transmitter if necessary */
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        if (!info->tx_active)
-                usc_start_transmitter(info);
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-        return NETDEV_TX_OK;
-}
-
-/**
- * called by network layer when interface enabled
- * claim resources and initialize hardware
- *
- * dev  pointer to network device structure
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_open(struct net_device *dev)
-{
-        struct mgsl_struct *info = dev_to_port(dev);
-        int rc;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s:hdlcdev_open(%s)\n",__FILE__,dev->name);
-
-        /* generic HDLC layer open processing */
-        if ((rc = hdlc_open(dev)))
-                return rc;
-
-        /* arbitrate between network and tty opens */
-        spin_lock_irqsave(&info->netlock, flags);
-        if (info->port.count != 0 || info->netcount != 0) {
-                printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
-                spin_unlock_irqrestore(&info->netlock, flags);
-                return -EBUSY;
-        }
-        info->netcount=1;
-        spin_unlock_irqrestore(&info->netlock, flags);
-
-        /* claim resources and init adapter */
-        if ((rc = startup(info)) != 0) {
-                spin_lock_irqsave(&info->netlock, flags);
-                info->netcount=0;
-                spin_unlock_irqrestore(&info->netlock, flags);
-                return rc;
-        }
-
-        /* assert DTR and RTS, apply hardware settings */
-        info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
-        mgsl_program_hw(info);
-
-        /* enable network layer transmit */
-        dev->trans_start = jiffies;
-        netif_start_queue(dev);
-
-        /* inform generic HDLC layer of current DCD status */
-        spin_lock_irqsave(&info->irq_spinlock, flags);
-        usc_get_serial_signals(info);
-        spin_unlock_irqrestore(&info->irq_spinlock, flags);
-        if (info->serial_signals & SerialSignal_DCD)
-                netif_carrier_on(dev);
-        else
-                netif_carrier_off(dev);
-        return 0;
-}
-
-/**
- * called by network layer when interface is disabled
- * shutdown hardware and release resources
- *
- * dev  pointer to network device structure
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_close(struct net_device *dev)
-{
-        struct mgsl_struct *info = dev_to_port(dev);
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s:hdlcdev_close(%s)\n",__FILE__,dev->name);
-
-        netif_stop_queue(dev);
-
-        /* shutdown adapter and release resources */
-        shutdown(info);
-
-        hdlc_close(dev);
-
-        spin_lock_irqsave(&info->netlock, flags);
-        info->netcount=0;
-        spin_unlock_irqrestore(&info->netlock, flags);
-
-        return 0;
-}
-
-/**
- * called by network layer to process IOCTL call to network device
- *
- * dev  pointer to network device structure
- * ifr  pointer to network interface request structure
- * cmd  IOCTL command code
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-        const size_t size = sizeof(sync_serial_settings);
-        sync_serial_settings new_line;
-        sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync;
-        struct mgsl_struct *info = dev_to_port(dev);
-        unsigned int flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
-
-        /* return error if TTY interface open */
-        if (info->port.count)
-                return -EBUSY;
-
-        if (cmd != SIOCWANDEV)
-                return hdlc_ioctl(dev, ifr, cmd);
-
-        switch(ifr->ifr_settings.type) {
-        case IF_GET_IFACE: /* return current sync_serial_settings */
-
-                ifr->ifr_settings.type = IF_IFACE_SYNC_SERIAL;
-                if (ifr->ifr_settings.size < size) {
-                        ifr->ifr_settings.size = size; /* data size wanted */
-                        return -ENOBUFS;
-                }
-
-                flags = info->params.flags & (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_RXC_DPLL |
-                                              HDLC_FLAG_RXC_BRG    | HDLC_FLAG_RXC_TXCPIN |
-                                              HDLC_FLAG_TXC_TXCPIN | HDLC_FLAG_TXC_DPLL |
-                                              HDLC_FLAG_TXC_BRG    | HDLC_FLAG_TXC_RXCPIN);
-
-                switch (flags){
-                case (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_TXCPIN): new_line.clock_type = CLOCK_EXT; break;
-                case (HDLC_FLAG_RXC_BRG    | HDLC_FLAG_TXC_BRG):    new_line.clock_type = CLOCK_INT; break;
-                case (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_BRG):    new_line.clock_type = CLOCK_TXINT; break;
-                case (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_RXCPIN): new_line.clock_type = CLOCK_TXFROMRX; break;
-                default: new_line.clock_type = CLOCK_DEFAULT;
-                }
-
-                new_line.clock_rate = info->params.clock_speed;
-                new_line.loopback   = info->params.loopback ? 1:0;
-
-                if (copy_to_user(line, &new_line, size))
-                        return -EFAULT;
-                return 0;
-
-        case IF_IFACE_SYNC_SERIAL: /* set sync_serial_settings */
-
-                if(!capable(CAP_NET_ADMIN))
-                        return -EPERM;
-                if (copy_from_user(&new_line, line, size))
-                        return -EFAULT;
-
-                switch (new_line.clock_type)
-                {
-                case CLOCK_EXT:      flags = HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_TXCPIN; break;
-                case CLOCK_TXFROMRX: flags = HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_RXCPIN; break;
-                case CLOCK_INT:      flags = HDLC_FLAG_RXC_BRG    | HDLC_FLAG_TXC_BRG;    break;
-                case CLOCK_TXINT:    flags = HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_BRG;    break;
-                case CLOCK_DEFAULT:  flags = info->params.flags &
-                                             (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_RXC_DPLL |
-                                              HDLC_FLAG_RXC_BRG    | HDLC_FLAG_RXC_TXCPIN |
-                                              HDLC_FLAG_TXC_TXCPIN | HDLC_FLAG_TXC_DPLL |
-                                              HDLC_FLAG_TXC_BRG    | HDLC_FLAG_TXC_RXCPIN); break;
-                default: return -EINVAL;
-                }
-
-                if (new_line.loopback != 0 && new_line.loopback != 1)
-                        return -EINVAL;
-
-                info->params.flags &= ~(HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_RXC_DPLL |
-                                        HDLC_FLAG_RXC_BRG    | HDLC_FLAG_RXC_TXCPIN |
-                                        HDLC_FLAG_TXC_TXCPIN | HDLC_FLAG_TXC_DPLL |
-                                        HDLC_FLAG_TXC_BRG    | HDLC_FLAG_TXC_RXCPIN);
-                info->params.flags |= flags;
-
-                info->params.loopback = new_line.loopback;
-
-                if (flags & (HDLC_FLAG_RXC_BRG | HDLC_FLAG_TXC_BRG))
-                        info->params.clock_speed = new_line.clock_rate;
-                else
-                        info->params.clock_speed = 0;
-
-                /* if network interface up, reprogram hardware */
-                if (info->netcount)
-                        mgsl_program_hw(info);
-                return 0;
-
-        default:
-                return hdlc_ioctl(dev, ifr, cmd);
-        }
-}
-
-/**
- * called by network layer when transmit timeout is detected
- *
- * dev  pointer to network device structure
- */
-static void hdlcdev_tx_timeout(struct net_device *dev)
-{
-        struct mgsl_struct *info = dev_to_port(dev);
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("hdlcdev_tx_timeout(%s)\n",dev->name);
-
-        dev->stats.tx_errors++;
-        dev->stats.tx_aborted_errors++;
-
-        spin_lock_irqsave(&info->irq_spinlock,flags);
-        usc_stop_transmitter(info);
-        spin_unlock_irqrestore(&info->irq_spinlock,flags);
-
-        netif_wake_queue(dev);
-}
-
-/**
- * called by device driver when transmit completes
- * reenable network layer transmit if stopped
- *
- * info  pointer to device instance information
- */
-static void hdlcdev_tx_done(struct mgsl_struct *info)
-{
-        if (netif_queue_stopped(info->netdev))
-                netif_wake_queue(info->netdev);
-}
-
-/**
- * called by device driver when frame received
- * pass frame to network layer
- *
- * info  pointer to device instance information
- * buf   pointer to buffer contianing frame data
- * size  count of data bytes in buf
- */
-static void hdlcdev_rx(struct mgsl_struct *info, char *buf, int size)
-{
-        struct sk_buff *skb = dev_alloc_skb(size);
-        struct net_device *dev = info->netdev;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("hdlcdev_rx(%s)\n", dev->name);
-
-        if (skb == NULL) {
-                printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n",
-                       dev->name);
-                dev->stats.rx_dropped++;
-                return;
-        }
-
-        memcpy(skb_put(skb, size), buf, size);
-
-        skb->protocol = hdlc_type_trans(skb, dev);
-
-        dev->stats.rx_packets++;
-        dev->stats.rx_bytes += size;
-
-        netif_rx(skb);
-}
-
-static const struct net_device_ops hdlcdev_ops = {
-        .ndo_open       = hdlcdev_open,
-        .ndo_stop       = hdlcdev_close,
-        .ndo_change_mtu = hdlc_change_mtu,
-        .ndo_start_xmit = hdlc_start_xmit,
-        .ndo_do_ioctl   = hdlcdev_ioctl,
-        .ndo_tx_timeout = hdlcdev_tx_timeout,
-};
-
-/**
- * called by device driver when adding device instance
- * do generic HDLC initialization
- *
- * info  pointer to device instance information
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_init(struct mgsl_struct *info)
-{
-        int rc;
-        struct net_device *dev;
-        hdlc_device *hdlc;
-
-        /* allocate and initialize network and HDLC layer objects */
-
-        if (!(dev = alloc_hdlcdev(info))) {
-                printk(KERN_ERR "%s:hdlc device allocation failure\n",__FILE__);
-                return -ENOMEM;
-        }
-
-        /* for network layer reporting purposes only */
-        dev->base_addr = info->io_base;
-        dev->irq       = info->irq_level;
-        dev->dma       = info->dma_level;
-
-        /* network layer callbacks and settings */
-        dev->netdev_ops     = &hdlcdev_ops;
-        dev->watchdog_timeo = 10 * HZ;
-        dev->tx_queue_len   = 50;
-
-        /* generic HDLC layer callbacks and settings */
-        hdlc         = dev_to_hdlc(dev);
-        hdlc->attach = hdlcdev_attach;
-        hdlc->xmit   = hdlcdev_xmit;
-
-        /* register objects with HDLC layer */
-        if ((rc = register_hdlc_device(dev))) {
-                printk(KERN_WARNING "%s:unable to register hdlc device\n",__FILE__);
-                free_netdev(dev);
-                return rc;
-        }
-
-        info->netdev = dev;
-        return 0;
-}
-
-/**
- * called by device driver when removing device instance
- * do generic HDLC cleanup
- *
- * info  pointer to device instance information
- */
-static void hdlcdev_exit(struct mgsl_struct *info)
-{
-        unregister_hdlc_device(info->netdev);
-        free_netdev(info->netdev);
-        info->netdev = NULL;
-}
-
-#endif /* CONFIG_HDLC */
-
-
-static int __devinit synclink_init_one (struct pci_dev *dev,
-                                        const struct pci_device_id *ent)
-{
-        struct mgsl_struct *info;
-
-        if (pci_enable_device(dev)) {
-                printk("error enabling pci device %p\n", dev);
-                return -EIO;
-        }
-
-        if (!(info = mgsl_allocate_device())) {
-                printk("can't allocate device instance data.\n");
-                return -EIO;
-        }
-
-        /* Copy user configuration info to device instance data */
-                
-        info->io_base = pci_resource_start(dev, 2);
-        info->irq_level = dev->irq;
-        info->phys_memory_base = pci_resource_start(dev, 3);
-                                
-        /* Because veremap only works on page boundaries we must map
-         * a larger area than is actually implemented for the LCR
-         * memory range. We map a full page starting at the page boundary.
-         */
-        info->phys_lcr_base = pci_resource_start(dev, 0);
-        info->lcr_offset    = info->phys_lcr_base & (PAGE_SIZE-1);
-        info->phys_lcr_base &= ~(PAGE_SIZE-1);
-                                
-        info->bus_type = MGSL_BUS_TYPE_PCI;
-        info->io_addr_size = 8;
-        info->irq_flags = IRQF_SHARED;
-
-        if (dev->device == 0x0210) {
-                /* Version 1 PCI9030 based universal PCI adapter */
-                info->misc_ctrl_value = 0x007c4080;
-                info->hw_version = 1;
-        } else {
-                /* Version 0 PCI9050 based 5V PCI adapter
-                 * A PCI9050 bug prevents reading LCR registers if 
-                 * LCR base address bit 7 is set. Maintain shadow
-                 * value so we can write to LCR misc control reg.
-                 */
-                info->misc_ctrl_value = 0x087e4546;
-                info->hw_version = 0;
-        }
-                                
-        mgsl_add_device(info);
-
-        return 0;
-}
-
-static void __devexit synclink_remove_one (struct pci_dev *dev)
-{
-}
-
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
deleted file mode 100644
index e63b830c86cc..000000000000
--- a/drivers/char/synclink_gt.c
+++ /dev/null
@@ -1,5049 +0,0 @@
-/*
- * Device driver for Microgate SyncLink GT serial adapters.
- *
- * written by Paul Fulghum for Microgate Corporation
- * paulkf@microgate.com
- *
- * Microgate and SyncLink are trademarks of Microgate Corporation
- *
- * This code is released under the GNU General Public License (GPL)
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * DEBUG OUTPUT DEFINITIONS
- *
- * uncomment lines below to enable specific types of debug output
- *
- * DBGINFO   information - most verbose output
- * DBGERR    serious errors
- * DBGBH     bottom half service routine debugging
- * DBGISR    interrupt service routine debugging
- * DBGDATA   output receive and transmit data
- * DBGTBUF   output transmit DMA buffers and registers
- * DBGRBUF   output receive DMA buffers and registers
- */
-
-#define DBGINFO(fmt) if (debug_level >= DEBUG_LEVEL_INFO) printk fmt
-#define DBGERR(fmt) if (debug_level >= DEBUG_LEVEL_ERROR) printk fmt
-#define DBGBH(fmt) if (debug_level >= DEBUG_LEVEL_BH) printk fmt
-#define DBGISR(fmt) if (debug_level >= DEBUG_LEVEL_ISR) printk fmt
-#define DBGDATA(info, buf, size, label) if (debug_level >= DEBUG_LEVEL_DATA) trace_block((info), (buf), (size), (label))
-/*#define DBGTBUF(info) dump_tbufs(info)*/
-/*#define DBGRBUF(info) dump_rbufs(info)*/
-
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial.h>
-#include <linux/major.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/ioport.h>
-#include <linux/mm.h>
-#include <linux/seq_file.h>
-#include <linux/slab.h>
-#include <linux/netdevice.h>
-#include <linux/vmalloc.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/ioctl.h>
-#include <linux/termios.h>
-#include <linux/bitops.h>
-#include <linux/workqueue.h>
-#include <linux/hdlc.h>
-#include <linux/synclink.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/dma.h>
-#include <asm/types.h>
-#include <asm/uaccess.h>
-
-#if defined(CONFIG_HDLC) || (defined(CONFIG_HDLC_MODULE) && defined(CONFIG_SYNCLINK_GT_MODULE))
-#define SYNCLINK_GENERIC_HDLC 1
-#else
-#define SYNCLINK_GENERIC_HDLC 0
-#endif
-
-/*
- * module identification
- */
-static char *driver_name     = "SyncLink GT";
-static char *tty_driver_name = "synclink_gt";
-static char *tty_dev_prefix  = "ttySLG";
-MODULE_LICENSE("GPL");
-#define MGSL_MAGIC 0x5401
-#define MAX_DEVICES 32
-
-static struct pci_device_id pci_table[] = {
-        {PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
-        {PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT2_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
-        {PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT4_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
-        {PCI_VENDOR_ID_MICROGATE, SYNCLINK_AC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
-        {0,}, /* terminate list */
-};
-MODULE_DEVICE_TABLE(pci, pci_table);
-
-static int  init_one(struct pci_dev *dev,const struct pci_device_id *ent);
-static void remove_one(struct pci_dev *dev);
-static struct pci_driver pci_driver = {
-        .name           = "synclink_gt",
-        .id_table       = pci_table,
-        .probe          = init_one,
-        .remove         = __devexit_p(remove_one),
-};
-
-static bool pci_registered;
-
-/*
- * module configuration and status
- */
-static struct slgt_info *slgt_device_list;
-static int slgt_device_count;
-
-static int ttymajor;
-static int debug_level;
-static int maxframe[MAX_DEVICES];
-
-module_param(ttymajor, int, 0);
-module_param(debug_level, int, 0);
-module_param_array(maxframe, int, NULL, 0);
-
-MODULE_PARM_DESC(ttymajor, "TTY major device number override: 0=auto assigned");
-MODULE_PARM_DESC(debug_level, "Debug syslog output: 0=disabled, 1 to 5=increasing detail");
-MODULE_PARM_DESC(maxframe, "Maximum frame size used by device (4096 to 65535)");
-
-/*
- * tty support and callbacks
- */
-static struct tty_driver *serial_driver;
-
-static int  open(struct tty_struct *tty, struct file * filp);
-static void close(struct tty_struct *tty, struct file * filp);
-static void hangup(struct tty_struct *tty);
-static void set_termios(struct tty_struct *tty, struct ktermios *old_termios);
-
-static int  write(struct tty_struct *tty, const unsigned char *buf, int count);
-static int put_char(struct tty_struct *tty, unsigned char ch);
-static void send_xchar(struct tty_struct *tty, char ch);
-static void wait_until_sent(struct tty_struct *tty, int timeout);
-static int  write_room(struct tty_struct *tty);
-static void flush_chars(struct tty_struct *tty);
-static void flush_buffer(struct tty_struct *tty);
-static void tx_hold(struct tty_struct *tty);
-static void tx_release(struct tty_struct *tty);
-
-static int  ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg);
-static int  chars_in_buffer(struct tty_struct *tty);
-static void throttle(struct tty_struct * tty);
-static void unthrottle(struct tty_struct * tty);
-static int set_break(struct tty_struct *tty, int break_state);
-
-/*
- * generic HDLC support and callbacks
- */
-#if SYNCLINK_GENERIC_HDLC
-#define dev_to_port(D) (dev_to_hdlc(D)->priv)
-static void hdlcdev_tx_done(struct slgt_info *info);
-static void hdlcdev_rx(struct slgt_info *info, char *buf, int size);
-static int  hdlcdev_init(struct slgt_info *info);
-static void hdlcdev_exit(struct slgt_info *info);
-#endif
-
-
-/*
- * device specific structures, macros and functions
- */
-
-#define SLGT_MAX_PORTS 4
-#define SLGT_REG_SIZE  256
-
-/*
- * conditional wait facility
- */
-struct cond_wait {
-        struct cond_wait *next;
-        wait_queue_head_t q;
-        wait_queue_t wait;
-        unsigned int data;
-};
-static void init_cond_wait(struct cond_wait *w, unsigned int data);
-static void add_cond_wait(struct cond_wait **head, struct cond_wait *w);
-static void remove_cond_wait(struct cond_wait **head, struct cond_wait *w);
-static void flush_cond_wait(struct cond_wait **head);
-
-/*
- * DMA buffer descriptor and access macros
- */
-struct slgt_desc
-{
-        __le16 count;
-        __le16 status;
-        __le32 pbuf;  /* physical address of data buffer */
-        __le32 next;  /* physical address of next descriptor */
-
-        /* driver book keeping */
-        char *buf;          /* virtual  address of data buffer */
-        unsigned int pdesc; /* physical address of this descriptor */
-        dma_addr_t buf_dma_addr;
-        unsigned short buf_count;
-};
-
-#define set_desc_buffer(a,b) (a).pbuf = cpu_to_le32((unsigned int)(b))
-#define set_desc_next(a,b) (a).next   = cpu_to_le32((unsigned int)(b))
-#define set_desc_count(a,b)(a).count  = cpu_to_le16((unsigned short)(b))
-#define set_desc_eof(a,b)  (a).status = cpu_to_le16((b) ? (le16_to_cpu((a).status) | BIT0) : (le16_to_cpu((a).status) & ~BIT0))
-#define set_desc_status(a, b) (a).status = cpu_to_le16((unsigned short)(b))
-#define desc_count(a)      (le16_to_cpu((a).count))
-#define desc_status(a)     (le16_to_cpu((a).status))
-#define desc_complete(a)   (le16_to_cpu((a).status) & BIT15)
-#define desc_eof(a)        (le16_to_cpu((a).status) & BIT2)
-#define desc_crc_error(a)  (le16_to_cpu((a).status) & BIT1)
-#define desc_abort(a)      (le16_to_cpu((a).status) & BIT0)
-#define desc_residue(a)    ((le16_to_cpu((a).status) & 0x38) >> 3)
-
-struct _input_signal_events {
-        int ri_up;
-        int ri_down;
-        int dsr_up;
-        int dsr_down;
-        int dcd_up;
-        int dcd_down;
-        int cts_up;
-        int cts_down;
-};
-
-/*
- * device instance data structure
- */
-struct slgt_info {
-        void *if_ptr;           /* General purpose pointer (used by SPPP) */
-        struct tty_port port;
-
-        struct slgt_info *next_device;  /* device list link */
-
-        int magic;
-
-        char device_name[25];
-        struct pci_dev *pdev;
-
-        int port_count;  /* count of ports on adapter */
-        int adapter_num; /* adapter instance number */
-        int port_num;    /* port instance number */
-
-        /* array of pointers to port contexts on this adapter */
-        struct slgt_info *port_array[SLGT_MAX_PORTS];
-
-        int                     line;           /* tty line instance number */
-
-        struct mgsl_icount      icount;
-
-        int                     timeout;
-        int                     x_char;         /* xon/xoff character */
-        unsigned int            read_status_mask;
-        unsigned int            ignore_status_mask;
-
-        wait_queue_head_t       status_event_wait_q;
-        wait_queue_head_t       event_wait_q;
-        struct timer_list       tx_timer;
-        struct timer_list       rx_timer;
-
-        unsigned int            gpio_present;
-        struct cond_wait        *gpio_wait_q;
-
-        spinlock_t lock;        /* spinlock for synchronizing with ISR */
-
-        struct work_struct task;
-        u32 pending_bh;
-        bool bh_requested;
-        bool bh_running;
-
-        int isr_overflow;
-        bool irq_requested;     /* true if IRQ requested */
-        bool irq_occurred;      /* for diagnostics use */
-
-        /* device configuration */
-
-        unsigned int bus_type;
-        unsigned int irq_level;
-        unsigned long irq_flags;
-
-        unsigned char __iomem * reg_addr;  /* memory mapped registers address */
-        u32 phys_reg_addr;
-        bool reg_addr_requested;
-
-        MGSL_PARAMS params;       /* communications parameters */
-        u32 idle_mode;
-        u32 max_frame_size;       /* as set by device config */
-
-        unsigned int rbuf_fill_level;
-        unsigned int rx_pio;
-        unsigned int if_mode;
-        unsigned int base_clock;
-
-        /* device status */
-
-        bool rx_enabled;
-        bool rx_restart;
-
-        bool tx_enabled;
-        bool tx_active;
-
-        unsigned char signals;    /* serial signal states */
-        int init_error;  /* initialization error */
-
-        unsigned char *tx_buf;
-        int tx_count;
-
-        char flag_buf[MAX_ASYNC_BUFFER_SIZE];
-        char char_buf[MAX_ASYNC_BUFFER_SIZE];
-        bool drop_rts_on_tx_done;
-        struct  _input_signal_events    input_signal_events;
-
-        int dcd_chkcount;       /* check counts to prevent */
-        int cts_chkcount;       /* too many IRQs if a signal */
-        int dsr_chkcount;       /* is floating */
-        int ri_chkcount;
-
-        char *bufs;             /* virtual address of DMA buffer lists */
-        dma_addr_t bufs_dma_addr; /* physical address of buffer descriptors */
-
-        unsigned int rbuf_count;
-        struct slgt_desc *rbufs;
-        unsigned int rbuf_current;
-        unsigned int rbuf_index;
-        unsigned int rbuf_fill_index;
-        unsigned short rbuf_fill_count;
-
-        unsigned int tbuf_count;
-        struct slgt_desc *tbufs;
-        unsigned int tbuf_current;
-        unsigned int tbuf_start;
-
-        unsigned char *tmp_rbuf;
-        unsigned int tmp_rbuf_count;
-
-        /* SPPP/Cisco HDLC device parts */
-
-        int netcount;
-        spinlock_t netlock;
-#if SYNCLINK_GENERIC_HDLC
-        struct net_device *netdev;
-#endif
-
-};
-
-static MGSL_PARAMS default_params = {
-        .mode            = MGSL_MODE_HDLC,
-        .loopback        = 0,
-        .flags           = HDLC_FLAG_UNDERRUN_ABORT15,
-        .encoding        = HDLC_ENCODING_NRZI_SPACE,
-        .clock_speed     = 0,
-        .addr_filter     = 0xff,
-        .crc_type        = HDLC_CRC_16_CCITT,
-        .preamble_length = HDLC_PREAMBLE_LENGTH_8BITS,
-        .preamble        = HDLC_PREAMBLE_PATTERN_NONE,
-        .data_rate       = 9600,
-        .data_bits       = 8,
-        .stop_bits       = 1,
-        .parity          = ASYNC_PARITY_NONE
-};
-
-
-#define BH_RECEIVE  1
-#define BH_TRANSMIT 2
-#define BH_STATUS   4
-#define IO_PIN_SHUTDOWN_LIMIT 100
-
-#define DMABUFSIZE 256
-#define DESC_LIST_SIZE 4096
-
-#define MASK_PARITY  BIT1
-#define MASK_FRAMING BIT0
-#define MASK_BREAK   BIT14
-#define MASK_OVERRUN BIT4
-
-#define GSR   0x00 /* global status */
-#define JCR   0x04 /* JTAG control */
-#define IODR  0x08 /* GPIO direction */
-#define IOER  0x0c /* GPIO interrupt enable */
-#define IOVR  0x10 /* GPIO value */
-#define IOSR  0x14 /* GPIO interrupt status */
-#define TDR   0x80 /* tx data */
-#define RDR   0x80 /* rx data */
-#define TCR   0x82 /* tx control */
-#define TIR   0x84 /* tx idle */
-#define TPR   0x85 /* tx preamble */
-#define RCR   0x86 /* rx control */
-#define VCR   0x88 /* V.24 control */
-#define CCR   0x89 /* clock control */
-#define BDR   0x8a /* baud divisor */
-#define SCR   0x8c /* serial control */
-#define SSR   0x8e /* serial status */
-#define RDCSR 0x90 /* rx DMA control/status */
-#define TDCSR 0x94 /* tx DMA control/status */
-#define RDDAR 0x98 /* rx DMA descriptor address */
-#define TDDAR 0x9c /* tx DMA descriptor address */
-
-#define RXIDLE      BIT14
-#define RXBREAK     BIT14
-#define IRQ_TXDATA  BIT13
-#define IRQ_TXIDLE  BIT12
-#define IRQ_TXUNDER BIT11 /* HDLC */
-#define IRQ_RXDATA  BIT10
-#define IRQ_RXIDLE  BIT9  /* HDLC */
-#define IRQ_RXBREAK BIT9  /* async */
-#define IRQ_RXOVER  BIT8
-#define IRQ_DSR     BIT7
-#define IRQ_CTS     BIT6
-#define IRQ_DCD     BIT5
-#define IRQ_RI      BIT4
-#define IRQ_ALL     0x3ff0
-#define IRQ_MASTER  BIT0
-
-#define slgt_irq_on(info, mask) \
-        wr_reg16((info), SCR, (unsigned short)(rd_reg16((info), SCR) | (mask)))
-#define slgt_irq_off(info, mask) \
-        wr_reg16((info), SCR, (unsigned short)(rd_reg16((info), SCR) & ~(mask)))
-
-static __u8  rd_reg8(struct slgt_info *info, unsigned int addr);
-static void  wr_reg8(struct slgt_info *info, unsigned int addr, __u8 value);
-static __u16 rd_reg16(struct slgt_info *info, unsigned int addr);
-static void  wr_reg16(struct slgt_info *info, unsigned int addr, __u16 value);
-static __u32 rd_reg32(struct slgt_info *info, unsigned int addr);
-static void  wr_reg32(struct slgt_info *info, unsigned int addr, __u32 value);
-
-static void  msc_set_vcr(struct slgt_info *info);
-
-static int  startup(struct slgt_info *info);
-static int  block_til_ready(struct tty_struct *tty, struct file * filp,struct slgt_info *info);
-static void shutdown(struct slgt_info *info);
-static void program_hw(struct slgt_info *info);
-static void change_params(struct slgt_info *info);
-
-static int  register_test(struct slgt_info *info);
-static int  irq_test(struct slgt_info *info);
-static int  loopback_test(struct slgt_info *info);
-static int  adapter_test(struct slgt_info *info);
-
-static void reset_adapter(struct slgt_info *info);
-static void reset_port(struct slgt_info *info);
-static void async_mode(struct slgt_info *info);
-static void sync_mode(struct slgt_info *info);
-
-static void rx_stop(struct slgt_info *info);
-static void rx_start(struct slgt_info *info);
-static void reset_rbufs(struct slgt_info *info);
-static void free_rbufs(struct slgt_info *info, unsigned int first, unsigned int last);
-static void rdma_reset(struct slgt_info *info);
-static bool rx_get_frame(struct slgt_info *info);
-static bool rx_get_buf(struct slgt_info *info);
-
-static void tx_start(struct slgt_info *info);
-static void tx_stop(struct slgt_info *info);
-static void tx_set_idle(struct slgt_info *info);
-static unsigned int free_tbuf_count(struct slgt_info *info);
-static unsigned int tbuf_bytes(struct slgt_info *info);
-static void reset_tbufs(struct slgt_info *info);
-static void tdma_reset(struct slgt_info *info);
-static bool tx_load(struct slgt_info *info, const char *buf, unsigned int count);
-
-static void get_signals(struct slgt_info *info);
-static void set_signals(struct slgt_info *info);
-static void enable_loopback(struct slgt_info *info);
-static void set_rate(struct slgt_info *info, u32 data_rate);
-
-static int  bh_action(struct slgt_info *info);
-static void bh_handler(struct work_struct *work);
-static void bh_transmit(struct slgt_info *info);
-static void isr_serial(struct slgt_info *info);
-static void isr_rdma(struct slgt_info *info);
-static void isr_txeom(struct slgt_info *info, unsigned short status);
-static void isr_tdma(struct slgt_info *info);
-
-static int  alloc_dma_bufs(struct slgt_info *info);
-static void free_dma_bufs(struct slgt_info *info);
-static int  alloc_desc(struct slgt_info *info);
-static void free_desc(struct slgt_info *info);
-static int  alloc_bufs(struct slgt_info *info, struct slgt_desc *bufs, int count);
-static void free_bufs(struct slgt_info *info, struct slgt_desc *bufs, int count);
-
-static int  alloc_tmp_rbuf(struct slgt_info *info);
-static void free_tmp_rbuf(struct slgt_info *info);
-
-static void tx_timeout(unsigned long context);
-static void rx_timeout(unsigned long context);
-
-/*
- * ioctl handlers
- */
-static int  get_stats(struct slgt_info *info, struct mgsl_icount __user *user_icount);
-static int  get_params(struct slgt_info *info, MGSL_PARAMS __user *params);
-static int  set_params(struct slgt_info *info, MGSL_PARAMS __user *params);
-static int  get_txidle(struct slgt_info *info, int __user *idle_mode);
-static int  set_txidle(struct slgt_info *info, int idle_mode);
-static int  tx_enable(struct slgt_info *info, int enable);
-static int  tx_abort(struct slgt_info *info);
-static int  rx_enable(struct slgt_info *info, int enable);
-static int  modem_input_wait(struct slgt_info *info,int arg);
-static int  wait_mgsl_event(struct slgt_info *info, int __user *mask_ptr);
-static int  tiocmget(struct tty_struct *tty, struct file *file);
-static int  tiocmset(struct tty_struct *tty, struct file *file,
-                     unsigned int set, unsigned int clear);
-static int set_break(struct tty_struct *tty, int break_state);
-static int  get_interface(struct slgt_info *info, int __user *if_mode);
-static int  set_interface(struct slgt_info *info, int if_mode);
-static int  set_gpio(struct slgt_info *info, struct gpio_desc __user *gpio);
-static int  get_gpio(struct slgt_info *info, struct gpio_desc __user *gpio);
-static int  wait_gpio(struct slgt_info *info, struct gpio_desc __user *gpio);
-
-/*
- * driver functions
- */
-static void add_device(struct slgt_info *info);
-static void device_init(int adapter_num, struct pci_dev *pdev);
-static int  claim_resources(struct slgt_info *info);
-static void release_resources(struct slgt_info *info);
-
-/*
- * DEBUG OUTPUT CODE
- */
-#ifndef DBGINFO
-#define DBGINFO(fmt)
-#endif
-#ifndef DBGERR
-#define DBGERR(fmt)
-#endif
-#ifndef DBGBH
-#define DBGBH(fmt)
-#endif
-#ifndef DBGISR
-#define DBGISR(fmt)
-#endif
-
-#ifdef DBGDATA
-static void trace_block(struct slgt_info *info, const char *data, int count, const char *label)
-{
-        int i;
-        int linecount;
-        printk("%s %s data:\n",info->device_name, label);
-        while(count) {
-                linecount = (count > 16) ? 16 : count;
-                for(i=0; i < linecount; i++)
-                        printk("%02X ",(unsigned char)data[i]);
-                for(;i<17;i++)
-                        printk("   ");
-                for(i=0;i<linecount;i++) {
-                        if (data[i]>=040 && data[i]<=0176)
-                                printk("%c",data[i]);
-                        else
-                                printk(".");
-                }
-                printk("\n");
-                data  += linecount;
-                count -= linecount;
-        }
-}
-#else
-#define DBGDATA(info, buf, size, label)
-#endif
-
-#ifdef DBGTBUF
-static void dump_tbufs(struct slgt_info *info)
-{
-        int i;
-        printk("tbuf_current=%d\n", info->tbuf_current);
-        for (i=0 ; i < info->tbuf_count ; i++) {
-                printk("%d: count=%04X status=%04X\n",
-                        i, le16_to_cpu(info->tbufs[i].count), le16_to_cpu(info->tbufs[i].status));
-        }
-}
-#else
-#define DBGTBUF(info)
-#endif
-
-#ifdef DBGRBUF
-static void dump_rbufs(struct slgt_info *info)
-{
-        int i;
-        printk("rbuf_current=%d\n", info->rbuf_current);
-        for (i=0 ; i < info->rbuf_count ; i++) {
-                printk("%d: count=%04X status=%04X\n",
-                        i, le16_to_cpu(info->rbufs[i].count), le16_to_cpu(info->rbufs[i].status));
-        }
-}
-#else
-#define DBGRBUF(info)
-#endif
-
-static inline int sanity_check(struct slgt_info *info, char *devname, const char *name)
-{
-#ifdef SANITY_CHECK
-        if (!info) {
-                printk("null struct slgt_info for (%s) in %s\n", devname, name);
-                return 1;
-        }
-        if (info->magic != MGSL_MAGIC) {
-                printk("bad magic number struct slgt_info (%s) in %s\n", devname, name);
-                return 1;
-        }
-#else
-        if (!info)
-                return 1;
-#endif
-        return 0;
-}
-
-/**
- * line discipline callback wrappers
- *
- * The wrappers maintain line discipline references
- * while calling into the line discipline.
- *
- * ldisc_receive_buf  - pass receive data to line discipline
- */
-static void ldisc_receive_buf(struct tty_struct *tty,
-                              const __u8 *data, char *flags, int count)
-{
-        struct tty_ldisc *ld;
-        if (!tty)
-                return;
-        ld = tty_ldisc_ref(tty);
-        if (ld) {
-                if (ld->ops->receive_buf)
-                        ld->ops->receive_buf(tty, data, flags, count);
-                tty_ldisc_deref(ld);
-        }
-}
-
-/* tty callbacks */
-
-static int open(struct tty_struct *tty, struct file *filp)
-{
-        struct slgt_info *info;
-        int retval, line;
-        unsigned long flags;
-
-        line = tty->index;
-        if ((line < 0) || (line >= slgt_device_count)) {
-                DBGERR(("%s: open with invalid line #%d.\n", driver_name, line));
-                return -ENODEV;
-        }
-
-        info = slgt_device_list;
-        while(info && info->line != line)
-                info = info->next_device;
-        if (sanity_check(info, tty->name, "open"))
-                return -ENODEV;
-        if (info->init_error) {
-                DBGERR(("%s init error=%d\n", info->device_name, info->init_error));
-                return -ENODEV;
-        }
-
-        tty->driver_data = info;
-        info->port.tty = tty;
-
-        DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
-
-        /* If port is closing, signal caller to try again */
-        if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
-                if (info->port.flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->port.close_wait);
-                retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
-                        -EAGAIN : -ERESTARTSYS);
-                goto cleanup;
-        }
-
-        mutex_lock(&info->port.mutex);
-        info->port.tty->low_latency = (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-
-        spin_lock_irqsave(&info->netlock, flags);
-        if (info->netcount) {
-                retval = -EBUSY;
-                spin_unlock_irqrestore(&info->netlock, flags);
-                mutex_unlock(&info->port.mutex);
-                goto cleanup;
-        }
-        info->port.count++;
-        spin_unlock_irqrestore(&info->netlock, flags);
-
-        if (info->port.count == 1) {
-                /* 1st open on this device, init hardware */
-                retval = startup(info);
-                if (retval < 0) {
-                        mutex_unlock(&info->port.mutex);
-                        goto cleanup;
-                }
-        }
-        mutex_unlock(&info->port.mutex);
-        retval = block_til_ready(tty, filp, info);
-        if (retval) {
-                DBGINFO(("%s block_til_ready rc=%d\n", info->device_name, retval));
-                goto cleanup;
-        }
-
-        retval = 0;
-
-cleanup:
-        if (retval) {
-                if (tty->count == 1)
-                        info->port.tty = NULL; /* tty layer will release tty struct */
-                if(info->port.count)
-                        info->port.count--;
-        }
-
-        DBGINFO(("%s open rc=%d\n", info->device_name, retval));
-        return retval;
-}
-
-static void close(struct tty_struct *tty, struct file *filp)
-{
-        struct slgt_info *info = tty->driver_data;
-
-        if (sanity_check(info, tty->name, "close"))
-                return;
-        DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
-
-        if (tty_port_close_start(&info->port, tty, filp) == 0)
-                goto cleanup;
-
-        mutex_lock(&info->port.mutex);
-        if (info->port.flags & ASYNC_INITIALIZED)
-                wait_until_sent(tty, info->timeout);
-        flush_buffer(tty);
-        tty_ldisc_flush(tty);
-
-        shutdown(info);
-        mutex_unlock(&info->port.mutex);
-
-        tty_port_close_end(&info->port, tty);
-        info->port.tty = NULL;
-cleanup:
-        DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
-}
-
-static void hangup(struct tty_struct *tty)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "hangup"))
-                return;
-        DBGINFO(("%s hangup\n", info->device_name));
-
-        flush_buffer(tty);
-
-        mutex_lock(&info->port.mutex);
-        shutdown(info);
-
-        spin_lock_irqsave(&info->port.lock, flags);
-        info->port.count = 0;
-        info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->port.tty = NULL;
-        spin_unlock_irqrestore(&info->port.lock, flags);
-        mutex_unlock(&info->port.mutex);
-
-        wake_up_interruptible(&info->port.open_wait);
-}
-
-static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-
-        DBGINFO(("%s set_termios\n", tty->driver->name));
-
-        change_params(info);
-
-        /* Handle transition to B0 status */
-        if (old_termios->c_cflag & CBAUD &&
-            !(tty->termios->c_cflag & CBAUD)) {
-                info->signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
-                spin_lock_irqsave(&info->lock,flags);
-                set_signals(info);
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-
-        /* Handle transition away from B0 status */
-        if (!(old_termios->c_cflag & CBAUD) &&
-            tty->termios->c_cflag & CBAUD) {
-                info->signals |= SerialSignal_DTR;
-                if (!(tty->termios->c_cflag & CRTSCTS) ||
-                    !test_bit(TTY_THROTTLED, &tty->flags)) {
-                        info->signals |= SerialSignal_RTS;
-                }
-                spin_lock_irqsave(&info->lock,flags);
-                set_signals(info);
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-
-        /* Handle turning off CRTSCTS */
-        if (old_termios->c_cflag & CRTSCTS &&
-            !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-                tx_release(tty);
-        }
-}
-
-static void update_tx_timer(struct slgt_info *info)
-{
-        /*
-         * use worst case speed of 1200bps to calculate transmit timeout
-         * based on data in buffers (tbuf_bytes) and FIFO (128 bytes)
-         */
-        if (info->params.mode == MGSL_MODE_HDLC) {
-                int timeout  = (tbuf_bytes(info) * 7) + 1000;
-                mod_timer(&info->tx_timer, jiffies + msecs_to_jiffies(timeout));
-        }
-}
-
-static int write(struct tty_struct *tty,
-                 const unsigned char *buf, int count)
-{
-        int ret = 0;
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "write"))
-                return -EIO;
-
-        DBGINFO(("%s write count=%d\n", info->device_name, count));
-
-        if (!info->tx_buf || (count > info->max_frame_size))
-                return -EIO;
-
-        if (!count || tty->stopped || tty->hw_stopped)
-                return 0;
-
-        spin_lock_irqsave(&info->lock, flags);
-
-        if (info->tx_count) {
-                /* send accumulated data from send_char() */
-                if (!tx_load(info, info->tx_buf, info->tx_count))
-                        goto cleanup;
-                info->tx_count = 0;
-        }
-
-        if (tx_load(info, buf, count))
-                ret = count;
-
-cleanup:
-        spin_unlock_irqrestore(&info->lock, flags);
-        DBGINFO(("%s write rc=%d\n", info->device_name, ret));
-        return ret;
-}
-
-static int put_char(struct tty_struct *tty, unsigned char ch)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-        int ret = 0;
-
-        if (sanity_check(info, tty->name, "put_char"))
-                return 0;
-        DBGINFO(("%s put_char(%d)\n", info->device_name, ch));
-        if (!info->tx_buf)
-                return 0;
-        spin_lock_irqsave(&info->lock,flags);
-        if (info->tx_count < info->max_frame_size) {
-                info->tx_buf[info->tx_count++] = ch;
-                ret = 1;
-        }
-        spin_unlock_irqrestore(&info->lock,flags);
-        return ret;
-}
-
-static void send_xchar(struct tty_struct *tty, char ch)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "send_xchar"))
-                return;
-        DBGINFO(("%s send_xchar(%d)\n", info->device_name, ch));
-        info->x_char = ch;
-        if (ch) {
-                spin_lock_irqsave(&info->lock,flags);
-                if (!info->tx_enabled)
-                        tx_start(info);
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-}
-
-static void wait_until_sent(struct tty_struct *tty, int timeout)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long orig_jiffies, char_time;
-
-        if (!info )
-                return;
-        if (sanity_check(info, tty->name, "wait_until_sent"))
-                return;
-        DBGINFO(("%s wait_until_sent entry\n", info->device_name));
-        if (!(info->port.flags & ASYNC_INITIALIZED))
-                goto exit;
-
-        orig_jiffies = jiffies;
-
-        /* Set check interval to 1/5 of estimated time to
-         * send a character, and make it at least 1. The check
-         * interval should also be less than the timeout.
-         * Note: use tight timings here to satisfy the NIST-PCTS.
-         */
-
-        if (info->params.data_rate) {
-                char_time = info->timeout/(32 * 5);
-                if (!char_time)
-                        char_time++;
-        } else
-                char_time = 1;
-
-        if (timeout)
-                char_time = min_t(unsigned long, char_time, timeout);
-
-        while (info->tx_active) {
-                msleep_interruptible(jiffies_to_msecs(char_time));
-                if (signal_pending(current))
-                        break;
-                if (timeout && time_after(jiffies, orig_jiffies + timeout))
-                        break;
-        }
-exit:
-        DBGINFO(("%s wait_until_sent exit\n", info->device_name));
-}
-
-static int write_room(struct tty_struct *tty)
-{
-        struct slgt_info *info = tty->driver_data;
-        int ret;
-
-        if (sanity_check(info, tty->name, "write_room"))
-                return 0;
-        ret = (info->tx_active) ? 0 : HDLC_MAX_FRAME_SIZE;
-        DBGINFO(("%s write_room=%d\n", info->device_name, ret));
-        return ret;
-}
-
-static void flush_chars(struct tty_struct *tty)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "flush_chars"))
-                return;
-        DBGINFO(("%s flush_chars entry tx_count=%d\n", info->device_name, info->tx_count));
-
-        if (info->tx_count <= 0 || tty->stopped ||
-            tty->hw_stopped || !info->tx_buf)
-                return;
-
-        DBGINFO(("%s flush_chars start transmit\n", info->device_name));
-
-        spin_lock_irqsave(&info->lock,flags);
-        if (info->tx_count && tx_load(info, info->tx_buf, info->tx_count))
-                info->tx_count = 0;
-        spin_unlock_irqrestore(&info->lock,flags);
-}
-
-static void flush_buffer(struct tty_struct *tty)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "flush_buffer"))
-                return;
-        DBGINFO(("%s flush_buffer\n", info->device_name));
-
-        spin_lock_irqsave(&info->lock, flags);
-        info->tx_count = 0;
-        spin_unlock_irqrestore(&info->lock, flags);
-
-        tty_wakeup(tty);
-}
-
-/*
- * throttle (stop) transmitter
- */
-static void tx_hold(struct tty_struct *tty)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "tx_hold"))
-                return;
-        DBGINFO(("%s tx_hold\n", info->device_name));
-        spin_lock_irqsave(&info->lock,flags);
-        if (info->tx_enabled && info->params.mode == MGSL_MODE_ASYNC)
-                tx_stop(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-}
-
-/*
- * release (start) transmitter
- */
-static void tx_release(struct tty_struct *tty)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "tx_release"))
-                return;
-        DBGINFO(("%s tx_release\n", info->device_name));
-        spin_lock_irqsave(&info->lock, flags);
-        if (info->tx_count && tx_load(info, info->tx_buf, info->tx_count))
-                info->tx_count = 0;
-        spin_unlock_irqrestore(&info->lock, flags);
-}
-
-/*
- * Service an IOCTL request
- *
- * Arguments
- *
- *      tty     pointer to tty instance data
- *      file    pointer to associated file object for device
- *      cmd     IOCTL command code
- *      arg     command argument/context
- *
- * Return 0 if success, otherwise error code
- */
-static int ioctl(struct tty_struct *tty, struct file *file,
-                 unsigned int cmd, unsigned long arg)
-{
-        struct slgt_info *info = tty->driver_data;
-        struct mgsl_icount cnow;        /* kernel counter temps */
-        struct serial_icounter_struct __user *p_cuser;  /* user space */
-        unsigned long flags;
-        void __user *argp = (void __user *)arg;
-        int ret;
-
-        if (sanity_check(info, tty->name, "ioctl"))
-                return -ENODEV;
-        DBGINFO(("%s ioctl() cmd=%08X\n", info->device_name, cmd));
-
-        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-            (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-                if (tty->flags & (1 << TTY_IO_ERROR))
-                    return -EIO;
-        }
-
-        switch (cmd) {
-        case MGSL_IOCWAITEVENT:
-                return wait_mgsl_event(info, argp);
-        case TIOCMIWAIT:
-                return modem_input_wait(info,(int)arg);
-        case TIOCGICOUNT:
-                spin_lock_irqsave(&info->lock,flags);
-                cnow = info->icount;
-                spin_unlock_irqrestore(&info->lock,flags);
-                p_cuser = argp;
-                if (put_user(cnow.cts, &p_cuser->cts) ||
-                    put_user(cnow.dsr, &p_cuser->dsr) ||
-                    put_user(cnow.rng, &p_cuser->rng) ||
-                    put_user(cnow.dcd, &p_cuser->dcd) ||
-                    put_user(cnow.rx, &p_cuser->rx) ||
-                    put_user(cnow.tx, &p_cuser->tx) ||
-                    put_user(cnow.frame, &p_cuser->frame) ||
-                    put_user(cnow.overrun, &p_cuser->overrun) ||
-                    put_user(cnow.parity, &p_cuser->parity) ||
-                    put_user(cnow.brk, &p_cuser->brk) ||
-                    put_user(cnow.buf_overrun, &p_cuser->buf_overrun))
-                        return -EFAULT;
-                return 0;
-        case MGSL_IOCSGPIO:
-                return set_gpio(info, argp);
-        case MGSL_IOCGGPIO:
-                return get_gpio(info, argp);
-        case MGSL_IOCWAITGPIO:
-                return wait_gpio(info, argp);
-        }
-        mutex_lock(&info->port.mutex);
-        switch (cmd) {
-        case MGSL_IOCGPARAMS:
-                ret = get_params(info, argp);
-                break;
-        case MGSL_IOCSPARAMS:
-                ret = set_params(info, argp);
-                break;
-        case MGSL_IOCGTXIDLE:
-                ret = get_txidle(info, argp);
-                break;
-        case MGSL_IOCSTXIDLE:
-                ret = set_txidle(info, (int)arg);
-                break;
-        case MGSL_IOCTXENABLE:
-                ret = tx_enable(info, (int)arg);
-                break;
-        case MGSL_IOCRXENABLE:
-                ret = rx_enable(info, (int)arg);
-                break;
-        case MGSL_IOCTXABORT:
-                ret = tx_abort(info);
-                break;
-        case MGSL_IOCGSTATS:
-                ret = get_stats(info, argp);
-                break;
-        case MGSL_IOCGIF:
-                ret = get_interface(info, argp);
-                break;
-        case MGSL_IOCSIF:
-                ret = set_interface(info,(int)arg);
-                break;
-        default:
-                ret = -ENOIOCTLCMD;
-        }
-        mutex_unlock(&info->port.mutex);
-        return ret;
-}
-
-/*
- * support for 32 bit ioctl calls on 64 bit systems
- */
-#ifdef CONFIG_COMPAT
-static long get_params32(struct slgt_info *info, struct MGSL_PARAMS32 __user *user_params)
-{
-        struct MGSL_PARAMS32 tmp_params;
-
-        DBGINFO(("%s get_params32\n", info->device_name));
-        tmp_params.mode            = (compat_ulong_t)info->params.mode;
-        tmp_params.loopback        = info->params.loopback;
-        tmp_params.flags           = info->params.flags;
-        tmp_params.encoding        = info->params.encoding;
-        tmp_params.clock_speed     = (compat_ulong_t)info->params.clock_speed;
-        tmp_params.addr_filter     = info->params.addr_filter;
-        tmp_params.crc_type        = info->params.crc_type;
-        tmp_params.preamble_length = info->params.preamble_length;
-        tmp_params.preamble        = info->params.preamble;
-        tmp_params.data_rate       = (compat_ulong_t)info->params.data_rate;
-        tmp_params.data_bits       = info->params.data_bits;
-        tmp_params.stop_bits       = info->params.stop_bits;
-        tmp_params.parity          = info->params.parity;
-        if (copy_to_user(user_params, &tmp_params, sizeof(struct MGSL_PARAMS32)))
-                return -EFAULT;
-        return 0;
-}
-
-static long set_params32(struct slgt_info *info, struct MGSL_PARAMS32 __user *new_params)
-{
-        struct MGSL_PARAMS32 tmp_params;
-
-        DBGINFO(("%s set_params32\n", info->device_name));
-        if (copy_from_user(&tmp_params, new_params, sizeof(struct MGSL_PARAMS32)))
-                return -EFAULT;
-
-        spin_lock(&info->lock);
-        if (tmp_params.mode == MGSL_MODE_BASE_CLOCK) {
-                info->base_clock = tmp_params.clock_speed;
-        } else {
-                info->params.mode            = tmp_params.mode;
-                info->params.loopback        = tmp_params.loopback;
-                info->params.flags           = tmp_params.flags;
-                info->params.encoding        = tmp_params.encoding;
-                info->params.clock_speed     = tmp_params.clock_speed;
-                info->params.addr_filter     = tmp_params.addr_filter;
-                info->params.crc_type        = tmp_params.crc_type;
-                info->params.preamble_length = tmp_params.preamble_length;
-                info->params.preamble        = tmp_params.preamble;
-                info->params.data_rate       = tmp_params.data_rate;
-                info->params.data_bits       = tmp_params.data_bits;
-                info->params.stop_bits       = tmp_params.stop_bits;
-                info->params.parity          = tmp_params.parity;
-        }
-        spin_unlock(&info->lock);
-
-        program_hw(info);
-
-        return 0;
-}
-
-static long slgt_compat_ioctl(struct tty_struct *tty, struct file *file,
-                         unsigned int cmd, unsigned long arg)
-{
-        struct slgt_info *info = tty->driver_data;
-        int rc = -ENOIOCTLCMD;
-
-        if (sanity_check(info, tty->name, "compat_ioctl"))
-                return -ENODEV;
-        DBGINFO(("%s compat_ioctl() cmd=%08X\n", info->device_name, cmd));
-
-        switch (cmd) {
-
-        case MGSL_IOCSPARAMS32:
-                rc = set_params32(info, compat_ptr(arg));
-                break;
-
-        case MGSL_IOCGPARAMS32:
-                rc = get_params32(info, compat_ptr(arg));
-                break;
-
-        case MGSL_IOCGPARAMS:
-        case MGSL_IOCSPARAMS:
-        case MGSL_IOCGTXIDLE:
-        case MGSL_IOCGSTATS:
-        case MGSL_IOCWAITEVENT:
-        case MGSL_IOCGIF:
-        case MGSL_IOCSGPIO:
-        case MGSL_IOCGGPIO:
-        case MGSL_IOCWAITGPIO:
-        case TIOCGICOUNT:
-                rc = ioctl(tty, file, cmd, (unsigned long)(compat_ptr(arg)));
-                break;
-
-        case MGSL_IOCSTXIDLE:
-        case MGSL_IOCTXENABLE:
-        case MGSL_IOCRXENABLE:
-        case MGSL_IOCTXABORT:
-        case TIOCMIWAIT:
-        case MGSL_IOCSIF:
-                rc = ioctl(tty, file, cmd, arg);
-                break;
-        }
-
-        DBGINFO(("%s compat_ioctl() cmd=%08X rc=%d\n", info->device_name, cmd, rc));
-        return rc;
-}
-#else
-#define slgt_compat_ioctl NULL
-#endif /* ifdef CONFIG_COMPAT */
-
-/*
- * proc fs support
- */
-static inline void line_info(struct seq_file *m, struct slgt_info *info)
-{
-        char stat_buf[30];
-        unsigned long flags;
-
-        seq_printf(m, "%s: IO=%08X IRQ=%d MaxFrameSize=%u\n",
-                      info->device_name, info->phys_reg_addr,
-                      info->irq_level, info->max_frame_size);
-
-        /* output current serial signal states */
-        spin_lock_irqsave(&info->lock,flags);
-        get_signals(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        stat_buf[0] = 0;
-        stat_buf[1] = 0;
-        if (info->signals & SerialSignal_RTS)
-                strcat(stat_buf, "|RTS");
-        if (info->signals & SerialSignal_CTS)
-                strcat(stat_buf, "|CTS");
-        if (info->signals & SerialSignal_DTR)
-                strcat(stat_buf, "|DTR");
-        if (info->signals & SerialSignal_DSR)
-                strcat(stat_buf, "|DSR");
-        if (info->signals & SerialSignal_DCD)
-                strcat(stat_buf, "|CD");
-        if (info->signals & SerialSignal_RI)
-                strcat(stat_buf, "|RI");
-
-        if (info->params.mode != MGSL_MODE_ASYNC) {
-                seq_printf(m, "\tHDLC txok:%d rxok:%d",
-                               info->icount.txok, info->icount.rxok);
-                if (info->icount.txunder)
-                        seq_printf(m, " txunder:%d", info->icount.txunder);
-                if (info->icount.txabort)
-                        seq_printf(m, " txabort:%d", info->icount.txabort);
-                if (info->icount.rxshort)
-                        seq_printf(m, " rxshort:%d", info->icount.rxshort);
-                if (info->icount.rxlong)
-                        seq_printf(m, " rxlong:%d", info->icount.rxlong);
-                if (info->icount.rxover)
-                        seq_printf(m, " rxover:%d", info->icount.rxover);
-                if (info->icount.rxcrc)
-                        seq_printf(m, " rxcrc:%d", info->icount.rxcrc);
-        } else {
-                seq_printf(m, "\tASYNC tx:%d rx:%d",
-                               info->icount.tx, info->icount.rx);
-                if (info->icount.frame)
-                        seq_printf(m, " fe:%d", info->icount.frame);
-                if (info->icount.parity)
-                        seq_printf(m, " pe:%d", info->icount.parity);
-                if (info->icount.brk)
-                        seq_printf(m, " brk:%d", info->icount.brk);
-                if (info->icount.overrun)
-                        seq_printf(m, " oe:%d", info->icount.overrun);
-        }
-
-        /* Append serial signal status to end */
-        seq_printf(m, " %s\n", stat_buf+1);
-
-        seq_printf(m, "\ttxactive=%d bh_req=%d bh_run=%d pending_bh=%x\n",
-                       info->tx_active,info->bh_requested,info->bh_running,
-                       info->pending_bh);
-}
-
-/* Called to print information about devices
- */
-static int synclink_gt_proc_show(struct seq_file *m, void *v)
-{
-        struct slgt_info *info;
-
-        seq_puts(m, "synclink_gt driver\n");
-
-        info = slgt_device_list;
-        while( info ) {
-                line_info(m, info);
-                info = info->next_device;
-        }
-        return 0;
-}
-
-static int synclink_gt_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, synclink_gt_proc_show, NULL);
-}
-
-static const struct file_operations synclink_gt_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = synclink_gt_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-/*
- * return count of bytes in transmit buffer
- */
-static int chars_in_buffer(struct tty_struct *tty)
-{
-        struct slgt_info *info = tty->driver_data;
-        int count;
-        if (sanity_check(info, tty->name, "chars_in_buffer"))
-                return 0;
-        count = tbuf_bytes(info);
-        DBGINFO(("%s chars_in_buffer()=%d\n", info->device_name, count));
-        return count;
-}
-
-/*
- * signal remote device to throttle send data (our receive data)
- */
-static void throttle(struct tty_struct * tty)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "throttle"))
-                return;
-        DBGINFO(("%s throttle\n", info->device_name));
-        if (I_IXOFF(tty))
-                send_xchar(tty, STOP_CHAR(tty));
-        if (tty->termios->c_cflag & CRTSCTS) {
-                spin_lock_irqsave(&info->lock,flags);
-                info->signals &= ~SerialSignal_RTS;
-                set_signals(info);
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-}
-
-/*
- * signal remote device to stop throttling send data (our receive data)
- */
-static void unthrottle(struct tty_struct * tty)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "unthrottle"))
-                return;
-        DBGINFO(("%s unthrottle\n", info->device_name));
-        if (I_IXOFF(tty)) {
-                if (info->x_char)
-                        info->x_char = 0;
-                else
-                        send_xchar(tty, START_CHAR(tty));
-        }
-        if (tty->termios->c_cflag & CRTSCTS) {
-                spin_lock_irqsave(&info->lock,flags);
-                info->signals |= SerialSignal_RTS;
-                set_signals(info);
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-}
-
-/*
- * set or clear transmit break condition
- * break_state  -1=set break condition, 0=clear
- */
-static int set_break(struct tty_struct *tty, int break_state)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned short value;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "set_break"))
-                return -EINVAL;
-        DBGINFO(("%s set_break(%d)\n", info->device_name, break_state));
-
-        spin_lock_irqsave(&info->lock,flags);
-        value = rd_reg16(info, TCR);
-        if (break_state == -1)
-                value |= BIT6;
-        else
-                value &= ~BIT6;
-        wr_reg16(info, TCR, value);
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-#if SYNCLINK_GENERIC_HDLC
-
-/**
- * called by generic HDLC layer when protocol selected (PPP, frame relay, etc.)
- * set encoding and frame check sequence (FCS) options
- *
- * dev       pointer to network device structure
- * encoding  serial encoding setting
- * parity    FCS setting
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
-                          unsigned short parity)
-{
-        struct slgt_info *info = dev_to_port(dev);
-        unsigned char  new_encoding;
-        unsigned short new_crctype;
-
-        /* return error if TTY interface open */
-        if (info->port.count)
-                return -EBUSY;
-
-        DBGINFO(("%s hdlcdev_attach\n", info->device_name));
-
-        switch (encoding)
-        {
-        case ENCODING_NRZ:        new_encoding = HDLC_ENCODING_NRZ; break;
-        case ENCODING_NRZI:       new_encoding = HDLC_ENCODING_NRZI_SPACE; break;
-        case ENCODING_FM_MARK:    new_encoding = HDLC_ENCODING_BIPHASE_MARK; break;
-        case ENCODING_FM_SPACE:   new_encoding = HDLC_ENCODING_BIPHASE_SPACE; break;
-        case ENCODING_MANCHESTER: new_encoding = HDLC_ENCODING_BIPHASE_LEVEL; break;
-        default: return -EINVAL;
-        }
-
-        switch (parity)
-        {
-        case PARITY_NONE:            new_crctype = HDLC_CRC_NONE; break;
-        case PARITY_CRC16_PR1_CCITT: new_crctype = HDLC_CRC_16_CCITT; break;
-        case PARITY_CRC32_PR1_CCITT: new_crctype = HDLC_CRC_32_CCITT; break;
-        default: return -EINVAL;
-        }
-
-        info->params.encoding = new_encoding;
-        info->params.crc_type = new_crctype;
-
-        /* if network interface up, reprogram hardware */
-        if (info->netcount)
-                program_hw(info);
-
-        return 0;
-}
-
-/**
- * called by generic HDLC layer to send frame
- *
- * skb  socket buffer containing HDLC frame
- * dev  pointer to network device structure
- */
-static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,
-                                      struct net_device *dev)
-{
-        struct slgt_info *info = dev_to_port(dev);
-        unsigned long flags;
-
-        DBGINFO(("%s hdlc_xmit\n", dev->name));
-
-        if (!skb->len)
-                return NETDEV_TX_OK;
-
-        /* stop sending until this frame completes */
-        netif_stop_queue(dev);
-
-        /* update network statistics */
-        dev->stats.tx_packets++;
-        dev->stats.tx_bytes += skb->len;
-
-        /* save start time for transmit timeout detection */
-        dev->trans_start = jiffies;
-
-        spin_lock_irqsave(&info->lock, flags);
-        tx_load(info, skb->data, skb->len);
-        spin_unlock_irqrestore(&info->lock, flags);
-
-        /* done with socket buffer, so free it */
-        dev_kfree_skb(skb);
-
-        return NETDEV_TX_OK;
-}
-
-/**
- * called by network layer when interface enabled
- * claim resources and initialize hardware
- *
- * dev  pointer to network device structure
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_open(struct net_device *dev)
-{
-        struct slgt_info *info = dev_to_port(dev);
-        int rc;
-        unsigned long flags;
-
-        if (!try_module_get(THIS_MODULE))
-                return -EBUSY;
-
-        DBGINFO(("%s hdlcdev_open\n", dev->name));
-
-        /* generic HDLC layer open processing */
-        if ((rc = hdlc_open(dev)))
-                return rc;
-
-        /* arbitrate between network and tty opens */
-        spin_lock_irqsave(&info->netlock, flags);
-        if (info->port.count != 0 || info->netcount != 0) {
-                DBGINFO(("%s hdlc_open busy\n", dev->name));
-                spin_unlock_irqrestore(&info->netlock, flags);
-                return -EBUSY;
-        }
-        info->netcount=1;
-        spin_unlock_irqrestore(&info->netlock, flags);
-
-        /* claim resources and init adapter */
-        if ((rc = startup(info)) != 0) {
-                spin_lock_irqsave(&info->netlock, flags);
-                info->netcount=0;
-                spin_unlock_irqrestore(&info->netlock, flags);
-                return rc;
-        }
-
-        /* assert DTR and RTS, apply hardware settings */
-        info->signals |= SerialSignal_RTS + SerialSignal_DTR;
-        program_hw(info);
-
-        /* enable network layer transmit */
-        dev->trans_start = jiffies;
-        netif_start_queue(dev);
-
-        /* inform generic HDLC layer of current DCD status */
-        spin_lock_irqsave(&info->lock, flags);
-        get_signals(info);
-        spin_unlock_irqrestore(&info->lock, flags);
-        if (info->signals & SerialSignal_DCD)
-                netif_carrier_on(dev);
-        else
-                netif_carrier_off(dev);
-        return 0;
-}
-
-/**
- * called by network layer when interface is disabled
- * shutdown hardware and release resources
- *
- * dev  pointer to network device structure
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_close(struct net_device *dev)
-{
-        struct slgt_info *info = dev_to_port(dev);
-        unsigned long flags;
-
-        DBGINFO(("%s hdlcdev_close\n", dev->name));
-
-        netif_stop_queue(dev);
-
-        /* shutdown adapter and release resources */
-        shutdown(info);
-
-        hdlc_close(dev);
-
-        spin_lock_irqsave(&info->netlock, flags);
-        info->netcount=0;
-        spin_unlock_irqrestore(&info->netlock, flags);
-
-        module_put(THIS_MODULE);
-        return 0;
-}
-
-/**
- * called by network layer to process IOCTL call to network device
- *
- * dev  pointer to network device structure
- * ifr  pointer to network interface request structure
- * cmd  IOCTL command code
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-        const size_t size = sizeof(sync_serial_settings);
-        sync_serial_settings new_line;
-        sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync;
-        struct slgt_info *info = dev_to_port(dev);
-        unsigned int flags;
-
-        DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
-
-        /* return error if TTY interface open */
-        if (info->port.count)
-                return -EBUSY;
-
-        if (cmd != SIOCWANDEV)
-                return hdlc_ioctl(dev, ifr, cmd);
-
-        switch(ifr->ifr_settings.type) {
-        case IF_GET_IFACE: /* return current sync_serial_settings */
-
-                ifr->ifr_settings.type = IF_IFACE_SYNC_SERIAL;
-                if (ifr->ifr_settings.size < size) {
-                        ifr->ifr_settings.size = size; /* data size wanted */
-                        return -ENOBUFS;
-                }
-
-                flags = info->params.flags & (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_RXC_DPLL |
-                                              HDLC_FLAG_RXC_BRG    | HDLC_FLAG_RXC_TXCPIN |
-                                              HDLC_FLAG_TXC_TXCPIN | HDLC_FLAG_TXC_DPLL |
-                                              HDLC_FLAG_TXC_BRG    | HDLC_FLAG_TXC_RXCPIN);
-
-                switch (flags){
-                case (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_TXCPIN): new_line.clock_type = CLOCK_EXT; break;
-                case (HDLC_FLAG_RXC_BRG    | HDLC_FLAG_TXC_BRG):    new_line.clock_type = CLOCK_INT; break;
-                case (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_BRG):    new_line.clock_type = CLOCK_TXINT; break;
-                case (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_RXCPIN): new_line.clock_type = CLOCK_TXFROMRX; break;
-                default: new_line.clock_type = CLOCK_DEFAULT;
-                }
-
-                new_line.clock_rate = info->params.clock_speed;
-                new_line.loopback   = info->params.loopback ? 1:0;
-
-                if (copy_to_user(line, &new_line, size))
-                        return -EFAULT;
-                return 0;
-
-        case IF_IFACE_SYNC_SERIAL: /* set sync_serial_settings */
-
-                if(!capable(CAP_NET_ADMIN))
-                        return -EPERM;
-                if (copy_from_user(&new_line, line, size))
-                        return -EFAULT;
-
-                switch (new_line.clock_type)
-                {
-                case CLOCK_EXT:      flags = HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_TXCPIN; break;
-                case CLOCK_TXFROMRX: flags = HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_RXCPIN; break;
-                case CLOCK_INT:      flags = HDLC_FLAG_RXC_BRG    | HDLC_FLAG_TXC_BRG;    break;
-                case CLOCK_TXINT:    flags = HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_BRG;    break;
-                case CLOCK_DEFAULT:  flags = info->params.flags &
-                                             (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_RXC_DPLL |
-                                              HDLC_FLAG_RXC_BRG    | HDLC_FLAG_RXC_TXCPIN |
-                                              HDLC_FLAG_TXC_TXCPIN | HDLC_FLAG_TXC_DPLL |
-                                              HDLC_FLAG_TXC_BRG    | HDLC_FLAG_TXC_RXCPIN); break;
-                default: return -EINVAL;
-                }
-
-                if (new_line.loopback != 0 && new_line.loopback != 1)
-                        return -EINVAL;
-
-                info->params.flags &= ~(HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_RXC_DPLL |
-                                        HDLC_FLAG_RXC_BRG    | HDLC_FLAG_RXC_TXCPIN |
-                                        HDLC_FLAG_TXC_TXCPIN | HDLC_FLAG_TXC_DPLL |
-                                        HDLC_FLAG_TXC_BRG    | HDLC_FLAG_TXC_RXCPIN);
-                info->params.flags |= flags;
-
-                info->params.loopback = new_line.loopback;
-
-                if (flags & (HDLC_FLAG_RXC_BRG | HDLC_FLAG_TXC_BRG))
-                        info->params.clock_speed = new_line.clock_rate;
-                else
-                        info->params.clock_speed = 0;
-
-                /* if network interface up, reprogram hardware */
-                if (info->netcount)
-                        program_hw(info);
-                return 0;
-
-        default:
-                return hdlc_ioctl(dev, ifr, cmd);
-        }
-}
-
-/**
- * called by network layer when transmit timeout is detected
- *
- * dev  pointer to network device structure
- */
-static void hdlcdev_tx_timeout(struct net_device *dev)
-{
-        struct slgt_info *info = dev_to_port(dev);
-        unsigned long flags;
-
-        DBGINFO(("%s hdlcdev_tx_timeout\n", dev->name));
-
-        dev->stats.tx_errors++;
-        dev->stats.tx_aborted_errors++;
-
-        spin_lock_irqsave(&info->lock,flags);
-        tx_stop(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        netif_wake_queue(dev);
-}
-
-/**
- * called by device driver when transmit completes
- * reenable network layer transmit if stopped
- *
- * info  pointer to device instance information
- */
-static void hdlcdev_tx_done(struct slgt_info *info)
-{
-        if (netif_queue_stopped(info->netdev))
-                netif_wake_queue(info->netdev);
-}
-
-/**
- * called by device driver when frame received
- * pass frame to network layer
- *
- * info  pointer to device instance information
- * buf   pointer to buffer contianing frame data
- * size  count of data bytes in buf
- */
-static void hdlcdev_rx(struct slgt_info *info, char *buf, int size)
-{
-        struct sk_buff *skb = dev_alloc_skb(size);
-        struct net_device *dev = info->netdev;
-
-        DBGINFO(("%s hdlcdev_rx\n", dev->name));
-
-        if (skb == NULL) {
-                DBGERR(("%s: can't alloc skb, drop packet\n", dev->name));
-                dev->stats.rx_dropped++;
-                return;
-        }
-
-        memcpy(skb_put(skb, size), buf, size);
-
-        skb->protocol = hdlc_type_trans(skb, dev);
-
-        dev->stats.rx_packets++;
-        dev->stats.rx_bytes += size;
-
-        netif_rx(skb);
-}
-
-static const struct net_device_ops hdlcdev_ops = {
-        .ndo_open       = hdlcdev_open,
-        .ndo_stop       = hdlcdev_close,
-        .ndo_change_mtu = hdlc_change_mtu,
-        .ndo_start_xmit = hdlc_start_xmit,
-        .ndo_do_ioctl   = hdlcdev_ioctl,
-        .ndo_tx_timeout = hdlcdev_tx_timeout,
-};
-
-/**
- * called by device driver when adding device instance
- * do generic HDLC initialization
- *
- * info  pointer to device instance information
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_init(struct slgt_info *info)
-{
-        int rc;
-        struct net_device *dev;
-        hdlc_device *hdlc;
-
-        /* allocate and initialize network and HDLC layer objects */
-
-        if (!(dev = alloc_hdlcdev(info))) {
-                printk(KERN_ERR "%s hdlc device alloc failure\n", info->device_name);
-                return -ENOMEM;
-        }
-
-        /* for network layer reporting purposes only */
-        dev->mem_start = info->phys_reg_addr;
-        dev->mem_end   = info->phys_reg_addr + SLGT_REG_SIZE - 1;
-        dev->irq       = info->irq_level;
-
-        /* network layer callbacks and settings */
-        dev->netdev_ops     = &hdlcdev_ops;
-        dev->watchdog_timeo = 10 * HZ;
-        dev->tx_queue_len   = 50;
-
-        /* generic HDLC layer callbacks and settings */
-        hdlc         = dev_to_hdlc(dev);
-        hdlc->attach = hdlcdev_attach;
-        hdlc->xmit   = hdlcdev_xmit;
-
-        /* register objects with HDLC layer */
-        if ((rc = register_hdlc_device(dev))) {
-                printk(KERN_WARNING "%s:unable to register hdlc device\n",__FILE__);
-                free_netdev(dev);
-                return rc;
-        }
-
-        info->netdev = dev;
-        return 0;
-}
-
-/**
- * called by device driver when removing device instance
- * do generic HDLC cleanup
- *
- * info  pointer to device instance information
- */
-static void hdlcdev_exit(struct slgt_info *info)
-{
-        unregister_hdlc_device(info->netdev);
-        free_netdev(info->netdev);
-        info->netdev = NULL;
-}
-
-#endif /* ifdef CONFIG_HDLC */
-
-/*
- * get async data from rx DMA buffers
- */
-static void rx_async(struct slgt_info *info)
-{
-        struct tty_struct *tty = info->port.tty;
-        struct mgsl_icount *icount = &info->icount;
-        unsigned int start, end;
-        unsigned char *p;
-        unsigned char status;
-        struct slgt_desc *bufs = info->rbufs;
-        int i, count;
-        int chars = 0;
-        int stat;
-        unsigned char ch;
-
-        start = end = info->rbuf_current;
-
-        while(desc_complete(bufs[end])) {
-                count = desc_count(bufs[end]) - info->rbuf_index;
-                p     = bufs[end].buf + info->rbuf_index;
-
-                DBGISR(("%s rx_async count=%d\n", info->device_name, count));
-                DBGDATA(info, p, count, "rx");
-
-                for(i=0 ; i < count; i+=2, p+=2) {
-                        ch = *p;
-                        icount->rx++;
-
-                        stat = 0;
-
-                        if ((status = *(p+1) & (BIT1 + BIT0))) {
-                                if (status & BIT1)
-                                        icount->parity++;
-                                else if (status & BIT0)
-                                        icount->frame++;
-                                /* discard char if tty control flags say so */
-                                if (status & info->ignore_status_mask)
-                                        continue;
-                                if (status & BIT1)
-                                        stat = TTY_PARITY;
-                                else if (status & BIT0)
-                                        stat = TTY_FRAME;
-                        }
-                        if (tty) {
-                                tty_insert_flip_char(tty, ch, stat);
-                                chars++;
-                        }
-                }
-
-                if (i < count) {
-                        /* receive buffer not completed */
-                        info->rbuf_index += i;
-                        mod_timer(&info->rx_timer, jiffies + 1);
-                        break;
-                }
-
-                info->rbuf_index = 0;
-                free_rbufs(info, end, end);
-
-                if (++end == info->rbuf_count)
-                        end = 0;
-
-                /* if entire list searched then no frame available */
-                if (end == start)
-                        break;
-        }
-
-        if (tty && chars)
-                tty_flip_buffer_push(tty);
-}
-
-/*
- * return next bottom half action to perform
- */
-static int bh_action(struct slgt_info *info)
-{
-        unsigned long flags;
-        int rc;
-
-        spin_lock_irqsave(&info->lock,flags);
-
-        if (info->pending_bh & BH_RECEIVE) {
-                info->pending_bh &= ~BH_RECEIVE;
-                rc = BH_RECEIVE;
-        } else if (info->pending_bh & BH_TRANSMIT) {
-                info->pending_bh &= ~BH_TRANSMIT;
-                rc = BH_TRANSMIT;
-        } else if (info->pending_bh & BH_STATUS) {
-                info->pending_bh &= ~BH_STATUS;
-                rc = BH_STATUS;
-        } else {
-                /* Mark BH routine as complete */
-                info->bh_running = false;
-                info->bh_requested = false;
-                rc = 0;
-        }
-
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        return rc;
-}
-
-/*
- * perform bottom half processing
- */
-static void bh_handler(struct work_struct *work)
-{
-        struct slgt_info *info = container_of(work, struct slgt_info, task);
-        int action;
-
-        if (!info)
-                return;
-        info->bh_running = true;
-
-        while((action = bh_action(info))) {
-                switch (action) {
-                case BH_RECEIVE:
-                        DBGBH(("%s bh receive\n", info->device_name));
-                        switch(info->params.mode) {
-                        case MGSL_MODE_ASYNC:
-                                rx_async(info);
-                                break;
-                        case MGSL_MODE_HDLC:
-                                while(rx_get_frame(info));
-                                break;
-                        case MGSL_MODE_RAW:
-                        case MGSL_MODE_MONOSYNC:
-                        case MGSL_MODE_BISYNC:
-                                while(rx_get_buf(info));
-                                break;
-                        }
-                        /* restart receiver if rx DMA buffers exhausted */
-                        if (info->rx_restart)
-                                rx_start(info);
-                        break;
-                case BH_TRANSMIT:
-                        bh_transmit(info);
-                        break;
-                case BH_STATUS:
-                        DBGBH(("%s bh status\n", info->device_name));
-                        info->ri_chkcount = 0;
-                        info->dsr_chkcount = 0;
-                        info->dcd_chkcount = 0;
-                        info->cts_chkcount = 0;
-                        break;
-                default:
-                        DBGBH(("%s unknown action\n", info->device_name));
-                        break;
-                }
-        }
-        DBGBH(("%s bh_handler exit\n", info->device_name));
-}
-
-static void bh_transmit(struct slgt_info *info)
-{
-        struct tty_struct *tty = info->port.tty;
-
-        DBGBH(("%s bh_transmit\n", info->device_name));
-        if (tty)
-                tty_wakeup(tty);
-}
-
-static void dsr_change(struct slgt_info *info, unsigned short status)
-{
-        if (status & BIT3) {
-                info->signals |= SerialSignal_DSR;
-                info->input_signal_events.dsr_up++;
-        } else {
-                info->signals &= ~SerialSignal_DSR;
-                info->input_signal_events.dsr_down++;
-        }
-        DBGISR(("dsr_change %s signals=%04X\n", info->device_name, info->signals));
-        if ((info->dsr_chkcount)++ == IO_PIN_SHUTDOWN_LIMIT) {
-                slgt_irq_off(info, IRQ_DSR);
-                return;
-        }
-        info->icount.dsr++;
-        wake_up_interruptible(&info->status_event_wait_q);
-        wake_up_interruptible(&info->event_wait_q);
-        info->pending_bh |= BH_STATUS;
-}
-
-static void cts_change(struct slgt_info *info, unsigned short status)
-{
-        if (status & BIT2) {
-                info->signals |= SerialSignal_CTS;
-                info->input_signal_events.cts_up++;
-        } else {
-                info->signals &= ~SerialSignal_CTS;
-                info->input_signal_events.cts_down++;
-        }
-        DBGISR(("cts_change %s signals=%04X\n", info->device_name, info->signals));
-        if ((info->cts_chkcount)++ == IO_PIN_SHUTDOWN_LIMIT) {
-                slgt_irq_off(info, IRQ_CTS);
-                return;
-        }
-        info->icount.cts++;
-        wake_up_interruptible(&info->status_event_wait_q);
-        wake_up_interruptible(&info->event_wait_q);
-        info->pending_bh |= BH_STATUS;
-
-        if (info->port.flags & ASYNC_CTS_FLOW) {
-                if (info->port.tty) {
-                        if (info->port.tty->hw_stopped) {
-                                if (info->signals & SerialSignal_CTS) {
-                                        info->port.tty->hw_stopped = 0;
-                                        info->pending_bh |= BH_TRANSMIT;
-                                        return;
-                                }
-                        } else {
-                                if (!(info->signals & SerialSignal_CTS))
-                                        info->port.tty->hw_stopped = 1;
-                        }
-                }
-        }
-}
-
-static void dcd_change(struct slgt_info *info, unsigned short status)
-{
-        if (status & BIT1) {
-                info->signals |= SerialSignal_DCD;
-                info->input_signal_events.dcd_up++;
-        } else {
-                info->signals &= ~SerialSignal_DCD;
-                info->input_signal_events.dcd_down++;
-        }
-        DBGISR(("dcd_change %s signals=%04X\n", info->device_name, info->signals));
-        if ((info->dcd_chkcount)++ == IO_PIN_SHUTDOWN_LIMIT) {
-                slgt_irq_off(info, IRQ_DCD);
-                return;
-        }
-        info->icount.dcd++;
-#if SYNCLINK_GENERIC_HDLC
-        if (info->netcount) {
-                if (info->signals & SerialSignal_DCD)
-                        netif_carrier_on(info->netdev);
-                else
-                        netif_carrier_off(info->netdev);
-        }
-#endif
-        wake_up_interruptible(&info->status_event_wait_q);
-        wake_up_interruptible(&info->event_wait_q);
-        info->pending_bh |= BH_STATUS;
-
-        if (info->port.flags & ASYNC_CHECK_CD) {
-                if (info->signals & SerialSignal_DCD)
-                        wake_up_interruptible(&info->port.open_wait);
-                else {
-                        if (info->port.tty)
-                                tty_hangup(info->port.tty);
-                }
-        }
-}
-
-static void ri_change(struct slgt_info *info, unsigned short status)
-{
-        if (status & BIT0) {
-                info->signals |= SerialSignal_RI;
-                info->input_signal_events.ri_up++;
-        } else {
-                info->signals &= ~SerialSignal_RI;
-                info->input_signal_events.ri_down++;
-        }
-        DBGISR(("ri_change %s signals=%04X\n", info->device_name, info->signals));
-        if ((info->ri_chkcount)++ == IO_PIN_SHUTDOWN_LIMIT) {
-                slgt_irq_off(info, IRQ_RI);
-                return;
-        }
-        info->icount.rng++;
-        wake_up_interruptible(&info->status_event_wait_q);
-        wake_up_interruptible(&info->event_wait_q);
-        info->pending_bh |= BH_STATUS;
-}
-
-static void isr_rxdata(struct slgt_info *info)
-{
-        unsigned int count = info->rbuf_fill_count;
-        unsigned int i = info->rbuf_fill_index;
-        unsigned short reg;
-
-        while (rd_reg16(info, SSR) & IRQ_RXDATA) {
-                reg = rd_reg16(info, RDR);
-                DBGISR(("isr_rxdata %s RDR=%04X\n", info->device_name, reg));
-                if (desc_complete(info->rbufs[i])) {
-                        /* all buffers full */
-                        rx_stop(info);
-                        info->rx_restart = 1;
-                        continue;
-                }
-                info->rbufs[i].buf[count++] = (unsigned char)reg;
-                /* async mode saves status byte to buffer for each data byte */
-                if (info->params.mode == MGSL_MODE_ASYNC)
-                        info->rbufs[i].buf[count++] = (unsigned char)(reg >> 8);
-                if (count == info->rbuf_fill_level || (reg & BIT10)) {
-                        /* buffer full or end of frame */
-                        set_desc_count(info->rbufs[i], count);
-                        set_desc_status(info->rbufs[i], BIT15 | (reg >> 8));
-                        info->rbuf_fill_count = count = 0;
-                        if (++i == info->rbuf_count)
-                                i = 0;
-                        info->pending_bh |= BH_RECEIVE;
-                }
-        }
-
-        info->rbuf_fill_index = i;
-        info->rbuf_fill_count = count;
-}
-
-static void isr_serial(struct slgt_info *info)
-{
-        unsigned short status = rd_reg16(info, SSR);
-
-        DBGISR(("%s isr_serial status=%04X\n", info->device_name, status));
-
-        wr_reg16(info, SSR, status); /* clear pending */
-
-        info->irq_occurred = true;
-
-        if (info->params.mode == MGSL_MODE_ASYNC) {
-                if (status & IRQ_TXIDLE) {
-                        if (info->tx_active)
-                                isr_txeom(info, status);
-                }
-                if (info->rx_pio && (status & IRQ_RXDATA))
-                        isr_rxdata(info);
-                if ((status & IRQ_RXBREAK) && (status & RXBREAK)) {
-                        info->icount.brk++;
-                        /* process break detection if tty control allows */
-                        if (info->port.tty) {
-                                if (!(status & info->ignore_status_mask)) {
-                                        if (info->read_status_mask & MASK_BREAK) {
-                                                tty_insert_flip_char(info->port.tty, 0, TTY_BREAK);
-                                                if (info->port.flags & ASYNC_SAK)
-                                                        do_SAK(info->port.tty);
-                                        }
-                                }
-                        }
-                }
-        } else {
-                if (status & (IRQ_TXIDLE + IRQ_TXUNDER))
-                        isr_txeom(info, status);
-                if (info->rx_pio && (status & IRQ_RXDATA))
-                        isr_rxdata(info);
-                if (status & IRQ_RXIDLE) {
-                        if (status & RXIDLE)
-                                info->icount.rxidle++;
-                        else
-                                info->icount.exithunt++;
-                        wake_up_interruptible(&info->event_wait_q);
-                }
-
-                if (status & IRQ_RXOVER)
-                        rx_start(info);
-        }
-
-        if (status & IRQ_DSR)
-                dsr_change(info, status);
-        if (status & IRQ_CTS)
-                cts_change(info, status);
-        if (status & IRQ_DCD)
-                dcd_change(info, status);
-        if (status & IRQ_RI)
-                ri_change(info, status);
-}
-
-static void isr_rdma(struct slgt_info *info)
-{
-        unsigned int status = rd_reg32(info, RDCSR);
-
-        DBGISR(("%s isr_rdma status=%08x\n", info->device_name, status));
-
-        /* RDCSR (rx DMA control/status)
-         *
-         * 31..07  reserved
-         * 06      save status byte to DMA buffer
-         * 05      error
-         * 04      eol (end of list)
-         * 03      eob (end of buffer)
-         * 02      IRQ enable
-         * 01      reset
-         * 00      enable
-         */
-        wr_reg32(info, RDCSR, status);  /* clear pending */
-
-        if (status & (BIT5 + BIT4)) {
-                DBGISR(("%s isr_rdma rx_restart=1\n", info->device_name));
-                info->rx_restart = true;
-        }
-        info->pending_bh |= BH_RECEIVE;
-}
-
-static void isr_tdma(struct slgt_info *info)
-{
-        unsigned int status = rd_reg32(info, TDCSR);
-
-        DBGISR(("%s isr_tdma status=%08x\n", info->device_name, status));
-
-        /* TDCSR (tx DMA control/status)
-         *
-         * 31..06  reserved
-         * 05      error
-         * 04      eol (end of list)
-         * 03      eob (end of buffer)
-         * 02      IRQ enable
-         * 01      reset
-         * 00      enable
-         */
-        wr_reg32(info, TDCSR, status);  /* clear pending */
-
-        if (status & (BIT5 + BIT4 + BIT3)) {
-                // another transmit buffer has completed
-                // run bottom half to get more send data from user
-                info->pending_bh |= BH_TRANSMIT;
-        }
-}
-
-/*
- * return true if there are unsent tx DMA buffers, otherwise false
- *
- * if there are unsent buffers then info->tbuf_start
- * is set to index of first unsent buffer
- */
-static bool unsent_tbufs(struct slgt_info *info)
-{
-        unsigned int i = info->tbuf_current;
-        bool rc = false;
-
-        /*
-         * search backwards from last loaded buffer (precedes tbuf_current)
-         * for first unsent buffer (desc_count > 0)
-         */
-
-        do {
-                if (i)
-                        i--;
-                else
-                        i = info->tbuf_count - 1;
-                if (!desc_count(info->tbufs[i]))
-                        break;
-                info->tbuf_start = i;
-                rc = true;
-        } while (i != info->tbuf_current);
-
-        return rc;
-}
-
-static void isr_txeom(struct slgt_info *info, unsigned short status)
-{
-        DBGISR(("%s txeom status=%04x\n", info->device_name, status));
-
-        slgt_irq_off(info, IRQ_TXDATA + IRQ_TXIDLE + IRQ_TXUNDER);
-        tdma_reset(info);
-        if (status & IRQ_TXUNDER) {
-                unsigned short val = rd_reg16(info, TCR);
-                wr_reg16(info, TCR, (unsigned short)(val | BIT2)); /* set reset bit */
-                wr_reg16(info, TCR, val); /* clear reset bit */
-        }
-
-        if (info->tx_active) {
-                if (info->params.mode != MGSL_MODE_ASYNC) {
-                        if (status & IRQ_TXUNDER)
-                                info->icount.txunder++;
-                        else if (status & IRQ_TXIDLE)
-                                info->icount.txok++;
-                }
-
-                if (unsent_tbufs(info)) {
-                        tx_start(info);
-                        update_tx_timer(info);
-                        return;
-                }
-                info->tx_active = false;
-
-                del_timer(&info->tx_timer);
-
-                if (info->params.mode != MGSL_MODE_ASYNC && info->drop_rts_on_tx_done) {
-                        info->signals &= ~SerialSignal_RTS;
-                        info->drop_rts_on_tx_done = false;
-                        set_signals(info);
-                }
-
-#if SYNCLINK_GENERIC_HDLC
-                if (info->netcount)
-                        hdlcdev_tx_done(info);
-                else
-#endif
-                {
-                        if (info->port.tty && (info->port.tty->stopped || info->port.tty->hw_stopped)) {
-                                tx_stop(info);
-                                return;
-                        }
-                        info->pending_bh |= BH_TRANSMIT;
-                }
-        }
-}
-
-static void isr_gpio(struct slgt_info *info, unsigned int changed, unsigned int state)
-{
-        struct cond_wait *w, *prev;
-
-        /* wake processes waiting for specific transitions */
-        for (w = info->gpio_wait_q, prev = NULL ; w != NULL ; w = w->next) {
-                if (w->data & changed) {
-                        w->data = state;
-                        wake_up_interruptible(&w->q);
-                        if (prev != NULL)
-                                prev->next = w->next;
-                        else
-                                info->gpio_wait_q = w->next;
-                } else
-                        prev = w;
-        }
-}
-
-/* interrupt service routine
- *
- *      irq     interrupt number
- *      dev_id  device ID supplied during interrupt registration
- */
-static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
-{
-        struct slgt_info *info = dev_id;
-        unsigned int gsr;
-        unsigned int i;
-
-        DBGISR(("slgt_interrupt irq=%d entry\n", info->irq_level));
-
-        spin_lock(&info->lock);
-
-        while((gsr = rd_reg32(info, GSR) & 0xffffff00)) {
-                DBGISR(("%s gsr=%08x\n", info->device_name, gsr));
-                info->irq_occurred = true;
-                for(i=0; i < info->port_count ; i++) {
-                        if (info->port_array[i] == NULL)
-                                continue;
-                        if (gsr & (BIT8 << i))
-                                isr_serial(info->port_array[i]);
-                        if (gsr & (BIT16 << (i*2)))
-                                isr_rdma(info->port_array[i]);
-                        if (gsr & (BIT17 << (i*2)))
-                                isr_tdma(info->port_array[i]);
-                }
-        }
-
-        if (info->gpio_present) {
-                unsigned int state;
-                unsigned int changed;
-                while ((changed = rd_reg32(info, IOSR)) != 0) {
-                        DBGISR(("%s iosr=%08x\n", info->device_name, changed));
-                        /* read latched state of GPIO signals */
-                        state = rd_reg32(info, IOVR);
-                        /* clear pending GPIO interrupt bits */
-                        wr_reg32(info, IOSR, changed);
-                        for (i=0 ; i < info->port_count ; i++) {
-                                if (info->port_array[i] != NULL)
-                                        isr_gpio(info->port_array[i], changed, state);
-                        }
-                }
-        }
-
-        for(i=0; i < info->port_count ; i++) {
-                struct slgt_info *port = info->port_array[i];
-
-                if (port && (port->port.count || port->netcount) &&
-                    port->pending_bh && !port->bh_running &&
-                    !port->bh_requested) {
-                        DBGISR(("%s bh queued\n", port->device_name));
-                        schedule_work(&port->task);
-                        port->bh_requested = true;
-                }
-        }
-
-        spin_unlock(&info->lock);
-
-        DBGISR(("slgt_interrupt irq=%d exit\n", info->irq_level));
-        return IRQ_HANDLED;
-}
-
-static int startup(struct slgt_info *info)
-{
-        DBGINFO(("%s startup\n", info->device_name));
-
-        if (info->port.flags & ASYNC_INITIALIZED)
-                return 0;
-
-        if (!info->tx_buf) {
-                info->tx_buf = kmalloc(info->max_frame_size, GFP_KERNEL);
-                if (!info->tx_buf) {
-                        DBGERR(("%s can't allocate tx buffer\n", info->device_name));
-                        return -ENOMEM;
-                }
-        }
-
-        info->pending_bh = 0;
-
-        memset(&info->icount, 0, sizeof(info->icount));
-
-        /* program hardware for current parameters */
-        change_params(info);
-
-        if (info->port.tty)
-                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
-
-        info->port.flags |= ASYNC_INITIALIZED;
-
-        return 0;
-}
-
-/*
- *  called by close() and hangup() to shutdown hardware
- */
-static void shutdown(struct slgt_info *info)
-{
-        unsigned long flags;
-
-        if (!(info->port.flags & ASYNC_INITIALIZED))
-                return;
-
-        DBGINFO(("%s shutdown\n", info->device_name));
-
-        /* clear status wait queue because status changes */
-        /* can't happen after shutting down the hardware */
-        wake_up_interruptible(&info->status_event_wait_q);
-        wake_up_interruptible(&info->event_wait_q);
-
-        del_timer_sync(&info->tx_timer);
-        del_timer_sync(&info->rx_timer);
-
-        kfree(info->tx_buf);
-        info->tx_buf = NULL;
-
-        spin_lock_irqsave(&info->lock,flags);
-
-        tx_stop(info);
-        rx_stop(info);
-
-        slgt_irq_off(info, IRQ_ALL | IRQ_MASTER);
-
-        if (!info->port.tty || info->port.tty->termios->c_cflag & HUPCL) {
-                info->signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
-                set_signals(info);
-        }
-
-        flush_cond_wait(&info->gpio_wait_q);
-
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        if (info->port.tty)
-                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
-
-        info->port.flags &= ~ASYNC_INITIALIZED;
-}
-
-static void program_hw(struct slgt_info *info)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->lock,flags);
-
-        rx_stop(info);
-        tx_stop(info);
-
-        if (info->params.mode != MGSL_MODE_ASYNC ||
-            info->netcount)
-                sync_mode(info);
-        else
-                async_mode(info);
-
-        set_signals(info);
-
-        info->dcd_chkcount = 0;
-        info->cts_chkcount = 0;
-        info->ri_chkcount = 0;
-        info->dsr_chkcount = 0;
-
-        slgt_irq_on(info, IRQ_DCD | IRQ_CTS | IRQ_DSR | IRQ_RI);
-        get_signals(info);
-
-        if (info->netcount ||
-            (info->port.tty && info->port.tty->termios->c_cflag & CREAD))
-                rx_start(info);
-
-        spin_unlock_irqrestore(&info->lock,flags);
-}
-
-/*
- * reconfigure adapter based on new parameters
- */
-static void change_params(struct slgt_info *info)
-{
-        unsigned cflag;
-        int bits_per_char;
-
-        if (!info->port.tty || !info->port.tty->termios)
-                return;
-        DBGINFO(("%s change_params\n", info->device_name));
-
-        cflag = info->port.tty->termios->c_cflag;
-
-        /* if B0 rate (hangup) specified then negate DTR and RTS */
-        /* otherwise assert DTR and RTS */
-        if (cflag & CBAUD)
-                info->signals |= SerialSignal_RTS + SerialSignal_DTR;
-        else
-                info->signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
-
-        /* byte size and parity */
-
-        switch (cflag & CSIZE) {
-        case CS5: info->params.data_bits = 5; break;
-        case CS6: info->params.data_bits = 6; break;
-        case CS7: info->params.data_bits = 7; break;
-        case CS8: info->params.data_bits = 8; break;
-        default:  info->params.data_bits = 7; break;
-        }
-
-        info->params.stop_bits = (cflag & CSTOPB) ? 2 : 1;
-
-        if (cflag & PARENB)
-                info->params.parity = (cflag & PARODD) ? ASYNC_PARITY_ODD : ASYNC_PARITY_EVEN;
-        else
-                info->params.parity = ASYNC_PARITY_NONE;
-
-        /* calculate number of jiffies to transmit a full
-         * FIFO (32 bytes) at specified data rate
-         */
-        bits_per_char = info->params.data_bits +
-                        info->params.stop_bits + 1;
-
-        info->params.data_rate = tty_get_baud_rate(info->port.tty);
-
-        if (info->params.data_rate) {
-                info->timeout = (32*HZ*bits_per_char) /
-                                info->params.data_rate;
-        }
-        info->timeout += HZ/50;         /* Add .02 seconds of slop */
-
-        if (cflag & CRTSCTS)
-                info->port.flags |= ASYNC_CTS_FLOW;
-        else
-                info->port.flags &= ~ASYNC_CTS_FLOW;
-
-        if (cflag & CLOCAL)
-                info->port.flags &= ~ASYNC_CHECK_CD;
-        else
-                info->port.flags |= ASYNC_CHECK_CD;
-
-        /* process tty input control flags */
-
-        info->read_status_mask = IRQ_RXOVER;
-        if (I_INPCK(info->port.tty))
-                info->read_status_mask |= MASK_PARITY | MASK_FRAMING;
-        if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty))
-                info->read_status_mask |= MASK_BREAK;
-        if (I_IGNPAR(info->port.tty))
-                info->ignore_status_mask |= MASK_PARITY | MASK_FRAMING;
-        if (I_IGNBRK(info->port.tty)) {
-                info->ignore_status_mask |= MASK_BREAK;
-                /* If ignoring parity and break indicators, ignore
-                 * overruns too.  (For real raw support).
-                 */
-                if (I_IGNPAR(info->port.tty))
-                        info->ignore_status_mask |= MASK_OVERRUN;
-        }
-
-        program_hw(info);
-}
-
-static int get_stats(struct slgt_info *info, struct mgsl_icount __user *user_icount)
-{
-        DBGINFO(("%s get_stats\n",  info->device_name));
-        if (!user_icount) {
-                memset(&info->icount, 0, sizeof(info->icount));
-        } else {
-                if (copy_to_user(user_icount, &info->icount, sizeof(struct mgsl_icount)))
-                        return -EFAULT;
-        }
-        return 0;
-}
-
-static int get_params(struct slgt_info *info, MGSL_PARAMS __user *user_params)
-{
-        DBGINFO(("%s get_params\n", info->device_name));
-        if (copy_to_user(user_params, &info->params, sizeof(MGSL_PARAMS)))
-                return -EFAULT;
-        return 0;
-}
-
-static int set_params(struct slgt_info *info, MGSL_PARAMS __user *new_params)
-{
-        unsigned long flags;
-        MGSL_PARAMS tmp_params;
-
-        DBGINFO(("%s set_params\n", info->device_name));
-        if (copy_from_user(&tmp_params, new_params, sizeof(MGSL_PARAMS)))
-                return -EFAULT;
-
-        spin_lock_irqsave(&info->lock, flags);
-        if (tmp_params.mode == MGSL_MODE_BASE_CLOCK)
-                info->base_clock = tmp_params.clock_speed;
-        else
-                memcpy(&info->params, &tmp_params, sizeof(MGSL_PARAMS));
-        spin_unlock_irqrestore(&info->lock, flags);
-
-        program_hw(info);
-
-        return 0;
-}
-
-static int get_txidle(struct slgt_info *info, int __user *idle_mode)
-{
-        DBGINFO(("%s get_txidle=%d\n", info->device_name, info->idle_mode));
-        if (put_user(info->idle_mode, idle_mode))
-                return -EFAULT;
-        return 0;
-}
-
-static int set_txidle(struct slgt_info *info, int idle_mode)
-{
-        unsigned long flags;
-        DBGINFO(("%s set_txidle(%d)\n", info->device_name, idle_mode));
-        spin_lock_irqsave(&info->lock,flags);
-        info->idle_mode = idle_mode;
-        if (info->params.mode != MGSL_MODE_ASYNC)
-                tx_set_idle(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-static int tx_enable(struct slgt_info *info, int enable)
-{
-        unsigned long flags;
-        DBGINFO(("%s tx_enable(%d)\n", info->device_name, enable));
-        spin_lock_irqsave(&info->lock,flags);
-        if (enable) {
-                if (!info->tx_enabled)
-                        tx_start(info);
-        } else {
-                if (info->tx_enabled)
-                        tx_stop(info);
-        }
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-/*
- * abort transmit HDLC frame
- */
-static int tx_abort(struct slgt_info *info)
-{
-        unsigned long flags;
-        DBGINFO(("%s tx_abort\n", info->device_name));
-        spin_lock_irqsave(&info->lock,flags);
-        tdma_reset(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-static int rx_enable(struct slgt_info *info, int enable)
-{
-        unsigned long flags;
-        unsigned int rbuf_fill_level;
-        DBGINFO(("%s rx_enable(%08x)\n", info->device_name, enable));
-        spin_lock_irqsave(&info->lock,flags);
-        /*
-         * enable[31..16] = receive DMA buffer fill level
-         * 0 = noop (leave fill level unchanged)
-         * fill level must be multiple of 4 and <= buffer size
-         */
-        rbuf_fill_level = ((unsigned int)enable) >> 16;
-        if (rbuf_fill_level) {
-                if ((rbuf_fill_level > DMABUFSIZE) || (rbuf_fill_level % 4)) {
-                        spin_unlock_irqrestore(&info->lock, flags);
-                        return -EINVAL;
-                }
-                info->rbuf_fill_level = rbuf_fill_level;
-                if (rbuf_fill_level < 128)
-                        info->rx_pio = 1; /* PIO mode */
-                else
-                        info->rx_pio = 0; /* DMA mode */
-                rx_stop(info); /* restart receiver to use new fill level */
-        }
-
-        /*
-         * enable[1..0] = receiver enable command
-         * 0 = disable
-         * 1 = enable
-         * 2 = enable or force hunt mode if already enabled
-         */
-        enable &= 3;
-        if (enable) {
-                if (!info->rx_enabled)
-                        rx_start(info);
-                else if (enable == 2) {
-                        /* force hunt mode (write 1 to RCR[3]) */
-                        wr_reg16(info, RCR, rd_reg16(info, RCR) | BIT3);
-                }
-        } else {
-                if (info->rx_enabled)
-                        rx_stop(info);
-        }
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-/*
- *  wait for specified event to occur
- */
-static int wait_mgsl_event(struct slgt_info *info, int __user *mask_ptr)
-{
-        unsigned long flags;
-        int s;
-        int rc=0;
-        struct mgsl_icount cprev, cnow;
-        int events;
-        int mask;
-        struct  _input_signal_events oldsigs, newsigs;
-        DECLARE_WAITQUEUE(wait, current);
-
-        if (get_user(mask, mask_ptr))
-                return -EFAULT;
-
-        DBGINFO(("%s wait_mgsl_event(%d)\n", info->device_name, mask));
-
-        spin_lock_irqsave(&info->lock,flags);
-
-        /* return immediately if state matches requested events */
-        get_signals(info);
-        s = info->signals;
-
-        events = mask &
-                ( ((s & SerialSignal_DSR) ? MgslEvent_DsrActive:MgslEvent_DsrInactive) +
-                  ((s & SerialSignal_DCD) ? MgslEvent_DcdActive:MgslEvent_DcdInactive) +
-                  ((s & SerialSignal_CTS) ? MgslEvent_CtsActive:MgslEvent_CtsInactive) +
-                  ((s & SerialSignal_RI)  ? MgslEvent_RiActive :MgslEvent_RiInactive) );
-        if (events) {
-                spin_unlock_irqrestore(&info->lock,flags);
-                goto exit;
-        }
-
-        /* save current irq counts */
-        cprev = info->icount;
-        oldsigs = info->input_signal_events;
-
-        /* enable hunt and idle irqs if needed */
-        if (mask & (MgslEvent_ExitHuntMode+MgslEvent_IdleReceived)) {
-                unsigned short val = rd_reg16(info, SCR);
-                if (!(val & IRQ_RXIDLE))
-                        wr_reg16(info, SCR, (unsigned short)(val | IRQ_RXIDLE));
-        }
-
-        set_current_state(TASK_INTERRUPTIBLE);
-        add_wait_queue(&info->event_wait_q, &wait);
-
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        for(;;) {
-                schedule();
-                if (signal_pending(current)) {
-                        rc = -ERESTARTSYS;
-                        break;
-                }
-
-                /* get current irq counts */
-                spin_lock_irqsave(&info->lock,flags);
-                cnow = info->icount;
-                newsigs = info->input_signal_events;
-                set_current_state(TASK_INTERRUPTIBLE);
-                spin_unlock_irqrestore(&info->lock,flags);
-
-                /* if no change, wait aborted for some reason */
-                if (newsigs.dsr_up   == oldsigs.dsr_up   &&
-                    newsigs.dsr_down == oldsigs.dsr_down &&
-                    newsigs.dcd_up   == oldsigs.dcd_up   &&
-                    newsigs.dcd_down == oldsigs.dcd_down &&
-                    newsigs.cts_up   == oldsigs.cts_up   &&
-                    newsigs.cts_down == oldsigs.cts_down &&
-                    newsigs.ri_up    == oldsigs.ri_up    &&
-                    newsigs.ri_down  == oldsigs.ri_down  &&
-                    cnow.exithunt    == cprev.exithunt   &&
-                    cnow.rxidle      == cprev.rxidle) {
-                        rc = -EIO;
-                        break;
-                }
-
-                events = mask &
-                        ( (newsigs.dsr_up   != oldsigs.dsr_up   ? MgslEvent_DsrActive:0)   +
-                          (newsigs.dsr_down != oldsigs.dsr_down ? MgslEvent_DsrInactive:0) +
-                          (newsigs.dcd_up   != oldsigs.dcd_up   ? MgslEvent_DcdActive:0)   +
-                          (newsigs.dcd_down != oldsigs.dcd_down ? MgslEvent_DcdInactive:0) +
-                          (newsigs.cts_up   != oldsigs.cts_up   ? MgslEvent_CtsActive:0)   +
-                          (newsigs.cts_down != oldsigs.cts_down ? MgslEvent_CtsInactive:0) +
-                          (newsigs.ri_up    != oldsigs.ri_up    ? MgslEvent_RiActive:0)    +
-                          (newsigs.ri_down  != oldsigs.ri_down  ? MgslEvent_RiInactive:0)  +
-                          (cnow.exithunt    != cprev.exithunt   ? MgslEvent_ExitHuntMode:0) +
-                          (cnow.rxidle      != cprev.rxidle     ? MgslEvent_IdleReceived:0) );
-                if (events)
-                        break;
-
-                cprev = cnow;
-                oldsigs = newsigs;
-        }
-
-        remove_wait_queue(&info->event_wait_q, &wait);
-        set_current_state(TASK_RUNNING);
-
-
-        if (mask & (MgslEvent_ExitHuntMode + MgslEvent_IdleReceived)) {
-                spin_lock_irqsave(&info->lock,flags);
-                if (!waitqueue_active(&info->event_wait_q)) {
-                        /* disable enable exit hunt mode/idle rcvd IRQs */
-                        wr_reg16(info, SCR,
-                                (unsigned short)(rd_reg16(info, SCR) & ~IRQ_RXIDLE));
-                }
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-exit:
-        if (rc == 0)
-                rc = put_user(events, mask_ptr);
-        return rc;
-}
-
-static int get_interface(struct slgt_info *info, int __user *if_mode)
-{
-        DBGINFO(("%s get_interface=%x\n", info->device_name, info->if_mode));
-        if (put_user(info->if_mode, if_mode))
-                return -EFAULT;
-        return 0;
-}
-
-static int set_interface(struct slgt_info *info, int if_mode)
-{
-        unsigned long flags;
-        unsigned short val;
-
-        DBGINFO(("%s set_interface=%x)\n", info->device_name, if_mode));
-        spin_lock_irqsave(&info->lock,flags);
-        info->if_mode = if_mode;
-
-        msc_set_vcr(info);
-
-        /* TCR (tx control) 07  1=RTS driver control */
-        val = rd_reg16(info, TCR);
-        if (info->if_mode & MGSL_INTERFACE_RTS_EN)
-                val |= BIT7;
-        else
-                val &= ~BIT7;
-        wr_reg16(info, TCR, val);
-
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-/*
- * set general purpose IO pin state and direction
- *
- * user_gpio fields:
- * state   each bit indicates a pin state
- * smask   set bit indicates pin state to set
- * dir     each bit indicates a pin direction (0=input, 1=output)
- * dmask   set bit indicates pin direction to set
- */
-static int set_gpio(struct slgt_info *info, struct gpio_desc __user *user_gpio)
-{
-        unsigned long flags;
-        struct gpio_desc gpio;
-        __u32 data;
-
-        if (!info->gpio_present)
-                return -EINVAL;
-        if (copy_from_user(&gpio, user_gpio, sizeof(gpio)))
-                return -EFAULT;
-        DBGINFO(("%s set_gpio state=%08x smask=%08x dir=%08x dmask=%08x\n",
-                 info->device_name, gpio.state, gpio.smask,
-                 gpio.dir, gpio.dmask));
-
-        spin_lock_irqsave(&info->lock,flags);
-        if (gpio.dmask) {
-                data = rd_reg32(info, IODR);
-                data |= gpio.dmask & gpio.dir;
-                data &= ~(gpio.dmask & ~gpio.dir);
-                wr_reg32(info, IODR, data);
-        }
-        if (gpio.smask) {
-                data = rd_reg32(info, IOVR);
-                data |= gpio.smask & gpio.state;
-                data &= ~(gpio.smask & ~gpio.state);
-                wr_reg32(info, IOVR, data);
-        }
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        return 0;
-}
-
-/*
- * get general purpose IO pin state and direction
- */
-static int get_gpio(struct slgt_info *info, struct gpio_desc __user *user_gpio)
-{
-        struct gpio_desc gpio;
-        if (!info->gpio_present)
-                return -EINVAL;
-        gpio.state = rd_reg32(info, IOVR);
-        gpio.smask = 0xffffffff;
-        gpio.dir   = rd_reg32(info, IODR);
-        gpio.dmask = 0xffffffff;
-        if (copy_to_user(user_gpio, &gpio, sizeof(gpio)))
-                return -EFAULT;
-        DBGINFO(("%s get_gpio state=%08x dir=%08x\n",
-                 info->device_name, gpio.state, gpio.dir));
-        return 0;
-}
-
-/*
- * conditional wait facility
- */
-static void init_cond_wait(struct cond_wait *w, unsigned int data)
-{
-        init_waitqueue_head(&w->q);
-        init_waitqueue_entry(&w->wait, current);
-        w->data = data;
-}
-
-static void add_cond_wait(struct cond_wait **head, struct cond_wait *w)
-{
-        set_current_state(TASK_INTERRUPTIBLE);
-        add_wait_queue(&w->q, &w->wait);
-        w->next = *head;
-        *head = w;
-}
-
-static void remove_cond_wait(struct cond_wait **head, struct cond_wait *cw)
-{
-        struct cond_wait *w, *prev;
-        remove_wait_queue(&cw->q, &cw->wait);
-        set_current_state(TASK_RUNNING);
-        for (w = *head, prev = NULL ; w != NULL ; prev = w, w = w->next) {
-                if (w == cw) {
-                        if (prev != NULL)
-                                prev->next = w->next;
-                        else
-                                *head = w->next;
-                        break;
-                }
-        }
-}
-
-static void flush_cond_wait(struct cond_wait **head)
-{
-        while (*head != NULL) {
-                wake_up_interruptible(&(*head)->q);
-                *head = (*head)->next;
-        }
-}
-
-/*
- * wait for general purpose I/O pin(s) to enter specified state
- *
- * user_gpio fields:
- * state - bit indicates target pin state
- * smask - set bit indicates watched pin
- *
- * The wait ends when at least one watched pin enters the specified
- * state. When 0 (no error) is returned, user_gpio->state is set to the
- * state of all GPIO pins when the wait ends.
- *
- * Note: Each pin may be a dedicated input, dedicated output, or
- * configurable input/output. The number and configuration of pins
- * varies with the specific adapter model. Only input pins (dedicated
- * or configured) can be monitored with this function.
- */
-static int wait_gpio(struct slgt_info *info, struct gpio_desc __user *user_gpio)
-{
-        unsigned long flags;
-        int rc = 0;
-        struct gpio_desc gpio;
-        struct cond_wait wait;
-        u32 state;
-
-        if (!info->gpio_present)
-                return -EINVAL;
-        if (copy_from_user(&gpio, user_gpio, sizeof(gpio)))
-                return -EFAULT;
-        DBGINFO(("%s wait_gpio() state=%08x smask=%08x\n",
-                 info->device_name, gpio.state, gpio.smask));
-        /* ignore output pins identified by set IODR bit */
-        if ((gpio.smask &= ~rd_reg32(info, IODR)) == 0)
-                return -EINVAL;
-        init_cond_wait(&wait, gpio.smask);
-
-        spin_lock_irqsave(&info->lock, flags);
-        /* enable interrupts for watched pins */
-        wr_reg32(info, IOER, rd_reg32(info, IOER) | gpio.smask);
-        /* get current pin states */
-        state = rd_reg32(info, IOVR);
-
-        if (gpio.smask & ~(state ^ gpio.state)) {
-                /* already in target state */
-                gpio.state = state;
-        } else {
-                /* wait for target state */
-                add_cond_wait(&info->gpio_wait_q, &wait);
-                spin_unlock_irqrestore(&info->lock, flags);
-                schedule();
-                if (signal_pending(current))
-                        rc = -ERESTARTSYS;
-                else
-                        gpio.state = wait.data;
-                spin_lock_irqsave(&info->lock, flags);
-                remove_cond_wait(&info->gpio_wait_q, &wait);
-        }
-
-        /* disable all GPIO interrupts if no waiting processes */
-        if (info->gpio_wait_q == NULL)
-                wr_reg32(info, IOER, 0);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        if ((rc == 0) && copy_to_user(user_gpio, &gpio, sizeof(gpio)))
-                rc = -EFAULT;
-        return rc;
-}
-
-static int modem_input_wait(struct slgt_info *info,int arg)
-{
-        unsigned long flags;
-        int rc;
-        struct mgsl_icount cprev, cnow;
-        DECLARE_WAITQUEUE(wait, current);
-
-        /* save current irq counts */
-        spin_lock_irqsave(&info->lock,flags);
-        cprev = info->icount;
-        add_wait_queue(&info->status_event_wait_q, &wait);
-        set_current_state(TASK_INTERRUPTIBLE);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        for(;;) {
-                schedule();
-                if (signal_pending(current)) {
-                        rc = -ERESTARTSYS;
-                        break;
-                }
-
-                /* get new irq counts */
-                spin_lock_irqsave(&info->lock,flags);
-                cnow = info->icount;
-                set_current_state(TASK_INTERRUPTIBLE);
-                spin_unlock_irqrestore(&info->lock,flags);
-
-                /* if no change, wait aborted for some reason */
-                if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
-                    cnow.dcd == cprev.dcd && cnow.cts == cprev.cts) {
-                        rc = -EIO;
-                        break;
-                }
-
-                /* check for change in caller specified modem input */
-                if ((arg & TIOCM_RNG && cnow.rng != cprev.rng) ||
-                    (arg & TIOCM_DSR && cnow.dsr != cprev.dsr) ||
-                    (arg & TIOCM_CD  && cnow.dcd != cprev.dcd) ||
-                    (arg & TIOCM_CTS && cnow.cts != cprev.cts)) {
-                        rc = 0;
-                        break;
-                }
-
-                cprev = cnow;
-        }
-        remove_wait_queue(&info->status_event_wait_q, &wait);
-        set_current_state(TASK_RUNNING);
-        return rc;
-}
-
-/*
- *  return state of serial control and status signals
- */
-static int tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned int result;
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->lock,flags);
-        get_signals(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        result = ((info->signals & SerialSignal_RTS) ? TIOCM_RTS:0) +
-                ((info->signals & SerialSignal_DTR) ? TIOCM_DTR:0) +
-                ((info->signals & SerialSignal_DCD) ? TIOCM_CAR:0) +
-                ((info->signals & SerialSignal_RI)  ? TIOCM_RNG:0) +
-                ((info->signals & SerialSignal_DSR) ? TIOCM_DSR:0) +
-                ((info->signals & SerialSignal_CTS) ? TIOCM_CTS:0);
-
-        DBGINFO(("%s tiocmget value=%08X\n", info->device_name, result));
-        return result;
-}
-
-/*
- * set modem control signals (DTR/RTS)
- *
- *      cmd     signal command: TIOCMBIS = set bit TIOCMBIC = clear bit
- *              TIOCMSET = set/clear signal values
- *      value   bit mask for command
- */
-static int tiocmset(struct tty_struct *tty, struct file *file,
-                    unsigned int set, unsigned int clear)
-{
-        struct slgt_info *info = tty->driver_data;
-        unsigned long flags;
-
-        DBGINFO(("%s tiocmset(%x,%x)\n", info->device_name, set, clear));
-
-        if (set & TIOCM_RTS)
-                info->signals |= SerialSignal_RTS;
-        if (set & TIOCM_DTR)
-                info->signals |= SerialSignal_DTR;
-        if (clear & TIOCM_RTS)
-                info->signals &= ~SerialSignal_RTS;
-        if (clear & TIOCM_DTR)
-                info->signals &= ~SerialSignal_DTR;
-
-        spin_lock_irqsave(&info->lock,flags);
-        set_signals(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-static int carrier_raised(struct tty_port *port)
-{
-        unsigned long flags;
-        struct slgt_info *info = container_of(port, struct slgt_info, port);
-
-        spin_lock_irqsave(&info->lock,flags);
-        get_signals(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-        return (info->signals & SerialSignal_DCD) ? 1 : 0;
-}
-
-static void dtr_rts(struct tty_port *port, int on)
-{
-        unsigned long flags;
-        struct slgt_info *info = container_of(port, struct slgt_info, port);
-
-        spin_lock_irqsave(&info->lock,flags);
-        if (on)
-                info->signals |= SerialSignal_RTS + SerialSignal_DTR;
-        else
-                info->signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
-        set_signals(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-}
-
-
-/*
- *  block current process until the device is ready to open
- */
-static int block_til_ready(struct tty_struct *tty, struct file *filp,
-                           struct slgt_info *info)
-{
-        DECLARE_WAITQUEUE(wait, current);
-        int             retval;
-        bool            do_clocal = false;
-        bool            extra_count = false;
-        unsigned long   flags;
-        int             cd;
-        struct tty_port *port = &info->port;
-
-        DBGINFO(("%s block_til_ready\n", tty->driver->name));
-
-        if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){
-                /* nonblock mode is set or port is not enabled */
-                port->flags |= ASYNC_NORMAL_ACTIVE;
-                return 0;
-        }
-
-        if (tty->termios->c_cflag & CLOCAL)
-                do_clocal = true;
-
-        /* Wait for carrier detect and the line to become
-         * free (i.e., not in use by the callout).  While we are in
-         * this loop, port->count is dropped by one, so that
-         * close() knows when to free things.  We restore it upon
-         * exit, either normal or abnormal.
-         */
-
-        retval = 0;
-        add_wait_queue(&port->open_wait, &wait);
-
-        spin_lock_irqsave(&info->lock, flags);
-        if (!tty_hung_up_p(filp)) {
-                extra_count = true;
-                port->count--;
-        }
-        spin_unlock_irqrestore(&info->lock, flags);
-        port->blocked_open++;
-
-        while (1) {
-                if ((tty->termios->c_cflag & CBAUD))
-                        tty_port_raise_dtr_rts(port);
-
-                set_current_state(TASK_INTERRUPTIBLE);
-
-                if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)){
-                        retval = (port->flags & ASYNC_HUP_NOTIFY) ?
-                                        -EAGAIN : -ERESTARTSYS;
-                        break;
-                }
-
-                cd = tty_port_carrier_raised(port);
-
-                if (!(port->flags & ASYNC_CLOSING) && (do_clocal || cd ))
-                        break;
-
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-
-                DBGINFO(("%s block_til_ready wait\n", tty->driver->name));
-                tty_unlock();
-                schedule();
-                tty_lock();
-        }
-
-        set_current_state(TASK_RUNNING);
-        remove_wait_queue(&port->open_wait, &wait);
-
-        if (extra_count)
-                port->count++;
-        port->blocked_open--;
-
-        if (!retval)
-                port->flags |= ASYNC_NORMAL_ACTIVE;
-
-        DBGINFO(("%s block_til_ready ready, rc=%d\n", tty->driver->name, retval));
-        return retval;
-}
-
-static int alloc_tmp_rbuf(struct slgt_info *info)
-{
-        info->tmp_rbuf = kmalloc(info->max_frame_size + 5, GFP_KERNEL);
-        if (info->tmp_rbuf == NULL)
-                return -ENOMEM;
-        return 0;
-}
-
-static void free_tmp_rbuf(struct slgt_info *info)
-{
-        kfree(info->tmp_rbuf);
-        info->tmp_rbuf = NULL;
-}
-
-/*
- * allocate DMA descriptor lists.
- */
-static int alloc_desc(struct slgt_info *info)
-{
-        unsigned int i;
-        unsigned int pbufs;
-
-        /* allocate memory to hold descriptor lists */
-        info->bufs = pci_alloc_consistent(info->pdev, DESC_LIST_SIZE, &info->bufs_dma_addr);
-        if (info->bufs == NULL)
-                return -ENOMEM;
-
-        memset(info->bufs, 0, DESC_LIST_SIZE);
-
-        info->rbufs = (struct slgt_desc*)info->bufs;
-        info->tbufs = ((struct slgt_desc*)info->bufs) + info->rbuf_count;
-
-        pbufs = (unsigned int)info->bufs_dma_addr;
-
-        /*
-         * Build circular lists of descriptors
-         */
-
-        for (i=0; i < info->rbuf_count; i++) {
-                /* physical address of this descriptor */
-                info->rbufs[i].pdesc = pbufs + (i * sizeof(struct slgt_desc));
-
-                /* physical address of next descriptor */
-                if (i == info->rbuf_count - 1)
-                        info->rbufs[i].next = cpu_to_le32(pbufs);
-                else
-                        info->rbufs[i].next = cpu_to_le32(pbufs + ((i+1) * sizeof(struct slgt_desc)));
-                set_desc_count(info->rbufs[i], DMABUFSIZE);
-        }
-
-        for (i=0; i < info->tbuf_count; i++) {
-                /* physical address of this descriptor */
-                info->tbufs[i].pdesc = pbufs + ((info->rbuf_count + i) * sizeof(struct slgt_desc));
-
-                /* physical address of next descriptor */
-                if (i == info->tbuf_count - 1)
-                        info->tbufs[i].next = cpu_to_le32(pbufs + info->rbuf_count * sizeof(struct slgt_desc));
-                else
-                        info->tbufs[i].next = cpu_to_le32(pbufs + ((info->rbuf_count + i + 1) * sizeof(struct slgt_desc)));
-        }
-
-        return 0;
-}
-
-static void free_desc(struct slgt_info *info)
-{
-        if (info->bufs != NULL) {
-                pci_free_consistent(info->pdev, DESC_LIST_SIZE, info->bufs, info->bufs_dma_addr);
-                info->bufs  = NULL;
-                info->rbufs = NULL;
-                info->tbufs = NULL;
-        }
-}
-
-static int alloc_bufs(struct slgt_info *info, struct slgt_desc *bufs, int count)
-{
-        int i;
-        for (i=0; i < count; i++) {
-                if ((bufs[i].buf = pci_alloc_consistent(info->pdev, DMABUFSIZE, &bufs[i].buf_dma_addr)) == NULL)
-                        return -ENOMEM;
-                bufs[i].pbuf  = cpu_to_le32((unsigned int)bufs[i].buf_dma_addr);
-        }
-        return 0;
-}
-
-static void free_bufs(struct slgt_info *info, struct slgt_desc *bufs, int count)
-{
-        int i;
-        for (i=0; i < count; i++) {
-                if (bufs[i].buf == NULL)
-                        continue;
-                pci_free_consistent(info->pdev, DMABUFSIZE, bufs[i].buf, bufs[i].buf_dma_addr);
-                bufs[i].buf = NULL;
-        }
-}
-
-static int alloc_dma_bufs(struct slgt_info *info)
-{
-        info->rbuf_count = 32;
-        info->tbuf_count = 32;
-
-        if (alloc_desc(info) < 0 ||
-            alloc_bufs(info, info->rbufs, info->rbuf_count) < 0 ||
-            alloc_bufs(info, info->tbufs, info->tbuf_count) < 0 ||
-            alloc_tmp_rbuf(info) < 0) {
-                DBGERR(("%s DMA buffer alloc fail\n", info->device_name));
-                return -ENOMEM;
-        }
-        reset_rbufs(info);
-        return 0;
-}
-
-static void free_dma_bufs(struct slgt_info *info)
-{
-        if (info->bufs) {
-                free_bufs(info, info->rbufs, info->rbuf_count);
-                free_bufs(info, info->tbufs, info->tbuf_count);
-                free_desc(info);
-        }
-        free_tmp_rbuf(info);
-}
-
-static int claim_resources(struct slgt_info *info)
-{
-        if (request_mem_region(info->phys_reg_addr, SLGT_REG_SIZE, "synclink_gt") == NULL) {
-                DBGERR(("%s reg addr conflict, addr=%08X\n",
-                        info->device_name, info->phys_reg_addr));
-                info->init_error = DiagStatus_AddressConflict;
-                goto errout;
-        }
-        else
-                info->reg_addr_requested = true;
-
-        info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE);
-        if (!info->reg_addr) {
-                DBGERR(("%s cant map device registers, addr=%08X\n",
-                        info->device_name, info->phys_reg_addr));
-                info->init_error = DiagStatus_CantAssignPciResources;
-                goto errout;
-        }
-        return 0;
-
-errout:
-        release_resources(info);
-        return -ENODEV;
-}
-
-static void release_resources(struct slgt_info *info)
-{
-        if (info->irq_requested) {
-                free_irq(info->irq_level, info);
-                info->irq_requested = false;
-        }
-
-        if (info->reg_addr_requested) {
-                release_mem_region(info->phys_reg_addr, SLGT_REG_SIZE);
-                info->reg_addr_requested = false;
-        }
-
-        if (info->reg_addr) {
-                iounmap(info->reg_addr);
-                info->reg_addr = NULL;
-        }
-}
-
-/* Add the specified device instance data structure to the
- * global linked list of devices and increment the device count.
- */
-static void add_device(struct slgt_info *info)
-{
-        char *devstr;
-
-        info->next_device = NULL;
-        info->line = slgt_device_count;
-        sprintf(info->device_name, "%s%d", tty_dev_prefix, info->line);
-
-        if (info->line < MAX_DEVICES) {
-                if (maxframe[info->line])
-                        info->max_frame_size = maxframe[info->line];
-        }
-
-        slgt_device_count++;
-
-        if (!slgt_device_list)
-                slgt_device_list = info;
-        else {
-                struct slgt_info *current_dev = slgt_device_list;
-                while(current_dev->next_device)
-                        current_dev = current_dev->next_device;
-                current_dev->next_device = info;
-        }
-
-        if (info->max_frame_size < 4096)
-                info->max_frame_size = 4096;
-        else if (info->max_frame_size > 65535)
-                info->max_frame_size = 65535;
-
-        switch(info->pdev->device) {
-        case SYNCLINK_GT_DEVICE_ID:
-                devstr = "GT";
-                break;
-        case SYNCLINK_GT2_DEVICE_ID:
-                devstr = "GT2";
-                break;
-        case SYNCLINK_GT4_DEVICE_ID:
-                devstr = "GT4";
-                break;
-        case SYNCLINK_AC_DEVICE_ID:
-                devstr = "AC";
-                info->params.mode = MGSL_MODE_ASYNC;
-                break;
-        default:
-                devstr = "(unknown model)";
-        }
-        printk("SyncLink %s %s IO=%08x IRQ=%d MaxFrameSize=%u\n",
-                devstr, info->device_name, info->phys_reg_addr,
-                info->irq_level, info->max_frame_size);
-
-#if SYNCLINK_GENERIC_HDLC
-        hdlcdev_init(info);
-#endif
-}
-
-static const struct tty_port_operations slgt_port_ops = {
-        .carrier_raised = carrier_raised,
-        .dtr_rts = dtr_rts,
-};
-
-/*
- *  allocate device instance structure, return NULL on failure
- */
-static struct slgt_info *alloc_dev(int adapter_num, int port_num, struct pci_dev *pdev)
-{
-        struct slgt_info *info;
-
-        info = kzalloc(sizeof(struct slgt_info), GFP_KERNEL);
-
-        if (!info) {
-                DBGERR(("%s device alloc failed adapter=%d port=%d\n",
-                        driver_name, adapter_num, port_num));
-        } else {
-                tty_port_init(&info->port);
-                info->port.ops = &slgt_port_ops;
-                info->magic = MGSL_MAGIC;
-                INIT_WORK(&info->task, bh_handler);
-                info->max_frame_size = 4096;
-                info->base_clock = 14745600;
-                info->rbuf_fill_level = DMABUFSIZE;
-                info->port.close_delay = 5*HZ/10;
-                info->port.closing_wait = 30*HZ;
-                init_waitqueue_head(&info->status_event_wait_q);
-                init_waitqueue_head(&info->event_wait_q);
-                spin_lock_init(&info->netlock);
-                memcpy(&info->params,&default_params,sizeof(MGSL_PARAMS));
-                info->idle_mode = HDLC_TXIDLE_FLAGS;
-                info->adapter_num = adapter_num;
-                info->port_num = port_num;
-
-                setup_timer(&info->tx_timer, tx_timeout, (unsigned long)info);
-                setup_timer(&info->rx_timer, rx_timeout, (unsigned long)info);
-
-                /* Copy configuration info to device instance data */
-                info->pdev = pdev;
-                info->irq_level = pdev->irq;
-                info->phys_reg_addr = pci_resource_start(pdev,0);
-
-                info->bus_type = MGSL_BUS_TYPE_PCI;
-                info->irq_flags = IRQF_SHARED;
-
-                info->init_error = -1; /* assume error, set to 0 on successful init */
-        }
-
-        return info;
-}
-
-static void device_init(int adapter_num, struct pci_dev *pdev)
-{
-        struct slgt_info *port_array[SLGT_MAX_PORTS];
-        int i;
-        int port_count = 1;
-
-        if (pdev->device == SYNCLINK_GT2_DEVICE_ID)
-                port_count = 2;
-        else if (pdev->device == SYNCLINK_GT4_DEVICE_ID)
-                port_count = 4;
-
-        /* allocate device instances for all ports */
-        for (i=0; i < port_count; ++i) {
-                port_array[i] = alloc_dev(adapter_num, i, pdev);
-                if (port_array[i] == NULL) {
-                        for (--i; i >= 0; --i)
-                                kfree(port_array[i]);
-                        return;
-                }
-        }
-
-        /* give copy of port_array to all ports and add to device list  */
-        for (i=0; i < port_count; ++i) {
-                memcpy(port_array[i]->port_array, port_array, sizeof(port_array));
-                add_device(port_array[i]);
-                port_array[i]->port_count = port_count;
-                spin_lock_init(&port_array[i]->lock);
-        }
-
-        /* Allocate and claim adapter resources */
-        if (!claim_resources(port_array[0])) {
-
-                alloc_dma_bufs(port_array[0]);
-
-                /* copy resource information from first port to others */
-                for (i = 1; i < port_count; ++i) {
-                        port_array[i]->lock      = port_array[0]->lock;
-                        port_array[i]->irq_level = port_array[0]->irq_level;
-                        port_array[i]->reg_addr  = port_array[0]->reg_addr;
-                        alloc_dma_bufs(port_array[i]);
-                }
-
-                if (request_irq(port_array[0]->irq_level,
-                                        slgt_interrupt,
-                                        port_array[0]->irq_flags,
-                                        port_array[0]->device_name,
-                                        port_array[0]) < 0) {
-                        DBGERR(("%s request_irq failed IRQ=%d\n",
-                                port_array[0]->device_name,
-                                port_array[0]->irq_level));
-                } else {
-                        port_array[0]->irq_requested = true;
-                        adapter_test(port_array[0]);
-                        for (i=1 ; i < port_count ; i++) {
-                                port_array[i]->init_error = port_array[0]->init_error;
-                                port_array[i]->gpio_present = port_array[0]->gpio_present;
-                        }
-                }
-        }
-
-        for (i=0; i < port_count; ++i)
-                tty_register_device(serial_driver, port_array[i]->line, &(port_array[i]->pdev->dev));
-}
-
-static int __devinit init_one(struct pci_dev *dev,
-                              const struct pci_device_id *ent)
-{
-        if (pci_enable_device(dev)) {
-                printk("error enabling pci device %p\n", dev);
-                return -EIO;
-        }
-        pci_set_master(dev);
-        device_init(slgt_device_count, dev);
-        return 0;
-}
-
-static void __devexit remove_one(struct pci_dev *dev)
-{
-}
-
-static const struct tty_operations ops = {
-        .open = open,
-        .close = close,
-        .write = write,
-        .put_char = put_char,
-        .flush_chars = flush_chars,
-        .write_room = write_room,
-        .chars_in_buffer = chars_in_buffer,
-        .flush_buffer = flush_buffer,
-        .ioctl = ioctl,
-        .compat_ioctl = slgt_compat_ioctl,
-        .throttle = throttle,
-        .unthrottle = unthrottle,
-        .send_xchar = send_xchar,
-        .break_ctl = set_break,
-        .wait_until_sent = wait_until_sent,
-        .set_termios = set_termios,
-        .stop = tx_hold,
-        .start = tx_release,
-        .hangup = hangup,
-        .tiocmget = tiocmget,
-        .tiocmset = tiocmset,
-        .proc_fops = &synclink_gt_proc_fops,
-};
-
-static void slgt_cleanup(void)
-{
-        int rc;
-        struct slgt_info *info;
-        struct slgt_info *tmp;
-
-        printk(KERN_INFO "unload %s\n", driver_name);
-
-        if (serial_driver) {
-                for (info=slgt_device_list ; info != NULL ; info=info->next_device)
-                        tty_unregister_device(serial_driver, info->line);
-                if ((rc = tty_unregister_driver(serial_driver)))
-                        DBGERR(("tty_unregister_driver error=%d\n", rc));
-                put_tty_driver(serial_driver);
-        }
-
-        /* reset devices */
-        info = slgt_device_list;
-        while(info) {
-                reset_port(info);
-                info = info->next_device;
-        }
-
-        /* release devices */
-        info = slgt_device_list;
-        while(info) {
-#if SYNCLINK_GENERIC_HDLC
-                hdlcdev_exit(info);
-#endif
-                free_dma_bufs(info);
-                free_tmp_rbuf(info);
-                if (info->port_num == 0)
-                        release_resources(info);
-                tmp = info;
-                info = info->next_device;
-                kfree(tmp);
-        }
-
-        if (pci_registered)
-                pci_unregister_driver(&pci_driver);
-}
-
-/*
- *  Driver initialization entry point.
- */
-static int __init slgt_init(void)
-{
-        int rc;
-
-        printk(KERN_INFO "%s\n", driver_name);
-
-        serial_driver = alloc_tty_driver(MAX_DEVICES);
-        if (!serial_driver) {
-                printk("%s can't allocate tty driver\n", driver_name);
-                return -ENOMEM;
-        }
-
-        /* Initialize the tty_driver structure */
-
-        serial_driver->owner = THIS_MODULE;
-        serial_driver->driver_name = tty_driver_name;
-        serial_driver->name = tty_dev_prefix;
-        serial_driver->major = ttymajor;
-        serial_driver->minor_start = 64;
-        serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        serial_driver->subtype = SERIAL_TYPE_NORMAL;
-        serial_driver->init_termios = tty_std_termios;
-        serial_driver->init_termios.c_cflag =
-                B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        serial_driver->init_termios.c_ispeed = 9600;
-        serial_driver->init_termios.c_ospeed = 9600;
-        serial_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-        tty_set_operations(serial_driver, &ops);
-        if ((rc = tty_register_driver(serial_driver)) < 0) {
-                DBGERR(("%s can't register serial driver\n", driver_name));
-                put_tty_driver(serial_driver);
-                serial_driver = NULL;
-                goto error;
-        }
-
-        printk(KERN_INFO "%s, tty major#%d\n",
-               driver_name, serial_driver->major);
-
-        slgt_device_count = 0;
-        if ((rc = pci_register_driver(&pci_driver)) < 0) {
-                printk("%s pci_register_driver error=%d\n", driver_name, rc);
-                goto error;
-        }
-        pci_registered = true;
-
-        if (!slgt_device_list)
-                printk("%s no devices found\n",driver_name);
-
-        return 0;
-
-error:
-        slgt_cleanup();
-        return rc;
-}
-
-static void __exit slgt_exit(void)
-{
-        slgt_cleanup();
-}
-
-module_init(slgt_init);
-module_exit(slgt_exit);
-
-/*
- * register access routines
- */
-
-#define CALC_REGADDR() \
-        unsigned long reg_addr = ((unsigned long)info->reg_addr) + addr; \
-        if (addr >= 0x80) \
-                reg_addr += (info->port_num) * 32;
-
-static __u8 rd_reg8(struct slgt_info *info, unsigned int addr)
-{
-        CALC_REGADDR();
-        return readb((void __iomem *)reg_addr);
-}
-
-static void wr_reg8(struct slgt_info *info, unsigned int addr, __u8 value)
-{
-        CALC_REGADDR();
-        writeb(value, (void __iomem *)reg_addr);
-}
-
-static __u16 rd_reg16(struct slgt_info *info, unsigned int addr)
-{
-        CALC_REGADDR();
-        return readw((void __iomem *)reg_addr);
-}
-
-static void wr_reg16(struct slgt_info *info, unsigned int addr, __u16 value)
-{
-        CALC_REGADDR();
-        writew(value, (void __iomem *)reg_addr);
-}
-
-static __u32 rd_reg32(struct slgt_info *info, unsigned int addr)
-{
-        CALC_REGADDR();
-        return readl((void __iomem *)reg_addr);
-}
-
-static void wr_reg32(struct slgt_info *info, unsigned int addr, __u32 value)
-{
-        CALC_REGADDR();
-        writel(value, (void __iomem *)reg_addr);
-}
-
-static void rdma_reset(struct slgt_info *info)
-{
-        unsigned int i;
-
-        /* set reset bit */
-        wr_reg32(info, RDCSR, BIT1);
-
-        /* wait for enable bit cleared */
-        for(i=0 ; i < 1000 ; i++)
-                if (!(rd_reg32(info, RDCSR) & BIT0))
-                        break;
-}
-
-static void tdma_reset(struct slgt_info *info)
-{
-        unsigned int i;
-
-        /* set reset bit */
-        wr_reg32(info, TDCSR, BIT1);
-
-        /* wait for enable bit cleared */
-        for(i=0 ; i < 1000 ; i++)
-                if (!(rd_reg32(info, TDCSR) & BIT0))
-                        break;
-}
-
-/*
- * enable internal loopback
- * TxCLK and RxCLK are generated from BRG
- * and TxD is looped back to RxD internally.
- */
-static void enable_loopback(struct slgt_info *info)
-{
-        /* SCR (serial control) BIT2=looopback enable */
-        wr_reg16(info, SCR, (unsigned short)(rd_reg16(info, SCR) | BIT2));
-
-        if (info->params.mode != MGSL_MODE_ASYNC) {
-                /* CCR (clock control)
-                 * 07..05  tx clock source (010 = BRG)
-                 * 04..02  rx clock source (010 = BRG)
-                 * 01      auxclk enable   (0 = disable)
-                 * 00      BRG enable      (1 = enable)
-                 *
-                 * 0100 1001
-                 */
-                wr_reg8(info, CCR, 0x49);
-
-                /* set speed if available, otherwise use default */
-                if (info->params.clock_speed)
-                        set_rate(info, info->params.clock_speed);
-                else
-                        set_rate(info, 3686400);
-        }
-}
-
-/*
- *  set baud rate generator to specified rate
- */
-static void set_rate(struct slgt_info *info, u32 rate)
-{
-        unsigned int div;
-        unsigned int osc = info->base_clock;
-
-        /* div = osc/rate - 1
-         *
-         * Round div up if osc/rate is not integer to
-         * force to next slowest rate.
-         */
-
-        if (rate) {
-                div = osc/rate;
-                if (!(osc % rate) && div)
-                        div--;
-                wr_reg16(info, BDR, (unsigned short)div);
-        }
-}
-
-static void rx_stop(struct slgt_info *info)
-{
-        unsigned short val;
-
-        /* disable and reset receiver */
-        val = rd_reg16(info, RCR) & ~BIT1;          /* clear enable bit */
-        wr_reg16(info, RCR, (unsigned short)(val | BIT2)); /* set reset bit */
-        wr_reg16(info, RCR, val);                  /* clear reset bit */
-
-        slgt_irq_off(info, IRQ_RXOVER + IRQ_RXDATA + IRQ_RXIDLE);
-
-        /* clear pending rx interrupts */
-        wr_reg16(info, SSR, IRQ_RXIDLE + IRQ_RXOVER);
-
-        rdma_reset(info);
-
-        info->rx_enabled = false;
-        info->rx_restart = false;
-}
-
-static void rx_start(struct slgt_info *info)
-{
-        unsigned short val;
-
-        slgt_irq_off(info, IRQ_RXOVER + IRQ_RXDATA);
-
-        /* clear pending rx overrun IRQ */
-        wr_reg16(info, SSR, IRQ_RXOVER);
-
-        /* reset and disable receiver */
-        val = rd_reg16(info, RCR) & ~BIT1; /* clear enable bit */
-        wr_reg16(info, RCR, (unsigned short)(val | BIT2)); /* set reset bit */
-        wr_reg16(info, RCR, val);                  /* clear reset bit */
-
-        rdma_reset(info);
-        reset_rbufs(info);
-
-        if (info->rx_pio) {
-                /* rx request when rx FIFO not empty */
-                wr_reg16(info, SCR, (unsigned short)(rd_reg16(info, SCR) & ~BIT14));
-                slgt_irq_on(info, IRQ_RXDATA);
-                if (info->params.mode == MGSL_MODE_ASYNC) {
-                        /* enable saving of rx status */
-                        wr_reg32(info, RDCSR, BIT6);
-                }
-        } else {
-                /* rx request when rx FIFO half full */
-                wr_reg16(info, SCR, (unsigned short)(rd_reg16(info, SCR) | BIT14));
-                /* set 1st descriptor address */
-                wr_reg32(info, RDDAR, info->rbufs[0].pdesc);
-
-                if (info->params.mode != MGSL_MODE_ASYNC) {
-                        /* enable rx DMA and DMA interrupt */
-                        wr_reg32(info, RDCSR, (BIT2 + BIT0));
-                } else {
-                        /* enable saving of rx status, rx DMA and DMA interrupt */
-                        wr_reg32(info, RDCSR, (BIT6 + BIT2 + BIT0));
-                }
-        }
-
-        slgt_irq_on(info, IRQ_RXOVER);
-
-        /* enable receiver */
-        wr_reg16(info, RCR, (unsigned short)(rd_reg16(info, RCR) | BIT1));
-
-        info->rx_restart = false;
-        info->rx_enabled = true;
-}
-
-static void tx_start(struct slgt_info *info)
-{
-        if (!info->tx_enabled) {
-                wr_reg16(info, TCR,
-                         (unsigned short)((rd_reg16(info, TCR) | BIT1) & ~BIT2));
-                info->tx_enabled = true;
-        }
-
-        if (desc_count(info->tbufs[info->tbuf_start])) {
-                info->drop_rts_on_tx_done = false;
-
-                if (info->params.mode != MGSL_MODE_ASYNC) {
-                        if (info->params.flags & HDLC_FLAG_AUTO_RTS) {
-                                get_signals(info);
-                                if (!(info->signals & SerialSignal_RTS)) {
-                                        info->signals |= SerialSignal_RTS;
-                                        set_signals(info);
-                                        info->drop_rts_on_tx_done = true;
-                                }
-                        }
-
-                        slgt_irq_off(info, IRQ_TXDATA);
-                        slgt_irq_on(info, IRQ_TXUNDER + IRQ_TXIDLE);
-                        /* clear tx idle and underrun status bits */
-                        wr_reg16(info, SSR, (unsigned short)(IRQ_TXIDLE + IRQ_TXUNDER));
-                } else {
-                        slgt_irq_off(info, IRQ_TXDATA);
-                        slgt_irq_on(info, IRQ_TXIDLE);
-                        /* clear tx idle status bit */
-                        wr_reg16(info, SSR, IRQ_TXIDLE);
-                }
-                /* set 1st descriptor address and start DMA */
-                wr_reg32(info, TDDAR, info->tbufs[info->tbuf_start].pdesc);
-                wr_reg32(info, TDCSR, BIT2 + BIT0);
-                info->tx_active = true;
-        }
-}
-
-static void tx_stop(struct slgt_info *info)
-{
-        unsigned short val;
-
-        del_timer(&info->tx_timer);
-
-        tdma_reset(info);
-
-        /* reset and disable transmitter */
-        val = rd_reg16(info, TCR) & ~BIT1;          /* clear enable bit */
-        wr_reg16(info, TCR, (unsigned short)(val | BIT2)); /* set reset bit */
-
-        slgt_irq_off(info, IRQ_TXDATA + IRQ_TXIDLE + IRQ_TXUNDER);
-
-        /* clear tx idle and underrun status bit */
-        wr_reg16(info, SSR, (unsigned short)(IRQ_TXIDLE + IRQ_TXUNDER));
-
-        reset_tbufs(info);
-
-        info->tx_enabled = false;
-        info->tx_active = false;
-}
-
-static void reset_port(struct slgt_info *info)
-{
-        if (!info->reg_addr)
-                return;
-
-        tx_stop(info);
-        rx_stop(info);
-
-        info->signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
-        set_signals(info);
-
-        slgt_irq_off(info, IRQ_ALL | IRQ_MASTER);
-}
-
-static void reset_adapter(struct slgt_info *info)
-{
-        int i;
-        for (i=0; i < info->port_count; ++i) {
-                if (info->port_array[i])
-                        reset_port(info->port_array[i]);
-        }
-}
-
-static void async_mode(struct slgt_info *info)
-{
-        unsigned short val;
-
-        slgt_irq_off(info, IRQ_ALL | IRQ_MASTER);
-        tx_stop(info);
-        rx_stop(info);
-
-        /* TCR (tx control)
-         *
-         * 15..13  mode, 010=async
-         * 12..10  encoding, 000=NRZ
-         * 09      parity enable
-         * 08      1=odd parity, 0=even parity
-         * 07      1=RTS driver control
-         * 06      1=break enable
-         * 05..04  character length
-         *         00=5 bits
-         *         01=6 bits
-         *         10=7 bits
-         *         11=8 bits
-         * 03      0=1 stop bit, 1=2 stop bits
-         * 02      reset
-         * 01      enable
-         * 00      auto-CTS enable
-         */
-        val = 0x4000;
-
-        if (info->if_mode & MGSL_INTERFACE_RTS_EN)
-                val |= BIT7;
-
-        if (info->params.parity != ASYNC_PARITY_NONE) {
-                val |= BIT9;
-                if (info->params.parity == ASYNC_PARITY_ODD)
-                        val |= BIT8;
-        }
-
-        switch (info->params.data_bits)
-        {
-        case 6: val |= BIT4; break;
-        case 7: val |= BIT5; break;
-        case 8: val |= BIT5 + BIT4; break;
-        }
-
-        if (info->params.stop_bits != 1)
-                val |= BIT3;
-
-        if (info->params.flags & HDLC_FLAG_AUTO_CTS)
-                val |= BIT0;
-
-        wr_reg16(info, TCR, val);
-
-        /* RCR (rx control)
-         *
-         * 15..13  mode, 010=async
-         * 12..10  encoding, 000=NRZ
-         * 09      parity enable
-         * 08      1=odd parity, 0=even parity
-         * 07..06  reserved, must be 0
-         * 05..04  character length
-         *         00=5 bits
-         *         01=6 bits
-         *         10=7 bits
-         *         11=8 bits
-         * 03      reserved, must be zero
-         * 02      reset
-         * 01      enable
-         * 00      auto-DCD enable
-         */
-        val = 0x4000;
-
-        if (info->params.parity != ASYNC_PARITY_NONE) {
-                val |= BIT9;
-                if (info->params.parity == ASYNC_PARITY_ODD)
-                        val |= BIT8;
-        }
-
-        switch (info->params.data_bits)
-        {
-        case 6: val |= BIT4; break;
-        case 7: val |= BIT5; break;
-        case 8: val |= BIT5 + BIT4; break;
-        }
-
-        if (info->params.flags & HDLC_FLAG_AUTO_DCD)
-                val |= BIT0;
-
-        wr_reg16(info, RCR, val);
-
-        /* CCR (clock control)
-         *
-         * 07..05  011 = tx clock source is BRG/16
-         * 04..02  010 = rx clock source is BRG
-         * 01      0 = auxclk disabled
-         * 00      1 = BRG enabled
-         *
-         * 0110 1001
-         */
-        wr_reg8(info, CCR, 0x69);
-
-        msc_set_vcr(info);
-
-        /* SCR (serial control)
-         *
-         * 15  1=tx req on FIFO half empty
-         * 14  1=rx req on FIFO half full
-         * 13  tx data  IRQ enable
-         * 12  tx idle  IRQ enable
-         * 11  rx break on IRQ enable
-         * 10  rx data  IRQ enable
-         * 09  rx break off IRQ enable
-         * 08  overrun  IRQ enable
-         * 07  DSR      IRQ enable
-         * 06  CTS      IRQ enable
-         * 05  DCD      IRQ enable
-         * 04  RI       IRQ enable
-         * 03  0=16x sampling, 1=8x sampling
-         * 02  1=txd->rxd internal loopback enable
-         * 01  reserved, must be zero
-         * 00  1=master IRQ enable
-         */
-        val = BIT15 + BIT14 + BIT0;
-        /* JCR[8] : 1 = x8 async mode feature available */
-        if ((rd_reg32(info, JCR) & BIT8) && info->params.data_rate &&
-            ((info->base_clock < (info->params.data_rate * 16)) ||
-             (info->base_clock % (info->params.data_rate * 16)))) {
-                /* use 8x sampling */
-                val |= BIT3;
-                set_rate(info, info->params.data_rate * 8);
-        } else {
-                /* use 16x sampling */
-                set_rate(info, info->params.data_rate * 16);
-        }
-        wr_reg16(info, SCR, val);
-
-        slgt_irq_on(info, IRQ_RXBREAK | IRQ_RXOVER);
-
-        if (info->params.loopback)
-                enable_loopback(info);
-}
-
-static void sync_mode(struct slgt_info *info)
-{
-        unsigned short val;
-
-        slgt_irq_off(info, IRQ_ALL | IRQ_MASTER);
-        tx_stop(info);
-        rx_stop(info);
-
-        /* TCR (tx control)
-         *
-         * 15..13  mode, 000=HDLC 001=raw 010=async 011=monosync 100=bisync
-         * 12..10  encoding
-         * 09      CRC enable
-         * 08      CRC32
-         * 07      1=RTS driver control
-         * 06      preamble enable
-         * 05..04  preamble length
-         * 03      share open/close flag
-         * 02      reset
-         * 01      enable
-         * 00      auto-CTS enable
-         */
-        val = BIT2;
-
-        switch(info->params.mode) {
-        case MGSL_MODE_MONOSYNC: val |= BIT14 + BIT13; break;
-        case MGSL_MODE_BISYNC:   val |= BIT15; break;
-        case MGSL_MODE_RAW:      val |= BIT13; break;
-        }
-        if (info->if_mode & MGSL_INTERFACE_RTS_EN)
-                val |= BIT7;
-
-        switch(info->params.encoding)
-        {
-        case HDLC_ENCODING_NRZB:          val |= BIT10; break;
-        case HDLC_ENCODING_NRZI_MARK:     val |= BIT11; break;
-        case HDLC_ENCODING_NRZI:          val |= BIT11 + BIT10; break;
-        case HDLC_ENCODING_BIPHASE_MARK:  val |= BIT12; break;
-        case HDLC_ENCODING_BIPHASE_SPACE: val |= BIT12 + BIT10; break;
-        case HDLC_ENCODING_BIPHASE_LEVEL: val |= BIT12 + BIT11; break;
-        case HDLC_ENCODING_DIFF_BIPHASE_LEVEL: val |= BIT12 + BIT11 + BIT10; break;
-        }
-
-        switch (info->params.crc_type & HDLC_CRC_MASK)
-        {
-        case HDLC_CRC_16_CCITT: val |= BIT9; break;
-        case HDLC_CRC_32_CCITT: val |= BIT9 + BIT8; break;
-        }
-
-        if (info->params.preamble != HDLC_PREAMBLE_PATTERN_NONE)
-                val |= BIT6;
-
-        switch (info->params.preamble_length)
-        {
-        case HDLC_PREAMBLE_LENGTH_16BITS: val |= BIT5; break;
-        case HDLC_PREAMBLE_LENGTH_32BITS: val |= BIT4; break;
-        case HDLC_PREAMBLE_LENGTH_64BITS: val |= BIT5 + BIT4; break;
-        }
-
-        if (info->params.flags & HDLC_FLAG_AUTO_CTS)
-                val |= BIT0;
-
-        wr_reg16(info, TCR, val);
-
-        /* TPR (transmit preamble) */
-
-        switch (info->params.preamble)
-        {
-        case HDLC_PREAMBLE_PATTERN_FLAGS: val = 0x7e; break;
-        case HDLC_PREAMBLE_PATTERN_ONES:  val = 0xff; break;
-        case HDLC_PREAMBLE_PATTERN_ZEROS: val = 0x00; break;
-        case HDLC_PREAMBLE_PATTERN_10:    val = 0x55; break;
-        case HDLC_PREAMBLE_PATTERN_01:    val = 0xaa; break;
-        default:                          val = 0x7e; break;
-        }
-        wr_reg8(info, TPR, (unsigned char)val);
-
-        /* RCR (rx control)
-         *
-         * 15..13  mode, 000=HDLC 001=raw 010=async 011=monosync 100=bisync
-         * 12..10  encoding
-         * 09      CRC enable
-         * 08      CRC32
-         * 07..03  reserved, must be 0
-         * 02      reset
-         * 01      enable
-         * 00      auto-DCD enable
-         */
-        val = 0;
-
-        switch(info->params.mode) {
-        case MGSL_MODE_MONOSYNC: val |= BIT14 + BIT13; break;
-        case MGSL_MODE_BISYNC:   val |= BIT15; break;
-        case MGSL_MODE_RAW:      val |= BIT13; break;
-        }
-
-        switch(info->params.encoding)
-        {
-        case HDLC_ENCODING_NRZB:          val |= BIT10; break;
-        case HDLC_ENCODING_NRZI_MARK:     val |= BIT11; break;
-        case HDLC_ENCODING_NRZI:          val |= BIT11 + BIT10; break;
-        case HDLC_ENCODING_BIPHASE_MARK:  val |= BIT12; break;
-        case HDLC_ENCODING_BIPHASE_SPACE: val |= BIT12 + BIT10; break;
-        case HDLC_ENCODING_BIPHASE_LEVEL: val |= BIT12 + BIT11; break;
-        case HDLC_ENCODING_DIFF_BIPHASE_LEVEL: val |= BIT12 + BIT11 + BIT10; break;
-        }
-
-        switch (info->params.crc_type & HDLC_CRC_MASK)
-        {
-        case HDLC_CRC_16_CCITT: val |= BIT9; break;
-        case HDLC_CRC_32_CCITT: val |= BIT9 + BIT8; break;
-        }
-
-        if (info->params.flags & HDLC_FLAG_AUTO_DCD)
-                val |= BIT0;
-
-        wr_reg16(info, RCR, val);
-
-        /* CCR (clock control)
-         *
-         * 07..05  tx clock source
-         * 04..02  rx clock source
-         * 01      auxclk enable
-         * 00      BRG enable
-         */
-        val = 0;
-
-        if (info->params.flags & HDLC_FLAG_TXC_BRG)
-        {
-                // when RxC source is DPLL, BRG generates 16X DPLL
-                // reference clock, so take TxC from BRG/16 to get
-                // transmit clock at actual data rate
-                if (info->params.flags & HDLC_FLAG_RXC_DPLL)
-                        val |= BIT6 + BIT5;     /* 011, txclk = BRG/16 */
-                else
-                        val |= BIT6;    /* 010, txclk = BRG */
-        }
-        else if (info->params.flags & HDLC_FLAG_TXC_DPLL)
-                val |= BIT7;    /* 100, txclk = DPLL Input */
-        else if (info->params.flags & HDLC_FLAG_TXC_RXCPIN)
-                val |= BIT5;    /* 001, txclk = RXC Input */
-
-        if (info->params.flags & HDLC_FLAG_RXC_BRG)
-                val |= BIT3;    /* 010, rxclk = BRG */
-        else if (info->params.flags & HDLC_FLAG_RXC_DPLL)
-                val |= BIT4;    /* 100, rxclk = DPLL */
-        else if (info->params.flags & HDLC_FLAG_RXC_TXCPIN)
-                val |= BIT2;    /* 001, rxclk = TXC Input */
-
-        if (info->params.clock_speed)
-                val |= BIT1 + BIT0;
-
-        wr_reg8(info, CCR, (unsigned char)val);
-
-        if (info->params.flags & (HDLC_FLAG_TXC_DPLL + HDLC_FLAG_RXC_DPLL))
-        {
-                // program DPLL mode
-                switch(info->params.encoding)
-                {
-                case HDLC_ENCODING_BIPHASE_MARK:
-                case HDLC_ENCODING_BIPHASE_SPACE:
-                        val = BIT7; break;
-                case HDLC_ENCODING_BIPHASE_LEVEL:
-                case HDLC_ENCODING_DIFF_BIPHASE_LEVEL:
-                        val = BIT7 + BIT6; break;
-                default: val = BIT6;    // NRZ encodings
-                }
-                wr_reg16(info, RCR, (unsigned short)(rd_reg16(info, RCR) | val));
-
-                // DPLL requires a 16X reference clock from BRG
-                set_rate(info, info->params.clock_speed * 16);
-        }
-        else
-                set_rate(info, info->params.clock_speed);
-
-        tx_set_idle(info);
-
-        msc_set_vcr(info);
-
-        /* SCR (serial control)
-         *
-         * 15  1=tx req on FIFO half empty
-         * 14  1=rx req on FIFO half full
-         * 13  tx data  IRQ enable
-         * 12  tx idle  IRQ enable
-         * 11  underrun IRQ enable
-         * 10  rx data  IRQ enable
-         * 09  rx idle  IRQ enable
-         * 08  overrun  IRQ enable
-         * 07  DSR      IRQ enable
-         * 06  CTS      IRQ enable
-         * 05  DCD      IRQ enable
-         * 04  RI       IRQ enable
-         * 03  reserved, must be zero
-         * 02  1=txd->rxd internal loopback enable
-         * 01  reserved, must be zero
-         * 00  1=master IRQ enable
-         */
-        wr_reg16(info, SCR, BIT15 + BIT14 + BIT0);
-
-        if (info->params.loopback)
-                enable_loopback(info);
-}
-
-/*
- *  set transmit idle mode
- */
-static void tx_set_idle(struct slgt_info *info)
-{
-        unsigned char val;
-        unsigned short tcr;
-
-        /* if preamble enabled (tcr[6] == 1) then tx idle size = 8 bits
-         * else tcr[5:4] = tx idle size: 00 = 8 bits, 01 = 16 bits
-         */
-        tcr = rd_reg16(info, TCR);
-        if (info->idle_mode & HDLC_TXIDLE_CUSTOM_16) {
-                /* disable preamble, set idle size to 16 bits */
-                tcr = (tcr & ~(BIT6 + BIT5)) | BIT4;
-                /* MSB of 16 bit idle specified in tx preamble register (TPR) */
-                wr_reg8(info, TPR, (unsigned char)((info->idle_mode >> 8) & 0xff));
-        } else if (!(tcr & BIT6)) {
-                /* preamble is disabled, set idle size to 8 bits */
-                tcr &= ~(BIT5 + BIT4);
-        }
-        wr_reg16(info, TCR, tcr);
-
-        if (info->idle_mode & (HDLC_TXIDLE_CUSTOM_8 | HDLC_TXIDLE_CUSTOM_16)) {
-                /* LSB of custom tx idle specified in tx idle register */
-                val = (unsigned char)(info->idle_mode & 0xff);
-        } else {
-                /* standard 8 bit idle patterns */
-                switch(info->idle_mode)
-                {
-                case HDLC_TXIDLE_FLAGS:          val = 0x7e; break;
-                case HDLC_TXIDLE_ALT_ZEROS_ONES:
-                case HDLC_TXIDLE_ALT_MARK_SPACE: val = 0xaa; break;
-                case HDLC_TXIDLE_ZEROS:
-                case HDLC_TXIDLE_SPACE:          val = 0x00; break;
-                default:                         val = 0xff;
-                }
-        }
-
-        wr_reg8(info, TIR, val);
-}
-
-/*
- * get state of V24 status (input) signals
- */
-static void get_signals(struct slgt_info *info)
-{
-        unsigned short status = rd_reg16(info, SSR);
-
-        /* clear all serial signals except DTR and RTS */
-        info->signals &= SerialSignal_DTR + SerialSignal_RTS;
-
-        if (status & BIT3)
-                info->signals |= SerialSignal_DSR;
-        if (status & BIT2)
-                info->signals |= SerialSignal_CTS;
-        if (status & BIT1)
-                info->signals |= SerialSignal_DCD;
-        if (status & BIT0)
-                info->signals |= SerialSignal_RI;
-}
-
-/*
- * set V.24 Control Register based on current configuration
- */
-static void msc_set_vcr(struct slgt_info *info)
-{
-        unsigned char val = 0;
-
-        /* VCR (V.24 control)
-         *
-         * 07..04  serial IF select
-         * 03      DTR
-         * 02      RTS
-         * 01      LL
-         * 00      RL
-         */
-
-        switch(info->if_mode & MGSL_INTERFACE_MASK)
-        {
-        case MGSL_INTERFACE_RS232:
-                val |= BIT5; /* 0010 */
-                break;
-        case MGSL_INTERFACE_V35:
-                val |= BIT7 + BIT6 + BIT5; /* 1110 */
-                break;
-        case MGSL_INTERFACE_RS422:
-                val |= BIT6; /* 0100 */
-                break;
-        }
-
-        if (info->if_mode & MGSL_INTERFACE_MSB_FIRST)
-                val |= BIT4;
-        if (info->signals & SerialSignal_DTR)
-                val |= BIT3;
-        if (info->signals & SerialSignal_RTS)
-                val |= BIT2;
-        if (info->if_mode & MGSL_INTERFACE_LL)
-                val |= BIT1;
-        if (info->if_mode & MGSL_INTERFACE_RL)
-                val |= BIT0;
-        wr_reg8(info, VCR, val);
-}
-
-/*
- * set state of V24 control (output) signals
- */
-static void set_signals(struct slgt_info *info)
-{
-        unsigned char val = rd_reg8(info, VCR);
-        if (info->signals & SerialSignal_DTR)
-                val |= BIT3;
-        else
-                val &= ~BIT3;
-        if (info->signals & SerialSignal_RTS)
-                val |= BIT2;
-        else
-                val &= ~BIT2;
-        wr_reg8(info, VCR, val);
-}
-
-/*
- * free range of receive DMA buffers (i to last)
- */
-static void free_rbufs(struct slgt_info *info, unsigned int i, unsigned int last)
-{
-        int done = 0;
-
-        while(!done) {
-                /* reset current buffer for reuse */
-                info->rbufs[i].status = 0;
-                set_desc_count(info->rbufs[i], info->rbuf_fill_level);
-                if (i == last)
-                        done = 1;
-                if (++i == info->rbuf_count)
-                        i = 0;
-        }
-        info->rbuf_current = i;
-}
-
-/*
- * mark all receive DMA buffers as free
- */
-static void reset_rbufs(struct slgt_info *info)
-{
-        free_rbufs(info, 0, info->rbuf_count - 1);
-        info->rbuf_fill_index = 0;
-        info->rbuf_fill_count = 0;
-}
-
-/*
- * pass receive HDLC frame to upper layer
- *
- * return true if frame available, otherwise false
- */
-static bool rx_get_frame(struct slgt_info *info)
-{
-        unsigned int start, end;
-        unsigned short status;
-        unsigned int framesize = 0;
-        unsigned long flags;
-        struct tty_struct *tty = info->port.tty;
-        unsigned char addr_field = 0xff;
-        unsigned int crc_size = 0;
-
-        switch (info->params.crc_type & HDLC_CRC_MASK) {
-        case HDLC_CRC_16_CCITT: crc_size = 2; break;
-        case HDLC_CRC_32_CCITT: crc_size = 4; break;
-        }
-
-check_again:
-
-        framesize = 0;
-        addr_field = 0xff;
-        start = end = info->rbuf_current;
-
-        for (;;) {
-                if (!desc_complete(info->rbufs[end]))
-                        goto cleanup;
-
-                if (framesize == 0 && info->params.addr_filter != 0xff)
-                        addr_field = info->rbufs[end].buf[0];
-
-                framesize += desc_count(info->rbufs[end]);
-
-                if (desc_eof(info->rbufs[end]))
-                        break;
-
-                if (++end == info->rbuf_count)
-                        end = 0;
-
-                if (end == info->rbuf_current) {
-                        if (info->rx_enabled){
-                                spin_lock_irqsave(&info->lock,flags);
-                                rx_start(info);
-                                spin_unlock_irqrestore(&info->lock,flags);
-                        }
-                        goto cleanup;
-                }
-        }
-
-        /* status
-         *
-         * 15      buffer complete
-         * 14..06  reserved
-         * 05..04  residue
-         * 02      eof (end of frame)
-         * 01      CRC error
-         * 00      abort
-         */
-        status = desc_status(info->rbufs[end]);
-
-        /* ignore CRC bit if not using CRC (bit is undefined) */
-        if ((info->params.crc_type & HDLC_CRC_MASK) == HDLC_CRC_NONE)
-                status &= ~BIT1;
-
-        if (framesize == 0 ||
-                 (addr_field != 0xff && addr_field != info->params.addr_filter)) {
-                free_rbufs(info, start, end);
-                goto check_again;
-        }
-
-        if (framesize < (2 + crc_size) || status & BIT0) {
-                info->icount.rxshort++;
-                framesize = 0;
-        } else if (status & BIT1) {
-                info->icount.rxcrc++;
-                if (!(info->params.crc_type & HDLC_CRC_RETURN_EX))
-                        framesize = 0;
-        }
-
-#if SYNCLINK_GENERIC_HDLC
-        if (framesize == 0) {
-                info->netdev->stats.rx_errors++;
-                info->netdev->stats.rx_frame_errors++;
-        }
-#endif
-
-        DBGBH(("%s rx frame status=%04X size=%d\n",
-                info->device_name, status, framesize));
-        DBGDATA(info, info->rbufs[start].buf, min_t(int, framesize, info->rbuf_fill_level), "rx");
-
-        if (framesize) {
-                if (!(info->params.crc_type & HDLC_CRC_RETURN_EX)) {
-                        framesize -= crc_size;
-                        crc_size = 0;
-                }
-
-                if (framesize > info->max_frame_size + crc_size)
-                        info->icount.rxlong++;
-                else {
-                        /* copy dma buffer(s) to contiguous temp buffer */
-                        int copy_count = framesize;
-                        int i = start;
-                        unsigned char *p = info->tmp_rbuf;
-                        info->tmp_rbuf_count = framesize;
-
-                        info->icount.rxok++;
-
-                        while(copy_count) {
-                                int partial_count = min_t(int, copy_count, info->rbuf_fill_level);
-                                memcpy(p, info->rbufs[i].buf, partial_count);
-                                p += partial_count;
-                                copy_count -= partial_count;
-                                if (++i == info->rbuf_count)
-                                        i = 0;
-                        }
-
-                        if (info->params.crc_type & HDLC_CRC_RETURN_EX) {
-                                *p = (status & BIT1) ? RX_CRC_ERROR : RX_OK;
-                                framesize++;
-                        }
-
-#if SYNCLINK_GENERIC_HDLC
-                        if (info->netcount)
-                                hdlcdev_rx(info,info->tmp_rbuf, framesize);
-                        else
-#endif
-                                ldisc_receive_buf(tty, info->tmp_rbuf, info->flag_buf, framesize);
-                }
-        }
-        free_rbufs(info, start, end);
-        return true;
-
-cleanup:
-        return false;
-}
-
-/*
- * pass receive buffer (RAW synchronous mode) to tty layer
- * return true if buffer available, otherwise false
- */
-static bool rx_get_buf(struct slgt_info *info)
-{
-        unsigned int i = info->rbuf_current;
-        unsigned int count;
-
-        if (!desc_complete(info->rbufs[i]))
-                return false;
-        count = desc_count(info->rbufs[i]);
-        switch(info->params.mode) {
-        case MGSL_MODE_MONOSYNC:
-        case MGSL_MODE_BISYNC:
-                /* ignore residue in byte synchronous modes */
-                if (desc_residue(info->rbufs[i]))
-                        count--;
-                break;
-        }
-        DBGDATA(info, info->rbufs[i].buf, count, "rx");
-        DBGINFO(("rx_get_buf size=%d\n", count));
-        if (count)
-                ldisc_receive_buf(info->port.tty, info->rbufs[i].buf,
-                                  info->flag_buf, count);
-        free_rbufs(info, i, i);
-        return true;
-}
-
-static void reset_tbufs(struct slgt_info *info)
-{
-        unsigned int i;
-        info->tbuf_current = 0;
-        for (i=0 ; i < info->tbuf_count ; i++) {
-                info->tbufs[i].status = 0;
-                info->tbufs[i].count  = 0;
-        }
-}
-
-/*
- * return number of free transmit DMA buffers
- */
-static unsigned int free_tbuf_count(struct slgt_info *info)
-{
-        unsigned int count = 0;
-        unsigned int i = info->tbuf_current;
-
-        do
-        {
-                if (desc_count(info->tbufs[i]))
-                        break; /* buffer in use */
-                ++count;
-                if (++i == info->tbuf_count)
-                        i=0;
-        } while (i != info->tbuf_current);
-
-        /* if tx DMA active, last zero count buffer is in use */
-        if (count && (rd_reg32(info, TDCSR) & BIT0))
-                --count;
-
-        return count;
-}
-
-/*
- * return number of bytes in unsent transmit DMA buffers
- * and the serial controller tx FIFO
- */
-static unsigned int tbuf_bytes(struct slgt_info *info)
-{
-        unsigned int total_count = 0;
-        unsigned int i = info->tbuf_current;
-        unsigned int reg_value;
-        unsigned int count;
-        unsigned int active_buf_count = 0;
-
-        /*
-         * Add descriptor counts for all tx DMA buffers.
-         * If count is zero (cleared by DMA controller after read),
-         * the buffer is complete or is actively being read from.
-         *
-         * Record buf_count of last buffer with zero count starting
-         * from current ring position. buf_count is mirror
-         * copy of count and is not cleared by serial controller.
-         * If DMA controller is active, that buffer is actively
-         * being read so add to total.
-         */
-        do {
-                count = desc_count(info->tbufs[i]);
-                if (count)
-                        total_count += count;
-                else if (!total_count)
-                        active_buf_count = info->tbufs[i].buf_count;
-                if (++i == info->tbuf_count)
-                        i = 0;
-        } while (i != info->tbuf_current);
-
-        /* read tx DMA status register */
-        reg_value = rd_reg32(info, TDCSR);
-
-        /* if tx DMA active, last zero count buffer is in use */
-        if (reg_value & BIT0)
-                total_count += active_buf_count;
-
-        /* add tx FIFO count = reg_value[15..8] */
-        total_count += (reg_value >> 8) & 0xff;
-
-        /* if transmitter active add one byte for shift register */
-        if (info->tx_active)
-                total_count++;
-
-        return total_count;
-}
-
-/*
- * load data into transmit DMA buffer ring and start transmitter if needed
- * return true if data accepted, otherwise false (buffers full)
- */
-static bool tx_load(struct slgt_info *info, const char *buf, unsigned int size)
-{
-        unsigned short count;
-        unsigned int i;
-        struct slgt_desc *d;
-
-        /* check required buffer space */
-        if (DIV_ROUND_UP(size, DMABUFSIZE) > free_tbuf_count(info))
-                return false;
-
-        DBGDATA(info, buf, size, "tx");
-
-        /*
-         * copy data to one or more DMA buffers in circular ring
-         * tbuf_start   = first buffer for this data
-         * tbuf_current = next free buffer
-         *
-         * Copy all data before making data visible to DMA controller by
-         * setting descriptor count of the first buffer.
-         * This prevents an active DMA controller from reading the first DMA
-         * buffers of a frame and stopping before the final buffers are filled.
-         */
-
-        info->tbuf_start = i = info->tbuf_current;
-
-        while (size) {
-                d = &info->tbufs[i];
-
-                count = (unsigned short)((size > DMABUFSIZE) ? DMABUFSIZE : size);
-                memcpy(d->buf, buf, count);
-
-                size -= count;
-                buf  += count;
-
-                /*
-                 * set EOF bit for last buffer of HDLC frame or
-                 * for every buffer in raw mode
-                 */
-                if ((!size && info->params.mode == MGSL_MODE_HDLC) ||
-                    info->params.mode == MGSL_MODE_RAW)
-                        set_desc_eof(*d, 1);
-                else
-                        set_desc_eof(*d, 0);
-
-                /* set descriptor count for all but first buffer */
-                if (i != info->tbuf_start)
-                        set_desc_count(*d, count);
-                d->buf_count = count;
-
-                if (++i == info->tbuf_count)
-                        i = 0;
-        }
-
-        info->tbuf_current = i;
-
-        /* set first buffer count to make new data visible to DMA controller */
-        d = &info->tbufs[info->tbuf_start];
-        set_desc_count(*d, d->buf_count);
-
-        /* start transmitter if needed and update transmit timeout */
-        if (!info->tx_active)
-                tx_start(info);
-        update_tx_timer(info);
-
-        return true;
-}
-
-static int register_test(struct slgt_info *info)
-{
-        static unsigned short patterns[] =
-                {0x0000, 0xffff, 0xaaaa, 0x5555, 0x6969, 0x9696};
-        static unsigned int count = ARRAY_SIZE(patterns);
-        unsigned int i;
-        int rc = 0;
-
-        for (i=0 ; i < count ; i++) {
-                wr_reg16(info, TIR, patterns[i]);
-                wr_reg16(info, BDR, patterns[(i+1)%count]);
-                if ((rd_reg16(info, TIR) != patterns[i]) ||
-                    (rd_reg16(info, BDR) != patterns[(i+1)%count])) {
-                        rc = -ENODEV;
-                        break;
-                }
-        }
-        info->gpio_present = (rd_reg32(info, JCR) & BIT5) ? 1 : 0;
-        info->init_error = rc ? 0 : DiagStatus_AddressFailure;
-        return rc;
-}
-
-static int irq_test(struct slgt_info *info)
-{
-        unsigned long timeout;
-        unsigned long flags;
-        struct tty_struct *oldtty = info->port.tty;
-        u32 speed = info->params.data_rate;
-
-        info->params.data_rate = 921600;
-        info->port.tty = NULL;
-
-        spin_lock_irqsave(&info->lock, flags);
-        async_mode(info);
-        slgt_irq_on(info, IRQ_TXIDLE);
-
-        /* enable transmitter */
-        wr_reg16(info, TCR,
-                (unsigned short)(rd_reg16(info, TCR) | BIT1));
-
-        /* write one byte and wait for tx idle */
-        wr_reg16(info, TDR, 0);
-
-        /* assume failure */
-        info->init_error = DiagStatus_IrqFailure;
-        info->irq_occurred = false;
-
-        spin_unlock_irqrestore(&info->lock, flags);
-
-        timeout=100;
-        while(timeout-- && !info->irq_occurred)
-                msleep_interruptible(10);
-
-        spin_lock_irqsave(&info->lock,flags);
-        reset_port(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        info->params.data_rate = speed;
-        info->port.tty = oldtty;
-
-        info->init_error = info->irq_occurred ? 0 : DiagStatus_IrqFailure;
-        return info->irq_occurred ? 0 : -ENODEV;
-}
-
-static int loopback_test_rx(struct slgt_info *info)
-{
-        unsigned char *src, *dest;
-        int count;
-
-        if (desc_complete(info->rbufs[0])) {
-                count = desc_count(info->rbufs[0]);
-                src   = info->rbufs[0].buf;
-                dest  = info->tmp_rbuf;
-
-                for( ; count ; count-=2, src+=2) {
-                        /* src=data byte (src+1)=status byte */
-                        if (!(*(src+1) & (BIT9 + BIT8))) {
-                                *dest = *src;
-                                dest++;
-                                info->tmp_rbuf_count++;
-                        }
-                }
-                DBGDATA(info, info->tmp_rbuf, info->tmp_rbuf_count, "rx");
-                return 1;
-        }
-        return 0;
-}
-
-static int loopback_test(struct slgt_info *info)
-{
-#define TESTFRAMESIZE 20
-
-        unsigned long timeout;
-        u16 count = TESTFRAMESIZE;
-        unsigned char buf[TESTFRAMESIZE];
-        int rc = -ENODEV;
-        unsigned long flags;
-
-        struct tty_struct *oldtty = info->port.tty;
-        MGSL_PARAMS params;
-
-        memcpy(&params, &info->params, sizeof(params));
-
-        info->params.mode = MGSL_MODE_ASYNC;
-        info->params.data_rate = 921600;
-        info->params.loopback = 1;
-        info->port.tty = NULL;
-
-        /* build and send transmit frame */
-        for (count = 0; count < TESTFRAMESIZE; ++count)
-                buf[count] = (unsigned char)count;
-
-        info->tmp_rbuf_count = 0;
-        memset(info->tmp_rbuf, 0, TESTFRAMESIZE);
-
-        /* program hardware for HDLC and enabled receiver */
-        spin_lock_irqsave(&info->lock,flags);
-        async_mode(info);
-        rx_start(info);
-        tx_load(info, buf, count);
-        spin_unlock_irqrestore(&info->lock, flags);
-
-        /* wait for receive complete */
-        for (timeout = 100; timeout; --timeout) {
-                msleep_interruptible(10);
-                if (loopback_test_rx(info)) {
-                        rc = 0;
-                        break;
-                }
-        }
-
-        /* verify received frame length and contents */
-        if (!rc && (info->tmp_rbuf_count != count ||
-                  memcmp(buf, info->tmp_rbuf, count))) {
-                rc = -ENODEV;
-        }
-
-        spin_lock_irqsave(&info->lock,flags);
-        reset_adapter(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        memcpy(&info->params, &params, sizeof(info->params));
-        info->port.tty = oldtty;
-
-        info->init_error = rc ? DiagStatus_DmaFailure : 0;
-        return rc;
-}
-
-static int adapter_test(struct slgt_info *info)
-{
-        DBGINFO(("testing %s\n", info->device_name));
-        if (register_test(info) < 0) {
-                printk("register test failure %s addr=%08X\n",
-                        info->device_name, info->phys_reg_addr);
-        } else if (irq_test(info) < 0) {
-                printk("IRQ test failure %s IRQ=%d\n",
-                        info->device_name, info->irq_level);
-        } else if (loopback_test(info) < 0) {
-                printk("loopback test failure %s\n", info->device_name);
-        }
-        return info->init_error;
-}
-
-/*
- * transmit timeout handler
- */
-static void tx_timeout(unsigned long context)
-{
-        struct slgt_info *info = (struct slgt_info*)context;
-        unsigned long flags;
-
-        DBGINFO(("%s tx_timeout\n", info->device_name));
-        if(info->tx_active && info->params.mode == MGSL_MODE_HDLC) {
-                info->icount.txtimeout++;
-        }
-        spin_lock_irqsave(&info->lock,flags);
-        tx_stop(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-#if SYNCLINK_GENERIC_HDLC
-        if (info->netcount)
-                hdlcdev_tx_done(info);
-        else
-#endif
-                bh_transmit(info);
-}
-
-/*
- * receive buffer polling timer
- */
-static void rx_timeout(unsigned long context)
-{
-        struct slgt_info *info = (struct slgt_info*)context;
-        unsigned long flags;
-
-        DBGINFO(("%s rx_timeout\n", info->device_name));
-        spin_lock_irqsave(&info->lock, flags);
-        info->pending_bh |= BH_RECEIVE;
-        spin_unlock_irqrestore(&info->lock, flags);
-        bh_handler(&info->task);
-}
-
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
deleted file mode 100644
index e56caf7d82aa..000000000000
--- a/drivers/char/synclinkmp.c
+++ /dev/null
@@ -1,5606 +0,0 @@
-/*
- * $Id: synclinkmp.c,v 4.38 2005/07/15 13:29:44 paulkf Exp $
- *
- * Device driver for Microgate SyncLink Multiport
- * high speed multiprotocol serial adapter.
- *
- * written by Paul Fulghum for Microgate Corporation
- * paulkf@microgate.com
- *
- * Microgate and SyncLink are trademarks of Microgate Corporation
- *
- * Derived from serial.c written by Theodore Ts'o and Linus Torvalds
- * This code is released under the GNU General Public License (GPL)
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define VERSION(ver,rel,seq) (((ver)<<16) | ((rel)<<8) | (seq))
-#if defined(__i386__)
-#  define BREAKPOINT() asm("   int $3");
-#else
-#  define BREAKPOINT() { }
-#endif
-
-#define MAX_DEVICES 12
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial.h>
-#include <linux/major.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/ioport.h>
-#include <linux/mm.h>
-#include <linux/seq_file.h>
-#include <linux/slab.h>
-#include <linux/netdevice.h>
-#include <linux/vmalloc.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/ioctl.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/dma.h>
-#include <linux/bitops.h>
-#include <asm/types.h>
-#include <linux/termios.h>
-#include <linux/workqueue.h>
-#include <linux/hdlc.h>
-#include <linux/synclink.h>
-
-#if defined(CONFIG_HDLC) || (defined(CONFIG_HDLC_MODULE) && defined(CONFIG_SYNCLINKMP_MODULE))
-#define SYNCLINK_GENERIC_HDLC 1
-#else
-#define SYNCLINK_GENERIC_HDLC 0
-#endif
-
-#define GET_USER(error,value,addr) error = get_user(value,addr)
-#define COPY_FROM_USER(error,dest,src,size) error = copy_from_user(dest,src,size) ? -EFAULT : 0
-#define PUT_USER(error,value,addr) error = put_user(value,addr)
-#define COPY_TO_USER(error,dest,src,size) error = copy_to_user(dest,src,size) ? -EFAULT : 0
-
-#include <asm/uaccess.h>
-
-static MGSL_PARAMS default_params = {
-        MGSL_MODE_HDLC,                 /* unsigned long mode */
-        0,                              /* unsigned char loopback; */
-        HDLC_FLAG_UNDERRUN_ABORT15,     /* unsigned short flags; */
-        HDLC_ENCODING_NRZI_SPACE,       /* unsigned char encoding; */
-        0,                              /* unsigned long clock_speed; */
-        0xff,                           /* unsigned char addr_filter; */
-        HDLC_CRC_16_CCITT,              /* unsigned short crc_type; */
-        HDLC_PREAMBLE_LENGTH_8BITS,     /* unsigned char preamble_length; */
-        HDLC_PREAMBLE_PATTERN_NONE,     /* unsigned char preamble; */
-        9600,                           /* unsigned long data_rate; */
-        8,                              /* unsigned char data_bits; */
-        1,                              /* unsigned char stop_bits; */
-        ASYNC_PARITY_NONE               /* unsigned char parity; */
-};
-
-/* size in bytes of DMA data buffers */
-#define SCABUFSIZE      1024
-#define SCA_MEM_SIZE    0x40000
-#define SCA_BASE_SIZE   512
-#define SCA_REG_SIZE    16
-#define SCA_MAX_PORTS   4
-#define SCAMAXDESC      128
-
-#define BUFFERLISTSIZE  4096
-
-/* SCA-I style DMA buffer descriptor */
-typedef struct _SCADESC
-{
-        u16     next;           /* lower l6 bits of next descriptor addr */
-        u16     buf_ptr;        /* lower 16 bits of buffer addr */
-        u8      buf_base;       /* upper 8 bits of buffer addr */
-        u8      pad1;
-        u16     length;         /* length of buffer */
-        u8      status;         /* status of buffer */
-        u8      pad2;
-} SCADESC, *PSCADESC;
-
-typedef struct _SCADESC_EX
-{
-        /* device driver bookkeeping section */
-        char    *virt_addr;     /* virtual address of data buffer */
-        u16     phys_entry;     /* lower 16-bits of physical address of this descriptor */
-} SCADESC_EX, *PSCADESC_EX;
-
-/* The queue of BH actions to be performed */
-
-#define BH_RECEIVE  1
-#define BH_TRANSMIT 2
-#define BH_STATUS   4
-
-#define IO_PIN_SHUTDOWN_LIMIT 100
-
-struct  _input_signal_events {
-        int     ri_up;
-        int     ri_down;
-        int     dsr_up;
-        int     dsr_down;
-        int     dcd_up;
-        int     dcd_down;
-        int     cts_up;
-        int     cts_down;
-};
-
-/*
- * Device instance data structure
- */
-typedef struct _synclinkmp_info {
-        void *if_ptr;                           /* General purpose pointer (used by SPPP) */
-        int                     magic;
-        struct tty_port         port;
-        int                     line;
-        unsigned short          close_delay;
-        unsigned short          closing_wait;   /* time to wait before closing */
-
-        struct mgsl_icount      icount;
-
-        int                     timeout;
-        int                     x_char;         /* xon/xoff character */
-        u16                     read_status_mask1;  /* break detection (SR1 indications) */
-        u16                     read_status_mask2;  /* parity/framing/overun (SR2 indications) */
-        unsigned char           ignore_status_mask1;  /* break detection (SR1 indications) */
-        unsigned char           ignore_status_mask2;  /* parity/framing/overun (SR2 indications) */
-        unsigned char           *tx_buf;
-        int                     tx_put;
-        int                     tx_get;
-        int                     tx_count;
-
-        wait_queue_head_t       status_event_wait_q;
-        wait_queue_head_t       event_wait_q;
-        struct timer_list       tx_timer;       /* HDLC transmit timeout timer */
-        struct _synclinkmp_info *next_device;   /* device list link */
-        struct timer_list       status_timer;   /* input signal status check timer */
-
-        spinlock_t lock;                /* spinlock for synchronizing with ISR */
-        struct work_struct task;                        /* task structure for scheduling bh */
-
-        u32 max_frame_size;                     /* as set by device config */
-
-        u32 pending_bh;
-
-        bool bh_running;                                /* Protection from multiple */
-        int isr_overflow;
-        bool bh_requested;
-
-        int dcd_chkcount;                       /* check counts to prevent */
-        int cts_chkcount;                       /* too many IRQs if a signal */
-        int dsr_chkcount;                       /* is floating */
-        int ri_chkcount;
-
-        char *buffer_list;                      /* virtual address of Rx & Tx buffer lists */
-        unsigned long buffer_list_phys;
-
-        unsigned int rx_buf_count;              /* count of total allocated Rx buffers */
-        SCADESC *rx_buf_list;                   /* list of receive buffer entries */
-        SCADESC_EX rx_buf_list_ex[SCAMAXDESC]; /* list of receive buffer entries */
-        unsigned int current_rx_buf;
-
-        unsigned int tx_buf_count;              /* count of total allocated Tx buffers */
-        SCADESC *tx_buf_list;           /* list of transmit buffer entries */
-        SCADESC_EX tx_buf_list_ex[SCAMAXDESC]; /* list of transmit buffer entries */
-        unsigned int last_tx_buf;
-
-        unsigned char *tmp_rx_buf;
-        unsigned int tmp_rx_buf_count;
-
-        bool rx_enabled;
-        bool rx_overflow;
-
-        bool tx_enabled;
-        bool tx_active;
-        u32 idle_mode;
-
-        unsigned char ie0_value;
-        unsigned char ie1_value;
-        unsigned char ie2_value;
-        unsigned char ctrlreg_value;
-        unsigned char old_signals;
-
-        char device_name[25];                   /* device instance name */
-
-        int port_count;
-        int adapter_num;
-        int port_num;
-
-        struct _synclinkmp_info *port_array[SCA_MAX_PORTS];
-
-        unsigned int bus_type;                  /* expansion bus type (ISA,EISA,PCI) */
-
-        unsigned int irq_level;                 /* interrupt level */
-        unsigned long irq_flags;
-        bool irq_requested;                     /* true if IRQ requested */
-
-        MGSL_PARAMS params;                     /* communications parameters */
-
-        unsigned char serial_signals;           /* current serial signal states */
-
-        bool irq_occurred;                      /* for diagnostics use */
-        unsigned int init_error;                /* Initialization startup error */
-
-        u32 last_mem_alloc;
-        unsigned char* memory_base;             /* shared memory address (PCI only) */
-        u32 phys_memory_base;
-        int shared_mem_requested;
-
-        unsigned char* sca_base;                /* HD64570 SCA Memory address */
-        u32 phys_sca_base;
-        u32 sca_offset;
-        bool sca_base_requested;
-
-        unsigned char* lcr_base;                /* local config registers (PCI only) */
-        u32 phys_lcr_base;
-        u32 lcr_offset;
-        int lcr_mem_requested;
-
-        unsigned char* statctrl_base;           /* status/control register memory */
-        u32 phys_statctrl_base;
-        u32 statctrl_offset;
-        bool sca_statctrl_requested;
-
-        u32 misc_ctrl_value;
-        char flag_buf[MAX_ASYNC_BUFFER_SIZE];
-        char char_buf[MAX_ASYNC_BUFFER_SIZE];
-        bool drop_rts_on_tx_done;
-
-        struct  _input_signal_events    input_signal_events;
-
-        /* SPPP/Cisco HDLC device parts */
-        int netcount;
-        spinlock_t netlock;
-
-#if SYNCLINK_GENERIC_HDLC
-        struct net_device *netdev;
-#endif
-
-} SLMP_INFO;
-
-#define MGSL_MAGIC 0x5401
-
-/*
- * define serial signal status change macros
- */
-#define MISCSTATUS_DCD_LATCHED  (SerialSignal_DCD<<8)   /* indicates change in DCD */
-#define MISCSTATUS_RI_LATCHED   (SerialSignal_RI<<8)    /* indicates change in RI */
-#define MISCSTATUS_CTS_LATCHED  (SerialSignal_CTS<<8)   /* indicates change in CTS */
-#define MISCSTATUS_DSR_LATCHED  (SerialSignal_DSR<<8)   /* change in DSR */
-
-/* Common Register macros */
-#define LPR     0x00
-#define PABR0   0x02
-#define PABR1   0x03
-#define WCRL    0x04
-#define WCRM    0x05
-#define WCRH    0x06
-#define DPCR    0x08
-#define DMER    0x09
-#define ISR0    0x10
-#define ISR1    0x11
-#define ISR2    0x12
-#define IER0    0x14
-#define IER1    0x15
-#define IER2    0x16
-#define ITCR    0x18
-#define INTVR   0x1a
-#define IMVR    0x1c
-
-/* MSCI Register macros */
-#define TRB     0x20
-#define TRBL    0x20
-#define TRBH    0x21
-#define SR0     0x22
-#define SR1     0x23
-#define SR2     0x24
-#define SR3     0x25
-#define FST     0x26
-#define IE0     0x28
-#define IE1     0x29
-#define IE2     0x2a
-#define FIE     0x2b
-#define CMD     0x2c
-#define MD0     0x2e
-#define MD1     0x2f
-#define MD2     0x30
-#define CTL     0x31
-#define SA0     0x32
-#define SA1     0x33
-#define IDL     0x34
-#define TMC     0x35
-#define RXS     0x36
-#define TXS     0x37
-#define TRC0    0x38
-#define TRC1    0x39
-#define RRC     0x3a
-#define CST0    0x3c
-#define CST1    0x3d
-
-/* Timer Register Macros */
-#define TCNT    0x60
-#define TCNTL   0x60
-#define TCNTH   0x61
-#define TCONR   0x62
-#define TCONRL  0x62
-#define TCONRH  0x63
-#define TMCS    0x64
-#define TEPR    0x65
-
-/* DMA Controller Register macros */
-#define DARL    0x80
-#define DARH    0x81
-#define DARB    0x82
-#define BAR     0x80
-#define BARL    0x80
-#define BARH    0x81
-#define BARB    0x82
-#define SAR     0x84
-#define SARL    0x84
-#define SARH    0x85
-#define SARB    0x86
-#define CPB     0x86
-#define CDA     0x88
-#define CDAL    0x88
-#define CDAH    0x89
-#define EDA     0x8a
-#define EDAL    0x8a
-#define EDAH    0x8b
-#define BFL     0x8c
-#define BFLL    0x8c
-#define BFLH    0x8d
-#define BCR     0x8e
-#define BCRL    0x8e
-#define BCRH    0x8f
-#define DSR     0x90
-#define DMR     0x91
-#define FCT     0x93
-#define DIR     0x94
-#define DCMD    0x95
-
-/* combine with timer or DMA register address */
-#define TIMER0  0x00
-#define TIMER1  0x08
-#define TIMER2  0x10
-#define TIMER3  0x18
-#define RXDMA   0x00
-#define TXDMA   0x20
-
-/* SCA Command Codes */
-#define NOOP            0x00
-#define TXRESET         0x01
-#define TXENABLE        0x02
-#define TXDISABLE       0x03
-#define TXCRCINIT       0x04
-#define TXCRCEXCL       0x05
-#define TXEOM           0x06
-#define TXABORT         0x07
-#define MPON            0x08
-#define TXBUFCLR        0x09
-#define RXRESET         0x11
-#define RXENABLE        0x12
-#define RXDISABLE       0x13
-#define RXCRCINIT       0x14
-#define RXREJECT        0x15
-#define SEARCHMP        0x16
-#define RXCRCEXCL       0x17
-#define RXCRCCALC       0x18
-#define CHRESET         0x21
-#define HUNT            0x31
-
-/* DMA command codes */
-#define SWABORT         0x01
-#define FEICLEAR        0x02
-
-/* IE0 */
-#define TXINTE          BIT7
-#define RXINTE          BIT6
-#define TXRDYE          BIT1
-#define RXRDYE          BIT0
-
-/* IE1 & SR1 */
-#define UDRN    BIT7
-#define IDLE    BIT6
-#define SYNCD   BIT4
-#define FLGD    BIT4
-#define CCTS    BIT3
-#define CDCD    BIT2
-#define BRKD    BIT1
-#define ABTD    BIT1
-#define GAPD    BIT1
-#define BRKE    BIT0
-#define IDLD    BIT0
-
-/* IE2 & SR2 */
-#define EOM     BIT7
-#define PMP     BIT6
-#define SHRT    BIT6
-#define PE      BIT5
-#define ABT     BIT5
-#define FRME    BIT4
-#define RBIT    BIT4
-#define OVRN    BIT3
-#define CRCE    BIT2
-
-
-/*
- * Global linked list of SyncLink devices
- */
-static SLMP_INFO *synclinkmp_device_list = NULL;
-static int synclinkmp_adapter_count = -1;
-static int synclinkmp_device_count = 0;
-
-/*
- * Set this param to non-zero to load eax with the
- * .text section address and breakpoint on module load.
- * This is useful for use with gdb and add-symbol-file command.
- */
-static int break_on_load = 0;
-
-/*
- * Driver major number, defaults to zero to get auto
- * assigned major number. May be forced as module parameter.
- */
-static int ttymajor = 0;
-
-/*
- * Array of user specified options for ISA adapters.
- */
-static int debug_level = 0;
-static int maxframe[MAX_DEVICES] = {0,};
-
-module_param(break_on_load, bool, 0);
-module_param(ttymajor, int, 0);
-module_param(debug_level, int, 0);
-module_param_array(maxframe, int, NULL, 0);
-
-static char *driver_name = "SyncLink MultiPort driver";
-static char *driver_version = "$Revision: 4.38 $";
-
-static int synclinkmp_init_one(struct pci_dev *dev,const struct pci_device_id *ent);
-static void synclinkmp_remove_one(struct pci_dev *dev);
-
-static struct pci_device_id synclinkmp_pci_tbl[] = {
-        { PCI_VENDOR_ID_MICROGATE, PCI_DEVICE_ID_MICROGATE_SCA, PCI_ANY_ID, PCI_ANY_ID, },
-        { 0, }, /* terminate list */
-};
-MODULE_DEVICE_TABLE(pci, synclinkmp_pci_tbl);
-
-MODULE_LICENSE("GPL");
-
-static struct pci_driver synclinkmp_pci_driver = {
-        .name           = "synclinkmp",
-        .id_table       = synclinkmp_pci_tbl,
-        .probe          = synclinkmp_init_one,
-        .remove         = __devexit_p(synclinkmp_remove_one),
-};
-
-
-static struct tty_driver *serial_driver;
-
-/* number of characters left in xmit buffer before we ask for more */
-#define WAKEUP_CHARS 256
-
-
-/* tty callbacks */
-
-static int  open(struct tty_struct *tty, struct file * filp);
-static void close(struct tty_struct *tty, struct file * filp);
-static void hangup(struct tty_struct *tty);
-static void set_termios(struct tty_struct *tty, struct ktermios *old_termios);
-
-static int  write(struct tty_struct *tty, const unsigned char *buf, int count);
-static int put_char(struct tty_struct *tty, unsigned char ch);
-static void send_xchar(struct tty_struct *tty, char ch);
-static void wait_until_sent(struct tty_struct *tty, int timeout);
-static int  write_room(struct tty_struct *tty);
-static void flush_chars(struct tty_struct *tty);
-static void flush_buffer(struct tty_struct *tty);
-static void tx_hold(struct tty_struct *tty);
-static void tx_release(struct tty_struct *tty);
-
-static int  ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg);
-static int  chars_in_buffer(struct tty_struct *tty);
-static void throttle(struct tty_struct * tty);
-static void unthrottle(struct tty_struct * tty);
-static int set_break(struct tty_struct *tty, int break_state);
-
-#if SYNCLINK_GENERIC_HDLC
-#define dev_to_port(D) (dev_to_hdlc(D)->priv)
-static void hdlcdev_tx_done(SLMP_INFO *info);
-static void hdlcdev_rx(SLMP_INFO *info, char *buf, int size);
-static int  hdlcdev_init(SLMP_INFO *info);
-static void hdlcdev_exit(SLMP_INFO *info);
-#endif
-
-/* ioctl handlers */
-
-static int  get_stats(SLMP_INFO *info, struct mgsl_icount __user *user_icount);
-static int  get_params(SLMP_INFO *info, MGSL_PARAMS __user *params);
-static int  set_params(SLMP_INFO *info, MGSL_PARAMS __user *params);
-static int  get_txidle(SLMP_INFO *info, int __user *idle_mode);
-static int  set_txidle(SLMP_INFO *info, int idle_mode);
-static int  tx_enable(SLMP_INFO *info, int enable);
-static int  tx_abort(SLMP_INFO *info);
-static int  rx_enable(SLMP_INFO *info, int enable);
-static int  modem_input_wait(SLMP_INFO *info,int arg);
-static int  wait_mgsl_event(SLMP_INFO *info, int __user *mask_ptr);
-static int  tiocmget(struct tty_struct *tty, struct file *file);
-static int  tiocmset(struct tty_struct *tty, struct file *file,
-                     unsigned int set, unsigned int clear);
-static int  set_break(struct tty_struct *tty, int break_state);
-
-static void add_device(SLMP_INFO *info);
-static void device_init(int adapter_num, struct pci_dev *pdev);
-static int  claim_resources(SLMP_INFO *info);
-static void release_resources(SLMP_INFO *info);
-
-static int  startup(SLMP_INFO *info);
-static int  block_til_ready(struct tty_struct *tty, struct file * filp,SLMP_INFO *info);
-static int carrier_raised(struct tty_port *port);
-static void shutdown(SLMP_INFO *info);
-static void program_hw(SLMP_INFO *info);
-static void change_params(SLMP_INFO *info);
-
-static bool init_adapter(SLMP_INFO *info);
-static bool register_test(SLMP_INFO *info);
-static bool irq_test(SLMP_INFO *info);
-static bool loopback_test(SLMP_INFO *info);
-static int  adapter_test(SLMP_INFO *info);
-static bool memory_test(SLMP_INFO *info);
-
-static void reset_adapter(SLMP_INFO *info);
-static void reset_port(SLMP_INFO *info);
-static void async_mode(SLMP_INFO *info);
-static void hdlc_mode(SLMP_INFO *info);
-
-static void rx_stop(SLMP_INFO *info);
-static void rx_start(SLMP_INFO *info);
-static void rx_reset_buffers(SLMP_INFO *info);
-static void rx_free_frame_buffers(SLMP_INFO *info, unsigned int first, unsigned int last);
-static bool rx_get_frame(SLMP_INFO *info);
-
-static void tx_start(SLMP_INFO *info);
-static void tx_stop(SLMP_INFO *info);
-static void tx_load_fifo(SLMP_INFO *info);
-static void tx_set_idle(SLMP_INFO *info);
-static void tx_load_dma_buffer(SLMP_INFO *info, const char *buf, unsigned int count);
-
-static void get_signals(SLMP_INFO *info);
-static void set_signals(SLMP_INFO *info);
-static void enable_loopback(SLMP_INFO *info, int enable);
-static void set_rate(SLMP_INFO *info, u32 data_rate);
-
-static int  bh_action(SLMP_INFO *info);
-static void bh_handler(struct work_struct *work);
-static void bh_receive(SLMP_INFO *info);
-static void bh_transmit(SLMP_INFO *info);
-static void bh_status(SLMP_INFO *info);
-static void isr_timer(SLMP_INFO *info);
-static void isr_rxint(SLMP_INFO *info);
-static void isr_rxrdy(SLMP_INFO *info);
-static void isr_txint(SLMP_INFO *info);
-static void isr_txrdy(SLMP_INFO *info);
-static void isr_rxdmaok(SLMP_INFO *info);
-static void isr_rxdmaerror(SLMP_INFO *info);
-static void isr_txdmaok(SLMP_INFO *info);
-static void isr_txdmaerror(SLMP_INFO *info);
-static void isr_io_pin(SLMP_INFO *info, u16 status);
-
-static int  alloc_dma_bufs(SLMP_INFO *info);
-static void free_dma_bufs(SLMP_INFO *info);
-static int  alloc_buf_list(SLMP_INFO *info);
-static int  alloc_frame_bufs(SLMP_INFO *info, SCADESC *list, SCADESC_EX *list_ex,int count);
-static int  alloc_tmp_rx_buf(SLMP_INFO *info);
-static void free_tmp_rx_buf(SLMP_INFO *info);
-
-static void load_pci_memory(SLMP_INFO *info, char* dest, const char* src, unsigned short count);
-static void trace_block(SLMP_INFO *info, const char* data, int count, int xmit);
-static void tx_timeout(unsigned long context);
-static void status_timeout(unsigned long context);
-
-static unsigned char read_reg(SLMP_INFO *info, unsigned char addr);
-static void write_reg(SLMP_INFO *info, unsigned char addr, unsigned char val);
-static u16 read_reg16(SLMP_INFO *info, unsigned char addr);
-static void write_reg16(SLMP_INFO *info, unsigned char addr, u16 val);
-static unsigned char read_status_reg(SLMP_INFO * info);
-static void write_control_reg(SLMP_INFO * info);
-
-
-static unsigned char rx_active_fifo_level = 16; // rx request FIFO activation level in bytes
-static unsigned char tx_active_fifo_level = 16; // tx request FIFO activation level in bytes
-static unsigned char tx_negate_fifo_level = 32; // tx request FIFO negation level in bytes
-
-static u32 misc_ctrl_value = 0x007e4040;
-static u32 lcr1_brdr_value = 0x00800028;
-
-static u32 read_ahead_count = 8;
-
-/* DPCR, DMA Priority Control
- *
- * 07..05  Not used, must be 0
- * 04      BRC, bus release condition: 0=all transfers complete
- *              1=release after 1 xfer on all channels
- * 03      CCC, channel change condition: 0=every cycle
- *              1=after each channel completes all xfers
- * 02..00  PR<2..0>, priority 100=round robin
- *
- * 00000100 = 0x00
- */
-static unsigned char dma_priority = 0x04;
-
-// Number of bytes that can be written to shared RAM
-// in a single write operation
-static u32 sca_pci_load_interval = 64;
-
-/*
- * 1st function defined in .text section. Calling this function in
- * init_module() followed by a breakpoint allows a remote debugger
- * (gdb) to get the .text address for the add-symbol-file command.
- * This allows remote debugging of dynamically loadable modules.
- */
-static void* synclinkmp_get_text_ptr(void);
-static void* synclinkmp_get_text_ptr(void) {return synclinkmp_get_text_ptr;}
-
-static inline int sanity_check(SLMP_INFO *info,
-                               char *name, const char *routine)
-{
-#ifdef SANITY_CHECK
-        static const char *badmagic =
-                "Warning: bad magic number for synclinkmp_struct (%s) in %s\n";
-        static const char *badinfo =
-                "Warning: null synclinkmp_struct for (%s) in %s\n";
-
-        if (!info) {
-                printk(badinfo, name, routine);
-                return 1;
-        }
-        if (info->magic != MGSL_MAGIC) {
-                printk(badmagic, name, routine);
-                return 1;
-        }
-#else
-        if (!info)
-                return 1;
-#endif
-        return 0;
-}
-
-/**
- * line discipline callback wrappers
- *
- * The wrappers maintain line discipline references
- * while calling into the line discipline.
- *
- * ldisc_receive_buf  - pass receive data to line discipline
- */
-
-static void ldisc_receive_buf(struct tty_struct *tty,
-                              const __u8 *data, char *flags, int count)
-{
-        struct tty_ldisc *ld;
-        if (!tty)
-                return;
-        ld = tty_ldisc_ref(tty);
-        if (ld) {
-                if (ld->ops->receive_buf)
-                        ld->ops->receive_buf(tty, data, flags, count);
-                tty_ldisc_deref(ld);
-        }
-}
-
-/* tty callbacks */
-
-/* Called when a port is opened.  Init and enable port.
- */
-static int open(struct tty_struct *tty, struct file *filp)
-{
-        SLMP_INFO *info;
-        int retval, line;
-        unsigned long flags;
-
-        line = tty->index;
-        if ((line < 0) || (line >= synclinkmp_device_count)) {
-                printk("%s(%d): open with invalid line #%d.\n",
-                        __FILE__,__LINE__,line);
-                return -ENODEV;
-        }
-
-        info = synclinkmp_device_list;
-        while(info && info->line != line)
-                info = info->next_device;
-        if (sanity_check(info, tty->name, "open"))
-                return -ENODEV;
-        if ( info->init_error ) {
-                printk("%s(%d):%s device is not allocated, init error=%d\n",
-                        __FILE__,__LINE__,info->device_name,info->init_error);
-                return -ENODEV;
-        }
-
-        tty->driver_data = info;
-        info->port.tty = tty;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s open(), old ref count = %d\n",
-                         __FILE__,__LINE__,tty->driver->name, info->port.count);
-
-        /* If port is closing, signal caller to try again */
-        if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
-                if (info->port.flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->port.close_wait);
-                retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
-                        -EAGAIN : -ERESTARTSYS);
-                goto cleanup;
-        }
-
-        info->port.tty->low_latency = (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-
-        spin_lock_irqsave(&info->netlock, flags);
-        if (info->netcount) {
-                retval = -EBUSY;
-                spin_unlock_irqrestore(&info->netlock, flags);
-                goto cleanup;
-        }
-        info->port.count++;
-        spin_unlock_irqrestore(&info->netlock, flags);
-
-        if (info->port.count == 1) {
-                /* 1st open on this device, init hardware */
-                retval = startup(info);
-                if (retval < 0)
-                        goto cleanup;
-        }
-
-        retval = block_til_ready(tty, filp, info);
-        if (retval) {
-                if (debug_level >= DEBUG_LEVEL_INFO)
-                        printk("%s(%d):%s block_til_ready() returned %d\n",
-                                 __FILE__,__LINE__, info->device_name, retval);
-                goto cleanup;
-        }
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s open() success\n",
-                         __FILE__,__LINE__, info->device_name);
-        retval = 0;
-
-cleanup:
-        if (retval) {
-                if (tty->count == 1)
-                        info->port.tty = NULL; /* tty layer will release tty struct */
-                if(info->port.count)
-                        info->port.count--;
-        }
-
-        return retval;
-}
-
-/* Called when port is closed. Wait for remaining data to be
- * sent. Disable port and free resources.
- */
-static void close(struct tty_struct *tty, struct file *filp)
-{
-        SLMP_INFO * info = tty->driver_data;
-
-        if (sanity_check(info, tty->name, "close"))
-                return;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s close() entry, count=%d\n",
-                         __FILE__,__LINE__, info->device_name, info->port.count);
-
-        if (tty_port_close_start(&info->port, tty, filp) == 0)
-                goto cleanup;
-
-        mutex_lock(&info->port.mutex);
-        if (info->port.flags & ASYNC_INITIALIZED)
-                wait_until_sent(tty, info->timeout);
-
-        flush_buffer(tty);
-        tty_ldisc_flush(tty);
-        shutdown(info);
-        mutex_unlock(&info->port.mutex);
-
-        tty_port_close_end(&info->port, tty);
-        info->port.tty = NULL;
-cleanup:
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
-                        tty->driver->name, info->port.count);
-}
-
-/* Called by tty_hangup() when a hangup is signaled.
- * This is the same as closing all open descriptors for the port.
- */
-static void hangup(struct tty_struct *tty)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s hangup()\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        if (sanity_check(info, tty->name, "hangup"))
-                return;
-
-        mutex_lock(&info->port.mutex);
-        flush_buffer(tty);
-        shutdown(info);
-
-        spin_lock_irqsave(&info->port.lock, flags);
-        info->port.count = 0;
-        info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->port.tty = NULL;
-        spin_unlock_irqrestore(&info->port.lock, flags);
-        mutex_unlock(&info->port.mutex);
-
-        wake_up_interruptible(&info->port.open_wait);
-}
-
-/* Set new termios settings
- */
-static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s set_termios()\n", __FILE__,__LINE__,
-                        tty->driver->name );
-
-        change_params(info);
-
-        /* Handle transition to B0 status */
-        if (old_termios->c_cflag & CBAUD &&
-            !(tty->termios->c_cflag & CBAUD)) {
-                info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
-                spin_lock_irqsave(&info->lock,flags);
-                set_signals(info);
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-
-        /* Handle transition away from B0 status */
-        if (!(old_termios->c_cflag & CBAUD) &&
-            tty->termios->c_cflag & CBAUD) {
-                info->serial_signals |= SerialSignal_DTR;
-                if (!(tty->termios->c_cflag & CRTSCTS) ||
-                    !test_bit(TTY_THROTTLED, &tty->flags)) {
-                        info->serial_signals |= SerialSignal_RTS;
-                }
-                spin_lock_irqsave(&info->lock,flags);
-                set_signals(info);
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-
-        /* Handle turning off CRTSCTS */
-        if (old_termios->c_cflag & CRTSCTS &&
-            !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-                tx_release(tty);
-        }
-}
-
-/* Send a block of data
- *
- * Arguments:
- *
- *      tty             pointer to tty information structure
- *      buf             pointer to buffer containing send data
- *      count           size of send data in bytes
- *
- * Return Value:        number of characters written
- */
-static int write(struct tty_struct *tty,
-                 const unsigned char *buf, int count)
-{
-        int     c, ret = 0;
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s write() count=%d\n",
-                       __FILE__,__LINE__,info->device_name,count);
-
-        if (sanity_check(info, tty->name, "write"))
-                goto cleanup;
-
-        if (!info->tx_buf)
-                goto cleanup;
-
-        if (info->params.mode == MGSL_MODE_HDLC) {
-                if (count > info->max_frame_size) {
-                        ret = -EIO;
-                        goto cleanup;
-                }
-                if (info->tx_active)
-                        goto cleanup;
-                if (info->tx_count) {
-                        /* send accumulated data from send_char() calls */
-                        /* as frame and wait before accepting more data. */
-                        tx_load_dma_buffer(info, info->tx_buf, info->tx_count);
-                        goto start;
-                }
-                ret = info->tx_count = count;
-                tx_load_dma_buffer(info, buf, count);
-                goto start;
-        }
-
-        for (;;) {
-                c = min_t(int, count,
-                        min(info->max_frame_size - info->tx_count - 1,
-                            info->max_frame_size - info->tx_put));
-                if (c <= 0)
-                        break;
-                        
-                memcpy(info->tx_buf + info->tx_put, buf, c);
-
-                spin_lock_irqsave(&info->lock,flags);
-                info->tx_put += c;
-                if (info->tx_put >= info->max_frame_size)
-                        info->tx_put -= info->max_frame_size;
-                info->tx_count += c;
-                spin_unlock_irqrestore(&info->lock,flags);
-
-                buf += c;
-                count -= c;
-                ret += c;
-        }
-
-        if (info->params.mode == MGSL_MODE_HDLC) {
-                if (count) {
-                        ret = info->tx_count = 0;
-                        goto cleanup;
-                }
-                tx_load_dma_buffer(info, info->tx_buf, info->tx_count);
-        }
-start:
-        if (info->tx_count && !tty->stopped && !tty->hw_stopped) {
-                spin_lock_irqsave(&info->lock,flags);
-                if (!info->tx_active)
-                        tx_start(info);
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-
-cleanup:
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk( "%s(%d):%s write() returning=%d\n",
-                        __FILE__,__LINE__,info->device_name,ret);
-        return ret;
-}
-
-/* Add a character to the transmit buffer.
- */
-static int put_char(struct tty_struct *tty, unsigned char ch)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-        int ret = 0;
-
-        if ( debug_level >= DEBUG_LEVEL_INFO ) {
-                printk( "%s(%d):%s put_char(%d)\n",
-                        __FILE__,__LINE__,info->device_name,ch);
-        }
-
-        if (sanity_check(info, tty->name, "put_char"))
-                return 0;
-
-        if (!info->tx_buf)
-                return 0;
-
-        spin_lock_irqsave(&info->lock,flags);
-
-        if ( (info->params.mode != MGSL_MODE_HDLC) ||
-             !info->tx_active ) {
-
-                if (info->tx_count < info->max_frame_size - 1) {
-                        info->tx_buf[info->tx_put++] = ch;
-                        if (info->tx_put >= info->max_frame_size)
-                                info->tx_put -= info->max_frame_size;
-                        info->tx_count++;
-                        ret = 1;
-                }
-        }
-
-        spin_unlock_irqrestore(&info->lock,flags);
-        return ret;
-}
-
-/* Send a high-priority XON/XOFF character
- */
-static void send_xchar(struct tty_struct *tty, char ch)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s send_xchar(%d)\n",
-                         __FILE__,__LINE__, info->device_name, ch );
-
-        if (sanity_check(info, tty->name, "send_xchar"))
-                return;
-
-        info->x_char = ch;
-        if (ch) {
-                /* Make sure transmit interrupts are on */
-                spin_lock_irqsave(&info->lock,flags);
-                if (!info->tx_enabled)
-                        tx_start(info);
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-}
-
-/* Wait until the transmitter is empty.
- */
-static void wait_until_sent(struct tty_struct *tty, int timeout)
-{
-        SLMP_INFO * info = tty->driver_data;
-        unsigned long orig_jiffies, char_time;
-
-        if (!info )
-                return;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s wait_until_sent() entry\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        if (sanity_check(info, tty->name, "wait_until_sent"))
-                return;
-
-        if (!test_bit(ASYNCB_INITIALIZED, &info->port.flags))
-                goto exit;
-
-        orig_jiffies = jiffies;
-
-        /* Set check interval to 1/5 of estimated time to
-         * send a character, and make it at least 1. The check
-         * interval should also be less than the timeout.
-         * Note: use tight timings here to satisfy the NIST-PCTS.
-         */
-
-        if ( info->params.data_rate ) {
-                char_time = info->timeout/(32 * 5);
-                if (!char_time)
-                        char_time++;
-        } else
-                char_time = 1;
-
-        if (timeout)
-                char_time = min_t(unsigned long, char_time, timeout);
-
-        if ( info->params.mode == MGSL_MODE_HDLC ) {
-                while (info->tx_active) {
-                        msleep_interruptible(jiffies_to_msecs(char_time));
-                        if (signal_pending(current))
-                                break;
-                        if (timeout && time_after(jiffies, orig_jiffies + timeout))
-                                break;
-                }
-        } else {
-                /*
-                 * TODO: determine if there is something similar to USC16C32
-                 *       TXSTATUS_ALL_SENT status
-                 */
-                while ( info->tx_active && info->tx_enabled) {
-                        msleep_interruptible(jiffies_to_msecs(char_time));
-                        if (signal_pending(current))
-                                break;
-                        if (timeout && time_after(jiffies, orig_jiffies + timeout))
-                                break;
-                }
-        }
-
-exit:
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s wait_until_sent() exit\n",
-                         __FILE__,__LINE__, info->device_name );
-}
-
-/* Return the count of free bytes in transmit buffer
- */
-static int write_room(struct tty_struct *tty)
-{
-        SLMP_INFO *info = tty->driver_data;
-        int ret;
-
-        if (sanity_check(info, tty->name, "write_room"))
-                return 0;
-
-        if (info->params.mode == MGSL_MODE_HDLC) {
-                ret = (info->tx_active) ? 0 : HDLC_MAX_FRAME_SIZE;
-        } else {
-                ret = info->max_frame_size - info->tx_count - 1;
-                if (ret < 0)
-                        ret = 0;
-        }
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s write_room()=%d\n",
-                       __FILE__, __LINE__, info->device_name, ret);
-
-        return ret;
-}
-
-/* enable transmitter and send remaining buffered characters
- */
-static void flush_chars(struct tty_struct *tty)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):%s flush_chars() entry tx_count=%d\n",
-                        __FILE__,__LINE__,info->device_name,info->tx_count);
-
-        if (sanity_check(info, tty->name, "flush_chars"))
-                return;
-
-        if (info->tx_count <= 0 || tty->stopped || tty->hw_stopped ||
-            !info->tx_buf)
-                return;
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):%s flush_chars() entry, starting transmitter\n",
-                        __FILE__,__LINE__,info->device_name );
-
-        spin_lock_irqsave(&info->lock,flags);
-
-        if (!info->tx_active) {
-                if ( (info->params.mode == MGSL_MODE_HDLC) &&
-                        info->tx_count ) {
-                        /* operating in synchronous (frame oriented) mode */
-                        /* copy data from circular tx_buf to */
-                        /* transmit DMA buffer. */
-                        tx_load_dma_buffer(info,
-                                 info->tx_buf,info->tx_count);
-                }
-                tx_start(info);
-        }
-
-        spin_unlock_irqrestore(&info->lock,flags);
-}
-
-/* Discard all data in the send buffer
- */
-static void flush_buffer(struct tty_struct *tty)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s flush_buffer() entry\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        if (sanity_check(info, tty->name, "flush_buffer"))
-                return;
-
-        spin_lock_irqsave(&info->lock,flags);
-        info->tx_count = info->tx_put = info->tx_get = 0;
-        del_timer(&info->tx_timer);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        tty_wakeup(tty);
-}
-
-/* throttle (stop) transmitter
- */
-static void tx_hold(struct tty_struct *tty)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "tx_hold"))
-                return;
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk("%s(%d):%s tx_hold()\n",
-                        __FILE__,__LINE__,info->device_name);
-
-        spin_lock_irqsave(&info->lock,flags);
-        if (info->tx_enabled)
-                tx_stop(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-}
-
-/* release (start) transmitter
- */
-static void tx_release(struct tty_struct *tty)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-
-        if (sanity_check(info, tty->name, "tx_release"))
-                return;
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk("%s(%d):%s tx_release()\n",
-                        __FILE__,__LINE__,info->device_name);
-
-        spin_lock_irqsave(&info->lock,flags);
-        if (!info->tx_enabled)
-                tx_start(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-}
-
-/* Service an IOCTL request
- *
- * Arguments:
- *
- *      tty     pointer to tty instance data
- *      file    pointer to associated file object for device
- *      cmd     IOCTL command code
- *      arg     command argument/context
- *
- * Return Value:        0 if success, otherwise error code
- */
-static int ioctl(struct tty_struct *tty, struct file *file,
-                 unsigned int cmd, unsigned long arg)
-{
-        SLMP_INFO *info = tty->driver_data;
-        int error;
-        struct mgsl_icount cnow;        /* kernel counter temps */
-        struct serial_icounter_struct __user *p_cuser;  /* user space */
-        unsigned long flags;
-        void __user *argp = (void __user *)arg;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s ioctl() cmd=%08X\n", __FILE__,__LINE__,
-                        info->device_name, cmd );
-
-        if (sanity_check(info, tty->name, "ioctl"))
-                return -ENODEV;
-
-        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-            (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-                if (tty->flags & (1 << TTY_IO_ERROR))
-                    return -EIO;
-        }
-
-        switch (cmd) {
-        case MGSL_IOCGPARAMS:
-                return get_params(info, argp);
-        case MGSL_IOCSPARAMS:
-                return set_params(info, argp);
-        case MGSL_IOCGTXIDLE:
-                return get_txidle(info, argp);
-        case MGSL_IOCSTXIDLE:
-                return set_txidle(info, (int)arg);
-        case MGSL_IOCTXENABLE:
-                return tx_enable(info, (int)arg);
-        case MGSL_IOCRXENABLE:
-                return rx_enable(info, (int)arg);
-        case MGSL_IOCTXABORT:
-                return tx_abort(info);
-        case MGSL_IOCGSTATS:
-                return get_stats(info, argp);
-        case MGSL_IOCWAITEVENT:
-                return wait_mgsl_event(info, argp);
-        case MGSL_IOCLOOPTXDONE:
-                return 0; // TODO: Not supported, need to document
-                /* Wait for modem input (DCD,RI,DSR,CTS) change
-                 * as specified by mask in arg (TIOCM_RNG/DSR/CD/CTS)
-                 */
-        case TIOCMIWAIT:
-                return modem_input_wait(info,(int)arg);
-                
-                /*
-                 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-                 * Return: write counters to the user passed counter struct
-                 * NB: both 1->0 and 0->1 transitions are counted except for
-                 *     RI where only 0->1 is counted.
-                 */
-        case TIOCGICOUNT:
-                spin_lock_irqsave(&info->lock,flags);
-                cnow = info->icount;
-                spin_unlock_irqrestore(&info->lock,flags);
-                p_cuser = argp;
-                PUT_USER(error,cnow.cts, &p_cuser->cts);
-                if (error) return error;
-                PUT_USER(error,cnow.dsr, &p_cuser->dsr);
-                if (error) return error;
-                PUT_USER(error,cnow.rng, &p_cuser->rng);
-                if (error) return error;
-                PUT_USER(error,cnow.dcd, &p_cuser->dcd);
-                if (error) return error;
-                PUT_USER(error,cnow.rx, &p_cuser->rx);
-                if (error) return error;
-                PUT_USER(error,cnow.tx, &p_cuser->tx);
-                if (error) return error;
-                PUT_USER(error,cnow.frame, &p_cuser->frame);
-                if (error) return error;
-                PUT_USER(error,cnow.overrun, &p_cuser->overrun);
-                if (error) return error;
-                PUT_USER(error,cnow.parity, &p_cuser->parity);
-                if (error) return error;
-                PUT_USER(error,cnow.brk, &p_cuser->brk);
-                if (error) return error;
-                PUT_USER(error,cnow.buf_overrun, &p_cuser->buf_overrun);
-                if (error) return error;
-                return 0;
-        default:
-                return -ENOIOCTLCMD;
-        }
-        return 0;
-}
-
-/*
- * /proc fs routines....
- */
-
-static inline void line_info(struct seq_file *m, SLMP_INFO *info)
-{
-        char    stat_buf[30];
-        unsigned long flags;
-
-        seq_printf(m, "%s: SCABase=%08x Mem=%08X StatusControl=%08x LCR=%08X\n"
-                       "\tIRQ=%d MaxFrameSize=%u\n",
-                info->device_name,
-                info->phys_sca_base,
-                info->phys_memory_base,
-                info->phys_statctrl_base,
-                info->phys_lcr_base,
-                info->irq_level,
-                info->max_frame_size );
-
-        /* output current serial signal states */
-        spin_lock_irqsave(&info->lock,flags);
-        get_signals(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        stat_buf[0] = 0;
-        stat_buf[1] = 0;
-        if (info->serial_signals & SerialSignal_RTS)
-                strcat(stat_buf, "|RTS");
-        if (info->serial_signals & SerialSignal_CTS)
-                strcat(stat_buf, "|CTS");
-        if (info->serial_signals & SerialSignal_DTR)
-                strcat(stat_buf, "|DTR");
-        if (info->serial_signals & SerialSignal_DSR)
-                strcat(stat_buf, "|DSR");
-        if (info->serial_signals & SerialSignal_DCD)
-                strcat(stat_buf, "|CD");
-        if (info->serial_signals & SerialSignal_RI)
-                strcat(stat_buf, "|RI");
-
-        if (info->params.mode == MGSL_MODE_HDLC) {
-                seq_printf(m, "\tHDLC txok:%d rxok:%d",
-                              info->icount.txok, info->icount.rxok);
-                if (info->icount.txunder)
-                        seq_printf(m, " txunder:%d", info->icount.txunder);
-                if (info->icount.txabort)
-                        seq_printf(m, " txabort:%d", info->icount.txabort);
-                if (info->icount.rxshort)
-                        seq_printf(m, " rxshort:%d", info->icount.rxshort);
-                if (info->icount.rxlong)
-                        seq_printf(m, " rxlong:%d", info->icount.rxlong);
-                if (info->icount.rxover)
-                        seq_printf(m, " rxover:%d", info->icount.rxover);
-                if (info->icount.rxcrc)
-                        seq_printf(m, " rxlong:%d", info->icount.rxcrc);
-        } else {
-                seq_printf(m, "\tASYNC tx:%d rx:%d",
-                              info->icount.tx, info->icount.rx);
-                if (info->icount.frame)
-                        seq_printf(m, " fe:%d", info->icount.frame);
-                if (info->icount.parity)
-                        seq_printf(m, " pe:%d", info->icount.parity);
-                if (info->icount.brk)
-                        seq_printf(m, " brk:%d", info->icount.brk);
-                if (info->icount.overrun)
-                        seq_printf(m, " oe:%d", info->icount.overrun);
-        }
-
-        /* Append serial signal status to end */
-        seq_printf(m, " %s\n", stat_buf+1);
-
-        seq_printf(m, "\ttxactive=%d bh_req=%d bh_run=%d pending_bh=%x\n",
-         info->tx_active,info->bh_requested,info->bh_running,
-         info->pending_bh);
-}
-
-/* Called to print information about devices
- */
-static int synclinkmp_proc_show(struct seq_file *m, void *v)
-{
-        SLMP_INFO *info;
-
-        seq_printf(m, "synclinkmp driver:%s\n", driver_version);
-
-        info = synclinkmp_device_list;
-        while( info ) {
-                line_info(m, info);
-                info = info->next_device;
-        }
-        return 0;
-}
-
-static int synclinkmp_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, synclinkmp_proc_show, NULL);
-}
-
-static const struct file_operations synclinkmp_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = synclinkmp_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-/* Return the count of bytes in transmit buffer
- */
-static int chars_in_buffer(struct tty_struct *tty)
-{
-        SLMP_INFO *info = tty->driver_data;
-
-        if (sanity_check(info, tty->name, "chars_in_buffer"))
-                return 0;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s chars_in_buffer()=%d\n",
-                       __FILE__, __LINE__, info->device_name, info->tx_count);
-
-        return info->tx_count;
-}
-
-/* Signal remote device to throttle send data (our receive data)
- */
-static void throttle(struct tty_struct * tty)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s throttle() entry\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        if (sanity_check(info, tty->name, "throttle"))
-                return;
-
-        if (I_IXOFF(tty))
-                send_xchar(tty, STOP_CHAR(tty));
-
-        if (tty->termios->c_cflag & CRTSCTS) {
-                spin_lock_irqsave(&info->lock,flags);
-                info->serial_signals &= ~SerialSignal_RTS;
-                set_signals(info);
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-}
-
-/* Signal remote device to stop throttling send data (our receive data)
- */
-static void unthrottle(struct tty_struct * tty)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s unthrottle() entry\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        if (sanity_check(info, tty->name, "unthrottle"))
-                return;
-
-        if (I_IXOFF(tty)) {
-                if (info->x_char)
-                        info->x_char = 0;
-                else
-                        send_xchar(tty, START_CHAR(tty));
-        }
-
-        if (tty->termios->c_cflag & CRTSCTS) {
-                spin_lock_irqsave(&info->lock,flags);
-                info->serial_signals |= SerialSignal_RTS;
-                set_signals(info);
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-}
-
-/* set or clear transmit break condition
- * break_state  -1=set break condition, 0=clear
- */
-static int set_break(struct tty_struct *tty, int break_state)
-{
-        unsigned char RegValue;
-        SLMP_INFO * info = tty->driver_data;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s set_break(%d)\n",
-                         __FILE__,__LINE__, info->device_name, break_state);
-
-        if (sanity_check(info, tty->name, "set_break"))
-                return -EINVAL;
-
-        spin_lock_irqsave(&info->lock,flags);
-        RegValue = read_reg(info, CTL);
-        if (break_state == -1)
-                RegValue |= BIT3;
-        else
-                RegValue &= ~BIT3;
-        write_reg(info, CTL, RegValue);
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-#if SYNCLINK_GENERIC_HDLC
-
-/**
- * called by generic HDLC layer when protocol selected (PPP, frame relay, etc.)
- * set encoding and frame check sequence (FCS) options
- *
- * dev       pointer to network device structure
- * encoding  serial encoding setting
- * parity    FCS setting
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
-                          unsigned short parity)
-{
-        SLMP_INFO *info = dev_to_port(dev);
-        unsigned char  new_encoding;
-        unsigned short new_crctype;
-
-        /* return error if TTY interface open */
-        if (info->port.count)
-                return -EBUSY;
-
-        switch (encoding)
-        {
-        case ENCODING_NRZ:        new_encoding = HDLC_ENCODING_NRZ; break;
-        case ENCODING_NRZI:       new_encoding = HDLC_ENCODING_NRZI_SPACE; break;
-        case ENCODING_FM_MARK:    new_encoding = HDLC_ENCODING_BIPHASE_MARK; break;
-        case ENCODING_FM_SPACE:   new_encoding = HDLC_ENCODING_BIPHASE_SPACE; break;
-        case ENCODING_MANCHESTER: new_encoding = HDLC_ENCODING_BIPHASE_LEVEL; break;
-        default: return -EINVAL;
-        }
-
-        switch (parity)
-        {
-        case PARITY_NONE:            new_crctype = HDLC_CRC_NONE; break;
-        case PARITY_CRC16_PR1_CCITT: new_crctype = HDLC_CRC_16_CCITT; break;
-        case PARITY_CRC32_PR1_CCITT: new_crctype = HDLC_CRC_32_CCITT; break;
-        default: return -EINVAL;
-        }
-
-        info->params.encoding = new_encoding;
-        info->params.crc_type = new_crctype;
-
-        /* if network interface up, reprogram hardware */
-        if (info->netcount)
-                program_hw(info);
-
-        return 0;
-}
-
-/**
- * called by generic HDLC layer to send frame
- *
- * skb  socket buffer containing HDLC frame
- * dev  pointer to network device structure
- */
-static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,
-                                      struct net_device *dev)
-{
-        SLMP_INFO *info = dev_to_port(dev);
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk(KERN_INFO "%s:hdlc_xmit(%s)\n",__FILE__,dev->name);
-
-        /* stop sending until this frame completes */
-        netif_stop_queue(dev);
-
-        /* copy data to device buffers */
-        info->tx_count = skb->len;
-        tx_load_dma_buffer(info, skb->data, skb->len);
-
-        /* update network statistics */
-        dev->stats.tx_packets++;
-        dev->stats.tx_bytes += skb->len;
-
-        /* done with socket buffer, so free it */
-        dev_kfree_skb(skb);
-
-        /* save start time for transmit timeout detection */
-        dev->trans_start = jiffies;
-
-        /* start hardware transmitter if necessary */
-        spin_lock_irqsave(&info->lock,flags);
-        if (!info->tx_active)
-                tx_start(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        return NETDEV_TX_OK;
-}
-
-/**
- * called by network layer when interface enabled
- * claim resources and initialize hardware
- *
- * dev  pointer to network device structure
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_open(struct net_device *dev)
-{
-        SLMP_INFO *info = dev_to_port(dev);
-        int rc;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s:hdlcdev_open(%s)\n",__FILE__,dev->name);
-
-        /* generic HDLC layer open processing */
-        if ((rc = hdlc_open(dev)))
-                return rc;
-
-        /* arbitrate between network and tty opens */
-        spin_lock_irqsave(&info->netlock, flags);
-        if (info->port.count != 0 || info->netcount != 0) {
-                printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
-                spin_unlock_irqrestore(&info->netlock, flags);
-                return -EBUSY;
-        }
-        info->netcount=1;
-        spin_unlock_irqrestore(&info->netlock, flags);
-
-        /* claim resources and init adapter */
-        if ((rc = startup(info)) != 0) {
-                spin_lock_irqsave(&info->netlock, flags);
-                info->netcount=0;
-                spin_unlock_irqrestore(&info->netlock, flags);
-                return rc;
-        }
-
-        /* assert DTR and RTS, apply hardware settings */
-        info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
-        program_hw(info);
-
-        /* enable network layer transmit */
-        dev->trans_start = jiffies;
-        netif_start_queue(dev);
-
-        /* inform generic HDLC layer of current DCD status */
-        spin_lock_irqsave(&info->lock, flags);
-        get_signals(info);
-        spin_unlock_irqrestore(&info->lock, flags);
-        if (info->serial_signals & SerialSignal_DCD)
-                netif_carrier_on(dev);
-        else
-                netif_carrier_off(dev);
-        return 0;
-}
-
-/**
- * called by network layer when interface is disabled
- * shutdown hardware and release resources
- *
- * dev  pointer to network device structure
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_close(struct net_device *dev)
-{
-        SLMP_INFO *info = dev_to_port(dev);
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s:hdlcdev_close(%s)\n",__FILE__,dev->name);
-
-        netif_stop_queue(dev);
-
-        /* shutdown adapter and release resources */
-        shutdown(info);
-
-        hdlc_close(dev);
-
-        spin_lock_irqsave(&info->netlock, flags);
-        info->netcount=0;
-        spin_unlock_irqrestore(&info->netlock, flags);
-
-        return 0;
-}
-
-/**
- * called by network layer to process IOCTL call to network device
- *
- * dev  pointer to network device structure
- * ifr  pointer to network interface request structure
- * cmd  IOCTL command code
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-        const size_t size = sizeof(sync_serial_settings);
-        sync_serial_settings new_line;
-        sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync;
-        SLMP_INFO *info = dev_to_port(dev);
-        unsigned int flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
-
-        /* return error if TTY interface open */
-        if (info->port.count)
-                return -EBUSY;
-
-        if (cmd != SIOCWANDEV)
-                return hdlc_ioctl(dev, ifr, cmd);
-
-        switch(ifr->ifr_settings.type) {
-        case IF_GET_IFACE: /* return current sync_serial_settings */
-
-                ifr->ifr_settings.type = IF_IFACE_SYNC_SERIAL;
-                if (ifr->ifr_settings.size < size) {
-                        ifr->ifr_settings.size = size; /* data size wanted */
-                        return -ENOBUFS;
-                }
-
-                flags = info->params.flags & (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_RXC_DPLL |
-                                              HDLC_FLAG_RXC_BRG    | HDLC_FLAG_RXC_TXCPIN |
-                                              HDLC_FLAG_TXC_TXCPIN | HDLC_FLAG_TXC_DPLL |
-                                              HDLC_FLAG_TXC_BRG    | HDLC_FLAG_TXC_RXCPIN);
-
-                switch (flags){
-                case (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_TXCPIN): new_line.clock_type = CLOCK_EXT; break;
-                case (HDLC_FLAG_RXC_BRG    | HDLC_FLAG_TXC_BRG):    new_line.clock_type = CLOCK_INT; break;
-                case (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_BRG):    new_line.clock_type = CLOCK_TXINT; break;
-                case (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_RXCPIN): new_line.clock_type = CLOCK_TXFROMRX; break;
-                default: new_line.clock_type = CLOCK_DEFAULT;
-                }
-
-                new_line.clock_rate = info->params.clock_speed;
-                new_line.loopback   = info->params.loopback ? 1:0;
-
-                if (copy_to_user(line, &new_line, size))
-                        return -EFAULT;
-                return 0;
-
-        case IF_IFACE_SYNC_SERIAL: /* set sync_serial_settings */
-
-                if(!capable(CAP_NET_ADMIN))
-                        return -EPERM;
-                if (copy_from_user(&new_line, line, size))
-                        return -EFAULT;
-
-                switch (new_line.clock_type)
-                {
-                case CLOCK_EXT:      flags = HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_TXCPIN; break;
-                case CLOCK_TXFROMRX: flags = HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_RXCPIN; break;
-                case CLOCK_INT:      flags = HDLC_FLAG_RXC_BRG    | HDLC_FLAG_TXC_BRG;    break;
-                case CLOCK_TXINT:    flags = HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_TXC_BRG;    break;
-                case CLOCK_DEFAULT:  flags = info->params.flags &
-                                             (HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_RXC_DPLL |
-                                              HDLC_FLAG_RXC_BRG    | HDLC_FLAG_RXC_TXCPIN |
-                                              HDLC_FLAG_TXC_TXCPIN | HDLC_FLAG_TXC_DPLL |
-                                              HDLC_FLAG_TXC_BRG    | HDLC_FLAG_TXC_RXCPIN); break;
-                default: return -EINVAL;
-                }
-
-                if (new_line.loopback != 0 && new_line.loopback != 1)
-                        return -EINVAL;
-
-                info->params.flags &= ~(HDLC_FLAG_RXC_RXCPIN | HDLC_FLAG_RXC_DPLL |
-                                        HDLC_FLAG_RXC_BRG    | HDLC_FLAG_RXC_TXCPIN |
-                                        HDLC_FLAG_TXC_TXCPIN | HDLC_FLAG_TXC_DPLL |
-                                        HDLC_FLAG_TXC_BRG    | HDLC_FLAG_TXC_RXCPIN);
-                info->params.flags |= flags;
-
-                info->params.loopback = new_line.loopback;
-
-                if (flags & (HDLC_FLAG_RXC_BRG | HDLC_FLAG_TXC_BRG))
-                        info->params.clock_speed = new_line.clock_rate;
-                else
-                        info->params.clock_speed = 0;
-
-                /* if network interface up, reprogram hardware */
-                if (info->netcount)
-                        program_hw(info);
-                return 0;
-
-        default:
-                return hdlc_ioctl(dev, ifr, cmd);
-        }
-}
-
-/**
- * called by network layer when transmit timeout is detected
- *
- * dev  pointer to network device structure
- */
-static void hdlcdev_tx_timeout(struct net_device *dev)
-{
-        SLMP_INFO *info = dev_to_port(dev);
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("hdlcdev_tx_timeout(%s)\n",dev->name);
-
-        dev->stats.tx_errors++;
-        dev->stats.tx_aborted_errors++;
-
-        spin_lock_irqsave(&info->lock,flags);
-        tx_stop(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        netif_wake_queue(dev);
-}
-
-/**
- * called by device driver when transmit completes
- * reenable network layer transmit if stopped
- *
- * info  pointer to device instance information
- */
-static void hdlcdev_tx_done(SLMP_INFO *info)
-{
-        if (netif_queue_stopped(info->netdev))
-                netif_wake_queue(info->netdev);
-}
-
-/**
- * called by device driver when frame received
- * pass frame to network layer
- *
- * info  pointer to device instance information
- * buf   pointer to buffer contianing frame data
- * size  count of data bytes in buf
- */
-static void hdlcdev_rx(SLMP_INFO *info, char *buf, int size)
-{
-        struct sk_buff *skb = dev_alloc_skb(size);
-        struct net_device *dev = info->netdev;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("hdlcdev_rx(%s)\n",dev->name);
-
-        if (skb == NULL) {
-                printk(KERN_NOTICE "%s: can't alloc skb, dropping packet\n",
-                       dev->name);
-                dev->stats.rx_dropped++;
-                return;
-        }
-
-        memcpy(skb_put(skb, size), buf, size);
-
-        skb->protocol = hdlc_type_trans(skb, dev);
-
-        dev->stats.rx_packets++;
-        dev->stats.rx_bytes += size;
-
-        netif_rx(skb);
-}
-
-static const struct net_device_ops hdlcdev_ops = {
-        .ndo_open       = hdlcdev_open,
-        .ndo_stop       = hdlcdev_close,
-        .ndo_change_mtu = hdlc_change_mtu,
-        .ndo_start_xmit = hdlc_start_xmit,
-        .ndo_do_ioctl   = hdlcdev_ioctl,
-        .ndo_tx_timeout = hdlcdev_tx_timeout,
-};
-
-/**
- * called by device driver when adding device instance
- * do generic HDLC initialization
- *
- * info  pointer to device instance information
- *
- * returns 0 if success, otherwise error code
- */
-static int hdlcdev_init(SLMP_INFO *info)
-{
-        int rc;
-        struct net_device *dev;
-        hdlc_device *hdlc;
-
-        /* allocate and initialize network and HDLC layer objects */
-
-        if (!(dev = alloc_hdlcdev(info))) {
-                printk(KERN_ERR "%s:hdlc device allocation failure\n",__FILE__);
-                return -ENOMEM;
-        }
-
-        /* for network layer reporting purposes only */
-        dev->mem_start = info->phys_sca_base;
-        dev->mem_end   = info->phys_sca_base + SCA_BASE_SIZE - 1;
-        dev->irq       = info->irq_level;
-
-        /* network layer callbacks and settings */
-        dev->netdev_ops     = &hdlcdev_ops;
-        dev->watchdog_timeo = 10 * HZ;
-        dev->tx_queue_len   = 50;
-
-        /* generic HDLC layer callbacks and settings */
-        hdlc         = dev_to_hdlc(dev);
-        hdlc->attach = hdlcdev_attach;
-        hdlc->xmit   = hdlcdev_xmit;
-
-        /* register objects with HDLC layer */
-        if ((rc = register_hdlc_device(dev))) {
-                printk(KERN_WARNING "%s:unable to register hdlc device\n",__FILE__);
-                free_netdev(dev);
-                return rc;
-        }
-
-        info->netdev = dev;
-        return 0;
-}
-
-/**
- * called by device driver when removing device instance
- * do generic HDLC cleanup
- *
- * info  pointer to device instance information
- */
-static void hdlcdev_exit(SLMP_INFO *info)
-{
-        unregister_hdlc_device(info->netdev);
-        free_netdev(info->netdev);
-        info->netdev = NULL;
-}
-
-#endif /* CONFIG_HDLC */
-
-
-/* Return next bottom half action to perform.
- * Return Value:        BH action code or 0 if nothing to do.
- */
-static int bh_action(SLMP_INFO *info)
-{
-        unsigned long flags;
-        int rc = 0;
-
-        spin_lock_irqsave(&info->lock,flags);
-
-        if (info->pending_bh & BH_RECEIVE) {
-                info->pending_bh &= ~BH_RECEIVE;
-                rc = BH_RECEIVE;
-        } else if (info->pending_bh & BH_TRANSMIT) {
-                info->pending_bh &= ~BH_TRANSMIT;
-                rc = BH_TRANSMIT;
-        } else if (info->pending_bh & BH_STATUS) {
-                info->pending_bh &= ~BH_STATUS;
-                rc = BH_STATUS;
-        }
-
-        if (!rc) {
-                /* Mark BH routine as complete */
-                info->bh_running = false;
-                info->bh_requested = false;
-        }
-
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        return rc;
-}
-
-/* Perform bottom half processing of work items queued by ISR.
- */
-static void bh_handler(struct work_struct *work)
-{
-        SLMP_INFO *info = container_of(work, SLMP_INFO, task);
-        int action;
-
-        if (!info)
-                return;
-
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk( "%s(%d):%s bh_handler() entry\n",
-                        __FILE__,__LINE__,info->device_name);
-
-        info->bh_running = true;
-
-        while((action = bh_action(info)) != 0) {
-
-                /* Process work item */
-                if ( debug_level >= DEBUG_LEVEL_BH )
-                        printk( "%s(%d):%s bh_handler() work item action=%d\n",
-                                __FILE__,__LINE__,info->device_name, action);
-
-                switch (action) {
-
-                case BH_RECEIVE:
-                        bh_receive(info);
-                        break;
-                case BH_TRANSMIT:
-                        bh_transmit(info);
-                        break;
-                case BH_STATUS:
-                        bh_status(info);
-                        break;
-                default:
-                        /* unknown work item ID */
-                        printk("%s(%d):%s Unknown work item ID=%08X!\n",
-                                __FILE__,__LINE__,info->device_name,action);
-                        break;
-                }
-        }
-
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk( "%s(%d):%s bh_handler() exit\n",
-                        __FILE__,__LINE__,info->device_name);
-}
-
-static void bh_receive(SLMP_INFO *info)
-{
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk( "%s(%d):%s bh_receive()\n",
-                        __FILE__,__LINE__,info->device_name);
-
-        while( rx_get_frame(info) );
-}
-
-static void bh_transmit(SLMP_INFO *info)
-{
-        struct tty_struct *tty = info->port.tty;
-
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk( "%s(%d):%s bh_transmit() entry\n",
-                        __FILE__,__LINE__,info->device_name);
-
-        if (tty)
-                tty_wakeup(tty);
-}
-
-static void bh_status(SLMP_INFO *info)
-{
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk( "%s(%d):%s bh_status() entry\n",
-                        __FILE__,__LINE__,info->device_name);
-
-        info->ri_chkcount = 0;
-        info->dsr_chkcount = 0;
-        info->dcd_chkcount = 0;
-        info->cts_chkcount = 0;
-}
-
-static void isr_timer(SLMP_INFO * info)
-{
-        unsigned char timer = (info->port_num & 1) ? TIMER2 : TIMER0;
-
-        /* IER2<7..4> = timer<3..0> interrupt enables (0=disabled) */
-        write_reg(info, IER2, 0);
-
-        /* TMCS, Timer Control/Status Register
-         *
-         * 07      CMF, Compare match flag (read only) 1=match
-         * 06      ECMI, CMF Interrupt Enable: 0=disabled
-         * 05      Reserved, must be 0
-         * 04      TME, Timer Enable
-         * 03..00  Reserved, must be 0
-         *
-         * 0000 0000
-         */
-        write_reg(info, (unsigned char)(timer + TMCS), 0);
-
-        info->irq_occurred = true;
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):%s isr_timer()\n",
-                        __FILE__,__LINE__,info->device_name);
-}
-
-static void isr_rxint(SLMP_INFO * info)
-{
-        struct tty_struct *tty = info->port.tty;
-        struct  mgsl_icount *icount = &info->icount;
-        unsigned char status = read_reg(info, SR1) & info->ie1_value & (FLGD + IDLD + CDCD + BRKD);
-        unsigned char status2 = read_reg(info, SR2) & info->ie2_value & OVRN;
-
-        /* clear status bits */
-        if (status)
-                write_reg(info, SR1, status);
-
-        if (status2)
-                write_reg(info, SR2, status2);
-        
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):%s isr_rxint status=%02X %02x\n",
-                        __FILE__,__LINE__,info->device_name,status,status2);
-
-        if (info->params.mode == MGSL_MODE_ASYNC) {
-                if (status & BRKD) {
-                        icount->brk++;
-
-                        /* process break detection if tty control
-                         * is not set to ignore it
-                         */
-                        if ( tty ) {
-                                if (!(status & info->ignore_status_mask1)) {
-                                        if (info->read_status_mask1 & BRKD) {
-                                                tty_insert_flip_char(tty, 0, TTY_BREAK);
-                                                if (info->port.flags & ASYNC_SAK)
-                                                        do_SAK(tty);
-                                        }
-                                }
-                        }
-                }
-        }
-        else {
-                if (status & (FLGD|IDLD)) {
-                        if (status & FLGD)
-                                info->icount.exithunt++;
-                        else if (status & IDLD)
-                                info->icount.rxidle++;
-                        wake_up_interruptible(&info->event_wait_q);
-                }
-        }
-
-        if (status & CDCD) {
-                /* simulate a common modem status change interrupt
-                 * for our handler
-                 */
-                get_signals( info );
-                isr_io_pin(info,
-                        MISCSTATUS_DCD_LATCHED|(info->serial_signals&SerialSignal_DCD));
-        }
-}
-
-/*
- * handle async rx data interrupts
- */
-static void isr_rxrdy(SLMP_INFO * info)
-{
-        u16 status;
-        unsigned char DataByte;
-        struct tty_struct *tty = info->port.tty;
-        struct  mgsl_icount *icount = &info->icount;
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):%s isr_rxrdy\n",
-                        __FILE__,__LINE__,info->device_name);
-
-        while((status = read_reg(info,CST0)) & BIT0)
-        {
-                int flag = 0;
-                bool over = false;
-                DataByte = read_reg(info,TRB);
-
-                icount->rx++;
-
-                if ( status & (PE + FRME + OVRN) ) {
-                        printk("%s(%d):%s rxerr=%04X\n",
-                                __FILE__,__LINE__,info->device_name,status);
-
-                        /* update error statistics */
-                        if (status & PE)
-                                icount->parity++;
-                        else if (status & FRME)
-                                icount->frame++;
-                        else if (status & OVRN)
-                                icount->overrun++;
-
-                        /* discard char if tty control flags say so */
-                        if (status & info->ignore_status_mask2)
-                                continue;
-
-                        status &= info->read_status_mask2;
-
-                        if ( tty ) {
-                                if (status & PE)
-                                        flag = TTY_PARITY;
-                                else if (status & FRME)
-                                        flag = TTY_FRAME;
-                                if (status & OVRN) {
-                                        /* Overrun is special, since it's
-                                         * reported immediately, and doesn't
-                                         * affect the current character
-                                         */
-                                        over = true;
-                                }
-                        }
-                }       /* end of if (error) */
-
-                if ( tty ) {
-                        tty_insert_flip_char(tty, DataByte, flag);
-                        if (over)
-                                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-                }
-        }
-
-        if ( debug_level >= DEBUG_LEVEL_ISR ) {
-                printk("%s(%d):%s rx=%d brk=%d parity=%d frame=%d overrun=%d\n",
-                        __FILE__,__LINE__,info->device_name,
-                        icount->rx,icount->brk,icount->parity,
-                        icount->frame,icount->overrun);
-        }
-
-        if ( tty )
-                tty_flip_buffer_push(tty);
-}
-
-static void isr_txeom(SLMP_INFO * info, unsigned char status)
-{
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):%s isr_txeom status=%02x\n",
-                        __FILE__,__LINE__,info->device_name,status);
-
-        write_reg(info, TXDMA + DIR, 0x00); /* disable Tx DMA IRQs */
-        write_reg(info, TXDMA + DSR, 0xc0); /* clear IRQs and disable DMA */
-        write_reg(info, TXDMA + DCMD, SWABORT); /* reset/init DMA channel */
-
-        if (status & UDRN) {
-                write_reg(info, CMD, TXRESET);
-                write_reg(info, CMD, TXENABLE);
-        } else
-                write_reg(info, CMD, TXBUFCLR);
-
-        /* disable and clear tx interrupts */
-        info->ie0_value &= ~TXRDYE;
-        info->ie1_value &= ~(IDLE + UDRN);
-        write_reg16(info, IE0, (unsigned short)((info->ie1_value << 8) + info->ie0_value));
-        write_reg(info, SR1, (unsigned char)(UDRN + IDLE));
-
-        if ( info->tx_active ) {
-                if (info->params.mode != MGSL_MODE_ASYNC) {
-                        if (status & UDRN)
-                                info->icount.txunder++;
-                        else if (status & IDLE)
-                                info->icount.txok++;
-                }
-
-                info->tx_active = false;
-                info->tx_count = info->tx_put = info->tx_get = 0;
-
-                del_timer(&info->tx_timer);
-
-                if (info->params.mode != MGSL_MODE_ASYNC && info->drop_rts_on_tx_done ) {
-                        info->serial_signals &= ~SerialSignal_RTS;
-                        info->drop_rts_on_tx_done = false;
-                        set_signals(info);
-                }
-
-#if SYNCLINK_GENERIC_HDLC
-                if (info->netcount)
-                        hdlcdev_tx_done(info);
-                else
-#endif
-                {
-                        if (info->port.tty && (info->port.tty->stopped || info->port.tty->hw_stopped)) {
-                                tx_stop(info);
-                                return;
-                        }
-                        info->pending_bh |= BH_TRANSMIT;
-                }
-        }
-}
-
-
-/*
- * handle tx status interrupts
- */
-static void isr_txint(SLMP_INFO * info)
-{
-        unsigned char status = read_reg(info, SR1) & info->ie1_value & (UDRN + IDLE + CCTS);
-
-        /* clear status bits */
-        write_reg(info, SR1, status);
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):%s isr_txint status=%02x\n",
-                        __FILE__,__LINE__,info->device_name,status);
-
-        if (status & (UDRN + IDLE))
-                isr_txeom(info, status);
-
-        if (status & CCTS) {
-                /* simulate a common modem status change interrupt
-                 * for our handler
-                 */
-                get_signals( info );
-                isr_io_pin(info,
-                        MISCSTATUS_CTS_LATCHED|(info->serial_signals&SerialSignal_CTS));
-
-        }
-}
-
-/*
- * handle async tx data interrupts
- */
-static void isr_txrdy(SLMP_INFO * info)
-{
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):%s isr_txrdy() tx_count=%d\n",
-                        __FILE__,__LINE__,info->device_name,info->tx_count);
-
-        if (info->params.mode != MGSL_MODE_ASYNC) {
-                /* disable TXRDY IRQ, enable IDLE IRQ */
-                info->ie0_value &= ~TXRDYE;
-                info->ie1_value |= IDLE;
-                write_reg16(info, IE0, (unsigned short)((info->ie1_value << 8) + info->ie0_value));
-                return;
-        }
-
-        if (info->port.tty && (info->port.tty->stopped || info->port.tty->hw_stopped)) {
-                tx_stop(info);
-                return;
-        }
-
-        if ( info->tx_count )
-                tx_load_fifo( info );
-        else {
-                info->tx_active = false;
-                info->ie0_value &= ~TXRDYE;
-                write_reg(info, IE0, info->ie0_value);
-        }
-
-        if (info->tx_count < WAKEUP_CHARS)
-                info->pending_bh |= BH_TRANSMIT;
-}
-
-static void isr_rxdmaok(SLMP_INFO * info)
-{
-        /* BIT7 = EOT (end of transfer)
-         * BIT6 = EOM (end of message/frame)
-         */
-        unsigned char status = read_reg(info,RXDMA + DSR) & 0xc0;
-
-        /* clear IRQ (BIT0 must be 1 to prevent clearing DE bit) */
-        write_reg(info, RXDMA + DSR, (unsigned char)(status | 1));
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):%s isr_rxdmaok(), status=%02x\n",
-                        __FILE__,__LINE__,info->device_name,status);
-
-        info->pending_bh |= BH_RECEIVE;
-}
-
-static void isr_rxdmaerror(SLMP_INFO * info)
-{
-        /* BIT5 = BOF (buffer overflow)
-         * BIT4 = COF (counter overflow)
-         */
-        unsigned char status = read_reg(info,RXDMA + DSR) & 0x30;
-
-        /* clear IRQ (BIT0 must be 1 to prevent clearing DE bit) */
-        write_reg(info, RXDMA + DSR, (unsigned char)(status | 1));
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):%s isr_rxdmaerror(), status=%02x\n",
-                        __FILE__,__LINE__,info->device_name,status);
-
-        info->rx_overflow = true;
-        info->pending_bh |= BH_RECEIVE;
-}
-
-static void isr_txdmaok(SLMP_INFO * info)
-{
-        unsigned char status_reg1 = read_reg(info, SR1);
-
-        write_reg(info, TXDMA + DIR, 0x00);     /* disable Tx DMA IRQs */
-        write_reg(info, TXDMA + DSR, 0xc0); /* clear IRQs and disable DMA */
-        write_reg(info, TXDMA + DCMD, SWABORT); /* reset/init DMA channel */
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):%s isr_txdmaok(), status=%02x\n",
-                        __FILE__,__LINE__,info->device_name,status_reg1);
-
-        /* program TXRDY as FIFO empty flag, enable TXRDY IRQ */
-        write_reg16(info, TRC0, 0);
-        info->ie0_value |= TXRDYE;
-        write_reg(info, IE0, info->ie0_value);
-}
-
-static void isr_txdmaerror(SLMP_INFO * info)
-{
-        /* BIT5 = BOF (buffer overflow)
-         * BIT4 = COF (counter overflow)
-         */
-        unsigned char status = read_reg(info,TXDMA + DSR) & 0x30;
-
-        /* clear IRQ (BIT0 must be 1 to prevent clearing DE bit) */
-        write_reg(info, TXDMA + DSR, (unsigned char)(status | 1));
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):%s isr_txdmaerror(), status=%02x\n",
-                        __FILE__,__LINE__,info->device_name,status);
-}
-
-/* handle input serial signal changes
- */
-static void isr_io_pin( SLMP_INFO *info, u16 status )
-{
-        struct  mgsl_icount *icount;
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk("%s(%d):isr_io_pin status=%04X\n",
-                        __FILE__,__LINE__,status);
-
-        if (status & (MISCSTATUS_CTS_LATCHED | MISCSTATUS_DCD_LATCHED |
-                      MISCSTATUS_DSR_LATCHED | MISCSTATUS_RI_LATCHED) ) {
-                icount = &info->icount;
-                /* update input line counters */
-                if (status & MISCSTATUS_RI_LATCHED) {
-                        icount->rng++;
-                        if ( status & SerialSignal_RI )
-                                info->input_signal_events.ri_up++;
-                        else
-                                info->input_signal_events.ri_down++;
-                }
-                if (status & MISCSTATUS_DSR_LATCHED) {
-                        icount->dsr++;
-                        if ( status & SerialSignal_DSR )
-                                info->input_signal_events.dsr_up++;
-                        else
-                                info->input_signal_events.dsr_down++;
-                }
-                if (status & MISCSTATUS_DCD_LATCHED) {
-                        if ((info->dcd_chkcount)++ >= IO_PIN_SHUTDOWN_LIMIT) {
-                                info->ie1_value &= ~CDCD;
-                                write_reg(info, IE1, info->ie1_value);
-                        }
-                        icount->dcd++;
-                        if (status & SerialSignal_DCD) {
-                                info->input_signal_events.dcd_up++;
-                        } else
-                                info->input_signal_events.dcd_down++;
-#if SYNCLINK_GENERIC_HDLC
-                        if (info->netcount) {
-                                if (status & SerialSignal_DCD)
-                                        netif_carrier_on(info->netdev);
-                                else
-                                        netif_carrier_off(info->netdev);
-                        }
-#endif
-                }
-                if (status & MISCSTATUS_CTS_LATCHED)
-                {
-                        if ((info->cts_chkcount)++ >= IO_PIN_SHUTDOWN_LIMIT) {
-                                info->ie1_value &= ~CCTS;
-                                write_reg(info, IE1, info->ie1_value);
-                        }
-                        icount->cts++;
-                        if ( status & SerialSignal_CTS )
-                                info->input_signal_events.cts_up++;
-                        else
-                                info->input_signal_events.cts_down++;
-                }
-                wake_up_interruptible(&info->status_event_wait_q);
-                wake_up_interruptible(&info->event_wait_q);
-
-                if ( (info->port.flags & ASYNC_CHECK_CD) &&
-                     (status & MISCSTATUS_DCD_LATCHED) ) {
-                        if ( debug_level >= DEBUG_LEVEL_ISR )
-                                printk("%s CD now %s...", info->device_name,
-                                       (status & SerialSignal_DCD) ? "on" : "off");
-                        if (status & SerialSignal_DCD)
-                                wake_up_interruptible(&info->port.open_wait);
-                        else {
-                                if ( debug_level >= DEBUG_LEVEL_ISR )
-                                        printk("doing serial hangup...");
-                                if (info->port.tty)
-                                        tty_hangup(info->port.tty);
-                        }
-                }
-
-                if ( (info->port.flags & ASYNC_CTS_FLOW) &&
-                     (status & MISCSTATUS_CTS_LATCHED) ) {
-                        if ( info->port.tty ) {
-                                if (info->port.tty->hw_stopped) {
-                                        if (status & SerialSignal_CTS) {
-                                                if ( debug_level >= DEBUG_LEVEL_ISR )
-                                                        printk("CTS tx start...");
-                                                info->port.tty->hw_stopped = 0;
-                                                tx_start(info);
-                                                info->pending_bh |= BH_TRANSMIT;
-                                                return;
-                                        }
-                                } else {
-                                        if (!(status & SerialSignal_CTS)) {
-                                                if ( debug_level >= DEBUG_LEVEL_ISR )
-                                                        printk("CTS tx stop...");
-                                                info->port.tty->hw_stopped = 1;
-                                                tx_stop(info);
-                                        }
-                                }
-                        }
-                }
-        }
-
-        info->pending_bh |= BH_STATUS;
-}
-
-/* Interrupt service routine entry point.
- *
- * Arguments:
- *      irq             interrupt number that caused interrupt
- *      dev_id          device ID supplied during interrupt registration
- *      regs            interrupted processor context
- */
-static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
-{
-        SLMP_INFO *info = dev_id;
-        unsigned char status, status0, status1=0;
-        unsigned char dmastatus, dmastatus0, dmastatus1=0;
-        unsigned char timerstatus0, timerstatus1=0;
-        unsigned char shift;
-        unsigned int i;
-        unsigned short tmp;
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk(KERN_DEBUG "%s(%d): synclinkmp_interrupt(%d)entry.\n",
-                        __FILE__, __LINE__, info->irq_level);
-
-        spin_lock(&info->lock);
-
-        for(;;) {
-
-                /* get status for SCA0 (ports 0-1) */
-                tmp = read_reg16(info, ISR0);   /* get ISR0 and ISR1 in one read */
-                status0 = (unsigned char)tmp;
-                dmastatus0 = (unsigned char)(tmp>>8);
-                timerstatus0 = read_reg(info, ISR2);
-
-                if ( debug_level >= DEBUG_LEVEL_ISR )
-                        printk(KERN_DEBUG "%s(%d):%s status0=%02x, dmastatus0=%02x, timerstatus0=%02x\n",
-                                __FILE__, __LINE__, info->device_name,
-                                status0, dmastatus0, timerstatus0);
-
-                if (info->port_count == 4) {
-                        /* get status for SCA1 (ports 2-3) */
-                        tmp = read_reg16(info->port_array[2], ISR0);
-                        status1 = (unsigned char)tmp;
-                        dmastatus1 = (unsigned char)(tmp>>8);
-                        timerstatus1 = read_reg(info->port_array[2], ISR2);
-
-                        if ( debug_level >= DEBUG_LEVEL_ISR )
-                                printk("%s(%d):%s status1=%02x, dmastatus1=%02x, timerstatus1=%02x\n",
-                                        __FILE__,__LINE__,info->device_name,
-                                        status1,dmastatus1,timerstatus1);
-                }
-
-                if (!status0 && !dmastatus0 && !timerstatus0 &&
-                         !status1 && !dmastatus1 && !timerstatus1)
-                        break;
-
-                for(i=0; i < info->port_count ; i++) {
-                        if (info->port_array[i] == NULL)
-                                continue;
-                        if (i < 2) {
-                                status = status0;
-                                dmastatus = dmastatus0;
-                        } else {
-                                status = status1;
-                                dmastatus = dmastatus1;
-                        }
-
-                        shift = i & 1 ? 4 :0;
-
-                        if (status & BIT0 << shift)
-                                isr_rxrdy(info->port_array[i]);
-                        if (status & BIT1 << shift)
-                                isr_txrdy(info->port_array[i]);
-                        if (status & BIT2 << shift)
-                                isr_rxint(info->port_array[i]);
-                        if (status & BIT3 << shift)
-                                isr_txint(info->port_array[i]);
-
-                        if (dmastatus & BIT0 << shift)
-                                isr_rxdmaerror(info->port_array[i]);
-                        if (dmastatus & BIT1 << shift)
-                                isr_rxdmaok(info->port_array[i]);
-                        if (dmastatus & BIT2 << shift)
-                                isr_txdmaerror(info->port_array[i]);
-                        if (dmastatus & BIT3 << shift)
-                                isr_txdmaok(info->port_array[i]);
-                }
-
-                if (timerstatus0 & (BIT5 | BIT4))
-                        isr_timer(info->port_array[0]);
-                if (timerstatus0 & (BIT7 | BIT6))
-                        isr_timer(info->port_array[1]);
-                if (timerstatus1 & (BIT5 | BIT4))
-                        isr_timer(info->port_array[2]);
-                if (timerstatus1 & (BIT7 | BIT6))
-                        isr_timer(info->port_array[3]);
-        }
-
-        for(i=0; i < info->port_count ; i++) {
-                SLMP_INFO * port = info->port_array[i];
-
-                /* Request bottom half processing if there's something
-                 * for it to do and the bh is not already running.
-                 *
-                 * Note: startup adapter diags require interrupts.
-                 * do not request bottom half processing if the
-                 * device is not open in a normal mode.
-                 */
-                if ( port && (port->port.count || port->netcount) &&
-                     port->pending_bh && !port->bh_running &&
-                     !port->bh_requested ) {
-                        if ( debug_level >= DEBUG_LEVEL_ISR )
-                                printk("%s(%d):%s queueing bh task.\n",
-                                        __FILE__,__LINE__,port->device_name);
-                        schedule_work(&port->task);
-                        port->bh_requested = true;
-                }
-        }
-
-        spin_unlock(&info->lock);
-
-        if ( debug_level >= DEBUG_LEVEL_ISR )
-                printk(KERN_DEBUG "%s(%d):synclinkmp_interrupt(%d)exit.\n",
-                        __FILE__, __LINE__, info->irq_level);
-        return IRQ_HANDLED;
-}
-
-/* Initialize and start device.
- */
-static int startup(SLMP_INFO * info)
-{
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk("%s(%d):%s tx_releaseup()\n",__FILE__,__LINE__,info->device_name);
-
-        if (info->port.flags & ASYNC_INITIALIZED)
-                return 0;
-
-        if (!info->tx_buf) {
-                info->tx_buf = kmalloc(info->max_frame_size, GFP_KERNEL);
-                if (!info->tx_buf) {
-                        printk(KERN_ERR"%s(%d):%s can't allocate transmit buffer\n",
-                                __FILE__,__LINE__,info->device_name);
-                        return -ENOMEM;
-                }
-        }
-
-        info->pending_bh = 0;
-
-        memset(&info->icount, 0, sizeof(info->icount));
-
-        /* program hardware for current parameters */
-        reset_port(info);
-
-        change_params(info);
-
-        mod_timer(&info->status_timer, jiffies + msecs_to_jiffies(10));
-
-        if (info->port.tty)
-                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
-
-        info->port.flags |= ASYNC_INITIALIZED;
-
-        return 0;
-}
-
-/* Called by close() and hangup() to shutdown hardware
- */
-static void shutdown(SLMP_INFO * info)
-{
-        unsigned long flags;
-
-        if (!(info->port.flags & ASYNC_INITIALIZED))
-                return;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s synclinkmp_shutdown()\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        /* clear status wait queue because status changes */
-        /* can't happen after shutting down the hardware */
-        wake_up_interruptible(&info->status_event_wait_q);
-        wake_up_interruptible(&info->event_wait_q);
-
-        del_timer(&info->tx_timer);
-        del_timer(&info->status_timer);
-
-        kfree(info->tx_buf);
-        info->tx_buf = NULL;
-
-        spin_lock_irqsave(&info->lock,flags);
-
-        reset_port(info);
-
-        if (!info->port.tty || info->port.tty->termios->c_cflag & HUPCL) {
-                info->serial_signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
-                set_signals(info);
-        }
-
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        if (info->port.tty)
-                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
-
-        info->port.flags &= ~ASYNC_INITIALIZED;
-}
-
-static void program_hw(SLMP_INFO *info)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->lock,flags);
-
-        rx_stop(info);
-        tx_stop(info);
-
-        info->tx_count = info->tx_put = info->tx_get = 0;
-
-        if (info->params.mode == MGSL_MODE_HDLC || info->netcount)
-                hdlc_mode(info);
-        else
-                async_mode(info);
-
-        set_signals(info);
-
-        info->dcd_chkcount = 0;
-        info->cts_chkcount = 0;
-        info->ri_chkcount = 0;
-        info->dsr_chkcount = 0;
-
-        info->ie1_value |= (CDCD|CCTS);
-        write_reg(info, IE1, info->ie1_value);
-
-        get_signals(info);
-
-        if (info->netcount || (info->port.tty && info->port.tty->termios->c_cflag & CREAD) )
-                rx_start(info);
-
-        spin_unlock_irqrestore(&info->lock,flags);
-}
-
-/* Reconfigure adapter based on new parameters
- */
-static void change_params(SLMP_INFO *info)
-{
-        unsigned cflag;
-        int bits_per_char;
-
-        if (!info->port.tty || !info->port.tty->termios)
-                return;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s change_params()\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        cflag = info->port.tty->termios->c_cflag;
-
-        /* if B0 rate (hangup) specified then negate DTR and RTS */
-        /* otherwise assert DTR and RTS */
-        if (cflag & CBAUD)
-                info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
-        else
-                info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
-
-        /* byte size and parity */
-
-        switch (cflag & CSIZE) {
-              case CS5: info->params.data_bits = 5; break;
-              case CS6: info->params.data_bits = 6; break;
-              case CS7: info->params.data_bits = 7; break;
-              case CS8: info->params.data_bits = 8; break;
-              /* Never happens, but GCC is too dumb to figure it out */
-              default:  info->params.data_bits = 7; break;
-              }
-
-        if (cflag & CSTOPB)
-                info->params.stop_bits = 2;
-        else
-                info->params.stop_bits = 1;
-
-        info->params.parity = ASYNC_PARITY_NONE;
-        if (cflag & PARENB) {
-                if (cflag & PARODD)
-                        info->params.parity = ASYNC_PARITY_ODD;
-                else
-                        info->params.parity = ASYNC_PARITY_EVEN;
-#ifdef CMSPAR
-                if (cflag & CMSPAR)
-                        info->params.parity = ASYNC_PARITY_SPACE;
-#endif
-        }
-
-        /* calculate number of jiffies to transmit a full
-         * FIFO (32 bytes) at specified data rate
-         */
-        bits_per_char = info->params.data_bits +
-                        info->params.stop_bits + 1;
-
-        /* if port data rate is set to 460800 or less then
-         * allow tty settings to override, otherwise keep the
-         * current data rate.
-         */
-        if (info->params.data_rate <= 460800) {
-                info->params.data_rate = tty_get_baud_rate(info->port.tty);
-        }
-
-        if ( info->params.data_rate ) {
-                info->timeout = (32*HZ*bits_per_char) /
-                                info->params.data_rate;
-        }
-        info->timeout += HZ/50;         /* Add .02 seconds of slop */
-
-        if (cflag & CRTSCTS)
-                info->port.flags |= ASYNC_CTS_FLOW;
-        else
-                info->port.flags &= ~ASYNC_CTS_FLOW;
-
-        if (cflag & CLOCAL)
-                info->port.flags &= ~ASYNC_CHECK_CD;
-        else
-                info->port.flags |= ASYNC_CHECK_CD;
-
-        /* process tty input control flags */
-
-        info->read_status_mask2 = OVRN;
-        if (I_INPCK(info->port.tty))
-                info->read_status_mask2 |= PE | FRME;
-        if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty))
-                info->read_status_mask1 |= BRKD;
-        if (I_IGNPAR(info->port.tty))
-                info->ignore_status_mask2 |= PE | FRME;
-        if (I_IGNBRK(info->port.tty)) {
-                info->ignore_status_mask1 |= BRKD;
-                /* If ignoring parity and break indicators, ignore
-                 * overruns too.  (For real raw support).
-                 */
-                if (I_IGNPAR(info->port.tty))
-                        info->ignore_status_mask2 |= OVRN;
-        }
-
-        program_hw(info);
-}
-
-static int get_stats(SLMP_INFO * info, struct mgsl_icount __user *user_icount)
-{
-        int err;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s get_params()\n",
-                         __FILE__,__LINE__, info->device_name);
-
-        if (!user_icount) {
-                memset(&info->icount, 0, sizeof(info->icount));
-        } else {
-                mutex_lock(&info->port.mutex);
-                COPY_TO_USER(err, user_icount, &info->icount, sizeof(struct mgsl_icount));
-                mutex_unlock(&info->port.mutex);
-                if (err)
-                        return -EFAULT;
-        }
-
-        return 0;
-}
-
-static int get_params(SLMP_INFO * info, MGSL_PARAMS __user *user_params)
-{
-        int err;
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s get_params()\n",
-                         __FILE__,__LINE__, info->device_name);
-
-        mutex_lock(&info->port.mutex);
-        COPY_TO_USER(err,user_params, &info->params, sizeof(MGSL_PARAMS));
-        mutex_unlock(&info->port.mutex);
-        if (err) {
-                if ( debug_level >= DEBUG_LEVEL_INFO )
-                        printk( "%s(%d):%s get_params() user buffer copy failed\n",
-                                __FILE__,__LINE__,info->device_name);
-                return -EFAULT;
-        }
-
-        return 0;
-}
-
-static int set_params(SLMP_INFO * info, MGSL_PARAMS __user *new_params)
-{
-        unsigned long flags;
-        MGSL_PARAMS tmp_params;
-        int err;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s set_params\n",
-                        __FILE__,__LINE__,info->device_name );
-        COPY_FROM_USER(err,&tmp_params, new_params, sizeof(MGSL_PARAMS));
-        if (err) {
-                if ( debug_level >= DEBUG_LEVEL_INFO )
-                        printk( "%s(%d):%s set_params() user buffer copy failed\n",
-                                __FILE__,__LINE__,info->device_name);
-                return -EFAULT;
-        }
-
-        mutex_lock(&info->port.mutex);
-        spin_lock_irqsave(&info->lock,flags);
-        memcpy(&info->params,&tmp_params,sizeof(MGSL_PARAMS));
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        change_params(info);
-        mutex_unlock(&info->port.mutex);
-
-        return 0;
-}
-
-static int get_txidle(SLMP_INFO * info, int __user *idle_mode)
-{
-        int err;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s get_txidle()=%d\n",
-                         __FILE__,__LINE__, info->device_name, info->idle_mode);
-
-        COPY_TO_USER(err,idle_mode, &info->idle_mode, sizeof(int));
-        if (err) {
-                if ( debug_level >= DEBUG_LEVEL_INFO )
-                        printk( "%s(%d):%s get_txidle() user buffer copy failed\n",
-                                __FILE__,__LINE__,info->device_name);
-                return -EFAULT;
-        }
-
-        return 0;
-}
-
-static int set_txidle(SLMP_INFO * info, int idle_mode)
-{
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s set_txidle(%d)\n",
-                        __FILE__,__LINE__,info->device_name, idle_mode );
-
-        spin_lock_irqsave(&info->lock,flags);
-        info->idle_mode = idle_mode;
-        tx_set_idle( info );
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-static int tx_enable(SLMP_INFO * info, int enable)
-{
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s tx_enable(%d)\n",
-                        __FILE__,__LINE__,info->device_name, enable);
-
-        spin_lock_irqsave(&info->lock,flags);
-        if ( enable ) {
-                if ( !info->tx_enabled ) {
-                        tx_start(info);
-                }
-        } else {
-                if ( info->tx_enabled )
-                        tx_stop(info);
-        }
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-/* abort send HDLC frame
- */
-static int tx_abort(SLMP_INFO * info)
-{
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s tx_abort()\n",
-                        __FILE__,__LINE__,info->device_name);
-
-        spin_lock_irqsave(&info->lock,flags);
-        if ( info->tx_active && info->params.mode == MGSL_MODE_HDLC ) {
-                info->ie1_value &= ~UDRN;
-                info->ie1_value |= IDLE;
-                write_reg(info, IE1, info->ie1_value);  /* disable tx status interrupts */
-                write_reg(info, SR1, (unsigned char)(IDLE + UDRN));     /* clear pending */
-
-                write_reg(info, TXDMA + DSR, 0);                /* disable DMA channel */
-                write_reg(info, TXDMA + DCMD, SWABORT); /* reset/init DMA channel */
-
-                write_reg(info, CMD, TXABORT);
-        }
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-static int rx_enable(SLMP_INFO * info, int enable)
-{
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s rx_enable(%d)\n",
-                        __FILE__,__LINE__,info->device_name,enable);
-
-        spin_lock_irqsave(&info->lock,flags);
-        if ( enable ) {
-                if ( !info->rx_enabled )
-                        rx_start(info);
-        } else {
-                if ( info->rx_enabled )
-                        rx_stop(info);
-        }
-        spin_unlock_irqrestore(&info->lock,flags);
-        return 0;
-}
-
-/* wait for specified event to occur
- */
-static int wait_mgsl_event(SLMP_INFO * info, int __user *mask_ptr)
-{
-        unsigned long flags;
-        int s;
-        int rc=0;
-        struct mgsl_icount cprev, cnow;
-        int events;
-        int mask;
-        struct  _input_signal_events oldsigs, newsigs;
-        DECLARE_WAITQUEUE(wait, current);
-
-        COPY_FROM_USER(rc,&mask, mask_ptr, sizeof(int));
-        if (rc) {
-                return  -EFAULT;
-        }
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s wait_mgsl_event(%d)\n",
-                        __FILE__,__LINE__,info->device_name,mask);
-
-        spin_lock_irqsave(&info->lock,flags);
-
-        /* return immediately if state matches requested events */
-        get_signals(info);
-        s = info->serial_signals;
-
-        events = mask &
-                ( ((s & SerialSignal_DSR) ? MgslEvent_DsrActive:MgslEvent_DsrInactive) +
-                  ((s & SerialSignal_DCD) ? MgslEvent_DcdActive:MgslEvent_DcdInactive) +
-                  ((s & SerialSignal_CTS) ? MgslEvent_CtsActive:MgslEvent_CtsInactive) +
-                  ((s & SerialSignal_RI)  ? MgslEvent_RiActive :MgslEvent_RiInactive) );
-        if (events) {
-                spin_unlock_irqrestore(&info->lock,flags);
-                goto exit;
-        }
-
-        /* save current irq counts */
-        cprev = info->icount;
-        oldsigs = info->input_signal_events;
-
-        /* enable hunt and idle irqs if needed */
-        if (mask & (MgslEvent_ExitHuntMode+MgslEvent_IdleReceived)) {
-                unsigned char oldval = info->ie1_value;
-                unsigned char newval = oldval +
-                         (mask & MgslEvent_ExitHuntMode ? FLGD:0) +
-                         (mask & MgslEvent_IdleReceived ? IDLD:0);
-                if ( oldval != newval ) {
-                        info->ie1_value = newval;
-                        write_reg(info, IE1, info->ie1_value);
-                }
-        }
-
-        set_current_state(TASK_INTERRUPTIBLE);
-        add_wait_queue(&info->event_wait_q, &wait);
-
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        for(;;) {
-                schedule();
-                if (signal_pending(current)) {
-                        rc = -ERESTARTSYS;
-                        break;
-                }
-
-                /* get current irq counts */
-                spin_lock_irqsave(&info->lock,flags);
-                cnow = info->icount;
-                newsigs = info->input_signal_events;
-                set_current_state(TASK_INTERRUPTIBLE);
-                spin_unlock_irqrestore(&info->lock,flags);
-
-                /* if no change, wait aborted for some reason */
-                if (newsigs.dsr_up   == oldsigs.dsr_up   &&
-                    newsigs.dsr_down == oldsigs.dsr_down &&
-                    newsigs.dcd_up   == oldsigs.dcd_up   &&
-                    newsigs.dcd_down == oldsigs.dcd_down &&
-                    newsigs.cts_up   == oldsigs.cts_up   &&
-                    newsigs.cts_down == oldsigs.cts_down &&
-                    newsigs.ri_up    == oldsigs.ri_up    &&
-                    newsigs.ri_down  == oldsigs.ri_down  &&
-                    cnow.exithunt    == cprev.exithunt   &&
-                    cnow.rxidle      == cprev.rxidle) {
-                        rc = -EIO;
-                        break;
-                }
-
-                events = mask &
-                        ( (newsigs.dsr_up   != oldsigs.dsr_up   ? MgslEvent_DsrActive:0)   +
-                          (newsigs.dsr_down != oldsigs.dsr_down ? MgslEvent_DsrInactive:0) +
-                          (newsigs.dcd_up   != oldsigs.dcd_up   ? MgslEvent_DcdActive:0)   +
-                          (newsigs.dcd_down != oldsigs.dcd_down ? MgslEvent_DcdInactive:0) +
-                          (newsigs.cts_up   != oldsigs.cts_up   ? MgslEvent_CtsActive:0)   +
-                          (newsigs.cts_down != oldsigs.cts_down ? MgslEvent_CtsInactive:0) +
-                          (newsigs.ri_up    != oldsigs.ri_up    ? MgslEvent_RiActive:0)    +
-                          (newsigs.ri_down  != oldsigs.ri_down  ? MgslEvent_RiInactive:0)  +
-                          (cnow.exithunt    != cprev.exithunt   ? MgslEvent_ExitHuntMode:0) +
-                          (cnow.rxidle      != cprev.rxidle     ? MgslEvent_IdleReceived:0) );
-                if (events)
-                        break;
-
-                cprev = cnow;
-                oldsigs = newsigs;
-        }
-
-        remove_wait_queue(&info->event_wait_q, &wait);
-        set_current_state(TASK_RUNNING);
-
-
-        if (mask & (MgslEvent_ExitHuntMode + MgslEvent_IdleReceived)) {
-                spin_lock_irqsave(&info->lock,flags);
-                if (!waitqueue_active(&info->event_wait_q)) {
-                        /* disable enable exit hunt mode/idle rcvd IRQs */
-                        info->ie1_value &= ~(FLGD|IDLD);
-                        write_reg(info, IE1, info->ie1_value);
-                }
-                spin_unlock_irqrestore(&info->lock,flags);
-        }
-exit:
-        if ( rc == 0 )
-                PUT_USER(rc, events, mask_ptr);
-
-        return rc;
-}
-
-static int modem_input_wait(SLMP_INFO *info,int arg)
-{
-        unsigned long flags;
-        int rc;
-        struct mgsl_icount cprev, cnow;
-        DECLARE_WAITQUEUE(wait, current);
-
-        /* save current irq counts */
-        spin_lock_irqsave(&info->lock,flags);
-        cprev = info->icount;
-        add_wait_queue(&info->status_event_wait_q, &wait);
-        set_current_state(TASK_INTERRUPTIBLE);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        for(;;) {
-                schedule();
-                if (signal_pending(current)) {
-                        rc = -ERESTARTSYS;
-                        break;
-                }
-
-                /* get new irq counts */
-                spin_lock_irqsave(&info->lock,flags);
-                cnow = info->icount;
-                set_current_state(TASK_INTERRUPTIBLE);
-                spin_unlock_irqrestore(&info->lock,flags);
-
-                /* if no change, wait aborted for some reason */
-                if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
-                    cnow.dcd == cprev.dcd && cnow.cts == cprev.cts) {
-                        rc = -EIO;
-                        break;
-                }
-
-                /* check for change in caller specified modem input */
-                if ((arg & TIOCM_RNG && cnow.rng != cprev.rng) ||
-                    (arg & TIOCM_DSR && cnow.dsr != cprev.dsr) ||
-                    (arg & TIOCM_CD  && cnow.dcd != cprev.dcd) ||
-                    (arg & TIOCM_CTS && cnow.cts != cprev.cts)) {
-                        rc = 0;
-                        break;
-                }
-
-                cprev = cnow;
-        }
-        remove_wait_queue(&info->status_event_wait_q, &wait);
-        set_current_state(TASK_RUNNING);
-        return rc;
-}
-
-/* return the state of the serial control and status signals
- */
-static int tiocmget(struct tty_struct *tty, struct file *file)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned int result;
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->lock,flags);
-        get_signals(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        result = ((info->serial_signals & SerialSignal_RTS) ? TIOCM_RTS:0) +
-                ((info->serial_signals & SerialSignal_DTR) ? TIOCM_DTR:0) +
-                ((info->serial_signals & SerialSignal_DCD) ? TIOCM_CAR:0) +
-                ((info->serial_signals & SerialSignal_RI)  ? TIOCM_RNG:0) +
-                ((info->serial_signals & SerialSignal_DSR) ? TIOCM_DSR:0) +
-                ((info->serial_signals & SerialSignal_CTS) ? TIOCM_CTS:0);
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s tiocmget() value=%08X\n",
-                         __FILE__,__LINE__, info->device_name, result );
-        return result;
-}
-
-/* set modem control signals (DTR/RTS)
- */
-static int tiocmset(struct tty_struct *tty, struct file *file,
-                    unsigned int set, unsigned int clear)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s tiocmset(%x,%x)\n",
-                        __FILE__,__LINE__,info->device_name, set, clear);
-
-        if (set & TIOCM_RTS)
-                info->serial_signals |= SerialSignal_RTS;
-        if (set & TIOCM_DTR)
-                info->serial_signals |= SerialSignal_DTR;
-        if (clear & TIOCM_RTS)
-                info->serial_signals &= ~SerialSignal_RTS;
-        if (clear & TIOCM_DTR)
-                info->serial_signals &= ~SerialSignal_DTR;
-
-        spin_lock_irqsave(&info->lock,flags);
-        set_signals(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        return 0;
-}
-
-static int carrier_raised(struct tty_port *port)
-{
-        SLMP_INFO *info = container_of(port, SLMP_INFO, port);
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->lock,flags);
-        get_signals(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        return (info->serial_signals & SerialSignal_DCD) ? 1 : 0;
-}
-
-static void dtr_rts(struct tty_port *port, int on)
-{
-        SLMP_INFO *info = container_of(port, SLMP_INFO, port);
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->lock,flags);
-        if (on)
-                info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
-        else
-                info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
-        set_signals(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-}
-
-/* Block the current process until the specified port is ready to open.
- */
-static int block_til_ready(struct tty_struct *tty, struct file *filp,
-                           SLMP_INFO *info)
-{
-        DECLARE_WAITQUEUE(wait, current);
-        int             retval;
-        bool            do_clocal = false;
-        bool            extra_count = false;
-        unsigned long   flags;
-        int             cd;
-        struct tty_port *port = &info->port;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s block_til_ready()\n",
-                         __FILE__,__LINE__, tty->driver->name );
-
-        if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){
-                /* nonblock mode is set or port is not enabled */
-                /* just verify that callout device is not active */
-                port->flags |= ASYNC_NORMAL_ACTIVE;
-                return 0;
-        }
-
-        if (tty->termios->c_cflag & CLOCAL)
-                do_clocal = true;
-
-        /* Wait for carrier detect and the line to become
-         * free (i.e., not in use by the callout).  While we are in
-         * this loop, port->count is dropped by one, so that
-         * close() knows when to free things.  We restore it upon
-         * exit, either normal or abnormal.
-         */
-
-        retval = 0;
-        add_wait_queue(&port->open_wait, &wait);
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s block_til_ready() before block, count=%d\n",
-                         __FILE__,__LINE__, tty->driver->name, port->count );
-
-        spin_lock_irqsave(&info->lock, flags);
-        if (!tty_hung_up_p(filp)) {
-                extra_count = true;
-                port->count--;
-        }
-        spin_unlock_irqrestore(&info->lock, flags);
-        port->blocked_open++;
-
-        while (1) {
-                if (tty->termios->c_cflag & CBAUD)
-                        tty_port_raise_dtr_rts(port);
-
-                set_current_state(TASK_INTERRUPTIBLE);
-
-                if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)){
-                        retval = (port->flags & ASYNC_HUP_NOTIFY) ?
-                                        -EAGAIN : -ERESTARTSYS;
-                        break;
-                }
-
-                cd = tty_port_carrier_raised(port);
-
-                if (!(port->flags & ASYNC_CLOSING) && (do_clocal || cd))
-                        break;
-
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-
-                if (debug_level >= DEBUG_LEVEL_INFO)
-                        printk("%s(%d):%s block_til_ready() count=%d\n",
-                                 __FILE__,__LINE__, tty->driver->name, port->count );
-
-                tty_unlock();
-                schedule();
-                tty_lock();
-        }
-
-        set_current_state(TASK_RUNNING);
-        remove_wait_queue(&port->open_wait, &wait);
-
-        if (extra_count)
-                port->count++;
-        port->blocked_open--;
-
-        if (debug_level >= DEBUG_LEVEL_INFO)
-                printk("%s(%d):%s block_til_ready() after, count=%d\n",
-                         __FILE__,__LINE__, tty->driver->name, port->count );
-
-        if (!retval)
-                port->flags |= ASYNC_NORMAL_ACTIVE;
-
-        return retval;
-}
-
-static int alloc_dma_bufs(SLMP_INFO *info)
-{
-        unsigned short BuffersPerFrame;
-        unsigned short BufferCount;
-
-        // Force allocation to start at 64K boundary for each port.
-        // This is necessary because *all* buffer descriptors for a port
-        // *must* be in the same 64K block. All descriptors on a port
-        // share a common 'base' address (upper 8 bits of 24 bits) programmed
-        // into the CBP register.
-        info->port_array[0]->last_mem_alloc = (SCA_MEM_SIZE/4) * info->port_num;
-
-        /* Calculate the number of DMA buffers necessary to hold the */
-        /* largest allowable frame size. Note: If the max frame size is */
-        /* not an even multiple of the DMA buffer size then we need to */
-        /* round the buffer count per frame up one. */
-
-        BuffersPerFrame = (unsigned short)(info->max_frame_size/SCABUFSIZE);
-        if ( info->max_frame_size % SCABUFSIZE )
-                BuffersPerFrame++;
-
-        /* calculate total number of data buffers (SCABUFSIZE) possible
-         * in one ports memory (SCA_MEM_SIZE/4) after allocating memory
-         * for the descriptor list (BUFFERLISTSIZE).
-         */
-        BufferCount = (SCA_MEM_SIZE/4 - BUFFERLISTSIZE)/SCABUFSIZE;
-
-        /* limit number of buffers to maximum amount of descriptors */
-        if (BufferCount > BUFFERLISTSIZE/sizeof(SCADESC))
-                BufferCount = BUFFERLISTSIZE/sizeof(SCADESC);
-
-        /* use enough buffers to transmit one max size frame */
-        info->tx_buf_count = BuffersPerFrame + 1;
-
-        /* never use more than half the available buffers for transmit */
-        if (info->tx_buf_count > (BufferCount/2))
-                info->tx_buf_count = BufferCount/2;
-
-        if (info->tx_buf_count > SCAMAXDESC)
-                info->tx_buf_count = SCAMAXDESC;
-
-        /* use remaining buffers for receive */
-        info->rx_buf_count = BufferCount - info->tx_buf_count;
-
-        if (info->rx_buf_count > SCAMAXDESC)
-                info->rx_buf_count = SCAMAXDESC;
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk("%s(%d):%s Allocating %d TX and %d RX DMA buffers.\n",
-                        __FILE__,__LINE__, info->device_name,
-                        info->tx_buf_count,info->rx_buf_count);
-
-        if ( alloc_buf_list( info ) < 0 ||
-                alloc_frame_bufs(info,
-                                        info->rx_buf_list,
-                                        info->rx_buf_list_ex,
-                                        info->rx_buf_count) < 0 ||
-                alloc_frame_bufs(info,
-                                        info->tx_buf_list,
-                                        info->tx_buf_list_ex,
-                                        info->tx_buf_count) < 0 ||
-                alloc_tmp_rx_buf(info) < 0 ) {
-                printk("%s(%d):%s Can't allocate DMA buffer memory\n",
-                        __FILE__,__LINE__, info->device_name);
-                return -ENOMEM;
-        }
-
-        rx_reset_buffers( info );
-
-        return 0;
-}
-
-/* Allocate DMA buffers for the transmit and receive descriptor lists.
- */
-static int alloc_buf_list(SLMP_INFO *info)
-{
-        unsigned int i;
-
-        /* build list in adapter shared memory */
-        info->buffer_list = info->memory_base + info->port_array[0]->last_mem_alloc;
-        info->buffer_list_phys = info->port_array[0]->last_mem_alloc;
-        info->port_array[0]->last_mem_alloc += BUFFERLISTSIZE;
-
-        memset(info->buffer_list, 0, BUFFERLISTSIZE);
-
-        /* Save virtual address pointers to the receive and */
-        /* transmit buffer lists. (Receive 1st). These pointers will */
-        /* be used by the processor to access the lists. */
-        info->rx_buf_list = (SCADESC *)info->buffer_list;
-
-        info->tx_buf_list = (SCADESC *)info->buffer_list;
-        info->tx_buf_list += info->rx_buf_count;
-
-        /* Build links for circular buffer entry lists (tx and rx)
-         *
-         * Note: links are physical addresses read by the SCA device
-         * to determine the next buffer entry to use.
-         */
-
-        for ( i = 0; i < info->rx_buf_count; i++ ) {
-                /* calculate and store physical address of this buffer entry */
-                info->rx_buf_list_ex[i].phys_entry =
-                        info->buffer_list_phys + (i * sizeof(SCABUFSIZE));
-
-                /* calculate and store physical address of */
-                /* next entry in cirular list of entries */
-                info->rx_buf_list[i].next = info->buffer_list_phys;
-                if ( i < info->rx_buf_count - 1 )
-                        info->rx_buf_list[i].next += (i + 1) * sizeof(SCADESC);
-
-                info->rx_buf_list[i].length = SCABUFSIZE;
-        }
-
-        for ( i = 0; i < info->tx_buf_count; i++ ) {
-                /* calculate and store physical address of this buffer entry */
-                info->tx_buf_list_ex[i].phys_entry = info->buffer_list_phys +
-                        ((info->rx_buf_count + i) * sizeof(SCADESC));
-
-                /* calculate and store physical address of */
-                /* next entry in cirular list of entries */
-
-                info->tx_buf_list[i].next = info->buffer_list_phys +
-                        info->rx_buf_count * sizeof(SCADESC);
-
-                if ( i < info->tx_buf_count - 1 )
-                        info->tx_buf_list[i].next += (i + 1) * sizeof(SCADESC);
-        }
-
-        return 0;
-}
-
-/* Allocate the frame DMA buffers used by the specified buffer list.
- */
-static int alloc_frame_bufs(SLMP_INFO *info, SCADESC *buf_list,SCADESC_EX *buf_list_ex,int count)
-{
-        int i;
-        unsigned long phys_addr;
-
-        for ( i = 0; i < count; i++ ) {
-                buf_list_ex[i].virt_addr = info->memory_base + info->port_array[0]->last_mem_alloc;
-                phys_addr = info->port_array[0]->last_mem_alloc;
-                info->port_array[0]->last_mem_alloc += SCABUFSIZE;
-
-                buf_list[i].buf_ptr  = (unsigned short)phys_addr;
-                buf_list[i].buf_base = (unsigned char)(phys_addr >> 16);
-        }
-
-        return 0;
-}
-
-static void free_dma_bufs(SLMP_INFO *info)
-{
-        info->buffer_list = NULL;
-        info->rx_buf_list = NULL;
-        info->tx_buf_list = NULL;
-}
-
-/* allocate buffer large enough to hold max_frame_size.
- * This buffer is used to pass an assembled frame to the line discipline.
- */
-static int alloc_tmp_rx_buf(SLMP_INFO *info)
-{
-        info->tmp_rx_buf = kmalloc(info->max_frame_size, GFP_KERNEL);
-        if (info->tmp_rx_buf == NULL)
-                return -ENOMEM;
-        return 0;
-}
-
-static void free_tmp_rx_buf(SLMP_INFO *info)
-{
-        kfree(info->tmp_rx_buf);
-        info->tmp_rx_buf = NULL;
-}
-
-static int claim_resources(SLMP_INFO *info)
-{
-        if (request_mem_region(info->phys_memory_base,SCA_MEM_SIZE,"synclinkmp") == NULL) {
-                printk( "%s(%d):%s mem addr conflict, Addr=%08X\n",
-                        __FILE__,__LINE__,info->device_name, info->phys_memory_base);
-                info->init_error = DiagStatus_AddressConflict;
-                goto errout;
-        }
-        else
-                info->shared_mem_requested = true;
-
-        if (request_mem_region(info->phys_lcr_base + info->lcr_offset,128,"synclinkmp") == NULL) {
-                printk( "%s(%d):%s lcr mem addr conflict, Addr=%08X\n",
-                        __FILE__,__LINE__,info->device_name, info->phys_lcr_base);
-                info->init_error = DiagStatus_AddressConflict;
-                goto errout;
-        }
-        else
-                info->lcr_mem_requested = true;
-
-        if (request_mem_region(info->phys_sca_base + info->sca_offset,SCA_BASE_SIZE,"synclinkmp") == NULL) {
-                printk( "%s(%d):%s sca mem addr conflict, Addr=%08X\n",
-                        __FILE__,__LINE__,info->device_name, info->phys_sca_base);
-                info->init_error = DiagStatus_AddressConflict;
-                goto errout;
-        }
-        else
-                info->sca_base_requested = true;
-
-        if (request_mem_region(info->phys_statctrl_base + info->statctrl_offset,SCA_REG_SIZE,"synclinkmp") == NULL) {
-                printk( "%s(%d):%s stat/ctrl mem addr conflict, Addr=%08X\n",
-                        __FILE__,__LINE__,info->device_name, info->phys_statctrl_base);
-                info->init_error = DiagStatus_AddressConflict;
-                goto errout;
-        }
-        else
-                info->sca_statctrl_requested = true;
-
-        info->memory_base = ioremap_nocache(info->phys_memory_base,
-                                                                SCA_MEM_SIZE);
-        if (!info->memory_base) {
-                printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n",
-                        __FILE__,__LINE__,info->device_name, info->phys_memory_base );
-                info->init_error = DiagStatus_CantAssignPciResources;
-                goto errout;
-        }
-
-        info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE);
-        if (!info->lcr_base) {
-                printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n",
-                        __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
-                info->init_error = DiagStatus_CantAssignPciResources;
-                goto errout;
-        }
-        info->lcr_base += info->lcr_offset;
-
-        info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE);
-        if (!info->sca_base) {
-                printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n",
-                        __FILE__,__LINE__,info->device_name, info->phys_sca_base );
-                info->init_error = DiagStatus_CantAssignPciResources;
-                goto errout;
-        }
-        info->sca_base += info->sca_offset;
-
-        info->statctrl_base = ioremap_nocache(info->phys_statctrl_base,
-                                                                PAGE_SIZE);
-        if (!info->statctrl_base) {
-                printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n",
-                        __FILE__,__LINE__,info->device_name, info->phys_statctrl_base );
-                info->init_error = DiagStatus_CantAssignPciResources;
-                goto errout;
-        }
-        info->statctrl_base += info->statctrl_offset;
-
-        if ( !memory_test(info) ) {
-                printk( "%s(%d):Shared Memory Test failed for device %s MemAddr=%08X\n",
-                        __FILE__,__LINE__,info->device_name, info->phys_memory_base );
-                info->init_error = DiagStatus_MemoryError;
-                goto errout;
-        }
-
-        return 0;
-
-errout:
-        release_resources( info );
-        return -ENODEV;
-}
-
-static void release_resources(SLMP_INFO *info)
-{
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):%s release_resources() entry\n",
-                        __FILE__,__LINE__,info->device_name );
-
-        if ( info->irq_requested ) {
-                free_irq(info->irq_level, info);
-                info->irq_requested = false;
-        }
-
-        if ( info->shared_mem_requested ) {
-                release_mem_region(info->phys_memory_base,SCA_MEM_SIZE);
-                info->shared_mem_requested = false;
-        }
-        if ( info->lcr_mem_requested ) {
-                release_mem_region(info->phys_lcr_base + info->lcr_offset,128);
-                info->lcr_mem_requested = false;
-        }
-        if ( info->sca_base_requested ) {
-                release_mem_region(info->phys_sca_base + info->sca_offset,SCA_BASE_SIZE);
-                info->sca_base_requested = false;
-        }
-        if ( info->sca_statctrl_requested ) {
-                release_mem_region(info->phys_statctrl_base + info->statctrl_offset,SCA_REG_SIZE);
-                info->sca_statctrl_requested = false;
-        }
-
-        if (info->memory_base){
-                iounmap(info->memory_base);
-                info->memory_base = NULL;
-        }
-
-        if (info->sca_base) {
-                iounmap(info->sca_base - info->sca_offset);
-                info->sca_base=NULL;
-        }
-
-        if (info->statctrl_base) {
-                iounmap(info->statctrl_base - info->statctrl_offset);
-                info->statctrl_base=NULL;
-        }
-
-        if (info->lcr_base){
-                iounmap(info->lcr_base - info->lcr_offset);
-                info->lcr_base = NULL;
-        }
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):%s release_resources() exit\n",
-                        __FILE__,__LINE__,info->device_name );
-}
-
-/* Add the specified device instance data structure to the
- * global linked list of devices and increment the device count.
- */
-static void add_device(SLMP_INFO *info)
-{
-        info->next_device = NULL;
-        info->line = synclinkmp_device_count;
-        sprintf(info->device_name,"ttySLM%dp%d",info->adapter_num,info->port_num);
-
-        if (info->line < MAX_DEVICES) {
-                if (maxframe[info->line])
-                        info->max_frame_size = maxframe[info->line];
-        }
-
-        synclinkmp_device_count++;
-
-        if ( !synclinkmp_device_list )
-                synclinkmp_device_list = info;
-        else {
-                SLMP_INFO *current_dev = synclinkmp_device_list;
-                while( current_dev->next_device )
-                        current_dev = current_dev->next_device;
-                current_dev->next_device = info;
-        }
-
-        if ( info->max_frame_size < 4096 )
-                info->max_frame_size = 4096;
-        else if ( info->max_frame_size > 65535 )
-                info->max_frame_size = 65535;
-
-        printk( "SyncLink MultiPort %s: "
-                "Mem=(%08x %08X %08x %08X) IRQ=%d MaxFrameSize=%u\n",
-                info->device_name,
-                info->phys_sca_base,
-                info->phys_memory_base,
-                info->phys_statctrl_base,
-                info->phys_lcr_base,
-                info->irq_level,
-                info->max_frame_size );
-
-#if SYNCLINK_GENERIC_HDLC
-        hdlcdev_init(info);
-#endif
-}
-
-static const struct tty_port_operations port_ops = {
-        .carrier_raised = carrier_raised,
-        .dtr_rts = dtr_rts,
-};
-
-/* Allocate and initialize a device instance structure
- *
- * Return Value:        pointer to SLMP_INFO if success, otherwise NULL
- */
-static SLMP_INFO *alloc_dev(int adapter_num, int port_num, struct pci_dev *pdev)
-{
-        SLMP_INFO *info;
-
-        info = kzalloc(sizeof(SLMP_INFO),
-                 GFP_KERNEL);
-
-        if (!info) {
-                printk("%s(%d) Error can't allocate device instance data for adapter %d, port %d\n",
-                        __FILE__,__LINE__, adapter_num, port_num);
-        } else {
-                tty_port_init(&info->port);
-                info->port.ops = &port_ops;
-                info->magic = MGSL_MAGIC;
-                INIT_WORK(&info->task, bh_handler);
-                info->max_frame_size = 4096;
-                info->port.close_delay = 5*HZ/10;
-                info->port.closing_wait = 30*HZ;
-                init_waitqueue_head(&info->status_event_wait_q);
-                init_waitqueue_head(&info->event_wait_q);
-                spin_lock_init(&info->netlock);
-                memcpy(&info->params,&default_params,sizeof(MGSL_PARAMS));
-                info->idle_mode = HDLC_TXIDLE_FLAGS;
-                info->adapter_num = adapter_num;
-                info->port_num = port_num;
-
-                /* Copy configuration info to device instance data */
-                info->irq_level = pdev->irq;
-                info->phys_lcr_base = pci_resource_start(pdev,0);
-                info->phys_sca_base = pci_resource_start(pdev,2);
-                info->phys_memory_base = pci_resource_start(pdev,3);
-                info->phys_statctrl_base = pci_resource_start(pdev,4);
-
-                /* Because veremap only works on page boundaries we must map
-                 * a larger area than is actually implemented for the LCR
-                 * memory range. We map a full page starting at the page boundary.
-                 */
-                info->lcr_offset    = info->phys_lcr_base & (PAGE_SIZE-1);
-                info->phys_lcr_base &= ~(PAGE_SIZE-1);
-
-                info->sca_offset    = info->phys_sca_base & (PAGE_SIZE-1);
-                info->phys_sca_base &= ~(PAGE_SIZE-1);
-
-                info->statctrl_offset    = info->phys_statctrl_base & (PAGE_SIZE-1);
-                info->phys_statctrl_base &= ~(PAGE_SIZE-1);
-
-                info->bus_type = MGSL_BUS_TYPE_PCI;
-                info->irq_flags = IRQF_SHARED;
-
-                setup_timer(&info->tx_timer, tx_timeout, (unsigned long)info);
-                setup_timer(&info->status_timer, status_timeout,
-                                (unsigned long)info);
-
-                /* Store the PCI9050 misc control register value because a flaw
-                 * in the PCI9050 prevents LCR registers from being read if
-                 * BIOS assigns an LCR base address with bit 7 set.
-                 *
-                 * Only the misc control register is accessed for which only
-                 * write access is needed, so set an initial value and change
-                 * bits to the device instance data as we write the value
-                 * to the actual misc control register.
-                 */
-                info->misc_ctrl_value = 0x087e4546;
-
-                /* initial port state is unknown - if startup errors
-                 * occur, init_error will be set to indicate the
-                 * problem. Once the port is fully initialized,
-                 * this value will be set to 0 to indicate the
-                 * port is available.
-                 */
-                info->init_error = -1;
-        }
-
-        return info;
-}
-
-static void device_init(int adapter_num, struct pci_dev *pdev)
-{
-        SLMP_INFO *port_array[SCA_MAX_PORTS];
-        int port;
-
-        /* allocate device instances for up to SCA_MAX_PORTS devices */
-        for ( port = 0; port < SCA_MAX_PORTS; ++port ) {
-                port_array[port] = alloc_dev(adapter_num,port,pdev);
-                if( port_array[port] == NULL ) {
-                        for ( --port; port >= 0; --port )
-                                kfree(port_array[port]);
-                        return;
-                }
-        }
-
-        /* give copy of port_array to all ports and add to device list  */
-        for ( port = 0; port < SCA_MAX_PORTS; ++port ) {
-                memcpy(port_array[port]->port_array,port_array,sizeof(port_array));
-                add_device( port_array[port] );
-                spin_lock_init(&port_array[port]->lock);
-        }
-
-        /* Allocate and claim adapter resources */
-        if ( !claim_resources(port_array[0]) ) {
-
-                alloc_dma_bufs(port_array[0]);
-
-                /* copy resource information from first port to others */
-                for ( port = 1; port < SCA_MAX_PORTS; ++port ) {
-                        port_array[port]->lock  = port_array[0]->lock;
-                        port_array[port]->irq_level     = port_array[0]->irq_level;
-                        port_array[port]->memory_base   = port_array[0]->memory_base;
-                        port_array[port]->sca_base      = port_array[0]->sca_base;
-                        port_array[port]->statctrl_base = port_array[0]->statctrl_base;
-                        port_array[port]->lcr_base      = port_array[0]->lcr_base;
-                        alloc_dma_bufs(port_array[port]);
-                }
-
-                if ( request_irq(port_array[0]->irq_level,
-                                        synclinkmp_interrupt,
-                                        port_array[0]->irq_flags,
-                                        port_array[0]->device_name,
-                                        port_array[0]) < 0 ) {
-                        printk( "%s(%d):%s Cant request interrupt, IRQ=%d\n",
-                                __FILE__,__LINE__,
-                                port_array[0]->device_name,
-                                port_array[0]->irq_level );
-                }
-                else {
-                        port_array[0]->irq_requested = true;
-                        adapter_test(port_array[0]);
-                }
-        }
-}
-
-static const struct tty_operations ops = {
-        .open = open,
-        .close = close,
-        .write = write,
-        .put_char = put_char,
-        .flush_chars = flush_chars,
-        .write_room = write_room,
-        .chars_in_buffer = chars_in_buffer,
-        .flush_buffer = flush_buffer,
-        .ioctl = ioctl,
-        .throttle = throttle,
-        .unthrottle = unthrottle,
-        .send_xchar = send_xchar,
-        .break_ctl = set_break,
-        .wait_until_sent = wait_until_sent,
-        .set_termios = set_termios,
-        .stop = tx_hold,
-        .start = tx_release,
-        .hangup = hangup,
-        .tiocmget = tiocmget,
-        .tiocmset = tiocmset,
-        .proc_fops = &synclinkmp_proc_fops,
-};
-
-
-static void synclinkmp_cleanup(void)
-{
-        int rc;
-        SLMP_INFO *info;
-        SLMP_INFO *tmp;
-
-        printk("Unloading %s %s\n", driver_name, driver_version);
-
-        if (serial_driver) {
-                if ((rc = tty_unregister_driver(serial_driver)))
-                        printk("%s(%d) failed to unregister tty driver err=%d\n",
-                               __FILE__,__LINE__,rc);
-                put_tty_driver(serial_driver);
-        }
-
-        /* reset devices */
-        info = synclinkmp_device_list;
-        while(info) {
-                reset_port(info);
-                info = info->next_device;
-        }
-
-        /* release devices */
-        info = synclinkmp_device_list;
-        while(info) {
-#if SYNCLINK_GENERIC_HDLC
-                hdlcdev_exit(info);
-#endif
-                free_dma_bufs(info);
-                free_tmp_rx_buf(info);
-                if ( info->port_num == 0 ) {
-                        if (info->sca_base)
-                                write_reg(info, LPR, 1); /* set low power mode */
-                        release_resources(info);
-                }
-                tmp = info;
-                info = info->next_device;
-                kfree(tmp);
-        }
-
-        pci_unregister_driver(&synclinkmp_pci_driver);
-}
-
-/* Driver initialization entry point.
- */
-
-static int __init synclinkmp_init(void)
-{
-        int rc;
-
-        if (break_on_load) {
-                synclinkmp_get_text_ptr();
-                BREAKPOINT();
-        }
-
-        printk("%s %s\n", driver_name, driver_version);
-
-        if ((rc = pci_register_driver(&synclinkmp_pci_driver)) < 0) {
-                printk("%s:failed to register PCI driver, error=%d\n",__FILE__,rc);
-                return rc;
-        }
-
-        serial_driver = alloc_tty_driver(128);
-        if (!serial_driver) {
-                rc = -ENOMEM;
-                goto error;
-        }
-
-        /* Initialize the tty_driver structure */
-
-        serial_driver->owner = THIS_MODULE;
-        serial_driver->driver_name = "synclinkmp";
-        serial_driver->name = "ttySLM";
-        serial_driver->major = ttymajor;
-        serial_driver->minor_start = 64;
-        serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        serial_driver->subtype = SERIAL_TYPE_NORMAL;
-        serial_driver->init_termios = tty_std_termios;
-        serial_driver->init_termios.c_cflag =
-                B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        serial_driver->init_termios.c_ispeed = 9600;
-        serial_driver->init_termios.c_ospeed = 9600;
-        serial_driver->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(serial_driver, &ops);
-        if ((rc = tty_register_driver(serial_driver)) < 0) {
-                printk("%s(%d):Couldn't register serial driver\n",
-                        __FILE__,__LINE__);
-                put_tty_driver(serial_driver);
-                serial_driver = NULL;
-                goto error;
-        }
-
-        printk("%s %s, tty major#%d\n",
-                driver_name, driver_version,
-                serial_driver->major);
-
-        return 0;
-
-error:
-        synclinkmp_cleanup();
-        return rc;
-}
-
-static void __exit synclinkmp_exit(void)
-{
-        synclinkmp_cleanup();
-}
-
-module_init(synclinkmp_init);
-module_exit(synclinkmp_exit);
-
-/* Set the port for internal loopback mode.
- * The TxCLK and RxCLK signals are generated from the BRG and
- * the TxD is looped back to the RxD internally.
- */
-static void enable_loopback(SLMP_INFO *info, int enable)
-{
-        if (enable) {
-                /* MD2 (Mode Register 2)
-                 * 01..00  CNCT<1..0> Channel Connection 11=Local Loopback
-                 */
-                write_reg(info, MD2, (unsigned char)(read_reg(info, MD2) | (BIT1 + BIT0)));
-
-                /* degate external TxC clock source */
-                info->port_array[0]->ctrlreg_value |= (BIT0 << (info->port_num * 2));
-                write_control_reg(info);
-
-                /* RXS/TXS (Rx/Tx clock source)
-                 * 07      Reserved, must be 0
-                 * 06..04  Clock Source, 100=BRG
-                 * 03..00  Clock Divisor, 0000=1
-                 */
-                write_reg(info, RXS, 0x40);
-                write_reg(info, TXS, 0x40);
-
-        } else {
-                /* MD2 (Mode Register 2)
-                 * 01..00  CNCT<1..0> Channel connection, 0=normal
-                 */
-                write_reg(info, MD2, (unsigned char)(read_reg(info, MD2) & ~(BIT1 + BIT0)));
-
-                /* RXS/TXS (Rx/Tx clock source)
-                 * 07      Reserved, must be 0
-                 * 06..04  Clock Source, 000=RxC/TxC Pin
-                 * 03..00  Clock Divisor, 0000=1
-                 */
-                write_reg(info, RXS, 0x00);
-                write_reg(info, TXS, 0x00);
-        }
-
-        /* set LinkSpeed if available, otherwise default to 2Mbps */
-        if (info->params.clock_speed)
-                set_rate(info, info->params.clock_speed);
-        else
-                set_rate(info, 3686400);
-}
-
-/* Set the baud rate register to the desired speed
- *
- *      data_rate       data rate of clock in bits per second
- *                      A data rate of 0 disables the AUX clock.
- */
-static void set_rate( SLMP_INFO *info, u32 data_rate )
-{
-        u32 TMCValue;
-        unsigned char BRValue;
-        u32 Divisor=0;
-
-        /* fBRG = fCLK/(TMC * 2^BR)
-         */
-        if (data_rate != 0) {
-                Divisor = 14745600/data_rate;
-                if (!Divisor)
-                        Divisor = 1;
-
-                TMCValue = Divisor;
-
-                BRValue = 0;
-                if (TMCValue != 1 && TMCValue != 2) {
-                        /* BRValue of 0 provides 50/50 duty cycle *only* when
-                         * TMCValue is 1 or 2. BRValue of 1 to 9 always provides
-                         * 50/50 duty cycle.
-                         */
-                        BRValue = 1;
-                        TMCValue >>= 1;
-                }
-
-                /* while TMCValue is too big for TMC register, divide
-                 * by 2 and increment BR exponent.
-                 */
-                for(; TMCValue > 256 && BRValue < 10; BRValue++)
-                        TMCValue >>= 1;
-
-                write_reg(info, TXS,
-                        (unsigned char)((read_reg(info, TXS) & 0xf0) | BRValue));
-                write_reg(info, RXS,
-                        (unsigned char)((read_reg(info, RXS) & 0xf0) | BRValue));
-                write_reg(info, TMC, (unsigned char)TMCValue);
-        }
-        else {
-                write_reg(info, TXS,0);
-                write_reg(info, RXS,0);
-                write_reg(info, TMC, 0);
-        }
-}
-
-/* Disable receiver
- */
-static void rx_stop(SLMP_INFO *info)
-{
-        if (debug_level >= DEBUG_LEVEL_ISR)
-                printk("%s(%d):%s rx_stop()\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        write_reg(info, CMD, RXRESET);
-
-        info->ie0_value &= ~RXRDYE;
-        write_reg(info, IE0, info->ie0_value);  /* disable Rx data interrupts */
-
-        write_reg(info, RXDMA + DSR, 0);        /* disable Rx DMA */
-        write_reg(info, RXDMA + DCMD, SWABORT); /* reset/init Rx DMA */
-        write_reg(info, RXDMA + DIR, 0);        /* disable Rx DMA interrupts */
-
-        info->rx_enabled = false;
-        info->rx_overflow = false;
-}
-
-/* enable the receiver
- */
-static void rx_start(SLMP_INFO *info)
-{
-        int i;
-
-        if (debug_level >= DEBUG_LEVEL_ISR)
-                printk("%s(%d):%s rx_start()\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        write_reg(info, CMD, RXRESET);
-
-        if ( info->params.mode == MGSL_MODE_HDLC ) {
-                /* HDLC, disabe IRQ on rxdata */
-                info->ie0_value &= ~RXRDYE;
-                write_reg(info, IE0, info->ie0_value);
-
-                /* Reset all Rx DMA buffers and program rx dma */
-                write_reg(info, RXDMA + DSR, 0);                /* disable Rx DMA */
-                write_reg(info, RXDMA + DCMD, SWABORT); /* reset/init Rx DMA */
-
-                for (i = 0; i < info->rx_buf_count; i++) {
-                        info->rx_buf_list[i].status = 0xff;
-
-                        // throttle to 4 shared memory writes at a time to prevent
-                        // hogging local bus (keep latency time for DMA requests low).
-                        if (!(i % 4))
-                                read_status_reg(info);
-                }
-                info->current_rx_buf = 0;
-
-                /* set current/1st descriptor address */
-                write_reg16(info, RXDMA + CDA,
-                        info->rx_buf_list_ex[0].phys_entry);
-
-                /* set new last rx descriptor address */
-                write_reg16(info, RXDMA + EDA,
-                        info->rx_buf_list_ex[info->rx_buf_count - 1].phys_entry);
-
-                /* set buffer length (shared by all rx dma data buffers) */
-                write_reg16(info, RXDMA + BFL, SCABUFSIZE);
-
-                write_reg(info, RXDMA + DIR, 0x60);     /* enable Rx DMA interrupts (EOM/BOF) */
-                write_reg(info, RXDMA + DSR, 0xf2);     /* clear Rx DMA IRQs, enable Rx DMA */
-        } else {
-                /* async, enable IRQ on rxdata */
-                info->ie0_value |= RXRDYE;
-                write_reg(info, IE0, info->ie0_value);
-        }
-
-        write_reg(info, CMD, RXENABLE);
-
-        info->rx_overflow = false;
-        info->rx_enabled = true;
-}
-
-/* Enable the transmitter and send a transmit frame if
- * one is loaded in the DMA buffers.
- */
-static void tx_start(SLMP_INFO *info)
-{
-        if (debug_level >= DEBUG_LEVEL_ISR)
-                printk("%s(%d):%s tx_start() tx_count=%d\n",
-                         __FILE__,__LINE__, info->device_name,info->tx_count );
-
-        if (!info->tx_enabled ) {
-                write_reg(info, CMD, TXRESET);
-                write_reg(info, CMD, TXENABLE);
-                info->tx_enabled = true;
-        }
-
-        if ( info->tx_count ) {
-
-                /* If auto RTS enabled and RTS is inactive, then assert */
-                /* RTS and set a flag indicating that the driver should */
-                /* negate RTS when the transmission completes. */
-
-                info->drop_rts_on_tx_done = false;
-
-                if (info->params.mode != MGSL_MODE_ASYNC) {
-
-                        if ( info->params.flags & HDLC_FLAG_AUTO_RTS ) {
-                                get_signals( info );
-                                if ( !(info->serial_signals & SerialSignal_RTS) ) {
-                                        info->serial_signals |= SerialSignal_RTS;
-                                        set_signals( info );
-                                        info->drop_rts_on_tx_done = true;
-                                }
-                        }
-
-                        write_reg16(info, TRC0,
-                                (unsigned short)(((tx_negate_fifo_level-1)<<8) + tx_active_fifo_level));
-
-                        write_reg(info, TXDMA + DSR, 0);                /* disable DMA channel */
-                        write_reg(info, TXDMA + DCMD, SWABORT); /* reset/init DMA channel */
-        
-                        /* set TX CDA (current descriptor address) */
-                        write_reg16(info, TXDMA + CDA,
-                                info->tx_buf_list_ex[0].phys_entry);
-        
-                        /* set TX EDA (last descriptor address) */
-                        write_reg16(info, TXDMA + EDA,
-                                info->tx_buf_list_ex[info->last_tx_buf].phys_entry);
-        
-                        /* enable underrun IRQ */
-                        info->ie1_value &= ~IDLE;
-                        info->ie1_value |= UDRN;
-                        write_reg(info, IE1, info->ie1_value);
-                        write_reg(info, SR1, (unsigned char)(IDLE + UDRN));
-        
-                        write_reg(info, TXDMA + DIR, 0x40);             /* enable Tx DMA interrupts (EOM) */
-                        write_reg(info, TXDMA + DSR, 0xf2);             /* clear Tx DMA IRQs, enable Tx DMA */
-        
-                        mod_timer(&info->tx_timer, jiffies +
-                                        msecs_to_jiffies(5000));
-                }
-                else {
-                        tx_load_fifo(info);
-                        /* async, enable IRQ on txdata */
-                        info->ie0_value |= TXRDYE;
-                        write_reg(info, IE0, info->ie0_value);
-                }
-
-                info->tx_active = true;
-        }
-}
-
-/* stop the transmitter and DMA
- */
-static void tx_stop( SLMP_INFO *info )
-{
-        if (debug_level >= DEBUG_LEVEL_ISR)
-                printk("%s(%d):%s tx_stop()\n",
-                         __FILE__,__LINE__, info->device_name );
-
-        del_timer(&info->tx_timer);
-
-        write_reg(info, TXDMA + DSR, 0);                /* disable DMA channel */
-        write_reg(info, TXDMA + DCMD, SWABORT); /* reset/init DMA channel */
-
-        write_reg(info, CMD, TXRESET);
-
-        info->ie1_value &= ~(UDRN + IDLE);
-        write_reg(info, IE1, info->ie1_value);  /* disable tx status interrupts */
-        write_reg(info, SR1, (unsigned char)(IDLE + UDRN));     /* clear pending */
-
-        info->ie0_value &= ~TXRDYE;
-        write_reg(info, IE0, info->ie0_value);  /* disable tx data interrupts */
-
-        info->tx_enabled = false;
-        info->tx_active = false;
-}
-
-/* Fill the transmit FIFO until the FIFO is full or
- * there is no more data to load.
- */
-static void tx_load_fifo(SLMP_INFO *info)
-{
-        u8 TwoBytes[2];
-
-        /* do nothing is now tx data available and no XON/XOFF pending */
-
-        if ( !info->tx_count && !info->x_char )
-                return;
-
-        /* load the Transmit FIFO until FIFOs full or all data sent */
-
-        while( info->tx_count && (read_reg(info,SR0) & BIT1) ) {
-
-                /* there is more space in the transmit FIFO and */
-                /* there is more data in transmit buffer */
-
-                if ( (info->tx_count > 1) && !info->x_char ) {
-                        /* write 16-bits */
-                        TwoBytes[0] = info->tx_buf[info->tx_get++];
-                        if (info->tx_get >= info->max_frame_size)
-                                info->tx_get -= info->max_frame_size;
-                        TwoBytes[1] = info->tx_buf[info->tx_get++];
-                        if (info->tx_get >= info->max_frame_size)
-                                info->tx_get -= info->max_frame_size;
-
-                        write_reg16(info, TRB, *((u16 *)TwoBytes));
-
-                        info->tx_count -= 2;
-                        info->icount.tx += 2;
-                } else {
-                        /* only 1 byte left to transmit or 1 FIFO slot left */
-
-                        if (info->x_char) {
-                                /* transmit pending high priority char */
-                                write_reg(info, TRB, info->x_char);
-                                info->x_char = 0;
-                        } else {
-                                write_reg(info, TRB, info->tx_buf[info->tx_get++]);
-                                if (info->tx_get >= info->max_frame_size)
-                                        info->tx_get -= info->max_frame_size;
-                                info->tx_count--;
-                        }
-                        info->icount.tx++;
-                }
-        }
-}
-
-/* Reset a port to a known state
- */
-static void reset_port(SLMP_INFO *info)
-{
-        if (info->sca_base) {
-
-                tx_stop(info);
-                rx_stop(info);
-
-                info->serial_signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
-                set_signals(info);
-
-                /* disable all port interrupts */
-                info->ie0_value = 0;
-                info->ie1_value = 0;
-                info->ie2_value = 0;
-                write_reg(info, IE0, info->ie0_value);
-                write_reg(info, IE1, info->ie1_value);
-                write_reg(info, IE2, info->ie2_value);
-
-                write_reg(info, CMD, CHRESET);
-        }
-}
-
-/* Reset all the ports to a known state.
- */
-static void reset_adapter(SLMP_INFO *info)
-{
-        int i;
-
-        for ( i=0; i < SCA_MAX_PORTS; ++i) {
-                if (info->port_array[i])
-                        reset_port(info->port_array[i]);
-        }
-}
-
-/* Program port for asynchronous communications.
- */
-static void async_mode(SLMP_INFO *info)
-{
-
-        unsigned char RegValue;
-
-        tx_stop(info);
-        rx_stop(info);
-
-        /* MD0, Mode Register 0
-         *
-         * 07..05  PRCTL<2..0>, Protocol Mode, 000=async
-         * 04      AUTO, Auto-enable (RTS/CTS/DCD)
-         * 03      Reserved, must be 0
-         * 02      CRCCC, CRC Calculation, 0=disabled
-         * 01..00  STOP<1..0> Stop bits (00=1,10=2)
-         *
-         * 0000 0000
-         */
-        RegValue = 0x00;
-        if (info->params.stop_bits != 1)
-                RegValue |= BIT1;
-        write_reg(info, MD0, RegValue);
-
-        /* MD1, Mode Register 1
-         *
-         * 07..06  BRATE<1..0>, bit rate, 00=1/1 01=1/16 10=1/32 11=1/64
-         * 05..04  TXCHR<1..0>, tx char size, 00=8 bits,01=7,10=6,11=5
-         * 03..02  RXCHR<1..0>, rx char size
-         * 01..00  PMPM<1..0>, Parity mode, 00=none 10=even 11=odd
-         *
-         * 0100 0000
-         */
-        RegValue = 0x40;
-        switch (info->params.data_bits) {
-        case 7: RegValue |= BIT4 + BIT2; break;
-        case 6: RegValue |= BIT5 + BIT3; break;
-        case 5: RegValue |= BIT5 + BIT4 + BIT3 + BIT2; break;
-        }
-        if (info->params.parity != ASYNC_PARITY_NONE) {
-                RegValue |= BIT1;
-                if (info->params.parity == ASYNC_PARITY_ODD)
-                        RegValue |= BIT0;
-        }
-        write_reg(info, MD1, RegValue);
-
-        /* MD2, Mode Register 2
-         *
-         * 07..02  Reserved, must be 0
-         * 01..00  CNCT<1..0> Channel connection, 00=normal 11=local loopback
-         *
-         * 0000 0000
-         */
-        RegValue = 0x00;
-        if (info->params.loopback)
-                RegValue |= (BIT1 + BIT0);
-        write_reg(info, MD2, RegValue);
-
-        /* RXS, Receive clock source
-         *
-         * 07      Reserved, must be 0
-         * 06..04  RXCS<2..0>, clock source, 000=RxC Pin, 100=BRG, 110=DPLL
-         * 03..00  RXBR<3..0>, rate divisor, 0000=1
-         */
-        RegValue=BIT6;
-        write_reg(info, RXS, RegValue);
-
-        /* TXS, Transmit clock source
-         *
-         * 07      Reserved, must be 0
-         * 06..04  RXCS<2..0>, clock source, 000=TxC Pin, 100=BRG, 110=Receive Clock
-         * 03..00  RXBR<3..0>, rate divisor, 0000=1
-         */
-        RegValue=BIT6;
-        write_reg(info, TXS, RegValue);
-
-        /* Control Register
-         *
-         * 6,4,2,0  CLKSEL<3..0>, 0 = TcCLK in, 1 = Auxclk out
-         */
-        info->port_array[0]->ctrlreg_value |= (BIT0 << (info->port_num * 2));
-        write_control_reg(info);
-
-        tx_set_idle(info);
-
-        /* RRC Receive Ready Control 0
-         *
-         * 07..05  Reserved, must be 0
-         * 04..00  RRC<4..0> Rx FIFO trigger active 0x00 = 1 byte
-         */
-        write_reg(info, RRC, 0x00);
-
-        /* TRC0 Transmit Ready Control 0
-         *
-         * 07..05  Reserved, must be 0
-         * 04..00  TRC<4..0> Tx FIFO trigger active 0x10 = 16 bytes
-         */
-        write_reg(info, TRC0, 0x10);
-
-        /* TRC1 Transmit Ready Control 1
-         *
-         * 07..05  Reserved, must be 0
-         * 04..00  TRC<4..0> Tx FIFO trigger inactive 0x1e = 31 bytes (full-1)
-         */
-        write_reg(info, TRC1, 0x1e);
-
-        /* CTL, MSCI control register
-         *
-         * 07..06  Reserved, set to 0
-         * 05      UDRNC, underrun control, 0=abort 1=CRC+flag (HDLC/BSC)
-         * 04      IDLC, idle control, 0=mark 1=idle register
-         * 03      BRK, break, 0=off 1 =on (async)
-         * 02      SYNCLD, sync char load enable (BSC) 1=enabled
-         * 01      GOP, go active on poll (LOOP mode) 1=enabled
-         * 00      RTS, RTS output control, 0=active 1=inactive
-         *
-         * 0001 0001
-         */
-        RegValue = 0x10;
-        if (!(info->serial_signals & SerialSignal_RTS))
-                RegValue |= 0x01;
-        write_reg(info, CTL, RegValue);
-
-        /* enable status interrupts */
-        info->ie0_value |= TXINTE + RXINTE;
-        write_reg(info, IE0, info->ie0_value);
-
-        /* enable break detect interrupt */
-        info->ie1_value = BRKD;
-        write_reg(info, IE1, info->ie1_value);
-
-        /* enable rx overrun interrupt */
-        info->ie2_value = OVRN;
-        write_reg(info, IE2, info->ie2_value);
-
-        set_rate( info, info->params.data_rate * 16 );
-}
-
-/* Program the SCA for HDLC communications.
- */
-static void hdlc_mode(SLMP_INFO *info)
-{
-        unsigned char RegValue;
-        u32 DpllDivisor;
-
-        // Can't use DPLL because SCA outputs recovered clock on RxC when
-        // DPLL mode selected. This causes output contention with RxC receiver.
-        // Use of DPLL would require external hardware to disable RxC receiver
-        // when DPLL mode selected.
-        info->params.flags &= ~(HDLC_FLAG_TXC_DPLL + HDLC_FLAG_RXC_DPLL);
-
-        /* disable DMA interrupts */
-        write_reg(info, TXDMA + DIR, 0);
-        write_reg(info, RXDMA + DIR, 0);
-
-        /* MD0, Mode Register 0
-         *
-         * 07..05  PRCTL<2..0>, Protocol Mode, 100=HDLC
-         * 04      AUTO, Auto-enable (RTS/CTS/DCD)
-         * 03      Reserved, must be 0
-         * 02      CRCCC, CRC Calculation, 1=enabled
-         * 01      CRC1, CRC selection, 0=CRC-16,1=CRC-CCITT-16
-         * 00      CRC0, CRC initial value, 1 = all 1s
-         *
-         * 1000 0001
-         */
-        RegValue = 0x81;
-        if (info->params.flags & HDLC_FLAG_AUTO_CTS)
-                RegValue |= BIT4;
-        if (info->params.flags & HDLC_FLAG_AUTO_DCD)
-                RegValue |= BIT4;
-        if (info->params.crc_type == HDLC_CRC_16_CCITT)
-                RegValue |= BIT2 + BIT1;
-        write_reg(info, MD0, RegValue);
-
-        /* MD1, Mode Register 1
-         *
-         * 07..06  ADDRS<1..0>, Address detect, 00=no addr check
-         * 05..04  TXCHR<1..0>, tx char size, 00=8 bits
-         * 03..02  RXCHR<1..0>, rx char size, 00=8 bits
-         * 01..00  PMPM<1..0>, Parity mode, 00=no parity
-         *
-         * 0000 0000
-         */
-        RegValue = 0x00;
-        write_reg(info, MD1, RegValue);
-
-        /* MD2, Mode Register 2
-         *
-         * 07      NRZFM, 0=NRZ, 1=FM
-         * 06..05  CODE<1..0> Encoding, 00=NRZ
-         * 04..03  DRATE<1..0> DPLL Divisor, 00=8
-         * 02      Reserved, must be 0
-         * 01..00  CNCT<1..0> Channel connection, 0=normal
-         *
-         * 0000 0000
-         */
-        RegValue = 0x00;
-        switch(info->params.encoding) {
-        case HDLC_ENCODING_NRZI:          RegValue |= BIT5; break;
-        case HDLC_ENCODING_BIPHASE_MARK:  RegValue |= BIT7 + BIT5; break; /* aka FM1 */
-        case HDLC_ENCODING_BIPHASE_SPACE: RegValue |= BIT7 + BIT6; break; /* aka FM0 */
-        case HDLC_ENCODING_BIPHASE_LEVEL: RegValue |= BIT7; break;      /* aka Manchester */
-#if 0
-        case HDLC_ENCODING_NRZB:                                        /* not supported */
-        case HDLC_ENCODING_NRZI_MARK:                                   /* not supported */
-        case HDLC_ENCODING_DIFF_BIPHASE_LEVEL:                          /* not supported */
-#endif
-        }
-        if ( info->params.flags & HDLC_FLAG_DPLL_DIV16 ) {
-                DpllDivisor = 16;
-                RegValue |= BIT3;
-        } else if ( info->params.flags & HDLC_FLAG_DPLL_DIV8 ) {
-                DpllDivisor = 8;
-        } else {
-                DpllDivisor = 32;
-                RegValue |= BIT4;
-        }
-        write_reg(info, MD2, RegValue);
-
-
-        /* RXS, Receive clock source
-         *
-         * 07      Reserved, must be 0
-         * 06..04  RXCS<2..0>, clock source, 000=RxC Pin, 100=BRG, 110=DPLL
-         * 03..00  RXBR<3..0>, rate divisor, 0000=1
-         */
-        RegValue=0;
-        if (info->params.flags & HDLC_FLAG_RXC_BRG)
-                RegValue |= BIT6;
-        if (info->params.flags & HDLC_FLAG_RXC_DPLL)
-                RegValue |= BIT6 + BIT5;
-        write_reg(info, RXS, RegValue);
-
-        /* TXS, Transmit clock source
-         *
-         * 07      Reserved, must be 0
-         * 06..04  RXCS<2..0>, clock source, 000=TxC Pin, 100=BRG, 110=Receive Clock
-         * 03..00  RXBR<3..0>, rate divisor, 0000=1
-         */
-        RegValue=0;
-        if (info->params.flags & HDLC_FLAG_TXC_BRG)
-                RegValue |= BIT6;
-        if (info->params.flags & HDLC_FLAG_TXC_DPLL)
-                RegValue |= BIT6 + BIT5;
-        write_reg(info, TXS, RegValue);
-
-        if (info->params.flags & HDLC_FLAG_RXC_DPLL)
-                set_rate(info, info->params.clock_speed * DpllDivisor);
-        else
-                set_rate(info, info->params.clock_speed);
-
-        /* GPDATA (General Purpose I/O Data Register)
-         *
-         * 6,4,2,0  CLKSEL<3..0>, 0 = TcCLK in, 1 = Auxclk out
-         */
-        if (info->params.flags & HDLC_FLAG_TXC_BRG)
-                info->port_array[0]->ctrlreg_value |= (BIT0 << (info->port_num * 2));
-        else
-                info->port_array[0]->ctrlreg_value &= ~(BIT0 << (info->port_num * 2));
-        write_control_reg(info);
-
-        /* RRC Receive Ready Control 0
-         *
-         * 07..05  Reserved, must be 0
-         * 04..00  RRC<4..0> Rx FIFO trigger active
-         */
-        write_reg(info, RRC, rx_active_fifo_level);
-
-        /* TRC0 Transmit Ready Control 0
-         *
-         * 07..05  Reserved, must be 0
-         * 04..00  TRC<4..0> Tx FIFO trigger active
-         */
-        write_reg(info, TRC0, tx_active_fifo_level);
-
-        /* TRC1 Transmit Ready Control 1
-         *
-         * 07..05  Reserved, must be 0
-         * 04..00  TRC<4..0> Tx FIFO trigger inactive 0x1f = 32 bytes (full)
-         */
-        write_reg(info, TRC1, (unsigned char)(tx_negate_fifo_level - 1));
-
-        /* DMR, DMA Mode Register
-         *
-         * 07..05  Reserved, must be 0
-         * 04      TMOD, Transfer Mode: 1=chained-block
-         * 03      Reserved, must be 0
-         * 02      NF, Number of Frames: 1=multi-frame
-         * 01      CNTE, Frame End IRQ Counter enable: 0=disabled
-         * 00      Reserved, must be 0
-         *
-         * 0001 0100
-         */
-        write_reg(info, TXDMA + DMR, 0x14);
-        write_reg(info, RXDMA + DMR, 0x14);
-
-        /* Set chain pointer base (upper 8 bits of 24 bit addr) */
-        write_reg(info, RXDMA + CPB,
-                (unsigned char)(info->buffer_list_phys >> 16));
-
-        /* Set chain pointer base (upper 8 bits of 24 bit addr) */
-        write_reg(info, TXDMA + CPB,
-                (unsigned char)(info->buffer_list_phys >> 16));
-
-        /* enable status interrupts. other code enables/disables
-         * the individual sources for these two interrupt classes.
-         */
-        info->ie0_value |= TXINTE + RXINTE;
-        write_reg(info, IE0, info->ie0_value);
-
-        /* CTL, MSCI control register
-         *
-         * 07..06  Reserved, set to 0
-         * 05      UDRNC, underrun control, 0=abort 1=CRC+flag (HDLC/BSC)
-         * 04      IDLC, idle control, 0=mark 1=idle register
-         * 03      BRK, break, 0=off 1 =on (async)
-         * 02      SYNCLD, sync char load enable (BSC) 1=enabled
-         * 01      GOP, go active on poll (LOOP mode) 1=enabled
-         * 00      RTS, RTS output control, 0=active 1=inactive
-         *
-         * 0001 0001
-         */
-        RegValue = 0x10;
-        if (!(info->serial_signals & SerialSignal_RTS))
-                RegValue |= 0x01;
-        write_reg(info, CTL, RegValue);
-
-        /* preamble not supported ! */
-
-        tx_set_idle(info);
-        tx_stop(info);
-        rx_stop(info);
-
-        set_rate(info, info->params.clock_speed);
-
-        if (info->params.loopback)
-                enable_loopback(info,1);
-}
-
-/* Set the transmit HDLC idle mode
- */
-static void tx_set_idle(SLMP_INFO *info)
-{
-        unsigned char RegValue = 0xff;
-
-        /* Map API idle mode to SCA register bits */
-        switch(info->idle_mode) {
-        case HDLC_TXIDLE_FLAGS:                 RegValue = 0x7e; break;
-        case HDLC_TXIDLE_ALT_ZEROS_ONES:        RegValue = 0xaa; break;
-        case HDLC_TXIDLE_ZEROS:                 RegValue = 0x00; break;
-        case HDLC_TXIDLE_ONES:                  RegValue = 0xff; break;
-        case HDLC_TXIDLE_ALT_MARK_SPACE:        RegValue = 0xaa; break;
-        case HDLC_TXIDLE_SPACE:                 RegValue = 0x00; break;
-        case HDLC_TXIDLE_MARK:                  RegValue = 0xff; break;
-        }
-
-        write_reg(info, IDL, RegValue);
-}
-
-/* Query the adapter for the state of the V24 status (input) signals.
- */
-static void get_signals(SLMP_INFO *info)
-{
-        u16 status = read_reg(info, SR3);
-        u16 gpstatus = read_status_reg(info);
-        u16 testbit;
-
-        /* clear all serial signals except DTR and RTS */
-        info->serial_signals &= SerialSignal_DTR + SerialSignal_RTS;
-
-        /* set serial signal bits to reflect MISR */
-
-        if (!(status & BIT3))
-                info->serial_signals |= SerialSignal_CTS;
-
-        if ( !(status & BIT2))
-                info->serial_signals |= SerialSignal_DCD;
-
-        testbit = BIT1 << (info->port_num * 2); // Port 0..3 RI is GPDATA<1,3,5,7>
-        if (!(gpstatus & testbit))
-                info->serial_signals |= SerialSignal_RI;
-
-        testbit = BIT0 << (info->port_num * 2); // Port 0..3 DSR is GPDATA<0,2,4,6>
-        if (!(gpstatus & testbit))
-                info->serial_signals |= SerialSignal_DSR;
-}
-
-/* Set the state of DTR and RTS based on contents of
- * serial_signals member of device context.
- */
-static void set_signals(SLMP_INFO *info)
-{
-        unsigned char RegValue;
-        u16 EnableBit;
-
-        RegValue = read_reg(info, CTL);
-        if (info->serial_signals & SerialSignal_RTS)
-                RegValue &= ~BIT0;
-        else
-                RegValue |= BIT0;
-        write_reg(info, CTL, RegValue);
-
-        // Port 0..3 DTR is ctrl reg <1,3,5,7>
-        EnableBit = BIT1 << (info->port_num*2);
-        if (info->serial_signals & SerialSignal_DTR)
-                info->port_array[0]->ctrlreg_value &= ~EnableBit;
-        else
-                info->port_array[0]->ctrlreg_value |= EnableBit;
-        write_control_reg(info);
-}
-
-/*******************/
-/* DMA Buffer Code */
-/*******************/
-
-/* Set the count for all receive buffers to SCABUFSIZE
- * and set the current buffer to the first buffer. This effectively
- * makes all buffers free and discards any data in buffers.
- */
-static void rx_reset_buffers(SLMP_INFO *info)
-{
-        rx_free_frame_buffers(info, 0, info->rx_buf_count - 1);
-}
-
-/* Free the buffers used by a received frame
- *
- * info   pointer to device instance data
- * first  index of 1st receive buffer of frame
- * last   index of last receive buffer of frame
- */
-static void rx_free_frame_buffers(SLMP_INFO *info, unsigned int first, unsigned int last)
-{
-        bool done = false;
-
-        while(!done) {
-                /* reset current buffer for reuse */
-                info->rx_buf_list[first].status = 0xff;
-
-                if (first == last) {
-                        done = true;
-                        /* set new last rx descriptor address */
-                        write_reg16(info, RXDMA + EDA, info->rx_buf_list_ex[first].phys_entry);
-                }
-
-                first++;
-                if (first == info->rx_buf_count)
-                        first = 0;
-        }
-
-        /* set current buffer to next buffer after last buffer of frame */
-        info->current_rx_buf = first;
-}
-
-/* Return a received frame from the receive DMA buffers.
- * Only frames received without errors are returned.
- *
- * Return Value:        true if frame returned, otherwise false
- */
-static bool rx_get_frame(SLMP_INFO *info)
-{
-        unsigned int StartIndex, EndIndex;      /* index of 1st and last buffers of Rx frame */
-        unsigned short status;
-        unsigned int framesize = 0;
-        bool ReturnCode = false;
-        unsigned long flags;
-        struct tty_struct *tty = info->port.tty;
-        unsigned char addr_field = 0xff;
-        SCADESC *desc;
-        SCADESC_EX *desc_ex;
-
-CheckAgain:
-        /* assume no frame returned, set zero length */
-        framesize = 0;
-        addr_field = 0xff;
-
-        /*
-         * current_rx_buf points to the 1st buffer of the next available
-         * receive frame. To find the last buffer of the frame look for
-         * a non-zero status field in the buffer entries. (The status
-         * field is set by the 16C32 after completing a receive frame.
-         */
-        StartIndex = EndIndex = info->current_rx_buf;
-
-        for ( ;; ) {
-                desc = &info->rx_buf_list[EndIndex];
-                desc_ex = &info->rx_buf_list_ex[EndIndex];
-
-                if (desc->status == 0xff)
-                        goto Cleanup;   /* current desc still in use, no frames available */
-
-                if (framesize == 0 && info->params.addr_filter != 0xff)
-                        addr_field = desc_ex->virt_addr[0];
-
-                framesize += desc->length;
-
-                /* Status != 0 means last buffer of frame */
-                if (desc->status)
-                        break;
-
-                EndIndex++;
-                if (EndIndex == info->rx_buf_count)
-                        EndIndex = 0;
-
-                if (EndIndex == info->current_rx_buf) {
-                        /* all buffers have been 'used' but none mark      */
-                        /* the end of a frame. Reset buffers and receiver. */
-                        if ( info->rx_enabled ){
-                                spin_lock_irqsave(&info->lock,flags);
-                                rx_start(info);
-                                spin_unlock_irqrestore(&info->lock,flags);
-                        }
-                        goto Cleanup;
-                }
-
-        }
-
-        /* check status of receive frame */
-
-        /* frame status is byte stored after frame data
-         *
-         * 7 EOM (end of msg), 1 = last buffer of frame
-         * 6 Short Frame, 1 = short frame
-         * 5 Abort, 1 = frame aborted
-         * 4 Residue, 1 = last byte is partial
-         * 3 Overrun, 1 = overrun occurred during frame reception
-         * 2 CRC,     1 = CRC error detected
-         *
-         */
-        status = desc->status;
-
-        /* ignore CRC bit if not using CRC (bit is undefined) */
-        /* Note:CRC is not save to data buffer */
-        if (info->params.crc_type == HDLC_CRC_NONE)
-                status &= ~BIT2;
-
-        if (framesize == 0 ||
-                 (addr_field != 0xff && addr_field != info->params.addr_filter)) {
-                /* discard 0 byte frames, this seems to occur sometime
-                 * when remote is idling flags.
-                 */
-                rx_free_frame_buffers(info, StartIndex, EndIndex);
-                goto CheckAgain;
-        }
-
-        if (framesize < 2)
-                status |= BIT6;
-
-        if (status & (BIT6+BIT5+BIT3+BIT2)) {
-                /* received frame has errors,
-                 * update counts and mark frame size as 0
-                 */
-                if (status & BIT6)
-                        info->icount.rxshort++;
-                else if (status & BIT5)
-                        info->icount.rxabort++;
-                else if (status & BIT3)
-                        info->icount.rxover++;
-                else
-                        info->icount.rxcrc++;
-
-                framesize = 0;
-#if SYNCLINK_GENERIC_HDLC
-                {
-                        info->netdev->stats.rx_errors++;
-                        info->netdev->stats.rx_frame_errors++;
-                }
-#endif
-        }
-
-        if ( debug_level >= DEBUG_LEVEL_BH )
-                printk("%s(%d):%s rx_get_frame() status=%04X size=%d\n",
-                        __FILE__,__LINE__,info->device_name,status,framesize);
-
-        if ( debug_level >= DEBUG_LEVEL_DATA )
-                trace_block(info,info->rx_buf_list_ex[StartIndex].virt_addr,
-                        min_t(int, framesize,SCABUFSIZE),0);
-
-        if (framesize) {
-                if (framesize > info->max_frame_size)
-                        info->icount.rxlong++;
-                else {
-                        /* copy dma buffer(s) to contiguous intermediate buffer */
-                        int copy_count = framesize;
-                        int index = StartIndex;
-                        unsigned char *ptmp = info->tmp_rx_buf;
-                        info->tmp_rx_buf_count = framesize;
-
-                        info->icount.rxok++;
-
-                        while(copy_count) {
-                                int partial_count = min(copy_count,SCABUFSIZE);
-                                memcpy( ptmp,
-                                        info->rx_buf_list_ex[index].virt_addr,
-                                        partial_count );
-                                ptmp += partial_count;
-                                copy_count -= partial_count;
-
-                                if ( ++index == info->rx_buf_count )
-                                        index = 0;
-                        }
-
-#if SYNCLINK_GENERIC_HDLC
-                        if (info->netcount)
-                                hdlcdev_rx(info,info->tmp_rx_buf,framesize);
-                        else
-#endif
-                                ldisc_receive_buf(tty,info->tmp_rx_buf,
-                                                  info->flag_buf, framesize);
-                }
-        }
-        /* Free the buffers used by this frame. */
-        rx_free_frame_buffers( info, StartIndex, EndIndex );
-
-        ReturnCode = true;
-
-Cleanup:
-        if ( info->rx_enabled && info->rx_overflow ) {
-                /* Receiver is enabled, but needs to restarted due to
-                 * rx buffer overflow. If buffers are empty, restart receiver.
-                 */
-                if (info->rx_buf_list[EndIndex].status == 0xff) {
-                        spin_lock_irqsave(&info->lock,flags);
-                        rx_start(info);
-                        spin_unlock_irqrestore(&info->lock,flags);
-                }
-        }
-
-        return ReturnCode;
-}
-
-/* load the transmit DMA buffer with data
- */
-static void tx_load_dma_buffer(SLMP_INFO *info, const char *buf, unsigned int count)
-{
-        unsigned short copy_count;
-        unsigned int i = 0;
-        SCADESC *desc;
-        SCADESC_EX *desc_ex;
-
-        if ( debug_level >= DEBUG_LEVEL_DATA )
-                trace_block(info,buf, min_t(int, count,SCABUFSIZE), 1);
-
-        /* Copy source buffer to one or more DMA buffers, starting with
-         * the first transmit dma buffer.
-         */
-        for(i=0;;)
-        {
-                copy_count = min_t(unsigned short,count,SCABUFSIZE);
-
-                desc = &info->tx_buf_list[i];
-                desc_ex = &info->tx_buf_list_ex[i];
-
-                load_pci_memory(info, desc_ex->virt_addr,buf,copy_count);
-
-                desc->length = copy_count;
-                desc->status = 0;
-
-                buf += copy_count;
-                count -= copy_count;
-
-                if (!count)
-                        break;
-
-                i++;
-                if (i >= info->tx_buf_count)
-                        i = 0;
-        }
-
-        info->tx_buf_list[i].status = 0x81;     /* set EOM and EOT status */
-        info->last_tx_buf = ++i;
-}
-
-static bool register_test(SLMP_INFO *info)
-{
-        static unsigned char testval[] = {0x00, 0xff, 0xaa, 0x55, 0x69, 0x96};
-        static unsigned int count = ARRAY_SIZE(testval);
-        unsigned int i;
-        bool rc = true;
-        unsigned long flags;
-
-        spin_lock_irqsave(&info->lock,flags);
-        reset_port(info);
-
-        /* assume failure */
-        info->init_error = DiagStatus_AddressFailure;
-
-        /* Write bit patterns to various registers but do it out of */
-        /* sync, then read back and verify values. */
-
-        for (i = 0 ; i < count ; i++) {
-                write_reg(info, TMC, testval[i]);
-                write_reg(info, IDL, testval[(i+1)%count]);
-                write_reg(info, SA0, testval[(i+2)%count]);
-                write_reg(info, SA1, testval[(i+3)%count]);
-
-                if ( (read_reg(info, TMC) != testval[i]) ||
-                          (read_reg(info, IDL) != testval[(i+1)%count]) ||
-                          (read_reg(info, SA0) != testval[(i+2)%count]) ||
-                          (read_reg(info, SA1) != testval[(i+3)%count]) )
-                {
-                        rc = false;
-                        break;
-                }
-        }
-
-        reset_port(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        return rc;
-}
-
-static bool irq_test(SLMP_INFO *info)
-{
-        unsigned long timeout;
-        unsigned long flags;
-
-        unsigned char timer = (info->port_num & 1) ? TIMER2 : TIMER0;
-
-        spin_lock_irqsave(&info->lock,flags);
-        reset_port(info);
-
-        /* assume failure */
-        info->init_error = DiagStatus_IrqFailure;
-        info->irq_occurred = false;
-
-        /* setup timer0 on SCA0 to interrupt */
-
-        /* IER2<7..4> = timer<3..0> interrupt enables (1=enabled) */
-        write_reg(info, IER2, (unsigned char)((info->port_num & 1) ? BIT6 : BIT4));
-
-        write_reg(info, (unsigned char)(timer + TEPR), 0);      /* timer expand prescale */
-        write_reg16(info, (unsigned char)(timer + TCONR), 1);   /* timer constant */
-
-
-        /* TMCS, Timer Control/Status Register
-         *
-         * 07      CMF, Compare match flag (read only) 1=match
-         * 06      ECMI, CMF Interrupt Enable: 1=enabled
-         * 05      Reserved, must be 0
-         * 04      TME, Timer Enable
-         * 03..00  Reserved, must be 0
-         *
-         * 0101 0000
-         */
-        write_reg(info, (unsigned char)(timer + TMCS), 0x50);
-
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        timeout=100;
-        while( timeout-- && !info->irq_occurred ) {
-                msleep_interruptible(10);
-        }
-
-        spin_lock_irqsave(&info->lock,flags);
-        reset_port(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        return info->irq_occurred;
-}
-
-/* initialize individual SCA device (2 ports)
- */
-static bool sca_init(SLMP_INFO *info)
-{
-        /* set wait controller to single mem partition (low), no wait states */
-        write_reg(info, PABR0, 0);      /* wait controller addr boundary 0 */
-        write_reg(info, PABR1, 0);      /* wait controller addr boundary 1 */
-        write_reg(info, WCRL, 0);       /* wait controller low range */
-        write_reg(info, WCRM, 0);       /* wait controller mid range */
-        write_reg(info, WCRH, 0);       /* wait controller high range */
-
-        /* DPCR, DMA Priority Control
-         *
-         * 07..05  Not used, must be 0
-         * 04      BRC, bus release condition: 0=all transfers complete
-         * 03      CCC, channel change condition: 0=every cycle
-         * 02..00  PR<2..0>, priority 100=round robin
-         *
-         * 00000100 = 0x04
-         */
-        write_reg(info, DPCR, dma_priority);
-
-        /* DMA Master Enable, BIT7: 1=enable all channels */
-        write_reg(info, DMER, 0x80);
-
-        /* enable all interrupt classes */
-        write_reg(info, IER0, 0xff);    /* TxRDY,RxRDY,TxINT,RxINT (ports 0-1) */
-        write_reg(info, IER1, 0xff);    /* DMIB,DMIA (channels 0-3) */
-        write_reg(info, IER2, 0xf0);    /* TIRQ (timers 0-3) */
-
-        /* ITCR, interrupt control register
-         * 07      IPC, interrupt priority, 0=MSCI->DMA
-         * 06..05  IAK<1..0>, Acknowledge cycle, 00=non-ack cycle
-         * 04      VOS, Vector Output, 0=unmodified vector
-         * 03..00  Reserved, must be 0
-         */
-        write_reg(info, ITCR, 0);
-
-        return true;
-}
-
-/* initialize adapter hardware
- */
-static bool init_adapter(SLMP_INFO *info)
-{
-        int i;
-
-        /* Set BIT30 of Local Control Reg 0x50 to reset SCA */
-        volatile u32 *MiscCtrl = (u32 *)(info->lcr_base + 0x50);
-        u32 readval;
-
-        info->misc_ctrl_value |= BIT30;
-        *MiscCtrl = info->misc_ctrl_value;
-
-        /*
-         * Force at least 170ns delay before clearing
-         * reset bit. Each read from LCR takes at least
-         * 30ns so 10 times for 300ns to be safe.
-         */
-        for(i=0;i<10;i++)
-                readval = *MiscCtrl;
-
-        info->misc_ctrl_value &= ~BIT30;
-        *MiscCtrl = info->misc_ctrl_value;
-
-        /* init control reg (all DTRs off, all clksel=input) */
-        info->ctrlreg_value = 0xaa;
-        write_control_reg(info);
-
-        {
-                volatile u32 *LCR1BRDR = (u32 *)(info->lcr_base + 0x2c);
-                lcr1_brdr_value &= ~(BIT5 + BIT4 + BIT3);
-
-                switch(read_ahead_count)
-                {
-                case 16:
-                        lcr1_brdr_value |= BIT5 + BIT4 + BIT3;
-                        break;
-                case 8:
-                        lcr1_brdr_value |= BIT5 + BIT4;
-                        break;
-                case 4:
-                        lcr1_brdr_value |= BIT5 + BIT3;
-                        break;
-                case 0:
-                        lcr1_brdr_value |= BIT5;
-                        break;
-                }
-
-                *LCR1BRDR = lcr1_brdr_value;
-                *MiscCtrl = misc_ctrl_value;
-        }
-
-        sca_init(info->port_array[0]);
-        sca_init(info->port_array[2]);
-
-        return true;
-}
-
-/* Loopback an HDLC frame to test the hardware
- * interrupt and DMA functions.
- */
-static bool loopback_test(SLMP_INFO *info)
-{
-#define TESTFRAMESIZE 20
-
-        unsigned long timeout;
-        u16 count = TESTFRAMESIZE;
-        unsigned char buf[TESTFRAMESIZE];
-        bool rc = false;
-        unsigned long flags;
-
-        struct tty_struct *oldtty = info->port.tty;
-        u32 speed = info->params.clock_speed;
-
-        info->params.clock_speed = 3686400;
-        info->port.tty = NULL;
-
-        /* assume failure */
-        info->init_error = DiagStatus_DmaFailure;
-
-        /* build and send transmit frame */
-        for (count = 0; count < TESTFRAMESIZE;++count)
-                buf[count] = (unsigned char)count;
-
-        memset(info->tmp_rx_buf,0,TESTFRAMESIZE);
-
-        /* program hardware for HDLC and enabled receiver */
-        spin_lock_irqsave(&info->lock,flags);
-        hdlc_mode(info);
-        enable_loopback(info,1);
-        rx_start(info);
-        info->tx_count = count;
-        tx_load_dma_buffer(info,buf,count);
-        tx_start(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        /* wait for receive complete */
-        /* Set a timeout for waiting for interrupt. */
-        for ( timeout = 100; timeout; --timeout ) {
-                msleep_interruptible(10);
-
-                if (rx_get_frame(info)) {
-                        rc = true;
-                        break;
-                }
-        }
-
-        /* verify received frame length and contents */
-        if (rc &&
-            ( info->tmp_rx_buf_count != count ||
-              memcmp(buf, info->tmp_rx_buf,count))) {
-                rc = false;
-        }
-
-        spin_lock_irqsave(&info->lock,flags);
-        reset_adapter(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        info->params.clock_speed = speed;
-        info->port.tty = oldtty;
-
-        return rc;
-}
-
-/* Perform diagnostics on hardware
- */
-static int adapter_test( SLMP_INFO *info )
-{
-        unsigned long flags;
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):Testing device %s\n",
-                        __FILE__,__LINE__,info->device_name );
-
-        spin_lock_irqsave(&info->lock,flags);
-        init_adapter(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        info->port_array[0]->port_count = 0;
-
-        if ( register_test(info->port_array[0]) &&
-                register_test(info->port_array[1])) {
-
-                info->port_array[0]->port_count = 2;
-
-                if ( register_test(info->port_array[2]) &&
-                        register_test(info->port_array[3]) )
-                        info->port_array[0]->port_count += 2;
-        }
-        else {
-                printk( "%s(%d):Register test failure for device %s Addr=%08lX\n",
-                        __FILE__,__LINE__,info->device_name, (unsigned long)(info->phys_sca_base));
-                return -ENODEV;
-        }
-
-        if ( !irq_test(info->port_array[0]) ||
-                !irq_test(info->port_array[1]) ||
-                 (info->port_count == 4 && !irq_test(info->port_array[2])) ||
-                 (info->port_count == 4 && !irq_test(info->port_array[3]))) {
-                printk( "%s(%d):Interrupt test failure for device %s IRQ=%d\n",
-                        __FILE__,__LINE__,info->device_name, (unsigned short)(info->irq_level) );
-                return -ENODEV;
-        }
-
-        if (!loopback_test(info->port_array[0]) ||
-                !loopback_test(info->port_array[1]) ||
-                 (info->port_count == 4 && !loopback_test(info->port_array[2])) ||
-                 (info->port_count == 4 && !loopback_test(info->port_array[3]))) {
-                printk( "%s(%d):DMA test failure for device %s\n",
-                        __FILE__,__LINE__,info->device_name);
-                return -ENODEV;
-        }
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):device %s passed diagnostics\n",
-                        __FILE__,__LINE__,info->device_name );
-
-        info->port_array[0]->init_error = 0;
-        info->port_array[1]->init_error = 0;
-        if ( info->port_count > 2 ) {
-                info->port_array[2]->init_error = 0;
-                info->port_array[3]->init_error = 0;
-        }
-
-        return 0;
-}
-
-/* Test the shared memory on a PCI adapter.
- */
-static bool memory_test(SLMP_INFO *info)
-{
-        static unsigned long testval[] = { 0x0, 0x55555555, 0xaaaaaaaa,
-                0x66666666, 0x99999999, 0xffffffff, 0x12345678 };
-        unsigned long count = ARRAY_SIZE(testval);
-        unsigned long i;
-        unsigned long limit = SCA_MEM_SIZE/sizeof(unsigned long);
-        unsigned long * addr = (unsigned long *)info->memory_base;
-
-        /* Test data lines with test pattern at one location. */
-
-        for ( i = 0 ; i < count ; i++ ) {
-                *addr = testval[i];
-                if ( *addr != testval[i] )
-                        return false;
-        }
-
-        /* Test address lines with incrementing pattern over */
-        /* entire address range. */
-
-        for ( i = 0 ; i < limit ; i++ ) {
-                *addr = i * 4;
-                addr++;
-        }
-
-        addr = (unsigned long *)info->memory_base;
-
-        for ( i = 0 ; i < limit ; i++ ) {
-                if ( *addr != i * 4 )
-                        return false;
-                addr++;
-        }
-
-        memset( info->memory_base, 0, SCA_MEM_SIZE );
-        return true;
-}
-
-/* Load data into PCI adapter shared memory.
- *
- * The PCI9050 releases control of the local bus
- * after completing the current read or write operation.
- *
- * While the PCI9050 write FIFO not empty, the
- * PCI9050 treats all of the writes as a single transaction
- * and does not release the bus. This causes DMA latency problems
- * at high speeds when copying large data blocks to the shared memory.
- *
- * This function breaks a write into multiple transations by
- * interleaving a read which flushes the write FIFO and 'completes'
- * the write transation. This allows any pending DMA request to gain control
- * of the local bus in a timely fasion.
- */
-static void load_pci_memory(SLMP_INFO *info, char* dest, const char* src, unsigned short count)
-{
-        /* A load interval of 16 allows for 4 32-bit writes at */
-        /* 136ns each for a maximum latency of 542ns on the local bus.*/
-
-        unsigned short interval = count / sca_pci_load_interval;
-        unsigned short i;
-
-        for ( i = 0 ; i < interval ; i++ )
-        {
-                memcpy(dest, src, sca_pci_load_interval);
-                read_status_reg(info);
-                dest += sca_pci_load_interval;
-                src += sca_pci_load_interval;
-        }
-
-        memcpy(dest, src, count % sca_pci_load_interval);
-}
-
-static void trace_block(SLMP_INFO *info,const char* data, int count, int xmit)
-{
-        int i;
-        int linecount;
-        if (xmit)
-                printk("%s tx data:\n",info->device_name);
-        else
-                printk("%s rx data:\n",info->device_name);
-
-        while(count) {
-                if (count > 16)
-                        linecount = 16;
-                else
-                        linecount = count;
-
-                for(i=0;i<linecount;i++)
-                        printk("%02X ",(unsigned char)data[i]);
-                for(;i<17;i++)
-                        printk("   ");
-                for(i=0;i<linecount;i++) {
-                        if (data[i]>=040 && data[i]<=0176)
-                                printk("%c",data[i]);
-                        else
-                                printk(".");
-                }
-                printk("\n");
-
-                data  += linecount;
-                count -= linecount;
-        }
-}       /* end of trace_block() */
-
-/* called when HDLC frame times out
- * update stats and do tx completion processing
- */
-static void tx_timeout(unsigned long context)
-{
-        SLMP_INFO *info = (SLMP_INFO*)context;
-        unsigned long flags;
-
-        if ( debug_level >= DEBUG_LEVEL_INFO )
-                printk( "%s(%d):%s tx_timeout()\n",
-                        __FILE__,__LINE__,info->device_name);
-        if(info->tx_active && info->params.mode == MGSL_MODE_HDLC) {
-                info->icount.txtimeout++;
-        }
-        spin_lock_irqsave(&info->lock,flags);
-        info->tx_active = false;
-        info->tx_count = info->tx_put = info->tx_get = 0;
-
-        spin_unlock_irqrestore(&info->lock,flags);
-
-#if SYNCLINK_GENERIC_HDLC
-        if (info->netcount)
-                hdlcdev_tx_done(info);
-        else
-#endif
-                bh_transmit(info);
-}
-
-/* called to periodically check the DSR/RI modem signal input status
- */
-static void status_timeout(unsigned long context)
-{
-        u16 status = 0;
-        SLMP_INFO *info = (SLMP_INFO*)context;
-        unsigned long flags;
-        unsigned char delta;
-
-
-        spin_lock_irqsave(&info->lock,flags);
-        get_signals(info);
-        spin_unlock_irqrestore(&info->lock,flags);
-
-        /* check for DSR/RI state change */
-
-        delta = info->old_signals ^ info->serial_signals;
-        info->old_signals = info->serial_signals;
-
-        if (delta & SerialSignal_DSR)
-                status |= MISCSTATUS_DSR_LATCHED|(info->serial_signals&SerialSignal_DSR);
-
-        if (delta & SerialSignal_RI)
-                status |= MISCSTATUS_RI_LATCHED|(info->serial_signals&SerialSignal_RI);
-
-        if (delta & SerialSignal_DCD)
-                status |= MISCSTATUS_DCD_LATCHED|(info->serial_signals&SerialSignal_DCD);
-
-        if (delta & SerialSignal_CTS)
-                status |= MISCSTATUS_CTS_LATCHED|(info->serial_signals&SerialSignal_CTS);
-
-        if (status)
-                isr_io_pin(info,status);
-
-        mod_timer(&info->status_timer, jiffies + msecs_to_jiffies(10));
-}
-
-
-/* Register Access Routines -
- * All registers are memory mapped
- */
-#define CALC_REGADDR() \
-        unsigned char * RegAddr = (unsigned char*)(info->sca_base + Addr); \
-        if (info->port_num > 1) \
-                RegAddr += 256;                 /* port 0-1 SCA0, 2-3 SCA1 */ \
-        if ( info->port_num & 1) { \
-                if (Addr > 0x7f) \
-                        RegAddr += 0x40;        /* DMA access */ \
-                else if (Addr > 0x1f && Addr < 0x60) \
-                        RegAddr += 0x20;        /* MSCI access */ \
-        }
-
-
-static unsigned char read_reg(SLMP_INFO * info, unsigned char Addr)
-{
-        CALC_REGADDR();
-        return *RegAddr;
-}
-static void write_reg(SLMP_INFO * info, unsigned char Addr, unsigned char Value)
-{
-        CALC_REGADDR();
-        *RegAddr = Value;
-}
-
-static u16 read_reg16(SLMP_INFO * info, unsigned char Addr)
-{
-        CALC_REGADDR();
-        return *((u16 *)RegAddr);
-}
-
-static void write_reg16(SLMP_INFO * info, unsigned char Addr, u16 Value)
-{
-        CALC_REGADDR();
-        *((u16 *)RegAddr) = Value;
-}
-
-static unsigned char read_status_reg(SLMP_INFO * info)
-{
-        unsigned char *RegAddr = (unsigned char *)info->statctrl_base;
-        return *RegAddr;
-}
-
-static void write_control_reg(SLMP_INFO * info)
-{
-        unsigned char *RegAddr = (unsigned char *)info->statctrl_base;
-        *RegAddr = info->port_array[0]->ctrlreg_value;
-}
-
-
-static int __devinit synclinkmp_init_one (struct pci_dev *dev,
-                                          const struct pci_device_id *ent)
-{
-        if (pci_enable_device(dev)) {
-                printk("error enabling pci device %p\n", dev);
-                return -EIO;
-        }
-        device_init( ++synclinkmp_adapter_count, dev );
-        return 0;
-}
-
-static void __devexit synclinkmp_remove_one (struct pci_dev *dev)
-{
-}
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
deleted file mode 100644
index ef31bb81e843..000000000000
--- a/drivers/char/sysrq.c
+++ /dev/null
@@ -1,801 +0,0 @@
-/*
- *      Linux Magic System Request Key Hacks
- *
- *      (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
- *      based on ideas by Pavel Machek <pavel@atrey.karlin.mff.cuni.cz>
- *
- *      (c) 2000 Crutcher Dunnavant <crutcher+kernel@datastacks.com>
- *      overhauled to use key registration
- *      based upon discusions in irc://irc.openprojects.net/#kernelnewbies
- *
- *      Copyright (c) 2010 Dmitry Torokhov
- *      Input handler conversion
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/mm.h>
-#include <linux/fs.h>
-#include <linux/mount.h>
-#include <linux/kdev_t.h>
-#include <linux/major.h>
-#include <linux/reboot.h>
-#include <linux/sysrq.h>
-#include <linux/kbd_kern.h>
-#include <linux/proc_fs.h>
-#include <linux/nmi.h>
-#include <linux/quotaops.h>
-#include <linux/perf_event.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/suspend.h>
-#include <linux/writeback.h>
-#include <linux/buffer_head.h>          /* for fsync_bdev() */
-#include <linux/swap.h>
-#include <linux/spinlock.h>
-#include <linux/vt_kern.h>
-#include <linux/workqueue.h>
-#include <linux/hrtimer.h>
-#include <linux/oom.h>
-#include <linux/slab.h>
-#include <linux/input.h>
-
-#include <asm/ptrace.h>
-#include <asm/irq_regs.h>
-
-/* Whether we react on sysrq keys or just ignore them */
-static int __read_mostly sysrq_enabled = 1;
-static bool __read_mostly sysrq_always_enabled;
-
-static bool sysrq_on(void)
-{
-        return sysrq_enabled || sysrq_always_enabled;
-}
-
-/*
- * A value of 1 means 'all', other nonzero values are an op mask:
- */
-static bool sysrq_on_mask(int mask)
-{
-        return sysrq_always_enabled ||
-               sysrq_enabled == 1 ||
-               (sysrq_enabled & mask);
-}
-
-static int __init sysrq_always_enabled_setup(char *str)
-{
-        sysrq_always_enabled = true;
-        pr_info("sysrq always enabled.\n");
-
-        return 1;
-}
-
-__setup("sysrq_always_enabled", sysrq_always_enabled_setup);
-
-
-static void sysrq_handle_loglevel(int key)
-{
-        int i;
-
-        i = key - '0';
-        console_loglevel = 7;
-        printk("Loglevel set to %d\n", i);
-        console_loglevel = i;
-}
-static struct sysrq_key_op sysrq_loglevel_op = {
-        .handler        = sysrq_handle_loglevel,
-        .help_msg       = "loglevel(0-9)",
-        .action_msg     = "Changing Loglevel",
-        .enable_mask    = SYSRQ_ENABLE_LOG,
-};
-
-#ifdef CONFIG_VT
-static void sysrq_handle_SAK(int key)
-{
-        struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work;
-        schedule_work(SAK_work);
-}
-static struct sysrq_key_op sysrq_SAK_op = {
-        .handler        = sysrq_handle_SAK,
-        .help_msg       = "saK",
-        .action_msg     = "SAK",
-        .enable_mask    = SYSRQ_ENABLE_KEYBOARD,
-};
-#else
-#define sysrq_SAK_op (*(struct sysrq_key_op *)NULL)
-#endif
-
-#ifdef CONFIG_VT
-static void sysrq_handle_unraw(int key)
-{
-        struct kbd_struct *kbd = &kbd_table[fg_console];
-
-        if (kbd)
-                kbd->kbdmode = default_utf8 ? VC_UNICODE : VC_XLATE;
-}
-static struct sysrq_key_op sysrq_unraw_op = {
-        .handler        = sysrq_handle_unraw,
-        .help_msg       = "unRaw",
-        .action_msg     = "Keyboard mode set to system default",
-        .enable_mask    = SYSRQ_ENABLE_KEYBOARD,
-};
-#else
-#define sysrq_unraw_op (*(struct sysrq_key_op *)NULL)
-#endif /* CONFIG_VT */
-
-static void sysrq_handle_crash(int key)
-{
-        char *killer = NULL;
-
-        panic_on_oops = 1;      /* force panic */
-        wmb();
-        *killer = 1;
-}
-static struct sysrq_key_op sysrq_crash_op = {
-        .handler        = sysrq_handle_crash,
-        .help_msg       = "Crash",
-        .action_msg     = "Trigger a crash",
-        .enable_mask    = SYSRQ_ENABLE_DUMP,
-};
-
-static void sysrq_handle_reboot(int key)
-{
-        lockdep_off();
-        local_irq_enable();
-        emergency_restart();
-}
-static struct sysrq_key_op sysrq_reboot_op = {
-        .handler        = sysrq_handle_reboot,
-        .help_msg       = "reBoot",
-        .action_msg     = "Resetting",
-        .enable_mask    = SYSRQ_ENABLE_BOOT,
-};
-
-static void sysrq_handle_sync(int key)
-{
-        emergency_sync();
-}
-static struct sysrq_key_op sysrq_sync_op = {
-        .handler        = sysrq_handle_sync,
-        .help_msg       = "Sync",
-        .action_msg     = "Emergency Sync",
-        .enable_mask    = SYSRQ_ENABLE_SYNC,
-};
-
-static void sysrq_handle_show_timers(int key)
-{
-        sysrq_timer_list_show();
-}
-
-static struct sysrq_key_op sysrq_show_timers_op = {
-        .handler        = sysrq_handle_show_timers,
-        .help_msg       = "show-all-timers(Q)",
-        .action_msg     = "Show clockevent devices & pending hrtimers (no others)",
-};
-
-static void sysrq_handle_mountro(int key)
-{
-        emergency_remount();
-}
-static struct sysrq_key_op sysrq_mountro_op = {
-        .handler        = sysrq_handle_mountro,
-        .help_msg       = "Unmount",
-        .action_msg     = "Emergency Remount R/O",
-        .enable_mask    = SYSRQ_ENABLE_REMOUNT,
-};
-
-#ifdef CONFIG_LOCKDEP
-static void sysrq_handle_showlocks(int key)
-{
-        debug_show_all_locks();
-}
-
-static struct sysrq_key_op sysrq_showlocks_op = {
-        .handler        = sysrq_handle_showlocks,
-        .help_msg       = "show-all-locks(D)",
-        .action_msg     = "Show Locks Held",
-};
-#else
-#define sysrq_showlocks_op (*(struct sysrq_key_op *)NULL)
-#endif
-
-#ifdef CONFIG_SMP
-static DEFINE_SPINLOCK(show_lock);
-
-static void showacpu(void *dummy)
-{
-        unsigned long flags;
-
-        /* Idle CPUs have no interesting backtrace. */
-        if (idle_cpu(smp_processor_id()))
-                return;
-
-        spin_lock_irqsave(&show_lock, flags);
-        printk(KERN_INFO "CPU%d:\n", smp_processor_id());
-        show_stack(NULL, NULL);
-        spin_unlock_irqrestore(&show_lock, flags);
-}
-
-static void sysrq_showregs_othercpus(struct work_struct *dummy)
-{
-        smp_call_function(showacpu, NULL, 0);
-}
-
-static DECLARE_WORK(sysrq_showallcpus, sysrq_showregs_othercpus);
-
-static void sysrq_handle_showallcpus(int key)
-{
-        /*
-         * Fall back to the workqueue based printing if the
-         * backtrace printing did not succeed or the
-         * architecture has no support for it:
-         */
-        if (!trigger_all_cpu_backtrace()) {
-                struct pt_regs *regs = get_irq_regs();
-
-                if (regs) {
-                        printk(KERN_INFO "CPU%d:\n", smp_processor_id());
-                        show_regs(regs);
-                }
-                schedule_work(&sysrq_showallcpus);
-        }
-}
-
-static struct sysrq_key_op sysrq_showallcpus_op = {
-        .handler        = sysrq_handle_showallcpus,
-        .help_msg       = "show-backtrace-all-active-cpus(L)",
-        .action_msg     = "Show backtrace of all active CPUs",
-        .enable_mask    = SYSRQ_ENABLE_DUMP,
-};
-#endif
-
-static void sysrq_handle_showregs(int key)
-{
-        struct pt_regs *regs = get_irq_regs();
-        if (regs)
-                show_regs(regs);
-        perf_event_print_debug();
-}
-static struct sysrq_key_op sysrq_showregs_op = {
-        .handler        = sysrq_handle_showregs,
-        .help_msg       = "show-registers(P)",
-        .action_msg     = "Show Regs",
-        .enable_mask    = SYSRQ_ENABLE_DUMP,
-};
-
-static void sysrq_handle_showstate(int key)
-{
-        show_state();
-}
-static struct sysrq_key_op sysrq_showstate_op = {
-        .handler        = sysrq_handle_showstate,
-        .help_msg       = "show-task-states(T)",
-        .action_msg     = "Show State",
-        .enable_mask    = SYSRQ_ENABLE_DUMP,
-};
-
-static void sysrq_handle_showstate_blocked(int key)
-{
-        show_state_filter(TASK_UNINTERRUPTIBLE);
-}
-static struct sysrq_key_op sysrq_showstate_blocked_op = {
-        .handler        = sysrq_handle_showstate_blocked,
-        .help_msg       = "show-blocked-tasks(W)",
-        .action_msg     = "Show Blocked State",
-        .enable_mask    = SYSRQ_ENABLE_DUMP,
-};
-
-#ifdef CONFIG_TRACING
-#include <linux/ftrace.h>
-
-static void sysrq_ftrace_dump(int key)
-{
-        ftrace_dump(DUMP_ALL);
-}
-static struct sysrq_key_op sysrq_ftrace_dump_op = {
-        .handler        = sysrq_ftrace_dump,
-        .help_msg       = "dump-ftrace-buffer(Z)",
-        .action_msg     = "Dump ftrace buffer",
-        .enable_mask    = SYSRQ_ENABLE_DUMP,
-};
-#else
-#define sysrq_ftrace_dump_op (*(struct sysrq_key_op *)NULL)
-#endif
-
-static void sysrq_handle_showmem(int key)
-{
-        show_mem();
-}
-static struct sysrq_key_op sysrq_showmem_op = {
-        .handler        = sysrq_handle_showmem,
-        .help_msg       = "show-memory-usage(M)",
-        .action_msg     = "Show Memory",
-        .enable_mask    = SYSRQ_ENABLE_DUMP,
-};
-
-/*
- * Signal sysrq helper function.  Sends a signal to all user processes.
- */
-static void send_sig_all(int sig)
-{
-        struct task_struct *p;
-
-        for_each_process(p) {
-                if (p->mm && !is_global_init(p))
-                        /* Not swapper, init nor kernel thread */
-                        force_sig(sig, p);
-        }
-}
-
-static void sysrq_handle_term(int key)
-{
-        send_sig_all(SIGTERM);
-        console_loglevel = 8;
-}
-static struct sysrq_key_op sysrq_term_op = {
-        .handler        = sysrq_handle_term,
-        .help_msg       = "terminate-all-tasks(E)",
-        .action_msg     = "Terminate All Tasks",
-        .enable_mask    = SYSRQ_ENABLE_SIGNAL,
-};
-
-static void moom_callback(struct work_struct *ignored)
-{
-        out_of_memory(node_zonelist(0, GFP_KERNEL), GFP_KERNEL, 0, NULL);
-}
-
-static DECLARE_WORK(moom_work, moom_callback);
-
-static void sysrq_handle_moom(int key)
-{
-        schedule_work(&moom_work);
-}
-static struct sysrq_key_op sysrq_moom_op = {
-        .handler        = sysrq_handle_moom,
-        .help_msg       = "memory-full-oom-kill(F)",
-        .action_msg     = "Manual OOM execution",
-        .enable_mask    = SYSRQ_ENABLE_SIGNAL,
-};
-
-#ifdef CONFIG_BLOCK
-static void sysrq_handle_thaw(int key)
-{
-        emergency_thaw_all();
-}
-static struct sysrq_key_op sysrq_thaw_op = {
-        .handler        = sysrq_handle_thaw,
-        .help_msg       = "thaw-filesystems(J)",
-        .action_msg     = "Emergency Thaw of all frozen filesystems",
-        .enable_mask    = SYSRQ_ENABLE_SIGNAL,
-};
-#endif
-
-static void sysrq_handle_kill(int key)
-{
-        send_sig_all(SIGKILL);
-        console_loglevel = 8;
-}
-static struct sysrq_key_op sysrq_kill_op = {
-        .handler        = sysrq_handle_kill,
-        .help_msg       = "kill-all-tasks(I)",
-        .action_msg     = "Kill All Tasks",
-        .enable_mask    = SYSRQ_ENABLE_SIGNAL,
-};
-
-static void sysrq_handle_unrt(int key)
-{
-        normalize_rt_tasks();
-}
-static struct sysrq_key_op sysrq_unrt_op = {
-        .handler        = sysrq_handle_unrt,
-        .help_msg       = "nice-all-RT-tasks(N)",
-        .action_msg     = "Nice All RT Tasks",
-        .enable_mask    = SYSRQ_ENABLE_RTNICE,
-};
-
-/* Key Operations table and lock */
-static DEFINE_SPINLOCK(sysrq_key_table_lock);
-
-static struct sysrq_key_op *sysrq_key_table[36] = {
-        &sysrq_loglevel_op,             /* 0 */
-        &sysrq_loglevel_op,             /* 1 */
-        &sysrq_loglevel_op,             /* 2 */
-        &sysrq_loglevel_op,             /* 3 */
-        &sysrq_loglevel_op,             /* 4 */
-        &sysrq_loglevel_op,             /* 5 */
-        &sysrq_loglevel_op,             /* 6 */
-        &sysrq_loglevel_op,             /* 7 */
-        &sysrq_loglevel_op,             /* 8 */
-        &sysrq_loglevel_op,             /* 9 */
-
-        /*
-         * a: Don't use for system provided sysrqs, it is handled specially on
-         * sparc and will never arrive.
-         */
-        NULL,                           /* a */
-        &sysrq_reboot_op,               /* b */
-        &sysrq_crash_op,                /* c & ibm_emac driver debug */
-        &sysrq_showlocks_op,            /* d */
-        &sysrq_term_op,                 /* e */
-        &sysrq_moom_op,                 /* f */
-        /* g: May be registered for the kernel debugger */
-        NULL,                           /* g */
-        NULL,                           /* h - reserved for help */
-        &sysrq_kill_op,                 /* i */
-#ifdef CONFIG_BLOCK
-        &sysrq_thaw_op,                 /* j */
-#else
-        NULL,                           /* j */
-#endif
-        &sysrq_SAK_op,                  /* k */
-#ifdef CONFIG_SMP
-        &sysrq_showallcpus_op,          /* l */
-#else
-        NULL,                           /* l */
-#endif
-        &sysrq_showmem_op,              /* m */
-        &sysrq_unrt_op,                 /* n */
-        /* o: This will often be registered as 'Off' at init time */
-        NULL,                           /* o */
-        &sysrq_showregs_op,             /* p */
-        &sysrq_show_timers_op,          /* q */
-        &sysrq_unraw_op,                /* r */
-        &sysrq_sync_op,                 /* s */
-        &sysrq_showstate_op,            /* t */
-        &sysrq_mountro_op,              /* u */
-        /* v: May be registered for frame buffer console restore */
-        NULL,                           /* v */
-        &sysrq_showstate_blocked_op,    /* w */
-        /* x: May be registered on ppc/powerpc for xmon */
-        NULL,                           /* x */
-        /* y: May be registered on sparc64 for global register dump */
-        NULL,                           /* y */
-        &sysrq_ftrace_dump_op,          /* z */
-};
-
-/* key2index calculation, -1 on invalid index */
-static int sysrq_key_table_key2index(int key)
-{
-        int retval;
-
-        if ((key >= '0') && (key <= '9'))
-                retval = key - '0';
-        else if ((key >= 'a') && (key <= 'z'))
-                retval = key + 10 - 'a';
-        else
-                retval = -1;
-        return retval;
-}
-
-/*
- * get and put functions for the table, exposed to modules.
- */
-struct sysrq_key_op *__sysrq_get_key_op(int key)
-{
-        struct sysrq_key_op *op_p = NULL;
-        int i;
-
-        i = sysrq_key_table_key2index(key);
-        if (i != -1)
-                op_p = sysrq_key_table[i];
-
-        return op_p;
-}
-
-static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
-{
-        int i = sysrq_key_table_key2index(key);
-
-        if (i != -1)
-                sysrq_key_table[i] = op_p;
-}
-
-void __handle_sysrq(int key, bool check_mask)
-{
-        struct sysrq_key_op *op_p;
-        int orig_log_level;
-        int i;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sysrq_key_table_lock, flags);
-        /*
-         * Raise the apparent loglevel to maximum so that the sysrq header
-         * is shown to provide the user with positive feedback.  We do not
-         * simply emit this at KERN_EMERG as that would change message
-         * routing in the consumers of /proc/kmsg.
-         */
-        orig_log_level = console_loglevel;
-        console_loglevel = 7;
-        printk(KERN_INFO "SysRq : ");
-
-        op_p = __sysrq_get_key_op(key);
-        if (op_p) {
-                /*
-                 * Should we check for enabled operations (/proc/sysrq-trigger
-                 * should not) and is the invoked operation enabled?
-                 */
-                if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
-                        printk("%s\n", op_p->action_msg);
-                        console_loglevel = orig_log_level;
-                        op_p->handler(key);
-                } else {
-                        printk("This sysrq operation is disabled.\n");
-                }
-        } else {
-                printk("HELP : ");
-                /* Only print the help msg once per handler */
-                for (i = 0; i < ARRAY_SIZE(sysrq_key_table); i++) {
-                        if (sysrq_key_table[i]) {
-                                int j;
-
-                                for (j = 0; sysrq_key_table[i] !=
-                                                sysrq_key_table[j]; j++)
-                                        ;
-                                if (j != i)
-                                        continue;
-                                printk("%s ", sysrq_key_table[i]->help_msg);
-                        }
-                }
-                printk("\n");
-                console_loglevel = orig_log_level;
-        }
-        spin_unlock_irqrestore(&sysrq_key_table_lock, flags);
-}
-
-void handle_sysrq(int key)
-{
-        if (sysrq_on())
-                __handle_sysrq(key, true);
-}
-EXPORT_SYMBOL(handle_sysrq);
-
-#ifdef CONFIG_INPUT
-
-/* Simple translation table for the SysRq keys */
-static const unsigned char sysrq_xlate[KEY_MAX + 1] =
-        "\000\0331234567890-=\177\t"                    /* 0x00 - 0x0f */
-        "qwertyuiop[]\r\000as"                          /* 0x10 - 0x1f */
-        "dfghjkl;'`\000\\zxcv"                          /* 0x20 - 0x2f */
-        "bnm,./\000*\000 \000\201\202\203\204\205"      /* 0x30 - 0x3f */
-        "\206\207\210\211\212\000\000789-456+1"         /* 0x40 - 0x4f */
-        "230\177\000\000\213\214\000\000\000\000\000\000\000\000\000\000" /* 0x50 - 0x5f */
-        "\r\000/";                                      /* 0x60 - 0x6f */
-
-static bool sysrq_down;
-static int sysrq_alt_use;
-static int sysrq_alt;
-
-static bool sysrq_filter(struct input_handle *handle, unsigned int type,
-                         unsigned int code, int value)
-{
-        if (type != EV_KEY)
-                goto out;
-
-        switch (code) {
-
-        case KEY_LEFTALT:
-        case KEY_RIGHTALT:
-                if (value)
-                        sysrq_alt = code;
-                else {
-                        if (sysrq_down && code == sysrq_alt_use)
-                                sysrq_down = false;
-
-                        sysrq_alt = 0;
-                }
-                break;
-
-        case KEY_SYSRQ:
-                if (value == 1 && sysrq_alt) {
-                        sysrq_down = true;
-                        sysrq_alt_use = sysrq_alt;
-                }
-                break;
-
-        default:
-                if (sysrq_down && value && value != 2)
-                        __handle_sysrq(sysrq_xlate[code], true);
-                break;
-        }
-
-out:
-        return sysrq_down;
-}
-
-static int sysrq_connect(struct input_handler *handler,
-                         struct input_dev *dev,
-                         const struct input_device_id *id)
-{
-        struct input_handle *handle;
-        int error;
-
-        sysrq_down = false;
-        sysrq_alt = 0;
-
-        handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL);
-        if (!handle)
-                return -ENOMEM;
-
-        handle->dev = dev;
-        handle->handler = handler;
-        handle->name = "sysrq";
-
-        error = input_register_handle(handle);
-        if (error) {
-                pr_err("Failed to register input sysrq handler, error %d\n",
-                        error);
-                goto err_free;
-        }
-
-        error = input_open_device(handle);
-        if (error) {
-                pr_err("Failed to open input device, error %d\n", error);
-                goto err_unregister;
-        }
-
-        return 0;
-
- err_unregister:
-        input_unregister_handle(handle);
- err_free:
-        kfree(handle);
-        return error;
-}
-
-static void sysrq_disconnect(struct input_handle *handle)
-{
-        input_close_device(handle);
-        input_unregister_handle(handle);
-        kfree(handle);
-}
-
-/*
- * We are matching on KEY_LEFTALT insteard of KEY_SYSRQ because not all
- * keyboards have SysRq ikey predefined and so user may add it to keymap
- * later, but we expect all such keyboards to have left alt.
- */
-static const struct input_device_id sysrq_ids[] = {
-        {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
-                                INPUT_DEVICE_ID_MATCH_KEYBIT,
-                .evbit = { BIT_MASK(EV_KEY) },
-                .keybit = { BIT_MASK(KEY_LEFTALT) },
-        },
-        { },
-};
-
-static struct input_handler sysrq_handler = {
-        .filter         = sysrq_filter,
-        .connect        = sysrq_connect,
-        .disconnect     = sysrq_disconnect,
-        .name           = "sysrq",
-        .id_table       = sysrq_ids,
-};
-
-static bool sysrq_handler_registered;
-
-static inline void sysrq_register_handler(void)
-{
-        int error;
-
-        error = input_register_handler(&sysrq_handler);
-        if (error)
-                pr_err("Failed to register input handler, error %d", error);
-        else
-                sysrq_handler_registered = true;
-}
-
-static inline void sysrq_unregister_handler(void)
-{
-        if (sysrq_handler_registered) {
-                input_unregister_handler(&sysrq_handler);
-                sysrq_handler_registered = false;
-        }
-}
-
-#else
-
-static inline void sysrq_register_handler(void)
-{
-}
-
-static inline void sysrq_unregister_handler(void)
-{
-}
-
-#endif /* CONFIG_INPUT */
-
-int sysrq_toggle_support(int enable_mask)
-{
-        bool was_enabled = sysrq_on();
-
-        sysrq_enabled = enable_mask;
-
-        if (was_enabled != sysrq_on()) {
-                if (sysrq_on())
-                        sysrq_register_handler();
-                else
-                        sysrq_unregister_handler();
-        }
-
-        return 0;
-}
-
-static int __sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p,
-                                struct sysrq_key_op *remove_op_p)
-{
-        int retval;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sysrq_key_table_lock, flags);
-        if (__sysrq_get_key_op(key) == remove_op_p) {
-                __sysrq_put_key_op(key, insert_op_p);
-                retval = 0;
-        } else {
-                retval = -1;
-        }
-        spin_unlock_irqrestore(&sysrq_key_table_lock, flags);
-        return retval;
-}
-
-int register_sysrq_key(int key, struct sysrq_key_op *op_p)
-{
-        return __sysrq_swap_key_ops(key, op_p, NULL);
-}
-EXPORT_SYMBOL(register_sysrq_key);
-
-int unregister_sysrq_key(int key, struct sysrq_key_op *op_p)
-{
-        return __sysrq_swap_key_ops(key, NULL, op_p);
-}
-EXPORT_SYMBOL(unregister_sysrq_key);
-
-#ifdef CONFIG_PROC_FS
-/*
- * writing 'C' to /proc/sysrq-trigger is like sysrq-C
- */
-static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
-                                   size_t count, loff_t *ppos)
-{
-        if (count) {
-                char c;
-
-                if (get_user(c, buf))
-                        return -EFAULT;
-                __handle_sysrq(c, false);
-        }
-
-        return count;
-}
-
-static const struct file_operations proc_sysrq_trigger_operations = {
-        .write          = write_sysrq_trigger,
-};
-
-static void sysrq_init_procfs(void)
-{
-        if (!proc_create("sysrq-trigger", S_IWUSR, NULL,
-                         &proc_sysrq_trigger_operations))
-                pr_err("Failed to register proc interface\n");
-}
-
-#else
-
-static inline void sysrq_init_procfs(void)
-{
-}
-
-#endif /* CONFIG_PROC_FS */
-
-static int __init sysrq_init(void)
-{
-        sysrq_init_procfs();
-
-        if (sysrq_on())
-                sysrq_register_handler();
-
-        return 0;
-}
-module_init(sysrq_init);
diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c
index cad4eb65f13d..ad264185eb10 100644
--- a/drivers/char/tb0219.c
+++ b/drivers/char/tb0219.c
@@ -261,6 +261,7 @@ static const struct file_operations tb0219_fops = {
         .write          = tanbac_tb0219_write,
         .open           = tanbac_tb0219_open,
         .release        = tanbac_tb0219_release,
+        .llseek         = no_llseek,
 };
 
 static void tb0219_restart(char *command)
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index 80ea6bcfffdc..0c964cdcc223 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -37,7 +37,7 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/sysfs.h>
 #include <linux/device.h>
@@ -206,7 +206,7 @@ static int tlclk_open(struct inode *inode, struct file *filp)
 {
         int result;
 
-        lock_kernel();
+        mutex_lock(&tlclk_mutex);
         if (test_and_set_bit(0, &useflags)) {
                 result = -EBUSY;
                 /* this legacy device is always one per system and it doesn't
@@ -229,7 +229,7 @@ static int tlclk_open(struct inode *inode, struct file *filp)
                 inb(TLCLK_REG6);        /* Clear interrupt events */
 
 out:
-        unlock_kernel();
+        mutex_unlock(&tlclk_mutex);
         return result;
 }
 
@@ -267,6 +267,7 @@ static const struct file_operations tlclk_fops = {
         .read = tlclk_read,
         .open = tlclk_open,
         .release = tlclk_release,
+        .llseek = noop_llseek,
 
 };
 
diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index f8bc79f6de34..014c9d90d297 100644
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -68,7 +68,7 @@
 #include <linux/stat.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/toshiba.h>
 
 #define TOSH_MINOR_DEV 181
@@ -78,6 +78,7 @@ MODULE_AUTHOR("Jonathan Buzzard <jonathan@buzzard.org.uk>");
 MODULE_DESCRIPTION("Toshiba laptop SMM driver");
 MODULE_SUPPORTED_DEVICE("toshiba");
 
+static DEFINE_MUTEX(tosh_mutex);
 static int tosh_fn;
 module_param_named(fn, tosh_fn, int, 0);
 MODULE_PARM_DESC(fn, "User specified Fn key detection port");
@@ -95,6 +96,7 @@ static long tosh_ioctl(struct file *, unsigned int,
 static const struct file_operations tosh_fops = {
         .owner          = THIS_MODULE,
         .unlocked_ioctl = tosh_ioctl,
+        .llseek         = noop_llseek,
 };
 
 static struct miscdevice tosh_device = {
@@ -274,16 +276,16 @@ static long tosh_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
                                 return -EINVAL;
 
                         /* do we need to emulate the fan ? */
-                        lock_kernel();
+                        mutex_lock(&tosh_mutex);
                         if (tosh_fan==1) {
                                 if (((ax==0xf300) || (ax==0xf400)) && (bx==0x0004)) {
                                         err = tosh_emulate_fan(&regs);
-                                        unlock_kernel();
+                                        mutex_unlock(&tosh_mutex);
                                         break;
                                 }
                         }
                         err = tosh_smm(&regs);
-                        unlock_kernel();
+                        mutex_unlock(&tosh_mutex);
                         break;
                 default:
                         return -EINVAL;
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index 4dc338f3d1aa..f6595aba4f0f 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -58,6 +58,6 @@ config TCG_INFINEON
           To compile this driver as a module, choose M here; the module
           will be called tpm_infineon.
           Further information on this driver and the supported hardware
-          can be found at http://www.prosec.rub.de/tpm
+          can be found at http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ 
 
 endif # TCG_TPM
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 05ad4a17a28f..7beb0e25f1e1 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -47,6 +47,16 @@ enum tpm_duration {
 #define TPM_MAX_PROTECTED_ORDINAL 12
 #define TPM_PROTECTED_ORDINAL_MASK 0xFF
 
+/*
+ * Bug workaround - some TPM's don't flush the most
+ * recently changed pcr on suspend, so force the flush
+ * with an extend to the selected _unused_ non-volatile pcr.
+ */
+static int tpm_suspend_pcr;
+module_param_named(suspend_pcr, tpm_suspend_pcr, uint, 0644);
+MODULE_PARM_DESC(suspend_pcr,
+                 "PCR to use for dummy writes to faciltate flush on suspend.");
+
 static LIST_HEAD(tpm_chip_list);
 static DEFINE_SPINLOCK(driver_lock);
 static DECLARE_BITMAP(dev_mask, TPM_NUM_DEVICES);
@@ -726,7 +736,7 @@ int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf)
         if (chip == NULL)
                 return -ENODEV;
         rc = __tpm_pcr_read(chip, pcr_idx, res_buf);
-        module_put(chip->dev->driver->owner);
+        tpm_chip_put(chip);
         return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_pcr_read);
@@ -765,11 +775,27 @@ int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)
         rc = transmit_cmd(chip, &cmd, EXTEND_PCR_RESULT_SIZE,
                           "attempting extend a PCR value");
 
-        module_put(chip->dev->driver->owner);
+        tpm_chip_put(chip);
         return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_pcr_extend);
 
+int tpm_send(u32 chip_num, void *cmd, size_t buflen)
+{
+        struct tpm_chip *chip;
+        int rc;
+
+        chip = tpm_chip_find_get(chip_num);
+        if (chip == NULL)
+                return -ENODEV;
+
+        rc = transmit_cmd(chip, cmd, buflen, "attempting tpm_cmd");
+
+        tpm_chip_put(chip);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(tpm_send);
+
 ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,
                       char *buf)
 {
@@ -954,7 +980,7 @@ int tpm_open(struct inode *inode, struct file *file)
                 return -EBUSY;
         }
 
-        chip->data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL);
+        chip->data_buffer = kzalloc(TPM_BUFSIZE, GFP_KERNEL);
         if (chip->data_buffer == NULL) {
                 clear_bit(0, &chip->is_open);
                 put_device(chip->dev);
@@ -976,7 +1002,7 @@ int tpm_release(struct inode *inode, struct file *file)
         struct tpm_chip *chip = file->private_data;
 
         del_singleshot_timer_sync(&chip->user_read_timer);
-        flush_scheduled_work();
+        flush_work_sync(&chip->work);
         file->private_data = NULL;
         atomic_set(&chip->data_pending, 0);
         kfree(chip->data_buffer);
@@ -1028,7 +1054,7 @@ ssize_t tpm_read(struct file *file, char __user *buf,
         ssize_t ret_size;
 
         del_singleshot_timer_sync(&chip->user_read_timer);
-        flush_scheduled_work();
+        flush_work_sync(&chip->work);
         ret_size = atomic_read(&chip->data_pending);
         atomic_set(&chip->data_pending, 0);
         if (ret_size > 0) {     /* relay data */
@@ -1077,18 +1103,6 @@ static struct tpm_input_header savestate_header = {
         .ordinal = TPM_ORD_SAVESTATE
 };
 
-/* Bug workaround - some TPM's don't flush the most
- * recently changed pcr on suspend, so force the flush
- * with an extend to the selected _unused_ non-volatile pcr.
- */
-static int tpm_suspend_pcr;
-static int __init tpm_suspend_setup(char *str)
-{
-        get_option(&str, &tpm_suspend_pcr);
-        return 1;
-}
-__setup("tpm_suspend_pcr=", tpm_suspend_setup);
-
 /*
  * We are about to suspend. Save the TPM state
  * so that it can be restored.
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 792868d24f2a..72ddb031b69a 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -113,6 +113,11 @@ struct tpm_chip {
 
 #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor)
 
+static inline void tpm_chip_put(struct tpm_chip *chip)
+{
+        module_put(chip->dev->driver->owner);
+}
+
 static inline int tpm_read_index(int base, int index)
 {
         outb(index, base);
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index f58440791e65..76da32e11f18 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -7,7 +7,7 @@
  * Copyright (C) 2005, Marcel Selhorst <m.selhorst@sirrix.com>
  * Sirrix AG - security technologies, http://www.sirrix.com and
  * Applied Data Security Group, Ruhr-University Bochum, Germany
- * Project-Homepage: http://www.prosec.rub.de/tpm
+ * Project-Homepage: http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ 
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 1030f8420137..dd21df55689d 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/wait.h>
+#include <linux/acpi.h>
 #include "tpm.h"
 
 #define TPM_HEADER_SIZE 10
@@ -78,6 +79,26 @@ enum tis_defaults {
 static LIST_HEAD(tis_chips);
 static DEFINE_SPINLOCK(tis_lock);
 
+#ifdef CONFIG_ACPI
+static int is_itpm(struct pnp_dev *dev)
+{
+        struct acpi_device *acpi = pnp_acpi_device(dev);
+        struct acpi_hardware_id *id;
+
+        list_for_each_entry(id, &acpi->pnp.ids, list) {
+                if (!strcmp("INTC0102", id->id))
+                        return 1;
+        }
+
+        return 0;
+}
+#else
+static int is_itpm(struct pnp_dev *dev)
+{
+        return 0;
+}
+#endif
+
 static int check_locality(struct tpm_chip *chip, int l)
 {
         if ((ioread8(chip->vendor.iobase + TPM_ACCESS(l)) &
@@ -613,6 +634,9 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
         else
                 interrupts = 0;
 
+        if (is_itpm(pnp_dev))
+                itpm = 1;
+
         return tpm_tis_init(&pnp_dev->dev, start, len, irq);
 }
 
diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c
deleted file mode 100644
index 1b8ee590b4ca..000000000000
--- a/drivers/char/tty_audit.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Creating audit events from TTY input.
- *
- * Copyright (C) 2007 Red Hat, Inc.  All rights reserved.  This copyrighted
- * material is made available to anyone wishing to use, modify, copy, or
- * redistribute it subject to the terms and conditions of the GNU General
- * Public License v.2.
- *
- * Authors: Miloslav Trmac <mitr@redhat.com>
- */
-
-#include <linux/audit.h>
-#include <linux/slab.h>
-#include <linux/tty.h>
-
-struct tty_audit_buf {
-        atomic_t count;
-        struct mutex mutex;     /* Protects all data below */
-        int major, minor;       /* The TTY which the data is from */
-        unsigned icanon:1;
-        size_t valid;
-        unsigned char *data;    /* Allocated size N_TTY_BUF_SIZE */
-};
-
-static struct tty_audit_buf *tty_audit_buf_alloc(int major, int minor,
-                                                 int icanon)
-{
-        struct tty_audit_buf *buf;
-
-        buf = kmalloc(sizeof(*buf), GFP_KERNEL);
-        if (!buf)
-                goto err;
-        buf->data = kmalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
-        if (!buf->data)
-                goto err_buf;
-        atomic_set(&buf->count, 1);
-        mutex_init(&buf->mutex);
-        buf->major = major;
-        buf->minor = minor;
-        buf->icanon = icanon;
-        buf->valid = 0;
-        return buf;
-
-err_buf:
-        kfree(buf);
-err:
-        return NULL;
-}
-
-static void tty_audit_buf_free(struct tty_audit_buf *buf)
-{
-        WARN_ON(buf->valid != 0);
-        kfree(buf->data);
-        kfree(buf);
-}
-
-static void tty_audit_buf_put(struct tty_audit_buf *buf)
-{
-        if (atomic_dec_and_test(&buf->count))
-                tty_audit_buf_free(buf);
-}
-
-static void tty_audit_log(const char *description, struct task_struct *tsk,
-                          uid_t loginuid, unsigned sessionid, int major,
-                          int minor, unsigned char *data, size_t size)
-{
-        struct audit_buffer *ab;
-
-        ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY);
-        if (ab) {
-                char name[sizeof(tsk->comm)];
-                uid_t uid = task_uid(tsk);
-
-                audit_log_format(ab, "%s pid=%u uid=%u auid=%u ses=%u "
-                                 "major=%d minor=%d comm=", description,
-                                 tsk->pid, uid, loginuid, sessionid,
-                                 major, minor);
-                get_task_comm(name, tsk);
-                audit_log_untrustedstring(ab, name);
-                audit_log_format(ab, " data=");
-                audit_log_n_hex(ab, data, size);
-                audit_log_end(ab);
-        }
-}
-
-/**
- *      tty_audit_buf_push      -       Push buffered data out
- *
- *      Generate an audit message from the contents of @buf, which is owned by
- *      @tsk with @loginuid.  @buf->mutex must be locked.
- */
-static void tty_audit_buf_push(struct task_struct *tsk, uid_t loginuid,
-                               unsigned int sessionid,
-                               struct tty_audit_buf *buf)
-{
-        if (buf->valid == 0)
-                return;
-        if (audit_enabled == 0)
-                return;
-        tty_audit_log("tty", tsk, loginuid, sessionid, buf->major, buf->minor,
-                      buf->data, buf->valid);
-        buf->valid = 0;
-}
-
-/**
- *      tty_audit_buf_push_current      -       Push buffered data out
- *
- *      Generate an audit message from the contents of @buf, which is owned by
- *      the current task.  @buf->mutex must be locked.
- */
-static void tty_audit_buf_push_current(struct tty_audit_buf *buf)
-{
-        uid_t auid = audit_get_loginuid(current);
-        unsigned int sessionid = audit_get_sessionid(current);
-        tty_audit_buf_push(current, auid, sessionid, buf);
-}
-
-/**
- *      tty_audit_exit  -       Handle a task exit
- *
- *      Make sure all buffered data is written out and deallocate the buffer.
- *      Only needs to be called if current->signal->tty_audit_buf != %NULL.
- */
-void tty_audit_exit(void)
-{
-        struct tty_audit_buf *buf;
-
-        spin_lock_irq(&current->sighand->siglock);
-        buf = current->signal->tty_audit_buf;
-        current->signal->tty_audit_buf = NULL;
-        spin_unlock_irq(&current->sighand->siglock);
-        if (!buf)
-                return;
-
-        mutex_lock(&buf->mutex);
-        tty_audit_buf_push_current(buf);
-        mutex_unlock(&buf->mutex);
-
-        tty_audit_buf_put(buf);
-}
-
-/**
- *      tty_audit_fork  -       Copy TTY audit state for a new task
- *
- *      Set up TTY audit state in @sig from current.  @sig needs no locking.
- */
-void tty_audit_fork(struct signal_struct *sig)
-{
-        spin_lock_irq(&current->sighand->siglock);
-        sig->audit_tty = current->signal->audit_tty;
-        spin_unlock_irq(&current->sighand->siglock);
-}
-
-/**
- *      tty_audit_tiocsti       -       Log TIOCSTI
- */
-void tty_audit_tiocsti(struct tty_struct *tty, char ch)
-{
-        struct tty_audit_buf *buf;
-        int major, minor, should_audit;
-
-        spin_lock_irq(&current->sighand->siglock);
-        should_audit = current->signal->audit_tty;
-        buf = current->signal->tty_audit_buf;
-        if (buf)
-                atomic_inc(&buf->count);
-        spin_unlock_irq(&current->sighand->siglock);
-
-        major = tty->driver->major;
-        minor = tty->driver->minor_start + tty->index;
-        if (buf) {
-                mutex_lock(&buf->mutex);
-                if (buf->major == major && buf->minor == minor)
-                        tty_audit_buf_push_current(buf);
-                mutex_unlock(&buf->mutex);
-                tty_audit_buf_put(buf);
-        }
-
-        if (should_audit && audit_enabled) {
-                uid_t auid;
-                unsigned int sessionid;
-
-                auid = audit_get_loginuid(current);
-                sessionid = audit_get_sessionid(current);
-                tty_audit_log("ioctl=TIOCSTI", current, auid, sessionid, major,
-                              minor, &ch, 1);
-        }
-}
-
-/**
- *      tty_audit_push_task     -       Flush task's pending audit data
- */
-void tty_audit_push_task(struct task_struct *tsk, uid_t loginuid, u32 sessionid)
-{
-        struct tty_audit_buf *buf;
-
-        spin_lock_irq(&tsk->sighand->siglock);
-        buf = tsk->signal->tty_audit_buf;
-        if (buf)
-                atomic_inc(&buf->count);
-        spin_unlock_irq(&tsk->sighand->siglock);
-        if (!buf)
-                return;
-
-        mutex_lock(&buf->mutex);
-        tty_audit_buf_push(tsk, loginuid, sessionid, buf);
-        mutex_unlock(&buf->mutex);
-
-        tty_audit_buf_put(buf);
-}
-
-/**
- *      tty_audit_buf_get       -       Get an audit buffer.
- *
- *      Get an audit buffer for @tty, allocate it if necessary.  Return %NULL
- *      if TTY auditing is disabled or out of memory.  Otherwise, return a new
- *      reference to the buffer.
- */
-static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty)
-{
-        struct tty_audit_buf *buf, *buf2;
-
-        buf = NULL;
-        buf2 = NULL;
-        spin_lock_irq(&current->sighand->siglock);
-        if (likely(!current->signal->audit_tty))
-                goto out;
-        buf = current->signal->tty_audit_buf;
-        if (buf) {
-                atomic_inc(&buf->count);
-                goto out;
-        }
-        spin_unlock_irq(&current->sighand->siglock);
-
-        buf2 = tty_audit_buf_alloc(tty->driver->major,
-                                   tty->driver->minor_start + tty->index,
-                                   tty->icanon);
-        if (buf2 == NULL) {
-                audit_log_lost("out of memory in TTY auditing");
-                return NULL;
-        }
-
-        spin_lock_irq(&current->sighand->siglock);
-        if (!current->signal->audit_tty)
-                goto out;
-        buf = current->signal->tty_audit_buf;
-        if (!buf) {
-                current->signal->tty_audit_buf = buf2;
-                buf = buf2;
-                buf2 = NULL;
-        }
-        atomic_inc(&buf->count);
-        /* Fall through */
- out:
-        spin_unlock_irq(&current->sighand->siglock);
-        if (buf2)
-                tty_audit_buf_free(buf2);
-        return buf;
-}
-
-/**
- *      tty_audit_add_data      -       Add data for TTY auditing.
- *
- *      Audit @data of @size from @tty, if necessary.
- */
-void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
-                        size_t size)
-{
-        struct tty_audit_buf *buf;
-        int major, minor;
-
-        if (unlikely(size == 0))
-                return;
-
-        if (tty->driver->type == TTY_DRIVER_TYPE_PTY
-            && tty->driver->subtype == PTY_TYPE_MASTER)
-                return;
-
-        buf = tty_audit_buf_get(tty);
-        if (!buf)
-                return;
-
-        mutex_lock(&buf->mutex);
-        major = tty->driver->major;
-        minor = tty->driver->minor_start + tty->index;
-        if (buf->major != major || buf->minor != minor
-            || buf->icanon != tty->icanon) {
-                tty_audit_buf_push_current(buf);
-                buf->major = major;
-                buf->minor = minor;
-                buf->icanon = tty->icanon;
-        }
-        do {
-                size_t run;
-
-                run = N_TTY_BUF_SIZE - buf->valid;
-                if (run > size)
-                        run = size;
-                memcpy(buf->data + buf->valid, data, run);
-                buf->valid += run;
-                data += run;
-                size -= run;
-                if (buf->valid == N_TTY_BUF_SIZE)
-                        tty_audit_buf_push_current(buf);
-        } while (size != 0);
-        mutex_unlock(&buf->mutex);
-        tty_audit_buf_put(buf);
-}
-
-/**
- *      tty_audit_push  -       Push buffered data out
- *
- *      Make sure no audit data is pending for @tty on the current process.
- */
-void tty_audit_push(struct tty_struct *tty)
-{
-        struct tty_audit_buf *buf;
-
-        spin_lock_irq(&current->sighand->siglock);
-        if (likely(!current->signal->audit_tty)) {
-                spin_unlock_irq(&current->sighand->siglock);
-                return;
-        }
-        buf = current->signal->tty_audit_buf;
-        if (buf)
-                atomic_inc(&buf->count);
-        spin_unlock_irq(&current->sighand->siglock);
-
-        if (buf) {
-                int major, minor;
-
-                major = tty->driver->major;
-                minor = tty->driver->minor_start + tty->index;
-                mutex_lock(&buf->mutex);
-                if (buf->major == major && buf->minor == minor)
-                        tty_audit_buf_push_current(buf);
-                mutex_unlock(&buf->mutex);
-                tty_audit_buf_put(buf);
-        }
-}
diff --git a/drivers/char/tty_buffer.c b/drivers/char/tty_buffer.c
deleted file mode 100644
index cc1e9850d655..000000000000
--- a/drivers/char/tty_buffer.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/*
- * Tty buffer allocation management
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <linux/timer.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/wait.h>
-#include <linux/bitops.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-
-/**
- *      tty_buffer_free_all             -       free buffers used by a tty
- *      @tty: tty to free from
- *
- *      Remove all the buffers pending on a tty whether queued with data
- *      or in the free ring. Must be called when the tty is no longer in use
- *
- *      Locking: none
- */
-
-void tty_buffer_free_all(struct tty_struct *tty)
-{
-        struct tty_buffer *thead;
-        while ((thead = tty->buf.head) != NULL) {
-                tty->buf.head = thead->next;
-                kfree(thead);
-        }
-        while ((thead = tty->buf.free) != NULL) {
-                tty->buf.free = thead->next;
-                kfree(thead);
-        }
-        tty->buf.tail = NULL;
-        tty->buf.memory_used = 0;
-}
-
-/**
- *      tty_buffer_alloc        -       allocate a tty buffer
- *      @tty: tty device
- *      @size: desired size (characters)
- *
- *      Allocate a new tty buffer to hold the desired number of characters.
- *      Return NULL if out of memory or the allocation would exceed the
- *      per device queue
- *
- *      Locking: Caller must hold tty->buf.lock
- */
-
-static struct tty_buffer *tty_buffer_alloc(struct tty_struct *tty, size_t size)
-{
-        struct tty_buffer *p;
-
-        if (tty->buf.memory_used + size > 65536)
-                return NULL;
-        p = kmalloc(sizeof(struct tty_buffer) + 2 * size, GFP_ATOMIC);
-        if (p == NULL)
-                return NULL;
-        p->used = 0;
-        p->size = size;
-        p->next = NULL;
-        p->commit = 0;
-        p->read = 0;
-        p->char_buf_ptr = (char *)(p->data);
-        p->flag_buf_ptr = (unsigned char *)p->char_buf_ptr + size;
-        tty->buf.memory_used += size;
-        return p;
-}
-
-/**
- *      tty_buffer_free         -       free a tty buffer
- *      @tty: tty owning the buffer
- *      @b: the buffer to free
- *
- *      Free a tty buffer, or add it to the free list according to our
- *      internal strategy
- *
- *      Locking: Caller must hold tty->buf.lock
- */
-
-static void tty_buffer_free(struct tty_struct *tty, struct tty_buffer *b)
-{
-        /* Dumb strategy for now - should keep some stats */
-        tty->buf.memory_used -= b->size;
-        WARN_ON(tty->buf.memory_used < 0);
-
-        if (b->size >= 512)
-                kfree(b);
-        else {
-                b->next = tty->buf.free;
-                tty->buf.free = b;
-        }
-}
-
-/**
- *      __tty_buffer_flush              -       flush full tty buffers
- *      @tty: tty to flush
- *
- *      flush all the buffers containing receive data. Caller must
- *      hold the buffer lock and must have ensured no parallel flush to
- *      ldisc is running.
- *
- *      Locking: Caller must hold tty->buf.lock
- */
-
-static void __tty_buffer_flush(struct tty_struct *tty)
-{
-        struct tty_buffer *thead;
-
-        while ((thead = tty->buf.head) != NULL) {
-                tty->buf.head = thead->next;
-                tty_buffer_free(tty, thead);
-        }
-        tty->buf.tail = NULL;
-}
-
-/**
- *      tty_buffer_flush                -       flush full tty buffers
- *      @tty: tty to flush
- *
- *      flush all the buffers containing receive data. If the buffer is
- *      being processed by flush_to_ldisc then we defer the processing
- *      to that function
- *
- *      Locking: none
- */
-
-void tty_buffer_flush(struct tty_struct *tty)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&tty->buf.lock, flags);
-
-        /* If the data is being pushed to the tty layer then we can't
-           process it here. Instead set a flag and the flush_to_ldisc
-           path will process the flush request before it exits */
-        if (test_bit(TTY_FLUSHING, &tty->flags)) {
-                set_bit(TTY_FLUSHPENDING, &tty->flags);
-                spin_unlock_irqrestore(&tty->buf.lock, flags);
-                wait_event(tty->read_wait,
-                                test_bit(TTY_FLUSHPENDING, &tty->flags) == 0);
-                return;
-        } else
-                __tty_buffer_flush(tty);
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-}
-
-/**
- *      tty_buffer_find         -       find a free tty buffer
- *      @tty: tty owning the buffer
- *      @size: characters wanted
- *
- *      Locate an existing suitable tty buffer or if we are lacking one then
- *      allocate a new one. We round our buffers off in 256 character chunks
- *      to get better allocation behaviour.
- *
- *      Locking: Caller must hold tty->buf.lock
- */
-
-static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size)
-{
-        struct tty_buffer **tbh = &tty->buf.free;
-        while ((*tbh) != NULL) {
-                struct tty_buffer *t = *tbh;
-                if (t->size >= size) {
-                        *tbh = t->next;
-                        t->next = NULL;
-                        t->used = 0;
-                        t->commit = 0;
-                        t->read = 0;
-                        tty->buf.memory_used += t->size;
-                        return t;
-                }
-                tbh = &((*tbh)->next);
-        }
-        /* Round the buffer size out */
-        size = (size + 0xFF) & ~0xFF;
-        return tty_buffer_alloc(tty, size);
-        /* Should possibly check if this fails for the largest buffer we
-           have queued and recycle that ? */
-}
-
-/**
- *      tty_buffer_request_room         -       grow tty buffer if needed
- *      @tty: tty structure
- *      @size: size desired
- *
- *      Make at least size bytes of linear space available for the tty
- *      buffer. If we fail return the size we managed to find.
- *
- *      Locking: Takes tty->buf.lock
- */
-int tty_buffer_request_room(struct tty_struct *tty, size_t size)
-{
-        struct tty_buffer *b, *n;
-        int left;
-        unsigned long flags;
-
-        spin_lock_irqsave(&tty->buf.lock, flags);
-
-        /* OPTIMISATION: We could keep a per tty "zero" sized buffer to
-           remove this conditional if its worth it. This would be invisible
-           to the callers */
-        if ((b = tty->buf.tail) != NULL)
-                left = b->size - b->used;
-        else
-                left = 0;
-
-        if (left < size) {
-                /* This is the slow path - looking for new buffers to use */
-                if ((n = tty_buffer_find(tty, size)) != NULL) {
-                        if (b != NULL) {
-                                b->next = n;
-                                b->commit = b->used;
-                        } else
-                                tty->buf.head = n;
-                        tty->buf.tail = n;
-                } else
-                        size = left;
-        }
-
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-        return size;
-}
-EXPORT_SYMBOL_GPL(tty_buffer_request_room);
-
-/**
- *      tty_insert_flip_string_fixed_flag - Add characters to the tty buffer
- *      @tty: tty structure
- *      @chars: characters
- *      @flag: flag value for each character
- *      @size: size
- *
- *      Queue a series of bytes to the tty buffering. All the characters
- *      passed are marked with the supplied flag. Returns the number added.
- *
- *      Locking: Called functions may take tty->buf.lock
- */
-
-int tty_insert_flip_string_fixed_flag(struct tty_struct *tty,
-                const unsigned char *chars, char flag, size_t size)
-{
-        int copied = 0;
-        do {
-                int goal = min_t(size_t, size - copied, TTY_BUFFER_PAGE);
-                int space = tty_buffer_request_room(tty, goal);
-                struct tty_buffer *tb = tty->buf.tail;
-                /* If there is no space then tb may be NULL */
-                if (unlikely(space == 0))
-                        break;
-                memcpy(tb->char_buf_ptr + tb->used, chars, space);
-                memset(tb->flag_buf_ptr + tb->used, flag, space);
-                tb->used += space;
-                copied += space;
-                chars += space;
-                /* There is a small chance that we need to split the data over
-                   several buffers. If this is the case we must loop */
-        } while (unlikely(size > copied));
-        return copied;
-}
-EXPORT_SYMBOL(tty_insert_flip_string_fixed_flag);
-
-/**
- *      tty_insert_flip_string_flags    -       Add characters to the tty buffer
- *      @tty: tty structure
- *      @chars: characters
- *      @flags: flag bytes
- *      @size: size
- *
- *      Queue a series of bytes to the tty buffering. For each character
- *      the flags array indicates the status of the character. Returns the
- *      number added.
- *
- *      Locking: Called functions may take tty->buf.lock
- */
-
-int tty_insert_flip_string_flags(struct tty_struct *tty,
-                const unsigned char *chars, const char *flags, size_t size)
-{
-        int copied = 0;
-        do {
-                int goal = min_t(size_t, size - copied, TTY_BUFFER_PAGE);
-                int space = tty_buffer_request_room(tty, goal);
-                struct tty_buffer *tb = tty->buf.tail;
-                /* If there is no space then tb may be NULL */
-                if (unlikely(space == 0))
-                        break;
-                memcpy(tb->char_buf_ptr + tb->used, chars, space);
-                memcpy(tb->flag_buf_ptr + tb->used, flags, space);
-                tb->used += space;
-                copied += space;
-                chars += space;
-                flags += space;
-                /* There is a small chance that we need to split the data over
-                   several buffers. If this is the case we must loop */
-        } while (unlikely(size > copied));
-        return copied;
-}
-EXPORT_SYMBOL(tty_insert_flip_string_flags);
-
-/**
- *      tty_schedule_flip       -       push characters to ldisc
- *      @tty: tty to push from
- *
- *      Takes any pending buffers and transfers their ownership to the
- *      ldisc side of the queue. It then schedules those characters for
- *      processing by the line discipline.
- *
- *      Locking: Takes tty->buf.lock
- */
-
-void tty_schedule_flip(struct tty_struct *tty)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&tty->buf.lock, flags);
-        if (tty->buf.tail != NULL)
-                tty->buf.tail->commit = tty->buf.tail->used;
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-        schedule_delayed_work(&tty->buf.work, 1);
-}
-EXPORT_SYMBOL(tty_schedule_flip);
-
-/**
- *      tty_prepare_flip_string         -       make room for characters
- *      @tty: tty
- *      @chars: return pointer for character write area
- *      @size: desired size
- *
- *      Prepare a block of space in the buffer for data. Returns the length
- *      available and buffer pointer to the space which is now allocated and
- *      accounted for as ready for normal characters. This is used for drivers
- *      that need their own block copy routines into the buffer. There is no
- *      guarantee the buffer is a DMA target!
- *
- *      Locking: May call functions taking tty->buf.lock
- */
-
-int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars,
-                                                                size_t size)
-{
-        int space = tty_buffer_request_room(tty, size);
-        if (likely(space)) {
-                struct tty_buffer *tb = tty->buf.tail;
-                *chars = tb->char_buf_ptr + tb->used;
-                memset(tb->flag_buf_ptr + tb->used, TTY_NORMAL, space);
-                tb->used += space;
-        }
-        return space;
-}
-EXPORT_SYMBOL_GPL(tty_prepare_flip_string);
-
-/**
- *      tty_prepare_flip_string_flags   -       make room for characters
- *      @tty: tty
- *      @chars: return pointer for character write area
- *      @flags: return pointer for status flag write area
- *      @size: desired size
- *
- *      Prepare a block of space in the buffer for data. Returns the length
- *      available and buffer pointer to the space which is now allocated and
- *      accounted for as ready for characters. This is used for drivers
- *      that need their own block copy routines into the buffer. There is no
- *      guarantee the buffer is a DMA target!
- *
- *      Locking: May call functions taking tty->buf.lock
- */
-
-int tty_prepare_flip_string_flags(struct tty_struct *tty,
-                        unsigned char **chars, char **flags, size_t size)
-{
-        int space = tty_buffer_request_room(tty, size);
-        if (likely(space)) {
-                struct tty_buffer *tb = tty->buf.tail;
-                *chars = tb->char_buf_ptr + tb->used;
-                *flags = tb->flag_buf_ptr + tb->used;
-                tb->used += space;
-        }
-        return space;
-}
-EXPORT_SYMBOL_GPL(tty_prepare_flip_string_flags);
-
-
-
-/**
- *      flush_to_ldisc
- *      @work: tty structure passed from work queue.
- *
- *      This routine is called out of the software interrupt to flush data
- *      from the buffer chain to the line discipline.
- *
- *      Locking: holds tty->buf.lock to guard buffer list. Drops the lock
- *      while invoking the line discipline receive_buf method. The
- *      receive_buf method is single threaded for each tty instance.
- */
-
-static void flush_to_ldisc(struct work_struct *work)
-{
-        struct tty_struct *tty =
-                container_of(work, struct tty_struct, buf.work.work);
-        unsigned long   flags;
-        struct tty_ldisc *disc;
-
-        disc = tty_ldisc_ref(tty);
-        if (disc == NULL)       /*  !TTY_LDISC */
-                return;
-
-        spin_lock_irqsave(&tty->buf.lock, flags);
-
-        if (!test_and_set_bit(TTY_FLUSHING, &tty->flags)) {
-                struct tty_buffer *head;
-                while ((head = tty->buf.head) != NULL) {
-                        int count;
-                        char *char_buf;
-                        unsigned char *flag_buf;
-
-                        count = head->commit - head->read;
-                        if (!count) {
-                                if (head->next == NULL)
-                                        break;
-                                tty->buf.head = head->next;
-                                tty_buffer_free(tty, head);
-                                continue;
-                        }
-                        /* Ldisc or user is trying to flush the buffers
-                           we are feeding to the ldisc, stop feeding the
-                           line discipline as we want to empty the queue */
-                        if (test_bit(TTY_FLUSHPENDING, &tty->flags))
-                                break;
-                        if (!tty->receive_room) {
-                                schedule_delayed_work(&tty->buf.work, 1);
-                                break;
-                        }
-                        if (count > tty->receive_room)
-                                count = tty->receive_room;
-                        char_buf = head->char_buf_ptr + head->read;
-                        flag_buf = head->flag_buf_ptr + head->read;
-                        head->read += count;
-                        spin_unlock_irqrestore(&tty->buf.lock, flags);
-                        disc->ops->receive_buf(tty, char_buf,
-                                                        flag_buf, count);
-                        spin_lock_irqsave(&tty->buf.lock, flags);
-                }
-                clear_bit(TTY_FLUSHING, &tty->flags);
-        }
-
-        /* We may have a deferred request to flush the input buffer,
-           if so pull the chain under the lock and empty the queue */
-        if (test_bit(TTY_FLUSHPENDING, &tty->flags)) {
-                __tty_buffer_flush(tty);
-                clear_bit(TTY_FLUSHPENDING, &tty->flags);
-                wake_up(&tty->read_wait);
-        }
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-
-        tty_ldisc_deref(disc);
-}
-
-/**
- *      tty_flush_to_ldisc
- *      @tty: tty to push
- *
- *      Push the terminal flip buffers to the line discipline.
- *
- *      Must not be called from IRQ context.
- */
-void tty_flush_to_ldisc(struct tty_struct *tty)
-{
-        flush_delayed_work(&tty->buf.work);
-}
-
-/**
- *      tty_flip_buffer_push    -       terminal
- *      @tty: tty to push
- *
- *      Queue a push of the terminal flip buffers to the line discipline. This
- *      function must not be called from IRQ context if tty->low_latency is set.
- *
- *      In the event of the queue being busy for flipping the work will be
- *      held off and retried later.
- *
- *      Locking: tty buffer lock. Driver locks in low latency mode.
- */
-
-void tty_flip_buffer_push(struct tty_struct *tty)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&tty->buf.lock, flags);
-        if (tty->buf.tail != NULL)
-                tty->buf.tail->commit = tty->buf.tail->used;
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-
-        if (tty->low_latency)
-                flush_to_ldisc(&tty->buf.work.work);
-        else
-                schedule_delayed_work(&tty->buf.work, 1);
-}
-EXPORT_SYMBOL(tty_flip_buffer_push);
-
-/**
- *      tty_buffer_init         -       prepare a tty buffer structure
- *      @tty: tty to initialise
- *
- *      Set up the initial state of the buffer management for a tty device.
- *      Must be called before the other tty buffer functions are used.
- *
- *      Locking: none
- */
-
-void tty_buffer_init(struct tty_struct *tty)
-{
-        spin_lock_init(&tty->buf.lock);
-        tty->buf.head = NULL;
-        tty->buf.tail = NULL;
-        tty->buf.free = NULL;
-        tty->buf.memory_used = 0;
-        INIT_DELAYED_WORK(&tty->buf.work, flush_to_ldisc);
-}
-
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
deleted file mode 100644
index 613c852ee0fe..000000000000
--- a/drivers/char/tty_io.c
+++ /dev/null
@@ -1,3198 +0,0 @@
-/*
- *  linux/drivers/char/tty_io.c
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- */
-
-/*
- * 'tty_io.c' gives an orthogonal feeling to tty's, be they consoles
- * or rs-channels. It also implements echoing, cooked mode etc.
- *
- * Kill-line thanks to John T Kohl, who also corrected VMIN = VTIME = 0.
- *
- * Modified by Theodore Ts'o, 9/14/92, to dynamically allocate the
- * tty_struct and tty_queue structures.  Previously there was an array
- * of 256 tty_struct's which was statically allocated, and the
- * tty_queue structures were allocated at boot time.  Both are now
- * dynamically allocated only when the tty is open.
- *
- * Also restructured routines so that there is more of a separation
- * between the high-level tty routines (tty_io.c and tty_ioctl.c) and
- * the low-level tty routines (serial.c, pty.c, console.c).  This
- * makes for cleaner and more compact code.  -TYT, 9/17/92
- *
- * Modified by Fred N. van Kempen, 01/29/93, to add line disciplines
- * which can be dynamically activated and de-activated by the line
- * discipline handling modules (like SLIP).
- *
- * NOTE: pay no attention to the line discipline code (yet); its
- * interface is still subject to change in this version...
- * -- TYT, 1/31/92
- *
- * Added functionality to the OPOST tty handling.  No delays, but all
- * other bits should be there.
- *      -- Nick Holloway <alfie@dcs.warwick.ac.uk>, 27th May 1993.
- *
- * Rewrote canonical mode and added more termios flags.
- *      -- julian@uhunix.uhcc.hawaii.edu (J. Cowley), 13Jan94
- *
- * Reorganized FASYNC support so mouse code can share it.
- *      -- ctm@ardi.com, 9Sep95
- *
- * New TIOCLINUX variants added.
- *      -- mj@k332.feld.cvut.cz, 19-Nov-95
- *
- * Restrict vt switching via ioctl()
- *      -- grif@cs.ucr.edu, 5-Dec-95
- *
- * Move console and virtual terminal code to more appropriate files,
- * implement CONFIG_VT and generalize console device interface.
- *      -- Marko Kohtala <Marko.Kohtala@hut.fi>, March 97
- *
- * Rewrote tty_init_dev and tty_release_dev to eliminate races.
- *      -- Bill Hawes <whawes@star.net>, June 97
- *
- * Added devfs support.
- *      -- C. Scott Ananian <cananian@alumni.princeton.edu>, 13-Jan-1998
- *
- * Added support for a Unix98-style ptmx device.
- *      -- C. Scott Ananian <cananian@alumni.princeton.edu>, 14-Jan-1998
- *
- * Reduced memory usage for older ARM systems
- *      -- Russell King <rmk@arm.linux.org.uk>
- *
- * Move do_SAK() into process context.  Less stack use in devfs functions.
- * alloc_tty_struct() always uses kmalloc()
- *                       -- Andrew Morton <andrewm@uow.edu.eu> 17Mar01
- */
-
-#include <linux/types.h>
-#include <linux/major.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/fcntl.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <linux/devpts_fs.h>
-#include <linux/file.h>
-#include <linux/fdtable.h>
-#include <linux/console.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/kd.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/smp_lock.h>
-#include <linux/device.h>
-#include <linux/wait.h>
-#include <linux/bitops.h>
-#include <linux/delay.h>
-#include <linux/seq_file.h>
-
-#include <linux/uaccess.h>
-#include <asm/system.h>
-
-#include <linux/kbd_kern.h>
-#include <linux/vt_kern.h>
-#include <linux/selection.h>
-
-#include <linux/kmod.h>
-#include <linux/nsproxy.h>
-
-#undef TTY_DEBUG_HANGUP
-
-#define TTY_PARANOIA_CHECK 1
-#define CHECK_TTY_COUNT 1
-
-struct ktermios tty_std_termios = {     /* for the benefit of tty drivers  */
-        .c_iflag = ICRNL | IXON,
-        .c_oflag = OPOST | ONLCR,
-        .c_cflag = B38400 | CS8 | CREAD | HUPCL,
-        .c_lflag = ISIG | ICANON | ECHO | ECHOE | ECHOK |
-                   ECHOCTL | ECHOKE | IEXTEN,
-        .c_cc = INIT_C_CC,
-        .c_ispeed = 38400,
-        .c_ospeed = 38400
-};
-
-EXPORT_SYMBOL(tty_std_termios);
-
-/* This list gets poked at by procfs and various bits of boot up code. This
-   could do with some rationalisation such as pulling the tty proc function
-   into this file */
-
-LIST_HEAD(tty_drivers);                 /* linked list of tty drivers */
-
-/* Mutex to protect creating and releasing a tty. This is shared with
-   vt.c for deeply disgusting hack reasons */
-DEFINE_MUTEX(tty_mutex);
-EXPORT_SYMBOL(tty_mutex);
-
-/* Spinlock to protect the tty->tty_files list */
-DEFINE_SPINLOCK(tty_files_lock);
-
-static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
-static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
-ssize_t redirected_tty_write(struct file *, const char __user *,
-                                                        size_t, loff_t *);
-static unsigned int tty_poll(struct file *, poll_table *);
-static int tty_open(struct inode *, struct file *);
-long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
-#ifdef CONFIG_COMPAT
-static long tty_compat_ioctl(struct file *file, unsigned int cmd,
-                                unsigned long arg);
-#else
-#define tty_compat_ioctl NULL
-#endif
-static int __tty_fasync(int fd, struct file *filp, int on);
-static int tty_fasync(int fd, struct file *filp, int on);
-static void release_tty(struct tty_struct *tty, int idx);
-static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
-static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
-
-/**
- *      alloc_tty_struct        -       allocate a tty object
- *
- *      Return a new empty tty structure. The data fields have not
- *      been initialized in any way but has been zeroed
- *
- *      Locking: none
- */
-
-struct tty_struct *alloc_tty_struct(void)
-{
-        return kzalloc(sizeof(struct tty_struct), GFP_KERNEL);
-}
-
-/**
- *      free_tty_struct         -       free a disused tty
- *      @tty: tty struct to free
- *
- *      Free the write buffers, tty queue and tty memory itself.
- *
- *      Locking: none. Must be called after tty is definitely unused
- */
-
-void free_tty_struct(struct tty_struct *tty)
-{
-        kfree(tty->write_buf);
-        tty_buffer_free_all(tty);
-        kfree(tty);
-}
-
-static inline struct tty_struct *file_tty(struct file *file)
-{
-        return ((struct tty_file_private *)file->private_data)->tty;
-}
-
-/* Associate a new file with the tty structure */
-void tty_add_file(struct tty_struct *tty, struct file *file)
-{
-        struct tty_file_private *priv;
-
-        /* XXX: must implement proper error handling in callers */
-        priv = kmalloc(sizeof(*priv), GFP_KERNEL|__GFP_NOFAIL);
-
-        priv->tty = tty;
-        priv->file = file;
-        file->private_data = priv;
-
-        spin_lock(&tty_files_lock);
-        list_add(&priv->list, &tty->tty_files);
-        spin_unlock(&tty_files_lock);
-}
-
-/* Delete file from its tty */
-void tty_del_file(struct file *file)
-{
-        struct tty_file_private *priv = file->private_data;
-
-        spin_lock(&tty_files_lock);
-        list_del(&priv->list);
-        spin_unlock(&tty_files_lock);
-        file->private_data = NULL;
-        kfree(priv);
-}
-
-
-#define TTY_NUMBER(tty) ((tty)->index + (tty)->driver->name_base)
-
-/**
- *      tty_name        -       return tty naming
- *      @tty: tty structure
- *      @buf: buffer for output
- *
- *      Convert a tty structure into a name. The name reflects the kernel
- *      naming policy and if udev is in use may not reflect user space
- *
- *      Locking: none
- */
-
-char *tty_name(struct tty_struct *tty, char *buf)
-{
-        if (!tty) /* Hmm.  NULL pointer.  That's fun. */
-                strcpy(buf, "NULL tty");
-        else
-                strcpy(buf, tty->name);
-        return buf;
-}
-
-EXPORT_SYMBOL(tty_name);
-
-int tty_paranoia_check(struct tty_struct *tty, struct inode *inode,
-                              const char *routine)
-{
-#ifdef TTY_PARANOIA_CHECK
-        if (!tty) {
-                printk(KERN_WARNING
-                        "null TTY for (%d:%d) in %s\n",
-                        imajor(inode), iminor(inode), routine);
-                return 1;
-        }
-        if (tty->magic != TTY_MAGIC) {
-                printk(KERN_WARNING
-                        "bad magic number for tty struct (%d:%d) in %s\n",
-                        imajor(inode), iminor(inode), routine);
-                return 1;
-        }
-#endif
-        return 0;
-}
-
-static int check_tty_count(struct tty_struct *tty, const char *routine)
-{
-#ifdef CHECK_TTY_COUNT
-        struct list_head *p;
-        int count = 0;
-
-        spin_lock(&tty_files_lock);
-        list_for_each(p, &tty->tty_files) {
-                count++;
-        }
-        spin_unlock(&tty_files_lock);
-        if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
-            tty->driver->subtype == PTY_TYPE_SLAVE &&
-            tty->link && tty->link->count)
-                count++;
-        if (tty->count != count) {
-                printk(KERN_WARNING "Warning: dev (%s) tty->count(%d) "
-                                    "!= #fd's(%d) in %s\n",
-                       tty->name, tty->count, count, routine);
-                return count;
-        }
-#endif
-        return 0;
-}
-
-/**
- *      get_tty_driver          -       find device of a tty
- *      @dev_t: device identifier
- *      @index: returns the index of the tty
- *
- *      This routine returns a tty driver structure, given a device number
- *      and also passes back the index number.
- *
- *      Locking: caller must hold tty_mutex
- */
-
-static struct tty_driver *get_tty_driver(dev_t device, int *index)
-{
-        struct tty_driver *p;
-
-        list_for_each_entry(p, &tty_drivers, tty_drivers) {
-                dev_t base = MKDEV(p->major, p->minor_start);
-                if (device < base || device >= base + p->num)
-                        continue;
-                *index = device - base;
-                return tty_driver_kref_get(p);
-        }
-        return NULL;
-}
-
-#ifdef CONFIG_CONSOLE_POLL
-
-/**
- *      tty_find_polling_driver -       find device of a polled tty
- *      @name: name string to match
- *      @line: pointer to resulting tty line nr
- *
- *      This routine returns a tty driver structure, given a name
- *      and the condition that the tty driver is capable of polled
- *      operation.
- */
-struct tty_driver *tty_find_polling_driver(char *name, int *line)
-{
-        struct tty_driver *p, *res = NULL;
-        int tty_line = 0;
-        int len;
-        char *str, *stp;
-
-        for (str = name; *str; str++)
-                if ((*str >= '0' && *str <= '9') || *str == ',')
-                        break;
-        if (!*str)
-                return NULL;
-
-        len = str - name;
-        tty_line = simple_strtoul(str, &str, 10);
-
-        mutex_lock(&tty_mutex);
-        /* Search through the tty devices to look for a match */
-        list_for_each_entry(p, &tty_drivers, tty_drivers) {
-                if (strncmp(name, p->name, len) != 0)
-                        continue;
-                stp = str;
-                if (*stp == ',')
-                        stp++;
-                if (*stp == '\0')
-                        stp = NULL;
-
-                if (tty_line >= 0 && tty_line < p->num && p->ops &&
-                    p->ops->poll_init && !p->ops->poll_init(p, tty_line, stp)) {
-                        res = tty_driver_kref_get(p);
-                        *line = tty_line;
-                        break;
-                }
-        }
-        mutex_unlock(&tty_mutex);
-
-        return res;
-}
-EXPORT_SYMBOL_GPL(tty_find_polling_driver);
-#endif
-
-/**
- *      tty_check_change        -       check for POSIX terminal changes
- *      @tty: tty to check
- *
- *      If we try to write to, or set the state of, a terminal and we're
- *      not in the foreground, send a SIGTTOU.  If the signal is blocked or
- *      ignored, go ahead and perform the operation.  (POSIX 7.2)
- *
- *      Locking: ctrl_lock
- */
-
-int tty_check_change(struct tty_struct *tty)
-{
-        unsigned long flags;
-        int ret = 0;
-
-        if (current->signal->tty != tty)
-                return 0;
-
-        spin_lock_irqsave(&tty->ctrl_lock, flags);
-
-        if (!tty->pgrp) {
-                printk(KERN_WARNING "tty_check_change: tty->pgrp == NULL!\n");
-                goto out_unlock;
-        }
-        if (task_pgrp(current) == tty->pgrp)
-                goto out_unlock;
-        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-        if (is_ignored(SIGTTOU))
-                goto out;
-        if (is_current_pgrp_orphaned()) {
-                ret = -EIO;
-                goto out;
-        }
-        kill_pgrp(task_pgrp(current), SIGTTOU, 1);
-        set_thread_flag(TIF_SIGPENDING);
-        ret = -ERESTARTSYS;
-out:
-        return ret;
-out_unlock:
-        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-        return ret;
-}
-
-EXPORT_SYMBOL(tty_check_change);
-
-static ssize_t hung_up_tty_read(struct file *file, char __user *buf,
-                                size_t count, loff_t *ppos)
-{
-        return 0;
-}
-
-static ssize_t hung_up_tty_write(struct file *file, const char __user *buf,
-                                 size_t count, loff_t *ppos)
-{
-        return -EIO;
-}
-
-/* No kernel lock held - none needed ;) */
-static unsigned int hung_up_tty_poll(struct file *filp, poll_table *wait)
-{
-        return POLLIN | POLLOUT | POLLERR | POLLHUP | POLLRDNORM | POLLWRNORM;
-}
-
-static long hung_up_tty_ioctl(struct file *file, unsigned int cmd,
-                unsigned long arg)
-{
-        return cmd == TIOCSPGRP ? -ENOTTY : -EIO;
-}
-
-static long hung_up_tty_compat_ioctl(struct file *file,
-                                     unsigned int cmd, unsigned long arg)
-{
-        return cmd == TIOCSPGRP ? -ENOTTY : -EIO;
-}
-
-static const struct file_operations tty_fops = {
-        .llseek         = no_llseek,
-        .read           = tty_read,
-        .write          = tty_write,
-        .poll           = tty_poll,
-        .unlocked_ioctl = tty_ioctl,
-        .compat_ioctl   = tty_compat_ioctl,
-        .open           = tty_open,
-        .release        = tty_release,
-        .fasync         = tty_fasync,
-};
-
-static const struct file_operations console_fops = {
-        .llseek         = no_llseek,
-        .read           = tty_read,
-        .write          = redirected_tty_write,
-        .poll           = tty_poll,
-        .unlocked_ioctl = tty_ioctl,
-        .compat_ioctl   = tty_compat_ioctl,
-        .open           = tty_open,
-        .release        = tty_release,
-        .fasync         = tty_fasync,
-};
-
-static const struct file_operations hung_up_tty_fops = {
-        .llseek         = no_llseek,
-        .read           = hung_up_tty_read,
-        .write          = hung_up_tty_write,
-        .poll           = hung_up_tty_poll,
-        .unlocked_ioctl = hung_up_tty_ioctl,
-        .compat_ioctl   = hung_up_tty_compat_ioctl,
-        .release        = tty_release,
-};
-
-static DEFINE_SPINLOCK(redirect_lock);
-static struct file *redirect;
-
-/**
- *      tty_wakeup      -       request more data
- *      @tty: terminal
- *
- *      Internal and external helper for wakeups of tty. This function
- *      informs the line discipline if present that the driver is ready
- *      to receive more output data.
- */
-
-void tty_wakeup(struct tty_struct *tty)
-{
-        struct tty_ldisc *ld;
-
-        if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags)) {
-                ld = tty_ldisc_ref(tty);
-                if (ld) {
-                        if (ld->ops->write_wakeup)
-                                ld->ops->write_wakeup(tty);
-                        tty_ldisc_deref(ld);
-                }
-        }
-        wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
-}
-
-EXPORT_SYMBOL_GPL(tty_wakeup);
-
-/**
- *      __tty_hangup            -       actual handler for hangup events
- *      @work: tty device
- *
- *      This can be called by the "eventd" kernel thread.  That is process
- *      synchronous but doesn't hold any locks, so we need to make sure we
- *      have the appropriate locks for what we're doing.
- *
- *      The hangup event clears any pending redirections onto the hung up
- *      device. It ensures future writes will error and it does the needed
- *      line discipline hangup and signal delivery. The tty object itself
- *      remains intact.
- *
- *      Locking:
- *              BTM
- *                redirect lock for undoing redirection
- *                file list lock for manipulating list of ttys
- *                tty_ldisc_lock from called functions
- *                termios_mutex resetting termios data
- *                tasklist_lock to walk task list for hangup event
- *                  ->siglock to protect ->signal/->sighand
- */
-void __tty_hangup(struct tty_struct *tty)
-{
-        struct file *cons_filp = NULL;
-        struct file *filp, *f = NULL;
-        struct task_struct *p;
-        struct tty_file_private *priv;
-        int    closecount = 0, n;
-        unsigned long flags;
-        int refs = 0;
-
-        if (!tty)
-                return;
-
-
-        spin_lock(&redirect_lock);
-        if (redirect && file_tty(redirect) == tty) {
-                f = redirect;
-                redirect = NULL;
-        }
-        spin_unlock(&redirect_lock);
-
-        tty_lock();
-
-        /* inuse_filps is protected by the single tty lock,
-           this really needs to change if we want to flush the
-           workqueue with the lock held */
-        check_tty_count(tty, "tty_hangup");
-
-        spin_lock(&tty_files_lock);
-        /* This breaks for file handles being sent over AF_UNIX sockets ? */
-        list_for_each_entry(priv, &tty->tty_files, list) {
-                filp = priv->file;
-                if (filp->f_op->write == redirected_tty_write)
-                        cons_filp = filp;
-                if (filp->f_op->write != tty_write)
-                        continue;
-                closecount++;
-                __tty_fasync(-1, filp, 0);      /* can't block */
-                filp->f_op = &hung_up_tty_fops;
-        }
-        spin_unlock(&tty_files_lock);
-
-        tty_ldisc_hangup(tty);
-
-        read_lock(&tasklist_lock);
-        if (tty->session) {
-                do_each_pid_task(tty->session, PIDTYPE_SID, p) {
-                        spin_lock_irq(&p->sighand->siglock);
-                        if (p->signal->tty == tty) {
-                                p->signal->tty = NULL;
-                                /* We defer the dereferences outside fo
-                                   the tasklist lock */
-                                refs++;
-                        }
-                        if (!p->signal->leader) {
-                                spin_unlock_irq(&p->sighand->siglock);
-                                continue;
-                        }
-                        __group_send_sig_info(SIGHUP, SEND_SIG_PRIV, p);
-                        __group_send_sig_info(SIGCONT, SEND_SIG_PRIV, p);
-                        put_pid(p->signal->tty_old_pgrp);  /* A noop */
-                        spin_lock_irqsave(&tty->ctrl_lock, flags);
-                        if (tty->pgrp)
-                                p->signal->tty_old_pgrp = get_pid(tty->pgrp);
-                        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                        spin_unlock_irq(&p->sighand->siglock);
-                } while_each_pid_task(tty->session, PIDTYPE_SID, p);
-        }
-        read_unlock(&tasklist_lock);
-
-        spin_lock_irqsave(&tty->ctrl_lock, flags);
-        clear_bit(TTY_THROTTLED, &tty->flags);
-        clear_bit(TTY_PUSH, &tty->flags);
-        clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
-        put_pid(tty->session);
-        put_pid(tty->pgrp);
-        tty->session = NULL;
-        tty->pgrp = NULL;
-        tty->ctrl_status = 0;
-        set_bit(TTY_HUPPED, &tty->flags);
-        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-
-        /* Account for the p->signal references we killed */
-        while (refs--)
-                tty_kref_put(tty);
-
-        /*
-         * If one of the devices matches a console pointer, we
-         * cannot just call hangup() because that will cause
-         * tty->count and state->count to go out of sync.
-         * So we just call close() the right number of times.
-         */
-        if (cons_filp) {
-                if (tty->ops->close)
-                        for (n = 0; n < closecount; n++)
-                                tty->ops->close(tty, cons_filp);
-        } else if (tty->ops->hangup)
-                (tty->ops->hangup)(tty);
-        /*
-         * We don't want to have driver/ldisc interactions beyond
-         * the ones we did here. The driver layer expects no
-         * calls after ->hangup() from the ldisc side. However we
-         * can't yet guarantee all that.
-         */
-        set_bit(TTY_HUPPED, &tty->flags);
-        tty_ldisc_enable(tty);
-
-        tty_unlock();
-
-        if (f)
-                fput(f);
-}
-
-static void do_tty_hangup(struct work_struct *work)
-{
-        struct tty_struct *tty =
-                container_of(work, struct tty_struct, hangup_work);
-
-        __tty_hangup(tty);
-}
-
-/**
- *      tty_hangup              -       trigger a hangup event
- *      @tty: tty to hangup
- *
- *      A carrier loss (virtual or otherwise) has occurred on this like
- *      schedule a hangup sequence to run after this event.
- */
-
-void tty_hangup(struct tty_struct *tty)
-{
-#ifdef TTY_DEBUG_HANGUP
-        char    buf[64];
-        printk(KERN_DEBUG "%s hangup...\n", tty_name(tty, buf));
-#endif
-        schedule_work(&tty->hangup_work);
-}
-
-EXPORT_SYMBOL(tty_hangup);
-
-/**
- *      tty_vhangup             -       process vhangup
- *      @tty: tty to hangup
- *
- *      The user has asked via system call for the terminal to be hung up.
- *      We do this synchronously so that when the syscall returns the process
- *      is complete. That guarantee is necessary for security reasons.
- */
-
-void tty_vhangup(struct tty_struct *tty)
-{
-#ifdef TTY_DEBUG_HANGUP
-        char    buf[64];
-
-        printk(KERN_DEBUG "%s vhangup...\n", tty_name(tty, buf));
-#endif
-        __tty_hangup(tty);
-}
-
-EXPORT_SYMBOL(tty_vhangup);
-
-
-/**
- *      tty_vhangup_self        -       process vhangup for own ctty
- *
- *      Perform a vhangup on the current controlling tty
- */
-
-void tty_vhangup_self(void)
-{
-        struct tty_struct *tty;
-
-        tty = get_current_tty();
-        if (tty) {
-                tty_vhangup(tty);
-                tty_kref_put(tty);
-        }
-}
-
-/**
- *      tty_hung_up_p           -       was tty hung up
- *      @filp: file pointer of tty
- *
- *      Return true if the tty has been subject to a vhangup or a carrier
- *      loss
- */
-
-int tty_hung_up_p(struct file *filp)
-{
-        return (filp->f_op == &hung_up_tty_fops);
-}
-
-EXPORT_SYMBOL(tty_hung_up_p);
-
-static void session_clear_tty(struct pid *session)
-{
-        struct task_struct *p;
-        do_each_pid_task(session, PIDTYPE_SID, p) {
-                proc_clear_tty(p);
-        } while_each_pid_task(session, PIDTYPE_SID, p);
-}
-
-/**
- *      disassociate_ctty       -       disconnect controlling tty
- *      @on_exit: true if exiting so need to "hang up" the session
- *
- *      This function is typically called only by the session leader, when
- *      it wants to disassociate itself from its controlling tty.
- *
- *      It performs the following functions:
- *      (1)  Sends a SIGHUP and SIGCONT to the foreground process group
- *      (2)  Clears the tty from being controlling the session
- *      (3)  Clears the controlling tty for all processes in the
- *              session group.
- *
- *      The argument on_exit is set to 1 if called when a process is
- *      exiting; it is 0 if called by the ioctl TIOCNOTTY.
- *
- *      Locking:
- *              BTM is taken for hysterical raisins, and held when
- *                called from no_tty().
- *                tty_mutex is taken to protect tty
- *                ->siglock is taken to protect ->signal/->sighand
- *                tasklist_lock is taken to walk process list for sessions
- *                  ->siglock is taken to protect ->signal/->sighand
- */
-
-void disassociate_ctty(int on_exit)
-{
-        struct tty_struct *tty;
-        struct pid *tty_pgrp = NULL;
-
-        if (!current->signal->leader)
-                return;
-
-        tty = get_current_tty();
-        if (tty) {
-                tty_pgrp = get_pid(tty->pgrp);
-                if (on_exit) {
-                        if (tty->driver->type != TTY_DRIVER_TYPE_PTY)
-                                tty_vhangup(tty);
-                }
-                tty_kref_put(tty);
-        } else if (on_exit) {
-                struct pid *old_pgrp;
-                spin_lock_irq(&current->sighand->siglock);
-                old_pgrp = current->signal->tty_old_pgrp;
-                current->signal->tty_old_pgrp = NULL;
-                spin_unlock_irq(&current->sighand->siglock);
-                if (old_pgrp) {
-                        kill_pgrp(old_pgrp, SIGHUP, on_exit);
-                        kill_pgrp(old_pgrp, SIGCONT, on_exit);
-                        put_pid(old_pgrp);
-                }
-                return;
-        }
-        if (tty_pgrp) {
-                kill_pgrp(tty_pgrp, SIGHUP, on_exit);
-                if (!on_exit)
-                        kill_pgrp(tty_pgrp, SIGCONT, on_exit);
-                put_pid(tty_pgrp);
-        }
-
-        spin_lock_irq(&current->sighand->siglock);
-        put_pid(current->signal->tty_old_pgrp);
-        current->signal->tty_old_pgrp = NULL;
-        spin_unlock_irq(&current->sighand->siglock);
-
-        tty = get_current_tty();
-        if (tty) {
-                unsigned long flags;
-                spin_lock_irqsave(&tty->ctrl_lock, flags);
-                put_pid(tty->session);
-                put_pid(tty->pgrp);
-                tty->session = NULL;
-                tty->pgrp = NULL;
-                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                tty_kref_put(tty);
-        } else {
-#ifdef TTY_DEBUG_HANGUP
-                printk(KERN_DEBUG "error attempted to write to tty [0x%p]"
-                       " = NULL", tty);
-#endif
-        }
-
-        /* Now clear signal->tty under the lock */
-        read_lock(&tasklist_lock);
-        session_clear_tty(task_session(current));
-        read_unlock(&tasklist_lock);
-}
-
-/**
- *
- *      no_tty  - Ensure the current process does not have a controlling tty
- */
-void no_tty(void)
-{
-        struct task_struct *tsk = current;
-        tty_lock();
-        disassociate_ctty(0);
-        tty_unlock();
-        proc_clear_tty(tsk);
-}
-
-
-/**
- *      stop_tty        -       propagate flow control
- *      @tty: tty to stop
- *
- *      Perform flow control to the driver. For PTY/TTY pairs we
- *      must also propagate the TIOCKPKT status. May be called
- *      on an already stopped device and will not re-call the driver
- *      method.
- *
- *      This functionality is used by both the line disciplines for
- *      halting incoming flow and by the driver. It may therefore be
- *      called from any context, may be under the tty atomic_write_lock
- *      but not always.
- *
- *      Locking:
- *              Uses the tty control lock internally
- */
-
-void stop_tty(struct tty_struct *tty)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&tty->ctrl_lock, flags);
-        if (tty->stopped) {
-                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                return;
-        }
-        tty->stopped = 1;
-        if (tty->link && tty->link->packet) {
-                tty->ctrl_status &= ~TIOCPKT_START;
-                tty->ctrl_status |= TIOCPKT_STOP;
-                wake_up_interruptible_poll(&tty->link->read_wait, POLLIN);
-        }
-        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-        if (tty->ops->stop)
-                (tty->ops->stop)(tty);
-}
-
-EXPORT_SYMBOL(stop_tty);
-
-/**
- *      start_tty       -       propagate flow control
- *      @tty: tty to start
- *
- *      Start a tty that has been stopped if at all possible. Perform
- *      any necessary wakeups and propagate the TIOCPKT status. If this
- *      is the tty was previous stopped and is being started then the
- *      driver start method is invoked and the line discipline woken.
- *
- *      Locking:
- *              ctrl_lock
- */
-
-void start_tty(struct tty_struct *tty)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&tty->ctrl_lock, flags);
-        if (!tty->stopped || tty->flow_stopped) {
-                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                return;
-        }
-        tty->stopped = 0;
-        if (tty->link && tty->link->packet) {
-                tty->ctrl_status &= ~TIOCPKT_STOP;
-                tty->ctrl_status |= TIOCPKT_START;
-                wake_up_interruptible_poll(&tty->link->read_wait, POLLIN);
-        }
-        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-        if (tty->ops->start)
-                (tty->ops->start)(tty);
-        /* If we have a running line discipline it may need kicking */
-        tty_wakeup(tty);
-}
-
-EXPORT_SYMBOL(start_tty);
-
-/**
- *      tty_read        -       read method for tty device files
- *      @file: pointer to tty file
- *      @buf: user buffer
- *      @count: size of user buffer
- *      @ppos: unused
- *
- *      Perform the read system call function on this terminal device. Checks
- *      for hung up devices before calling the line discipline method.
- *
- *      Locking:
- *              Locks the line discipline internally while needed. Multiple
- *      read calls may be outstanding in parallel.
- */
-
-static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
-                        loff_t *ppos)
-{
-        int i;
-        struct inode *inode = file->f_path.dentry->d_inode;
-        struct tty_struct *tty = file_tty(file);
-        struct tty_ldisc *ld;
-
-        if (tty_paranoia_check(tty, inode, "tty_read"))
-                return -EIO;
-        if (!tty || (test_bit(TTY_IO_ERROR, &tty->flags)))
-                return -EIO;
-
-        /* We want to wait for the line discipline to sort out in this
-           situation */
-        ld = tty_ldisc_ref_wait(tty);
-        if (ld->ops->read)
-                i = (ld->ops->read)(tty, file, buf, count);
-        else
-                i = -EIO;
-        tty_ldisc_deref(ld);
-        if (i > 0)
-                inode->i_atime = current_fs_time(inode->i_sb);
-        return i;
-}
-
-void tty_write_unlock(struct tty_struct *tty)
-{
-        mutex_unlock(&tty->atomic_write_lock);
-        wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
-}
-
-int tty_write_lock(struct tty_struct *tty, int ndelay)
-{
-        if (!mutex_trylock(&tty->atomic_write_lock)) {
-                if (ndelay)
-                        return -EAGAIN;
-                if (mutex_lock_interruptible(&tty->atomic_write_lock))
-                        return -ERESTARTSYS;
-        }
-        return 0;
-}
-
-/*
- * Split writes up in sane blocksizes to avoid
- * denial-of-service type attacks
- */
-static inline ssize_t do_tty_write(
-        ssize_t (*write)(struct tty_struct *, struct file *, const unsigned char *, size_t),
-        struct tty_struct *tty,
-        struct file *file,
-        const char __user *buf,
-        size_t count)
-{
-        ssize_t ret, written = 0;
-        unsigned int chunk;
-
-        ret = tty_write_lock(tty, file->f_flags & O_NDELAY);
-        if (ret < 0)
-                return ret;
-
-        /*
-         * We chunk up writes into a temporary buffer. This
-         * simplifies low-level drivers immensely, since they
-         * don't have locking issues and user mode accesses.
-         *
-         * But if TTY_NO_WRITE_SPLIT is set, we should use a
-         * big chunk-size..
-         *
-         * The default chunk-size is 2kB, because the NTTY
-         * layer has problems with bigger chunks. It will
-         * claim to be able to handle more characters than
-         * it actually does.
-         *
-         * FIXME: This can probably go away now except that 64K chunks
-         * are too likely to fail unless switched to vmalloc...
-         */
-        chunk = 2048;
-        if (test_bit(TTY_NO_WRITE_SPLIT, &tty->flags))
-                chunk = 65536;
-        if (count < chunk)
-                chunk = count;
-
-        /* write_buf/write_cnt is protected by the atomic_write_lock mutex */
-        if (tty->write_cnt < chunk) {
-                unsigned char *buf_chunk;
-
-                if (chunk < 1024)
-                        chunk = 1024;
-
-                buf_chunk = kmalloc(chunk, GFP_KERNEL);
-                if (!buf_chunk) {
-                        ret = -ENOMEM;
-                        goto out;
-                }
-                kfree(tty->write_buf);
-                tty->write_cnt = chunk;
-                tty->write_buf = buf_chunk;
-        }
-
-        /* Do the write .. */
-        for (;;) {
-                size_t size = count;
-                if (size > chunk)
-                        size = chunk;
-                ret = -EFAULT;
-                if (copy_from_user(tty->write_buf, buf, size))
-                        break;
-                ret = write(tty, file, tty->write_buf, size);
-                if (ret <= 0)
-                        break;
-                written += ret;
-                buf += ret;
-                count -= ret;
-                if (!count)
-                        break;
-                ret = -ERESTARTSYS;
-                if (signal_pending(current))
-                        break;
-                cond_resched();
-        }
-        if (written) {
-                struct inode *inode = file->f_path.dentry->d_inode;
-                inode->i_mtime = current_fs_time(inode->i_sb);
-                ret = written;
-        }
-out:
-        tty_write_unlock(tty);
-        return ret;
-}
-
-/**
- * tty_write_message - write a message to a certain tty, not just the console.
- * @tty: the destination tty_struct
- * @msg: the message to write
- *
- * This is used for messages that need to be redirected to a specific tty.
- * We don't put it into the syslog queue right now maybe in the future if
- * really needed.
- *
- * We must still hold the BTM and test the CLOSING flag for the moment.
- */
-
-void tty_write_message(struct tty_struct *tty, char *msg)
-{
-        if (tty) {
-                mutex_lock(&tty->atomic_write_lock);
-                tty_lock();
-                if (tty->ops->write && !test_bit(TTY_CLOSING, &tty->flags)) {
-                        tty_unlock();
-                        tty->ops->write(tty, msg, strlen(msg));
-                } else
-                        tty_unlock();
-                tty_write_unlock(tty);
-        }
-        return;
-}
-
-
-/**
- *      tty_write               -       write method for tty device file
- *      @file: tty file pointer
- *      @buf: user data to write
- *      @count: bytes to write
- *      @ppos: unused
- *
- *      Write data to a tty device via the line discipline.
- *
- *      Locking:
- *              Locks the line discipline as required
- *              Writes to the tty driver are serialized by the atomic_write_lock
- *      and are then processed in chunks to the device. The line discipline
- *      write method will not be invoked in parallel for each device.
- */
-
-static ssize_t tty_write(struct file *file, const char __user *buf,
-                                                size_t count, loff_t *ppos)
-{
-        struct inode *inode = file->f_path.dentry->d_inode;
-        struct tty_struct *tty = file_tty(file);
-        struct tty_ldisc *ld;
-        ssize_t ret;
-
-        if (tty_paranoia_check(tty, inode, "tty_write"))
-                return -EIO;
-        if (!tty || !tty->ops->write ||
-                (test_bit(TTY_IO_ERROR, &tty->flags)))
-                        return -EIO;
-        /* Short term debug to catch buggy drivers */
-        if (tty->ops->write_room == NULL)
-                printk(KERN_ERR "tty driver %s lacks a write_room method.\n",
-                        tty->driver->name);
-        ld = tty_ldisc_ref_wait(tty);
-        if (!ld->ops->write)
-                ret = -EIO;
-        else
-                ret = do_tty_write(ld->ops->write, tty, file, buf, count);
-        tty_ldisc_deref(ld);
-        return ret;
-}
-
-ssize_t redirected_tty_write(struct file *file, const char __user *buf,
-                                                size_t count, loff_t *ppos)
-{
-        struct file *p = NULL;
-
-        spin_lock(&redirect_lock);
-        if (redirect) {
-                get_file(redirect);
-                p = redirect;
-        }
-        spin_unlock(&redirect_lock);
-
-        if (p) {
-                ssize_t res;
-                res = vfs_write(p, buf, count, &p->f_pos);
-                fput(p);
-                return res;
-        }
-        return tty_write(file, buf, count, ppos);
-}
-
-static char ptychar[] = "pqrstuvwxyzabcde";
-
-/**
- *      pty_line_name   -       generate name for a pty
- *      @driver: the tty driver in use
- *      @index: the minor number
- *      @p: output buffer of at least 6 bytes
- *
- *      Generate a name from a driver reference and write it to the output
- *      buffer.
- *
- *      Locking: None
- */
-static void pty_line_name(struct tty_driver *driver, int index, char *p)
-{
-        int i = index + driver->name_base;
-        /* ->name is initialized to "ttyp", but "tty" is expected */
-        sprintf(p, "%s%c%x",
-                driver->subtype == PTY_TYPE_SLAVE ? "tty" : driver->name,
-                ptychar[i >> 4 & 0xf], i & 0xf);
-}
-
-/**
- *      tty_line_name   -       generate name for a tty
- *      @driver: the tty driver in use
- *      @index: the minor number
- *      @p: output buffer of at least 7 bytes
- *
- *      Generate a name from a driver reference and write it to the output
- *      buffer.
- *
- *      Locking: None
- */
-static void tty_line_name(struct tty_driver *driver, int index, char *p)
-{
-        sprintf(p, "%s%d", driver->name, index + driver->name_base);
-}
-
-/**
- *      tty_driver_lookup_tty() - find an existing tty, if any
- *      @driver: the driver for the tty
- *      @idx:    the minor number
- *
- *      Return the tty, if found or ERR_PTR() otherwise.
- *
- *      Locking: tty_mutex must be held. If tty is found, the mutex must
- *      be held until the 'fast-open' is also done. Will change once we
- *      have refcounting in the driver and per driver locking
- */
-static struct tty_struct *tty_driver_lookup_tty(struct tty_driver *driver,
-                struct inode *inode, int idx)
-{
-        struct tty_struct *tty;
-
-        if (driver->ops->lookup)
-                return driver->ops->lookup(driver, inode, idx);
-
-        tty = driver->ttys[idx];
-        return tty;
-}
-
-/**
- *      tty_init_termios        -  helper for termios setup
- *      @tty: the tty to set up
- *
- *      Initialise the termios structures for this tty. Thus runs under
- *      the tty_mutex currently so we can be relaxed about ordering.
- */
-
-int tty_init_termios(struct tty_struct *tty)
-{
-        struct ktermios *tp;
-        int idx = tty->index;
-
-        tp = tty->driver->termios[idx];
-        if (tp == NULL) {
-                tp = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);
-                if (tp == NULL)
-                        return -ENOMEM;
-                memcpy(tp, &tty->driver->init_termios,
-                                                sizeof(struct ktermios));
-                tty->driver->termios[idx] = tp;
-        }
-        tty->termios = tp;
-        tty->termios_locked = tp + 1;
-
-        /* Compatibility until drivers always set this */
-        tty->termios->c_ispeed = tty_termios_input_baud_rate(tty->termios);
-        tty->termios->c_ospeed = tty_termios_baud_rate(tty->termios);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(tty_init_termios);
-
-/**
- *      tty_driver_install_tty() - install a tty entry in the driver
- *      @driver: the driver for the tty
- *      @tty: the tty
- *
- *      Install a tty object into the driver tables. The tty->index field
- *      will be set by the time this is called. This method is responsible
- *      for ensuring any need additional structures are allocated and
- *      configured.
- *
- *      Locking: tty_mutex for now
- */
-static int tty_driver_install_tty(struct tty_driver *driver,
-                                                struct tty_struct *tty)
-{
-        int idx = tty->index;
-        int ret;
-
-        if (driver->ops->install) {
-                ret = driver->ops->install(driver, tty);
-                return ret;
-        }
-
-        if (tty_init_termios(tty) == 0) {
-                tty_driver_kref_get(driver);
-                tty->count++;
-                driver->ttys[idx] = tty;
-                return 0;
-        }
-        return -ENOMEM;
-}
-
-/**
- *      tty_driver_remove_tty() - remove a tty from the driver tables
- *      @driver: the driver for the tty
- *      @idx:    the minor number
- *
- *      Remvoe a tty object from the driver tables. The tty->index field
- *      will be set by the time this is called.
- *
- *      Locking: tty_mutex for now
- */
-static void tty_driver_remove_tty(struct tty_driver *driver,
-                                                struct tty_struct *tty)
-{
-        if (driver->ops->remove)
-                driver->ops->remove(driver, tty);
-        else
-                driver->ttys[tty->index] = NULL;
-}
-
-/*
- *      tty_reopen()    - fast re-open of an open tty
- *      @tty    - the tty to open
- *
- *      Return 0 on success, -errno on error.
- *
- *      Locking: tty_mutex must be held from the time the tty was found
- *               till this open completes.
- */
-static int tty_reopen(struct tty_struct *tty)
-{
-        struct tty_driver *driver = tty->driver;
-
-        if (test_bit(TTY_CLOSING, &tty->flags))
-                return -EIO;
-
-        if (driver->type == TTY_DRIVER_TYPE_PTY &&
-            driver->subtype == PTY_TYPE_MASTER) {
-                /*
-                 * special case for PTY masters: only one open permitted,
-                 * and the slave side open count is incremented as well.
-                 */
-                if (tty->count)
-                        return -EIO;
-
-                tty->link->count++;
-        }
-        tty->count++;
-        tty->driver = driver; /* N.B. why do this every time?? */
-
-        mutex_lock(&tty->ldisc_mutex);
-        WARN_ON(!test_bit(TTY_LDISC, &tty->flags));
-        mutex_unlock(&tty->ldisc_mutex);
-
-        return 0;
-}
-
-/**
- *      tty_init_dev            -       initialise a tty device
- *      @driver: tty driver we are opening a device on
- *      @idx: device index
- *      @ret_tty: returned tty structure
- *      @first_ok: ok to open a new device (used by ptmx)
- *
- *      Prepare a tty device. This may not be a "new" clean device but
- *      could also be an active device. The pty drivers require special
- *      handling because of this.
- *
- *      Locking:
- *              The function is called under the tty_mutex, which
- *      protects us from the tty struct or driver itself going away.
- *
- *      On exit the tty device has the line discipline attached and
- *      a reference count of 1. If a pair was created for pty/tty use
- *      and the other was a pty master then it too has a reference count of 1.
- *
- * WSH 06/09/97: Rewritten to remove races and properly clean up after a
- * failed open.  The new code protects the open with a mutex, so it's
- * really quite straightforward.  The mutex locking can probably be
- * relaxed for the (most common) case of reopening a tty.
- */
-
-struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx,
-                                                                int first_ok)
-{
-        struct tty_struct *tty;
-        int retval;
-
-        /* Check if pty master is being opened multiple times */
-        if (driver->subtype == PTY_TYPE_MASTER &&
-                (driver->flags & TTY_DRIVER_DEVPTS_MEM) && !first_ok) {
-                return ERR_PTR(-EIO);
-        }
-
-        /*
-         * First time open is complex, especially for PTY devices.
-         * This code guarantees that either everything succeeds and the
-         * TTY is ready for operation, or else the table slots are vacated
-         * and the allocated memory released.  (Except that the termios
-         * and locked termios may be retained.)
-         */
-
-        if (!try_module_get(driver->owner))
-                return ERR_PTR(-ENODEV);
-
-        tty = alloc_tty_struct();
-        if (!tty)
-                goto fail_no_mem;
-        initialize_tty_struct(tty, driver, idx);
-
-        retval = tty_driver_install_tty(driver, tty);
-        if (retval < 0) {
-                free_tty_struct(tty);
-                module_put(driver->owner);
-                return ERR_PTR(retval);
-        }
-
-        /*
-         * Structures all installed ... call the ldisc open routines.
-         * If we fail here just call release_tty to clean up.  No need
-         * to decrement the use counts, as release_tty doesn't care.
-         */
-        retval = tty_ldisc_setup(tty, tty->link);
-        if (retval)
-                goto release_mem_out;
-        return tty;
-
-fail_no_mem:
-        module_put(driver->owner);
-        return ERR_PTR(-ENOMEM);
-
-        /* call the tty release_tty routine to clean out this slot */
-release_mem_out:
-        if (printk_ratelimit())
-                printk(KERN_INFO "tty_init_dev: ldisc open failed, "
-                                 "clearing slot %d\n", idx);
-        release_tty(tty, idx);
-        return ERR_PTR(retval);
-}
-
-void tty_free_termios(struct tty_struct *tty)
-{
-        struct ktermios *tp;
-        int idx = tty->index;
-        /* Kill this flag and push into drivers for locking etc */
-        if (tty->driver->flags & TTY_DRIVER_RESET_TERMIOS) {
-                /* FIXME: Locking on ->termios array */
-                tp = tty->termios;
-                tty->driver->termios[idx] = NULL;
-                kfree(tp);
-        }
-}
-EXPORT_SYMBOL(tty_free_termios);
-
-void tty_shutdown(struct tty_struct *tty)
-{
-        tty_driver_remove_tty(tty->driver, tty);
-        tty_free_termios(tty);
-}
-EXPORT_SYMBOL(tty_shutdown);
-
-/**
- *      release_one_tty         -       release tty structure memory
- *      @kref: kref of tty we are obliterating
- *
- *      Releases memory associated with a tty structure, and clears out the
- *      driver table slots. This function is called when a device is no longer
- *      in use. It also gets called when setup of a device fails.
- *
- *      Locking:
- *              tty_mutex - sometimes only
- *              takes the file list lock internally when working on the list
- *      of ttys that the driver keeps.
- *
- *      This method gets called from a work queue so that the driver private
- *      cleanup ops can sleep (needed for USB at least)
- */
-static void release_one_tty(struct work_struct *work)
-{
-        struct tty_struct *tty =
-                container_of(work, struct tty_struct, hangup_work);
-        struct tty_driver *driver = tty->driver;
-
-        if (tty->ops->cleanup)
-                tty->ops->cleanup(tty);
-
-        tty->magic = 0;
-        tty_driver_kref_put(driver);
-        module_put(driver->owner);
-
-        spin_lock(&tty_files_lock);
-        list_del_init(&tty->tty_files);
-        spin_unlock(&tty_files_lock);
-
-        put_pid(tty->pgrp);
-        put_pid(tty->session);
-        free_tty_struct(tty);
-}
-
-static void queue_release_one_tty(struct kref *kref)
-{
-        struct tty_struct *tty = container_of(kref, struct tty_struct, kref);
-
-        if (tty->ops->shutdown)
-                tty->ops->shutdown(tty);
-        else
-                tty_shutdown(tty);
-
-        /* The hangup queue is now free so we can reuse it rather than
-           waste a chunk of memory for each port */
-        INIT_WORK(&tty->hangup_work, release_one_tty);
-        schedule_work(&tty->hangup_work);
-}
-
-/**
- *      tty_kref_put            -       release a tty kref
- *      @tty: tty device
- *
- *      Release a reference to a tty device and if need be let the kref
- *      layer destruct the object for us
- */
-
-void tty_kref_put(struct tty_struct *tty)
-{
-        if (tty)
-                kref_put(&tty->kref, queue_release_one_tty);
-}
-EXPORT_SYMBOL(tty_kref_put);
-
-/**
- *      release_tty             -       release tty structure memory
- *
- *      Release both @tty and a possible linked partner (think pty pair),
- *      and decrement the refcount of the backing module.
- *
- *      Locking:
- *              tty_mutex - sometimes only
- *              takes the file list lock internally when working on the list
- *      of ttys that the driver keeps.
- *              FIXME: should we require tty_mutex is held here ??
- *
- */
-static void release_tty(struct tty_struct *tty, int idx)
-{
-        /* This should always be true but check for the moment */
-        WARN_ON(tty->index != idx);
-
-        if (tty->link)
-                tty_kref_put(tty->link);
-        tty_kref_put(tty);
-}
-
-/**
- *      tty_release             -       vfs callback for close
- *      @inode: inode of tty
- *      @filp: file pointer for handle to tty
- *
- *      Called the last time each file handle is closed that references
- *      this tty. There may however be several such references.
- *
- *      Locking:
- *              Takes bkl. See tty_release_dev
- *
- * Even releasing the tty structures is a tricky business.. We have
- * to be very careful that the structures are all released at the
- * same time, as interrupts might otherwise get the wrong pointers.
- *
- * WSH 09/09/97: rewritten to avoid some nasty race conditions that could
- * lead to double frees or releasing memory still in use.
- */
-
-int tty_release(struct inode *inode, struct file *filp)
-{
-        struct tty_struct *tty = file_tty(filp);
-        struct tty_struct *o_tty;
-        int     pty_master, tty_closing, o_tty_closing, do_sleep;
-        int     devpts;
-        int     idx;
-        char    buf[64];
-
-        if (tty_paranoia_check(tty, inode, "tty_release_dev"))
-                return 0;
-
-        tty_lock();
-        check_tty_count(tty, "tty_release_dev");
-
-        __tty_fasync(-1, filp, 0);
-
-        idx = tty->index;
-        pty_master = (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
-                      tty->driver->subtype == PTY_TYPE_MASTER);
-        devpts = (tty->driver->flags & TTY_DRIVER_DEVPTS_MEM) != 0;
-        o_tty = tty->link;
-
-#ifdef TTY_PARANOIA_CHECK
-        if (idx < 0 || idx >= tty->driver->num) {
-                printk(KERN_DEBUG "tty_release_dev: bad idx when trying to "
-                                  "free (%s)\n", tty->name);
-                tty_unlock();
-                return 0;
-        }
-        if (!devpts) {
-                if (tty != tty->driver->ttys[idx]) {
-                        tty_unlock();
-                        printk(KERN_DEBUG "tty_release_dev: driver.table[%d] not tty "
-                               "for (%s)\n", idx, tty->name);
-                        return 0;
-                }
-                if (tty->termios != tty->driver->termios[idx]) {
-                        tty_unlock();
-                        printk(KERN_DEBUG "tty_release_dev: driver.termios[%d] not termios "
-                               "for (%s)\n",
-                               idx, tty->name);
-                        return 0;
-                }
-        }
-#endif
-
-#ifdef TTY_DEBUG_HANGUP
-        printk(KERN_DEBUG "tty_release_dev of %s (tty count=%d)...",
-               tty_name(tty, buf), tty->count);
-#endif
-
-#ifdef TTY_PARANOIA_CHECK
-        if (tty->driver->other &&
-             !(tty->driver->flags & TTY_DRIVER_DEVPTS_MEM)) {
-                if (o_tty != tty->driver->other->ttys[idx]) {
-                        tty_unlock();
-                        printk(KERN_DEBUG "tty_release_dev: other->table[%d] "
-                                          "not o_tty for (%s)\n",
-                               idx, tty->name);
-                        return 0 ;
-                }
-                if (o_tty->termios != tty->driver->other->termios[idx]) {
-                        tty_unlock();
-                        printk(KERN_DEBUG "tty_release_dev: other->termios[%d] "
-                                          "not o_termios for (%s)\n",
-                               idx, tty->name);
-                        return 0;
-                }
-                if (o_tty->link != tty) {
-                        tty_unlock();
-                        printk(KERN_DEBUG "tty_release_dev: bad pty pointers\n");
-                        return 0;
-                }
-        }
-#endif
-        if (tty->ops->close)
-                tty->ops->close(tty, filp);
-
-        tty_unlock();
-        /*
-         * Sanity check: if tty->count is going to zero, there shouldn't be
-         * any waiters on tty->read_wait or tty->write_wait.  We test the
-         * wait queues and kick everyone out _before_ actually starting to
-         * close.  This ensures that we won't block while releasing the tty
-         * structure.
-         *
-         * The test for the o_tty closing is necessary, since the master and
-         * slave sides may close in any order.  If the slave side closes out
-         * first, its count will be one, since the master side holds an open.
-         * Thus this test wouldn't be triggered at the time the slave closes,
-         * so we do it now.
-         *
-         * Note that it's possible for the tty to be opened again while we're
-         * flushing out waiters.  By recalculating the closing flags before
-         * each iteration we avoid any problems.
-         */
-        while (1) {
-                /* Guard against races with tty->count changes elsewhere and
-                   opens on /dev/tty */
-
-                mutex_lock(&tty_mutex);
-                tty_lock();
-                tty_closing = tty->count <= 1;
-                o_tty_closing = o_tty &&
-                        (o_tty->count <= (pty_master ? 1 : 0));
-                do_sleep = 0;
-
-                if (tty_closing) {
-                        if (waitqueue_active(&tty->read_wait)) {
-                                wake_up_poll(&tty->read_wait, POLLIN);
-                                do_sleep++;
-                        }
-                        if (waitqueue_active(&tty->write_wait)) {
-                                wake_up_poll(&tty->write_wait, POLLOUT);
-                                do_sleep++;
-                        }
-                }
-                if (o_tty_closing) {
-                        if (waitqueue_active(&o_tty->read_wait)) {
-                                wake_up_poll(&o_tty->read_wait, POLLIN);
-                                do_sleep++;
-                        }
-                        if (waitqueue_active(&o_tty->write_wait)) {
-                                wake_up_poll(&o_tty->write_wait, POLLOUT);
-                                do_sleep++;
-                        }
-                }
-                if (!do_sleep)
-                        break;
-
-                printk(KERN_WARNING "tty_release_dev: %s: read/write wait queue "
-                                    "active!\n", tty_name(tty, buf));
-                tty_unlock();
-                mutex_unlock(&tty_mutex);
-                schedule();
-        }
-
-        /*
-         * The closing flags are now consistent with the open counts on
-         * both sides, and we've completed the last operation that could
-         * block, so it's safe to proceed with closing.
-         */
-        if (pty_master) {
-                if (--o_tty->count < 0) {
-                        printk(KERN_WARNING "tty_release_dev: bad pty slave count "
-                                            "(%d) for %s\n",
-                               o_tty->count, tty_name(o_tty, buf));
-                        o_tty->count = 0;
-                }
-        }
-        if (--tty->count < 0) {
-                printk(KERN_WARNING "tty_release_dev: bad tty->count (%d) for %s\n",
-                       tty->count, tty_name(tty, buf));
-                tty->count = 0;
-        }
-
-        /*
-         * We've decremented tty->count, so we need to remove this file
-         * descriptor off the tty->tty_files list; this serves two
-         * purposes:
-         *  - check_tty_count sees the correct number of file descriptors
-         *    associated with this tty.
-         *  - do_tty_hangup no longer sees this file descriptor as
-         *    something that needs to be handled for hangups.
-         */
-        tty_del_file(filp);
-
-        /*
-         * Perform some housekeeping before deciding whether to return.
-         *
-         * Set the TTY_CLOSING flag if this was the last open.  In the
-         * case of a pty we may have to wait around for the other side
-         * to close, and TTY_CLOSING makes sure we can't be reopened.
-         */
-        if (tty_closing)
-                set_bit(TTY_CLOSING, &tty->flags);
-        if (o_tty_closing)
-                set_bit(TTY_CLOSING, &o_tty->flags);
-
-        /*
-         * If _either_ side is closing, make sure there aren't any
-         * processes that still think tty or o_tty is their controlling
-         * tty.
-         */
-        if (tty_closing || o_tty_closing) {
-                read_lock(&tasklist_lock);
-                session_clear_tty(tty->session);
-                if (o_tty)
-                        session_clear_tty(o_tty->session);
-                read_unlock(&tasklist_lock);
-        }
-
-        mutex_unlock(&tty_mutex);
-
-        /* check whether both sides are closing ... */
-        if (!tty_closing || (o_tty && !o_tty_closing)) {
-                tty_unlock();
-                return 0;
-        }
-
-#ifdef TTY_DEBUG_HANGUP
-        printk(KERN_DEBUG "freeing tty structure...");
-#endif
-        /*
-         * Ask the line discipline code to release its structures
-         */
-        tty_ldisc_release(tty, o_tty);
-        /*
-         * The release_tty function takes care of the details of clearing
-         * the slots and preserving the termios structure.
-         */
-        release_tty(tty, idx);
-
-        /* Make this pty number available for reallocation */
-        if (devpts)
-                devpts_kill_index(inode, idx);
-        tty_unlock();
-        return 0;
-}
-
-/**
- *      tty_open                -       open a tty device
- *      @inode: inode of device file
- *      @filp: file pointer to tty
- *
- *      tty_open and tty_release keep up the tty count that contains the
- *      number of opens done on a tty. We cannot use the inode-count, as
- *      different inodes might point to the same tty.
- *
- *      Open-counting is needed for pty masters, as well as for keeping
- *      track of serial lines: DTR is dropped when the last close happens.
- *      (This is not done solely through tty->count, now.  - Ted 1/27/92)
- *
- *      The termios state of a pty is reset on first open so that
- *      settings don't persist across reuse.
- *
- *      Locking: tty_mutex protects tty, get_tty_driver and tty_init_dev work.
- *               tty->count should protect the rest.
- *               ->siglock protects ->signal/->sighand
- */
-
-static int tty_open(struct inode *inode, struct file *filp)
-{
-        struct tty_struct *tty = NULL;
-        int noctty, retval;
-        struct tty_driver *driver;
-        int index;
-        dev_t device = inode->i_rdev;
-        unsigned saved_flags = filp->f_flags;
-
-        nonseekable_open(inode, filp);
-
-retry_open:
-        noctty = filp->f_flags & O_NOCTTY;
-        index  = -1;
-        retval = 0;
-
-        mutex_lock(&tty_mutex);
-        tty_lock();
-
-        if (device == MKDEV(TTYAUX_MAJOR, 0)) {
-                tty = get_current_tty();
-                if (!tty) {
-                        tty_unlock();
-                        mutex_unlock(&tty_mutex);
-                        return -ENXIO;
-                }
-                driver = tty_driver_kref_get(tty->driver);
-                index = tty->index;
-                filp->f_flags |= O_NONBLOCK; /* Don't let /dev/tty block */
-                /* noctty = 1; */
-                /* FIXME: Should we take a driver reference ? */
-                tty_kref_put(tty);
-                goto got_driver;
-        }
-#ifdef CONFIG_VT
-        if (device == MKDEV(TTY_MAJOR, 0)) {
-                extern struct tty_driver *console_driver;
-                driver = tty_driver_kref_get(console_driver);
-                index = fg_console;
-                noctty = 1;
-                goto got_driver;
-        }
-#endif
-        if (device == MKDEV(TTYAUX_MAJOR, 1)) {
-                struct tty_driver *console_driver = console_device(&index);
-                if (console_driver) {
-                        driver = tty_driver_kref_get(console_driver);
-                        if (driver) {
-                                /* Don't let /dev/console block */
-                                filp->f_flags |= O_NONBLOCK;
-                                noctty = 1;
-                                goto got_driver;
-                        }
-                }
-                tty_unlock();
-                mutex_unlock(&tty_mutex);
-                return -ENODEV;
-        }
-
-        driver = get_tty_driver(device, &index);
-        if (!driver) {
-                tty_unlock();
-                mutex_unlock(&tty_mutex);
-                return -ENODEV;
-        }
-got_driver:
-        if (!tty) {
-                /* check whether we're reopening an existing tty */
-                tty = tty_driver_lookup_tty(driver, inode, index);
-
-                if (IS_ERR(tty)) {
-                        tty_unlock();
-                        mutex_unlock(&tty_mutex);
-                        return PTR_ERR(tty);
-                }
-        }
-
-        if (tty) {
-                retval = tty_reopen(tty);
-                if (retval)
-                        tty = ERR_PTR(retval);
-        } else
-                tty = tty_init_dev(driver, index, 0);
-
-        mutex_unlock(&tty_mutex);
-        tty_driver_kref_put(driver);
-        if (IS_ERR(tty)) {
-                tty_unlock();
-                return PTR_ERR(tty);
-        }
-
-        tty_add_file(tty, filp);
-
-        check_tty_count(tty, "tty_open");
-        if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
-            tty->driver->subtype == PTY_TYPE_MASTER)
-                noctty = 1;
-#ifdef TTY_DEBUG_HANGUP
-        printk(KERN_DEBUG "opening %s...", tty->name);
-#endif
-        if (!retval) {
-                if (tty->ops->open)
-                        retval = tty->ops->open(tty, filp);
-                else
-                        retval = -ENODEV;
-        }
-        filp->f_flags = saved_flags;
-
-        if (!retval && test_bit(TTY_EXCLUSIVE, &tty->flags) &&
-                                                !capable(CAP_SYS_ADMIN))
-                retval = -EBUSY;
-
-        if (retval) {
-#ifdef TTY_DEBUG_HANGUP
-                printk(KERN_DEBUG "error %d in opening %s...", retval,
-                       tty->name);
-#endif
-                tty_unlock(); /* need to call tty_release without BTM */
-                tty_release(inode, filp);
-                if (retval != -ERESTARTSYS)
-                        return retval;
-
-                if (signal_pending(current))
-                        return retval;
-
-                schedule();
-                /*
-                 * Need to reset f_op in case a hangup happened.
-                 */
-                tty_lock();
-                if (filp->f_op == &hung_up_tty_fops)
-                        filp->f_op = &tty_fops;
-                tty_unlock();
-                goto retry_open;
-        }
-        tty_unlock();
-
-
-        mutex_lock(&tty_mutex);
-        tty_lock();
-        spin_lock_irq(&current->sighand->siglock);
-        if (!noctty &&
-            current->signal->leader &&
-            !current->signal->tty &&
-            tty->session == NULL)
-                __proc_set_tty(current, tty);
-        spin_unlock_irq(&current->sighand->siglock);
-        tty_unlock();
-        mutex_unlock(&tty_mutex);
-        return 0;
-}
-
-
-
-/**
- *      tty_poll        -       check tty status
- *      @filp: file being polled
- *      @wait: poll wait structures to update
- *
- *      Call the line discipline polling method to obtain the poll
- *      status of the device.
- *
- *      Locking: locks called line discipline but ldisc poll method
- *      may be re-entered freely by other callers.
- */
-
-static unsigned int tty_poll(struct file *filp, poll_table *wait)
-{
-        struct tty_struct *tty = file_tty(filp);
-        struct tty_ldisc *ld;
-        int ret = 0;
-
-        if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_poll"))
-                return 0;
-
-        ld = tty_ldisc_ref_wait(tty);
-        if (ld->ops->poll)
-                ret = (ld->ops->poll)(tty, filp, wait);
-        tty_ldisc_deref(ld);
-        return ret;
-}
-
-static int __tty_fasync(int fd, struct file *filp, int on)
-{
-        struct tty_struct *tty = file_tty(filp);
-        unsigned long flags;
-        int retval = 0;
-
-        if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_fasync"))
-                goto out;
-
-        retval = fasync_helper(fd, filp, on, &tty->fasync);
-        if (retval <= 0)
-                goto out;
-
-        if (on) {
-                enum pid_type type;
-                struct pid *pid;
-                if (!waitqueue_active(&tty->read_wait))
-                        tty->minimum_to_wake = 1;
-                spin_lock_irqsave(&tty->ctrl_lock, flags);
-                if (tty->pgrp) {
-                        pid = tty->pgrp;
-                        type = PIDTYPE_PGID;
-                } else {
-                        pid = task_pid(current);
-                        type = PIDTYPE_PID;
-                }
-                get_pid(pid);
-                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                retval = __f_setown(filp, pid, type, 0);
-                put_pid(pid);
-                if (retval)
-                        goto out;
-        } else {
-                if (!tty->fasync && !waitqueue_active(&tty->read_wait))
-                        tty->minimum_to_wake = N_TTY_BUF_SIZE;
-        }
-        retval = 0;
-out:
-        return retval;
-}
-
-static int tty_fasync(int fd, struct file *filp, int on)
-{
-        int retval;
-        tty_lock();
-        retval = __tty_fasync(fd, filp, on);
-        tty_unlock();
-        return retval;
-}
-
-/**
- *      tiocsti                 -       fake input character
- *      @tty: tty to fake input into
- *      @p: pointer to character
- *
- *      Fake input to a tty device. Does the necessary locking and
- *      input management.
- *
- *      FIXME: does not honour flow control ??
- *
- *      Locking:
- *              Called functions take tty_ldisc_lock
- *              current->signal->tty check is safe without locks
- *
- *      FIXME: may race normal receive processing
- */
-
-static int tiocsti(struct tty_struct *tty, char __user *p)
-{
-        char ch, mbz = 0;
-        struct tty_ldisc *ld;
-
-        if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
-                return -EPERM;
-        if (get_user(ch, p))
-                return -EFAULT;
-        tty_audit_tiocsti(tty, ch);
-        ld = tty_ldisc_ref_wait(tty);
-        ld->ops->receive_buf(tty, &ch, &mbz, 1);
-        tty_ldisc_deref(ld);
-        return 0;
-}
-
-/**
- *      tiocgwinsz              -       implement window query ioctl
- *      @tty; tty
- *      @arg: user buffer for result
- *
- *      Copies the kernel idea of the window size into the user buffer.
- *
- *      Locking: tty->termios_mutex is taken to ensure the winsize data
- *              is consistent.
- */
-
-static int tiocgwinsz(struct tty_struct *tty, struct winsize __user *arg)
-{
-        int err;
-
-        mutex_lock(&tty->termios_mutex);
-        err = copy_to_user(arg, &tty->winsize, sizeof(*arg));
-        mutex_unlock(&tty->termios_mutex);
-
-        return err ? -EFAULT: 0;
-}
-
-/**
- *      tty_do_resize           -       resize event
- *      @tty: tty being resized
- *      @rows: rows (character)
- *      @cols: cols (character)
- *
- *      Update the termios variables and send the necessary signals to
- *      peform a terminal resize correctly
- */
-
-int tty_do_resize(struct tty_struct *tty, struct winsize *ws)
-{
-        struct pid *pgrp;
-        unsigned long flags;
-
-        /* Lock the tty */
-        mutex_lock(&tty->termios_mutex);
-        if (!memcmp(ws, &tty->winsize, sizeof(*ws)))
-                goto done;
-        /* Get the PID values and reference them so we can
-           avoid holding the tty ctrl lock while sending signals */
-        spin_lock_irqsave(&tty->ctrl_lock, flags);
-        pgrp = get_pid(tty->pgrp);
-        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-
-        if (pgrp)
-                kill_pgrp(pgrp, SIGWINCH, 1);
-        put_pid(pgrp);
-
-        tty->winsize = *ws;
-done:
-        mutex_unlock(&tty->termios_mutex);
-        return 0;
-}
-
-/**
- *      tiocswinsz              -       implement window size set ioctl
- *      @tty; tty side of tty
- *      @arg: user buffer for result
- *
- *      Copies the user idea of the window size to the kernel. Traditionally
- *      this is just advisory information but for the Linux console it
- *      actually has driver level meaning and triggers a VC resize.
- *
- *      Locking:
- *              Driver dependant. The default do_resize method takes the
- *      tty termios mutex and ctrl_lock. The console takes its own lock
- *      then calls into the default method.
- */
-
-static int tiocswinsz(struct tty_struct *tty, struct winsize __user *arg)
-{
-        struct winsize tmp_ws;
-        if (copy_from_user(&tmp_ws, arg, sizeof(*arg)))
-                return -EFAULT;
-
-        if (tty->ops->resize)
-                return tty->ops->resize(tty, &tmp_ws);
-        else
-                return tty_do_resize(tty, &tmp_ws);
-}
-
-/**
- *      tioccons        -       allow admin to move logical console
- *      @file: the file to become console
- *
- *      Allow the adminstrator to move the redirected console device
- *
- *      Locking: uses redirect_lock to guard the redirect information
- */
-
-static int tioccons(struct file *file)
-{
-        if (!capable(CAP_SYS_ADMIN))
-                return -EPERM;
-        if (file->f_op->write == redirected_tty_write) {
-                struct file *f;
-                spin_lock(&redirect_lock);
-                f = redirect;
-                redirect = NULL;
-                spin_unlock(&redirect_lock);
-                if (f)
-                        fput(f);
-                return 0;
-        }
-        spin_lock(&redirect_lock);
-        if (redirect) {
-                spin_unlock(&redirect_lock);
-                return -EBUSY;
-        }
-        get_file(file);
-        redirect = file;
-        spin_unlock(&redirect_lock);
-        return 0;
-}
-
-/**
- *      fionbio         -       non blocking ioctl
- *      @file: file to set blocking value
- *      @p: user parameter
- *
- *      Historical tty interfaces had a blocking control ioctl before
- *      the generic functionality existed. This piece of history is preserved
- *      in the expected tty API of posix OS's.
- *
- *      Locking: none, the open file handle ensures it won't go away.
- */
-
-static int fionbio(struct file *file, int __user *p)
-{
-        int nonblock;
-
-        if (get_user(nonblock, p))
-                return -EFAULT;
-
-        spin_lock(&file->f_lock);
-        if (nonblock)
-                file->f_flags |= O_NONBLOCK;
-        else
-                file->f_flags &= ~O_NONBLOCK;
-        spin_unlock(&file->f_lock);
-        return 0;
-}
-
-/**
- *      tiocsctty       -       set controlling tty
- *      @tty: tty structure
- *      @arg: user argument
- *
- *      This ioctl is used to manage job control. It permits a session
- *      leader to set this tty as the controlling tty for the session.
- *
- *      Locking:
- *              Takes tty_mutex() to protect tty instance
- *              Takes tasklist_lock internally to walk sessions
- *              Takes ->siglock() when updating signal->tty
- */
-
-static int tiocsctty(struct tty_struct *tty, int arg)
-{
-        int ret = 0;
-        if (current->signal->leader && (task_session(current) == tty->session))
-                return ret;
-
-        mutex_lock(&tty_mutex);
-        /*
-         * The process must be a session leader and
-         * not have a controlling tty already.
-         */
-        if (!current->signal->leader || current->signal->tty) {
-                ret = -EPERM;
-                goto unlock;
-        }
-
-        if (tty->session) {
-                /*
-                 * This tty is already the controlling
-                 * tty for another session group!
-                 */
-                if (arg == 1 && capable(CAP_SYS_ADMIN)) {
-                        /*
-                         * Steal it away
-                         */
-                        read_lock(&tasklist_lock);
-                        session_clear_tty(tty->session);
-                        read_unlock(&tasklist_lock);
-                } else {
-                        ret = -EPERM;
-                        goto unlock;
-                }
-        }
-        proc_set_tty(current, tty);
-unlock:
-        mutex_unlock(&tty_mutex);
-        return ret;
-}
-
-/**
- *      tty_get_pgrp    -       return a ref counted pgrp pid
- *      @tty: tty to read
- *
- *      Returns a refcounted instance of the pid struct for the process
- *      group controlling the tty.
- */
-
-struct pid *tty_get_pgrp(struct tty_struct *tty)
-{
-        unsigned long flags;
-        struct pid *pgrp;
-
-        spin_lock_irqsave(&tty->ctrl_lock, flags);
-        pgrp = get_pid(tty->pgrp);
-        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-
-        return pgrp;
-}
-EXPORT_SYMBOL_GPL(tty_get_pgrp);
-
-/**
- *      tiocgpgrp               -       get process group
- *      @tty: tty passed by user
- *      @real_tty: tty side of the tty pased by the user if a pty else the tty
- *      @p: returned pid
- *
- *      Obtain the process group of the tty. If there is no process group
- *      return an error.
- *
- *      Locking: none. Reference to current->signal->tty is safe.
- */
-
-static int tiocgpgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t __user *p)
-{
-        struct pid *pid;
-        int ret;
-        /*
-         * (tty == real_tty) is a cheap way of
-         * testing if the tty is NOT a master pty.
-         */
-        if (tty == real_tty && current->signal->tty != real_tty)
-                return -ENOTTY;
-        pid = tty_get_pgrp(real_tty);
-        ret =  put_user(pid_vnr(pid), p);
-        put_pid(pid);
-        return ret;
-}
-
-/**
- *      tiocspgrp               -       attempt to set process group
- *      @tty: tty passed by user
- *      @real_tty: tty side device matching tty passed by user
- *      @p: pid pointer
- *
- *      Set the process group of the tty to the session passed. Only
- *      permitted where the tty session is our session.
- *
- *      Locking: RCU, ctrl lock
- */
-
-static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t __user *p)
-{
-        struct pid *pgrp;
-        pid_t pgrp_nr;
-        int retval = tty_check_change(real_tty);
-        unsigned long flags;
-
-        if (retval == -EIO)
-                return -ENOTTY;
-        if (retval)
-                return retval;
-        if (!current->signal->tty ||
-            (current->signal->tty != real_tty) ||
-            (real_tty->session != task_session(current)))
-                return -ENOTTY;
-        if (get_user(pgrp_nr, p))
-                return -EFAULT;
-        if (pgrp_nr < 0)
-                return -EINVAL;
-        rcu_read_lock();
-        pgrp = find_vpid(pgrp_nr);
-        retval = -ESRCH;
-        if (!pgrp)
-                goto out_unlock;
-        retval = -EPERM;
-        if (session_of_pgrp(pgrp) != task_session(current))
-                goto out_unlock;
-        retval = 0;
-        spin_lock_irqsave(&tty->ctrl_lock, flags);
-        put_pid(real_tty->pgrp);
-        real_tty->pgrp = get_pid(pgrp);
-        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-out_unlock:
-        rcu_read_unlock();
-        return retval;
-}
-
-/**
- *      tiocgsid                -       get session id
- *      @tty: tty passed by user
- *      @real_tty: tty side of the tty pased by the user if a pty else the tty
- *      @p: pointer to returned session id
- *
- *      Obtain the session id of the tty. If there is no session
- *      return an error.
- *
- *      Locking: none. Reference to current->signal->tty is safe.
- */
-
-static int tiocgsid(struct tty_struct *tty, struct tty_struct *real_tty, pid_t __user *p)
-{
-        /*
-         * (tty == real_tty) is a cheap way of
-         * testing if the tty is NOT a master pty.
-        */
-        if (tty == real_tty && current->signal->tty != real_tty)
-                return -ENOTTY;
-        if (!real_tty->session)
-                return -ENOTTY;
-        return put_user(pid_vnr(real_tty->session), p);
-}
-
-/**
- *      tiocsetd        -       set line discipline
- *      @tty: tty device
- *      @p: pointer to user data
- *
- *      Set the line discipline according to user request.
- *
- *      Locking: see tty_set_ldisc, this function is just a helper
- */
-
-static int tiocsetd(struct tty_struct *tty, int __user *p)
-{
-        int ldisc;
-        int ret;
-
-        if (get_user(ldisc, p))
-                return -EFAULT;
-
-        ret = tty_set_ldisc(tty, ldisc);
-
-        return ret;
-}
-
-/**
- *      send_break      -       performed time break
- *      @tty: device to break on
- *      @duration: timeout in mS
- *
- *      Perform a timed break on hardware that lacks its own driver level
- *      timed break functionality.
- *
- *      Locking:
- *              atomic_write_lock serializes
- *
- */
-
-static int send_break(struct tty_struct *tty, unsigned int duration)
-{
-        int retval;
-
-        if (tty->ops->break_ctl == NULL)
-                return 0;
-
-        if (tty->driver->flags & TTY_DRIVER_HARDWARE_BREAK)
-                retval = tty->ops->break_ctl(tty, duration);
-        else {
-                /* Do the work ourselves */
-                if (tty_write_lock(tty, 0) < 0)
-                        return -EINTR;
-                retval = tty->ops->break_ctl(tty, -1);
-                if (retval)
-                        goto out;
-                if (!signal_pending(current))
-                        msleep_interruptible(duration);
-                retval = tty->ops->break_ctl(tty, 0);
-out:
-                tty_write_unlock(tty);
-                if (signal_pending(current))
-                        retval = -EINTR;
-        }
-        return retval;
-}
-
-/**
- *      tty_tiocmget            -       get modem status
- *      @tty: tty device
- *      @file: user file pointer
- *      @p: pointer to result
- *
- *      Obtain the modem status bits from the tty driver if the feature
- *      is supported. Return -EINVAL if it is not available.
- *
- *      Locking: none (up to the driver)
- */
-
-static int tty_tiocmget(struct tty_struct *tty, struct file *file, int __user *p)
-{
-        int retval = -EINVAL;
-
-        if (tty->ops->tiocmget) {
-                retval = tty->ops->tiocmget(tty, file);
-
-                if (retval >= 0)
-                        retval = put_user(retval, p);
-        }
-        return retval;
-}
-
-/**
- *      tty_tiocmset            -       set modem status
- *      @tty: tty device
- *      @file: user file pointer
- *      @cmd: command - clear bits, set bits or set all
- *      @p: pointer to desired bits
- *
- *      Set the modem status bits from the tty driver if the feature
- *      is supported. Return -EINVAL if it is not available.
- *
- *      Locking: none (up to the driver)
- */
-
-static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int cmd,
-             unsigned __user *p)
-{
-        int retval;
-        unsigned int set, clear, val;
-
-        if (tty->ops->tiocmset == NULL)
-                return -EINVAL;
-
-        retval = get_user(val, p);
-        if (retval)
-                return retval;
-        set = clear = 0;
-        switch (cmd) {
-        case TIOCMBIS:
-                set = val;
-                break;
-        case TIOCMBIC:
-                clear = val;
-                break;
-        case TIOCMSET:
-                set = val;
-                clear = ~val;
-                break;
-        }
-        set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
-        clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
-        return tty->ops->tiocmset(tty, file, set, clear);
-}
-
-struct tty_struct *tty_pair_get_tty(struct tty_struct *tty)
-{
-        if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
-            tty->driver->subtype == PTY_TYPE_MASTER)
-                tty = tty->link;
-        return tty;
-}
-EXPORT_SYMBOL(tty_pair_get_tty);
-
-struct tty_struct *tty_pair_get_pty(struct tty_struct *tty)
-{
-        if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
-            tty->driver->subtype == PTY_TYPE_MASTER)
-            return tty;
-        return tty->link;
-}
-EXPORT_SYMBOL(tty_pair_get_pty);
-
-/*
- * Split this up, as gcc can choke on it otherwise..
- */
-long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-{
-        struct tty_struct *tty = file_tty(file);
-        struct tty_struct *real_tty;
-        void __user *p = (void __user *)arg;
-        int retval;
-        struct tty_ldisc *ld;
-        struct inode *inode = file->f_dentry->d_inode;
-
-        if (tty_paranoia_check(tty, inode, "tty_ioctl"))
-                return -EINVAL;
-
-        real_tty = tty_pair_get_tty(tty);
-
-        /*
-         * Factor out some common prep work
-         */
-        switch (cmd) {
-        case TIOCSETD:
-        case TIOCSBRK:
-        case TIOCCBRK:
-        case TCSBRK:
-        case TCSBRKP:
-                retval = tty_check_change(tty);
-                if (retval)
-                        return retval;
-                if (cmd != TIOCCBRK) {
-                        tty_wait_until_sent(tty, 0);
-                        if (signal_pending(current))
-                                return -EINTR;
-                }
-                break;
-        }
-
-        /*
-         *      Now do the stuff.
-         */
-        switch (cmd) {
-        case TIOCSTI:
-                return tiocsti(tty, p);
-        case TIOCGWINSZ:
-                return tiocgwinsz(real_tty, p);
-        case TIOCSWINSZ:
-                return tiocswinsz(real_tty, p);
-        case TIOCCONS:
-                return real_tty != tty ? -EINVAL : tioccons(file);
-        case FIONBIO:
-                return fionbio(file, p);
-        case TIOCEXCL:
-                set_bit(TTY_EXCLUSIVE, &tty->flags);
-                return 0;
-        case TIOCNXCL:
-                clear_bit(TTY_EXCLUSIVE, &tty->flags);
-                return 0;
-        case TIOCNOTTY:
-                if (current->signal->tty != tty)
-                        return -ENOTTY;
-                no_tty();
-                return 0;
-        case TIOCSCTTY:
-                return tiocsctty(tty, arg);
-        case TIOCGPGRP:
-                return tiocgpgrp(tty, real_tty, p);
-        case TIOCSPGRP:
-                return tiocspgrp(tty, real_tty, p);
-        case TIOCGSID:
-                return tiocgsid(tty, real_tty, p);
-        case TIOCGETD:
-                return put_user(tty->ldisc->ops->num, (int __user *)p);
-        case TIOCSETD:
-                return tiocsetd(tty, p);
-        /*
-         * Break handling
-         */
-        case TIOCSBRK:  /* Turn break on, unconditionally */
-                if (tty->ops->break_ctl)
-                        return tty->ops->break_ctl(tty, -1);
-                return 0;
-        case TIOCCBRK:  /* Turn break off, unconditionally */
-                if (tty->ops->break_ctl)
-                        return tty->ops->break_ctl(tty, 0);
-                return 0;
-        case TCSBRK:   /* SVID version: non-zero arg --> no break */
-                /* non-zero arg means wait for all output data
-                 * to be sent (performed above) but don't send break.
-                 * This is used by the tcdrain() termios function.
-                 */
-                if (!arg)
-                        return send_break(tty, 250);
-                return 0;
-        case TCSBRKP:   /* support for POSIX tcsendbreak() */
-                return send_break(tty, arg ? arg*100 : 250);
-
-        case TIOCMGET:
-                return tty_tiocmget(tty, file, p);
-        case TIOCMSET:
-        case TIOCMBIC:
-        case TIOCMBIS:
-                return tty_tiocmset(tty, file, cmd, p);
-        case TCFLSH:
-                switch (arg) {
-                case TCIFLUSH:
-                case TCIOFLUSH:
-                /* flush tty buffer and allow ldisc to process ioctl */
-                        tty_buffer_flush(tty);
-                        break;
-                }
-                break;
-        }
-        if (tty->ops->ioctl) {
-                retval = (tty->ops->ioctl)(tty, file, cmd, arg);
-                if (retval != -ENOIOCTLCMD)
-                        return retval;
-        }
-        ld = tty_ldisc_ref_wait(tty);
-        retval = -EINVAL;
-        if (ld->ops->ioctl) {
-                retval = ld->ops->ioctl(tty, file, cmd, arg);
-                if (retval == -ENOIOCTLCMD)
-                        retval = -EINVAL;
-        }
-        tty_ldisc_deref(ld);
-        return retval;
-}
-
-#ifdef CONFIG_COMPAT
-static long tty_compat_ioctl(struct file *file, unsigned int cmd,
-                                unsigned long arg)
-{
-        struct inode *inode = file->f_dentry->d_inode;
-        struct tty_struct *tty = file_tty(file);
-        struct tty_ldisc *ld;
-        int retval = -ENOIOCTLCMD;
-
-        if (tty_paranoia_check(tty, inode, "tty_ioctl"))
-                return -EINVAL;
-
-        if (tty->ops->compat_ioctl) {
-                retval = (tty->ops->compat_ioctl)(tty, file, cmd, arg);
-                if (retval != -ENOIOCTLCMD)
-                        return retval;
-        }
-
-        ld = tty_ldisc_ref_wait(tty);
-        if (ld->ops->compat_ioctl)
-                retval = ld->ops->compat_ioctl(tty, file, cmd, arg);
-        tty_ldisc_deref(ld);
-
-        return retval;
-}
-#endif
-
-/*
- * This implements the "Secure Attention Key" ---  the idea is to
- * prevent trojan horses by killing all processes associated with this
- * tty when the user hits the "Secure Attention Key".  Required for
- * super-paranoid applications --- see the Orange Book for more details.
- *
- * This code could be nicer; ideally it should send a HUP, wait a few
- * seconds, then send a INT, and then a KILL signal.  But you then
- * have to coordinate with the init process, since all processes associated
- * with the current tty must be dead before the new getty is allowed
- * to spawn.
- *
- * Now, if it would be correct ;-/ The current code has a nasty hole -
- * it doesn't catch files in flight. We may send the descriptor to ourselves
- * via AF_UNIX socket, close it and later fetch from socket. FIXME.
- *
- * Nasty bug: do_SAK is being called in interrupt context.  This can
- * deadlock.  We punt it up to process context.  AKPM - 16Mar2001
- */
-void __do_SAK(struct tty_struct *tty)
-{
-#ifdef TTY_SOFT_SAK
-        tty_hangup(tty);
-#else
-        struct task_struct *g, *p;
-        struct pid *session;
-        int             i;
-        struct file     *filp;
-        struct fdtable *fdt;
-
-        if (!tty)
-                return;
-        session = tty->session;
-
-        tty_ldisc_flush(tty);
-
-        tty_driver_flush_buffer(tty);
-
-        read_lock(&tasklist_lock);
-        /* Kill the entire session */
-        do_each_pid_task(session, PIDTYPE_SID, p) {
-                printk(KERN_NOTICE "SAK: killed process %d"
-                        " (%s): task_session(p)==tty->session\n",
-                        task_pid_nr(p), p->comm);
-                send_sig(SIGKILL, p, 1);
-        } while_each_pid_task(session, PIDTYPE_SID, p);
-        /* Now kill any processes that happen to have the
-         * tty open.
-         */
-        do_each_thread(g, p) {
-                if (p->signal->tty == tty) {
-                        printk(KERN_NOTICE "SAK: killed process %d"
-                            " (%s): task_session(p)==tty->session\n",
-                            task_pid_nr(p), p->comm);
-                        send_sig(SIGKILL, p, 1);
-                        continue;
-                }
-                task_lock(p);
-                if (p->files) {
-                        /*
-                         * We don't take a ref to the file, so we must
-                         * hold ->file_lock instead.
-                         */
-                        spin_lock(&p->files->file_lock);
-                        fdt = files_fdtable(p->files);
-                        for (i = 0; i < fdt->max_fds; i++) {
-                                filp = fcheck_files(p->files, i);
-                                if (!filp)
-                                        continue;
-                                if (filp->f_op->read == tty_read &&
-                                    file_tty(filp) == tty) {
-                                        printk(KERN_NOTICE "SAK: killed process %d"
-                                            " (%s): fd#%d opened to the tty\n",
-                                            task_pid_nr(p), p->comm, i);
-                                        force_sig(SIGKILL, p);
-                                        break;
-                                }
-                        }
-                        spin_unlock(&p->files->file_lock);
-                }
-                task_unlock(p);
-        } while_each_thread(g, p);
-        read_unlock(&tasklist_lock);
-#endif
-}
-
-static void do_SAK_work(struct work_struct *work)
-{
-        struct tty_struct *tty =
-                container_of(work, struct tty_struct, SAK_work);
-        __do_SAK(tty);
-}
-
-/*
- * The tq handling here is a little racy - tty->SAK_work may already be queued.
- * Fortunately we don't need to worry, because if ->SAK_work is already queued,
- * the values which we write to it will be identical to the values which it
- * already has. --akpm
- */
-void do_SAK(struct tty_struct *tty)
-{
-        if (!tty)
-                return;
-        schedule_work(&tty->SAK_work);
-}
-
-EXPORT_SYMBOL(do_SAK);
-
-/**
- *      initialize_tty_struct
- *      @tty: tty to initialize
- *
- *      This subroutine initializes a tty structure that has been newly
- *      allocated.
- *
- *      Locking: none - tty in question must not be exposed at this point
- */
-
-void initialize_tty_struct(struct tty_struct *tty,
-                struct tty_driver *driver, int idx)
-{
-        memset(tty, 0, sizeof(struct tty_struct));
-        kref_init(&tty->kref);
-        tty->magic = TTY_MAGIC;
-        tty_ldisc_init(tty);
-        tty->session = NULL;
-        tty->pgrp = NULL;
-        tty->overrun_time = jiffies;
-        tty->buf.head = tty->buf.tail = NULL;
-        tty_buffer_init(tty);
-        mutex_init(&tty->termios_mutex);
-        mutex_init(&tty->ldisc_mutex);
-        init_waitqueue_head(&tty->write_wait);
-        init_waitqueue_head(&tty->read_wait);
-        INIT_WORK(&tty->hangup_work, do_tty_hangup);
-        mutex_init(&tty->atomic_read_lock);
-        mutex_init(&tty->atomic_write_lock);
-        mutex_init(&tty->output_lock);
-        mutex_init(&tty->echo_lock);
-        spin_lock_init(&tty->read_lock);
-        spin_lock_init(&tty->ctrl_lock);
-        INIT_LIST_HEAD(&tty->tty_files);
-        INIT_WORK(&tty->SAK_work, do_SAK_work);
-
-        tty->driver = driver;
-        tty->ops = driver->ops;
-        tty->index = idx;
-        tty_line_name(driver, idx, tty->name);
-}
-
-/**
- *      tty_put_char    -       write one character to a tty
- *      @tty: tty
- *      @ch: character
- *
- *      Write one byte to the tty using the provided put_char method
- *      if present. Returns the number of characters successfully output.
- *
- *      Note: the specific put_char operation in the driver layer may go
- *      away soon. Don't call it directly, use this method
- */
-
-int tty_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        if (tty->ops->put_char)
-                return tty->ops->put_char(tty, ch);
-        return tty->ops->write(tty, &ch, 1);
-}
-EXPORT_SYMBOL_GPL(tty_put_char);
-
-struct class *tty_class;
-
-/**
- *      tty_register_device - register a tty device
- *      @driver: the tty driver that describes the tty device
- *      @index: the index in the tty driver for this tty device
- *      @device: a struct device that is associated with this tty device.
- *              This field is optional, if there is no known struct device
- *              for this tty device it can be set to NULL safely.
- *
- *      Returns a pointer to the struct device for this tty device
- *      (or ERR_PTR(-EFOO) on error).
- *
- *      This call is required to be made to register an individual tty device
- *      if the tty driver's flags have the TTY_DRIVER_DYNAMIC_DEV bit set.  If
- *      that bit is not set, this function should not be called by a tty
- *      driver.
- *
- *      Locking: ??
- */
-
-struct device *tty_register_device(struct tty_driver *driver, unsigned index,
-                                   struct device *device)
-{
-        char name[64];
-        dev_t dev = MKDEV(driver->major, driver->minor_start) + index;
-
-        if (index >= driver->num) {
-                printk(KERN_ERR "Attempt to register invalid tty line number "
-                       " (%d).\n", index);
-                return ERR_PTR(-EINVAL);
-        }
-
-        if (driver->type == TTY_DRIVER_TYPE_PTY)
-                pty_line_name(driver, index, name);
-        else
-                tty_line_name(driver, index, name);
-
-        return device_create(tty_class, device, dev, NULL, name);
-}
-EXPORT_SYMBOL(tty_register_device);
-
-/**
- *      tty_unregister_device - unregister a tty device
- *      @driver: the tty driver that describes the tty device
- *      @index: the index in the tty driver for this tty device
- *
- *      If a tty device is registered with a call to tty_register_device() then
- *      this function must be called when the tty device is gone.
- *
- *      Locking: ??
- */
-
-void tty_unregister_device(struct tty_driver *driver, unsigned index)
-{
-        device_destroy(tty_class,
-                MKDEV(driver->major, driver->minor_start) + index);
-}
-EXPORT_SYMBOL(tty_unregister_device);
-
-struct tty_driver *alloc_tty_driver(int lines)
-{
-        struct tty_driver *driver;
-
-        driver = kzalloc(sizeof(struct tty_driver), GFP_KERNEL);
-        if (driver) {
-                kref_init(&driver->kref);
-                driver->magic = TTY_DRIVER_MAGIC;
-                driver->num = lines;
-                /* later we'll move allocation of tables here */
-        }
-        return driver;
-}
-EXPORT_SYMBOL(alloc_tty_driver);
-
-static void destruct_tty_driver(struct kref *kref)
-{
-        struct tty_driver *driver = container_of(kref, struct tty_driver, kref);
-        int i;
-        struct ktermios *tp;
-        void *p;
-
-        if (driver->flags & TTY_DRIVER_INSTALLED) {
-                /*
-                 * Free the termios and termios_locked structures because
-                 * we don't want to get memory leaks when modular tty
-                 * drivers are removed from the kernel.
-                 */
-                for (i = 0; i < driver->num; i++) {
-                        tp = driver->termios[i];
-                        if (tp) {
-                                driver->termios[i] = NULL;
-                                kfree(tp);
-                        }
-                        if (!(driver->flags & TTY_DRIVER_DYNAMIC_DEV))
-                                tty_unregister_device(driver, i);
-                }
-                p = driver->ttys;
-                proc_tty_unregister_driver(driver);
-                driver->ttys = NULL;
-                driver->termios = NULL;
-                kfree(p);
-                cdev_del(&driver->cdev);
-        }
-        kfree(driver);
-}
-
-void tty_driver_kref_put(struct tty_driver *driver)
-{
-        kref_put(&driver->kref, destruct_tty_driver);
-}
-EXPORT_SYMBOL(tty_driver_kref_put);
-
-void tty_set_operations(struct tty_driver *driver,
-                        const struct tty_operations *op)
-{
-        driver->ops = op;
-};
-EXPORT_SYMBOL(tty_set_operations);
-
-void put_tty_driver(struct tty_driver *d)
-{
-        tty_driver_kref_put(d);
-}
-EXPORT_SYMBOL(put_tty_driver);
-
-/*
- * Called by a tty driver to register itself.
- */
-int tty_register_driver(struct tty_driver *driver)
-{
-        int error;
-        int i;
-        dev_t dev;
-        void **p = NULL;
-
-        if (!(driver->flags & TTY_DRIVER_DEVPTS_MEM) && driver->num) {
-                p = kzalloc(driver->num * 2 * sizeof(void *), GFP_KERNEL);
-                if (!p)
-                        return -ENOMEM;
-        }
-
-        if (!driver->major) {
-                error = alloc_chrdev_region(&dev, driver->minor_start,
-                                                driver->num, driver->name);
-                if (!error) {
-                        driver->major = MAJOR(dev);
-                        driver->minor_start = MINOR(dev);
-                }
-        } else {
-                dev = MKDEV(driver->major, driver->minor_start);
-                error = register_chrdev_region(dev, driver->num, driver->name);
-        }
-        if (error < 0) {
-                kfree(p);
-                return error;
-        }
-
-        if (p) {
-                driver->ttys = (struct tty_struct **)p;
-                driver->termios = (struct ktermios **)(p + driver->num);
-        } else {
-                driver->ttys = NULL;
-                driver->termios = NULL;
-        }
-
-        cdev_init(&driver->cdev, &tty_fops);
-        driver->cdev.owner = driver->owner;
-        error = cdev_add(&driver->cdev, dev, driver->num);
-        if (error) {
-                unregister_chrdev_region(dev, driver->num);
-                driver->ttys = NULL;
-                driver->termios = NULL;
-                kfree(p);
-                return error;
-        }
-
-        mutex_lock(&tty_mutex);
-        list_add(&driver->tty_drivers, &tty_drivers);
-        mutex_unlock(&tty_mutex);
-
-        if (!(driver->flags & TTY_DRIVER_DYNAMIC_DEV)) {
-                for (i = 0; i < driver->num; i++)
-                    tty_register_device(driver, i, NULL);
-        }
-        proc_tty_register_driver(driver);
-        driver->flags |= TTY_DRIVER_INSTALLED;
-        return 0;
-}
-
-EXPORT_SYMBOL(tty_register_driver);
-
-/*
- * Called by a tty driver to unregister itself.
- */
-int tty_unregister_driver(struct tty_driver *driver)
-{
-#if 0
-        /* FIXME */
-        if (driver->refcount)
-                return -EBUSY;
-#endif
-        unregister_chrdev_region(MKDEV(driver->major, driver->minor_start),
-                                driver->num);
-        mutex_lock(&tty_mutex);
-        list_del(&driver->tty_drivers);
-        mutex_unlock(&tty_mutex);
-        return 0;
-}
-
-EXPORT_SYMBOL(tty_unregister_driver);
-
-dev_t tty_devnum(struct tty_struct *tty)
-{
-        return MKDEV(tty->driver->major, tty->driver->minor_start) + tty->index;
-}
-EXPORT_SYMBOL(tty_devnum);
-
-void proc_clear_tty(struct task_struct *p)
-{
-        unsigned long flags;
-        struct tty_struct *tty;
-        spin_lock_irqsave(&p->sighand->siglock, flags);
-        tty = p->signal->tty;
-        p->signal->tty = NULL;
-        spin_unlock_irqrestore(&p->sighand->siglock, flags);
-        tty_kref_put(tty);
-}
-
-/* Called under the sighand lock */
-
-static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
-{
-        if (tty) {
-                unsigned long flags;
-                /* We should not have a session or pgrp to put here but.... */
-                spin_lock_irqsave(&tty->ctrl_lock, flags);
-                put_pid(tty->session);
-                put_pid(tty->pgrp);
-                tty->pgrp = get_pid(task_pgrp(tsk));
-                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                tty->session = get_pid(task_session(tsk));
-                if (tsk->signal->tty) {
-                        printk(KERN_DEBUG "tty not NULL!!\n");
-                        tty_kref_put(tsk->signal->tty);
-                }
-        }
-        put_pid(tsk->signal->tty_old_pgrp);
-        tsk->signal->tty = tty_kref_get(tty);
-        tsk->signal->tty_old_pgrp = NULL;
-}
-
-static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
-{
-        spin_lock_irq(&tsk->sighand->siglock);
-        __proc_set_tty(tsk, tty);
-        spin_unlock_irq(&tsk->sighand->siglock);
-}
-
-struct tty_struct *get_current_tty(void)
-{
-        struct tty_struct *tty;
-        unsigned long flags;
-
-        spin_lock_irqsave(&current->sighand->siglock, flags);
-        tty = tty_kref_get(current->signal->tty);
-        spin_unlock_irqrestore(&current->sighand->siglock, flags);
-        return tty;
-}
-EXPORT_SYMBOL_GPL(get_current_tty);
-
-void tty_default_fops(struct file_operations *fops)
-{
-        *fops = tty_fops;
-}
-
-/*
- * Initialize the console device. This is called *early*, so
- * we can't necessarily depend on lots of kernel help here.
- * Just do some early initializations, and do the complex setup
- * later.
- */
-void __init console_init(void)
-{
-        initcall_t *call;
-
-        /* Setup the default TTY line discipline. */
-        tty_ldisc_begin();
-
-        /*
-         * set up the console device so that later boot sequences can
-         * inform about problems etc..
-         */
-        call = __con_initcall_start;
-        while (call < __con_initcall_end) {
-                (*call)();
-                call++;
-        }
-}
-
-static char *tty_devnode(struct device *dev, mode_t *mode)
-{
-        if (!mode)
-                return NULL;
-        if (dev->devt == MKDEV(TTYAUX_MAJOR, 0) ||
-            dev->devt == MKDEV(TTYAUX_MAJOR, 2))
-                *mode = 0666;
-        return NULL;
-}
-
-static int __init tty_class_init(void)
-{
-        tty_class = class_create(THIS_MODULE, "tty");
-        if (IS_ERR(tty_class))
-                return PTR_ERR(tty_class);
-        tty_class->devnode = tty_devnode;
-        return 0;
-}
-
-postcore_initcall(tty_class_init);
-
-/* 3/2004 jmc: why do these devices exist? */
-
-static struct cdev tty_cdev, console_cdev;
-
-/*
- * Ok, now we can initialize the rest of the tty devices and can count
- * on memory allocations, interrupts etc..
- */
-int __init tty_init(void)
-{
-        cdev_init(&tty_cdev, &tty_fops);
-        if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
-            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
-                panic("Couldn't register /dev/tty driver\n");
-        device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL,
-                              "tty");
-
-        cdev_init(&console_cdev, &console_fops);
-        if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||
-            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0)
-                panic("Couldn't register /dev/console driver\n");
-        device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL,
-                              "console");
-
-#ifdef CONFIG_VT
-        vty_init(&console_fops);
-#endif
-        return 0;
-}
-
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
deleted file mode 100644
index 0c1889971459..000000000000
--- a/drivers/char/tty_ioctl.c
+++ /dev/null
@@ -1,1179 +0,0 @@
-/*
- *  linux/drivers/char/tty_ioctl.c
- *
- *  Copyright (C) 1991, 1992, 1993, 1994  Linus Torvalds
- *
- * Modified by Fred N. van Kempen, 01/29/93, to add line disciplines
- * which can be dynamically activated and de-activated by the line
- * discipline handling modules (like SLIP).
- */
-
-#include <linux/types.h>
-#include <linux/termios.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/major.h>
-#include <linux/tty.h>
-#include <linux/fcntl.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/bitops.h>
-#include <linux/mutex.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-
-#undef TTY_DEBUG_WAIT_UNTIL_SENT
-
-#undef  DEBUG
-
-/*
- * Internal flag options for termios setting behavior
- */
-#define TERMIOS_FLUSH   1
-#define TERMIOS_WAIT    2
-#define TERMIOS_TERMIO  4
-#define TERMIOS_OLD     8
-
-
-/**
- *      tty_chars_in_buffer     -       characters pending
- *      @tty: terminal
- *
- *      Return the number of bytes of data in the device private
- *      output queue. If no private method is supplied there is assumed
- *      to be no queue on the device.
- */
-
-int tty_chars_in_buffer(struct tty_struct *tty)
-{
-        if (tty->ops->chars_in_buffer)
-                return tty->ops->chars_in_buffer(tty);
-        else
-                return 0;
-}
-EXPORT_SYMBOL(tty_chars_in_buffer);
-
-/**
- *      tty_write_room          -       write queue space
- *      @tty: terminal
- *
- *      Return the number of bytes that can be queued to this device
- *      at the present time. The result should be treated as a guarantee
- *      and the driver cannot offer a value it later shrinks by more than
- *      the number of bytes written. If no method is provided 2K is always
- *      returned and data may be lost as there will be no flow control.
- */
- 
-int tty_write_room(struct tty_struct *tty)
-{
-        if (tty->ops->write_room)
-                return tty->ops->write_room(tty);
-        return 2048;
-}
-EXPORT_SYMBOL(tty_write_room);
-
-/**
- *      tty_driver_flush_buffer -       discard internal buffer
- *      @tty: terminal
- *
- *      Discard the internal output buffer for this device. If no method
- *      is provided then either the buffer cannot be hardware flushed or
- *      there is no buffer driver side.
- */
-void tty_driver_flush_buffer(struct tty_struct *tty)
-{
-        if (tty->ops->flush_buffer)
-                tty->ops->flush_buffer(tty);
-}
-EXPORT_SYMBOL(tty_driver_flush_buffer);
-
-/**
- *      tty_throttle            -       flow control
- *      @tty: terminal
- *
- *      Indicate that a tty should stop transmitting data down the stack.
- *      Takes the termios mutex to protect against parallel throttle/unthrottle
- *      and also to ensure the driver can consistently reference its own
- *      termios data at this point when implementing software flow control.
- */
-
-void tty_throttle(struct tty_struct *tty)
-{
-        mutex_lock(&tty->termios_mutex);
-        /* check TTY_THROTTLED first so it indicates our state */
-        if (!test_and_set_bit(TTY_THROTTLED, &tty->flags) &&
-            tty->ops->throttle)
-                tty->ops->throttle(tty);
-        mutex_unlock(&tty->termios_mutex);
-}
-EXPORT_SYMBOL(tty_throttle);
-
-/**
- *      tty_unthrottle          -       flow control
- *      @tty: terminal
- *
- *      Indicate that a tty may continue transmitting data down the stack.
- *      Takes the termios mutex to protect against parallel throttle/unthrottle
- *      and also to ensure the driver can consistently reference its own
- *      termios data at this point when implementing software flow control.
- *
- *      Drivers should however remember that the stack can issue a throttle,
- *      then change flow control method, then unthrottle.
- */
-
-void tty_unthrottle(struct tty_struct *tty)
-{
-        mutex_lock(&tty->termios_mutex);
-        if (test_and_clear_bit(TTY_THROTTLED, &tty->flags) &&
-            tty->ops->unthrottle)
-                tty->ops->unthrottle(tty);
-        mutex_unlock(&tty->termios_mutex);
-}
-EXPORT_SYMBOL(tty_unthrottle);
-
-/**
- *      tty_wait_until_sent     -       wait for I/O to finish
- *      @tty: tty we are waiting for
- *      @timeout: how long we will wait
- *
- *      Wait for characters pending in a tty driver to hit the wire, or
- *      for a timeout to occur (eg due to flow control)
- *
- *      Locking: none
- */
-
-void tty_wait_until_sent(struct tty_struct *tty, long timeout)
-{
-#ifdef TTY_DEBUG_WAIT_UNTIL_SENT
-        char buf[64];
-
-        printk(KERN_DEBUG "%s wait until sent...\n", tty_name(tty, buf));
-#endif
-        if (!timeout)
-                timeout = MAX_SCHEDULE_TIMEOUT;
-        if (wait_event_interruptible_timeout(tty->write_wait,
-                        !tty_chars_in_buffer(tty), timeout) >= 0) {
-                if (tty->ops->wait_until_sent)
-                        tty->ops->wait_until_sent(tty, timeout);
-        }
-}
-EXPORT_SYMBOL(tty_wait_until_sent);
-
-
-/*
- *              Termios Helper Methods
- */
-
-static void unset_locked_termios(struct ktermios *termios,
-                                 struct ktermios *old,
-                                 struct ktermios *locked)
-{
-        int     i;
-
-#define NOSET_MASK(x, y, z) (x = ((x) & ~(z)) | ((y) & (z)))
-
-        if (!locked) {
-                printk(KERN_WARNING "Warning?!? termios_locked is NULL.\n");
-                return;
-        }
-
-        NOSET_MASK(termios->c_iflag, old->c_iflag, locked->c_iflag);
-        NOSET_MASK(termios->c_oflag, old->c_oflag, locked->c_oflag);
-        NOSET_MASK(termios->c_cflag, old->c_cflag, locked->c_cflag);
-        NOSET_MASK(termios->c_lflag, old->c_lflag, locked->c_lflag);
-        termios->c_line = locked->c_line ? old->c_line : termios->c_line;
-        for (i = 0; i < NCCS; i++)
-                termios->c_cc[i] = locked->c_cc[i] ?
-                        old->c_cc[i] : termios->c_cc[i];
-        /* FIXME: What should we do for i/ospeed */
-}
-
-/*
- * Routine which returns the baud rate of the tty
- *
- * Note that the baud_table needs to be kept in sync with the
- * include/asm/termbits.h file.
- */
-static const speed_t baud_table[] = {
-        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
-        9600, 19200, 38400, 57600, 115200, 230400, 460800,
-#ifdef __sparc__
-        76800, 153600, 307200, 614400, 921600
-#else
-        500000, 576000, 921600, 1000000, 1152000, 1500000, 2000000,
-        2500000, 3000000, 3500000, 4000000
-#endif
-};
-
-#ifndef __sparc__
-static const tcflag_t baud_bits[] = {
-        B0, B50, B75, B110, B134, B150, B200, B300, B600,
-        B1200, B1800, B2400, B4800, B9600, B19200, B38400,
-        B57600, B115200, B230400, B460800, B500000, B576000,
-        B921600, B1000000, B1152000, B1500000, B2000000, B2500000,
-        B3000000, B3500000, B4000000
-};
-#else
-static const tcflag_t baud_bits[] = {
-        B0, B50, B75, B110, B134, B150, B200, B300, B600,
-        B1200, B1800, B2400, B4800, B9600, B19200, B38400,
-        B57600, B115200, B230400, B460800, B76800, B153600,
-        B307200, B614400, B921600
-};
-#endif
-
-static int n_baud_table = ARRAY_SIZE(baud_table);
-
-/**
- *      tty_termios_baud_rate
- *      @termios: termios structure
- *
- *      Convert termios baud rate data into a speed. This should be called
- *      with the termios lock held if this termios is a terminal termios
- *      structure. May change the termios data. Device drivers can call this
- *      function but should use ->c_[io]speed directly as they are updated.
- *
- *      Locking: none
- */
-
-speed_t tty_termios_baud_rate(struct ktermios *termios)
-{
-        unsigned int cbaud;
-
-        cbaud = termios->c_cflag & CBAUD;
-
-#ifdef BOTHER
-        /* Magic token for arbitary speed via c_ispeed/c_ospeed */
-        if (cbaud == BOTHER)
-                return termios->c_ospeed;
-#endif
-        if (cbaud & CBAUDEX) {
-                cbaud &= ~CBAUDEX;
-
-                if (cbaud < 1 || cbaud + 15 > n_baud_table)
-                        termios->c_cflag &= ~CBAUDEX;
-                else
-                        cbaud += 15;
-        }
-        return baud_table[cbaud];
-}
-EXPORT_SYMBOL(tty_termios_baud_rate);
-
-/**
- *      tty_termios_input_baud_rate
- *      @termios: termios structure
- *
- *      Convert termios baud rate data into a speed. This should be called
- *      with the termios lock held if this termios is a terminal termios
- *      structure. May change the termios data. Device drivers can call this
- *      function but should use ->c_[io]speed directly as they are updated.
- *
- *      Locking: none
- */
-
-speed_t tty_termios_input_baud_rate(struct ktermios *termios)
-{
-#ifdef IBSHIFT
-        unsigned int cbaud = (termios->c_cflag >> IBSHIFT) & CBAUD;
-
-        if (cbaud == B0)
-                return tty_termios_baud_rate(termios);
-
-        /* Magic token for arbitary speed via c_ispeed*/
-        if (cbaud == BOTHER)
-                return termios->c_ispeed;
-
-        if (cbaud & CBAUDEX) {
-                cbaud &= ~CBAUDEX;
-
-                if (cbaud < 1 || cbaud + 15 > n_baud_table)
-                        termios->c_cflag &= ~(CBAUDEX << IBSHIFT);
-                else
-                        cbaud += 15;
-        }
-        return baud_table[cbaud];
-#else
-        return tty_termios_baud_rate(termios);
-#endif
-}
-EXPORT_SYMBOL(tty_termios_input_baud_rate);
-
-/**
- *      tty_termios_encode_baud_rate
- *      @termios: ktermios structure holding user requested state
- *      @ispeed: input speed
- *      @ospeed: output speed
- *
- *      Encode the speeds set into the passed termios structure. This is
- *      used as a library helper for drivers os that they can report back
- *      the actual speed selected when it differs from the speed requested
- *
- *      For maximal back compatibility with legacy SYS5/POSIX *nix behaviour
- *      we need to carefully set the bits when the user does not get the
- *      desired speed. We allow small margins and preserve as much of possible
- *      of the input intent to keep compatibility.
- *
- *      Locking: Caller should hold termios lock. This is already held
- *      when calling this function from the driver termios handler.
- *
- *      The ifdefs deal with platforms whose owners have yet to update them
- *      and will all go away once this is done.
- */
-
-void tty_termios_encode_baud_rate(struct ktermios *termios,
-                                  speed_t ibaud, speed_t obaud)
-{
-        int i = 0;
-        int ifound = -1, ofound = -1;
-        int iclose = ibaud/50, oclose = obaud/50;
-        int ibinput = 0;
-
-        if (obaud == 0)                 /* CD dropped             */
-                ibaud = 0;              /* Clear ibaud to be sure */
-
-        termios->c_ispeed = ibaud;
-        termios->c_ospeed = obaud;
-
-#ifdef BOTHER
-        /* If the user asked for a precise weird speed give a precise weird
-           answer. If they asked for a Bfoo speed they many have problems
-           digesting non-exact replies so fuzz a bit */
-
-        if ((termios->c_cflag & CBAUD) == BOTHER)
-                oclose = 0;
-        if (((termios->c_cflag >> IBSHIFT) & CBAUD) == BOTHER)
-                iclose = 0;
-        if ((termios->c_cflag >> IBSHIFT) & CBAUD)
-                ibinput = 1;    /* An input speed was specified */
-#endif
-        termios->c_cflag &= ~CBAUD;
-
-        /*
-         *      Our goal is to find a close match to the standard baud rate
-         *      returned. Walk the baud rate table and if we get a very close
-         *      match then report back the speed as a POSIX Bxxxx value by
-         *      preference
-         */
-
-        do {
-                if (obaud - oclose <= baud_table[i] &&
-                    obaud + oclose >= baud_table[i]) {
-                        termios->c_cflag |= baud_bits[i];
-                        ofound = i;
-                }
-                if (ibaud - iclose <= baud_table[i] &&
-                    ibaud + iclose >= baud_table[i]) {
-                        /* For the case input == output don't set IBAUD bits
-                           if the user didn't do so */
-                        if (ofound == i && !ibinput)
-                                ifound  = i;
-#ifdef IBSHIFT
-                        else {
-                                ifound = i;
-                                termios->c_cflag |= (baud_bits[i] << IBSHIFT);
-                        }
-#endif
-                }
-        } while (++i < n_baud_table);
-
-        /*
-         *      If we found no match then use BOTHER if provided or warn
-         *      the user their platform maintainer needs to wake up if not.
-         */
-#ifdef BOTHER
-        if (ofound == -1)
-                termios->c_cflag |= BOTHER;
-        /* Set exact input bits only if the input and output differ or the
-           user already did */
-        if (ifound == -1 && (ibaud != obaud || ibinput))
-                termios->c_cflag |= (BOTHER << IBSHIFT);
-#else
-        if (ifound == -1 || ofound == -1) {
-                printk_once(KERN_WARNING "tty: Unable to return correct "
-                          "speed data as your architecture needs updating.\n");
-        }
-#endif
-}
-EXPORT_SYMBOL_GPL(tty_termios_encode_baud_rate);
-
-/**
- *      tty_encode_baud_rate            -       set baud rate of the tty
- *      @ibaud: input baud rate
- *      @obad: output baud rate
- *
- *      Update the current termios data for the tty with the new speed
- *      settings. The caller must hold the termios_mutex for the tty in
- *      question.
- */
-
-void tty_encode_baud_rate(struct tty_struct *tty, speed_t ibaud, speed_t obaud)
-{
-        tty_termios_encode_baud_rate(tty->termios, ibaud, obaud);
-}
-EXPORT_SYMBOL_GPL(tty_encode_baud_rate);
-
-/**
- *      tty_get_baud_rate       -       get tty bit rates
- *      @tty: tty to query
- *
- *      Returns the baud rate as an integer for this terminal. The
- *      termios lock must be held by the caller and the terminal bit
- *      flags may be updated.
- *
- *      Locking: none
- */
-
-speed_t tty_get_baud_rate(struct tty_struct *tty)
-{
-        speed_t baud = tty_termios_baud_rate(tty->termios);
-
-        if (baud == 38400 && tty->alt_speed) {
-                if (!tty->warned) {
-                        printk(KERN_WARNING "Use of setserial/setrocket to "
-                                            "set SPD_* flags is deprecated\n");
-                        tty->warned = 1;
-                }
-                baud = tty->alt_speed;
-        }
-
-        return baud;
-}
-EXPORT_SYMBOL(tty_get_baud_rate);
-
-/**
- *      tty_termios_copy_hw     -       copy hardware settings
- *      @new: New termios
- *      @old: Old termios
- *
- *      Propogate the hardware specific terminal setting bits from
- *      the old termios structure to the new one. This is used in cases
- *      where the hardware does not support reconfiguration or as a helper
- *      in some cases where only minimal reconfiguration is supported
- */
-
-void tty_termios_copy_hw(struct ktermios *new, struct ktermios *old)
-{
-        /* The bits a dumb device handles in software. Smart devices need
-           to always provide a set_termios method */
-        new->c_cflag &= HUPCL | CREAD | CLOCAL;
-        new->c_cflag |= old->c_cflag & ~(HUPCL | CREAD | CLOCAL);
-        new->c_ispeed = old->c_ispeed;
-        new->c_ospeed = old->c_ospeed;
-}
-EXPORT_SYMBOL(tty_termios_copy_hw);
-
-/**
- *      tty_termios_hw_change   -       check for setting change
- *      @a: termios
- *      @b: termios to compare
- *
- *      Check if any of the bits that affect a dumb device have changed
- *      between the two termios structures, or a speed change is needed.
- */
-
-int tty_termios_hw_change(struct ktermios *a, struct ktermios *b)
-{
-        if (a->c_ispeed != b->c_ispeed || a->c_ospeed != b->c_ospeed)
-                return 1;
-        if ((a->c_cflag ^ b->c_cflag) & ~(HUPCL | CREAD | CLOCAL))
-                return 1;
-        return 0;
-}
-EXPORT_SYMBOL(tty_termios_hw_change);
-
-/**
- *      change_termios          -       update termios values
- *      @tty: tty to update
- *      @new_termios: desired new value
- *
- *      Perform updates to the termios values set on this terminal. There
- *      is a bit of layering violation here with n_tty in terms of the
- *      internal knowledge of this function.
- *
- *      Locking: termios_mutex
- */
-
-static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)
-{
-        struct ktermios old_termios;
-        struct tty_ldisc *ld;
-        unsigned long flags;
-
-        /*
-         *      Perform the actual termios internal changes under lock.
-         */
-
-
-        /* FIXME: we need to decide on some locking/ordering semantics
-           for the set_termios notification eventually */
-        mutex_lock(&tty->termios_mutex);
-        old_termios = *tty->termios;
-        *tty->termios = *new_termios;
-        unset_locked_termios(tty->termios, &old_termios, tty->termios_locked);
-
-        /* See if packet mode change of state. */
-        if (tty->link && tty->link->packet) {
-                int extproc = (old_termios.c_lflag & EXTPROC) |
-                                (tty->termios->c_lflag & EXTPROC);
-                int old_flow = ((old_termios.c_iflag & IXON) &&
-                                (old_termios.c_cc[VSTOP] == '\023') &&
-                                (old_termios.c_cc[VSTART] == '\021'));
-                int new_flow = (I_IXON(tty) &&
-                                STOP_CHAR(tty) == '\023' &&
-                                START_CHAR(tty) == '\021');
-                if ((old_flow != new_flow) || extproc) {
-                        spin_lock_irqsave(&tty->ctrl_lock, flags);
-                        if (old_flow != new_flow) {
-                                tty->ctrl_status &= ~(TIOCPKT_DOSTOP | TIOCPKT_NOSTOP);
-                                if (new_flow)
-                                        tty->ctrl_status |= TIOCPKT_DOSTOP;
-                                else
-                                        tty->ctrl_status |= TIOCPKT_NOSTOP;
-                        }
-                        if (extproc)
-                                tty->ctrl_status |= TIOCPKT_IOCTL;
-                        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                        wake_up_interruptible(&tty->link->read_wait);
-                }
-        }
-
-        if (tty->ops->set_termios)
-                (*tty->ops->set_termios)(tty, &old_termios);
-        else
-                tty_termios_copy_hw(tty->termios, &old_termios);
-
-        ld = tty_ldisc_ref(tty);
-        if (ld != NULL) {
-                if (ld->ops->set_termios)
-                        (ld->ops->set_termios)(tty, &old_termios);
-                tty_ldisc_deref(ld);
-        }
-        mutex_unlock(&tty->termios_mutex);
-}
-
-/**
- *      set_termios             -       set termios values for a tty
- *      @tty: terminal device
- *      @arg: user data
- *      @opt: option information
- *
- *      Helper function to prepare termios data and run necessary other
- *      functions before using change_termios to do the actual changes.
- *
- *      Locking:
- *              Called functions take ldisc and termios_mutex locks
- */
-
-static int set_termios(struct tty_struct *tty, void __user *arg, int opt)
-{
-        struct ktermios tmp_termios;
-        struct tty_ldisc *ld;
-        int retval = tty_check_change(tty);
-
-        if (retval)
-                return retval;
-
-        mutex_lock(&tty->termios_mutex);
-        memcpy(&tmp_termios, tty->termios, sizeof(struct ktermios));
-        mutex_unlock(&tty->termios_mutex);
-
-        if (opt & TERMIOS_TERMIO) {
-                if (user_termio_to_kernel_termios(&tmp_termios,
-                                                (struct termio __user *)arg))
-                        return -EFAULT;
-#ifdef TCGETS2
-        } else if (opt & TERMIOS_OLD) {
-                if (user_termios_to_kernel_termios_1(&tmp_termios,
-                                                (struct termios __user *)arg))
-                        return -EFAULT;
-        } else {
-                if (user_termios_to_kernel_termios(&tmp_termios,
-                                                (struct termios2 __user *)arg))
-                        return -EFAULT;
-        }
-#else
-        } else if (user_termios_to_kernel_termios(&tmp_termios,
-                                        (struct termios __user *)arg))
-                return -EFAULT;
-#endif
-
-        /* If old style Bfoo values are used then load c_ispeed/c_ospeed
-         * with the real speed so its unconditionally usable */
-        tmp_termios.c_ispeed = tty_termios_input_baud_rate(&tmp_termios);
-        tmp_termios.c_ospeed = tty_termios_baud_rate(&tmp_termios);
-
-        ld = tty_ldisc_ref(tty);
-
-        if (ld != NULL) {
-                if ((opt & TERMIOS_FLUSH) && ld->ops->flush_buffer)
-                        ld->ops->flush_buffer(tty);
-                tty_ldisc_deref(ld);
-        }
-
-        if (opt & TERMIOS_WAIT) {
-                tty_wait_until_sent(tty, 0);
-                if (signal_pending(current))
-                        return -EINTR;
-        }
-
-        change_termios(tty, &tmp_termios);
-
-        /* FIXME: Arguably if tmp_termios == tty->termios AND the
-           actual requested termios was not tmp_termios then we may
-           want to return an error as no user requested change has
-           succeeded */
-        return 0;
-}
-
-static void copy_termios(struct tty_struct *tty, struct ktermios *kterm)
-{
-        mutex_lock(&tty->termios_mutex);
-        memcpy(kterm, tty->termios, sizeof(struct ktermios));
-        mutex_unlock(&tty->termios_mutex);
-}
-
-static void copy_termios_locked(struct tty_struct *tty, struct ktermios *kterm)
-{
-        mutex_lock(&tty->termios_mutex);
-        memcpy(kterm, tty->termios_locked, sizeof(struct ktermios));
-        mutex_unlock(&tty->termios_mutex);
-}
-
-static int get_termio(struct tty_struct *tty, struct termio __user *termio)
-{
-        struct ktermios kterm;
-        copy_termios(tty, &kterm);
-        if (kernel_termios_to_user_termio(termio, &kterm))
-                return -EFAULT;
-        return 0;
-}
-
-
-#ifdef TCGETX
-
-/**
- *      set_termiox     -       set termiox fields if possible
- *      @tty: terminal
- *      @arg: termiox structure from user
- *      @opt: option flags for ioctl type
- *
- *      Implement the device calling points for the SYS5 termiox ioctl
- *      interface in Linux
- */
-
-static int set_termiox(struct tty_struct *tty, void __user *arg, int opt)
-{
-        struct termiox tnew;
-        struct tty_ldisc *ld;
-
-        if (tty->termiox == NULL)
-                return -EINVAL;
-        if (copy_from_user(&tnew, arg, sizeof(struct termiox)))
-                return -EFAULT;
-
-        ld = tty_ldisc_ref(tty);
-        if (ld != NULL) {
-                if ((opt & TERMIOS_FLUSH) && ld->ops->flush_buffer)
-                        ld->ops->flush_buffer(tty);
-                tty_ldisc_deref(ld);
-        }
-        if (opt & TERMIOS_WAIT) {
-                tty_wait_until_sent(tty, 0);
-                if (signal_pending(current))
-                        return -EINTR;
-        }
-
-        mutex_lock(&tty->termios_mutex);
-        if (tty->ops->set_termiox)
-                tty->ops->set_termiox(tty, &tnew);
-        mutex_unlock(&tty->termios_mutex);
-        return 0;
-}
-
-#endif
-
-
-#ifdef TIOCGETP
-/*
- * These are deprecated, but there is limited support..
- *
- * The "sg_flags" translation is a joke..
- */
-static int get_sgflags(struct tty_struct *tty)
-{
-        int flags = 0;
-
-        if (!(tty->termios->c_lflag & ICANON)) {
-                if (tty->termios->c_lflag & ISIG)
-                        flags |= 0x02;          /* cbreak */
-                else
-                        flags |= 0x20;          /* raw */
-        }
-        if (tty->termios->c_lflag & ECHO)
-                flags |= 0x08;                  /* echo */
-        if (tty->termios->c_oflag & OPOST)
-                if (tty->termios->c_oflag & ONLCR)
-                        flags |= 0x10;          /* crmod */
-        return flags;
-}
-
-static int get_sgttyb(struct tty_struct *tty, struct sgttyb __user *sgttyb)
-{
-        struct sgttyb tmp;
-
-        mutex_lock(&tty->termios_mutex);
-        tmp.sg_ispeed = tty->termios->c_ispeed;
-        tmp.sg_ospeed = tty->termios->c_ospeed;
-        tmp.sg_erase = tty->termios->c_cc[VERASE];
-        tmp.sg_kill = tty->termios->c_cc[VKILL];
-        tmp.sg_flags = get_sgflags(tty);
-        mutex_unlock(&tty->termios_mutex);
-
-        return copy_to_user(sgttyb, &tmp, sizeof(tmp)) ? -EFAULT : 0;
-}
-
-static void set_sgflags(struct ktermios *termios, int flags)
-{
-        termios->c_iflag = ICRNL | IXON;
-        termios->c_oflag = 0;
-        termios->c_lflag = ISIG | ICANON;
-        if (flags & 0x02) {     /* cbreak */
-                termios->c_iflag = 0;
-                termios->c_lflag &= ~ICANON;
-        }
-        if (flags & 0x08) {             /* echo */
-                termios->c_lflag |= ECHO | ECHOE | ECHOK |
-                                    ECHOCTL | ECHOKE | IEXTEN;
-        }
-        if (flags & 0x10) {             /* crmod */
-                termios->c_oflag |= OPOST | ONLCR;
-        }
-        if (flags & 0x20) {     /* raw */
-                termios->c_iflag = 0;
-                termios->c_lflag &= ~(ISIG | ICANON);
-        }
-        if (!(termios->c_lflag & ICANON)) {
-                termios->c_cc[VMIN] = 1;
-                termios->c_cc[VTIME] = 0;
-        }
-}
-
-/**
- *      set_sgttyb              -       set legacy terminal values
- *      @tty: tty structure
- *      @sgttyb: pointer to old style terminal structure
- *
- *      Updates a terminal from the legacy BSD style terminal information
- *      structure.
- *
- *      Locking: termios_mutex
- */
-
-static int set_sgttyb(struct tty_struct *tty, struct sgttyb __user *sgttyb)
-{
-        int retval;
-        struct sgttyb tmp;
-        struct ktermios termios;
-
-        retval = tty_check_change(tty);
-        if (retval)
-                return retval;
-
-        if (copy_from_user(&tmp, sgttyb, sizeof(tmp)))
-                return -EFAULT;
-
-        mutex_lock(&tty->termios_mutex);
-        termios = *tty->termios;
-        termios.c_cc[VERASE] = tmp.sg_erase;
-        termios.c_cc[VKILL] = tmp.sg_kill;
-        set_sgflags(&termios, tmp.sg_flags);
-        /* Try and encode into Bfoo format */
-#ifdef BOTHER
-        tty_termios_encode_baud_rate(&termios, termios.c_ispeed,
-                                                termios.c_ospeed);
-#endif
-        mutex_unlock(&tty->termios_mutex);
-        change_termios(tty, &termios);
-        return 0;
-}
-#endif
-
-#ifdef TIOCGETC
-static int get_tchars(struct tty_struct *tty, struct tchars __user *tchars)
-{
-        struct tchars tmp;
-
-        mutex_lock(&tty->termios_mutex);
-        tmp.t_intrc = tty->termios->c_cc[VINTR];
-        tmp.t_quitc = tty->termios->c_cc[VQUIT];
-        tmp.t_startc = tty->termios->c_cc[VSTART];
-        tmp.t_stopc = tty->termios->c_cc[VSTOP];
-        tmp.t_eofc = tty->termios->c_cc[VEOF];
-        tmp.t_brkc = tty->termios->c_cc[VEOL2]; /* what is brkc anyway? */
-        mutex_unlock(&tty->termios_mutex);
-        return copy_to_user(tchars, &tmp, sizeof(tmp)) ? -EFAULT : 0;
-}
-
-static int set_tchars(struct tty_struct *tty, struct tchars __user *tchars)
-{
-        struct tchars tmp;
-
-        if (copy_from_user(&tmp, tchars, sizeof(tmp)))
-                return -EFAULT;
-        mutex_lock(&tty->termios_mutex);
-        tty->termios->c_cc[VINTR] = tmp.t_intrc;
-        tty->termios->c_cc[VQUIT] = tmp.t_quitc;
-        tty->termios->c_cc[VSTART] = tmp.t_startc;
-        tty->termios->c_cc[VSTOP] = tmp.t_stopc;
-        tty->termios->c_cc[VEOF] = tmp.t_eofc;
-        tty->termios->c_cc[VEOL2] = tmp.t_brkc; /* what is brkc anyway? */
-        mutex_unlock(&tty->termios_mutex);
-        return 0;
-}
-#endif
-
-#ifdef TIOCGLTC
-static int get_ltchars(struct tty_struct *tty, struct ltchars __user *ltchars)
-{
-        struct ltchars tmp;
-
-        mutex_lock(&tty->termios_mutex);
-        tmp.t_suspc = tty->termios->c_cc[VSUSP];
-        /* what is dsuspc anyway? */
-        tmp.t_dsuspc = tty->termios->c_cc[VSUSP];
-        tmp.t_rprntc = tty->termios->c_cc[VREPRINT];
-        /* what is flushc anyway? */
-        tmp.t_flushc = tty->termios->c_cc[VEOL2];
-        tmp.t_werasc = tty->termios->c_cc[VWERASE];
-        tmp.t_lnextc = tty->termios->c_cc[VLNEXT];
-        mutex_unlock(&tty->termios_mutex);
-        return copy_to_user(ltchars, &tmp, sizeof(tmp)) ? -EFAULT : 0;
-}
-
-static int set_ltchars(struct tty_struct *tty, struct ltchars __user *ltchars)
-{
-        struct ltchars tmp;
-
-        if (copy_from_user(&tmp, ltchars, sizeof(tmp)))
-                return -EFAULT;
-
-        mutex_lock(&tty->termios_mutex);
-        tty->termios->c_cc[VSUSP] = tmp.t_suspc;
-        /* what is dsuspc anyway? */
-        tty->termios->c_cc[VEOL2] = tmp.t_dsuspc;
-        tty->termios->c_cc[VREPRINT] = tmp.t_rprntc;
-        /* what is flushc anyway? */
-        tty->termios->c_cc[VEOL2] = tmp.t_flushc;
-        tty->termios->c_cc[VWERASE] = tmp.t_werasc;
-        tty->termios->c_cc[VLNEXT] = tmp.t_lnextc;
-        mutex_unlock(&tty->termios_mutex);
-        return 0;
-}
-#endif
-
-/**
- *      send_prio_char          -       send priority character
- *
- *      Send a high priority character to the tty even if stopped
- *
- *      Locking: none for xchar method, write ordering for write method.
- */
-
-static int send_prio_char(struct tty_struct *tty, char ch)
-{
-        int     was_stopped = tty->stopped;
-
-        if (tty->ops->send_xchar) {
-                tty->ops->send_xchar(tty, ch);
-                return 0;
-        }
-
-        if (tty_write_lock(tty, 0) < 0)
-                return -ERESTARTSYS;
-
-        if (was_stopped)
-                start_tty(tty);
-        tty->ops->write(tty, &ch, 1);
-        if (was_stopped)
-                stop_tty(tty);
-        tty_write_unlock(tty);
-        return 0;
-}
-
-/**
- *      tty_change_softcar      -       carrier change ioctl helper
- *      @tty: tty to update
- *      @arg: enable/disable CLOCAL
- *
- *      Perform a change to the CLOCAL state and call into the driver
- *      layer to make it visible. All done with the termios mutex
- */
-
-static int tty_change_softcar(struct tty_struct *tty, int arg)
-{
-        int ret = 0;
-        int bit = arg ? CLOCAL : 0;
-        struct ktermios old;
-
-        mutex_lock(&tty->termios_mutex);
-        old = *tty->termios;
-        tty->termios->c_cflag &= ~CLOCAL;
-        tty->termios->c_cflag |= bit;
-        if (tty->ops->set_termios)
-                tty->ops->set_termios(tty, &old);
-        if ((tty->termios->c_cflag & CLOCAL) != bit)
-                ret = -EINVAL;
-        mutex_unlock(&tty->termios_mutex);
-        return ret;
-}
-
-/**
- *      tty_mode_ioctl          -       mode related ioctls
- *      @tty: tty for the ioctl
- *      @file: file pointer for the tty
- *      @cmd: command
- *      @arg: ioctl argument
- *
- *      Perform non line discipline specific mode control ioctls. This
- *      is designed to be called by line disciplines to ensure they provide
- *      consistent mode setting.
- */
-
-int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
-                        unsigned int cmd, unsigned long arg)
-{
-        struct tty_struct *real_tty;
-        void __user *p = (void __user *)arg;
-        int ret = 0;
-        struct ktermios kterm;
-
-        if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
-            tty->driver->subtype == PTY_TYPE_MASTER)
-                real_tty = tty->link;
-        else
-                real_tty = tty;
-
-        switch (cmd) {
-#ifdef TIOCGETP
-        case TIOCGETP:
-                return get_sgttyb(real_tty, (struct sgttyb __user *) arg);
-        case TIOCSETP:
-        case TIOCSETN:
-                return set_sgttyb(real_tty, (struct sgttyb __user *) arg);
-#endif
-#ifdef TIOCGETC
-        case TIOCGETC:
-                return get_tchars(real_tty, p);
-        case TIOCSETC:
-                return set_tchars(real_tty, p);
-#endif
-#ifdef TIOCGLTC
-        case TIOCGLTC:
-                return get_ltchars(real_tty, p);
-        case TIOCSLTC:
-                return set_ltchars(real_tty, p);
-#endif
-        case TCSETSF:
-                return set_termios(real_tty, p,  TERMIOS_FLUSH | TERMIOS_WAIT | TERMIOS_OLD);
-        case TCSETSW:
-                return set_termios(real_tty, p, TERMIOS_WAIT | TERMIOS_OLD);
-        case TCSETS:
-                return set_termios(real_tty, p, TERMIOS_OLD);
-#ifndef TCGETS2
-        case TCGETS:
-                copy_termios(real_tty, &kterm);
-                if (kernel_termios_to_user_termios((struct termios __user *)arg, &kterm))
-                        ret = -EFAULT;
-                return ret;
-#else
-        case TCGETS:
-                copy_termios(real_tty, &kterm);
-                if (kernel_termios_to_user_termios_1((struct termios __user *)arg, &kterm))
-                        ret = -EFAULT;
-                return ret;
-        case TCGETS2:
-                copy_termios(real_tty, &kterm);
-                if (kernel_termios_to_user_termios((struct termios2 __user *)arg, &kterm))
-                        ret = -EFAULT;
-                return ret;
-        case TCSETSF2:
-                return set_termios(real_tty, p,  TERMIOS_FLUSH | TERMIOS_WAIT);
-        case TCSETSW2:
-                return set_termios(real_tty, p, TERMIOS_WAIT);
-        case TCSETS2:
-                return set_termios(real_tty, p, 0);
-#endif
-        case TCGETA:
-                return get_termio(real_tty, p);
-        case TCSETAF:
-                return set_termios(real_tty, p, TERMIOS_FLUSH | TERMIOS_WAIT | TERMIOS_TERMIO);
-        case TCSETAW:
-                return set_termios(real_tty, p, TERMIOS_WAIT | TERMIOS_TERMIO);
-        case TCSETA:
-                return set_termios(real_tty, p, TERMIOS_TERMIO);
-#ifndef TCGETS2
-        case TIOCGLCKTRMIOS:
-                copy_termios_locked(real_tty, &kterm);
-                if (kernel_termios_to_user_termios((struct termios __user *)arg, &kterm))
-                        ret = -EFAULT;
-                return ret;
-        case TIOCSLCKTRMIOS:
-                if (!capable(CAP_SYS_ADMIN))
-                        return -EPERM;
-                copy_termios_locked(real_tty, &kterm);
-                if (user_termios_to_kernel_termios(&kterm,
-                                               (struct termios __user *) arg))
-                        return -EFAULT;
-                mutex_lock(&real_tty->termios_mutex);
-                memcpy(real_tty->termios_locked, &kterm, sizeof(struct ktermios));
-                mutex_unlock(&real_tty->termios_mutex);
-                return 0;
-#else
-        case TIOCGLCKTRMIOS:
-                copy_termios_locked(real_tty, &kterm);
-                if (kernel_termios_to_user_termios_1((struct termios __user *)arg, &kterm))
-                        ret = -EFAULT;
-                return ret;
-        case TIOCSLCKTRMIOS:
-                if (!capable(CAP_SYS_ADMIN))
-                        return -EPERM;
-                copy_termios_locked(real_tty, &kterm);
-                if (user_termios_to_kernel_termios_1(&kterm,
-                                               (struct termios __user *) arg))
-                        return -EFAULT;
-                mutex_lock(&real_tty->termios_mutex);
-                memcpy(real_tty->termios_locked, &kterm, sizeof(struct ktermios));
-                mutex_unlock(&real_tty->termios_mutex);
-                return ret;
-#endif
-#ifdef TCGETX
-        case TCGETX: {
-                struct termiox ktermx;
-                if (real_tty->termiox == NULL)
-                        return -EINVAL;
-                mutex_lock(&real_tty->termios_mutex);
-                memcpy(&ktermx, real_tty->termiox, sizeof(struct termiox));
-                mutex_unlock(&real_tty->termios_mutex);
-                if (copy_to_user(p, &ktermx, sizeof(struct termiox)))
-                        ret = -EFAULT;
-                return ret;
-        }
-        case TCSETX:
-                return set_termiox(real_tty, p, 0);
-        case TCSETXW:
-                return set_termiox(real_tty, p, TERMIOS_WAIT);
-        case TCSETXF:
-                return set_termiox(real_tty, p, TERMIOS_FLUSH);
-#endif          
-        case TIOCGSOFTCAR:
-                copy_termios(real_tty, &kterm);
-                ret = put_user((kterm.c_cflag & CLOCAL) ? 1 : 0,
-                                                (int __user *)arg);
-                return ret;
-        case TIOCSSOFTCAR:
-                if (get_user(arg, (unsigned int __user *) arg))
-                        return -EFAULT;
-                return tty_change_softcar(real_tty, arg);
-        default:
-                return -ENOIOCTLCMD;
-        }
-}
-EXPORT_SYMBOL_GPL(tty_mode_ioctl);
-
-int tty_perform_flush(struct tty_struct *tty, unsigned long arg)
-{
-        struct tty_ldisc *ld;
-        int retval = tty_check_change(tty);
-        if (retval)
-                return retval;
-
-        ld = tty_ldisc_ref_wait(tty);
-        switch (arg) {
-        case TCIFLUSH:
-                if (ld && ld->ops->flush_buffer)
-                        ld->ops->flush_buffer(tty);
-                break;
-        case TCIOFLUSH:
-                if (ld && ld->ops->flush_buffer)
-                        ld->ops->flush_buffer(tty);
-                /* fall through */
-        case TCOFLUSH:
-                tty_driver_flush_buffer(tty);
-                break;
-        default:
-                tty_ldisc_deref(ld);
-                return -EINVAL;
-        }
-        tty_ldisc_deref(ld);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(tty_perform_flush);
-
-int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
-                       unsigned int cmd, unsigned long arg)
-{
-        unsigned long flags;
-        int retval;
-
-        switch (cmd) {
-        case TCXONC:
-                retval = tty_check_change(tty);
-                if (retval)
-                        return retval;
-                switch (arg) {
-                case TCOOFF:
-                        if (!tty->flow_stopped) {
-                                tty->flow_stopped = 1;
-                                stop_tty(tty);
-                        }
-                        break;
-                case TCOON:
-                        if (tty->flow_stopped) {
-                                tty->flow_stopped = 0;
-                                start_tty(tty);
-                        }
-                        break;
-                case TCIOFF:
-                        if (STOP_CHAR(tty) != __DISABLED_CHAR)
-                                return send_prio_char(tty, STOP_CHAR(tty));
-                        break;
-                case TCION:
-                        if (START_CHAR(tty) != __DISABLED_CHAR)
-                                return send_prio_char(tty, START_CHAR(tty));
-                        break;
-                default:
-                        return -EINVAL;
-                }
-                return 0;
-        case TCFLSH:
-                return tty_perform_flush(tty, arg);
-        case TIOCPKT:
-        {
-                int pktmode;
-
-                if (tty->driver->type != TTY_DRIVER_TYPE_PTY ||
-                    tty->driver->subtype != PTY_TYPE_MASTER)
-                        return -ENOTTY;
-                if (get_user(pktmode, (int __user *) arg))
-                        return -EFAULT;
-                spin_lock_irqsave(&tty->ctrl_lock, flags);
-                if (pktmode) {
-                        if (!tty->packet) {
-                                tty->packet = 1;
-                                tty->link->ctrl_status = 0;
-                        }
-                } else
-                        tty->packet = 0;
-                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                return 0;
-        }
-        default:
-                /* Try the mode commands */
-                return tty_mode_ioctl(tty, file, cmd, arg);
-        }
-}
-EXPORT_SYMBOL(n_tty_ioctl_helper);
diff --git a/drivers/char/tty_ldisc.c b/drivers/char/tty_ldisc.c
deleted file mode 100644
index 412f9775d19c..000000000000
--- a/drivers/char/tty_ldisc.c
+++ /dev/null
@@ -1,915 +0,0 @@
-#include <linux/types.h>
-#include <linux/major.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/fcntl.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <linux/devpts_fs.h>
-#include <linux/file.h>
-#include <linux/console.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/kd.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/wait.h>
-#include <linux/bitops.h>
-#include <linux/delay.h>
-#include <linux/seq_file.h>
-
-#include <linux/uaccess.h>
-#include <asm/system.h>
-
-#include <linux/kbd_kern.h>
-#include <linux/vt_kern.h>
-#include <linux/selection.h>
-
-#include <linux/smp_lock.h>     /* For the moment */
-
-#include <linux/kmod.h>
-#include <linux/nsproxy.h>
-
-/*
- *      This guards the refcounted line discipline lists. The lock
- *      must be taken with irqs off because there are hangup path
- *      callers who will do ldisc lookups and cannot sleep.
- */
-
-static DEFINE_SPINLOCK(tty_ldisc_lock);
-static DECLARE_WAIT_QUEUE_HEAD(tty_ldisc_wait);
-/* Line disc dispatch table */
-static struct tty_ldisc_ops *tty_ldiscs[NR_LDISCS];
-
-static inline struct tty_ldisc *get_ldisc(struct tty_ldisc *ld)
-{
-        if (ld)
-                atomic_inc(&ld->users);
-        return ld;
-}
-
-static void put_ldisc(struct tty_ldisc *ld)
-{
-        unsigned long flags;
-
-        if (WARN_ON_ONCE(!ld))
-                return;
-
-        /*
-         * If this is the last user, free the ldisc, and
-         * release the ldisc ops.
-         *
-         * We really want an "atomic_dec_and_lock_irqsave()",
-         * but we don't have it, so this does it by hand.
-         */
-        local_irq_save(flags);
-        if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
-                struct tty_ldisc_ops *ldo = ld->ops;
-
-                ldo->refcount--;
-                module_put(ldo->owner);
-                spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-
-                kfree(ld);
-                return;
-        }
-        local_irq_restore(flags);
-}
-
-/**
- *      tty_register_ldisc      -       install a line discipline
- *      @disc: ldisc number
- *      @new_ldisc: pointer to the ldisc object
- *
- *      Installs a new line discipline into the kernel. The discipline
- *      is set up as unreferenced and then made available to the kernel
- *      from this point onwards.
- *
- *      Locking:
- *              takes tty_ldisc_lock to guard against ldisc races
- */
-
-int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
-{
-        unsigned long flags;
-        int ret = 0;
-
-        if (disc < N_TTY || disc >= NR_LDISCS)
-                return -EINVAL;
-
-        spin_lock_irqsave(&tty_ldisc_lock, flags);
-        tty_ldiscs[disc] = new_ldisc;
-        new_ldisc->num = disc;
-        new_ldisc->refcount = 0;
-        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-
-        return ret;
-}
-EXPORT_SYMBOL(tty_register_ldisc);
-
-/**
- *      tty_unregister_ldisc    -       unload a line discipline
- *      @disc: ldisc number
- *      @new_ldisc: pointer to the ldisc object
- *
- *      Remove a line discipline from the kernel providing it is not
- *      currently in use.
- *
- *      Locking:
- *              takes tty_ldisc_lock to guard against ldisc races
- */
-
-int tty_unregister_ldisc(int disc)
-{
-        unsigned long flags;
-        int ret = 0;
-
-        if (disc < N_TTY || disc >= NR_LDISCS)
-                return -EINVAL;
-
-        spin_lock_irqsave(&tty_ldisc_lock, flags);
-        if (tty_ldiscs[disc]->refcount)
-                ret = -EBUSY;
-        else
-                tty_ldiscs[disc] = NULL;
-        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-
-        return ret;
-}
-EXPORT_SYMBOL(tty_unregister_ldisc);
-
-static struct tty_ldisc_ops *get_ldops(int disc)
-{
-        unsigned long flags;
-        struct tty_ldisc_ops *ldops, *ret;
-
-        spin_lock_irqsave(&tty_ldisc_lock, flags);
-        ret = ERR_PTR(-EINVAL);
-        ldops = tty_ldiscs[disc];
-        if (ldops) {
-                ret = ERR_PTR(-EAGAIN);
-                if (try_module_get(ldops->owner)) {
-                        ldops->refcount++;
-                        ret = ldops;
-                }
-        }
-        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-        return ret;
-}
-
-static void put_ldops(struct tty_ldisc_ops *ldops)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&tty_ldisc_lock, flags);
-        ldops->refcount--;
-        module_put(ldops->owner);
-        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-}
-
-/**
- *      tty_ldisc_get           -       take a reference to an ldisc
- *      @disc: ldisc number
- *
- *      Takes a reference to a line discipline. Deals with refcounts and
- *      module locking counts. Returns NULL if the discipline is not available.
- *      Returns a pointer to the discipline and bumps the ref count if it is
- *      available
- *
- *      Locking:
- *              takes tty_ldisc_lock to guard against ldisc races
- */
-
-static struct tty_ldisc *tty_ldisc_get(int disc)
-{
-        struct tty_ldisc *ld;
-        struct tty_ldisc_ops *ldops;
-
-        if (disc < N_TTY || disc >= NR_LDISCS)
-                return ERR_PTR(-EINVAL);
-
-        /*
-         * Get the ldisc ops - we may need to request them to be loaded
-         * dynamically and try again.
-         */
-        ldops = get_ldops(disc);
-        if (IS_ERR(ldops)) {
-                request_module("tty-ldisc-%d", disc);
-                ldops = get_ldops(disc);
-                if (IS_ERR(ldops))
-                        return ERR_CAST(ldops);
-        }
-
-        ld = kmalloc(sizeof(struct tty_ldisc), GFP_KERNEL);
-        if (ld == NULL) {
-                put_ldops(ldops);
-                return ERR_PTR(-ENOMEM);
-        }
-
-        ld->ops = ldops;
-        atomic_set(&ld->users, 1);
-        return ld;
-}
-
-static void *tty_ldiscs_seq_start(struct seq_file *m, loff_t *pos)
-{
-        return (*pos < NR_LDISCS) ? pos : NULL;
-}
-
-static void *tty_ldiscs_seq_next(struct seq_file *m, void *v, loff_t *pos)
-{
-        (*pos)++;
-        return (*pos < NR_LDISCS) ? pos : NULL;
-}
-
-static void tty_ldiscs_seq_stop(struct seq_file *m, void *v)
-{
-}
-
-static int tty_ldiscs_seq_show(struct seq_file *m, void *v)
-{
-        int i = *(loff_t *)v;
-        struct tty_ldisc_ops *ldops;
-
-        ldops = get_ldops(i);
-        if (IS_ERR(ldops))
-                return 0;
-        seq_printf(m, "%-10s %2d\n", ldops->name ? ldops->name : "???", i);
-        put_ldops(ldops);
-        return 0;
-}
-
-static const struct seq_operations tty_ldiscs_seq_ops = {
-        .start  = tty_ldiscs_seq_start,
-        .next   = tty_ldiscs_seq_next,
-        .stop   = tty_ldiscs_seq_stop,
-        .show   = tty_ldiscs_seq_show,
-};
-
-static int proc_tty_ldiscs_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &tty_ldiscs_seq_ops);
-}
-
-const struct file_operations tty_ldiscs_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_tty_ldiscs_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-/**
- *      tty_ldisc_assign        -       set ldisc on a tty
- *      @tty: tty to assign
- *      @ld: line discipline
- *
- *      Install an instance of a line discipline into a tty structure. The
- *      ldisc must have a reference count above zero to ensure it remains.
- *      The tty instance refcount starts at zero.
- *
- *      Locking:
- *              Caller must hold references
- */
-
-static void tty_ldisc_assign(struct tty_struct *tty, struct tty_ldisc *ld)
-{
-        tty->ldisc = ld;
-}
-
-/**
- *      tty_ldisc_try           -       internal helper
- *      @tty: the tty
- *
- *      Make a single attempt to grab and bump the refcount on
- *      the tty ldisc. Return 0 on failure or 1 on success. This is
- *      used to implement both the waiting and non waiting versions
- *      of tty_ldisc_ref
- *
- *      Locking: takes tty_ldisc_lock
- */
-
-static struct tty_ldisc *tty_ldisc_try(struct tty_struct *tty)
-{
-        unsigned long flags;
-        struct tty_ldisc *ld;
-
-        spin_lock_irqsave(&tty_ldisc_lock, flags);
-        ld = NULL;
-        if (test_bit(TTY_LDISC, &tty->flags))
-                ld = get_ldisc(tty->ldisc);
-        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-        return ld;
-}
-
-/**
- *      tty_ldisc_ref_wait      -       wait for the tty ldisc
- *      @tty: tty device
- *
- *      Dereference the line discipline for the terminal and take a
- *      reference to it. If the line discipline is in flux then
- *      wait patiently until it changes.
- *
- *      Note: Must not be called from an IRQ/timer context. The caller
- *      must also be careful not to hold other locks that will deadlock
- *      against a discipline change, such as an existing ldisc reference
- *      (which we check for)
- *
- *      Locking: call functions take tty_ldisc_lock
- */
-
-struct tty_ldisc *tty_ldisc_ref_wait(struct tty_struct *tty)
-{
-        struct tty_ldisc *ld;
-
-        /* wait_event is a macro */
-        wait_event(tty_ldisc_wait, (ld = tty_ldisc_try(tty)) != NULL);
-        return ld;
-}
-EXPORT_SYMBOL_GPL(tty_ldisc_ref_wait);
-
-/**
- *      tty_ldisc_ref           -       get the tty ldisc
- *      @tty: tty device
- *
- *      Dereference the line discipline for the terminal and take a
- *      reference to it. If the line discipline is in flux then
- *      return NULL. Can be called from IRQ and timer functions.
- *
- *      Locking: called functions take tty_ldisc_lock
- */
-
-struct tty_ldisc *tty_ldisc_ref(struct tty_struct *tty)
-{
-        return tty_ldisc_try(tty);
-}
-EXPORT_SYMBOL_GPL(tty_ldisc_ref);
-
-/**
- *      tty_ldisc_deref         -       free a tty ldisc reference
- *      @ld: reference to free up
- *
- *      Undoes the effect of tty_ldisc_ref or tty_ldisc_ref_wait. May
- *      be called in IRQ context.
- *
- *      Locking: takes tty_ldisc_lock
- */
-
-void tty_ldisc_deref(struct tty_ldisc *ld)
-{
-        put_ldisc(ld);
-}
-EXPORT_SYMBOL_GPL(tty_ldisc_deref);
-
-static inline void tty_ldisc_put(struct tty_ldisc *ld)
-{
-        put_ldisc(ld);
-}
-
-/**
- *      tty_ldisc_enable        -       allow ldisc use
- *      @tty: terminal to activate ldisc on
- *
- *      Set the TTY_LDISC flag when the line discipline can be called
- *      again. Do necessary wakeups for existing sleepers. Clear the LDISC
- *      changing flag to indicate any ldisc change is now over.
- *
- *      Note: nobody should set the TTY_LDISC bit except via this function.
- *      Clearing directly is allowed.
- */
-
-void tty_ldisc_enable(struct tty_struct *tty)
-{
-        set_bit(TTY_LDISC, &tty->flags);
-        clear_bit(TTY_LDISC_CHANGING, &tty->flags);
-        wake_up(&tty_ldisc_wait);
-}
-
-/**
- *      tty_ldisc_flush -       flush line discipline queue
- *      @tty: tty
- *
- *      Flush the line discipline queue (if any) for this tty. If there
- *      is no line discipline active this is a no-op.
- */
-
-void tty_ldisc_flush(struct tty_struct *tty)
-{
-        struct tty_ldisc *ld = tty_ldisc_ref(tty);
-        if (ld) {
-                if (ld->ops->flush_buffer)
-                        ld->ops->flush_buffer(tty);
-                tty_ldisc_deref(ld);
-        }
-        tty_buffer_flush(tty);
-}
-EXPORT_SYMBOL_GPL(tty_ldisc_flush);
-
-/**
- *      tty_set_termios_ldisc           -       set ldisc field
- *      @tty: tty structure
- *      @num: line discipline number
- *
- *      This is probably overkill for real world processors but
- *      they are not on hot paths so a little discipline won't do
- *      any harm.
- *
- *      Locking: takes termios_mutex
- */
-
-static void tty_set_termios_ldisc(struct tty_struct *tty, int num)
-{
-        mutex_lock(&tty->termios_mutex);
-        tty->termios->c_line = num;
-        mutex_unlock(&tty->termios_mutex);
-}
-
-/**
- *      tty_ldisc_open          -       open a line discipline
- *      @tty: tty we are opening the ldisc on
- *      @ld: discipline to open
- *
- *      A helper opening method. Also a convenient debugging and check
- *      point.
- *
- *      Locking: always called with BTM already held.
- */
-
-static int tty_ldisc_open(struct tty_struct *tty, struct tty_ldisc *ld)
-{
-        WARN_ON(test_and_set_bit(TTY_LDISC_OPEN, &tty->flags));
-        if (ld->ops->open) {
-                int ret;
-                /* BTM here locks versus a hangup event */
-                WARN_ON(!tty_locked());
-                ret = ld->ops->open(tty);
-                return ret;
-        }
-        return 0;
-}
-
-/**
- *      tty_ldisc_close         -       close a line discipline
- *      @tty: tty we are opening the ldisc on
- *      @ld: discipline to close
- *
- *      A helper close method. Also a convenient debugging and check
- *      point.
- */
-
-static void tty_ldisc_close(struct tty_struct *tty, struct tty_ldisc *ld)
-{
-        WARN_ON(!test_bit(TTY_LDISC_OPEN, &tty->flags));
-        clear_bit(TTY_LDISC_OPEN, &tty->flags);
-        if (ld->ops->close)
-                ld->ops->close(tty);
-}
-
-/**
- *      tty_ldisc_restore       -       helper for tty ldisc change
- *      @tty: tty to recover
- *      @old: previous ldisc
- *
- *      Restore the previous line discipline or N_TTY when a line discipline
- *      change fails due to an open error
- */
-
-static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old)
-{
-        char buf[64];
-        struct tty_ldisc *new_ldisc;
-        int r;
-
-        /* There is an outstanding reference here so this is safe */
-        old = tty_ldisc_get(old->ops->num);
-        WARN_ON(IS_ERR(old));
-        tty_ldisc_assign(tty, old);
-        tty_set_termios_ldisc(tty, old->ops->num);
-        if (tty_ldisc_open(tty, old) < 0) {
-                tty_ldisc_put(old);
-                /* This driver is always present */
-                new_ldisc = tty_ldisc_get(N_TTY);
-                if (IS_ERR(new_ldisc))
-                        panic("n_tty: get");
-                tty_ldisc_assign(tty, new_ldisc);
-                tty_set_termios_ldisc(tty, N_TTY);
-                r = tty_ldisc_open(tty, new_ldisc);
-                if (r < 0)
-                        panic("Couldn't open N_TTY ldisc for "
-                              "%s --- error %d.",
-                              tty_name(tty, buf), r);
-        }
-}
-
-/**
- *      tty_ldisc_halt          -       shut down the line discipline
- *      @tty: tty device
- *
- *      Shut down the line discipline and work queue for this tty device.
- *      The TTY_LDISC flag being cleared ensures no further references can
- *      be obtained while the delayed work queue halt ensures that no more
- *      data is fed to the ldisc.
- *
- *      You need to do a 'flush_scheduled_work()' (outside the ldisc_mutex)
- *      in order to make sure any currently executing ldisc work is also
- *      flushed.
- */
-
-static int tty_ldisc_halt(struct tty_struct *tty)
-{
-        clear_bit(TTY_LDISC, &tty->flags);
-        return cancel_delayed_work_sync(&tty->buf.work);
-}
-
-/**
- *      tty_set_ldisc           -       set line discipline
- *      @tty: the terminal to set
- *      @ldisc: the line discipline
- *
- *      Set the discipline of a tty line. Must be called from a process
- *      context. The ldisc change logic has to protect itself against any
- *      overlapping ldisc change (including on the other end of pty pairs),
- *      the close of one side of a tty/pty pair, and eventually hangup.
- *
- *      Locking: takes tty_ldisc_lock, termios_mutex
- */
-
-int tty_set_ldisc(struct tty_struct *tty, int ldisc)
-{
-        int retval;
-        struct tty_ldisc *o_ldisc, *new_ldisc;
-        int work, o_work = 0;
-        struct tty_struct *o_tty;
-
-        new_ldisc = tty_ldisc_get(ldisc);
-        if (IS_ERR(new_ldisc))
-                return PTR_ERR(new_ldisc);
-
-        tty_lock();
-        /*
-         *      We need to look at the tty locking here for pty/tty pairs
-         *      when both sides try to change in parallel.
-         */
-
-        o_tty = tty->link;      /* o_tty is the pty side or NULL */
-
-
-        /*
-         *      Check the no-op case
-         */
-
-        if (tty->ldisc->ops->num == ldisc) {
-                tty_unlock();
-                tty_ldisc_put(new_ldisc);
-                return 0;
-        }
-
-        tty_unlock();
-        /*
-         *      Problem: What do we do if this blocks ?
-         *      We could deadlock here
-         */
-
-        tty_wait_until_sent(tty, 0);
-
-        tty_lock();
-        mutex_lock(&tty->ldisc_mutex);
-
-        /*
-         *      We could be midstream of another ldisc change which has
-         *      dropped the lock during processing. If so we need to wait.
-         */
-
-        while (test_bit(TTY_LDISC_CHANGING, &tty->flags)) {
-                mutex_unlock(&tty->ldisc_mutex);
-                tty_unlock();
-                wait_event(tty_ldisc_wait,
-                        test_bit(TTY_LDISC_CHANGING, &tty->flags) == 0);
-                tty_lock();
-                mutex_lock(&tty->ldisc_mutex);
-        }
-
-        set_bit(TTY_LDISC_CHANGING, &tty->flags);
-
-        /*
-         *      No more input please, we are switching. The new ldisc
-         *      will update this value in the ldisc open function
-         */
-
-        tty->receive_room = 0;
-
-        o_ldisc = tty->ldisc;
-
-        tty_unlock();
-        /*
-         *      Make sure we don't change while someone holds a
-         *      reference to the line discipline. The TTY_LDISC bit
-         *      prevents anyone taking a reference once it is clear.
-         *      We need the lock to avoid racing reference takers.
-         *
-         *      We must clear the TTY_LDISC bit here to avoid a livelock
-         *      with a userspace app continually trying to use the tty in
-         *      parallel to the change and re-referencing the tty.
-         */
-
-        work = tty_ldisc_halt(tty);
-        if (o_tty)
-                o_work = tty_ldisc_halt(o_tty);
-
-        /*
-         * Wait for ->hangup_work and ->buf.work handlers to terminate.
-         * We must drop the mutex here in case a hangup is also in process.
-         */
-
-        mutex_unlock(&tty->ldisc_mutex);
-
-        flush_scheduled_work();
-
-        tty_lock();
-        mutex_lock(&tty->ldisc_mutex);
-        if (test_bit(TTY_HUPPED, &tty->flags)) {
-                /* We were raced by the hangup method. It will have stomped
-                   the ldisc data and closed the ldisc down */
-                clear_bit(TTY_LDISC_CHANGING, &tty->flags);
-                mutex_unlock(&tty->ldisc_mutex);
-                tty_ldisc_put(new_ldisc);
-                tty_unlock();
-                return -EIO;
-        }
-
-        /* Shutdown the current discipline. */
-        tty_ldisc_close(tty, o_ldisc);
-
-        /* Now set up the new line discipline. */
-        tty_ldisc_assign(tty, new_ldisc);
-        tty_set_termios_ldisc(tty, ldisc);
-
-        retval = tty_ldisc_open(tty, new_ldisc);
-        if (retval < 0) {
-                /* Back to the old one or N_TTY if we can't */
-                tty_ldisc_put(new_ldisc);
-                tty_ldisc_restore(tty, o_ldisc);
-        }
-
-        /* At this point we hold a reference to the new ldisc and a
-           a reference to the old ldisc. If we ended up flipping back
-           to the existing ldisc we have two references to it */
-
-        if (tty->ldisc->ops->num != o_ldisc->ops->num && tty->ops->set_ldisc)
-                tty->ops->set_ldisc(tty);
-
-        tty_ldisc_put(o_ldisc);
-
-        /*
-         *      Allow ldisc referencing to occur again
-         */
-
-        tty_ldisc_enable(tty);
-        if (o_tty)
-                tty_ldisc_enable(o_tty);
-
-        /* Restart the work queue in case no characters kick it off. Safe if
-           already running */
-        if (work)
-                schedule_delayed_work(&tty->buf.work, 1);
-        if (o_work)
-                schedule_delayed_work(&o_tty->buf.work, 1);
-        mutex_unlock(&tty->ldisc_mutex);
-        tty_unlock();
-        return retval;
-}
-
-/**
- *      tty_reset_termios       -       reset terminal state
- *      @tty: tty to reset
- *
- *      Restore a terminal to the driver default state.
- */
-
-static void tty_reset_termios(struct tty_struct *tty)
-{
-        mutex_lock(&tty->termios_mutex);
-        *tty->termios = tty->driver->init_termios;
-        tty->termios->c_ispeed = tty_termios_input_baud_rate(tty->termios);
-        tty->termios->c_ospeed = tty_termios_baud_rate(tty->termios);
-        mutex_unlock(&tty->termios_mutex);
-}
-
-
-/**
- *      tty_ldisc_reinit        -       reinitialise the tty ldisc
- *      @tty: tty to reinit
- *      @ldisc: line discipline to reinitialize
- *
- *      Switch the tty to a line discipline and leave the ldisc
- *      state closed
- */
-
-static void tty_ldisc_reinit(struct tty_struct *tty, int ldisc)
-{
-        struct tty_ldisc *ld;
-
-        tty_ldisc_close(tty, tty->ldisc);
-        tty_ldisc_put(tty->ldisc);
-        tty->ldisc = NULL;
-        /*
-         *      Switch the line discipline back
-         */
-        ld = tty_ldisc_get(ldisc);
-        BUG_ON(IS_ERR(ld));
-        tty_ldisc_assign(tty, ld);
-        tty_set_termios_ldisc(tty, ldisc);
-}
-
-/**
- *      tty_ldisc_hangup                -       hangup ldisc reset
- *      @tty: tty being hung up
- *
- *      Some tty devices reset their termios when they receive a hangup
- *      event. In that situation we must also switch back to N_TTY properly
- *      before we reset the termios data.
- *
- *      Locking: We can take the ldisc mutex as the rest of the code is
- *      careful to allow for this.
- *
- *      In the pty pair case this occurs in the close() path of the
- *      tty itself so we must be careful about locking rules.
- */
-
-void tty_ldisc_hangup(struct tty_struct *tty)
-{
-        struct tty_ldisc *ld;
-        int reset = tty->driver->flags & TTY_DRIVER_RESET_TERMIOS;
-        int err = 0;
-
-        /*
-         * FIXME! What are the locking issues here? This may me overdoing
-         * things... This question is especially important now that we've
-         * removed the irqlock.
-         */
-        ld = tty_ldisc_ref(tty);
-        if (ld != NULL) {
-                /* We may have no line discipline at this point */
-                if (ld->ops->flush_buffer)
-                        ld->ops->flush_buffer(tty);
-                tty_driver_flush_buffer(tty);
-                if ((test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags)) &&
-                    ld->ops->write_wakeup)
-                        ld->ops->write_wakeup(tty);
-                if (ld->ops->hangup)
-                        ld->ops->hangup(tty);
-                tty_ldisc_deref(ld);
-        }
-        /*
-         * FIXME: Once we trust the LDISC code better we can wait here for
-         * ldisc completion and fix the driver call race
-         */
-        wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
-        wake_up_interruptible_poll(&tty->read_wait, POLLIN);
-        /*
-         * Shutdown the current line discipline, and reset it to
-         * N_TTY if need be.
-         *
-         * Avoid racing set_ldisc or tty_ldisc_release
-         */
-        mutex_lock(&tty->ldisc_mutex);
-
-        /*
-         * this is like tty_ldisc_halt, but we need to give up
-         * the BTM before calling cancel_delayed_work_sync,
-         * which may need to wait for another function taking the BTM
-         */
-        clear_bit(TTY_LDISC, &tty->flags);
-        tty_unlock();
-        cancel_delayed_work_sync(&tty->buf.work);
-        mutex_unlock(&tty->ldisc_mutex);
-
-        tty_lock();
-        mutex_lock(&tty->ldisc_mutex);
-
-        /* At this point we have a closed ldisc and we want to
-           reopen it. We could defer this to the next open but
-           it means auditing a lot of other paths so this is
-           a FIXME */
-        if (tty->ldisc) {       /* Not yet closed */
-                if (reset == 0) {
-                        tty_ldisc_reinit(tty, tty->termios->c_line);
-                        err = tty_ldisc_open(tty, tty->ldisc);
-                }
-                /* If the re-open fails or we reset then go to N_TTY. The
-                   N_TTY open cannot fail */
-                if (reset || err) {
-                        tty_ldisc_reinit(tty, N_TTY);
-                        WARN_ON(tty_ldisc_open(tty, tty->ldisc));
-                }
-                tty_ldisc_enable(tty);
-        }
-        mutex_unlock(&tty->ldisc_mutex);
-        if (reset)
-                tty_reset_termios(tty);
-}
-
-/**
- *      tty_ldisc_setup                 -       open line discipline
- *      @tty: tty being shut down
- *      @o_tty: pair tty for pty/tty pairs
- *
- *      Called during the initial open of a tty/pty pair in order to set up the
- *      line disciplines and bind them to the tty. This has no locking issues
- *      as the device isn't yet active.
- */
-
-int tty_ldisc_setup(struct tty_struct *tty, struct tty_struct *o_tty)
-{
-        struct tty_ldisc *ld = tty->ldisc;
-        int retval;
-
-        retval = tty_ldisc_open(tty, ld);
-        if (retval)
-                return retval;
-
-        if (o_tty) {
-                retval = tty_ldisc_open(o_tty, o_tty->ldisc);
-                if (retval) {
-                        tty_ldisc_close(tty, ld);
-                        return retval;
-                }
-                tty_ldisc_enable(o_tty);
-        }
-        tty_ldisc_enable(tty);
-        return 0;
-}
-/**
- *      tty_ldisc_release               -       release line discipline
- *      @tty: tty being shut down
- *      @o_tty: pair tty for pty/tty pairs
- *
- *      Called during the final close of a tty/pty pair in order to shut down
- *      the line discpline layer. On exit the ldisc assigned is N_TTY and the
- *      ldisc has not been opened.
- */
-
-void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty)
-{
-        /*
-         * Prevent flush_to_ldisc() from rescheduling the work for later.  Then
-         * kill any delayed work. As this is the final close it does not
-         * race with the set_ldisc code path.
-         */
-
-        tty_unlock();
-        tty_ldisc_halt(tty);
-        flush_scheduled_work();
-        tty_lock();
-
-        mutex_lock(&tty->ldisc_mutex);
-        /*
-         * Now kill off the ldisc
-         */
-        tty_ldisc_close(tty, tty->ldisc);
-        tty_ldisc_put(tty->ldisc);
-        /* Force an oops if we mess this up */
-        tty->ldisc = NULL;
-
-        /* Ensure the next open requests the N_TTY ldisc */
-        tty_set_termios_ldisc(tty, N_TTY);
-        mutex_unlock(&tty->ldisc_mutex);
-
-        /* This will need doing differently if we need to lock */
-        if (o_tty)
-                tty_ldisc_release(o_tty, NULL);
-
-        /* And the memory resources remaining (buffers, termios) will be
-           disposed of when the kref hits zero */
-}
-
-/**
- *      tty_ldisc_init          -       ldisc setup for new tty
- *      @tty: tty being allocated
- *
- *      Set up the line discipline objects for a newly allocated tty. Note that
- *      the tty structure is not completely set up when this call is made.
- */
-
-void tty_ldisc_init(struct tty_struct *tty)
-{
-        struct tty_ldisc *ld = tty_ldisc_get(N_TTY);
-        if (IS_ERR(ld))
-                panic("n_tty: init_tty");
-        tty_ldisc_assign(tty, ld);
-}
-
-void tty_ldisc_begin(void)
-{
-        /* Setup the default TTY line discipline. */
-        (void) tty_register_ldisc(N_TTY, &tty_ldisc_N_TTY);
-}
diff --git a/drivers/char/tty_mutex.c b/drivers/char/tty_mutex.c
deleted file mode 100644
index 133697540c73..000000000000
--- a/drivers/char/tty_mutex.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * drivers/char/tty_lock.c
- */
-#include <linux/tty.h>
-#include <linux/module.h>
-#include <linux/kallsyms.h>
-#include <linux/semaphore.h>
-#include <linux/sched.h>
-
-/*
- * The 'big tty mutex'
- *
- * This mutex is taken and released by tty_lock() and tty_unlock(),
- * replacing the older big kernel lock.
- * It can no longer be taken recursively, and does not get
- * released implicitly while sleeping.
- *
- * Don't use in new code.
- */
-static DEFINE_MUTEX(big_tty_mutex);
-struct task_struct *__big_tty_mutex_owner;
-EXPORT_SYMBOL_GPL(__big_tty_mutex_owner);
-
-/*
- * Getting the big tty mutex.
- */
-void __lockfunc tty_lock(void)
-{
-        struct task_struct *task = current;
-
-        WARN_ON(__big_tty_mutex_owner == task);
-
-        mutex_lock(&big_tty_mutex);
-        __big_tty_mutex_owner = task;
-}
-EXPORT_SYMBOL(tty_lock);
-
-void __lockfunc tty_unlock(void)
-{
-        struct task_struct *task = current;
-
-        WARN_ON(__big_tty_mutex_owner != task);
-        __big_tty_mutex_owner = NULL;
-
-        mutex_unlock(&big_tty_mutex);
-}
-EXPORT_SYMBOL(tty_unlock);
diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
deleted file mode 100644
index 33d37d230f8f..000000000000
--- a/drivers/char/tty_port.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Tty port functions
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <linux/serial.h>
-#include <linux/timer.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/wait.h>
-#include <linux/bitops.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-
-void tty_port_init(struct tty_port *port)
-{
-        memset(port, 0, sizeof(*port));
-        init_waitqueue_head(&port->open_wait);
-        init_waitqueue_head(&port->close_wait);
-        init_waitqueue_head(&port->delta_msr_wait);
-        mutex_init(&port->mutex);
-        mutex_init(&port->buf_mutex);
-        spin_lock_init(&port->lock);
-        port->close_delay = (50 * HZ) / 100;
-        port->closing_wait = (3000 * HZ) / 100;
-        kref_init(&port->kref);
-}
-EXPORT_SYMBOL(tty_port_init);
-
-int tty_port_alloc_xmit_buf(struct tty_port *port)
-{
-        /* We may sleep in get_zeroed_page() */
-        mutex_lock(&port->buf_mutex);
-        if (port->xmit_buf == NULL)
-                port->xmit_buf = (unsigned char *)get_zeroed_page(GFP_KERNEL);
-        mutex_unlock(&port->buf_mutex);
-        if (port->xmit_buf == NULL)
-                return -ENOMEM;
-        return 0;
-}
-EXPORT_SYMBOL(tty_port_alloc_xmit_buf);
-
-void tty_port_free_xmit_buf(struct tty_port *port)
-{
-        mutex_lock(&port->buf_mutex);
-        if (port->xmit_buf != NULL) {
-                free_page((unsigned long)port->xmit_buf);
-                port->xmit_buf = NULL;
-        }
-        mutex_unlock(&port->buf_mutex);
-}
-EXPORT_SYMBOL(tty_port_free_xmit_buf);
-
-static void tty_port_destructor(struct kref *kref)
-{
-        struct tty_port *port = container_of(kref, struct tty_port, kref);
-        if (port->xmit_buf)
-                free_page((unsigned long)port->xmit_buf);
-        if (port->ops->destruct)
-                port->ops->destruct(port);
-        else
-                kfree(port);
-}
-
-void tty_port_put(struct tty_port *port)
-{
-        if (port)
-                kref_put(&port->kref, tty_port_destructor);
-}
-EXPORT_SYMBOL(tty_port_put);
-
-/**
- *      tty_port_tty_get        -       get a tty reference
- *      @port: tty port
- *
- *      Return a refcount protected tty instance or NULL if the port is not
- *      associated with a tty (eg due to close or hangup)
- */
-
-struct tty_struct *tty_port_tty_get(struct tty_port *port)
-{
-        unsigned long flags;
-        struct tty_struct *tty;
-
-        spin_lock_irqsave(&port->lock, flags);
-        tty = tty_kref_get(port->tty);
-        spin_unlock_irqrestore(&port->lock, flags);
-        return tty;
-}
-EXPORT_SYMBOL(tty_port_tty_get);
-
-/**
- *      tty_port_tty_set        -       set the tty of a port
- *      @port: tty port
- *      @tty: the tty
- *
- *      Associate the port and tty pair. Manages any internal refcounts.
- *      Pass NULL to deassociate a port
- */
-
-void tty_port_tty_set(struct tty_port *port, struct tty_struct *tty)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&port->lock, flags);
-        if (port->tty)
-                tty_kref_put(port->tty);
-        port->tty = tty_kref_get(tty);
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-EXPORT_SYMBOL(tty_port_tty_set);
-
-static void tty_port_shutdown(struct tty_port *port)
-{
-        mutex_lock(&port->mutex);
-        if (port->ops->shutdown && !port->console &&
-                test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags))
-                        port->ops->shutdown(port);
-        mutex_unlock(&port->mutex);
-}
-
-/**
- *      tty_port_hangup         -       hangup helper
- *      @port: tty port
- *
- *      Perform port level tty hangup flag and count changes. Drop the tty
- *      reference.
- */
-
-void tty_port_hangup(struct tty_port *port)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&port->lock, flags);
-        port->count = 0;
-        port->flags &= ~ASYNC_NORMAL_ACTIVE;
-        if (port->tty) {
-                set_bit(TTY_IO_ERROR, &port->tty->flags);
-                tty_kref_put(port->tty);
-        }
-        port->tty = NULL;
-        spin_unlock_irqrestore(&port->lock, flags);
-        wake_up_interruptible(&port->open_wait);
-        wake_up_interruptible(&port->delta_msr_wait);
-        tty_port_shutdown(port);
-}
-EXPORT_SYMBOL(tty_port_hangup);
-
-/**
- *      tty_port_carrier_raised -       carrier raised check
- *      @port: tty port
- *
- *      Wrapper for the carrier detect logic. For the moment this is used
- *      to hide some internal details. This will eventually become entirely
- *      internal to the tty port.
- */
-
-int tty_port_carrier_raised(struct tty_port *port)
-{
-        if (port->ops->carrier_raised == NULL)
-                return 1;
-        return port->ops->carrier_raised(port);
-}
-EXPORT_SYMBOL(tty_port_carrier_raised);
-
-/**
- *      tty_port_raise_dtr_rts  -       Raise DTR/RTS
- *      @port: tty port
- *
- *      Wrapper for the DTR/RTS raise logic. For the moment this is used
- *      to hide some internal details. This will eventually become entirely
- *      internal to the tty port.
- */
-
-void tty_port_raise_dtr_rts(struct tty_port *port)
-{
-        if (port->ops->dtr_rts)
-                port->ops->dtr_rts(port, 1);
-}
-EXPORT_SYMBOL(tty_port_raise_dtr_rts);
-
-/**
- *      tty_port_lower_dtr_rts  -       Lower DTR/RTS
- *      @port: tty port
- *
- *      Wrapper for the DTR/RTS raise logic. For the moment this is used
- *      to hide some internal details. This will eventually become entirely
- *      internal to the tty port.
- */
-
-void tty_port_lower_dtr_rts(struct tty_port *port)
-{
-        if (port->ops->dtr_rts)
-                port->ops->dtr_rts(port, 0);
-}
-EXPORT_SYMBOL(tty_port_lower_dtr_rts);
-
-/**
- *      tty_port_block_til_ready        -       Waiting logic for tty open
- *      @port: the tty port being opened
- *      @tty: the tty device being bound
- *      @filp: the file pointer of the opener
- *
- *      Implement the core POSIX/SuS tty behaviour when opening a tty device.
- *      Handles:
- *              - hangup (both before and during)
- *              - non blocking open
- *              - rts/dtr/dcd
- *              - signals
- *              - port flags and counts
- *
- *      The passed tty_port must implement the carrier_raised method if it can
- *      do carrier detect and the dtr_rts method if it supports software
- *      management of these lines. Note that the dtr/rts raise is done each
- *      iteration as a hangup may have previously dropped them while we wait.
- */
-
-int tty_port_block_til_ready(struct tty_port *port,
-                                struct tty_struct *tty, struct file *filp)
-{
-        int do_clocal = 0, retval;
-        unsigned long flags;
-        DEFINE_WAIT(wait);
-        int cd;
-
-        /* block if port is in the process of being closed */
-        if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
-                wait_event_interruptible_tty(port->close_wait,
-                                !(port->flags & ASYNC_CLOSING));
-                if (port->flags & ASYNC_HUP_NOTIFY)
-                        return -EAGAIN;
-                else
-                        return -ERESTARTSYS;
-        }
-
-        /* if non-blocking mode is set we can pass directly to open unless
-           the port has just hung up or is in another error state */
-        if (tty->flags & (1 << TTY_IO_ERROR)) {
-                port->flags |= ASYNC_NORMAL_ACTIVE;
-                return 0;
-        }
-        if (filp->f_flags & O_NONBLOCK) {
-                /* Indicate we are open */
-                if (tty->termios->c_cflag & CBAUD)
-                        tty_port_raise_dtr_rts(port);
-                port->flags |= ASYNC_NORMAL_ACTIVE;
-                return 0;
-        }
-
-        if (C_CLOCAL(tty))
-                do_clocal = 1;
-
-        /* Block waiting until we can proceed. We may need to wait for the
-           carrier, but we must also wait for any close that is in progress
-           before the next open may complete */
-
-        retval = 0;
-
-        /* The port lock protects the port counts */
-        spin_lock_irqsave(&port->lock, flags);
-        if (!tty_hung_up_p(filp))
-                port->count--;
-        port->blocked_open++;
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        while (1) {
-                /* Indicate we are open */
-                if (tty->termios->c_cflag & CBAUD)
-                        tty_port_raise_dtr_rts(port);
-
-                prepare_to_wait(&port->open_wait, &wait, TASK_INTERRUPTIBLE);
-                /* Check for a hangup or uninitialised port.
-                                                        Return accordingly */
-                if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)) {
-                        if (port->flags & ASYNC_HUP_NOTIFY)
-                                retval = -EAGAIN;
-                        else
-                                retval = -ERESTARTSYS;
-                        break;
-                }
-                /* Probe the carrier. For devices with no carrier detect this
-                   will always return true */
-                cd = tty_port_carrier_raised(port);
-                if (!(port->flags & ASYNC_CLOSING) &&
-                                (do_clocal || cd))
-                        break;
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-                tty_unlock();
-                schedule();
-                tty_lock();
-        }
-        finish_wait(&port->open_wait, &wait);
-
-        /* Update counts. A parallel hangup will have set count to zero and
-           we must not mess that up further */
-        spin_lock_irqsave(&port->lock, flags);
-        if (!tty_hung_up_p(filp))
-                port->count++;
-        port->blocked_open--;
-        if (retval == 0)
-                port->flags |= ASYNC_NORMAL_ACTIVE;
-        spin_unlock_irqrestore(&port->lock, flags);
-        return retval;
-}
-EXPORT_SYMBOL(tty_port_block_til_ready);
-
-int tty_port_close_start(struct tty_port *port,
-                                struct tty_struct *tty, struct file *filp)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&port->lock, flags);
-        if (tty_hung_up_p(filp)) {
-                spin_unlock_irqrestore(&port->lock, flags);
-                return 0;
-        }
-
-        if (tty->count == 1 && port->count != 1) {
-                printk(KERN_WARNING
-                    "tty_port_close_start: tty->count = 1 port count = %d.\n",
-                                                                port->count);
-                port->count = 1;
-        }
-        if (--port->count < 0) {
-                printk(KERN_WARNING "tty_port_close_start: count = %d\n",
-                                                                port->count);
-                port->count = 0;
-        }
-
-        if (port->count) {
-                spin_unlock_irqrestore(&port->lock, flags);
-                if (port->ops->drop)
-                        port->ops->drop(port);
-                return 0;
-        }
-        set_bit(ASYNCB_CLOSING, &port->flags);
-        tty->closing = 1;
-        spin_unlock_irqrestore(&port->lock, flags);
-        /* Don't block on a stalled port, just pull the chain */
-        if (tty->flow_stopped)
-                tty_driver_flush_buffer(tty);
-        if (test_bit(ASYNCB_INITIALIZED, &port->flags) &&
-                        port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, port->closing_wait);
-        if (port->drain_delay) {
-                unsigned int bps = tty_get_baud_rate(tty);
-                long timeout;
-
-                if (bps > 1200)
-                        timeout = max_t(long,
-                                (HZ * 10 * port->drain_delay) / bps, HZ / 10);
-                else
-                        timeout = 2 * HZ;
-                schedule_timeout_interruptible(timeout);
-        }
-        /* Flush the ldisc buffering */
-        tty_ldisc_flush(tty);
-
-        /* Drop DTR/RTS if HUPCL is set. This causes any attached modem to
-           hang up the line */
-        if (tty->termios->c_cflag & HUPCL)
-                tty_port_lower_dtr_rts(port);
-
-        /* Don't call port->drop for the last reference. Callers will want
-           to drop the last active reference in ->shutdown() or the tty
-           shutdown path */
-        return 1;
-}
-EXPORT_SYMBOL(tty_port_close_start);
-
-void tty_port_close_end(struct tty_port *port, struct tty_struct *tty)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&port->lock, flags);
-        tty->closing = 0;
-
-        if (port->blocked_open) {
-                spin_unlock_irqrestore(&port->lock, flags);
-                if (port->close_delay) {
-                        msleep_interruptible(
-                                jiffies_to_msecs(port->close_delay));
-                }
-                spin_lock_irqsave(&port->lock, flags);
-                wake_up_interruptible(&port->open_wait);
-        }
-        port->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
-        wake_up_interruptible(&port->close_wait);
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-EXPORT_SYMBOL(tty_port_close_end);
-
-void tty_port_close(struct tty_port *port, struct tty_struct *tty,
-                                                        struct file *filp)
-{
-        if (tty_port_close_start(port, tty, filp) == 0)
-                return;
-        tty_port_shutdown(port);
-        set_bit(TTY_IO_ERROR, &tty->flags);
-        tty_port_close_end(port, tty);
-        tty_port_tty_set(port, NULL);
-}
-EXPORT_SYMBOL(tty_port_close);
-
-int tty_port_open(struct tty_port *port, struct tty_struct *tty,
-                                                        struct file *filp)
-{
-        spin_lock_irq(&port->lock);
-        if (!tty_hung_up_p(filp))
-                ++port->count;
-        spin_unlock_irq(&port->lock);
-        tty_port_tty_set(port, tty);
-
-        /*
-         * Do the device-specific open only if the hardware isn't
-         * already initialized. Serialize open and shutdown using the
-         * port mutex.
-         */
-
-        mutex_lock(&port->mutex);
-
-        if (!test_bit(ASYNCB_INITIALIZED, &port->flags)) {
-                clear_bit(TTY_IO_ERROR, &tty->flags);
-                if (port->ops->activate) {
-                        int retval = port->ops->activate(port, tty);
-                        if (retval) {
-                                mutex_unlock(&port->mutex);
-                                return retval;
-                        }
-                }
-                set_bit(ASYNCB_INITIALIZED, &port->flags);
-        }
-        mutex_unlock(&port->mutex);
-        return tty_port_block_til_ready(port, tty, filp);
-}
-
-EXPORT_SYMBOL(tty_port_open);
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
new file mode 100644
index 000000000000..a1f68af4ccf4
--- /dev/null
+++ b/drivers/char/ttyprintk.c
@@ -0,0 +1,225 @@
+/*
+ *  linux/drivers/char/ttyprintk.c
+ *
+ *  Copyright (C) 2010  Samo Pogacnik
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the smems of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+
+/*
+ * This pseudo device allows user to make printk messages. It is possible
+ * to store "console" messages inline with kernel messages for better analyses
+ * of the boot process, for example.
+ */
+
+#include <linux/device.h>
+#include <linux/serial.h>
+#include <linux/tty.h>
+
+struct ttyprintk_port {
+        struct tty_port port;
+        struct mutex port_write_mutex;
+};
+
+static struct ttyprintk_port tpk_port;
+
+/*
+ * Our simple preformatting supports transparent output of (time-stamped)
+ * printk messages (also suitable for logging service):
+ * - any cr is replaced by nl
+ * - adds a ttyprintk source tag in front of each line
+ * - too long message is fragmeted, with '\'nl between fragments
+ * - TPK_STR_SIZE isn't really the write_room limiting factor, bcause
+ *   it is emptied on the fly during preformatting.
+ */
+#define TPK_STR_SIZE 508 /* should be bigger then max expected line length */
+#define TPK_MAX_ROOM 4096 /* we could assume 4K for instance */
+static const char *tpk_tag = "[U] "; /* U for User */
+static int tpk_curr;
+
+static int tpk_printk(const unsigned char *buf, int count)
+{
+        static char tmp[TPK_STR_SIZE + 4];
+        int i = tpk_curr;
+
+        if (buf == NULL) {
+                /* flush tmp[] */
+                if (tpk_curr > 0) {
+                        /* non nl or cr terminated message - add nl */
+                        tmp[tpk_curr + 0] = '\n';
+                        tmp[tpk_curr + 1] = '\0';
+                        printk(KERN_INFO "%s%s", tpk_tag, tmp);
+                        tpk_curr = 0;
+                }
+                return i;
+        }
+
+        for (i = 0; i < count; i++) {
+                tmp[tpk_curr] = buf[i];
+                if (tpk_curr < TPK_STR_SIZE) {
+                        switch (buf[i]) {
+                        case '\r':
+                                /* replace cr with nl */
+                                tmp[tpk_curr + 0] = '\n';
+                                tmp[tpk_curr + 1] = '\0';
+                                printk(KERN_INFO "%s%s", tpk_tag, tmp);
+                                tpk_curr = 0;
+                                if (buf[i + 1] == '\n')
+                                        i++;
+                                break;
+                        case '\n':
+                                tmp[tpk_curr + 1] = '\0';
+                                printk(KERN_INFO "%s%s", tpk_tag, tmp);
+                                tpk_curr = 0;
+                                break;
+                        default:
+                                tpk_curr++;
+                        }
+                } else {
+                        /* end of tmp buffer reached: cut the message in two */
+                        tmp[tpk_curr + 1] = '\\';
+                        tmp[tpk_curr + 2] = '\n';
+                        tmp[tpk_curr + 3] = '\0';
+                        printk(KERN_INFO "%s%s", tpk_tag, tmp);
+                        tpk_curr = 0;
+                }
+        }
+
+        return count;
+}
+
+/*
+ * TTY operations open function.
+ */
+static int tpk_open(struct tty_struct *tty, struct file *filp)
+{
+        tty->driver_data = &tpk_port;
+
+        return tty_port_open(&tpk_port.port, tty, filp);
+}
+
+/*
+ * TTY operations close function.
+ */
+static void tpk_close(struct tty_struct *tty, struct file *filp)
+{
+        struct ttyprintk_port *tpkp = tty->driver_data;
+
+        mutex_lock(&tpkp->port_write_mutex);
+        /* flush tpk_printk buffer */
+        tpk_printk(NULL, 0);
+        mutex_unlock(&tpkp->port_write_mutex);
+
+        tty_port_close(&tpkp->port, tty, filp);
+}
+
+/*
+ * TTY operations write function.
+ */
+static int tpk_write(struct tty_struct *tty,
+                const unsigned char *buf, int count)
+{
+        struct ttyprintk_port *tpkp = tty->driver_data;
+        int ret;
+
+
+        /* exclusive use of tpk_printk within this tty */
+        mutex_lock(&tpkp->port_write_mutex);
+        ret = tpk_printk(buf, count);
+        mutex_unlock(&tpkp->port_write_mutex);
+
+        return ret;
+}
+
+/*
+ * TTY operations write_room function.
+ */
+static int tpk_write_room(struct tty_struct *tty)
+{
+        return TPK_MAX_ROOM;
+}
+
+/*
+ * TTY operations ioctl function.
+ */
+static int tpk_ioctl(struct tty_struct *tty,
+                        unsigned int cmd, unsigned long arg)
+{
+        struct ttyprintk_port *tpkp = tty->driver_data;
+
+        if (!tpkp)
+                return -EINVAL;
+
+        switch (cmd) {
+        /* Stop TIOCCONS */
+        case TIOCCONS:
+                return -EOPNOTSUPP;
+        default:
+                return -ENOIOCTLCMD;
+        }
+        return 0;
+}
+
+static const struct tty_operations ttyprintk_ops = {
+        .open = tpk_open,
+        .close = tpk_close,
+        .write = tpk_write,
+        .write_room = tpk_write_room,
+        .ioctl = tpk_ioctl,
+};
+
+struct tty_port_operations null_ops = { };
+
+static struct tty_driver *ttyprintk_driver;
+
+static int __init ttyprintk_init(void)
+{
+        int ret = -ENOMEM;
+        void *rp;
+
+        ttyprintk_driver = alloc_tty_driver(1);
+        if (!ttyprintk_driver)
+                return ret;
+
+        ttyprintk_driver->owner = THIS_MODULE;
+        ttyprintk_driver->driver_name = "ttyprintk";
+        ttyprintk_driver->name = "ttyprintk";
+        ttyprintk_driver->major = TTYAUX_MAJOR;
+        ttyprintk_driver->minor_start = 3;
+        ttyprintk_driver->num = 1;
+        ttyprintk_driver->type = TTY_DRIVER_TYPE_CONSOLE;
+        ttyprintk_driver->init_termios = tty_std_termios;
+        ttyprintk_driver->init_termios.c_oflag = OPOST | OCRNL | ONOCR | ONLRET;
+        ttyprintk_driver->flags = TTY_DRIVER_RESET_TERMIOS |
+                TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
+        tty_set_operations(ttyprintk_driver, &ttyprintk_ops);
+
+        ret = tty_register_driver(ttyprintk_driver);
+        if (ret < 0) {
+                printk(KERN_ERR "Couldn't register ttyprintk driver\n");
+                goto error;
+        }
+
+        /* create our unnumbered device */
+        rp = device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 3), NULL,
+                                ttyprintk_driver->name);
+        if (IS_ERR(rp)) {
+                printk(KERN_ERR "Couldn't create ttyprintk device\n");
+                ret = PTR_ERR(rp);
+                goto error;
+        }
+
+        tty_port_init(&tpk_port.port);
+        tpk_port.port.ops = &null_ops;
+        mutex_init(&tpk_port.port_write_mutex);
+
+        return 0;
+
+error:
+        put_tty_driver(ttyprintk_driver);
+        ttyprintk_driver = NULL;
+        return ret;
+}
+module_init(ttyprintk_init);
diff --git a/drivers/char/uv_mmtimer.c b/drivers/char/uv_mmtimer.c
index c7072ba14f48..956ebe2080a5 100644
--- a/drivers/char/uv_mmtimer.c
+++ b/drivers/char/uv_mmtimer.c
@@ -23,7 +23,6 @@
 #include <linux/interrupt.h>
 #include <linux/time.h>
 #include <linux/math64.h>
-#include <linux/smp_lock.h>
 
 #include <asm/genapic.h>
 #include <asm/uv/uv_hub.h>
@@ -52,6 +51,7 @@ static const struct file_operations uv_mmtimer_fops = {
         .owner = THIS_MODULE,
         .mmap = uv_mmtimer_mmap,
         .unlocked_ioctl = uv_mmtimer_ioctl,
+        .llseek = noop_llseek,
 };
 
 /**
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
deleted file mode 100644
index bcce46c96b88..000000000000
--- a/drivers/char/vc_screen.c
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * linux/drivers/char/vc_screen.c
- *
- * Provide access to virtual console memory.
- * /dev/vcs0: the screen as it is being viewed right now (possibly scrolled)
- * /dev/vcsN: the screen of /dev/ttyN (1 <= N <= 63)
- *            [minor: N]
- *
- * /dev/vcsaN: idem, but including attributes, and prefixed with
- *      the 4 bytes lines,columns,x,y (as screendump used to give).
- *      Attribute/character pair is in native endianity.
- *            [minor: N+128]
- *
- * This replaces screendump and part of selection, so that the system
- * administrator can control access using file system permissions.
- *
- * aeb@cwi.nl - efter Friedas begravelse - 950211
- *
- * machek@k332.feld.cvut.cz - modified not to send characters to wrong console
- *       - fixed some fatal off-by-one bugs (0-- no longer == -1 -> looping and looping and looping...)
- *       - making it shorter - scr_readw are macros which expand in PRETTY long code
- */
-
-#include <linux/kernel.h>
-#include <linux/major.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/interrupt.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <linux/mutex.h>
-#include <linux/vt_kern.h>
-#include <linux/selection.h>
-#include <linux/kbd_kern.h>
-#include <linux/console.h>
-#include <linux/device.h>
-#include <linux/smp_lock.h>
-
-#include <asm/uaccess.h>
-#include <asm/byteorder.h>
-#include <asm/unaligned.h>
-
-#undef attr
-#undef org
-#undef addr
-#define HEADER_SIZE     4
-
-static int
-vcs_size(struct inode *inode)
-{
-        int size;
-        int minor = iminor(inode);
-        int currcons = minor & 127;
-        struct vc_data *vc;
-
-        if (currcons == 0)
-                currcons = fg_console;
-        else
-                currcons--;
-        if (!vc_cons_allocated(currcons))
-                return -ENXIO;
-        vc = vc_cons[currcons].d;
-
-        size = vc->vc_rows * vc->vc_cols;
-
-        if (minor & 128)
-                size = 2*size + HEADER_SIZE;
-        return size;
-}
-
-static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
-{
-        int size;
-
-        mutex_lock(&con_buf_mtx);
-        size = vcs_size(file->f_path.dentry->d_inode);
-        switch (orig) {
-                default:
-                        mutex_unlock(&con_buf_mtx);
-                        return -EINVAL;
-                case 2:
-                        offset += size;
-                        break;
-                case 1:
-                        offset += file->f_pos;
-                case 0:
-                        break;
-        }
-        if (offset < 0 || offset > size) {
-                mutex_unlock(&con_buf_mtx);
-                return -EINVAL;
-        }
-        file->f_pos = offset;
-        mutex_unlock(&con_buf_mtx);
-        return file->f_pos;
-}
-
-
-static ssize_t
-vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
-{
-        struct inode *inode = file->f_path.dentry->d_inode;
-        unsigned int currcons = iminor(inode);
-        struct vc_data *vc;
-        long pos;
-        long viewed, attr, read;
-        int col, maxcol;
-        unsigned short *org = NULL;
-        ssize_t ret;
-
-        mutex_lock(&con_buf_mtx);
-
-        pos = *ppos;
-
-        /* Select the proper current console and verify
-         * sanity of the situation under the console lock.
-         */
-        acquire_console_sem();
-
-        attr = (currcons & 128);
-        currcons = (currcons & 127);
-        if (currcons == 0) {
-                currcons = fg_console;
-                viewed = 1;
-        } else {
-                currcons--;
-                viewed = 0;
-        }
-        ret = -ENXIO;
-        if (!vc_cons_allocated(currcons))
-                goto unlock_out;
-        vc = vc_cons[currcons].d;
-
-        ret = -EINVAL;
-        if (pos < 0)
-                goto unlock_out;
-        read = 0;
-        ret = 0;
-        while (count) {
-                char *con_buf0, *con_buf_start;
-                long this_round, size;
-                ssize_t orig_count;
-                long p = pos;
-
-                /* Check whether we are above size each round,
-                 * as copy_to_user at the end of this loop
-                 * could sleep.
-                 */
-                size = vcs_size(inode);
-                if (pos >= size)
-                        break;
-                if (count > size - pos)
-                        count = size - pos;
-
-                this_round = count;
-                if (this_round > CON_BUF_SIZE)
-                        this_round = CON_BUF_SIZE;
-
-                /* Perform the whole read into the local con_buf.
-                 * Then we can drop the console spinlock and safely
-                 * attempt to move it to userspace.
-                 */
-
-                con_buf_start = con_buf0 = con_buf;
-                orig_count = this_round;
-                maxcol = vc->vc_cols;
-                if (!attr) {
-                        org = screen_pos(vc, p, viewed);
-                        col = p % maxcol;
-                        p += maxcol - col;
-                        while (this_round-- > 0) {
-                                *con_buf0++ = (vcs_scr_readw(vc, org++) & 0xff);
-                                if (++col == maxcol) {
-                                        org = screen_pos(vc, p, viewed);
-                                        col = 0;
-                                        p += maxcol;
-                                }
-                        }
-                } else {
-                        if (p < HEADER_SIZE) {
-                                size_t tmp_count;
-
-                                con_buf0[0] = (char)vc->vc_rows;
-                                con_buf0[1] = (char)vc->vc_cols;
-                                getconsxy(vc, con_buf0 + 2);
-
-                                con_buf_start += p;
-                                this_round += p;
-                                if (this_round > CON_BUF_SIZE) {
-                                        this_round = CON_BUF_SIZE;
-                                        orig_count = this_round - p;
-                                }
-
-                                tmp_count = HEADER_SIZE;
-                                if (tmp_count > this_round)
-                                        tmp_count = this_round;
-
-                                /* Advance state pointers and move on. */
-                                this_round -= tmp_count;
-                                p = HEADER_SIZE;
-                                con_buf0 = con_buf + HEADER_SIZE;
-                                /* If this_round >= 0, then p is even... */
-                        } else if (p & 1) {
-                                /* Skip first byte for output if start address is odd
-                                 * Update region sizes up/down depending on free
-                                 * space in buffer.
-                                 */
-                                con_buf_start++;
-                                if (this_round < CON_BUF_SIZE)
-                                        this_round++;
-                                else
-                                        orig_count--;
-                        }
-                        if (this_round > 0) {
-                                unsigned short *tmp_buf = (unsigned short *)con_buf0;
-
-                                p -= HEADER_SIZE;
-                                p /= 2;
-                                col = p % maxcol;
-
-                                org = screen_pos(vc, p, viewed);
-                                p += maxcol - col;
-
-                                /* Buffer has even length, so we can always copy
-                                 * character + attribute. We do not copy last byte
-                                 * to userspace if this_round is odd.
-                                 */
-                                this_round = (this_round + 1) >> 1;
-
-                                while (this_round) {
-                                        *tmp_buf++ = vcs_scr_readw(vc, org++);
-                                        this_round --;
-                                        if (++col == maxcol) {
-                                                org = screen_pos(vc, p, viewed);
-                                                col = 0;
-                                                p += maxcol;
-                                        }
-                                }
-                        }
-                }
-
-                /* Finally, release the console semaphore while we push
-                 * all the data to userspace from our temporary buffer.
-                 *
-                 * AKPM: Even though it's a semaphore, we should drop it because
-                 * the pagefault handling code may want to call printk().
-                 */
-
-                release_console_sem();
-                ret = copy_to_user(buf, con_buf_start, orig_count);
-                acquire_console_sem();
-
-                if (ret) {
-                        read += (orig_count - ret);
-                        ret = -EFAULT;
-                        break;
-                }
-                buf += orig_count;
-                pos += orig_count;
-                read += orig_count;
-                count -= orig_count;
-        }
-        *ppos += read;
-        if (read)
-                ret = read;
-unlock_out:
-        release_console_sem();
-        mutex_unlock(&con_buf_mtx);
-        return ret;
-}
-
-static ssize_t
-vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
-{
-        struct inode *inode = file->f_path.dentry->d_inode;
-        unsigned int currcons = iminor(inode);
-        struct vc_data *vc;
-        long pos;
-        long viewed, attr, size, written;
-        char *con_buf0;
-        int col, maxcol;
-        u16 *org0 = NULL, *org = NULL;
-        size_t ret;
-
-        mutex_lock(&con_buf_mtx);
-
-        pos = *ppos;
-
-        /* Select the proper current console and verify
-         * sanity of the situation under the console lock.
-         */
-        acquire_console_sem();
-
-        attr = (currcons & 128);
-        currcons = (currcons & 127);
-
-        if (currcons == 0) {
-                currcons = fg_console;
-                viewed = 1;
-        } else {
-                currcons--;
-                viewed = 0;
-        }
-        ret = -ENXIO;
-        if (!vc_cons_allocated(currcons))
-                goto unlock_out;
-        vc = vc_cons[currcons].d;
-
-        size = vcs_size(inode);
-        ret = -EINVAL;
-        if (pos < 0 || pos > size)
-                goto unlock_out;
-        if (count > size - pos)
-                count = size - pos;
-        written = 0;
-        while (count) {
-                long this_round = count;
-                size_t orig_count;
-                long p;
-
-                if (this_round > CON_BUF_SIZE)
-                        this_round = CON_BUF_SIZE;
-
-                /* Temporarily drop the console lock so that we can read
-                 * in the write data from userspace safely.
-                 */
-                release_console_sem();
-                ret = copy_from_user(con_buf, buf, this_round);
-                acquire_console_sem();
-
-                if (ret) {
-                        this_round -= ret;
-                        if (!this_round) {
-                                /* Abort loop if no data were copied. Otherwise
-                                 * fail with -EFAULT.
-                                 */
-                                if (written)
-                                        break;
-                                ret = -EFAULT;
-                                goto unlock_out;
-                        }
-                }
-
-                /* The vcs_size might have changed while we slept to grab
-                 * the user buffer, so recheck.
-                 * Return data written up to now on failure.
-                 */
-                size = vcs_size(inode);
-                if (pos >= size)
-                        break;
-                if (this_round > size - pos)
-                        this_round = size - pos;
-
-                /* OK, now actually push the write to the console
-                 * under the lock using the local kernel buffer.
-                 */
-
-                con_buf0 = con_buf;
-                orig_count = this_round;
-                maxcol = vc->vc_cols;
-                p = pos;
-                if (!attr) {
-                        org0 = org = screen_pos(vc, p, viewed);
-                        col = p % maxcol;
-                        p += maxcol - col;
-
-                        while (this_round > 0) {
-                                unsigned char c = *con_buf0++;
-
-                                this_round--;
-                                vcs_scr_writew(vc,
-                                               (vcs_scr_readw(vc, org) & 0xff00) | c, org);
-                                org++;
-                                if (++col == maxcol) {
-                                        org = screen_pos(vc, p, viewed);
-                                        col = 0;
-                                        p += maxcol;
-                                }
-                        }
-                } else {
-                        if (p < HEADER_SIZE) {
-                                char header[HEADER_SIZE];
-
-                                getconsxy(vc, header + 2);
-                                while (p < HEADER_SIZE && this_round > 0) {
-                                        this_round--;
-                                        header[p++] = *con_buf0++;
-                                }
-                                if (!viewed)
-                                        putconsxy(vc, header + 2);
-                        }
-                        p -= HEADER_SIZE;
-                        col = (p/2) % maxcol;
-                        if (this_round > 0) {
-                                org0 = org = screen_pos(vc, p/2, viewed);
-                                if ((p & 1) && this_round > 0) {
-                                        char c;
-
-                                        this_round--;
-                                        c = *con_buf0++;
-#ifdef __BIG_ENDIAN
-                                        vcs_scr_writew(vc, c |
-                                             (vcs_scr_readw(vc, org) & 0xff00), org);
-#else
-                                        vcs_scr_writew(vc, (c << 8) |
-                                             (vcs_scr_readw(vc, org) & 0xff), org);
-#endif
-                                        org++;
-                                        p++;
-                                        if (++col == maxcol) {
-                                                org = screen_pos(vc, p/2, viewed);
-                                                col = 0;
-                                        }
-                                }
-                                p /= 2;
-                                p += maxcol - col;
-                        }
-                        while (this_round > 1) {
-                                unsigned short w;
-
-                                w = get_unaligned(((unsigned short *)con_buf0));
-                                vcs_scr_writew(vc, w, org++);
-                                con_buf0 += 2;
-                                this_round -= 2;
-                                if (++col == maxcol) {
-                                        org = screen_pos(vc, p, viewed);
-                                        col = 0;
-                                        p += maxcol;
-                                }
-                        }
-                        if (this_round > 0) {
-                                unsigned char c;
-
-                                c = *con_buf0++;
-#ifdef __BIG_ENDIAN
-                                vcs_scr_writew(vc, (vcs_scr_readw(vc, org) & 0xff) | (c << 8), org);
-#else
-                                vcs_scr_writew(vc, (vcs_scr_readw(vc, org) & 0xff00) | c, org);
-#endif
-                        }
-                }
-                count -= orig_count;
-                written += orig_count;
-                buf += orig_count;
-                pos += orig_count;
-                if (org0)
-                        update_region(vc, (unsigned long)(org0), org - org0);
-        }
-        *ppos += written;
-        ret = written;
-
-unlock_out:
-        release_console_sem();
-
-        mutex_unlock(&con_buf_mtx);
-
-        return ret;
-}
-
-static int
-vcs_open(struct inode *inode, struct file *filp)
-{
-        unsigned int currcons = iminor(inode) & 127;
-        int ret = 0;
-        
-        tty_lock();
-        if(currcons && !vc_cons_allocated(currcons-1))
-                ret = -ENXIO;
-        tty_unlock();
-        return ret;
-}
-
-static const struct file_operations vcs_fops = {
-        .llseek         = vcs_lseek,
-        .read           = vcs_read,
-        .write          = vcs_write,
-        .open           = vcs_open,
-};
-
-static struct class *vc_class;
-
-void vcs_make_sysfs(int index)
-{
-        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, index + 1), NULL,
-                      "vcs%u", index + 1);
-        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, index + 129), NULL,
-                      "vcsa%u", index + 1);
-}
-
-void vcs_remove_sysfs(int index)
-{
-        device_destroy(vc_class, MKDEV(VCS_MAJOR, index + 1));
-        device_destroy(vc_class, MKDEV(VCS_MAJOR, index + 129));
-}
-
-int __init vcs_init(void)
-{
-        unsigned int i;
-
-        if (register_chrdev(VCS_MAJOR, "vcs", &vcs_fops))
-                panic("unable to get major %d for vcs device", VCS_MAJOR);
-        vc_class = class_create(THIS_MODULE, "vc");
-
-        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");
-        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");
-        for (i = 0; i < MIN_NR_CONSOLES; i++)
-                vcs_make_sysfs(i);
-        return 0;
-}
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 42f7fa442ff8..ad6e64a2912d 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -46,7 +46,7 @@
 #include <linux/completion.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/slab.h>
 
 #include <asm/uaccess.h>
@@ -64,6 +64,7 @@
 #define VIOTAPE_KERN_WARN       KERN_WARNING "viotape: "
 #define VIOTAPE_KERN_INFO       KERN_INFO "viotape: "
 
+static DEFINE_MUTEX(proc_viotape_mutex);
 static int viotape_numdev;
 
 /*
@@ -684,9 +685,9 @@ static long viotap_unlocked_ioctl(struct file *file,
 {
         long rc;
 
-        lock_kernel();
+        mutex_lock(&proc_viotape_mutex);
         rc = viotap_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&proc_viotape_mutex);
         return rc;
 }
 
@@ -700,7 +701,7 @@ static int viotap_open(struct inode *inode, struct file *file)
         if (op == NULL)
                 return -ENOMEM;
 
-        lock_kernel();
+        mutex_lock(&proc_viotape_mutex);
         get_dev_info(file->f_path.dentry->d_inode, &devi);
 
         /* Note: We currently only support one mode! */
@@ -731,7 +732,7 @@ static int viotap_open(struct inode *inode, struct file *file)
 
 free_op:
         free_op_struct(op);
-        unlock_kernel();
+        mutex_unlock(&proc_viotape_mutex);
         return ret;
 }
 
@@ -804,6 +805,7 @@ const struct file_operations viotap_fops = {
         .unlocked_ioctl =       viotap_unlocked_ioctl,
         .open =                 viotap_open,
         .release =              viotap_release,
+        .llseek =               noop_llseek,
 };
 
 /* Handle interrupt events for tape */
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 0f69c5ec0ecd..fb68b1295373 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2006, 2007, 2009 Rusty Russell, IBM Corporation
- * Copyright (C) 2009, 2010 Red Hat, Inc.
+ * Copyright (C) 2009, 2010, 2011 Red Hat, Inc.
+ * Copyright (C) 2009, 2010, 2011 Amit Shah <amit.shah@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +32,7 @@
 #include <linux/virtio_console.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
-#include "hvc_console.h"
+#include "../tty/hvc/hvc_console.h"
 
 /*
  * This is a global struct for storing common data for all the devices
@@ -48,6 +49,9 @@ struct ports_driver_data {
         /* Used for exporting per-port information to debugfs */
         struct dentry *debugfs_dir;
 
+        /* List of all the devices we're handling */
+        struct list_head portdevs;
+
         /* Number of devices this driver is handling */
         unsigned int index;
 
@@ -108,6 +112,9 @@ struct port_buffer {
  * ports for that device (vdev->priv).
  */
 struct ports_device {
+        /* Next portdev in the list, head is in the pdrvdata struct */
+        struct list_head list;
+
         /*
          * Workqueue handlers where we process deferred work after
          * notification
@@ -178,15 +185,21 @@ struct port {
         struct console cons;
 
         /* Each port associates with a separate char device */
-        struct cdev cdev;
+        struct cdev *cdev;
         struct device *dev;
 
+        /* Reference-counting to handle port hot-unplugs and file operations */
+        struct kref kref;
+
         /* A waitqueue for poll() or blocking read operations */
         wait_queue_head_t waitqueue;
 
         /* The 'name' of the port that we expose via sysfs properties */
         char *name;
 
+        /* We can notify apps of host connect / disconnect events via SIGIO */
+        struct fasync_struct *async_queue;
+
         /* The 'id' to identify the port with the Host */
         u32 id;
 
@@ -221,6 +234,41 @@ out:
         return port;
 }
 
+static struct port *find_port_by_devt_in_portdev(struct ports_device *portdev,
+                                                 dev_t dev)
+{
+        struct port *port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&portdev->ports_lock, flags);
+        list_for_each_entry(port, &portdev->ports, list)
+                if (port->cdev->dev == dev)
+                        goto out;
+        port = NULL;
+out:
+        spin_unlock_irqrestore(&portdev->ports_lock, flags);
+
+        return port;
+}
+
+static struct port *find_port_by_devt(dev_t dev)
+{
+        struct ports_device *portdev;
+        struct port *port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&pdrvdata_lock, flags);
+        list_for_each_entry(portdev, &pdrvdata.portdevs, list) {
+                port = find_port_by_devt_in_portdev(portdev, dev);
+                if (port)
+                        goto out;
+        }
+        port = NULL;
+out:
+        spin_unlock_irqrestore(&pdrvdata_lock, flags);
+        return port;
+}
+
 static struct port *find_port_by_id(struct ports_device *portdev, u32 id)
 {
         struct port *port;
@@ -340,6 +388,10 @@ static void discard_port_data(struct port *port)
         unsigned int len;
         int ret;
 
+        if (!port->portdev) {
+                /* Device has been unplugged.  vqs are already gone. */
+                return;
+        }
         vq = port->in_vq;
         if (port->inbuf)
                 buf = port->inbuf;
@@ -410,7 +462,10 @@ static ssize_t __send_control_msg(struct ports_device *portdev, u32 port_id,
 static ssize_t send_control_msg(struct port *port, unsigned int event,
                                 unsigned int value)
 {
-        return __send_control_msg(port->portdev, port->id, event, value);
+        /* Did the port get unplugged before userspace closed it? */
+        if (port->portdev)
+                return __send_control_msg(port->portdev, port->id, event, value);
+        return 0;
 }
 
 /* Callers must take the port->outvq_lock */
@@ -419,6 +474,10 @@ static void reclaim_consumed_buffers(struct port *port)
         void *buf;
         unsigned int len;
 
+        if (!port->portdev) {
+                /* Device has been unplugged.  vqs are already gone. */
+                return;
+        }
         while ((buf = virtqueue_get_buf(port->out_vq, &len))) {
                 kfree(buf);
                 port->outvq_full = false;
@@ -525,6 +584,10 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
 /* The condition that must be true for polling to end */
 static bool will_read_block(struct port *port)
 {
+        if (!port->guest_connected) {
+                /* Port got hot-unplugged. Let's exit. */
+                return false;
+        }
         return !port_has_data(port) && port->host_connected;
 }
 
@@ -575,6 +638,9 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
                 if (ret < 0)
                         return ret;
         }
+        /* Port got hot-unplugged. */
+        if (!port->guest_connected)
+                return -ENODEV;
         /*
          * We could've received a disconnection message while we were
          * waiting for more data.
@@ -616,6 +682,9 @@ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
                 if (ret < 0)
                         return ret;
         }
+        /* Port got hot-unplugged. */
+        if (!port->guest_connected)
+                return -ENODEV;
 
         count = min((size_t)(32 * 1024), count);
 
@@ -656,6 +725,10 @@ static unsigned int port_fops_poll(struct file *filp, poll_table *wait)
         port = filp->private_data;
         poll_wait(filp, &port->waitqueue, wait);
 
+        if (!port->guest_connected) {
+                /* Port got unplugged */
+                return POLLHUP;
+        }
         ret = 0;
         if (!will_read_block(port))
                 ret |= POLLIN | POLLRDNORM;
@@ -667,6 +740,8 @@ static unsigned int port_fops_poll(struct file *filp, poll_table *wait)
         return ret;
 }
 
+static void remove_port(struct kref *kref);
+
 static int port_fops_release(struct inode *inode, struct file *filp)
 {
         struct port *port;
@@ -687,6 +762,16 @@ static int port_fops_release(struct inode *inode, struct file *filp)
         reclaim_consumed_buffers(port);
         spin_unlock_irq(&port->outvq_lock);
 
+        /*
+         * Locks aren't necessary here as a port can't be opened after
+         * unplug, and if a port isn't unplugged, a kref would already
+         * exist for the port.  Plus, taking ports_lock here would
+         * create a dependency on other locks taken by functions
+         * inside remove_port if we're the last holder of the port,
+         * creating many problems.
+         */
+        kref_put(&port->kref, remove_port);
+
         return 0;
 }
 
@@ -694,22 +779,31 @@ static int port_fops_open(struct inode *inode, struct file *filp)
 {
         struct cdev *cdev = inode->i_cdev;
         struct port *port;
+        int ret;
 
-        port = container_of(cdev, struct port, cdev);
+        port = find_port_by_devt(cdev->dev);
         filp->private_data = port;
 
+        /* Prevent against a port getting hot-unplugged at the same time */
+        spin_lock_irq(&port->portdev->ports_lock);
+        kref_get(&port->kref);
+        spin_unlock_irq(&port->portdev->ports_lock);
+
         /*
          * Don't allow opening of console port devices -- that's done
          * via /dev/hvc
          */
-        if (is_console_port(port))
-                return -ENXIO;
+        if (is_console_port(port)) {
+                ret = -ENXIO;
+                goto out;
+        }
 
         /* Allow only one process to open a particular port at a time */
         spin_lock_irq(&port->inbuf_lock);
         if (port->guest_connected) {
                 spin_unlock_irq(&port->inbuf_lock);
-                return -EMFILE;
+                ret = -EMFILE;
+                goto out;
         }
 
         port->guest_connected = true;
@@ -724,10 +818,23 @@ static int port_fops_open(struct inode *inode, struct file *filp)
         reclaim_consumed_buffers(port);
         spin_unlock_irq(&port->outvq_lock);
 
+        nonseekable_open(inode, filp);
+
         /* Notify host of port being opened */
         send_control_msg(filp->private_data, VIRTIO_CONSOLE_PORT_OPEN, 1);
 
         return 0;
+out:
+        kref_put(&port->kref, remove_port);
+        return ret;
+}
+
+static int port_fops_fasync(int fd, struct file *filp, int mode)
+{
+        struct port *port;
+
+        port = filp->private_data;
+        return fasync_helper(fd, filp, mode, &port->async_queue);
 }
 
 /*
@@ -743,6 +850,8 @@ static const struct file_operations port_fops = {
         .write = port_fops_write,
         .poll  = port_fops_poll,
         .release = port_fops_release,
+        .fasync = port_fops_fasync,
+        .llseek = no_llseek,
 };
 
 /*
@@ -1001,6 +1110,12 @@ static unsigned int fill_queue(struct virtqueue *vq, spinlock_t *lock)
         return nr_added_bufs;
 }
 
+static void send_sigio_to_port(struct port *port)
+{
+        if (port->async_queue && port->guest_connected)
+                kill_fasync(&port->async_queue, SIGIO, POLL_OUT);
+}
+
 static int add_port(struct ports_device *portdev, u32 id)
 {
         char debugfs_name[16];
@@ -1015,6 +1130,7 @@ static int add_port(struct ports_device *portdev, u32 id)
                 err = -ENOMEM;
                 goto fail;
         }
+        kref_init(&port->kref);
 
         port->portdev = portdev;
         port->id = id;
@@ -1022,6 +1138,7 @@ static int add_port(struct ports_device *portdev, u32 id)
         port->name = NULL;
         port->inbuf = NULL;
         port->cons.hvc = NULL;
+        port->async_queue = NULL;
 
         port->cons.ws.ws_row = port->cons.ws.ws_col = 0;
 
@@ -1032,14 +1149,20 @@ static int add_port(struct ports_device *portdev, u32 id)
         port->in_vq = portdev->in_vqs[port->id];
         port->out_vq = portdev->out_vqs[port->id];
 
-        cdev_init(&port->cdev, &port_fops);
+        port->cdev = cdev_alloc();
+        if (!port->cdev) {
+                dev_err(&port->portdev->vdev->dev, "Error allocating cdev\n");
+                err = -ENOMEM;
+                goto free_port;
+        }
+        port->cdev->ops = &port_fops;
 
         devt = MKDEV(portdev->chr_major, id);
-        err = cdev_add(&port->cdev, devt, 1);
+        err = cdev_add(port->cdev, devt, 1);
         if (err < 0) {
                 dev_err(&port->portdev->vdev->dev,
                         "Error %d adding cdev for port %u\n", err, id);
-                goto free_port;
+                goto free_cdev;
         }
         port->dev = device_create(pdrvdata.class, &port->portdev->vdev->dev,
                                   devt, port, "vport%up%u",
@@ -1104,7 +1227,7 @@ free_inbufs:
 free_device:
         device_destroy(pdrvdata.class, port->dev->devt);
 free_cdev:
-        cdev_del(&port->cdev);
+        cdev_del(port->cdev);
 free_port:
         kfree(port);
 fail:
@@ -1113,42 +1236,52 @@ fail:
         return err;
 }
 
-/* Remove all port-specific data. */
-static int remove_port(struct port *port)
+/* No users remain, remove all port-specific data. */
+static void remove_port(struct kref *kref)
+{
+        struct port *port;
+
+        port = container_of(kref, struct port, kref);
+
+        sysfs_remove_group(&port->dev->kobj, &port_attribute_group);
+        device_destroy(pdrvdata.class, port->dev->devt);
+        cdev_del(port->cdev);
+
+        kfree(port->name);
+
+        debugfs_remove(port->debugfs_file);
+
+        kfree(port);
+}
+
+/*
+ * Port got unplugged.  Remove port from portdev's list and drop the
+ * kref reference.  If no userspace has this port opened, it will
+ * result in immediate removal the port.
+ */
+static void unplug_port(struct port *port)
 {
         struct port_buffer *buf;
 
+        spin_lock_irq(&port->portdev->ports_lock);
+        list_del(&port->list);
+        spin_unlock_irq(&port->portdev->ports_lock);
+
         if (port->guest_connected) {
                 port->guest_connected = false;
                 port->host_connected = false;
                 wake_up_interruptible(&port->waitqueue);
-                send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 0);
-        }
 
-        spin_lock_irq(&port->portdev->ports_lock);
-        list_del(&port->list);
-        spin_unlock_irq(&port->portdev->ports_lock);
+                /* Let the app know the port is going down. */
+                send_sigio_to_port(port);
+        }
 
         if (is_console_port(port)) {
                 spin_lock_irq(&pdrvdata_lock);
                 list_del(&port->cons.list);
                 spin_unlock_irq(&pdrvdata_lock);
-#if 0
-                /*
-                 * hvc_remove() not called as removing one hvc port
-                 * results in other hvc ports getting frozen.
-                 *
-                 * Once this is resolved in hvc, this functionality
-                 * will be enabled.  Till that is done, the -EPIPE
-                 * return from get_chars() above will help
-                 * hvc_console.c to clean up on ports we remove here.
-                 */
                 hvc_remove(port->cons.hvc);
-#endif
         }
-        sysfs_remove_group(&port->dev->kobj, &port_attribute_group);
-        device_destroy(pdrvdata.class, port->dev->devt);
-        cdev_del(&port->cdev);
 
         /* Remove unused data this port might have received. */
         discard_port_data(port);
@@ -1159,12 +1292,19 @@ static int remove_port(struct port *port)
         while ((buf = virtqueue_detach_unused_buf(port->in_vq)))
                 free_buf(buf);
 
-        kfree(port->name);
-
-        debugfs_remove(port->debugfs_file);
+        /*
+         * We should just assume the device itself has gone off --
+         * else a close on an open port later will try to send out a
+         * control message.
+         */
+        port->portdev = NULL;
 
-        kfree(port);
-        return 0;
+        /*
+         * Locks around here are not necessary - a port can't be
+         * opened after we removed the port struct from ports_list
+         * above.
+         */
+        kref_put(&port->kref, remove_port);
 }
 
 /* Any private messages that the Host and Guest want to share */
@@ -1203,7 +1343,7 @@ static void handle_control_message(struct ports_device *portdev,
                 add_port(portdev, cpkt->id);
                 break;
         case VIRTIO_CONSOLE_PORT_REMOVE:
-                remove_port(port);
+                unplug_port(port);
                 break;
         case VIRTIO_CONSOLE_CONSOLE_PORT:
                 if (!cpkt->value)
@@ -1245,6 +1385,12 @@ static void handle_control_message(struct ports_device *portdev,
                 spin_lock_irq(&port->outvq_lock);
                 reclaim_consumed_buffers(port);
                 spin_unlock_irq(&port->outvq_lock);
+
+                /*
+                 * If the guest is connected, it'll be interested in
+                 * knowing the host connection state changed.
+                 */
+                send_sigio_to_port(port);
                 break;
         case VIRTIO_CONSOLE_PORT_NAME:
                 /*
@@ -1314,6 +1460,17 @@ static void control_work_handler(struct work_struct *work)
         spin_unlock(&portdev->cvq_lock);
 }
 
+static void out_intr(struct virtqueue *vq)
+{
+        struct port *port;
+
+        port = find_port_by_vq(vq->vdev->priv, vq);
+        if (!port)
+                return;
+
+        wake_up_interruptible(&port->waitqueue);
+}
+
 static void in_intr(struct virtqueue *vq)
 {
         struct port *port;
@@ -1341,6 +1498,9 @@ static void in_intr(struct virtqueue *vq)
 
         wake_up_interruptible(&port->waitqueue);
 
+        /* Send a SIGIO indicating new data in case the process asked for it */
+        send_sigio_to_port(port);
+
         if (is_console_port(port) && hvc_poll(port->cons.hvc))
                 hvc_kick();
 }
@@ -1396,31 +1556,16 @@ static int init_vqs(struct ports_device *portdev)
         nr_queues = use_multiport(portdev) ? (nr_ports + 1) * 2 : 2;
 
         vqs = kmalloc(nr_queues * sizeof(struct virtqueue *), GFP_KERNEL);
-        if (!vqs) {
-                err = -ENOMEM;
-                goto fail;
-        }
         io_callbacks = kmalloc(nr_queues * sizeof(vq_callback_t *), GFP_KERNEL);
-        if (!io_callbacks) {
-                err = -ENOMEM;
-                goto free_vqs;
-        }
         io_names = kmalloc(nr_queues * sizeof(char *), GFP_KERNEL);
-        if (!io_names) {
-                err = -ENOMEM;
-                goto free_callbacks;
-        }
         portdev->in_vqs = kmalloc(nr_ports * sizeof(struct virtqueue *),
                                   GFP_KERNEL);
-        if (!portdev->in_vqs) {
-                err = -ENOMEM;
-                goto free_names;
-        }
         portdev->out_vqs = kmalloc(nr_ports * sizeof(struct virtqueue *),
                                    GFP_KERNEL);
-        if (!portdev->out_vqs) {
+        if (!vqs || !io_callbacks || !io_names || !portdev->in_vqs ||
+                        !portdev->out_vqs) {
                 err = -ENOMEM;
-                goto free_invqs;
+                goto free;
         }
 
         /*
@@ -1430,7 +1575,7 @@ static int init_vqs(struct ports_device *portdev)
          */
         j = 0;
         io_callbacks[j] = in_intr;
-        io_callbacks[j + 1] = NULL;
+        io_callbacks[j + 1] = out_intr;
         io_names[j] = "input";
         io_names[j + 1] = "output";
         j += 2;
@@ -1444,7 +1589,7 @@ static int init_vqs(struct ports_device *portdev)
                 for (i = 1; i < nr_ports; i++) {
                         j += 2;
                         io_callbacks[j] = in_intr;
-                        io_callbacks[j + 1] = NULL;
+                        io_callbacks[j + 1] = out_intr;
                         io_names[j] = "input";
                         io_names[j + 1] = "output";
                 }
@@ -1454,7 +1599,7 @@ static int init_vqs(struct ports_device *portdev)
                                               io_callbacks,
                                               (const char **)io_names);
         if (err)
-                goto free_outvqs;
+                goto free;
 
         j = 0;
         portdev->in_vqs[0] = vqs[0];
@@ -1470,23 +1615,19 @@ static int init_vqs(struct ports_device *portdev)
                         portdev->out_vqs[i] = vqs[j + 1];
                 }
         }
-        kfree(io_callbacks);
         kfree(io_names);
+        kfree(io_callbacks);
         kfree(vqs);
 
         return 0;
 
-free_names:
-        kfree(io_names);
-free_callbacks:
-        kfree(io_callbacks);
-free_outvqs:
+free:
         kfree(portdev->out_vqs);
-free_invqs:
         kfree(portdev->in_vqs);
-free_vqs:
+        kfree(io_names);
+        kfree(io_callbacks);
         kfree(vqs);
-fail:
+
         return err;
 }
 
@@ -1536,17 +1677,12 @@ static int __devinit virtcons_probe(struct virtio_device *vdev)
         portdev->config.max_nr_ports = 1;
         if (virtio_has_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT)) {
                 multiport = true;
-                vdev->features[0] |= 1 << VIRTIO_CONSOLE_F_MULTIPORT;
-
                 vdev->config->get(vdev, offsetof(struct virtio_console_config,
                                                  max_nr_ports),
                                   &portdev->config.max_nr_ports,
                                   sizeof(portdev->config.max_nr_ports));
         }
 
-        /* Let the Host know we support multiple ports.*/
-        vdev->config->finalize_features(vdev);
-
         err = init_vqs(portdev);
         if (err < 0) {
                 dev_err(&vdev->dev, "Error %d initializing vqs\n", err);
@@ -1577,6 +1713,10 @@ static int __devinit virtcons_probe(struct virtio_device *vdev)
                 add_port(portdev, 0);
         }
 
+        spin_lock_irq(&pdrvdata_lock);
+        list_add_tail(&portdev->list, &pdrvdata.portdevs);
+        spin_unlock_irq(&pdrvdata_lock);
+
         __send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID,
                            VIRTIO_CONSOLE_DEVICE_READY, 1);
         return 0;
@@ -1600,23 +1740,41 @@ static void virtcons_remove(struct virtio_device *vdev)
 {
         struct ports_device *portdev;
         struct port *port, *port2;
-        struct port_buffer *buf;
-        unsigned int len;
 
         portdev = vdev->priv;
 
+        spin_lock_irq(&pdrvdata_lock);
+        list_del(&portdev->list);
+        spin_unlock_irq(&pdrvdata_lock);
+
+        /* Disable interrupts for vqs */
+        vdev->config->reset(vdev);
+        /* Finish up work that's lined up */
         cancel_work_sync(&portdev->control_work);
 
         list_for_each_entry_safe(port, port2, &portdev->ports, list)
-                remove_port(port);
+                unplug_port(port);
 
         unregister_chrdev(portdev->chr_major, "virtio-portsdev");
 
-        while ((buf = virtqueue_get_buf(portdev->c_ivq, &len)))
-                free_buf(buf);
+        /*
+         * When yanking out a device, we immediately lose the
+         * (device-side) queues.  So there's no point in keeping the
+         * guest side around till we drop our final reference.  This
+         * also means that any ports which are in an open state will
+         * have to just stop using the port, as the vqs are going
+         * away.
+         */
+        if (use_multiport(portdev)) {
+                struct port_buffer *buf;
+                unsigned int len;
 
-        while ((buf = virtqueue_detach_unused_buf(portdev->c_ivq)))
-                free_buf(buf);
+                while ((buf = virtqueue_get_buf(portdev->c_ivq, &len)))
+                        free_buf(buf);
+
+                while ((buf = virtqueue_detach_unused_buf(portdev->c_ivq)))
+                        free_buf(buf);
+        }
 
         vdev->config->del_vqs(vdev);
         kfree(portdev->in_vqs);
@@ -1663,6 +1821,7 @@ static int __init init(void)
                            PTR_ERR(pdrvdata.debugfs_dir));
         }
         INIT_LIST_HEAD(&pdrvdata.consoles);
+        INIT_LIST_HEAD(&pdrvdata.portdevs);
 
         return register_virtio_driver(&virtio_console);
 }
diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c
deleted file mode 100644
index 12de1202d22c..000000000000
--- a/drivers/char/vme_scc.c
+++ /dev/null
@@ -1,1145 +0,0 @@
-/*
- * drivers/char/vme_scc.c: MVME147, MVME162, BVME6000 SCC serial ports
- * implementation.
- * Copyright 1999 Richard Hirst <richard@sleepie.demon.co.uk>
- *
- * Based on atari_SCC.c which was
- *   Copyright 1994-95 Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
- *   Partially based on PC-Linux serial.c by Linus Torvalds and Theodore Ts'o
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
- *
- */
-
-#include <linux/module.h>
-#include <linux/kdev_t.h>
-#include <asm/io.h>
-#include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/mm.h>
-#include <linux/serial.h>
-#include <linux/fcntl.h>
-#include <linux/major.h>
-#include <linux/delay.h>
-#include <linux/miscdevice.h>
-#include <linux/console.h>
-#include <linux/init.h>
-#include <asm/setup.h>
-#include <asm/bootinfo.h>
-
-#ifdef CONFIG_MVME147_SCC
-#include <asm/mvme147hw.h>
-#endif
-#ifdef CONFIG_MVME162_SCC
-#include <asm/mvme16xhw.h>
-#endif
-#ifdef CONFIG_BVME6000_SCC
-#include <asm/bvme6000hw.h>
-#endif
-
-#include <linux/generic_serial.h>
-#include "scc.h"
-
-
-#define CHANNEL_A       0
-#define CHANNEL_B       1
-
-#define SCC_MINOR_BASE  64
-
-/* Shadows for all SCC write registers */
-static unsigned char scc_shadow[2][16];
-
-/* Location to access for SCC register access delay */
-static volatile unsigned char *scc_del = NULL;
-
-/* To keep track of STATUS_REG state for detection of Ext/Status int source */
-static unsigned char scc_last_status_reg[2];
-
-/***************************** Prototypes *****************************/
-
-/* Function prototypes */
-static void scc_disable_tx_interrupts(void * ptr);
-static void scc_enable_tx_interrupts(void * ptr);
-static void scc_disable_rx_interrupts(void * ptr);
-static void scc_enable_rx_interrupts(void * ptr);
-static int  scc_carrier_raised(struct tty_port *port);
-static void scc_shutdown_port(void * ptr);
-static int scc_set_real_termios(void  *ptr);
-static void scc_hungup(void  *ptr);
-static void scc_close(void  *ptr);
-static int scc_chars_in_buffer(void * ptr);
-static int scc_open(struct tty_struct * tty, struct file * filp);
-static int scc_ioctl(struct tty_struct * tty, struct file * filp,
-                     unsigned int cmd, unsigned long arg);
-static void scc_throttle(struct tty_struct *tty);
-static void scc_unthrottle(struct tty_struct *tty);
-static irqreturn_t scc_tx_int(int irq, void *data);
-static irqreturn_t scc_rx_int(int irq, void *data);
-static irqreturn_t scc_stat_int(int irq, void *data);
-static irqreturn_t scc_spcond_int(int irq, void *data);
-static void scc_setsignals(struct scc_port *port, int dtr, int rts);
-static int scc_break_ctl(struct tty_struct *tty, int break_state);
-
-static struct tty_driver *scc_driver;
-
-static struct scc_port scc_ports[2];
-
-/*---------------------------------------------------------------------------
- * Interface from generic_serial.c back here
- *--------------------------------------------------------------------------*/
-
-static struct real_driver scc_real_driver = {
-        scc_disable_tx_interrupts,
-        scc_enable_tx_interrupts,
-        scc_disable_rx_interrupts,
-        scc_enable_rx_interrupts,
-        scc_shutdown_port,
-        scc_set_real_termios,
-        scc_chars_in_buffer,
-        scc_close,
-        scc_hungup,
-        NULL
-};
-
-
-static const struct tty_operations scc_ops = {
-        .open   = scc_open,
-        .close = gs_close,
-        .write = gs_write,
-        .put_char = gs_put_char,
-        .flush_chars = gs_flush_chars,
-        .write_room = gs_write_room,
-        .chars_in_buffer = gs_chars_in_buffer,
-        .flush_buffer = gs_flush_buffer,
-        .ioctl = scc_ioctl,
-        .throttle = scc_throttle,
-        .unthrottle = scc_unthrottle,
-        .set_termios = gs_set_termios,
-        .stop = gs_stop,
-        .start = gs_start,
-        .hangup = gs_hangup,
-        .break_ctl = scc_break_ctl,
-};
-
-static const struct tty_port_operations scc_port_ops = {
-        .carrier_raised = scc_carrier_raised,
-};
-
-/*----------------------------------------------------------------------------
- * vme_scc_init() and support functions
- *---------------------------------------------------------------------------*/
-
-static int __init scc_init_drivers(void)
-{
-        int error;
-
-        scc_driver = alloc_tty_driver(2);
-        if (!scc_driver)
-                return -ENOMEM;
-        scc_driver->owner = THIS_MODULE;
-        scc_driver->driver_name = "scc";
-        scc_driver->name = "ttyS";
-        scc_driver->major = TTY_MAJOR;
-        scc_driver->minor_start = SCC_MINOR_BASE;
-        scc_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        scc_driver->subtype = SERIAL_TYPE_NORMAL;
-        scc_driver->init_termios = tty_std_termios;
-        scc_driver->init_termios.c_cflag =
-          B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        scc_driver->init_termios.c_ispeed = 9600;
-        scc_driver->init_termios.c_ospeed = 9600;
-        scc_driver->flags = TTY_DRIVER_REAL_RAW;
-        tty_set_operations(scc_driver, &scc_ops);
-
-        if ((error = tty_register_driver(scc_driver))) {
-                printk(KERN_ERR "scc: Couldn't register scc driver, error = %d\n",
-                       error);
-                put_tty_driver(scc_driver);
-                return 1;
-        }
-
-        return 0;
-}
-
-
-/* ports[] array is indexed by line no (i.e. [0] for ttyS0, [1] for ttyS1).
- */
-
-static void __init scc_init_portstructs(void)
-{
-        struct scc_port *port;
-        int i;
-
-        for (i = 0; i < 2; i++) {
-                port = scc_ports + i;
-                tty_port_init(&port->gs.port);
-                port->gs.port.ops = &scc_port_ops;
-                port->gs.magic = SCC_MAGIC;
-                port->gs.close_delay = HZ/2;
-                port->gs.closing_wait = 30 * HZ;
-                port->gs.rd = &scc_real_driver;
-#ifdef NEW_WRITE_LOCKING
-                port->gs.port_write_mutex = MUTEX;
-#endif
-                init_waitqueue_head(&port->gs.port.open_wait);
-                init_waitqueue_head(&port->gs.port.close_wait);
-        }
-}
-
-
-#ifdef CONFIG_MVME147_SCC
-static int __init mvme147_scc_init(void)
-{
-        struct scc_port *port;
-        int error;
-
-        printk(KERN_INFO "SCC: MVME147 Serial Driver\n");
-        /* Init channel A */
-        port = &scc_ports[0];
-        port->channel = CHANNEL_A;
-        port->ctrlp = (volatile unsigned char *)M147_SCC_A_ADDR;
-        port->datap = port->ctrlp + 1;
-        port->port_a = &scc_ports[0];
-        port->port_b = &scc_ports[1];
-        error = request_irq(MVME147_IRQ_SCCA_TX, scc_tx_int, IRQF_DISABLED,
-                            "SCC-A TX", port);
-        if (error)
-                goto fail;
-        error = request_irq(MVME147_IRQ_SCCA_STAT, scc_stat_int, IRQF_DISABLED,
-                            "SCC-A status", port);
-        if (error)
-                goto fail_free_a_tx;
-        error = request_irq(MVME147_IRQ_SCCA_RX, scc_rx_int, IRQF_DISABLED,
-                            "SCC-A RX", port);
-        if (error)
-                goto fail_free_a_stat;
-        error = request_irq(MVME147_IRQ_SCCA_SPCOND, scc_spcond_int,
-                            IRQF_DISABLED, "SCC-A special cond", port);
-        if (error)
-                goto fail_free_a_rx;
-
-        {
-                SCC_ACCESS_INIT(port);
-
-                /* disable interrupts for this channel */
-                SCCwrite(INT_AND_DMA_REG, 0);
-                /* Set the interrupt vector */
-                SCCwrite(INT_VECTOR_REG, MVME147_IRQ_SCC_BASE);
-                /* Interrupt parameters: vector includes status, status low */
-                SCCwrite(MASTER_INT_CTRL, MIC_VEC_INCL_STAT);
-                SCCmod(MASTER_INT_CTRL, 0xff, MIC_MASTER_INT_ENAB);
-        }
-
-        /* Init channel B */
-        port = &scc_ports[1];
-        port->channel = CHANNEL_B;
-        port->ctrlp = (volatile unsigned char *)M147_SCC_B_ADDR;
-        port->datap = port->ctrlp + 1;
-        port->port_a = &scc_ports[0];
-        port->port_b = &scc_ports[1];
-        error = request_irq(MVME147_IRQ_SCCB_TX, scc_tx_int, IRQF_DISABLED,
-                            "SCC-B TX", port);
-        if (error)
-                goto fail_free_a_spcond;
-        error = request_irq(MVME147_IRQ_SCCB_STAT, scc_stat_int, IRQF_DISABLED,
-                            "SCC-B status", port);
-        if (error)
-                goto fail_free_b_tx;
-        error = request_irq(MVME147_IRQ_SCCB_RX, scc_rx_int, IRQF_DISABLED,
-                            "SCC-B RX", port);
-        if (error)
-                goto fail_free_b_stat;
-        error = request_irq(MVME147_IRQ_SCCB_SPCOND, scc_spcond_int,
-                            IRQF_DISABLED, "SCC-B special cond", port);
-        if (error)
-                goto fail_free_b_rx;
-
-        {
-                SCC_ACCESS_INIT(port);
-
-                /* disable interrupts for this channel */
-                SCCwrite(INT_AND_DMA_REG, 0);
-        }
-
-        /* Ensure interrupts are enabled in the PCC chip */
-        m147_pcc->serial_cntrl=PCC_LEVEL_SERIAL|PCC_INT_ENAB;
-
-        /* Initialise the tty driver structures and register */
-        scc_init_portstructs();
-        scc_init_drivers();
-
-        return 0;
-
-fail_free_b_rx:
-        free_irq(MVME147_IRQ_SCCB_RX, port);
-fail_free_b_stat:
-        free_irq(MVME147_IRQ_SCCB_STAT, port);
-fail_free_b_tx:
-        free_irq(MVME147_IRQ_SCCB_TX, port);
-fail_free_a_spcond:
-        free_irq(MVME147_IRQ_SCCA_SPCOND, port);
-fail_free_a_rx:
-        free_irq(MVME147_IRQ_SCCA_RX, port);
-fail_free_a_stat:
-        free_irq(MVME147_IRQ_SCCA_STAT, port);
-fail_free_a_tx:
-        free_irq(MVME147_IRQ_SCCA_TX, port);
-fail:
-        return error;
-}
-#endif
-
-
-#ifdef CONFIG_MVME162_SCC
-static int __init mvme162_scc_init(void)
-{
-        struct scc_port *port;
-        int error;
-
-        if (!(mvme16x_config & MVME16x_CONFIG_GOT_SCCA))
-                return (-ENODEV);
-
-        printk(KERN_INFO "SCC: MVME162 Serial Driver\n");
-        /* Init channel A */
-        port = &scc_ports[0];
-        port->channel = CHANNEL_A;
-        port->ctrlp = (volatile unsigned char *)MVME_SCC_A_ADDR;
-        port->datap = port->ctrlp + 2;
-        port->port_a = &scc_ports[0];
-        port->port_b = &scc_ports[1];
-        error = request_irq(MVME162_IRQ_SCCA_TX, scc_tx_int, IRQF_DISABLED,
-                            "SCC-A TX", port);
-        if (error)
-                goto fail;
-        error = request_irq(MVME162_IRQ_SCCA_STAT, scc_stat_int, IRQF_DISABLED,
-                            "SCC-A status", port);
-        if (error)
-                goto fail_free_a_tx;
-        error = request_irq(MVME162_IRQ_SCCA_RX, scc_rx_int, IRQF_DISABLED,
-                            "SCC-A RX", port);
-        if (error)
-                goto fail_free_a_stat;
-        error = request_irq(MVME162_IRQ_SCCA_SPCOND, scc_spcond_int,
-                            IRQF_DISABLED, "SCC-A special cond", port);
-        if (error)
-                goto fail_free_a_rx;
-
-        {
-                SCC_ACCESS_INIT(port);
-
-                /* disable interrupts for this channel */
-                SCCwrite(INT_AND_DMA_REG, 0);
-                /* Set the interrupt vector */
-                SCCwrite(INT_VECTOR_REG, MVME162_IRQ_SCC_BASE);
-                /* Interrupt parameters: vector includes status, status low */
-                SCCwrite(MASTER_INT_CTRL, MIC_VEC_INCL_STAT);
-                SCCmod(MASTER_INT_CTRL, 0xff, MIC_MASTER_INT_ENAB);
-        }
-
-        /* Init channel B */
-        port = &scc_ports[1];
-        port->channel = CHANNEL_B;
-        port->ctrlp = (volatile unsigned char *)MVME_SCC_B_ADDR;
-        port->datap = port->ctrlp + 2;
-        port->port_a = &scc_ports[0];
-        port->port_b = &scc_ports[1];
-        error = request_irq(MVME162_IRQ_SCCB_TX, scc_tx_int, IRQF_DISABLED,
-                            "SCC-B TX", port);
-        if (error)
-                goto fail_free_a_spcond;
-        error = request_irq(MVME162_IRQ_SCCB_STAT, scc_stat_int, IRQF_DISABLED,
-                            "SCC-B status", port);
-        if (error)
-                goto fail_free_b_tx;
-        error = request_irq(MVME162_IRQ_SCCB_RX, scc_rx_int, IRQF_DISABLED,
-                            "SCC-B RX", port);
-        if (error)
-                goto fail_free_b_stat;
-        error = request_irq(MVME162_IRQ_SCCB_SPCOND, scc_spcond_int,
-                            IRQF_DISABLED, "SCC-B special cond", port);
-        if (error)
-                goto fail_free_b_rx;
-
-        {
-                SCC_ACCESS_INIT(port);  /* Either channel will do */
-
-                /* disable interrupts for this channel */
-                SCCwrite(INT_AND_DMA_REG, 0);
-        }
-
-        /* Ensure interrupts are enabled in the MC2 chip */
-        *(volatile char *)0xfff4201d = 0x14;
-
-        /* Initialise the tty driver structures and register */
-        scc_init_portstructs();
-        scc_init_drivers();
-
-        return 0;
-
-fail_free_b_rx:
-        free_irq(MVME162_IRQ_SCCB_RX, port);
-fail_free_b_stat:
-        free_irq(MVME162_IRQ_SCCB_STAT, port);
-fail_free_b_tx:
-        free_irq(MVME162_IRQ_SCCB_TX, port);
-fail_free_a_spcond:
-        free_irq(MVME162_IRQ_SCCA_SPCOND, port);
-fail_free_a_rx:
-        free_irq(MVME162_IRQ_SCCA_RX, port);
-fail_free_a_stat:
-        free_irq(MVME162_IRQ_SCCA_STAT, port);
-fail_free_a_tx:
-        free_irq(MVME162_IRQ_SCCA_TX, port);
-fail:
-        return error;
-}
-#endif
-
-
-#ifdef CONFIG_BVME6000_SCC
-static int __init bvme6000_scc_init(void)
-{
-        struct scc_port *port;
-        int error;
-
-        printk(KERN_INFO "SCC: BVME6000 Serial Driver\n");
-        /* Init channel A */
-        port = &scc_ports[0];
-        port->channel = CHANNEL_A;
-        port->ctrlp = (volatile unsigned char *)BVME_SCC_A_ADDR;
-        port->datap = port->ctrlp + 4;
-        port->port_a = &scc_ports[0];
-        port->port_b = &scc_ports[1];
-        error = request_irq(BVME_IRQ_SCCA_TX, scc_tx_int, IRQF_DISABLED,
-                            "SCC-A TX", port);
-        if (error)
-                goto fail;
-        error = request_irq(BVME_IRQ_SCCA_STAT, scc_stat_int, IRQF_DISABLED,
-                            "SCC-A status", port);
-        if (error)
-                goto fail_free_a_tx;
-        error = request_irq(BVME_IRQ_SCCA_RX, scc_rx_int, IRQF_DISABLED,
-                            "SCC-A RX", port);
-        if (error)
-                goto fail_free_a_stat;
-        error = request_irq(BVME_IRQ_SCCA_SPCOND, scc_spcond_int,
-                            IRQF_DISABLED, "SCC-A special cond", port);
-        if (error)
-                goto fail_free_a_rx;
-
-        {
-                SCC_ACCESS_INIT(port);
-
-                /* disable interrupts for this channel */
-                SCCwrite(INT_AND_DMA_REG, 0);
-                /* Set the interrupt vector */
-                SCCwrite(INT_VECTOR_REG, BVME_IRQ_SCC_BASE);
-                /* Interrupt parameters: vector includes status, status low */
-                SCCwrite(MASTER_INT_CTRL, MIC_VEC_INCL_STAT);
-                SCCmod(MASTER_INT_CTRL, 0xff, MIC_MASTER_INT_ENAB);
-        }
-
-        /* Init channel B */
-        port = &scc_ports[1];
-        port->channel = CHANNEL_B;
-        port->ctrlp = (volatile unsigned char *)BVME_SCC_B_ADDR;
-        port->datap = port->ctrlp + 4;
-        port->port_a = &scc_ports[0];
-        port->port_b = &scc_ports[1];
-        error = request_irq(BVME_IRQ_SCCB_TX, scc_tx_int, IRQF_DISABLED,
-                            "SCC-B TX", port);
-        if (error)
-                goto fail_free_a_spcond;
-        error = request_irq(BVME_IRQ_SCCB_STAT, scc_stat_int, IRQF_DISABLED,
-                            "SCC-B status", port);
-        if (error)
-                goto fail_free_b_tx;
-        error = request_irq(BVME_IRQ_SCCB_RX, scc_rx_int, IRQF_DISABLED,
-                            "SCC-B RX", port);
-        if (error)
-                goto fail_free_b_stat;
-        error = request_irq(BVME_IRQ_SCCB_SPCOND, scc_spcond_int,
-                            IRQF_DISABLED, "SCC-B special cond", port);
-        if (error)
-                goto fail_free_b_rx;
-
-        {
-                SCC_ACCESS_INIT(port);  /* Either channel will do */
-
-                /* disable interrupts for this channel */
-                SCCwrite(INT_AND_DMA_REG, 0);
-        }
-
-        /* Initialise the tty driver structures and register */
-        scc_init_portstructs();
-        scc_init_drivers();
-
-        return 0;
-
-fail:
-        free_irq(BVME_IRQ_SCCA_STAT, port);
-fail_free_a_tx:
-        free_irq(BVME_IRQ_SCCA_RX, port);
-fail_free_a_stat:
-        free_irq(BVME_IRQ_SCCA_SPCOND, port);
-fail_free_a_rx:
-        free_irq(BVME_IRQ_SCCB_TX, port);
-fail_free_a_spcond:
-        free_irq(BVME_IRQ_SCCB_STAT, port);
-fail_free_b_tx:
-        free_irq(BVME_IRQ_SCCB_RX, port);
-fail_free_b_stat:
-        free_irq(BVME_IRQ_SCCB_SPCOND, port);
-fail_free_b_rx:
-        return error;
-}
-#endif
-
-
-static int __init vme_scc_init(void)
-{
-        int res = -ENODEV;
-
-#ifdef CONFIG_MVME147_SCC
-        if (MACH_IS_MVME147)
-                res = mvme147_scc_init();
-#endif
-#ifdef CONFIG_MVME162_SCC
-        if (MACH_IS_MVME16x)
-                res = mvme162_scc_init();
-#endif
-#ifdef CONFIG_BVME6000_SCC
-        if (MACH_IS_BVME6000)
-                res = bvme6000_scc_init();
-#endif
-        return res;
-}
-
-module_init(vme_scc_init);
-
-
-/*---------------------------------------------------------------------------
- * Interrupt handlers
- *--------------------------------------------------------------------------*/
-
-static irqreturn_t scc_rx_int(int irq, void *data)
-{
-        unsigned char   ch;
-        struct scc_port *port = data;
-        struct tty_struct *tty = port->gs.port.tty;
-        SCC_ACCESS_INIT(port);
-
-        ch = SCCread_NB(RX_DATA_REG);
-        if (!tty) {
-                printk(KERN_WARNING "scc_rx_int with NULL tty!\n");
-                SCCwrite_NB(COMMAND_REG, CR_HIGHEST_IUS_RESET);
-                return IRQ_HANDLED;
-        }
-        tty_insert_flip_char(tty, ch, 0);
-
-        /* Check if another character is already ready; in that case, the
-         * spcond_int() function must be used, because this character may have an
-         * error condition that isn't signalled by the interrupt vector used!
-         */
-        if (SCCread(INT_PENDING_REG) &
-            (port->channel == CHANNEL_A ? IPR_A_RX : IPR_B_RX)) {
-                scc_spcond_int (irq, data);
-                return IRQ_HANDLED;
-        }
-
-        SCCwrite_NB(COMMAND_REG, CR_HIGHEST_IUS_RESET);
-
-        tty_flip_buffer_push(tty);
-        return IRQ_HANDLED;
-}
-
-
-static irqreturn_t scc_spcond_int(int irq, void *data)
-{
-        struct scc_port *port = data;
-        struct tty_struct *tty = port->gs.port.tty;
-        unsigned char   stat, ch, err;
-        int             int_pending_mask = port->channel == CHANNEL_A ?
-                                           IPR_A_RX : IPR_B_RX;
-        SCC_ACCESS_INIT(port);
-        
-        if (!tty) {
-                printk(KERN_WARNING "scc_spcond_int with NULL tty!\n");
-                SCCwrite(COMMAND_REG, CR_ERROR_RESET);
-                SCCwrite_NB(COMMAND_REG, CR_HIGHEST_IUS_RESET);
-                return IRQ_HANDLED;
-        }
-        do {
-                stat = SCCread(SPCOND_STATUS_REG);
-                ch = SCCread_NB(RX_DATA_REG);
-
-                if (stat & SCSR_RX_OVERRUN)
-                        err = TTY_OVERRUN;
-                else if (stat & SCSR_PARITY_ERR)
-                        err = TTY_PARITY;
-                else if (stat & SCSR_CRC_FRAME_ERR)
-                        err = TTY_FRAME;
-                else
-                        err = 0;
-
-                tty_insert_flip_char(tty, ch, err);
-
-                /* ++TeSche: *All* errors have to be cleared manually,
-                 * else the condition persists for the next chars
-                 */
-                if (err)
-                  SCCwrite(COMMAND_REG, CR_ERROR_RESET);
-
-        } while(SCCread(INT_PENDING_REG) & int_pending_mask);
-
-        SCCwrite_NB(COMMAND_REG, CR_HIGHEST_IUS_RESET);
-
-        tty_flip_buffer_push(tty);
-        return IRQ_HANDLED;
-}
-
-
-static irqreturn_t scc_tx_int(int irq, void *data)
-{
-        struct scc_port *port = data;
-        SCC_ACCESS_INIT(port);
-
-        if (!port->gs.port.tty) {
-                printk(KERN_WARNING "scc_tx_int with NULL tty!\n");
-                SCCmod (INT_AND_DMA_REG, ~IDR_TX_INT_ENAB, 0);
-                SCCwrite(COMMAND_REG, CR_TX_PENDING_RESET);
-                SCCwrite_NB(COMMAND_REG, CR_HIGHEST_IUS_RESET);
-                return IRQ_HANDLED;
-        }
-        while ((SCCread_NB(STATUS_REG) & SR_TX_BUF_EMPTY)) {
-                if (port->x_char) {
-                        SCCwrite(TX_DATA_REG, port->x_char);
-                        port->x_char = 0;
-                }
-                else if ((port->gs.xmit_cnt <= 0) ||
-                         port->gs.port.tty->stopped ||
-                         port->gs.port.tty->hw_stopped)
-                        break;
-                else {
-                        SCCwrite(TX_DATA_REG, port->gs.xmit_buf[port->gs.xmit_tail++]);
-                        port->gs.xmit_tail = port->gs.xmit_tail & (SERIAL_XMIT_SIZE-1);
-                        if (--port->gs.xmit_cnt <= 0)
-                                break;
-                }
-        }
-        if ((port->gs.xmit_cnt <= 0) || port->gs.port.tty->stopped ||
-            port->gs.port.tty->hw_stopped) {
-                /* disable tx interrupts */
-                SCCmod (INT_AND_DMA_REG, ~IDR_TX_INT_ENAB, 0);
-                SCCwrite(COMMAND_REG, CR_TX_PENDING_RESET);   /* disable tx_int on next tx underrun? */
-                port->gs.port.flags &= ~GS_TX_INTEN;
-        }
-        if (port->gs.port.tty && port->gs.xmit_cnt <= port->gs.wakeup_chars)
-                tty_wakeup(port->gs.port.tty);
-
-        SCCwrite_NB(COMMAND_REG, CR_HIGHEST_IUS_RESET);
-        return IRQ_HANDLED;
-}
-
-
-static irqreturn_t scc_stat_int(int irq, void *data)
-{
-        struct scc_port *port = data;
-        unsigned channel = port->channel;
-        unsigned char   last_sr, sr, changed;
-        SCC_ACCESS_INIT(port);
-
-        last_sr = scc_last_status_reg[channel];
-        sr = scc_last_status_reg[channel] = SCCread_NB(STATUS_REG);
-        changed = last_sr ^ sr;
-
-        if (changed & SR_DCD) {
-                port->c_dcd = !!(sr & SR_DCD);
-                if (!(port->gs.port.flags & ASYNC_CHECK_CD))
-                        ;       /* Don't report DCD changes */
-                else if (port->c_dcd) {
-                        wake_up_interruptible(&port->gs.port.open_wait);
-                }
-                else {
-                        if (port->gs.port.tty)
-                                tty_hangup (port->gs.port.tty);
-                }
-        }
-        SCCwrite(COMMAND_REG, CR_EXTSTAT_RESET);
-        SCCwrite_NB(COMMAND_REG, CR_HIGHEST_IUS_RESET);
-        return IRQ_HANDLED;
-}
-
-
-/*---------------------------------------------------------------------------
- * generic_serial.c callback funtions
- *--------------------------------------------------------------------------*/
-
-static void scc_disable_tx_interrupts(void *ptr)
-{
-        struct scc_port *port = ptr;
-        unsigned long   flags;
-        SCC_ACCESS_INIT(port);
-
-        local_irq_save(flags);
-        SCCmod(INT_AND_DMA_REG, ~IDR_TX_INT_ENAB, 0);
-        port->gs.port.flags &= ~GS_TX_INTEN;
-        local_irq_restore(flags);
-}
-
-
-static void scc_enable_tx_interrupts(void *ptr)
-{
-        struct scc_port *port = ptr;
-        unsigned long   flags;
-        SCC_ACCESS_INIT(port);
-
-        local_irq_save(flags);
-        SCCmod(INT_AND_DMA_REG, 0xff, IDR_TX_INT_ENAB);
-        /* restart the transmitter */
-        scc_tx_int (0, port);
-        local_irq_restore(flags);
-}
-
-
-static void scc_disable_rx_interrupts(void *ptr)
-{
-        struct scc_port *port = ptr;
-        unsigned long   flags;
-        SCC_ACCESS_INIT(port);
-
-        local_irq_save(flags);
-        SCCmod(INT_AND_DMA_REG,
-            ~(IDR_RX_INT_MASK|IDR_PARERR_AS_SPCOND|IDR_EXTSTAT_INT_ENAB), 0);
-        local_irq_restore(flags);
-}
-
-
-static void scc_enable_rx_interrupts(void *ptr)
-{
-        struct scc_port *port = ptr;
-        unsigned long   flags;
-        SCC_ACCESS_INIT(port);
-
-        local_irq_save(flags);
-        SCCmod(INT_AND_DMA_REG, 0xff,
-                IDR_EXTSTAT_INT_ENAB|IDR_PARERR_AS_SPCOND|IDR_RX_INT_ALL);
-        local_irq_restore(flags);
-}
-
-
-static int scc_carrier_raised(struct tty_port *port)
-{
-        struct scc_port *sc = container_of(port, struct scc_port, gs.port);
-        unsigned channel = sc->channel;
-
-        return !!(scc_last_status_reg[channel] & SR_DCD);
-}
-
-
-static void scc_shutdown_port(void *ptr)
-{
-        struct scc_port *port = ptr;
-
-        port->gs.port.flags &= ~ GS_ACTIVE;
-        if (port->gs.port.tty && (port->gs.port.tty->termios->c_cflag & HUPCL)) {
-                scc_setsignals (port, 0, 0);
-        }
-}
-
-
-static int scc_set_real_termios (void *ptr)
-{
-        /* the SCC has char sizes 5,7,6,8 in that order! */
-        static int chsize_map[4] = { 0, 2, 1, 3 };
-        unsigned cflag, baud, chsize, channel, brgval = 0;
-        unsigned long flags;
-        struct scc_port *port = ptr;
-        SCC_ACCESS_INIT(port);
-
-        if (!port->gs.port.tty || !port->gs.port.tty->termios) return 0;
-
-        channel = port->channel;
-
-        if (channel == CHANNEL_A)
-                return 0;               /* Settings controlled by boot PROM */
-
-        cflag  = port->gs.port.tty->termios->c_cflag;
-        baud = port->gs.baud;
-        chsize = (cflag & CSIZE) >> 4;
-
-        if (baud == 0) {
-                /* speed == 0 -> drop DTR */
-                local_irq_save(flags);
-                SCCmod(TX_CTRL_REG, ~TCR_DTR, 0);
-                local_irq_restore(flags);
-                return 0;
-        }
-        else if ((MACH_IS_MVME16x && (baud < 50 || baud > 38400)) ||
-                 (MACH_IS_MVME147 && (baud < 50 || baud > 19200)) ||
-                 (MACH_IS_BVME6000 &&(baud < 50 || baud > 76800))) {
-                printk(KERN_NOTICE "SCC: Bad speed requested, %d\n", baud);
-                return 0;
-        }
-
-        if (cflag & CLOCAL)
-                port->gs.port.flags &= ~ASYNC_CHECK_CD;
-        else
-                port->gs.port.flags |= ASYNC_CHECK_CD;
-
-#ifdef CONFIG_MVME147_SCC
-        if (MACH_IS_MVME147)
-                brgval = (M147_SCC_PCLK + baud/2) / (16 * 2 * baud) - 2;
-#endif
-#ifdef CONFIG_MVME162_SCC
-        if (MACH_IS_MVME16x)
-                brgval = (MVME_SCC_PCLK + baud/2) / (16 * 2 * baud) - 2;
-#endif
-#ifdef CONFIG_BVME6000_SCC
-        if (MACH_IS_BVME6000)
-                brgval = (BVME_SCC_RTxC + baud/2) / (16 * 2 * baud) - 2;
-#endif
-        /* Now we have all parameters and can go to set them: */
-        local_irq_save(flags);
-
-        /* receiver's character size and auto-enables */
-        SCCmod(RX_CTRL_REG, ~(RCR_CHSIZE_MASK|RCR_AUTO_ENAB_MODE),
-                        (chsize_map[chsize] << 6) |
-                        ((cflag & CRTSCTS) ? RCR_AUTO_ENAB_MODE : 0));
-        /* parity and stop bits (both, Tx and Rx), clock mode never changes */
-        SCCmod (AUX1_CTRL_REG,
-                ~(A1CR_PARITY_MASK | A1CR_MODE_MASK),
-                ((cflag & PARENB
-                  ? (cflag & PARODD ? A1CR_PARITY_ODD : A1CR_PARITY_EVEN)
-                  : A1CR_PARITY_NONE)
-                 | (cflag & CSTOPB ? A1CR_MODE_ASYNC_2 : A1CR_MODE_ASYNC_1)));
-        /* sender's character size, set DTR for valid baud rate */
-        SCCmod(TX_CTRL_REG, ~TCR_CHSIZE_MASK, chsize_map[chsize] << 5 | TCR_DTR);
-        /* clock sources never change */
-        /* disable BRG before changing the value */
-        SCCmod(DPLL_CTRL_REG, ~DCR_BRG_ENAB, 0);
-        /* BRG value */
-        SCCwrite(TIMER_LOW_REG, brgval & 0xff);
-        SCCwrite(TIMER_HIGH_REG, (brgval >> 8) & 0xff);
-        /* BRG enable, and clock source never changes */
-        SCCmod(DPLL_CTRL_REG, 0xff, DCR_BRG_ENAB);
-
-        local_irq_restore(flags);
-
-        return 0;
-}
-
-
-static int scc_chars_in_buffer (void *ptr)
-{
-        struct scc_port *port = ptr;
-        SCC_ACCESS_INIT(port);
-
-        return (SCCread (SPCOND_STATUS_REG) & SCSR_ALL_SENT) ? 0  : 1;
-}
-
-
-/* Comment taken from sx.c (2.4.0):
-   I haven't the foggiest why the decrement use count has to happen
-   here. The whole linux serial drivers stuff needs to be redesigned.
-   My guess is that this is a hack to minimize the impact of a bug
-   elsewhere. Thinking about it some more. (try it sometime) Try
-   running minicom on a serial port that is driven by a modularized
-   driver. Have the modem hangup. Then remove the driver module. Then
-   exit minicom.  I expect an "oops".  -- REW */
-
-static void scc_hungup(void *ptr)
-{
-        scc_disable_tx_interrupts(ptr);
-        scc_disable_rx_interrupts(ptr);
-}
-
-
-static void scc_close(void *ptr)
-{
-        scc_disable_tx_interrupts(ptr);
-        scc_disable_rx_interrupts(ptr);
-}
-
-
-/*---------------------------------------------------------------------------
- * Internal support functions
- *--------------------------------------------------------------------------*/
-
-static void scc_setsignals(struct scc_port *port, int dtr, int rts)
-{
-        unsigned long flags;
-        unsigned char t;
-        SCC_ACCESS_INIT(port);
-
-        local_irq_save(flags);
-        t = SCCread(TX_CTRL_REG);
-        if (dtr >= 0) t = dtr? (t | TCR_DTR): (t & ~TCR_DTR);
-        if (rts >= 0) t = rts? (t | TCR_RTS): (t & ~TCR_RTS);
-        SCCwrite(TX_CTRL_REG, t);
-        local_irq_restore(flags);
-}
-
-
-static void scc_send_xchar(struct tty_struct *tty, char ch)
-{
-        struct scc_port *port = tty->driver_data;
-
-        port->x_char = ch;
-        if (ch)
-                scc_enable_tx_interrupts(port);
-}
-
-
-/*---------------------------------------------------------------------------
- * Driver entrypoints referenced from above
- *--------------------------------------------------------------------------*/
-
-static int scc_open (struct tty_struct * tty, struct file * filp)
-{
-        int line = tty->index;
-        int retval;
-        struct scc_port *port = &scc_ports[line];
-        int i, channel = port->channel;
-        unsigned long   flags;
-        SCC_ACCESS_INIT(port);
-#if defined(CONFIG_MVME162_SCC) || defined(CONFIG_MVME147_SCC)
-        static const struct {
-                unsigned reg, val;
-        } mvme_init_tab[] = {
-                /* Values for MVME162 and MVME147 */
-                /* no parity, 1 stop bit, async, 1:16 */
-                { AUX1_CTRL_REG, A1CR_PARITY_NONE|A1CR_MODE_ASYNC_1|A1CR_CLKMODE_x16 },
-                /* parity error is special cond, ints disabled, no DMA */
-                { INT_AND_DMA_REG, IDR_PARERR_AS_SPCOND | IDR_RX_INT_DISAB },
-                /* Rx 8 bits/char, no auto enable, Rx off */
-                { RX_CTRL_REG, RCR_CHSIZE_8 },
-                /* DTR off, Tx 8 bits/char, RTS off, Tx off */
-                { TX_CTRL_REG, TCR_CHSIZE_8 },
-                /* special features off */
-                { AUX2_CTRL_REG, 0 },
-                { CLK_CTRL_REG, CCR_RXCLK_BRG | CCR_TXCLK_BRG },
-                { DPLL_CTRL_REG, DCR_BRG_ENAB | DCR_BRG_USE_PCLK },
-                /* Start Rx */
-                { RX_CTRL_REG, RCR_RX_ENAB | RCR_CHSIZE_8 },
-                /* Start Tx */
-                { TX_CTRL_REG, TCR_TX_ENAB | TCR_RTS | TCR_DTR | TCR_CHSIZE_8 },
-                /* Ext/Stat ints: DCD only */
-                { INT_CTRL_REG, ICR_ENAB_DCD_INT },
-                /* Reset Ext/Stat ints */
-                { COMMAND_REG, CR_EXTSTAT_RESET },
-                /* ...again */
-                { COMMAND_REG, CR_EXTSTAT_RESET },
-        };
-#endif
-#if defined(CONFIG_BVME6000_SCC)
-        static const struct {
-                unsigned reg, val;
-        } bvme_init_tab[] = {
-                /* Values for BVME6000 */
-                /* no parity, 1 stop bit, async, 1:16 */
-                { AUX1_CTRL_REG, A1CR_PARITY_NONE|A1CR_MODE_ASYNC_1|A1CR_CLKMODE_x16 },
-                /* parity error is special cond, ints disabled, no DMA */
-                { INT_AND_DMA_REG, IDR_PARERR_AS_SPCOND | IDR_RX_INT_DISAB },
-                /* Rx 8 bits/char, no auto enable, Rx off */
-                { RX_CTRL_REG, RCR_CHSIZE_8 },
-                /* DTR off, Tx 8 bits/char, RTS off, Tx off */
-                { TX_CTRL_REG, TCR_CHSIZE_8 },
-                /* special features off */
-                { AUX2_CTRL_REG, 0 },
-                { CLK_CTRL_REG, CCR_RTxC_XTAL | CCR_RXCLK_BRG | CCR_TXCLK_BRG },
-                { DPLL_CTRL_REG, DCR_BRG_ENAB },
-                /* Start Rx */
-                { RX_CTRL_REG, RCR_RX_ENAB | RCR_CHSIZE_8 },
-                /* Start Tx */
-                { TX_CTRL_REG, TCR_TX_ENAB | TCR_RTS | TCR_DTR | TCR_CHSIZE_8 },
-                /* Ext/Stat ints: DCD only */
-                { INT_CTRL_REG, ICR_ENAB_DCD_INT },
-                /* Reset Ext/Stat ints */
-                { COMMAND_REG, CR_EXTSTAT_RESET },
-                /* ...again */
-                { COMMAND_REG, CR_EXTSTAT_RESET },
-        };
-#endif
-        if (!(port->gs.port.flags & ASYNC_INITIALIZED)) {
-                local_irq_save(flags);
-#if defined(CONFIG_MVME147_SCC) || defined(CONFIG_MVME162_SCC)
-                if (MACH_IS_MVME147 || MACH_IS_MVME16x) {
-                        for (i = 0; i < ARRAY_SIZE(mvme_init_tab); ++i)
-                                SCCwrite(mvme_init_tab[i].reg, mvme_init_tab[i].val);
-                }
-#endif
-#if defined(CONFIG_BVME6000_SCC)
-                if (MACH_IS_BVME6000) {
-                        for (i = 0; i < ARRAY_SIZE(bvme_init_tab); ++i)
-                                SCCwrite(bvme_init_tab[i].reg, bvme_init_tab[i].val);
-                }
-#endif
-
-                /* remember status register for detection of DCD and CTS changes */
-                scc_last_status_reg[channel] = SCCread(STATUS_REG);
-
-                port->c_dcd = 0;        /* Prevent initial 1->0 interrupt */
-                scc_setsignals (port, 1,1);
-                local_irq_restore(flags);
-        }
-
-        tty->driver_data = port;
-        port->gs.port.tty = tty;
-        port->gs.port.count++;
-        retval = gs_init_port(&port->gs);
-        if (retval) {
-                port->gs.port.count--;
-                return retval;
-        }
-        port->gs.port.flags |= GS_ACTIVE;
-        retval = gs_block_til_ready(port, filp);
-
-        if (retval) {
-                port->gs.port.count--;
-                return retval;
-        }
-
-        port->c_dcd = tty_port_carrier_raised(&port->gs.port);
-
-        scc_enable_rx_interrupts(port);
-
-        return 0;
-}
-
-
-static void scc_throttle (struct tty_struct * tty)
-{
-        struct scc_port *port = tty->driver_data;
-        unsigned long   flags;
-        SCC_ACCESS_INIT(port);
-
-        if (tty->termios->c_cflag & CRTSCTS) {
-                local_irq_save(flags);
-                SCCmod(TX_CTRL_REG, ~TCR_RTS, 0);
-                local_irq_restore(flags);
-        }
-        if (I_IXOFF(tty))
-                scc_send_xchar(tty, STOP_CHAR(tty));
-}
-
-
-static void scc_unthrottle (struct tty_struct * tty)
-{
-        struct scc_port *port = tty->driver_data;
-        unsigned long   flags;
-        SCC_ACCESS_INIT(port);
-
-        if (tty->termios->c_cflag & CRTSCTS) {
-                local_irq_save(flags);
-                SCCmod(TX_CTRL_REG, 0xff, TCR_RTS);
-                local_irq_restore(flags);
-        }
-        if (I_IXOFF(tty))
-                scc_send_xchar(tty, START_CHAR(tty));
-}
-
-
-static int scc_ioctl(struct tty_struct *tty, struct file *file,
-                     unsigned int cmd, unsigned long arg)
-{
-        return -ENOIOCTLCMD;
-}
-
-
-static int scc_break_ctl(struct tty_struct *tty, int break_state)
-{
-        struct scc_port *port = tty->driver_data;
-        unsigned long   flags;
-        SCC_ACCESS_INIT(port);
-
-        local_irq_save(flags);
-        SCCmod(TX_CTRL_REG, ~TCR_SEND_BREAK, 
-                        break_state ? TCR_SEND_BREAK : 0);
-        local_irq_restore(flags);
-        return 0;
-}
-
-
-/*---------------------------------------------------------------------------
- * Serial console stuff...
- *--------------------------------------------------------------------------*/
-
-#define scc_delay() do { __asm__ __volatile__ (" nop; nop"); } while (0)
-
-static void scc_ch_write (char ch)
-{
-        volatile char *p = NULL;
-        
-#ifdef CONFIG_MVME147_SCC
-        if (MACH_IS_MVME147)
-                p = (volatile char *)M147_SCC_A_ADDR;
-#endif
-#ifdef CONFIG_MVME162_SCC
-        if (MACH_IS_MVME16x)
-                p = (volatile char *)MVME_SCC_A_ADDR;
-#endif
-#ifdef CONFIG_BVME6000_SCC
-        if (MACH_IS_BVME6000)
-                p = (volatile char *)BVME_SCC_A_ADDR;
-#endif
-
-        do {
-                scc_delay();
-        }
-        while (!(*p & 4));
-        scc_delay();
-        *p = 8;
-        scc_delay();
-        *p = ch;
-}
-
-/* The console must be locked when we get here. */
-
-static void scc_console_write (struct console *co, const char *str, unsigned count)
-{
-        unsigned long   flags;
-
-        local_irq_save(flags);
-
-        while (count--)
-        {
-                if (*str == '\n')
-                        scc_ch_write ('\r');
-                scc_ch_write (*str++);
-        }
-        local_irq_restore(flags);
-}
-
-static struct tty_driver *scc_console_device(struct console *c, int *index)
-{
-        *index = c->index;
-        return scc_driver;
-}
-
-static struct console sercons = {
-        .name           = "ttyS",
-        .write          = scc_console_write,
-        .device         = scc_console_device,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-};
-
-
-static int __init vme_scc_console_init(void)
-{
-        if (vme_brdtype == VME_TYPE_MVME147 ||
-                        vme_brdtype == VME_TYPE_MVME162 ||
-                        vme_brdtype == VME_TYPE_MVME172 ||
-                        vme_brdtype == VME_TYPE_BVME4000 ||
-                        vme_brdtype == VME_TYPE_BVME6000)
-                register_console(&sercons);
-        return 0;
-}
-console_initcall(vme_scc_console_init);
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
deleted file mode 100644
index 281aada7b4a1..000000000000
--- a/drivers/char/vt.c
+++ /dev/null
@@ -1,4204 +0,0 @@
-/*
- *  linux/drivers/char/vt.c
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- */
-
-/*
- * Hopefully this will be a rather complete VT102 implementation.
- *
- * Beeping thanks to John T Kohl.
- *
- * Virtual Consoles, Screen Blanking, Screen Dumping, Color, Graphics
- *   Chars, and VT100 enhancements by Peter MacDonald.
- *
- * Copy and paste function by Andrew Haylett,
- *   some enhancements by Alessandro Rubini.
- *
- * Code to check for different video-cards mostly by Galen Hunt,
- * <g-hunt@ee.utah.edu>
- *
- * Rudimentary ISO 10646/Unicode/UTF-8 character set support by
- * Markus Kuhn, <mskuhn@immd4.informatik.uni-erlangen.de>.
- *
- * Dynamic allocation of consoles, aeb@cwi.nl, May 1994
- * Resizing of consoles, aeb, 940926
- *
- * Code for xterm like mouse click reporting by Peter Orbaek 20-Jul-94
- * <poe@daimi.aau.dk>
- *
- * User-defined bell sound, new setterm control sequences and printk
- * redirection by Martin Mares <mj@k332.feld.cvut.cz> 19-Nov-95
- *
- * APM screenblank bug fixed Takashi Manabe <manabe@roy.dsl.tutics.tut.jp>
- *
- * Merge with the abstract console driver by Geert Uytterhoeven
- * <geert@linux-m68k.org>, Jan 1997.
- *
- *   Original m68k console driver modifications by
- *
- *     - Arno Griffioen <arno@usn.nl>
- *     - David Carter <carter@cs.bris.ac.uk>
- * 
- *   The abstract console driver provides a generic interface for a text
- *   console. It supports VGA text mode, frame buffer based graphical consoles
- *   and special graphics processors that are only accessible through some
- *   registers (e.g. a TMS340x0 GSP).
- *
- *   The interface to the hardware is specified using a special structure
- *   (struct consw) which contains function pointers to console operations
- *   (see <linux/console.h> for more information).
- *
- * Support for changeable cursor shape
- * by Pavel Machek <pavel@atrey.karlin.mff.cuni.cz>, August 1997
- *
- * Ported to i386 and con_scrolldelta fixed
- * by Emmanuel Marty <core@ggi-project.org>, April 1998
- *
- * Resurrected character buffers in videoram plus lots of other trickery
- * by Martin Mares <mj@atrey.karlin.mff.cuni.cz>, July 1998
- *
- * Removed old-style timers, introduced console_timer, made timer
- * deletion SMP-safe.  17Jun00, Andrew Morton
- *
- * Removed console_lock, enabled interrupts across all console operations
- * 13 March 2001, Andrew Morton
- *
- * Fixed UTF-8 mode so alternate charset modes always work according
- * to control sequences interpreted in do_con_trol function
- * preserving backward VT100 semigraphics compatibility,
- * malformed UTF sequences represented as sequences of replacement glyphs,
- * original codes or '?' as a last resort if replacement glyph is undefined
- * by Adam Tla/lka <atlka@pg.gda.pl>, Aug 2006
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/kd.h>
-#include <linux/slab.h>
-#include <linux/major.h>
-#include <linux/mm.h>
-#include <linux/console.h>
-#include <linux/init.h>
-#include <linux/mutex.h>
-#include <linux/vt_kern.h>
-#include <linux/selection.h>
-#include <linux/smp_lock.h>
-#include <linux/tiocl.h>
-#include <linux/kbd_kern.h>
-#include <linux/consolemap.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/workqueue.h>
-#include <linux/pm.h>
-#include <linux/font.h>
-#include <linux/bitops.h>
-#include <linux/notifier.h>
-#include <linux/device.h>
-#include <linux/io.h>
-#include <asm/system.h>
-#include <linux/uaccess.h>
-#include <linux/kdb.h>
-#include <linux/ctype.h>
-
-#define MAX_NR_CON_DRIVER 16
-
-#define CON_DRIVER_FLAG_MODULE 1
-#define CON_DRIVER_FLAG_INIT   2
-#define CON_DRIVER_FLAG_ATTR   4
-
-struct con_driver {
-        const struct consw *con;
-        const char *desc;
-        struct device *dev;
-        int node;
-        int first;
-        int last;
-        int flag;
-};
-
-static struct con_driver registered_con_driver[MAX_NR_CON_DRIVER];
-const struct consw *conswitchp;
-
-/* A bitmap for codes <32. A bit of 1 indicates that the code
- * corresponding to that bit number invokes some special action
- * (such as cursor movement) and should not be displayed as a
- * glyph unless the disp_ctrl mode is explicitly enabled.
- */
-#define CTRL_ACTION 0x0d00ff81
-#define CTRL_ALWAYS 0x0800f501  /* Cannot be overridden by disp_ctrl */
-
-/*
- * Here is the default bell parameters: 750HZ, 1/8th of a second
- */
-#define DEFAULT_BELL_PITCH      750
-#define DEFAULT_BELL_DURATION   (HZ/8)
-
-struct vc vc_cons [MAX_NR_CONSOLES];
-
-#ifndef VT_SINGLE_DRIVER
-static const struct consw *con_driver_map[MAX_NR_CONSOLES];
-#endif
-
-static int con_open(struct tty_struct *, struct file *);
-static void vc_init(struct vc_data *vc, unsigned int rows,
-                    unsigned int cols, int do_clear);
-static void gotoxy(struct vc_data *vc, int new_x, int new_y);
-static void save_cur(struct vc_data *vc);
-static void reset_terminal(struct vc_data *vc, int do_clear);
-static void con_flush_chars(struct tty_struct *tty);
-static int set_vesa_blanking(char __user *p);
-static void set_cursor(struct vc_data *vc);
-static void hide_cursor(struct vc_data *vc);
-static void console_callback(struct work_struct *ignored);
-static void blank_screen_t(unsigned long dummy);
-static void set_palette(struct vc_data *vc);
-
-static int printable;           /* Is console ready for printing? */
-int default_utf8 = true;
-module_param(default_utf8, int, S_IRUGO | S_IWUSR);
-int global_cursor_default = -1;
-module_param(global_cursor_default, int, S_IRUGO | S_IWUSR);
-
-static int cur_default = CUR_DEFAULT;
-module_param(cur_default, int, S_IRUGO | S_IWUSR);
-
-/*
- * ignore_poke: don't unblank the screen when things are typed.  This is
- * mainly for the privacy of braille terminal users.
- */
-static int ignore_poke;
-
-int do_poke_blanked_console;
-int console_blanked;
-
-static int vesa_blank_mode; /* 0:none 1:suspendV 2:suspendH 3:powerdown */
-static int vesa_off_interval;
-static int blankinterval = 10*60;
-core_param(consoleblank, blankinterval, int, 0444);
-
-static DECLARE_WORK(console_work, console_callback);
-
-/*
- * fg_console is the current virtual console,
- * last_console is the last used one,
- * want_console is the console we want to switch to,
- * saved_* variants are for save/restore around kernel debugger enter/leave
- */
-int fg_console;
-int last_console;
-int want_console = -1;
-static int saved_fg_console;
-static int saved_last_console;
-static int saved_want_console;
-static int saved_vc_mode;
-static int saved_console_blanked;
-
-/*
- * For each existing display, we have a pointer to console currently visible
- * on that display, allowing consoles other than fg_console to be refreshed
- * appropriately. Unless the low-level driver supplies its own display_fg
- * variable, we use this one for the "master display".
- */
-static struct vc_data *master_display_fg;
-
-/*
- * Unfortunately, we need to delay tty echo when we're currently writing to the
- * console since the code is (and always was) not re-entrant, so we schedule
- * all flip requests to process context with schedule-task() and run it from
- * console_callback().
- */
-
-/*
- * For the same reason, we defer scrollback to the console callback.
- */
-static int scrollback_delta;
-
-/*
- * Hook so that the power management routines can (un)blank
- * the console on our behalf.
- */
-int (*console_blank_hook)(int);
-
-static DEFINE_TIMER(console_timer, blank_screen_t, 0, 0);
-static int blank_state;
-static int blank_timer_expired;
-enum {
-        blank_off = 0,
-        blank_normal_wait,
-        blank_vesa_wait,
-};
-
-/*
- * Notifier list for console events.
- */
-static ATOMIC_NOTIFIER_HEAD(vt_notifier_list);
-
-int register_vt_notifier(struct notifier_block *nb)
-{
-        return atomic_notifier_chain_register(&vt_notifier_list, nb);
-}
-EXPORT_SYMBOL_GPL(register_vt_notifier);
-
-int unregister_vt_notifier(struct notifier_block *nb)
-{
-        return atomic_notifier_chain_unregister(&vt_notifier_list, nb);
-}
-EXPORT_SYMBOL_GPL(unregister_vt_notifier);
-
-static void notify_write(struct vc_data *vc, unsigned int unicode)
-{
-        struct vt_notifier_param param = { .vc = vc, unicode = unicode };
-        atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
-}
-
-static void notify_update(struct vc_data *vc)
-{
-        struct vt_notifier_param param = { .vc = vc };
-        atomic_notifier_call_chain(&vt_notifier_list, VT_UPDATE, &param);
-}
-/*
- *      Low-Level Functions
- */
-
-#define IS_FG(vc)       ((vc)->vc_num == fg_console)
-
-#ifdef VT_BUF_VRAM_ONLY
-#define DO_UPDATE(vc)   0
-#else
-#define DO_UPDATE(vc)   (CON_IS_VISIBLE(vc) && !console_blanked)
-#endif
-
-static inline unsigned short *screenpos(struct vc_data *vc, int offset, int viewed)
-{
-        unsigned short *p;
-        
-        if (!viewed)
-                p = (unsigned short *)(vc->vc_origin + offset);
-        else if (!vc->vc_sw->con_screen_pos)
-                p = (unsigned short *)(vc->vc_visible_origin + offset);
-        else
-                p = vc->vc_sw->con_screen_pos(vc, offset);
-        return p;
-}
-
-/* Called  from the keyboard irq path.. */
-static inline void scrolldelta(int lines)
-{
-        /* FIXME */
-        /* scrolldelta needs some kind of consistency lock, but the BKL was
-           and still is not protecting versus the scheduled back end */
-        scrollback_delta += lines;
-        schedule_console_callback();
-}
-
-void schedule_console_callback(void)
-{
-        schedule_work(&console_work);
-}
-
-static void scrup(struct vc_data *vc, unsigned int t, unsigned int b, int nr)
-{
-        unsigned short *d, *s;
-
-        if (t+nr >= b)
-                nr = b - t - 1;
-        if (b > vc->vc_rows || t >= b || nr < 1)
-                return;
-        if (CON_IS_VISIBLE(vc) && vc->vc_sw->con_scroll(vc, t, b, SM_UP, nr))
-                return;
-        d = (unsigned short *)(vc->vc_origin + vc->vc_size_row * t);
-        s = (unsigned short *)(vc->vc_origin + vc->vc_size_row * (t + nr));
-        scr_memmovew(d, s, (b - t - nr) * vc->vc_size_row);
-        scr_memsetw(d + (b - t - nr) * vc->vc_cols, vc->vc_video_erase_char,
-                    vc->vc_size_row * nr);
-}
-
-static void scrdown(struct vc_data *vc, unsigned int t, unsigned int b, int nr)
-{
-        unsigned short *s;
-        unsigned int step;
-
-        if (t+nr >= b)
-                nr = b - t - 1;
-        if (b > vc->vc_rows || t >= b || nr < 1)
-                return;
-        if (CON_IS_VISIBLE(vc) && vc->vc_sw->con_scroll(vc, t, b, SM_DOWN, nr))
-                return;
-        s = (unsigned short *)(vc->vc_origin + vc->vc_size_row * t);
-        step = vc->vc_cols * nr;
-        scr_memmovew(s + step, s, (b - t - nr) * vc->vc_size_row);
-        scr_memsetw(s, vc->vc_video_erase_char, 2 * step);
-}
-
-static void do_update_region(struct vc_data *vc, unsigned long start, int count)
-{
-#ifndef VT_BUF_VRAM_ONLY
-        unsigned int xx, yy, offset;
-        u16 *p;
-
-        p = (u16 *) start;
-        if (!vc->vc_sw->con_getxy) {
-                offset = (start - vc->vc_origin) / 2;
-                xx = offset % vc->vc_cols;
-                yy = offset / vc->vc_cols;
-        } else {
-                int nxx, nyy;
-                start = vc->vc_sw->con_getxy(vc, start, &nxx, &nyy);
-                xx = nxx; yy = nyy;
-        }
-        for(;;) {
-                u16 attrib = scr_readw(p) & 0xff00;
-                int startx = xx;
-                u16 *q = p;
-                while (xx < vc->vc_cols && count) {
-                        if (attrib != (scr_readw(p) & 0xff00)) {
-                                if (p > q)
-                                        vc->vc_sw->con_putcs(vc, q, p-q, yy, startx);
-                                startx = xx;
-                                q = p;
-                                attrib = scr_readw(p) & 0xff00;
-                        }
-                        p++;
-                        xx++;
-                        count--;
-                }
-                if (p > q)
-                        vc->vc_sw->con_putcs(vc, q, p-q, yy, startx);
-                if (!count)
-                        break;
-                xx = 0;
-                yy++;
-                if (vc->vc_sw->con_getxy) {
-                        p = (u16 *)start;
-                        start = vc->vc_sw->con_getxy(vc, start, NULL, NULL);
-                }
-        }
-#endif
-}
-
-void update_region(struct vc_data *vc, unsigned long start, int count)
-{
-        WARN_CONSOLE_UNLOCKED();
-
-        if (DO_UPDATE(vc)) {
-                hide_cursor(vc);
-                do_update_region(vc, start, count);
-                set_cursor(vc);
-        }
-}
-
-/* Structure of attributes is hardware-dependent */
-
-static u8 build_attr(struct vc_data *vc, u8 _color, u8 _intensity, u8 _blink,
-    u8 _underline, u8 _reverse, u8 _italic)
-{
-        if (vc->vc_sw->con_build_attr)
-                return vc->vc_sw->con_build_attr(vc, _color, _intensity,
-                       _blink, _underline, _reverse, _italic);
-
-#ifndef VT_BUF_VRAM_ONLY
-/*
- * ++roman: I completely changed the attribute format for monochrome
- * mode (!can_do_color). The formerly used MDA (monochrome display
- * adapter) format didn't allow the combination of certain effects.
- * Now the attribute is just a bit vector:
- *  Bit 0..1: intensity (0..2)
- *  Bit 2   : underline
- *  Bit 3   : reverse
- *  Bit 7   : blink
- */
-        {
-        u8 a = _color;
-        if (!vc->vc_can_do_color)
-                return _intensity |
-                       (_italic ? 2 : 0) |
-                       (_underline ? 4 : 0) |
-                       (_reverse ? 8 : 0) |
-                       (_blink ? 0x80 : 0);
-        if (_italic)
-                a = (a & 0xF0) | vc->vc_itcolor;
-        else if (_underline)
-                a = (a & 0xf0) | vc->vc_ulcolor;
-        else if (_intensity == 0)
-                a = (a & 0xf0) | vc->vc_ulcolor;
-        if (_reverse)
-                a = ((a) & 0x88) | ((((a) >> 4) | ((a) << 4)) & 0x77);
-        if (_blink)
-                a ^= 0x80;
-        if (_intensity == 2)
-                a ^= 0x08;
-        if (vc->vc_hi_font_mask == 0x100)
-                a <<= 1;
-        return a;
-        }
-#else
-        return 0;
-#endif
-}
-
-static void update_attr(struct vc_data *vc)
-{
-        vc->vc_attr = build_attr(vc, vc->vc_color, vc->vc_intensity,
-                      vc->vc_blink, vc->vc_underline,
-                      vc->vc_reverse ^ vc->vc_decscnm, vc->vc_italic);
-        vc->vc_video_erase_char = (build_attr(vc, vc->vc_color, 1, vc->vc_blink, 0, vc->vc_decscnm, 0) << 8) | ' ';
-}
-
-/* Note: inverting the screen twice should revert to the original state */
-void invert_screen(struct vc_data *vc, int offset, int count, int viewed)
-{
-        unsigned short *p;
-
-        WARN_CONSOLE_UNLOCKED();
-
-        count /= 2;
-        p = screenpos(vc, offset, viewed);
-        if (vc->vc_sw->con_invert_region)
-                vc->vc_sw->con_invert_region(vc, p, count);
-#ifndef VT_BUF_VRAM_ONLY
-        else {
-                u16 *q = p;
-                int cnt = count;
-                u16 a;
-
-                if (!vc->vc_can_do_color) {
-                        while (cnt--) {
-                            a = scr_readw(q);
-                            a ^= 0x0800;
-                            scr_writew(a, q);
-                            q++;
-                        }
-                } else if (vc->vc_hi_font_mask == 0x100) {
-                        while (cnt--) {
-                                a = scr_readw(q);
-                                a = ((a) & 0x11ff) | (((a) & 0xe000) >> 4) | (((a) & 0x0e00) << 4);
-                                scr_writew(a, q);
-                                q++;
-                        }
-                } else {
-                        while (cnt--) {
-                                a = scr_readw(q);
-                                a = ((a) & 0x88ff) | (((a) & 0x7000) >> 4) | (((a) & 0x0700) << 4);
-                                scr_writew(a, q);
-                                q++;
-                        }
-                }
-        }
-#endif
-        if (DO_UPDATE(vc))
-                do_update_region(vc, (unsigned long) p, count);
-}
-
-/* used by selection: complement pointer position */
-void complement_pos(struct vc_data *vc, int offset)
-{
-        static int old_offset = -1;
-        static unsigned short old;
-        static unsigned short oldx, oldy;
-
-        WARN_CONSOLE_UNLOCKED();
-
-        if (old_offset != -1 && old_offset >= 0 &&
-            old_offset < vc->vc_screenbuf_size) {
-                scr_writew(old, screenpos(vc, old_offset, 1));
-                if (DO_UPDATE(vc))
-                        vc->vc_sw->con_putc(vc, old, oldy, oldx);
-        }
-
-        old_offset = offset;
-
-        if (offset != -1 && offset >= 0 &&
-            offset < vc->vc_screenbuf_size) {
-                unsigned short new;
-                unsigned short *p;
-                p = screenpos(vc, offset, 1);
-                old = scr_readw(p);
-                new = old ^ vc->vc_complement_mask;
-                scr_writew(new, p);
-                if (DO_UPDATE(vc)) {
-                        oldx = (offset >> 1) % vc->vc_cols;
-                        oldy = (offset >> 1) / vc->vc_cols;
-                        vc->vc_sw->con_putc(vc, new, oldy, oldx);
-                }
-        }
-
-}
-
-static void insert_char(struct vc_data *vc, unsigned int nr)
-{
-        unsigned short *p, *q = (unsigned short *)vc->vc_pos;
-
-        p = q + vc->vc_cols - nr - vc->vc_x;
-        while (--p >= q)
-                scr_writew(scr_readw(p), p + nr);
-        scr_memsetw(q, vc->vc_video_erase_char, nr * 2);
-        vc->vc_need_wrap = 0;
-        if (DO_UPDATE(vc)) {
-                unsigned short oldattr = vc->vc_attr;
-                vc->vc_sw->con_bmove(vc, vc->vc_y, vc->vc_x, vc->vc_y, vc->vc_x + nr, 1,
-                                     vc->vc_cols - vc->vc_x - nr);
-                vc->vc_attr = vc->vc_video_erase_char >> 8;
-                while (nr--)
-                        vc->vc_sw->con_putc(vc, vc->vc_video_erase_char, vc->vc_y, vc->vc_x + nr);
-                vc->vc_attr = oldattr;
-        }
-}
-
-static void delete_char(struct vc_data *vc, unsigned int nr)
-{
-        unsigned int i = vc->vc_x;
-        unsigned short *p = (unsigned short *)vc->vc_pos;
-
-        while (++i <= vc->vc_cols - nr) {
-                scr_writew(scr_readw(p+nr), p);
-                p++;
-        }
-        scr_memsetw(p, vc->vc_video_erase_char, nr * 2);
-        vc->vc_need_wrap = 0;
-        if (DO_UPDATE(vc)) {
-                unsigned short oldattr = vc->vc_attr;
-                vc->vc_sw->con_bmove(vc, vc->vc_y, vc->vc_x + nr, vc->vc_y, vc->vc_x, 1,
-                                     vc->vc_cols - vc->vc_x - nr);
-                vc->vc_attr = vc->vc_video_erase_char >> 8;
-                while (nr--)
-                        vc->vc_sw->con_putc(vc, vc->vc_video_erase_char, vc->vc_y,
-                                     vc->vc_cols - 1 - nr);
-                vc->vc_attr = oldattr;
-        }
-}
-
-static int softcursor_original;
-
-static void add_softcursor(struct vc_data *vc)
-{
-        int i = scr_readw((u16 *) vc->vc_pos);
-        u32 type = vc->vc_cursor_type;
-
-        if (! (type & 0x10)) return;
-        if (softcursor_original != -1) return;
-        softcursor_original = i;
-        i |= ((type >> 8) & 0xff00 );
-        i ^= ((type) & 0xff00 );
-        if ((type & 0x20) && ((softcursor_original & 0x7000) == (i & 0x7000))) i ^= 0x7000;
-        if ((type & 0x40) && ((i & 0x700) == ((i & 0x7000) >> 4))) i ^= 0x0700;
-        scr_writew(i, (u16 *) vc->vc_pos);
-        if (DO_UPDATE(vc))
-                vc->vc_sw->con_putc(vc, i, vc->vc_y, vc->vc_x);
-}
-
-static void hide_softcursor(struct vc_data *vc)
-{
-        if (softcursor_original != -1) {
-                scr_writew(softcursor_original, (u16 *)vc->vc_pos);
-                if (DO_UPDATE(vc))
-                        vc->vc_sw->con_putc(vc, softcursor_original,
-                                        vc->vc_y, vc->vc_x);
-                softcursor_original = -1;
-        }
-}
-
-static void hide_cursor(struct vc_data *vc)
-{
-        if (vc == sel_cons)
-                clear_selection();
-        vc->vc_sw->con_cursor(vc, CM_ERASE);
-        hide_softcursor(vc);
-}
-
-static void set_cursor(struct vc_data *vc)
-{
-        if (!IS_FG(vc) || console_blanked ||
-            vc->vc_mode == KD_GRAPHICS)
-                return;
-        if (vc->vc_deccm) {
-                if (vc == sel_cons)
-                        clear_selection();
-                add_softcursor(vc);
-                if ((vc->vc_cursor_type & 0x0f) != 1)
-                        vc->vc_sw->con_cursor(vc, CM_DRAW);
-        } else
-                hide_cursor(vc);
-}
-
-static void set_origin(struct vc_data *vc)
-{
-        WARN_CONSOLE_UNLOCKED();
-
-        if (!CON_IS_VISIBLE(vc) ||
-            !vc->vc_sw->con_set_origin ||
-            !vc->vc_sw->con_set_origin(vc))
-                vc->vc_origin = (unsigned long)vc->vc_screenbuf;
-        vc->vc_visible_origin = vc->vc_origin;
-        vc->vc_scr_end = vc->vc_origin + vc->vc_screenbuf_size;
-        vc->vc_pos = vc->vc_origin + vc->vc_size_row * vc->vc_y + 2 * vc->vc_x;
-}
-
-static inline void save_screen(struct vc_data *vc)
-{
-        WARN_CONSOLE_UNLOCKED();
-
-        if (vc->vc_sw->con_save_screen)
-                vc->vc_sw->con_save_screen(vc);
-}
-
-/*
- *      Redrawing of screen
- */
-
-static void clear_buffer_attributes(struct vc_data *vc)
-{
-        unsigned short *p = (unsigned short *)vc->vc_origin;
-        int count = vc->vc_screenbuf_size / 2;
-        int mask = vc->vc_hi_font_mask | 0xff;
-
-        for (; count > 0; count--, p++) {
-                scr_writew((scr_readw(p)&mask) | (vc->vc_video_erase_char & ~mask), p);
-        }
-}
-
-void redraw_screen(struct vc_data *vc, int is_switch)
-{
-        int redraw = 0;
-
-        WARN_CONSOLE_UNLOCKED();
-
-        if (!vc) {
-                /* strange ... */
-                /* printk("redraw_screen: tty %d not allocated ??\n", new_console+1); */
-                return;
-        }
-
-        if (is_switch) {
-                struct vc_data *old_vc = vc_cons[fg_console].d;
-                if (old_vc == vc)
-                        return;
-                if (!CON_IS_VISIBLE(vc))
-                        redraw = 1;
-                *vc->vc_display_fg = vc;
-                fg_console = vc->vc_num;
-                hide_cursor(old_vc);
-                if (!CON_IS_VISIBLE(old_vc)) {
-                        save_screen(old_vc);
-                        set_origin(old_vc);
-                }
-        } else {
-                hide_cursor(vc);
-                redraw = 1;
-        }
-
-        if (redraw) {
-                int update;
-                int old_was_color = vc->vc_can_do_color;
-
-                set_origin(vc);
-                update = vc->vc_sw->con_switch(vc);
-                set_palette(vc);
-                /*
-                 * If console changed from mono<->color, the best we can do
-                 * is to clear the buffer attributes. As it currently stands,
-                 * rebuilding new attributes from the old buffer is not doable
-                 * without overly complex code.
-                 */
-                if (old_was_color != vc->vc_can_do_color) {
-                        update_attr(vc);
-                        clear_buffer_attributes(vc);
-                }
-
-                /* Forcibly update if we're panicing */
-                if ((update && vc->vc_mode != KD_GRAPHICS) ||
-                    vt_force_oops_output(vc))
-                        do_update_region(vc, vc->vc_origin, vc->vc_screenbuf_size / 2);
-        }
-        set_cursor(vc);
-        if (is_switch) {
-                set_leds();
-                compute_shiftstate();
-                notify_update(vc);
-        }
-}
-
-/*
- *      Allocation, freeing and resizing of VTs.
- */
-
-int vc_cons_allocated(unsigned int i)
-{
-        return (i < MAX_NR_CONSOLES && vc_cons[i].d);
-}
-
-static void visual_init(struct vc_data *vc, int num, int init)
-{
-        /* ++Geert: vc->vc_sw->con_init determines console size */
-        if (vc->vc_sw)
-                module_put(vc->vc_sw->owner);
-        vc->vc_sw = conswitchp;
-#ifndef VT_SINGLE_DRIVER
-        if (con_driver_map[num])
-                vc->vc_sw = con_driver_map[num];
-#endif
-        __module_get(vc->vc_sw->owner);
-        vc->vc_num = num;
-        vc->vc_display_fg = &master_display_fg;
-        vc->vc_uni_pagedir_loc = &vc->vc_uni_pagedir;
-        vc->vc_uni_pagedir = 0;
-        vc->vc_hi_font_mask = 0;
-        vc->vc_complement_mask = 0;
-        vc->vc_can_do_color = 0;
-        vc->vc_panic_force_write = false;
-        vc->vc_sw->con_init(vc, init);
-        if (!vc->vc_complement_mask)
-                vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;
-        vc->vc_s_complement_mask = vc->vc_complement_mask;
-        vc->vc_size_row = vc->vc_cols << 1;
-        vc->vc_screenbuf_size = vc->vc_rows * vc->vc_size_row;
-}
-
-int vc_allocate(unsigned int currcons)  /* return 0 on success */
-{
-        WARN_CONSOLE_UNLOCKED();
-
-        if (currcons >= MAX_NR_CONSOLES)
-                return -ENXIO;
-        if (!vc_cons[currcons].d) {
-            struct vc_data *vc;
-            struct vt_notifier_param param;
-
-            /* prevent users from taking too much memory */
-            if (currcons >= MAX_NR_USER_CONSOLES && !capable(CAP_SYS_RESOURCE))
-              return -EPERM;
-
-            /* due to the granularity of kmalloc, we waste some memory here */
-            /* the alloc is done in two steps, to optimize the common situation
-               of a 25x80 console (structsize=216, screenbuf_size=4000) */
-            /* although the numbers above are not valid since long ago, the
-               point is still up-to-date and the comment still has its value
-               even if only as a historical artifact.  --mj, July 1998 */
-            param.vc = vc = kzalloc(sizeof(struct vc_data), GFP_KERNEL);
-            if (!vc)
-                return -ENOMEM;
-            vc_cons[currcons].d = vc;
-            tty_port_init(&vc->port);
-            INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK);
-            visual_init(vc, currcons, 1);
-            if (!*vc->vc_uni_pagedir_loc)
-                con_set_default_unimap(vc);
-            vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size, GFP_KERNEL);
-            if (!vc->vc_screenbuf) {
-                kfree(vc);
-                vc_cons[currcons].d = NULL;
-                return -ENOMEM;
-            }
-
-            /* If no drivers have overridden us and the user didn't pass a
-               boot option, default to displaying the cursor */
-            if (global_cursor_default == -1)
-                    global_cursor_default = 1;
-
-            vc_init(vc, vc->vc_rows, vc->vc_cols, 1);
-            vcs_make_sysfs(currcons);
-            atomic_notifier_call_chain(&vt_notifier_list, VT_ALLOCATE, &param);
-        }
-        return 0;
-}
-
-static inline int resize_screen(struct vc_data *vc, int width, int height,
-                                int user)
-{
-        /* Resizes the resolution of the display adapater */
-        int err = 0;
-
-        if (vc->vc_mode != KD_GRAPHICS && vc->vc_sw->con_resize)
-                err = vc->vc_sw->con_resize(vc, width, height, user);
-
-        return err;
-}
-
-/*
- * Change # of rows and columns (0 means unchanged/the size of fg_console)
- * [this is to be used together with some user program
- * like resize that changes the hardware videomode]
- */
-#define VC_RESIZE_MAXCOL (32767)
-#define VC_RESIZE_MAXROW (32767)
-
-/**
- *      vc_do_resize    -       resizing method for the tty
- *      @tty: tty being resized
- *      @real_tty: real tty (different to tty if a pty/tty pair)
- *      @vc: virtual console private data
- *      @cols: columns
- *      @lines: lines
- *
- *      Resize a virtual console, clipping according to the actual constraints.
- *      If the caller passes a tty structure then update the termios winsize
- *      information and perform any necessary signal handling.
- *
- *      Caller must hold the console semaphore. Takes the termios mutex and
- *      ctrl_lock of the tty IFF a tty is passed.
- */
-
-static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
-                                unsigned int cols, unsigned int lines)
-{
-        unsigned long old_origin, new_origin, new_scr_end, rlth, rrem, err = 0;
-        unsigned long end;
-        unsigned int old_cols, old_rows, old_row_size, old_screen_size;
-        unsigned int new_cols, new_rows, new_row_size, new_screen_size;
-        unsigned int user;
-        unsigned short *newscreen;
-
-        WARN_CONSOLE_UNLOCKED();
-
-        if (!vc)
-                return -ENXIO;
-
-        user = vc->vc_resize_user;
-        vc->vc_resize_user = 0;
-
-        if (cols > VC_RESIZE_MAXCOL || lines > VC_RESIZE_MAXROW)
-                return -EINVAL;
-
-        new_cols = (cols ? cols : vc->vc_cols);
-        new_rows = (lines ? lines : vc->vc_rows);
-        new_row_size = new_cols << 1;
-        new_screen_size = new_row_size * new_rows;
-
-        if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
-                return 0;
-
-        newscreen = kmalloc(new_screen_size, GFP_USER);
-        if (!newscreen)
-                return -ENOMEM;
-
-        old_rows = vc->vc_rows;
-        old_cols = vc->vc_cols;
-        old_row_size = vc->vc_size_row;
-        old_screen_size = vc->vc_screenbuf_size;
-
-        err = resize_screen(vc, new_cols, new_rows, user);
-        if (err) {
-                kfree(newscreen);
-                return err;
-        }
-
-        vc->vc_rows = new_rows;
-        vc->vc_cols = new_cols;
-        vc->vc_size_row = new_row_size;
-        vc->vc_screenbuf_size = new_screen_size;
-
-        rlth = min(old_row_size, new_row_size);
-        rrem = new_row_size - rlth;
-        old_origin = vc->vc_origin;
-        new_origin = (long) newscreen;
-        new_scr_end = new_origin + new_screen_size;
-
-        if (vc->vc_y > new_rows) {
-                if (old_rows - vc->vc_y < new_rows) {
-                        /*
-                         * Cursor near the bottom, copy contents from the
-                         * bottom of buffer
-                         */
-                        old_origin += (old_rows - new_rows) * old_row_size;
-                } else {
-                        /*
-                         * Cursor is in no man's land, copy 1/2 screenful
-                         * from the top and bottom of cursor position
-                         */
-                        old_origin += (vc->vc_y - new_rows/2) * old_row_size;
-                }
-        }
-
-        end = old_origin + old_row_size * min(old_rows, new_rows);
-
-        update_attr(vc);
-
-        while (old_origin < end) {
-                scr_memcpyw((unsigned short *) new_origin,
-                            (unsigned short *) old_origin, rlth);
-                if (rrem)
-                        scr_memsetw((void *)(new_origin + rlth),
-                                    vc->vc_video_erase_char, rrem);
-                old_origin += old_row_size;
-                new_origin += new_row_size;
-        }
-        if (new_scr_end > new_origin)
-                scr_memsetw((void *)new_origin, vc->vc_video_erase_char,
-                            new_scr_end - new_origin);
-        kfree(vc->vc_screenbuf);
-        vc->vc_screenbuf = newscreen;
-        vc->vc_screenbuf_size = new_screen_size;
-        set_origin(vc);
-
-        /* do part of a reset_terminal() */
-        vc->vc_top = 0;
-        vc->vc_bottom = vc->vc_rows;
-        gotoxy(vc, vc->vc_x, vc->vc_y);
-        save_cur(vc);
-
-        if (tty) {
-                /* Rewrite the requested winsize data with the actual
-                   resulting sizes */
-                struct winsize ws;
-                memset(&ws, 0, sizeof(ws));
-                ws.ws_row = vc->vc_rows;
-                ws.ws_col = vc->vc_cols;
-                ws.ws_ypixel = vc->vc_scan_lines;
-                tty_do_resize(tty, &ws);
-        }
-
-        if (CON_IS_VISIBLE(vc))
-                update_screen(vc);
-        vt_event_post(VT_EVENT_RESIZE, vc->vc_num, vc->vc_num);
-        return err;
-}
-
-/**
- *      vc_resize               -       resize a VT
- *      @vc: virtual console
- *      @cols: columns
- *      @rows: rows
- *
- *      Resize a virtual console as seen from the console end of things. We
- *      use the common vc_do_resize methods to update the structures. The
- *      caller must hold the console sem to protect console internals and
- *      vc->port.tty
- */
-
-int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int rows)
-{
-        return vc_do_resize(vc->port.tty, vc, cols, rows);
-}
-
-/**
- *      vt_resize               -       resize a VT
- *      @tty: tty to resize
- *      @ws: winsize attributes
- *
- *      Resize a virtual terminal. This is called by the tty layer as we
- *      register our own handler for resizing. The mutual helper does all
- *      the actual work.
- *
- *      Takes the console sem and the called methods then take the tty
- *      termios_mutex and the tty ctrl_lock in that order.
- */
-static int vt_resize(struct tty_struct *tty, struct winsize *ws)
-{
-        struct vc_data *vc = tty->driver_data;
-        int ret;
-
-        acquire_console_sem();
-        ret = vc_do_resize(tty, vc, ws->ws_col, ws->ws_row);
-        release_console_sem();
-        return ret;
-}
-
-void vc_deallocate(unsigned int currcons)
-{
-        WARN_CONSOLE_UNLOCKED();
-
-        if (vc_cons_allocated(currcons)) {
-                struct vc_data *vc = vc_cons[currcons].d;
-                struct vt_notifier_param param = { .vc = vc };
-
-                atomic_notifier_call_chain(&vt_notifier_list, VT_DEALLOCATE, &param);
-                vcs_remove_sysfs(currcons);
-                vc->vc_sw->con_deinit(vc);
-                put_pid(vc->vt_pid);
-                module_put(vc->vc_sw->owner);
-                kfree(vc->vc_screenbuf);
-                if (currcons >= MIN_NR_CONSOLES)
-                        kfree(vc);
-                vc_cons[currcons].d = NULL;
-        }
-}
-
-/*
- *      VT102 emulator
- */
-
-#define set_kbd(vc, x)  set_vc_kbd_mode(kbd_table + (vc)->vc_num, (x))
-#define clr_kbd(vc, x)  clr_vc_kbd_mode(kbd_table + (vc)->vc_num, (x))
-#define is_kbd(vc, x)   vc_kbd_mode(kbd_table + (vc)->vc_num, (x))
-
-#define decarm          VC_REPEAT
-#define decckm          VC_CKMODE
-#define kbdapplic       VC_APPLIC
-#define lnm             VC_CRLF
-
-/*
- * this is what the terminal answers to a ESC-Z or csi0c query.
- */
-#define VT100ID "\033[?1;2c"
-#define VT102ID "\033[?6c"
-
-unsigned char color_table[] = { 0, 4, 2, 6, 1, 5, 3, 7,
-                                       8,12,10,14, 9,13,11,15 };
-
-/* the default colour table, for VGA+ colour systems */
-int default_red[] = {0x00,0xaa,0x00,0xaa,0x00,0xaa,0x00,0xaa,
-    0x55,0xff,0x55,0xff,0x55,0xff,0x55,0xff};
-int default_grn[] = {0x00,0x00,0xaa,0x55,0x00,0x00,0xaa,0xaa,
-    0x55,0x55,0xff,0xff,0x55,0x55,0xff,0xff};
-int default_blu[] = {0x00,0x00,0x00,0x00,0xaa,0xaa,0xaa,0xaa,
-    0x55,0x55,0x55,0x55,0xff,0xff,0xff,0xff};
-
-module_param_array(default_red, int, NULL, S_IRUGO | S_IWUSR);
-module_param_array(default_grn, int, NULL, S_IRUGO | S_IWUSR);
-module_param_array(default_blu, int, NULL, S_IRUGO | S_IWUSR);
-
-/*
- * gotoxy() must verify all boundaries, because the arguments
- * might also be negative. If the given position is out of
- * bounds, the cursor is placed at the nearest margin.
- */
-static void gotoxy(struct vc_data *vc, int new_x, int new_y)
-{
-        int min_y, max_y;
-
-        if (new_x < 0)
-                vc->vc_x = 0;
-        else {
-                if (new_x >= vc->vc_cols)
-                        vc->vc_x = vc->vc_cols - 1;
-                else
-                        vc->vc_x = new_x;
-        }
-
-        if (vc->vc_decom) {
-                min_y = vc->vc_top;
-                max_y = vc->vc_bottom;
-        } else {
-                min_y = 0;
-                max_y = vc->vc_rows;
-        }
-        if (new_y < min_y)
-                vc->vc_y = min_y;
-        else if (new_y >= max_y)
-                vc->vc_y = max_y - 1;
-        else
-                vc->vc_y = new_y;
-        vc->vc_pos = vc->vc_origin + vc->vc_y * vc->vc_size_row + (vc->vc_x<<1);
-        vc->vc_need_wrap = 0;
-}
-
-/* for absolute user moves, when decom is set */
-static void gotoxay(struct vc_data *vc, int new_x, int new_y)
-{
-        gotoxy(vc, new_x, vc->vc_decom ? (vc->vc_top + new_y) : new_y);
-}
-
-void scrollback(struct vc_data *vc, int lines)
-{
-        if (!lines)
-                lines = vc->vc_rows / 2;
-        scrolldelta(-lines);
-}
-
-void scrollfront(struct vc_data *vc, int lines)
-{
-        if (!lines)
-                lines = vc->vc_rows / 2;
-        scrolldelta(lines);
-}
-
-static void lf(struct vc_data *vc)
-{
-        /* don't scroll if above bottom of scrolling region, or
-         * if below scrolling region
-         */
-        if (vc->vc_y + 1 == vc->vc_bottom)
-                scrup(vc, vc->vc_top, vc->vc_bottom, 1);
-        else if (vc->vc_y < vc->vc_rows - 1) {
-                vc->vc_y++;
-                vc->vc_pos += vc->vc_size_row;
-        }
-        vc->vc_need_wrap = 0;
-        notify_write(vc, '\n');
-}
-
-static void ri(struct vc_data *vc)
-{
-        /* don't scroll if below top of scrolling region, or
-         * if above scrolling region
-         */
-        if (vc->vc_y == vc->vc_top)
-                scrdown(vc, vc->vc_top, vc->vc_bottom, 1);
-        else if (vc->vc_y > 0) {
-                vc->vc_y--;
-                vc->vc_pos -= vc->vc_size_row;
-        }
-        vc->vc_need_wrap = 0;
-}
-
-static inline void cr(struct vc_data *vc)
-{
-        vc->vc_pos -= vc->vc_x << 1;
-        vc->vc_need_wrap = vc->vc_x = 0;
-        notify_write(vc, '\r');
-}
-
-static inline void bs(struct vc_data *vc)
-{
-        if (vc->vc_x) {
-                vc->vc_pos -= 2;
-                vc->vc_x--;
-                vc->vc_need_wrap = 0;
-                notify_write(vc, '\b');
-        }
-}
-
-static inline void del(struct vc_data *vc)
-{
-        /* ignored */
-}
-
-static void csi_J(struct vc_data *vc, int vpar)
-{
-        unsigned int count;
-        unsigned short * start;
-
-        switch (vpar) {
-                case 0: /* erase from cursor to end of display */
-                        count = (vc->vc_scr_end - vc->vc_pos) >> 1;
-                        start = (unsigned short *)vc->vc_pos;
-                        if (DO_UPDATE(vc)) {
-                                /* do in two stages */
-                                vc->vc_sw->con_clear(vc, vc->vc_y, vc->vc_x, 1,
-                                              vc->vc_cols - vc->vc_x);
-                                vc->vc_sw->con_clear(vc, vc->vc_y + 1, 0,
-                                              vc->vc_rows - vc->vc_y - 1,
-                                              vc->vc_cols);
-                        }
-                        break;
-                case 1: /* erase from start to cursor */
-                        count = ((vc->vc_pos - vc->vc_origin) >> 1) + 1;
-                        start = (unsigned short *)vc->vc_origin;
-                        if (DO_UPDATE(vc)) {
-                                /* do in two stages */
-                                vc->vc_sw->con_clear(vc, 0, 0, vc->vc_y,
-                                              vc->vc_cols);
-                                vc->vc_sw->con_clear(vc, vc->vc_y, 0, 1,
-                                              vc->vc_x + 1);
-                        }
-                        break;
-                case 2: /* erase whole display */
-                        count = vc->vc_cols * vc->vc_rows;
-                        start = (unsigned short *)vc->vc_origin;
-                        if (DO_UPDATE(vc))
-                                vc->vc_sw->con_clear(vc, 0, 0,
-                                              vc->vc_rows,
-                                              vc->vc_cols);
-                        break;
-                default:
-                        return;
-        }
-        scr_memsetw(start, vc->vc_video_erase_char, 2 * count);
-        vc->vc_need_wrap = 0;
-}
-
-static void csi_K(struct vc_data *vc, int vpar)
-{
-        unsigned int count;
-        unsigned short * start;
-
-        switch (vpar) {
-                case 0: /* erase from cursor to end of line */
-                        count = vc->vc_cols - vc->vc_x;
-                        start = (unsigned short *)vc->vc_pos;
-                        if (DO_UPDATE(vc))
-                                vc->vc_sw->con_clear(vc, vc->vc_y, vc->vc_x, 1,
-                                                     vc->vc_cols - vc->vc_x);
-                        break;
-                case 1: /* erase from start of line to cursor */
-                        start = (unsigned short *)(vc->vc_pos - (vc->vc_x << 1));
-                        count = vc->vc_x + 1;
-                        if (DO_UPDATE(vc))
-                                vc->vc_sw->con_clear(vc, vc->vc_y, 0, 1,
-                                                     vc->vc_x + 1);
-                        break;
-                case 2: /* erase whole line */
-                        start = (unsigned short *)(vc->vc_pos - (vc->vc_x << 1));
-                        count = vc->vc_cols;
-                        if (DO_UPDATE(vc))
-                                vc->vc_sw->con_clear(vc, vc->vc_y, 0, 1,
-                                              vc->vc_cols);
-                        break;
-                default:
-                        return;
-        }
-        scr_memsetw(start, vc->vc_video_erase_char, 2 * count);
-        vc->vc_need_wrap = 0;
-}
-
-static void csi_X(struct vc_data *vc, int vpar) /* erase the following vpar positions */
-{                                         /* not vt100? */
-        int count;
-
-        if (!vpar)
-                vpar++;
-        count = (vpar > vc->vc_cols - vc->vc_x) ? (vc->vc_cols - vc->vc_x) : vpar;
-
-        scr_memsetw((unsigned short *)vc->vc_pos, vc->vc_video_erase_char, 2 * count);
-        if (DO_UPDATE(vc))
-                vc->vc_sw->con_clear(vc, vc->vc_y, vc->vc_x, 1, count);
-        vc->vc_need_wrap = 0;
-}
-
-static void default_attr(struct vc_data *vc)
-{
-        vc->vc_intensity = 1;
-        vc->vc_italic = 0;
-        vc->vc_underline = 0;
-        vc->vc_reverse = 0;
-        vc->vc_blink = 0;
-        vc->vc_color = vc->vc_def_color;
-}
-
-/* console_sem is held */
-static void csi_m(struct vc_data *vc)
-{
-        int i;
-
-        for (i = 0; i <= vc->vc_npar; i++)
-                switch (vc->vc_par[i]) {
-                        case 0: /* all attributes off */
-                                default_attr(vc);
-                                break;
-                        case 1:
-                                vc->vc_intensity = 2;
-                                break;
-                        case 2:
-                                vc->vc_intensity = 0;
-                                break;
-                        case 3:
-                                vc->vc_italic = 1;
-                                break;
-                        case 4:
-                                vc->vc_underline = 1;
-                                break;
-                        case 5:
-                                vc->vc_blink = 1;
-                                break;
-                        case 7:
-                                vc->vc_reverse = 1;
-                                break;
-                        case 10: /* ANSI X3.64-1979 (SCO-ish?)
-                                  * Select primary font, don't display
-                                  * control chars if defined, don't set
-                                  * bit 8 on output.
-                                  */
-                                vc->vc_translate = set_translate(vc->vc_charset == 0
-                                                ? vc->vc_G0_charset
-                                                : vc->vc_G1_charset, vc);
-                                vc->vc_disp_ctrl = 0;
-                                vc->vc_toggle_meta = 0;
-                                break;
-                        case 11: /* ANSI X3.64-1979 (SCO-ish?)
-                                  * Select first alternate font, lets
-                                  * chars < 32 be displayed as ROM chars.
-                                  */
-                                vc->vc_translate = set_translate(IBMPC_MAP, vc);
-                                vc->vc_disp_ctrl = 1;
-                                vc->vc_toggle_meta = 0;
-                                break;
-                        case 12: /* ANSI X3.64-1979 (SCO-ish?)
-                                  * Select second alternate font, toggle
-                                  * high bit before displaying as ROM char.
-                                  */
-                                vc->vc_translate = set_translate(IBMPC_MAP, vc);
-                                vc->vc_disp_ctrl = 1;
-                                vc->vc_toggle_meta = 1;
-                                break;
-                        case 21:
-                        case 22:
-                                vc->vc_intensity = 1;
-                                break;
-                        case 23:
-                                vc->vc_italic = 0;
-                                break;
-                        case 24:
-                                vc->vc_underline = 0;
-                                break;
-                        case 25:
-                                vc->vc_blink = 0;
-                                break;
-                        case 27:
-                                vc->vc_reverse = 0;
-                                break;
-                        case 38: /* ANSI X3.64-1979 (SCO-ish?)
-                                  * Enables underscore, white foreground
-                                  * with white underscore (Linux - use
-                                  * default foreground).
-                                  */
-                                vc->vc_color = (vc->vc_def_color & 0x0f) | (vc->vc_color & 0xf0);
-                                vc->vc_underline = 1;
-                                break;
-                        case 39: /* ANSI X3.64-1979 (SCO-ish?)
-                                  * Disable underline option.
-                                  * Reset colour to default? It did this
-                                  * before...
-                                  */
-                                vc->vc_color = (vc->vc_def_color & 0x0f) | (vc->vc_color & 0xf0);
-                                vc->vc_underline = 0;
-                                break;
-                        case 49:
-                                vc->vc_color = (vc->vc_def_color & 0xf0) | (vc->vc_color & 0x0f);
-                                break;
-                        default:
-                                if (vc->vc_par[i] >= 30 && vc->vc_par[i] <= 37)
-                                        vc->vc_color = color_table[vc->vc_par[i] - 30]
-                                                | (vc->vc_color & 0xf0);
-                                else if (vc->vc_par[i] >= 40 && vc->vc_par[i] <= 47)
-                                        vc->vc_color = (color_table[vc->vc_par[i] - 40] << 4)
-                                                | (vc->vc_color & 0x0f);
-                                break;
-                }
-        update_attr(vc);
-}
-
-static void respond_string(const char *p, struct tty_struct *tty)
-{
-        while (*p) {
-                tty_insert_flip_char(tty, *p, 0);
-                p++;
-        }
-        con_schedule_flip(tty);
-}
-
-static void cursor_report(struct vc_data *vc, struct tty_struct *tty)
-{
-        char buf[40];
-
-        sprintf(buf, "\033[%d;%dR", vc->vc_y + (vc->vc_decom ? vc->vc_top + 1 : 1), vc->vc_x + 1);
-        respond_string(buf, tty);
-}
-
-static inline void status_report(struct tty_struct *tty)
-{
-        respond_string("\033[0n", tty); /* Terminal ok */
-}
-
-static inline void respond_ID(struct tty_struct * tty)
-{
-        respond_string(VT102ID, tty);
-}
-
-void mouse_report(struct tty_struct *tty, int butt, int mrx, int mry)
-{
-        char buf[8];
-
-        sprintf(buf, "\033[M%c%c%c", (char)(' ' + butt), (char)('!' + mrx),
-                (char)('!' + mry));
-        respond_string(buf, tty);
-}
-
-/* invoked via ioctl(TIOCLINUX) and through set_selection */
-int mouse_reporting(void)
-{
-        return vc_cons[fg_console].d->vc_report_mouse;
-}
-
-/* console_sem is held */
-static void set_mode(struct vc_data *vc, int on_off)
-{
-        int i;
-
-        for (i = 0; i <= vc->vc_npar; i++)
-                if (vc->vc_ques) {
-                        switch(vc->vc_par[i]) { /* DEC private modes set/reset */
-                        case 1:                 /* Cursor keys send ^[Ox/^[[x */
-                                if (on_off)
-                                        set_kbd(vc, decckm);
-                                else
-                                        clr_kbd(vc, decckm);
-                                break;
-                        case 3: /* 80/132 mode switch unimplemented */
-                                vc->vc_deccolm = on_off;
-#if 0
-                                vc_resize(deccolm ? 132 : 80, vc->vc_rows);
-                                /* this alone does not suffice; some user mode
-                                   utility has to change the hardware regs */
-#endif
-                                break;
-                        case 5:                 /* Inverted screen on/off */
-                                if (vc->vc_decscnm != on_off) {
-                                        vc->vc_decscnm = on_off;
-                                        invert_screen(vc, 0, vc->vc_screenbuf_size, 0);
-                                        update_attr(vc);
-                                }
-                                break;
-                        case 6:                 /* Origin relative/absolute */
-                                vc->vc_decom = on_off;
-                                gotoxay(vc, 0, 0);
-                                break;
-                        case 7:                 /* Autowrap on/off */
-                                vc->vc_decawm = on_off;
-                                break;
-                        case 8:                 /* Autorepeat on/off */
-                                if (on_off)
-                                        set_kbd(vc, decarm);
-                                else
-                                        clr_kbd(vc, decarm);
-                                break;
-                        case 9:
-                                vc->vc_report_mouse = on_off ? 1 : 0;
-                                break;
-                        case 25:                /* Cursor on/off */
-                                vc->vc_deccm = on_off;
-                                break;
-                        case 1000:
-                                vc->vc_report_mouse = on_off ? 2 : 0;
-                                break;
-                        }
-                } else {
-                        switch(vc->vc_par[i]) { /* ANSI modes set/reset */
-                        case 3:                 /* Monitor (display ctrls) */
-                                vc->vc_disp_ctrl = on_off;
-                                break;
-                        case 4:                 /* Insert Mode on/off */
-                                vc->vc_decim = on_off;
-                                break;
-                        case 20:                /* Lf, Enter == CrLf/Lf */
-                                if (on_off)
-                                        set_kbd(vc, lnm);
-                                else
-                                        clr_kbd(vc, lnm);
-                                break;
-                        }
-                }
-}
-
-/* console_sem is held */
-static void setterm_command(struct vc_data *vc)
-{
-        switch(vc->vc_par[0]) {
-                case 1: /* set color for underline mode */
-                        if (vc->vc_can_do_color &&
-                                        vc->vc_par[1] < 16) {
-                                vc->vc_ulcolor = color_table[vc->vc_par[1]];
-                                if (vc->vc_underline)
-                                        update_attr(vc);
-                        }
-                        break;
-                case 2: /* set color for half intensity mode */
-                        if (vc->vc_can_do_color &&
-                                        vc->vc_par[1] < 16) {
-                                vc->vc_halfcolor = color_table[vc->vc_par[1]];
-                                if (vc->vc_intensity == 0)
-                                        update_attr(vc);
-                        }
-                        break;
-                case 8: /* store colors as defaults */
-                        vc->vc_def_color = vc->vc_attr;
-                        if (vc->vc_hi_font_mask == 0x100)
-                                vc->vc_def_color >>= 1;
-                        default_attr(vc);
-                        update_attr(vc);
-                        break;
-                case 9: /* set blanking interval */
-                        blankinterval = ((vc->vc_par[1] < 60) ? vc->vc_par[1] : 60) * 60;
-                        poke_blanked_console();
-                        break;
-                case 10: /* set bell frequency in Hz */
-                        if (vc->vc_npar >= 1)
-                                vc->vc_bell_pitch = vc->vc_par[1];
-                        else
-                                vc->vc_bell_pitch = DEFAULT_BELL_PITCH;
-                        break;
-                case 11: /* set bell duration in msec */
-                        if (vc->vc_npar >= 1)
-                                vc->vc_bell_duration = (vc->vc_par[1] < 2000) ?
-                                        vc->vc_par[1] * HZ / 1000 : 0;
-                        else
-                                vc->vc_bell_duration = DEFAULT_BELL_DURATION;
-                        break;
-                case 12: /* bring specified console to the front */
-                        if (vc->vc_par[1] >= 1 && vc_cons_allocated(vc->vc_par[1] - 1))
-                                set_console(vc->vc_par[1] - 1);
-                        break;
-                case 13: /* unblank the screen */
-                        poke_blanked_console();
-                        break;
-                case 14: /* set vesa powerdown interval */
-                        vesa_off_interval = ((vc->vc_par[1] < 60) ? vc->vc_par[1] : 60) * 60 * HZ;
-                        break;
-                case 15: /* activate the previous console */
-                        set_console(last_console);
-                        break;
-        }
-}
-
-/* console_sem is held */
-static void csi_at(struct vc_data *vc, unsigned int nr)
-{
-        if (nr > vc->vc_cols - vc->vc_x)
-                nr = vc->vc_cols - vc->vc_x;
-        else if (!nr)
-                nr = 1;
-        insert_char(vc, nr);
-}
-
-/* console_sem is held */
-static void csi_L(struct vc_data *vc, unsigned int nr)
-{
-        if (nr > vc->vc_rows - vc->vc_y)
-                nr = vc->vc_rows - vc->vc_y;
-        else if (!nr)
-                nr = 1;
-        scrdown(vc, vc->vc_y, vc->vc_bottom, nr);
-        vc->vc_need_wrap = 0;
-}
-
-/* console_sem is held */
-static void csi_P(struct vc_data *vc, unsigned int nr)
-{
-        if (nr > vc->vc_cols - vc->vc_x)
-                nr = vc->vc_cols - vc->vc_x;
-        else if (!nr)
-                nr = 1;
-        delete_char(vc, nr);
-}
-
-/* console_sem is held */
-static void csi_M(struct vc_data *vc, unsigned int nr)
-{
-        if (nr > vc->vc_rows - vc->vc_y)
-                nr = vc->vc_rows - vc->vc_y;
-        else if (!nr)
-                nr=1;
-        scrup(vc, vc->vc_y, vc->vc_bottom, nr);
-        vc->vc_need_wrap = 0;
-}
-
-/* console_sem is held (except via vc_init->reset_terminal */
-static void save_cur(struct vc_data *vc)
-{
-        vc->vc_saved_x          = vc->vc_x;
-        vc->vc_saved_y          = vc->vc_y;
-        vc->vc_s_intensity      = vc->vc_intensity;
-        vc->vc_s_italic         = vc->vc_italic;
-        vc->vc_s_underline      = vc->vc_underline;
-        vc->vc_s_blink          = vc->vc_blink;
-        vc->vc_s_reverse        = vc->vc_reverse;
-        vc->vc_s_charset        = vc->vc_charset;
-        vc->vc_s_color          = vc->vc_color;
-        vc->vc_saved_G0         = vc->vc_G0_charset;
-        vc->vc_saved_G1         = vc->vc_G1_charset;
-}
-
-/* console_sem is held */
-static void restore_cur(struct vc_data *vc)
-{
-        gotoxy(vc, vc->vc_saved_x, vc->vc_saved_y);
-        vc->vc_intensity        = vc->vc_s_intensity;
-        vc->vc_italic           = vc->vc_s_italic;
-        vc->vc_underline        = vc->vc_s_underline;
-        vc->vc_blink            = vc->vc_s_blink;
-        vc->vc_reverse          = vc->vc_s_reverse;
-        vc->vc_charset          = vc->vc_s_charset;
-        vc->vc_color            = vc->vc_s_color;
-        vc->vc_G0_charset       = vc->vc_saved_G0;
-        vc->vc_G1_charset       = vc->vc_saved_G1;
-        vc->vc_translate        = set_translate(vc->vc_charset ? vc->vc_G1_charset : vc->vc_G0_charset, vc);
-        update_attr(vc);
-        vc->vc_need_wrap = 0;
-}
-
-enum { ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey,
-        EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd,
-        ESpalette };
-
-/* console_sem is held (except via vc_init()) */
-static void reset_terminal(struct vc_data *vc, int do_clear)
-{
-        vc->vc_top              = 0;
-        vc->vc_bottom           = vc->vc_rows;
-        vc->vc_state            = ESnormal;
-        vc->vc_ques             = 0;
-        vc->vc_translate        = set_translate(LAT1_MAP, vc);
-        vc->vc_G0_charset       = LAT1_MAP;
-        vc->vc_G1_charset       = GRAF_MAP;
-        vc->vc_charset          = 0;
-        vc->vc_need_wrap        = 0;
-        vc->vc_report_mouse     = 0;
-        vc->vc_utf              = default_utf8;
-        vc->vc_utf_count        = 0;
-
-        vc->vc_disp_ctrl        = 0;
-        vc->vc_toggle_meta      = 0;
-
-        vc->vc_decscnm          = 0;
-        vc->vc_decom            = 0;
-        vc->vc_decawm           = 1;
-        vc->vc_deccm            = global_cursor_default;
-        vc->vc_decim            = 0;
-
-        set_kbd(vc, decarm);
-        clr_kbd(vc, decckm);
-        clr_kbd(vc, kbdapplic);
-        clr_kbd(vc, lnm);
-        kbd_table[vc->vc_num].lockstate = 0;
-        kbd_table[vc->vc_num].slockstate = 0;
-        kbd_table[vc->vc_num].ledmode = LED_SHOW_FLAGS;
-        kbd_table[vc->vc_num].ledflagstate = kbd_table[vc->vc_num].default_ledflagstate;
-        /* do not do set_leds here because this causes an endless tasklet loop
-           when the keyboard hasn't been initialized yet */
-
-        vc->vc_cursor_type = cur_default;
-        vc->vc_complement_mask = vc->vc_s_complement_mask;
-
-        default_attr(vc);
-        update_attr(vc);
-
-        vc->vc_tab_stop[0]      = 0x01010100;
-        vc->vc_tab_stop[1]      =
-        vc->vc_tab_stop[2]      =
-        vc->vc_tab_stop[3]      =
-        vc->vc_tab_stop[4]      =
-        vc->vc_tab_stop[5]      =
-        vc->vc_tab_stop[6]      =
-        vc->vc_tab_stop[7]      = 0x01010101;
-
-        vc->vc_bell_pitch = DEFAULT_BELL_PITCH;
-        vc->vc_bell_duration = DEFAULT_BELL_DURATION;
-
-        gotoxy(vc, 0, 0);
-        save_cur(vc);
-        if (do_clear)
-            csi_J(vc, 2);
-}
-
-/* console_sem is held */
-static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
-{
-        /*
-         *  Control characters can be used in the _middle_
-         *  of an escape sequence.
-         */
-        switch (c) {
-        case 0:
-                return;
-        case 7:
-                if (vc->vc_bell_duration)
-                        kd_mksound(vc->vc_bell_pitch, vc->vc_bell_duration);
-                return;
-        case 8:
-                bs(vc);
-                return;
-        case 9:
-                vc->vc_pos -= (vc->vc_x << 1);
-                while (vc->vc_x < vc->vc_cols - 1) {
-                        vc->vc_x++;
-                        if (vc->vc_tab_stop[vc->vc_x >> 5] & (1 << (vc->vc_x & 31)))
-                                break;
-                }
-                vc->vc_pos += (vc->vc_x << 1);
-                notify_write(vc, '\t');
-                return;
-        case 10: case 11: case 12:
-                lf(vc);
-                if (!is_kbd(vc, lnm))
-                        return;
-        case 13:
-                cr(vc);
-                return;
-        case 14:
-                vc->vc_charset = 1;
-                vc->vc_translate = set_translate(vc->vc_G1_charset, vc);
-                vc->vc_disp_ctrl = 1;
-                return;
-        case 15:
-                vc->vc_charset = 0;
-                vc->vc_translate = set_translate(vc->vc_G0_charset, vc);
-                vc->vc_disp_ctrl = 0;
-                return;
-        case 24: case 26:
-                vc->vc_state = ESnormal;
-                return;
-        case 27:
-                vc->vc_state = ESesc;
-                return;
-        case 127:
-                del(vc);
-                return;
-        case 128+27:
-                vc->vc_state = ESsquare;
-                return;
-        }
-        switch(vc->vc_state) {
-        case ESesc:
-                vc->vc_state = ESnormal;
-                switch (c) {
-                case '[':
-                        vc->vc_state = ESsquare;
-                        return;
-                case ']':
-                        vc->vc_state = ESnonstd;
-                        return;
-                case '%':
-                        vc->vc_state = ESpercent;
-                        return;
-                case 'E':
-                        cr(vc);
-                        lf(vc);
-                        return;
-                case 'M':
-                        ri(vc);
-                        return;
-                case 'D':
-                        lf(vc);
-                        return;
-                case 'H':
-                        vc->vc_tab_stop[vc->vc_x >> 5] |= (1 << (vc->vc_x & 31));
-                        return;
-                case 'Z':
-                        respond_ID(tty);
-                        return;
-                case '7':
-                        save_cur(vc);
-                        return;
-                case '8':
-                        restore_cur(vc);
-                        return;
-                case '(':
-                        vc->vc_state = ESsetG0;
-                        return;
-                case ')':
-                        vc->vc_state = ESsetG1;
-                        return;
-                case '#':
-                        vc->vc_state = EShash;
-                        return;
-                case 'c':
-                        reset_terminal(vc, 1);
-                        return;
-                case '>':  /* Numeric keypad */
-                        clr_kbd(vc, kbdapplic);
-                        return;
-                case '=':  /* Appl. keypad */
-                        set_kbd(vc, kbdapplic);
-                        return;
-                }
-                return;
-        case ESnonstd:
-                if (c=='P') {   /* palette escape sequence */
-                        for (vc->vc_npar = 0; vc->vc_npar < NPAR; vc->vc_npar++)
-                                vc->vc_par[vc->vc_npar] = 0;
-                        vc->vc_npar = 0;
-                        vc->vc_state = ESpalette;
-                        return;
-                } else if (c=='R') {   /* reset palette */
-                        reset_palette(vc);
-                        vc->vc_state = ESnormal;
-                } else
-                        vc->vc_state = ESnormal;
-                return;
-        case ESpalette:
-                if (isxdigit(c)) {
-                        vc->vc_par[vc->vc_npar++] = hex_to_bin(c);
-                        if (vc->vc_npar == 7) {
-                                int i = vc->vc_par[0] * 3, j = 1;
-                                vc->vc_palette[i] = 16 * vc->vc_par[j++];
-                                vc->vc_palette[i++] += vc->vc_par[j++];
-                                vc->vc_palette[i] = 16 * vc->vc_par[j++];
-                                vc->vc_palette[i++] += vc->vc_par[j++];
-                                vc->vc_palette[i] = 16 * vc->vc_par[j++];
-                                vc->vc_palette[i] += vc->vc_par[j];
-                                set_palette(vc);
-                                vc->vc_state = ESnormal;
-                        }
-                } else
-                        vc->vc_state = ESnormal;
-                return;
-        case ESsquare:
-                for (vc->vc_npar = 0; vc->vc_npar < NPAR; vc->vc_npar++)
-                        vc->vc_par[vc->vc_npar] = 0;
-                vc->vc_npar = 0;
-                vc->vc_state = ESgetpars;
-                if (c == '[') { /* Function key */
-                        vc->vc_state=ESfunckey;
-                        return;
-                }
-                vc->vc_ques = (c == '?');
-                if (vc->vc_ques)
-                        return;
-        case ESgetpars:
-                if (c == ';' && vc->vc_npar < NPAR - 1) {
-                        vc->vc_npar++;
-                        return;
-                } else if (c>='0' && c<='9') {
-                        vc->vc_par[vc->vc_npar] *= 10;
-                        vc->vc_par[vc->vc_npar] += c - '0';
-                        return;
-                } else
-                        vc->vc_state = ESgotpars;
-        case ESgotpars:
-                vc->vc_state = ESnormal;
-                switch(c) {
-                case 'h':
-                        set_mode(vc, 1);
-                        return;
-                case 'l':
-                        set_mode(vc, 0);
-                        return;
-                case 'c':
-                        if (vc->vc_ques) {
-                                if (vc->vc_par[0])
-                                        vc->vc_cursor_type = vc->vc_par[0] | (vc->vc_par[1] << 8) | (vc->vc_par[2] << 16);
-                                else
-                                        vc->vc_cursor_type = cur_default;
-                                return;
-                        }
-                        break;
-                case 'm':
-                        if (vc->vc_ques) {
-                                clear_selection();
-                                if (vc->vc_par[0])
-                                        vc->vc_complement_mask = vc->vc_par[0] << 8 | vc->vc_par[1];
-                                else
-                                        vc->vc_complement_mask = vc->vc_s_complement_mask;
-                                return;
-                        }
-                        break;
-                case 'n':
-                        if (!vc->vc_ques) {
-                                if (vc->vc_par[0] == 5)
-                                        status_report(tty);
-                                else if (vc->vc_par[0] == 6)
-                                        cursor_report(vc, tty);
-                        }
-                        return;
-                }
-                if (vc->vc_ques) {
-                        vc->vc_ques = 0;
-                        return;
-                }
-                switch(c) {
-                case 'G': case '`':
-                        if (vc->vc_par[0])
-                                vc->vc_par[0]--;
-                        gotoxy(vc, vc->vc_par[0], vc->vc_y);
-                        return;
-                case 'A':
-                        if (!vc->vc_par[0])
-                                vc->vc_par[0]++;
-                        gotoxy(vc, vc->vc_x, vc->vc_y - vc->vc_par[0]);
-                        return;
-                case 'B': case 'e':
-                        if (!vc->vc_par[0])
-                                vc->vc_par[0]++;
-                        gotoxy(vc, vc->vc_x, vc->vc_y + vc->vc_par[0]);
-                        return;
-                case 'C': case 'a':
-                        if (!vc->vc_par[0])
-                                vc->vc_par[0]++;
-                        gotoxy(vc, vc->vc_x + vc->vc_par[0], vc->vc_y);
-                        return;
-                case 'D':
-                        if (!vc->vc_par[0])
-                                vc->vc_par[0]++;
-                        gotoxy(vc, vc->vc_x - vc->vc_par[0], vc->vc_y);
-                        return;
-                case 'E':
-                        if (!vc->vc_par[0])
-                                vc->vc_par[0]++;
-                        gotoxy(vc, 0, vc->vc_y + vc->vc_par[0]);
-                        return;
-                case 'F':
-                        if (!vc->vc_par[0])
-                                vc->vc_par[0]++;
-                        gotoxy(vc, 0, vc->vc_y - vc->vc_par[0]);
-                        return;
-                case 'd':
-                        if (vc->vc_par[0])
-                                vc->vc_par[0]--;
-                        gotoxay(vc, vc->vc_x ,vc->vc_par[0]);
-                        return;
-                case 'H': case 'f':
-                        if (vc->vc_par[0])
-                                vc->vc_par[0]--;
-                        if (vc->vc_par[1])
-                                vc->vc_par[1]--;
-                        gotoxay(vc, vc->vc_par[1], vc->vc_par[0]);
-                        return;
-                case 'J':
-                        csi_J(vc, vc->vc_par[0]);
-                        return;
-                case 'K':
-                        csi_K(vc, vc->vc_par[0]);
-                        return;
-                case 'L':
-                        csi_L(vc, vc->vc_par[0]);
-                        return;
-                case 'M':
-                        csi_M(vc, vc->vc_par[0]);
-                        return;
-                case 'P':
-                        csi_P(vc, vc->vc_par[0]);
-                        return;
-                case 'c':
-                        if (!vc->vc_par[0])
-                                respond_ID(tty);
-                        return;
-                case 'g':
-                        if (!vc->vc_par[0])
-                                vc->vc_tab_stop[vc->vc_x >> 5] &= ~(1 << (vc->vc_x & 31));
-                        else if (vc->vc_par[0] == 3) {
-                                vc->vc_tab_stop[0] =
-                                        vc->vc_tab_stop[1] =
-                                        vc->vc_tab_stop[2] =
-                                        vc->vc_tab_stop[3] =
-                                        vc->vc_tab_stop[4] =
-                                        vc->vc_tab_stop[5] =
-                                        vc->vc_tab_stop[6] =
-                                        vc->vc_tab_stop[7] = 0;
-                        }
-                        return;
-                case 'm':
-                        csi_m(vc);
-                        return;
-                case 'q': /* DECLL - but only 3 leds */
-                        /* map 0,1,2,3 to 0,1,2,4 */
-                        if (vc->vc_par[0] < 4)
-                                setledstate(kbd_table + vc->vc_num,
-                                            (vc->vc_par[0] < 3) ? vc->vc_par[0] : 4);
-                        return;
-                case 'r':
-                        if (!vc->vc_par[0])
-                                vc->vc_par[0]++;
-                        if (!vc->vc_par[1])
-                                vc->vc_par[1] = vc->vc_rows;
-                        /* Minimum allowed region is 2 lines */
-                        if (vc->vc_par[0] < vc->vc_par[1] &&
-                            vc->vc_par[1] <= vc->vc_rows) {
-                                vc->vc_top = vc->vc_par[0] - 1;
-                                vc->vc_bottom = vc->vc_par[1];
-                                gotoxay(vc, 0, 0);
-                        }
-                        return;
-                case 's':
-                        save_cur(vc);
-                        return;
-                case 'u':
-                        restore_cur(vc);
-                        return;
-                case 'X':
-                        csi_X(vc, vc->vc_par[0]);
-                        return;
-                case '@':
-                        csi_at(vc, vc->vc_par[0]);
-                        return;
-                case ']': /* setterm functions */
-                        setterm_command(vc);
-                        return;
-                }
-                return;
-        case ESpercent:
-                vc->vc_state = ESnormal;
-                switch (c) {
-                case '@':  /* defined in ISO 2022 */
-                        vc->vc_utf = 0;
-                        return;
-                case 'G':  /* prelim official escape code */
-                case '8':  /* retained for compatibility */
-                        vc->vc_utf = 1;
-                        return;
-                }
-                return;
-        case ESfunckey:
-                vc->vc_state = ESnormal;
-                return;
-        case EShash:
-                vc->vc_state = ESnormal;
-                if (c == '8') {
-                        /* DEC screen alignment test. kludge :-) */
-                        vc->vc_video_erase_char =
-                                (vc->vc_video_erase_char & 0xff00) | 'E';
-                        csi_J(vc, 2);
-                        vc->vc_video_erase_char =
-                                (vc->vc_video_erase_char & 0xff00) | ' ';
-                        do_update_region(vc, vc->vc_origin, vc->vc_screenbuf_size / 2);
-                }
-                return;
-        case ESsetG0:
-                if (c == '0')
-                        vc->vc_G0_charset = GRAF_MAP;
-                else if (c == 'B')
-                        vc->vc_G0_charset = LAT1_MAP;
-                else if (c == 'U')
-                        vc->vc_G0_charset = IBMPC_MAP;
-                else if (c == 'K')
-                        vc->vc_G0_charset = USER_MAP;
-                if (vc->vc_charset == 0)
-                        vc->vc_translate = set_translate(vc->vc_G0_charset, vc);
-                vc->vc_state = ESnormal;
-                return;
-        case ESsetG1:
-                if (c == '0')
-                        vc->vc_G1_charset = GRAF_MAP;
-                else if (c == 'B')
-                        vc->vc_G1_charset = LAT1_MAP;
-                else if (c == 'U')
-                        vc->vc_G1_charset = IBMPC_MAP;
-                else if (c == 'K')
-                        vc->vc_G1_charset = USER_MAP;
-                if (vc->vc_charset == 1)
-                        vc->vc_translate = set_translate(vc->vc_G1_charset, vc);
-                vc->vc_state = ESnormal;
-                return;
-        default:
-                vc->vc_state = ESnormal;
-        }
-}
-
-/* This is a temporary buffer used to prepare a tty console write
- * so that we can easily avoid touching user space while holding the
- * console spinlock.  It is allocated in con_init and is shared by
- * this code and the vc_screen read/write tty calls.
- *
- * We have to allocate this statically in the kernel data section
- * since console_init (and thus con_init) are called before any
- * kernel memory allocation is available.
- */
-char con_buf[CON_BUF_SIZE];
-DEFINE_MUTEX(con_buf_mtx);
-
-/* is_double_width() is based on the wcwidth() implementation by
- * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
- * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
- */
-struct interval {
-        uint32_t first;
-        uint32_t last;
-};
-
-static int bisearch(uint32_t ucs, const struct interval *table, int max)
-{
-        int min = 0;
-        int mid;
-
-        if (ucs < table[0].first || ucs > table[max].last)
-                return 0;
-        while (max >= min) {
-                mid = (min + max) / 2;
-                if (ucs > table[mid].last)
-                        min = mid + 1;
-                else if (ucs < table[mid].first)
-                        max = mid - 1;
-                else
-                        return 1;
-        }
-        return 0;
-}
-
-static int is_double_width(uint32_t ucs)
-{
-        static const struct interval double_width[] = {
-                { 0x1100, 0x115F }, { 0x2329, 0x232A }, { 0x2E80, 0x303E },
-                { 0x3040, 0xA4CF }, { 0xAC00, 0xD7A3 }, { 0xF900, 0xFAFF },
-                { 0xFE10, 0xFE19 }, { 0xFE30, 0xFE6F }, { 0xFF00, 0xFF60 },
-                { 0xFFE0, 0xFFE6 }, { 0x20000, 0x2FFFD }, { 0x30000, 0x3FFFD }
-        };
-        return bisearch(ucs, double_width, ARRAY_SIZE(double_width) - 1);
-}
-
-/* acquires console_sem */
-static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int count)
-{
-#ifdef VT_BUF_VRAM_ONLY
-#define FLUSH do { } while(0);
-#else
-#define FLUSH if (draw_x >= 0) { \
-        vc->vc_sw->con_putcs(vc, (u16 *)draw_from, (u16 *)draw_to - (u16 *)draw_from, vc->vc_y, draw_x); \
-        draw_x = -1; \
-        }
-#endif
-
-        int c, tc, ok, n = 0, draw_x = -1;
-        unsigned int currcons;
-        unsigned long draw_from = 0, draw_to = 0;
-        struct vc_data *vc;
-        unsigned char vc_attr;
-        struct vt_notifier_param param;
-        uint8_t rescan;
-        uint8_t inverse;
-        uint8_t width;
-        u16 himask, charmask;
-
-        if (in_interrupt())
-                return count;
-
-        might_sleep();
-
-        acquire_console_sem();
-        vc = tty->driver_data;
-        if (vc == NULL) {
-                printk(KERN_ERR "vt: argh, driver_data is NULL !\n");
-                release_console_sem();
-                return 0;
-        }
-
-        currcons = vc->vc_num;
-        if (!vc_cons_allocated(currcons)) {
-            /* could this happen? */
-                printk_once("con_write: tty %d not allocated\n", currcons+1);
-            release_console_sem();
-            return 0;
-        }
-
-        himask = vc->vc_hi_font_mask;
-        charmask = himask ? 0x1ff : 0xff;
-
-        /* undraw cursor first */
-        if (IS_FG(vc))
-                hide_cursor(vc);
-
-        param.vc = vc;
-
-        while (!tty->stopped && count) {
-                int orig = *buf;
-                c = orig;
-                buf++;
-                n++;
-                count--;
-                rescan = 0;
-                inverse = 0;
-                width = 1;
-
-                /* Do no translation at all in control states */
-                if (vc->vc_state != ESnormal) {
-                        tc = c;
-                } else if (vc->vc_utf && !vc->vc_disp_ctrl) {
-                    /* Combine UTF-8 into Unicode in vc_utf_char.
-                     * vc_utf_count is the number of continuation bytes still
-                     * expected to arrive.
-                     * vc_npar is the number of continuation bytes arrived so
-                     * far
-                     */
-rescan_last_byte:
-                    if ((c & 0xc0) == 0x80) {
-                        /* Continuation byte received */
-                        static const uint32_t utf8_length_changes[] = { 0x0000007f, 0x000007ff, 0x0000ffff, 0x001fffff, 0x03ffffff, 0x7fffffff };
-                        if (vc->vc_utf_count) {
-                            vc->vc_utf_char = (vc->vc_utf_char << 6) | (c & 0x3f);
-                            vc->vc_npar++;
-                            if (--vc->vc_utf_count) {
-                                /* Still need some bytes */
-                                continue;
-                            }
-                            /* Got a whole character */
-                            c = vc->vc_utf_char;
-                            /* Reject overlong sequences */
-                            if (c <= utf8_length_changes[vc->vc_npar - 1] ||
-                                        c > utf8_length_changes[vc->vc_npar])
-                                c = 0xfffd;
-                        } else {
-                            /* Unexpected continuation byte */
-                            vc->vc_utf_count = 0;
-                            c = 0xfffd;
-                        }
-                    } else {
-                        /* Single ASCII byte or first byte of a sequence received */
-                        if (vc->vc_utf_count) {
-                            /* Continuation byte expected */
-                            rescan = 1;
-                            vc->vc_utf_count = 0;
-                            c = 0xfffd;
-                        } else if (c > 0x7f) {
-                            /* First byte of a multibyte sequence received */
-                            vc->vc_npar = 0;
-                            if ((c & 0xe0) == 0xc0) {
-                                vc->vc_utf_count = 1;
-                                vc->vc_utf_char = (c & 0x1f);
-                            } else if ((c & 0xf0) == 0xe0) {
-                                vc->vc_utf_count = 2;
-                                vc->vc_utf_char = (c & 0x0f);
-                            } else if ((c & 0xf8) == 0xf0) {
-                                vc->vc_utf_count = 3;
-                                vc->vc_utf_char = (c & 0x07);
-                            } else if ((c & 0xfc) == 0xf8) {
-                                vc->vc_utf_count = 4;
-                                vc->vc_utf_char = (c & 0x03);
-                            } else if ((c & 0xfe) == 0xfc) {
-                                vc->vc_utf_count = 5;
-                                vc->vc_utf_char = (c & 0x01);
-                            } else {
-                                /* 254 and 255 are invalid */
-                                c = 0xfffd;
-                            }
-                            if (vc->vc_utf_count) {
-                                /* Still need some bytes */
-                                continue;
-                            }
-                        }
-                        /* Nothing to do if an ASCII byte was received */
-                    }
-                    /* End of UTF-8 decoding. */
-                    /* c is the received character, or U+FFFD for invalid sequences. */
-                    /* Replace invalid Unicode code points with U+FFFD too */
-                    if ((c >= 0xd800 && c <= 0xdfff) || c == 0xfffe || c == 0xffff)
-                        c = 0xfffd;
-                    tc = c;
-                } else {        /* no utf or alternate charset mode */
-                    tc = vc_translate(vc, c);
-                }
-
-                param.c = tc;
-                if (atomic_notifier_call_chain(&vt_notifier_list, VT_PREWRITE,
-                                        &param) == NOTIFY_STOP)
-                        continue;
-
-                /* If the original code was a control character we
-                 * only allow a glyph to be displayed if the code is
-                 * not normally used (such as for cursor movement) or
-                 * if the disp_ctrl mode has been explicitly enabled.
-                 * Certain characters (as given by the CTRL_ALWAYS
-                 * bitmap) are always displayed as control characters,
-                 * as the console would be pretty useless without
-                 * them; to display an arbitrary font position use the
-                 * direct-to-font zone in UTF-8 mode.
-                 */
-                ok = tc && (c >= 32 ||
-                            !(vc->vc_disp_ctrl ? (CTRL_ALWAYS >> c) & 1 :
-                                  vc->vc_utf || ((CTRL_ACTION >> c) & 1)))
-                        && (c != 127 || vc->vc_disp_ctrl)
-                        && (c != 128+27);
-
-                if (vc->vc_state == ESnormal && ok) {
-                        if (vc->vc_utf && !vc->vc_disp_ctrl) {
-                                if (is_double_width(c))
-                                        width = 2;
-                        }
-                        /* Now try to find out how to display it */
-                        tc = conv_uni_to_pc(vc, tc);
-                        if (tc & ~charmask) {
-                                if (tc == -1 || tc == -2) {
-                                    continue; /* nothing to display */
-                                }
-                                /* Glyph not found */
-                                if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) {
-                                    /* In legacy mode use the glyph we get by a 1:1 mapping.
-                                       This would make absolutely no sense with Unicode in mind,
-                                       but do this for ASCII characters since a font may lack
-                                       Unicode mapping info and we don't want to end up with
-                                       having question marks only. */
-                                    tc = c;
-                                } else {
-                                    /* Display U+FFFD. If it's not found, display an inverse question mark. */
-                                    tc = conv_uni_to_pc(vc, 0xfffd);
-                                    if (tc < 0) {
-                                        inverse = 1;
-                                        tc = conv_uni_to_pc(vc, '?');
-                                        if (tc < 0) tc = '?';
-                                    }
-                                }
-                        }
-
-                        if (!inverse) {
-                                vc_attr = vc->vc_attr;
-                        } else {
-                                /* invert vc_attr */
-                                if (!vc->vc_can_do_color) {
-                                        vc_attr = (vc->vc_attr) ^ 0x08;
-                                } else if (vc->vc_hi_font_mask == 0x100) {
-                                        vc_attr = ((vc->vc_attr) & 0x11) | (((vc->vc_attr) & 0xe0) >> 4) | (((vc->vc_attr) & 0x0e) << 4);
-                                } else {
-                                        vc_attr = ((vc->vc_attr) & 0x88) | (((vc->vc_attr) & 0x70) >> 4) | (((vc->vc_attr) & 0x07) << 4);
-                                }
-                                FLUSH
-                        }
-
-                        while (1) {
-                                if (vc->vc_need_wrap || vc->vc_decim)
-                                        FLUSH
-                                if (vc->vc_need_wrap) {
-                                        cr(vc);
-                                        lf(vc);
-                                }
-                                if (vc->vc_decim)
-                                        insert_char(vc, 1);
-                                scr_writew(himask ?
-                                             ((vc_attr << 8) & ~himask) + ((tc & 0x100) ? himask : 0) + (tc & 0xff) :
-                                             (vc_attr << 8) + tc,
-                                           (u16 *) vc->vc_pos);
-                                if (DO_UPDATE(vc) && draw_x < 0) {
-                                        draw_x = vc->vc_x;
-                                        draw_from = vc->vc_pos;
-                                }
-                                if (vc->vc_x == vc->vc_cols - 1) {
-                                        vc->vc_need_wrap = vc->vc_decawm;
-                                        draw_to = vc->vc_pos + 2;
-                                } else {
-                                        vc->vc_x++;
-                                        draw_to = (vc->vc_pos += 2);
-                                }
-
-                                if (!--width) break;
-
-                                tc = conv_uni_to_pc(vc, ' '); /* A space is printed in the second column */
-                                if (tc < 0) tc = ' ';
-                        }
-                        notify_write(vc, c);
-
-                        if (inverse) {
-                                FLUSH
-                        }
-
-                        if (rescan) {
-                                rescan = 0;
-                                inverse = 0;
-                                width = 1;
-                                c = orig;
-                                goto rescan_last_byte;
-                        }
-                        continue;
-                }
-                FLUSH
-                do_con_trol(tty, vc, orig);
-        }
-        FLUSH
-        console_conditional_schedule();
-        release_console_sem();
-        notify_update(vc);
-        return n;
-#undef FLUSH
-}
-
-/*
- * This is the console switching callback.
- *
- * Doing console switching in a process context allows
- * us to do the switches asynchronously (needed when we want
- * to switch due to a keyboard interrupt).  Synchronization
- * with other console code and prevention of re-entrancy is
- * ensured with console_sem.
- */
-static void console_callback(struct work_struct *ignored)
-{
-        acquire_console_sem();
-
-        if (want_console >= 0) {
-                if (want_console != fg_console &&
-                    vc_cons_allocated(want_console)) {
-                        hide_cursor(vc_cons[fg_console].d);
-                        change_console(vc_cons[want_console].d);
-                        /* we only changed when the console had already
-                           been allocated - a new console is not created
-                           in an interrupt routine */
-                }
-                want_console = -1;
-        }
-        if (do_poke_blanked_console) { /* do not unblank for a LED change */
-                do_poke_blanked_console = 0;
-                poke_blanked_console();
-        }
-        if (scrollback_delta) {
-                struct vc_data *vc = vc_cons[fg_console].d;
-                clear_selection();
-                if (vc->vc_mode == KD_TEXT)
-                        vc->vc_sw->con_scrolldelta(vc, scrollback_delta);
-                scrollback_delta = 0;
-        }
-        if (blank_timer_expired) {
-                do_blank_screen(0);
-                blank_timer_expired = 0;
-        }
-        notify_update(vc_cons[fg_console].d);
-
-        release_console_sem();
-}
-
-int set_console(int nr)
-{
-        struct vc_data *vc = vc_cons[fg_console].d;
-
-        if (!vc_cons_allocated(nr) || vt_dont_switch ||
-                (vc->vt_mode.mode == VT_AUTO && vc->vc_mode == KD_GRAPHICS)) {
-
-                /*
-                 * Console switch will fail in console_callback() or
-                 * change_console() so there is no point scheduling
-                 * the callback
-                 *
-                 * Existing set_console() users don't check the return
-                 * value so this shouldn't break anything
-                 */
-                return -EINVAL;
-        }
-
-        want_console = nr;
-        schedule_console_callback();
-
-        return 0;
-}
-
-struct tty_driver *console_driver;
-
-#ifdef CONFIG_VT_CONSOLE
-
-/**
- * vt_kmsg_redirect() - Sets/gets the kernel message console
- * @new:        The new virtual terminal number or -1 if the console should stay
- *              unchanged
- *
- * By default, the kernel messages are always printed on the current virtual
- * console. However, the user may modify that default with the
- * TIOCL_SETKMSGREDIRECT ioctl call.
- *
- * This function sets the kernel message console to be @new. It returns the old
- * virtual console number. The virtual terminal number 0 (both as parameter and
- * return value) means no redirection (i.e. always printed on the currently
- * active console).
- *
- * The parameter -1 means that only the current console is returned, but the
- * value is not modified. You may use the macro vt_get_kmsg_redirect() in that
- * case to make the code more understandable.
- *
- * When the kernel is compiled without CONFIG_VT_CONSOLE, this function ignores
- * the parameter and always returns 0.
- */
-int vt_kmsg_redirect(int new)
-{
-        static int kmsg_con;
-
-        if (new != -1)
-                return xchg(&kmsg_con, new);
-        else
-                return kmsg_con;
-}
-
-/*
- *      Console on virtual terminal
- *
- * The console must be locked when we get here.
- */
-
-static void vt_console_print(struct console *co, const char *b, unsigned count)
-{
-        struct vc_data *vc = vc_cons[fg_console].d;
-        unsigned char c;
-        static DEFINE_SPINLOCK(printing_lock);
-        const ushort *start;
-        ushort cnt = 0;
-        ushort myx;
-        int kmsg_console;
-
-        /* console busy or not yet initialized */
-        if (!printable)
-                return;
-        if (!spin_trylock(&printing_lock))
-                return;
-
-        kmsg_console = vt_get_kmsg_redirect();
-        if (kmsg_console && vc_cons_allocated(kmsg_console - 1))
-                vc = vc_cons[kmsg_console - 1].d;
-
-        /* read `x' only after setting currcons properly (otherwise
-           the `x' macro will read the x of the foreground console). */
-        myx = vc->vc_x;
-
-        if (!vc_cons_allocated(fg_console)) {
-                /* impossible */
-                /* printk("vt_console_print: tty %d not allocated ??\n", currcons+1); */
-                goto quit;
-        }
-
-        if (vc->vc_mode != KD_TEXT && !vt_force_oops_output(vc))
-                goto quit;
-
-        /* undraw cursor first */
-        if (IS_FG(vc))
-                hide_cursor(vc);
-
-        start = (ushort *)vc->vc_pos;
-
-        /* Contrived structure to try to emulate original need_wrap behaviour
-         * Problems caused when we have need_wrap set on '\n' character */
-        while (count--) {
-                c = *b++;
-                if (c == 10 || c == 13 || c == 8 || vc->vc_need_wrap) {
-                        if (cnt > 0) {
-                                if (CON_IS_VISIBLE(vc))
-                                        vc->vc_sw->con_putcs(vc, start, cnt, vc->vc_y, vc->vc_x);
-                                vc->vc_x += cnt;
-                                if (vc->vc_need_wrap)
-                                        vc->vc_x--;
-                                cnt = 0;
-                        }
-                        if (c == 8) {           /* backspace */
-                                bs(vc);
-                                start = (ushort *)vc->vc_pos;
-                                myx = vc->vc_x;
-                                continue;
-                        }
-                        if (c != 13)
-                                lf(vc);
-                        cr(vc);
-                        start = (ushort *)vc->vc_pos;
-                        myx = vc->vc_x;
-                        if (c == 10 || c == 13)
-                                continue;
-                }
-                scr_writew((vc->vc_attr << 8) + c, (unsigned short *)vc->vc_pos);
-                notify_write(vc, c);
-                cnt++;
-                if (myx == vc->vc_cols - 1) {
-                        vc->vc_need_wrap = 1;
-                        continue;
-                }
-                vc->vc_pos += 2;
-                myx++;
-        }
-        if (cnt > 0) {
-                if (CON_IS_VISIBLE(vc))
-                        vc->vc_sw->con_putcs(vc, start, cnt, vc->vc_y, vc->vc_x);
-                vc->vc_x += cnt;
-                if (vc->vc_x == vc->vc_cols) {
-                        vc->vc_x--;
-                        vc->vc_need_wrap = 1;
-                }
-        }
-        set_cursor(vc);
-        notify_update(vc);
-
-quit:
-        spin_unlock(&printing_lock);
-}
-
-static struct tty_driver *vt_console_device(struct console *c, int *index)
-{
-        *index = c->index ? c->index-1 : fg_console;
-        return console_driver;
-}
-
-static struct console vt_console_driver = {
-        .name           = "tty",
-        .write          = vt_console_print,
-        .device         = vt_console_device,
-        .unblank        = unblank_screen,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-};
-#endif
-
-/*
- *      Handling of Linux-specific VC ioctls
- */
-
-/*
- * Generally a bit racy with respect to console_sem().
- *
- * There are some functions which don't need it.
- *
- * There are some functions which can sleep for arbitrary periods
- * (paste_selection) but we don't need the lock there anyway.
- *
- * set_selection has locking, and definitely needs it
- */
-
-int tioclinux(struct tty_struct *tty, unsigned long arg)
-{
-        char type, data;
-        char __user *p = (char __user *)arg;
-        int lines;
-        int ret;
-
-        if (current->signal->tty != tty && !capable(CAP_SYS_ADMIN))
-                return -EPERM;
-        if (get_user(type, p))
-                return -EFAULT;
-        ret = 0;
-
-        switch (type)
-        {
-                case TIOCL_SETSEL:
-                        acquire_console_sem();
-                        ret = set_selection((struct tiocl_selection __user *)(p+1), tty);
-                        release_console_sem();
-                        break;
-                case TIOCL_PASTESEL:
-                        ret = paste_selection(tty);
-                        break;
-                case TIOCL_UNBLANKSCREEN:
-                        acquire_console_sem();
-                        unblank_screen();
-                        release_console_sem();
-                        break;
-                case TIOCL_SELLOADLUT:
-                        ret = sel_loadlut(p);
-                        break;
-                case TIOCL_GETSHIFTSTATE:
-
-        /*
-         * Make it possible to react to Shift+Mousebutton.
-         * Note that 'shift_state' is an undocumented
-         * kernel-internal variable; programs not closely
-         * related to the kernel should not use this.
-         */
-                        data = shift_state;
-                        ret = __put_user(data, p);
-                        break;
-                case TIOCL_GETMOUSEREPORTING:
-                        data = mouse_reporting();
-                        ret = __put_user(data, p);
-                        break;
-                case TIOCL_SETVESABLANK:
-                        ret = set_vesa_blanking(p);
-                        break;
-                case TIOCL_GETKMSGREDIRECT:
-                        data = vt_get_kmsg_redirect();
-                        ret = __put_user(data, p);
-                        break;
-                case TIOCL_SETKMSGREDIRECT:
-                        if (!capable(CAP_SYS_ADMIN)) {
-                                ret = -EPERM;
-                        } else {
-                                if (get_user(data, p+1))
-                                        ret = -EFAULT;
-                                else
-                                        vt_kmsg_redirect(data);
-                        }
-                        break;
-                case TIOCL_GETFGCONSOLE:
-                        ret = fg_console;
-                        break;
-                case TIOCL_SCROLLCONSOLE:
-                        if (get_user(lines, (s32 __user *)(p+4))) {
-                                ret = -EFAULT;
-                        } else {
-                                scrollfront(vc_cons[fg_console].d, lines);
-                                ret = 0;
-                        }
-                        break;
-                case TIOCL_BLANKSCREEN: /* until explicitly unblanked, not only poked */
-                        acquire_console_sem();
-                        ignore_poke = 1;
-                        do_blank_screen(0);
-                        release_console_sem();
-                        break;
-                case TIOCL_BLANKEDSCREEN:
-                        ret = console_blanked;
-                        break;
-                default:
-                        ret = -EINVAL;
-                        break;
-        }
-        return ret;
-}
-
-/*
- * /dev/ttyN handling
- */
-
-static int con_write(struct tty_struct *tty, const unsigned char *buf, int count)
-{
-        int     retval;
-
-        retval = do_con_write(tty, buf, count);
-        con_flush_chars(tty);
-
-        return retval;
-}
-
-static int con_put_char(struct tty_struct *tty, unsigned char ch)
-{
-        if (in_interrupt())
-                return 0;       /* n_r3964 calls put_char() from interrupt context */
-        return do_con_write(tty, &ch, 1);
-}
-
-static int con_write_room(struct tty_struct *tty)
-{
-        if (tty->stopped)
-                return 0;
-        return 32768;           /* No limit, really; we're not buffering */
-}
-
-static int con_chars_in_buffer(struct tty_struct *tty)
-{
-        return 0;               /* we're not buffering */
-}
-
-/*
- * con_throttle and con_unthrottle are only used for
- * paste_selection(), which has to stuff in a large number of
- * characters...
- */
-static void con_throttle(struct tty_struct *tty)
-{
-}
-
-static void con_unthrottle(struct tty_struct *tty)
-{
-        struct vc_data *vc = tty->driver_data;
-
-        wake_up_interruptible(&vc->paste_wait);
-}
-
-/*
- * Turn the Scroll-Lock LED on when the tty is stopped
- */
-static void con_stop(struct tty_struct *tty)
-{
-        int console_num;
-        if (!tty)
-                return;
-        console_num = tty->index;
-        if (!vc_cons_allocated(console_num))
-                return;
-        set_vc_kbd_led(kbd_table + console_num, VC_SCROLLOCK);
-        set_leds();
-}
-
-/*
- * Turn the Scroll-Lock LED off when the console is started
- */
-static void con_start(struct tty_struct *tty)
-{
-        int console_num;
-        if (!tty)
-                return;
-        console_num = tty->index;
-        if (!vc_cons_allocated(console_num))
-                return;
-        clr_vc_kbd_led(kbd_table + console_num, VC_SCROLLOCK);
-        set_leds();
-}
-
-static void con_flush_chars(struct tty_struct *tty)
-{
-        struct vc_data *vc;
-
-        if (in_interrupt())     /* from flush_to_ldisc */
-                return;
-
-        /* if we race with con_close(), vt may be null */
-        acquire_console_sem();
-        vc = tty->driver_data;
-        if (vc)
-                set_cursor(vc);
-        release_console_sem();
-}
-
-/*
- * Allocate the console screen memory.
- */
-static int con_open(struct tty_struct *tty, struct file *filp)
-{
-        unsigned int currcons = tty->index;
-        int ret = 0;
-
-        acquire_console_sem();
-        if (tty->driver_data == NULL) {
-                ret = vc_allocate(currcons);
-                if (ret == 0) {
-                        struct vc_data *vc = vc_cons[currcons].d;
-
-                        /* Still being freed */
-                        if (vc->port.tty) {
-                                release_console_sem();
-                                return -ERESTARTSYS;
-                        }
-                        tty->driver_data = vc;
-                        vc->port.tty = tty;
-
-                        if (!tty->winsize.ws_row && !tty->winsize.ws_col) {
-                                tty->winsize.ws_row = vc_cons[currcons].d->vc_rows;
-                                tty->winsize.ws_col = vc_cons[currcons].d->vc_cols;
-                        }
-                        if (vc->vc_utf)
-                                tty->termios->c_iflag |= IUTF8;
-                        else
-                                tty->termios->c_iflag &= ~IUTF8;
-                        release_console_sem();
-                        return ret;
-                }
-        }
-        release_console_sem();
-        return ret;
-}
-
-static void con_close(struct tty_struct *tty, struct file *filp)
-{
-        /* Nothing to do - we defer to shutdown */
-}
-
-static void con_shutdown(struct tty_struct *tty)
-{
-        struct vc_data *vc = tty->driver_data;
-        BUG_ON(vc == NULL);
-        acquire_console_sem();
-        vc->port.tty = NULL;
-        release_console_sem();
-        tty_shutdown(tty);
-}
-
-static int default_italic_color    = 2; // green (ASCII)
-static int default_underline_color = 3; // cyan (ASCII)
-module_param_named(italic, default_italic_color, int, S_IRUGO | S_IWUSR);
-module_param_named(underline, default_underline_color, int, S_IRUGO | S_IWUSR);
-
-static void vc_init(struct vc_data *vc, unsigned int rows,
-                    unsigned int cols, int do_clear)
-{
-        int j, k ;
-
-        vc->vc_cols = cols;
-        vc->vc_rows = rows;
-        vc->vc_size_row = cols << 1;
-        vc->vc_screenbuf_size = vc->vc_rows * vc->vc_size_row;
-
-        set_origin(vc);
-        vc->vc_pos = vc->vc_origin;
-        reset_vc(vc);
-        for (j=k=0; j<16; j++) {
-                vc->vc_palette[k++] = default_red[j] ;
-                vc->vc_palette[k++] = default_grn[j] ;
-                vc->vc_palette[k++] = default_blu[j] ;
-        }
-        vc->vc_def_color       = 0x07;   /* white */
-        vc->vc_ulcolor         = default_underline_color;
-        vc->vc_itcolor         = default_italic_color;
-        vc->vc_halfcolor       = 0x08;   /* grey */
-        init_waitqueue_head(&vc->paste_wait);
-        reset_terminal(vc, do_clear);
-}
-
-/*
- * This routine initializes console interrupts, and does nothing
- * else. If you want the screen to clear, call tty_write with
- * the appropriate escape-sequence.
- */
-
-static int __init con_init(void)
-{
-        const char *display_desc = NULL;
-        struct vc_data *vc;
-        unsigned int currcons = 0, i;
-
-        acquire_console_sem();
-
-        if (conswitchp)
-                display_desc = conswitchp->con_startup();
-        if (!display_desc) {
-                fg_console = 0;
-                release_console_sem();
-                return 0;
-        }
-
-        for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
-                struct con_driver *con_driver = &registered_con_driver[i];
-
-                if (con_driver->con == NULL) {
-                        con_driver->con = conswitchp;
-                        con_driver->desc = display_desc;
-                        con_driver->flag = CON_DRIVER_FLAG_INIT;
-                        con_driver->first = 0;
-                        con_driver->last = MAX_NR_CONSOLES - 1;
-                        break;
-                }
-        }
-
-        for (i = 0; i < MAX_NR_CONSOLES; i++)
-                con_driver_map[i] = conswitchp;
-
-        if (blankinterval) {
-                blank_state = blank_normal_wait;
-                mod_timer(&console_timer, jiffies + (blankinterval * HZ));
-        }
-
-        for (currcons = 0; currcons < MIN_NR_CONSOLES; currcons++) {
-                vc_cons[currcons].d = vc = kzalloc(sizeof(struct vc_data), GFP_NOWAIT);
-                INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK);
-                tty_port_init(&vc->port);
-                visual_init(vc, currcons, 1);
-                vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_NOWAIT);
-                vc_init(vc, vc->vc_rows, vc->vc_cols,
-                        currcons || !vc->vc_sw->con_save_screen);
-        }
-        currcons = fg_console = 0;
-        master_display_fg = vc = vc_cons[currcons].d;
-        set_origin(vc);
-        save_screen(vc);
-        gotoxy(vc, vc->vc_x, vc->vc_y);
-        csi_J(vc, 0);
-        update_screen(vc);
-        printk("Console: %s %s %dx%d",
-                vc->vc_can_do_color ? "colour" : "mono",
-                display_desc, vc->vc_cols, vc->vc_rows);
-        printable = 1;
-        printk("\n");
-
-        release_console_sem();
-
-#ifdef CONFIG_VT_CONSOLE
-        register_console(&vt_console_driver);
-#endif
-        return 0;
-}
-console_initcall(con_init);
-
-static const struct tty_operations con_ops = {
-        .open = con_open,
-        .close = con_close,
-        .write = con_write,
-        .write_room = con_write_room,
-        .put_char = con_put_char,
-        .flush_chars = con_flush_chars,
-        .chars_in_buffer = con_chars_in_buffer,
-        .ioctl = vt_ioctl,
-#ifdef CONFIG_COMPAT
-        .compat_ioctl = vt_compat_ioctl,
-#endif
-        .stop = con_stop,
-        .start = con_start,
-        .throttle = con_throttle,
-        .unthrottle = con_unthrottle,
-        .resize = vt_resize,
-        .shutdown = con_shutdown
-};
-
-static struct cdev vc0_cdev;
-
-int __init vty_init(const struct file_operations *console_fops)
-{
-        cdev_init(&vc0_cdev, console_fops);
-        if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
-            register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
-                panic("Couldn't register /dev/tty0 driver\n");
-        device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
-
-        vcs_init();
-
-        console_driver = alloc_tty_driver(MAX_NR_CONSOLES);
-        if (!console_driver)
-                panic("Couldn't allocate console driver\n");
-        console_driver->owner = THIS_MODULE;
-        console_driver->name = "tty";
-        console_driver->name_base = 1;
-        console_driver->major = TTY_MAJOR;
-        console_driver->minor_start = 1;
-        console_driver->type = TTY_DRIVER_TYPE_CONSOLE;
-        console_driver->init_termios = tty_std_termios;
-        if (default_utf8)
-                console_driver->init_termios.c_iflag |= IUTF8;
-        console_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_RESET_TERMIOS;
-        tty_set_operations(console_driver, &con_ops);
-        if (tty_register_driver(console_driver))
-                panic("Couldn't register console driver\n");
-        kbd_init();
-        console_map_init();
-#ifdef CONFIG_MDA_CONSOLE
-        mda_console_init();
-#endif
-        return 0;
-}
-
-#ifndef VT_SINGLE_DRIVER
-
-static struct class *vtconsole_class;
-
-static int bind_con_driver(const struct consw *csw, int first, int last,
-                           int deflt)
-{
-        struct module *owner = csw->owner;
-        const char *desc = NULL;
-        struct con_driver *con_driver;
-        int i, j = -1, k = -1, retval = -ENODEV;
-
-        if (!try_module_get(owner))
-                return -ENODEV;
-
-        acquire_console_sem();
-
-        /* check if driver is registered */
-        for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
-                con_driver = &registered_con_driver[i];
-
-                if (con_driver->con == csw) {
-                        desc = con_driver->desc;
-                        retval = 0;
-                        break;
-                }
-        }
-
-        if (retval)
-                goto err;
-
-        if (!(con_driver->flag & CON_DRIVER_FLAG_INIT)) {
-                csw->con_startup();
-                con_driver->flag |= CON_DRIVER_FLAG_INIT;
-        }
-
-        if (deflt) {
-                if (conswitchp)
-                        module_put(conswitchp->owner);
-
-                __module_get(owner);
-                conswitchp = csw;
-        }
-
-        first = max(first, con_driver->first);
-        last = min(last, con_driver->last);
-
-        for (i = first; i <= last; i++) {
-                int old_was_color;
-                struct vc_data *vc = vc_cons[i].d;
-
-                if (con_driver_map[i])
-                        module_put(con_driver_map[i]->owner);
-                __module_get(owner);
-                con_driver_map[i] = csw;
-
-                if (!vc || !vc->vc_sw)
-                        continue;
-
-                j = i;
-
-                if (CON_IS_VISIBLE(vc)) {
-                        k = i;
-                        save_screen(vc);
-                }
-
-                old_was_color = vc->vc_can_do_color;
-                vc->vc_sw->con_deinit(vc);
-                vc->vc_origin = (unsigned long)vc->vc_screenbuf;
-                visual_init(vc, i, 0);
-                set_origin(vc);
-                update_attr(vc);
-
-                /* If the console changed between mono <-> color, then
-                 * the attributes in the screenbuf will be wrong.  The
-                 * following resets all attributes to something sane.
-                 */
-                if (old_was_color != vc->vc_can_do_color)
-                        clear_buffer_attributes(vc);
-        }
-
-        printk("Console: switching ");
-        if (!deflt)
-                printk("consoles %d-%d ", first+1, last+1);
-        if (j >= 0) {
-                struct vc_data *vc = vc_cons[j].d;
-
-                printk("to %s %s %dx%d\n",
-                       vc->vc_can_do_color ? "colour" : "mono",
-                       desc, vc->vc_cols, vc->vc_rows);
-
-                if (k >= 0) {
-                        vc = vc_cons[k].d;
-                        update_screen(vc);
-                }
-        } else
-                printk("to %s\n", desc);
-
-        retval = 0;
-err:
-        release_console_sem();
-        module_put(owner);
-        return retval;
-};
-
-#ifdef CONFIG_VT_HW_CONSOLE_BINDING
-static int con_is_graphics(const struct consw *csw, int first, int last)
-{
-        int i, retval = 0;
-
-        for (i = first; i <= last; i++) {
-                struct vc_data *vc = vc_cons[i].d;
-
-                if (vc && vc->vc_mode == KD_GRAPHICS) {
-                        retval = 1;
-                        break;
-                }
-        }
-
-        return retval;
-}
-
-/**
- * unbind_con_driver - unbind a console driver
- * @csw: pointer to console driver to unregister
- * @first: first in range of consoles that @csw should be unbound from
- * @last: last in range of consoles that @csw should be unbound from
- * @deflt: should next bound console driver be default after @csw is unbound?
- *
- * To unbind a driver from all possible consoles, pass 0 as @first and
- * %MAX_NR_CONSOLES as @last.
- *
- * @deflt controls whether the console that ends up replacing @csw should be
- * the default console.
- *
- * RETURNS:
- * -ENODEV if @csw isn't a registered console driver or can't be unregistered
- * or 0 on success.
- */
-int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
-{
-        struct module *owner = csw->owner;
-        const struct consw *defcsw = NULL;
-        struct con_driver *con_driver = NULL, *con_back = NULL;
-        int i, retval = -ENODEV;
-
-        if (!try_module_get(owner))
-                return -ENODEV;
-
-        acquire_console_sem();
-
-        /* check if driver is registered and if it is unbindable */
-        for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
-                con_driver = &registered_con_driver[i];
-
-                if (con_driver->con == csw &&
-                    con_driver->flag & CON_DRIVER_FLAG_MODULE) {
-                        retval = 0;
-                        break;
-                }
-        }
-
-        if (retval) {
-                release_console_sem();
-                goto err;
-        }
-
-        retval = -ENODEV;
-
-        /* check if backup driver exists */
-        for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
-                con_back = &registered_con_driver[i];
-
-                if (con_back->con &&
-                    !(con_back->flag & CON_DRIVER_FLAG_MODULE)) {
-                        defcsw = con_back->con;
-                        retval = 0;
-                        break;
-                }
-        }
-
-        if (retval) {
-                release_console_sem();
-                goto err;
-        }
-
-        if (!con_is_bound(csw)) {
-                release_console_sem();
-                goto err;
-        }
-
-        first = max(first, con_driver->first);
-        last = min(last, con_driver->last);
-
-        for (i = first; i <= last; i++) {
-                if (con_driver_map[i] == csw) {
-                        module_put(csw->owner);
-                        con_driver_map[i] = NULL;
-                }
-        }
-
-        if (!con_is_bound(defcsw)) {
-                const struct consw *defconsw = conswitchp;
-
-                defcsw->con_startup();
-                con_back->flag |= CON_DRIVER_FLAG_INIT;
-                /*
-                 * vgacon may change the default driver to point
-                 * to dummycon, we restore it here...
-                 */
-                conswitchp = defconsw;
-        }
-
-        if (!con_is_bound(csw))
-                con_driver->flag &= ~CON_DRIVER_FLAG_INIT;
-
-        release_console_sem();
-        /* ignore return value, binding should not fail */
-        bind_con_driver(defcsw, first, last, deflt);
-err:
-        module_put(owner);
-        return retval;
-
-}
-EXPORT_SYMBOL(unbind_con_driver);
-
-static int vt_bind(struct con_driver *con)
-{
-        const struct consw *defcsw = NULL, *csw = NULL;
-        int i, more = 1, first = -1, last = -1, deflt = 0;
-
-        if (!con->con || !(con->flag & CON_DRIVER_FLAG_MODULE) ||
-            con_is_graphics(con->con, con->first, con->last))
-                goto err;
-
-        csw = con->con;
-
-        for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
-                struct con_driver *con = &registered_con_driver[i];
-
-                if (con->con && !(con->flag & CON_DRIVER_FLAG_MODULE)) {
-                        defcsw = con->con;
-                        break;
-                }
-        }
-
-        if (!defcsw)
-                goto err;
-
-        while (more) {
-                more = 0;
-
-                for (i = con->first; i <= con->last; i++) {
-                        if (con_driver_map[i] == defcsw) {
-                                if (first == -1)
-                                        first = i;
-                                last = i;
-                                more = 1;
-                        } else if (first != -1)
-                                break;
-                }
-
-                if (first == 0 && last == MAX_NR_CONSOLES -1)
-                        deflt = 1;
-
-                if (first != -1)
-                        bind_con_driver(csw, first, last, deflt);
-
-                first = -1;
-                last = -1;
-                deflt = 0;
-        }
-
-err:
-        return 0;
-}
-
-static int vt_unbind(struct con_driver *con)
-{
-        const struct consw *csw = NULL;
-        int i, more = 1, first = -1, last = -1, deflt = 0;
-
-        if (!con->con || !(con->flag & CON_DRIVER_FLAG_MODULE) ||
-            con_is_graphics(con->con, con->first, con->last))
-                goto err;
-
-        csw = con->con;
-
-        while (more) {
-                more = 0;
-
-                for (i = con->first; i <= con->last; i++) {
-                        if (con_driver_map[i] == csw) {
-                                if (first == -1)
-                                        first = i;
-                                last = i;
-                                more = 1;
-                        } else if (first != -1)
-                                break;
-                }
-
-                if (first == 0 && last == MAX_NR_CONSOLES -1)
-                        deflt = 1;
-
-                if (first != -1)
-                        unbind_con_driver(csw, first, last, deflt);
-
-                first = -1;
-                last = -1;
-                deflt = 0;
-        }
-
-err:
-        return 0;
-}
-#else
-static inline int vt_bind(struct con_driver *con)
-{
-        return 0;
-}
-static inline int vt_unbind(struct con_driver *con)
-{
-        return 0;
-}
-#endif /* CONFIG_VT_HW_CONSOLE_BINDING */
-
-static ssize_t store_bind(struct device *dev, struct device_attribute *attr,
-                          const char *buf, size_t count)
-{
-        struct con_driver *con = dev_get_drvdata(dev);
-        int bind = simple_strtoul(buf, NULL, 0);
-
-        if (bind)
-                vt_bind(con);
-        else
-                vt_unbind(con);
-
-        return count;
-}
-
-static ssize_t show_bind(struct device *dev, struct device_attribute *attr,
-                         char *buf)
-{
-        struct con_driver *con = dev_get_drvdata(dev);
-        int bind = con_is_bound(con->con);
-
-        return snprintf(buf, PAGE_SIZE, "%i\n", bind);
-}
-
-static ssize_t show_name(struct device *dev, struct device_attribute *attr,
-                         char *buf)
-{
-        struct con_driver *con = dev_get_drvdata(dev);
-
-        return snprintf(buf, PAGE_SIZE, "%s %s\n",
-                        (con->flag & CON_DRIVER_FLAG_MODULE) ? "(M)" : "(S)",
-                         con->desc);
-
-}
-
-static struct device_attribute device_attrs[] = {
-        __ATTR(bind, S_IRUGO|S_IWUSR, show_bind, store_bind),
-        __ATTR(name, S_IRUGO, show_name, NULL),
-};
-
-static int vtconsole_init_device(struct con_driver *con)
-{
-        int i;
-        int error = 0;
-
-        con->flag |= CON_DRIVER_FLAG_ATTR;
-        dev_set_drvdata(con->dev, con);
-        for (i = 0; i < ARRAY_SIZE(device_attrs); i++) {
-                error = device_create_file(con->dev, &device_attrs[i]);
-                if (error)
-                        break;
-        }
-
-        if (error) {
-                while (--i >= 0)
-                        device_remove_file(con->dev, &device_attrs[i]);
-                con->flag &= ~CON_DRIVER_FLAG_ATTR;
-        }
-
-        return error;
-}
-
-static void vtconsole_deinit_device(struct con_driver *con)
-{
-        int i;
-
-        if (con->flag & CON_DRIVER_FLAG_ATTR) {
-                for (i = 0; i < ARRAY_SIZE(device_attrs); i++)
-                        device_remove_file(con->dev, &device_attrs[i]);
-                con->flag &= ~CON_DRIVER_FLAG_ATTR;
-        }
-}
-
-/**
- * con_is_bound - checks if driver is bound to the console
- * @csw: console driver
- *
- * RETURNS: zero if unbound, nonzero if bound
- *
- * Drivers can call this and if zero, they should release
- * all resources allocated on con_startup()
- */
-int con_is_bound(const struct consw *csw)
-{
-        int i, bound = 0;
-
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
-                if (con_driver_map[i] == csw) {
-                        bound = 1;
-                        break;
-                }
-        }
-
-        return bound;
-}
-EXPORT_SYMBOL(con_is_bound);
-
-/**
- * con_debug_enter - prepare the console for the kernel debugger
- * @sw: console driver
- *
- * Called when the console is taken over by the kernel debugger, this
- * function needs to save the current console state, then put the console
- * into a state suitable for the kernel debugger.
- *
- * RETURNS:
- * Zero on success, nonzero if a failure occurred when trying to prepare
- * the console for the debugger.
- */
-int con_debug_enter(struct vc_data *vc)
-{
-        int ret = 0;
-
-        saved_fg_console = fg_console;
-        saved_last_console = last_console;
-        saved_want_console = want_console;
-        saved_vc_mode = vc->vc_mode;
-        saved_console_blanked = console_blanked;
-        vc->vc_mode = KD_TEXT;
-        console_blanked = 0;
-        if (vc->vc_sw->con_debug_enter)
-                ret = vc->vc_sw->con_debug_enter(vc);
-#ifdef CONFIG_KGDB_KDB
-        /* Set the initial LINES variable if it is not already set */
-        if (vc->vc_rows < 999) {
-                int linecount;
-                char lns[4];
-                const char *setargs[3] = {
-                        "set",
-                        "LINES",
-                        lns,
-                };
-                if (kdbgetintenv(setargs[0], &linecount)) {
-                        snprintf(lns, 4, "%i", vc->vc_rows);
-                        kdb_set(2, setargs);
-                }
-        }
-#endif /* CONFIG_KGDB_KDB */
-        return ret;
-}
-EXPORT_SYMBOL_GPL(con_debug_enter);
-
-/**
- * con_debug_leave - restore console state
- * @sw: console driver
- *
- * Restore the console state to what it was before the kernel debugger
- * was invoked.
- *
- * RETURNS:
- * Zero on success, nonzero if a failure occurred when trying to restore
- * the console.
- */
-int con_debug_leave(void)
-{
-        struct vc_data *vc;
-        int ret = 0;
-
-        fg_console = saved_fg_console;
-        last_console = saved_last_console;
-        want_console = saved_want_console;
-        console_blanked = saved_console_blanked;
-        vc_cons[fg_console].d->vc_mode = saved_vc_mode;
-
-        vc = vc_cons[fg_console].d;
-        if (vc->vc_sw->con_debug_leave)
-                ret = vc->vc_sw->con_debug_leave(vc);
-        return ret;
-}
-EXPORT_SYMBOL_GPL(con_debug_leave);
-
-/**
- * register_con_driver - register console driver to console layer
- * @csw: console driver
- * @first: the first console to take over, minimum value is 0
- * @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1
- *
- * DESCRIPTION: This function registers a console driver which can later
- * bind to a range of consoles specified by @first and @last. It will
- * also initialize the console driver by calling con_startup().
- */
-int register_con_driver(const struct consw *csw, int first, int last)
-{
-        struct module *owner = csw->owner;
-        struct con_driver *con_driver;
-        const char *desc;
-        int i, retval = 0;
-
-        if (!try_module_get(owner))
-                return -ENODEV;
-
-        acquire_console_sem();
-
-        for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
-                con_driver = &registered_con_driver[i];
-
-                /* already registered */
-                if (con_driver->con == csw)
-                        retval = -EINVAL;
-        }
-
-        if (retval)
-                goto err;
-
-        desc = csw->con_startup();
-
-        if (!desc)
-                goto err;
-
-        retval = -EINVAL;
-
-        for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
-                con_driver = &registered_con_driver[i];
-
-                if (con_driver->con == NULL) {
-                        con_driver->con = csw;
-                        con_driver->desc = desc;
-                        con_driver->node = i;
-                        con_driver->flag = CON_DRIVER_FLAG_MODULE |
-                                           CON_DRIVER_FLAG_INIT;
-                        con_driver->first = first;
-                        con_driver->last = last;
-                        retval = 0;
-                        break;
-                }
-        }
-
-        if (retval)
-                goto err;
-
-        con_driver->dev = device_create(vtconsole_class, NULL,
-                                                MKDEV(0, con_driver->node),
-                                                NULL, "vtcon%i",
-                                                con_driver->node);
-
-        if (IS_ERR(con_driver->dev)) {
-                printk(KERN_WARNING "Unable to create device for %s; "
-                       "errno = %ld\n", con_driver->desc,
-                       PTR_ERR(con_driver->dev));
-                con_driver->dev = NULL;
-        } else {
-                vtconsole_init_device(con_driver);
-        }
-
-err:
-        release_console_sem();
-        module_put(owner);
-        return retval;
-}
-EXPORT_SYMBOL(register_con_driver);
-
-/**
- * unregister_con_driver - unregister console driver from console layer
- * @csw: console driver
- *
- * DESCRIPTION: All drivers that registers to the console layer must
- * call this function upon exit, or if the console driver is in a state
- * where it won't be able to handle console services, such as the
- * framebuffer console without loaded framebuffer drivers.
- *
- * The driver must unbind first prior to unregistration.
- */
-int unregister_con_driver(const struct consw *csw)
-{
-        int i, retval = -ENODEV;
-
-        acquire_console_sem();
-
-        /* cannot unregister a bound driver */
-        if (con_is_bound(csw))
-                goto err;
-
-        for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
-                struct con_driver *con_driver = &registered_con_driver[i];
-
-                if (con_driver->con == csw &&
-                    con_driver->flag & CON_DRIVER_FLAG_MODULE) {
-                        vtconsole_deinit_device(con_driver);
-                        device_destroy(vtconsole_class,
-                                       MKDEV(0, con_driver->node));
-                        con_driver->con = NULL;
-                        con_driver->desc = NULL;
-                        con_driver->dev = NULL;
-                        con_driver->node = 0;
-                        con_driver->flag = 0;
-                        con_driver->first = 0;
-                        con_driver->last = 0;
-                        retval = 0;
-                        break;
-                }
-        }
-err:
-        release_console_sem();
-        return retval;
-}
-EXPORT_SYMBOL(unregister_con_driver);
-
-/*
- *      If we support more console drivers, this function is used
- *      when a driver wants to take over some existing consoles
- *      and become default driver for newly opened ones.
- *
- *      take_over_console is basically a register followed by unbind
- */
-int take_over_console(const struct consw *csw, int first, int last, int deflt)
-{
-        int err;
-
-        err = register_con_driver(csw, first, last);
-
-        if (!err)
-                bind_con_driver(csw, first, last, deflt);
-
-        return err;
-}
-
-/*
- * give_up_console is a wrapper to unregister_con_driver. It will only
- * work if driver is fully unbound.
- */
-void give_up_console(const struct consw *csw)
-{
-        unregister_con_driver(csw);
-}
-
-static int __init vtconsole_class_init(void)
-{
-        int i;
-
-        vtconsole_class = class_create(THIS_MODULE, "vtconsole");
-        if (IS_ERR(vtconsole_class)) {
-                printk(KERN_WARNING "Unable to create vt console class; "
-                       "errno = %ld\n", PTR_ERR(vtconsole_class));
-                vtconsole_class = NULL;
-        }
-
-        /* Add system drivers to sysfs */
-        for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
-                struct con_driver *con = &registered_con_driver[i];
-
-                if (con->con && !con->dev) {
-                        con->dev = device_create(vtconsole_class, NULL,
-                                                         MKDEV(0, con->node),
-                                                         NULL, "vtcon%i",
-                                                         con->node);
-
-                        if (IS_ERR(con->dev)) {
-                                printk(KERN_WARNING "Unable to create "
-                                       "device for %s; errno = %ld\n",
-                                       con->desc, PTR_ERR(con->dev));
-                                con->dev = NULL;
-                        } else {
-                                vtconsole_init_device(con);
-                        }
-                }
-        }
-
-        return 0;
-}
-postcore_initcall(vtconsole_class_init);
-
-#endif
-
-/*
- *      Screen blanking
- */
-
-static int set_vesa_blanking(char __user *p)
-{
-        unsigned int mode;
-
-        if (get_user(mode, p + 1))
-                return -EFAULT;
-
-        vesa_blank_mode = (mode < 4) ? mode : 0;
-        return 0;
-}
-
-void do_blank_screen(int entering_gfx)
-{
-        struct vc_data *vc = vc_cons[fg_console].d;
-        int i;
-
-        WARN_CONSOLE_UNLOCKED();
-
-        if (console_blanked) {
-                if (blank_state == blank_vesa_wait) {
-                        blank_state = blank_off;
-                        vc->vc_sw->con_blank(vc, vesa_blank_mode + 1, 0);
-                }
-                return;
-        }
-
-        /* entering graphics mode? */
-        if (entering_gfx) {
-                hide_cursor(vc);
-                save_screen(vc);
-                vc->vc_sw->con_blank(vc, -1, 1);
-                console_blanked = fg_console + 1;
-                blank_state = blank_off;
-                set_origin(vc);
-                return;
-        }
-
-        if (blank_state != blank_normal_wait)
-                return;
-        blank_state = blank_off;
-
-        /* don't blank graphics */
-        if (vc->vc_mode != KD_TEXT) {
-                console_blanked = fg_console + 1;
-                return;
-        }
-
-        hide_cursor(vc);
-        del_timer_sync(&console_timer);
-        blank_timer_expired = 0;
-
-        save_screen(vc);
-        /* In case we need to reset origin, blanking hook returns 1 */
-        i = vc->vc_sw->con_blank(vc, vesa_off_interval ? 1 : (vesa_blank_mode + 1), 0);
-        console_blanked = fg_console + 1;
-        if (i)
-                set_origin(vc);
-
-        if (console_blank_hook && console_blank_hook(1))
-                return;
-
-        if (vesa_off_interval && vesa_blank_mode) {
-                blank_state = blank_vesa_wait;
-                mod_timer(&console_timer, jiffies + vesa_off_interval);
-        }
-        vt_event_post(VT_EVENT_BLANK, vc->vc_num, vc->vc_num);
-}
-EXPORT_SYMBOL(do_blank_screen);
-
-/*
- * Called by timer as well as from vt_console_driver
- */
-void do_unblank_screen(int leaving_gfx)
-{
-        struct vc_data *vc;
-
-        /* This should now always be called from a "sane" (read: can schedule)
-         * context for the sake of the low level drivers, except in the special
-         * case of oops_in_progress
-         */
-        if (!oops_in_progress)
-                might_sleep();
-
-        WARN_CONSOLE_UNLOCKED();
-
-        ignore_poke = 0;
-        if (!console_blanked)
-                return;
-        if (!vc_cons_allocated(fg_console)) {
-                /* impossible */
-                printk("unblank_screen: tty %d not allocated ??\n", fg_console+1);
-                return;
-        }
-        vc = vc_cons[fg_console].d;
-        /* Try to unblank in oops case too */
-        if (vc->vc_mode != KD_TEXT && !vt_force_oops_output(vc))
-                return; /* but leave console_blanked != 0 */
-
-        if (blankinterval) {
-                mod_timer(&console_timer, jiffies + (blankinterval * HZ));
-                blank_state = blank_normal_wait;
-        }
-
-        console_blanked = 0;
-        if (vc->vc_sw->con_blank(vc, 0, leaving_gfx) || vt_force_oops_output(vc))
-                /* Low-level driver cannot restore -> do it ourselves */
-                update_screen(vc);
-        if (console_blank_hook)
-                console_blank_hook(0);
-        set_palette(vc);
-        set_cursor(vc);
-        vt_event_post(VT_EVENT_UNBLANK, vc->vc_num, vc->vc_num);
-}
-EXPORT_SYMBOL(do_unblank_screen);
-
-/*
- * This is called by the outside world to cause a forced unblank, mostly for
- * oopses. Currently, I just call do_unblank_screen(0), but we could eventually
- * call it with 1 as an argument and so force a mode restore... that may kill
- * X or at least garbage the screen but would also make the Oops visible...
- */
-void unblank_screen(void)
-{
-        do_unblank_screen(0);
-}
-
-/*
- * We defer the timer blanking to work queue so it can take the console mutex
- * (console operations can still happen at irq time, but only from printk which
- * has the console mutex. Not perfect yet, but better than no locking
- */
-static void blank_screen_t(unsigned long dummy)
-{
-        if (unlikely(!keventd_up())) {
-                mod_timer(&console_timer, jiffies + (blankinterval * HZ));
-                return;
-        }
-        blank_timer_expired = 1;
-        schedule_work(&console_work);
-}
-
-void poke_blanked_console(void)
-{
-        WARN_CONSOLE_UNLOCKED();
-
-        /* Add this so we quickly catch whoever might call us in a non
-         * safe context. Nowadays, unblank_screen() isn't to be called in
-         * atomic contexts and is allowed to schedule (with the special case
-         * of oops_in_progress, but that isn't of any concern for this
-         * function. --BenH.
-         */
-        might_sleep();
-
-        /* This isn't perfectly race free, but a race here would be mostly harmless,
-         * at worse, we'll do a spurrious blank and it's unlikely
-         */
-        del_timer(&console_timer);
-        blank_timer_expired = 0;
-
-        if (ignore_poke || !vc_cons[fg_console].d || vc_cons[fg_console].d->vc_mode == KD_GRAPHICS)
-                return;
-        if (console_blanked)
-                unblank_screen();
-        else if (blankinterval) {
-                mod_timer(&console_timer, jiffies + (blankinterval * HZ));
-                blank_state = blank_normal_wait;
-        }
-}
-
-/*
- *      Palettes
- */
-
-static void set_palette(struct vc_data *vc)
-{
-        WARN_CONSOLE_UNLOCKED();
-
-        if (vc->vc_mode != KD_GRAPHICS)
-                vc->vc_sw->con_set_palette(vc, color_table);
-}
-
-static int set_get_cmap(unsigned char __user *arg, int set)
-{
-    int i, j, k;
-
-    WARN_CONSOLE_UNLOCKED();
-
-    for (i = 0; i < 16; i++)
-        if (set) {
-            get_user(default_red[i], arg++);
-            get_user(default_grn[i], arg++);
-            get_user(default_blu[i], arg++);
-        } else {
-            put_user(default_red[i], arg++);
-            put_user(default_grn[i], arg++);
-            put_user(default_blu[i], arg++);
-        }
-    if (set) {
-        for (i = 0; i < MAX_NR_CONSOLES; i++)
-            if (vc_cons_allocated(i)) {
-                for (j = k = 0; j < 16; j++) {
-                    vc_cons[i].d->vc_palette[k++] = default_red[j];
-                    vc_cons[i].d->vc_palette[k++] = default_grn[j];
-                    vc_cons[i].d->vc_palette[k++] = default_blu[j];
-                }
-                set_palette(vc_cons[i].d);
-            }
-    }
-    return 0;
-}
-
-/*
- * Load palette into the DAC registers. arg points to a colour
- * map, 3 bytes per colour, 16 colours, range from 0 to 255.
- */
-
-int con_set_cmap(unsigned char __user *arg)
-{
-        int rc;
-
-        acquire_console_sem();
-        rc = set_get_cmap (arg,1);
-        release_console_sem();
-
-        return rc;
-}
-
-int con_get_cmap(unsigned char __user *arg)
-{
-        int rc;
-
-        acquire_console_sem();
-        rc = set_get_cmap (arg,0);
-        release_console_sem();
-
-        return rc;
-}
-
-void reset_palette(struct vc_data *vc)
-{
-        int j, k;
-        for (j=k=0; j<16; j++) {
-                vc->vc_palette[k++] = default_red[j];
-                vc->vc_palette[k++] = default_grn[j];
-                vc->vc_palette[k++] = default_blu[j];
-        }
-        set_palette(vc);
-}
-
-/*
- *  Font switching
- *
- *  Currently we only support fonts up to 32 pixels wide, at a maximum height
- *  of 32 pixels. Userspace fontdata is stored with 32 bytes (shorts/ints, 
- *  depending on width) reserved for each character which is kinda wasty, but 
- *  this is done in order to maintain compatibility with the EGA/VGA fonts. It 
- *  is upto the actual low-level console-driver convert data into its favorite
- *  format (maybe we should add a `fontoffset' field to the `display'
- *  structure so we won't have to convert the fontdata all the time.
- *  /Jes
- */
-
-#define max_font_size 65536
-
-static int con_font_get(struct vc_data *vc, struct console_font_op *op)
-{
-        struct console_font font;
-        int rc = -EINVAL;
-        int c;
-
-        if (vc->vc_mode != KD_TEXT)
-                return -EINVAL;
-
-        if (op->data) {
-                font.data = kmalloc(max_font_size, GFP_KERNEL);
-                if (!font.data)
-                        return -ENOMEM;
-        } else
-                font.data = NULL;
-
-        acquire_console_sem();
-        if (vc->vc_sw->con_font_get)
-                rc = vc->vc_sw->con_font_get(vc, &font);
-        else
-                rc = -ENOSYS;
-        release_console_sem();
-
-        if (rc)
-                goto out;
-
-        c = (font.width+7)/8 * 32 * font.charcount;
-
-        if (op->data && font.charcount > op->charcount)
-                rc = -ENOSPC;
-        if (!(op->flags & KD_FONT_FLAG_OLD)) {
-                if (font.width > op->width || font.height > op->height) 
-                        rc = -ENOSPC;
-        } else {
-                if (font.width != 8)
-                        rc = -EIO;
-                else if ((op->height && font.height > op->height) ||
-                         font.height > 32)
-                        rc = -ENOSPC;
-        }
-        if (rc)
-                goto out;
-
-        op->height = font.height;
-        op->width = font.width;
-        op->charcount = font.charcount;
-
-        if (op->data && copy_to_user(op->data, font.data, c))
-                rc = -EFAULT;
-
-out:
-        kfree(font.data);
-        return rc;
-}
-
-static int con_font_set(struct vc_data *vc, struct console_font_op *op)
-{
-        struct console_font font;
-        int rc = -EINVAL;
-        int size;
-
-        if (vc->vc_mode != KD_TEXT)
-                return -EINVAL;
-        if (!op->data)
-                return -EINVAL;
-        if (op->charcount > 512)
-                return -EINVAL;
-        if (!op->height) {              /* Need to guess font height [compat] */
-                int h, i;
-                u8 __user *charmap = op->data;
-                u8 tmp;
-                
-                /* If from KDFONTOP ioctl, don't allow things which can be done in userland,
-                   so that we can get rid of this soon */
-                if (!(op->flags & KD_FONT_FLAG_OLD))
-                        return -EINVAL;
-                for (h = 32; h > 0; h--)
-                        for (i = 0; i < op->charcount; i++) {
-                                if (get_user(tmp, &charmap[32*i+h-1]))
-                                        return -EFAULT;
-                                if (tmp)
-                                        goto nonzero;
-                        }
-                return -EINVAL;
-        nonzero:
-                op->height = h;
-        }
-        if (op->width <= 0 || op->width > 32 || op->height > 32)
-                return -EINVAL;
-        size = (op->width+7)/8 * 32 * op->charcount;
-        if (size > max_font_size)
-                return -ENOSPC;
-        font.charcount = op->charcount;
-        font.height = op->height;
-        font.width = op->width;
-        font.data = memdup_user(op->data, size);
-        if (IS_ERR(font.data))
-                return PTR_ERR(font.data);
-        acquire_console_sem();
-        if (vc->vc_sw->con_font_set)
-                rc = vc->vc_sw->con_font_set(vc, &font, op->flags);
-        else
-                rc = -ENOSYS;
-        release_console_sem();
-        kfree(font.data);
-        return rc;
-}
-
-static int con_font_default(struct vc_data *vc, struct console_font_op *op)
-{
-        struct console_font font = {.width = op->width, .height = op->height};
-        char name[MAX_FONT_NAME];
-        char *s = name;
-        int rc;
-
-        if (vc->vc_mode != KD_TEXT)
-                return -EINVAL;
-
-        if (!op->data)
-                s = NULL;
-        else if (strncpy_from_user(name, op->data, MAX_FONT_NAME - 1) < 0)
-                return -EFAULT;
-        else
-                name[MAX_FONT_NAME - 1] = 0;
-
-        acquire_console_sem();
-        if (vc->vc_sw->con_font_default)
-                rc = vc->vc_sw->con_font_default(vc, &font, s);
-        else
-                rc = -ENOSYS;
-        release_console_sem();
-        if (!rc) {
-                op->width = font.width;
-                op->height = font.height;
-        }
-        return rc;
-}
-
-static int con_font_copy(struct vc_data *vc, struct console_font_op *op)
-{
-        int con = op->height;
-        int rc;
-
-        if (vc->vc_mode != KD_TEXT)
-                return -EINVAL;
-
-        acquire_console_sem();
-        if (!vc->vc_sw->con_font_copy)
-                rc = -ENOSYS;
-        else if (con < 0 || !vc_cons_allocated(con))
-                rc = -ENOTTY;
-        else if (con == vc->vc_num)     /* nothing to do */
-                rc = 0;
-        else
-                rc = vc->vc_sw->con_font_copy(vc, con);
-        release_console_sem();
-        return rc;
-}
-
-int con_font_op(struct vc_data *vc, struct console_font_op *op)
-{
-        switch (op->op) {
-        case KD_FONT_OP_SET:
-                return con_font_set(vc, op);
-        case KD_FONT_OP_GET:
-                return con_font_get(vc, op);
-        case KD_FONT_OP_SET_DEFAULT:
-                return con_font_default(vc, op);
-        case KD_FONT_OP_COPY:
-                return con_font_copy(vc, op);
-        }
-        return -ENOSYS;
-}
-
-/*
- *      Interface exported to selection and vcs.
- */
-
-/* used by selection */
-u16 screen_glyph(struct vc_data *vc, int offset)
-{
-        u16 w = scr_readw(screenpos(vc, offset, 1));
-        u16 c = w & 0xff;
-
-        if (w & vc->vc_hi_font_mask)
-                c |= 0x100;
-        return c;
-}
-EXPORT_SYMBOL_GPL(screen_glyph);
-
-/* used by vcs - note the word offset */
-unsigned short *screen_pos(struct vc_data *vc, int w_offset, int viewed)
-{
-        return screenpos(vc, 2 * w_offset, viewed);
-}
-
-void getconsxy(struct vc_data *vc, unsigned char *p)
-{
-        p[0] = vc->vc_x;
-        p[1] = vc->vc_y;
-}
-
-void putconsxy(struct vc_data *vc, unsigned char *p)
-{
-        hide_cursor(vc);
-        gotoxy(vc, p[0], p[1]);
-        set_cursor(vc);
-}
-
-u16 vcs_scr_readw(struct vc_data *vc, const u16 *org)
-{
-        if ((unsigned long)org == vc->vc_pos && softcursor_original != -1)
-                return softcursor_original;
-        return scr_readw(org);
-}
-
-void vcs_scr_writew(struct vc_data *vc, u16 val, u16 *org)
-{
-        scr_writew(val, org);
-        if ((unsigned long)org == vc->vc_pos) {
-                softcursor_original = -1;
-                add_softcursor(vc);
-        }
-}
-
-/*
- *      Visible symbols for modules
- */
-
-EXPORT_SYMBOL(color_table);
-EXPORT_SYMBOL(default_red);
-EXPORT_SYMBOL(default_grn);
-EXPORT_SYMBOL(default_blu);
-EXPORT_SYMBOL(update_region);
-EXPORT_SYMBOL(redraw_screen);
-EXPORT_SYMBOL(vc_resize);
-EXPORT_SYMBOL(fg_console);
-EXPORT_SYMBOL(console_blank_hook);
-EXPORT_SYMBOL(console_blanked);
-EXPORT_SYMBOL(vc_cons);
-EXPORT_SYMBOL(global_cursor_default);
-#ifndef VT_SINGLE_DRIVER
-EXPORT_SYMBOL(take_over_console);
-EXPORT_SYMBOL(give_up_console);
-#endif
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
deleted file mode 100644
index 38df8c19e74c..000000000000
--- a/drivers/char/vt_ioctl.c
+++ /dev/null
@@ -1,1787 +0,0 @@
-/*
- *  linux/drivers/char/vt_ioctl.c
- *
- *  Copyright (C) 1992 obz under the linux copyright
- *
- *  Dynamic diacritical handling - aeb@cwi.nl - Dec 1993
- *  Dynamic keymap and string allocation - aeb@cwi.nl - May 1994
- *  Restrict VT switching via ioctl() - grif@cs.ucr.edu - Dec 1995
- *  Some code moved for less code duplication - Andi Kleen - Mar 1997
- *  Check put/get_user, cleanups - acme@conectiva.com.br - Jun 2001
- */
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/tty.h>
-#include <linux/timer.h>
-#include <linux/kernel.h>
-#include <linux/compat.h>
-#include <linux/module.h>
-#include <linux/kd.h>
-#include <linux/vt.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/major.h>
-#include <linux/fs.h>
-#include <linux/console.h>
-#include <linux/consolemap.h>
-#include <linux/signal.h>
-#include <linux/smp_lock.h>
-#include <linux/timex.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-
-#include <linux/kbd_kern.h>
-#include <linux/vt_kern.h>
-#include <linux/kbd_diacr.h>
-#include <linux/selection.h>
-
-char vt_dont_switch;
-extern struct tty_driver *console_driver;
-
-#define VT_IS_IN_USE(i) (console_driver->ttys[i] && console_driver->ttys[i]->count)
-#define VT_BUSY(i)      (VT_IS_IN_USE(i) || i == fg_console || vc_cons[i].d == sel_cons)
-
-/*
- * Console (vt and kd) routines, as defined by USL SVR4 manual, and by
- * experimentation and study of X386 SYSV handling.
- *
- * One point of difference: SYSV vt's are /dev/vtX, which X >= 0, and
- * /dev/console is a separate ttyp. Under Linux, /dev/tty0 is /dev/console,
- * and the vc start at /dev/ttyX, X >= 1. We maintain that here, so we will
- * always treat our set of vt as numbered 1..MAX_NR_CONSOLES (corresponding to
- * ttys 0..MAX_NR_CONSOLES-1). Explicitly naming VT 0 is illegal, but using
- * /dev/tty0 (fg_console) as a target is legal, since an implicit aliasing
- * to the current console is done by the main ioctl code.
- */
-
-#ifdef CONFIG_X86
-#include <linux/syscalls.h>
-#endif
-
-static void complete_change_console(struct vc_data *vc);
-
-/*
- *      User space VT_EVENT handlers
- */
-
-struct vt_event_wait {
-        struct list_head list;
-        struct vt_event event;
-        int done;
-};
-
-static LIST_HEAD(vt_events);
-static DEFINE_SPINLOCK(vt_event_lock);
-static DECLARE_WAIT_QUEUE_HEAD(vt_event_waitqueue);
-
-/**
- *      vt_event_post
- *      @event: the event that occurred
- *      @old: old console
- *      @new: new console
- *
- *      Post an VT event to interested VT handlers
- */
-
-void vt_event_post(unsigned int event, unsigned int old, unsigned int new)
-{
-        struct list_head *pos, *head;
-        unsigned long flags;
-        int wake = 0;
-
-        spin_lock_irqsave(&vt_event_lock, flags);
-        head = &vt_events;
-
-        list_for_each(pos, head) {
-                struct vt_event_wait *ve = list_entry(pos,
-                                                struct vt_event_wait, list);
-                if (!(ve->event.event & event))
-                        continue;
-                ve->event.event = event;
-                /* kernel view is consoles 0..n-1, user space view is
-                   console 1..n with 0 meaning current, so we must bias */
-                ve->event.oldev = old + 1;
-                ve->event.newev = new + 1;
-                wake = 1;
-                ve->done = 1;
-        }
-        spin_unlock_irqrestore(&vt_event_lock, flags);
-        if (wake)
-                wake_up_interruptible(&vt_event_waitqueue);
-}
-
-/**
- *      vt_event_wait           -       wait for an event
- *      @vw: our event
- *
- *      Waits for an event to occur which completes our vt_event_wait
- *      structure. On return the structure has wv->done set to 1 for success
- *      or 0 if some event such as a signal ended the wait.
- */
-
-static void vt_event_wait(struct vt_event_wait *vw)
-{
-        unsigned long flags;
-        /* Prepare the event */
-        INIT_LIST_HEAD(&vw->list);
-        vw->done = 0;
-        /* Queue our event */
-        spin_lock_irqsave(&vt_event_lock, flags);
-        list_add(&vw->list, &vt_events);
-        spin_unlock_irqrestore(&vt_event_lock, flags);
-        /* Wait for it to pass */
-        wait_event_interruptible_tty(vt_event_waitqueue, vw->done);
-        /* Dequeue it */
-        spin_lock_irqsave(&vt_event_lock, flags);
-        list_del(&vw->list);
-        spin_unlock_irqrestore(&vt_event_lock, flags);
-}
-
-/**
- *      vt_event_wait_ioctl     -       event ioctl handler
- *      @arg: argument to ioctl
- *
- *      Implement the VT_WAITEVENT ioctl using the VT event interface
- */
-
-static int vt_event_wait_ioctl(struct vt_event __user *event)
-{
-        struct vt_event_wait vw;
-
-        if (copy_from_user(&vw.event, event, sizeof(struct vt_event)))
-                return -EFAULT;
-        /* Highest supported event for now */
-        if (vw.event.event & ~VT_MAX_EVENT)
-                return -EINVAL;
-
-        vt_event_wait(&vw);
-        /* If it occurred report it */
-        if (vw.done) {
-                if (copy_to_user(event, &vw.event, sizeof(struct vt_event)))
-                        return -EFAULT;
-                return 0;
-        }
-        return -EINTR;
-}
-
-/**
- *      vt_waitactive   -       active console wait
- *      @event: event code
- *      @n: new console
- *
- *      Helper for event waits. Used to implement the legacy
- *      event waiting ioctls in terms of events
- */
-
-int vt_waitactive(int n)
-{
-        struct vt_event_wait vw;
-        do {
-                if (n == fg_console + 1)
-                        break;
-                vw.event.event = VT_EVENT_SWITCH;
-                vt_event_wait(&vw);
-                if (vw.done == 0)
-                        return -EINTR;
-        } while (vw.event.newev != n);
-        return 0;
-}
-
-/*
- * these are the valid i/o ports we're allowed to change. they map all the
- * video ports
- */
-#define GPFIRST 0x3b4
-#define GPLAST 0x3df
-#define GPNUM (GPLAST - GPFIRST + 1)
-
-#define i (tmp.kb_index)
-#define s (tmp.kb_table)
-#define v (tmp.kb_value)
-static inline int
-do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_struct *kbd)
-{
-        struct kbentry tmp;
-        ushort *key_map, val, ov;
-
-        if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
-                return -EFAULT;
-
-        if (!capable(CAP_SYS_TTY_CONFIG))
-                perm = 0;
-
-        switch (cmd) {
-        case KDGKBENT:
-                key_map = key_maps[s];
-                if (key_map) {
-                    val = U(key_map[i]);
-                    if (kbd->kbdmode != VC_UNICODE && KTYP(val) >= NR_TYPES)
-                        val = K_HOLE;
-                } else
-                    val = (i ? K_HOLE : K_NOSUCHMAP);
-                return put_user(val, &user_kbe->kb_value);
-        case KDSKBENT:
-                if (!perm)
-                        return -EPERM;
-                if (!i && v == K_NOSUCHMAP) {
-                        /* deallocate map */
-                        key_map = key_maps[s];
-                        if (s && key_map) {
-                            key_maps[s] = NULL;
-                            if (key_map[0] == U(K_ALLOCATED)) {
-                                        kfree(key_map);
-                                        keymap_count--;
-                            }
-                        }
-                        break;
-                }
-
-                if (KTYP(v) < NR_TYPES) {
-                    if (KVAL(v) > max_vals[KTYP(v)])
-                                return -EINVAL;
-                } else
-                    if (kbd->kbdmode != VC_UNICODE)
-                                return -EINVAL;
-
-                /* ++Geert: non-PC keyboards may generate keycode zero */
-#if !defined(__mc68000__) && !defined(__powerpc__)
-                /* assignment to entry 0 only tests validity of args */
-                if (!i)
-                        break;
-#endif
-
-                if (!(key_map = key_maps[s])) {
-                        int j;
-
-                        if (keymap_count >= MAX_NR_OF_USER_KEYMAPS &&
-                            !capable(CAP_SYS_RESOURCE))
-                                return -EPERM;
-
-                        key_map = kmalloc(sizeof(plain_map),
-                                                     GFP_KERNEL);
-                        if (!key_map)
-                                return -ENOMEM;
-                        key_maps[s] = key_map;
-                        key_map[0] = U(K_ALLOCATED);
-                        for (j = 1; j < NR_KEYS; j++)
-                                key_map[j] = U(K_HOLE);
-                        keymap_count++;
-                }
-                ov = U(key_map[i]);
-                if (v == ov)
-                        break;  /* nothing to do */
-                /*
-                 * Attention Key.
-                 */
-                if (((ov == K_SAK) || (v == K_SAK)) && !capable(CAP_SYS_ADMIN))
-                        return -EPERM;
-                key_map[i] = U(v);
-                if (!s && (KTYP(ov) == KT_SHIFT || KTYP(v) == KT_SHIFT))
-                        compute_shiftstate();
-                break;
-        }
-        return 0;
-}
-#undef i
-#undef s
-#undef v
-
-static inline int 
-do_kbkeycode_ioctl(int cmd, struct kbkeycode __user *user_kbkc, int perm)
-{
-        struct kbkeycode tmp;
-        int kc = 0;
-
-        if (copy_from_user(&tmp, user_kbkc, sizeof(struct kbkeycode)))
-                return -EFAULT;
-        switch (cmd) {
-        case KDGETKEYCODE:
-                kc = getkeycode(tmp.scancode);
-                if (kc >= 0)
-                        kc = put_user(kc, &user_kbkc->keycode);
-                break;
-        case KDSETKEYCODE:
-                if (!perm)
-                        return -EPERM;
-                kc = setkeycode(tmp.scancode, tmp.keycode);
-                break;
-        }
-        return kc;
-}
-
-static inline int
-do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
-{
-        struct kbsentry *kbs;
-        char *p;
-        u_char *q;
-        u_char __user *up;
-        int sz;
-        int delta;
-        char *first_free, *fj, *fnw;
-        int i, j, k;
-        int ret;
-
-        if (!capable(CAP_SYS_TTY_CONFIG))
-                perm = 0;
-
-        kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
-        if (!kbs) {
-                ret = -ENOMEM;
-                goto reterr;
-        }
-
-        /* we mostly copy too much here (512bytes), but who cares ;) */
-        if (copy_from_user(kbs, user_kdgkb, sizeof(struct kbsentry))) {
-                ret = -EFAULT;
-                goto reterr;
-        }
-        kbs->kb_string[sizeof(kbs->kb_string)-1] = '\0';
-        i = kbs->kb_func;
-
-        switch (cmd) {
-        case KDGKBSENT:
-                sz = sizeof(kbs->kb_string) - 1; /* sz should have been
-                                                  a struct member */
-                up = user_kdgkb->kb_string;
-                p = func_table[i];
-                if(p)
-                        for ( ; *p && sz; p++, sz--)
-                                if (put_user(*p, up++)) {
-                                        ret = -EFAULT;
-                                        goto reterr;
-                                }
-                if (put_user('\0', up)) {
-                        ret = -EFAULT;
-                        goto reterr;
-                }
-                kfree(kbs);
-                return ((p && *p) ? -EOVERFLOW : 0);
-        case KDSKBSENT:
-                if (!perm) {
-                        ret = -EPERM;
-                        goto reterr;
-                }
-
-                q = func_table[i];
-                first_free = funcbufptr + (funcbufsize - funcbufleft);
-                for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 
-                        ;
-                if (j < MAX_NR_FUNC)
-                        fj = func_table[j];
-                else
-                        fj = first_free;
-
-                delta = (q ? -strlen(q) : 1) + strlen(kbs->kb_string);
-                if (delta <= funcbufleft) {     /* it fits in current buf */
-                    if (j < MAX_NR_FUNC) {
-                        memmove(fj + delta, fj, first_free - fj);
-                        for (k = j; k < MAX_NR_FUNC; k++)
-                            if (func_table[k])
-                                func_table[k] += delta;
-                    }
-                    if (!q)
-                      func_table[i] = fj;
-                    funcbufleft -= delta;
-                } else {                        /* allocate a larger buffer */
-                    sz = 256;
-                    while (sz < funcbufsize - funcbufleft + delta)
-                      sz <<= 1;
-                    fnw = kmalloc(sz, GFP_KERNEL);
-                    if(!fnw) {
-                      ret = -ENOMEM;
-                      goto reterr;
-                    }
-
-                    if (!q)
-                      func_table[i] = fj;
-                    if (fj > funcbufptr)
-                        memmove(fnw, funcbufptr, fj - funcbufptr);
-                    for (k = 0; k < j; k++)
-                      if (func_table[k])
-                        func_table[k] = fnw + (func_table[k] - funcbufptr);
-
-                    if (first_free > fj) {
-                        memmove(fnw + (fj - funcbufptr) + delta, fj, first_free - fj);
-                        for (k = j; k < MAX_NR_FUNC; k++)
-                          if (func_table[k])
-                            func_table[k] = fnw + (func_table[k] - funcbufptr) + delta;
-                    }
-                    if (funcbufptr != func_buf)
-                      kfree(funcbufptr);
-                    funcbufptr = fnw;
-                    funcbufleft = funcbufleft - delta + sz - funcbufsize;
-                    funcbufsize = sz;
-                }
-                strcpy(func_table[i], kbs->kb_string);
-                break;
-        }
-        ret = 0;
-reterr:
-        kfree(kbs);
-        return ret;
-}
-
-static inline int 
-do_fontx_ioctl(int cmd, struct consolefontdesc __user *user_cfd, int perm, struct console_font_op *op)
-{
-        struct consolefontdesc cfdarg;
-        int i;
-
-        if (copy_from_user(&cfdarg, user_cfd, sizeof(struct consolefontdesc))) 
-                return -EFAULT;
-        
-        switch (cmd) {
-        case PIO_FONTX:
-                if (!perm)
-                        return -EPERM;
-                op->op = KD_FONT_OP_SET;
-                op->flags = KD_FONT_FLAG_OLD;
-                op->width = 8;
-                op->height = cfdarg.charheight;
-                op->charcount = cfdarg.charcount;
-                op->data = cfdarg.chardata;
-                return con_font_op(vc_cons[fg_console].d, op);
-        case GIO_FONTX: {
-                op->op = KD_FONT_OP_GET;
-                op->flags = KD_FONT_FLAG_OLD;
-                op->width = 8;
-                op->height = cfdarg.charheight;
-                op->charcount = cfdarg.charcount;
-                op->data = cfdarg.chardata;
-                i = con_font_op(vc_cons[fg_console].d, op);
-                if (i)
-                        return i;
-                cfdarg.charheight = op->height;
-                cfdarg.charcount = op->charcount;
-                if (copy_to_user(user_cfd, &cfdarg, sizeof(struct consolefontdesc)))
-                        return -EFAULT;
-                return 0;
-                }
-        }
-        return -EINVAL;
-}
-
-static inline int 
-do_unimap_ioctl(int cmd, struct unimapdesc __user *user_ud, int perm, struct vc_data *vc)
-{
-        struct unimapdesc tmp;
-
-        if (copy_from_user(&tmp, user_ud, sizeof tmp))
-                return -EFAULT;
-        if (tmp.entries)
-                if (!access_ok(VERIFY_WRITE, tmp.entries,
-                                tmp.entry_ct*sizeof(struct unipair)))
-                        return -EFAULT;
-        switch (cmd) {
-        case PIO_UNIMAP:
-                if (!perm)
-                        return -EPERM;
-                return con_set_unimap(vc, tmp.entry_ct, tmp.entries);
-        case GIO_UNIMAP:
-                if (!perm && fg_console != vc->vc_num)
-                        return -EPERM;
-                return con_get_unimap(vc, tmp.entry_ct, &(user_ud->entry_ct), tmp.entries);
-        }
-        return 0;
-}
-
-
-
-/*
- * We handle the console-specific ioctl's here.  We allow the
- * capability to modify any console, not just the fg_console. 
- */
-int vt_ioctl(struct tty_struct *tty, struct file * file,
-             unsigned int cmd, unsigned long arg)
-{
-        struct vc_data *vc = tty->driver_data;
-        struct console_font_op op;      /* used in multiple places here */
-        struct kbd_struct * kbd;
-        unsigned int console;
-        unsigned char ucval;
-        void __user *up = (void __user *)arg;
-        int i, perm;
-        int ret = 0;
-
-        console = vc->vc_num;
-
-        tty_lock();
-
-        if (!vc_cons_allocated(console)) {      /* impossible? */
-                ret = -ENOIOCTLCMD;
-                goto out;
-        }
-
-
-        /*
-         * To have permissions to do most of the vt ioctls, we either have
-         * to be the owner of the tty, or have CAP_SYS_TTY_CONFIG.
-         */
-        perm = 0;
-        if (current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG))
-                perm = 1;
- 
-        kbd = kbd_table + console;
-        switch (cmd) {
-        case TIOCLINUX:
-                ret = tioclinux(tty, arg);
-                break;
-        case KIOCSOUND:
-                if (!perm)
-                        goto eperm;
-                /*
-                 * The use of PIT_TICK_RATE is historic, it used to be
-                 * the platform-dependent CLOCK_TICK_RATE between 2.6.12
-                 * and 2.6.36, which was a minor but unfortunate ABI
-                 * change.
-                 */
-                if (arg)
-                        arg = PIT_TICK_RATE / arg;
-                kd_mksound(arg, 0);
-                break;
-
-        case KDMKTONE:
-                if (!perm)
-                        goto eperm;
-        {
-                unsigned int ticks, count;
-                
-                /*
-                 * Generate the tone for the appropriate number of ticks.
-                 * If the time is zero, turn off sound ourselves.
-                 */
-                ticks = HZ * ((arg >> 16) & 0xffff) / 1000;
-                count = ticks ? (arg & 0xffff) : 0;
-                if (count)
-                        count = PIT_TICK_RATE / count;
-                kd_mksound(count, ticks);
-                break;
-        }
-
-        case KDGKBTYPE:
-                /*
-                 * this is naive.
-                 */
-                ucval = KB_101;
-                goto setchar;
-
-                /*
-                 * These cannot be implemented on any machine that implements
-                 * ioperm() in user level (such as Alpha PCs) or not at all.
-                 *
-                 * XXX: you should never use these, just call ioperm directly..
-                 */
-#ifdef CONFIG_X86
-        case KDADDIO:
-        case KDDELIO:
-                /*
-                 * KDADDIO and KDDELIO may be able to add ports beyond what
-                 * we reject here, but to be safe...
-                 */
-                if (arg < GPFIRST || arg > GPLAST) {
-                        ret = -EINVAL;
-                        break;
-                }
-                ret = sys_ioperm(arg, 1, (cmd == KDADDIO)) ? -ENXIO : 0;
-                break;
-
-        case KDENABIO:
-        case KDDISABIO:
-                ret = sys_ioperm(GPFIRST, GPNUM,
-                                  (cmd == KDENABIO)) ? -ENXIO : 0;
-                break;
-#endif
-
-        /* Linux m68k/i386 interface for setting the keyboard delay/repeat rate */
-                
-        case KDKBDREP:
-        {
-                struct kbd_repeat kbrep;
-                
-                if (!capable(CAP_SYS_TTY_CONFIG))
-                        goto eperm;
-
-                if (copy_from_user(&kbrep, up, sizeof(struct kbd_repeat))) {
-                        ret =  -EFAULT;
-                        break;
-                }
-                ret = kbd_rate(&kbrep);
-                if (ret)
-                        break;
-                if (copy_to_user(up, &kbrep, sizeof(struct kbd_repeat)))
-                        ret = -EFAULT;
-                break;
-        }
-
-        case KDSETMODE:
-                /*
-                 * currently, setting the mode from KD_TEXT to KD_GRAPHICS
-                 * doesn't do a whole lot. i'm not sure if it should do any
-                 * restoration of modes or what...
-                 *
-                 * XXX It should at least call into the driver, fbdev's definitely
-                 * need to restore their engine state. --BenH
-                 */
-                if (!perm)
-                        goto eperm;
-                switch (arg) {
-                case KD_GRAPHICS:
-                        break;
-                case KD_TEXT0:
-                case KD_TEXT1:
-                        arg = KD_TEXT;
-                case KD_TEXT:
-                        break;
-                default:
-                        ret = -EINVAL;
-                        goto out;
-                }
-                if (vc->vc_mode == (unsigned char) arg)
-                        break;
-                vc->vc_mode = (unsigned char) arg;
-                if (console != fg_console)
-                        break;
-                /*
-                 * explicitly blank/unblank the screen if switching modes
-                 */
-                acquire_console_sem();
-                if (arg == KD_TEXT)
-                        do_unblank_screen(1);
-                else
-                        do_blank_screen(1);
-                release_console_sem();
-                break;
-
-        case KDGETMODE:
-                ucval = vc->vc_mode;
-                goto setint;
-
-        case KDMAPDISP:
-        case KDUNMAPDISP:
-                /*
-                 * these work like a combination of mmap and KDENABIO.
-                 * this could be easily finished.
-                 */
-                ret = -EINVAL;
-                break;
-
-        case KDSKBMODE:
-                if (!perm)
-                        goto eperm;
-                switch(arg) {
-                  case K_RAW:
-                        kbd->kbdmode = VC_RAW;
-                        break;
-                  case K_MEDIUMRAW:
-                        kbd->kbdmode = VC_MEDIUMRAW;
-                        break;
-                  case K_XLATE:
-                        kbd->kbdmode = VC_XLATE;
-                        compute_shiftstate();
-                        break;
-                  case K_UNICODE:
-                        kbd->kbdmode = VC_UNICODE;
-                        compute_shiftstate();
-                        break;
-                  default:
-                        ret = -EINVAL;
-                        goto out;
-                }
-                tty_ldisc_flush(tty);
-                break;
-
-        case KDGKBMODE:
-                ucval = ((kbd->kbdmode == VC_RAW) ? K_RAW :
-                                 (kbd->kbdmode == VC_MEDIUMRAW) ? K_MEDIUMRAW :
-                                 (kbd->kbdmode == VC_UNICODE) ? K_UNICODE :
-                                 K_XLATE);
-                goto setint;
-
-        /* this could be folded into KDSKBMODE, but for compatibility
-           reasons it is not so easy to fold KDGKBMETA into KDGKBMODE */
-        case KDSKBMETA:
-                switch(arg) {
-                  case K_METABIT:
-                        clr_vc_kbd_mode(kbd, VC_META);
-                        break;
-                  case K_ESCPREFIX:
-                        set_vc_kbd_mode(kbd, VC_META);
-                        break;
-                  default:
-                        ret = -EINVAL;
-                }
-                break;
-
-        case KDGKBMETA:
-                ucval = (vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
-        setint:
-                ret = put_user(ucval, (int __user *)arg);
-                break;
-
-        case KDGETKEYCODE:
-        case KDSETKEYCODE:
-                if(!capable(CAP_SYS_TTY_CONFIG))
-                        perm = 0;
-                ret = do_kbkeycode_ioctl(cmd, up, perm);
-                break;
-
-        case KDGKBENT:
-        case KDSKBENT:
-                ret = do_kdsk_ioctl(cmd, up, perm, kbd);
-                break;
-
-        case KDGKBSENT:
-        case KDSKBSENT:
-                ret = do_kdgkb_ioctl(cmd, up, perm);
-                break;
-
-        case KDGKBDIACR:
-        {
-                struct kbdiacrs __user *a = up;
-                struct kbdiacr diacr;
-                int i;
-
-                if (put_user(accent_table_size, &a->kb_cnt)) {
-                        ret = -EFAULT;
-                        break;
-                }
-                for (i = 0; i < accent_table_size; i++) {
-                        diacr.diacr = conv_uni_to_8bit(accent_table[i].diacr);
-                        diacr.base = conv_uni_to_8bit(accent_table[i].base);
-                        diacr.result = conv_uni_to_8bit(accent_table[i].result);
-                        if (copy_to_user(a->kbdiacr + i, &diacr, sizeof(struct kbdiacr))) {
-                                ret = -EFAULT;
-                                break;
-                        }
-                }
-                break;
-        }
-        case KDGKBDIACRUC:
-        {
-                struct kbdiacrsuc __user *a = up;
-
-                if (put_user(accent_table_size, &a->kb_cnt))
-                        ret = -EFAULT;
-                else if (copy_to_user(a->kbdiacruc, accent_table,
-                                accent_table_size*sizeof(struct kbdiacruc)))
-                        ret = -EFAULT;
-                break;
-        }
-
-        case KDSKBDIACR:
-        {
-                struct kbdiacrs __user *a = up;
-                struct kbdiacr diacr;
-                unsigned int ct;
-                int i;
-
-                if (!perm)
-                        goto eperm;
-                if (get_user(ct,&a->kb_cnt)) {
-                        ret = -EFAULT;
-                        break;
-                }
-                if (ct >= MAX_DIACR) {
-                        ret = -EINVAL;
-                        break;
-                }
-                accent_table_size = ct;
-                for (i = 0; i < ct; i++) {
-                        if (copy_from_user(&diacr, a->kbdiacr + i, sizeof(struct kbdiacr))) {
-                                ret = -EFAULT;
-                                break;
-                        }
-                        accent_table[i].diacr = conv_8bit_to_uni(diacr.diacr);
-                        accent_table[i].base = conv_8bit_to_uni(diacr.base);
-                        accent_table[i].result = conv_8bit_to_uni(diacr.result);
-                }
-                break;
-        }
-
-        case KDSKBDIACRUC:
-        {
-                struct kbdiacrsuc __user *a = up;
-                unsigned int ct;
-
-                if (!perm)
-                        goto eperm;
-                if (get_user(ct,&a->kb_cnt)) {
-                        ret = -EFAULT;
-                        break;
-                }
-                if (ct >= MAX_DIACR) {
-                        ret = -EINVAL;
-                        break;
-                }
-                accent_table_size = ct;
-                if (copy_from_user(accent_table, a->kbdiacruc, ct*sizeof(struct kbdiacruc)))
-                        ret = -EFAULT;
-                break;
-        }
-
-        /* the ioctls below read/set the flags usually shown in the leds */
-        /* don't use them - they will go away without warning */
-        case KDGKBLED:
-                ucval = kbd->ledflagstate | (kbd->default_ledflagstate << 4);
-                goto setchar;
-
-        case KDSKBLED:
-                if (!perm)
-                        goto eperm;
-                if (arg & ~0x77) {
-                        ret = -EINVAL;
-                        break;
-                }
-                kbd->ledflagstate = (arg & 7);
-                kbd->default_ledflagstate = ((arg >> 4) & 7);
-                set_leds();
-                break;
-
-        /* the ioctls below only set the lights, not the functions */
-        /* for those, see KDGKBLED and KDSKBLED above */
-        case KDGETLED:
-                ucval = getledstate();
-        setchar:
-                ret = put_user(ucval, (char __user *)arg);
-                break;
-
-        case KDSETLED:
-                if (!perm)
-                        goto eperm;
-                setledstate(kbd, arg);
-                break;
-
-        /*
-         * A process can indicate its willingness to accept signals
-         * generated by pressing an appropriate key combination.
-         * Thus, one can have a daemon that e.g. spawns a new console
-         * upon a keypress and then changes to it.
-         * See also the kbrequest field of inittab(5).
-         */
-        case KDSIGACCEPT:
-        {
-                if (!perm || !capable(CAP_KILL))
-                        goto eperm;
-                if (!valid_signal(arg) || arg < 1 || arg == SIGKILL)
-                        ret = -EINVAL;
-                else {
-                        spin_lock_irq(&vt_spawn_con.lock);
-                        put_pid(vt_spawn_con.pid);
-                        vt_spawn_con.pid = get_pid(task_pid(current));
-                        vt_spawn_con.sig = arg;
-                        spin_unlock_irq(&vt_spawn_con.lock);
-                }
-                break;
-        }
-
-        case VT_SETMODE:
-        {
-                struct vt_mode tmp;
-
-                if (!perm)
-                        goto eperm;
-                if (copy_from_user(&tmp, up, sizeof(struct vt_mode))) {
-                        ret = -EFAULT;
-                        goto out;
-                }
-                if (tmp.mode != VT_AUTO && tmp.mode != VT_PROCESS) {
-                        ret = -EINVAL;
-                        goto out;
-                }
-                acquire_console_sem();
-                vc->vt_mode = tmp;
-                /* the frsig is ignored, so we set it to 0 */
-                vc->vt_mode.frsig = 0;
-                put_pid(vc->vt_pid);
-                vc->vt_pid = get_pid(task_pid(current));
-                /* no switch is required -- saw@shade.msu.ru */
-                vc->vt_newvt = -1;
-                release_console_sem();
-                break;
-        }
-
-        case VT_GETMODE:
-        {
-                struct vt_mode tmp;
-                int rc;
-
-                acquire_console_sem();
-                memcpy(&tmp, &vc->vt_mode, sizeof(struct vt_mode));
-                release_console_sem();
-
-                rc = copy_to_user(up, &tmp, sizeof(struct vt_mode));
-                if (rc)
-                        ret = -EFAULT;
-                break;
-        }
-
-        /*
-         * Returns global vt state. Note that VT 0 is always open, since
-         * it's an alias for the current VT, and people can't use it here.
-         * We cannot return state for more than 16 VTs, since v_state is short.
-         */
-        case VT_GETSTATE:
-        {
-                struct vt_stat __user *vtstat = up;
-                unsigned short state, mask;
-
-                if (put_user(fg_console + 1, &vtstat->v_active))
-                        ret = -EFAULT;
-                else {
-                        state = 1;      /* /dev/tty0 is always open */
-                        for (i = 0, mask = 2; i < MAX_NR_CONSOLES && mask;
-                                                        ++i, mask <<= 1)
-                                if (VT_IS_IN_USE(i))
-                                        state |= mask;
-                        ret = put_user(state, &vtstat->v_state);
-                }
-                break;
-        }
-
-        /*
-         * Returns the first available (non-opened) console.
-         */
-        case VT_OPENQRY:
-                for (i = 0; i < MAX_NR_CONSOLES; ++i)
-                        if (! VT_IS_IN_USE(i))
-                                break;
-                ucval = i < MAX_NR_CONSOLES ? (i+1) : -1;
-                goto setint;             
-
-        /*
-         * ioctl(fd, VT_ACTIVATE, num) will cause us to switch to vt # num,
-         * with num >= 1 (switches to vt 0, our console, are not allowed, just
-         * to preserve sanity).
-         */
-        case VT_ACTIVATE:
-                if (!perm)
-                        goto eperm;
-                if (arg == 0 || arg > MAX_NR_CONSOLES)
-                        ret =  -ENXIO;
-                else {
-                        arg--;
-                        acquire_console_sem();
-                        ret = vc_allocate(arg);
-                        release_console_sem();
-                        if (ret)
-                                break;
-                        set_console(arg);
-                }
-                break;
-
-        case VT_SETACTIVATE:
-        {
-                struct vt_setactivate vsa;
-
-                if (!perm)
-                        goto eperm;
-
-                if (copy_from_user(&vsa, (struct vt_setactivate __user *)arg,
-                                        sizeof(struct vt_setactivate))) {
-                        ret = -EFAULT;
-                        goto out;
-                }
-                if (vsa.console == 0 || vsa.console > MAX_NR_CONSOLES)
-                        ret = -ENXIO;
-                else {
-                        vsa.console--;
-                        acquire_console_sem();
-                        ret = vc_allocate(vsa.console);
-                        if (ret == 0) {
-                                struct vc_data *nvc;
-                                /* This is safe providing we don't drop the
-                                   console sem between vc_allocate and
-                                   finishing referencing nvc */
-                                nvc = vc_cons[vsa.console].d;
-                                nvc->vt_mode = vsa.mode;
-                                nvc->vt_mode.frsig = 0;
-                                put_pid(nvc->vt_pid);
-                                nvc->vt_pid = get_pid(task_pid(current));
-                        }
-                        release_console_sem();
-                        if (ret)
-                                break;
-                        /* Commence switch and lock */
-                        set_console(arg);
-                }
-        }
-
-        /*
-         * wait until the specified VT has been activated
-         */
-        case VT_WAITACTIVE:
-                if (!perm)
-                        goto eperm;
-                if (arg == 0 || arg > MAX_NR_CONSOLES)
-                        ret = -ENXIO;
-                else
-                        ret = vt_waitactive(arg);
-                break;
-
-        /*
-         * If a vt is under process control, the kernel will not switch to it
-         * immediately, but postpone the operation until the process calls this
-         * ioctl, allowing the switch to complete.
-         *
-         * According to the X sources this is the behavior:
-         *      0:      pending switch-from not OK
-         *      1:      pending switch-from OK
-         *      2:      completed switch-to OK
-         */
-        case VT_RELDISP:
-                if (!perm)
-                        goto eperm;
-
-                if (vc->vt_mode.mode != VT_PROCESS) {
-                        ret = -EINVAL;
-                        break;
-                }
-                /*
-                 * Switching-from response
-                 */
-                acquire_console_sem();
-                if (vc->vt_newvt >= 0) {
-                        if (arg == 0)
-                                /*
-                                 * Switch disallowed, so forget we were trying
-                                 * to do it.
-                                 */
-                                vc->vt_newvt = -1;
-
-                        else {
-                                /*
-                                 * The current vt has been released, so
-                                 * complete the switch.
-                                 */
-                                int newvt;
-                                newvt = vc->vt_newvt;
-                                vc->vt_newvt = -1;
-                                ret = vc_allocate(newvt);
-                                if (ret) {
-                                        release_console_sem();
-                                        break;
-                                }
-                                /*
-                                 * When we actually do the console switch,
-                                 * make sure we are atomic with respect to
-                                 * other console switches..
-                                 */
-                                complete_change_console(vc_cons[newvt].d);
-                        }
-                } else {
-                        /*
-                         * Switched-to response
-                         */
-                        /*
-                         * If it's just an ACK, ignore it
-                         */
-                        if (arg != VT_ACKACQ)
-                                ret = -EINVAL;
-                }
-                release_console_sem();
-                break;
-
-         /*
-          * Disallocate memory associated to VT (but leave VT1)
-          */
-         case VT_DISALLOCATE:
-                if (arg > MAX_NR_CONSOLES) {
-                        ret = -ENXIO;
-                        break;
-                }
-                if (arg == 0) {
-                    /* deallocate all unused consoles, but leave 0 */
-                        acquire_console_sem();
-                        for (i=1; i<MAX_NR_CONSOLES; i++)
-                                if (! VT_BUSY(i))
-                                        vc_deallocate(i);
-                        release_console_sem();
-                } else {
-                        /* deallocate a single console, if possible */
-                        arg--;
-                        if (VT_BUSY(arg))
-                                ret = -EBUSY;
-                        else if (arg) {                       /* leave 0 */
-                                acquire_console_sem();
-                                vc_deallocate(arg);
-                                release_console_sem();
-                        }
-                }
-                break;
-
-        case VT_RESIZE:
-        {
-                struct vt_sizes __user *vtsizes = up;
-                struct vc_data *vc;
-
-                ushort ll,cc;
-                if (!perm)
-                        goto eperm;
-                if (get_user(ll, &vtsizes->v_rows) ||
-                    get_user(cc, &vtsizes->v_cols))
-                        ret = -EFAULT;
-                else {
-                        acquire_console_sem();
-                        for (i = 0; i < MAX_NR_CONSOLES; i++) {
-                                vc = vc_cons[i].d;
-
-                                if (vc) {
-                                        vc->vc_resize_user = 1;
-                                        vc_resize(vc_cons[i].d, cc, ll);
-                                }
-                        }
-                        release_console_sem();
-                }
-                break;
-        }
-
-        case VT_RESIZEX:
-        {
-                struct vt_consize __user *vtconsize = up;
-                ushort ll,cc,vlin,clin,vcol,ccol;
-                if (!perm)
-                        goto eperm;
-                if (!access_ok(VERIFY_READ, vtconsize,
-                                sizeof(struct vt_consize))) {
-                        ret = -EFAULT;
-                        break;
-                }
-                /* FIXME: Should check the copies properly */
-                __get_user(ll, &vtconsize->v_rows);
-                __get_user(cc, &vtconsize->v_cols);
-                __get_user(vlin, &vtconsize->v_vlin);
-                __get_user(clin, &vtconsize->v_clin);
-                __get_user(vcol, &vtconsize->v_vcol);
-                __get_user(ccol, &vtconsize->v_ccol);
-                vlin = vlin ? vlin : vc->vc_scan_lines;
-                if (clin) {
-                        if (ll) {
-                                if (ll != vlin/clin) {
-                                        /* Parameters don't add up */
-                                        ret = -EINVAL;
-                                        break;
-                                }
-                        } else 
-                                ll = vlin/clin;
-                }
-                if (vcol && ccol) {
-                        if (cc) {
-                                if (cc != vcol/ccol) {
-                                        ret = -EINVAL;
-                                        break;
-                                }
-                        } else
-                                cc = vcol/ccol;
-                }
-
-                if (clin > 32) {
-                        ret =  -EINVAL;
-                        break;
-                }
-                    
-                for (i = 0; i < MAX_NR_CONSOLES; i++) {
-                        if (!vc_cons[i].d)
-                                continue;
-                        acquire_console_sem();
-                        if (vlin)
-                                vc_cons[i].d->vc_scan_lines = vlin;
-                        if (clin)
-                                vc_cons[i].d->vc_font.height = clin;
-                        vc_cons[i].d->vc_resize_user = 1;
-                        vc_resize(vc_cons[i].d, cc, ll);
-                        release_console_sem();
-                }
-                break;
-        }
-
-        case PIO_FONT: {
-                if (!perm)
-                        goto eperm;
-                op.op = KD_FONT_OP_SET;
-                op.flags = KD_FONT_FLAG_OLD | KD_FONT_FLAG_DONT_RECALC; /* Compatibility */
-                op.width = 8;
-                op.height = 0;
-                op.charcount = 256;
-                op.data = up;
-                ret = con_font_op(vc_cons[fg_console].d, &op);
-                break;
-        }
-
-        case GIO_FONT: {
-                op.op = KD_FONT_OP_GET;
-                op.flags = KD_FONT_FLAG_OLD;
-                op.width = 8;
-                op.height = 32;
-                op.charcount = 256;
-                op.data = up;
-                ret = con_font_op(vc_cons[fg_console].d, &op);
-                break;
-        }
-
-        case PIO_CMAP:
-                if (!perm)
-                        ret = -EPERM;
-                else
-                        ret = con_set_cmap(up);
-                break;
-
-        case GIO_CMAP:
-                ret = con_get_cmap(up);
-                break;
-
-        case PIO_FONTX:
-        case GIO_FONTX:
-                ret = do_fontx_ioctl(cmd, up, perm, &op);
-                break;
-
-        case PIO_FONTRESET:
-        {
-                if (!perm)
-                        goto eperm;
-
-#ifdef BROKEN_GRAPHICS_PROGRAMS
-                /* With BROKEN_GRAPHICS_PROGRAMS defined, the default
-                   font is not saved. */
-                ret = -ENOSYS;
-                break;
-#else
-                {
-                op.op = KD_FONT_OP_SET_DEFAULT;
-                op.data = NULL;
-                ret = con_font_op(vc_cons[fg_console].d, &op);
-                if (ret)
-                        break;
-                con_set_default_unimap(vc_cons[fg_console].d);
-                break;
-                }
-#endif
-        }
-
-        case KDFONTOP: {
-                if (copy_from_user(&op, up, sizeof(op))) {
-                        ret = -EFAULT;
-                        break;
-                }
-                if (!perm && op.op != KD_FONT_OP_GET)
-                        goto eperm;
-                ret = con_font_op(vc, &op);
-                if (ret)
-                        break;
-                if (copy_to_user(up, &op, sizeof(op)))
-                        ret = -EFAULT;
-                break;
-        }
-
-        case PIO_SCRNMAP:
-                if (!perm)
-                        ret = -EPERM;
-                else
-                        ret = con_set_trans_old(up);
-                break;
-
-        case GIO_SCRNMAP:
-                ret = con_get_trans_old(up);
-                break;
-
-        case PIO_UNISCRNMAP:
-                if (!perm)
-                        ret = -EPERM;
-                else
-                        ret = con_set_trans_new(up);
-                break;
-
-        case GIO_UNISCRNMAP:
-                ret = con_get_trans_new(up);
-                break;
-
-        case PIO_UNIMAPCLR:
-              { struct unimapinit ui;
-                if (!perm)
-                        goto eperm;
-                ret = copy_from_user(&ui, up, sizeof(struct unimapinit));
-                if (ret)
-                        ret = -EFAULT;
-                else
-                        con_clear_unimap(vc, &ui);
-                break;
-              }
-
-        case PIO_UNIMAP:
-        case GIO_UNIMAP:
-                ret = do_unimap_ioctl(cmd, up, perm, vc);
-                break;
-
-        case VT_LOCKSWITCH:
-                if (!capable(CAP_SYS_TTY_CONFIG))
-                        goto eperm;
-                vt_dont_switch = 1;
-                break;
-        case VT_UNLOCKSWITCH:
-                if (!capable(CAP_SYS_TTY_CONFIG))
-                        goto eperm;
-                vt_dont_switch = 0;
-                break;
-        case VT_GETHIFONTMASK:
-                ret = put_user(vc->vc_hi_font_mask,
-                                        (unsigned short __user *)arg);
-                break;
-        case VT_WAITEVENT:
-                ret = vt_event_wait_ioctl((struct vt_event __user *)arg);
-                break;
-        default:
-                ret = -ENOIOCTLCMD;
-        }
-out:
-        tty_unlock();
-        return ret;
-eperm:
-        ret = -EPERM;
-        goto out;
-}
-
-void reset_vc(struct vc_data *vc)
-{
-        vc->vc_mode = KD_TEXT;
-        kbd_table[vc->vc_num].kbdmode = default_utf8 ? VC_UNICODE : VC_XLATE;
-        vc->vt_mode.mode = VT_AUTO;
-        vc->vt_mode.waitv = 0;
-        vc->vt_mode.relsig = 0;
-        vc->vt_mode.acqsig = 0;
-        vc->vt_mode.frsig = 0;
-        put_pid(vc->vt_pid);
-        vc->vt_pid = NULL;
-        vc->vt_newvt = -1;
-        if (!in_interrupt())    /* Via keyboard.c:SAK() - akpm */
-                reset_palette(vc);
-}
-
-void vc_SAK(struct work_struct *work)
-{
-        struct vc *vc_con =
-                container_of(work, struct vc, SAK_work);
-        struct vc_data *vc;
-        struct tty_struct *tty;
-
-        acquire_console_sem();
-        vc = vc_con->d;
-        if (vc) {
-                tty = vc->port.tty;
-                /*
-                 * SAK should also work in all raw modes and reset
-                 * them properly.
-                 */
-                if (tty)
-                        __do_SAK(tty);
-                reset_vc(vc);
-        }
-        release_console_sem();
-}
-
-#ifdef CONFIG_COMPAT
-
-struct compat_consolefontdesc {
-        unsigned short charcount;       /* characters in font (256 or 512) */
-        unsigned short charheight;      /* scan lines per character (1-32) */
-        compat_caddr_t chardata;        /* font data in expanded form */
-};
-
-static inline int
-compat_fontx_ioctl(int cmd, struct compat_consolefontdesc __user *user_cfd,
-                         int perm, struct console_font_op *op)
-{
-        struct compat_consolefontdesc cfdarg;
-        int i;
-
-        if (copy_from_user(&cfdarg, user_cfd, sizeof(struct compat_consolefontdesc)))
-                return -EFAULT;
-
-        switch (cmd) {
-        case PIO_FONTX:
-                if (!perm)
-                        return -EPERM;
-                op->op = KD_FONT_OP_SET;
-                op->flags = KD_FONT_FLAG_OLD;
-                op->width = 8;
-                op->height = cfdarg.charheight;
-                op->charcount = cfdarg.charcount;
-                op->data = compat_ptr(cfdarg.chardata);
-                return con_font_op(vc_cons[fg_console].d, op);
-        case GIO_FONTX:
-                op->op = KD_FONT_OP_GET;
-                op->flags = KD_FONT_FLAG_OLD;
-                op->width = 8;
-                op->height = cfdarg.charheight;
-                op->charcount = cfdarg.charcount;
-                op->data = compat_ptr(cfdarg.chardata);
-                i = con_font_op(vc_cons[fg_console].d, op);
-                if (i)
-                        return i;
-                cfdarg.charheight = op->height;
-                cfdarg.charcount = op->charcount;
-                if (copy_to_user(user_cfd, &cfdarg, sizeof(struct compat_consolefontdesc)))
-                        return -EFAULT;
-                return 0;
-        }
-        return -EINVAL;
-}
-
-struct compat_console_font_op {
-        compat_uint_t op;        /* operation code KD_FONT_OP_* */
-        compat_uint_t flags;     /* KD_FONT_FLAG_* */
-        compat_uint_t width, height;     /* font size */
-        compat_uint_t charcount;
-        compat_caddr_t data;    /* font data with height fixed to 32 */
-};
-
-static inline int
-compat_kdfontop_ioctl(struct compat_console_font_op __user *fontop,
-                         int perm, struct console_font_op *op, struct vc_data *vc)
-{
-        int i;
-
-        if (copy_from_user(op, fontop, sizeof(struct compat_console_font_op)))
-                return -EFAULT;
-        if (!perm && op->op != KD_FONT_OP_GET)
-                return -EPERM;
-        op->data = compat_ptr(((struct compat_console_font_op *)op)->data);
-        op->flags |= KD_FONT_FLAG_OLD;
-        i = con_font_op(vc, op);
-        if (i)
-                return i;
-        ((struct compat_console_font_op *)op)->data = (unsigned long)op->data;
-        if (copy_to_user(fontop, op, sizeof(struct compat_console_font_op)))
-                return -EFAULT;
-        return 0;
-}
-
-struct compat_unimapdesc {
-        unsigned short entry_ct;
-        compat_caddr_t entries;
-};
-
-static inline int
-compat_unimap_ioctl(unsigned int cmd, struct compat_unimapdesc __user *user_ud,
-                         int perm, struct vc_data *vc)
-{
-        struct compat_unimapdesc tmp;
-        struct unipair __user *tmp_entries;
-
-        if (copy_from_user(&tmp, user_ud, sizeof tmp))
-                return -EFAULT;
-        tmp_entries = compat_ptr(tmp.entries);
-        if (tmp_entries)
-                if (!access_ok(VERIFY_WRITE, tmp_entries,
-                                tmp.entry_ct*sizeof(struct unipair)))
-                        return -EFAULT;
-        switch (cmd) {
-        case PIO_UNIMAP:
-                if (!perm)
-                        return -EPERM;
-                return con_set_unimap(vc, tmp.entry_ct, tmp_entries);
-        case GIO_UNIMAP:
-                if (!perm && fg_console != vc->vc_num)
-                        return -EPERM;
-                return con_get_unimap(vc, tmp.entry_ct, &(user_ud->entry_ct), tmp_entries);
-        }
-        return 0;
-}
-
-long vt_compat_ioctl(struct tty_struct *tty, struct file * file,
-             unsigned int cmd, unsigned long arg)
-{
-        struct vc_data *vc = tty->driver_data;
-        struct console_font_op op;      /* used in multiple places here */
-        struct kbd_struct *kbd;
-        unsigned int console;
-        void __user *up = (void __user *)arg;
-        int perm;
-        int ret = 0;
-
-        console = vc->vc_num;
-
-        tty_lock();
-
-        if (!vc_cons_allocated(console)) {      /* impossible? */
-                ret = -ENOIOCTLCMD;
-                goto out;
-        }
-
-        /*
-         * To have permissions to do most of the vt ioctls, we either have
-         * to be the owner of the tty, or have CAP_SYS_TTY_CONFIG.
-         */
-        perm = 0;
-        if (current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG))
-                perm = 1;
-
-        kbd = kbd_table + console;
-        switch (cmd) {
-        /*
-         * these need special handlers for incompatible data structures
-         */
-        case PIO_FONTX:
-        case GIO_FONTX:
-                ret = compat_fontx_ioctl(cmd, up, perm, &op);
-                break;
-
-        case KDFONTOP:
-                ret = compat_kdfontop_ioctl(up, perm, &op, vc);
-                break;
-
-        case PIO_UNIMAP:
-        case GIO_UNIMAP:
-                ret = compat_unimap_ioctl(cmd, up, perm, vc);
-                break;
-
-        /*
-         * all these treat 'arg' as an integer
-         */
-        case KIOCSOUND:
-        case KDMKTONE:
-#ifdef CONFIG_X86
-        case KDADDIO:
-        case KDDELIO:
-#endif
-        case KDSETMODE:
-        case KDMAPDISP:
-        case KDUNMAPDISP:
-        case KDSKBMODE:
-        case KDSKBMETA:
-        case KDSKBLED:
-        case KDSETLED:
-        case KDSIGACCEPT:
-        case VT_ACTIVATE:
-        case VT_WAITACTIVE:
-        case VT_RELDISP:
-        case VT_DISALLOCATE:
-        case VT_RESIZE:
-        case VT_RESIZEX:
-                goto fallback;
-
-        /*
-         * the rest has a compatible data structure behind arg,
-         * but we have to convert it to a proper 64 bit pointer.
-         */
-        default:
-                arg = (unsigned long)compat_ptr(arg);
-                goto fallback;
-        }
-out:
-        tty_unlock();
-        return ret;
-
-fallback:
-        tty_unlock();
-        return vt_ioctl(tty, file, cmd, arg);
-}
-
-
-#endif /* CONFIG_COMPAT */
-
-
-/*
- * Performs the back end of a vt switch. Called under the console
- * semaphore.
- */
-static void complete_change_console(struct vc_data *vc)
-{
-        unsigned char old_vc_mode;
-        int old = fg_console;
-
-        last_console = fg_console;
-
-        /*
-         * If we're switching, we could be going from KD_GRAPHICS to
-         * KD_TEXT mode or vice versa, which means we need to blank or
-         * unblank the screen later.
-         */
-        old_vc_mode = vc_cons[fg_console].d->vc_mode;
-        switch_screen(vc);
-
-        /*
-         * This can't appear below a successful kill_pid().  If it did,
-         * then the *blank_screen operation could occur while X, having
-         * received acqsig, is waking up on another processor.  This
-         * condition can lead to overlapping accesses to the VGA range
-         * and the framebuffer (causing system lockups).
-         *
-         * To account for this we duplicate this code below only if the
-         * controlling process is gone and we've called reset_vc.
-         */
-        if (old_vc_mode != vc->vc_mode) {
-                if (vc->vc_mode == KD_TEXT)
-                        do_unblank_screen(1);
-                else
-                        do_blank_screen(1);
-        }
-
-        /*
-         * If this new console is under process control, send it a signal
-         * telling it that it has acquired. Also check if it has died and
-         * clean up (similar to logic employed in change_console())
-         */
-        if (vc->vt_mode.mode == VT_PROCESS) {
-                /*
-                 * Send the signal as privileged - kill_pid() will
-                 * tell us if the process has gone or something else
-                 * is awry
-                 */
-                if (kill_pid(vc->vt_pid, vc->vt_mode.acqsig, 1) != 0) {
-                /*
-                 * The controlling process has died, so we revert back to
-                 * normal operation. In this case, we'll also change back
-                 * to KD_TEXT mode. I'm not sure if this is strictly correct
-                 * but it saves the agony when the X server dies and the screen
-                 * remains blanked due to KD_GRAPHICS! It would be nice to do
-                 * this outside of VT_PROCESS but there is no single process
-                 * to account for and tracking tty count may be undesirable.
-                 */
-                        reset_vc(vc);
-
-                        if (old_vc_mode != vc->vc_mode) {
-                                if (vc->vc_mode == KD_TEXT)
-                                        do_unblank_screen(1);
-                                else
-                                        do_blank_screen(1);
-                        }
-                }
-        }
-
-        /*
-         * Wake anyone waiting for their VT to activate
-         */
-        vt_event_post(VT_EVENT_SWITCH, old, vc->vc_num);
-        return;
-}
-
-/*
- * Performs the front-end of a vt switch
- */
-void change_console(struct vc_data *new_vc)
-{
-        struct vc_data *vc;
-
-        if (!new_vc || new_vc->vc_num == fg_console || vt_dont_switch)
-                return;
-
-        /*
-         * If this vt is in process mode, then we need to handshake with
-         * that process before switching. Essentially, we store where that
-         * vt wants to switch to and wait for it to tell us when it's done
-         * (via VT_RELDISP ioctl).
-         *
-         * We also check to see if the controlling process still exists.
-         * If it doesn't, we reset this vt to auto mode and continue.
-         * This is a cheap way to track process control. The worst thing
-         * that can happen is: we send a signal to a process, it dies, and
-         * the switch gets "lost" waiting for a response; hopefully, the
-         * user will try again, we'll detect the process is gone (unless
-         * the user waits just the right amount of time :-) and revert the
-         * vt to auto control.
-         */
-        vc = vc_cons[fg_console].d;
-        if (vc->vt_mode.mode == VT_PROCESS) {
-                /*
-                 * Send the signal as privileged - kill_pid() will
-                 * tell us if the process has gone or something else
-                 * is awry.
-                 *
-                 * We need to set vt_newvt *before* sending the signal or we
-                 * have a race.
-                 */
-                vc->vt_newvt = new_vc->vc_num;
-                if (kill_pid(vc->vt_pid, vc->vt_mode.relsig, 1) == 0) {
-                        /*
-                         * It worked. Mark the vt to switch to and
-                         * return. The process needs to send us a
-                         * VT_RELDISP ioctl to complete the switch.
-                         */
-                        return;
-                }
-
-                /*
-                 * The controlling process has died, so we revert back to
-                 * normal operation. In this case, we'll also change back
-                 * to KD_TEXT mode. I'm not sure if this is strictly correct
-                 * but it saves the agony when the X server dies and the screen
-                 * remains blanked due to KD_GRAPHICS! It would be nice to do
-                 * this outside of VT_PROCESS but there is no single process
-                 * to account for and tracking tty count may be undesirable.
-                 */
-                reset_vc(vc);
-
-                /*
-                 * Fall through to normal (VT_AUTO) handling of the switch...
-                 */
-        }
-
-        /*
-         * Ignore all switches in KD_GRAPHICS+VT_AUTO mode
-         */
-        if (vc->vc_mode == KD_GRAPHICS)
-                return;
-
-        complete_change_console(new_vc);
-}
-
-/* Perform a kernel triggered VT switch for suspend/resume */
-
-static int disable_vt_switch;
-
-int vt_move_to_console(unsigned int vt, int alloc)
-{
-        int prev;
-
-        acquire_console_sem();
-        /* Graphics mode - up to X */
-        if (disable_vt_switch) {
-                release_console_sem();
-                return 0;
-        }
-        prev = fg_console;
-
-        if (alloc && vc_allocate(vt)) {
-                /* we can't have a free VC for now. Too bad,
-                 * we don't want to mess the screen for now. */
-                release_console_sem();
-                return -ENOSPC;
-        }
-
-        if (set_console(vt)) {
-                /*
-                 * We're unable to switch to the SUSPEND_CONSOLE.
-                 * Let the calling function know so it can decide
-                 * what to do.
-                 */
-                release_console_sem();
-                return -EIO;
-        }
-        release_console_sem();
-        tty_lock();
-        if (vt_waitactive(vt + 1)) {
-                pr_debug("Suspend: Can't switch VCs.");
-                tty_unlock();
-                return -EINTR;
-        }
-        tty_unlock();
-        return prev;
-}
-
-/*
- * Normally during a suspend, we allocate a new console and switch to it.
- * When we resume, we switch back to the original console.  This switch
- * can be slow, so on systems where the framebuffer can handle restoration
- * of video registers anyways, there's little point in doing the console
- * switch.  This function allows you to disable it by passing it '0'.
- */
-void pm_set_vt_switch(int do_switch)
-{
-        acquire_console_sem();
-        disable_vt_switch = !do_switch;
-        release_console_sem();
-}
-EXPORT_SYMBOL(pm_set_vt_switch);
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index b663d573aad9..39ccdeada791 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -67,7 +67,7 @@
  * cp foo.bit /dev/icap0
  *
  * Note that unless foo.bit is an appropriately constructed partial
- * bitstream, this has a high likelyhood of overwriting the design
+ * bitstream, this has a high likelihood of overwriting the design
  * currently programmed in the FPGA.
  */
 
@@ -81,7 +81,6 @@
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/mutex.h>
-#include <linux/smp_lock.h>
 #include <linux/sysctl.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
@@ -112,6 +111,7 @@
 #define HWICAP_DEVICES 1
 
 /* An array, which is set to true when the device is registered. */
+static DEFINE_MUTEX(hwicap_mutex);
 static bool probed_devices[HWICAP_DEVICES];
 static struct mutex icap_sem;
 
@@ -502,7 +502,7 @@ static int hwicap_open(struct inode *inode, struct file *file)
         struct hwicap_drvdata *drvdata;
         int status;
 
-        lock_kernel();
+        mutex_lock(&hwicap_mutex);
         drvdata = container_of(inode->i_cdev, struct hwicap_drvdata, cdev);
 
         status = mutex_lock_interruptible(&drvdata->sem);
@@ -528,7 +528,7 @@ static int hwicap_open(struct inode *inode, struct file *file)
  error:
         mutex_unlock(&drvdata->sem);
  out:
-        unlock_kernel();
+        mutex_unlock(&hwicap_mutex);
         return status;
 }
 
@@ -567,6 +567,7 @@ static const struct file_operations hwicap_fops = {
         .read = hwicap_read,
         .open = hwicap_open,
         .release = hwicap_release,
+        .llseek = noop_llseek,
 };
 
 static int __devinit hwicap_setup(struct device *dev, int id,
@@ -713,20 +714,29 @@ static int __devexit hwicap_remove(struct device *dev)
         return 0;               /* success */
 }
 
-static int __devinit hwicap_drv_probe(struct platform_device *pdev)
+#ifdef CONFIG_OF
+static int __devinit hwicap_of_probe(struct platform_device *op,
+                                     const struct hwicap_driver_config *config)
 {
-        struct resource *res;
-        const struct config_registers *regs;
+        struct resource res;
+        const unsigned int *id;
         const char *family;
+        int rc;
+        const struct config_registers *regs;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res)
-                return -ENODEV;
+
+        rc = of_address_to_resource(op->dev.of_node, 0, &res);
+        if (rc) {
+                dev_err(&op->dev, "invalid address\n");
+                return rc;
+        }
+
+        id = of_get_property(op->dev.of_node, "port-number", NULL);
 
         /* It's most likely that we're using V4, if the family is not
            specified */
         regs = &v4_config_registers;
-        family = pdev->dev.platform_data;
+        family = of_get_property(op->dev.of_node, "xlnx,family", NULL);
 
         if (family) {
                 if (!strcmp(family, "virtex2p")) {
@@ -737,54 +747,37 @@ static int __devinit hwicap_drv_probe(struct platform_device *pdev)
                         regs = &v5_config_registers;
                 }
         }
-
-        return hwicap_setup(&pdev->dev, pdev->id, res,
-                        &buffer_icap_config, regs);
+        return hwicap_setup(&op->dev, id ? *id : -1, &res, config,
+                        regs);
 }
-
-static int __devexit hwicap_drv_remove(struct platform_device *pdev)
+#else
+static inline int hwicap_of_probe(struct platform_device *op,
+                                  const struct hwicap_driver_config *config)
 {
-        return hwicap_remove(&pdev->dev);
+        return -EINVAL;
 }
+#endif /* CONFIG_OF */
 
-static struct platform_driver hwicap_platform_driver = {
-        .probe = hwicap_drv_probe,
-        .remove = hwicap_drv_remove,
-        .driver = {
-                .owner = THIS_MODULE,
-                .name = DRIVER_NAME,
-        },
-};
-
-/* ---------------------------------------------------------------------
- * OF bus binding
- */
-
-#if defined(CONFIG_OF)
-static int __devinit
-hwicap_of_probe(struct platform_device *op, const struct of_device_id *match)
+static const struct of_device_id __devinitconst hwicap_of_match[];
+static int __devinit hwicap_drv_probe(struct platform_device *pdev)
 {
-        struct resource res;
-        const unsigned int *id;
-        const char *family;
-        int rc;
-        const struct hwicap_driver_config *config = match->data;
+        const struct of_device_id *match;
+        struct resource *res;
         const struct config_registers *regs;
+        const char *family;
 
-        dev_dbg(&op->dev, "hwicap_of_probe(%p, %p)\n", op, match);
-
-        rc = of_address_to_resource(op->dev.of_node, 0, &res);
-        if (rc) {
-                dev_err(&op->dev, "invalid address\n");
-                return rc;
-        }
+        match = of_match_device(hwicap_of_match, &pdev->dev);
+        if (match)
+                return hwicap_of_probe(pdev, match->data);
 
-        id = of_get_property(op->dev.of_node, "port-number", NULL);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENODEV;
 
         /* It's most likely that we're using V4, if the family is not
            specified */
         regs = &v4_config_registers;
-        family = of_get_property(op->dev.of_node, "xlnx,family", NULL);
+        family = pdev->dev.platform_data;
 
         if (family) {
                 if (!strcmp(family, "virtex2p")) {
@@ -795,50 +788,38 @@ hwicap_of_probe(struct platform_device *op, const struct of_device_id *match)
                         regs = &v5_config_registers;
                 }
         }
-        return hwicap_setup(&op->dev, id ? *id : -1, &res, config,
-                        regs);
+
+        return hwicap_setup(&pdev->dev, pdev->id, res,
+                        &buffer_icap_config, regs);
 }
 
-static int __devexit hwicap_of_remove(struct platform_device *op)
+static int __devexit hwicap_drv_remove(struct platform_device *pdev)
 {
-        return hwicap_remove(&op->dev);
+        return hwicap_remove(&pdev->dev);
 }
 
-/* Match table for of_platform binding */
+#ifdef CONFIG_OF
+/* Match table for device tree binding */
 static const struct of_device_id __devinitconst hwicap_of_match[] = {
         { .compatible = "xlnx,opb-hwicap-1.00.b", .data = &buffer_icap_config},
         { .compatible = "xlnx,xps-hwicap-1.00.a", .data = &fifo_icap_config},
         {},
 };
 MODULE_DEVICE_TABLE(of, hwicap_of_match);
+#else
+#define hwicap_of_match NULL
+#endif
 
-static struct of_platform_driver hwicap_of_driver = {
-        .probe = hwicap_of_probe,
-        .remove = __devexit_p(hwicap_of_remove),
+static struct platform_driver hwicap_platform_driver = {
+        .probe = hwicap_drv_probe,
+        .remove = hwicap_drv_remove,
         .driver = {
-                .name = DRIVER_NAME,
                 .owner = THIS_MODULE,
+                .name = DRIVER_NAME,
                 .of_match_table = hwicap_of_match,
         },
 };
 
-/* Registration helpers to keep the number of #ifdefs to a minimum */
-static inline int __init hwicap_of_register(void)
-{
-        pr_debug("hwicap: calling of_register_platform_driver()\n");
-        return of_register_platform_driver(&hwicap_of_driver);
-}
-
-static inline void __exit hwicap_of_unregister(void)
-{
-        of_unregister_platform_driver(&hwicap_of_driver);
-}
-#else /* CONFIG_OF */
-/* CONFIG_OF not enabled; do nothing helpers */
-static inline int __init hwicap_of_register(void) { return 0; }
-static inline void __exit hwicap_of_unregister(void) { }
-#endif /* CONFIG_OF */
-
 static int __init hwicap_module_init(void)
 {
         dev_t devt;
@@ -855,21 +836,12 @@ static int __init hwicap_module_init(void)
                 return retval;
 
         retval = platform_driver_register(&hwicap_platform_driver);
-
-        if (retval)
-                goto failed1;
-
-        retval = hwicap_of_register();
-
         if (retval)
-                goto failed2;
+                goto failed;
 
         return retval;
 
- failed2:
-        platform_driver_unregister(&hwicap_platform_driver);
-
- failed1:
+ failed:
         unregister_chrdev_region(devt, HWICAP_DEVICES);
 
         return retval;
@@ -883,8 +855,6 @@ static void __exit hwicap_module_cleanup(void)
 
         platform_driver_unregister(&hwicap_platform_driver);
 
-        hwicap_of_unregister();
-
         unregister_chrdev_region(devt, HWICAP_DEVICES);
 }