From bb2c86bf3f0df1df79fcbb9fe213361f77d26ad4 Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Mon, 12 Jan 2015 14:49:59 -0800 Subject: [PATCH] video_common: XVID_VM_WUXGA_60P->XVID_VM_1600x1200_60_P. Signed-off-by: Andrei-Liviu Simion --- XilinxProcessorIPLib/drivers/video_common/src/xvid.h | 5 +++-- .../drivers/video_common/src/xvid_timings_table.c | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h index da1ef98c..e746b491 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h @@ -166,7 +166,6 @@ typedef enum { XVID_VM_WXGA_60_P, XVID_VM_UXGA_60_P, - XVID_VM_WUXGA_60_P, XVID_VM_WSXGA_60_P, XVID_VM_480_30_I, @@ -176,7 +175,9 @@ typedef enum { XVID_VM_NUM_SUPPORT, XVID_VM_USE_EDID_PREFERRED, - XVID_VM_NO_INPUT + XVID_VM_NO_INPUT, + + XVID_VM_WUXGA_60_P = XVID_VM_1600x1200_60_P } XVid_VideoMode; typedef enum { diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c index 331e7d0b..3cecbb0f 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c @@ -463,11 +463,6 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = {1600, 64, 192, 304, 2160, 1, 1200, 1, 3, 46, 1250, 0, 0, 0, 0, 1} }, /* XVID_VM_1600x1200_60_P */ - { XVID_VM_WUXGA_60_P, "1920x1200@60Hz", XVID_FR_60HZ, - 0, - {1920, 136, 200, 336, 2592, 1, - 1200, 3, 6, 36, 1245, 0, 0, 0, 0, 1} }, - /* XVID_VM_1920x1200_60_P */ { XVID_VM_WSXGA_60_P, "1680x1050@60Hz", XVID_FR_60HZ, 0, {1680, 104, 176, 280, 2240, 1,