diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2011-04-19 23:07:56 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2011-04-19 23:07:56 +0000 |
| commit | d4824ee6779c42dac69675d2e3ebc84cb0f5c29a (patch) | |
| tree | 90ae73c6c8e79c01c129a02460a22bc390f66000 /sys | |
| parent | 5e759e7448873adae098ee36432a0576ef19fa72 (diff) | |
as confirmed by my 11mo old son, this makes midi keyboards work with macppc
"no objection" drahn@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/macppc/macppc/conf.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 835f2d1fd4d..db1e2f7eea7 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.206 2011/02/17 20:14:30 miod Exp $g +# $OpenBSD: GENERIC,v 1.207 2011/04/19 23:07:54 todd Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -404,3 +404,4 @@ owctr* at onewire? # Counter device pseudo-device hotplug 1 # devices hot plugging pseudo-device wsmux 2 # mouse & keyboard multiplexor +pseudo-device sequencer 1 diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c index 1cd05415ceb..3703fb44ac6 100644 --- a/sys/arch/macppc/macppc/conf.c +++ b/sys/arch/macppc/macppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.44 2011/01/14 19:04:08 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.45 2011/04/19 23:07:54 todd Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -131,6 +131,8 @@ cdev_decl(pci); #include "audio.h" #include "video.h" +#include "midi.h" +#include "sequencer.h" #include "pf.h" @@ -201,8 +203,8 @@ struct cdevsw cdevsw[] = { #else cdev_notdef(), /* 51 */ #endif - cdev_notdef(), /* 52 */ - cdev_notdef(), /* 53 */ + cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */ + cdev_midi_init(NSEQUENCER,sequencer), /* 53: sequencer I/O */ cdev_disk_init(NRAID,raid), /* 54: RAIDframe disk driver */ cdev_notdef(), /* 55 */ /* The following slots are reserved for isdn4bsd. */ |