* [PATCH] Add support for Audigy2LS on MSI motherboard.
@ 2005-02-13 0:45 James Courtier-Dutton
2005-02-13 12:05 ` James Courtier-Dutton
0 siblings, 1 reply; 3+ messages in thread
From: James Courtier-Dutton @ 2005-02-13 0:45 UTC (permalink / raw)
To: ALSA development
[-- Attachment #1: Type: text/plain, Size: 82 bytes --]
Fixes Bug #0901
Signed off by: James Courtier-Dutton <James@superbug.demon.co.uk>
[-- Attachment #2: ca0106-msi-audigyls-fix.diff.txt --]
[-- Type: text/plain, Size: 2669 bytes --]
Index: alsa-driver/alsa-kernel/pci/ca0106/ca0106_main.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ca0106/ca0106_main.c,v
retrieving revision 1.3
diff -u -r1.3 ca0106_main.c
--- alsa-driver/alsa-kernel/pci/ca0106/ca0106_main.c 4 Jan 2005 13:55:46 -0000 1.3
+++ alsa-driver/alsa-kernel/pci/ca0106/ca0106_main.c 13 Feb 2005 00:25:42 -0000
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
* Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit
- * Version: 0.0.21
+ * Version: 0.0.22
*
* FEATURES currently supported:
* Front, Rear and Center/LFE.
@@ -75,6 +75,8 @@
* 0.0.21
* Add 4 capture channels. (SPDIF only comes in on channel 0. )
* Add SPDIF capture using optional digital I/O module for SB Live 24bit. (Analog capture does not yet work.)
+ * 0.0.22
+ * Add support for MSI Audigy2LS. From kiksen, bug #0901.
*
* BUGS:
* Some stability problems when unloading the snd-ca0106 kernel module.
@@ -169,6 +171,7 @@
{ 0x10051102, "AudigyLS [SB0310b]"} , /* Unknown AudigyLS that also says SB0310 on it */
{ 0x10061102, "Live! 7.1 24bit [SB0410]"} , /* New Sound Blaster Live! 7.1 24bit. This does not have an AC97. 53SB041000001 */
{ 0x10071102, "Live! 7.1 24bit [SB0413]"} , /* New Dell Sound Blaster Live! 7.1 24bit. This does not have an AC97. */
+ { 0x10091462, "Live! by MSI [SB0438]"}, /* MSI SB Audigy2LS without AC97 */
{ 0, "AudigyLS [Unknown]" }
};
@@ -1133,7 +1136,9 @@
snd_ca0106_ptr_write(chip, CAPTURE_SOURCE, 0x0, 0x333300e4); /* Select MIC, Line in, TAD in, AUX in */
chip->capture_source = 3; /* Set CAPTURE_SOURCE */
- if ((chip->serial == 0x10061102) || (chip->serial == 0x10071102) ) { /* The SB0410 and SB0413 use GPIO differently. */
+ if ((chip->serial == 0x10061102) ||
+ (chip->serial == 0x10071102) ||
+ (chip->serial == 0x10091462)) { /* The SB0410 and SB0413 use GPIO differently. */
/* FIXME: Still need to find out what the other GPIO bits do. E.g. For digital spdif out. */
outl(0x0, chip->port+GPIO);
//outl(0x00f0e000, chip->port+GPIO); /* Analog */
@@ -1200,7 +1205,9 @@
snd_card_free(card);
return err;
}
- if ((chip->serial != 0x10061102) && (chip->serial != 0x10071102) ) { /* The SB0410 and SB0413 do not have an ac97 chip. */
+ if ((chip->serial != 0x10061102) &&
+ (chip->serial != 0x10071102) &&
+ (chip->serial != 0x10091462) ) { /* The SB0410 and SB0413 do not have an ac97 chip. */
if ((err = snd_ca0106_ac97(chip)) < 0) {
snd_card_free(card);
return err;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Add support for Audigy2LS on MSI motherboard.
2005-02-13 0:45 [PATCH] Add support for Audigy2LS on MSI motherboard James Courtier-Dutton
@ 2005-02-13 12:05 ` James Courtier-Dutton
2005-02-14 15:35 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: James Courtier-Dutton @ 2005-02-13 12:05 UTC (permalink / raw)
To: James Courtier-Dutton; +Cc: ALSA development
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
Updated patch, using different name.
Fixes Bug #0901
Signed off by: James Courtier-Dutton <James@superbug.demon.co.uk>
James Courtier-Dutton wrote:
> Fixes Bug #0901
> Signed off by: James Courtier-Dutton <James@superbug.demon.co.uk>
>
>
[-- Attachment #2: ca0106-msi-sblive24-fix.diff.txt --]
[-- Type: text/plain, Size: 2765 bytes --]
Index: alsa-driver/alsa-kernel/pci/ca0106/ca0106_main.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ca0106/ca0106_main.c,v
retrieving revision 1.3
diff -u -r1.3 ca0106_main.c
--- alsa-driver/alsa-kernel/pci/ca0106/ca0106_main.c 4 Jan 2005 13:55:46 -0000 1.3
+++ alsa-driver/alsa-kernel/pci/ca0106/ca0106_main.c 13 Feb 2005 11:45:39 -0000
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
* Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit
- * Version: 0.0.21
+ * Version: 0.0.22
*
* FEATURES currently supported:
* Front, Rear and Center/LFE.
@@ -75,6 +75,8 @@
* 0.0.21
* Add 4 capture channels. (SPDIF only comes in on channel 0. )
* Add SPDIF capture using optional digital I/O module for SB Live 24bit. (Analog capture does not yet work.)
+ * 0.0.22
+ * Add support for MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97. From kiksen, bug #901
*
* BUGS:
* Some stability problems when unloading the snd-ca0106 kernel module.
@@ -169,6 +171,7 @@
{ 0x10051102, "AudigyLS [SB0310b]"} , /* Unknown AudigyLS that also says SB0310 on it */
{ 0x10061102, "Live! 7.1 24bit [SB0410]"} , /* New Sound Blaster Live! 7.1 24bit. This does not have an AC97. 53SB041000001 */
{ 0x10071102, "Live! 7.1 24bit [SB0413]"} , /* New Dell Sound Blaster Live! 7.1 24bit. This does not have an AC97. */
+ { 0x10091462, "MSI K8N Diamond MB [SB0438]"}, /* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */
{ 0, "AudigyLS [Unknown]" }
};
@@ -1133,7 +1136,9 @@
snd_ca0106_ptr_write(chip, CAPTURE_SOURCE, 0x0, 0x333300e4); /* Select MIC, Line in, TAD in, AUX in */
chip->capture_source = 3; /* Set CAPTURE_SOURCE */
- if ((chip->serial == 0x10061102) || (chip->serial == 0x10071102) ) { /* The SB0410 and SB0413 use GPIO differently. */
+ if ((chip->serial == 0x10061102) ||
+ (chip->serial == 0x10071102) ||
+ (chip->serial == 0x10091462)) { /* The SB0410 and SB0413 use GPIO differently. */
/* FIXME: Still need to find out what the other GPIO bits do. E.g. For digital spdif out. */
outl(0x0, chip->port+GPIO);
//outl(0x00f0e000, chip->port+GPIO); /* Analog */
@@ -1200,7 +1205,9 @@
snd_card_free(card);
return err;
}
- if ((chip->serial != 0x10061102) && (chip->serial != 0x10071102) ) { /* The SB0410 and SB0413 do not have an ac97 chip. */
+ if ((chip->serial != 0x10061102) &&
+ (chip->serial != 0x10071102) &&
+ (chip->serial != 0x10091462) ) { /* The SB0410 and SB0413 do not have an ac97 chip. */
if ((err = snd_ca0106_ac97(chip)) < 0) {
snd_card_free(card);
return err;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Add support for Audigy2LS on MSI motherboard.
2005-02-13 12:05 ` James Courtier-Dutton
@ 2005-02-14 15:35 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2005-02-14 15:35 UTC (permalink / raw)
To: James Courtier-Dutton; +Cc: ALSA development
At Sun, 13 Feb 2005 12:05:33 +0000,
James Courtier-Dutton wrote:
>
> Updated patch, using different name.
>
> Fixes Bug #0901
> Signed off by: James Courtier-Dutton <James@superbug.demon.co.uk>
Applied. Thanks!
Takashi
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-02-14 15:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-02-13 0:45 [PATCH] Add support for Audigy2LS on MSI motherboard James Courtier-Dutton
2005-02-13 12:05 ` James Courtier-Dutton
2005-02-14 15:35 ` 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.