aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/isa/gus/gus_dma.c24
1 files changed, 15 insertions, 9 deletions
diff --git a/sound/isa/gus/gus_dma.c b/sound/isa/gus/gus_dma.c
index f45f6116c77a..cf8cd3c26a55 100644
--- a/sound/isa/gus/gus_dma.c
+++ b/sound/isa/gus/gus_dma.c
@@ -45,7 +45,8 @@ static void snd_gf1_dma_program(struct snd_gus_card * gus,
45 unsigned char dma_cmd; 45 unsigned char dma_cmd;
46 unsigned int address_high; 46 unsigned int address_high;
47 47
48 // snd_printk("dma_transfer: addr=0x%x, buf=0x%lx, count=0x%x\n", addr, (long) buf, count); 48 snd_printdd("dma_transfer: addr=0x%x, buf=0x%lx, count=0x%x\n",
49 addr, buf_addr, count);
49 50
50 if (gus->gf1.dma1 > 3) { 51 if (gus->gf1.dma1 > 3) {
51 if (gus->gf1.enh_mode) { 52 if (gus->gf1.enh_mode) {
@@ -142,7 +143,9 @@ static void snd_gf1_dma_interrupt(struct snd_gus_card * gus)
142 snd_gf1_dma_program(gus, block->addr, block->buf_addr, block->count, (unsigned short) block->cmd); 143 snd_gf1_dma_program(gus, block->addr, block->buf_addr, block->count, (unsigned short) block->cmd);
143 kfree(block); 144 kfree(block);
144#if 0 145#if 0
145 printk("program dma (IRQ) - addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n", addr, (long) buffer, count, cmd); 146 snd_printd(KERN_DEBUG "program dma (IRQ) - "
147 "addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n",
148 block->addr, block->buf_addr, block->count, block->cmd);
146#endif 149#endif
147} 150}
148 151
@@ -203,13 +206,16 @@ int snd_gf1_dma_transfer_block(struct snd_gus_card * gus,
203 } 206 }
204 *block = *__block; 207 *block = *__block;
205 block->next = NULL; 208 block->next = NULL;
206#if 0 209
207 printk("addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n", block->addr, (long) block->buffer, block->count, block->cmd); 210 snd_printdd("addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n",
208#endif 211 block->addr, (long) block->buffer, block->count,
209#if 0 212 block->cmd);
210 printk("gus->gf1.dma_data_pcm_last = 0x%lx\n", (long)gus->gf1.dma_data_pcm_last); 213
211 printk("gus->gf1.dma_data_pcm = 0x%lx\n", (long)gus->gf1.dma_data_pcm); 214 snd_printdd("gus->gf1.dma_data_pcm_last = 0x%lx\n",
212#endif 215 (long)gus->gf1.dma_data_pcm_last);
216 snd_printdd("gus->gf1.dma_data_pcm = 0x%lx\n",
217 (long)gus->gf1.dma_data_pcm);
218
213 spin_lock_irqsave(&gus->dma_lock, flags); 219 spin_lock_irqsave(&gus->dma_lock, flags);
214 if (synth) { 220 if (synth) {
215 if (gus->gf1.dma_data_synth_last) { 221 if (gus->gf1.dma_data_synth_last) {