superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: ctxfi: Rename SPDIFI1 to SPDIFI_BAY 

Rename the SPDIFI1 enum value to SPDIFI_BAY to better reflect its
purpose as the S/PDIF input on the internal drive bay, as opposed to
the S/PDIF input via Flexijack or optical (SPDIFIO; not SPDIFI-zero).

Signed-off-by: Harin Lee <me@harin.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20260401090159.2404387-2-me@harin.net
master
Harin Lee 2026-04-01 18:01:57 +09:00 committed by Takashi Iwai
parent 0542972950
commit c6cd83ccee
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/pci/ctxfi/ctatc.c
View File

@ -1429,10 +1429,10 @@ static int atc_get_resources(struct ct_atc *atc)
for (i = 0; i < NUM_DAIOTYP; i++) {
if (((i == MIC) && !cap.dedicated_mic) ||
((i == RCA) && !cap.dedicated_rca) ||
i == SPDIFI1)
i == SPDIFI_BAY)
continue;
if (atc->model == CTSB073X && i == SPDIFIO)
da_desc.type = SPDIFI1;
da_desc.type = SPDIFI_BAY;
else
da_desc.type = i;
da_desc.output = (i < LINEIM) || (i == RCA);

6
sound/pci/ctxfi/ctdaio.c
View File

@ -35,7 +35,7 @@ static const struct daio_rsc_idx idx_20k1[NUM_DAIOTYP] = {
[LINEIM] = {.left = 0x1b5, .right = 0x1bd},
[SPDIFOO] = {.left = 0x20, .right = 0x21},
[SPDIFIO] = {.left = 0x15, .right = 0x1d},
[SPDIFI1] = {.left = 0x95, .right = 0x9d},
[SPDIFI_BAY] = {.left = 0x95, .right = 0x9d},
};
static const struct daio_rsc_idx idx_20k2[NUM_DAIOTYP] = {
@ -106,7 +106,7 @@ static int daio_device_index(enum DAIOTYP type, struct hw *hw)
switch (type) {
case SPDIFOO: return 0;
case SPDIFIO: return 0;
case SPDIFI1: return 1;
case SPDIFI_BAY: return 1;
case LINEO1: return 4;
case LINEO2: return 7;
case LINEO3: return 5;
@ -120,7 +120,7 @@ static int daio_device_index(enum DAIOTYP type, struct hw *hw)
switch (type) {
case SPDIFOO: return 0;
case SPDIFIO: return 0;
case SPDIFI1: return 1;
case SPDIFI_BAY: return 1;
case LINEO1: return 4;
case LINEO2: return 7;
case LINEO3: return 5;

2
sound/pci/ctxfi/ctdaio.h
View File

@ -32,7 +32,7 @@ enum DAIOTYP {
SPDIFIO, /* S/PDIF In (Flexijack/Optical) on the card */
MIC, /* Dedicated mic on Titanium HD */
RCA, /* Dedicated RCA on SE-300PCIE */
SPDIFI1, /* S/PDIF In on internal Drive Bay */
SPDIFI_BAY, /* S/PDIF In on internal drive bay */
NUM_DAIOTYP
};