More config files update for the new pcmcia framework.

3 files changed, 33 insertions, 41 deletions

diff --git a/sys/arch/i386/conf/INST b/sys/arch/i386/conf/INST
index a9af271ee1d..f3b9f04b558 100644
--- a/sys/arch/i386/conf/INST
+++ b/sys/arch/i386/conf/INST
@@ -1,4 +1,4 @@
-#	$OpenBSD: INST,v 1.23 1998/06/23 05:59:45 deraadt Exp $
+#	$OpenBSD: INST,v 1.24 1998/09/11 11:35:35 fgsch Exp $
 #	$NetBSD: INSTADP,v 1.17 1996/05/20 03:32:19 thorpej Exp $
 #
 #	Install kernels no longer support X.
@@ -60,14 +60,12 @@ pci0	at mainbus0
 ppb*	at pci? dev ? function ?	# PCI-PCI bridges
 pci*	at ppb? bus ?
 
-pcicmaster0	at isa? port 0x3E0 size 2
-pcic0	at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
-pcic1	at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096
-pcicmaster1	at isa? port 0x3E2 size 2
-pcic2	at pcicmaster1 irq 11 iomem 0xd6000 iosiz 4096
-pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
+# ISA PCMCIA controllers
+pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
+pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
 
-pcmcia* at pcic?
+# PCMCIA bus support
+pcmcia*	at pcic? controller ? socket ?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
@@ -85,7 +83,7 @@ com2	at isa? port 0x3e8 irq 5
 #com*	at boca? slave ?
 #rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
 #com*	at rtfps? slave ?
-com3	at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards
+com*	at pcmcia? function ?		# PCMCIA modem cards
 
 # option for using CD1400 handshaking for incoming data
 # requires a special cable that exchanges the RTS and DTR lines
@@ -150,8 +148,8 @@ le*	at pci? dev ? function ?		# PCnet-PCI based ethernet cards
 de*	at pci? dev ? function ?		# DC21X4X-based ethernet cards
 ep0	at pci? dev ? function ?		# 3C590 ethernet cards
 ep*	at pci? dev ? function ?		# 3C590 ethernet cards
-ed*	at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
-ep*	at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
+#ed*	at pcmcia? function ?			# PCMCIA based ed cards
+ep*	at pcmcia? function ?			# PCMCIA based ep cards
 fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI cards
 
 pseudo-device	loop	1		# network loopback
diff --git a/sys/arch/i386/conf/LAP b/sys/arch/i386/conf/LAP
index c968313d1a2..5d10e164091 100644
--- a/sys/arch/i386/conf/LAP
+++ b/sys/arch/i386/conf/LAP
@@ -1,4 +1,4 @@
-#	$OpenBSD: LAP,v 1.26 1998/07/11 15:31:22 todd Exp $
+#	$OpenBSD: LAP,v 1.27 1998/09/11 11:35:35 fgsch Exp $
 #	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
 #
 #	TDR -- Theo Deraadt's 486
@@ -167,7 +167,9 @@ wd*	at wdc? drive ?
 #option		PCMCIA_ISA_DEBUG
 
 #apm0	at bios0
-pcmcia* at pcic?
+
+# PCMCIA bus support
+pcmcia*	at pcic? controller ? socket ?
 
 # Multiple controllers need some testing.  Some laptops have multiple PCIC
 # controllers instead of two-slot controllers.
@@ -177,24 +179,18 @@ pcmcia* at pcic?
 # device of the type "class bridge, subclass PCMCIA, ..." at bootup)
 # you may try the following:
 #
-#   pcicmaster0     at isa? port 0x3000 size 2
-#   pcic0           at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
+#   pcic0           at isa? port 0x3000 iomem 0xd0000 iosiz 0x4000
 #
-# IRQ 2/9 doesn't seem to work for status change interrupts, so use one
-# of the higher ones.
-pcicmaster0	at isa? port 0x3E0 size 2
-pcic0	at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
-pcic1	at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096
-pcicmaster1 at isa? port 0x3E2 size 2
-pcic2	at pcicmaster1 irq 11 iomem 0xd6000 iosiz 4096
-pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
-
-ed0	at pcmcia? port 0x300 iomem 0xd8000 iosiz 8192 	irq 10
-ed0	at pcmcia? port 0x300 size 0x20 irq 10 slot ?
-ep0	at pcmcia? port 0x300 size 0x10 irq 10 slot ?
-#com1	at pcmcia? port 0x2f8 size 8 irq 5 slot ?
-#com2	at pcmcia? port 0x3e8 size 8 irq 5 slot ?
-com3	at pcmcia? port 0x2e8 size 8 irq 3 slot ?
+# ISA PCMCIA controllers
+pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
+pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
+
+#ed*	at pcmcia? function ?
+#ed*	at pcmcia? function ?
+ep*	at pcmcia? function ?
+#com*	at pcmcia? function ?
+#com*	at pcmcia? function ?
+com*	at pcmcia? function ?
 
 pseudo-device	loop	1		# network loopback
 pseudo-device	bpfilter 16		# packet filter
diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index 8f612025a8c..6e38a4ef329 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,4 +1,4 @@
-#	$OpenBSD: NETTAN,v 1.28 1998/08/10 18:51:50 provos Exp $
+#	$OpenBSD: NETTAN,v 1.29 1998/09/11 11:35:35 fgsch Exp $
 #
 #	NETTAN -- Applitron Datasystem AB
 #
@@ -128,14 +128,12 @@ pci0	at mainbus0 bus ?
 ppb*	at pci? dev ? function ?	# PCI-PCI bridges
 pci*	at ppb? bus ?
 
-pcicmaster0     at isa? port 0x3E0 size 2
-pcic0	at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
-pcic1	at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096
-pcicmaster1 at isa? port 0x3E2 size 2
-pcic2	at pcicmaster1 irq 11 iomem 0xd6000 iosiz 4096
-pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
+# ISA PCMCIA controllers
+pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
+pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
 
-pcmcia* at pcic?
+# PCMCIA bus support
+pcmcia*	at pcic? controller ? socket ?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
@@ -155,7 +153,7 @@ com*	at ast? slave ?
 #com*	at boca? slave ?
 #rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
 #com*	at rtfps? slave ?
-com3    at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards
+com*    at pcmcia? function ?		# PCMCIA modem cards
 
 # option for using CD1400 handshaking for incoming data
 # requires a special cable that exchanges the RTS and DTR lines
@@ -244,8 +242,8 @@ fxp*	at pci? dev ? function ?		# EtherExpress 10/100B ethernet cards
 ed*	at pci? dev ? function ?		# NE2000-compat ethernet cards
 ep0	at pci? dev ? function ?		# 3C590 ethernet cards
 ep*	at pci? dev ? function ?		# 3C590 ethernet cards
-ed*     at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
-ep*     at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
+#ed*     at pcmcia? function ?			# PCMCIA based ed cards
+ep*     at pcmcia? function ?			# PCMCIA based ep cards
 fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI cards
 
 pss0	at isa? port 0x220 irq 7 drq 6  # Personal Sound System