date:20030901

[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 aureon.c,1.2,1.3

2003-09-01 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1:/tmp/cvs-serv6609

Modified Files:
aureon.c 
Log Message:
fixed the SPDIF bit on aureon boards.
spdif out should work now.



Index: aureon.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/aureon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aureon.c18 Jun 2003 11:09:40 -  1.2
+++ aureon.c1 Sep 2003 09:20:56 -   1.3
@@ -457,7 +457,7 @@
0x12,   /* SYSCONF: clock 512, mpu401, spdif-in/ADC, 3DACs */
0x80,   /* ACLINK: I2S */
0xf8,   /* I2S: vol, 96k, 24bit, 192k */
-   0xc2,   /* SPDIF: out-en, out-int, spdif-in */
+   0xc3,   /* SPDIF: out-en, out-int, spdif-in */
0xff,   /* GPIO_DIR */
0xff,   /* GPIO_DIR1 */
0xbf,   /* GPIO_DIR2 */
@@ -473,7 +473,7 @@
0x13,   /* SYSCONF: clock 512, mpu401, spdif-in/ADC, 4DACs */
0x80,   /* ACLINK: I2S */
0xf8,   /* I2S: vol, 96k, 24bit, 192k */
-   0xc2,   /* SPDIF: out-en, out-int, spdif-in */
+   0xc3,   /* SPDIF: out-en, out-int, spdif-in */
0xff,   /* GPIO_DIR */
0xff,   /* GPIO_DIR1 */
0xbf,   /* GPIO_DIR2 */



---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/include ac97_codec.h,1.33,1.34

2003-09-01 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv11562/include

Modified Files:
ac97_codec.h 
Log Message:
James Courtier-Dutton [EMAIL PROTECTED]:
- enabled SPDIF input of ALC650.



Index: ac97_codec.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/ac97_codec.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ac97_codec.h28 Aug 2003 15:36:44 -  1.33
+++ ac97_codec.h1 Sep 2003 09:53:26 -   1.34
@@ -214,11 +214,46 @@
 #define AC97_CXR_SPDIF_AC3 0x2
 
 /* specific - ALC */
+#define AC97_ALC650_SPDIF_INPUT_STATUS10x60
+/* S/PDIF input status 1 bit defines */
+#define AC97_ALC650_PRO 0x0001  /* Professional status */
+#define AC97_ALC650_NAUDIO  0x0002  /* Non audio stream */
+#define AC97_ALC650_COPY0x0004  /* Copyright status */
+#define AC97_ALC650_PRE 0x0038  /* Preemphasis status */
+#define AC97_ALC650_PRE_SHIFT   3
+#define AC97_ALC650_MODE0x00C0  /* Preemphasis status */
+#define AC97_ALC650_MODE_SHIFT  6
+#define AC97_ALC650_CC_MASK 0x7f00  /* Category Code mask */
+#define AC97_ALC650_CC_SHIFT8
+#define AC97_ALC650_L   0x8000  /* Generation Level status */
+
+#define AC97_ALC650_SPDIF_INPUT_STATUS20x62
+/* S/PDIF input status 2 bit defines */
+#define AC97_ALC650_SOUCE_MASK  0x000f  /* Source number */
+#define AC97_ALC650_CHANNEL_MASK0x00f0  /* Channel number */
+#define AC97_ALC650_CHANNEL_SHIFT   4 
+#define AC97_ALC650_SPSR_MASK   0x0f00  /* S/PDIF Sample Rate bits */
+#define AC97_ALC650_SPSR_SHIFT  8
+#define AC97_ALC650_SPSR_44K0x  /* Use 44.1kHz Sample rate */
+#define AC97_ALC650_SPSR_48K0x0200  /* Use 48kHz Sample rate */
+#define AC97_ALC650_SPSR_32K0x0300  /* Use 32kHz Sample rate */
+#define AC97_ALC650_CLOCK_ACCURACY  0x3000  /* Clock accuracy */
+#define AC97_ALC650_CLOCK_SHIFT 12
+#define AC97_ALC650_CLOCK_LOCK  0x4000  /* Clock locked status */
+#define AC97_ALC650_V   0x8000  /* Validity status */
+
 #define AC97_ALC650_SURR_DAC_VOL   0x64
 #define AC97_ALC650_LFE_DAC_VOL0x66
-#define AC97_ALC650_MULTICH0x6a
-#define AC97_ALC650_REVISION0x6e
-#define AC97_ALC650_CLOCK  0x7a
+#define AC97_ALC650_UNKNOWN1   0x68
+#define AC97_ALC650_MULTICH0x6a
+#define AC97_ALC650_UNKNOWN2   0x6c
+#define AC97_ALC650_REVISION   0x6e
+#define AC97_ALC650_UNKNOWN3   0x70
+#define AC97_ALC650_UNKNOWN4   0x72
+#define AC97_ALC650_MISC   0x74
+#define AC97_ALC650_GPIO_SETUP 0x76
+#define AC97_ALC650_GPIO_STATUS0x78
+#define AC97_ALC650_CLOCK  0x7a
 
 /* specific - Yamaha YMF753 */
 #define AC97_YMF753_DIT_CTRL2  0x66/* DIT Control 2 */



---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_patch.c,1.21,1.22 ac97_proc.c,1.1,1.2

2003-09-01 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv11562/pci/ac97

Modified Files:
ac97_patch.c ac97_proc.c 
Log Message:
James Courtier-Dutton [EMAIL PROTECTED]:
- enabled SPDIF input of ALC650.



Index: ac97_patch.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ac97_patch.c28 Aug 2003 15:36:44 -  1.21
+++ ac97_patch.c1 Sep 2003 09:53:26 -   1.22
@@ -915,6 +915,9 @@
}
 
if (spdif) {
+   /* enable AC97_ALC650_GPIO_SETUP, AC97_ALC650_CLOCK for R/W */
+   snd_ac97_write_cache(ac97, AC97_ALC650_GPIO_STATUS, 
+   snd_ac97_read(ac97, AC97_ALC650_GPIO_STATUS) | 0x8000);
/* enable spdif in */
snd_ac97_write_cache(ac97, AC97_ALC650_CLOCK,
 snd_ac97_read(ac97, AC97_ALC650_CLOCK) | 0x03);
@@ -930,18 +933,18 @@
int mic_off;
mic_off = snd_ac97_read(ac97, AC97_ALC650_MULTICH)  (1  10);
/* GPIO0 direction */
-   val = snd_ac97_read(ac97, 0x76);
+   val = snd_ac97_read(ac97, AC97_ALC650_GPIO_SETUP);
if (mic_off)
val = ~0x01;
else
val |= 0x01;
-   snd_ac97_write_cache(ac97, 0x76, val);
-   val = snd_ac97_read(ac97, 0x78);
+   snd_ac97_write_cache(ac97, AC97_ALC650_GPIO_SETUP, val);
+   val = snd_ac97_read(ac97, AC97_ALC650_GPIO_STATUS);
if (mic_off)
val = ~0x100;
else
val = val | 0x100;
-   snd_ac97_write_cache(ac97, 0x78, val);
+   snd_ac97_write_cache(ac97, AC97_ALC650_GPIO_STATUS, val);
}
 
/* full DAC volume */

Index: ac97_proc.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_proc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ac97_proc.c 17 Jun 2003 18:43:32 -  1.1
+++ ac97_proc.c 1 Sep 2003 09:53:26 -   1.2
@@ -151,7 +151,7 @@
snd_iprintf(buffer, SPDIF Control:%s%s%s%s Category=0x%x 
Generation=%i%s%s%s\n,
val  AC97_SC_PRO ?  PRO :  Consumer,
val  AC97_SC_NAUDIO ?  Non-audio :  PCM,
-   val  AC97_SC_COPY ?  Copyright : ,
+   val  AC97_SC_COPY ?  :  Copyright,
val  AC97_SC_PRE ?  Preemph50/15 : ,
(val  AC97_SC_CC_MASK)  AC97_SC_CC_SHIFT,
(val  AC97_SC_L)  11,
@@ -164,7 +164,31 @@
(ac97-flags  AC97_CS_SPDIF) ?
(val  AC97_SC_V ?  Enabled : ) :
(val  AC97_SC_V ?  Validity : ));
+   /* ALC650 specific*/
+   if ((ac97-id  0xfff0) == 0x414c4720 
+   (snd_ac97_read(ac97, AC97_ALC650_CLOCK)  0x01)) {
+   val = snd_ac97_read(ac97, AC97_ALC650_SPDIF_INPUT_STATUS2);
+   if (val  AC97_ALC650_CLOCK_LOCK) {
+   val = snd_ac97_read(ac97, 
AC97_ALC650_SPDIF_INPUT_STATUS1);
+   snd_iprintf(buffer, SPDIF In Status  :%s%s%s%s 
Category=0x%x Generation=%i,
+   val  AC97_ALC650_PRO ?  PRO :  
Consumer,
+   val  AC97_ALC650_NAUDIO ?  Non-audio : 
 PCM,
+   val  AC97_ALC650_COPY ?  :  Copyright,
+   val  AC97_ALC650_PRE ?  Preemph50/15 : 
,
+   (val  AC97_ALC650_CC_MASK)  
AC97_ALC650_CC_SHIFT,
+   (val  AC97_ALC650_L)  15);
+   val = snd_ac97_read(ac97, 
AC97_ALC650_SPDIF_INPUT_STATUS2);
+   snd_iprintf(buffer, %s Accuracy=%i%s%s\n,
+   spdif_rates[(val  AC97_ALC650_SPSR_MASK) 
 AC97_ALC650_SPSR_SHIFT],
+   (val  AC97_ALC650_CLOCK_ACCURACY)  
AC97_ALC650_CLOCK_SHIFT,
+   (val  AC97_ALC650_CLOCK_LOCK ?  Locked 
:  Unlocked),
+   (val  AC97_ALC650_V ?  Validity? : ));
+   } else {
+   snd_iprintf(buffer, SPDIF In Status  : Not Locked\n);
+   }
+   }
}
+
 
   __modem:
mext = snd_ac97_read(ac97, AC97_EXTENDED_MID);



---
This sf.net email is sponsored by:ThinkGeek
Welcome

[alsa-cvslog] CVS: alsa-driver configure.in,1.187,1.188

2003-09-01 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1:/tmp/cvs-serv1669

Modified Files:
configure.in 
Log Message:
fixed the modification of linux/kmod.h.



Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- configure.in19 Aug 2003 06:58:43 -  1.187
+++ configure.in1 Sep 2003 15:18:57 -   1.188
@@ -319,7 +319,7 @@
 
 AC_DEFUN(MODIFY_KERNEL_HEADER, [
   AC_MSG_CHECKING(to modify of kernel $1)
-  if grep $2 $CONFIG_SND_KERNELDIR/include/$1  /dev/null; then
+  if grep $2 $CONFIG_SND_KERNELDIR/include/$1  /dev/null 21; then
 AC_MSG_RESULT(no)
 if test -f include/$1; then
   echo Removing a dummy $1.
@@ -327,6 +327,8 @@
 fi
   else
 AC_MSG_RESULT(yes)
+mkdir -p include/linux
+mkdir -p include/asm
 echo #ifndef $2  include/$1
 echo #define $2  include/$1
 cat $CONFIG_SND_KERNELDIR/include/$1  include/$1



---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 aureon.c,1.2,1.3

[alsa-cvslog] CVS: alsa-kernel/include ac97_codec.h,1.33,1.34

[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_patch.c,1.21,1.22 ac97_proc.c,1.1,1.2

[alsa-cvslog] CVS: alsa-driver configure.in,1.187,1.188

4 matches

Site Navigation

Mail list logo

Footer information