From c500ac2aeb6acacaa8e9e90cb896099823a3c508 Mon Sep 17 00:00:00 2001 From: Thiago Farina Date: Sun, 1 Nov 2009 16:47:35 -0500 Subject: [PATCH] --- yaml --- r: 173804 b: refs/heads/master c: 96c085db0a0f22895917f09cf942853186b892fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/sgivwfb.c | 4 ++-- trunk/include/video/sgivw.h | 11 +++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index d71ed03ca154..25d17b0c6b50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 809aaaae162e58696c61e1d0c156cfe16bd309e2 +refs/heads/master: 96c085db0a0f22895917f09cf942853186b892fd diff --git a/trunk/drivers/video/sgivwfb.c b/trunk/drivers/video/sgivwfb.c index bba53714a7b1..f86012239bff 100644 --- a/trunk/drivers/video/sgivwfb.c +++ b/trunk/drivers/video/sgivwfb.c @@ -260,13 +260,13 @@ static int sgivwfb_check_var(struct fb_var_screeninfo *var, var->grayscale = 0; /* No grayscale for now */ /* determine valid resolution and timing */ - for (min_mode = 0; min_mode < DBE_VT_SIZE; min_mode++) { + for (min_mode = 0; min_mode < ARRAY_SIZE(dbeVTimings); min_mode++) { if (dbeVTimings[min_mode].width >= var->xres && dbeVTimings[min_mode].height >= var->yres) break; } - if (min_mode == DBE_VT_SIZE) + if (min_mode == ARRAY_SIZE(dbeVTimings)) return -EINVAL; /* Resolution to high */ /* XXX FIXME - should try to pick best refresh rate */ diff --git a/trunk/include/video/sgivw.h b/trunk/include/video/sgivw.h index 55f2a7c024af..f6aa5692e74b 100644 --- a/trunk/include/video/sgivw.h +++ b/trunk/include/video/sgivw.h @@ -351,7 +351,7 @@ typedef enum { struct dbe_timing_info { dbe_timing_t type; - int flags; + int flags; short width; /* Monitor resolution */ short height; int fields_sec; /* fields/sec (Hz -3 dec. places */ @@ -389,11 +389,11 @@ struct dbe_timing_info dbeVTimings[] = { { DBE_VT_640_480_60, /* flags, width, height, fields_sec, cfreq */ - 0, 640, 480, 59940, 25175, + 0, 640, 480, 59940, 25175, /* htotal, hblank_start, hblank_end, hsync_start, hsync_end */ - 800, 640, 800, 656, 752, + 800, 640, 800, 656, 752, /* vtotal, vblank_start, vblank_end, vsync_start, vsync_end */ - 525, 480, 525, 490, 492, + 525, 480, 525, 490, 492, /* pll_m, pll_n, pll_p */ 15, 2, 3 }, @@ -650,7 +650,7 @@ struct dbe_timing_info dbeVTimings[] = { /* pll_m, pll_n, pll_p */ 6, 1, 0 }, - + { DBE_VT_1920_1200_60, /* flags, width, height, fields_sec, cfreq */ @@ -676,7 +676,6 @@ struct dbe_timing_info dbeVTimings[] = { } }; -#define DBE_VT_SIZE (sizeof(dbeVTimings)/sizeof(dbeVTimings[0])) #endif // INCLUDE_TIMING_TABLE_DATA #endif // ! __SGIVWFB_H__