diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2005-06-30 13:40:51 +0200 |
|---|---|---|
| committer |   Jaroslav Kysela <perex@suse.cz> | 2005-07-28 12:09:56 +0200 |
| commit | 6d00a3127972e7853d6296ffc1e72c5b1a23d937 (patch) | |
| tree | 6c9018f16ed83400cb3297aa7c1ffea95cc03ff1 /sound/pcmcia/vx/vxpocket.h | |
| parent | [ALSA] Use kstrdup (diff) | |
| download | linux-dev-6d00a3127972e7853d6296ffc1e72c5b1a23d937.tar.xz linux-dev-6d00a3127972e7853d6296ffc1e72c5b1a23d937.zip | |
[ALSA] Fix and clean-up of vxpocket driver
Documentation,PCMCIA Kconfig,Digigram VX Pocket driver
- Fixed Oops with request_firmware()
- Detect the card type in runtime (vxpoocket v2 or 440)
- snd-vxp440 driver is merged to snd-vxpocket
- Clean up the code
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to '')
| -rw-r--r-- | sound/pcmcia/vx/vxpocket.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/sound/pcmcia/vx/vxpocket.h b/sound/pcmcia/vx/vxpocket.h index 4462c04a4e8f..70754aa3dd11 100644 --- a/sound/pcmcia/vx/vxpocket.h +++ b/sound/pcmcia/vx/vxpocket.h @@ -28,24 +28,6 @@ #include <pcmcia/cistpl.h> #include <pcmcia/ds.h> -struct snd_vxp_entry { - dev_info_t *dev_info; - - /* module parameters */ - int *index_table; - char **id_table; - int *enable_table; - int *ibl; - - /* h/w config */ - struct snd_vx_hardware *hardware; - struct snd_vx_ops *ops; - - /* slots */ - vx_core_t *card_list[SNDRV_CARDS]; - dev_link_t *dev_list; /* Linked list of devices */ -}; - struct snd_vxpocket { vx_core_t core; @@ -57,8 +39,7 @@ struct snd_vxpocket { unsigned int regCDSP; /* current CDSP register */ unsigned int regDIALOG; /* current DIALOG register */ - int index; - struct snd_vxp_entry *hw_entry; + int index; /* card index */ /* pcmcia stuff */ dev_link_t link; @@ -70,12 +51,6 @@ extern struct snd_vx_ops snd_vxpocket_ops; void vx_set_mic_boost(vx_core_t *chip, int boost); void vx_set_mic_level(vx_core_t *chip, int level); -/* - * pcmcia stuff - */ -dev_link_t *snd_vxpocket_attach(struct snd_vxp_entry *hw); -void snd_vxpocket_detach(struct snd_vxp_entry *hw, dev_link_t *link); - int vxp_add_mic_controls(vx_core_t *chip); /* Constants used to access the CDSP register (0x08). */ |