diff options
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/eap.c | 20 | ||||
| -rw-r--r-- | sys/dev/pci/eapreg.h | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index 177cda3f732..5dbe5970734 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eap.c,v 1.29 2006/04/07 22:41:33 jsg Exp $ */ +/* $OpenBSD: eap.c,v 1.30 2007/11/12 05:38:23 jakemsr Exp $ */ /* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */ /* @@ -140,7 +140,7 @@ struct eap_softc { u_short sc_port[AK_NPORTS]; /* mirror of the hardware setting */ u_int sc_record_source; /* recording source mask */ - u_int sc_output_source; /* output source mask */ + u_int sc_input_source; /* input source mask */ u_int sc_mic_preamp; char sc_1371; /* Using ES1371/AC97 codec */ @@ -606,7 +606,7 @@ eap_attach(struct device *parent, struct device *self, void *aux) eap_hw_if = &eap1370_hw_if; /* Enable all relevant mixer switches. */ - ctl.dev = EAP_OUTPUT_SELECT; + ctl.dev = EAP_INPUT_SOURCE; ctl.type = AUDIO_MIXER_SET; ctl.un.mask = 1 << EAP_VOICE_VOL | 1 << EAP_FM_VOL | 1 << EAP_CD_VOL | 1 << EAP_LINE_VOL | 1 << EAP_AUX_VOL | @@ -1293,10 +1293,10 @@ eap1370_mixer_set_port(void *addr, mixer_ctrl_t *cp) eap1370_set_mixer(sc, AK_IN_MIXER2_R, r2); return (0); } - if (cp->dev == EAP_OUTPUT_SELECT) { + if (cp->dev == EAP_INPUT_SOURCE) { if (cp->type != AUDIO_MIXER_SET) return (EINVAL); - m = sc->sc_output_source = cp->un.mask; + m = sc->sc_input_source = cp->un.mask; o1 = o2 = 0; if (m & (1 << EAP_VOICE_VOL)) o2 |= AK_M_VOICE_L | AK_M_VOICE_R; @@ -1390,10 +1390,10 @@ eap1370_mixer_get_port(void *addr, mixer_ctrl_t *cp) return (EINVAL); cp->un.mask = sc->sc_record_source; return (0); - case EAP_OUTPUT_SELECT: + case EAP_INPUT_SOURCE: if (cp->type != AUDIO_MIXER_SET) return (EINVAL); - cp->un.mask = sc->sc_output_source; + cp->un.mask = sc->sc_input_source; return (0); case EAP_MIC_PREAMP: if (cp->type != AUDIO_MIXER_ENUM) @@ -1545,10 +1545,10 @@ eap1370_query_devinfo(void *addr, mixer_devinfo_t *dip) sizeof dip->un.s.member[5].label.name); dip->un.s.member[5].mask = 1 << EAP_VOICE_VOL; return (0); - case EAP_OUTPUT_SELECT: - dip->mixer_class = EAP_OUTPUT_CLASS; + case EAP_INPUT_SOURCE: + dip->mixer_class = EAP_INPUT_CLASS; dip->prev = dip->next = AUDIO_MIXER_LAST; - strlcpy(dip->label.name, AudioNselect, sizeof dip->label.name); + strlcpy(dip->label.name, AudioNsource, sizeof dip->label.name); dip->type = AUDIO_MIXER_SET; dip->un.s.num_mem = 6; strlcpy(dip->un.s.member[0].label.name, AudioNmicrophone, diff --git a/sys/dev/pci/eapreg.h b/sys/dev/pci/eapreg.h index 0997f83e8eb..39a057925c3 100644 --- a/sys/dev/pci/eapreg.h +++ b/sys/dev/pci/eapreg.h @@ -1,5 +1,5 @@ -/* $OpenBSD: eapreg.h,v 1.1 2001/09/06 14:47:07 naddy Exp $ */ -/* $NetBSD: eapreg.h,v 1.2 2000/04/30 21:59:58 augustss Exp $ */ +/* $OpenBSD: eapreg.h,v 1.2 2007/11/12 05:38:23 jakemsr Exp $ */ +/* $NetBSD: eapreg.h,v 1.10 2005/02/13 23:58:38 fredb Exp $ */ /* * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -264,7 +264,7 @@ #define EAP_AUX_VOL 5 #define EAP_MIC_VOL 6 #define EAP_RECORD_SOURCE 7 -#define EAP_OUTPUT_SELECT 8 +#define EAP_INPUT_SOURCE 8 #define EAP_MIC_PREAMP 9 #define EAP_OUTPUT_CLASS 10 #define EAP_RECORD_CLASS 11 |