Initial commit of NEWCARD cardbus side (that actually compiles and works)

Files:
	dev/cardbus/cardbus.c
	dev/cardbus/cardbusreg.h
	dev/cardbus/cardbusvar.h
	dev/cardbus/cardbus_cis.c
	dev/cardbus/cardbus_cis.h
	dev/pccbb/pccbb.c
	dev/pccbb/pccbbreg.h
	dev/pccbb/pccbbvar.h
	dev/pccbb/pccbb_if.m

This should support:
  - cardbus controllers:
    * TI 113X
    * TI 12XX
    * TI 14XX
    * Ricoh 47X
    * Ricoh 46X
    * ToPIC 95
    * ToPIC 97
    * ToPIC 100
    * Cirrus Logic CLPD683x
  - cardbus cards
    * 3c575BT
    * 3c575CT
    * Xircom X3201 (includes IBM, Xircom and, Intel cards)
    [ 3com support already in kernel, Xircom will be committed real soon now]

This doesn't work with 16bit pccards under NEWCARD.

Enable in your config by having "device pccbb" and "device cardbus".
(A "device pccard" will attach a pccard bus, but it means you system have
a high chance of panicing when a 16bit card is inserted)

It should be fairly simple to make a driver attach to cardbus under
NEWCARD -- simply add an entry for attaching to cardbus on a new
DRIVER_MODULE and add new device IDs as necessary.  You should also make
sure the card can be detached nicely without the interrupt routine doing
something weird, like going into an infinite loop.  Usually that should
entail adding an additional check when a pci register or the bus space is
read to check if it equals 0xffffffff.

Any problems, please let me know.

Reviewed by: imp

6 files changed, 0 insertions, 563 deletions

diff --git a/sys/dev/cardbus/Makefile.cardbusdevs b/sys/dev/cardbus/Makefile.cardbusdevs
deleted file mode 100644
index 1181493548ef..000000000000
--- a/sys/dev/cardbus/Makefile.cardbusdevs
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$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/cardbusdevs b/sys/dev/cardbus/cardbusdevs
deleted file mode 100644
index 5df9b6230458..000000000000
--- a/sys/dev/cardbus/cardbusdevs
+++ /dev/null
@@ -1,65 +0,0 @@
-$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/cardbusdevs.h b/sys/dev/cardbus/cardbusdevs.h
deleted file mode 100644
index 4ffb3c8e0ca0..000000000000
--- a/sys/dev/cardbus/cardbusdevs.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$FreeBSD$	*/
-
-/*
- * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
- *
- * generated from:
- *	FreeBSD: src/sys/dev/cardbus/cardbusdevs,v 1.1 1999/11/18 07:21:50 imp Exp 
- */
-
-/*
- * 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
- */
-
-#define	CARDBUS_VENDOR_DEC	0x1011		/* Digital Equipment */
-#define	CARDBUS_VENDOR_3COM	0x10B7		/* 3Com */
-#define	CARDBUS_VENDOR_ADP	0x9004		/* Adaptec */
-#define	CARDBUS_VENDOR_ADP2	0x9005		/* Adaptec (2nd PCI Vendor ID) */
-#define	CARDBUS_VENDOR_OPTI	0x1045		/* Opti */
-
-/*
- * List of known products.  Grouped by vendor.
- */
-
-/* 3COM Products */
-
-#define	CARDBUS_PRODUCT_3COM_3C575TX	0x5057		/* 3c575 100Base-TX */
-#define	CARDBUS_PRODUCT_3COM_3C575BTX	0x5157		/* 3c575B 100Base-TX */
-
-/* Adaptec products */
-#define	CARDBUS_PRODUCT_ADP_1480	0x6075		/* APA-1480 */
-
-/* DEC products */
-#define	CARDBUS_PRODUCT_DEC_21142	0x0019		/* DECchip 21142/3 */
-
-/* Opti products */
-#define	CARDBUS_PRODUCT_OPTI_82C861	0xc861		/* 82C861 USB Host Controller (OHCI) */
diff --git a/sys/dev/cardbus/cardbusdevs_data.h b/sys/dev/cardbus/cardbusdevs_data.h
deleted file mode 100644
index 5a40a1f052d8..000000000000
--- a/sys/dev/cardbus/cardbusdevs_data.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*	$FreeBSD$	*/
-
-/*
- * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
- *
- * generated from:
- *	FreeBSD: src/sys/dev/cardbus/cardbusdevs,v 1.1 1999/11/18 07:21:50 imp Exp 
- */
-
-/*
- * 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.
- */
-
-struct cardbus_knowndev cardbus_knowndevs[] = {
-	{
-	    CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3C575TX,
-	    0,
-	    "3Com",
-	    "3c575 100Base-TX",
-	},
-	{
-	    CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3C575BTX,
-	    0,
-	    "3Com",
-	    "3c575B 100Base-TX",
-	},
-	{
-	    CARDBUS_VENDOR_ADP, CARDBUS_PRODUCT_ADP_1480,
-	    0,
-	    "Adaptec",
-	    "APA-1480",
-	},
-	{
-	    CARDBUS_VENDOR_DEC, CARDBUS_PRODUCT_DEC_21142,
-	    0,
-	    "Digital Equipment",
-	    "DECchip 21142/3",
-	},
-	{
-	    CARDBUS_VENDOR_OPTI, CARDBUS_PRODUCT_OPTI_82C861,
-	    0,
-	    "Opti",
-	    "82C861 USB Host Controller (OHCI)",
-	},
-	{
-	    CARDBUS_VENDOR_DEC, 0,
-	    CARDBUS_KNOWNDEV_NOPROD,
-	    "Digital Equipment",
-	    NULL,
-	},
-	{
-	    CARDBUS_VENDOR_3COM, 0,
-	    CARDBUS_KNOWNDEV_NOPROD,
-	    "3Com",
-	    NULL,
-	},
-	{
-	    CARDBUS_VENDOR_ADP, 0,
-	    CARDBUS_KNOWNDEV_NOPROD,
-	    "Adaptec",
-	    NULL,
-	},
-	{
-	    CARDBUS_VENDOR_ADP2, 0,
-	    CARDBUS_KNOWNDEV_NOPROD,
-	    "Adaptec (2nd PCI Vendor ID)",
-	    NULL,
-	},
-	{
-	    CARDBUS_VENDOR_OPTI, 0,
-	    CARDBUS_KNOWNDEV_NOPROD,
-	    "Opti",
-	    NULL,
-	},
-	{ 0, 0, 0, NULL, NULL, }
-};
diff --git a/sys/dev/cardbus/devlist2h.awk b/sys/dev/cardbus/devlist2h.awk
deleted file mode 100644
index 2dd9caa694b8..000000000000
--- a/sys/dev/cardbus/devlist2h.awk
+++ /dev/null
@@ -1,222 +0,0 @@
-#! /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
deleted file mode 100644
index ec3bfb87e748..000000000000
--- a/sys/dev/cardbus/pccardcis.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$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 */