Commit ddf289f9 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab

[media] em28xx: overhaul em28xx_capture_area_set()

- move the bit shifting of width+height values inside the function
- fix the debug message format and output values
- add comment about the size limit (e.g. EM277x supports >2MPix)
- make void, because error checking is incomplete and we never check the
  returned value (we would continue anyway)
Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9f3b935b
...@@ -733,22 +733,24 @@ static int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, ...@@ -733,22 +733,24 @@ static int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax,
return em28xx_write_regs(dev, EM28XX_R2B_YMAX, &ymax, 1); return em28xx_write_regs(dev, EM28XX_R2B_YMAX, &ymax, 1);
} }
static int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart, static void em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,
u16 width, u16 height) u16 width, u16 height)
{ {
u8 cwidth = width; u8 cwidth = width >> 2;
u8 cheight = height; u8 cheight = height >> 2;
u8 overflow = (height >> 7 & 0x02) | (width >> 8 & 0x01); u8 overflow = (height >> 9 & 0x02) | (width >> 10 & 0x01);
/* NOTE: size limit: 2047x1023 = 2MPix */
em28xx_coredbg("em28xx Area Set: (%d,%d)\n", em28xx_coredbg("capture area set to (%d,%d): %dx%d\n",
(width | (overflow & 2) << 7), hstart, vstart,
(height | (overflow & 1) << 8)); ((overflow & 2) << 9 | cwidth << 2),
((overflow & 1) << 10 | cheight << 2));
em28xx_write_regs(dev, EM28XX_R1C_HSTART, &hstart, 1); em28xx_write_regs(dev, EM28XX_R1C_HSTART, &hstart, 1);
em28xx_write_regs(dev, EM28XX_R1D_VSTART, &vstart, 1); em28xx_write_regs(dev, EM28XX_R1D_VSTART, &vstart, 1);
em28xx_write_regs(dev, EM28XX_R1E_CWIDTH, &cwidth, 1); em28xx_write_regs(dev, EM28XX_R1E_CWIDTH, &cwidth, 1);
em28xx_write_regs(dev, EM28XX_R1F_CHEIGHT, &cheight, 1); em28xx_write_regs(dev, EM28XX_R1F_CHEIGHT, &cheight, 1);
return em28xx_write_regs(dev, EM28XX_R1B_OFLOW, &overflow, 1); em28xx_write_regs(dev, EM28XX_R1B_OFLOW, &overflow, 1);
} }
static int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v) static int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v)
...@@ -801,9 +803,9 @@ int em28xx_resolution_set(struct em28xx *dev) ...@@ -801,9 +803,9 @@ int em28xx_resolution_set(struct em28xx *dev)
it out, we end up with the same format as the rest of the VBI it out, we end up with the same format as the rest of the VBI
region */ region */
if (em28xx_vbi_supported(dev) == 1) if (em28xx_vbi_supported(dev) == 1)
em28xx_capture_area_set(dev, 0, 2, width >> 2, height >> 2); em28xx_capture_area_set(dev, 0, 2, width, height);
else else
em28xx_capture_area_set(dev, 0, 0, width >> 2, height >> 2); em28xx_capture_area_set(dev, 0, 0, width, height);
return em28xx_scaler_set(dev, dev->hscale, dev->vscale); return em28xx_scaler_set(dev, dev->hscale, dev->vscale);
} }
......
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