From 57d0052df3570470bce5d6789ee36077b9574235 Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Mon, 12 Jan 2015 15:04:36 -0800 Subject: [PATCH] video_common: XVID_VM_UXGA_60_P->XVID_VM_1600x1200_60_P. Signed-off-by: Andrei-Liviu Simion --- XilinxProcessorIPLib/drivers/video_common/src/xvid.h | 1 + .../drivers/video_common/src/xvid_timings_table.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h index 92067b17..a2be1193 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h @@ -176,6 +176,7 @@ typedef enum { XVID_VM_USE_EDID_PREFERRED, XVID_VM_NO_INPUT, + XVID_VM_UXGA_60_P = XVID_VM_1600x1200_60_P, XVID_VM_WSXGA_60_P = XVID_VM_1680x1050_60_P, XVID_VM_WUXGA_60_P = XVID_VM_1600x1200_60_P } XVid_VideoMode; diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c index aa8704ed..3f10b242 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c @@ -458,11 +458,6 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 0, {1366, 70, 143, 213, 1792, 1, 768, 3, 3, 24, 798, 0, 0, 0, 0, 1} }, - { XVID_VM_UXGA_60_P, "1600x1200@60Hz", XVID_FR_60HZ, - 0, - {1600, 64, 192, 304, 2160, 1, - 1200, 1, 3, 46, 1250, 0, 0, 0, 0, 1} }, - /* XVID_VM_1600x1200_60_P */ /* Interlaced modes. */ { XVID_VM_480_30_I, "720x480@30Hz (I)", XVID_FR_30HZ,