Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7779f75f authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Jaroslav Kysela
Browse files

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: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 61ef19d7

include/sound/wss.h

+96 −76
Original line number Diff line number Diff line 
#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 */

sound/isa/azt2320.c

+15 −12
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ struct snd_card_azt2320 { 
	int dev_no;

	struct pnp_dev *dev;

	struct pnp_dev *devmpu;

	struct snd_cs4231 *chip;

	struct snd_wss *chip;

};



static struct pnp_card_device_id snd_azt2320_pnpids[] = {
@@ -181,7 +181,7 @@ static int __devinit snd_card_azt2320_probe(int dev, 
	int error;

	struct snd_card *card;

	struct snd_card_azt2320 *acard;

	struct snd_cs4231 *chip;

	struct snd_wss *chip;

	struct snd_opl3 *opl3;



	if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
@@ -200,11 +200,11 @@ static int __devinit snd_card_azt2320_probe(int dev, 
		return error;

	}



	if ((error = snd_cs4231_create(card, wss_port[dev], -1,

	error = snd_wss_create(card, wss_port[dev], -1,

			       irq[dev],

				       dma1[dev],

				       dma2[dev],

				       CS4231_HW_DETECT, 0, &chip)) < 0) {

			       dma1[dev], dma2[dev],

			       WSS_HW_DETECT, 0, &chip);

	if (error < 0) {

		snd_card_free(card);

		return error;

	}
@@ -214,15 +214,18 @@ static int __devinit snd_card_azt2320_probe(int dev, 
	sprintf(card->longname, "%s, WSS at 0x%lx, irq %i, dma %i&%i",

		card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);



	if ((error = snd_cs4231_pcm(chip, 0, NULL)) < 0) {

	error = snd_wss_pcm(chip, 0, NULL);

	if (error < 0) {

		snd_card_free(card);

		return error;

	}

	if ((error = snd_cs4231_mixer(chip)) < 0) {

	error = snd_wss_mixer(chip);

	if (error < 0) {

		snd_card_free(card);

		return error;

	}

	if ((error = snd_cs4231_timer(chip, 0, NULL)) < 0) {

	error = snd_wss_timer(chip, 0, NULL);

	if (error < 0) {

		snd_card_free(card);

		return error;

	}
@@ -293,7 +296,7 @@ static int snd_azt2320_pnp_suspend(struct pnp_card_link *pcard, pm_message_t sta 
{

	struct snd_card *card = pnp_get_card_drvdata(pcard);

	struct snd_card_azt2320 *acard = card->private_data;

	struct snd_cs4231 *chip = acard->chip;

	struct snd_wss *chip = acard->chip;



	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);

	chip->suspend(chip);
@@ -304,7 +307,7 @@ static int snd_azt2320_pnp_resume(struct pnp_card_link *pcard) 
{

	struct snd_card *card = pnp_get_card_drvdata(pcard);

	struct snd_card_azt2320 *acard = card->private_data;

	struct snd_cs4231 *chip = acard->chip;

	struct snd_wss *chip = acard->chip;



	chip->resume(chip);

	snd_power_change_state(card, SNDRV_CTL_POWER_D0);

sound/isa/cs423x/cs4231.c

+8 −8
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int __devinit snd_cs4231_match(struct device *dev, unsigned int n) 
static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n)

{

	struct snd_card *card;

	struct snd_cs4231 *chip;

	struct snd_wss *chip;

	struct snd_pcm *pcm;

	int error;
@@ -99,14 +99,14 @@ static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n) 
	if (!card)

		return -EINVAL;



	error = snd_cs4231_create(card, port[n], -1, irq[n], dma1[n], dma2[n],

			CS4231_HW_DETECT, 0, &chip);

	error = snd_wss_create(card, port[n], -1, irq[n], dma1[n], dma2[n],

			WSS_HW_DETECT, 0, &chip);

	if (error < 0)

		goto out;



	card->private_data = chip;



	error = snd_cs4231_pcm(chip, 0, &pcm);

	error = snd_wss_pcm(chip, 0, &pcm);

	if (error < 0)

		goto out;
@@ -118,11 +118,11 @@ static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n) 
	if (dma2[n] >= 0)

		sprintf(card->longname + strlen(card->longname), "&%d", dma2[n]);



	error = snd_cs4231_mixer(chip);

	error = snd_wss_mixer(chip);

	if (error < 0)

		goto out;



	error = snd_cs4231_timer(chip, 0, NULL);

	error = snd_wss_timer(chip, 0, NULL);

	if (error < 0)

		goto out;
@@ -160,7 +160,7 @@ static int __devexit snd_cs4231_remove(struct device *dev, unsigned int n) 
static int snd_cs4231_suspend(struct device *dev, unsigned int n, pm_message_t state)

{

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_cs4231 *chip = card->private_data;

	struct snd_wss *chip = card->private_data;



	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);

	chip->suspend(chip);
@@ -170,7 +170,7 @@ static int snd_cs4231_suspend(struct device *dev, unsigned int n, pm_message_t s 
static int snd_cs4231_resume(struct device *dev, unsigned int n)

{

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_cs4231 *chip = card->private_data;

	struct snd_wss *chip = card->private_data;



	chip->resume(chip);

	snd_power_change_state(card, SNDRV_CTL_POWER_D0);

sound/isa/cs423x/cs4236.c

+22 −25
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int pnp_registered; 
#endif /* CONFIG_PNP */



struct snd_card_cs4236 {

	struct snd_cs4231 *chip;

	struct snd_wss *chip;

	struct resource *res_sb_port;

#ifdef CONFIG_PNP

	struct pnp_dev *wss;
@@ -396,7 +396,7 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) 
{

	struct snd_card_cs4236 *acard;

	struct snd_pcm *pcm;

	struct snd_cs4231 *chip;

	struct snd_wss *chip;

	struct snd_opl3 *opl3;

	int err;
@@ -408,41 +408,37 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) 
		}



#ifdef CS4232

	if ((err = snd_cs4231_create(card,

				     port[dev],

				     cport[dev],

	err = snd_wss_create(card, port[dev], cport[dev],

			     irq[dev],

				     dma1[dev],

				     dma2[dev],

				     CS4231_HW_DETECT,

				     0,

				     &chip)) < 0)

			     dma1[dev], dma2[dev],

			     WSS_HW_DETECT, 0, &chip);

	if (err < 0)

		return err;

	acard->chip = chip;



	if ((err = snd_cs4231_pcm(chip, 0, &pcm)) < 0)

	err = snd_wss_pcm(chip, 0, &pcm);

	if (err < 0)

		return err;



	if ((err = snd_cs4231_mixer(chip)) < 0)

	err = snd_wss_mixer(chip);

	if (err < 0)

		return err;



#else /* CS4236 */

	if ((err = snd_cs4236_create(card,

				     port[dev],

				     cport[dev],

				     irq[dev],

				     dma1[dev],

				     dma2[dev],

				     CS4231_HW_DETECT,

				     0,

				     &chip)) < 0)

	err = snd_cs4236_create(card,

				port[dev], cport[dev],

				irq[dev], dma1[dev], dma2[dev],

				WSS_HW_DETECT, 0, &chip);

	if (err < 0)

		return err;

	acard->chip = chip;



	if ((err = snd_cs4236_pcm(chip, 0, &pcm)) < 0)

	err = snd_cs4236_pcm(chip, 0, &pcm);

	if (err < 0)

		return err;



	if ((err = snd_cs4236_mixer(chip)) < 0)

	err = snd_cs4236_mixer(chip);

	if (err < 0)

		return err;

#endif

	strcpy(card->driver, pcm->name);
@@ -455,7 +451,8 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) 
	if (dma2[dev] >= 0)

		sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);



	if ((err = snd_cs4231_timer(chip, 0, NULL)) < 0)

	err = snd_wss_timer(chip, 0, NULL);

	if (err < 0)

		return err;



	if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {

sound/isa/cs423x/cs4236_lib.c

+204 −140

File changed.

Preview size limit exceeded, changes collapsed.