|
@@ -82,7 +82,10 @@ static int snd_gf1_pcm_block_change(struct snd_pcm_substream *substream,
|
|
|
|
|
|
count += offset & 31;
|
|
|
offset &= ~31;
|
|
|
- // snd_printk("block change - offset = 0x%x, count = 0x%x\n", offset, count);
|
|
|
+ /*
|
|
|
+ snd_printk(KERN_DEBUG "block change - offset = 0x%x, count = 0x%x\n",
|
|
|
+ offset, count);
|
|
|
+ */
|
|
|
memset(&block, 0, sizeof(block));
|
|
|
block.cmd = SNDRV_GF1_DMA_IRQ;
|
|
|
if (snd_pcm_format_unsigned(runtime->format))
|
|
@@ -135,7 +138,11 @@ static void snd_gf1_pcm_trigger_up(struct snd_pcm_substream *substream)
|
|
|
curr = begin + (pcmp->bpos * pcmp->block_size) / runtime->channels;
|
|
|
end = curr + (pcmp->block_size / runtime->channels);
|
|
|
end -= snd_pcm_format_width(runtime->format) == 16 ? 2 : 1;
|
|
|
- // snd_printk("init: curr=0x%x, begin=0x%x, end=0x%x, ctrl=0x%x, ramp=0x%x, rate=0x%x\n", curr, begin, end, voice_ctrl, ramp_ctrl, rate);
|
|
|
+ /*
|
|
|
+ snd_printk(KERN_DEBUG "init: curr=0x%x, begin=0x%x, end=0x%x, "
|
|
|
+ "ctrl=0x%x, ramp=0x%x, rate=0x%x\n",
|
|
|
+ curr, begin, end, voice_ctrl, ramp_ctrl, rate);
|
|
|
+ */
|
|
|
pan = runtime->channels == 2 ? (!voice ? 1 : 14) : 8;
|
|
|
vol = !voice ? gus->gf1.pcm_volume_level_left : gus->gf1.pcm_volume_level_right;
|
|
|
spin_lock_irqsave(&gus->reg_lock, flags);
|
|
@@ -205,9 +212,11 @@ static void snd_gf1_pcm_interrupt_wave(struct snd_gus_card * gus,
|
|
|
ramp_ctrl = (snd_gf1_read8(gus, SNDRV_GF1_VB_VOLUME_CONTROL) & ~0xa4) | 0x03;
|
|
|
#if 0
|
|
|
snd_gf1_select_voice(gus, pvoice->number);
|
|
|
- printk("position = 0x%x\n", (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
|
|
|
+ printk(KERN_DEBUG "position = 0x%x\n",
|
|
|
+ (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
|
|
|
snd_gf1_select_voice(gus, pcmp->pvoices[1]->number);
|
|
|
- printk("position = 0x%x\n", (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
|
|
|
+ printk(KERN_DEBUG "position = 0x%x\n",
|
|
|
+ (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
|
|
|
snd_gf1_select_voice(gus, pvoice->number);
|
|
|
#endif
|
|
|
pcmp->bpos++;
|
|
@@ -299,7 +308,11 @@ static int snd_gf1_pcm_poke_block(struct snd_gus_card *gus, unsigned char *buf,
|
|
|
unsigned int len;
|
|
|
unsigned long flags;
|
|
|
|
|
|
- // printk("poke block; buf = 0x%x, pos = %i, count = %i, port = 0x%x\n", (int)buf, pos, count, gus->gf1.port);
|
|
|
+ /*
|
|
|
+ printk(KERN_DEBUG
|
|
|
+ "poke block; buf = 0x%x, pos = %i, count = %i, port = 0x%x\n",
|
|
|
+ (int)buf, pos, count, gus->gf1.port);
|
|
|
+ */
|
|
|
while (count > 0) {
|
|
|
len = count;
|
|
|
if (len > 512) /* limit, to allow IRQ */
|
|
@@ -680,7 +693,8 @@ static int snd_gf1_pcm_playback_open(struct snd_pcm_substream *substream)
|
|
|
runtime->private_free = snd_gf1_pcm_playback_free;
|
|
|
|
|
|
#if 0
|
|
|
- printk("playback.buffer = 0x%lx, gf1.pcm_buffer = 0x%lx\n", (long) pcm->playback.buffer, (long) gus->gf1.pcm_buffer);
|
|
|
+ printk(KERN_DEBUG "playback.buffer = 0x%lx, gf1.pcm_buffer = 0x%lx\n",
|
|
|
+ (long) pcm->playback.buffer, (long) gus->gf1.pcm_buffer);
|
|
|
#endif
|
|
|
if ((err = snd_gf1_dma_init(gus)) < 0)
|
|
|
return err;
|