Skip to content

L
linux
Commit ee419653 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: Fix missing KERN_* prefix to printk in sound/pci 

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 42b0158b
Hide whitespace changes
Inline Side-by-side
Showing with 318 additions and 146 deletions
sound/pci/ac97/ac97_codec.c
View file @ ee419653
...@@ -1643,7 +1643,10 @@ static int snd_ac97_modem_build(struct snd_card *card, struct snd_ac97 * ac97) ...@@ -1643,7 +1643,10 @@ static int snd_ac97_modem_build(struct snd_card *card, struct snd_ac97 * ac97)
{ {
int err, idx; int err, idx;
//printk("AC97_GPIO_CFG = %x\n",snd_ac97_read(ac97,AC97_GPIO_CFG)); /*
printk(KERN_DEBUG "AC97_GPIO_CFG = %x\n",
snd_ac97_read(ac97,AC97_GPIO_CFG));
*/
snd_ac97_write(ac97, AC97_GPIO_CFG, 0xffff & ~(AC97_GPIO_LINE1_OH)); snd_ac97_write(ac97, AC97_GPIO_CFG, 0xffff & ~(AC97_GPIO_LINE1_OH));
snd_ac97_write(ac97, AC97_GPIO_POLARITY, 0xffff & ~(AC97_GPIO_LINE1_OH)); snd_ac97_write(ac97, AC97_GPIO_POLARITY, 0xffff & ~(AC97_GPIO_LINE1_OH));
snd_ac97_write(ac97, AC97_GPIO_STICKY, 0xffff); snd_ac97_write(ac97, AC97_GPIO_STICKY, 0xffff);
......
sound/pci/ak4531_codec.c
View file @ ee419653
...@@ -51,7 +51,8 @@ static void snd_ak4531_dump(struct snd_ak4531 *ak4531) ...@@ -51,7 +51,8 @@ static void snd_ak4531_dump(struct snd_ak4531 *ak4531)
int idx; int idx;
for (idx = 0; idx < 0x19; idx++) for (idx = 0; idx < 0x19; idx++)
printk("ak4531 0x%x: 0x%x\n", idx, ak4531->regs[idx]); printk(KERN_DEBUG "ak4531 0x%x: 0x%x\n",
idx, ak4531->regs[idx]);
} }
#endif #endif
......
sound/pci/als300.c
View file @ ee419653
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
#define DEBUG_PLAY_REC 0 #define DEBUG_PLAY_REC 0
#if DEBUG_CALLS #if DEBUG_CALLS
#define snd_als300_dbgcalls(format, args...) printk(format, ##args) #define snd_als300_dbgcalls(format, args...) printk(KERN_DEBUG format, ##args)
#define snd_als300_dbgcallenter() printk(KERN_ERR "--> %s\n", __func__) #define snd_als300_dbgcallenter() printk(KERN_ERR "--> %s\n", __func__)
#define snd_als300_dbgcallleave() printk(KERN_ERR "<-- %s\n", __func__) #define snd_als300_dbgcallleave() printk(KERN_ERR "<-- %s\n", __func__)
#else #else
......
sound/pci/au88x0/au88x0_a3d.c
View file @ ee419653
...@@ -462,9 +462,10 @@ static void a3dsrc_ZeroSliceIO(a3dsrc_t * a) ...@@ -462,9 +462,10 @@ static void a3dsrc_ZeroSliceIO(a3dsrc_t * a)
/* Reset Single A3D source. */ /* Reset Single A3D source. */
static void a3dsrc_ZeroState(a3dsrc_t * a) static void a3dsrc_ZeroState(a3dsrc_t * a)
{ {
/*
//printk("vortex: ZeroState slice: %d, source %d\n", a->slice, a->source); printk(KERN_DEBUG "vortex: ZeroState slice: %d, source %d\n",
a->slice, a->source);
*/
a3dsrc_SetAtmosState(a, 0, 0, 0, 0); a3dsrc_SetAtmosState(a, 0, 0, 0, 0);
a3dsrc_SetHrtfState(a, A3dHrirZeros, A3dHrirZeros); a3dsrc_SetHrtfState(a, A3dHrirZeros, A3dHrirZeros);
a3dsrc_SetItdDline(a, A3dItdDlineZeros); a3dsrc_SetItdDline(a, A3dItdDlineZeros);
......
sound/pci/au88x0/au88x0_core.c
View file @ ee419653
...@@ -1135,7 +1135,10 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma, ...@@ -1135,7 +1135,10 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,
snd_pcm_sgbuf_get_addr(dma->substream, 0)); snd_pcm_sgbuf_get_addr(dma->substream, 0));
break; break;
} }
//printk("vortex: cfg0 = 0x%x\nvortex: cfg1=0x%x\n", dma->cfg0, dma->cfg1); /*
printk(KERN_DEBUG "vortex: cfg0 = 0x%x\nvortex: cfg1=0x%x\n",
dma->cfg0, dma->cfg1);
*/
hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG0 + (adbdma << 3), dma->cfg0); hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG0 + (adbdma << 3), dma->cfg0);
hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG1 + (adbdma << 3), dma->cfg1); hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG1 + (adbdma << 3), dma->cfg1);
...@@ -1959,7 +1962,7 @@ vortex_connect_codecplay(vortex_t * vortex, int en, unsigned char mixers[]) ...@@ -1959,7 +1962,7 @@ vortex_connect_codecplay(vortex_t * vortex, int en, unsigned char mixers[])
ADB_CODECOUT(0 + 4)); ADB_CODECOUT(0 + 4));
vortex_connection_mix_adb(vortex, en, 0x11, mixers[3], vortex_connection_mix_adb(vortex, en, 0x11, mixers[3],
ADB_CODECOUT(1 + 4)); ADB_CODECOUT(1 + 4));
//printk("SDAC detected "); /* printk(KERN_DEBUG "SDAC detected "); */
} }
#else #else
// Use plain direct output to codec. // Use plain direct output to codec.
...@@ -2013,7 +2016,11 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype) ...@@ -2013,7 +2016,11 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)
resmap[restype] |= (1 << i); resmap[restype] |= (1 << i);
else else
vortex->dma_adb[i].resources[restype] |= (1 << i); vortex->dma_adb[i].resources[restype] |= (1 << i);
//printk("vortex: ResManager: type %d out %d\n", restype, i); /*
printk(KERN_DEBUG
"vortex: ResManager: type %d out %d\n",
restype, i);
*/
return i; return i;
} }
} }
...@@ -2024,7 +2031,11 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype) ...@@ -2024,7 +2031,11 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)
for (i = 0; i < qty; i++) { for (i = 0; i < qty; i++) {
if (resmap[restype] & (1 << i)) { if (resmap[restype] & (1 << i)) {
resmap[restype] &= ~(1 << i); resmap[restype] &= ~(1 << i);
//printk("vortex: ResManager: type %d in %d\n",restype, i); /*
printk(KERN_DEBUG
"vortex: ResManager: type %d in %d\n",
restype, i);
*/
return i; return i;
} }
} }
......
sound/pci/au88x0/au88x0_synth.c
View file @ ee419653
...@@ -213,38 +213,59 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt, ...@@ -213,38 +213,59 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,
switch (reg) { switch (reg) {
/* Voice specific parameters */ /* Voice specific parameters */
case 0: /* running */ case 0: /* running */
//printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_RUN(wt), (int)val); /*
printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
WT_RUN(wt), (int)val);
*/
hwwrite(vortex->mmio, WT_RUN(wt), val); hwwrite(vortex->mmio, WT_RUN(wt), val);
return 0xc; return 0xc;
break; break;
case 1: /* param 0 */ case 1: /* param 0 */
//printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,0), (int)val); /*
printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
WT_PARM(wt,0), (int)val);
*/
hwwrite(vortex->mmio, WT_PARM(wt, 0), val); hwwrite(vortex->mmio, WT_PARM(wt, 0), val);
return 0xc; return 0xc;
break; break;
case 2: /* param 1 */ case 2: /* param 1 */
//printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,1), (int)val); /*
printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
WT_PARM(wt,1), (int)val);
*/
hwwrite(vortex->mmio, WT_PARM(wt, 1), val); hwwrite(vortex->mmio, WT_PARM(wt, 1), val);
return 0xc; return 0xc;
break; break;
case 3: /* param 2 */ case 3: /* param 2 */
//printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,2), (int)val); /*
printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
WT_PARM(wt,2), (int)val);
*/
hwwrite(vortex->mmio, WT_PARM(wt, 2), val); hwwrite(vortex->mmio, WT_PARM(wt, 2), val);
return 0xc; return 0xc;
break; break;
case 4: /* param 3 */ case 4: /* param 3 */
//printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,3), (int)val); /*
printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
WT_PARM(wt,3), (int)val);
*/
hwwrite(vortex->mmio, WT_PARM(wt, 3), val); hwwrite(vortex->mmio, WT_PARM(wt, 3), val);
return 0xc; return 0xc;
break; break;
case 6: /* mute */ case 6: /* mute */
//printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_MUTE(wt), (int)val); /*
printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
WT_MUTE(wt), (int)val);
*/
hwwrite(vortex->mmio, WT_MUTE(wt), val); hwwrite(vortex->mmio, WT_MUTE(wt), val);
return 0xc; return 0xc;
break; break;
case 0xb: case 0xb:
{ /* delay */ { /* delay */
//printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_DELAY(wt,0), (int)val); /*
printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
WT_DELAY(wt,0), (int)val);
*/
hwwrite(vortex->mmio, WT_DELAY(wt, 3), val); hwwrite(vortex->mmio, WT_DELAY(wt, 3), val);
hwwrite(vortex->mmio, WT_DELAY(wt, 2), val); hwwrite(vortex->mmio, WT_DELAY(wt, 2), val);
hwwrite(vortex->mmio, WT_DELAY(wt, 1), val); hwwrite(vortex->mmio, WT_DELAY(wt, 1), val);
...@@ -272,7 +293,9 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt, ...@@ -272,7 +293,9 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,
return 0; return 0;
break; break;
} }
//printk("vortex: WT SetReg(0x%x) = 0x%08x\n", ecx, (int)val); /*
printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", ecx, (int)val);
*/
hwwrite(vortex->mmio, ecx, val); hwwrite(vortex->mmio, ecx, val);
return 1; return 1;
} }
......
sound/pci/azt3328.c
View file @ ee419653
...@@ -211,25 +211,25 @@ MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}"); ...@@ -211,25 +211,25 @@ MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}");
#endif #endif
#if DEBUG_MIXER #if DEBUG_MIXER
#define snd_azf3328_dbgmixer(format, args...) printk(format, ##args) #define snd_azf3328_dbgmixer(format, args...) printk(KERN_DEBUG format, ##args)
#else #else
#define snd_azf3328_dbgmixer(format, args...) #define snd_azf3328_dbgmixer(format, args...)
#endif #endif
#if DEBUG_PLAY_REC #if DEBUG_PLAY_REC
#define snd_azf3328_dbgplay(format, args...) printk(KERN_ERR format, ##args) #define snd_azf3328_dbgplay(format, args...) printk(KERN_DEBUG format, ##args)
#else #else
#define snd_azf3328_dbgplay(format, args...) #define snd_azf3328_dbgplay(format, args...)
#endif #endif
#if DEBUG_MISC #if DEBUG_MISC
#define snd_azf3328_dbgtimer(format, args...) printk(KERN_ERR format, ##args) #define snd_azf3328_dbgtimer(format, args...) printk(KERN_DEBUG format, ##args)
#else #else
#define snd_azf3328_dbgtimer(format, args...) #define snd_azf3328_dbgtimer(format, args...)
#endif #endif
#if DEBUG_GAME #if DEBUG_GAME
#define snd_azf3328_dbggame(format, args...) printk(KERN_ERR format, ##args) #define snd_azf3328_dbggame(format, args...) printk(KERN_DEBUG format, ##args)
#else #else
#define snd_azf3328_dbggame(format, args...) #define snd_azf3328_dbggame(format, args...)
#endif #endif
......
sound/pci/ca0106/ca0106_main.c
View file @ ee419653
...@@ -404,7 +404,9 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu, ...@@ -404,7 +404,9 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu,
} }
tmp = reg << 25 | value << 16; tmp = reg << 25 | value << 16;
// snd_printk("I2C-write:reg=0x%x, value=0x%x\n", reg, value); /*
snd_printk(KERN_DEBUG "I2C-write:reg=0x%x, value=0x%x\n", reg, value);
*/
/* Not sure what this I2C channel controls. */ /* Not sure what this I2C channel controls. */
/* snd_ca0106_ptr_write(emu, I2C_D0, 0, tmp); */ /* snd_ca0106_ptr_write(emu, I2C_D0, 0, tmp); */
...@@ -422,7 +424,7 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu, ...@@ -422,7 +424,7 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu,
/* Wait till the transaction ends */ /* Wait till the transaction ends */
while (1) { while (1) {
status = snd_ca0106_ptr_read(emu, I2C_A, 0); status = snd_ca0106_ptr_read(emu, I2C_A, 0);
//snd_printk("I2C:status=0x%x\n", status); /*snd_printk(KERN_DEBUG "I2C:status=0x%x\n", status);*/
timeout++; timeout++;
if ((status & I2C_A_ADC_START) == 0) if ((status & I2C_A_ADC_START) == 0)
break; break;
...@@ -521,7 +523,10 @@ static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substr ...@@ -521,7 +523,10 @@ static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substr
channel->number = channel_id; channel->number = channel_id;
channel->use = 1; channel->use = 1;
//printk("open:channel_id=%d, chip=%p, channel=%p\n",channel_id, chip, channel); /*
printk(KERN_DEBUG "open:channel_id=%d, chip=%p, channel=%p\n",
channel_id, chip, channel);
*/
//channel->interrupt = snd_ca0106_pcm_channel_interrupt; //channel->interrupt = snd_ca0106_pcm_channel_interrupt;
channel->epcm = epcm; channel->epcm = epcm;
if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
...@@ -614,7 +619,10 @@ static int snd_ca0106_pcm_open_capture_channel(struct snd_pcm_substream *substre ...@@ -614,7 +619,10 @@ static int snd_ca0106_pcm_open_capture_channel(struct snd_pcm_substream *substre
channel->number = channel_id; channel->number = channel_id;
channel->use = 1; channel->use = 1;
//printk("open:channel_id=%d, chip=%p, channel=%p\n",channel_id, chip, channel); /*
printk(KERN_DEBUG "open:channel_id=%d, chip=%p, channel=%p\n",
channel_id, chip, channel);
*/
//channel->interrupt = snd_ca0106_pcm_channel_interrupt; //channel->interrupt = snd_ca0106_pcm_channel_interrupt;
channel->epcm = epcm; channel->epcm = epcm;
if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
...@@ -705,9 +713,20 @@ static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream) ...@@ -705,9 +713,20 @@ static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream)
u32 reg71; u32 reg71;
int i; int i;
//snd_printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, periods=%u, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size, runtime->periods, frames_to_bytes(runtime, 1)); #if 0 /* debug */
//snd_printk("dma_addr=%x, dma_area=%p, table_base=%p\n",runtime->dma_addr, runtime->dma_area, table_base); snd_printk(KERN_DEBUG
//snd_printk("dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",emu->buffer.addr, emu->buffer.area, emu->buffer.bytes); "prepare:channel_number=%d, rate=%d, format=0x%x, "
"channels=%d, buffer_size=%ld, period_size=%ld, "
"periods=%u, frames_to_bytes=%d\n",
channel, runtime->rate, runtime->format,
runtime->channels, runtime->buffer_size,
runtime->period_size, runtime->periods,
frames_to_bytes(runtime, 1));
snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, table_base=%p\n",
runtime->dma_addr, runtime->dma_area, table_base);
snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",
emu->buffer.addr, emu->buffer.area, emu->buffer.bytes);
#endif /* debug */
/* Rate can be set per channel. */ /* Rate can be set per channel. */
/* reg40 control host to fifo */ /* reg40 control host to fifo */
/* reg71 controls DAC rate. */ /* reg71 controls DAC rate. */
...@@ -799,9 +818,20 @@ static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream) ...@@ -799,9 +818,20 @@ static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream)
u32 reg71_set = 0; u32 reg71_set = 0;
u32 reg71; u32 reg71;
//snd_printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, periods=%u, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size, runtime->periods, frames_to_bytes(runtime, 1)); #if 0 /* debug */
//snd_printk("dma_addr=%x, dma_area=%p, table_base=%p\n",runtime->dma_addr, runtime->dma_area, table_base); snd_printk(KERN_DEBUG
//snd_printk("dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",emu->buffer.addr, emu->buffer.area, emu->buffer.bytes); "prepare:channel_number=%d, rate=%d, format=0x%x, "
"channels=%d, buffer_size=%ld, period_size=%ld, "
"periods=%u, frames_to_bytes=%d\n",
channel, runtime->rate, runtime->format,
runtime->channels, runtime->buffer_size,
runtime->period_size, runtime->periods,
frames_to_bytes(runtime, 1));
snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, table_base=%p\n",
runtime->dma_addr, runtime->dma_area, table_base);
snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",
emu->buffer.addr, emu->buffer.area, emu->buffer.bytes);
#endif /* debug */
/* reg71 controls ADC rate. */ /* reg71 controls ADC rate. */
switch (runtime->rate) { switch (runtime->rate) {
case 44100: case 44100:
...@@ -846,7 +876,14 @@ static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream) ...@@ -846,7 +876,14 @@ static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream)
} }
//printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size, frames_to_bytes(runtime, 1)); /*
printk(KERN_DEBUG
"prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, "
"buffer_size=%ld, period_size=%ld, frames_to_bytes=%d\n",
channel, runtime->rate, runtime->format, runtime->channels,
runtime->buffer_size, runtime->period_size,
frames_to_bytes(runtime, 1));
*/
snd_ca0106_ptr_write(emu, 0x13, channel, 0); snd_ca0106_ptr_write(emu, 0x13, channel, 0);
snd_ca0106_ptr_write(emu, CAPTURE_DMA_ADDR, channel, runtime->dma_addr); snd_ca0106_ptr_write(emu, CAPTURE_DMA_ADDR, channel, runtime->dma_addr);
snd_ca0106_ptr_write(emu, CAPTURE_BUFFER_SIZE, channel, frames_to_bytes(runtime, runtime->buffer_size)<<16); // buffer size in bytes snd_ca0106_ptr_write(emu, CAPTURE_BUFFER_SIZE, channel, frames_to_bytes(runtime, runtime->buffer_size)<<16); // buffer size in bytes
...@@ -888,13 +925,13 @@ static int snd_ca0106_pcm_trigger_playback(struct snd_pcm_substream *substream, ...@@ -888,13 +925,13 @@ static int snd_ca0106_pcm_trigger_playback(struct snd_pcm_substream *substream,
runtime = s->runtime; runtime = s->runtime;
epcm = runtime->private_data; epcm = runtime->private_data;
channel = epcm->channel_id; channel = epcm->channel_id;
/* snd_printk("channel=%d\n",channel); */ /* snd_printk(KERN_DEBUG "channel=%d\n", channel); */
epcm->running = running; epcm->running = running;
basic |= (0x1 << channel); basic |= (0x1 << channel);
extended |= (0x10 << channel); extended |= (0x10 << channel);
snd_pcm_trigger_done(s, substream); snd_pcm_trigger_done(s, substream);
} }
/* snd_printk("basic=0x%x, extended=0x%x\n",basic, extended); */ /* snd_printk(KERN_DEBUG "basic=0x%x, extended=0x%x\n",basic, extended); */
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
...@@ -972,8 +1009,13 @@ snd_ca0106_pcm_pointer_playback(struct snd_pcm_substream *substream) ...@@ -972,8 +1009,13 @@ snd_ca0106_pcm_pointer_playback(struct snd_pcm_substream *substream)
ptr=ptr2; ptr=ptr2;
if (ptr >= runtime->buffer_size) if (ptr >= runtime->buffer_size)
ptr -= runtime->buffer_size; ptr -= runtime->buffer_size;
//printk("ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n", ptr1, ptr2, ptr, (int)runtime->buffer_size, (int)runtime->period_size, (int)runtime->frame_bits, (int)runtime->rate); /*
printk(KERN_DEBUG "ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, "
"buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n",
ptr1, ptr2, ptr, (int)runtime->buffer_size,
(int)runtime->period_size, (int)runtime->frame_bits,
(int)runtime->rate);
*/
return ptr; return ptr;
} }
...@@ -995,8 +1037,13 @@ snd_ca0106_pcm_pointer_capture(struct snd_pcm_substream *substream) ...@@ -995,8 +1037,13 @@ snd_ca0106_pcm_pointer_capture(struct snd_pcm_substream *substream)
ptr=ptr2; ptr=ptr2;
if (ptr >= runtime->buffer_size) if (ptr >= runtime->buffer_size)
ptr -= runtime->buffer_size; ptr -= runtime->buffer_size;
//printk("ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n", ptr1, ptr2, ptr, (int)runtime->buffer_size, (int)runtime->period_size, (int)runtime->frame_bits, (int)runtime->rate); /*
printk(KERN_DEBUG "ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, "
"buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n",
ptr1, ptr2, ptr, (int)runtime->buffer_size,
(int)runtime->period_size, (int)runtime->frame_bits,
(int)runtime->rate);
*/
return ptr; return ptr;
} }
...@@ -1181,8 +1228,12 @@ static irqreturn_t snd_ca0106_interrupt(int irq, void *dev_id) ...@@ -1181,8 +1228,12 @@ static irqreturn_t snd_ca0106_interrupt(int irq, void *dev_id)
return IRQ_NONE; return IRQ_NONE;
stat76 = snd_ca0106_ptr_read(chip, EXTENDED_INT, 0); stat76 = snd_ca0106_ptr_read(chip, EXTENDED_INT, 0);
//snd_printk("interrupt status = 0x%08x, stat76=0x%08x\n", status, stat76); /*
//snd_printk("ptr=0x%08x\n",snd_ca0106_ptr_read(chip, PLAYBACK_POINTER, 0)); snd_printk(KERN_DEBUG "interrupt status = 0x%08x, stat76=0x%08x\n",
status, stat76);
snd_printk(KERN_DEBUG "ptr=0x%08x\n",
snd_ca0106_ptr_read(chip, PLAYBACK_POINTER, 0));
*/
mask = 0x11; /* 0x1 for one half, 0x10 for the other half period. */ mask = 0x11; /* 0x1 for one half, 0x10 for the other half period. */
for(i = 0; i < 4; i++) { for(i = 0; i < 4; i++) {
pchannel = &(chip->playback_channels[i]); pchannel = &(chip->playback_channels[i]);
...@@ -1470,7 +1521,7 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume) ...@@ -1470,7 +1521,7 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume)
int size, n; int size, n;
size = ARRAY_SIZE(i2c_adc_init); size = ARRAY_SIZE(i2c_adc_init);
/* snd_printk("I2C:array size=0x%x\n", size); */ /* snd_printk(KERN_DEBUG "I2C:array size=0x%x\n", size); */
for (n = 0; n < size; n++) for (n = 0; n < size; n++)
snd_ca0106_i2c_write(chip, i2c_adc_init[n][0], snd_ca0106_i2c_write(chip, i2c_adc_init[n][0],
i2c_adc_init[n][1]); i2c_adc_init[n][1]);
......
sound/pci/cs4281.c
View file @ ee419653
...@@ -834,7 +834,11 @@ static snd_pcm_uframes_t snd_cs4281_pointer(struct snd_pcm_substream *substream) ...@@ -834,7 +834,11 @@ static snd_pcm_uframes_t snd_cs4281_pointer(struct snd_pcm_substream *substream)
struct cs4281_dma *dma = runtime->private_data; struct cs4281_dma *dma = runtime->private_data;
struct cs4281 *chip = snd_pcm_substream_chip(substream); struct cs4281 *chip = snd_pcm_substream_chip(substream);
// printk("DCC = 0x%x, buffer_size = 0x%x, jiffies = %li\n", snd_cs4281_peekBA0(chip, dma->regDCC), runtime->buffer_size, jiffies); /*
printk(KERN_DEBUG "DCC = 0x%x, buffer_size = 0x%x, jiffies = %li\n",
snd_cs4281_peekBA0(chip, dma->regDCC), runtime->buffer_size,
jiffies);
*/
return runtime->buffer_size - return runtime->buffer_size -
snd_cs4281_peekBA0(chip, dma->regDCC) - 1; snd_cs4281_peekBA0(chip, dma->regDCC) - 1;
} }
......
sound/pci/cs46xx/cs46xx_lib.c
View file @ ee419653
...@@ -194,7 +194,7 @@ static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip, ...@@ -194,7 +194,7 @@ static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip,
* ACSDA = Status Data Register = 474h * ACSDA = Status Data Register = 474h
*/ */
#if 0 #if 0
printk("e) reg = 0x%x, val = 0x%x, BA0_ACCAD = 0x%x\n", reg, printk(KERN_DEBUG "e) reg = 0x%x, val = 0x%x, BA0_ACCAD = 0x%x\n", reg,
snd_cs46xx_peekBA0(chip, BA0_ACSDA), snd_cs46xx_peekBA0(chip, BA0_ACSDA),
snd_cs46xx_peekBA0(chip, BA0_ACCAD)); snd_cs46xx_peekBA0(chip, BA0_ACCAD));
#endif #endif
...@@ -428,8 +428,8 @@ static int cs46xx_wait_for_fifo(struct snd_cs46xx * chip,int retry_timeout) ...@@ -428,8 +428,8 @@ static int cs46xx_wait_for_fifo(struct snd_cs46xx * chip,int retry_timeout)
} }
if(status & SERBST_WBSY) { if(status & SERBST_WBSY) {
snd_printk( KERN_ERR "cs46xx: failure waiting for FIFO command to complete\n"); snd_printk(KERN_ERR "cs46xx: failure waiting for "
"FIFO command to complete\n");
return -EINVAL; return -EINVAL;
} }
......
sound/pci/cs46xx/cs46xx_lib.h
View file @ ee419653
...@@ -62,7 +62,11 @@ static inline void snd_cs46xx_poke(struct snd_cs46xx *chip, unsigned long reg, u ...@@ -62,7 +62,11 @@ static inline void snd_cs46xx_poke(struct snd_cs46xx *chip, unsigned long reg, u
unsigned int bank = reg >> 16; unsigned int bank = reg >> 16;
unsigned int offset = reg & 0xffff; unsigned int offset = reg & 0xffff;
/*if (bank == 0) printk("snd_cs46xx_poke: %04X - %08X\n",reg >> 2,val); */ /*
if (bank == 0)
printk(KERN_DEBUG "snd_cs46xx_poke: %04X - %08X\n",
reg >> 2,val);
*/
writel(val, chip->region.idx[bank+1].remap_addr + offset); writel(val, chip->region.idx[bank+1].remap_addr + offset);
} }
......
sound/pci/cs5535audio/cs5535audio.c
View file @ ee419653
...@@ -312,7 +312,7 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card, ...@@ -312,7 +312,7 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card,
if (request_irq(pci->irq, snd_cs5535audio_interrupt, if (request_irq(pci->irq, snd_cs5535audio_interrupt,
IRQF_SHARED, "CS5535 Audio", cs5535au)) { IRQF_SHARED, "CS5535 Audio", cs5535au)) {
snd_printk("unable to grab IRQ %d\n", pci->irq); snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
err = -EBUSY; err = -EBUSY;
goto sndfail; goto sndfail;
} }
......
sound/pci/ens1370.c
View file @ ee419653
...@@ -584,7 +584,8 @@ static void snd_es1370_codec_write(struct snd_ak4531 *ak4531, ...@@ -584,7 +584,8 @@ static void snd_es1370_codec_write(struct snd_ak4531 *ak4531,
unsigned long end_time = jiffies + HZ / 10; unsigned long end_time = jiffies + HZ / 10;
#if 0 #if 0
printk("CODEC WRITE: reg = 0x%x, val = 0x%x (0x%x), creg = 0x%x\n", printk(KERN_DEBUG
"CODEC WRITE: reg = 0x%x, val = 0x%x (0x%x), creg = 0x%x\n",
reg, val, ES_1370_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1370_CODEC)); reg, val, ES_1370_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1370_CODEC));
#endif #endif
do { do {
......
sound/pci/es1938.c
View file @ ee419653
...@@ -1673,18 +1673,22 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id) ...@@ -1673,18 +1673,22 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id)
status = inb(SLIO_REG(chip, IRQCONTROL)); status = inb(SLIO_REG(chip, IRQCONTROL));
#if 0 #if 0
printk("Es1938debug - interrupt status: =0x%x\n", status); printk(KERN_DEBUG "Es1938debug - interrupt status: =0x%x\n", status);
#endif #endif
/* AUDIO 1 */ /* AUDIO 1 */
if (status & 0x10) { if (status & 0x10) {
#if 0 #if 0
printk("Es1938debug - AUDIO channel 1 interrupt\n"); printk(KERN_DEBUG
printk("Es1938debug - AUDIO channel 1 DMAC DMA count: %u\n", "Es1938debug - AUDIO channel 1 interrupt\n");
printk(KERN_DEBUG
"Es1938debug - AUDIO channel 1 DMAC DMA count: %u\n",
inw(SLDM_REG(chip, DMACOUNT))); inw(SLDM_REG(chip, DMACOUNT)));
printk("Es1938debug - AUDIO channel 1 DMAC DMA base: %u\n", printk(KERN_DEBUG
"Es1938debug - AUDIO channel 1 DMAC DMA base: %u\n",
inl(SLDM_REG(chip, DMAADDR))); inl(SLDM_REG(chip, DMAADDR)));
printk("Es1938debug - AUDIO channel 1 DMAC DMA status: 0x%x\n", printk(KERN_DEBUG
"Es1938debug - AUDIO channel 1 DMAC DMA status: 0x%x\n",
inl(SLDM_REG(chip, DMASTATUS))); inl(SLDM_REG(chip, DMASTATUS)));
#endif #endif
/* clear irq */ /* clear irq */
...@@ -1699,10 +1703,13 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id) ...@@ -1699,10 +1703,13 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id)
/* AUDIO 2 */ /* AUDIO 2 */
if (status & 0x20) { if (status & 0x20) {
#if 0 #if 0
printk("Es1938debug - AUDIO channel 2 interrupt\n"); printk(KERN_DEBUG
printk("Es1938debug - AUDIO channel 2 DMAC DMA count: %u\n", "Es1938debug - AUDIO channel 2 interrupt\n");
printk(KERN_DEBUG
"Es1938debug - AUDIO channel 2 DMAC DMA count: %u\n",
inw(SLIO_REG(chip, AUDIO2DMACOUNT))); inw(SLIO_REG(chip, AUDIO2DMACOUNT)));
printk("Es1938debug - AUDIO channel 2 DMAC DMA base: %u\n", printk(KERN_DEBUG
"Es1938debug - AUDIO channel 2 DMAC DMA base: %u\n",
inl(SLIO_REG(chip, AUDIO2DMAADDR))); inl(SLIO_REG(chip, AUDIO2DMAADDR)));
#endif #endif
......
sound/pci/mixart/mixart_hwdep.c
View file @ ee419653
...@@ -345,8 +345,8 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -345,8 +345,8 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
status_daught = readl_be( MIXART_MEM( mgr,MIXART_PSEUDOREG_DXLX_STATUS_OFFSET )); status_daught = readl_be( MIXART_MEM( mgr,MIXART_PSEUDOREG_DXLX_STATUS_OFFSET ));
/* motherboard xilinx status 5 will say that the board is performing a reset */ /* motherboard xilinx status 5 will say that the board is performing a reset */
if( status_xilinx == 5 ) { if (status_xilinx == 5) {
snd_printk( KERN_ERR "miXart is resetting !\n"); snd_printk(KERN_ERR "miXart is resetting !\n");
return -EAGAIN; /* try again later */ return -EAGAIN; /* try again later */
} }
...@@ -354,13 +354,14 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -354,13 +354,14 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
case MIXART_MOTHERBOARD_XLX_INDEX: case MIXART_MOTHERBOARD_XLX_INDEX:
/* xilinx already loaded ? */ /* xilinx already loaded ? */
if( status_xilinx == 4 ) { if (status_xilinx == 4) {
snd_printk( KERN_DEBUG "xilinx is already loaded !\n"); snd_printk(KERN_DEBUG "xilinx is already loaded !\n");
return 0; return 0;
} }
/* the status should be 0 == "idle" */ /* the status should be 0 == "idle" */
if( status_xilinx != 0 ) { if (status_xilinx != 0) {
snd_printk( KERN_ERR "xilinx load error ! status = %d\n", status_xilinx); snd_printk(KERN_ERR "xilinx load error ! status = %d\n",
status_xilinx);
return -EIO; /* modprob -r may help ? */ return -EIO; /* modprob -r may help ? */
} }
...@@ -389,21 +390,23 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -389,21 +390,23 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
case MIXART_MOTHERBOARD_ELF_INDEX: case MIXART_MOTHERBOARD_ELF_INDEX:
if( status_elf == 4 ) { if (status_elf == 4) {
snd_printk( KERN_DEBUG "elf file already loaded !\n"); snd_printk(KERN_DEBUG "elf file already loaded !\n");
return 0; return 0;
} }
/* the status should be 0 == "idle" */ /* the status should be 0 == "idle" */
if( status_elf != 0 ) { if (status_elf != 0) {
snd_printk( KERN_ERR "elf load error ! status = %d\n", status_elf); snd_printk(KERN_ERR "elf load error ! status = %d\n",
status_elf);
return -EIO; /* modprob -r may help ? */ return -EIO; /* modprob -r may help ? */
} }
/* wait for xilinx status == 4 */ /* wait for xilinx status == 4 */
err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_MXLX_STATUS_OFFSET, 1, 4, 500); /* 5sec */ err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_MXLX_STATUS_OFFSET, 1, 4, 500); /* 5sec */
if (err < 0) { if (err < 0) {
snd_printk( KERN_ERR "xilinx was not loaded or could not be started\n"); snd_printk(KERN_ERR "xilinx was not loaded or "
"could not be started\n");
return err; return err;
} }
...@@ -424,7 +427,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -424,7 +427,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* wait for elf status == 4 */ /* wait for elf status == 4 */
err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_ELF_STATUS_OFFSET, 1, 4, 300); /* 3sec */ err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_ELF_STATUS_OFFSET, 1, 4, 300); /* 3sec */
if (err < 0) { if (err < 0) {
snd_printk( KERN_ERR "elf could not be started\n"); snd_printk(KERN_ERR "elf could not be started\n");
return err; return err;
} }
...@@ -437,15 +440,16 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -437,15 +440,16 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
default: default:
/* elf and xilinx should be loaded */ /* elf and xilinx should be loaded */
if( (status_elf != 4) || (status_xilinx != 4) ) { if (status_elf != 4 || status_xilinx != 4) {
printk( KERN_ERR "xilinx or elf not successfully loaded\n"); printk(KERN_ERR "xilinx or elf not "
"successfully loaded\n");
return -EIO; /* modprob -r may help ? */ return -EIO; /* modprob -r may help ? */
} }
/* wait for daughter detection != 0 */ /* wait for daughter detection != 0 */
err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DBRD_PRESENCE_OFFSET, 0, 0, 30); /* 300msec */ err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DBRD_PRESENCE_OFFSET, 0, 0, 30); /* 300msec */
if (err < 0) { if (err < 0) {
snd_printk( KERN_ERR "error starting elf file\n"); snd_printk(KERN_ERR "error starting elf file\n");
return err; return err;
} }
...@@ -460,8 +464,9 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -460,8 +464,9 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
return -EINVAL; return -EINVAL;
/* daughter should be idle */ /* daughter should be idle */
if( status_daught != 0 ) { if (status_daught != 0) {
printk( KERN_ERR "daughter load error ! status = %d\n", status_daught); printk(KERN_ERR "daughter load error ! status = %d\n",
status_daught);
return -EIO; /* modprob -r may help ? */ return -EIO; /* modprob -r may help ? */
} }
...@@ -480,7 +485,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -480,7 +485,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* wait for status == 2 */ /* wait for status == 2 */
err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DXLX_STATUS_OFFSET, 1, 2, 30); /* 300msec */ err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DXLX_STATUS_OFFSET, 1, 2, 30); /* 300msec */
if (err < 0) { if (err < 0) {
snd_printk( KERN_ERR "daughter board load error\n"); snd_printk(KERN_ERR "daughter board load error\n");
return err; return err;
} }
...@@ -502,7 +507,8 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -502,7 +507,8 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* wait for daughter status == 3 */ /* wait for daughter status == 3 */
err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DXLX_STATUS_OFFSET, 1, 3, 300); /* 3sec */ err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DXLX_STATUS_OFFSET, 1, 3, 300); /* 3sec */
if (err < 0) { if (err < 0) {
snd_printk( KERN_ERR "daughter board could not be initialised\n"); snd_printk(KERN_ERR
"daughter board could not be initialised\n");
return err; return err;
} }
...@@ -512,7 +518,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -512,7 +518,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* first communication with embedded */ /* first communication with embedded */
err = mixart_first_init(mgr); err = mixart_first_init(mgr);
if (err < 0) { if (err < 0) {
snd_printk( KERN_ERR "miXart could not be set up\n"); snd_printk(KERN_ERR "miXart could not be set up\n");
return err; return err;
} }
......
sound/pci/sonicvibes.c
View file @ ee419653
...@@ -273,7 +273,8 @@ static inline void snd_sonicvibes_setdmaa(struct sonicvibes * sonic, ...@@ -273,7 +273,8 @@ static inline void snd_sonicvibes_setdmaa(struct sonicvibes * sonic,
outl(count, sonic->dmaa_port + SV_DMA_COUNT0); outl(count, sonic->dmaa_port + SV_DMA_COUNT0);
outb(0x18, sonic->dmaa_port + SV_DMA_MODE); outb(0x18, sonic->dmaa_port + SV_DMA_MODE);
#if 0 #if 0
printk("program dmaa: addr = 0x%x, paddr = 0x%x\n", addr, inl(sonic->dmaa_port + SV_DMA_ADDR0)); printk(KERN_DEBUG "program dmaa: addr = 0x%x, paddr = 0x%x\n",
addr, inl(sonic->dmaa_port + SV_DMA_ADDR0));
#endif #endif
} }
...@@ -288,7 +289,8 @@ static inline void snd_sonicvibes_setdmac(struct sonicvibes * sonic, ...@@ -288,7 +289,8 @@ static inline void snd_sonicvibes_setdmac(struct sonicvibes * sonic,
outl(count, sonic->dmac_port + SV_DMA_COUNT0); outl(count, sonic->dmac_port + SV_DMA_COUNT0);
outb(0x14, sonic->dmac_port + SV_DMA_MODE); outb(0x14, sonic->dmac_port + SV_DMA_MODE);
#if 0 #if 0
printk("program dmac: addr = 0x%x, paddr = 0x%x\n", addr, inl(sonic->dmac_port + SV_DMA_ADDR0)); printk(KERN_DEBUG "program dmac: addr = 0x%x, paddr = 0x%x\n",
addr, inl(sonic->dmac_port + SV_DMA_ADDR0));
#endif #endif
} }
...@@ -355,71 +357,104 @@ static unsigned char snd_sonicvibes_in(struct sonicvibes * sonic, unsigned char ...@@ -355,71 +357,104 @@ static unsigned char snd_sonicvibes_in(struct sonicvibes * sonic, unsigned char
#if 0 #if 0
static void snd_sonicvibes_debug(struct sonicvibes * sonic) static void snd_sonicvibes_debug(struct sonicvibes * sonic)
{ {
printk("SV REGS: INDEX = 0x%02x ", inb(SV_REG(sonic, INDEX))); printk(KERN_DEBUG
"SV REGS: INDEX = 0x%02x ", inb(SV_REG(sonic, INDEX)));
printk(" STATUS = 0x%02x\n", inb(SV_REG(sonic, STATUS))); printk(" STATUS = 0x%02x\n", inb(SV_REG(sonic, STATUS)));
printk(" 0x00: left input = 0x%02x ", snd_sonicvibes_in(sonic, 0x00)); printk(KERN_DEBUG
" 0x00: left input = 0x%02x ", snd_sonicvibes_in(sonic, 0x00));
printk(" 0x20: synth rate low = 0x%02x\n", snd_sonicvibes_in(sonic, 0x20)); printk(" 0x20: synth rate low = 0x%02x\n", snd_sonicvibes_in(sonic, 0x20));
printk(" 0x01: right input = 0x%02x ", snd_sonicvibes_in(sonic, 0x01)); printk(KERN_DEBUG
" 0x01: right input = 0x%02x ", snd_sonicvibes_in(sonic, 0x01));
printk(" 0x21: synth rate high = 0x%02x\n", snd_sonicvibes_in(sonic, 0x21)); printk(" 0x21: synth rate high = 0x%02x\n", snd_sonicvibes_in(sonic, 0x21));
printk(" 0x02: left AUX1 = 0x%02x ", snd_sonicvibes_in(sonic, 0x02)); printk(KERN_DEBUG
" 0x02: left AUX1 = 0x%02x ", snd_sonicvibes_in(sonic, 0x02));
printk(" 0x22: ADC clock = 0x%02x\n", snd_sonicvibes_in(sonic, 0x22)); printk(" 0x22: ADC clock = 0x%02x\n", snd_sonicvibes_in(sonic, 0x22));
printk(" 0x03: right AUX1 = 0x%02x ", snd_sonicvibes_in(sonic, 0x03)); printk(KERN_DEBUG
" 0x03: right AUX1 = 0x%02x ", snd_sonicvibes_in(sonic, 0x03));
printk(" 0x23: ADC alt rate = 0x%02x\n", snd_sonicvibes_in(sonic, 0x23)); printk(" 0x23: ADC alt rate = 0x%02x\n", snd_sonicvibes_in(sonic, 0x23));
printk(" 0x04: left CD = 0x%02x ", snd_sonicvibes_in(sonic, 0x04)); printk(KERN_DEBUG
" 0x04: left CD = 0x%02x ", snd_sonicvibes_in(sonic, 0x04));
printk(" 0x24: ADC pll M = 0x%02x\n", snd_sonicvibes_in(sonic, 0x24)); printk(" 0x24: ADC pll M = 0x%02x\n", snd_sonicvibes_in(sonic, 0x24));
printk(" 0x05: right CD = 0x%02x ", snd_sonicvibes_in(sonic, 0x05)); printk(KERN_DEBUG
" 0x05: right CD = 0x%02x ", snd_sonicvibes_in(sonic, 0x05));
printk(" 0x25: ADC pll N = 0x%02x\n", snd_sonicvibes_in(sonic, 0x25)); printk(" 0x25: ADC pll N = 0x%02x\n", snd_sonicvibes_in(sonic, 0x25));
printk(" 0x06: left line = 0x%02x ", snd_sonicvibes_in(sonic, 0x06)); printk(KERN_DEBUG
" 0x06: left line = 0x%02x ", snd_sonicvibes_in(sonic, 0x06));
printk(" 0x26: Synth pll M = 0x%02x\n", snd_sonicvibes_in(sonic, 0x26)); printk(" 0x26: Synth pll M = 0x%02x\n", snd_sonicvibes_in(sonic, 0x26));
printk(" 0x07: right line = 0x%02x ", snd_sonicvibes_in(sonic, 0x07)); printk(KERN_DEBUG
" 0x07: right line = 0x%02x ", snd_sonicvibes_in(sonic, 0x07));
printk(" 0x27: Synth pll N = 0x%02x\n", snd_sonicvibes_in(sonic, 0x27)); printk(" 0x27: Synth pll N = 0x%02x\n", snd_sonicvibes_in(sonic, 0x27));
printk(" 0x08: MIC = 0x%02x ", snd_sonicvibes_in(sonic, 0x08)); printk(KERN_DEBUG
" 0x08: MIC = 0x%02x ", snd_sonicvibes_in(sonic, 0x08));
printk(" 0x28: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x28)); printk(" 0x28: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x28));
printk(" 0x09: Game port = 0x%02x ", snd_sonicvibes_in(sonic, 0x09)); printk(KERN_DEBUG
" 0x09: Game port = 0x%02x ", snd_sonicvibes_in(sonic, 0x09));
printk(" 0x29: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x29)); printk(" 0x29: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x29));
printk(" 0x0a: left synth = 0x%02x ", snd_sonicvibes_in(sonic, 0x0a)); printk(KERN_DEBUG
" 0x0a: left synth = 0x%02x ", snd_sonicvibes_in(sonic, 0x0a));
printk(" 0x2a: MPU401 = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2a)); printk(" 0x2a: MPU401 = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2a));
printk(" 0x0b: right synth = 0x%02x ", snd_sonicvibes_in(sonic, 0x0b)); printk(KERN_DEBUG
" 0x0b: right synth = 0x%02x ", snd_sonicvibes_in(sonic, 0x0b));
printk(" 0x2b: drive ctrl = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2b)); printk(" 0x2b: drive ctrl = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2b));
printk(" 0x0c: left AUX2 = 0x%02x ", snd_sonicvibes_in(sonic, 0x0c)); printk(KERN_DEBUG
" 0x0c: left AUX2 = 0x%02x ", snd_sonicvibes_in(sonic, 0x0c));
printk(" 0x2c: SRS space = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2c)); printk(" 0x2c: SRS space = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2c));
printk(" 0x0d: right AUX2 = 0x%02x ", snd_sonicvibes_in(sonic, 0x0d)); printk(KERN_DEBUG
" 0x0d: right AUX2 = 0x%02x ", snd_sonicvibes_in(sonic, 0x0d));
printk(" 0x2d: SRS center = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2d)); printk(" 0x2d: SRS center = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2d));
printk(" 0x0e: left analog = 0x%02x ", snd_sonicvibes_in(sonic, 0x0e)); printk(KERN_DEBUG
" 0x0e: left analog = 0x%02x ", snd_sonicvibes_in(sonic, 0x0e));
printk(" 0x2e: wave source = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2e)); printk(" 0x2e: wave source = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2e));
printk(" 0x0f: right analog = 0x%02x ", snd_sonicvibes_in(sonic, 0x0f)); printk(KERN_DEBUG
" 0x0f: right analog = 0x%02x ", snd_sonicvibes_in(sonic, 0x0f));
printk(" 0x2f: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2f)); printk(" 0x2f: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2f));
printk(" 0x10: left PCM = 0x%02x ", snd_sonicvibes_in(sonic, 0x10)); printk(KERN_DEBUG
" 0x10: left PCM = 0x%02x ", snd_sonicvibes_in(sonic, 0x10));
printk(" 0x30: analog power = 0x%02x\n", snd_sonicvibes_in(sonic, 0x30)); printk(" 0x30: analog power = 0x%02x\n", snd_sonicvibes_in(sonic, 0x30));
printk(" 0x11: right PCM = 0x%02x ", snd_sonicvibes_in(sonic, 0x11)); printk(KERN_DEBUG
" 0x11: right PCM = 0x%02x ", snd_sonicvibes_in(sonic, 0x11));
printk(" 0x31: analog power = 0x%02x\n", snd_sonicvibes_in(sonic, 0x31)); printk(" 0x31: analog power = 0x%02x\n", snd_sonicvibes_in(sonic, 0x31));
printk(" 0x12: DMA data format = 0x%02x ", snd_sonicvibes_in(sonic, 0x12)); printk(KERN_DEBUG
" 0x12: DMA data format = 0x%02x ", snd_sonicvibes_in(sonic, 0x12));
printk(" 0x32: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x32)); printk(" 0x32: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x32));
printk(" 0x13: P/C enable = 0x%02x ", snd_sonicvibes_in(sonic, 0x13)); printk(KERN_DEBUG
" 0x13: P/C enable = 0x%02x ", snd_sonicvibes_in(sonic, 0x13));
printk(" 0x33: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x33)); printk(" 0x33: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x33));
printk(" 0x14: U/D button = 0x%02x ", snd_sonicvibes_in(sonic, 0x14)); printk(KERN_DEBUG
" 0x14: U/D button = 0x%02x ", snd_sonicvibes_in(sonic, 0x14));
printk(" 0x34: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x34)); printk(" 0x34: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x34));
printk(" 0x15: revision = 0x%02x ", snd_sonicvibes_in(sonic, 0x15)); printk(KERN_DEBUG
" 0x15: revision = 0x%02x ", snd_sonicvibes_in(sonic, 0x15));
printk(" 0x35: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x35)); printk(" 0x35: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x35));
printk(" 0x16: ADC output ctrl = 0x%02x ", snd_sonicvibes_in(sonic, 0x16)); printk(KERN_DEBUG
" 0x16: ADC output ctrl = 0x%02x ", snd_sonicvibes_in(sonic, 0x16));
printk(" 0x36: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x36)); printk(" 0x36: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x36));
printk(" 0x17: --- = 0x%02x ", snd_sonicvibes_in(sonic, 0x17)); printk(KERN_DEBUG
" 0x17: --- = 0x%02x ", snd_sonicvibes_in(sonic, 0x17));
printk(" 0x37: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x37)); printk(" 0x37: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x37));
printk(" 0x18: DMA A upper cnt = 0x%02x ", snd_sonicvibes_in(sonic, 0x18)); printk(KERN_DEBUG
" 0x18: DMA A upper cnt = 0x%02x ", snd_sonicvibes_in(sonic, 0x18));
printk(" 0x38: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x38)); printk(" 0x38: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x38));
printk(" 0x19: DMA A lower cnt = 0x%02x ", snd_sonicvibes_in(sonic, 0x19)); printk(KERN_DEBUG
" 0x19: DMA A lower cnt = 0x%02x ", snd_sonicvibes_in(sonic, 0x19));
printk(" 0x39: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x39)); printk(" 0x39: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x39));
printk(" 0x1a: --- = 0x%02x ", snd_sonicvibes_in(sonic, 0x1a)); printk(KERN_DEBUG
" 0x1a: --- = 0x%02x ", snd_sonicvibes_in(sonic, 0x1a));
printk(" 0x3a: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3a)); printk(" 0x3a: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3a));
printk(" 0x1b: --- = 0x%02x ", snd_sonicvibes_in(sonic, 0x1b)); printk(KERN_DEBUG
" 0x1b: --- = 0x%02x ", snd_sonicvibes_in(sonic, 0x1b));
printk(" 0x3b: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3b)); printk(" 0x3b: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3b));
printk(" 0x1c: DMA C upper cnt = 0x%02x ", snd_sonicvibes_in(sonic, 0x1c)); printk(KERN_DEBUG
" 0x1c: DMA C upper cnt = 0x%02x ", snd_sonicvibes_in(sonic, 0x1c));
printk(" 0x3c: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3c)); printk(" 0x3c: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3c));
printk(" 0x1d: DMA C upper cnt = 0x%02x ", snd_sonicvibes_in(sonic, 0x1d)); printk(KERN_DEBUG
" 0x1d: DMA C upper cnt = 0x%02x ", snd_sonicvibes_in(sonic, 0x1d));
printk(" 0x3d: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3d)); printk(" 0x3d: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3d));
printk(" 0x1e: PCM rate low = 0x%02x ", snd_sonicvibes_in(sonic, 0x1e)); printk(KERN_DEBUG
" 0x1e: PCM rate low = 0x%02x ", snd_sonicvibes_in(sonic, 0x1e));
printk(" 0x3e: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3e)); printk(" 0x3e: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3e));
printk(" 0x1f: PCM rate high = 0x%02x ", snd_sonicvibes_in(sonic, 0x1f)); printk(KERN_DEBUG
" 0x1f: PCM rate high = 0x%02x ", snd_sonicvibes_in(sonic, 0x1f));
printk(" 0x3f: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3f)); printk(" 0x3f: --- = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3f));
} }
...@@ -476,8 +511,8 @@ static void snd_sonicvibes_pll(unsigned int rate, ...@@ -476,8 +511,8 @@ static void snd_sonicvibes_pll(unsigned int rate,
*res_m = m; *res_m = m;
*res_n = n; *res_n = n;
#if 0 #if 0
printk("metric = %i, xm = %i, xn = %i\n", metric, xm, xn); printk(KERN_DEBUG "metric = %i, xm = %i, xn = %i\n", metric, xm, xn);
printk("pll: m = 0x%x, r = 0x%x, n = 0x%x\n", reg, m, r, n); printk(KERN_DEBUG "pll: m = 0x%x, r = 0x%x, n = 0x%x\n", reg, m, r, n);
#endif #endif
} }
......
sound/pci/trident/trident_main.c
View file @ ee419653
...@@ -68,40 +68,40 @@ static void snd_trident_print_voice_regs(struct snd_trident *trident, int voice) ...@@ -68,40 +68,40 @@ static void snd_trident_print_voice_regs(struct snd_trident *trident, int voice)
{ {
unsigned int val, tmp; unsigned int val, tmp;
printk("Trident voice %i:\n", voice); printk(KERN_DEBUG "Trident voice %i:\n", voice);
outb(voice, TRID_REG(trident, T4D_LFO_GC_CIR)); outb(voice, TRID_REG(trident, T4D_LFO_GC_CIR));
val = inl(TRID_REG(trident, CH_LBA)); val = inl(TRID_REG(trident, CH_LBA));
printk("LBA: 0x%x\n", val); printk(KERN_DEBUG "LBA: 0x%x\n", val);
val = inl(TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC)); val = inl(TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC));
printk("GVSel: %i\n", val >> 31); printk(KERN_DEBUG "GVSel: %i\n", val >> 31);
printk("Pan: 0x%x\n", (val >> 24) & 0x7f); printk(KERN_DEBUG "Pan: 0x%x\n", (val >> 24) & 0x7f);
printk("Vol: 0x%x\n", (val >> 16) & 0xff); printk(KERN_DEBUG "Vol: 0x%x\n", (val >> 16) & 0xff);
printk("CTRL: 0x%x\n", (val >> 12) & 0x0f); printk(KERN_DEBUG "CTRL: 0x%x\n", (val >> 12) & 0x0f);
printk("EC: 0x%x\n", val & 0x0fff); printk(KERN_DEBUG "EC: 0x%x\n", val & 0x0fff);
if (trident->device != TRIDENT_DEVICE_ID_NX) { if (trident->device != TRIDENT_DEVICE_ID_NX) {
val = inl(TRID_REG(trident, CH_DX_CSO_ALPHA_FMS)); val = inl(TRID_REG(trident, CH_DX_CSO_ALPHA_FMS));
printk("CSO: 0x%x\n", val >> 16); printk(KERN_DEBUG "CSO: 0x%x\n", val >> 16);
printk("Alpha: 0x%x\n", (val >> 4) & 0x0fff); printk("Alpha: 0x%x\n", (val >> 4) & 0x0fff);
printk("FMS: 0x%x\n", val & 0x0f); printk(KERN_DEBUG "FMS: 0x%x\n", val & 0x0f);
val = inl(TRID_REG(trident, CH_DX_ESO_DELTA)); val = inl(TRID_REG(trident, CH_DX_ESO_DELTA));
printk("ESO: 0x%x\n", val >> 16); printk(KERN_DEBUG "ESO: 0x%x\n", val >> 16);
printk("Delta: 0x%x\n", val & 0xffff); printk(KERN_DEBUG "Delta: 0x%x\n", val & 0xffff);
val = inl(TRID_REG(trident, CH_DX_FMC_RVOL_CVOL)); val = inl(TRID_REG(trident, CH_DX_FMC_RVOL_CVOL));
} else { // TRIDENT_DEVICE_ID_NX } else { // TRIDENT_DEVICE_ID_NX
val = inl(TRID_REG(trident, CH_NX_DELTA_CSO)); val = inl(TRID_REG(trident, CH_NX_DELTA_CSO));
tmp = (val >> 24) & 0xff; tmp = (val >> 24) & 0xff;
printk("CSO: 0x%x\n", val & 0x00ffffff); printk(KERN_DEBUG "CSO: 0x%x\n", val & 0x00ffffff);
val = inl(TRID_REG(trident, CH_NX_DELTA_ESO)); val = inl(TRID_REG(trident, CH_NX_DELTA_ESO));
tmp |= (val >> 16) & 0xff00; tmp |= (val >> 16) & 0xff00;
printk("Delta: 0x%x\n", tmp); printk(KERN_DEBUG "Delta: 0x%x\n", tmp);
printk("ESO: 0x%x\n", val & 0x00ffffff); printk(KERN_DEBUG "ESO: 0x%x\n", val & 0x00ffffff);
val = inl(TRID_REG(trident, CH_NX_ALPHA_FMS_FMC_RVOL_CVOL)); val = inl(TRID_REG(trident, CH_NX_ALPHA_FMS_FMC_RVOL_CVOL));
printk("Alpha: 0x%x\n", val >> 20); printk(KERN_DEBUG "Alpha: 0x%x\n", val >> 20);
printk("FMS: 0x%x\n", (val >> 16) & 0x0f); printk(KERN_DEBUG "FMS: 0x%x\n", (val >> 16) & 0x0f);
} }
printk("FMC: 0x%x\n", (val >> 14) & 3); printk(KERN_DEBUG "FMC: 0x%x\n", (val >> 14) & 3);
printk("RVol: 0x%x\n", (val >> 7) & 0x7f); printk(KERN_DEBUG "RVol: 0x%x\n", (val >> 7) & 0x7f);
printk("CVol: 0x%x\n", val & 0x7f); printk(KERN_DEBUG "CVol: 0x%x\n", val & 0x7f);
} }
#endif #endif
...@@ -496,12 +496,17 @@ void snd_trident_write_voice_regs(struct snd_trident * trident, ...@@ -496,12 +496,17 @@ void snd_trident_write_voice_regs(struct snd_trident * trident,
outl(regs[4], TRID_REG(trident, CH_START + 16)); outl(regs[4], TRID_REG(trident, CH_START + 16));
#if 0 #if 0
printk("written %i channel:\n", voice->number); printk(KERN_DEBUG "written %i channel:\n", voice->number);
printk(" regs[0] = 0x%x/0x%x\n", regs[0], inl(TRID_REG(trident, CH_START + 0))); printk(KERN_DEBUG " regs[0] = 0x%x/0x%x\n",
printk(" regs[1] = 0x%x/0x%x\n", regs[1], inl(TRID_REG(trident, CH_START + 4))); regs[0], inl(TRID_REG(trident, CH_START + 0)));
printk(" regs[2] = 0x%x/0x%x\n", regs[2], inl(TRID_REG(trident, CH_START + 8))); printk(KERN_DEBUG " regs[1] = 0x%x/0x%x\n",
printk(" regs[3] = 0x%x/0x%x\n", regs[3], inl(TRID_REG(trident, CH_START + 12))); regs[1], inl(TRID_REG(trident, CH_START + 4)));
printk(" regs[4] = 0x%x/0x%x\n", regs[4], inl(TRID_REG(trident, CH_START + 16))); printk(KERN_DEBUG " regs[2] = 0x%x/0x%x\n",
regs[2], inl(TRID_REG(trident, CH_START + 8)));
printk(KERN_DEBUG " regs[3] = 0x%x/0x%x\n",
regs[3], inl(TRID_REG(trident, CH_START + 12)));
printk(KERN_DEBUG " regs[4] = 0x%x/0x%x\n",
regs[4], inl(TRID_REG(trident, CH_START + 16)));
#endif #endif
} }
...@@ -583,7 +588,7 @@ static void snd_trident_write_vol_reg(struct snd_trident * trident, ...@@ -583,7 +588,7 @@ static void snd_trident_write_vol_reg(struct snd_trident * trident,
outb(voice->Vol >> 2, TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC + 2)); outb(voice->Vol >> 2, TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC + 2));
break; break;
case TRIDENT_DEVICE_ID_SI7018: case TRIDENT_DEVICE_ID_SI7018:
// printk("voice->Vol = 0x%x\n", voice->Vol); /* printk(KERN_DEBUG "voice->Vol = 0x%x\n", voice->Vol); */
outw((voice->CTRL << 12) | voice->Vol, outw((voice->CTRL << 12) | voice->Vol,
TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC)); TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC));
break; break;
......
sound/pci/via82xx.c
View file @ ee419653
...@@ -466,7 +466,10 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre ...@@ -466,7 +466,10 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre
flag = VIA_TBL_BIT_FLAG; /* period boundary */ flag = VIA_TBL_BIT_FLAG; /* period boundary */
} else } else
flag = 0; /* period continues to the next */ flag = 0; /* period continues to the next */
// printk("via: tbl %d: at %d size %d (rest %d)\n", idx, ofs, r, rest); /*
printk(KERN_DEBUG "via: tbl %d: at %d size %d "
"(rest %d)\n", idx, ofs, r, rest);
*/
((u32 *)dev->table.area)[(idx<<1) + 1] = cpu_to_le32(r | flag); ((u32 *)dev->table.area)[(idx<<1) + 1] = cpu_to_le32(r | flag);
dev->idx_table[idx].offset = ofs; dev->idx_table[idx].offset = ofs;
dev->idx_table[idx].size = r; dev->idx_table[idx].size = r;
......
sound/pci/via82xx_modem.c
View file @ ee419653
...@@ -328,7 +328,10 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre ...@@ -328,7 +328,10 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre
flag = VIA_TBL_BIT_FLAG; /* period boundary */ flag = VIA_TBL_BIT_FLAG; /* period boundary */
} else } else
flag = 0; /* period continues to the next */ flag = 0; /* period continues to the next */
// printk("via: tbl %d: at %d size %d (rest %d)\n", idx, ofs, r, rest); /*
printk(KERN_DEBUG "via: tbl %d: at %d size %d "
"(rest %d)\n", idx, ofs, r, rest);
*/
((u32 *)dev->table.area)[(idx<<1) + 1] = cpu_to_le32(r | flag); ((u32 *)dev->table.area)[(idx<<1) + 1] = cpu_to_le32(r | flag);
dev->idx_table[idx].offset = ofs; dev->idx_table[idx].offset = ofs;
dev->idx_table[idx].size = r; dev->idx_table[idx].size = r;
......
sound/pci/vx222/vx222_ops.c
View file @ ee419653
...@@ -107,7 +107,9 @@ static unsigned char vx2_inb(struct vx_core *chip, int offset) ...@@ -107,7 +107,9 @@ static unsigned char vx2_inb(struct vx_core *chip, int offset)
static void vx2_outb(struct vx_core *chip, int offset, unsigned char val) static void vx2_outb(struct vx_core *chip, int offset, unsigned char val)
{ {
outb(val, vx2_reg_addr(chip, offset)); outb(val, vx2_reg_addr(chip, offset));
//printk("outb: %x -> %x\n", val, vx2_reg_addr(chip, offset)); /*
printk(KERN_DEBUG "outb: %x -> %x\n", val, vx2_reg_addr(chip, offset));
*/
} }
/** /**
...@@ -126,7 +128,9 @@ static unsigned int vx2_inl(struct vx_core *chip, int offset) ...@@ -126,7 +128,9 @@ static unsigned int vx2_inl(struct vx_core *chip, int offset)
*/ */
static void vx2_outl(struct vx_core *chip, int offset, unsigned int val) static void vx2_outl(struct vx_core *chip, int offset, unsigned int val)
{ {
// printk("outl: %x -> %x\n", val, vx2_reg_addr(chip, offset)); /*
printk(KERN_DEBUG "outl: %x -> %x\n", val, vx2_reg_addr(chip, offset));
*/
outl(val, vx2_reg_addr(chip, offset)); outl(val, vx2_reg_addr(chip, offset));
} }
......
sound/pci/ymfpci/ymfpci_main.c
View file @ ee419653
...@@ -318,7 +318,12 @@ static void snd_ymfpci_pcm_interrupt(struct snd_ymfpci *chip, struct snd_ymfpci_ ...@@ -318,7 +318,12 @@ static void snd_ymfpci_pcm_interrupt(struct snd_ymfpci *chip, struct snd_ymfpci_
ypcm->period_pos += delta; ypcm->period_pos += delta;
ypcm->last_pos = pos; ypcm->last_pos = pos;
if (ypcm->period_pos >= ypcm->period_size) { if (ypcm->period_pos >= ypcm->period_size) {
// printk("done - active_bank = 0x%x, start = 0x%x\n", chip->active_bank, voice->bank[chip->active_bank].start); /*
printk(KERN_DEBUG
"done - active_bank = 0x%x, start = 0x%x\n",
chip->active_bank,
voice->bank[chip->active_bank].start);
*/
ypcm->period_pos %= ypcm->period_size; ypcm->period_pos %= ypcm->period_size;
spin_unlock(&chip->reg_lock); spin_unlock(&chip->reg_lock);
snd_pcm_period_elapsed(ypcm->substream); snd_pcm_period_elapsed(ypcm->substream);
...@@ -366,7 +371,12 @@ static void snd_ymfpci_pcm_capture_interrupt(struct snd_pcm_substream *substream ...@@ -366,7 +371,12 @@ static void snd_ymfpci_pcm_capture_interrupt(struct snd_pcm_substream *substream
ypcm->last_pos = pos; ypcm->last_pos = pos;
if (ypcm->period_pos >= ypcm->period_size) { if (ypcm->period_pos >= ypcm->period_size) {
ypcm->period_pos %= ypcm->period_size; ypcm->period_pos %= ypcm->period_size;
// printk("done - active_bank = 0x%x, start = 0x%x\n", chip->active_bank, voice->bank[chip->active_bank].start); /*
printk(KERN_DEBUG
"done - active_bank = 0x%x, start = 0x%x\n",
chip->active_bank,
voice->bank[chip->active_bank].start);
*/
spin_unlock(&chip->reg_lock); spin_unlock(&chip->reg_lock);
snd_pcm_period_elapsed(substream); snd_pcm_period_elapsed(substream);
spin_lock(&chip->reg_lock); spin_lock(&chip->reg_lock);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7