I'm sorry. I forgot to mention that these patches replace the two previous patches :)

Ash

----- Original Message ----- From: "Ash Willis" ashwillis@programmer.net To: "Takashi Iwai" tiwai@suse.de Subject: [alsa-devel] [PATCH] Add support for Cyrix/NatSemi Geode CS5530 (VSA1) Date: Thu, 24 May 2007 09:09:29 -0500

Takashi, here are my modified patches. One small one for alsa-driver. I took your advice and merged the rest into alsa-kernel. Everything should be in order this time.

Add support for Cyrix/NatSemi Geode SC5530 (VSA1)

Signed-off-by Ash Willis ashwillis@programmer.net

diff -r fb391138d29c -r 994136cf989e pci/cs5530.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pci/cs5530.c Thu May 24 20:45:25 2007 +0100 @@ -0,0 +1,2 @@ +#include "../alsa-kernel/pci/cs5530.c" +EXPORT_NO_SYMBOLS;

---

diff -r 45179b325c8e -r 0b0c03c6c6ca Documentation/ALSA-Configuration.txt --- a/Documentation/ALSA-Configuration.txt Wed May 23 16:27:32 2007 +0200 +++ b/Documentation/ALSA-Configuration.txt Thu May 24 20:58:27 2007 +0100 @@ -467,7 +467,12 @@ Prior to version 0.9.0rc4 options had a above explicitly.

  The power-management is supported.

• Module snd-cs5530

• ---

• Module for Cyrix/NatSemi Geode 5530 chip.

• Module snd-cs5535audio

diff -r 45179b325c8e -r 0b0c03c6c6ca include/sb.h --- a/include/sb.h Wed May 23 16:27:32 2007 +0200 +++ b/include/sb.h Thu May 24 20:58:27 2007 +0100 @@ -38,6 +38,7 @@ enum sb_hw_type { SB_HW_ALS100, /* Avance Logic ALS100 chip */ SB_HW_ALS4000, /* Avance Logic ALS4000 chip */ SB_HW_DT019X, /* Diamond Tech. DT-019X / Avance Logic ALS-007 */

• SB_HW_CS5530, /* Cyrix/NatSemi 5530 VSA1 */ };

  #define SB_OPEN_PCM 0x01

diff -r 45179b325c8e -r 0b0c03c6c6ca isa/sb/sb16_main.c --- a/isa/sb/sb16_main.c Wed May 23 16:27:32 2007 +0200 +++ b/isa/sb/sb16_main.c Thu May 24 20:58:27 2007 +0100 @@ -563,6 +563,11 @@ static int snd_sb16_playback_open(struct __open_ok: if (chip->hardware == SB_HW_ALS100) runtime->hw.rate_max = 48000;

• if (chip->hardware == SB_HW_CS5530) {

• runtime->hw.buffer_bytes_max = 32 * 1024;
  

• runtime->hw.periods_min = 2;
  

• runtime->hw.rate_min = 44100;
  

• } if (chip->mode & SB_RATE_LOCK) runtime->hw.rate_min = runtime->hw.rate_max = chip->locked_rate; chip->playback_substream = substream;

@@ -633,6 +638,11 @@ static int snd_sb16_capture_open(struct __open_ok: if (chip->hardware == SB_HW_ALS100) runtime->hw.rate_max = 48000;

• if (chip->hardware == SB_HW_CS5530) {

• runtime->hw.buffer_bytes_max = 32 * 1024;
  

• runtime->hw.periods_min = 2;
  

• runtime->hw.rate_min = 44100;
  

• } if (chip->mode & SB_RATE_LOCK) runtime->hw.rate_min = runtime->hw.rate_max = chip->locked_rate; chip->capture_substream = substream;

diff -r 45179b325c8e -r 0b0c03c6c6ca isa/sb/sb_common.c --- a/isa/sb/sb_common.c Wed May 23 16:27:32 2007 +0200 +++ b/isa/sb/sb_common.c Thu May 24 20:58:27 2007 +0100 @@ -128,7 +128,7 @@ static int snd_sbdsp_probe(struct snd_sb minor = version & 0xff; snd_printdd("SB [0x%lx]: DSP chip found, version = %i.%i\n", chip->port, major, minor);

• switch (chip->hardware) { case SB_HW_AUTO: switch (major) {

@@ -167,6 +167,9 @@ static int snd_sbdsp_probe(struct snd_sb break; case SB_HW_DT019X: str = "(DT019X/ALS007)";

• break;
  

• case SB_HW_CS5530:

• str = "16 (CS5530)";
  

  break; default: return -ENODEV;

diff -r 45179b325c8e -r 0b0c03c6c6ca isa/sb/sb_mixer.c --- a/isa/sb/sb_mixer.c Wed May 23 16:27:32 2007 +0200 +++ b/isa/sb/sb_mixer.c Thu May 24 20:58:27 2007 +0100 @@ -821,6 +821,7 @@ int snd_sbmixer_new(struct snd_sb *chip) break; case SB_HW_16: case SB_HW_ALS100:

• case SB_HW_CS5530: if ((err = snd_sbmixer_init(chip, snd_sb16_controls, ARRAY_SIZE(snd_sb16_controls),

@@ -950,6 +951,7 @@ void snd_sbmixer_suspend(struct snd_sb * break; case SB_HW_16: case SB_HW_ALS100:

• case SB_HW_CS5530: save_mixer(chip, sb16_saved_regs, ARRAY_SIZE(sb16_saved_regs)); break; case SB_HW_ALS4000:

@@ -975,6 +977,7 @@ void snd_sbmixer_resume(struct snd_sb *c break; case SB_HW_16: case SB_HW_ALS100:

• case SB_HW_CS5530: restore_mixer(chip, sb16_saved_regs, ARRAY_SIZE(sb16_saved_regs)); break; case SB_HW_ALS4000:

diff -r 45179b325c8e -r 0b0c03c6c6ca pci/Kconfig --- a/pci/Kconfig Wed May 23 16:27:32 2007 +0200 +++ b/pci/Kconfig Thu May 24 20:58:27 2007 +0100 @@ -214,6 +214,16 @@ config SND_CS46XX_NEW_DSP Say Y here to use a new DSP image for SPDIF and dual codecs.

 This works better than the old code, so say Y.

+config SND_CS5530

• tristate "CS5530 Audio"

• depends on SND

• select SND_SB16

• help

•  Say Y here to include support for audio on Cyrix/NatSemi CS5530 chips.
  

•  To compile this driver as a module, choose M here: the module
  

•  will be called snd-cs5530.
  
  

  config SND_CS5535AUDIO tristate "CS5535/CS5536 Audio"

diff -r 45179b325c8e -r 0b0c03c6c6ca pci/Makefile --- a/pci/Makefile Wed May 23 16:27:32 2007 +0200 +++ b/pci/Makefile Thu May 24 20:58:27 2007 +0100 @@ -12,6 +12,7 @@ snd-bt87x-objs := bt87x.o snd-bt87x-objs := bt87x.o snd-cmipci-objs := cmipci.o snd-cs4281-objs := cs4281.o +snd-cs5530-objs := cs5530.o snd-ens1370-objs := ens1370.o snd-ens1371-objs := ens1371.o snd-es1938-objs := es1938.o @@ -36,6 +37,7 @@ obj-$(CONFIG_SND_BT87X) += snd-bt87x.o obj-$(CONFIG_SND_BT87X) += snd-bt87x.o obj-$(CONFIG_SND_CMIPCI) += snd-cmipci.o obj-$(CONFIG_SND_CS4281) += snd-cs4281.o +obj-$(CONFIG_SND_CS5530) += snd-cs5530.o obj-$(CONFIG_SND_ENS1370) += snd-ens1370.o obj-$(CONFIG_SND_ENS1371) += snd-ens1371.o obj-$(CONFIG_SND_ES1938) += snd-es1938.o diff -r 45179b325c8e -r 0b0c03c6c6ca pci/cs5530.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pci/cs5530.c Thu May 24 20:58:27 2007 +0100 @@ -0,0 +1,306 @@ +/*

• • cs5530.c - Initialisation code for Cyrix/NatSemi VSA1 softaudio
• • (C) Copyright 2007 Ash Willis ashwillis@programmer.net
• • (C) Copyright 2003 Red Hat Inc alan@redhat.com
• • This driver was ported (shamelessly ripped ;) from oss/kahlua.c but I did
• • mess with it a bit. The chip seems to have to have trouble with

full duplex

• • mode. If we're recording in 8bit 8000kHz, say, and we then attempt to
• • simultaneously play back audio at 16bit 44100kHz, the device

actually plays

• • back in the same format in which it is capturing. By forcing the chip to
• • always play/capture in 16/44100, we can let alsa-lib convert

the samples and

• • that way we can hack up some full duplex audio.
• • XpressAudio(tm) is used on the Cyrix MediaGX (now NatSemi Geode) systems.
• • The older version (VSA1) provides fairly good soundblaster emulation
• • although there are a couple of bugs: large DMA buffers break record,
• • and the MPU event handling seems suspect. VSA2 allows the native driver
• • to control the AC97 audio engine directly and requires a different driver.
• • Thanks to National Semiconductor for providing the needed information
• • on the XpressAudio(tm) internals.
• • This program is free software; you can redistribute it and/or modify it
• • under the terms of the GNU General Public License as published by the
• • Free Software Foundation; either version 2, or (at your option) any
• • later version.
• • This program is distributed in the hope that it will be useful, but
• • WITHOUT ANY WARRANTY; without even the implied warranty of
• • MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
• • General Public License for more details.
• • TO DO:
• • Investigate whether we can portably support Cognac (5520) in the
• • same manner.
• */

+#include <sound/driver.h> +#include <linux/delay.h> +#include <linux/moduleparam.h> +#include <linux/pci.h> +#include <sound/core.h> +#include <sound/sb.h> +#include <sound/initval.h>

+MODULE_AUTHOR("Ash Willis"); +MODULE_DESCRIPTION("CS5530 Audio"); +MODULE_LICENSE("GPL");

+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; +static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; +static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;

+struct snd_cs5530 {

• struct snd_card *card;
• struct pci_dev *pci;
• struct snd_sb *sb;
• unsigned long pci_base;

+};

+static struct pci_device_id snd_cs5530_ids[] = {

• {PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID,

• 					PCI_ANY_ID, 0, 0},
  

• {0,}

+};

+MODULE_DEVICE_TABLE(pci, snd_cs5530_ids);

+static int snd_cs5530_free(struct snd_cs5530 *chip) +{

• pci_release_regions(chip->pci);
• pci_disable_device(chip->pci);
• kfree(chip);
• return 0;

+}

+static int snd_cs5530_dev_free(struct snd_device *device) +{

• struct snd_cs5530 *chip = device->device_data;
• return snd_cs5530_free(chip);

+}

+static void __devexit snd_cs5530_remove(struct pci_dev *pci) +{

• snd_card_free(pci_get_drvdata(pci));
• pci_set_drvdata(pci, NULL);

+}

+static u8 __devinit snd_cs5530_mixer_read(unsigned long io, u8 reg) +{

• outb(reg, io + 4);
• udelay(20);
• reg = inb(io + 5);
• udelay(20);
• return reg;

+}

+static int __devinit snd_cs5530_create(struct snd_card *card,

• 		       struct pci_dev *pci,
  

• 		       struct snd_cs5530 **rchip)
  

+{

• struct snd_cs5530 *chip;
• unsigned long sb_base;
• u8 irq, dma8, dma16 = 0;
• u16 map;
• void __iomem *mem;
• int err;
• static struct snd_device_ops ops = {

• .dev_free = snd_cs5530_dev_free,
  

• };
• *rchip = NULL;
• err = pci_enable_device(pci);
• if (err < 0)

• return err;
  

• chip = kzalloc(sizeof(*chip), GFP_KERNEL);
• if (chip == NULL) {

• pci_disable_device(pci);
  

• return -ENOMEM;
  

• }
• chip->card = card;
• chip->pci = pci;
• err = pci_request_regions(pci, "CS5530");
• if (err < 0) {

• kfree(chip);
  

• pci_disable_device(pci);
  

• return err;
  

• }
• chip->pci_base = pci_resource_start(pci, 0);
• mem = ioremap_nocache(chip->pci_base, pci_resource_len(pci, 0));
• if (mem == NULL) {

• kfree(chip);
  

• pci_disable_device(pci);
  

• return -EBUSY;
  

• }
• map = readw(mem + 0x18);
• iounmap(mem);
• /* Map bits

• 0:1	* 0x20 + 0x200 = sb base
  

• 2	sb enable
  

• 3	adlib enable
  

• 5	MPU enable 0x330
  

• 6	MPU enable 0x300
  

•   The other bits may be used internally so must be masked */
  

• sb_base = 0x220 + 0x20 * (map & 3);
• if (map & (1<<2))

• printk(KERN_INFO "CS5530: XpressAudio at 0x%lx\n", sb_base);
  

• else {

• printk(KERN_ERR "Could not find XpressAudio!\n");
  

• snd_cs5530_free(chip);
  

• return -ENODEV;
  

• }
• if (map & (1<<5))

• printk(KERN_INFO "CS5530: MPU at 0x300\n");
  

• else if (map & (1<<6))

• printk(KERN_INFO "CS5530: MPU at 0x330\n");
  

• irq = snd_cs5530_mixer_read(sb_base, 0x80) & 0x0F;
• dma8 = snd_cs5530_mixer_read(sb_base, 0x81);
• if (dma8 & 0x20)

• dma16 = 5;
  

• else if (dma8 & 0x40)

• dma16 = 6;
  

• else if (dma8 & 0x80)

• dma16 = 7;
  

• else {

• printk(KERN_ERR "CS5530: No 16bit DMA enabled\n");
  

• snd_cs5530_free(chip);
  

• return -ENODEV;
  

• }
• if (dma8 & 0x01)

• dma8 = 0;
  

• else if (dma8 & 02)

• dma8 = 1;
  

• else if (dma8 & 0x08)

• dma8 = 3;
  

• else {

• printk(KERN_ERR "CS5530: No 8bit DMA enabled\n");
  

• snd_cs5530_free(chip);
  

• return -ENODEV;
  

• }
• if (irq & 1)

• irq = 9;
  

• else if (irq & 2)

• irq = 5;
  

• else if (irq & 4)

• irq = 7;
  

• else if (irq & 8)

• irq = 10;
  

• else {

• printk(KERN_ERR "CS5530: SoundBlaster IRQ not set\n");
  

• snd_cs5530_free(chip);
  

• return -ENODEV;
  

• }
• printk(KERN_INFO "CS5530: IRQ: %d DMA8: %d DMA16: %d\n", irq, dma8,

• 							dma16);
  

• err = snd_sbdsp_create(card, sb_base, irq, snd_sb16dsp_interrupt, dma8,

• 				dma16, SB_HW_CS5530, &chip->sb);
  

• if (err < 0) {

• printk(KERN_ERR "CS5530: Could not create SoundBlaster\n");
  

• snd_cs5530_free(chip);
  

• return err;
  

• }
• err = snd_sb16dsp_pcm(chip->sb, 0, &chip->sb->pcm);
• if (err < 0) {

• printk(KERN_ERR "CS5530: Could not create PCM\n");
  

• snd_cs5530_free(chip);
  

• return err;
  

• }
• err = snd_sbmixer_new(chip->sb);
• if (err < 0) {

• printk(KERN_ERR "CS5530: Could not create Mixer\n");
  

• snd_cs5530_free(chip);
  

• return err;
  

• }
• err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
• if (err < 0) {

• snd_cs5530_free(chip);
  

• return err;
  

• }
• snd_card_set_dev(card, &pci->dev);
• *rchip = chip;
• return 0;

+}

+static int __devinit snd_cs5530_probe(struct pci_dev *pci,

• 			const struct pci_device_id *pci_id)
  

+{

• static int dev;
• struct snd_card *card;
• struct snd_cs5530 *chip = NULL;
• int err;
• if (dev >= SNDRV_CARDS)

• return -ENODEV;
  

• if (!enable[dev]) {

• dev++;
  

• return -ENOENT;
  

• }
• card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
• if (card == NULL)

• return -ENOMEM;
  

• err = snd_cs5530_create(card, pci, &chip);
• if (err < 0) {

• snd_card_free(card);
  

• return err;
  

• }
• strcpy(card->driver, "CS5530");
• strcpy(card->shortname, "CS5530 Audio");
• sprintf(card->longname, "%s at 0x%lx", card->shortname, chip->pci_base);
• err = snd_card_register(card);
• if (err < 0) {

• snd_card_free(card);
  

• return err;
  

• }
• pci_set_drvdata(pci, card);
• dev++;
• return 0;

+}

+static struct pci_driver driver = {

• .name = "CS5530_Audio",
• .id_table = snd_cs5530_ids,
• .probe = snd_cs5530_probe,
• .remove = __devexit_p(snd_cs5530_remove),

+};

+static int __init alsa_card_cs5530_init(void) +{

• return pci_register_driver(&driver);

+}

+static void __exit alsa_card_cs5530_exit(void) +{

• pci_unregister_driver(&driver);

+}

+module_init(alsa_card_cs5530_init) +module_exit(alsa_card_cs5530_exit)

=

---

Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

=