diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/video/samsung/mdnie_table.h | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/video/samsung/mdnie_table.h')
-rw-r--r-- | drivers/video/samsung/mdnie_table.h | 117 |
1 files changed, 63 insertions, 54 deletions
diff --git a/drivers/video/samsung/mdnie_table.h b/drivers/video/samsung/mdnie_table.h index f52b662..2ce420f 100644 --- a/drivers/video/samsung/mdnie_table.h +++ b/drivers/video/samsung/mdnie_table.h @@ -16,7 +16,7 @@ static const unsigned short tune_dynamic_video[] = { END_SEQ, 0x0000, }; -static const unsigned short tune_dynamic_vtcall[] = { +static const unsigned short tune_dynamic_vt[] = { END_SEQ, 0x0000, }; @@ -32,7 +32,7 @@ static const unsigned short tune_movie_video[] = { END_SEQ, 0x0000, }; -static const unsigned short tune_movie_vtcall[] = { +static const unsigned short tune_movie_vt[] = { END_SEQ, 0x0000, }; @@ -48,7 +48,7 @@ static const unsigned short tune_standard_video[] = { END_SEQ, 0x0000, }; -static const unsigned short tune_standard_vtcall[] = { +static const unsigned short tune_standard_vt[] = { END_SEQ, 0x0000, }; @@ -64,13 +64,17 @@ static const unsigned short tune_natural_video[] = { END_SEQ, 0x0000, }; -static const unsigned short tune_natural_vtcall[] = { +static const unsigned short tune_natural_vt[] = { END_SEQ, 0x0000, }; -static const unsigned short *tune_camera; +static const unsigned short tune_camera[] = { + END_SEQ, 0x0000, +}; -static const unsigned short *tune_camera_outdoor; +static const unsigned short tune_camera_outdoor[] = { + END_SEQ, 0x0000, +}; static const unsigned short tune_cold[] = { END_SEQ, 0x0000, @@ -80,7 +84,7 @@ static const unsigned short tune_cold_outdoor[] = { END_SEQ, 0x0000, }; -static const unsigned short tune_outdoor[] = { +static const unsigned short tune_normal_outdoor[] = { END_SEQ, 0x0000, }; @@ -100,7 +104,7 @@ struct mdnie_tunning_info etc_table[CABC_MAX][OUTDOOR_MAX][TONE_MAX] = { {"COLD", tune_cold}, }, { - {"NORMAL_OUTDOOR", tune_outdoor}, + {"NORMAL_OUTDOOR", tune_normal_outdoor}, {"WARM_OUTDOOR", tune_warm_outdoor}, {"COLD_OUTDOOR", tune_cold_outdoor}, }, @@ -112,61 +116,61 @@ struct mdnie_tunning_info_cabc tunning_table[CABC_MAX][MODE_MAX][SCENARIO_MAX] = { { {"DYNAMIC_UI", tune_dynamic_ui, 0}, - {"DYNAMIC_VIDEO_NORMAL", tune_dynamic_video, LUT_VIDEO}, - {"DYNAMIC_VIDEO_WARM", tune_dynamic_video, LUT_VIDEO}, - {"DYNAMIC_VIDEO_COLD", tune_dynamic_video, LUT_VIDEO}, - {"CAMERA", NULL/*tune_camera*/, 0}, + {"DYNAMIC_VIDEO", tune_dynamic_video, LUT_VIDEO}, + {"DYNAMIC_VIDEO", tune_dynamic_video, LUT_VIDEO}, + {"DYNAMIC_VIDEO", tune_dynamic_video, LUT_VIDEO}, + {"CAMERA", NULL/*tune_camera*/, 0}, {"DYNAMIC_UI", tune_dynamic_ui, 0}, {"DYNAMIC_GALLERY", tune_dynamic_gallery, 0}, - {"DYNAMIC_VT", tune_dynamic_vtcall, 0}, + {"DYNAMIC_VT", tune_dynamic_vt, 0}, }, { {"STANDARD_UI", tune_standard_ui, 0}, - {"STANDARD_VIDEO_NORMAL", tune_standard_video, LUT_VIDEO}, - {"STANDARD_VIDEO_WARM", tune_standard_video, LUT_VIDEO}, - {"STANDARD_VIDEO_COLD", tune_standard_video, LUT_VIDEO}, - {"CAMERA", NULL/*tune_camera*/, 0}, + {"STANDARD_VIDEO", tune_standard_video, LUT_VIDEO}, + {"STANDARD_VIDEO", tune_standard_video, LUT_VIDEO}, + {"STANDARD_VIDEO", tune_standard_video, LUT_VIDEO}, + {"CAMERA", NULL/*tune_camera*/, 0}, {"STANDARD_UI", tune_standard_ui, 0}, {"STANDARD_GALLERY", tune_standard_gallery, 0}, - {"STANDARD_VT", tune_standard_vtcall, 0}, + {"STANDARD_VT", tune_standard_vt, 0}, }, { {"MOVIE_UI", tune_movie_ui, 0}, - {"MOVIE_VIDEO_NORMAL", tune_movie_video, LUT_VIDEO}, - {"MOVIE_VIDEO_WARM", tune_movie_video, LUT_VIDEO}, - {"MOVIE_VIDEO_COLD", tune_movie_video, LUT_VIDEO}, - {"CAMERA", NULL/*tune_camera*/, 0}, + {"MOVIE_VIDEO", tune_movie_video, LUT_VIDEO}, + {"MOVIE_VIDEO", tune_movie_video, LUT_VIDEO}, + {"MOVIE_VIDEO", tune_movie_video, LUT_VIDEO}, + {"CAMERA", NULL/*tune_camera*/, 0}, {"MOVIE_UI", tune_movie_ui, 0}, {"MOVIE_GALLERY", tune_movie_gallery, 0}, - {"MOVIE_VT", tune_movie_vtcall, 0}, + {"MOVIE_VT", tune_movie_vt, 0}, }, }, { { {"DYNAMIC_UI_CABC", tune_dynamic_ui, 0}, - {"DYNAMIC_VIDEO_NORMAL_CABC", tune_dynamic_video, LUT_VIDEO}, - {"DYNAMIC_VIDEO_WARM_CABC", tune_dynamic_video, LUT_VIDEO}, - {"DYNAMIC_VIDEO_COLD", tune_dynamic_video, LUT_VIDEO}, - {"CAMERA", NULL/*tune_camera*/, 0}, + {"DYNAMIC_VIDEO_CABC", tune_dynamic_video, LUT_VIDEO}, + {"DYNAMIC_VIDEO_CABC", tune_dynamic_video, LUT_VIDEO}, + {"DYNAMIC_VIDEO_CABC", tune_dynamic_video, LUT_VIDEO}, + {"CAMERA", NULL/*tune_camera*/, 0}, {"DYNAMIC_UI_CABC", tune_dynamic_ui, 0}, {"DYNAMIC_GALLERY_CABC", tune_dynamic_gallery, 0}, - {"DYNAMIC_VT_CABC", tune_dynamic_vtcall, 0}, + {"DYNAMIC_VT_CABC", tune_dynamic_vt, 0}, }, { {"STANDARD_UI_CABC", tune_standard_ui, 0}, - {"STANDARD_VIDEO_NORMAL_CABC", tune_standard_video, LUT_VIDEO}, - {"STANDARD_VIDEO_WARM_CABC", tune_standard_video, LUT_VIDEO}, - {"STANDARD_VIDEO_COLD_CABC", tune_standard_video, LUT_VIDEO}, - {"CAMERA", NULL/*tune_camera*/, 0}, + {"STANDARD_VIDEO_CABC", tune_standard_video, LUT_VIDEO}, + {"STANDARD_VIDEO_CABC", tune_standard_video, LUT_VIDEO}, + {"STANDARD_VIDEO_CABC", tune_standard_video, LUT_VIDEO}, + {"CAMERA", NULL/*tune_camera*/, 0}, {"STANDARD_UI_CABC", tune_standard_ui, 0}, {"STANDARD_GALLERY_CABC", tune_standard_gallery, 0}, - {"STANDARD_VT_CABC", tune_standard_vtcall, 0}, + {"STANDARD_VT_CABC", tune_standard_vt, 0}, }, { {"MOVIE_UI_CABC", tune_movie_ui, 0}, - {"MOVIE_VIDEO_NORMAL_CABC", tune_movie_video, LUT_VIDEO}, - {"MOVIE_VIDEO_WARM_CABC", tune_movie_video, LUT_VIDEO}, - {"MOVIE_VIDEO_COLD_CABC", tune_movie_video, LUT_VIDEO}, - {"CAMERA", NULL/*tune_camera*/, 0}, + {"MOVIE_VIDEO_CABC", tune_movie_video, LUT_VIDEO}, + {"MOVIE_VIDEO_CABC", tune_movie_video, LUT_VIDEO}, + {"MOVIE_VIDEO_CABC", tune_movie_video, LUT_VIDEO}, + {"CAMERA", NULL/*tune_camera*/, 0}, {"MOVIE_UI_CABC", tune_movie_ui, 0}, {"MOVIE_GALLERY_CABC", tune_movie_gallery, 0}, - {"MOVIE_VT_CABC", tune_movie_vtcall, 0}, + {"MOVIE_VT_CABC", tune_movie_vt, 0}, }, }, }; @@ -175,43 +179,48 @@ struct mdnie_tunning_info tunning_table[CABC_MAX][MODE_MAX][SCENARIO_MAX] = { { { {"DYNAMIC_UI", tune_dynamic_ui}, - {"DYNAMIC_VIDEO_NORMAL", tune_dynamic_video}, - {"DYNAMIC_VIDEO_WARM", tune_dynamic_video}, - {"DYNAMIC_VIDEO_COLD", tune_dynamic_video}, + {"DYNAMIC_VIDEO", tune_dynamic_video}, + {"DYNAMIC_VIDEO", tune_dynamic_video}, + {"DYNAMIC_VIDEO", tune_dynamic_video}, {"CAMERA", NULL/*tune_camera*/}, {"DYNAMIC_UI", tune_dynamic_ui}, {"DYNAMIC_GALLERY", tune_dynamic_gallery}, - {"DYNAMIC_VT", tune_dynamic_vtcall}, + {"DYNAMIC_VT", tune_dynamic_vt}, }, { {"STANDARD_UI", tune_standard_ui}, - {"STANDARD_VIDEO_NORMAL", tune_standard_video}, - {"STANDARD_VIDEO_WARM", tune_standard_video}, - {"STANDARD_VIDEO_COLD", tune_standard_video}, + {"STANDARD_VIDEO", tune_standard_video}, + {"STANDARD_VIDEO", tune_standard_video}, + {"STANDARD_VIDEO", tune_standard_video}, {"CAMERA", NULL/*tune_camera*/}, {"STANDARD_UI", tune_standard_ui}, {"STANDARD_GALLERY", tune_standard_gallery}, - {"STANDARD_VT", tune_standard_vtcall}, + {"STANDARD_VT", tune_standard_vt}, }, { {"NATURAL_UI", tune_natural_ui}, - {"NATURAL_VIDEO_NORMAL", tune_natural_video}, - {"NATURAL_VIDEO_WARM", tune_natural_video}, - {"NATURAL_VIDEO_COLD", tune_natural_video}, + {"NATURAL_VIDEO", tune_natural_video}, + {"NATURAL_VIDEO", tune_natural_video}, + {"NATURAL_VIDEO", tune_natural_video}, {"CAMERA", NULL/*tune_camera*/}, {"NATURAL_UI", tune_natural_ui}, {"NATURAL_GALLERY", tune_natural_gallery}, - {"NATURAL_VT", tune_natural_vtcall}, + {"NATURAL_VT", tune_natural_vt}, }, { {"MOVIE_UI", tune_movie_ui}, - {"MOVIE_VIDEO_NORMAL", tune_movie_video}, - {"MOVIE_VIDEO_WARM", tune_movie_video}, - {"MOVIE_VIDEO_COLD", tune_movie_video}, + {"MOVIE_VIDEO", tune_movie_video}, + {"MOVIE_VIDEO", tune_movie_video}, + {"MOVIE_VIDEO", tune_movie_video}, {"CAMERA", NULL/*tune_camera*/}, {"MOVIE_UI", tune_movie_ui}, {"MOVIE_GALLERY", tune_movie_gallery}, - {"MOVIE_VT", tune_movie_vtcall}, + {"MOVIE_VT", tune_movie_vt}, }, } }; #endif +struct mdnie_tunning_info camera_table[OUTDOOR_MAX] = { + {"CAMERA", tune_camera}, + {"CAMERA_OUTDOOR", tune_camera_outdoor}, +}; + #endif /* __MDNIE_TABLE_H__ */ |