From owner-svn-src-all@FreeBSD.ORG Fri Mar 20 21:46:28 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CED8106564A; Fri, 20 Mar 2009 21:46:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 69D278FC13; Fri, 20 Mar 2009 21:46:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2KLkSmY014414; Fri, 20 Mar 2009 21:46:28 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2KLkSbD014413; Fri, 20 Mar 2009 21:46:28 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200903202146.n2KLkSbD014413@svn.freebsd.org> From: Alexander Motin Date: Fri, 20 Mar 2009 21:46:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190178 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/sound/pci/hda X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Mar 2009 21:46:29 -0000 Author: mav Date: Fri Mar 20 21:46:28 2009 New Revision: 190178 URL: http://svn.freebsd.org/changeset/base/190178 Log: MFC rev. 188510, 189876, 189879 s/succeded/succeeded/ in comments. Fix spelling in message. Remove CD input hack for ALC268 based Acer systems. Latest systems does not implement CD input in hardware, while unconditional showing it confuse users. Also it was made in the way that sometimes improper with present driver. Add patch for ALC268 based Acer TM5320 to make headphones jack sensing work. Default configuration defines two separate playback associations, which current driver unable to trace properly due to order they are defined and limited codec uniformity. Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/dev/sound/pci/hda/hdac.c Modified: stable/7/sys/dev/sound/pci/hda/hdac.c ============================================================================== --- stable/7/sys/dev/sound/pci/hda/hdac.c Fri Mar 20 21:22:14 2009 (r190177) +++ stable/7/sys/dev/sound/pci/hda/hdac.c Fri Mar 20 21:46:28 2009 (r190178) @@ -83,7 +83,7 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20090131_0127" +#define HDA_DRV_TEST_REV "20090316_0130" SND_DECLARE_FILE("$FreeBSD$"); @@ -253,6 +253,7 @@ SND_DECLARE_FILE("$FreeBSD$"); #define ACER_A4715_SUBVENDOR HDA_MODEL_CONSTRUCT(ACER, 0x0133) #define ACER_3681WXM_SUBVENDOR HDA_MODEL_CONSTRUCT(ACER, 0x0110) #define ACER_T6292_SUBVENDOR HDA_MODEL_CONSTRUCT(ACER, 0x011b) +#define ACER_T5320_SUBVENDOR HDA_MODEL_CONSTRUCT(ACER, 0x011f) #define ACER_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(ACER, 0xffff) /* Asus */ @@ -2459,13 +2460,14 @@ hdac_widget_pin_getconfig(struct hdac_wi patch = "seq=15 device=Headphones"; break; } - } else if (id == HDA_CODEC_ALC268 && - HDA_DEV_MATCH(ACER_ALL_SUBVENDOR, sc->pci_subvendor)) { + } else if (id == HDA_CODEC_ALC268) { + if (sc->pci_subvendor == ACER_T5320_SUBVENDOR) { switch (nid) { - case 28: - patch = "device=CD conn=fixed"; + case 20: /* Headphones Jack */ + patch = "as=1 seq=15"; break; } + } } if (patch != NULL) @@ -4981,7 +4983,7 @@ hdac_audio_trace_as_out(struct hdac_devi /* Find next pin */ for (i = seq; i < 16 && ases[as].pins[i] == 0; i++) ; - /* Check if there is no any left. If so - we succeded. */ + /* Check if there is no any left. If so - we succeeded. */ if (i == 16) return (1); @@ -5027,7 +5029,7 @@ hdac_audio_trace_as_out(struct hdac_devi hdac_audio_trace_dac(devinfo, as, i, ases[as].pins[i], hpredir, min, res, 0); ases[as].dacs[i] = res; - /* We succeded, so call next. */ + /* We succeeded, so call next. */ if (hdac_audio_trace_as_out(devinfo, as, i + 1)) return (1); /* If next failed, we should retry with next min */ @@ -6002,7 +6004,7 @@ retry: if (res) { HDA_BOOTVERBOSE( device_printf(devinfo->codec->sc->dev, - "Association %d (%d) trace succeded\n", + "Association %d (%d) trace succeeded\n", j, as[j].index); ); } else { @@ -7907,9 +7909,9 @@ hdac_pcm_attach(device_t dev) device_printf(dev, "+--------------------------------------+\n"); hdac_dump_pcmchannels(pdevinfo); device_printf(dev, "\n"); - device_printf(dev, "+--------------------------------+\n"); - device_printf(dev, "| DUMPING Playback/Record Pathes |\n"); - device_printf(dev, "+--------------------------------+\n"); + device_printf(dev, "+-------------------------------+\n"); + device_printf(dev, "| DUMPING Playback/Record Paths |\n"); + device_printf(dev, "+-------------------------------+\n"); hdac_dump_dac(pdevinfo); hdac_dump_adc(pdevinfo); hdac_dump_mix(pdevinfo);