Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / sound / pcmcia / vx / vxpocket.h

diff --git a/sound/pcmcia/vx/vxpocket.h b/sound/pcmcia/vx/vxpocket.h
index 4462c04..27ea002 100644 (file)
--- a/sound/pcmcia/vx/vxpocket.h
+++ b/sound/pcmcia/vx/vxpocket.h
@@ -28,27 +28,9 @@
 #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;
+       struct vx_core core;
 
        unsigned long port;
 
@@ -57,26 +39,19 @@ 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;
+       struct pcmcia_device    *p_dev;
        dev_node_t node;
 };
 
 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);
+void vx_set_mic_boost(struct vx_core *chip, int boost);
+void vx_set_mic_level(struct vx_core *chip, int level);
 
-int vxp_add_mic_controls(vx_core_t *chip);
+int vxp_add_mic_controls(struct vx_core *chip);
 
 /* Constants used to access the CDSP register (0x08). */
 #define CDSP_MAGIC     0xA7    /* magic value (for read) */