Skip to contentSkip to conversation

ALSA: ctxfi: Add SB046x PCI ID

PATCH In review Edward Matijevic 2 participants 4 messages May 21, 2022 – May 23, 2022 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: ctxfi: Add SB046x PCI ID

Adds the PCI ID for X-Fi cards sold under the Platnum and XtremeMusic names

Before: snd_ctxfi 0000:05:05.0: chip 20K1 model Unknown (1102:0021) is found
After: snd_ctxfi 0000:05:05.0: chip 20K1 model SB046x (1102:0021) is found

---
 sound/pci/ctxfi/ctatc.c      | 2 ++
 sound/pci/ctxfi/cthardware.h | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
sound/pci/ctxfi/ctatc.c +2 -0
index 78f35e88aed6..fbdb8a3d5b8e 100644
@@ -36,6 +36,7 @@
 			    | ((IEC958_AES3_CON_FS_48000) << 24))
 
 static const struct snd_pci_quirk subsys_20k1_list[] = {
+	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0021, "SB046x", CTSB046X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0022, "SB055x", CTSB055X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X),
@@ -64,6 +65,7 @@ static const struct snd_pci_quirk subsys_20k2_list[] = {
 
 static const char *ct_subsys_name[NUM_CTCARDS] = {
 	/* 20k1 models */
+	[CTSB046X]	= "SB046x",
 	[CTSB055X]	= "SB055x",
 	[CTSB073X]	= "SB073x",
 	[CTUAA]		= "UAA",
sound/pci/ctxfi/cthardware.h +2 -1
index f406b626a28c..2875cec83b8f 100644
@@ -26,8 +26,9 @@ enum CHIPTYP {
 
 enum CTCARDS {
 	/* 20k1 models */
+	CTSB046X,
+	CT20K1_MODEL_FIRST = CTSB046X,
 	CTSB055X,
-	CT20K1_MODEL_FIRST = CTSB055X,
 	CTSB073X,
 	CTUAA,
 	CT20K1_UNKNOWN,
Signature · 1 line
2.36.1
#1 lore raw
Quoted 7 lines · Edward Matijevic

Adds the PCI ID for X-Fi cards sold under the Platnum and XtremeMusic names

Before: snd_ctxfi 0000:05:05.0: chip 20K1 model Unknown (1102:0021) is found
After: snd_ctxfi 0000:05:05.0: chip 20K1 model SB046x (1102:0021) is found

Does / did everything work as expected? The model field influence on a few device-specific setups such as the GPIO initial value, ADC and DAC selections, not only the name string.

thanks,

Takashi

Quoted 43 lines
---
 sound/pci/ctxfi/ctatc.c      | 2 ++
 sound/pci/ctxfi/cthardware.h | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
sound/pci/ctxfi/ctatc.c +2 -0
index 78f35e88aed6..fbdb8a3d5b8e 100644
@@ -36,6 +36,7 @@
 			    | ((IEC958_AES3_CON_FS_48000) << 24))
 
 static const struct snd_pci_quirk subsys_20k1_list[] = {
+	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0021, "SB046x", CTSB046X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0022, "SB055x", CTSB055X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X),
@@ -64,6 +65,7 @@ static const struct snd_pci_quirk subsys_20k2_list[] = {
 
 static const char *ct_subsys_name[NUM_CTCARDS] = {
 	/* 20k1 models */
+	[CTSB046X]	= "SB046x",
 	[CTSB055X]	= "SB055x",
 	[CTSB073X]	= "SB073x",
 	[CTUAA]		= "UAA",
sound/pci/ctxfi/cthardware.h +2 -1
index f406b626a28c..2875cec83b8f 100644
@@ -26,8 +26,9 @@ enum CHIPTYP {
 
 enum CTCARDS {
 	/* 20k1 models */
+	CTSB046X,
+	CT20K1_MODEL_FIRST = CTSB046X,
 	CTSB055X,
-	CT20K1_MODEL_FIRST = CTSB055X,
 	CTSB073X,
 	CTUAA,
 	CT20K1_UNKNOWN,
Signature · 1 line
2.36.1
#2 lore raw
Quoted 8 lines · Takashi Iwai
Quoted 6 lines · Edward Matijevic

Adds the PCI ID for X-Fi cards sold under the Platnum and XtremeMusic names

Before: snd_ctxfi 0000:05:05.0: chip 20K1 model Unknown (1102:0021) is found
After: snd_ctxfi 0000:05:05.0: chip 20K1 model SB046x (1102:0021) is found

Quoted 8 lines

Does / did everything work as expected? The model field influence on a few device-specific setups such as the GPIO initial value, ADC and DAC selections, not only the name string.

thanks,

Takashi

When first wrote the patch years ago I still had audio output with this patch and the cards with that ID are already using the default cases/values in cthw20k1.c so adding the name is just a cosmetic change so it no longer says "Unknown"

Quoted 43 lines
Quoted 43 lines
---
 sound/pci/ctxfi/ctatc.c      | 2 ++
 sound/pci/ctxfi/cthardware.h | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
sound/pci/ctxfi/ctatc.c +2 -0
index 78f35e88aed6..fbdb8a3d5b8e 100644
@@ -36,6 +36,7 @@
 			    | ((IEC958_AES3_CON_FS_48000) << 24))
 
 static const struct snd_pci_quirk subsys_20k1_list[] = {
+	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0021, "SB046x", CTSB046X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0022, "SB055x", CTSB055X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X),
@@ -64,6 +65,7 @@ static const struct snd_pci_quirk subsys_20k2_list[] = {
 
 static const char *ct_subsys_name[NUM_CTCARDS] = {
 	/* 20k1 models */
+	[CTSB046X]	= "SB046x",
 	[CTSB055X]	= "SB055x",
 	[CTSB073X]	= "SB073x",
 	[CTUAA]		= "UAA",
sound/pci/ctxfi/cthardware.h +2 -1
index f406b626a28c..2875cec83b8f 100644
@@ -26,8 +26,9 @@ enum CHIPTYP {
 
 enum CTCARDS {
 	/* 20k1 models */
+	CTSB046X,
+	CT20K1_MODEL_FIRST = CTSB046X,
 	CTSB055X,
-	CT20K1_MODEL_FIRST = CTSB055X,
 	CTSB073X,
 	CTUAA,
 	CT20K1_UNKNOWN,
Signature · 1 line
2.36.1
#3 lore raw
Quoted 15 lines · On Sat, 21 May 2022 13:31:02 +0200, Edward MatijeviH7 wrote:
Quoted 13 lines · Takashi Iwai
Quoted 6 lines · Edward Matijevic

Adds the PCI ID for X-Fi cards sold under the Platnum and XtremeMusic names

Before: snd_ctxfi 0000:05:05.0: chip 20K1 model Unknown (1102:0021) is found
After: snd_ctxfi 0000:05:05.0: chip 20K1 model SB046x (1102:0021) is found

Does / did everything work as expected? The model field influence on a few device-specific setups such as the GPIO initial value, ADC and DAC selections, not only the name string.

Quoted 7 lines
Quoted 3 lines

thanks,

Takashi

When first wrote the patch years ago I still had audio output with this patch and the cards with that ID are already using the default cases/values in cthw20k1.c so adding the name is just a cosmetic change so it no longer says "Unknown"

OK, now I applied with a bit more comment.

thanks,

Takashi