aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-08-21 07:19:16 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:06:28 -0400
commit16cf1d0c5d7b8970aca2ca426166833642ce0544 (patch)
treeadda251661de6dc44c05fcc71bcdd9fe3bad7670
parentaeb292d1342c649ac0b35ae9205b761fd14adb57 (diff)
V4L/DVB (6082): cx88: Improve risc instruction printing in sram channel dump
When the risc instrunctions from the CMDS were printed, instruction arguments weren't taken into account. This changes output like: cx88[0]: risc0: 0x1d010400 [ write sol eol irq1 cnt0 count=1024 ] cx88[0]: risc1: 0x0cac2800 [ INVALID sol eol 23 21 19 18 13 count=2048 ] cx88[0]: risc2: 0x1d010400 [ write sol eol irq1 cnt0 count=1024 ] cx88[0]: risc3: 0x0cac2c00 [ INVALID sol eol 23 21 19 18 13 count=3072 ] cx88[0]: risc0: 0x1d010400 [ write sol eol irq1 cnt0 count=1024 ] cx88[0]: risc1: 0x0cac2800 [ arg #1 ] cx88[0]: risc2: 0x1d010400 [ write sol eol irq1 cnt0 count=1024 ] cx88[0]: risc3: 0x0cac2c00 [ arg #1 ] Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/cx88/cx88-core.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index cea3212d28b4..ce7f1f0ae054 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -434,10 +434,13 @@ void cx88_sram_channel_dump(struct cx88_core *core,
434 printk("%s: cmds: %-12s: 0x%08x\n", 434 printk("%s: cmds: %-12s: 0x%08x\n",
435 core->name,name[i], 435 core->name,name[i],
436 cx_read(ch->cmds_start + 4*i)); 436 cx_read(ch->cmds_start + 4*i));
437 for (i = 0; i < 4; i++) { 437 for (n = 1, i = 0; i < 4; i++) {
438 risc = cx_read(ch->cmds_start + 4 * (i+11)); 438 risc = cx_read(ch->cmds_start + 4 * (i+11));
439 printk("%s: risc%d: ", core->name, i); 439 printk("%s: risc%d: ", core->name, i);
440 cx88_risc_decode(risc); 440 if (--n)
441 printk("0x%08x [ arg #%d ]\n", risc, n);
442 else
443 n = cx88_risc_decode(risc);
441 } 444 }
442 for (i = 0; i < 16; i += n) { 445 for (i = 0; i < 16; i += n) {
443 risc = cx_read(ch->ctrl_start + 4 * i); 446 risc = cx_read(ch->ctrl_start + 4 * i);