|
@@ -297,8 +297,8 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
|
|
|
"Text",
|
|
|
NULL
|
|
|
};
|
|
|
- static const char * const tune_preemphasis[] = {
|
|
|
- "No Preemphasis",
|
|
|
+ static const char * const tune_emphasis[] = {
|
|
|
+ "None",
|
|
|
"50 Microseconds",
|
|
|
"75 Microseconds",
|
|
|
NULL,
|
|
@@ -508,7 +508,9 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
|
|
|
case V4L2_CID_SCENE_MODE:
|
|
|
return scene_mode;
|
|
|
case V4L2_CID_TUNE_PREEMPHASIS:
|
|
|
- return tune_preemphasis;
|
|
|
+ return tune_emphasis;
|
|
|
+ case V4L2_CID_TUNE_DEEMPHASIS:
|
|
|
+ return tune_emphasis;
|
|
|
case V4L2_CID_FLASH_LED_MODE:
|
|
|
return flash_led_mode;
|
|
|
case V4L2_CID_FLASH_STROBE_SOURCE:
|
|
@@ -800,6 +802,9 @@ const char *v4l2_ctrl_get_name(u32 id)
|
|
|
case V4L2_CID_DV_RX_POWER_PRESENT: return "Power Present";
|
|
|
case V4L2_CID_DV_RX_RGB_RANGE: return "Rx RGB Quantization Range";
|
|
|
|
|
|
+ case V4L2_CID_FM_RX_CLASS: return "FM Radio Receiver Controls";
|
|
|
+ case V4L2_CID_TUNE_DEEMPHASIS: return "De-Emphasis";
|
|
|
+ case V4L2_CID_RDS_RECEPTION: return "RDS Reception";
|
|
|
default:
|
|
|
return NULL;
|
|
|
}
|
|
@@ -848,6 +853,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
|
|
|
case V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER:
|
|
|
case V4L2_CID_WIDE_DYNAMIC_RANGE:
|
|
|
case V4L2_CID_IMAGE_STABILIZATION:
|
|
|
+ case V4L2_CID_RDS_RECEPTION:
|
|
|
*type = V4L2_CTRL_TYPE_BOOLEAN;
|
|
|
*min = 0;
|
|
|
*max = *step = 1;
|
|
@@ -906,6 +912,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
|
|
|
case V4L2_CID_DV_TX_RGB_RANGE:
|
|
|
case V4L2_CID_DV_RX_RGB_RANGE:
|
|
|
case V4L2_CID_TEST_PATTERN:
|
|
|
+ case V4L2_CID_TUNE_DEEMPHASIS:
|
|
|
*type = V4L2_CTRL_TYPE_MENU;
|
|
|
break;
|
|
|
case V4L2_CID_LINK_FREQ:
|
|
@@ -928,6 +935,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
|
|
|
case V4L2_CID_IMAGE_SOURCE_CLASS:
|
|
|
case V4L2_CID_IMAGE_PROC_CLASS:
|
|
|
case V4L2_CID_DV_CLASS:
|
|
|
+ case V4L2_CID_FM_RX_CLASS:
|
|
|
*type = V4L2_CTRL_TYPE_CTRL_CLASS;
|
|
|
/* You can neither read not write these */
|
|
|
*flags |= V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_WRITE_ONLY;
|