Commit dfe547ab authored by Jody McIntyre's avatar Jody McIntyre Committed by Linus Torvalds

[PATCH] ohci1394: tlabels misprinted in DBGMSG

- Print the correct value in the DBGMSG in dma_rcv_tasklet().
  See OHCI 1.1 section 8.7, page 103 ff.
- Print tlabels as %d everywhere.
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarJody McIntyre <scjody@steamballoon.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8d134db0
...@@ -2691,7 +2691,7 @@ static void dma_rcv_tasklet (unsigned long data) ...@@ -2691,7 +2691,7 @@ static void dma_rcv_tasklet (unsigned long data)
(cond_le32_to_cpu(d->spb[length/4-1], ohci->no_swap_incoming)>>16)&0x1f, (cond_le32_to_cpu(d->spb[length/4-1], ohci->no_swap_incoming)>>16)&0x1f,
(cond_le32_to_cpu(d->spb[length/4-1], ohci->no_swap_incoming)>>21)&0x3, (cond_le32_to_cpu(d->spb[length/4-1], ohci->no_swap_incoming)>>21)&0x3,
tcode, length, d->ctx, tcode, length, d->ctx,
(cond_le32_to_cpu(d->spb[length/4-1], ohci->no_swap_incoming)>>10)&0x3f); (cond_le32_to_cpu(d->spb[0], ohci->no_swap_incoming)>>10)&0x3f);
ack = (((cond_le32_to_cpu(d->spb[length/4-1], ohci->no_swap_incoming)>>16)&0x1f) ack = (((cond_le32_to_cpu(d->spb[length/4-1], ohci->no_swap_incoming)>>16)&0x1f)
== 0x11) ? 1 : 0; == 0x11) ? 1 : 0;
...@@ -2754,7 +2754,7 @@ static void dma_trm_tasklet (unsigned long data) ...@@ -2754,7 +2754,7 @@ static void dma_trm_tasklet (unsigned long data)
d->ctx); d->ctx);
else else
DBGMSG("Packet sent to node %d tcode=0x%X tLabel=" DBGMSG("Packet sent to node %d tcode=0x%X tLabel="
"0x%02X ack=0x%X spd=%d dataLength=%d ctx=%d", "%d ack=0x%X spd=%d dataLength=%d ctx=%d",
(le32_to_cpu(d->prg_cpu[d->sent_ind]->data[1])>>16)&0x3f, (le32_to_cpu(d->prg_cpu[d->sent_ind]->data[1])>>16)&0x3f,
(le32_to_cpu(d->prg_cpu[d->sent_ind]->data[0])>>4)&0xf, (le32_to_cpu(d->prg_cpu[d->sent_ind]->data[0])>>4)&0xf,
(le32_to_cpu(d->prg_cpu[d->sent_ind]->data[0])>>10)&0x3f, (le32_to_cpu(d->prg_cpu[d->sent_ind]->data[0])>>10)&0x3f,
...@@ -2763,7 +2763,7 @@ static void dma_trm_tasklet (unsigned long data) ...@@ -2763,7 +2763,7 @@ static void dma_trm_tasklet (unsigned long data)
d->ctx); d->ctx);
else else
DBGMSG("Packet sent to node %d tcode=0x%X tLabel=" DBGMSG("Packet sent to node %d tcode=0x%X tLabel="
"0x%02X ack=0x%X spd=%d data=0x%08X ctx=%d", "%d ack=0x%X spd=%d data=0x%08X ctx=%d",
(le32_to_cpu(d->prg_cpu[d->sent_ind]->data[1]) (le32_to_cpu(d->prg_cpu[d->sent_ind]->data[1])
>>16)&0x3f, >>16)&0x3f,
(le32_to_cpu(d->prg_cpu[d->sent_ind]->data[0]) (le32_to_cpu(d->prg_cpu[d->sent_ind]->data[0])
......
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