From d282f771e745564e2496af1c84b58f07e0094777 Mon Sep 17 00:00:00 2001 From: soren Date: Fri, 18 Feb 2000 18:55:31 +0000 Subject: [PATCH] Remove redundant CIS definitions. --- sys/dev/cardbus/cardbus.c | 11 ++--- sys/dev/cardbus/pccardcis.h | 92 ------------------------------------- 2 files changed, 4 insertions(+), 99 deletions(-) delete mode 100644 sys/dev/cardbus/pccardcis.h diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 47057398988e..467da6f2795e 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cardbus.c,v 1.19 2000/01/31 08:49:07 haya Exp $ */ +/* $NetBSD: cardbus.c,v 1.20 2000/02/18 18:55:31 soren Exp $ */ /* * Copyright (c) 1997, 1998, 1999 and 2000 @@ -47,14 +47,13 @@ #include #include -#include #include #include /* XXX */ #include /* XXX */ -#include /* XXX */ +#include #if defined CARDBUS_DEBUG #define STATIC @@ -65,7 +64,6 @@ #endif - STATIC void cardbusattach __P((struct device *, struct device *, void *)); /* STATIC int cardbusprint __P((void *, const char *)); */ int cardbus_attach_card __P((struct cardbus_softc *)); @@ -866,7 +864,7 @@ decode_tuples(tuple, buflen, func, data) { u_int8_t *tp = tuple; - if (CISTPL_LINKTARGET != *tuple) { + if (PCMCIA_CISTPL_LINKTARGET != *tuple) { DPRINTF(("WRONG TUPLE: 0x%x\n", *tuple)); return 0; } @@ -895,7 +893,7 @@ decode_tuple(tuple, func, data) (*func)(tuple, len, data); - if (CISTPL_END == type) { + if (PCMCIA_CISTPL_END == type) { return NULL; } @@ -966,4 +964,3 @@ print_tuple(tuple, len, data) } #endif - diff --git a/sys/dev/cardbus/pccardcis.h b/sys/dev/cardbus/pccardcis.h deleted file mode 100644 index cd74014998fd..000000000000 --- a/sys/dev/cardbus/pccardcis.h +++ /dev/null @@ -1,92 +0,0 @@ -/* $NetBSD: pccardcis.h,v 1.3 1999/12/15 12:28:55 kleink 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 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. - */ - - -#ifndef _DEV_PCCARD_PCCARDCIS_H_ -#define _DEV_PCCARD_PCCARDCIS_H_ - -#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 /* !_DEV_PCCARD_PCCARDCIS_H_ */