aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2008-06-22 13:20:09 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:13:31 -0400
commit3aa7110e1c415c38c42ef77be0ef2c7a888b9e16 (patch)
tree9cebbd4f3450e9479854d1fb4efa5325b93dfd3b
parent947a080037c6ae47cfe5072eadbd189e3da27ecd (diff)
V4L/DVB (8132): bt8xx endianness annotations and fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/bt8xx/bt878.h2
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/bt8xx/bt878.h b/drivers/media/dvb/bt8xx/bt878.h
index 375fd2892a1..d19b59299d7 100644
--- a/drivers/media/dvb/bt8xx/bt878.h
+++ b/drivers/media/dvb/bt8xx/bt878.h
@@ -128,7 +128,7 @@ struct bt878 {
128 dma_addr_t buf_dma; 128 dma_addr_t buf_dma;
129 129
130 u32 risc_size; 130 u32 risc_size;
131 u32 *risc_cpu; 131 __le32 *risc_cpu;
132 dma_addr_t risc_dma; 132 dma_addr_t risc_dma;
133 u32 risc_pos; 133 u32 risc_pos;
134 134
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 06c40c91a6f..0ea559a7fe5 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -3705,7 +3705,7 @@ static void bttv_risc_disasm(struct bttv *btv,
3705 for (i = 0; i < (risc->size >> 2); i += n) { 3705 for (i = 0; i < (risc->size >> 2); i += n) {
3706 printk("%s: 0x%lx: ", btv->c.name, 3706 printk("%s: 0x%lx: ", btv->c.name,
3707 (unsigned long)(risc->dma + (i<<2))); 3707 (unsigned long)(risc->dma + (i<<2)));
3708 n = bttv_risc_decode(risc->cpu[i]); 3708 n = bttv_risc_decode(le32_to_cpu(risc->cpu[i]));
3709 for (j = 1; j < n; j++) 3709 for (j = 1; j < n; j++)
3710 printk("%s: 0x%lx: 0x%08x [ arg #%d ]\n", 3710 printk("%s: 0x%lx: 0x%08x [ arg #%d ]\n",
3711 btv->c.name, (unsigned long)(risc->dma + ((i+j)<<2)), 3711 btv->c.name, (unsigned long)(risc->dma + ((i+j)<<2)),
@@ -3774,8 +3774,8 @@ static void bttv_irq_debug_low_latency(struct bttv *btv, u32 rc)
3774 printk("bttv%d: irq: skipped frame [main=%lx,o_vbi=%lx,o_field=%lx,rc=%lx]\n", 3774 printk("bttv%d: irq: skipped frame [main=%lx,o_vbi=%lx,o_field=%lx,rc=%lx]\n",
3775 btv->c.nr, 3775 btv->c.nr,
3776 (unsigned long)btv->main.dma, 3776 (unsigned long)btv->main.dma,
3777 (unsigned long)btv->main.cpu[RISC_SLOT_O_VBI+1], 3777 (unsigned long)le32_to_cpu(btv->main.cpu[RISC_SLOT_O_VBI+1]),
3778 (unsigned long)btv->main.cpu[RISC_SLOT_O_FIELD+1], 3778 (unsigned long)le32_to_cpu(btv->main.cpu[RISC_SLOT_O_FIELD+1]),
3779 (unsigned long)rc); 3779 (unsigned long)rc);
3780 3780
3781 if (0 == (btread(BT848_DSTATUS) & BT848_DSTATUS_HLOC)) { 3781 if (0 == (btread(BT848_DSTATUS) & BT848_DSTATUS_HLOC)) {