linux/drivers/staging/easycap, branch v3.1

staging/easycap: remove oss support

2011-07-08T21:02:26Z

remove support for OSS. OSS is being deprecated and it is just plain headache to support both alsa and oss. Last I broke the compilation when OSS is enabled with the patch cdaa898b5efcc598ab1004e8f913061dc7005091 staging/easycap: kill telltale logic so this fixes also that issue. Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman

staging/easycap: remove unused macro MICROSECONDS

2011-07-08T21:02:25Z

Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman

staging/easycap: kill telltale logic

2011-07-06T02:47:46Z

This reason for this feature was 'some versions of the videodev module overwrite the data which has been written by the call to usb_set_intfdata() in easycap_usb_probe(), replacing it with a pointer to the embedded v4l2_device structure. to detect this, the string in the easycap.telltale[] buffer is checked.' The upstream version of v4l2_device_register sets driver data only when it wasn't already set, therefore this is not needed Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman

Remove unneeded version.h includes (and add where needed) for drivers/staging/easycap/

2011-07-05T17:39:39Z

It was pointed out by 'make versioncheck' that linux/version.h was not always being included where needed and sometimes included needlessly in drivers/staging/easycap/. This patch fixes up the includes. Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman

staging/easycap: Fix bytesperline calculation

2011-07-05T17:26:16Z

As described above fillin_formats() """ /* * THE 16-BIT easycap_format.mask HAS MEANING: * (least significant) BIT 0: 0 => PAL, 25 FPS; 1 => NTSC, 30 FPS * BITS 2-4: RESERVED FOR DIFFERENTIATING STANDARDS * BITS 5-7: NUMBER OF BYTES PER PIXEL * BIT 8: 0 => NATIVE BYTE ORDER; 1 => SWAPPED * BITS 9-10: RESERVED FOR OTHER BYTE PERMUTATIONS * BIT 11: 0 => UNDECIMATED; 1 => DECIMATED * BIT 12: 0 => OFFER FRAMES; 1 => OFFER FIELDS * BIT 13: 0 => FULL FRAMERATE; 1 => REDUCED * (most significant) BITS 14-15: RESERVED FOR OTHER FIELD/FRAME OPTIONS * IT FOLLOWS THAT: * bytesperpixel IS ((0x00E0 & easycap_format.mask) >> 5) * byteswaporder IS true IF (0 != (0x0100 & easycap_format.mask)) * * decimatepixel IS true IF (0 != (0x0800 & easycap_format.mask)) * * offerfields IS true IF (0 != (0x1000 & easycap_format.mask)) */ """ bytes-per-pixel is stored in bits 5-7 of calculated mask. But when calculating bytes-per-line we were extracting wrong value instead of bytes-per-pixel, which was usually 2 times bigger -- e.g. for PAL YUV 422 I was getting ((mask3 & 0x00F0) >> 4) = 4 bytes instead of 2. The error here is that even in comments there is a line saying * bytesperpixel IS ((0x00E0 & easycap_format.mask) >> 5) but we were using ((0x00F0 & easycap_format.mask) >> 4) With 2 times bigger bytesperpixel and automatically bytesperline, the video was shown halfheight'ed, which is understandable if we look at video-memory layout: <------- bytesperline --------> <- real bpl -> x0----------y0 x1-----------y1 x2----------y2 x3-----------y3 xn----------yn xn-----------yn for each line, we should display width pixels, then move to next line with bytesperline, and oops, if bytesperline = 2*real-bytesperlin, we'll skip one line and move to next-next line, and so only half lines will be shown. Initially I've debugged the problem with my video application[1], but I've checked that after this patch both rawv (mine app) and tvtime work correctly. [1] http://repo.or.cz/w/rawv.git P.S. why at all we use those mask/shifts? Why not use bitfields? Cc: Mike Thomas Signed-off-by: Kirill Smelkov Acked-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman

staging/easycap: PAGE_SIZE is always defined

2011-07-05T17:26:16Z

I'm not 100% sure, only 99.99% that PAGE_SIZE is always defined in Linux. So there is no need to check for it. Cc: Mike Thomas Signed-off-by: Kirill Smelkov Acked-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman

staging/easycap: There is no need to support V4L1 ioctls

2011-07-05T17:26:16Z

Because V4L1 was completly removed from the kernel in 2.6.38. See e.g. 08af245d ([media] V4L: remove V4L1 compatibility mode). Cc: Mike Thomas Signed-off-by: Kirill Smelkov Acked-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman

staging/easycap: Fix thinko in "bars" module option description

2011-07-05T17:26:16Z

Both bars=0 and bars=1 were described as meaning to display bars on signal lost. Actually bars=1 means "display bars", but bars=0 means display raw source as is (usually black screen). Instead of changing bars=0 to "_no_ testcard bars ..." as suggested by Dan Carpenter reword the whole bars description for clarity. Cc: Mike Thomas Cc: Dan Carpenter Signed-off-by: Kirill Smelkov Acked-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman

staging/easycap: Kill leftover build options in readme

2011-07-05T17:26:16Z

The following options were removed from in-tree driver, but were left in README: - EASYCAP_IS_VIDEODEV_CLIENT was removed in cb81fa07 (staging/easycap: kill EASYCAP_IS_VIDEODEV_CLIENT compilation conditional); - EASYCAP_NEEDS_V4L2_DEVICE_H/EASYCAP_NEEDS_V4L2_FOPS were removed in 30516058 (staging/easycap: kill EASYCAP_NEEDS_V4L2_DEVICE_H and EASYCAP_NEEDS_V4L2_FOPS); - EASYCAP_NEEDS_UNLOCKED_IOCTL was removed in f2b3c685 (staging/easycap: kill EASYCAP_NEEDS_UNLOCKED_IOCTL). Remove them. Cc: Mike Thomas Signed-off-by: Kirill Smelkov Acked-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman

Staging: easycap: use after free in easycap_delete()

2011-07-05T17:22:50Z

The JOM() macro dereferences peasycap, so I moved the free down some lines. Signed-off-by: Dan Carpenter Acked-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman