ALSA: vx: hard dependency on the standard fw loader
Yet again like previous two commits, drop the old hwdep user-space firmware code from vx driver (snd-vxpocket and snd-vx222). Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
parent
d19144987c
commit
0d144de9af
|
|
@ -27,12 +27,6 @@
|
|||
#include <sound/hwdep.h>
|
||||
#include <linux/interrupt.h>
|
||||
|
||||
#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
|
||||
#if !defined(CONFIG_USE_VXLOADER) && !defined(CONFIG_SND_VX_LIB) /* built-in kernel */
|
||||
#define SND_VX_FW_LOADER /* use the standard firmware loader */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
struct firmware;
|
||||
struct device;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ config SND_OPL4_LIB
|
|||
|
||||
config SND_VX_LIB
|
||||
tristate
|
||||
select FW_LOADER
|
||||
select SND_HWDEP
|
||||
select SND_PCM
|
||||
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@
|
|||
#include <sound/hwdep.h>
|
||||
#include <sound/vx_core.h>
|
||||
|
||||
#ifdef SND_VX_FW_LOADER
|
||||
|
||||
MODULE_FIRMWARE("vx/bx_1_vxp.b56");
|
||||
MODULE_FIRMWARE("vx/bx_1_vp4.b56");
|
||||
MODULE_FIRMWARE("vx/x1_1_vx2.xlx");
|
||||
|
|
@ -119,142 +117,5 @@ void snd_vx_free_firmware(struct vx_core *chip)
|
|||
#endif
|
||||
}
|
||||
|
||||
#else /* old style firmware loading */
|
||||
|
||||
static int vx_hwdep_dsp_status(struct snd_hwdep *hw,
|
||||
struct snd_hwdep_dsp_status *info)
|
||||
{
|
||||
static char *type_ids[VX_TYPE_NUMS] = {
|
||||
[VX_TYPE_BOARD] = "vxboard",
|
||||
[VX_TYPE_V2] = "vx222",
|
||||
[VX_TYPE_MIC] = "vx222",
|
||||
[VX_TYPE_VXPOCKET] = "vxpocket",
|
||||
[VX_TYPE_VXP440] = "vxp440",
|
||||
};
|
||||
struct vx_core *vx = hw->private_data;
|
||||
|
||||
if (snd_BUG_ON(!type_ids[vx->type]))
|
||||
return -EINVAL;
|
||||
strcpy(info->id, type_ids[vx->type]);
|
||||
if (vx_is_pcmcia(vx))
|
||||
info->num_dsps = 4;
|
||||
else
|
||||
info->num_dsps = 3;
|
||||
if (vx->chip_status & VX_STAT_CHIP_INIT)
|
||||
info->chip_ready = 1;
|
||||
info->version = VX_DRIVER_VERSION;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void free_fw(const struct firmware *fw)
|
||||
{
|
||||
if (fw) {
|
||||
vfree(fw->data);
|
||||
kfree(fw);
|
||||
}
|
||||
}
|
||||
|
||||
static int vx_hwdep_dsp_load(struct snd_hwdep *hw,
|
||||
struct snd_hwdep_dsp_image *dsp)
|
||||
{
|
||||
struct vx_core *vx = hw->private_data;
|
||||
int index, err;
|
||||
struct firmware *fw;
|
||||
|
||||
if (snd_BUG_ON(!vx->ops->load_dsp))
|
||||
return -ENXIO;
|
||||
|
||||
fw = kmalloc(sizeof(*fw), GFP_KERNEL);
|
||||
if (! fw) {
|
||||
snd_printk(KERN_ERR "cannot allocate firmware\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
fw->size = dsp->length;
|
||||
fw->data = vmalloc(fw->size);
|
||||
if (! fw->data) {
|
||||
snd_printk(KERN_ERR "cannot allocate firmware image (length=%d)\n",
|
||||
(int)fw->size);
|
||||
kfree(fw);
|
||||
return -ENOMEM;
|
||||
}
|
||||
if (copy_from_user((void *)fw->data, dsp->image, dsp->length)) {
|
||||
free_fw(fw);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
index = dsp->index;
|
||||
if (! vx_is_pcmcia(vx))
|
||||
index++;
|
||||
err = vx->ops->load_dsp(vx, index, fw);
|
||||
if (err < 0) {
|
||||
free_fw(fw);
|
||||
return err;
|
||||
}
|
||||
#ifdef CONFIG_PM
|
||||
vx->firmware[index] = fw;
|
||||
#else
|
||||
free_fw(fw);
|
||||
#endif
|
||||
|
||||
if (index == 1)
|
||||
vx->chip_status |= VX_STAT_XILINX_LOADED;
|
||||
if (index < 3)
|
||||
return 0;
|
||||
|
||||
/* ok, we reached to the last one */
|
||||
/* create the devices if not built yet */
|
||||
if (! (vx->chip_status & VX_STAT_DEVICE_INIT)) {
|
||||
if ((err = snd_vx_pcm_new(vx)) < 0)
|
||||
return err;
|
||||
|
||||
if ((err = snd_vx_mixer_new(vx)) < 0)
|
||||
return err;
|
||||
|
||||
if (vx->ops->add_controls)
|
||||
if ((err = vx->ops->add_controls(vx)) < 0)
|
||||
return err;
|
||||
|
||||
if ((err = snd_card_register(vx->card)) < 0)
|
||||
return err;
|
||||
|
||||
vx->chip_status |= VX_STAT_DEVICE_INIT;
|
||||
}
|
||||
vx->chip_status |= VX_STAT_CHIP_INIT;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* exported */
|
||||
int snd_vx_setup_firmware(struct vx_core *chip)
|
||||
{
|
||||
int err;
|
||||
struct snd_hwdep *hw;
|
||||
|
||||
if ((err = snd_hwdep_new(chip->card, SND_VX_HWDEP_ID, 0, &hw)) < 0)
|
||||
return err;
|
||||
|
||||
hw->iface = SNDRV_HWDEP_IFACE_VX;
|
||||
hw->private_data = chip;
|
||||
hw->ops.dsp_status = vx_hwdep_dsp_status;
|
||||
hw->ops.dsp_load = vx_hwdep_dsp_load;
|
||||
hw->exclusive = 1;
|
||||
sprintf(hw->name, "VX Loader (%s)", chip->card->driver);
|
||||
chip->hwdep = hw;
|
||||
|
||||
return snd_card_register(chip->card);
|
||||
}
|
||||
|
||||
/* exported */
|
||||
void snd_vx_free_firmware(struct vx_core *chip)
|
||||
{
|
||||
#ifdef CONFIG_PM
|
||||
int i;
|
||||
for (i = 0; i < 4; i++)
|
||||
free_fw(chip->firmware[i]);
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif /* SND_VX_FW_LOADER */
|
||||
|
||||
EXPORT_SYMBOL(snd_vx_setup_firmware);
|
||||
EXPORT_SYMBOL(snd_vx_free_firmware);
|
||||
|
|
|
|||
Reference in New Issue