From owner-dev-commits-src-all@freebsd.org Mon Jul 12 06:13:02 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C7BB86516B2; Mon, 12 Jul 2021 06:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GNYNG4Q2Vz3h64; Mon, 12 Jul 2021 06:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7E75F1D68; Mon, 12 Jul 2021 06:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16C6D2PM044617; Mon, 12 Jul 2021 06:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16C6D2Zr044616; Mon, 12 Jul 2021 06:13:02 GMT (envelope-from git) Date: Mon, 12 Jul 2021 06:13:02 GMT Message-Id: <202107120613.16C6D2Zr044616@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 86d69de88d1c - main - Fix blankspace anomalies, no actual code change. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86d69de88d1c7e8c7ed906590652008fc6f44d05 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2021 06:13:02 -0000 The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=86d69de88d1c7e8c7ed906590652008fc6f44d05 commit 86d69de88d1c7e8c7ed906590652008fc6f44d05 Author: Xin LI AuthorDate: 2021-07-12 06:12:24 +0000 Commit: Xin LI CommitDate: 2021-07-12 06:12:24 +0000 Fix blankspace anomalies, no actual code change. --- sys/dev/sound/pci/hda/hda_reg.h | 26 +++++------ sys/dev/sound/pci/hda/hdaa.c | 50 ++++++++++----------- sys/dev/sound/pci/hda/hdaa.h | 4 +- sys/dev/sound/pci/hda/hdac.c | 8 ++-- sys/dev/sound/pci/hda/hdac.h | 2 +- sys/dev/sound/pci/hda/hdacc.c | 14 +++--- sys/dev/sound/pci/hda/pin_patch.h | 2 +- sys/dev/sound/pci/hda/pin_patch_realtek.h | 72 +++++++++++++++---------------- 8 files changed, 89 insertions(+), 89 deletions(-) diff --git a/sys/dev/sound/pci/hda/hda_reg.h b/sys/dev/sound/pci/hda/hda_reg.h index 91099caf083d..59fe92dd6d7e 100644 --- a/sys/dev/sound/pci/hda/hda_reg.h +++ b/sys/dev/sound/pci/hda/hda_reg.h @@ -668,7 +668,7 @@ /* Channel Count Control */ #define HDA_CMD_VERB_GET_CONV_CHAN_COUNT 0xf2d -#define HDA_CMD_VERB_SET_CONV_CHAN_COUNT 0x72d +#define HDA_CMD_VERB_SET_CONV_CHAN_COUNT 0x72d #define HDA_CMD_GET_CONV_CHAN_COUNT(cad, nid) \ (HDA_CMD_12BIT((cad), (nid), \ @@ -677,20 +677,20 @@ (HDA_CMD_12BIT((cad), (nid), \ HDA_CMD_VERB_SET_CONV_CHAN_COUNT, (payload))) -#define HDA_CMD_VERB_GET_HDMI_DIP_SIZE 0xf2e +#define HDA_CMD_VERB_GET_HDMI_DIP_SIZE 0xf2e #define HDA_CMD_GET_HDMI_DIP_SIZE(cad, nid, arg) \ (HDA_CMD_12BIT((cad), (nid), \ HDA_CMD_VERB_GET_HDMI_DIP_SIZE, (arg))) -#define HDA_CMD_VERB_GET_HDMI_ELDD 0xf2f +#define HDA_CMD_VERB_GET_HDMI_ELDD 0xf2f #define HDA_CMD_GET_HDMI_ELDD(cad, nid, off) \ (HDA_CMD_12BIT((cad), (nid), \ HDA_CMD_VERB_GET_HDMI_ELDD, (off))) -#define HDA_CMD_VERB_GET_HDMI_DIP_INDEX 0xf30 -#define HDA_CMD_VERB_SET_HDMI_DIP_INDEX 0x730 +#define HDA_CMD_VERB_GET_HDMI_DIP_INDEX 0xf30 +#define HDA_CMD_VERB_SET_HDMI_DIP_INDEX 0x730 #define HDA_CMD_GET_HDMI_DIP_INDEX(cad, nid) \ (HDA_CMD_12BIT((cad), (nid), \ @@ -699,8 +699,8 @@ (HDA_CMD_12BIT((cad), (nid), \ HDA_CMD_VERB_SET_HDMI_DIP_INDEX, (payload))) -#define HDA_CMD_VERB_GET_HDMI_DIP_DATA 0xf31 -#define HDA_CMD_VERB_SET_HDMI_DIP_DATA 0x731 +#define HDA_CMD_VERB_GET_HDMI_DIP_DATA 0xf31 +#define HDA_CMD_VERB_SET_HDMI_DIP_DATA 0x731 #define HDA_CMD_GET_HDMI_DIP_DATA(cad, nid) \ (HDA_CMD_12BIT((cad), (nid), \ @@ -709,8 +709,8 @@ (HDA_CMD_12BIT((cad), (nid), \ HDA_CMD_VERB_SET_HDMI_DIP_DATA, (payload))) -#define HDA_CMD_VERB_GET_HDMI_DIP_XMIT 0xf32 -#define HDA_CMD_VERB_SET_HDMI_DIP_XMIT 0x732 +#define HDA_CMD_VERB_GET_HDMI_DIP_XMIT 0xf32 +#define HDA_CMD_VERB_SET_HDMI_DIP_XMIT 0x732 #define HDA_CMD_GET_HDMI_DIP_XMIT(cad, nid) \ (HDA_CMD_12BIT((cad), (nid), \ @@ -719,11 +719,11 @@ (HDA_CMD_12BIT((cad), (nid), \ HDA_CMD_VERB_SET_HDMI_DIP_XMIT, (payload))) -#define HDA_CMD_VERB_GET_HDMI_CP_CTRL 0xf33 -#define HDA_CMD_VERB_SET_HDMI_CP_CTRL 0x733 +#define HDA_CMD_VERB_GET_HDMI_CP_CTRL 0xf33 +#define HDA_CMD_VERB_SET_HDMI_CP_CTRL 0x733 -#define HDA_CMD_VERB_GET_HDMI_CHAN_SLOT 0xf34 -#define HDA_CMD_VERB_SET_HDMI_CHAN_SLOT 0x734 +#define HDA_CMD_VERB_GET_HDMI_CHAN_SLOT 0xf34 +#define HDA_CMD_VERB_SET_HDMI_CHAN_SLOT 0x734 #define HDA_CMD_GET_HDMI_CHAN_SLOT(cad, nid) \ (HDA_CMD_12BIT((cad), (nid), \ diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index ae7d77d431b2..621361c5fa70 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -2712,7 +2712,7 @@ hdaa_audio_ctl_recsel_comm(struct hdaa_pcm_devinfo *pdevinfo, uint32_t src, nid_ if (w->type == HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_AUDIO_MIXER) { ctl = hdaa_audio_ctl_amp_get(devinfo, w->nid, HDAA_CTL_IN, i, 1); - if (ctl == NULL) + if (ctl == NULL) continue; /* If we have input control on this node mute them * according to requested sources. */ @@ -3080,7 +3080,7 @@ hdaa_audio_ctl_parse(struct hdaa_devinfo *devinfo) if (w->type == HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX || w->waspin) ctls[cnt].ndir = HDAA_CTL_IN; - else + else ctls[cnt].ndir = HDAA_CTL_OUT; ctls[cnt++].dir = HDAA_CTL_OUT; } @@ -3145,7 +3145,7 @@ hdaa_audio_ctl_parse(struct hdaa_devinfo *devinfo) if (w->type == HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX) ctls[cnt].ndir = HDAA_CTL_OUT; - else + else ctls[cnt].ndir = HDAA_CTL_IN; ctls[cnt++].dir = HDAA_CTL_IN; break; @@ -4138,7 +4138,7 @@ hdaa_audio_disable_nonaudio(struct hdaa_devinfo *devinfo) w->type == HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_VOLUME_WIDGET) { w->enable = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling nid %d due to it's" " non-audio type.\n", w->nid); @@ -4165,7 +4165,7 @@ hdaa_audio_disable_useless(struct hdaa_devinfo *devinfo) HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_NONE) { w->enable = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling pin nid %d due" " to None connectivity.\n", w->nid); @@ -4174,7 +4174,7 @@ hdaa_audio_disable_useless(struct hdaa_devinfo *devinfo) HDA_CONFIG_DEFAULTCONF_ASSOCIATION_MASK) == 0) { w->enable = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling unassociated" " pin nid %d.\n", w->nid); @@ -4201,7 +4201,7 @@ hdaa_audio_disable_useless(struct hdaa_devinfo *devinfo) ctl->widget->connsenable[ctl->index] = 0; done = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling ctl %d nid %d cnid %d due" " to disabled widget.\n", i, ctl->widget->nid, @@ -4222,7 +4222,7 @@ hdaa_audio_disable_useless(struct hdaa_devinfo *devinfo) if (cw == NULL || cw->enable == 0) { w->connsenable[j] = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling nid %d connection %d due" " to disabled child widget.\n", i, j); @@ -4245,7 +4245,7 @@ hdaa_audio_disable_useless(struct hdaa_devinfo *devinfo) w->enable = 0; done = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling nid %d due to all it's" " inputs disabled.\n", w->nid); ); @@ -4270,7 +4270,7 @@ hdaa_audio_disable_useless(struct hdaa_devinfo *devinfo) w->enable = 0; done = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling nid %d due to all it's" " consumers disabled.\n", w->nid); ); @@ -4296,7 +4296,7 @@ hdaa_audio_disable_unas(struct hdaa_devinfo *devinfo) if (w->bindas == -1) { w->enable = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling unassociated nid %d.\n", w->nid); ); @@ -4318,7 +4318,7 @@ hdaa_audio_disable_unas(struct hdaa_devinfo *devinfo) continue; w->connsenable[j] = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling connection to input pin " "nid %d conn %d.\n", i, j); @@ -4351,7 +4351,7 @@ hdaa_audio_disable_unas(struct hdaa_devinfo *devinfo) if (cw->connsenable[j] && cw->conns[j] == i) { cw->connsenable[j] = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling connection from output pin " "nid %d conn %d cnid %d.\n", k, j, i); @@ -4400,7 +4400,7 @@ hdaa_audio_disable_notselected(struct hdaa_devinfo *devinfo) continue; w->connsenable[j] = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling unselected connection " "nid %d conn %d.\n", i, j); @@ -4455,7 +4455,7 @@ hdaa_audio_disable_crossas(struct hdaa_devinfo *devinfo) continue; w->connsenable[j] = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling crossassociatement connection " "nid %d conn %d cnid %d.\n", i, j, cw->nid); @@ -4497,7 +4497,7 @@ hdaa_audio_disable_crossas(struct hdaa_devinfo *devinfo) if (ctl->ndir == HDAA_CTL_IN) ctl->widget->connsenable[ctl->index] = 0; HDA_BOOTHVERBOSE( - device_printf(devinfo->dev, + device_printf(devinfo->dev, " Disabling crossassociatement connection " "ctl %d nid %d cnid %d.\n", i, ctl->widget->nid, @@ -4719,7 +4719,7 @@ hdaa_audio_assign_names(struct hdaa_devinfo *devinfo) int i, j; int type = -1, use, used = 0; static const int types[7][13] = { - { SOUND_MIXER_LINE, SOUND_MIXER_LINE1, SOUND_MIXER_LINE2, + { SOUND_MIXER_LINE, SOUND_MIXER_LINE1, SOUND_MIXER_LINE2, SOUND_MIXER_LINE3, -1 }, /* line */ { SOUND_MIXER_MONITOR, SOUND_MIXER_MIC, -1 }, /* int mic */ { SOUND_MIXER_MIC, SOUND_MIXER_MONITOR, -1 }, /* ext mic */ @@ -5034,10 +5034,10 @@ hdaa_audio_prepare_pin_ctrl(struct hdaa_devinfo *devinfo) /* Disable everything. */ if (devinfo->init_clear) { w->wclass.pin.ctrl &= ~( - HDA_CMD_SET_PIN_WIDGET_CTRL_HPHN_ENABLE | - HDA_CMD_SET_PIN_WIDGET_CTRL_OUT_ENABLE | - HDA_CMD_SET_PIN_WIDGET_CTRL_IN_ENABLE | - HDA_CMD_SET_PIN_WIDGET_CTRL_VREF_ENABLE_MASK); + HDA_CMD_SET_PIN_WIDGET_CTRL_HPHN_ENABLE | + HDA_CMD_SET_PIN_WIDGET_CTRL_OUT_ENABLE | + HDA_CMD_SET_PIN_WIDGET_CTRL_IN_ENABLE | + HDA_CMD_SET_PIN_WIDGET_CTRL_VREF_ENABLE_MASK); } if (w->enable == 0) { @@ -5917,7 +5917,7 @@ hdaa_dump_dst_nid(struct hdaa_pcm_devinfo *pdevinfo, nid_t nid, int depth) printf("\n"); return; } - printf(" [src: %s]", + printf(" [src: %s]", hdaa_audio_ctl_ossmixer_mask2allname( w->ossmask, buf, sizeof(buf))); if (w->ossdev >= 0) { @@ -6246,10 +6246,10 @@ hdaa_configure(device_t dev) printf(" "); printf(" ossmask=0x%08x\n", ctl->ossmask); - device_printf(dev, + device_printf(dev, " mute: %d step: %3d size: %3d off: %3d%s\n", ctl->mute, ctl->step, ctl->size, ctl->offset, - (ctl->enable == 0) ? " [DISABLED]" : + (ctl->enable == 0) ? " [DISABLED]" : ((ctl->ossmask == 0) ? " [UNUSED]" : "")); } device_printf(dev, "\n"); @@ -7043,7 +7043,7 @@ hdaa_pcm_attach(device_t dev) } else pdevinfo->chan_blkcnt = HDA_BDL_DEFAULT; - /* + /* * We don't register interrupt handler with snd_setup_intr * in pcm device. Mark pcm device as MPSAFE manually. */ diff --git a/sys/dev/sound/pci/hda/hdaa.h b/sys/dev/sound/pci/hda/hdaa.h index 4fdc3fcead26..15a3db5edd04 100644 --- a/sys/dev/sound/pci/hda/hdaa.h +++ b/sys/dev/sound/pci/hda/hdaa.h @@ -252,10 +252,10 @@ struct hdaa_chan { #define RANGEQDB(ctl) \ ((ctl)->step * ((ctl)->size + 1)) -#define VAL2QDB(ctl, val) \ +#define VAL2QDB(ctl, val) \ (((ctl)->size + 1) * ((int)(val) - (ctl)->offset)) -#define QDB2VAL(ctl, qdb) \ +#define QDB2VAL(ctl, qdb) \ imax(imin((((qdb) + (ctl)->size / 2 * ((qdb) > 0 ? 1 : -1)) / \ ((ctl)->size + 1) + (ctl)->offset), (ctl)->step), 0) diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index b1fb193595fe..cad631f4ee5d 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -603,9 +603,9 @@ hdac_dma_alloc(struct hdac_softc *sc, struct hdac_dma *dma, bus_size_t size) BUS_SPACE_MAXADDR, /* highaddr */ NULL, /* filtfunc */ NULL, /* fistfuncarg */ - roundsz, /* maxsize */ + roundsz, /* maxsize */ 1, /* nsegments */ - roundsz, /* maxsegsz */ + roundsz, /* maxsegsz */ 0, /* flags */ NULL, /* lockfunc */ NULL, /* lockfuncarg */ @@ -1313,9 +1313,9 @@ hdac_attach(device_t dev) BUS_SPACE_MAXADDR, /* highaddr */ NULL, /* filtfunc */ NULL, /* fistfuncarg */ - HDA_BUFSZ_MAX, /* maxsize */ + HDA_BUFSZ_MAX, /* maxsize */ 1, /* nsegments */ - HDA_BUFSZ_MAX, /* maxsegsz */ + HDA_BUFSZ_MAX, /* maxsegsz */ 0, /* flags */ NULL, /* lockfunc */ NULL, /* lockfuncarg */ diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 611cb98badd8..06ac0371df6b 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -90,7 +90,7 @@ #define HDA_INTEL_CNLK HDA_MODEL_CONSTRUCT(INTEL, 0x9dc8) #define HDA_INTEL_ICLK HDA_MODEL_CONSTRUCT(INTEL, 0x34c8) #define HDA_INTEL_CMLKLP HDA_MODEL_CONSTRUCT(INTEL, 0x02c8) -#define HDA_INTEL_CMLKH HDA_MODEL_CONSTRUCT(INTEL, 0x06c8) +#define HDA_INTEL_CMLKH HDA_MODEL_CONSTRUCT(INTEL, 0x06c8) #define HDA_INTEL_TGLK HDA_MODEL_CONSTRUCT(INTEL, 0xa0c8) #define INTEL_A100ID_SUBVENDOR HDA_MODEL_CONSTRUCT(INTEL, 0xa100) #define INTEL_D400ID_SUBVENDOR HDA_MODEL_CONSTRUCT(INTEL, 0xd400) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index ff72498ecb9f..e663ffa3dbcf 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -196,19 +196,19 @@ static const struct { { HDA_CODEC_STAC9229D, 0, "Sigmatel STAC9229D" }, { HDA_CODEC_STAC9230X, 0, "Sigmatel STAC9230X" }, { HDA_CODEC_STAC9230D, 0, "Sigmatel STAC9230D" }, - { HDA_CODEC_STAC9250, 0, "Sigmatel STAC9250" }, - { HDA_CODEC_STAC9251, 0, "Sigmatel STAC9251" }, - { HDA_CODEC_STAC9255, 0, "Sigmatel STAC9255" }, - { HDA_CODEC_STAC9255D, 0, "Sigmatel STAC9255D" }, - { HDA_CODEC_STAC9254, 0, "Sigmatel STAC9254" }, - { HDA_CODEC_STAC9254D, 0, "Sigmatel STAC9254D" }, + { HDA_CODEC_STAC9250, 0, "Sigmatel STAC9250" }, + { HDA_CODEC_STAC9251, 0, "Sigmatel STAC9251" }, + { HDA_CODEC_STAC9255, 0, "Sigmatel STAC9255" }, + { HDA_CODEC_STAC9255D, 0, "Sigmatel STAC9255D" }, + { HDA_CODEC_STAC9254, 0, "Sigmatel STAC9254" }, + { HDA_CODEC_STAC9254D, 0, "Sigmatel STAC9254D" }, { HDA_CODEC_STAC9271X, 0, "Sigmatel STAC9271X" }, { HDA_CODEC_STAC9271D, 0, "Sigmatel STAC9271D" }, { HDA_CODEC_STAC9272X, 0, "Sigmatel STAC9272X" }, { HDA_CODEC_STAC9272D, 0, "Sigmatel STAC9272D" }, { HDA_CODEC_STAC9273X, 0, "Sigmatel STAC9273X" }, { HDA_CODEC_STAC9273D, 0, "Sigmatel STAC9273D" }, - { HDA_CODEC_STAC9274, 0, "Sigmatel STAC9274" }, + { HDA_CODEC_STAC9274, 0, "Sigmatel STAC9274" }, { HDA_CODEC_STAC9274D, 0, "Sigmatel STAC9274D" }, { HDA_CODEC_STAC9274X5NH, 0, "Sigmatel STAC9274X5NH" }, { HDA_CODEC_STAC9274D5NH, 0, "Sigmatel STAC9274D5NH" }, diff --git a/sys/dev/sound/pci/hda/pin_patch.h b/sys/dev/sound/pci/hda/pin_patch.h index 8e2c9875906f..ecf23bdb9603 100644 --- a/sys/dev/sound/pci/hda/pin_patch.h +++ b/sys/dev/sound/pci/hda/pin_patch.h @@ -109,7 +109,7 @@ struct pin_machine_model_t { struct model_pin_patch_t { struct pin_machine_model_t *models; /* list of machine models */ - struct pin_patch_t *pin_patches; /* hardcoded overrides */ + struct pin_patch_t *pin_patches; /* hardcoded overrides */ void (*fixup_func)(struct hdaa_widget *); /* for future use */ }; diff --git a/sys/dev/sound/pci/hda/pin_patch_realtek.h b/sys/dev/sound/pci/hda/pin_patch_realtek.h index 804885659515..dfa262e3610a 100644 --- a/sys/dev/sound/pci/hda/pin_patch_realtek.h +++ b/sys/dev/sound/pci/hda/pin_patch_realtek.h @@ -194,7 +194,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_JACK_WO_DETECT(25), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -204,7 +204,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_JACK_WO_DETECT(25), PIN_PATCH_HPMIC_WO_DETECT(26), - { } + { } } }, { } } @@ -219,7 +219,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(27, "seq=1 as=5 misc=1 ctype=Analog device=Speaker loc=Internal conn=Fixed"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -235,7 +235,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_MIC_INTERNAL(19), PIN_PATCH_STRING(25, "as=2 misc=1 color=Black ctype=1/8 device=Mic loc=Right"), - { } + { } } }, { } } @@ -249,7 +249,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(16, "seq=15 device=Headphones"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -258,7 +258,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(17, "as=1 misc=1 ctype=ATAPI device=Speaker loc=Internal conn=Fixed"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -267,7 +267,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(15, "color=Green ctype=1/8 device=Headphones loc=Rear"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -286,7 +286,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { PIN_PATCH_NOT_APPLICABLE(23), PIN_PATCH_NOT_APPLICABLE(24), PIN_PATCH_NOT_APPLICABLE(25), - { } + { } } }, { } } @@ -302,7 +302,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { PIN_PATCH_STRING(20, "as=1 misc=1 ctype=ATAPI device=Speaker loc=Onboard conn=Fixed"), PIN_PATCH_STRING(21, "seq=15 as=2 misc=4 color=Black ctype=1/8 device=Headphones loc=Front"), PIN_PATCH_STRING(22, "seq=15 as=1 misc=4 color=Black ctype=1/8 device=Headphones loc=Rear"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -311,7 +311,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(21, "as=1 misc=1 ctype=Analog device=Speaker loc=Internal conn=Fixed"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -320,7 +320,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(22, "as=2 misc=1 ctype=ATAPI device=Speaker loc=Onboard conn=Fixed"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -329,7 +329,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(22, "as=15 misc=1 color=White ctype=ATAPI device=AUX loc=Onboard"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -338,7 +338,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(22, "seq=1 as=2"), - { } + { } } }, { } } @@ -352,7 +352,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(20, "as=1 seq=15"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -361,7 +361,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(30, "as=8 misc=1 color=Black ctype=Combo device=SPDIF-out loc=Rear"), - { } + { } } }, { } } @@ -375,7 +375,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(21, "as=1 seq=15"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -389,7 +389,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_DOCK_MIC_IN(25), PIN_PATCH_DOCK_HP(27), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -398,7 +398,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(33, "as=1 seq=15"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -407,7 +407,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_SUBWOOFER(23), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -417,7 +417,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_DOCK_LINE_OUT(26), PIN_PATCH_DOCK_MIC_IN(27), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -426,7 +426,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_HPMIC_WITH_DETECT(25), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -436,7 +436,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(33, "seq=15 as=2 color=Black ctype=1/8 device=Headphones loc=Front"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -448,7 +448,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_JACK_WO_DETECT(25), PIN_PATCH_HPMIC_WO_DETECT(26), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -458,7 +458,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_JACK_WO_DETECT(25), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -467,7 +467,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(24, "seq=12 as=2 misc=8 color=Black ctype=1/8 device=Mic loc=Right"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -480,7 +480,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { PIN_PATCH_STRING(24, "as=1 misc=1 ctype=ATAPI device=Speaker loc=Onboard conn=Fixed"), PIN_PATCH_STRING(30, "seq=14 as=1 color=Black ctype=Digital device=SPDIF-out loc=Left"), PIN_PATCH_STRING(33, "seq=15 as=1 color=Black ctype=1/8 device=Headphones loc=Left"), - { } + { } } }, { .models = (struct pin_machine_model_t[]){ @@ -490,7 +490,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(24, "seq=15 as=3 color=Black ctype=1/8 device=Line-in loc=Ext-Rear"), PIN_PATCH_STRING(27, "as=2 color=Black ctype=1/8 loc=Ext-Rear"), - { } + { } } }, { } } @@ -510,7 +510,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { PIN_PATCH_STRING(25, "as=2 misc=12 color=Pink ctype=1/8 device=Mic loc=Rear"), PIN_PATCH_STRING(27, "seq=15 as=2 misc=1 ctype=Analog device=Mic loc=Onboard conn=Fixed"), PIN_PATCH_HP_OUT(33), - { } + { } } }, { } } @@ -527,7 +527,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { PIN_PATCH_STRING(27, "as=2 color=Black ctype=1/8 loc=Ext-Rear"), PIN_PATCH_HPMIC_WITH_DETECT(26), PIN_PATCH_STRING(24, "seq=15 as=3 color=Black ctype=1/8 device=Line-in loc=Ext-Rear"), - { } + { } } }, { } } @@ -550,7 +550,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { PIN_PATCH_STRING(29, "seq=13 as=2 misc=11 color=Pink ctype=DIN device=Other conn=None"), PIN_PATCH_NOT_APPLICABLE(30), PIN_PATCH_STRING(33, "seq=15 as=1 color=Black ctype=1/8 device=Headphones loc=Left"), - { } + { } } }, { } } @@ -565,7 +565,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_JACK_WO_DETECT(25), - { } + { } } }, { } } @@ -596,7 +596,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { PIN_PATCH_STRING(21, "seq=15 as=1 color=Green ctype=1/8 device=Headphones loc=Front"), PIN_PATCH_STRING(23, "seq=2 as=1 misc=1 ctype=Analog device=Speaker loc=Internal conn=Fixed"), PIN_PATCH_JACK_WO_DETECT(26), - { } + { } } }, { } } @@ -610,7 +610,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(21, "as=1 seq=15"), - { } + { } } }, { } } @@ -635,7 +635,7 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_HPMIC_WO_DETECT(24), PIN_PATCH_JACK_WO_DETECT(26), - { } + { } } }, { } } @@ -993,11 +993,11 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { }, .pin_patches = (struct pin_patch_t[]){ PIN_PATCH_STRING(27, "as=1 seq=15"), - { } + { } } }, { } } - } + } }; #endif /* PIN_PATCH_REALTEK_H */