[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 hoontech.c,1.4,1.5
Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11538
Modified Files:
hoontech.c
Log Message:
fix Hoontech DSP* box configuration
Index: hoontech.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/hoontech.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hoontech.c 13 Apr 2004 15:39:21 - 1.4
+++ hoontech.c 4 May 2004 06:46:29 - 1.5
@@ -83,6 +83,7 @@
ICE1712_STDSP24_2_CHN4(ice->hoontech_boxbits, 0);
ICE1712_STDSP24_2_MIDI1(ice->hoontech_boxbits, activate);
snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[3]);
ICE1712_STDSP24_1_CHN1(ice->hoontech_boxbits, 1);
ICE1712_STDSP24_1_CHN2(ice->hoontech_boxbits, 1);
@@ -117,7 +118,7 @@
up(&ice->gpio_mutex);
}
-static void __devinit snd_ice1712_stdsp24_box_midi(ice1712_t *ice, int box, int
master, int slave)
+static void __devinit snd_ice1712_stdsp24_box_midi(ice1712_t *ice, int box, int
master)
{
down(&ice->gpio_mutex);
@@ -128,23 +129,26 @@
ICE1712_STDSP24_2_MIDIIN(ice->hoontech_boxbits, 1);
ICE1712_STDSP24_2_MIDI1(ice->hoontech_boxbits, master);
snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[3]);
udelay(100);
ICE1712_STDSP24_2_MIDIIN(ice->hoontech_boxbits, 0);
snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
- udelay(100);
+ mdelay(10);
ICE1712_STDSP24_2_MIDIIN(ice->hoontech_boxbits, 1);
snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
- udelay(100);
+ up(&ice->gpio_mutex);
+}
- /* MIDI2 is direct */
- ICE1712_STDSP24_3_MIDI2(ice->hoontech_boxbits, slave);
+static void __devinit snd_ice1712_stdsp24_midi2(ice1712_t *ice, int activate)
+{
+ down(&ice->gpio_mutex);
+ ICE1712_STDSP24_3_MIDI2(ice->hoontech_boxbits, activate);
snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[3]);
-
up(&ice->gpio_mutex);
}
@@ -218,8 +222,9 @@
for (chn = 0; chn < 4; chn++)
snd_ice1712_stdsp24_box_channel(ice, box, chn,
(ice->hoontech_boxconfig[box] & (1 << chn)) ? 1 : 0);
snd_ice1712_stdsp24_box_midi(ice, box,
- (ice->hoontech_boxconfig[box] &
ICE1712_STDSP24_BOX_MIDI1) ? 1 : 0,
- (ice->hoontech_boxconfig[box] &
ICE1712_STDSP24_BOX_MIDI2) ? 1 : 0);
+ (ice->hoontech_boxconfig[box] &
ICE1712_STDSP24_BOX_MIDI1) ? 1 : 0);
+ if (ice->hoontech_boxconfig[box] & ICE1712_STDSP24_BOX_MIDI2)
+ snd_ice1712_stdsp24_midi2(ice, 1);
}
return 0;
---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include core.h,1.50,1.51
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15469/include
Modified Files:
core.h
Log Message:
- added the generic PM callback registration.
- rewritten ISA callbacks to use the new one.
Index: core.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/core.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- core.h 8 Apr 2004 16:34:59 - 1.50
+++ core.h 3 May 2004 17:36:07 - 1.51
@@ -205,10 +205,12 @@
int (*suspend)(snd_card_t *, unsigned int),
int (*resume)(snd_card_t *, unsigned int),
void *private_data);
-int snd_card_set_isa_pm_callback(snd_card_t *card,
+int snd_card_set_dev_pm_callback(snd_card_t *card, int type,
int (*suspend)(snd_card_t *, unsigned int),
int (*resume)(snd_card_t *, unsigned int),
void *private_data);
+#define snd_card_set_isa_pm_callback(card,suspend,resume,data) \
+ snd_card_set_dev_pm_callback(card, PM_ISA_DEV, suspend, resume, data)
#ifndef SND_PCI_PM_CALLBACKS
int snd_card_pci_suspend(struct pci_dev *dev, u32 state);
int snd_card_pci_resume(struct pci_dev *dev);
@@ -222,6 +224,7 @@
#define snd_power_get_state(card) SNDRV_CTL_POWER_D0
#define snd_power_change_state(card, state)do { (void)(card); } while (0)
#define snd_card_set_pm_callback(card,suspend,resume,data) -EINVAL
+#define snd_card_set_dev_pm_callback(card,suspend,resume,data) -EINVAL
#define snd_card_set_isa_pm_callback(card,suspend,resume,data) -EINVAL
#define SND_PCI_PM_CALLBACKS
#endif
---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils/seq/aplaymidi .cvsignore,1.1,1.2
Update of /cvsroot/alsa/alsa-utils/seq/aplaymidi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18196 Modified Files: .cvsignore Log Message: added binaries. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-utils/seq/aplaymidi/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Feb 2004 10:58:35 - 1.1 +++ .cvsignore 3 May 2004 17:47:57 - 1.2 @@ -1,3 +1,5 @@ .deps Makefile Makefile.in +aplaymidi +arecordmidi --- This SF.Net email is sponsored by: Oracle 10g Get certified on the hottest thing ever to hit the market... Oracle 10g. Take an Oracle 10g class now, and we'll give you the exam FREE. http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/Documentation/DocBook writing-an-alsa-driver.tmpl,1.27,1.28
Update of /cvsroot/alsa/alsa-kernel/Documentation/DocBook In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15859/Documentation/DocBook Modified Files: writing-an-alsa-driver.tmpl Log Message: - fixed some obsolete descriptions and typos. - a bit more detailed description about addition of the new driver. Index: writing-an-alsa-driver.tmpl === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/DocBook/writing-an-alsa-driver.tmpl,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- writing-an-alsa-driver.tmpl 13 Apr 2004 14:58:59 - 1.27 +++ writing-an-alsa-driver.tmpl 3 May 2004 17:37:55 - 1.28 @@ -5507,10 +5507,14 @@ Suppose that you'll create a new PCI driver for the card xyz. The card module name would be snd-xyz. The new driver is usually put into alsa-driver - tree. Then the driver is evaluated, audited and tested + tree, alsa-driver/pci directory in + the case of PCI cards. + Then the driver is evaluated, audited and tested by developers and users. After a certain time, the driver - will go to alsa-kernel tree and eventually integrated into - Linux 2.6 tree. + will go to alsa-kernel tree (to the corresponding directory, + such as alsa-kernel/pci) and eventually + integrated into Linux 2.6 tree (the directory would be + linux/sound/pci). @@ -5537,7 +5541,7 @@ @@ -5554,8 +5558,8 @@
[alsa-cvslog] CVS: alsa-kernel/arm sa11xx-uda1341.c,1.14,1.15
Update of /cvsroot/alsa/alsa-kernel/arm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15639/arm
Modified Files:
sa11xx-uda1341.c
Log Message:
- clean up PM codes using the new PM callback functions.
Index: sa11xx-uda1341.c
===
RCS file: /cvsroot/alsa/alsa-kernel/arm/sa11xx-uda1341.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sa11xx-uda1341.c7 Apr 2004 17:48:10 - 1.14
+++ sa11xx-uda1341.c3 May 2004 17:36:50 - 1.15
@@ -137,7 +137,6 @@
}audio_stream_t;
typedef struct snd_card_sa11xx_uda1341 {
- struct pm_dev *pm_dev;
snd_card_t *card;
struct l3_client *uda1341;
snd_pcm_t *pcm;
@@ -868,12 +867,10 @@
#ifdef CONFIG_PM
-static void snd_sa11xx_uda1341_suspend(sa11xx_uda1341_t *chip)
+static int snd_sa11xx_uda1341_suspend(snd_card_t *card, unsigned int state)
{
- snd_card_t *card = chip->card;
+ sa11xx_uda1341_t *chip = snd_magic_cast(sa11x_uda1341_t,
card->pm_private_data, return -EINVAL);
- if (card->power_state == SNDRV_CTL_POWER_D3hot)
- return;
snd_pcm_suspend_all(chip->pcm);
#ifdef HH_VERSION
sa1100_dma_sleep(chip->s[SNDRV_PCM_STREAM_PLAYBACK].dmach);
@@ -884,14 +881,13 @@
l3_command(chip->uda1341, CMD_SUSPEND, NULL);
sa11xx_uda1341_audio_shutdown(chip);
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+ return 0;
}
-static void snd_sa11xx_uda1341_resume(sa11xx_uda1341_t *chip)
+static int snd_sa11xx_uda1341_resume(snd_card_t *card, unsigned int state)
{
- snd_card_t *card = chip->card;
+ sa11xx_uda1341_t *chip = snd_magic_cast(sa11x_uda1341_t,
card->pm_private_data, return -EINVAL);
- if (card->power_state == SNDRV_CTL_POWER_D0)
- return;
sa11xx_uda1341_audio_init(chip);
l3_command(chip->uda1341, CMD_RESUME, NULL);
#ifdef HH_VERSION
@@ -901,50 +897,14 @@
//FIXME
#endif
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
-}
-
-static int sa11xx_uda1341_pm_callback(struct pm_dev *pm_dev, pm_request_t req, void
*data)
-{
- sa11xx_uda1341_t *chip = pm_dev->data;
-
- switch (req) {
- case PM_SUSPEND: /* enter D1-D3 */
- snd_sa11xx_uda1341_suspend(chip);
- break;
- case PM_RESUME: /* enter D0 */
- snd_sa11xx_uda1341_resume(chip);
- break;
- }
- return 0;
-}
-
-static int sa11xx_uda1341_set_power_state(snd_card_t *card, unsigned int power_state)
-{
- sa11xx_uda1341_t *chip = snd_magic_cast(sa11xx_uda1341_t,
card->power_state_private_data, return);
-
- switch (power_state) {
- case SNDRV_CTL_POWER_D0:
- case SNDRV_CTL_POWER_D1:
- case SNDRV_CTL_POWER_D2:
- snd_sa11xx_uda1341_resume(chip);
- break;
- case SNDRV_CTL_POWER_D3hot:
- case SNDRV_CTL_POWER_D3cold:
- snd_sa11xx_uda1341_suspend(chip);
- break;
- default:
- return -EINVAL;
- }
return 0;
}
-
#endif /* COMFIG_PM */
void snd_sa11xx_uda1341_free(snd_card_t *card)
{
sa11xx_uda1341_t *chip = snd_magic_cast(sa11xx_uda1341_t, card->private_data,
return);
- pm_unregister(chip->pm_dev);
audio_dma_free(&chip->s[SNDRV_PCM_STREAM_PLAYBACK]);
audio_dma_free(&chip->s[SNDRV_PCM_STREAM_CAPTURE]);
sa11xx_uda1341 = NULL;
@@ -985,15 +945,10 @@
if ((err = snd_card_sa11xx_uda1341_pcm(sa11xx_uda1341, 0)) < 0)
goto nodev;
-
-#ifdef CONFIG_PM
- card->power_state_private_data = sa11xx_uda1341;
- card->set_power_state = sa11xx_uda1341_set_power_state;
- sa11xx_uda1341->pm_dev = pm_register(PM_SYS_DEV, 0,
sa11xx_uda1341_pm_callback);
- if (sa11xx_uda1341->pm_dev)
- sa11xx_uda1341->pm_dev->data = sa11xx_uda1341;
-#endif
-
+ snd_card_set_dev_pm_callback(card, PM_SYS_DEV,
+snd_sa11xx_uda1341_suspend,
snd_sa11_uda1341_resume,
+sa11xx_uda1341);
+
strcpy(card->driver, "UDA1341");
strcpy(card->shortname, "H3600 UDA1341TS");
sprintf(card->longname, "Compaq iPAQ H3600 with Philips UDA1341TS");
---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core init.c,1.45,1.46 sound.c,1.61,1.62
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15469/core
Modified Files:
init.c sound.c
Log Message:
- added the generic PM callback registration.
- rewritten ISA callbacks to use the new one.
Index: init.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/init.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- init.c 8 Apr 2004 16:34:59 - 1.45
+++ init.c 3 May 2004 17:36:07 - 1.46
@@ -739,8 +739,7 @@
return 0;
}
-#ifdef CONFIG_ISA
-static int snd_isa_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
+static int snd_generic_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
{
snd_card_t *card = dev->data;
@@ -758,28 +757,29 @@
}
/**
- * snd_card_set_isa_pm_callback - set the ISA power-management callbacks
+ * snd_card_set_dev_pm_callback - set the generic power-management callbacks
* @card: soundcard structure
+ * @type: PM device type (PM_XXX)
* @suspend: suspend callback function
* @resume: resume callback function
* @private_data: private data to pass to the callback functions
*
* Registers the power-management and sets the lowlevel callbacks for
- * the given ISA card. These callbacks are called from the ALSA's
- * common PM handler and from the control API.
+ * the given card with the given PM type. These callbacks are called
+ * from the ALSA's common PM handler and from the control API.
*/
-int snd_card_set_isa_pm_callback(snd_card_t *card,
+int snd_card_set_dev_pm_callback(snd_card_t *card, int type,
int (*suspend)(snd_card_t *, unsigned int),
int (*resume)(snd_card_t *, unsigned int),
void *private_data)
{
- card->pm_dev = pm_register(PM_ISA_DEV, 0, snd_isa_pm_callback);
+ card->pm_dev = pm_register(type, 0, snd_generic_pm_callback);
if (! card->pm_dev)
return -ENOMEM;
card->pm_dev->data = card;
- return snd_card_set_pm_callback(card, suspend, resume, private_data);
+ snd_card_set_pm_callback(card, suspend, resume, private_data);
+ return 0;
}
-#endif
#ifdef CONFIG_PCI
int snd_card_pci_suspend(struct pci_dev *dev, u32 state)
Index: sound.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sound.c 8 Apr 2004 16:34:59 - 1.61
+++ sound.c 3 May 2004 17:36:07 - 1.62
@@ -467,13 +467,11 @@
#ifdef CONFIG_PM
EXPORT_SYMBOL(snd_power_wait);
EXPORT_SYMBOL(snd_card_set_pm_callback);
+EXPORT_SYMBOL(snd_card_set_dev_pm_callback);
#ifdef CONFIG_PCI
EXPORT_SYMBOL(snd_card_pci_suspend);
EXPORT_SYMBOL(snd_card_pci_resume);
#endif
-#ifdef CONFIG_ISA
-EXPORT_SYMBOL(snd_card_set_isa_pm_callback);
-#endif
#endif
/* device.c */
EXPORT_SYMBOL(snd_device_new);
---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci es1968.c,1.65,1.66
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15122/pci
Modified Files:
es1968.c
Log Message:
- set ACPI D3 at suspend.
- fixed the interrupt disabling at shutdown.
- enabled PM for compaq Armada.
Index: es1968.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- es1968.c14 Apr 2004 17:27:04 - 1.65
+++ es1968.c3 May 2004 17:34:48 - 1.66
@@ -2426,6 +2426,7 @@
snd_pcm_suspend_all(chip->pcm);
snd_ac97_suspend(chip->ac97);
snd_es1968_bob_stop(chip);
+ snd_es1968_set_acpi(chip, ACPI_D3);
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
return 0;
}
@@ -2463,8 +2464,11 @@
static int snd_es1968_free(es1968_t *chip)
{
- if (chip->res_io_port)
- snd_es1968_reset(chip);
+ if (chip->res_io_port) {
+ synchronize_irq(chip->irq);
+ outw(1, chip->io_port + 0x04); /* clear WP interrupts */
+ outw(0, chip->io_port + ESM_PORT_HOST_IRQ); /* disable IRQ */
+ }
#ifdef SUPPORT_JOYSTICK
if (chip->res_joystick) {
@@ -2498,6 +2502,7 @@
};
static struct ess_device_list pm_whitelist[] __devinitdata = {
+ { TYPE_MAESTRO2E, 0x0e11 }, /* Compaq Armada */
{ TYPE_MAESTRO2E, 0x1028 },
{ TYPE_MAESTRO2E, 0x103c },
{ TYPE_MAESTRO2E, 0x1179 },
---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include uda1341.h,1.5,1.6
Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15639/include Modified Files: uda1341.h Log Message: - clean up PM codes using the new PM callback functions. --- This SF.Net email is sponsored by: Oracle 10g Get certified on the hottest thing ever to hit the market... Oracle 10g. Take an Oracle 10g class now, and we'll give you the exam FREE. http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.131,1.132
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14792/pci/ac97
Modified Files:
ac97_codec.c
Log Message:
try to mute and power down in the destructor (to shut up noises).
Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ac97_codec.c19 Apr 2004 18:11:29 - 1.131
+++ ac97_codec.c3 May 2004 17:32:57 - 1.132
@@ -999,6 +999,8 @@
*
*/
+static void snd_ac97_powerdown(ac97_t *ac97);
+
static int snd_ac97_bus_free(ac97_bus_t *bus)
{
if (bus) {
@@ -1034,6 +1036,7 @@
static int snd_ac97_dev_free(snd_device_t *device)
{
ac97_t *ac97 = snd_magic_cast(ac97_t, device->device_data, return -ENXIO);
+ snd_ac97_powerdown(ac97); /* for avoiding click noises during shut down */
return snd_ac97_free(ac97);
}
@@ -1995,18 +1998,16 @@
return 0;
}
-#ifdef CONFIG_PM
-/**
- * snd_ac97_suspend - General suspend function for AC97 codec
- * @ac97: the ac97 instance
+
+/*
+ * Power down the chip.
*
- * Suspends the codec, power down the chip.
* MASTER and HEADPHONE registers are muted but the register cache values
* are not changed, so that the values can be restored in snd_ac97_resume().
*/
-void snd_ac97_suspend(ac97_t *ac97)
+static void snd_ac97_powerdown(ac97_t *ac97)
{
- unsigned short power = (ac97->regs[AC97_POWERDOWN] ^ 0x8000) & ~0x8000; /*
invert EAPD */
+ unsigned short power;
if (ac97_is_audio(ac97)) {
/* some codecs have stereo mute bits */
@@ -2014,6 +2015,7 @@
snd_ac97_write(ac97, AC97_HEADPHONE, 0x9f9f);
}
+ power = ac97->regs[AC97_POWERDOWN] | 0x8000;/* EAPD */
power |= 0x4000;/* Headphone amplifier powerdown */
power |= 0x0300;/* ADC & DAC powerdown */
snd_ac97_write(ac97, AC97_POWERDOWN, power);
@@ -2021,8 +2023,24 @@
power |= 0x0400;/* Analog Mixer powerdown (Vref on) */
snd_ac97_write(ac97, AC97_POWERDOWN, power);
udelay(100);
+#if 0
+ /* FIXME: this causes click noises on some boards at resume */
power |= 0x3800;/* AC-link powerdown, internal Clk disable */
snd_ac97_write(ac97, AC97_POWERDOWN, power);
+#endif
+}
+
+
+#ifdef CONFIG_PM
+/**
+ * snd_ac97_suspend - General suspend function for AC97 codec
+ * @ac97: the ac97 instance
+ *
+ * Suspends the codec, power down the chip.
+ */
+void snd_ac97_suspend(ac97_t *ac97)
+{
+ snd_ac97_powerdown(ac97);
}
/**
---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
___
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.40,1.41
Update of /cvsroot/alsa/alsa-kernel/isa/cs423x
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8594
Modified Files:
cs4231_lib.c
Log Message:
add missing closing brace
Index: cs4231_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4231_lib.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cs4231_lib.c1 May 2004 09:01:11 - 1.40
+++ cs4231_lib.c3 May 2004 14:37:05 - 1.41
@@ -994,6 +994,7 @@
if (status & CS4231_PLAYBACK_IRQ) {
if (chip->playback_substream)
snd_pcm_period_elapsed(chip->playback_substream);
+ }
if (status & CS4231_RECORD_IRQ) {
if (chip->capture_substream) {
snd_cs4231_overrange(chip);
---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_local.h,1.135,1.136
Update of /cvsroot/alsa/alsa-lib/src/pcm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8729 Modified Files: pcm_local.h Log Message: define SND_PCM_INFO_RESUME Index: pcm_local.h === RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_local.h,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- pcm_local.h 15 Apr 2004 12:52:58 - 1.135 +++ pcm_local.h 3 May 2004 14:37:53 - 1.136 @@ -82,6 +82,8 @@ #define SND_PCM_INFO_BLOCK_TRANSFER SNDRV_PCM_INFO_BLOCK_TRANSFER /** device can detect DAC/ADC overrange */ #define SND_PCM_INFO_OVERRANGE SNDRV_PCM_INFO_OVERRANGE +/** device supports resume */ +#define SND_PCM_INFO_RESUME SNDRV_PCM_INFO_RESUME /** device is capable to pause */ #define SND_PCM_INFO_PAUSE SNDRV_PCM_INFO_PAUSE /** device can do only half duplex */ --- This SF.Net email is sponsored by: Oracle 10g Get certified on the hottest thing ever to hit the market... Oracle 10g. Take an Oracle 10g class now, and we'll give you the exam FREE. http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_null.c,1.50,1.51
Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8922
Modified Files:
pcm_null.c
Log Message:
initialize hw_params->info
Index: pcm_null.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_null.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pcm_null.c 17 Mar 2004 11:48:15 - 1.50
+++ pcm_null.c 3 May 2004 14:38:46 - 1.51
@@ -275,6 +275,8 @@
static int snd_pcm_null_hw_refine(snd_pcm_t *pcm ATTRIBUTE_UNUSED,
snd_pcm_hw_params_t *params)
{
int err = snd_pcm_hw_refine_soft(pcm, params);
+ params->info = SND_PCM_INFO_MMAP | SND_PCM_INFO_MMAP_VALID |
+ SND_PCM_INFO_RESUME | SND_PCM_INFO_PAUSE;
params->fifo_size = 0;
return err;
}
---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils/aplay aplay.c,1.179,1.180
Update of /cvsroot/alsa/alsa-utils/aplay
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12386
Modified Files:
aplay.c
Log Message:
fix default buffer time setting when maximum buffer time is less than 250 ms
Index: aplay.c
===
RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.c,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- aplay.c 27 Apr 2004 13:38:59 - 1.179
+++ aplay.c 3 May 2004 10:03:57 - 1.180
@@ -852,8 +852,13 @@
}
}
rate = hwparams.rate;
- if (buffer_time == 0 && buffer_frames == 0)
- buffer_time = 50;
+ if (buffer_time == 0 && buffer_frames == 0) {
+ err = snd_pcm_hw_params_get_buffer_time_max(params,
+ &buffer_time, 0);
+ assert(err >= 0);
+ if (buffer_time > 50)
+ buffer_time = 50;
+ }
if (period_time == 0 && period_frames == 0) {
if (buffer_time > 0)
period_time = buffer_time / 4;
---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/rme9652 hdsp.c,1.56,1.57
Update of /cvsroot/alsa/alsa-kernel/pci/rme9652 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32231 Modified Files: hdsp.c Log Message: HDSP9632 has also firmware version 0x97 Index: hdsp.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hdsp.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- hdsp.c 13 Apr 2004 14:59:02 - 1.56 +++ hdsp.c 3 May 2004 09:01:17 - 1.57 @@ -635,6 +635,7 @@ case 0xa: return (64 * out) + (32 + (in)); case 0x96: + case 0x97: return (32 * out) + (16 + (in)); default: return (52 * out) + (26 + (in)); @@ -647,6 +648,7 @@ case 0xa: return (64 * out) + in; case 0x96: + case 0x97: return (32 * out) + in; default: return (52 * out) + in; @@ -5019,6 +5021,7 @@ is_9652 = 1; break; case 0x96: + case 0x97: hdsp->card_name = "RME HDSP 9632"; hdsp->max_channels = 16; is_9632 = 1; --- This SF.Net email is sponsored by: Oracle 10g Get certified on the hottest thing ever to hit the market... Oracle 10g. Take an Oracle 10g class now, and we'll give you the exam FREE. http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emu10k1_main.c,1.32,1.33 emufx.c,1.51,1.52 emumixer.c,1.20,1.21
Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28640/pci/emu10k1 Modified Files: emu10k1_main.c emufx.c emumixer.c Log Message: Initial attempt to add support for SB Live 5.1 (c) 2003 Index: emu10k1_main.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emu10k1_main.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- emu10k1_main.c 6 Mar 2004 16:51:30 - 1.32 +++ emu10k1_main.c 3 May 2004 08:43:04 - 1.33 @@ -690,7 +690,7 @@ if (extin_mask == 0) extin_mask = 0x3fcf; if (extout_mask == 0) - extout_mask = 0x1fff; + extout_mask = 0x7fff; emu->fx8010.extin_mask = extin_mask; emu->fx8010.extout_mask = extout_mask; Index: emufx.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emufx.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- emufx.c 6 Mar 2004 16:51:30 - 1.51 +++ emufx.c 3 May 2004 08:43:04 - 1.52 @@ -120,8 +120,8 @@ /* 0x0a */ "PCM Capture Left", /* 0x0b */ "PCM Capture Right", /* 0x0c */ "MIC Capture", - /* 0x0d */ NULL, - /* 0x0e */ NULL, + /* 0x0d */ "AC97 Surround Left", + /* 0x0e */ "AC97 Surround Right", /* 0x0f */ NULL, /* 0x10 */ NULL, /* 0x11 */ "Analog Center", @@ -2113,22 +2113,26 @@ for (z = 0; z < 2; z++) OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_REAR_L + z), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 2 + z), C_, C_); - if (emu->fx8010.extout_mask & (1ac97, AC97_REC_SEL, 0x); c = audigy_remove_ctls; } else { + if (emu->ac97->id == AC97_ID_STAC9758) { + emu->rear_ac97 = 1; + snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT); + } /* remove unused AC97 controls */ snd_ac97_write(emu->ac97, AC97_SURROUND_MASTER, 0x0202); snd_ac97_write(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202); --- This SF.Net email is sponsored by: Oracle 10g Get certified on the hottest thing ever to hit the market... Oracle 10g. Take an Oracle 10g class now, and we'll give you the exam FREE. http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include emu10k1.h,1.38,1.39
Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28640/include Modified Files: emu10k1.h Log Message: Initial attempt to add support for SB Live 5.1 (c) 2003 Index: emu10k1.h === RCS file: /cvsroot/alsa/alsa-kernel/include/emu10k1.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- emu10k1.h 2 Mar 2004 15:32:36 - 1.38 +++ emu10k1.h 3 May 2004 08:43:04 - 1.39 @@ -650,7 +650,8 @@ #define SPBYPASS_FORMAT0x0f00 /* If 1, SPDIF XX uses 24 bit, if 0 - 20 bit*/ #define AC97SLOT 0x5f/* additional AC97 slots enable bits */ -#define AC97SLOT_10K2 0x03 +#define AC97SLOT_REAR_RIGHT0x01/* Rear left */ +#define AC97SLOT_REAR_LEFT 0x02/* Rear right */ #define AC97SLOT_CNTR 0x10/* Center enable */ #define AC97SLOT_LFE 0x20/* LFE enable */ @@ -937,7 +938,8 @@ struct resource *res_port; int APS: 1, /* APS flag */ no_ac97: 1, /* no AC'97 */ - tos_link: 1;/* tos link detected */ + tos_link: 1,/* tos link detected */ + rear_ac97: 1; /* rear channels are on AC'97 */ unsigned int audigy;/* is Audigy? */ unsigned int revision; /* chip revision */ unsigned int serial;/* serial number */ @@ -1184,8 +1186,8 @@ #define EXTOUT_AC97_R 0x01 /* AC'97 playback channel - right */ #define EXTOUT_TOSLINK_L 0x02/* LiveDrive - TOSLink Optical - left */ #define EXTOUT_TOSLINK_R 0x03/* LiveDrive - TOSLink Optical - right */ -#define EXTOUT_CENTER 0x04/* SB Live 5.1 - center */ -#define EXTOUT_LFE 0x05 /* SB Live 5.1 - LFE */ +#define EXTOUT_AC97_CENTER 0x04/* SB Live 5.1 - center */ +#define EXTOUT_AC97_LFE 0x05 /* SB Live 5.1 - LFE */ #define EXTOUT_HEADPHONE_L 0x06/* LiveDrive - Headphone - left */ #define EXTOUT_HEADPHONE_R 0x07/* LiveDrive - Headphone - right */ #define EXTOUT_REAR_L 0x08 /* Rear channel - left */ @@ -1193,6 +1195,8 @@ #define EXTOUT_ADC_CAP_L 0x0a/* ADC Capture buffer - left */ #define EXTOUT_ADC_CAP_R 0x0b/* ADC Capture buffer - right */ #define EXTOUT_MIC_CAP0x0c /* MIC Capture buffer */ +#define EXTOUT_AC97_REAR_L 0x0d/* SB Live 5.1 (c) 2003 - Rear Left */ +#define EXTOUT_AC97_REAR_R 0x0e/* SB Live 5.1 (c) 2003 - Rear Right */ #define EXTOUT_ACENTER0x11 /* Analog Center */ #define EXTOUT_ALFE 0x12 /* Analog LFE */ --- This SF.Net email is sponsored by: Oracle 10g Get certified on the hottest thing ever to hit the market... Oracle 10g. Take an Oracle 10g class now, and we'll give you the exam FREE. http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/Documentation ALSA-Configuration.txt,1.39,1.40
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28640/Documentation Modified Files: ALSA-Configuration.txt Log Message: Initial attempt to add support for SB Live 5.1 (c) 2003 Index: ALSA-Configuration.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- ALSA-Configuration.txt 24 Mar 2004 11:42:51 - 1.39 +++ ALSA-Configuration.txt 3 May 2004 08:43:04 - 1.40 @@ -417,7 +417,8 @@ * Creative Card w/Digital out + Digital I/O 2 [0x0fc3/0x1f0f] * Creative Card w/Digital CD in + Digital I/O 2 [0x0fcf/0x1f0f] * Creative Card 5.1/w Digital out + LiveDrive [0x3fc3/0x1fff] -* Creative Card all ins and outs [0x3fff/0x1fff] + * Creative Card 5.1 (c) 2003[0x3fc3/0x7cff] +* Creative Card all ins and outs [0x3fff/0x7fff] Module snd-ens1370 -- --- This SF.Net email is sponsored by: Oracle 10g Get certified on the hottest thing ever to hit the market... Oracle 10g. Take an Oracle 10g class now, and we'll give you the exam FREE. http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
