tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 23 Feb 2011 00:23:22 +0000 (16:23 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 23 Feb 2011 00:23:22 +0000 (16:23 -0800)
As planned by Arnd Bergmann, this moves the ipwireless driver to the
drivers/tty/ directory as that's where it really belongs.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: David Sterba <dsterba@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
22 files changed:
MAINTAINERS
drivers/char/pcmcia/ipwireless/Makefile [deleted file]
drivers/char/pcmcia/ipwireless/hardware.c [deleted file]
drivers/char/pcmcia/ipwireless/hardware.h [deleted file]
drivers/char/pcmcia/ipwireless/main.c [deleted file]
drivers/char/pcmcia/ipwireless/main.h [deleted file]
drivers/char/pcmcia/ipwireless/network.c [deleted file]
drivers/char/pcmcia/ipwireless/network.h [deleted file]
drivers/char/pcmcia/ipwireless/setup_protocol.h [deleted file]
drivers/char/pcmcia/ipwireless/tty.c [deleted file]
drivers/char/pcmcia/ipwireless/tty.h [deleted file]
drivers/tty/Makefile
drivers/tty/ipwireless/Makefile [new file with mode: 0644]
drivers/tty/ipwireless/hardware.c [new file with mode: 0644]
drivers/tty/ipwireless/hardware.h [new file with mode: 0644]
drivers/tty/ipwireless/main.c [new file with mode: 0644]
drivers/tty/ipwireless/main.h [new file with mode: 0644]
drivers/tty/ipwireless/network.c [new file with mode: 0644]
drivers/tty/ipwireless/network.h [new file with mode: 0644]
drivers/tty/ipwireless/setup_protocol.h [new file with mode: 0644]
drivers/tty/ipwireless/tty.c [new file with mode: 0644]
drivers/tty/ipwireless/tty.h [new file with mode: 0644]

index 1eaeda66a525402eadc392826b2fd18c46bbad99..e39337a1b958706719211c5524eb01a856475d63 100644 (file)
@@ -3423,7 +3423,7 @@ M:        Jiri Kosina <jkosina@suse.cz>
 M:     David Sterba <dsterba@suse.cz>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
-F:     drivers/char/pcmcia/ipwireless/
+F:     drivers/tty/ipwireless/
 
 IPX NETWORK LAYER
 M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
diff --git a/drivers/char/pcmcia/ipwireless/Makefile b/drivers/char/pcmcia/ipwireless/Makefile
deleted file mode 100644 (file)
index db80873..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# drivers/char/pcmcia/ipwireless/Makefile
-#
-# Makefile for the IPWireless driver
-#
-
-obj-$(CONFIG_IPWIRELESS) += ipwireless.o
-
-ipwireless-y := 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 (file)
index 0aeb5a3..0000000
+++ /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_work_sync(&hw->work_rx);
-
-       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 (file)
index 90a8590..0000000
+++ /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 (file)
index 94b8eb4..0000000
+++ /dev/null
@@ -1,335 +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>
-
-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, void *priv_data)
-{
-       struct ipw_dev *ipw = priv_data;
-       struct resource *io_resource;
-       int ret;
-
-       p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-       p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-
-       /* 0x40 causes it to generate level mode interrupts. */
-       /* 0x04 enables IREQ pin. */
-       p_dev->config_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);
-
-       p_dev->resource[2]->flags |=
-               WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM | WIN_ENABLE;
-
-       ret = pcmcia_request_window(p_dev, p_dev->resource[2], 0);
-       if (ret != 0)
-               goto exit1;
-
-       ret = pcmcia_map_mem_page(p_dev, p_dev->resource[2], p_dev->card_addr);
-       if (ret != 0)
-               goto exit2;
-
-       ipw->is_v2_card = resource_size(p_dev->resource[2]) == 0x100;
-
-       ipw->attr_memory = ioremap(p_dev->resource[2]->start,
-                               resource_size(p_dev->resource[2]));
-       request_mem_region(p_dev->resource[2]->start,
-                       resource_size(p_dev->resource[2]),
-                       IPWIRELESS_PCCARD_NAME);
-
-       p_dev->resource[3]->flags |= WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM |
-                                       WIN_ENABLE;
-       p_dev->resource[3]->end = 0; /* this used to be 0x1000 */
-       ret = pcmcia_request_window(p_dev, p_dev->resource[3], 0);
-       if (ret != 0)
-               goto exit2;
-
-       ret = pcmcia_map_mem_page(p_dev, p_dev->resource[3], 0);
-       if (ret != 0)
-               goto exit3;
-
-       ipw->attr_memory = ioremap(p_dev->resource[3]->start,
-                               resource_size(p_dev->resource[3]));
-       request_mem_region(p_dev->resource[3]->start,
-                       resource_size(p_dev->resource[3]),
-                       IPWIRELESS_PCCARD_NAME);
-
-       return 0;
-
-exit3:
-exit2:
-       if (ipw->common_memory) {
-               release_mem_region(p_dev->resource[2]->start,
-                               resource_size(p_dev->resource[2]));
-               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;
-       link->config_flags |= CONF_AUTO_SET_IO | CONF_AUTO_SET_IOMEM |
-               CONF_ENABLE_IRQ;
-
-       ret = pcmcia_loop_config(link, ipwireless_probe, ipw);
-       if (ret != 0)
-               return ret;
-
-       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 %pR, common memory %pR\n",
-                       link->resource[3],
-                       link->resource[2]);
-
-       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_enable_device(link);
-       if (ret != 0)
-               goto exit;
-
-       return 0;
-
-exit:
-       if (ipw->common_memory) {
-               release_mem_region(link->resource[2]->start,
-                               resource_size(link->resource[2]));
-               iounmap(ipw->common_memory);
-       }
-       if (ipw->attr_memory) {
-               release_mem_region(link->resource[3]->start,
-                               resource_size(link->resource[3]));
-               iounmap(ipw->attr_memory);
-       }
-       pcmcia_disable_device(link);
-       return -1;
-}
-
-static void release_ipwireless(struct ipw_dev *ipw)
-{
-       if (ipw->common_memory) {
-               release_mem_region(ipw->link->resource[2]->start,
-                               resource_size(ipw->link->resource[2]));
-               iounmap(ipw->common_memory);
-       }
-       if (ipw->attr_memory) {
-               release_mem_region(ipw->link->resource[3]->start,
-                               resource_size(ipw->link->resource[3]));
-               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,
-       .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;
-
-       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)
-{
-       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 (file)
index f2cbb11..0000000
+++ /dev/null
@@ -1,68 +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/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;
-
-       void __iomem *attr_memory;
-
-       void __iomem *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 (file)
index f7daeea..0000000
+++ /dev/null
@@ -1,508 +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_work_sync(&network->work_go_online);
-       flush_work_sync(&network->work_go_offline);
-
-       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 (file)
index 561f765..0000000
+++ /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 (file)
index 9d6bcc7..0000000
+++ /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 (file)
index ef92869..0000000
+++ /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 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,
-            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,
-                    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 -ENOIOCTLCMD;
-}
-
-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_work_sync(&ttyj->linux_tty->hangup_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 (file)
index 747b2d6..0000000
+++ /dev/null
@@ -1,45 +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/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
index e549da348a0425de4e34bf91d02ff77536665556..690522fcb338f1b9fd7cd79a23e69eecfa26e030 100644 (file)
@@ -24,3 +24,5 @@ obj-$(CONFIG_ROCKETPORT)      += rocket.o
 obj-$(CONFIG_SYNCLINK_GT)      += synclink_gt.o
 obj-$(CONFIG_SYNCLINKMP)       += synclinkmp.o
 obj-$(CONFIG_SYNCLINK)         += synclink.o
+
+obj-y += ipwireless/
diff --git a/drivers/tty/ipwireless/Makefile b/drivers/tty/ipwireless/Makefile
new file mode 100644 (file)
index 0000000..db80873
--- /dev/null
@@ -0,0 +1,10 @@
+#
+# drivers/char/pcmcia/ipwireless/Makefile
+#
+# Makefile for the IPWireless driver
+#
+
+obj-$(CONFIG_IPWIRELESS) += ipwireless.o
+
+ipwireless-y := hardware.o main.o network.o tty.o
+
diff --git a/drivers/tty/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c
new file mode 100644 (file)
index 0000000..0aeb5a3
--- /dev/null
@@ -0,0 +1,1764 @@
+/*
+ * 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_work_sync(&hw->work_rx);
+
+       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/tty/ipwireless/hardware.h b/drivers/tty/ipwireless/hardware.h
new file mode 100644 (file)
index 0000000..90a8590
--- /dev/null
@@ -0,0 +1,62 @@
+/*
+ * 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/tty/ipwireless/main.c b/drivers/tty/ipwireless/main.c
new file mode 100644 (file)
index 0000000..94b8eb4
--- /dev/null
@@ -0,0 +1,335 @@
+/*
+ * 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>
+
+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, void *priv_data)
+{
+       struct ipw_dev *ipw = priv_data;
+       struct resource *io_resource;
+       int ret;
+
+       p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+       p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
+
+       /* 0x40 causes it to generate level mode interrupts. */
+       /* 0x04 enables IREQ pin. */
+       p_dev->config_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);
+
+       p_dev->resource[2]->flags |=
+               WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM | WIN_ENABLE;
+
+       ret = pcmcia_request_window(p_dev, p_dev->resource[2], 0);
+       if (ret != 0)
+               goto exit1;
+
+       ret = pcmcia_map_mem_page(p_dev, p_dev->resource[2], p_dev->card_addr);
+       if (ret != 0)
+               goto exit2;
+
+       ipw->is_v2_card = resource_size(p_dev->resource[2]) == 0x100;
+
+       ipw->attr_memory = ioremap(p_dev->resource[2]->start,
+                               resource_size(p_dev->resource[2]));
+       request_mem_region(p_dev->resource[2]->start,
+                       resource_size(p_dev->resource[2]),
+                       IPWIRELESS_PCCARD_NAME);
+
+       p_dev->resource[3]->flags |= WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM |
+                                       WIN_ENABLE;
+       p_dev->resource[3]->end = 0; /* this used to be 0x1000 */
+       ret = pcmcia_request_window(p_dev, p_dev->resource[3], 0);
+       if (ret != 0)
+               goto exit2;
+
+       ret = pcmcia_map_mem_page(p_dev, p_dev->resource[3], 0);
+       if (ret != 0)
+               goto exit3;
+
+       ipw->attr_memory = ioremap(p_dev->resource[3]->start,
+                               resource_size(p_dev->resource[3]));
+       request_mem_region(p_dev->resource[3]->start,
+                       resource_size(p_dev->resource[3]),
+                       IPWIRELESS_PCCARD_NAME);
+
+       return 0;
+
+exit3:
+exit2:
+       if (ipw->common_memory) {
+               release_mem_region(p_dev->resource[2]->start,
+                               resource_size(p_dev->resource[2]));
+               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;
+       link->config_flags |= CONF_AUTO_SET_IO | CONF_AUTO_SET_IOMEM |
+               CONF_ENABLE_IRQ;
+
+       ret = pcmcia_loop_config(link, ipwireless_probe, ipw);
+       if (ret != 0)
+               return ret;
+
+       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 %pR, common memory %pR\n",
+                       link->resource[3],
+                       link->resource[2]);
+
+       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_enable_device(link);
+       if (ret != 0)
+               goto exit;
+
+       return 0;
+
+exit:
+       if (ipw->common_memory) {
+               release_mem_region(link->resource[2]->start,
+                               resource_size(link->resource[2]));
+               iounmap(ipw->common_memory);
+       }
+       if (ipw->attr_memory) {
+               release_mem_region(link->resource[3]->start,
+                               resource_size(link->resource[3]));
+               iounmap(ipw->attr_memory);
+       }
+       pcmcia_disable_device(link);
+       return -1;
+}
+
+static void release_ipwireless(struct ipw_dev *ipw)
+{
+       if (ipw->common_memory) {
+               release_mem_region(ipw->link->resource[2]->start,
+                               resource_size(ipw->link->resource[2]));
+               iounmap(ipw->common_memory);
+       }
+       if (ipw->attr_memory) {
+               release_mem_region(ipw->link->resource[3]->start,
+                               resource_size(ipw->link->resource[3]));
+               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,
+       .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;
+
+       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)
+{
+       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/tty/ipwireless/main.h b/drivers/tty/ipwireless/main.h
new file mode 100644 (file)
index 0000000..f2cbb11
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+ * 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/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;
+
+       void __iomem *attr_memory;
+
+       void __iomem *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/tty/ipwireless/network.c b/drivers/tty/ipwireless/network.c
new file mode 100644 (file)
index 0000000..f7daeea
--- /dev/null
@@ -0,0 +1,508 @@
+/*
+ * 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_work_sync(&network->work_go_online);
+       flush_work_sync(&network->work_go_offline);
+
+       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/tty/ipwireless/network.h b/drivers/tty/ipwireless/network.h
new file mode 100644 (file)
index 0000000..561f765
--- /dev/null
@@ -0,0 +1,53 @@
+/*
+ * 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/tty/ipwireless/setup_protocol.h b/drivers/tty/ipwireless/setup_protocol.h
new file mode 100644 (file)
index 0000000..9d6bcc7
--- /dev/null
@@ -0,0 +1,108 @@
+/*
+ * 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/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
new file mode 100644 (file)
index 0000000..ef92869
--- /dev/null
@@ -0,0 +1,679 @@
+/*
+ * 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 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,
+            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,
+                    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 -ENOIOCTLCMD;
+}
+
+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_work_sync(&ttyj->linux_tty->hangup_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/tty/ipwireless/tty.h b/drivers/tty/ipwireless/tty.h
new file mode 100644 (file)
index 0000000..747b2d6
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * 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/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