git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
drivers
/
vx
/
vx_hwdep.c
diff --git
a/sound/drivers/vx/vx_hwdep.c
b/sound/drivers/vx/vx_hwdep.c
index
9a3dc3c
..
e1920af
100644
(file)
--- a/
sound/drivers/vx/vx_hwdep.c
+++ b/
sound/drivers/vx/vx_hwdep.c
@@
-23,13
+23,14
@@
#include <sound/driver.h>
#include <linux/device.h>
#include <linux/firmware.h>
#include <sound/driver.h>
#include <linux/device.h>
#include <linux/firmware.h>
+#include <linux/vmalloc.h>
#include <sound/core.h>
#include <sound/hwdep.h>
#include <sound/vx_core.h>
#ifdef SND_VX_FW_LOADER
#include <sound/core.h>
#include <sound/hwdep.h>
#include <sound/vx_core.h>
#ifdef SND_VX_FW_LOADER
-int snd_vx_setup_firmware(
vx_core_t
*chip)
+int snd_vx_setup_firmware(
struct vx_core
*chip)
{
static char *fw_files[VX_TYPE_NUMS][4] = {
[VX_TYPE_BOARD] = {
{
static char *fw_files[VX_TYPE_NUMS][4] = {
[VX_TYPE_BOARD] = {
@@
-94,7
+95,7
@@
int snd_vx_setup_firmware(vx_core_t *chip)
}
/* exported */
}
/* exported */
-void snd_vx_free_firmware(
vx_core_t
*chip)
+void snd_vx_free_firmware(
struct vx_core
*chip)
{
#ifdef CONFIG_PM
int i;
{
#ifdef CONFIG_PM
int i;
@@
-105,17
+106,18
@@
void snd_vx_free_firmware(vx_core_t *chip)
#else /* old style firmware loading */
#else /* old style firmware loading */
-static int vx_hwdep_open(s
nd_hwdep_t
*hw, struct file *file)
+static int vx_hwdep_open(s
truct snd_hwdep
*hw, struct file *file)
{
return 0;
}
{
return 0;
}
-static int vx_hwdep_release(s
nd_hwdep_t
*hw, struct file *file)
+static int vx_hwdep_release(s
truct snd_hwdep
*hw, struct file *file)
{
return 0;
}
{
return 0;
}
-static int vx_hwdep_dsp_status(snd_hwdep_t *hw, snd_hwdep_dsp_status_t *info)
+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",
{
static char *type_ids[VX_TYPE_NUMS] = {
[VX_TYPE_BOARD] = "vxboard",
@@
-124,7
+126,7
@@
static int vx_hwdep_dsp_status(snd_hwdep_t *hw, snd_hwdep_dsp_status_t *info)
[VX_TYPE_VXPOCKET] = "vxpocket",
[VX_TYPE_VXP440] = "vxp440",
};
[VX_TYPE_VXPOCKET] = "vxpocket",
[VX_TYPE_VXP440] = "vxp440",
};
-
vx_core_t
*vx = hw->private_data;
+
struct vx_core
*vx = hw->private_data;
snd_assert(type_ids[vx->type], return -EINVAL);
strcpy(info->id, type_ids[vx->type]);
snd_assert(type_ids[vx->type], return -EINVAL);
strcpy(info->id, type_ids[vx->type]);
@@
-146,9
+148,10
@@
static void free_fw(const struct firmware *fw)
}
}
}
}
-static int vx_hwdep_dsp_load(snd_hwdep_t *hw, snd_hwdep_dsp_image_t *dsp)
+static int vx_hwdep_dsp_load(struct snd_hwdep *hw,
+ struct snd_hwdep_dsp_image *dsp)
{
{
-
vx_core_t
*vx = hw->private_data;
+
struct vx_core
*vx = hw->private_data;
int index, err;
struct firmware *fw;
int index, err;
struct firmware *fw;
@@
-215,10
+218,10
@@
static int vx_hwdep_dsp_load(snd_hwdep_t *hw, snd_hwdep_dsp_image_t *dsp)
/* exported */
/* exported */
-int snd_vx_setup_firmware(
vx_core_t
*chip)
+int snd_vx_setup_firmware(
struct vx_core
*chip)
{
int err;
{
int err;
- s
nd_hwdep_t
*hw;
+ s
truct snd_hwdep
*hw;
if ((err = snd_hwdep_new(chip->card, SND_VX_HWDEP_ID, 0, &hw)) < 0)
return err;
if ((err = snd_hwdep_new(chip->card, SND_VX_HWDEP_ID, 0, &hw)) < 0)
return err;
@@
-237,7
+240,7
@@
int snd_vx_setup_firmware(vx_core_t *chip)
}
/* exported */
}
/* exported */
-void snd_vx_free_firmware(
vx_core_t
*chip)
+void snd_vx_free_firmware(
struct vx_core
*chip)
{
#ifdef CONFIG_PM
int i;
{
#ifdef CONFIG_PM
int i;
@@
-247,3
+250,6
@@
void snd_vx_free_firmware(vx_core_t *chip)
}
#endif /* SND_VX_FW_LOADER */
}
#endif /* SND_VX_FW_LOADER */
+
+EXPORT_SYMBOL(snd_vx_setup_firmware);
+EXPORT_SYMBOL(snd_vx_free_firmware);