Yep, our pcmcia framework works on amigas too :-)

I also added aic and ep, although they are untested.

2 files changed, 46 insertions, 3 deletions

diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index 02cca68d0f1..2e6ad316b77 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.25 1998/10/04 23:26:38 niklas Exp $
+#	$OpenBSD: GENERIC,v 1.26 1999/01/20 17:57:07 niklas Exp $
 #	$NetBSD: GENERIC,v 1.85 1997/08/27 19:32:49 is Exp $
 
 #
@@ -216,6 +216,15 @@ isa*	at cross?
 
 #isapnp0	at isa?
 
+# ISA PCMCIA controllers
+pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
+pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
+
+# PCMCIA bus support
+pcmcia*	at pcic? controller ? socket ?
+
+option		PCMCIAVERBOSE
+
 com0	at isa? port 0x3f8 irq 4	# Standard PC serial ports
 com1	at isa? port 0x2f8 irq 3
 com2	at isa? port 0x3e8 irq 5
@@ -232,11 +241,16 @@ com*	at rtfps? slave ?
 # requires a special cable that exchanges the RTS and DTR lines
 # options CY_HW_RTS
 # cy0	at isa? iomem 0xd4000 irq 12	# ISA cyclom card
+com*	at pcmcia? function ?		# PCMCIA modems/serial ports
 
 lpt0	at isa? port 0x378 irq 7	# Standard PC parallel ports
 lpt1	at isa? port 0x278
 lpt2	at isa? port 0x3bc
 
+aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI controllers
+aic*	at pcmcia? function ?		# PCMCIA based aic SCSI controllers
+scsibus* at aic?
+
 wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
 #wdc1	at isa? port 0x170 irq ?
 wd*	at wdc? drive ?
@@ -250,6 +264,12 @@ ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet cards
 ne0	at isa? port 0x240 iomem 0xd8000 irq 9	# NE[12]000 ethernet cards
 ne1	at isa? port 0x300 irq 10		# NE[12]000 ethernet cards
 #ne*	at isapnp?				# NE[12]000 PnP ethernet cards
+ep0	at isa? port ? irq ?			# 3C509 ethernet
+#ep*	at isapnp?				# 3C509 PnP ethernet
+ep*	at isa? port ? irq ?			# 3C509 ethernet
+ne*	at pcmcia? function ?			# PCMCIA based NE2000 ethernet
+ep*	at pcmcia? function ?			# PCMCIA based 3C5xx ethernet
+sm*	at pcmcia? function ?			# PCMCIA based sm ethernet
 
 fd*	at fdc0 unit ?
 
diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga
index 98e28cd25d3..6378e4f3928 100644
--- a/sys/arch/amiga/conf/files.amiga
+++ b/sys/arch/amiga/conf/files.amiga
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amiga,v 1.30 1999/01/19 10:09:26 niklas Exp $
+#	$OpenBSD: files.amiga,v 1.31 1999/01/20 17:57:07 niklas Exp $
 #	$NetBSD: files.amiga,v 1.62 1997/08/27 19:32:47 is Exp $
 
 
@@ -327,7 +327,6 @@ file	arch/amiga/isa/cross.c		cross needs-flag
 
 # XXX Dummy busses needed for some multi-homed devices specified in files.isa
 define	pci { }
-define	pcmcia {}
 
 include	"../../../dev/isa/files.isa"
 file	arch/amiga/isa/isa_machdep.c	isabus
@@ -378,3 +377,27 @@ major	{rd = 16}
 # SunOS Binary Compatibility (COMPAT_SUNOS)
 include "../../../compat/sunos/files.sunos"
 file	arch/m68k/m68k/sunos_machdep.c	compat_sunos
+
+# 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 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"