summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale S. Rahn <rahnds@cvs.openbsd.org>2000-09-06 02:42:00 +0000
committerDale S. Rahn <rahnds@cvs.openbsd.org>2000-09-06 02:42:00 +0000
commit7d234c9ba71d44455f983c77491b8f4ac666a699 (patch)
tree0fb64a59351dbc65925fe95d65efd434d3c353b3
parentb65927521e1df0c319129dece70ade602442b2d7 (diff)
Version with latest features. to be merged into GENERIC shortly.
-rw-r--r--sys/arch/powerpc/conf/USBMAC22
1 files changed, 14 insertions, 8 deletions
diff --git a/sys/arch/powerpc/conf/USBMAC b/sys/arch/powerpc/conf/USBMAC
index d6a3735ede4..b67af7096ae 100644
--- a/sys/arch/powerpc/conf/USBMAC
+++ b/sys/arch/powerpc/conf/USBMAC
@@ -1,4 +1,4 @@
-# $OpenBSD: USBMAC,v 1.3 2000/08/07 18:51:22 deraadt Exp $
+# $OpenBSD: USBMAC,v 1.4 2000/09/06 02:41:59 rahnds Exp $
#
# PPC GENERIC config file
#
@@ -13,6 +13,9 @@ option SYS_TYPE=APPL
option FIREPOWERBUGS
options PPC_MPC106_BUG
+option PCIVERBOSE
+
+option WSEMUL_VT100
include "../../../conf/GENERIC"
@@ -41,7 +44,7 @@ ncr* at pci? dev ? function ?
de* at pci? dev ? function ?
#vme* at pci? dev ? function ?
#vga* at pci? dev ? function ? # PCI VGA graphics
-#vgafb0 at pci? dev ? function ? # PCI VGA graphics
+vgafb0 at pci? dev ? function ? # PCI VGA graphics
#ep* at pci? dev ? function ? # 3Com 3c59x
#ne* at pci? dev ? function ? # NE2000-compatible Ethernet
#adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
@@ -76,7 +79,7 @@ bm* at obio? # bmac ethernet
#esp* at obio? flags 0x00ff # 53c9x SCSI
#mesh* at obio? flags 0xffff # MESH SCSI
#nvram* at obio? # nvram
-#adb* at obio? # Apple Desktop Bus
+adb* at obio? # Apple Desktop Bus
#aed* at adb? # ADB Event Device
#akbd* at adb? # ADB keyboard
#ams* at adb? # ADB mouse
@@ -105,16 +108,19 @@ atapiscsi* at wdc? channel ? flags 0x0000
scsibus* at atapiscsi?
# PCI USB Controllers
-ohci* at pci? # Open Host Controller
+ohci* at pci? # Open Host Controller
# USB bus support
-usb* at ohci?
+usb* at ohci? flags 0x1
uhub* at usb?
uhub* at uhub? port ? configuration ? interface ?
# USB Generic HID devices
uhid* at uhub? port ? configuration ? interface ?
+# USB HID Keyboard devices
+ukbd* at uhub? port ? configuration ? interface ?
+
# USB Generic driver
ugen* at uhub? port ? configuration ? interface ?
@@ -135,8 +141,9 @@ ugen* at uhub? port ? configuration ? interface ?
#### Workstation Console attachments
-#wscons* at vga?
-#wscons* at vgafb?
+#wsdisplay* at vga?
+wsdisplay* at vgafb?
+wskbd0 at ukbd? console 0
#### SCSI Bus devices
@@ -154,4 +161,3 @@ ofrtc* at openfirm?
#ofdisk* at openfirm? # used for floppy support
#ofnet* at openfirm?
ofcons* at openfirm?
-