* [PATCH] ALSA: ctxfi: Add SB046x PCI ID
@ 2022-05-21 4:45 Edward Matijevic
2022-05-21 10:39 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Edward Matijevic @ 2022-05-21 4:45 UTC (permalink / raw)
To: alsa-devel
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
Signed-off-by: Edward Matijevic <motolav@gmail.com>
---
sound/pci/ctxfi/ctatc.c | 2 ++
sound/pci/ctxfi/cthardware.h | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index 78f35e88aed6..fbdb8a3d5b8e 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -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",
diff --git a/sound/pci/ctxfi/cthardware.h b/sound/pci/ctxfi/cthardware.h
index f406b626a28c..2875cec83b8f 100644
--- a/sound/pci/ctxfi/cthardware.h
+++ b/sound/pci/ctxfi/cthardware.h
@@ -26,8 +26,9 @@ enum CHIPTYP {
enum CTCARDS {
/* 20k1 models */
+ CTSB046X,
+ CT20K1_MODEL_FIRST = CTSB046X,
CTSB055X,
- CT20K1_MODEL_FIRST = CTSB055X,
CTSB073X,
CTUAA,
CT20K1_UNKNOWN,
--
2.36.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ALSA: ctxfi: Add SB046x PCI ID
2022-05-21 4:45 [PATCH] ALSA: ctxfi: Add SB046x PCI ID Edward Matijevic
@ 2022-05-21 10:39 ` Takashi Iwai
2022-05-21 11:31 ` Edward Matijević
0 siblings, 1 reply; 4+ messages in thread
From: Takashi Iwai @ 2022-05-21 10:39 UTC (permalink / raw)
To: Edward Matijevic; +Cc: alsa-devel
On Sat, 21 May 2022 06:45:15 +0200,
Edward Matijevic wrote:
>
> 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
>
> Signed-off-by: Edward Matijevic <motolav@gmail.com>
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
> ---
> sound/pci/ctxfi/ctatc.c | 2 ++
> sound/pci/ctxfi/cthardware.h | 3 ++-
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
> index 78f35e88aed6..fbdb8a3d5b8e 100644
> --- a/sound/pci/ctxfi/ctatc.c
> +++ b/sound/pci/ctxfi/ctatc.c
> @@ -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",
> diff --git a/sound/pci/ctxfi/cthardware.h b/sound/pci/ctxfi/cthardware.h
> index f406b626a28c..2875cec83b8f 100644
> --- a/sound/pci/ctxfi/cthardware.h
> +++ b/sound/pci/ctxfi/cthardware.h
> @@ -26,8 +26,9 @@ enum CHIPTYP {
>
> enum CTCARDS {
> /* 20k1 models */
> + CTSB046X,
> + CT20K1_MODEL_FIRST = CTSB046X,
> CTSB055X,
> - CT20K1_MODEL_FIRST = CTSB055X,
> CTSB073X,
> CTUAA,
> CT20K1_UNKNOWN,
> --
> 2.36.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ALSA: ctxfi: Add SB046x PCI ID
2022-05-21 10:39 ` Takashi Iwai
@ 2022-05-21 11:31 ` Edward Matijević
2022-05-23 7:47 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Edward Matijević @ 2022-05-21 11:31 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel
On 5/21/22 05:39, Takashi Iwai wrote:
> On Sat, 21 May 2022 06:45:15 +0200,
> Edward Matijevic wrote:
>> 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
>>
>> Signed-off-by: Edward Matijevic <motolav@gmail.com>
> 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"
>> ---
>> sound/pci/ctxfi/ctatc.c | 2 ++
>> sound/pci/ctxfi/cthardware.h | 3 ++-
>> 2 files changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
>> index 78f35e88aed6..fbdb8a3d5b8e 100644
>> --- a/sound/pci/ctxfi/ctatc.c
>> +++ b/sound/pci/ctxfi/ctatc.c
>> @@ -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",
>> diff --git a/sound/pci/ctxfi/cthardware.h b/sound/pci/ctxfi/cthardware.h
>> index f406b626a28c..2875cec83b8f 100644
>> --- a/sound/pci/ctxfi/cthardware.h
>> +++ b/sound/pci/ctxfi/cthardware.h
>> @@ -26,8 +26,9 @@ enum CHIPTYP {
>>
>> enum CTCARDS {
>> /* 20k1 models */
>> + CTSB046X,
>> + CT20K1_MODEL_FIRST = CTSB046X,
>> CTSB055X,
>> - CT20K1_MODEL_FIRST = CTSB055X,
>> CTSB073X,
>> CTUAA,
>> CT20K1_UNKNOWN,
>> --
>> 2.36.1
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ALSA: ctxfi: Add SB046x PCI ID
2022-05-21 11:31 ` Edward Matijević
@ 2022-05-23 7:47 ` Takashi Iwai
0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2022-05-23 7:47 UTC (permalink / raw)
To: Edward MatijeviH7; +Cc: alsa-devel
On Sat, 21 May 2022 13:31:02 +0200,
Edward MatijeviH7 wrote:
>
> On 5/21/22 05:39, Takashi Iwai wrote:
> > On Sat, 21 May 2022 06:45:15 +0200,
> > Edward Matijevic wrote:
> >> 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
> >>
> >> Signed-off-by: Edward Matijevic <motolav@gmail.com>
> > 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"
OK, now I applied with a bit more comment.
thanks,
Takashi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-23 7:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-21 4:45 [PATCH] ALSA: ctxfi: Add SB046x PCI ID Edward Matijevic
2022-05-21 10:39 ` Takashi Iwai
2022-05-21 11:31 ` Edward Matijević
2022-05-23 7:47 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.