From 485055a93029a03dc72e2ef0da96d055d4789f04 Mon Sep 17 00:00:00 2001 From: David Wang Date: Tue, 11 Apr 2017 18:05:37 -0700 Subject: tegra: camera: updated control CID define Move control CID define to tegra-v4l2-camera and switched CID prefix from V4L2 to TEGRA_CAMERA. Updated users of camera controls to use new defines. Change-Id: Ifb1d4e9e3ed438bd13dd3af1d0ec16cb885f4474 Signed-off-by: David Wang Reviewed-on: http://git-master/r/1460998 GVS: Gerrit_Virtual_Submit Reviewed-by: Wenjia Zhou Reviewed-by: Bhanu Murthy V --- include/media/camera_common.h | 39 --------------------------------------- include/media/i2c/tc358840.h | 11 +++++++---- 2 files changed, 7 insertions(+), 43 deletions(-) (limited to 'include/media') diff --git a/include/media/camera_common.h b/include/media/camera_common.h index 0232d2bd0..016cb09ae 100644 --- a/include/media/camera_common.h +++ b/include/media/camera_common.h @@ -40,45 +40,6 @@ #include #include -#define V4L2_CID_TEGRA_CAMERA_BASE (V4L2_CTRL_CLASS_CAMERA | 0x2000) - -#define V4L2_CID_FRAME_LENGTH (V4L2_CID_TEGRA_CAMERA_BASE+0) -#define V4L2_CID_COARSE_TIME (V4L2_CID_TEGRA_CAMERA_BASE+1) -#define V4L2_CID_COARSE_TIME_SHORT (V4L2_CID_TEGRA_CAMERA_BASE+2) -#define V4L2_CID_GROUP_HOLD (V4L2_CID_TEGRA_CAMERA_BASE+3) -#define V4L2_CID_HDR_EN (V4L2_CID_TEGRA_CAMERA_BASE+4) -#define V4L2_CID_EEPROM_DATA (V4L2_CID_TEGRA_CAMERA_BASE+5) -#define V4L2_CID_OTP_DATA (V4L2_CID_TEGRA_CAMERA_BASE+6) -#define V4L2_CID_FUSE_ID (V4L2_CID_TEGRA_CAMERA_BASE+7) -#define V4L2_CID_TEGRA_CAMERA_LAST (V4L2_CID_TEGRA_CAMERA_BASE+8) -#define V4L2_CID_SENSOR_MODE_ID (V4L2_CID_TEGRA_CAMERA_BASE+10) - -/* undefine default CID for GAIN/EXPOSURE and use NV's version */ -#undef V4L2_CID_GAIN -#undef V4L2_CID_EXPOSURE -#define V4L2_CID_GAIN (V4L2_CID_TEGRA_CAMERA_BASE+11) -#define V4L2_CID_EXPOSURE (V4L2_CID_TEGRA_CAMERA_BASE+12) -#define V4L2_CID_FRAME_RATE (V4L2_CID_TEGRA_CAMERA_BASE+13) - -#define V4L2_CID_VI_BYPASS_MODE (V4L2_CID_TEGRA_CAMERA_BASE+100) -#define V4L2_CID_OVERRIDE_ENABLE (V4L2_CID_TEGRA_CAMERA_BASE+101) -#define V4L2_CID_VI_HEIGHT_ALIGN (V4L2_CID_TEGRA_CAMERA_BASE+102) -#define V4L2_CID_VI_SIZE_ALIGN (V4L2_CID_TEGRA_CAMERA_BASE+103) -#define V4L2_CID_WRITE_ISPFORMAT (V4L2_CID_TEGRA_CAMERA_BASE+104) -#define V4L2_CID_VI_CAPTURE_SETUP (V4L2_CID_TEGRA_CAMERA_BASE+105) -#define V4L2_CID_VI_CAPTURE_INFO (V4L2_CID_TEGRA_CAMERA_BASE+106) -#define V4L2_CID_VI_CAPTURE_RESET (V4L2_CID_TEGRA_CAMERA_BASE+107) -#define V4L2_CID_VI_CAPTURE_RELEASE (V4L2_CID_TEGRA_CAMERA_BASE+108) -#define V4L2_CID_VI_CAPTURE_CONFIG (V4L2_CID_TEGRA_CAMERA_BASE+109) -#define V4L2_CID_VI_CAPTURE_REQUEST (V4L2_CID_TEGRA_CAMERA_BASE+110) -#define V4L2_CID_VI_CAPTURE_STATUS (V4L2_CID_TEGRA_CAMERA_BASE+111) - -#define MAX_BUFFER_SIZE 32 -#define MAX_CID_CONTROLS 16 -#define MAX_NUM_SENSOR_MODES 30 -#define OF_MAX_STR_LEN 256 -#define OF_SENSORMODE_PREFIX ("mode") - /* * Scaling factor for converting a Q10.22 fixed point value * back to its original floating point value diff --git a/include/media/i2c/tc358840.h b/include/media/i2c/tc358840.h index 98161225c..31ffe8f12 100644 --- a/include/media/i2c/tc358840.h +++ b/include/media/i2c/tc358840.h @@ -77,13 +77,16 @@ struct tc358840_platform_data { }; /* custom controls */ -#define V4L2_CID_USER_TC358840_BASE (V4L2_CID_BASE + 0x1000) +#define TEGRA_CAMERA_CID_USER_TC358840_BASE (TEGRA_CAMERA_CID_BASE + 0x1000) /* Audio sample rate in Hz */ -#define TC358840_CID_AUDIO_SAMPLING_RATE (V4L2_CID_USER_TC358840_BASE + 1) +#define TC358840_CID_AUDIO_SAMPLING_RATE \ + (TEGRA_CAMERA_CID_USER_TC358840_BASE + 1) /* Audio present status */ -#define TC358840_CID_AUDIO_PRESENT (V4L2_CID_USER_TC358840_BASE + 2) +#define TC358840_CID_AUDIO_PRESENT \ + (TEGRA_CAMERA_CID_USER_TC358840_BASE + 2) /* Splitter width */ -#define TC358840_CID_SPLITTER_WIDTH (V4L2_CID_USER_TC358840_BASE + 3) +#define TC358840_CID_SPLITTER_WIDTH \ + (TEGRA_CAMERA_CID_USER_TC358840_BASE + 3) #endif /* _TC358840_ */ -- cgit v1.2.2