aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen_io.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-01-18 03:17:53 -0500
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:30:04 -0500
commitc2353a0826d2b8fe9f5c6a6aca99149e4ee7b196 (patch)
treebd15b1625da94b87a6f0602b47a35c09385f56ba /sound/pci/oxygen/oxygen_io.c
parent4052ce4cbf48531bdd8ff43b673ccb5c005dec79 (diff)
[ALSA] oxygen: add register definitions
Add more symbols for registers and register fields. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/oxygen_io.c')
-rw-r--r--sound/pci/oxygen/oxygen_io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen_io.c b/sound/pci/oxygen/oxygen_io.c
index 616087c552e2..ebafc65dc345 100644
--- a/sound/pci/oxygen/oxygen_io.c
+++ b/sound/pci/oxygen/oxygen_io.c
@@ -119,7 +119,7 @@ void oxygen_write_ac97(struct oxygen *chip, unsigned int codec,
119 udelay(5); 119 udelay(5);
120 oxygen_write32(chip, OXYGEN_AC97_REGS, reg); 120 oxygen_write32(chip, OXYGEN_AC97_REGS, reg);
121 /* require two "completed" writes, just to be sure */ 121 /* require two "completed" writes, just to be sure */
122 if (oxygen_ac97_wait(chip, OXYGEN_AC97_WRITE_COMPLETE) >= 0 && 122 if (oxygen_ac97_wait(chip, OXYGEN_AC97_INT_WRITE_DONE) >= 0 &&
123 ++succeeded >= 2) 123 ++succeeded >= 2)
124 return; 124 return;
125 } 125 }
@@ -141,7 +141,7 @@ u16 oxygen_read_ac97(struct oxygen *chip, unsigned int codec,
141 udelay(5); 141 udelay(5);
142 oxygen_write32(chip, OXYGEN_AC97_REGS, reg); 142 oxygen_write32(chip, OXYGEN_AC97_REGS, reg);
143 udelay(10); 143 udelay(10);
144 if (oxygen_ac97_wait(chip, OXYGEN_AC97_READ_COMPLETE) >= 0) { 144 if (oxygen_ac97_wait(chip, OXYGEN_AC97_INT_READ_DONE) >= 0) {
145 u16 value = oxygen_read16(chip, OXYGEN_AC97_REGS); 145 u16 value = oxygen_read16(chip, OXYGEN_AC97_REGS);
146 /* we require two consecutive reads of the same value */ 146 /* we require two consecutive reads of the same value */
147 if (value == last_read) 147 if (value == last_read)