Raw import of newconfig cardbus code. This is effectively an import,

so the code doesn't compile.  I added $FreeBSD$ headers.

7 files changed, 1093 insertions, 0 deletions

diff --git a/sys/dev/cardbus/Makefile.cardbusdevs b/sys/dev/cardbus/Makefile.cardbusdevs
new file mode 100644
index 0000000..1181493
--- /dev/null
+++ b/sys/dev/cardbus/Makefile.cardbusdevs
@@ -0,0 +1,8 @@
+#	$Id: Makefile.cardbusdevs,v 1.1.2.1 1999/02/16 16:46:06 haya Exp $
+# $FreeBSD$
+
+AWK=	awk
+
+cardbusdevs.h cardbusdevs_data.h: cardbusdevs devlist2h.awk
+	/bin/rm -f cardbusdevs.h cardbusdevs_data.h
+	${AWK} -f devlist2h.awk cardbusdevs
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
new file mode 100644
index 0000000..394f1c9
--- /dev/null
+++ b/sys/dev/cardbus/cardbus.c
@@ -0,0 +1,420 @@
+/*	$Id: cardbus.c,v 1.1.2.1 1999/02/16 16:44:35 haya Exp $	*/
+
+/*
+ * Copyright (c) 1997 and 1998 HAYAKAWA Koichi.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by HAYAKAWA Koichi.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+/* FreeBSD/newconfig version. UCHIYAMA Yasushi 1999 */
+/* $FreeBSD$ */
+#define CARDBUS_DEBUG
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
+
+#include <machine/bus.h>
+
+#include <dev/cardbus/pccardcis.h>
+
+#include <dev/cardbus/cardbusreg.h>
+#include <dev/cardbus/cardbusvar.h>
+
+#include <dev/pcmcia/pcmciareg.h>
+#include <dev/pcmcia/pcmciavar.h>
+
+#include <dev/ic/i82365reg.h>
+#include <dev/ic/i82365reg.h>
+
+#include <dev/pci/pccbbreg.h>
+#include <dev/pci/pccbbvar.h>
+
+#if defined CARDBUS_DEBUG
+#define STATIC
+#define DPRINTF(a) printf a
+#define DDELAY(x) delay((x)*1000*1000)
+#else
+#define STATIC static
+#define DPRINTF(a)
+#endif
+
+STATIC void cardbusattach __P((struct device *, struct device *, void *));
+STATIC int cardbusmatch __P((struct device *, struct cfdata *, void *));
+static int cardbussubmatch __P((struct device *, struct cfdata *, void *));
+static int cardbusprint __P((void *, const char *));
+
+static u_int8_t *decode_tuple __P((u_int8_t *));
+static int decode_tuples __P((u_int8_t *, int));
+static char *tuple_name __P((int));
+
+struct cfattach cardbus_ca = {
+    sizeof(struct cardbus_softc), cardbusmatch, cardbusattach
+};
+
+STATIC int
+cardbusmatch(parent, cf, aux)
+    struct device *parent;
+    struct cfdata *cf;
+    void *aux;
+{
+    struct cbslot_attach_args *cba = aux;
+
+    /* which slot? */
+    if (cf->cbslotcf_slot != CBSLOT_UNK_SLOT &&
+	cf->cbslotcf_slot != cba->cba_function) {
+
+	DPRINTF(("cardbusmatch: function differs %d <=> %d\n",
+		 cf->cbslotcf_slot, cba->cba_function));
+
+	return 0;
+    }
+
+    if (cba->cba_function < 0 || cba->cba_function > 255) {
+	return 0;
+    }
+
+    return 1;
+}
+
+void
+cardslot_if_setup (struct cardbus_softc *csc)
+{
+    csc->sc_if.if_card_attach = cardbus_attach_card;
+}
+
+STATIC void
+cardbusattach(parent, self, aux)
+    struct device *parent;
+    struct device *self;
+    void *aux;
+{
+    struct pccbb_softc *psc = (struct pccbb_softc *)parent;
+    struct cardbus_softc *sc = (void *)self;
+    struct cbslot_attach_args *cba = aux;
+    int cdstatus;
+
+    sc->sc_bus = cba->cba_bus;
+    sc->sc_device = cba->cba_function;
+    sc->sc_intrline = cba->cba_intrline;
+
+    printf(" bus %d device %d\n", sc->sc_bus, sc->sc_device);
+
+    sc->sc_iot = cba->cba_iot;	        /* CardBus I/O space tag */
+    sc->sc_memt = cba->cba_memt;	/* CardBus MEM space tag */
+    sc->sc_dmat = cba->cba_dmat;	/* DMA tag */
+
+    sc->sc_cc = cba->cba_cc;
+    sc->sc_cf = cba->cba_cf;
+    cardslot_if_setup (sc);
+    cdstatus = 0;
+
+    if ((cdstatus = (sc->sc_cf->cardbus_ctrl)(sc->sc_cc, CARDBUS_CD))) {
+	DPRINTF(("cardbusattach: CardBus card found [0x%x]\n", cdstatus));
+	psc->sc_cbdev = cardbus_attach_card(sc);
+    }
+}
+
+/**********************************************************************
+* int cardbus_attach_card(struct cardbus_softc *sc)
+*    This functions attaches the card on the slot: turns on power,
+*    reads and analyses tuple, sets consifuration index.
+***********************************************************************/
+struct device *
+cardbus_attach_card(sc)
+    struct cardbus_softc *sc;
+{
+    struct device *attached_device = NULL;
+    cardbus_chipset_tag_t cc;
+    cardbus_function_tag_t cf;
+    int cdstatus;
+    cardbustag_t tag;
+    cardbusreg_t id, class, cis_ptr, bhlcr;
+    u_int8_t tuple[2048];
+    int function, max_func, device;
+
+    cc = sc->sc_cc;
+    cf = sc->sc_cf;
+
+    DPRINTF(("cardbus_attach_card: cb%d start\n", sc->sc_dev.dv_unit));
+
+    /* inspect initial voltage */
+    if (0 == (cdstatus = (cf->cardbus_ctrl)(cc, CARDBUS_CD))) {
+	DPRINTF(("cardbusattach: no CardBus card on cb%d\n", sc->sc_dev.dv_unit));
+	return 0;
+    }
+
+    if (cdstatus & CARDBUS_3V_CARD) {
+	cf->cardbus_power(cc, CARDBUS_VCC_3V);
+    }
+    (cf->cardbus_ctrl)(cc, CARDBUS_RESET);
+
+    device = 0; /* Only one card can attach cardbus slot */
+    function = 0;
+
+    tag = cardbus_make_tag (cc, cf, sc->sc_bus, device, function);
+
+    bhlcr = (cf->cardbus_conf_read)(cc, tag, CARDBUS_BHLC_REG);
+    max_func = CARDBUS_HDRTYPE_MULTIFN(bhlcr) ? 8 : 1;
+
+    for (function = 0; function < max_func; function++) {
+	if (function)
+	    tag = cardbus_make_tag (cc, cf, sc->sc_bus, device, function);
+
+	id = (cf->cardbus_conf_read)(cc, tag, CARDBUS_ID_REG);
+	if (CARDBUS_VENDOR(id) == 0xffff || CARDBUS_VENDOR(id) == 0) {
+	    cardbus_free_tag (cc, cf, tag);
+	    continue;
+	}
+
+	class = (cf->cardbus_conf_read)(cc, tag, CARDBUS_CLASS_REG);
+	cis_ptr = (cf->cardbus_conf_read)(cc, tag, CARDBUS_CIS_REG);
+
+	DPRINTF(("cardbus_attach_card: Vendor 0x%x, Product 0x%x, CIS 0x%x\n",
+		 CARDBUS_VENDOR(id), CARDBUS_PRODUCT(id), cis_ptr));
+
+	bzero(tuple, 2048);
+
+	if (0 == (cis_ptr & CARDBUS_CIS_ASIMASK)) {
+	    int i = cis_ptr & CARDBUS_CIS_ADDRMASK;
+	    int j = 0;
+
+	    for (; i < 0xff; i += 4) {
+		u_int32_t e = (cf->cardbus_conf_read)(cc, tag, i);
+		tuple[j] = 0xff & e;
+		e >>= 8;
+		tuple[j + 1] = 0xff & e;
+		e >>= 8;
+		tuple[j + 2] = 0xff & e;
+		e >>= 8;
+		tuple[j + 3] = 0xff & e;
+		j += 4;
+	    }
+	}
+
+	decode_tuples(tuple, 2048);
+	if (function == 0) {
+	    struct cardbus_attach_args ca;
+	    cardbusreg_t intr = cardbus_conf_read(cc, cf, tag, CARDBUS_INTERRUPT_REG);
+
+	    ca.ca_unit = sc->sc_dev.dv_unit;
+	    ca.ca_cc = sc->sc_cc;
+	    ca.ca_cf = sc->sc_cf;
+
+	    ca.ca_iot = sc->sc_iot;
+	    ca.ca_memt = sc->sc_memt;
+	    ca.ca_dmat = sc->sc_dmat;
+
+	    ca.ca_tag = tag;
+	    ca.ca_device = device;
+	    ca.ca_function = function;
+	    ca.ca_id = id;
+	    ca.ca_class = class;
+
+	    ca.ca_intrline = sc->sc_intrline;
+
+	    attached_device = config_found_sm((void *)sc, &ca, cardbusprint, cardbussubmatch);
+	} else {
+	    printf ("cardbus_attach_card: XXX Multi-function can't handle. function 0 only.\n");
+	}
+	cardbus_free_tag (cc, cf, tag);
+    }
+    if (!attached_device)
+	cf->cardbus_power(cc, CARDBUS_VCC_0V);
+    return attached_device;
+}
+
+static int
+cardbussubmatch(parent, cf, aux)
+    struct device *parent;
+    struct cfdata *cf;
+    void *aux;
+{
+    struct cardbus_attach_args *ca = aux;
+
+    if (cf->cardbuscf_dev != CARDBUS_UNK_DEV &&
+	cf->cardbuscf_dev != ca->ca_unit) {
+	return 0;
+    }
+    if (cf->cardbuscf_function != CARDBUS_UNK_FUNCTION &&
+	cf->cardbuscf_function != ca->ca_function) {
+	return 0;
+    }
+
+    return ((*cf->cf_attach->ca_match)(parent, cf, aux));
+}
+
+static int
+cardbusprint(aux, pnp)
+    void *aux;
+    const char *pnp;
+{
+    register struct cardbus_attach_args *ca = aux;
+    char devinfo[256];
+
+    if (pnp) {
+	printf("vendor 0x%04x id 0x%04x at %s",
+	       CARDBUS_VENDOR(ca->ca_id), CARDBUS_PRODUCT(ca->ca_id), pnp);
+    }
+    printf(" dev %d function %d", ca->ca_device, ca->ca_function);
+    return UNCONF;
+}
+
+/**********************************************************************
+* void *cardbus_intr_establish(cc, cf, irq, level, func, arg)
+*   Interrupt handler of pccard.
+*  args:
+*   cardbus_chipset_tag_t *cc
+*   int irq: 
+**********************************************************************/
+void *
+cardbus_intr_establish(cc, cf, irq, level, func, arg)
+    cardbus_chipset_tag_t cc;
+    cardbus_function_tag_t cf;
+    cardbus_intr_handle_t irq;
+    int level;
+    int (*func) __P((void *));
+    void *arg;
+{
+    DPRINTF(("- cardbus_intr_establish: irq %d\n", irq));
+
+    return (*cf->cardbus_intr_establish)(cc, irq, level, func, arg);
+}
+
+/**********************************************************************
+* void cardbus_intr_disestablish(cc, cf, handler)
+*   Interrupt handler of pccard.
+*  args:
+*   cardbus_chipset_tag_t *cc
+**********************************************************************/
+void
+cardbus_intr_disestablish(cc, cf, handler)
+    cardbus_chipset_tag_t cc;
+    cardbus_function_tag_t cf;
+    void *handler;
+{
+    DPRINTF(("- cardbus_intr_disestablish\n"));
+
+    (*cf->cardbus_intr_disestablish)(cc, handler);
+    return;
+}
+
+/**********************************************************************
+* below this line, there are some functions for decoding tuples.
+* They should go out from this file.
+**********************************************************************/
+static int
+decode_tuples(tuple, buflen)
+    u_int8_t *tuple;
+    int buflen;
+{
+    u_int8_t *tp = tuple;
+
+    if (CISTPL_LINKTARGET != *tuple) {
+	DPRINTF(("WRONG TUPLE\n"));
+	return 0;
+    }
+
+    while (NULL != (tp = decode_tuple(tp))) {
+	if (tuple + buflen < tp) {
+	    break;
+	}
+    }
+  
+    return 1;
+}
+
+static u_int8_t *
+decode_tuple(tuple)
+    u_int8_t *tuple;
+{
+    u_int8_t type;
+    u_int8_t len;
+    int i;
+
+    type = tuple[0];
+    len = tuple[1] + 2;
+
+    printf("tuple: %s len %d\n", tuple_name(type), len);
+    if (CISTPL_END == type) {
+	return NULL;
+    }
+
+    for (i = 0; i < len; ++i) {
+	if (i % 16 == 0) {
+	    printf("  0x%2x:", i);
+	}
+	printf(" %x",tuple[i]);
+	if (i % 16 == 15) {
+	    printf("\n");
+	}
+    }
+    if (i % 16 != 0) {
+	printf("\n");
+    }
+
+    return tuple + len;
+}
+
+static char *
+tuple_name(type)
+    int type;
+{
+    static char *tuple_name_s [] = {
+	"TPL_NULL", "TPL_DEVICE", "Reserved", "Reserved", /* 0-3 */
+	"CONFIG_CB", "CFTABLE_ENTRY_CB", "Reserved", "BAR", /* 4-7 */
+	"Reserved", "Reserved", "Reserved", "Reserved", /* 8-B */
+	"Reserved", "Reserved", "Reserved", "Reserved", /* C-F */
+	"CHECKSUM", "LONGLINK_A", "LONGLINK_C", "LINKTARGET",	/* 10-13 */
+	"NO_LINK", "VERS_1", "ALTSTR", "DEVICE_A",
+	"JEDEC_C", "JEDEC_A", "CONFIG", "CFTABLE_ENTRY",
+	"DEVICE_OC", "DEVICE_OA", "DEVICE_GEO", "DEVICE_GEO_A",
+	"MANFID", "FUNCID", "FUNCE", "SWIL", /* 20-23 */
+	"Reserved", "Reserved", "Reserved", "Reserved", /* 24-27 */
+	"Reserved", "Reserved", "Reserved", "Reserved", /* 28-2B */
+	"Reserved", "Reserved", "Reserved", "Reserved", /* 2C-2F */
+	"Reserved", "Reserved", "Reserved", "Reserved", /* 30-33 */
+	"Reserved", "Reserved", "Reserved", "Reserved", /* 34-37 */
+	"Reserved", "Reserved", "Reserved", "Reserved", /* 38-3B */
+	"Reserved", "Reserved", "Reserved", "Reserved", /* 3C-3F */
+	"VERS_2", "FORMAT", "GEOMETRY", "BYTEORDER",
+	"DATE", "BATTERY", "ORG"
+    };
+#define NAME_LEN(x) (sizeof x / sizeof(x[0]))
+
+    if (type > 0 && type < NAME_LEN(tuple_name_s)) {
+	return tuple_name_s[type];
+    } else if (0xff == type) {
+	return "END";
+    } else {
+	return "Reserved";
+    }
+}
diff --git a/sys/dev/cardbus/cardbusdevs b/sys/dev/cardbus/cardbusdevs
new file mode 100644
index 0000000..5df9b62
--- /dev/null
+++ b/sys/dev/cardbus/cardbusdevs
@@ -0,0 +1,65 @@
+$FreeBSD$
+
+/*
+ * Copyright (C) 1999  Hayakawa Koichi.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the author
+ *	for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * This code is stollen from sys/dev/pci/pcidevs
+ */
+
+
+/*
+ * List of known CardBus vendors
+ */
+
+vendor DEC		0x1011	Digital Equipment
+vendor 3COM		0x10B7	3Com
+vendor ADP		0x9004	Adaptec
+vendor ADP2		0x9005	Adaptec (2nd PCI Vendor ID)
+vendor OPTI		0x1045	Opti
+
+/*
+ * List of known products.  Grouped by vendor.
+ */
+
+/* 3COM Products */
+
+product 3COM 3C575TX	0x5057	3c575 100Base-TX
+product 3COM 3C575BTX	0x5157  3c575B 100Base-TX
+
+/* Adaptec products */
+product ADP 1480        0x6075  APA-1480
+
+/* DEC products */
+product DEC 21142	0x0019	DECchip 21142/3
+
+/* Opti products */
+product OPTI 82C861	0xc861	82C861 USB Host Controller (OHCI)
diff --git a/sys/dev/cardbus/cardbusreg.h b/sys/dev/cardbus/cardbusreg.h
new file mode 100644
index 0000000..56e2e56
--- /dev/null
+++ b/sys/dev/cardbus/cardbusreg.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 1998 HAYAKAWA Koichi.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the author.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+/* $FreeBSD$ */
+
+typedef u_int32_t cardbusreg_t;
+typedef int cardbus_intr_line_t;
+
+typedef void *cardbus_chipset_tag_t;
+typedef int cardbus_intr_handle_t;
+
+typedef u_int16_t cardbus_vendor_id_t;
+typedef u_int16_t cardbus_product_id_t;
+
+#define	CARDBUS_ID_REG			0x00
+
+#  define CARDBUS_VENDOR_SHIFT  0
+#  define CARDBUS_VENDOR_MASK   0xffff
+#  define CARDBUS_VENDOR(id) \
+	    (((id) >> CARDBUS_VENDOR_SHIFT) & CARDBUS_VENDOR_MASK)
+
+#  define CARDBUS_PRODUCT_SHIFT  16
+#  define CARDBUS_PRODUCT_MASK   0xffff
+#  define CARDBUS_PRODUCT(id) \
+	    (((id) >> CARDBUS_PRODUCT_SHIFT) & CARDBUS_PRODUCT_MASK)
+
+
+#define	CARDBUS_COMMAND_STATUS_REG  0x04
+
+#  define CARDBUS_COMMAND_IO_ENABLE     0x00000001
+#  define CARDBUS_COMMAND_MEM_ENABLE    0x00000002
+#  define CARDBUS_COMMAND_MASTER_ENABLE 0x00000004
+
+
+#define CARDBUS_CLASS_REG       0x08
+
+/* BIST, Header Type, Latency Timer, Cache Line Size */
+#define CARDBUS_BHLC_REG        0x0c
+
+#define	CARDBUS_BIST_SHIFT        24
+#define	CARDBUS_BIST_MASK       0xff
+#define	CARDBUS_BIST(bhlcr) \
+	    (((bhlcr) >> CARDBUS_BIST_SHIFT) & CARDBUS_BIST_MASK)
+
+#define	CARDBUS_HDRTYPE_SHIFT     16
+#define	CARDBUS_HDRTYPE_MASK    0xff
+#define	CARDBUS_HDRTYPE(bhlcr) \
+	    (((bhlcr) >> CARDBUS_HDRTYPE_SHIFT) & CARDBUS_HDRTYPE_MASK)
+
+#define	CARDBUS_HDRTYPE_TYPE(bhlcr) \
+	    (CARDBUS_HDRTYPE(bhlcr) & 0x7f)
+#define	CARDBUS_HDRTYPE_MULTIFN(bhlcr) \
+	    ((CARDBUS_HDRTYPE(bhlcr) & 0x80) != 0)
+
+#define	CARDBUS_LATTIMER_SHIFT      8
+#define	CARDBUS_LATTIMER_MASK    0xff
+#define	CARDBUS_LATTIMER(bhlcr) \
+	    (((bhlcr) >> CARDBUS_LATTIMER_SHIFT) & CARDBUS_LATTIMER_MASK)
+
+#define	CARDBUS_CACHELINE_SHIFT     0
+#define	CARDBUS_CACHELINE_MASK   0xff
+#define	CARDBUS_CACHELINE(bhlcr) \
+	    (((bhlcr) >> CARDBUS_CACHELINE_SHIFT) & CARDBUS_CACHELINE_MASK)
+
+
+/* Base Resisters */
+#define CARDBUS_BASE0_REG  0x10
+#define CARDBUS_BASE1_REG  0x14
+#define CARDBUS_BASE2_REG  0x18
+#define CARDBUS_BASE3_REG  0x1C
+#define CARDBUS_BASE4_REG  0x20
+#define CARDBUS_BASE5_REG  0x24
+#define CARDBUS_CIS_REG    0x28
+#  define CARDBUS_CIS_ASIMASK 0x07
+#  define CARDBUS_CIS_ADDRMASK 0x0ffffff8
+
+#define	CARDBUS_INTERRUPT_REG   0x3c
+
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
new file mode 100644
index 0000000..2f91141
--- /dev/null
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -0,0 +1,180 @@
+/*	$Id: cardbusvar.h,v 1.1.2.1 1999/02/16 16:46:08 haya Exp $	*/
+
+/*
+ * Copyright (c) 1998 HAYAKAWA Koichi.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the author.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+/* $FreeBSD$ */
+
+#if !defined SYS_DEV_PCCARD_CARDBUSVAR_H
+#define SYS_DEV_PCCARD_CARDBUSVAR_H
+#include <pci/pcivar.h> /* XXX */
+typedef pcitag_t cardbustag_t; /* XXX */
+
+typedef struct cardbus_functions {
+    int (*cardbus_ctrl) __P((cardbus_chipset_tag_t, int));
+    int (*cardbus_power) __P((cardbus_chipset_tag_t, int));
+    int (*cardbus_mem_open) __P((cardbus_chipset_tag_t, int, u_int32_t, u_int32_t));
+    int (*cardbus_mem_close) __P((cardbus_chipset_tag_t, int));
+    int (*cardbus_io_open) __P((cardbus_chipset_tag_t, int, u_int32_t, u_int32_t));
+    int (*cardbus_io_close) __P((cardbus_chipset_tag_t, int));
+    void *(*cardbus_intr_establish) __P((cardbus_chipset_tag_t, int irq, int level, int (*ih)(void *), void *sc));
+    void (*cardbus_intr_disestablish) __P((cardbus_chipset_tag_t ct, void *ih));
+    cardbustag_t (*cardbus_make_tag) __P((cardbus_chipset_tag_t, int, int, int));  
+    void (*cardbus_free_tag) __P((cardbus_chipset_tag_t, cardbustag_t));
+    cardbusreg_t (*cardbus_conf_read) __P((cardbus_chipset_tag_t, cardbustag_t, int));
+    void (*cardbus_conf_write) __P((cardbus_chipset_tag_t, cardbustag_t, int, cardbusreg_t));
+} cardbus_function_t, *cardbus_function_tag_t;
+
+/**********************************************************************
+* struct cbslot_attach_args is the attach argument for cardbus slot.
+**********************************************************************/
+struct cbslot_attach_args {
+  char *cba_busname;
+  bus_space_tag_t cba_iot;	/* cardbus i/o space tag */
+  bus_space_tag_t cba_memt;	/* cardbus mem space tag */
+  bus_dma_tag_t cba_dmat;	/* DMA tag */
+
+  int cba_bus;			/* cardbus bus number */
+  int cba_function;		/* slot number on this Host Bus Adaptor */
+
+  cardbus_chipset_tag_t cba_cc;	/* cardbus chipset */
+  cardbus_function_tag_t cba_cf; /* cardbus functions */
+  int cba_intrline;		/* interrupt line */
+};
+
+#define cbslotcf_slot  cf_loc[0]
+#define CBSLOT_UNK_SLOT -1
+
+/**********************************************************************
+* struct cardslot_if is the interface for cardslot.
+**********************************************************************/
+struct cardslot_if {
+    struct device *(*if_card_attach) __P((struct cardbus_softc*));
+};
+/**********************************************************************
+* struct cardbus_softc is the softc for cardbus card.
+**********************************************************************/
+struct cardbus_softc {
+  struct device sc_dev;		/* fundamental device structure */
+
+  int sc_bus;			/* cardbus bus number */
+  int sc_device;		/* cardbus device number */
+  int sc_intrline;		/* CardBus intrline */
+  
+  bus_space_tag_t sc_iot;	/* CardBus I/O space tag */
+  bus_space_tag_t sc_memt;	/* CardBus MEM space tag */
+  bus_dma_tag_t sc_dmat;	/* DMA tag */
+  cardbus_chipset_tag_t sc_cc;	/* CardBus chipset */
+  cardbus_function_tag_t sc_cf;	/* CardBus function */
+
+  int sc_volt;			/* applied Vcc voltage */
+#define PCCARD_33V  0x02
+#define PCCARD_XXV  0x04
+#define PCCARD_YYV  0x08
+  struct cardslot_if sc_if;  
+};
+void
+cardslot_if_setup __P((struct cardbus_softc*));
+
+/**********************************************************************
+* struct cbslot_attach_args is the attach argument for cardbus card.
+**********************************************************************/
+struct cardbus_attach_args {
+  int ca_unit;
+  cardbus_chipset_tag_t ca_cc;
+  cardbus_function_tag_t ca_cf;
+
+  bus_space_tag_t ca_iot;	/* CardBus I/O space tag */
+  bus_space_tag_t ca_memt;	/* CardBus MEM space tag */
+  bus_dma_tag_t ca_dmat;	/* DMA tag */
+
+  u_int ca_device;
+  u_int ca_function;
+  cardbustag_t ca_tag;
+  cardbusreg_t ca_id;
+  cardbusreg_t ca_class;
+
+  /* interrupt information */
+  cardbus_intr_line_t ca_intrline;
+};
+
+
+#define CARDBUS_ENABLE  1	/* enable the channel */
+#define CARDBUS_DISABLE 2	/* disable the channel */
+#define CARDBUS_RESET   4
+#define CARDBUS_CD      7
+#  define CARDBUS_NOCARD 0
+#  define CARDBUS_5V_CARD 0x01	/* XXX: It must not exist */
+#  define CARDBUS_3V_CARD 0x02
+#  define CARDBUS_XV_CARD 0x04
+#  define CARDBUS_YV_CARD 0x08
+#define CARDBUS_IO_ENABLE    100
+#define CARDBUS_IO_DISABLE   101
+#define CARDBUS_MEM_ENABLE   102
+#define CARDBUS_MEM_DISABLE  103
+#define CARDBUS_BM_ENABLE    104 /* bus master */
+#define CARDBUS_BM_DISABLE   105
+
+#define CARDBUS_VCC_UC  0x0000
+#define CARDBUS_VCC_3V  0x0001
+#define CARDBUS_VCC_XV  0x0002
+#define CARDBUS_VCC_YV  0x0003
+#define CARDBUS_VCC_0V  0x0004
+#define CARDBUS_VCC_5V  0x0005	/* ??? */
+#define CARDBUS_VCCMASK 0x000f
+#define CARDBUS_VPP_UC  0x0000
+#define CARDBUS_VPP_VCC 0x0010
+#define CARDBUS_VPP_12V 0x0030
+#define CARDBUS_VPP_0V  0x0040
+#define CARDBUS_VPPMASK 0x00f0
+
+
+/**********************************************************************
+* Locators devies that attach to 'cardbus', as specified to config.
+**********************************************************************/
+#include "locators.h"
+
+#define cardbuscf_dev cf_loc[CARDBUSCF_DEV]
+#define CARDBUS_UNK_DEV CARDBUSCF_DEV_DEFAULT
+
+#define cardbuscf_function cf_loc[CARDBUSCF_FUNC]
+#define CARDBUS_UNK_FUNCTION CARDBUSCF_FUNC_DEFAULT
+
+struct device *cardbus_attach_card __P((struct cardbus_softc *));
+void *cardbus_intr_establish __P((cardbus_chipset_tag_t, cardbus_function_tag_t, cardbus_intr_handle_t irq, int level, int (*func) (void *), void *arg));
+void cardbus_intr_disestablish __P((cardbus_chipset_tag_t, cardbus_function_tag_t, void *handler));
+
+#define cardbus_conf_read(cc, cf, tag, offs) ((cf)->cardbus_conf_read)((cc), (tag), (offs))
+#define cardbus_conf_write(cc, cf, tag, offs, val) ((cf)->cardbus_conf_write)((cc), (tag), (offs), (val))
+#define cardbus_make_tag(cc, cf, bus, device, function) ((cf)->cardbus_make_tag)((cc), (bus), (device), (function))
+#define cardbus_free_tag(cc, cf, tag) ((cf)->cardbus_free_tag)((cc), (tag))
+
+#endif /* SYS_DEV_PCCARD_CARDBUSVAR_H */
+
diff --git a/sys/dev/cardbus/devlist2h.awk b/sys/dev/cardbus/devlist2h.awk
new file mode 100644
index 0000000..2dd9caa
--- /dev/null
+++ b/sys/dev/cardbus/devlist2h.awk
@@ -0,0 +1,222 @@
+#! /usr/bin/awk -f
+#	$NetBSD: devlist2h.awk,v 1.5 1998/01/09 06:54:25 thorpej Exp $
+#	$FreeBSD$
+#
+# Copyright (c) 1995, 1996 Christopher G. Demetriou
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed by Christopher G. Demetriou.
+# 4. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+BEGIN {
+	nproducts = nvendors = 0
+	dfile="cardbusdevs_data.h"
+	hfile="cardbusdevs.h"
+}
+NR == 1 {
+	VERSION = $0
+	gsub("\\$", "", VERSION)
+
+	printf("/*\t\$FreeBSD\$\t*/\n\n") > dfile
+	printf("/*\n") > dfile
+	printf(" * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.\n") \
+	    > dfile
+	printf(" *\n") > dfile
+	printf(" * generated from:\n") > dfile
+	printf(" *\t%s\n", VERSION) > dfile
+	printf(" */\n") > dfile
+
+	printf("/*\t\$FreeBSD\$\t*/\n\n") > hfile
+	printf("/*\n") > hfile
+	printf(" * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.\n") \
+	    > hfile
+	printf(" *\n") > hfile
+	printf(" * generated from:\n") > hfile
+	printf(" *\t%s\n", VERSION) > hfile
+	printf(" */\n") > hfile
+
+	next
+}
+$1 == "vendor" {
+	nvendors++
+
+	vendorindex[$2] = nvendors;		# record index for this name, for later.
+	vendors[nvendors, 1] = $2;		# name
+	vendors[nvendors, 2] = $3;		# id
+	printf("#define\tCARDBUS_VENDOR_%s\t%s\t", vendors[nvendors, 1],
+	    vendors[nvendors, 2]) > hfile
+
+	i = 3; f = 4;
+
+	# comments
+	ocomment = oparen = 0
+	if (f <= NF) {
+		printf("\t/* ") > hfile
+		ocomment = 1;
+	}
+	while (f <= NF) {
+		if ($f == "#") {
+			printf("(") > hfile
+			oparen = 1
+			f++
+			continue
+		}
+		if (oparen) {
+			printf("%s", $f) > hfile
+			if (f < NF)
+				printf(" ") > hfile
+			f++
+			continue
+		}
+		vendors[nvendors, i] = $f
+		printf("%s", vendors[nvendors, i]) > hfile
+		if (f < NF)
+			printf(" ") > hfile
+		i++; f++;
+	}
+	if (oparen)
+		printf(")") > hfile
+	if (ocomment)
+		printf(" */") > hfile
+	printf("\n") > hfile
+
+	next
+}
+$1 == "product" {
+	nproducts++
+
+	products[nproducts, 1] = $2;		# vendor name
+	products[nproducts, 2] = $3;		# product id
+	products[nproducts, 3] = $4;		# id
+	printf("#define\tCARDBUS_PRODUCT_%s_%s\t%s\t", products[nproducts, 1],
+	    products[nproducts, 2], products[nproducts, 3]) > hfile
+
+	i=4; f = 5;
+
+	# comments
+	ocomment = oparen = 0
+	if (f <= NF) {
+		printf("\t/* ") > hfile
+		ocomment = 1;
+	}
+	while (f <= NF) {
+		if ($f == "#") {
+			printf("(") > hfile
+			oparen = 1
+			f++
+			continue
+		}
+		if (oparen) {
+			printf("%s", $f) > hfile
+			if (f < NF)
+				printf(" ") > hfile
+			f++
+			continue
+		}
+		products[nproducts, i] = $f
+		printf("%s", products[nproducts, i]) > hfile
+		if (f < NF)
+			printf(" ") > hfile
+		i++; f++;
+	}
+	if (oparen)
+		printf(")") > hfile
+	if (ocomment)
+		printf(" */") > hfile
+	printf("\n") > hfile
+
+	next
+}
+{
+	if ($0 == "")
+		blanklines++
+	print $0 > hfile
+	if (blanklines < 2)
+		print $0 > dfile
+}
+END {
+	# print out the match tables
+
+	printf("\n") > dfile
+
+	printf("struct cardbus_knowndev cardbus_knowndevs[] = {\n") > dfile
+	for (i = 1; i <= nproducts; i++) {
+		printf("\t{\n") > dfile
+		printf("\t    CARDBUS_VENDOR_%s, CARDBUS_PRODUCT_%s_%s,\n",
+		    products[i, 1], products[i, 1], products[i, 2]) \
+		    > dfile
+		printf("\t    ") > dfile
+		printf("0") > dfile
+		printf(",\n") > dfile
+
+		vendi = vendorindex[products[i, 1]];
+		printf("\t    \"") > dfile
+		j = 3;
+		needspace = 0;
+		while (vendors[vendi, j] != "") {
+			if (needspace)
+				printf(" ") > dfile
+			printf("%s", vendors[vendi, j]) > dfile
+			needspace = 1
+			j++
+		}
+		printf("\",\n") > dfile
+
+		printf("\t    \"") > dfile
+		j = 4;
+		needspace = 0;
+		while (products[i, j] != "") {
+			if (needspace)
+				printf(" ") > dfile
+			printf("%s", products[i, j]) > dfile
+			needspace = 1
+			j++
+		}
+		printf("\",\n") > dfile
+		printf("\t},\n") > dfile
+	}
+	for (i = 1; i <= nvendors; i++) {
+		printf("\t{\n") > dfile
+		printf("\t    CARDBUS_VENDOR_%s, 0,\n", vendors[i, 1]) \
+		    > dfile
+		printf("\t    CARDBUS_KNOWNDEV_NOPROD,\n") \
+		    > dfile
+		printf("\t    \"") > dfile
+		j = 3;
+		needspace = 0;
+		while (vendors[i, j] != "") {
+			if (needspace)
+				printf(" ") > dfile
+			printf("%s", vendors[i, j]) > dfile
+			needspace = 1
+			j++
+		}
+		printf("\",\n") > dfile
+		printf("\t    NULL,\n") > dfile
+		printf("\t},\n") > dfile
+	}
+	printf("\t{ 0, 0, 0, NULL, NULL, }\n") > dfile
+	printf("};\n") > dfile
+}
diff --git a/sys/dev/cardbus/pccardcis.h b/sys/dev/cardbus/pccardcis.h
new file mode 100644
index 0000000..ec3bfb8
--- /dev/null
+++ b/sys/dev/cardbus/pccardcis.h
@@ -0,0 +1,93 @@
+/*	$Id: pccardcis.h,v 1.1.2.1 1999/02/16 16:44:36 haya Exp $	*/
+/* $FreeBSD$ */
+
+/*
+ * Copyright (c) 1997 and 1998
+ *                             HAYAKAWA Koichi.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the author.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#if !defined SYS_DEV_PCCARD_PCCARDCIS_H
+#define SYS_DEV_PCCARD_PCCARDCIS_H 1
+
+#define CISTPL_NULL        0x00
+#define CISTPL_DEVICE      0x01
+#define CISTPL_CONFIG_CB   0x04
+#define CISTPL_CFTABLE_ENTRY_CB 0x05
+#define CISTPL_BAR         0x07
+#define CISTPL_CHECKSUM    0x10
+#define CISTPL_LONGLINK_A  0x11
+#define CISTPL_LONGLINK_C  0x12
+#define CISTPL_LINKTARGET  0x13
+#define CISTPL_NO_LINK     0x14
+#define CISTPL_VERS_1      0x15
+#define CISTPL_ALTSTR      0x16
+#define CISTPL_DEVICE_A    0x17
+#define CISTPL_JEDEC_C     0x18
+#define CISTPL_JEDEC_A     0x19
+#define CISTPL_CONFIG      0x1A
+#define CISTPL_CFTABLE_ENTRY 0x1B
+#define CISTPL_DEVICE_OC   0x1C
+#define CISTPL_DEVICE_OA   0x1D
+#define CISTPL_DEVICE_GEO  0x1E
+#define CISTPL_DEVICE_GEO_A  0x1F
+#define CISTPL_MANFID      0x20
+#define CISTPL_FUNCID      0x21
+#define CISTPL_FUNCE       0x22
+#define CISTPL_SWIL        0x23
+#define CISTPL_VERS_2      0x40
+#define CISTPL_FORMAT      0x41
+#define CISTPL_GEOMETRY    0x42
+#define CISTPL_BYTEORDER   0x43
+#define CISTPL_DATE        0x44
+#define CISTPL_BATTERY     0x45
+#define CISTPL_ORG         0x46
+#define CISTPL_END         0xFF
+
+
+/* CISTPL_FUNC */
+#define TPL_FUNC_MF         0	/* multi function tuple */
+#define TPL_FUNC_MEM        1	/* memory */
+#define TPL_FUNC_SERIAL     2	/* serial, including modem and fax */
+#define TPL_FUNC_PARALLEL   3	/* parallel, including printer and SCSI */
+#define TPL_FUNC_DISK       4	/* Disk */
+#define TPL_FUNC_VIDEO      5	/* Video Adaptor */
+#define TPL_FUNC_LAN        6	/* LAN Adaptor */
+#define TPL_FUNC_AIMS       7	/* Auto Inclement Mass Strages */
+
+/* TPL_FUNC_LAN */
+#define TPL_FUNCE_LAN_TECH  1	/* technology */
+#define TPL_FUNCE_LAN_SPEED 2	/* speed */
+#define TPL_FUNCE_LAN_MEDIA 2	/* which media do you use? */
+#define TPL_FUNCE_LAN_NID   4	/* node id (address) */
+#define TPL_FUNCE_LAN_CONN  5	/* connector type (shape) */
+
+
+#endif /* SYS_DEV_PCCARD_PCCARDCIS_H */