[src/trunk]: src/sys/arch/algor/conf Add PCMCIA devices.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bc8061919f77
branches:  trunk
changeset: 510957:bc8061919f77
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Jun 10 08:45:09 2001 +0000

description:
Add PCMCIA devices.

diffstat:

 sys/arch/algor/conf/P5064       |  34 +++++++++++++++++-----------------
 sys/arch/algor/conf/files.algor |  24 +++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 18 deletions(-)

diffs (111 lines):

diff -r 3e6b383f0538 -r bc8061919f77 sys/arch/algor/conf/P5064
--- a/sys/arch/algor/conf/P5064 Sun Jun 10 08:27:42 2001 +0000
+++ b/sys/arch/algor/conf/P5064 Sun Jun 10 08:45:09 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: P5064,v 1.4 2001/06/10 05:02:33 thorpej Exp $
+#      $NetBSD: P5064,v 1.5 2001/06/10 08:45:09 thorpej Exp $
 #
 # Algorithmics P-5064 kernel.
 #
 
 include        "arch/algor/conf/std.algor"
 
-#ident                 "P5064-$Revision: 1.4 $"
+#ident                 "P5064-$Revision: 1.5 $"
 
 maxusers 32
 
@@ -225,20 +225,20 @@
 #bha*  at      isa? port 0x334 irq ? drq ?     # BusLogic [57]4X SCSI (unt.)
 #uha*  at      isa? port 0x330 irq ? drq ?     # UltraStor [13]4f SCSI (unt.)
 #uha*  at      isa? port 0x334 irq ? drq ?     # UltraStor [13]4f SCSI (unt.)
-#pcic0 at      isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
-#pcic1 at      isa? port 0x3e2 iomem 0xcc000 iosiz 0x10000
-#pcmcia*       at      pcic? controller ? socket ?
+pcic0  at      isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
+pcic1  at      isa? port 0x3e2 iomem 0xcc000 iosiz 0x10000
+pcmcia*        at      pcic? controller ? socket ?
 
 # PCMCIA device
-#aic*  at      pcmcia? function ?              # Adaptec APA-1460 SCSI
-#com*  at      pcmcia? function ?              # Modems and serial cards
-#wdc*  at      pcmcia? function ?              # PCMCIA IDE controllers
-#ep*   at      pcmcia? function ?              # 3Com 3c589 and 3c562 Eth.
-#mbe*  at      pcmcia? function ?              # MB8696x based Ethernet
-#ne*   at      pcmcia? function ?              # NE2000-compatible Eth.
-#sm*   at      pcmcia? function ?              # Megahertz Ethernet
-#ray*  at      pcmcia? function ?              # Raytheon Raylink (802.11)
-#wi*   at      pcmcia? function ?              # Lucent WaveLAN/IEEE
+aic*   at      pcmcia? function ?              # Adaptec APA-1460 SCSI
+com*   at      pcmcia? function ?              # Modems and serial cards
+wdc*   at      pcmcia? function ?              # PCMCIA IDE controllers
+ep*    at      pcmcia? function ?              # 3Com 3c589 and 3c562 Eth.
+mbe*   at      pcmcia? function ?              # MB8696x based Ethernet
+ne*    at      pcmcia? function ?              # NE2000-compatible Eth.
+sm*    at      pcmcia? function ?              # Megahertz Ethernet
+ray*   at      pcmcia? function ?              # Raytheon Raylink (802.11)
+wi*    at      pcmcia? function ?              # Lucent WaveLAN/IEEE
 
 # SCSI bus support
 #scsibus* at   adv?
@@ -246,7 +246,7 @@
 #scsibus* at   aha?
 #scsibus* at   ahb?
 #scsibus* at   ahc?
-#scsibus* at   aic?
+scsibus* at    aic?
 #scsibus* at   bha?
 #scsibus* at   dpt?
 #scsibus* at   isp?
@@ -261,11 +261,11 @@
 
 # ST506/ESDI/IDE devices
 wd*    at      pciide? channel ?
-#wd*   at      wdc? drive ?
+wd*    at      wdc? drive ?
 
 # ATAPI bus support
 atapibus* at   pciide? channel ?
-#atapibus* at  wdc?
+atapibus* at   wdc?
 
 # ATAPI devices
 sd*    at      atapibus? drive ?               # ATAPI disk devices
diff -r 3e6b383f0538 -r bc8061919f77 sys/arch/algor/conf/files.algor
--- a/sys/arch/algor/conf/files.algor   Sun Jun 10 08:27:42 2001 +0000
+++ b/sys/arch/algor/conf/files.algor   Sun Jun 10 08:45:09 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.algor,v 1.2 2001/06/01 16:00:04 thorpej Exp $
+#      $NetBSD: files.algor,v 1.3 2001/06/10 08:45:09 thorpej Exp $
 
 # Algorithmics evaluation board specific configuration info.
 
@@ -146,6 +146,28 @@
 # ISA Plug and Play devices
 file   arch/algor/isa/isapnp_machdep.c         isapnp
 
+# PCIC pcmcia controller
+defopt PCIC_ISA_ALLOC_IOBASE
+defopt PCIC_ISA_ALLOC_IOSIZE
+defopt PCIC_ISA_INTR_ALLOC_MASK
+
+device pcic: pcmciabus
+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/isapnp/i82365_isapnp.c              pcic_isapnp
+
+# Code common to ISA and ISAPnP attachments
+file   dev/isa/i82365_isasubr.c                pcic_isa | pcic_isapnp
+
+# Machine-independent PCMCIA drivers
+include "dev/pcmcia/files.pcmcia"
+
 #
 # Devices on the P-4032 local I/O bus.
 #