adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ALSA] snd-powermac: style burgundy.c

Browse source 
Coding style corrections for burgundy.c.

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Risto Suominen 2008-04-16 19:45:51 +02:00 committed by Takashi Iwai
parent 44deee129c
commit 20861fa7b2
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sound/ppc/burgundy.c
View file

@ -102,7 +102,8 @@ snd_pmac_burgundy_rcw(struct snd_pmac *chip, unsigned addr)
} }
static void static void
snd_pmac_burgundy_wcb(struct snd_pmac *chip, unsigned int addr, unsigned int val) snd_pmac_burgundy_wcb(struct snd_pmac *chip, unsigned int addr,
unsigned int val)
{ {
out_le32(&chip->awacs->codec_ctrl, addr + 0x300000 + (val & 0xff)); out_le32(&chip->awacs->codec_ctrl, addr + 0x300000 + (val & 0xff));
snd_pmac_burgundy_busy_wait(chip); snd_pmac_burgundy_busy_wait(chip);
@ -126,8 +127,11 @@ snd_pmac_burgundy_rcb(struct snd_pmac *chip, unsigned int addr)
return val; return val;
} }
#define BASE2ADDR(base) ((base) << 12)
#define ADDR2BASE(addr) ((addr) >> 12)
/* /*
* Burgundy volume: 0 - 100, stereo * Burgundy volume: 0 - 100, stereo, word reg
*/ */
static void static void
snd_pmac_burgundy_write_volume(struct snd_pmac *chip, unsigned int address, snd_pmac_burgundy_write_volume(struct snd_pmac *chip, unsigned int address,
@ -168,13 +172,6 @@ snd_pmac_burgundy_read_volume(struct snd_pmac *chip, unsigned int address,
volume[1] = 0; volume[1] = 0;
} }
/*
*/
#define BASE2ADDR(base) ((base) << 12)
#define ADDR2BASE(addr) ((addr) >> 12)
static int snd_pmac_burgundy_info_volume(struct snd_kcontrol *kcontrol, static int snd_pmac_burgundy_info_volume(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
@ -191,8 +188,8 @@ static int snd_pmac_burgundy_get_volume(struct snd_kcontrol *kcontrol,
struct snd_pmac *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff); unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff);
int shift = (kcontrol->private_value >> 8) & 0xff; int shift = (kcontrol->private_value >> 8) & 0xff;
snd_pmac_burgundy_read_volume(chip, addr, ucontrol->value.integer.value, snd_pmac_burgundy_read_volume(chip, addr,
shift); ucontrol->value.integer.value, shift);
return 0; return 0;
} }
@ -204,8 +201,8 @@ static int snd_pmac_burgundy_put_volume(struct snd_kcontrol *kcontrol,
int shift = (kcontrol->private_value >> 8) & 0xff; int shift = (kcontrol->private_value >> 8) & 0xff;
long nvoices[2]; long nvoices[2];
snd_pmac_burgundy_write_volume(chip, addr, ucontrol->value.integer.value, snd_pmac_burgundy_write_volume(chip, addr,
shift); ucontrol->value.integer.value, shift);
snd_pmac_burgundy_read_volume(chip, addr, nvoices, shift); snd_pmac_burgundy_read_volume(chip, addr, nvoices, shift);
return (nvoices[0] != ucontrol->value.integer.value[0] || return (nvoices[0] != ucontrol->value.integer.value[0] ||
nvoices[1] != ucontrol->value.integer.value[1]); nvoices[1] != ucontrol->value.integer.value[1]);
@ -700,7 +697,8 @@ int __init snd_pmac_burgundy_init(struct snd_pmac *chip)
chip->master_sw_ctl = snd_ctl_new1(imac chip->master_sw_ctl = snd_ctl_new1(imac
? &snd_pmac_burgundy_master_sw_imac ? &snd_pmac_burgundy_master_sw_imac
: &snd_pmac_burgundy_master_sw_pmac, chip); : &snd_pmac_burgundy_master_sw_pmac, chip);
if ((err = snd_ctl_add(chip->card, chip->master_sw_ctl)) < 0) err = snd_ctl_add(chip->card, chip->master_sw_ctl);
if (err < 0)
return err; return err;
chip->master_sw_ctl = snd_ctl_new1(imac chip->master_sw_ctl = snd_ctl_new1(imac
? &snd_pmac_burgundy_line_sw_imac ? &snd_pmac_burgundy_line_sw_imac
@ -718,10 +716,12 @@ int __init snd_pmac_burgundy_init(struct snd_pmac *chip)
chip->speaker_sw_ctl = snd_ctl_new1(imac chip->speaker_sw_ctl = snd_ctl_new1(imac
? &snd_pmac_burgundy_speaker_sw_imac ? &snd_pmac_burgundy_speaker_sw_imac
: &snd_pmac_burgundy_speaker_sw_pmac, chip); : &snd_pmac_burgundy_speaker_sw_pmac, chip);
if ((err = snd_ctl_add(chip->card, chip->speaker_sw_ctl)) < 0) err = snd_ctl_add(chip->card, chip->speaker_sw_ctl);
if (err < 0)
return err; return err;
#ifdef PMAC_SUPPORT_AUTOMUTE #ifdef PMAC_SUPPORT_AUTOMUTE
if ((err = snd_pmac_add_automute(chip)) < 0) err = snd_pmac_add_automute(chip);
if (err < 0)
return err; return err;
chip->detect_headphone = snd_pmac_burgundy_detect_headphone; chip->detect_headphone = snd_pmac_burgundy_detect_headphone;