#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/init.h>
+#include <linux/firmware.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/asoundef.h>
* snd_vx_boot_xilinx - boot up the xilinx interface
* @boot: the boot record to load
*/
-int snd_vx_load_boot_image(vx_core_t *chip, const snd_hwdep_dsp_image_t *boot)
+int snd_vx_load_boot_image(vx_core_t *chip, const struct firmware *boot)
{
unsigned int i;
int no_fillup = vx_has_new_dsp(chip);
/* check the length of boot image */
- snd_assert(boot->length > 0, return -EINVAL);
- snd_assert(boot->length % 3 == 0, return -EINVAL);
- snd_assert(boot->image, return -EINVAL);
+ snd_assert(boot->size > 0, return -EINVAL);
+ snd_assert(boot->size % 3 == 0, return -EINVAL);
#if 0
{
/* more strict check */
- unsigned int c = ((u32)boot->image[0] << 16) | ((u32)boot->image[1] << 8) | boot->image[2];
- snd_assert(boot->length == (c + 2) * 3, return -EINVAL);
+ unsigned int c = ((u32)boot->data[0] << 16) | ((u32)boot->data[1] << 8) | boot->data[2];
+ snd_assert(boot->size == (c + 2) * 3, return -EINVAL);
}
#endif
/* download boot strap */
for (i = 0; i < 0x600; i += 3) {
- if (i >= boot->length) {
+ if (i >= boot->size) {
if (no_fillup)
break;
if (vx_wait_isr_bit(chip, ISR_TX_EMPTY) < 0) {
vx_outb(chip, TXM, 0);
vx_outb(chip, TXL, 0);
} else {
- unsigned char image[3];
- if (copy_from_user(image, boot->image + i, 3))
- return -EFAULT;
+ unsigned char *image = boot->data + i;
if (vx_wait_isr_bit(chip, ISR_TX_EMPTY) < 0) {
snd_printk(KERN_ERR "dsp boot failed at %d\n", i);
return -EIO;
/**
* snd_vx_dsp_boot - load the DSP boot
*/
-int snd_vx_dsp_boot(vx_core_t *chip, const snd_hwdep_dsp_image_t *boot)
+int snd_vx_dsp_boot(vx_core_t *chip, const struct firmware *boot)
{
int err;
int cold_reset = !(chip->chip_status & VX_STAT_DEVICE_INIT);
/**
* snd_vx_dsp_load - load the DSP image
*/
-int snd_vx_dsp_load(vx_core_t *chip, const snd_hwdep_dsp_image_t *dsp)
+int snd_vx_dsp_load(vx_core_t *chip, const struct firmware *dsp)
{
unsigned int i;
int err;
unsigned int csum = 0;
- unsigned char image[3], *cptr;
+ unsigned char *image, *cptr;
- snd_assert(dsp->length % 3 == 0, return -EINVAL);
+ snd_assert(dsp->size % 3 == 0, return -EINVAL);
vx_toggle_dac_mute(chip, 1);
/* Transfert data buffer from PC to DSP */
- for (i = 0; i < dsp->length; i += 3) {
- if (copy_from_user(image, dsp->image + i, 3))
- return -EFAULT;
+ for (i = 0; i < dsp->size; i += 3) {
+ image = dsp->data + i;
/* Wait DSP ready for a new read */
if ((err = vx_wait_isr_bit(chip, ISR_TX_EMPTY)) < 0) {
printk("dsp loading error at position %d\n", i);
return 0;
}
+#ifdef CONFIG_PM
+/*
+ * suspend
+ */
+static int snd_vx_suspend(snd_card_t *card, unsigned int state)
+{
+ vx_core_t *chip = card->pm_private_data;
+ unsigned int i;
+
+ snd_assert(chip, return -EINVAL);
+
+ chip->chip_status |= VX_STAT_IN_SUSPEND;
+ for (i = 0; i < chip->hw->num_codecs; i++)
+ snd_pcm_suspend_all(chip->pcm[i]);
+
+ return 0;
+}
+
+/*
+ * resume
+ */
+static int snd_vx_resume(snd_card_t *card, unsigned int state)
+{
+ vx_core_t *chip = card->pm_private_data;
+ int i, err;
+
+ snd_assert(chip, return -EINVAL);
+
+ chip->chip_status &= ~VX_STAT_CHIP_INIT;
+
+ for (i = 0; i < 4; i++) {
+ if (! chip->firmware[i])
+ continue;
+ err = chip->ops->load_dsp(chip, i, chip->firmware[i]);
+ if (err < 0) {
+ snd_printk(KERN_ERR "vx: firmware resume error at DSP %d\n", i);
+ return -EIO;
+ }
+ }
+
+ chip->chip_status |= VX_STAT_CHIP_INIT;
+ chip->chip_status &= ~VX_STAT_IN_SUSPEND;
+
+ return 0;
+}
+
+#endif
+
/**
* snd_vx_create - constructor for vx_core_t
* @hw: hardware specific record
snd_assert(card && hw && ops, return NULL);
- chip = kcalloc(1, sizeof(chip) + extra_size, GFP_KERNEL);
+ chip = kcalloc(1, sizeof(*chip) + extra_size, GFP_KERNEL);
if (! chip) {
snd_printk(KERN_ERR "vx_core: no memory\n");
return NULL;
strcpy(card->driver, hw->name);
sprintf(card->shortname, "Digigram %s", hw->name);
+ snd_card_set_pm_callback(card, snd_vx_suspend, snd_vx_resume, chip);
+
vx_proc_init(chip);
return chip;
}
-#ifdef CONFIG_PM
-/*
- * suspend
- */
-void snd_vx_suspend(vx_core_t *chip)
-{
- unsigned int i;
-
- chip->chip_status |= VX_STAT_IN_SUSPEND;
- for (i = 0; i < chip->hw->num_codecs; i++)
- snd_pcm_suspend_all(chip->pcm[i]);
- if (chip->hwdep)
- chip->hwdep->dsp_loaded = 0;
-}
-
-/*
- * resume
- */
-void snd_vx_resume(vx_core_t *chip)
-{
- /* clear all stuff... */
- chip->chip_status &= ~(VX_STAT_IN_SUSPEND|VX_STAT_CHIP_INIT);
-}
-
-#endif
-
/*
* module entries
*/
*/
EXPORT_SYMBOL(snd_vx_check_reg_bit);
EXPORT_SYMBOL(snd_vx_create);
-EXPORT_SYMBOL(snd_vx_hwdep_new);
+EXPORT_SYMBOL(snd_vx_setup_firmware);
+EXPORT_SYMBOL(snd_vx_free_firmware);
EXPORT_SYMBOL(snd_vx_irq_handler);
EXPORT_SYMBOL(snd_vx_delay);
EXPORT_SYMBOL(snd_vx_dsp_boot);
EXPORT_SYMBOL(snd_vx_dsp_load);
EXPORT_SYMBOL(snd_vx_load_boot_image);
-#ifdef CONFIG_PM
-EXPORT_SYMBOL(snd_vx_suspend);
-EXPORT_SYMBOL(snd_vx_resume);
-#endif
git://git.onelab.eu / linux-2.6.git / blobdiff