summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/i386/conf/GENERIC17
-rw-r--r--sys/arch/macppc/conf/GENERIC19
2 files changed, 31 insertions, 5 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 7b5903c6613..51128dbd081 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.326 2002/12/10 23:37:03 miod Exp $
+# $OpenBSD: GENERIC,v 1.327 2002/12/13 03:02:07 tdeval Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -132,6 +132,21 @@ scsibus* at usscanner?
#radio* at udsbr?
ugen* at uhub? port ? configuration ? # USB Generic driver
+# FireWire Controllers
+#fwohci* at pci? dev ? function ? # PCI FireWire adapter
+#fwohci* at cardbus? dev ? function ? # CardBus FireWire adapter
+
+#fwnode* at fwbus? idhi ? idlo ?
+
+#fwscsi* at fwnode? # SCSI over FireWire
+#scsibus* at fwscsi?
+
+#option FWOHCI_DEBUG
+#option FWNODE_DEBUG
+#option P1212_DEBUG
+#option SBP2_DEBUG
+#option FWSCSI_DEBUG
+
puc* at pci? # PCI "universal" communication device
npx0 at isa? port 0xf0 irq 13 # math coprocessor
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 3c4c2939a0f..4aa27231a53 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.38 2002/12/04 17:32:30 nate Exp $g
+# $OpenBSD: GENERIC,v 1.39 2002/12/13 03:02:12 tdeval Exp $g
#
# PPC GENERIC config file
#
@@ -105,10 +105,21 @@ gpio* at gpio? # GPIO, PMU interrupt router.
aed* at adb? # ADB Event Device
akbd* at adb? # ADB keyboard
-fwohci* at pci? dev ? function ? # FireWire on ohci
+# FireWire Controllers
+#fwohci* at pci? dev ? function ? # PCI FireWire adapter
+#fwohci* at cardbus? dev ? function ? # CardBus FireWire adapter
+
#fw* at fwbus? # IPv4/v6 over FireWire
-fwnode* at fwbus? idhi ? idlo ?
-#fwscsi* at fwnode?
+#fwnode* at fwbus? idhi ? idlo ?
+
+#fwscsi* at fwnode? # SCSI over FireWire
+#scsibus* at fwscsi?
+
+#option FWOHCI_DEBUG
+#option FWNODE_DEBUG
+#option P1212_DEBUG
+#option SBP2_DEBUG
+#option FWSCSI_DEBUG
wskbd* at akbd? console ? mux 1
ams* at adb? # ADB mouse