diff options
| author |   jcs <jcs@openbsd.org> | 2019-10-14 01:59:14 +0000 |
|---|---|---|
| committer | jcs <jcs@openbsd.org> | 2019-10-14 01:59:14 +0000 |
| commit | 054809f86fd5bba2bda3df8649e630dd271f99dc (patch) | |
| tree | 97203cb84aa1954910657cf98f69ab7f65b4f4f4 | |
| parent | Convert all tsleep(9) calls to tsleep_nsec(9) in wsdisplay(4). (diff) | |
| download | wireguard-openbsd-054809f86fd5bba2bda3df8649e630dd271f99dc.tar.xz wireguard-openbsd-054809f86fd5bba2bda3df8649e630dd271f99dc.zip | |
Rename AZ_QRK_WID_SPKR2_DAC and AZ_QRK_WID_DOLBY_ATMOS to make it
clear they are not widget quirks, and renumber AZ_QRK_WID_SPKR2_DAC
to fall outside of AZ_QRK_WID_MASK since it's not handled by
azalia_codec_widget_quirks
| -rw-r--r-- | sys/dev/pci/azalia.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/azalia.h | 6 | ||||
| -rw-r--r-- | sys/dev/pci/azalia_codec.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index 277aed53ffc..eef2b7cc8b7 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.252 2019/09/10 07:49:15 ratchov Exp $ */ +/* $OpenBSD: azalia.c,v 1.253 2019/10/14 01:59:14 jcs Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -1415,7 +1415,7 @@ azalia_resume_codec(codec_t *this) } DELAY(100); - if (this->qrks & AZ_QRK_WID_DOLBY_ATMOS) + if (this->qrks & AZ_QRK_DOLBY_ATMOS) azalia_codec_init_dolby_atmos(this); FOR_EACH_WIDGET(this, i) { @@ -1559,7 +1559,7 @@ azalia_codec_init(codec_t *this) return ENOMEM; } - if (this->qrks & AZ_QRK_WID_DOLBY_ATMOS) + if (this->qrks & AZ_QRK_DOLBY_ATMOS) azalia_codec_init_dolby_atmos(this); /* query the base parameters */ @@ -2228,7 +2228,7 @@ azalia_codec_select_spkrdac(codec_t *this) for (i = 0; i < w->nconnections; i++) { conv = azalia_codec_find_defdac(this, w->connections[i], 1); - if (this->qrks & AZ_QRK_WID_SPKR2_DAC) { + if (this->qrks & AZ_QRK_ROUTE_SPKR2_DAC) { if (conv != this->spkr_dac) { conn = i; break; diff --git a/sys/dev/pci/azalia.h b/sys/dev/pci/azalia.h index a3324a4e835..116207ac457 100644 --- a/sys/dev/pci/azalia.h +++ b/sys/dev/pci/azalia.h @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.h,v 1.67 2019/08/13 15:28:12 jcs Exp $ */ +/* $OpenBSD: azalia.h,v 1.68 2019/10/14 01:59:14 jcs Exp $ */ /* $NetBSD: azalia.h,v 1.6 2006/01/16 14:15:26 kent Exp $ */ /*- @@ -513,8 +513,8 @@ #define AZ_QRK_WID_TPDOCK1 0x00010000 #define AZ_QRK_WID_TPDOCK2 0x00020000 #define AZ_QRK_WID_TPDOCK3 0x00040000 -#define AZ_QRK_WID_DOLBY_ATMOS 0x00100000 -#define AZ_QRK_WID_SPKR2_DAC 0x00200000 +#define AZ_QRK_ROUTE_SPKR2_DAC 0x01000000 +#define AZ_QRK_DOLBY_ATMOS 0x02000000 /* memory-mapped types */ typedef struct { diff --git a/sys/dev/pci/azalia_codec.c b/sys/dev/pci/azalia_codec.c index 4d850846e4f..fe744f5b50d 100644 --- a/sys/dev/pci/azalia_codec.c +++ b/sys/dev/pci/azalia_codec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia_codec.c,v 1.176 2019/08/13 15:28:12 jcs Exp $ */ +/* $OpenBSD: azalia_codec.c,v 1.177 2019/10/14 01:59:14 jcs Exp $ */ /* $NetBSD: azalia_codec.c,v 1.8 2006/05/10 11:17:27 kent Exp $ */ /*- @@ -127,7 +127,7 @@ azalia_codec_init_vtbl(codec_t *this) case 0x10ec0285: this->name = "Realtek ALC285"; if (this->subid == 0x229217aa) /* Thinkpad X1 Carbon 7 */ - this->qrks |= AZ_QRK_WID_SPKR2_DAC; + this->qrks |= AZ_QRK_ROUTE_SPKR2_DAC; break; case 0x10ec0292: this->name = "Realtek ALC292"; @@ -162,7 +162,7 @@ azalia_codec_init_vtbl(codec_t *this) this->name = "Realtek ALC298"; if (this->subid == 0x320019e5 || this->subid == 0x320119e5) /* Huawei Matebook X */ - this->qrks |= AZ_QRK_WID_DOLBY_ATMOS; + this->qrks |= AZ_QRK_DOLBY_ATMOS; break; case 0x10ec0660: this->name = "Realtek ALC660"; |