diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-05 10:11:31 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-05 10:11:31 -0500 |
commit | ee419653a38de93b75a577851d9e4003cf0bbe07 (patch) | |
tree | 653dafe079341b6d8b4c858a49aeabdf9657cb7f /sound/pci/au88x0 | |
parent | 42b0158bdb1344b05cc1e98c363fba9e97137565 (diff) |
ALSA: Fix missing KERN_* prefix to printk in sound/pci
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/au88x0')
-rw-r--r-- | sound/pci/au88x0/au88x0_a3d.c | 7 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0_core.c | 19 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0_synth.c | 39 |
3 files changed, 50 insertions, 15 deletions
diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c index 649849e540d..f4aa8ff6f5f 100644 --- a/sound/pci/au88x0/au88x0_a3d.c +++ b/sound/pci/au88x0/au88x0_a3d.c | |||
@@ -462,9 +462,10 @@ static void a3dsrc_ZeroSliceIO(a3dsrc_t * a) | |||
462 | /* Reset Single A3D source. */ | 462 | /* Reset Single A3D source. */ |
463 | static void a3dsrc_ZeroState(a3dsrc_t * a) | 463 | static void a3dsrc_ZeroState(a3dsrc_t * a) |
464 | { | 464 | { |
465 | 465 | /* | |
466 | //printk("vortex: ZeroState slice: %d, source %d\n", a->slice, a->source); | 466 | printk(KERN_DEBUG "vortex: ZeroState slice: %d, source %d\n", |
467 | 467 | a->slice, a->source); | |
468 | */ | ||
468 | a3dsrc_SetAtmosState(a, 0, 0, 0, 0); | 469 | a3dsrc_SetAtmosState(a, 0, 0, 0, 0); |
469 | a3dsrc_SetHrtfState(a, A3dHrirZeros, A3dHrirZeros); | 470 | a3dsrc_SetHrtfState(a, A3dHrirZeros, A3dHrirZeros); |
470 | a3dsrc_SetItdDline(a, A3dItdDlineZeros); | 471 | a3dsrc_SetItdDline(a, A3dItdDlineZeros); |
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c index b070e571451..e6a04d037c1 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c | |||
@@ -1135,7 +1135,10 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma, | |||
1135 | snd_pcm_sgbuf_get_addr(dma->substream, 0)); | 1135 | snd_pcm_sgbuf_get_addr(dma->substream, 0)); |
1136 | break; | 1136 | break; |
1137 | } | 1137 | } |
1138 | //printk("vortex: cfg0 = 0x%x\nvortex: cfg1=0x%x\n", dma->cfg0, dma->cfg1); | 1138 | /* |
1139 | printk(KERN_DEBUG "vortex: cfg0 = 0x%x\nvortex: cfg1=0x%x\n", | ||
1140 | dma->cfg0, dma->cfg1); | ||
1141 | */ | ||
1139 | hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG0 + (adbdma << 3), dma->cfg0); | 1142 | hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG0 + (adbdma << 3), dma->cfg0); |
1140 | hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG1 + (adbdma << 3), dma->cfg1); | 1143 | hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG1 + (adbdma << 3), dma->cfg1); |
1141 | 1144 | ||
@@ -1959,7 +1962,7 @@ vortex_connect_codecplay(vortex_t * vortex, int en, unsigned char mixers[]) | |||
1959 | ADB_CODECOUT(0 + 4)); | 1962 | ADB_CODECOUT(0 + 4)); |
1960 | vortex_connection_mix_adb(vortex, en, 0x11, mixers[3], | 1963 | vortex_connection_mix_adb(vortex, en, 0x11, mixers[3], |
1961 | ADB_CODECOUT(1 + 4)); | 1964 | ADB_CODECOUT(1 + 4)); |
1962 | //printk("SDAC detected "); | 1965 | /* printk(KERN_DEBUG "SDAC detected "); */ |
1963 | } | 1966 | } |
1964 | #else | 1967 | #else |
1965 | // Use plain direct output to codec. | 1968 | // Use plain direct output to codec. |
@@ -2013,7 +2016,11 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype) | |||
2013 | resmap[restype] |= (1 << i); | 2016 | resmap[restype] |= (1 << i); |
2014 | else | 2017 | else |
2015 | vortex->dma_adb[i].resources[restype] |= (1 << i); | 2018 | vortex->dma_adb[i].resources[restype] |= (1 << i); |
2016 | //printk("vortex: ResManager: type %d out %d\n", restype, i); | 2019 | /* |
2020 | printk(KERN_DEBUG | ||
2021 | "vortex: ResManager: type %d out %d\n", | ||
2022 | restype, i); | ||
2023 | */ | ||
2017 | return i; | 2024 | return i; |
2018 | } | 2025 | } |
2019 | } | 2026 | } |
@@ -2024,7 +2031,11 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype) | |||
2024 | for (i = 0; i < qty; i++) { | 2031 | for (i = 0; i < qty; i++) { |
2025 | if (resmap[restype] & (1 << i)) { | 2032 | if (resmap[restype] & (1 << i)) { |
2026 | resmap[restype] &= ~(1 << i); | 2033 | resmap[restype] &= ~(1 << i); |
2027 | //printk("vortex: ResManager: type %d in %d\n",restype, i); | 2034 | /* |
2035 | printk(KERN_DEBUG | ||
2036 | "vortex: ResManager: type %d in %d\n", | ||
2037 | restype, i); | ||
2038 | */ | ||
2028 | return i; | 2039 | return i; |
2029 | } | 2040 | } |
2030 | } | 2041 | } |
diff --git a/sound/pci/au88x0/au88x0_synth.c b/sound/pci/au88x0/au88x0_synth.c index 978b856f562..2805e34bd41 100644 --- a/sound/pci/au88x0/au88x0_synth.c +++ b/sound/pci/au88x0/au88x0_synth.c | |||
@@ -213,38 +213,59 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt, | |||
213 | switch (reg) { | 213 | switch (reg) { |
214 | /* Voice specific parameters */ | 214 | /* Voice specific parameters */ |
215 | case 0: /* running */ | 215 | case 0: /* running */ |
216 | //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_RUN(wt), (int)val); | 216 | /* |
217 | printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", | ||
218 | WT_RUN(wt), (int)val); | ||
219 | */ | ||
217 | hwwrite(vortex->mmio, WT_RUN(wt), val); | 220 | hwwrite(vortex->mmio, WT_RUN(wt), val); |
218 | return 0xc; | 221 | return 0xc; |
219 | break; | 222 | break; |
220 | case 1: /* param 0 */ | 223 | case 1: /* param 0 */ |
221 | //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,0), (int)val); | 224 | /* |
225 | printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", | ||
226 | WT_PARM(wt,0), (int)val); | ||
227 | */ | ||
222 | hwwrite(vortex->mmio, WT_PARM(wt, 0), val); | 228 | hwwrite(vortex->mmio, WT_PARM(wt, 0), val); |
223 | return 0xc; | 229 | return 0xc; |
224 | break; | 230 | break; |
225 | case 2: /* param 1 */ | 231 | case 2: /* param 1 */ |
226 | //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,1), (int)val); | 232 | /* |
233 | printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", | ||
234 | WT_PARM(wt,1), (int)val); | ||
235 | */ | ||
227 | hwwrite(vortex->mmio, WT_PARM(wt, 1), val); | 236 | hwwrite(vortex->mmio, WT_PARM(wt, 1), val); |
228 | return 0xc; | 237 | return 0xc; |
229 | break; | 238 | break; |
230 | case 3: /* param 2 */ | 239 | case 3: /* param 2 */ |
231 | //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,2), (int)val); | 240 | /* |
241 | printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", | ||
242 | WT_PARM(wt,2), (int)val); | ||
243 | */ | ||
232 | hwwrite(vortex->mmio, WT_PARM(wt, 2), val); | 244 | hwwrite(vortex->mmio, WT_PARM(wt, 2), val); |
233 | return 0xc; | 245 | return 0xc; |
234 | break; | 246 | break; |
235 | case 4: /* param 3 */ | 247 | case 4: /* param 3 */ |
236 | //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,3), (int)val); | 248 | /* |
249 | printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", | ||
250 | WT_PARM(wt,3), (int)val); | ||
251 | */ | ||
237 | hwwrite(vortex->mmio, WT_PARM(wt, 3), val); | 252 | hwwrite(vortex->mmio, WT_PARM(wt, 3), val); |
238 | return 0xc; | 253 | return 0xc; |
239 | break; | 254 | break; |
240 | case 6: /* mute */ | 255 | case 6: /* mute */ |
241 | //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_MUTE(wt), (int)val); | 256 | /* |
257 | printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", | ||
258 | WT_MUTE(wt), (int)val); | ||
259 | */ | ||
242 | hwwrite(vortex->mmio, WT_MUTE(wt), val); | 260 | hwwrite(vortex->mmio, WT_MUTE(wt), val); |
243 | return 0xc; | 261 | return 0xc; |
244 | break; | 262 | break; |
245 | case 0xb: | 263 | case 0xb: |
246 | { /* delay */ | 264 | { /* delay */ |
247 | //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_DELAY(wt,0), (int)val); | 265 | /* |
266 | printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", | ||
267 | WT_DELAY(wt,0), (int)val); | ||
268 | */ | ||
248 | hwwrite(vortex->mmio, WT_DELAY(wt, 3), val); | 269 | hwwrite(vortex->mmio, WT_DELAY(wt, 3), val); |
249 | hwwrite(vortex->mmio, WT_DELAY(wt, 2), val); | 270 | hwwrite(vortex->mmio, WT_DELAY(wt, 2), val); |
250 | hwwrite(vortex->mmio, WT_DELAY(wt, 1), val); | 271 | hwwrite(vortex->mmio, WT_DELAY(wt, 1), val); |
@@ -272,7 +293,9 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt, | |||
272 | return 0; | 293 | return 0; |
273 | break; | 294 | break; |
274 | } | 295 | } |
275 | //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", ecx, (int)val); | 296 | /* |
297 | printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", ecx, (int)val); | ||
298 | */ | ||
276 | hwwrite(vortex->mmio, ecx, val); | 299 | hwwrite(vortex->mmio, ecx, val); |
277 | return 1; | 300 | return 1; |
278 | } | 301 | } |