[src/netbsd-1-5]: src/sys/arch/macppc/conf Pullup 1.73-1.75 and 1.78 [mycroft]:

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

details:   https://anonhg.NetBSD.org/src/rev/ff2ffb70363a
branches:  netbsd-1-5
changeset: 490072:ff2ffb70363a
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Nov 01 14:56:04 2000 +0000

description:
Pullup 1.73-1.75 and 1.78 [mycroft]:
Fix half-committed pullup; `rnd' is no longer `experimental', so remove
the comment.  Add generic PCI Ethernet and audio devices.

diffstat:

 sys/arch/macppc/conf/GENERIC |  40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)

diffs (79 lines):

diff -r c8c2f6043dac -r ff2ffb70363a sys/arch/macppc/conf/GENERIC
--- a/sys/arch/macppc/conf/GENERIC      Wed Nov 01 14:55:22 2000 +0000
+++ b/sys/arch/macppc/conf/GENERIC      Wed Nov 01 14:56:04 2000 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.70.2.2 2000/10/04 08:24:27 itojun Exp $
+#      $NetBSD: GENERIC,v 1.70.2.3 2000/11/01 14:56:04 tv Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include                "arch/macppc/conf/std.macppc"
 
-#ident                 "GENERIC-$Revision: 1.70.2.2 $"
+#ident                 "GENERIC-$Revision: 1.70.2.3 $"
 
 maxusers       32
 
@@ -135,6 +135,7 @@
 fxp*   at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
 ne*    at pci? dev ? function ?        # NE2000-compatible Ethernet
 rtk*   at pci? dev ? function ?        # Realtek 8129/8139
+sip*   at pci? dev ? function ?        # SiS 900/7016 Ethernet
 adv*   at pci? dev ? function ?        # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
 ahc*   at pci? dev ? function ?        # Adaptec 294x, aic78x0 SCSI
 bha*   at pci? dev ? function ?        # BusLogic 9xx SCSI
@@ -256,7 +257,6 @@
 
 # USB audio
 uaudio*        at uhub? port ? configuration ?
-audio* at uaudio?
 
 # USB Ethernet adapters
 aue*   at uhub? port ?         # ADMtek AN986 Pegasus based adapters
@@ -266,6 +266,38 @@
 # USB Generic driver
 ugen*  at uhub? port ? configuration ? interface ?
 
+# Audio Devices
+
+# PCI audio devices
+#clcs* at pci? dev ? function ?        # Cirrus Logic CS4280
+#cmpci*        at pci? dev ? function ?        # C-Media CMI8338/8738
+eap*   at pci? dev ? function ?        # Ensoniq AudioPCI
+#eso*  at pci? dev ? function ?        # ESS Solo-1 PCI AudioDrive
+#fms*  at pci? dev ? function ?        # Forte Media FM801
+#sv*   at pci? dev ? function ?        # S3 SonicVibes
+
+# OPL[23] FM synthesizers
+#opl*  at eso?
+#opl*  at fms?
+
+# Audio support
+#audio*        at auvia?
+#audio*        at clcs?
+#audio*        at cmpci?
+audio* at eap?
+#audio*        at eso?
+#audio*        at fms?
+#audio*        at sv?
+audio* at uaudio?
+
+# MPU 401 UARTs
+#mpu*  at eso?
+#mpu*  at fms?
+
+# MIDI support
+midi*  at eap?                 # 137[01] MIDI port
+#midi* at mpu?                 # MPU 401
+
 pseudo-device  vnd             4       # disk-like interface to files
 pseudo-device  ccd             4       # concatenated/striped disk devices
 #pseudo-device raid            4       # RAIDframe disk driver
@@ -282,6 +314,4 @@
 #pseudo-device faith           1       # IPv[46] tcp relay translation i/f
 #pseudo-device stf             1       # 6to4 IPv6 over IPv4 encapsulation
 pseudo-device  pty             64      # pseudo-terminals
-
-# rnd is EXPERIMENTAL at this point.
 pseudo-device  rnd                     # /dev/random and in-kernel generator