Skip to content

Commit

Permalink
V4L/DVB (5644): Usbvision: video_ioctl2 conversion
Browse files Browse the repository at this point in the history
The ioctl entry point, a big switch/case, is splitted in little 
functions. 

These functions are set as callbacks for the video_ioctl2 video4linux 
facility.

This improves the driver memory consumption and enables the v4l1 
compatibility as a side effect.

Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
Acked-by: Dwaine P. Garden <dwainegarden@rogers.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Thierry MERLE authored and Mauro Carvalho Chehab committed Jul 18, 2007
1 parent ea1f83c commit c5f4836
Show file tree
Hide file tree
Showing 3 changed files with 787 additions and 686 deletions.
8 changes: 4 additions & 4 deletions drivers/media/video/usbvision/usbvision-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1831,10 +1831,10 @@ int usbvision_set_output(struct usb_usbvision *usbvision, int width,
frameRate = FRAMERATE_MAX;
}

if (usbvision->tvnorm->id & V4L2_STD_625_50) {
if (usbvision->tvnormId & V4L2_STD_625_50) {
frameDrop = frameRate * 32 / 25 - 1;
}
else if (usbvision->tvnorm->id & V4L2_STD_525_60) {
else if (usbvision->tvnormId & V4L2_STD_525_60) {
frameDrop = frameRate * 32 / 30 - 1;
}

Expand Down Expand Up @@ -2067,7 +2067,7 @@ int usbvision_set_input(struct usb_usbvision *usbvision)
}


if (usbvision->tvnorm->id & V4L2_STD_PAL) {
if (usbvision->tvnormId & V4L2_STD_PAL) {
value[0] = 0xC0;
value[1] = 0x02; //0x02C0 -> 704 Input video line length
value[2] = 0x20;
Expand All @@ -2076,7 +2076,7 @@ int usbvision_set_input(struct usb_usbvision *usbvision)
value[5] = 0x00; //0x0060 -> 96 Input video h offset
value[6] = 0x16;
value[7] = 0x00; //0x0016 -> 22 Input video v offset
} else if (usbvision->tvnorm->id & V4L2_STD_SECAM) {
} else if (usbvision->tvnormId & V4L2_STD_SECAM) {
value[0] = 0xC0;
value[1] = 0x02; //0x02C0 -> 704 Input video line length
value[2] = 0x20;
Expand Down
Loading

0 comments on commit c5f4836

Please sign in to comment.