I also ported in the serial_cs module from pcmcia 3.1.1. I placed it
in drivers/char/pcmcia, a new subdir, and added a new submenu in
the Character devices menu for this module. There's some help for
it now, too.
Thanks to Keith Owens <kaos@ocs.com.au> for help with the first bit!
Stephen Foskett
sfoskett@slf.gweep.net
-- cut here --
diff -ur linux.v2.3.26/Documentation/Configure.help linux/Documentation/Configure.help
--- linux.v2.3.26/Documentation/Configure.help Wed Nov 10 22:18:14 1999
+++ linux/Documentation/Configure.help Wed Nov 10 22:51:22 1999
@@ -9946,6 +9946,22 @@
determined automatically, so you need to specify it here ONLY if
running a DEC Alpha, otherwise this setting has no effect.
+PCMCIA character device support
+CONFIG_CHAR_PCMCIA
+ Say Y if you would like to include support for any PCMCIA character
+ devices, specifically serial modems. If unsure, say N.
+
+Generic serial device support
+CONFIG_PCMCIA_SERIAL
+ Say Y here if you intend to attach any sort of serial PCMCIA
+ (PC-card) adapter, such as a modem.
+
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called serial_cs.o. If you want to compile it as a
+ module, say M here and read Documentation/modules.txt. If unsure,
+ say N.
+
Zilog serial support
CONFIG_SUN_ZS
This driver does not exist at this point, so you might as well
diff -ur linux.v2.3.26/Makefile linux/Makefile
--- linux.v2.3.26/Makefile Wed Nov 10 22:06:34 1999
+++ linux/Makefile Wed Nov 10 22:52:46 1999
@@ -166,6 +166,10 @@
DRIVERS := $(DRIVERS) drivers/net/pcmcia/pcmcia_net.o
endif
+ifeq ($(CONFIG_PCMCIA_CHARCARD),y)
+DRIVERS := $(DRIVERS) drivers/net/pcmcia/pcmcia_char.o
+endif
+
ifdef CONFIG_DIO
DRIVERS := $(DRIVERS) drivers/dio/dio.a
endif
@@ -362,6 +366,8 @@
if [ -f IRDA_MODULES ]; then inst_mod IRDA_MODULES net; fi; \
if [ -f USB_MODULES ]; then inst_mod USB_MODULES usb; fi; \
if [ -f PCMCIA_MODULES ]; then inst_mod PCMCIA_MODULES pcmcia; fi; \
+ if [ -f PCMCIA_NET_MODULES ]; then inst_mod PCMCIA_NET_MODULES pcmcia; fi; \
+ if [ -f PCMCIA_CHAR_MODULES ]; then inst_mod PCMCIA_CHAR_MODULES pcmcia; fi; \
\
ls *.o > $$MODLIB/.allmods; \
echo $$MODULES | tr ' ' '\n' | sort | comm -23 $$MODLIB/.allmods - > $$MODLIB/.misc; \
diff -ur linux.v2.3.26/drivers/char/Config.in linux/drivers/char/Config.in
--- linux.v2.3.26/drivers/char/Config.in Wed Nov 10 18:19:06 1999
+++ linux/drivers/char/Config.in Wed Nov 10 22:54:54 1999
@@ -221,4 +221,8 @@
fi
fi
+if [ "$CONFIG_PCMCIA" != "n" ]; then
+ source drivers/char/pcmcia/Config.in
+fi
+
endmenu
diff -ur linux.v2.3.26/drivers/char/Makefile linux/drivers/char/Makefile
--- linux.v2.3.26/drivers/char/Makefile Wed Nov 10 22:49:25 1999
+++ linux/drivers/char/Makefile Wed Nov 10 22:50:03 1999
@@ -546,6 +546,15 @@
endif
endif
+ifeq ($(CONFIG_PCMCIA),y)
+ SUB_DIRS += pcmcia
+ MOD_IN_SUB_DIRS += pcmcia
+else
+ ifeq ($(CONFIG_PCMCIA),m)
+ MOD_IN_SUB_DIRS += pcmcia
+ endif
+endif
+
ifeq ($(CONFIG_FTAPE),y)
O_OBJS += ftape/ftape.o
SUB_DIRS += ftape
diff -ur linux.v2.3.26/drivers/char/pcmcia/Config.in linux/drivers/char/pcmcia/Config.in
--- linux.v2.3.26/drivers/char/pcmcia/Config.in Wed Nov 10 18:20:57 1999
+++ linux/drivers/char/pcmcia/Config.in Wed Nov 10 22:59:38 1999
@@ -0,0 +1,22 @@
+#
+# PCMCIA Char device configuration
+#
+
+mainmenu_option next_comment
+comment 'PCMCIA character device support'
+
+bool 'PCMCIA character device support' CONFIG_CHAR_PCMCIA
+if [ "$CONFIG_CHAR_PCMCIA" = "y" ]; then
+ dep_tristate ' Generic Serial PCMCIA support' CONFIG_PCMCIA_SERIAL $CONFIG_PCMCIA
+ # if [ "$CONFIG_CARDBUS" = "y" ]; then
+ # dep_tristate ' Generic Serial CardBus support' CONFIG_PCMCIA_SERIAL_CB $CONFIG_
+PCMCIA
+ # fi
+fi
+
+if [ "$CONFIG_PCMCIA_SERIAL" = "y" \
+ ]; then
+ define_bool CONFIG_PCMCIA_CHARCARD y
+fi
+
+endmenu
diff -ur linux.v2.3.26/drivers/char/pcmcia/Makefile linux/drivers/char/pcmcia/Makefile
--- linux.v2.3.26/drivers/char/pcmcia/Makefile Wed Nov 10 18:20:53 1999
+++ linux/drivers/char/pcmcia/Makefile Wed Nov 10 22:56:32 1999
@@ -0,0 +1,24 @@
+#
+# drivers/char/pcmcia/Makefile
+#
+# Makefile for the Linux PCMCIA char device drivers.
+#
+
+SUB_DIRS :=
+MOD_SUB_DIRS := $(SUB_DIRS)
+ALL_SUB_DIRS := $(SUB_DIRS)
+
+O_TARGET := pcmcia_char.o
+O_OBJS :=
+M_OBJS :=
+MOD_LIST_NAME := PCMCIA_CHAR_MODULES
+
+ifeq ($(CONFIG_PCMCIA_SERIAL),y)
+ O_OBJS += serial_cs.o
+else
+ ifeq ($(CONFIG_PCMCIA_SERIAL),m)
+ M_OBJS += serial_cs.o
+ endif
+endif
+
+include $(TOPDIR)/Rules.make
diff -ur linux.v2.3.26/drivers/char/pcmcia/serial_cs.c linux/drivers/char/pcmcia/serial_cs.c
--- linux.v2.3.26/drivers/char/pcmcia/serial_cs.c Wed Nov 10 18:21:01 1999
+++ linux/drivers/char/pcmcia/serial_cs.c Wed Nov 10 23:00:44 1999
@@ -0,0 +1,669 @@
+/*======================================================================
+
+ A driver for PCMCIA serial devices
+
+ serial_cs.c 1.111a 1999/11/10
+
+ The contents of this file are subject to the Mozilla Public
+ License Version 1.1 (the "License"); you may not use this file
+ except in compliance with the License. You may obtain a copy of
+ the License at http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS
+ IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ rights and limitations under the License.
+
+ The initial developer of the original code is David A. Hinds
+ <dhinds@hyper.stanford.edu>. Portions created by David A. Hinds
+ are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
+
+ Slightly modified for Linux Kernel inclusion by Stephen Foskett.
+
+ Alternatively, the contents of this file may be used under the
+ terms of the GNU Public License version 2 (the "GPL"), in which
+ case the provisions of the GPL are applicable instead of the
+ above. If you wish to allow the use of your version of this file
+ only under the terms of the GPL and not to allow others to use
+ your version of this file under the MPL, indicate your decision
+ by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL. If you do not delete
+ the provisions above, a recipient may use your version of this
+ file under either the MPL or the GPL.
+
+======================================================================*/
+
+#include <linux/config.h>
+#include <linux/module.h>
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/ptrace.h>
+#include <linux/malloc.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/tty.h>
+#include <linux/serial.h>
+#include <linux/major.h>
+#include <asm/io.h>
+#include <asm/system.h>
+
+#include <pcmcia/version.h>
+#include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/ciscode.h>
+#include <pcmcia/ds.h>
+#include <pcmcia/cisreg.h>
+
+#ifdef PCMCIA_DEBUG
+static int pc_debug = PCMCIA_DEBUG;
+MODULE_PARM(pc_debug, "i");
+#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
+static char *version =
+"serial_cs.c 1.111 1999/09/16 03:57:08 (David Hinds)";
+#else
+#define DEBUG(n, args...)
+#endif
+
+/*====================================================================*/
+
+/* Parameters that can be set with 'insmod' */
+
+/* Bit map of interrupts to choose from */
+static u_int irq_mask = 0xdeb8;
+static int irq_list[4] = { -1 };
+
+/* Enable the speaker? */
+static int do_sound = 1;
+
+MODULE_PARM(irq_mask, "i");
+MODULE_PARM(irq_list, "1-4i");
+MODULE_PARM(do_sound, "i");
+
+/*====================================================================*/
+
+/* Table of multi-port card ID's */
+
+typedef struct {
+ u_short manfid;
+ u_short prodid;
+ int multi; /* 1 = multifunction, > 1 = # ports */
+} multi_id_t;
+
+static multi_id_t multi_id[] = {
+ { MANFID_OMEGA, PRODID_OMEGA_QSP_100, 4 },
+ { MANFID_QUATECH, PRODID_QUATECH_DUAL_RS232, 2 },
+ { MANFID_QUATECH, PRODID_QUATECH_DUAL_RS232_D1, 2 },
+ { MANFID_QUATECH, PRODID_QUATECH_QUAD_RS232, 4 },
+ { MANFID_SOCKET, PRODID_SOCKET_DUAL_RS232, 2 },
+ { MANFID_INTEL, PRODID_INTEL_DUAL_RS232, 2 },
+ { MANFID_NATINST, PRODID_NATINST_QUAD_RS232, 4 }
+};
+#define MULTI_COUNT (sizeof(multi_id)/sizeof(multi_id_t))
+
+typedef struct serial_info_t {
+ int ndev;
+ int multi;
+ int slave;
+ int manfid;
+ dev_node_t node[4];
+ int line[4];
+} serial_info_t;
+
+static void serial_config(dev_link_t *link);
+static void serial_release(u_long arg);
+static int serial_event(event_t event, int priority,
+ event_callback_args_t *args);
+
+static dev_info_t dev_info = "serial_cs";
+
+static dev_link_t *serial_attach(void);
+static void serial_detach(dev_link_t *);
+
+static dev_link_t *dev_list = NULL;
+
+/*====================================================================*/
+
+static void cs_error(client_handle_t handle, int func, int ret)
+{
+ error_info_t err = { func, ret };
+ CardServices(ReportError, handle, &err);
+}
+
+/*======================================================================
+
+ serial_attach() creates an "instance" of the driver, allocating
+ local data structures for one device. The device is registered
+ with Card Services.
+
+======================================================================*/
+
+static dev_link_t *serial_attach(void)
+{
+ client_reg_t client_reg;
+ dev_link_t *link;
+ int i, ret;
+
+ DEBUG(0, "serial_attach()\n");
+
+ /* Create new serial device */
+ link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);
+ memset(link, 0, sizeof(struct dev_link_t));
+ link->release.function = &serial_release;
+ link->release.data = (u_long)link;
+ link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+ link->io.NumPorts1 = 8;
+ link->io.IOAddrLines = 3;
+ link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+ link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
+ if (irq_list[0] == -1)
+ link->irq.IRQInfo2 = irq_mask;
+ else
+ for (i = 0; i < 4; i++)
+ link->irq.IRQInfo2 |= 1 << irq_list[i];
+ link->conf.Attributes = CONF_ENABLE_IRQ;
+ link->conf.Vcc = 50;
+ if (do_sound) {
+ link->conf.Attributes |= CONF_ENABLE_SPKR;
+ link->conf.Status = CCSR_AUDIO_ENA;
+ }
+ link->conf.IntType = INT_MEMORY_AND_IO;
+ link->priv = kmalloc(sizeof(struct serial_info_t), GFP_KERNEL);
+ memset(link->priv, 0, sizeof(struct serial_info_t));
+
+ /* Register with Card Services */
+ link->next = dev_list;
+ dev_list = link;
+ client_reg.dev_info = &dev_info;
+ client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
+ client_reg.EventMask =
+ CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
+ CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
+ CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
+ client_reg.event_handler = &serial_event;
+ client_reg.Version = 0x0210;
+ client_reg.event_callback_args.client_data = link;
+ ret = CardServices(RegisterClient, &link->handle, &client_reg);
+ if (ret != CS_SUCCESS) {
+ cs_error(link->handle, RegisterClient, ret);
+ serial_detach(link);
+ return NULL;
+ }
+
+ return link;
+} /* serial_attach */
+
+/*======================================================================
+
+ 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 serial_detach(dev_link_t *link)
+{
+ dev_link_t **linkp;
+ long flags;
+ int ret;
+
+ DEBUG(0, "serial_detach(0x%p)\n", link);
+
+ /* Locate device structure */
+ for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
+ if (*linkp == link) break;
+ if (*linkp == NULL)
+ return;
+
+ save_flags(flags);
+ cli();
+ if (link->state & DEV_RELEASE_PENDING) {
+ del_timer(&link->release);
+ link->state &= ~DEV_RELEASE_PENDING;
+ }
+ restore_flags(flags);
+
+ if (link->state & DEV_CONFIG)
+ serial_release((u_long)link);
+
+ if (link->handle) {
+ ret = CardServices(DeregisterClient, link->handle);
+ if (ret != CS_SUCCESS)
+ cs_error(link->handle, DeregisterClient, ret);
+ }
+
+ /* Unlink device structure, free bits */
+ *linkp = link->next;
+ kfree_s(link->priv, sizeof(serial_info_t));
+ kfree_s(link, sizeof(struct dev_link_t));
+
+} /* serial_detach */
+
+/*====================================================================*/
+
+static int setup_serial(serial_info_t *info, ioaddr_t port, int irq)
+{
+ struct serial_struct serial;
+ int line;
+
+ memset(&serial, 0, sizeof(serial));
+ serial.port = port;
+ serial.irq = irq;
+ serial.flags = ASYNC_SKIP_TEST;
+ serial.flags |= (info->multi || info->slave) ? ASYNC_SHARE_IRQ : 0;
+ line = register_serial(&serial);
+ if (line < 0) {
+ printk(KERN_NOTICE "serial_cs: register_serial() at 0x%04x, "
+ "irq %d failed\n", serial.port, serial.irq);
+ return -1;
+ }
+
+ info->line[info->ndev] = line;
+ sprintf(info->node[info->ndev].dev_name, "ttyS%d", line);
+ info->node[info->ndev].major = TTY_MAJOR;
+ info->node[info->ndev].minor = 0x40+line;
+ if (info->ndev > 0)
+ info->node[info->ndev-1].next = &info->node[info->ndev];
+ info->ndev++;
+
+ return 0;
+}
+
+/*====================================================================*/
+
+static int get_tuple(int fn, client_handle_t handle, tuple_t *tuple,
+ cisparse_t *parse)
+{
+ int i;
+ i = CardServices(fn, handle, tuple);
+ if (i != CS_SUCCESS) return CS_NO_MORE_ITEMS;
+ i = CardServices(GetTupleData, handle, tuple);
+ if (i != CS_SUCCESS) return i;
+ return CardServices(ParseTuple, handle, tuple, parse);
+}
+
+#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c)
+
+/*====================================================================*/
+
+static int simple_config(dev_link_t *link)
+{
+ static ioaddr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
+ client_handle_t handle = link->handle;
+ serial_info_t *info = link->priv;
+ tuple_t tuple;
+ u_char buf[256];
+ cisparse_t parse;
+ cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+ config_info_t config;
+ int i, j;
+
+ /* If the card is already configured, look up the port and irq */
+ i = CardServices(GetConfigurationInfo, handle, &config);
+ if ((i == CS_SUCCESS) &&
+ (config.Attributes & CONF_VALID_CLIENT)) {
+ ioaddr_t port = 0;
+ if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) {
+ port = config.BasePort2;
+ info->slave = 1;
+ } else if ((info->manfid == MANFID_OSITECH) &&
+ (config.NumPorts1 == 0x40)) {
+ port = config.BasePort1 + 0x28;
+ info->slave = 1;
+ }
+ if (info->slave)
+ return setup_serial(info, port, config.AssignedIRQ);
+ }
+ link->conf.Vcc = config.Vcc;
+
+ /* First pass: look for a config entry that looks normal. */
+ tuple.TupleData = (cisdata_t *)buf;
+ tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
+ tuple.Attributes = 0;
+ tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+ i = first_tuple(handle, &tuple, &parse);
+ while (i != CS_NO_MORE_ITEMS) {
+ if (i != CS_SUCCESS) goto next_entry;
+ if (cf->vpp1.present & (1<<CISTPL_POWER_VNOM))
+ link->conf.Vpp1 = link->conf.Vpp2 =
+ cf->vpp1.param[CISTPL_POWER_VNOM]/10000;
+ if ((cf->io.nwin > 0) && ((cf->io.win[0].base & 0xf) == 8)) {
+ link->conf.ConfigIndex = cf->index;
+ link->io.BasePort1 = cf->io.win[0].base;
+ i = CardServices(RequestIO, link->handle, &link->io);
+ if (i == CS_SUCCESS) goto found_port;
+ }
+ next_entry:
+ i = next_tuple(handle, &tuple, &parse);
+ }
+
+ /* Second pass: try to find an entry that isn't picky about
+ its base address, then try to grab any standard serial port
+ address, and finally try to get any free port. */
+ i = first_tuple(handle, &tuple, &parse);
+ while (i != CS_NO_MORE_ITEMS) {
+ if ((i == CS_SUCCESS) && (cf->io.nwin > 0) &&
+ ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
+ link->conf.ConfigIndex = cf->index;
+ for (j = 0; j < 5; j++) {
+ link->io.BasePort1 = base[j];
+ i = CardServices(RequestIO, link->handle,
+ &link->io);
+ if (i == CS_SUCCESS) goto found_port;
+ }
+ }
+ i = next_tuple(handle, &tuple, &parse);
+ }
+
+found_port:
+ if (i != CS_SUCCESS) {
+ cs_error(link->handle, RequestIO, i);
+ return -1;
+ }
+
+ i = CardServices(RequestIRQ, link->handle, &link->irq);
+ if (i != CS_SUCCESS) {
+ cs_error(link->handle, RequestIRQ, i);
+ link->irq.AssignedIRQ = 0;
+ }
+ if (info->multi && (info->manfid == MANFID_3COM))
+ link->conf.ConfigIndex &= ~(0x08);
+ i = CardServices(RequestConfiguration, link->handle, &link->conf);
+ if (i != CS_SUCCESS) {
+ cs_error(link->handle, RequestConfiguration, i);
+ return -1;
+ }
+
+ return setup_serial(info, link->io.BasePort1, link->irq.AssignedIRQ);
+}
+
+static int multi_config(dev_link_t *link)
+{
+ client_handle_t handle = link->handle;
+ serial_info_t *info = link->priv;
+ tuple_t tuple;
+ u_char buf[256];
+ cisparse_t parse;
+ cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+ int i, base2 = 0;
+
+ tuple.TupleData = (cisdata_t *)buf;
+ tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
+ tuple.Attributes = 0;
+ tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+
+ /* First, look for a generic full-sized window */
+ link->io.NumPorts1 = info->multi * 8;
+ i = first_tuple(handle, &tuple, &parse);
+ while (i != CS_NO_MORE_ITEMS) {
+ /* The quad port cards have bad CIS's, so just look for a
+ window larger than 8 ports and assume it will be right */
+ if ((i == CS_SUCCESS) && (cf->io.nwin == 1) &&
+ (cf->io.win[0].len > 8)) {
+ link->conf.ConfigIndex = cf->index;
+ link->io.BasePort1 = cf->io.win[0].base;
+ i = CardServices(RequestIO, link->handle, &link->io);
+ base2 = link->io.BasePort1 + 8;
+ if (i == CS_SUCCESS) break;
+ }
+ i = next_tuple(handle, &tuple, &parse);
+ }
+
+ /* If that didn't work, look for two windows */
+ if (i != CS_SUCCESS) {
+ link->io.NumPorts1 = link->io.NumPorts2 = 8;
+ info->multi = 2;
+ i = first_tuple(handle, &tuple, &parse);
+ while (i != CS_NO_MORE_ITEMS) {
+ if ((i == CS_SUCCESS) && (cf->io.nwin == 2)) {
+ link->conf.ConfigIndex = cf->index;
+ link->io.BasePort1 = cf->io.win[0].base;
+ link->io.BasePort2 = cf->io.win[1].base;
+ i = CardServices(RequestIO, link->handle, &link->io);
+ base2 = link->io.BasePort2;
+ if (i == CS_SUCCESS) break;
+ }
+ i = next_tuple(handle, &tuple, &parse);
+ }
+ }
+
+ if (i != CS_SUCCESS) {
+ cs_error(link->handle, RequestIO, i);
+ return -1;
+ }
+
+ i = CardServices(RequestIRQ, link->handle, &link->irq);
+ if (i != CS_SUCCESS) {
+ cs_error(link->handle, RequestIRQ, i);
+ link->irq.AssignedIRQ = 0;
+ }
+ /* Socket Dual IO: this enables irq's for second port */
+ if (info->multi && (info->manfid == MANFID_SOCKET)) {
+ link->conf.Present |= PRESENT_EXT_STATUS;
+ link->conf.ExtStatus = ESR_REQ_ATTN_ENA;
+ }
+ i = CardServices(RequestConfiguration, link->handle, &link->conf);
+ if (i != CS_SUCCESS) {
+ cs_error(link->handle, RequestConfiguration, i);
+ return -1;
+ }
+
+ setup_serial(info, link->io.BasePort1, link->irq.AssignedIRQ);
+ for (i = 0; i < info->multi-1; i++)
+ setup_serial(info, base2+(8*i), link->irq.AssignedIRQ);
+
+ return 0;
+}
+
+/*======================================================================
+
+ serial_config() is scheduled to run after a CARD_INSERTION event
+ is received, to configure the PCMCIA socket, and to make the
+ serial device available to the system.
+
+======================================================================*/
+
+#define CS_CHECK(fn, args...) \
+while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
+
+void serial_config(dev_link_t *link)
+{
+ client_handle_t handle;
+ serial_info_t *info;
+ tuple_t tuple;
+ u_short buf[128];
+ cisparse_t parse;
+ cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+ int i, last_ret, last_fn;
+
+ sti();
+ handle = link->handle;
+ info = link->priv;
+
+ DEBUG(0, "serial_config(0x%p)\n", link);
+
+ tuple.TupleData = (cisdata_t *)buf;
+ tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
+ tuple.Attributes = 0;
+ /* Get configuration register information */
+ tuple.DesiredTuple = CISTPL_CONFIG;
+ last_ret = first_tuple(handle, &tuple, &parse);
+ if (last_ret != CS_SUCCESS) {
+ last_fn = ParseTuple;
+ goto cs_failed;
+ }
+ link->conf.ConfigBase = parse.config.base;
+ link->conf.Present = parse.config.rmask[0];
+
+ /* Configure card */
+ link->state |= DEV_CONFIG;
+
+ /* Is this a compliant multifunction card? */
+ tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
+ tuple.Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK;
+ info->multi = (first_tuple(handle, &tuple, &parse) == CS_SUCCESS);
+
+ /* Is this a multiport card? */
+ tuple.DesiredTuple = CISTPL_MANFID;
+ if (first_tuple(handle, &tuple, &parse) == CS_SUCCESS) {
+ info->manfid = le16_to_cpu(buf[0]);
+ for (i = 0; i < MULTI_COUNT; i++)
+ if ((info->manfid == multi_id[i].manfid) &&
+ (le16_to_cpu(buf[1]) == multi_id[i].prodid))
+ break;
+ if (i < MULTI_COUNT)
+ info->multi = multi_id[i].multi;
+ }
+
+ /* Another check for dual-serial cards: look for either serial or
+ multifunction cards that ask for appropriate IO port ranges */
+ tuple.DesiredTuple = CISTPL_FUNCID;
+ if ((info->multi == 0) &&
+ ((first_tuple(handle, &tuple, &parse) != CS_SUCCESS) ||
+ (parse.funcid.func == CISTPL_FUNCID_MULTI) ||
+ (parse.funcid.func == CISTPL_FUNCID_SERIAL))) {
+ tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+ if ((first_tuple(handle, &tuple, &parse) == CS_SUCCESS) &&
+ (((cf->io.nwin == 1) && (cf->io.win[0].len == 16)) ||
+ ((cf->io.nwin == 2) && (cf->io.win[0].len == 8) &&
+ (cf->io.win[1].len == 8))))
+ info->multi = 2;
+ }
+
+ if (info->multi > 1)
+ multi_config(link);
+ else
+ simple_config(link);
+
+ if (info->ndev == 0)
+ goto failed;
+
+ if (info->manfid == MANFID_IBM) {
+ conf_reg_t reg = { 0, CS_READ, 0x800, 0 };
+ CS_CHECK(AccessConfigurationRegister, link->handle, ®);
+ reg.Action = CS_WRITE;
+ reg.Value = reg.Value | 1;
+ CS_CHECK(AccessConfigurationRegister, link->handle, ®);
+ }
+
+ link->dev = &info->node[0];
+ link->state &= ~DEV_CONFIG_PENDING;
+ return;
+
+cs_failed:
+ cs_error(link->handle, last_fn, last_ret);
+failed:
+ serial_release((u_long)link);
+
+} /* serial_config */
+
+/*======================================================================
+
+ After a card is removed, serial_release() will unregister the net
+ device, and release the PCMCIA configuration.
+
+======================================================================*/
+
+void serial_release(u_long arg)
+{
+ dev_link_t *link = (dev_link_t *)arg;
+ serial_info_t *info = link->priv;
+ int i;
+
+ sti();
+
+ DEBUG(0, "serial_release(0x%p)\n", link);
+
+ for (i = 0; i < info->ndev; i++) {
+ unregister_serial(info->line[i]);
+ }
+ link->dev = NULL;
+
+ if (!info->slave) {
+ CardServices(ReleaseConfiguration, link->handle);
+ CardServices(ReleaseIO, link->handle, &link->io);
+ CardServices(ReleaseIRQ, link->handle, &link->irq);
+ }
+
+ link->state &= ~DEV_CONFIG;
+
+} /* serial_release */
+
+/*======================================================================
+
+ The card status event handler. Mostly, this schedules other
+ stuff to run after an event is received. A CARD_REMOVAL event
+ also sets some flags to discourage the serial drivers from
+ talking to the ports.
+
+======================================================================*/
+
+static int serial_event(event_t event, int priority,
+ event_callback_args_t *args)
+{
+ dev_link_t *link = args->client_data;
+ serial_info_t *info = link->priv;
+
+ DEBUG(1, "serial_event(0x%06x)\n", event);
+
+ switch (event) {
+ case CS_EVENT_CARD_REMOVAL:
+ link->state &= ~DEV_PRESENT;
+ if (link->state & DEV_CONFIG) {
+ link->release.expires = jiffies + HZ/20;
+ link->state |= DEV_RELEASE_PENDING;
+ add_timer(&link->release);
+ }
+ break;
+ case CS_EVENT_CARD_INSERTION:
+ link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+ serial_config(link);
+ break;
+ case CS_EVENT_PM_SUSPEND:
+ link->state |= DEV_SUSPEND;
+ /* Fall through... */
+ case CS_EVENT_RESET_PHYSICAL:
+ if ((link->state & DEV_CONFIG) && !info->slave)
+ CardServices(ReleaseConfiguration, link->handle);
+ break;
+ case CS_EVENT_PM_RESUME:
+ link->state &= ~DEV_SUSPEND;
+ /* Fall through... */
+ case CS_EVENT_CARD_RESET:
+ if (DEV_OK(link) && !info->slave)
+ CardServices(RequestConfiguration, link->handle, &link->conf);
+ break;
+ }
+ return 0;
+} /* serial_event */
+
+/*====================================================================*/
+
+static int __init init_serial_cs(void)
+{
+ servinfo_t serv;
+ DEBUG(0, "%s\n", version);
+ CardServices(GetCardServicesInfo, &serv);
+ if (serv.Revision != CS_RELEASE_CODE) {
+ printk(KERN_NOTICE "serial_cs: Card Services release "
+ "does not match!\n");
+ return -1;
+ }
+ register_pccard_driver(&dev_info, &serial_attach, &serial_detach);
+ return 0;
+}
+
+static void __exit exit_serial_cs(void)
+{
+ DEBUG(0, "serial_cs: unloading\n");
+ unregister_pccard_driver(&dev_info);
+ while (dev_list != NULL)
+ serial_detach(dev_list);
+}
+
+module_init(init_serial_cs);
+module_exit(exit_serial_cs);
diff -ur linux.v2.3.26/drivers/net/pcmcia/Makefile linux/drivers/net/pcmcia/Makefile
--- linux.v2.3.26/drivers/net/pcmcia/Makefile Wed Nov 10 22:07:20 1999
+++ linux/drivers/net/pcmcia/Makefile Wed Nov 10 22:57:12 1999
@@ -11,7 +11,7 @@
O_TARGET := pcmcia_net.o
O_OBJS :=
M_OBJS :=
-MOD_LIST_NAME := PCMCIA_MODULES
+MOD_LIST_NAME := PCMCIA_NET_MODULES
#CFLAGS_3c575_cb.o = -DCARDBUS
#CFLAGS_tulip_cb.o = -DCARDBUS
@@ -109,6 +109,14 @@
else
ifeq ($(CONFIG_PCMCIA_WAVELAN),m)
M_OBJS += wavelan_cs.o
+ endif
+endif
+
+ifeq ($(CONFIG_PCMCIA_XIRC2PS),y)
+ OX_OBJS += xirc2ps_cs.o
+else
+ ifeq ($(CONFIG_PCMCIA_XIRC2PS),m)
+ M_OBJS += xirc2ps_cs.o
endif
endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/