ALSA: wss_lib: rename cs4321_foo to wss_foo

Rename functions and structures from the former
cs4321_lib to names more corresponding with the
new name: wss_lib.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

1 files changed, 96 insertions, 76 deletions

diff --git a/include/sound/wss.h b/include/sound/wss.h
index f0785f9f4ae..3b53973f96a 100644
--- a/include/sound/wss.h
+++ b/include/sound/wss.h
@@ -1,5 +1,5 @@
-#ifndef __SOUND_CS4231_H
-#define __SOUND_CS4231_H
+#ifndef __SOUND_WSS_H
+#define __SOUND_WSS_H
 
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
@@ -30,42 +30,42 @@
 
 /* defines for codec.mode */
 
-#define CS4231_MODE_NONE        0x0000
-#define CS4231_MODE_PLAY        0x0001
-#define CS4231_MODE_RECORD      0x0002
-#define CS4231_MODE_TIMER       0x0004
-#define CS4231_MODE_OPEN        (CS4231_MODE_PLAY|CS4231_MODE_RECORD|CS4231_MODE_TIMER)
+#define WSS_MODE_NONE   0x0000
+#define WSS_MODE_PLAY   0x0001
+#define WSS_MODE_RECORD 0x0002
+#define WSS_MODE_TIMER  0x0004
+#define WSS_MODE_OPEN   (WSS_MODE_PLAY|WSS_MODE_RECORD|WSS_MODE_TIMER)
 
 /* defines for codec.hardware */
 
-#define CS4231_HW_DETECT        0x0000  /* let CS4231 driver detect chip */
-#define CS4231_HW_DETECT3       0x0001  /* allow mode 3 */
-#define CS4231_HW_TYPE_MASK     0xff00  /* type mask */
-#define CS4231_HW_CS4231_MASK   0x0100  /* CS4231 serie */
-#define CS4231_HW_CS4231        0x0100  /* CS4231 chip */
-#define CS4231_HW_CS4231A       0x0101  /* CS4231A chip */
-#define CS4231_HW_AD1845        0x0102  /* AD1845 chip */
-#define CS4231_HW_CS4232_MASK   0x0200  /* CS4232 serie (has control ports) */
-#define CS4231_HW_CS4232        0x0200  /* CS4232 */
-#define CS4231_HW_CS4232A       0x0201  /* CS4232A */
-#define CS4231_HW_CS4236        0x0202  /* CS4236 */
-#define CS4231_HW_CS4236B_MASK  0x0400  /* CS4236B serie (has extended control regs) */
-#define CS4231_HW_CS4235        0x0400  /* CS4235 - Crystal Clear (tm) stereo enhancement */
-#define CS4231_HW_CS4236B       0x0401  /* CS4236B */
-#define CS4231_HW_CS4237B       0x0402  /* CS4237B - SRS 3D */
-#define CS4231_HW_CS4238B       0x0403  /* CS4238B - QSOUND 3D */
-#define CS4231_HW_CS4239        0x0404  /* CS4239 - Crystal Clear (tm) stereo enhancement */
+#define WSS_HW_DETECT        0x0000     /* let CS4231 driver detect chip */
+#define WSS_HW_DETECT3  0x0001  /* allow mode 3 */
+#define WSS_HW_TYPE_MASK        0xff00  /* type mask */
+#define WSS_HW_CS4231_MASK   0x0100     /* CS4231 serie */
+#define WSS_HW_CS4231        0x0100     /* CS4231 chip */
+#define WSS_HW_CS4231A       0x0101     /* CS4231A chip */
+#define WSS_HW_AD1845   0x0102  /* AD1845 chip */
+#define WSS_HW_CS4232_MASK   0x0200     /* CS4232 serie (has control ports) */
+#define WSS_HW_CS4232        0x0200     /* CS4232 */
+#define WSS_HW_CS4232A       0x0201     /* CS4232A */
+#define WSS_HW_CS4236   0x0202  /* CS4236 */
+#define WSS_HW_CS4236B_MASK     0x0400  /* CS4236B serie (has extended control regs) */
+#define WSS_HW_CS4235   0x0400  /* CS4235 - Crystal Clear (tm) stereo enhancement */
+#define WSS_HW_CS4236B       0x0401     /* CS4236B */
+#define WSS_HW_CS4237B       0x0402     /* CS4237B - SRS 3D */
+#define WSS_HW_CS4238B  0x0403  /* CS4238B - QSOUND 3D */
+#define WSS_HW_CS4239   0x0404  /* CS4239 - Crystal Clear (tm) stereo enhancement */
 /* compatible, but clones */
-#define CS4231_HW_INTERWAVE     0x1000  /* InterWave chip */
-#define CS4231_HW_OPL3SA2       0x1101  /* OPL3-SA2 chip, similar to cs4231 */
-#define CS4231_HW_OPTI93X       0x1102  /* Opti 930/931/933 */
+#define WSS_HW_INTERWAVE     0x1000     /* InterWave chip */
+#define WSS_HW_OPL3SA2       0x1101     /* OPL3-SA2 chip, similar to cs4231 */
+#define WSS_HW_OPTI93X  0x1102  /* Opti 930/931/933 */
 
 /* defines for codec.hwshare */
-#define CS4231_HWSHARE_IRQ      (1<<0)
-#define CS4231_HWSHARE_DMA1     (1<<1)
-#define CS4231_HWSHARE_DMA2     (1<<2)
+#define WSS_HWSHARE_IRQ (1<<0)
+#define WSS_HWSHARE_DMA1        (1<<1)
+#define WSS_HWSHARE_DMA2        (1<<2)
 
-struct snd_cs4231 {
+struct snd_wss {
         unsigned long port;             /* base i/o port */
         struct resource *res_port;
         unsigned long cport;            /* control base i/o port (CS4236) */
@@ -74,8 +74,8 @@ struct snd_cs4231 {
         int dma1;                       /* playback DMA */
         int dma2;                       /* record DMA */
         unsigned short version;         /* version of CODEC chip */
-        unsigned short mode;            /* see to CS4231_MODE_XXXX */
-        unsigned short hardware;        /* see to CS4231_HW_XXXX */
+        unsigned short mode;            /* see to WSS_MODE_XXXX */
+        unsigned short hardware;        /* see to WSS_HW_XXXX */
         unsigned short hwshare;         /* shared resources */
         unsigned short single_dma:1,    /* forced single DMA mode (GUS 16-bit daughter board) or dma1 == dma2 */
                        ebus_flag:1;     /* SPARC: EBUS present */
@@ -100,43 +100,50 @@ struct snd_cs4231 {
         struct mutex open_mutex;
 
         int (*rate_constraint) (struct snd_pcm_runtime *runtime);
-        void (*set_playback_format) (struct snd_cs4231 *chip, struct snd_pcm_hw_params *hw_params, unsigned char pdfr);
-        void (*set_capture_format) (struct snd_cs4231 *chip, struct snd_pcm_hw_params *hw_params, unsigned char cdfr);
-        void (*trigger) (struct snd_cs4231 *chip, unsigned int what, int start);
+        void (*set_playback_format) (struct snd_wss *chip,
+                                     struct snd_pcm_hw_params *hw_params,
+                                     unsigned char pdfr);
+        void (*set_capture_format) (struct snd_wss *chip,
+                                    struct snd_pcm_hw_params *hw_params,
+                                    unsigned char cdfr);
+        void (*trigger) (struct snd_wss *chip, unsigned int what, int start);
 #ifdef CONFIG_PM
-        void (*suspend) (struct snd_cs4231 *chip);
-        void (*resume) (struct snd_cs4231 *chip);
+        void (*suspend) (struct snd_wss *chip);
+        void (*resume) (struct snd_wss *chip);
 #endif
         void *dma_private_data;
-        int (*claim_dma) (struct snd_cs4231 *chip, void *dma_private_data, int dma);
-        int (*release_dma) (struct snd_cs4231 *chip, void *dma_private_data, int dma);
+        int (*claim_dma) (struct snd_wss *chip,
+                          void *dma_private_data, int dma);
+        int (*release_dma) (struct snd_wss *chip,
+                            void *dma_private_data, int dma);
 };
 
 /* exported functions */
 
-void snd_cs4231_out(struct snd_cs4231 *chip, unsigned char reg, unsigned char val);
-unsigned char snd_cs4231_in(struct snd_cs4231 *chip, unsigned char reg);
-void snd_cs4236_ext_out(struct snd_cs4231 *chip, unsigned char reg, unsigned char val);
-unsigned char snd_cs4236_ext_in(struct snd_cs4231 *chip, unsigned char reg);
-void snd_cs4231_mce_up(struct snd_cs4231 *chip);
-void snd_cs4231_mce_down(struct snd_cs4231 *chip);
+void snd_wss_out(struct snd_wss *chip, unsigned char reg, unsigned char val);
+unsigned char snd_wss_in(struct snd_wss *chip, unsigned char reg);
+void snd_cs4236_ext_out(struct snd_wss *chip,
+                        unsigned char reg, unsigned char val);
+unsigned char snd_cs4236_ext_in(struct snd_wss *chip, unsigned char reg);
+void snd_wss_mce_up(struct snd_wss *chip);
+void snd_wss_mce_down(struct snd_wss *chip);
 
-void snd_cs4231_overrange(struct snd_cs4231 *chip);
+void snd_wss_overrange(struct snd_wss *chip);
 
-irqreturn_t snd_cs4231_interrupt(int irq, void *dev_id);
+irqreturn_t snd_wss_interrupt(int irq, void *dev_id);
 
-const char *snd_cs4231_chip_id(struct snd_cs4231 *chip);
+const char *snd_wss_chip_id(struct snd_wss *chip);
 
-int snd_cs4231_create(struct snd_card *card,
+int snd_wss_create(struct snd_card *card,
                       unsigned long port,
                       unsigned long cport,
                       int irq, int dma1, int dma2,
                       unsigned short hardware,
                       unsigned short hwshare,
-                      struct snd_cs4231 ** rchip);
-int snd_cs4231_pcm(struct snd_cs4231 * chip, int device, struct snd_pcm **rpcm);
-int snd_cs4231_timer(struct snd_cs4231 * chip, int device, struct snd_timer **rtimer);
-int snd_cs4231_mixer(struct snd_cs4231 * chip);
+                      struct snd_wss **rchip);
+int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm);
+int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer);
+int snd_wss_mixer(struct snd_wss *chip);
 
 int snd_cs4236_create(struct snd_card *card,
                       unsigned long port,
@@ -144,32 +151,45 @@ int snd_cs4236_create(struct snd_card *card,
                       int irq, int dma1, int dma2,
                       unsigned short hardware,
                       unsigned short hwshare,
-                      struct snd_cs4231 ** rchip);
-int snd_cs4236_pcm(struct snd_cs4231 * chip, int device, struct snd_pcm **rpcm);
-int snd_cs4236_mixer(struct snd_cs4231 * chip);
+                      struct snd_wss **rchip);
+int snd_cs4236_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm);
+int snd_cs4236_mixer(struct snd_wss *chip);
 
 /*
  *  mixer library
  */
 
-#define CS4231_SINGLE(xname, xindex, reg, shift, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .info = snd_cs4231_info_single, \
-  .get = snd_cs4231_get_single, .put = snd_cs4231_put_single, \
+#define WSS_SINGLE(xname, xindex, reg, shift, mask, invert) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+  .name = xname, \
+  .index = xindex, \
+  .info = snd_wss_info_single, \
+  .get = snd_wss_get_single, \
+  .put = snd_wss_put_single, \
   .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
-int snd_cs4231_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
-int snd_cs4231_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-int snd_cs4231_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-
-#define CS4231_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .info = snd_cs4231_info_double, \
-  .get = snd_cs4231_get_double, .put = snd_cs4231_put_double, \
-  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
-
-int snd_cs4231_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
-int snd_cs4231_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-int snd_cs4231_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-
-#endif /* __SOUND_CS4231_H */
+int snd_wss_info_single(struct snd_kcontrol *kcontrol,
+                        struct snd_ctl_elem_info *uinfo);
+int snd_wss_get_single(struct snd_kcontrol *kcontrol,
+                        struct snd_ctl_elem_value *ucontrol);
+int snd_wss_put_single(struct snd_kcontrol *kcontrol,
+                        struct snd_ctl_elem_value *ucontrol);
+
+#define WSS_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+  .name = xname, \
+  .index = xindex, \
+  .info = snd_wss_info_double, \
+  .get = snd_wss_get_double, \
+  .put = snd_wss_put_double, \
+  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | \
+                   (shift_right << 19) | (mask << 24) | (invert << 22) }
+
+int snd_wss_info_double(struct snd_kcontrol *kcontrol,
+                        struct snd_ctl_elem_info *uinfo);
+int snd_wss_get_double(struct snd_kcontrol *kcontrol,
+                        struct snd_ctl_elem_value *ucontrol);
+int snd_wss_put_double(struct snd_kcontrol *kcontrol,
+                        struct snd_ctl_elem_value *ucontrol);
+
+#endif /* __SOUND_WSS_H */