summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2000-05-15 04:17:31 +0000
committerJason Wright <jason@cvs.openbsd.org>2000-05-15 04:17:31 +0000
commit80a6e70a19a407c482fae79ec48c3497aa0420e9 (patch)
treefbbedefac82855627cadbb411b987e113e18b78a /sys/arch/i386/conf
parentdffc15e7537ba0afd2e89b38cedc78952edd48d0 (diff)
driver for the databook isa/pcmcia bridge (commented out in GENERIC for now);
from NetBSD.
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/files.i3868
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 4c5ad6554f3..b6ae81faadd 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.183 2000/04/27 02:19:42 millert Exp $
+# $OpenBSD: GENERIC,v 1.184 2000/05/15 04:17:30 jason Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -59,9 +59,11 @@ pcib* at pci? dev ? function ? # PCI-ISA bridges (do nothing)
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
+#tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?
+#pcmcia* at tcic? controller ? socket ?
# CardBus bus support (also see NOTE below)
#cardbus* at cardslot?
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 778c72658c1..90f4f9a42cd 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.64 2000/04/08 05:50:49 aaron Exp $
+# $OpenBSD: files.i386,v 1.65 2000/05/15 04:17:29 jason Exp $
# $NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
#
# new style config file for i386 architecture
@@ -288,6 +288,12 @@ file dev/isa/i82365_isa.c pcic_isa
# Code common to ISA and ISAPnP attachments
file dev/isa/i82365_isasubr.c pcic_isa | pcic_isapnp
+# Databook TCIC/2 pcmcia/isa bridge
+device tcic: pcmciabus
+file dev/ic/tcic2.c tcic
+attach tcic at isa with tcic_isa
+file dev/isa/tcic2_isa.c tcic_isa
+
#
# Machine-independent PUC drivers
#