diff options
| author |   ratchov <ratchov@openbsd.org> | 2008-03-21 20:11:36 +0000 |
|---|---|---|
| committer | ratchov <ratchov@openbsd.org> | 2008-03-21 20:11:36 +0000 |
| commit | 25dbb6cf28e0458f9928105ae45851bc867435c5 (patch) | |
| tree | d2d3a82442f651cbaf4962c04b92cdc421f2180d | |
| parent | USB Floppies are umass devices so we always use the default 63/255 (diff) | |
| download | wireguard-openbsd-25dbb6cf28e0458f9928105ae45851bc867435c5.tar.xz wireguard-openbsd-25dbb6cf28e0458f9928105ae45851bc867435c5.zip | |
outputs.master.mute, inputs.dac.mute, record.volume.mute and record.source
are already initialized in ac97.c, we dont need to set them here too.
ok jakemsr
| -rw-r--r-- | sys/dev/pci/eap.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index 5dbe5970734..1999f035ddf 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eap.c,v 1.30 2007/11/12 05:38:23 jakemsr Exp $ */ +/* $OpenBSD: eap.c,v 1.31 2008/03/21 20:11:36 ratchov Exp $ */ /* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */ /* @@ -199,8 +199,6 @@ int eap1371_attach_codec(void *sc, struct ac97_codec_if *); int eap1371_read_codec(void *sc, u_int8_t a, u_int16_t *d); int eap1371_write_codec(void *sc, u_int8_t a, u_int16_t d); void eap1371_reset_codec(void *sc); -int eap1371_get_portnum_by_name(struct eap_softc *, char *, char *, - char *); #if NMIDI > 0 void eap_midi_close(void *); void eap_midi_getinfo(void *, struct midi_info *); @@ -690,26 +688,6 @@ eap_attach(struct device *parent, struct device *self, void *aux) return; eap_hw_if = &eap1371_hw_if; - - /* Just enable the DAC and master volumes by default */ - ctl.type = AUDIO_MIXER_ENUM; - ctl.un.ord = 0; /* off */ - ctl.dev = eap1371_get_portnum_by_name(sc, AudioCoutputs, - AudioNmaster, AudioNmute); - eap1371_mixer_set_port(sc, &ctl); - ctl.dev = eap1371_get_portnum_by_name(sc, AudioCinputs, - AudioNdac, AudioNmute); - eap1371_mixer_set_port(sc, &ctl); - ctl.dev = eap1371_get_portnum_by_name(sc, AudioCrecord, - AudioNvolume, AudioNmute); - eap1371_mixer_set_port(sc, &ctl); - - ctl.dev = eap1371_get_portnum_by_name(sc, AudioCrecord, - AudioNsource, NULL); - ctl.type = AUDIO_MIXER_ENUM; - ctl.un.ord = 0; - eap1371_mixer_set_port(sc, &ctl); - } audio_attach_mi(eap_hw_if, sc, &sc->sc_dev); @@ -1246,14 +1224,6 @@ eap1371_query_devinfo(void *addr, mixer_devinfo_t *dip) return (sc->codec_if->vtbl->query_devinfo(sc->codec_if, dip)); } -int -eap1371_get_portnum_by_name(struct eap_softc *sc, - char *class, char *device, char *qualifier) -{ - return (sc->codec_if->vtbl->get_portnum_by_name(sc->codec_if, class, - device, qualifier)); -} - void eap1370_set_mixer(struct eap_softc *sc, int a, int d) { |