|
@@ -443,7 +443,7 @@ static void sh_vou_configure_geometry(struct sh_vou_device *vou_dev,
|
|
int pix_idx, int w_idx, int h_idx)
|
|
int pix_idx, int w_idx, int h_idx)
|
|
{
|
|
{
|
|
struct sh_vou_fmt *fmt = vou_fmt + pix_idx;
|
|
struct sh_vou_fmt *fmt = vou_fmt + pix_idx;
|
|
- unsigned int black_left, black_top, width_max, height_max,
|
|
|
|
|
|
+ unsigned int black_left, black_top, width_max,
|
|
frame_in_height, frame_out_height, frame_out_top;
|
|
frame_in_height, frame_out_height, frame_out_top;
|
|
struct v4l2_rect *rect = &vou_dev->rect;
|
|
struct v4l2_rect *rect = &vou_dev->rect;
|
|
struct v4l2_pix_format *pix = &vou_dev->pix;
|
|
struct v4l2_pix_format *pix = &vou_dev->pix;
|
|
@@ -451,10 +451,10 @@ static void sh_vou_configure_geometry(struct sh_vou_device *vou_dev,
|
|
|
|
|
|
if (vou_dev->std & V4L2_STD_525_60) {
|
|
if (vou_dev->std & V4L2_STD_525_60) {
|
|
width_max = 858;
|
|
width_max = 858;
|
|
- height_max = 262;
|
|
|
|
|
|
+ /* height_max = 262; */
|
|
} else {
|
|
} else {
|
|
width_max = 864;
|
|
width_max = 864;
|
|
- height_max = 312;
|
|
|
|
|
|
+ /* height_max = 312; */
|
|
}
|
|
}
|
|
|
|
|
|
frame_in_height = pix->height / 2;
|
|
frame_in_height = pix->height / 2;
|
|
@@ -1053,7 +1053,6 @@ static irqreturn_t sh_vou_isr(int irq, void *dev_id)
|
|
static unsigned long j;
|
|
static unsigned long j;
|
|
struct videobuf_buffer *vb;
|
|
struct videobuf_buffer *vb;
|
|
static int cnt;
|
|
static int cnt;
|
|
- static int side;
|
|
|
|
u32 irq_status = sh_vou_reg_a_read(vou_dev, VOUIR), masked;
|
|
u32 irq_status = sh_vou_reg_a_read(vou_dev, VOUIR), masked;
|
|
u32 vou_status = sh_vou_reg_a_read(vou_dev, VOUSTR);
|
|
u32 vou_status = sh_vou_reg_a_read(vou_dev, VOUSTR);
|
|
|
|
|
|
@@ -1081,7 +1080,7 @@ static irqreturn_t sh_vou_isr(int irq, void *dev_id)
|
|
irq_status, masked, vou_status, cnt);
|
|
irq_status, masked, vou_status, cnt);
|
|
|
|
|
|
cnt++;
|
|
cnt++;
|
|
- side = vou_status & 0x10000;
|
|
|
|
|
|
+ /* side = vou_status & 0x10000; */
|
|
|
|
|
|
/* Clear only set interrupts */
|
|
/* Clear only set interrupts */
|
|
sh_vou_reg_a_write(vou_dev, VOUIR, masked);
|
|
sh_vou_reg_a_write(vou_dev, VOUIR, masked);
|