|
|
@@ -198,7 +198,7 @@ static int omap_vout_try_format(struct v4l2_pix_format *pix)
|
|
|
* omap_vout_uservirt_to_phys: This inline function is used to convert user
|
|
|
* space virtual address to physical address.
|
|
|
*/
|
|
|
-static u32 omap_vout_uservirt_to_phys(u32 virtp)
|
|
|
+static unsigned long omap_vout_uservirt_to_phys(unsigned long virtp)
|
|
|
{
|
|
|
unsigned long physp = 0;
|
|
|
struct vm_area_struct *vma;
|
|
|
@@ -418,10 +418,10 @@ static int omapvid_setup_overlay(struct omap_vout_device *vout,
|
|
|
}
|
|
|
|
|
|
v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev,
|
|
|
- "%s enable=%d addr=%x width=%d\n height=%d color_mode=%d\n"
|
|
|
+ "%s enable=%d addr=%pad width=%d\n height=%d color_mode=%d\n"
|
|
|
"rotation=%d mirror=%d posx=%d posy=%d out_width = %d \n"
|
|
|
"out_height=%d rotation_type=%d screen_width=%d\n",
|
|
|
- __func__, ovl->is_enabled(ovl), info.paddr, info.width, info.height,
|
|
|
+ __func__, ovl->is_enabled(ovl), &info.paddr, info.width, info.height,
|
|
|
info.color_mode, info.rotation, info.mirror, info.pos_x,
|
|
|
info.pos_y, info.out_width, info.out_height, info.rotation_type,
|
|
|
info.screen_width);
|
|
|
@@ -794,7 +794,7 @@ static int omap_vout_buffer_prepare(struct videobuf_queue *q,
|
|
|
vout->queued_buf_addr[vb->i] = (u8 *)
|
|
|
omap_vout_uservirt_to_phys(vb->baddr);
|
|
|
} else {
|
|
|
- u32 addr, dma_addr;
|
|
|
+ unsigned long addr, dma_addr;
|
|
|
unsigned long size;
|
|
|
|
|
|
addr = (unsigned long) vout->buf_virt_addr[vb->i];
|