diff options
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/files.sgi | 7 | ||||
| -rw-r--r-- | sys/arch/sgi/sgi/conf.c | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/sys/arch/sgi/conf/GENERIC b/sys/arch/sgi/conf/GENERIC index 9655c45e5c7..3e2f6ba7f74 100644 --- a/sys/arch/sgi/conf/GENERIC +++ b/sys/arch/sgi/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.11 2004/10/20 12:49:15 pefo Exp $ +# $OpenBSD: GENERIC,v 1.12 2005/01/02 19:50:30 kettenis Exp $ # machine sgi mips64 @@ -47,6 +47,7 @@ macebus0 at mainbus0 # MACE controller localbus. # Localbus devices clock0 at macebus0 mec0 at macebus0 sys 0x18 base 0x00280000 irq 4 +#mavb0 at macebus0 sys 0x18 base 0x00300000 irq 7 com0 at macebus0 sys 0x18 base 0x00390000 irq 5 com1 at macebus0 sys 0x18 base 0x00398000 irq 5 @@ -95,6 +96,9 @@ urlphy* at mii? # Realtek RTL8150L internal PHY rgephy* at mii? # Realtek 8169S/8110S PHY ukphy* at mii? # "unknown" PHYs +#### Audio +#audio* at mavb? + #### WS console #wsdisplay* at vga? #wskbd* at ukbd? mux 1 diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi index c7c65952776..cb377f7cbf5 100644 --- a/sys/arch/sgi/conf/files.sgi +++ b/sys/arch/sgi/conf/files.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: files.sgi,v 1.6 2004/10/20 12:49:15 pefo Exp $ +# $OpenBSD: files.sgi,v 1.7 2005/01/02 19:50:30 kettenis Exp $ # # maxpartitions must be first item in files.${ARCH} # @@ -95,6 +95,11 @@ device mec: ether, ifnet, ifmedia, mii attach mec at macebus file arch/sgi/dev/if_mec.c mec +# Moosehead A/V Board audio +device mavb: audio +attach mavb at macebus +file arch/sgi/dev/mavb.c mavb + # Raster operations include "dev/rasops/files.rasops" include "dev/wsfont/files.wsfont" diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c index 055492669f6..499ef079630 100644 --- a/sys/arch/sgi/sgi/conf.c +++ b/sys/arch/sgi/sgi/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.7 2004/12/13 16:18:02 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.8 2005/01/02 19:50:30 kettenis Exp $ */ /* * Copyright (c) 1992, 1993 @@ -106,6 +106,7 @@ cdev_decl(lpt); #include "ss.h" #include "uk.h" cdev_decl(wd); +#include "audio.h" #ifdef XFS #include <xfs/nxfs.h> cdev_decl(xfs_dev); @@ -174,7 +175,7 @@ cdev_wsdisplay_init(NWSDISPLAY, wsdisplay), /* 25: */ cdev_notdef(), /* 41: */ cdev_notdef(), /* 42: */ cdev_notdef(), /* 33: */ - cdev_notdef(), /* 44: */ + cdev_audio_init(NAUDIO,audio), /* 44: /dev/audio */ cdev_notdef(), /* 45: */ cdev_notdef(), /* 46: */ cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */ |