[src/netbsd-1-5]: src/sys/arch/macppc/macppc Pull in revisions from 1.21 to 1...

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

details:   https://anonhg.NetBSD.org/src/rev/495decae835e
branches:  netbsd-1-5
changeset: 488692:495decae835e
user:      wrstuden <wrstuden%NetBSD.org@localhost>
date:      Mon Jul 24 22:49:43 2000 +0000

description:
Pull in revisions from 1.21 to 1.24. Thes changes add audio device
entrypoints.

diffstat:

 sys/arch/macppc/macppc/conf.c |  14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r 60f3cd51e9e8 -r 495decae835e sys/arch/macppc/macppc/conf.c
--- a/sys/arch/macppc/macppc/conf.c     Mon Jul 24 20:39:50 2000 +0000
+++ b/sys/arch/macppc/macppc/conf.c     Mon Jul 24 22:49:43 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.21 2000/06/09 17:11:30 tsubai Exp $ */
+/*     $NetBSD: conf.c,v 1.21.2.1 2000/07/24 22:49:43 wrstuden Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -105,6 +105,12 @@
 cdev_decl(zs);
 #include "ipfilter.h"
 #include "ch.h"
+cdev_decl(ch);
+#include "audio.h"
+cdev_decl(audio);
+#include "midi.h"
+cdev_decl(midi);
+#include "sequencer.h"
 #include "ss.h"
 #include "uk.h"
 #include "ite.h"
@@ -200,6 +206,9 @@
        cdev_tty_init(NCOM,com),        /* 45: NS16x50 compatible ports */
        cdev_tty_init(NCZ,cztty),       /* 46: Cyclades-Z serial port */
        cdev_tty_init(NCY,cy),          /* 47: Cyclom-Y serial port */
+       cdev_audio_init(NAUDIO,audio),  /* 48: generic audio I/O */
+       cdev_midi_init(NMIDI,midi),     /* 49: MIDI I/O */
+       cdev_midi_init(NSEQUENCER,sequencer),   /* 50: sequencer I/O */
 };
 int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
 
@@ -282,6 +291,9 @@
        /* 45 */        NODEV,
        /* 46 */        NODEV,
        /* 47 */        NODEV,
+       /* 48 */        NODEV,
+       /* 49 */        NODEV,
+       /* 50 */        NODEV,
 };
 
 /*