Comment the pcmcia attach routines for ed and pccom.

Add the pcmcia definitions for the new framework.

1 files changed, 38 insertions, 4 deletions

diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 2c310215f61..d6229d96f76 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.45 1998/09/11 04:17:43 jason Exp $
+#	$OpenBSD: files.i386,v 1.46 1998/09/11 10:33:13 fgsch Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -100,7 +100,7 @@ file	arch/i386/pci/pcib.c		pcib
 # Pcmcia, before ISA (to define device stuff)
 #
 
-include "../../../dev/pcmcia/files.pcmcia"
+#include "../../../dev/pcmcia/files.pcmcia"
 
 #
 # ISA and mixed ISA+EISA or ISA+PCI or ISA+PCMCIA drivers
@@ -133,7 +133,7 @@ define pckbd { [irq = -1], [port = -1] }
 device	pccom: tty
 attach	pccom at isa with pccom_isa
 attach	pccom at commulti with pccom_commulti
-attach	pccom at pcmcia with pccom_pcmcia
+#attach	pccom at pcmcia with pccom_pcmcia
 file	arch/i386/isa/pccom.c		pccom & (pccom_isa | pccom_isapnp | pccom_commulti | pccom_pcmcia) needs-flag
 
 # PC console support a la "pccons"
@@ -183,7 +183,7 @@ file	arch/i386/isa/spkr.c		spkr needs-flag
 # XXX conflicts with other ports; can't be in files.isa
 device	ed: ether, ifnet
 attach	ed at isa with ed_isa
-attach	ed at pcmcia with ed_pcmcia
+#attach	ed at pcmcia with ed_pcmcia
 attach	ed at pci with ed_pci
 file	dev/isa/if_ed.c			ed & (ed_isa | ed_pcmcia | ed_pci) needs-flag
 
@@ -255,3 +255,37 @@ file	arch/i386/i386/bios.c		bios needs-count
 device apm
 attach apm at bios
 file	arch/i386/i386/apm.c		apm needs-count
+
+# XXXX pcic here because it needs to be late.  The catch: pcic needs
+# to be late, so devices which attach to it are attached late.  But it
+# needs to be before its isa and pci attachments.  This answer is
+# non-optimal, but I don't have a better answer right now.
+
+# PCIC pcmcia contoller
+# XXX this needs to be done very late, so it's done here.  This feels
+# like a kludge, but it might be for the best.
+
+device	pcic {[controller = -1], [socket = -1]}
+file	dev/ic/i82365.c			pcic
+
+# PCIC pcmcia controller on ISA bus.
+attach	pcic at isa with pcic_isa
+file	dev/isa/i82365_isa.c		pcic_isa
+
+# PCIC pcmcia controller on PCI bus.
+#attach	pcic at pci with pcic_pci
+#file	dev/pci/i82365_pci.c		pcic_pci
+
+# PCIC pcmcia controller on PnP board
+#attach	pcic at isapnp with pcic_isapnp
+#file	dev/isa/i82365_isapnp.c	pcic_isapnp
+
+# Code common to ISA and ISAPnP attachments
+file	dev/isa/i82365_isasubr.c	pcic_isa | pcic_isapnp
+
+# this wants to be probed as late as possible.
+#
+# Machine-independent PCMCIA drivers
+#
+include "dev/pcmcia/files.pcmcia"
+