[alsa-cvslog] CVS: alsa-driver configure.in,1.183,1.184
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv28549 Modified Files: configure.in Log Message: 0.9.5 Index: configure.in === RCS file: /cvsroot/alsa/alsa-driver/configure.in,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- configure.in30 Jun 2003 13:33:51 - 1.183 +++ configure.in8 Jul 2003 08:21:01 - 1.184 @@ -4,7 +4,7 @@ AC_INIT(acore/sound.patch) AC_PREFIX_DEFAULT(/usr) -CONFIG_SND_VERSION=0.9.4 +CONFIG_SND_VERSION=0.9.5 dnl Checks for programs. AC_PROG_CC --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0016ave/direct;at.asp_061203_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib configure.in,1.108,1.109
Update of /cvsroot/alsa/alsa-lib
In directory sc8-pr-cvs1:/tmp/cvs-serv28637
Modified Files:
configure.in
Log Message:
0.9.5
Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-lib/configure.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- configure.in24 Jun 2003 19:30:08 - 1.108
+++ configure.in8 Jul 2003 08:21:21 - 1.109
@@ -8,7 +8,7 @@
dnl remove API = c+1:0:0
dnl *
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 0.9.4)
+AM_INIT_AUTOMAKE(alsa-lib, 0.9.5)
eval LIBTOOL_VERSION_INFO=2:0:0
dnl *
AM_CONDITIONAL(INSTALL_M4, test -n ${ACLOCAL})
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0016ave/direct;at.asp_061203_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include ad1848.h,1.8,1.9
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv13654/include
Modified Files:
ad1848.h
Log Message:
added the quirk for thinkpad 360/750/755 by Ryan Underwood [EMAIL PROTECTED]
- suspend/resume is implemented (only for thinkpad).
- use KERN_ERR prefix for error messages.
Index: ad1848.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/ad1848.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ad1848.h23 Apr 2003 10:01:29 - 1.8
+++ ad1848.h8 Jul 2003 10:41:05 - 1.9
@@ -120,6 +120,12 @@
#define AD1848_HW_AD1848 0x0002 /* AD1848 chip */
#define AD1848_HW_CS4248 0x0003 /* CS4248 chip */
#define AD1848_HW_CMI8330 0x0004 /* CMI8330 chip */
+#define AD1848_HW_THINKPAD 0x0005 /* Thinkpad 360/750/755 */
+
+/* IBM Thinkpad specific stuff */
+#define AD1848_THINKPAD_CTL_PORT1 0x15e8
+#define AD1848_THINKPAD_CTL_PORT2 0x15e9
+#define AD1848_THINKPAD_CS4248_ENABLE_BIT 0x02
struct _snd_ad1848 {
unsigned long port; /* i/o port */
@@ -140,6 +146,10 @@
int mce_bit;
int calibrate_mute;
int dma_size;
+ int thinkpad_flag; /* Thinkpad CS4248 needs some extra help */
+#ifdef CONFIG_PM
+ struct pm_dev *thinkpad_pmstate;
+#endif
spinlock_t reg_lock;
struct semaphore open_mutex;
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0016ave/direct;at.asp_061203_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/ad1848 ad1848.c,1.8,1.9 ad1848_lib.c,1.26,1.27
Update of /cvsroot/alsa/alsa-kernel/isa/ad1848
In directory sc8-pr-cvs1:/tmp/cvs-serv13654/isa/ad1848
Modified Files:
ad1848.c ad1848_lib.c
Log Message:
added the quirk for thinkpad 360/750/755 by Ryan Underwood [EMAIL PROTECTED]
- suspend/resume is implemented (only for thinkpad).
- use KERN_ERR prefix for error messages.
Index: ad1848.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/ad1848/ad1848.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ad1848.c21 Oct 2002 18:28:21 - 1.8
+++ ad1848.c8 Jul 2003 10:41:05 - 1.9
@@ -46,6 +46,7 @@
static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;/* PnP setup */
static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,11,12,15 */
static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3,5,6,7 */
+static int thinkpad[SNDRV_CARDS]; /* Thinkpad special case */
MODULE_PARM(index, 1- __MODULE_STRING(SNDRV_CARDS) i);
MODULE_PARM_DESC(index, Index value for AD1848 soundcard.);
@@ -65,6 +66,9 @@
MODULE_PARM(dma1, 1- __MODULE_STRING(SNDRV_CARDS) i);
MODULE_PARM_DESC(dma1, DMA1 # for AD1848 driver.);
MODULE_PARM_SYNTAX(dma1, SNDRV_DMA_DESC);
+MODULE_PARM(thinkpad, 1- __MODULE_STRING(SNDRV_CARDS) i);
+MODULE_PARM_DESC(thinkpad, Enable only for the onboard CS4248 of IBM Thinkpad
360/750/755 series.);
+MODULE_PARM_SYNTAX(thinkpad, SNDRV_ENABLED , SNDRV_BOOLEAN_FALSE_DESC);
static snd_card_t *snd_ad1848_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
@@ -77,15 +81,15 @@
int err;
if (port[dev] == SNDRV_AUTO_PORT) {
- snd_printk(specify port\n);
+ snd_printk(KERN_ERR ad1848: specify port\n);
return -EINVAL;
}
if (irq[dev] == SNDRV_AUTO_IRQ) {
- snd_printk(specify irq\n);
+ snd_printk(KERN_ERR ad1848: specify irq\n);
return -EINVAL;
}
if (dma1[dev] == SNDRV_AUTO_DMA) {
- snd_printk(specify dma1\n);
+ snd_printk(KERN_ERR ad1848: specify dma1\n);
return -EINVAL;
}
@@ -96,7 +100,7 @@
if ((err = snd_ad1848_create(card, port[dev],
irq[dev],
dma1[dev],
-AD1848_HW_DETECT,
+thinkpad[dev] ? AD1848_HW_THINKPAD :
AD1848_HW_DETECT,
chip)) 0) {
snd_card_free(card);
return err;
@@ -116,6 +120,10 @@
sprintf(card-longname, %s at 0x%lx, irq %d, dma %d,
pcm-name, chip-port, irq[dev], dma1[dev]);
+ if (thinkpad[dev]) {
+ strcat(card-longname, [Thinkpad]);
+ }
+
if ((err = snd_card_register(card)) 0) {
snd_card_free(card);
return err;
@@ -168,7 +176,8 @@
get_id(str,id[nr_dev]) == 2
get_option(str,(int *)port[nr_dev]) == 2
get_option(str,irq[nr_dev]) == 2
- get_option(str,dma1[nr_dev]) == 2);
+ get_option(str,dma1[nr_dev]) == 2
+ get_option(str,thinkpad[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: ad1848_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/ad1848/ad1848_lib.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ad1848_lib.c30 May 2003 12:28:34 - 1.26
+++ ad1848_lib.c8 Jul 2003 10:41:05 - 1.27
@@ -625,6 +625,95 @@
*/
+static void snd_ad1848_thinkpad_twiddle(ad1848_t *chip, int on) {
+
+ int tmp;
+
+ if (!chip-thinkpad_flag) return;
+
+ outb(0x1c, AD1848_THINKPAD_CTL_PORT1);
+ tmp = inb(AD1848_THINKPAD_CTL_PORT2);
+
+ switch (on) {
+ case 0: /* turn it off */
+ tmp = ~AD1848_THINKPAD_CS4248_ENABLE_BIT;
+ default: /* turn it on */
+ tmp |= AD1848_THINKPAD_CS4248_ENABLE_BIT;
+ }
+
+ outb(tmp, AD1848_THINKPAD_CTL_PORT2);
+
+}
+
+#ifdef CONFIG_PM
+static void snd_ad1848_suspend(ad1848_t *chip) {
+
+ snd_card_t *card = chip-card;
+
+ if (card-power_state == SNDRV_CTL_POWER_D3hot)
+ return;
+
+ snd_pcm_suspend_all(chip-pcm);
+ /* FIXME: save registers? */
+
+ if (chip-thinkpad_flag)
+ snd_ad1848_thinkpad_twiddle(chip, 0);
+
+ snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+}
+
+static void snd_ad1848_resume(ad1848_t *chip) {
+
+ snd_card_t *card = chip-card;
+
+ if (card-power_state == SNDRV_CTL_POWER_D0)
+ return;
+
+ if (chip-thinkpad_flag)
+ snd_ad1848_thinkpad_twiddle(chip, 1);
+
+ /* FIXME: restore registers? */
+
+ snd_power_change_state(card,
[alsa-cvslog] CVS: alsa-kernel/isa opl3sa2.c,1.26,1.27
Update of /cvsroot/alsa/alsa-kernel/isa In directory sc8-pr-cvs1:/tmp/cvs-serv13864/isa Modified Files: opl3sa2.c Log Message: fixed the order of function calls in suspend. Index: opl3sa2.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/opl3sa2.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- opl3sa2.c 9 May 2003 14:07:23 - 1.26 +++ opl3sa2.c 8 Jul 2003 10:41:34 - 1.27 @@ -552,9 +552,8 @@ if (card-power_state == SNDRV_CTL_POWER_D3hot) return; - /* FIXME: is this order ok? */ + snd_pcm_suspend_all(chip-cs4231-pcm); /* stop before saving regs */ chip-cs4231_suspend(chip-cs4231); - snd_pcm_suspend_all(chip-cs4231-pcm); /* power down */ snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D3); --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0016ave/direct;at.asp_061203_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/cs423x cs4231_lib.c,1.32,1.33
Update of /cvsroot/alsa/alsa-kernel/isa/cs423x
In directory sc8-pr-cvs1:/tmp/cvs-serv13897/isa/cs423x
Modified Files:
cs4231_lib.c
Log Message:
call snd_pcm_suspend_all() in suspend.
Index: cs4231_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4231_lib.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cs4231_lib.c30 Apr 2003 11:53:17 - 1.32
+++ cs4231_lib.c8 Jul 2003 10:42:09 - 1.33
@@ -1401,8 +1401,10 @@
switch (rqst) {
case PM_SUSPEND:
- if (chip-suspend)
+ if (chip-suspend) {
+ snd_pcm_suspend_all(chip-pcm);
(*chip-suspend)(chip);
+ }
break;
case PM_RESUME:
if (chip-resume)
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0016ave/direct;at.asp_061203_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/conf/cards VX222.conf,NONE,1.1 VXPocket.conf,NONE,1.1 VXPocket440.conf,NONE,1.1 Makefile.am,1.12,1.13
Update of /cvsroot/alsa/alsa-lib/src/conf/cards
In directory sc8-pr-cvs1:/tmp/cvs-serv14260
Modified Files:
Makefile.am
Added Files:
VX222.conf VXPocket.conf VXPocket440.conf
Log Message:
added config files for digigram cards.
--- NEW FILE: VX222.conf ---
#
# Configuration for Digigram VX222
#
confdir:pcm/front.conf
VX222.pcm.front.0 {
@args [ CARD ]
@args.CARD {
type string
}
type hw
card $CARD
device 0
}
confdir:pcm/iec958.conf
VX222.pcm.iec958.0 {
@args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD {
type string
}
@args.AES0 {
type integer
}
@args.AES1 {
type integer
}
@args.AES2 {
type integer
}
@args.AES3 {
type integer
}
type hooks
slave.pcm {
type hw
card $CARD
device 0
}
hooks.0 {
type ctl_elems
hook_args [
{
name IEC958 Playback Default
lock true
preserve true
value [ $AES0 $AES1 $AES2 $AES3 ]
}
]
}
}
--- NEW FILE: VXPocket.conf ---
#
# Configuration for Digigram VXpocket
#
confdir:pcm/front.conf
VXPocket.pcm.front.0 {
@args [ CARD ]
@args.CARD {
type string
}
type hw
card $CARD
device 0
}
confdir:pcm/iec958.conf
VXPocket.pcm.iec958.0 {
@args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD {
type string
}
@args.AES0 {
type integer
}
@args.AES1 {
type integer
}
@args.AES2 {
type integer
}
@args.AES3 {
type integer
}
type hooks
slave.pcm {
type hw
card $CARD
device 0
}
hooks.0 {
type ctl_elems
hook_args [
{
name IEC958 Playback Default
lock true
preserve true
value [ $AES0 $AES1 $AES2 $AES3 ]
}
]
}
}
--- NEW FILE: VXPocket440.conf ---
#
# Configuration for Digigram VXpocket440
#
confdir:pcm/front.conf
VXPocket440.pcm.front.0 {
@args [ CARD ]
@args.CARD {
type string
}
type hw
card $CARD
device 0
}
confdir:pcm/rear.conf
VXPocket440.pcm.rear.0 {
@args [ CARD ]
@args.CARD {
type string
}
type hw
card $CARD
device 1
}
confdir:pcm/surround40.conf
VXPocket440.pcm.surround40.0 {
@args [ CARD ]
@args.CARD {
type string
}
type multi
master 1
slaves [
{
pcm {
@func concat
strings [
cards.VXPocket440.pcm.front.0:CARD= $CARD
]
}
channels 2
}
{
pcm {
@func concat
strings [
cards.VXPocket440.pcm.rear.0:CARD= $CARD
]
}
channels 2
}
]
bindings [
{ slave 0 channel 0 }
{ slave 0 channel 1 }
{ slave 1 channel 0 }
{ slave 1 channel 1 }
]
}
confdir:pcm/iec958.conf
VXPocket440.pcm.iec958.0 {
@args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD {
type string
}
@args.AES0 {
type integer
}
@args.AES1 {
type integer
}
@args.AES2 {
type integer
}
@args.AES3 {
type integer
}
type hooks
slave.pcm {
type hw
card $CARD
device 0
}
hooks.0 {
type ctl_elems
hook_args [
{
name IEC958 Playback Default
lock true
preserve true
value [ $AES0 $AES1 $AES2 $AES3 ]
}
]
}
}
Index: Makefile.am
[alsa-cvslog] CVS: alsa-driver/pci/rme9652 hammerfall_mem.inc,1.1,NONE
Update of /cvsroot/alsa/alsa-driver/pci/rme9652 In directory sc8-pr-cvs1:/tmp/cvs-serv14428 Removed Files: hammerfall_mem.inc Log Message: removed unused file (snd-hammerfall-mem is replaced with snd-page-alloc). --- hammerfall_mem.inc DELETED --- --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0016ave/direct;at.asp_061203_01/01 ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/support/pnp pnp.c,1.10,1.11
Update of /cvsroot/alsa/alsa-driver/support/pnp
In directory sc8-pr-cvs1:/tmp/cvs-serv9068
Modified Files:
pnp.c
Log Message:
call isapnp prepare callback in pnp_manual_config_dev().
this ensures the sane device configuration and fixes the problem
of SBAWE cards.
Index: pnp.c
===
RCS file: /cvsroot/alsa/alsa-driver/support/pnp/pnp.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pnp.c 19 May 2003 08:24:51 - 1.10
+++ pnp.c 8 Jul 2003 13:37:40 - 1.11
@@ -319,9 +319,14 @@
}
}
+/* FIXME: this function cannot be called many times. the setting is cleared at each
time */
int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res, int
mode)
{
unsigned int idx;
+ int err;
+
+ /* prepare the isapnp */
+ err = dev-p.prepare((struct isapnp_dev *)dev);
for (idx = 0; idx PNP_MAX_IRQ; idx++)
copy_resource(dev-p.irq_resource[idx], res-irq_resource[idx]);
@@ -357,8 +362,6 @@
for (idx = 0; idx PNP_MAX_MEM; idx++)
copy_resource(tmp-mem_resource[idx], dev-p.resource[idx+8]);
- /* prepare the isapnp to get the range of resources */
- dev-p.prepare((struct isapnp_dev *)dev);
/* restore the manual configuration again */
pnp_manual_config_dev(dev, tmp, 0);
kfree(tmp);
---
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa0016ave/direct;at.asp_061203_01/01
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/ad1848 ad1848_lib.c,1.27,1.28
Update of /cvsroot/alsa/alsa-kernel/isa/ad1848
In directory sc8-pr-cvs1:/tmp/cvs-serv16310
Modified Files:
ad1848_lib.c
Log Message:
fixed thinkpad_twiddle(). it was handled as always on.
Index: ad1848_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/ad1848/ad1848_lib.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ad1848_lib.c8 Jul 2003 10:41:05 - 1.27
+++ ad1848_lib.c8 Jul 2003 17:21:07 - 1.28
@@ -634,13 +634,13 @@
outb(0x1c, AD1848_THINKPAD_CTL_PORT1);
tmp = inb(AD1848_THINKPAD_CTL_PORT2);
- switch (on) {
- case 0: /* turn it off */
- tmp = ~AD1848_THINKPAD_CS4248_ENABLE_BIT;
- default: /* turn it on */
- tmp |= AD1848_THINKPAD_CS4248_ENABLE_BIT;
- }
-
+ if (on)
+ /* turn it on */
+ tmp |= AD1848_THINKPAD_CS4248_ENABLE_BIT;
+ else
+ /* turn it off */
+ tmp = ~AD1848_THINKPAD_CS4248_ENABLE_BIT;
+
outb(tmp, AD1848_THINKPAD_CTL_PORT2);
}
---
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing more.
Download eval WebKing and get a free book.
www.parasoft.com/bulletproofapps
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
