PERFORCE change 150659 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=150659

Change 150659 by hselasky at hselasky_laptop001 on 2008/09/29 17:41:31

	
	Sync with the Penguins: Videodev updates from Fritz Katz.

Affected files ...

.. //depot/projects/usb/src/sys/sys/videodev.h#8 edit

Differences ...

==== //depot/projects/usb/src/sys/sys/videodev.h#8 (text+ko) ====

@@ -557,7 +557,7 @@
 
 #define	V4L2_STD_PAL_M		(1ULL << 0x08)
 #define	V4L2_STD_PAL_N		(1ULL << 0x09)
-#define	V4L2_STD_PAL_NC		(1ULL << 0x0A)
+#define	V4L2_STD_PAL_Nc		(1ULL << 0x0A)
 #define	V4L2_STD_PAL_60		(1ULL << 0x0B)
 
 #define	V4L2_STD_NTSC_M		(1ULL << 0x0C)
@@ -579,7 +579,7 @@
 #define	V4L2_STD_ATSC_16_VSB	(1ULL << 0x1A)
 
 /* some merged standards */
-#define	V4L2_STD_MN	(V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_NC|V4L2_STD_NTSC)
+#define	V4L2_STD_MN	(V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
 #define	V4L2_STD_B	(V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)
 #define	V4L2_STD_GH	(V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H)
 #define	V4L2_STD_DK	(V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK)
@@ -614,7 +614,7 @@
 				 V4L2_STD_NTSC_443)
 #define	V4L2_STD_625_50		(V4L2_STD_PAL | \
 				 V4L2_STD_PAL_N | \
-				 V4L2_STD_PAL_NC | \
+				 V4L2_STD_PAL_Nc | \
 				 V4L2_STD_SECAM)
 #define	V4L2_STD_ATSC		(V4L2_STD_ATSC_8_VSB | \
 				 V4L2_STD_ATSC_16_VSB)
@@ -759,13 +759,13 @@
 #define	V4L2_CID_AUDIO_TREBLE		(V4L2_CID_BASE+8)
 #define	V4L2_CID_AUDIO_MUTE		(V4L2_CID_BASE+9)
 #define	V4L2_CID_AUDIO_LOUDNESS		(V4L2_CID_BASE+10)
-#define	V4L2_CID_BLACK_LEVEL		(V4L2_CID_BASE+11)
+#define	V4L2_CID_BLACK_LEVEL		(V4L2_CID_BASE+11)	/* Deprecated */
 #define	V4L2_CID_AUTO_WHITE_BALANCE	(V4L2_CID_BASE+12)
 #define	V4L2_CID_DO_WHITE_BALANCE	(V4L2_CID_BASE+13)
 #define	V4L2_CID_RED_BALANCE		(V4L2_CID_BASE+14)
 #define	V4L2_CID_BLUE_BALANCE		(V4L2_CID_BASE+15)
 #define	V4L2_CID_GAMMA			(V4L2_CID_BASE+16)
-#define	V4L2_CID_WHITENESS		(V4L2_CID_GAMMA)	/* ? Not sure */
+#define	V4L2_CID_WHITENESS		(V4L2_CID_GAMMA)	/* Deprecated */
 #define	V4L2_CID_EXPOSURE		(V4L2_CID_BASE+17)
 #define	V4L2_CID_AUTOGAIN		(V4L2_CID_BASE+18)
 #define	V4L2_CID_GAIN			(V4L2_CID_BASE+19)
@@ -773,7 +773,20 @@
 #define	V4L2_CID_VFLIP			(V4L2_CID_BASE+21)
 #define	V4L2_CID_HCENTER		(V4L2_CID_BASE+22)
 #define	V4L2_CID_VCENTER		(V4L2_CID_BASE+23)
-#define	V4L2_CID_LASTP1			(V4L2_CID_BASE+24)	/* last CID + 1 */
+#define	V4L2_CID_POWER_LINE_FREQUENCY	(V4L2_CID_BASE+24)
+enum v4l2_power_line_frequency {
+	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED = 0,
+	V4L2_CID_POWER_LINE_FREQUENCY_50HZ = 1,
+	V4L2_CID_POWER_LINE_FREQUENCY_60HZ = 2,
+};
+
+#define	V4L2_CID_HUE_AUTO			(V4L2_CID_BASE+25)
+#define	V4L2_CID_WHITE_BALANCE_TEMPERATURE	(V4L2_CID_BASE+26)
+#define	V4L2_CID_SHARPNESS			(V4L2_CID_BASE+27)
+#define	V4L2_CID_BACKLIGHT_COMPENSATION 	(V4L2_CID_BASE+28)
+#define	V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
+#define	V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
+#define	V4L2_CID_LASTP1                         (V4L2_CID_BASE+31)	/* last CID + 1 */
 
 /*  MPEG-class control IDs defined by V4L2 */
 #define	V4L2_CID_MPEG_BASE			(V4L2_CTRL_CLASS_MPEG | 0x900)