]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] v4l2-ctrls: fix comments
authorHans Verkuil <hans.verkuil@cisco.com>
Mon, 27 Jan 2014 14:03:34 +0000 (11:03 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Thu, 17 Jul 2014 14:57:26 +0000 (11:57 -0300)
Various comments referred to videodev2.h, but the control definitions have
been moved to v4l2-controls.h.

Also add the same reminder message to each class of controls.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/v4l2-core/v4l2-ctrls.c

index adf5485e56a869cfda9f1515db02328b2d49d9ae..5aaf15e047c84f983f55019bee1d5bdf4c6628c3 100644 (file)
@@ -592,7 +592,7 @@ const char *v4l2_ctrl_get_name(u32 id)
 {
        switch (id) {
        /* USER controls */
-       /* Keep the order of the 'case's the same as in videodev2.h! */
+       /* Keep the order of the 'case's the same as in v4l2-controls.h! */
        case V4L2_CID_USER_CLASS:               return "User Controls";
        case V4L2_CID_BRIGHTNESS:               return "Brightness";
        case V4L2_CID_CONTRAST:                 return "Contrast";
@@ -754,7 +754,7 @@ const char *v4l2_ctrl_get_name(u32 id)
        case V4L2_CID_MPEG_VIDEO_VPX_PROFILE:                   return "VPX Profile";
 
        /* CAMERA controls */
-       /* Keep the order of the 'case's the same as in videodev2.h! */
+       /* Keep the order of the 'case's the same as in v4l2-controls.h! */
        case V4L2_CID_CAMERA_CLASS:             return "Camera Controls";
        case V4L2_CID_EXPOSURE_AUTO:            return "Auto Exposure";
        case V4L2_CID_EXPOSURE_ABSOLUTE:        return "Exposure Time, Absolute";
@@ -788,8 +788,8 @@ const char *v4l2_ctrl_get_name(u32 id)
        case V4L2_CID_AUTO_FOCUS_STATUS:        return "Auto Focus, Status";
        case V4L2_CID_AUTO_FOCUS_RANGE:         return "Auto Focus, Range";
 
-       /* FM Radio Modulator control */
-       /* Keep the order of the 'case's the same as in videodev2.h! */
+       /* FM Radio Modulator controls */
+       /* Keep the order of the 'case's the same as in v4l2-controls.h! */
        case V4L2_CID_FM_TX_CLASS:              return "FM Radio Modulator Controls";
        case V4L2_CID_RDS_TX_DEVIATION:         return "RDS Signal Deviation";
        case V4L2_CID_RDS_TX_PI:                return "RDS Program ID";
@@ -812,6 +812,7 @@ const char *v4l2_ctrl_get_name(u32 id)
        case V4L2_CID_TUNE_ANTENNA_CAPACITOR:   return "Tune Antenna Capacitor";
 
        /* Flash controls */
+       /* Keep the order of the 'case's the same as in v4l2-controls.h! */
        case V4L2_CID_FLASH_CLASS:              return "Flash Controls";
        case V4L2_CID_FLASH_LED_MODE:           return "LED Mode";
        case V4L2_CID_FLASH_STROBE_SOURCE:      return "Strobe Source";
@@ -827,7 +828,7 @@ const char *v4l2_ctrl_get_name(u32 id)
        case V4L2_CID_FLASH_READY:              return "Ready to Strobe";
 
        /* JPEG encoder controls */
-       /* Keep the order of the 'case's the same as in videodev2.h! */
+       /* Keep the order of the 'case's the same as in v4l2-controls.h! */
        case V4L2_CID_JPEG_CLASS:               return "JPEG Compression Controls";
        case V4L2_CID_JPEG_CHROMA_SUBSAMPLING:  return "Chroma Subsampling";
        case V4L2_CID_JPEG_RESTART_INTERVAL:    return "Restart Interval";
@@ -835,18 +836,21 @@ const char *v4l2_ctrl_get_name(u32 id)
        case V4L2_CID_JPEG_ACTIVE_MARKER:       return "Active Markers";
 
        /* Image source controls */
+       /* Keep the order of the 'case's the same as in v4l2-controls.h! */
        case V4L2_CID_IMAGE_SOURCE_CLASS:       return "Image Source Controls";
        case V4L2_CID_VBLANK:                   return "Vertical Blanking";
        case V4L2_CID_HBLANK:                   return "Horizontal Blanking";
        case V4L2_CID_ANALOGUE_GAIN:            return "Analogue Gain";
 
        /* Image processing controls */
+       /* Keep the order of the 'case's the same as in v4l2-controls.h! */
        case V4L2_CID_IMAGE_PROC_CLASS:         return "Image Processing Controls";
        case V4L2_CID_LINK_FREQ:                return "Link Frequency";
        case V4L2_CID_PIXEL_RATE:               return "Pixel Rate";
        case V4L2_CID_TEST_PATTERN:             return "Test Pattern";
 
        /* DV controls */
+       /* Keep the order of the 'case's the same as in v4l2-controls.h! */
        case V4L2_CID_DV_CLASS:                 return "Digital Video Controls";
        case V4L2_CID_DV_TX_HOTPLUG:            return "Hotplug Present";
        case V4L2_CID_DV_TX_RXSENSE:            return "RxSense Present";