From: Ezequiel Garcia <elezegarcia@gmail.com> To: <linux-kernel@vger.kernel.org>, alsa-devel@alsa-project.org Cc: Ezequiel Garcia <elezegarcia@gmail.com>, Ralf Baechle <ralf@linux-mips.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, Clemens Ladisch <clemens@ladisch.de> Subject: [PATCH 2/3] swarm_cs4297: Rename AC97 registers to use sound/ac97_codec.h definitions Date: Mon, 11 Jun 2012 16:58:50 -0300 [thread overview] Message-ID: <1339444731-15678-2-git-send-email-elezegarcia@gmail.com> (raw) In-Reply-To: <1339444731-15678-1-git-send-email-elezegarcia@gmail.com> This patch removes the last usage of linux/ac97_codec.h by renaming ac97 registers to use sound/ac97_codec.h definitions. This will enable us to remove linux/ac97_codec.h. Not even compilation tested. Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.de> Cc: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> --- Hi all, This patch is important so we can remove linux/ac97_codec.h usage. Since this driver is mips related, I can't test it until I install a mips toolchain. If someone can compile this for me, or even test it with real hardware I think it would be better. If not then I can install a mips toolchain and compile it myself, but I won't be able to test it on real hardware. This patch should be treated with carefully and be applied only if someone manages to test it. Regards, Ezequiel. --- sound/oss/swarm_cs4297a.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c index 09d4648..d0a1000 100644 --- a/sound/oss/swarm_cs4297a.c +++ b/sound/oss/swarm_cs4297a.c @@ -69,7 +69,6 @@ #include <linux/sound.h> #include <linux/slab.h> #include <linux/soundcard.h> -#include <linux/ac97_codec.h> #include <linux/pci.h> #include <linux/bitops.h> #include <linux/interrupt.h> @@ -77,6 +76,7 @@ #include <linux/poll.h> #include <linux/mutex.h> #include <linux/kernel.h> +#include <sound/ac97_codec.h> #include <asm/byteorder.h> #include <asm/dma.h> @@ -1162,10 +1162,10 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, }; static const unsigned mixreg[] = { - AC97_PCMOUT_VOL, - AC97_AUX_VOL, - AC97_CD_VOL, - AC97_LINEIN_VOL + AC97_PCM, + AC97_AUX, + AC97_CD, + AC97_LINE }; unsigned char l, r, rl, rr, vidx; unsigned char attentbl[11] = @@ -1264,7 +1264,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, if (_SIOC_DIR(cmd) == _SIOC_READ) { switch (_IOC_NR(cmd)) { case SOUND_MIXER_RECSRC: // Arg contains a bit for each recording source - cs4297a_read_ac97(s, AC97_RECORD_SELECT, + cs4297a_read_ac97(s, AC97_REC_SEL, &temp1); return put_user(mixer_src[temp1 & 7], (int *) arg); @@ -1314,7 +1314,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, if (val == mixer_src[i]) { temp1 = (i << 8) | i; cs4297a_write_ac97(s, - AC97_RECORD_SELECT, + AC97_REC_SEL, temp1); return 0; } @@ -1349,8 +1349,8 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, temp1 |= (rl << 8) | rr; - cs4297a_write_ac97(s, AC97_MASTER_VOL_STEREO, temp1); - cs4297a_write_ac97(s, AC97_PHONE_VOL, temp1); + cs4297a_write_ac97(s, AC97_MASTER, temp1); + cs4297a_write_ac97(s, AC97_PHONE, temp1); #ifdef OSS_DOCUMENTED_MIXER_SEMANTICS s->mix.vol[8] = ((unsigned int) r << 8) | l; @@ -1380,7 +1380,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, temp1 = 0; rl = 15 - rl; // Convert volume to attenuation. temp1 |= rl << 1; - cs4297a_write_ac97(s, AC97_PCBEEP_VOL, temp1); + cs4297a_write_ac97(s, AC97_PC_BEEP, temp1); #ifdef OSS_DOCUMENTED_MIXER_SEMANTICS s->mix.vol[6] = l << 8; @@ -1406,7 +1406,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, temp1 = 0; temp1 = temp1 | (rl << 8) | rr; - cs4297a_write_ac97(s, AC97_RECORD_GAIN, temp1); + cs4297a_write_ac97(s, AC97_REC_GAIN, temp1); #ifdef OSS_DOCUMENTED_MIXER_SEMANTICS s->mix.vol[7] = ((unsigned int) r << 8) | l; @@ -1428,7 +1428,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, rl = ((unsigned) l * 5 - 4) / 16; // Convert 0-100 range to 0-31. l = (rl * 16 + 4) / 5; } - cs4297a_read_ac97(s, AC97_MIC_VOL, &temp1); + cs4297a_read_ac97(s, AC97_MIC, &temp1); temp1 &= 0x40; // Isolate 20db gain bit. if (rl < 3) { temp1 |= 0x8000; @@ -1436,7 +1436,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, } rl = 31 - rl; // Convert volume to attenuation. temp1 |= rl; - cs4297a_write_ac97(s, AC97_MIC_VOL, temp1); + cs4297a_write_ac97(s, AC97_MIC, temp1); #ifdef OSS_DOCUMENTED_MIXER_SEMANTICS s->mix.vol[5] = val << 8; @@ -2690,7 +2690,7 @@ static int __init cs4297a_init(void) do { udelay(4000); - rval = cs4297a_read_ac97(s, AC97_POWER_CONTROL, &pwr); + rval = cs4297a_read_ac97(s, AC97_POWERDOWN, &pwr); } while (!rval && (pwr != 0xf)); if (!rval) { -- 1.7.4.4
WARNING: multiple messages have this Message-ID (diff)
From: Ezequiel Garcia <elezegarcia@gmail.com> To: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org Cc: Ezequiel Garcia <elezegarcia@gmail.com>, Ralf Baechle <ralf@linux-mips.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, Clemens Ladisch <clemens@ladisch.de> Subject: [PATCH 2/3] swarm_cs4297: Rename AC97 registers to use sound/ac97_codec.h definitions Date: Mon, 11 Jun 2012 16:58:50 -0300 [thread overview] Message-ID: <1339444731-15678-2-git-send-email-elezegarcia@gmail.com> (raw) In-Reply-To: <1339444731-15678-1-git-send-email-elezegarcia@gmail.com> This patch removes the last usage of linux/ac97_codec.h by renaming ac97 registers to use sound/ac97_codec.h definitions. This will enable us to remove linux/ac97_codec.h. Not even compilation tested. Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.de> Cc: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> --- Hi all, This patch is important so we can remove linux/ac97_codec.h usage. Since this driver is mips related, I can't test it until I install a mips toolchain. If someone can compile this for me, or even test it with real hardware I think it would be better. If not then I can install a mips toolchain and compile it myself, but I won't be able to test it on real hardware. This patch should be treated with carefully and be applied only if someone manages to test it. Regards, Ezequiel. --- sound/oss/swarm_cs4297a.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c index 09d4648..d0a1000 100644 --- a/sound/oss/swarm_cs4297a.c +++ b/sound/oss/swarm_cs4297a.c @@ -69,7 +69,6 @@ #include <linux/sound.h> #include <linux/slab.h> #include <linux/soundcard.h> -#include <linux/ac97_codec.h> #include <linux/pci.h> #include <linux/bitops.h> #include <linux/interrupt.h> @@ -77,6 +76,7 @@ #include <linux/poll.h> #include <linux/mutex.h> #include <linux/kernel.h> +#include <sound/ac97_codec.h> #include <asm/byteorder.h> #include <asm/dma.h> @@ -1162,10 +1162,10 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, }; static const unsigned mixreg[] = { - AC97_PCMOUT_VOL, - AC97_AUX_VOL, - AC97_CD_VOL, - AC97_LINEIN_VOL + AC97_PCM, + AC97_AUX, + AC97_CD, + AC97_LINE }; unsigned char l, r, rl, rr, vidx; unsigned char attentbl[11] = @@ -1264,7 +1264,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, if (_SIOC_DIR(cmd) == _SIOC_READ) { switch (_IOC_NR(cmd)) { case SOUND_MIXER_RECSRC: // Arg contains a bit for each recording source - cs4297a_read_ac97(s, AC97_RECORD_SELECT, + cs4297a_read_ac97(s, AC97_REC_SEL, &temp1); return put_user(mixer_src[temp1 & 7], (int *) arg); @@ -1314,7 +1314,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, if (val == mixer_src[i]) { temp1 = (i << 8) | i; cs4297a_write_ac97(s, - AC97_RECORD_SELECT, + AC97_REC_SEL, temp1); return 0; } @@ -1349,8 +1349,8 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, temp1 |= (rl << 8) | rr; - cs4297a_write_ac97(s, AC97_MASTER_VOL_STEREO, temp1); - cs4297a_write_ac97(s, AC97_PHONE_VOL, temp1); + cs4297a_write_ac97(s, AC97_MASTER, temp1); + cs4297a_write_ac97(s, AC97_PHONE, temp1); #ifdef OSS_DOCUMENTED_MIXER_SEMANTICS s->mix.vol[8] = ((unsigned int) r << 8) | l; @@ -1380,7 +1380,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, temp1 = 0; rl = 15 - rl; // Convert volume to attenuation. temp1 |= rl << 1; - cs4297a_write_ac97(s, AC97_PCBEEP_VOL, temp1); + cs4297a_write_ac97(s, AC97_PC_BEEP, temp1); #ifdef OSS_DOCUMENTED_MIXER_SEMANTICS s->mix.vol[6] = l << 8; @@ -1406,7 +1406,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, temp1 = 0; temp1 = temp1 | (rl << 8) | rr; - cs4297a_write_ac97(s, AC97_RECORD_GAIN, temp1); + cs4297a_write_ac97(s, AC97_REC_GAIN, temp1); #ifdef OSS_DOCUMENTED_MIXER_SEMANTICS s->mix.vol[7] = ((unsigned int) r << 8) | l; @@ -1428,7 +1428,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, rl = ((unsigned) l * 5 - 4) / 16; // Convert 0-100 range to 0-31. l = (rl * 16 + 4) / 5; } - cs4297a_read_ac97(s, AC97_MIC_VOL, &temp1); + cs4297a_read_ac97(s, AC97_MIC, &temp1); temp1 &= 0x40; // Isolate 20db gain bit. if (rl < 3) { temp1 |= 0x8000; @@ -1436,7 +1436,7 @@ static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd, } rl = 31 - rl; // Convert volume to attenuation. temp1 |= rl; - cs4297a_write_ac97(s, AC97_MIC_VOL, temp1); + cs4297a_write_ac97(s, AC97_MIC, temp1); #ifdef OSS_DOCUMENTED_MIXER_SEMANTICS s->mix.vol[5] = val << 8; @@ -2690,7 +2690,7 @@ static int __init cs4297a_init(void) do { udelay(4000); - rval = cs4297a_read_ac97(s, AC97_POWER_CONTROL, &pwr); + rval = cs4297a_read_ac97(s, AC97_POWERDOWN, &pwr); } while (!rval && (pwr != 0xf)); if (!rval) { -- 1.7.4.4
next prev parent reply other threads:[~2012-06-11 20:00 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-06-11 19:58 [PATCH 1/3] maestro3: Remove unused AC97 register definitions Ezequiel Garcia 2012-06-11 19:58 ` Ezequiel Garcia 2012-06-11 19:58 ` Ezequiel Garcia [this message] 2012-06-11 19:58 ` [PATCH 2/3] swarm_cs4297: Rename AC97 registers to use sound/ac97_codec.h definitions Ezequiel Garcia 2012-06-18 14:04 ` Takashi Iwai 2012-06-18 14:04 ` Takashi Iwai 2012-06-18 17:50 ` Ezequiel Garcia 2012-06-19 5:38 ` Takashi Iwai 2012-06-19 5:38 ` Takashi Iwai 2012-06-19 12:41 ` Ezequiel Garcia 2012-06-19 12:41 ` Ezequiel Garcia 2012-06-19 12:47 ` Takashi Iwai 2012-06-19 19:13 ` Ezequiel Garcia 2012-07-07 23:06 ` Maciej W. Rozycki 2012-06-11 19:58 ` [PATCH 3/3] Remove unused include/linux/ac97_codec.h header Ezequiel Garcia 2012-06-11 19:58 ` Ezequiel Garcia 2012-06-18 14:06 ` [PATCH 1/3] maestro3: Remove unused AC97 register definitions Takashi Iwai 2012-06-18 14:06 ` Takashi Iwai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1339444731-15678-2-git-send-email-elezegarcia@gmail.com \ --to=elezegarcia@gmail.com \ --cc=alsa-devel@alsa-project.org \ --cc=clemens@ladisch.de \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=ralf@linux-mips.org \ --cc=tiwai@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.