From owner-FreeBSD-tech-jp@jp.freebsd.org  Wed Aug 27 13:41:40 1997
Received: by jaz.jp.freebsd.org (8.8.7+2.7Wbeta7/8.7.3) id NAA27648
	Wed, 27 Aug 1997 13:41:40 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.7+2.7Wbeta7/8.7.3) with ESMTP id NAA27643
	for <FreeBSD-tech-jp@jp.freebsd.org>; Wed, 27 Aug 1997 13:41:39 +0900 (JST)
Received: (from hosokawa@localhost) by afs.ntc.mita.keio.ac.jp (8.7.4+2.6Wbeta6/3.4W5-ntc_mailserver1.02) id NAA28144; Wed, 27 Aug 1997 13:41:38 +0900 (JST)
Date: Wed, 27 Aug 1997 13:41:38 +0900 (JST)
Message-Id: <199708270441.NAA28144@afs.ntc.mita.keio.ac.jp>
To: FreeBSD-tech-jp@jp.freebsd.org
Cc: bsd-nomads@ai.cs.fujitsu.co.jp
In-Reply-To: Your message of Wed, 27 Aug 1997 13:05:22 +0900 (JST).
	<199708270405.NAA25726@pharaoh0.syslabo.co.jp>
From: hosokawa@ntc.keio.ac.jp (HOSOKAWA Tatsumi)
X-Mailer: mnews [version 1.18PL3] 1994-08/01(Mon)
Reply-To: FreeBSD-tech-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=20]
X-Sequence: FreeBSD-tech-jp 511
Subject: [FreeBSD-tech-jp 511] Re: [Q] pccard-3.0-patch
Errors-To: owner-FreeBSD-tech-jp@jp.freebsd.org
Sender: owner-FreeBSD-tech-jp@jp.freebsd.org

<199708270405.NAA25726@pharaoh0.syslabo.co.jp>$B$N5-;v$K$*$$$F(B
hanada@syslabo.co.jp$B$5$s$O=q$-$^$7$?!#(B

>> $B$"$j$,$H$&8f:B$$$^$9!#$H$j$"$($:!"Ev$F$F8+$^$7$?!#(B
>> $B#3$D$a$N%9%m%C%H$OG'<1$7$^$;$s$G$7$?!#(B
>> $B:#!";~4V$,$J$$$N$G$H$j$"$($:!"(B-v $B$N7k2L$rJs9p$7$^$9!#(B

$B;~4V$,$J$$$H$3$mHs>o$K?=$7Lu$J$$$N$G$9$,(B :-)$B!"(B
$B$3$l$G$I$&$@$C!*(B

--- pcic.c.970827	Wed Aug 27 10:07:44 1997
+++ pcic.c	Wed Aug 27 13:34:21 1997
@@ -178,24 +178,18 @@
 	bus = tag->bus;
 	slot = tag->slot;
 
-	/* XXX - don't initialize the same PCIC twice! */
-	if (pci_pcics[pcic_unit].bus != 0xffu)
-		if (bootverbose) {
-			printf("pci_pcic_attach: pcic(%d,%d) has already "
-				"been initialized.\n", bus, slot);
-			goto pci_pcic_attach_end;
-		}
-
 	/* Assign PCIC unit number (support for multiple PCIC's on PCI bus) */
 	for (i = 0; i < x_pcic_unit; i++) {
 		if (bus == pci_pcics[i].bus && slot == pci_pcics[i].slot)
-			goto matched;
+			/* XXX - don't initialize the same PCIC twice! */
+			printf("pci_pcic_attach: pcic(%d,%d) has already "
+				"been initialized.\n", bus, slot);
+			goto no_legacy16_init;
 	}
 	pci_pcics[x_pcic_unit].bus = bus;
 	pci_pcics[x_pcic_unit].slot = slot;
 	pcic_unit = x_pcic_unit;
 	x_pcic_unit++;
-matched:
 	if (!pci_pcics[pcic_unit].pci_id)
 		pci_pcics[pcic_unit].pci_id = pcic_pci_id;
 
@@ -319,7 +313,7 @@
 		break;
 	}
 
-pci_pcic_attach_end:
+no_legacy16_init:
 	if (!bootverbose)
 		return;
 	print_cardbus_registers(tag);
--
HOSOKAWA, Tatsumi
Network Technology Center
Keio University
hosokawa@ntc.keio.ac.jp
