diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index fb88a17e6f12..901d024e1db8 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1099 2008/09/27 13:16:53 reed Exp $ +# $NetBSD: mi,v 1.1100 2008/09/30 16:50:38 jmcneill Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -869,7 +869,7 @@ ./usr/share/man/cat4/esh.0 man-sys-catman .cat ./usr/share/man/cat4/esiop.0 man-sys-catman .cat ./usr/share/man/cat4/esis.0 man-sys-catman .cat -./usr/share/man/cat4/esl.0 man-sys-catman .cat +./usr/share/man/cat4/esl.0 man-obsolete obsolete ./usr/share/man/cat4/esm.0 man-sys-catman .cat ./usr/share/man/cat4/eso.0 man-sys-catman .cat ./usr/share/man/cat4/esp.0 man-sys-catman .cat @@ -3379,7 +3379,7 @@ ./usr/share/man/html4/esh.html man-sys-htmlman html ./usr/share/man/html4/esiop.html man-sys-htmlman html ./usr/share/man/html4/esis.html man-sys-htmlman html -./usr/share/man/html4/esl.html man-sys-htmlman html +./usr/share/man/html4/esl.html man-obsolete obsolete ./usr/share/man/html4/esm.html man-sys-htmlman html ./usr/share/man/html4/eso.html man-sys-htmlman html ./usr/share/man/html4/esp.html man-sys-htmlman html @@ -5667,7 +5667,7 @@ ./usr/share/man/man4/esh.4 man-sys-man .man ./usr/share/man/man4/esiop.4 man-sys-man .man ./usr/share/man/man4/esis.4 man-sys-man .man -./usr/share/man/man4/esl.4 man-sys-man .man +./usr/share/man/man4/esl.4 man-obsolete obsolete ./usr/share/man/man4/esm.4 man-sys-man .man ./usr/share/man/man4/eso.4 man-sys-man .man ./usr/share/man/man4/esp.4 man-sys-man .man diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 80aa23a01d62..4084386868f8 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.474 2008/09/21 10:25:07 hannken Exp $ +# $NetBSD: Makefile,v 1.475 2008/09/30 16:48:39 jmcneill Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \ @@ -19,7 +19,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \ ddb.4 ddc.4 de.4 dge.4 dk.4 dmoverio.4 \ dmphy.4 dpt.4 dpti.4 drm.4 drum.4 \ eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 esis.4 \ - esa.4 esiop.4 esl.4 esm.4 eso.4 etherip.4 exphy.4 \ + esa.4 esiop.4 esm.4 eso.4 etherip.4 exphy.4 \ fast_ipsec.4 fd.4 finsio.4 fpa.4 fms.4 fss.4 fxp.4 \ gem.4 genfb.4 gentbi.4 geodeide.4 \ glxtphy.4 gpib.4 gpio.4 gre.4 gphyter.4 gsip.4 hifn.4 hme.4 \ diff --git a/share/man/man4/esl.4 b/share/man/man4/esl.4 deleted file mode 100644 index b316f706c0ba..000000000000 --- a/share/man/man4/esl.4 +++ /dev/null @@ -1,72 +0,0 @@ -.\" $NetBSD: esl.4,v 1.6 2005/06/22 04:30:08 kent Exp $ -.\" -.\" Copyright (c) 2001 Jared D. McNeill -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by Jared D. McNeill. -.\" 4. Neither the name of the author nor the names of any -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS -.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS -.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -.\" POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd June 22, 2005 -.Dt ESL 4 -.Os -.Sh NAME -.Nm esl -.Nd ESS Technology AudioDrive (Programmed I/O mode) family audio device driver -.Sh SYNOPSIS -.Cd "esl* at pcmcia? function ?" -.Cd "audio* at audiobus?" -.Cd "opl* at esl?" -.Sh DESCRIPTION -The -.Nm -driver provides support for the ESS 1688 AudioDrive audio devices on a -PCMCIA card. -.Pp -Since there is no way to do DMA over the PCMCIA bus, the -.Nm -driver uses a Programmed I/O mode to drive the cards. This is very -inefficient, but is the only way to drive such a card. -.Pp -Cards supported by this driver are capable of 8- and 16-bit audio sample -playback at rates up to 44.1kHz. -.Sh SEE ALSO -.Xr audio 4 , -.Xr midi 4 , -.Xr opl 4 , -.Xr pcmcia 4 -.Sh HISTORY -The -.Nm -device driver appeared in -.Nx 1.6 . -.Sh AUTHORS -.An Jared D. McNeill Aq jmcneill@invisible.ca -.Sh BUGS -Putting a machine into suspend mode while this driver is active will -cause the machine to freeze. -.Pp -Recording is not yet supported by this driver. diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 8b6585403ecc..3eb419744815 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.226 2008/09/09 03:26:42 ober Exp $ +# $NetBSD: GENERIC,v 1.227 2008/09/30 16:46:56 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.226 $" +#ident "GENERIC-$Revision: 1.227 $" maxusers 64 # estimated number of users @@ -915,13 +915,9 @@ neo* at pci? dev ? function ? # NeoMagic 256 AC'97 Audio sv* at pci? dev ? function ? # S3 SonicVibes yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio -# PCMCIA audio devices -#esl* at pcmcia? function ? # ESS 1688 AudioDrive - # OPL[23] FM synthesizers #opl0 at isa? port 0x388 # use only if not attached to sound card opl* at cmpci? flags 1 -#opl* at esl? opl* at eso? opl* at fms? opl* at sv? diff --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0 index 53a9ba680609..1132384bcd57 100644 --- a/sys/arch/amd64/conf/XEN3_DOM0 +++ b/sys/arch/amd64/conf/XEN3_DOM0 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.28 2008/09/17 12:39:50 cegger Exp $ +# $NetBSD: XEN3_DOM0,v 1.29 2008/09/30 16:46:56 jmcneill Exp $ include "arch/amd64/conf/std.xen" @@ -654,7 +654,6 @@ yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio # OPL[23] FM synthesizers #opl0 at isa? port 0x388 # use only if not attached to sound card opl* at cmpci? flags 1 -#opl* at esl? opl* at eso? opl* at fms? opl* at sv? diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL index cd0a80ea93f6..9e50f7ffd8e6 100644 --- a/sys/arch/i386/conf/ALL +++ b/sys/arch/i386/conf/ALL @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.180 2008/09/19 22:50:05 jmcneill Exp $ +# $NetBSD: ALL,v 1.181 2008/09/30 16:45:33 jmcneill Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.180 $" +#ident "ALL-$Revision: 1.181 $" maxusers 32 # estimated number of users @@ -1284,16 +1284,11 @@ gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis Ultra Sound pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum sb0 at isa? port 0x220 irq 5 drq 1 drq2 5 # SoundBlaster wss0 at isa? port 0x530 irq 10 drq 0 drq2 1 # Windows Sound System - -# PCMCIA audio devices -esl* at pcmcia? function ? # ESS 1688 AudioDrive - cms0 at isa? port 0x220 # Creative Music System # OPL[23] FM synthesizers opl0 at isa? port 0x388 # use only if not attached to sound card opl* at cmpci? flags 1 -opl* at esl? opl* at eso? opl* at ess? opl* at fms? diff --git a/sys/arch/i386/conf/CARDBUS b/sys/arch/i386/conf/CARDBUS index 3e1ac5af7dc6..9bd5bfbd36f2 100644 --- a/sys/arch/i386/conf/CARDBUS +++ b/sys/arch/i386/conf/CARDBUS @@ -1,4 +1,4 @@ -# $NetBSD: CARDBUS,v 1.78 2006/10/01 09:53:08 itohy Exp $ +# $NetBSD: CARDBUS,v 1.79 2008/09/30 16:45:33 jmcneill Exp $ # # CARDBUS: GENERIC + CardBus support @@ -54,9 +54,3 @@ tlp* at cardbus? function ? # DECchip 21143 # CardBus USB controllers ehci* at cardbus? function ? # Enhanced Host Controller ohci* at cardbus? function ? # Open Host Controller - -# PCMCIA audio devices -esl* at pcmcia? function ? # ESS 1688 AudioDrive - -# OPL[23] FM synthesizers -opl* at esl? diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 7ecbc997e948..cb6672bcaf64 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.909 2008/09/09 03:26:42 ober Exp $ +# $NetBSD: GENERIC,v 1.910 2008/09/30 16:45:33 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.909 $" +#ident "GENERIC-$Revision: 1.910 $" maxusers 64 # estimated number of users @@ -1273,16 +1273,11 @@ gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis Ultra Sound pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum sb0 at isa? port 0x220 irq 5 drq 1 drq2 5 # SoundBlaster wss0 at isa? port 0x530 irq 10 drq 0 drq2 1 # Windows Sound System - -# PCMCIA audio devices -#esl* at pcmcia? function ? # ESS 1688 AudioDrive - #cms0 at isa? port 0x220 # Creative Music System # OPL[23] FM synthesizers #opl0 at isa? port 0x388 # use only if not attached to sound card opl* at cmpci? flags 1 -#opl* at esl? opl* at eso? opl* at ess? opl* at fms? diff --git a/sys/arch/i386/conf/XEN2_DOM0 b/sys/arch/i386/conf/XEN2_DOM0 index 311c6d22209e..946237e04f6c 100644 --- a/sys/arch/i386/conf/XEN2_DOM0 +++ b/sys/arch/i386/conf/XEN2_DOM0 @@ -1,4 +1,4 @@ -# $NetBSD: XEN2_DOM0,v 1.49 2008/09/17 12:39:50 cegger Exp $ +# $NetBSD: XEN2_DOM0,v 1.50 2008/09/30 16:45:33 jmcneill Exp $ include "arch/xen/conf/std.xen" @@ -639,7 +639,6 @@ yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio # OPL[23] FM synthesizers #opl0 at isa? port 0x388 # use only if not attached to sound card opl* at cmpci? flags 1 -#opl* at esl? opl* at eso? opl* at fms? opl* at sv?