From owner-freebsd-current  Wed Sep  1  7:15:25 1999
Delivered-To: freebsd-current@freebsd.org
Received: from critter.freebsd.dk (critter.freebsd.dk [212.242.40.131])
	by hub.freebsd.org (Postfix) with ESMTP
	id 173AE14C41; Wed,  1 Sep 1999 07:15:20 -0700 (PDT)
	(envelope-from phk@critter.freebsd.dk)
Received: from critter.freebsd.dk (localhost [127.0.0.1])
	by critter.freebsd.dk (8.9.3/8.9.2) with ESMTP id QAA36160;
	Wed, 1 Sep 1999 16:14:20 +0200 (CEST)
	(envelope-from phk@critter.freebsd.dk)
To: peter@freebsd.org
Cc: current@freebsd.org
Subject: isa.c misses ISA_NIRQ and friends
From: Poul-Henning Kamp <phk@freebsd.org>
Date: Wed, 01 Sep 1999 16:14:19 +0200
Message-ID: <36158.936195259@critter.freebsd.dk>
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG


Peter must have forgotten some changes, until he fixes it,
you can use this patch to revert his change to isa.c

Index: isa.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/isa.c,v
retrieving revision 1.130
diff -u -r1.130 isa.c
--- isa.c	1999/09/01 06:34:24	1.130
+++ isa.c	1999/09/01 14:11:17
@@ -104,13 +104,13 @@
 		if (!rle) {
 			if (*rid < 0)
 				return 0;
-			if (type == SYS_RES_IRQ && *rid >= ISA_NIRQ)
+			if (type == SYS_RES_IRQ && *rid > 1)
 				return 0;
-			if (type == SYS_RES_DRQ && *rid >= ISA_NDRQ)
+			if (type == SYS_RES_DRQ && *rid > 1)
 				return 0;
-			if (type != SYS_RES_MEMORY && *rid >= ISA_NMEM)
+			if (type != SYS_RES_MEMORY && *rid > 3)
 				return 0;
-			if (type == SYS_RES_IOPORT && *rid >= ISA_NPORT)
+			if (type == SYS_RES_IOPORT && *rid > 7)
 				return 0;
 			resource_list_add(rl, type, *rid, start, end, count);
 		}


schizo# config -r LINT
Removing old directory ../../compile/LINT:  Done.
Don't forget to do a ``make depend''
Kernel build directory is ../../compile/LINT
schizo# cd /sys/com*/LINT
schizo# make isa.o
[...]
cc -c -O -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -ansi  -nostdinc -I- -I. -I../.. -I../../../include  -DKERNEL -include opt_global.h -elf  ../../i386/isa/isa.c
../../i386/isa/isa.c: In function `isa_alloc_resource':
../../i386/isa/isa.c:107: `ISA_NIRQ' undeclared (first use in this function)
../../i386/isa/isa.c:107: (Each undeclared identifier is reported only once
../../i386/isa/isa.c:107: for each function it appears in.)
../../i386/isa/isa.c:109: `ISA_NDRQ' undeclared (first use in this function)
../../i386/isa/isa.c:111: `ISA_NMEM' undeclared (first use in this function)
../../i386/isa/isa.c:113: `ISA_NPORT' undeclared (first use in this function)
*** Error code 1

--
Poul-Henning Kamp             FreeBSD coreteam member
phk@FreeBSD.ORG               "Real hackers run -current on their laptop."
FreeBSD -- It will take a long time before progress goes too far!


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message