Move dumpcis to its own directory, start to decouple from the

pccardc/pccardd history.

8 files changed, 2320 insertions, 0 deletions

diff --git a/usr.sbin/dumpcis/Makefile b/usr.sbin/dumpcis/Makefile
new file mode 100644
index 0000000..b68e2e4
--- /dev/null
+++ b/usr.sbin/dumpcis/Makefile
@@ -0,0 +1,9 @@
+#	pccardc Makefile
+#
+# $FreeBSD$
+
+PROG=	dumpcis
+MAN=	dumpcis.8
+SRCS=	main.c dumpcis.c dumpcisfile.c readcis.c printcis.c
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/dumpcis/dumpcis.8 b/usr.sbin/dumpcis/dumpcis.8
new file mode 100644
index 0000000..518eadd
--- /dev/null
+++ b/usr.sbin/dumpcis/dumpcis.8
@@ -0,0 +1,49 @@
+.\"
+.\" Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
+.\" 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. 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$
+.\"
+.Dd October 18, 2006
+.Dt DUMPCIS 8
+.Os
+.Sh NAME
+.Nm dumpcis
+.Nd PC Card and Cardbus (PCMCIA) CIS display tool
+.Sh SYNOPSIS
+.Nm
+.Ar
+.Sh DESCRIPTION
+The
+.Nm
+utility translates a raw CIS stream into human readable form.
+.Sh SEE ALSO
+.Xr cardbus 4 ,
+.Xr cbb 4 ,
+.Xr pccard 4
+.Sh AUTHORS
+.An -nosplit
+The original version was written by
+.An Warner Losh Aq imp@FreeBSD.org .
diff --git a/usr.sbin/dumpcis/dumpcis.c b/usr.sbin/dumpcis/dumpcis.c
new file mode 100644
index 0000000..d085e37
--- /dev/null
+++ b/usr.sbin/dumpcis/dumpcis.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 1995 Andrew McRae.  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. 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 lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#include <pccard/cardinfo.h>
+#include <pccard/cis.h>
+#include "readcis.h"
+
+int     nocards;
+
+static void
+scan(int slot)
+{
+	int     fd;
+	char    name[64];
+	struct cis *cp;
+	struct slotstate st;
+
+	sprintf(name, CARD_DEVICE, slot);
+	fd = open(name, O_RDONLY);
+	if (fd < 0)
+		return;
+	nocards++;
+	if (ioctl(fd, PIOCGSTATE, &st))
+		err(1, "ioctl (PIOCGSTATE)");
+	if (st.state == filled) {
+		cp = readcis(fd);
+		if (cp) {
+			printf("Configuration data for card in slot %d\n",
+			    slot);
+			dumpcis(cp);
+			freecis(cp);
+		}
+	}
+}
+
+void
+dump(unsigned char *p, int sz)
+{
+	int     ad = 0, i;
+
+	while (sz > 0) {
+		printf("%03x: ", ad);
+		for (i = 0; i < ((sz < 16) ? sz : 16); i++)
+			printf(" %02x", p[i]);
+		printf("\n");
+		sz -= 16;
+		p += 16;
+		ad += 16;
+	}
+}
+
+void *
+xmalloc(int sz)
+{
+	void   *p;
+
+	sz = (sz + 7) & ~7;
+	p = malloc(sz);
+	if (p)
+		bzero(p, sz);
+	else
+		errx(1, "malloc");
+	return (p);
+}
+
+int
+dumpcis_main(int argc, char **argv)
+{
+	int     node;
+
+	for (node = 0; node < 8; node++)
+		scan(node);
+	printf("%d slots found\n", nocards);
+	return 0;
+}
diff --git a/usr.sbin/dumpcis/dumpcisfile.c b/usr.sbin/dumpcis/dumpcisfile.c
new file mode 100644
index 0000000..6a415ba
--- /dev/null
+++ b/usr.sbin/dumpcis/dumpcisfile.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 1995 Andrew McRae.  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. 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 lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#include <pccard/cardinfo.h>
+#include <pccard/cis.h>
+#include "readcis.h"
+
+static void
+scanfile(name)
+	char     *name;
+{
+	int     fd;
+	struct cis *cp;
+
+	fd = open(name, O_RDONLY);
+	if (fd < 0)
+		return;
+	cp = readcis(fd);
+	if (cp) {
+		printf("Configuration data for file %s\n",
+		    name);
+		dumpcis(cp);
+		freecis(cp);
+	}
+	close(fd);
+}
+
+int
+dumpcisfile_main(int argc, char **argv)
+{
+
+	isdumpcisfile = 1;
+	for (argc--, argv++; argc; argc--, argv++)
+		scanfile(*argv);
+	return 0;
+}
diff --git a/usr.sbin/dumpcis/main.c b/usr.sbin/dumpcis/main.c
new file mode 100644
index 0000000..317195c
--- /dev/null
+++ b/usr.sbin/dumpcis/main.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006 M. Warner Losh.  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.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+int dumpcisfile_main(int, char **);
+
+int
+main(int argc, char **argv)
+{
+	return dumpcisfile_main(argc, argv);
+}
diff --git a/usr.sbin/dumpcis/printcis.c b/usr.sbin/dumpcis/printcis.c
new file mode 100644
index 0000000..f8a53b3
--- /dev/null
+++ b/usr.sbin/dumpcis/printcis.c
@@ -0,0 +1,1107 @@
+/*
+ * Copyright (c) 1995 Andrew McRae.  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. 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 lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
+/* 
+ * Code cleanup, bug-fix and extension
+ * by Tatsumi Hosokawa <hosokawa@mt.cs.keio.ac.jp>                   
+ */
+
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#include <pccard/cardinfo.h>
+#include <pccard/cis.h>
+
+#include "readcis.h"
+
+static void   dump_config_map(struct tuple *tp);
+static void   dump_cis_config(struct tuple *tp);
+static void   dump_other_cond(u_char *p, int len);
+static void   dump_device_desc(u_char *p, int len, char *type);
+static void   dump_info_v1(u_char *p, int len);
+static void   dump_longlink_mfc(u_char *p, int len);
+static void   dump_bar(u_char *p, int len);
+static void   dump_device_geo(u_char *p, int len);
+static void   dump_func_id(u_char *p);
+static void   dump_serial_ext(u_char *p, int len);
+static void   dump_disk_ext(u_char *p, int len);
+static void   dump_network_ext(u_char *p, int len);
+static void   dump_info_v2(u_char *p, int len);
+static void   dump_org(u_char *p, int len);
+
+void
+dumpcis(struct cis *cp)
+{
+	struct tuple *tp;
+	struct tuple_list *tl;
+	int     count = 0, sz, ad, i;
+	u_char *p;
+	int func = 0;
+
+	for (tl = cp->tlist; tl; tl = tl->next)
+		for (tp = tl->tuples; tp; tp = tp->next) {
+			printf("Tuple #%d, code = 0x%x (%s), length = %d\n",
+			    ++count, tp->code, tuple_name(tp->code), tp->length);
+			p = tp->data;
+			sz = tp->length;
+			ad = 0;
+			while (sz > 0) {
+				printf("    %03x: ", ad);
+				for (i = 0; i < ((sz < 16) ? sz : 16); i++)
+					printf(" %02x", p[i]);
+				printf("\n");
+				sz -= 16;
+				p += 16;
+				ad += 16;
+			}
+			switch (tp->code) {
+			default:
+				break;
+			case CIS_MEM_COMMON:	/* 0x01 */
+				dump_device_desc(tp->data, tp->length, "Common");
+				break;
+			case CIS_CONF_MAP_CB:	/* 0x04 */
+				dump_config_map(tp);
+				break;
+			case CIS_CONFIG_CB:	/* 0x05 */
+				dump_cis_config(tp);
+				break;
+			case CIS_LONGLINK_MFC:	/* 0x06 */
+				dump_longlink_mfc(tp->data, tp->length);
+				break;
+			case CIS_BAR:		/* 0x07 */
+				dump_bar(tp->data, tp->length);
+				break;
+			case CIS_CHECKSUM:	/* 0x10 */
+				printf("\tChecksum from offset %d, length %d, value is 0x%x\n",
+				       tpl16(tp->data),
+				       tpl16(tp->data + 2),
+				       tp->data[4]);
+				break;
+			case CIS_LONGLINK_A:	/* 0x11 */
+				printf("\tLong link to attribute memory, address 0x%x\n",
+				       tpl32(tp->data));
+				break;
+			case CIS_LONGLINK_C:	/* 0x12 */
+				printf("\tLong link to common memory, address 0x%x\n",
+				       tpl32(tp->data));
+				break;	
+			case CIS_INFO_V1:	/* 0x15 */
+				dump_info_v1(tp->data, tp->length);
+				break;
+			case CIS_ALTSTR:	/* 0x16 */
+				break;
+			case CIS_MEM_ATTR:	/* 0x17 */
+				dump_device_desc(tp->data, tp->length, "Attribute");
+				break;
+			case CIS_JEDEC_C:	/* 0x18 */
+			case CIS_JEDEC_A:	/* 0x19 */
+				break;
+			case CIS_CONF_MAP:	/* 0x1A */
+				dump_config_map(tp);
+				break;
+			case CIS_CONFIG:	/* 0x1B */
+				dump_cis_config(tp);
+				break;
+			case CIS_DEVICE_OC:	/* 0x1C */
+			case CIS_DEVICE_OA:	/* 0x1D */
+				dump_other_cond(tp->data, tp->length);
+				break;
+			case CIS_DEVICEGEO:	/* 0x1E */
+			case CIS_DEVICEGEO_A:	/* 0x1F */
+				dump_device_geo(tp->data, tp->length);
+				break;
+			case CIS_MANUF_ID:	/* 0x20 */
+				printf("\tPCMCIA ID = 0x%x, OEM ID = 0x%x\n",
+				       tpl16(tp->data),
+				       tpl16(tp->data + 2));
+				break;
+			case CIS_FUNC_ID:	/* 0x21 */
+				func = tp->data[0];
+				dump_func_id(tp->data);
+				break;
+			case CIS_FUNC_EXT:	/* 0x22 */
+				switch (func) {
+				case 2:
+					dump_serial_ext(tp->data, tp->length);
+					break;
+				case 4:
+					dump_disk_ext(tp->data, tp->length);
+					break;
+				case 6:
+					dump_network_ext(tp->data, tp->length);
+					break;
+				}
+				break;
+			case CIS_VERS_2:	/* 0x40 */
+				dump_info_v2(tp->data, tp->length);
+				break;
+			case CIS_ORG:		/* 0x46 */
+				dump_org(tp->data, tp->length);
+				break;
+			}
+		}
+}
+
+/*
+ *	CIS_CONF_MAP   : Dump configuration map tuple.
+ *	CIS_CONF_MAP_CB: Dump configuration map for CardBus
+ */
+static void
+dump_config_map(struct tuple *tp)
+{
+	u_char *p = tp->data, x;
+	int     rlen, mlen = 0;
+	int     i;
+
+	rlen = (p[0] & 3) + 1;
+	if (tp->code == CIS_CONF_MAP)
+		mlen = ((p[0] >> 2) & 3) + 1;
+	if (tp->length < rlen + mlen + 2) {
+		printf("\tWrong length for configuration map tuple\n");
+		return;
+	}
+	printf("\tReg len = %d, config register addr = 0x%x, last config = 0x%x\n",
+	       rlen, parse_num(rlen | 0x10, p + 2, &p, 0), p[1]);
+	if (mlen) {
+		printf("\tRegisters: ");
+		for (i = 0; i < mlen; i++, p++) {
+			for (x = 0x1; x; x <<= 1)
+				printf("%c", x & *p ? 'X' : '-');
+			putchar(' ');
+		}
+	}
+	i = tp->length - (rlen + mlen + 2);
+	if (i) {
+		if (!mlen)
+			putchar('\t');
+		printf("%d bytes in subtuples", i);
+	}
+	if (mlen || i)
+		putchar('\n');
+}
+
+/*
+ *	Dump power descriptor.
+ *	call from dump_cis_config()
+ */
+static int
+print_pwr_desc(u_char *p)
+{
+	int     len = 1, i;
+	u_char mask;
+	char  **expp;
+	static char *pname[] =
+	{"Nominal operating supply voltage",
+	 "Minimum operating supply voltage",
+	 "Maximum operating supply voltage",
+	 "Continuous supply current",
+	 "Max current average over 1 second",
+	 "Max current average over 10 ms",
+	 "Power down supply current",
+	 "Reserved"
+	};
+	static char *vexp[] =
+	{"10uV", "100uV", "1mV", "10mV", "100mV", "1V", "10V", "100V"};
+	static char *cexp[] =
+	{"10nA", "1uA", "10uA", "100uA", "1mA", "10mA", "100mA", "1A"};
+	static char *mant[] =
+	{"1", "1.2", "1.3", "1.5", "2", "2.5", "3", "3.5", "4", "4.5",
+	"5", "5.5", "6", "7", "8", "9"};
+
+	mask = *p++;
+	expp = vexp;
+	for (i = 0; i < 8; i++)
+		if (mask & (1 << i)) {
+			len++;
+			if (i >= 3)
+				expp = cexp;
+			printf("\t\t%s: ", pname[i]);
+			printf("%s x %s",
+			    mant[(*p >> 3) & 0xF],
+			    expp[*p & 7]);
+			while (*p & 0x80) {
+				len++;
+				p++;
+				printf(", ext = 0x%x", *p);
+			}
+			printf("\n");
+			p++;
+		}
+	return (len);
+}
+
+/*
+ *	print_ext_speed - Print extended speed.
+ *	call from dump_cis_config(), dump_device_desc()
+ */
+static void
+print_ext_speed(u_char x, int scale)
+{
+	static char *mant[] =
+	{"Reserved", "1.0", "1.2", "1.3", "1.5", "2.0", "2.5", "3.0",
+	"3.5", "4.0", "4.5", "5.0", "5.5", "6.0", "7.0", "8.0"};
+	static char *exp[] =
+	{"1 ns", "10 ns", "100 ns", "1 us", "10 us", "100 us",
+	"1 ms", "10 ms"};
+	static char *scale_name[] =
+	{"None", "10", "100", "1,000", "10,000", "100,000",
+	"1,000,000", "10,000,000"};
+
+	printf("Speed = %s x %s", mant[(x >> 3) & 0xF], exp[x & 7]);
+	if (scale)
+		printf(", scaled by %s", scale_name[scale & 7]);
+}
+
+/*
+ *	Print variable length value.
+ *	call from print_io_map(), print_mem_map()
+ */
+static int
+print_num(int sz, char *fmt, u_char *p, int ofs)
+{
+	switch (sz) {
+	case 0:
+	case 0x10:
+		return 0;
+	case 1:
+	case 0x11:
+		printf(fmt, *p + ofs);
+		return 1;
+	case 2:
+	case 0x12:
+		printf(fmt, tpl16(p) + ofs);
+		return 2;
+	case 0x13:
+		printf(fmt, tpl24(p) + ofs);
+		return 3;
+	case 3:
+	case 0x14:
+		printf(fmt, tpl32(p) + ofs);
+		return 4;
+	}
+	errx(1, "print_num(0x%x): Illegal arguments", sz);
+/*NOTREACHED*/
+}
+
+/*
+ *	Print I/O mapping sub-tuple.
+ *	call from dump_cis_config()
+ */
+static u_char *
+print_io_map(u_char *p, u_char *q)
+{
+	int i, j;
+	u_char c;
+
+	if (q <= p)
+		goto err;
+	if (CIS_IO_ADDR(*p))	/* I/O address line */
+		printf("\tCard decodes %d address lines",
+			CIS_IO_ADDR(*p));
+	else
+		printf("\tCard provides address decode");
+
+	/* 8/16 bit I/O */
+	switch (*p & (CIS_IO_8BIT | CIS_IO_16BIT)) {
+	case CIS_IO_8BIT:
+		printf(", 8 Bit I/O only");
+		break;
+	case CIS_IO_16BIT:
+		printf(", limited 8/16 Bit I/O");
+		break;
+	case (CIS_IO_8BIT | CIS_IO_16BIT):
+		printf(", full 8/16 Bit I/O");
+		break;
+	}
+	putchar('\n');
+
+	/* I/O block sub-tuple exist */
+	if (*p++ & CIS_IO_RANGE) {
+		if (q <= p)
+			goto err;
+		c = *p++;
+		/* calculate byte length */
+		j = CIS_IO_ADSZ(c) + CIS_IO_BLKSZ(c);
+		if (CIS_IO_ADSZ(c) == 3)
+			j++;
+		if (CIS_IO_BLKSZ(c) == 3)
+			j++;
+		/* number of I/O block sub-tuples */
+		for (i = 0; i <= CIS_IO_BLKS(c); i++) {
+			if (q - p < j)
+				goto err;
+			printf("\t\tI/O address # %d: ", i + 1);
+			/* start block address */
+			p += print_num(CIS_IO_ADSZ(c),
+				       "block start = 0x%x", p, 0);
+			/* block size */
+			p += print_num(CIS_IO_BLKSZ(c),
+				       " block length = 0x%x", p, 1);
+			putchar('\n');
+		}
+	}
+	return p;
+
+ err:	/* warning */
+	printf("\tWrong length for I/O mapping sub-tuple\n");
+	return p;
+}
+
+/*
+ *	Print IRQ sub-tuple.
+ *	call from dump_cis_config()
+ */
+static u_char *
+print_irq_map(u_char *p, u_char *q)
+{
+	int i, j;
+	u_char c;
+
+	if (q <= p)
+		goto err;
+	printf("\t\tIRQ modes:");
+	c = ' ';
+	if (*p & CIS_IRQ_LEVEL) { /* Level triggered interrupts */
+		printf(" Level");
+		c = ',';
+	}
+	if (*p & CIS_IRQ_PULSE) { /* Pulse triggered requests */
+		printf("%c Pulse", c);
+		c = ',';
+	}
+	if (*p & CIS_IRQ_SHARING) /* Interrupt sharing */
+		printf("%c Shared", c);
+	putchar('\n');
+
+	/* IRQ mask values exist */
+	if (*p & CIS_IRQ_MASK) {
+		if (q - p < 3)
+			goto err;
+		i = tpl16(p + 1); /* IRQ mask */
+		printf("\t\tIRQs: ");
+		if (*p & 1)
+			printf(" NMI");
+		if (*p & 0x2)
+			printf(" IOCK");
+		if (*p & 0x4)
+			printf(" BERR");
+		if (*p & 0x8)
+			printf(" VEND");
+		for (j = 0; j < 16; j++)
+			if (i & (1 << j))
+				printf(" %d", j);
+		putchar('\n');
+		p += 3;
+	} else {
+		printf("\t\tIRQ level = %d\n", CIS_IRQ_IRQN(*p));
+		p++;
+	}
+	return p;
+
+ err:	/* warning */
+	printf("\tWrong length for IRQ sub-tuple\n");
+	return p;
+}
+
+/*
+ *	Print memory map sub-tuple.
+ *	call from dump_cis_config()
+ */
+static u_char *
+print_mem_map(u_char feat, u_char *p, u_char *q)
+{
+	int i, j;
+	u_char c;
+
+	switch (CIS_FEAT_MEMORY(feat)) {
+
+	case CIS_FEAT_MEM_NONE:	/* No memory block */
+		break;
+	case CIS_FEAT_MEM_LEN:	/* Specify memory length */
+		if (q - p < 2)
+			goto err;
+		printf("\tMemory space length = 0x%x\n", tpl16(p));
+		p += 2;
+		break;
+	case CIS_FEAT_MEM_ADDR:	/* Memory address and length */
+		if (q - p < 4)
+			goto err;
+		printf("\tMemory space address = 0x%x, length = 0x%x\n",
+		       tpl16(p + 2), tpl16(p));
+		p += 4;
+		break;
+	case CIS_FEAT_MEM_WIN:	/* Memory descriptors. */
+		if (q <= p)
+			goto err;
+		c = *p++;
+		/* calculate byte length */
+		j = CIS_MEM_LENSZ(c) + CIS_MEM_ADDRSZ(c);
+		if (c & CIS_MEM_HOST)
+			j += CIS_MEM_ADDRSZ(c);
+		/* number of memory block */
+		for (i = 0; i < CIS_MEM_WINS(c); i++) {
+			if (q - p < j)
+				goto err;
+			printf("\tMemory descriptor %d\n\t\t", i + 1);
+			/* memory length */
+			p += print_num(CIS_MEM_LENSZ(c) | 0x10,
+				       " blk length = 0x%x00", p, 0);
+			/* card address */
+			p += print_num(CIS_MEM_ADDRSZ(c) | 0x10,
+				       " card addr = 0x%x00", p, 0);
+			if (c & CIS_MEM_HOST) /* Host address value exist */
+				p += print_num(CIS_MEM_ADDRSZ(c) | 0x10,
+					       " host addr = 0x%x00", p, 0);
+			putchar('\n');
+		}
+		break;
+	}
+	return p;
+
+ err:	/* warning */
+	printf("\tWrong length for memory mapping sub-tuple\n");
+	return p;
+}
+
+/*
+ *	CIS_CONFIG   : Dump a config entry.
+ *	CIS_CONFIG_CB: Dump a configuration entry for CardBus
+ */
+static void
+dump_cis_config(struct tuple *tp)
+{
+	u_char *p, *q, feat;
+	int     i, j;
+	char    c;
+
+	p = tp->data;
+	q = p + tp->length;
+	printf("\tConfig index = 0x%x%s\n", *p & 0x3F,
+	       *p & 0x40 ? "(default)" : "");
+
+	/* Interface byte exists */
+	if (tp->code == CIS_CONFIG && (*p & 0x80)) {
+		p++;
+		printf("\tInterface byte = 0x%x ", *p);
+		switch (*p & 0xF) { /* Interface type */
+		default:
+			printf("(reserved)");
+			break;
+		case 0:
+			printf("(memory)");
+			break;
+		case 1:
+			printf("(I/O)");
+			break;
+		case 4:
+		case 5:
+		case 6:
+		case 7:
+		case 8:
+			printf("(custom)");
+			break;
+		}
+		c = ' ';
+		if (*p & 0x10) { /* Battery voltage detect */
+			printf(" BVD1/2 active");
+			c = ',';
+		}
+		if (*p & 0x20) { /* Write protect active */
+			printf("%c card WP active", c);	/* Write protect */
+			c = ',';
+		}
+		if (*p & 0x40) { /* RdyBsy active bit */
+			printf("%c +RDY/-BSY active", c);
+			c = ',';
+		}
+		if (*p & 0x80)	/* Wait signal required */
+			printf("%c wait signal supported", c);
+		printf("\n");
+	}
+
+	/* features byte */
+	p++;
+	feat = *p++;
+
+	/* Power structure sub-tuple */
+	switch (CIS_FEAT_POWER(feat)) {	/* Power sub-tuple(s) exists */
+	case 0:
+		break;
+	case 1:
+		printf("\tVcc pwr:\n");
+		p += print_pwr_desc(p);
+		break;
+	case 2:
+		printf("\tVcc pwr:\n");
+		p += print_pwr_desc(p);
+		printf("\tVpp pwr:\n");
+		p += print_pwr_desc(p);
+		break;
+	case 3:
+		printf("\tVcc pwr:\n");
+		p += print_pwr_desc(p);
+		printf("\tVpp1 pwr:\n");
+		p += print_pwr_desc(p);
+		printf("\tVpp2 pwr:\n");
+		p += print_pwr_desc(p);
+		break;
+	}
+
+	/* Timing sub-tuple */
+	if (tp->code == CIS_CONFIG &&
+	    (feat & CIS_FEAT_TIMING)) {	/* Timing sub-tuple exists */
+		i = *p++;
+		j = CIS_WAIT_SCALE(i);
+		if (j != 3) {
+			printf("\tWait scale ");
+			print_ext_speed(*p++, j);
+			printf("\n");
+		}
+		j = CIS_READY_SCALE(i);
+		if (j != 7) {
+			printf("\tRDY/BSY scale ");
+			print_ext_speed(*p++, j);
+			printf("\n");
+		}
+		j = CIS_RESERVED_SCALE(i);
+		if (j != 7) {
+			printf("\tExternal scale ");
+			print_ext_speed(*p++, j);
+			printf("\n");
+		}
+	}
+
+	/* I/O mapping sub-tuple */
+	if (feat & CIS_FEAT_I_O) { /* I/O space sub-tuple exists */
+		if (tp->code == CIS_CONFIG)
+			p = print_io_map(p, q);
+		else {		/* CIS_CONFIG_CB */
+			printf("\tI/O base:");
+			for (i = 0; i < 8; i++)
+				if (*p & (1 << i))
+					printf(" %d", i);
+			putchar('\n');
+			p++;
+		}
+	}
+
+	/* IRQ descriptor sub-tuple */
+	if (feat & CIS_FEAT_IRQ) /* IRQ sub-tuple exists */
+		p = print_irq_map(p, q);
+
+	/* Memory map sub-tuple */
+	if (CIS_FEAT_MEMORY(feat)) { /* Memory space sub-tuple(s) exists */
+		if (tp->code == CIS_CONFIG)
+			p = print_mem_map(feat, p, q);
+		else {		/* CIS_CONFIG_CB */
+			printf("\tMemory base:");
+			for (i = 0; i < 8; i++)
+				if (*p & (1 << i))
+					printf(" %d", i);
+			putchar('\n');
+			p++;
+		}
+	}
+
+	/* Misc sub-tuple */
+	if (feat & CIS_FEAT_MISC) { /* Miscellaneous sub-tuple exists */
+		if (tp->code == CIS_CONFIG) {
+			printf("\tMax twin cards = %d\n", *p & 7);
+			printf("\tMisc attr:%s%s%s",
+			       (*p & 8) ? " (Audio-BVD2)" : "",
+			       (*p & 0x10) ? " (Read-only)" : "",
+			       (*p & 0x20) ? " (Power down supported)" : "");
+			if (*p++ & 0x80) {
+				printf(" (Ext byte = 0x%x)", *p);
+				p++;
+			}
+			putchar('\n');
+		}
+		else {		/* CIS_CONFIG_CB */
+			printf("\tMisc attr:");
+			printf("%s%s%s%s%s%s%s",
+			       (*p & 1) ? " (Master)" : "",
+			       (*p & 2) ? " (Invalidate)" : "",
+			       (*p & 4) ? " (VGA palette)" : "",
+			       (*p & 8) ? " (Parity)" : "",
+			       (*p & 0x10) ? " (Wait)" : "",
+			       (*p & 0x20) ? " (Serr)" : "",
+			       (*p & 0x40) ? " (Fast back)" : "");
+			if (*p++ & 0x80) {
+				printf("%s%s",
+				       (*p & 1) ? " (Binary audio)" : "",
+				       (*p & 2) ? " (pwm audio)" : "");
+				p++;
+			}
+			putchar('\n');
+		}
+	}
+}
+
+/*
+ *	CIS_DEVICE_OC, CIS_DEVICE_OA:
+ *		Dump other conditions for common/attribute memory
+ */
+static void
+dump_other_cond(u_char *p, int len)
+{
+	if (p[0] && len > 0) {
+		printf("\t");
+		if (p[0] & 1)
+			printf("(MWAIT)");
+		if (p[0] & 2)
+			printf(" (3V card)");
+		if (p[0] & 0x80)
+			printf(" (Extension bytes follow)");
+		printf("\n");
+	}
+}
+
+/*
+ *	CIS_MEM_COMMON, CIS_MEM_ATTR:
+ *		Common / Attribute memory descripter
+ */
+static void
+dump_device_desc(u_char *p, int len, char *type)
+{
+	static char *un_name[] =
+	{"512b", "2Kb", "8Kb", "32Kb", "128Kb", "512Kb", "2Mb", "reserved"};
+	static char *speed[] =
+	{"No speed", "250nS", "200nS", "150nS",
+	"100nS", "Reserved", "Reserved"};
+	static char *dev[] =
+	{"No device", "Mask ROM", "OTPROM", "UV EPROM",
+	 "EEPROM", "FLASH EEPROM", "SRAM", "DRAM",
+	 "Reserved", "Reserved", "Reserved", "Reserved",
+	 "Reserved", "Function specific", "Extended",
+	"Reserved"};
+	int     count = 0;
+
+	while (*p != 0xFF && len > 0) {
+		u_char x;
+
+		x = *p++;
+		len -= 2;
+		if (count++ == 0)
+			printf("\t%s memory device information:\n", type);
+		printf("\t\tDevice number %d, type %s, WPS = %s\n",
+		    count, dev[x >> 4], (x & 0x8) ? "ON" : "OFF");
+		if ((x & 7) == 7) {
+			len--;
+			if (*p) {
+				printf("\t\t");
+				print_ext_speed(*p, 0);
+				while (*p & 0x80) {
+					p++;
+					len--;
+				}
+			}
+			p++;
+		} else
+			printf("\t\tSpeed = %s", speed[x & 7]);
+		printf(", Memory block size = %s, %d units\n",
+		    un_name[*p & 7], (*p >> 3) + 1);
+		p++;
+	}
+}
+
+/*
+ *	CIS_INFO_V1: Print version-1 info
+ */
+static void
+dump_info_v1(u_char *p, int len)
+{
+	if (len < 2) {
+		printf("\tWrong length for version-1 info tuple\n");
+		return;
+	}
+	printf("\tVersion = %d.%d", p[0], p[1]);
+	p += 2;
+	len -= 2;
+	if (len > 1 && *p != 0xff) {
+		printf(", Manuf = [%s]", p);
+		while (*p++ && --len > 0);
+	}
+	if (len > 1 && *p != 0xff) {
+		printf(", card vers = [%s]", p);
+		while (*p++ && --len > 0);
+	} else {
+		printf("\n\tWrong length for version-1 info tuple\n");
+		return;
+	}
+	putchar('\n');
+	if (len > 1 && *p != 0xff) {
+		printf("\tAddit. info = [%.*s]", len, p);
+		while (*p++ && --len > 0);
+		if (len > 1 && *p != 0xff)
+			printf(",[%.*s]", len, p);
+		putchar('\n');
+	}
+}
+
+/*
+ *	CIS_FUNC_ID: Functional ID
+ */
+static void
+dump_func_id(u_char *p)
+{
+	static char *id[] = {
+		"Multifunction card",
+		"Memory card",
+		"Serial port/modem",
+		"Parallel port",
+		"Fixed disk card",
+		"Video adapter",
+		"Network/LAN adapter",
+		"AIMS",
+		"SCSI card",
+		"Security"
+	};
+
+	printf("\t%s%s%s\n",
+	       (*p <= 9) ? id[*p] : "Unknown function",
+	       (p[1] & 1) ? " - POST initialize" : "",
+	       (p[1] & 2) ? " - Card has ROM" : "");
+}
+
+/*
+ *	CIS_FUNC_EXT: Dump functional extension tuple.
+ *		(Serial port/modem)
+ */
+static void
+dump_serial_ext(u_char *p, int len)
+{
+	static char *type[] = {
+		"", "Modem", "Data", "Fax", "Voice", "Data modem",
+		"Fax/modem", "Voice", " (Data)", " (Fax)", " (Voice)"
+	};
+
+	if (len < 1)
+		return;
+	switch (p[0]) {
+	case 0:			/* Serial */
+	case 8:			/* Data */
+	case 9:			/* Fax */
+	case 10:		/* Voice */
+		printf("\tSerial interface extension:%s\n", type[*p]);
+		if (len < 4)
+			goto err;
+		switch (p[1] & 0x1F) {
+		default:
+			printf("\t\tUnkn device");
+			break;
+		case 0:
+			printf("\t\t8250 UART");
+			break;
+		case 1:
+			printf("\t\t16450 UART");
+			break;
+		case 2:
+			printf("\t\t16550 UART");
+			break;
+		}
+		printf(", Parity - %s%s%s%s\n",
+		       (p[2] & 1) ? "Space," : "",
+		       (p[2] & 2) ? "Mark," : "",
+		       (p[2] & 4) ? "Odd," : "",
+		       (p[2] & 8) ? "Even" : "");
+		printf("\t\tData bit - %s%s%s%s Stop bit - %s%s%s\n",
+		       (p[3] & 1) ? "5bit," : "",
+		       (p[3] & 2) ? "6bit," : "",
+		       (p[3] & 4) ? "7bit," : "",
+		       (p[3] & 8) ? "8bit," : "",
+		       (p[3] & 0x10) ? "1bit," : "",
+		       (p[3] & 0x20) ? "1.5bit," : "",
+		       (p[3] & 0x40) ? "2bit" : "");
+		break;
+	case 1:			/* Serial */
+	case 5:			/* Data */
+	case 6:			/* Fax */
+	case 7:			/* Voice */
+		printf("\t%s interface capabilities:\n", type[*p]);
+		if (len < 9)
+			goto err;
+		break;
+	case 2:			/* Data */
+		printf("\tData modem services available:\n");
+		break;
+	case 0x13:		/* Fax1 */
+	case 0x23:		/* Fax2 */
+	case 0x33:		/* Fax3 */
+		printf("\tFax%d/modem services available:\n", *p >> 4);
+		break;
+	case 0x84:		/* Voice */
+		printf("\tVoice services available:\n");
+		break;
+	err:	/* warning */
+		printf("\tWrong length for serial extension tuple\n");
+		return;
+	}
+}
+
+/*
+ *	CIS_FUNC_EXT: Dump functional extension tuple.
+ *		(Fixed disk card)
+ */
+static void
+dump_disk_ext(u_char *p, int len)
+{
+	if (len < 1)
+		return;
+	switch (p[0]) {
+	case 1:			/* IDE interface */
+		if (len < 2)
+			goto err;
+		printf("\tDisk interface: %s\n",
+		       (p[1] & 1) ? "IDE" : "Undefined");
+		break;
+	case 2:			/* Master */
+	case 3:			/* Slave */
+		if (len < 3)
+			goto err;
+		printf("\tDisk features: %s, %s%s\n",
+		       (p[1] & 0x04) ? "Silicon" : "Rotating",
+		       (p[1] & 0x08) ? "Unique, " : "",
+		       (p[1] & 0x10) ? "Dual" : "Single");
+		if (p[2] & 0x7f)
+			printf("\t\t%s%s%s%s%s%s%s\n",
+			       (p[2] & 0x01) ? "Sleep, " : "",
+			       (p[2] & 0x02) ? "Standby, " : "",
+			       (p[2] & 0x04) ? "Idle, " : "",
+			       (p[2] & 0x08) ? "Low power, " : "",
+			       (p[2] & 0x10) ? "Reg inhibit, " : "",
+			       (p[2] & 0x20) ? "Index, " : "",
+			       (p[2] & 0x40) ? "Iois16" : "");
+		break;
+	err:	/* warning */
+		printf("\tWrong length for fixed disk extension tuple\n");
+		return;
+	}
+}
+
+static void
+print_speed(u_int i)
+{
+	if (i < 1000)
+		printf("%u bits/sec", i);
+	else if (i < 1000000)
+		printf("%u kb/sec", i / 1000);
+	else
+		printf("%u Mb/sec", i / 1000000);
+}
+
+/*
+ *	CIS_FUNC_EXT: Dump functional extension tuple.
+ *		(Network/LAN adapter)
+ */
+static void
+dump_network_ext(u_char *p, int len)
+{
+	static const char *tech[] = {
+		"Undefined", "ARCnet", "Ethernet", "Token ring",
+		"Localtalk", "FDDI/CDDI", "ATM", "Wireless"
+	};
+	static const char *media[] = {
+		"Undefined", "UTP", "STP", "Thin coax",
+		"THICK coax", "Fiber", "900 MHz", "2.4 GHz",
+		"5.4 GHz", "Diffuse Infrared", "Point to point Infrared"
+	};
+	u_int i = 0;
+
+	if (len < 1)
+		return;
+	switch (p[0]) {
+	case 1:			/* Network technology */
+		if (len < 2)
+			goto err;
+		printf("\tNetwork technology: %s\n", tech[p[1] & 7]);
+		break;
+	case 2:			/* Network speed */
+		if (len < 5)
+			goto err;
+		printf("\tNetwork speed: ");
+		print_speed(tpl32(p + 1));
+		putchar('\n');
+		break;
+	case 3:			/* Network media */
+		if (len < 2)
+			goto err;
+		if (p[1] <= 10)
+			i = p[1];
+		printf("\tNetwork media: %s\n", media[i]);
+		break;
+	case 4:			/* Node ID */
+		if (len <= 2 || len < p[1] + 2)
+			goto err;
+		printf("\tNetwork node ID:");
+		for (i = 0; i < p[1]; i++)
+			printf(" %02x", p[i + 2]);
+		putchar('\n');
+		break;
+	case 5:			/* Connecter type */
+		if (len < 2)
+			goto err;
+		printf("\tNetwork connector: %s connector standard\n",
+		       (p[1] == 0) ? "open" : "closed");
+		break;
+	err:	/* warning */
+		printf("\tWrong length for network extension tuple\n");
+		return;
+	}
+}
+
+/*
+ *	CIS_LONGLINK_MFC: Long link to next chain for Multi function card
+ */
+static void
+dump_longlink_mfc(u_char *p, int len)
+{
+	u_int i, n = *p++;
+
+	--len;
+	for (i = 0; i < n; i++) {
+		if (len < 5) {
+			printf("\tWrong length for long link MFC tuple\n");
+			return;
+		}
+		printf("\tFunction %d: %s memory, address 0x%x\n",
+		       i, (*p ? "common" : "attribute"), tpl32(p + 1));
+		p += 5;
+		len -= 5;
+	}
+}
+
+/*
+ *	CIS_DEVICEGEO, CIS_DEVICEGEO_A:
+ *		Geometry info for common/attribute memory
+ */
+static void
+dump_device_geo(u_char *p, int len)
+{
+	while (len >= 6) {
+		printf("\twidth = %d, erase = 0x%x, read = 0x%x, write = 0x%x\n"
+		       "\t\tpartition = 0x%x, interleave = 0x%x\n",
+		       p[0], 1 << (p[1] - 1),
+		       1 << (p[2] - 1), 1 << (p[3] - 1),
+		       1 << (p[4] - 1), 1 << (p[5] - 1));
+		len -= 6;
+	}
+}
+
+/*
+ *	CIS_INFO_V2: Print version-2 info
+ */
+static void
+dump_info_v2(u_char *p, int len)
+{
+	if (len < 9) {
+		printf("\tWrong length for version-2 info tuple\n");
+		return;
+	}
+	printf("\tVersion = 0x%x, compliance = 0x%x, dindex = 0x%x\n",
+	       p[0], p[1], tpl16(p + 2));
+	printf("\tVspec8 = 0x%x, vspec9 = 0x%x, nhdr = %d\n",
+	       p[6], p[7], p[8]);
+	p += 9;
+	len -= 9;
+	if (len <= 1 || *p == 0xff)
+		return;
+	printf("\tVendor = [%.*s]", len, p);
+	while (*p++ && --len > 0);
+	if (len > 1 && *p != 0xff)
+		printf(", info = [%.*s]", len, p);
+	putchar('\n');
+}
+
+/*
+ *	CIS_ORG: Organization
+ */
+static void
+dump_org(u_char *p, int len)
+{
+	if (len < 1) {
+		printf("\tWrong length for organization tuple\n");
+		return;
+	}
+	switch (*p) {
+	case 0:
+		printf("\tFilesystem");
+		break;
+	case 1:
+		printf("\tApp specific");
+		break;
+	case 2:
+		printf("\tCode");
+		break;
+	default:
+		if (*p < 0x80)
+			printf("\tReserved");
+		else
+			printf("\tVendor specific");
+		break;
+	}
+	printf(" [%.*s]\n", len - 1, p + 1);
+}
+
+static void
+print_size(u_int i)
+{
+	if (i < 1024)
+		printf("%ubits", i);
+	else if (i < 1024*1024)
+		printf("%ukb", i / 1024);
+	else
+		printf("%uMb", i / (1024*1024));
+}
+
+/*
+ *	CIS_BAR: Base address register for CardBus
+ */
+static void
+dump_bar(u_char *p, int len)
+{
+	if (len < 6) {
+		printf("\tWrong length for BAR tuple\n");
+		return;
+	}
+	printf("\tBAR %d: size = ", *p & 7);
+	print_size(tpl32(p + 2));
+	printf(", %s%s%s%s\n",
+	       (*p & 0x10) ? "I/O" : "Memory",
+	       (*p & 0x20) ? ", Prefetch" : "",
+	       (*p & 0x40) ? ", Cacheable" : "",
+	       (*p & 0x80) ? ", <1Mb" : "");
+}
diff --git a/usr.sbin/dumpcis/readcis.c b/usr.sbin/dumpcis/readcis.c
new file mode 100644
index 0000000..73b72ef
--- /dev/null
+++ b/usr.sbin/dumpcis/readcis.c
@@ -0,0 +1,790 @@
+/*
+ * Copyright (c) 1995 Andrew McRae.  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. 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 lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
+/*
+ * Code cleanup, bug-fix and extension
+ * by Tatsumi Hosokawa <hosokawa@mt.cs.keio.ac.jp>
+ */
+
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#include <pccard/cardinfo.h>
+#include <pccard/cis.h>
+
+#include "readcis.h"
+
+#ifdef RATOCLAN
+static int	rex5588 = 0;
+#endif
+int isdumpcisfile = 0;
+
+static int read_attr(int, char *, int);
+static int ck_linktarget(int, off_t, int);
+static void cis_info(struct cis *, unsigned char *, int);
+static void device_desc(unsigned char *, int, struct dev_mem *);
+static void config_map(struct cis *, unsigned char *, int);
+static void cis_config(struct cis *, unsigned char *, int);
+static void cis_manuf_id(struct cis *, unsigned char *, int);
+static void cis_func_id(struct cis *, unsigned char *, int);
+static void cis_network_ext(struct cis *, unsigned char *, int);
+static struct tuple_list *read_one_tuplelist(int, int, off_t);
+static struct tuple_list *read_tuples(int);
+static struct tuple *find_tuple_in_list(struct tuple_list *, unsigned char);
+static struct tuple_info *get_tuple_info(unsigned char);
+
+static struct tuple_info tuple_info[] = {
+	{"Null tuple", 0x00, 0},
+	{"Common memory descriptor", 0x01, 255},
+	{"Long link to next chain for CardBus", 0x02, 255},
+	{"Indirect access", 0x03, 255},
+	{"Configuration map for CardBus", 0x04, 255},
+	{"Configuration entry for CardBus", 0x05, 255},
+	{"Long link to next chain for MFC", 0x06, 255},
+	{"Base address register for CardBus", 0x07, 6},
+	{"Checksum", 0x10, 5},
+	{"Long link to attribute memory", 0x11, 4},
+	{"Long link to common memory", 0x12, 4},
+	{"Link target", 0x13, 3},
+	{"No link", 0x14, 0},
+	{"Version 1 info", 0x15, 255},
+	{"Alternate language string", 0x16, 255},
+	{"Attribute memory descriptor", 0x17, 255},
+	{"JEDEC descr for common memory", 0x18, 255},
+	{"JEDEC descr for attribute memory", 0x19, 255},
+	{"Configuration map", 0x1A, 255},
+	{"Configuration entry", 0x1B, 255},
+	{"Other conditions for common memory", 0x1C, 255},
+	{"Other conditions for attribute memory", 0x1D, 255},
+	{"Geometry info for common memory", 0x1E, 255},
+	{"Geometry info for attribute memory", 0x1F, 255},
+	{"Manufacturer ID", 0x20, 4},
+	{"Functional ID", 0x21, 2},
+	{"Functional EXT", 0x22, 255},
+	{"Software interleave", 0x23, 2},
+	{"Version 2 Info", 0x40, 255},
+	{"Data format", 0x41, 255},
+	{"Geometry", 0x42, 4},
+	{"Byte order", 0x43, 2},
+	{"Card init date", 0x44, 4},
+	{"Battery replacement", 0x45, 4},
+	{"Organization", 0x46, 255},
+	{"Terminator", 0xFF, 0},
+	{0, 0, 0}
+};
+
+/*
+ *	After reading the tuples, decode the relevant ones.
+ */
+struct cis *
+readcis(int fd)
+{
+	struct tuple_list *tl;
+	struct tuple *tp;
+	struct cis *cp;
+
+	cp = xmalloc(sizeof(*cp));
+	cp->tlist = read_tuples(fd);
+	if (cp->tlist == 0)
+		return (NULL);
+
+	for (tl = cp->tlist; tl; tl = tl->next)
+		for (tp = tl->tuples; tp; tp = tp->next) {
+#if 0
+			printf("tuple code = 0x%02x, data is\n", tp->code);
+			dump(tp->data, tp->length);
+#endif
+			switch (tp->code) {
+			case CIS_MEM_COMMON:	/* 0x01 */
+				device_desc(tp->data, tp->length, &cp->common_mem);
+				break;
+			case CIS_INFO_V1:	/* 0x15 */
+				cis_info(cp, tp->data, tp->length);
+				break;
+			case CIS_MEM_ATTR:	/* 0x17 */
+				device_desc(tp->data, tp->length, &cp->attr_mem);
+				break;
+			case CIS_CONF_MAP:	/* 0x1A */
+				config_map(cp, tp->data, tp->length);
+				break;
+			case CIS_CONFIG:	/* 0x1B */
+				cis_config(cp, tp->data, tp->length);
+				break;
+			case CIS_MANUF_ID:	/* 0x20 */
+				cis_manuf_id(cp, tp->data, tp->length);
+				break;
+			case CIS_FUNC_ID:	/* 0x21 */
+				cis_func_id(cp, tp->data, tp->length);
+				break;
+			case CIS_FUNC_EXT:	/* 0x22 */
+				if (cp->func_id1 == 6)	/* LAN adaptor */
+					cis_network_ext(cp, tp->data, tp->length);
+				break;
+			}
+		}
+	return (cp);
+}
+
+/*
+ *	free_cis - delete cis entry.
+ */
+void
+freecis(struct cis *cp)
+{
+	struct cis_ioblk *io;
+	struct cis_memblk *mem;
+	struct cis_config *conf;
+	struct tuple *tp;
+	struct tuple_list *tl;
+
+	while ((tl = cp->tlist) != 0) {
+		cp->tlist = tl->next;
+		while ((tp = tl->tuples) != 0) {
+			tl->tuples = tp->next;
+			if (tp->data)
+				free(tp->data);
+		}
+	}
+
+	while ((conf = cp->conf) != 0) {
+		cp->conf = conf->next;
+		while ((io = conf->io) != 0) {
+			conf->io = io->next;
+			free(io);
+		}
+		while ((mem = conf->mem) != 0) {
+			conf->mem = mem->next;
+			free(mem);
+		}
+		free(conf);
+	}
+	free(cp);
+}
+
+/*
+ *	Fills in CIS version data.
+ */
+static void
+cis_info(struct cis *cp, unsigned char *p, int len)
+{
+	cp->maj_v = *p++;
+	cp->min_v = *p++;
+	len -= 2;
+	if (cp->manuf) {
+		free(cp->manuf);
+		cp->manuf = NULL;
+	}
+	if (len > 1 && *p != 0xff) {
+		cp->manuf = strdup(p);
+		len -= strlen(p) + 1;
+		p += strlen(p) + 1;
+	}
+	if (cp->vers) {
+		free(cp->vers);
+		cp->vers = NULL;
+	}
+	if (len > 1 && *p != 0xff) {
+		cp->vers = strdup(p);
+		len -= strlen(p) + 1;
+		p += strlen(p) + 1;
+	} else {
+		cp->vers = strdup("[none]");
+	}
+	if (cp->add_info1) {
+		free(cp->add_info1);
+		cp->add_info1 = NULL;
+	}
+	if (len > 1 && *p != 0xff) {
+		cp->add_info1 = strdup(p);
+		len -= strlen(p) + 1;
+		p += strlen(p) + 1;
+	} else {
+		cp->add_info1 = strdup("[none]");
+	}
+	if (cp->add_info2) {
+		free(cp->add_info2);
+		cp->add_info2 = NULL;
+	}
+	if (len > 1 && *p != 0xff)
+		cp->add_info2 = strdup(p);
+	else
+		cp->add_info2 = strdup("[none]");
+}
+
+static void
+cis_manuf_id(struct cis *cp, unsigned char *p, int len)
+{
+	if (len >= 4) {
+		cp->manufacturer = tpl16(p);
+		cp->product = tpl16(p+2);
+		if (len == 5)
+			cp->prodext = *(p+4); /* For xe driver */
+	} else {
+		cp->manufacturer=0;
+		cp->product=0;
+		cp->prodext=0;
+	}
+}
+/*
+ *	Fills in CIS function ID.
+ */
+static void
+cis_func_id(struct cis *cp, unsigned char *p, int len)
+{
+	cp->func_id1 = *p++;
+	cp->func_id2 = *p++;
+}
+
+static void
+cis_network_ext(struct cis *cp, unsigned char *p, int len)
+{
+	int i;
+
+	switch (p[0]) {
+	case 4:		/* Node ID */
+		if (len <= 2 || len < p[1] + 2)
+			return;
+
+		if (cp->lan_nid)
+			free(cp->lan_nid);
+		cp->lan_nid = xmalloc(p[1]);
+
+		for (i = 0; i <= p[1]; i++)
+			cp->lan_nid[i] = p[i + 1];
+		break;
+	}
+}
+
+/*
+ *	"FUJITSU LAN Card (FMV-J182)" has broken CIS
+ */
+static int
+fmvj182_check(unsigned char *p)
+{
+	char    manuf[BUFSIZ], vers[BUFSIZ];
+
+	p++;			/* major version */
+	p++;			/* minor version */
+	strncpy(manuf, p, sizeof(manuf) - 1);
+	while (*p++);
+	strncpy(vers, p, sizeof(vers) - 1);
+	if (!strcmp(manuf, "FUJITSU") && !strcmp(vers, "LAN Card(FMV-J182)"))
+		return 1;
+	else
+		return 0;
+}
+
+#ifdef RATOCLAN
+/*
+ *	"RATOC LAN Card (REX-5588)" has broken CIS
+ */
+static int
+rex5588_check(unsigned char *p)
+{
+	char    manuf[BUFSIZ], vers[BUFSIZ];
+
+	p++;			/* major version */
+	p++;			/* minor version */
+	strncpy(manuf, p, sizeof(manuf) - 1);
+	while (*p++);
+	strncpy(vers, p, sizeof(manuf) - 1);
+	if (!strcmp(manuf, "PCMCIA LAN MBH10304  ES"))
+		return 1;
+	else
+		return 0;
+}
+#endif
+
+#ifdef HSSYNTH
+/*
+ *	Broken CIS for "HITACHI MICROCOMPUTER SYSTEM LTD." "MSSHVPC02"
+ */
+static int
+hss_check(unsigned char *p)
+{
+	char    manuf[BUFSIZ], vers[BUFSIZ];
+
+	p++;			/* major version */
+	p++;			/* minor version */
+	strncpy(manuf, p, sizeof(manuf) - 1);
+	while (*p++);
+	strncpy(vers, p, sizeof(vers) - 1);
+	if (!strcmp(manuf, "HITACHI MICROCOMPUTER SYSTEMS LTD.")
+	 && !strcmp(vers, "MSSHVPC02"))
+		return 1;
+	else
+		return 0;
+}
+#endif	/* HSSYNTH */
+
+/*
+ *	device_desc - decode device descriptor.
+ */
+static void
+device_desc(unsigned char *p, int len, struct dev_mem *dp)
+{
+	while (len > 0 && *p != 0xFF) {
+		dp->valid = 1;
+		dp->type = (*p & 0xF0) >> 4;
+		dp->wps = !!(*p & 0x8);
+		dp->speed = *p & 7;
+		p++;
+		if (*p != 0xFF) {
+			dp->addr = (*p >> 3) & 0xF;
+			dp->units = *p & 7;
+		}
+		p++;
+		len -= 2;
+	}
+}
+
+/*
+ *	configuration map of card control register.
+ */
+static void
+config_map(struct cis *cp, unsigned char *p, int len)
+{
+	unsigned char *p1;
+	int rlen = (*p & 3) + 1;
+
+	p1 = p + 1;
+	cp->last_config = *p1++ & 0x3F;
+	cp->reg_addr = parse_num(rlen | 0x10, p1, &p1, 0);
+	cp->ccrs = *p1;
+}
+
+/*
+ *	Parse variable length value.
+ */
+u_int
+parse_num(int sz, u_char *p, u_char **q, int ofs)
+{
+	u_int num = 0;
+
+	switch (sz) {	
+	case 0:
+	case 0x10:
+		break;
+	case 1:
+	case 0x11:
+		num = (*p++) + ofs;
+		break;
+	case 2:
+	case 0x12:
+		num = tpl16(p) + ofs;
+		p += 2;
+		break;
+	case 0x13:
+		num = tpl24(p) + ofs;
+		p += 3;
+		break;
+	case 3:
+	case 0x14:
+		num = tpl32(p) + ofs;
+		p += 4;
+		break;
+	}
+	if (q)
+		*q = p;
+	return num;
+}
+
+/*
+ *	CIS config entry - Decode and build configuration entry.
+ */
+static void
+cis_config(struct cis *cp, unsigned char *p, int len)
+{
+	int     x;
+	int     i, j;
+	struct cis_config *conf, *last;
+	unsigned char feat;
+
+	conf = xmalloc(sizeof(*conf));
+	if ((last = cp->conf) != 0) {
+		while (last->next)
+			last = last->next;
+		last->next = conf;
+	} else
+		cp->conf = conf;
+ 	conf->id = *p & 0x3F;	/* Config index */
+#ifdef RATOCLAN
+	if (rex5588 && conf->id >= 0x08 && conf->id <= 0x1d)
+		conf->id |= 0x20;
+#endif
+ 	if (*p & 0x40)		/* Default flag */
+		cp->def_config = conf;
+	if (*p++ & 0x80)
+ 		p++;		/* Interface byte skip */
+ 	feat = *p++;		/* Features byte */
+	for (i = 0; i < CIS_FEAT_POWER(feat); i++) {
+		unsigned char parms = *p++;
+
+		conf->pwr = 1;
+		for (j = 0; j < 8; j++)
+			if (parms & (1 << j))
+				while (*p++ & 0x80);
+	}
+	if (feat & CIS_FEAT_TIMING) {
+		conf->timing = 1;
+		i = *p++;
+		if (CIS_WAIT_SCALE(i) != 3)
+			p++;
+		if (CIS_READY_SCALE(i) != 7)
+			p++;
+		if (CIS_RESERVED_SCALE(i) != 7)
+			p++;
+	}
+	if (feat & CIS_FEAT_I_O) {
+		conf->iospace = 1;
+		if (CIS_IO_RANGE & *p)
+			conf->io_blks = CIS_IO_BLKS(p[1]) + 1;
+		conf->io_addr = CIS_IO_ADDR(*p);
+		conf->io_bus = (*p >> 5) & 3; /* CIS_IO_8BIT | CIS_IO_16BIT */
+		if (*p++ & CIS_IO_RANGE) {
+			struct cis_ioblk *io;
+			struct cis_ioblk *last_io = NULL;
+
+			i = CIS_IO_ADSZ(*p);
+			j = CIS_IO_BLKSZ(*p++);
+			for (x = 0; x < conf->io_blks; x++) {
+				io = xmalloc(sizeof(*io));
+				if (last_io)
+					last_io->next = io;
+				else
+					conf->io = io;
+				last_io = io;
+				io->addr = parse_num(i, p, &p, 0);
+				io->size = parse_num(j, p, &p, 1);
+			}
+		}
+	}
+	if (feat & CIS_FEAT_IRQ) {
+		conf->irq = 1;
+		conf->irqlevel = *p & 0xF;
+		conf->irq_flags = *p & 0xF0;
+		if (*p++ & CIS_IRQ_MASK) {
+			conf->irq_mask = tpl16(p);
+			p += 2;
+		}
+	}
+	switch (CIS_FEAT_MEMORY(feat)) {
+	case CIS_FEAT_MEM_NONE:
+		break;
+	case CIS_FEAT_MEM_LEN:
+		conf->memspace = 1;
+		conf->mem = xmalloc(sizeof(*conf->mem));
+		conf->mem->length = tpl16(p) << 8;
+		break;
+	case CIS_FEAT_MEM_ADDR:
+		conf->memspace = 1;
+		conf->mem = xmalloc(sizeof(*conf->mem));
+		conf->mem->length = tpl16(p) << 8;
+		conf->mem->address = tpl16(p + 2) << 8;
+		break;
+	case CIS_FEAT_MEM_WIN: {
+		struct cis_memblk *mem;
+		struct cis_memblk *last_mem = NULL;
+
+		conf->memspace = 1;
+		x = *p++;
+		conf->memwins = CIS_MEM_WINS(x);
+		for (i = 0; i < conf->memwins; i++) {
+			mem = xmalloc(sizeof(*mem));
+			if (last_mem)
+				last_mem->next = mem;
+			else
+				conf->mem = mem;
+			last_mem = mem;
+			mem->length = parse_num(CIS_MEM_LENSZ(x) | 0x10, p, &p, 0) << 8;
+			mem->address = parse_num(CIS_MEM_ADDRSZ(x) | 0x10, p, &p, 0) << 8;
+			if (x & CIS_MEM_HOST) {
+				mem->host_address = parse_num(CIS_MEM_ADDRSZ(x) | 0x10,
+							      p, &p, 0) << 8;
+			}
+		}
+		break;
+	    }
+	}
+	if (feat & CIS_FEAT_MISC) {
+		conf->misc_valid = 1;
+		conf->misc = *p++;
+	}
+}
+
+/*
+ *	Read the tuples from the card.
+ *	The processing of tuples is as follows:
+ *		- Read tuples at attribute memory, offset 0.
+ *		- If a CIS_END is the first tuple, look for
+ *		  a tuple list at common memory offset 0; this list
+ *		  must start with a LINKTARGET.
+ *		- If a long link tuple was encountered, execute the long
+ *		  link.
+ *		- If a no-link tuple was seen, terminate processing.
+ *		- If no no-link tuple exists, and no long link tuple
+ *		  exists while processing the primary tuple list,
+ *		  then look for a LINKTARGET tuple in common memory.
+ *		- If a long link tuple is found in any list, then process
+ *		  it. Only one link is allowed per list.
+ */
+static struct tuple_list *tlist;
+
+static struct tuple_list *
+read_tuples(int fd)
+{
+	struct tuple_list *tl = 0, *last_tl;
+	struct tuple *tp;
+	int     flag;
+	off_t   offs;
+
+	tlist = 0;
+	last_tl = tlist = read_one_tuplelist(fd, MDF_ATTR, (off_t) 0);
+
+	/* Now start processing the links (if any). */
+	do {
+		flag = MDF_ATTR;
+		tp = find_tuple_in_list(last_tl, CIS_LONGLINK_A);
+		if (tp == 0) {
+			flag = 0;
+			tp = find_tuple_in_list(last_tl, CIS_LONGLINK_C);
+		}
+		if (tp && tp->length == 4) {
+			offs = tpl32(tp->data);
+#ifdef	DEBUG
+			printf("Checking long link at %qd (%s memory)\n",
+			    offs, flag ? "Attribute" : "Common");
+#endif
+			/* If a link was found, read the tuple list from it. */
+			if (ck_linktarget(fd, offs, flag)) {
+				tl = read_one_tuplelist(fd, flag, offs);
+				last_tl->next = tl;
+				last_tl = tl;
+			}
+		} else
+			tl = 0;
+	} while (tl);
+
+	/*
+	 * If the primary list had no NOLINK tuple, and no LINKTARGET,
+	 * then try to read a tuple list at common memory (offset 0).
+	 */
+	if (find_tuple_in_list(tlist, CIS_NOLINK) == 0 && tlist->next == 0 &&
+	    ck_linktarget(fd, (off_t) 0, 0)) {
+#ifdef	DEBUG
+		printf("Reading long link at %qd (%s memory)\n",
+		    offs, flag ? "Attribute" : "Common");
+#endif
+		tlist->next = read_one_tuplelist(fd, 0, (off_t) 0);
+	}
+	return (tlist);
+}
+
+/*
+ *	Read one tuple list from the card.
+ */
+static struct tuple_list *
+read_one_tuplelist(int fd, int flags, off_t offs)
+{
+	struct tuple *tp, *last_tp = 0;
+	struct tuple_list *tl;
+	struct tuple_info *tinfo;
+	int     total = 0;
+	unsigned char code, length;
+	int     fmvj182 = 0;
+#ifdef HSSYNTH
+	int     hss = 0;
+#endif	/* HSSYNTH */
+
+	/* Check to see if this memory has already been scanned. */
+	for (tl = tlist; tl; tl = tl->next)
+		if (tl->offs == offs && tl->flags == (flags & MDF_ATTR))
+			return (0);
+	tl = xmalloc(sizeof(*tl));
+	tl->offs = offs;
+	tl->flags = flags & MDF_ATTR;
+	ioctl(fd, PIOCRWFLAG, &flags);
+	lseek(fd, offs, SEEK_SET);
+	do {
+		if (read_attr(fd, &code, 1) != 1) {
+			warn("CIS code read");
+			break;
+		}
+		total++;
+		if (code == CIS_NULL)
+			continue;
+		tp = xmalloc(sizeof(*tp));
+		tp->code = code;
+		if (code == CIS_END)
+			length = 0;
+		else {
+			if (read_attr(fd, &length, 1) != 1) {
+				warn("CIS len read");
+				break;
+			}
+			total++;
+			if (fmvj182 && (code == 0x1b) && (length == 25))
+				length = 31;
+		}
+		tp->length = length;
+#ifdef	DEBUG
+		printf("Tuple code = 0x%x, len = %d\n", code, length);
+#endif
+		if (length == 0xFF) {
+			length = tp->length = 0;
+			code = CIS_END;
+		}
+		if (length != 0) {
+			total += length;
+			tp->data = xmalloc(length);
+			if (read_attr(fd, tp->data, length) != length) {
+				warn("CIS read");
+				break;
+			}
+		}
+
+		/*
+		 * Check the tuple, and ignore it if it isn't in the table
+		 * or the length is illegal.
+		 */
+		tinfo = get_tuple_info(code);
+		if (code == CIS_INFO_V1) {
+			/* Hack for broken CIS of FMV-J182 Ethernet card */
+			fmvj182 = fmvj182_check(tp->data);
+#ifdef RATOCLAN
+			/* Hack for RATOC LAN card */
+			rex5588 = rex5588_check(tp->data);
+#endif /* RATOCLAN */
+#ifdef	HSSYNTH
+			/* Hack for Hitachi Speech Synthesis card */
+			hss = hss_check(tp->data);
+#endif	/* HSSYNTH */
+		}
+		if (tinfo != NULL && (tinfo->length != 255 && tinfo->length > length)) {
+			printf("code %s ignored\n", tuple_name(code));
+			tp->code = CIS_NULL;
+		}
+		if (tl->tuples == NULL)
+			tl->tuples = tp;
+		else
+			last_tp->next = tp;
+		last_tp = tp;
+	} while (code != CIS_END && total < 1024);
+	return (tl);
+}
+
+/*
+ *	return true if the offset points to a LINKTARGET tuple.
+ */
+static int
+ck_linktarget(int fd, off_t offs, int flag)
+{
+	char    blk[5];
+
+	ioctl(fd, PIOCRWFLAG, &flag);
+	lseek(fd, offs, SEEK_SET);
+	if (read_attr(fd, blk, 5) != 5)
+		return (0);
+	if (blk[0] == 0x13 &&
+	    blk[1] == 0x3 &&
+	    blk[2] == 'C' &&
+	    blk[3] == 'I' &&
+	    blk[4] == 'S')
+		return (1);
+	return (0);
+}
+
+/*
+ *	find_tuple_in_list - find a tuple within a
+ *	single tuple list.
+ */
+static struct tuple *
+find_tuple_in_list(struct tuple_list *tl, unsigned char code)
+{
+	struct tuple *tp;
+
+	for (tp = tl->tuples; tp; tp = tp->next)
+		if (tp->code == code)
+			break;
+	return (tp);
+}
+
+static int
+read_attr(int fd, char *bp, int len)
+{
+	char    blk[1024], *p = blk;
+	int     i, l;
+	
+	if (isdumpcisfile)
+		return (read(fd, bp, len));
+	if (len > sizeof(blk) / 2)
+		len = sizeof(blk) / 2;
+	l = i = read(fd, blk, len * 2);
+	if (i <= 0) {
+		printf("Read return %d bytes (expected %d)\n", i, len * 2);
+		return (i);
+	}
+	while (i > 0) {
+		*bp++ = *p++;
+		p++;
+		i -= 2;
+	}
+	return (l / 2);
+}
+
+/*
+ *	return table entry for code.
+ */
+static struct tuple_info *
+get_tuple_info(unsigned char code)
+{
+	struct tuple_info *tp;
+
+	for (tp = tuple_info; tp->name; tp++)
+		if (tp->code == code)
+			return (tp);
+	return (0);
+}
+
+char *
+tuple_name(unsigned char code)
+{
+	struct tuple_info *tp;
+
+	tp = get_tuple_info(code);
+	if (tp)
+		return (tp->name);
+	return ("Unknown");
+}
diff --git a/usr.sbin/dumpcis/readcis.h b/usr.sbin/dumpcis/readcis.h
new file mode 100644
index 0000000..8ebd745
--- /dev/null
+++ b/usr.sbin/dumpcis/readcis.h
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 1995 Andrew McRae.  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. 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$
+ */
+
+struct tuple {
+	struct tuple *next;
+	unsigned char code;
+	int     length;
+	unsigned char *data;
+};
+
+struct tuple_list {
+	struct tuple_list *next;
+	struct tuple *tuples;
+	off_t   offs;
+	int     flags;
+};
+
+struct tuple_info {
+	char   *name;
+	unsigned char code;
+	unsigned char length;		/* 255 means variable length */
+};
+
+/*
+ *	Memory device descriptor.
+ */
+struct dev_mem {
+	unsigned char valid;
+	unsigned char type;
+	unsigned char speed;
+	unsigned char wps;
+	unsigned char addr;
+	unsigned char units;
+};
+
+/*
+ *	One I/O structure describing a possible I/O map
+ *	of the card.
+ */
+struct cis_ioblk {
+	struct cis_ioblk *next;
+	unsigned int addr;
+	unsigned int size;
+};
+
+/*
+ *	A structure storing a memory map for the card.
+ */
+struct cis_memblk {
+	struct cis_memblk *next;
+	unsigned int address;
+	unsigned int length;
+	unsigned int host_address;
+};
+
+/*
+ *	One configuration entry for the card.
+ */
+struct cis_config {
+	struct cis_config *next;
+	unsigned int pwr:1;		/* Which values are defined. */
+	unsigned int timing:1;
+	unsigned int iospace:1;
+	unsigned int irq:1;
+	unsigned int memspace:1;
+	unsigned int misc_valid:1;
+	unsigned char id;
+	unsigned char io_blks;
+	unsigned char io_addr;
+	unsigned char io_bus;
+	struct cis_ioblk *io;
+	unsigned char irqlevel;
+	unsigned char irq_flags;
+	unsigned irq_mask;
+	unsigned char memwins;
+	struct cis_memblk *mem;
+	unsigned char misc;
+};
+
+/*
+ *	Structure holding all data retrieved from the
+ *	CIS block on the card.
+ *	The default configuration contains interface defaults
+ *	not listed in each separate configuration.
+ */
+struct cis {
+	struct tuple_list *tlist;
+	char    *manuf;
+	char    *vers;
+	char    *add_info1;
+	char    *add_info2;
+	unsigned char maj_v, min_v;
+	unsigned char last_config;
+	unsigned char ccrs;
+	unsigned long reg_addr;
+	u_int manufacturer;
+	u_int product;
+	u_int prodext;
+	unsigned char func_id1, func_id2;
+	struct dev_mem attr_mem;
+	struct dev_mem common_mem;
+	struct cis_config *def_config;
+	struct cis_config *conf;
+	unsigned char *lan_nid;
+};
+
+#define	tpl32(tp)	((*((tp) + 3) << 24) | \
+			 (*((tp) + 2) << 16) | \
+			 (*((tp) + 1) << 8)  | *(tp))
+#define	tpl24(tp)	((*((tp) + 2) << 16) | \
+			 (*((tp) + 1) << 8)  | *(tp))
+#define	tpl16(tp)	((*((tp) + 1) << 8)  | *(tp))
+
+void   *xmalloc(int);
+void    dump(unsigned char *, int);
+void    dumpcis(struct cis *);
+void    freecis(struct cis *);
+struct cis *readcis(int);
+
+char   *tuple_name(unsigned char);
+u_int   parse_num(int, u_char *, u_char **, int);
+
+int isdumpcisfile;