fixed more undefined symbols

BaS_gcc/include/fb.h

@@ -579,22 +579,4 @@ extern long Funcs_misc(long func, long par, const char *token);
 extern long Funcs_event(long id_type, long data); 
 
 extern struct fb_info *info_fvdi;
-
-/*
- * Debugging stuffs
- */
-extern short debug;
-extern void debug_print(const char *string);
-extern void debug_print_value(const char *string, long val);
-extern void debug_print_value_hex(const char *string, long val);
-extern void debug_print_value_hex_byte(const char *string, unsigned char val);
-extern void debug_print_value_hex_word(const char *string, unsigned short val);
-extern void debug_print_value_hex_long(const char *string, unsigned long val);
-#define DPRINT debug_print
-#define DPRINTVAL debug_print_value
-#define DPRINTVALHEX debug_print_value_hex
-#define DPRINTVALHEXBYTE debug_print_value_hex_byte
-#define DPRINTVALHEXWORD debug_print_value_hex_word
-#define DPRINTVALHEXLONG debug_print_value_hex_long
-
 #endif /* _FB_H */

BaS_gcc/video/fbmodedb.c

@@ -12,8 +12,17 @@
  */
 
 #include "fb.h"
+#include "bas_types.h"
+#include "bas_printf.h"
 #include "bas_string.h"
 
+#define DBG_MODES
+#ifdef DBG_MODES
+#define dbg(format, arg...) do { xprintf("DEBUG: " format, ##arg); } while (0)
+#else
+#define dbg(format, arg...) do { ; } while (0)
+#endif /* DBG_MODES */
+
 #define name_matches(v, s, l) \
     ((v).name && !strncmp((s), (v).name, (l)) && strlen((v).name) == (l))
 #define res_matches(v, x, y) \
@@ -25,366 +34,368 @@
 
 #define DEFAULT_MODEDB_INDEX	0
 
-const struct fb_videomode modedb[] = {
+const struct fb_videomode modedb[] =
+{
     {
 		/* 640x400 @ 70 Hz, 31.5 kHz hsync */
 		70, 640, 400, 39721, 40, 24, 39, 9, 96, 2,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 640x480 @ 60 Hz, 31.5 kHz hsync */
 		60, 640, 480, 39721, 40, 24, 32, 11, 96, 2,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 800x600 @ 56 Hz, 35.15 kHz hsync */
 		56, 800, 600, 27777, 128, 24, 22, 1, 72, 2,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1024x768 @ 87 Hz interlaced, 35.5 kHz hsync */
 		87, 1024, 768, 22271, 56, 24, 33, 8, 160, 8,
 		0, FB_VMODE_INTERLACED
-    }, {
+    },
+	{
 		/* 640x400 @ 85 Hz, 37.86 kHz hsync */
 		85, 640, 400, 31746, 96, 32, 41, 1, 64, 3,
 		FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 640x480 @ 72 Hz, 36.5 kHz hsync */
 		72, 640, 480, 31746, 144, 40, 30, 8, 40, 3,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 640x480 @ 75 Hz, 37.50 kHz hsync */
 		75, 640, 480, 31746, 120, 16, 16, 1, 64, 3,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 800x600 @ 60 Hz, 37.8 kHz hsync */
 		60, 800, 600, 25000, 88, 40, 23, 1, 128, 4,
 		FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 640x480 @ 85 Hz, 43.27 kHz hsync */
 		85, 640, 480, 27777, 80, 56, 25, 1, 56, 3,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1152x864 @ 89 Hz interlaced, 44 kHz hsync */
 		69, 1152, 864, 15384, 96, 16, 110, 1, 216, 10,
 		0, FB_VMODE_INTERLACED
-    }, {
+    },
+	{
 		/* 800x600 @ 72 Hz, 48.0 kHz hsync */
 		72, 800, 600, 20000, 64, 56, 23, 37, 120, 6,
 		FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1024x768 @ 60 Hz, 48.4 kHz hsync */
 		60, 1024, 768, 15384, 168, 8, 29, 3, 144, 6,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 640x480 @ 100 Hz, 53.01 kHz hsync */
 		100, 640, 480, 21834, 96, 32, 36, 8, 96, 6,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1152x864 @ 60 Hz, 53.5 kHz hsync */
 		60, 1152, 864, 11123, 208, 64, 16, 4, 256, 8,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 800x600 @ 85 Hz, 55.84 kHz hsync */
 		85, 800, 600, 16460, 160, 64, 36, 16, 64, 5,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1024x768 @ 70 Hz, 56.5 kHz hsync */
 		70, 1024, 768, 13333, 144, 24, 29, 3, 136, 6,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1280x1024 @ 87 Hz interlaced, 51 kHz hsync */
 		87, 1280, 1024, 12500, 56, 16, 128, 1, 216, 12,
 		0, FB_VMODE_INTERLACED
-    }, {
+    },
+	{
 		/* 800x600 @ 100 Hz, 64.02 kHz hsync */
 		100, 800, 600, 14357, 160, 64, 30, 4, 64, 6,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1024x768 @ 76 Hz, 62.5 kHz hsync */
 		76, 1024, 768, 11764, 208, 8, 36, 16, 120, 3,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1152x864 @ 70 Hz, 62.4 kHz hsync */
 		70, 1152, 864, 10869, 106, 56, 20, 1, 160, 10,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1280x1024 @ 61 Hz, 64.2 kHz hsync */
 		61, 1280, 1024, 9090, 200, 48, 26, 1, 184, 3,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1400x1050 @ 60Hz, 63.9 kHz hsync */
 		68, 1400, 1050, 9259, 136, 40, 13, 1, 112, 3,
 		0, FB_VMODE_NONINTERLACED   	
-    }, {
+    },
+	{
 		/* 1400x1050 @ 75,107 Hz, 82,392 kHz +hsync +vsync*/
 		75, 1400, 1050, 9271, 120, 56, 13, 0, 112, 3,
 		FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1400x1050 @ 60 Hz, ? kHz +hsync +vsync*/
   		60, 1400, 1050, 9259, 128, 40, 12, 0, 112, 3,
 		FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1024x768 @ 85 Hz, 70.24 kHz hsync */
 		85, 1024, 768, 10111, 192, 32, 34, 14, 160, 6,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1152x864 @ 78 Hz, 70.8 kHz hsync */
 		78, 1152, 864, 9090, 228, 88, 32, 0, 84, 12,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1280x1024 @ 70 Hz, 74.59 kHz hsync */
 		70, 1280, 1024, 7905, 224, 32, 28, 8, 160, 8,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1600x1200 @ 60Hz, 75.00 kHz hsync */
 		60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3,
 		FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1152x864 @ 84 Hz, 76.0 kHz hsync */
 		84, 1152, 864, 7407, 184, 312, 32, 0, 128, 12,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1280x1024 @ 74 Hz, 78.85 kHz hsync */
 		74, 1280, 1024, 7407, 256, 32, 34, 3, 144, 3,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1024x768 @ 100Hz, 80.21 kHz hsync */
 		100, 1024, 768, 8658, 192, 32, 21, 3, 192, 10,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1280x1024 @ 76 Hz, 81.13 kHz hsync */
 		76, 1280, 1024, 7407, 248, 32, 34, 3, 104, 3,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1600x1200 @ 70 Hz, 87.50 kHz hsync */
 		70, 1600, 1200, 5291, 304, 64, 46, 1, 192, 3,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1152x864 @ 100 Hz, 89.62 kHz hsync */
 		100, 1152, 864, 7264, 224, 32, 17, 2, 128, 19,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1280x1024 @ 85 Hz, 91.15 kHz hsync */
 		85, 1280, 1024, 6349, 224, 64, 44, 1, 160, 3,
 		FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1600x1200 @ 75 Hz, 93.75 kHz hsync */
 		75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3,
 		FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1600x1200 @ 85 Hz, 105.77 kHz hsync */
 		85, 1600, 1200, 4545, 272, 16, 37, 4, 192, 3,
 		FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1280x1024 @ 100 Hz, 107.16 kHz hsync */
 		100, 1280, 1024, 5502, 256, 32, 26, 7, 128, 15,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1800x1440 @ 64Hz, 96.15 kHz hsync  */
 		64, 1800, 1440, 4347, 304, 96, 46, 1, 192, 3,
 		FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1800x1440 @ 70Hz, 104.52 kHz hsync  */
 		70, 1800, 1440, 4000, 304, 96, 46, 1, 192, 3,
 		FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 512x384 @ 78 Hz, 31.50 kHz hsync */
 		78, 512, 384, 49603, 48, 16, 16, 1, 64, 3,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 512x384 @ 85 Hz, 34.38 kHz hsync */
 		85, 512, 384, 45454, 48, 16, 16, 1, 64, 3,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 320x200 @ 70 Hz, 31.5 kHz hsync, 8:5 aspect ratio */
 		70, 320, 200, 79440, 16, 16, 20, 4, 48, 1,
 		0, FB_VMODE_DOUBLE
-    }, {
+    },
+	{
 		/* 320x240 @ 60 Hz, 31.5 kHz hsync, 4:3 aspect ratio */
 		60, 320, 240, 79440, 16, 16, 16, 5, 48, 1,
 		0, FB_VMODE_DOUBLE
-    }, {
+    },
+	{
 		/* 320x240 @ 72 Hz, 36.5 kHz hsync */
 		72, 320, 240, 63492, 16, 16, 16, 4, 48, 2,
 		0, FB_VMODE_DOUBLE
-    }, {
+    },
+	{
 		/* 400x300 @ 56 Hz, 35.2 kHz hsync, 4:3 aspect ratio */
 		56, 400, 300, 55555, 64, 16, 10, 1, 32, 1,
 		0, FB_VMODE_DOUBLE
-    }, {
+    },
+	{
 		/* 400x300 @ 60 Hz, 37.8 kHz hsync */
 		60, 400, 300, 50000, 48, 16, 11, 1, 64, 2,
 		0, FB_VMODE_DOUBLE
-    }, {
+    },
+	{
 		/* 400x300 @ 72 Hz, 48.0 kHz hsync */
 		72, 400, 300, 40000, 32, 24, 11, 19, 64, 3,
 		0, FB_VMODE_DOUBLE
-    }, {
+    },
+	{
 		/* 480x300 @ 56 Hz, 35.2 kHz hsync, 8:5 aspect ratio */
 		56, 480, 300, 46176, 80, 16, 10, 1, 40, 1,
 		0, FB_VMODE_DOUBLE
-    }, {
+    },
+	{
 		/* 480x300 @ 60 Hz, 37.8 kHz hsync */
 		60, 480, 300, 41858, 56, 16, 11, 1, 80, 2,
 		0, FB_VMODE_DOUBLE
-    }, {
+    },
+	{
 		/* 480x300 @ 63 Hz, 39.6 kHz hsync */
 		63, 480, 300, 40000, 56, 16, 11, 1, 80, 2,
 		0, FB_VMODE_DOUBLE
-    }, {
+    },
+	{
 		/* 480x300 @ 72 Hz, 48.0 kHz hsync */
 		72, 480, 300, 33386, 40, 24, 11, 19, 80, 3,
 		0, FB_VMODE_DOUBLE
-    }, {
+    },
+	{
 		/* 1920x1200 @ 60 Hz, 74.5 Khz hsync */
 		60, 1920, 1200, 5177, 128, 336, 1, 38, 208, 3,
 		FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
 		FB_VMODE_NONINTERLACED
-    }, {
+    },
-#if 1
+	{
 		/* 1152x768, 60 Hz, PowerBook G4 Titanium I and II */
 		60, 1152, 768, 14047, 158, 26, 29, 3, 136, 6,
 		FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
-    }, {
+    },
-#else
+	{
 		/* 1920x1080, 60 Hz, 1080pf */
 		60, 1920, 1080, 6741, 148, 44, 36, 4, 88, 5,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
-#endif
+	{
 		/* 1366x768, 60 Hz, 47.403 kHz hsync, WXGA 16:9 aspect ratio */
 		60, 1366, 768, 13806, 120, 10, 14, 3, 32, 5,
 		0, FB_VMODE_NONINTERLACED
-    }, {
+    },
+	{
 		/* 1280x800, 60 Hz, 47.403 kHz hsync, WXGA 16:10 aspect ratio */
 		60, 1280, 800, 12048, 200, 64, 24, 1, 136, 3,
 		0, FB_VMODE_NONINTERLACED
     },
 };
 
-long total_modedb = sizeof(modedb)/sizeof(*modedb);
+long total_modedb = sizeof(modedb) / sizeof(*modedb);
 
-const struct fb_videomode vesa_modes[] = {
+const struct fb_videomode vesa_modes[] =
+{
 	/* 0 640x350-85 VESA */
-	{ 85, 640, 350, 31746,  96, 32, 60, 32, 64, 3,
+	{ 85, 640, 350, 31746,  96, 32, 60, 32, 64, 3, FB_SYNC_HOR_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA},
-	  FB_SYNC_HOR_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA},
 	/* 1 640x400-85 VESA */
-	{ 85, 640, 400, 31746,  96, 32, 41, 01, 64, 3,
+	{ 85, 640, 400, 31746,  96, 32, 41, 01, 64, 3, FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 2 720x400-85 VESA */
-	{ 85, 721, 400, 28169, 108, 36, 42, 01, 72, 3,
+	{ 85, 721, 400, 28169, 108, 36, 42, 01, 72, 3, FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 3 640x480-60 VESA */
-	{ 60, 640, 480, 39682,  48, 16, 33, 10, 96, 2, 
+	{ 60, 640, 480, 39682,  48, 16, 33, 10, 96, 2, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 4 640x480-72 VESA */
-	{ 72, 640, 480, 31746, 128, 24, 29, 9, 40, 2, 
+	{ 72, 640, 480, 31746, 128, 24, 29, 9, 40, 2, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 5 640x480-75 VESA */
-	{ 75, 640, 480, 31746, 120, 16, 16, 01, 64, 3,
+	{ 75, 640, 480, 31746, 120, 16, 16, 01, 64, 3, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 6 640x480-85 VESA */
-	{ 85, 640, 480, 27777, 80, 56, 25, 01, 56, 3,
+	{ 85, 640, 480, 27777, 80, 56, 25, 01, 56, 3, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 7 800x600-56 VESA */
-	{ 56, 800, 600, 27777, 128, 24, 22, 01, 72, 2,
+	{ 56, 800, 600, 27777, 128, 24, 22, 01, 72, 2, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 8 800x600-60 VESA */
-	{ 60, 800, 600, 25000, 88, 40, 23, 01, 128, 4,
+	{ 60, 800, 600, 25000, 88, 40, 23, 01, 128, 4, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 9 800x600-72 VESA */
-	{ 72, 800, 600, 20000, 64, 56, 23, 37, 120, 6,
+	{ 72, 800, 600, 20000, 64, 56, 23, 37, 120, 6, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 10 800x600-75 VESA */
-	{ 75, 800, 600, 20202, 160, 16, 21, 01, 80, 3,
+	{ 75, 800, 600, 20202, 160, 16, 21, 01, 80, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 11 800x600-85 VESA */
-	{ 85, 800, 600, 17761, 152, 32, 27, 01, 64, 3,
+	{ 85, 800, 600, 17761, 152, 32, 27, 01, 64, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 12 1024x768i-43 VESA */
-	{ 53, 1024, 768, 22271, 56, 8, 41, 0, 176, 8,
+	{ 53, 1024, 768, 22271, 56, 8, 41, 0, 176, 8, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_INTERLACED, FB_MODE_IS_VESA },
 	/* 13 1024x768-60 VESA */
-	{ 60, 1024, 768, 15384, 160, 24, 29, 3, 136, 6,
+	{ 60, 1024, 768, 15384, 160, 24, 29, 3, 136, 6, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 14 1024x768-70 VESA */
-	{ 70, 1024, 768, 13333, 144, 24, 29, 3, 136, 6,
+	{ 70, 1024, 768, 13333, 144, 24, 29, 3, 136, 6, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 15 1024x768-75 VESA */
-	{ 75, 1024, 768, 12690, 176, 16, 28, 1, 96, 3,
+	{ 75, 1024, 768, 12690, 176, 16, 28, 1, 96, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 16 1024x768-85 VESA */
-	{ 85, 1024, 768, 10582, 208, 48, 36, 1, 96, 3,
+	{ 85, 1024, 768, 10582, 208, 48, 36, 1, 96, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 17 1152x864-75 VESA */
-	{ 75, 1153, 864, 9259, 256, 64, 32, 1, 128, 3,
+	{ 75, 1153, 864, 9259, 256, 64, 32, 1, 128, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 18 1280x960-60 VESA */
-	{ 60, 1280, 960, 9259, 312, 96, 36, 1, 112, 3,
+	{ 60, 1280, 960, 9259, 312, 96, 36, 1, 112, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 19 1280x960-85 VESA */
-	{ 85, 1280, 960, 6734, 224, 64, 47, 1, 160, 3,
+	{ 85, 1280, 960, 6734, 224, 64, 47, 1, 160, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 20 1280x1024-60 VESA */
-	{ 60, 1280, 1024, 9259, 248, 48, 38, 1, 112, 3,
+	{ 60, 1280, 1024, 9259, 248, 48, 38, 1, 112, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 21 1280x1024-75 VESA */
-	{ 75, 1280, 1024, 7407, 248, 16, 38, 1, 144, 3,
+	{ 75, 1280, 1024, 7407, 248, 16, 38, 1, 144, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 22 1280x1024-85 VESA */
-	{ 85, 1280, 1024, 6349, 224, 64, 44, 1, 160, 3,
+	{ 85, 1280, 1024, 6349, 224, 64, 44, 1, 160, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 23 1600x1200-60 VESA */
-	{ 60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3,
+	{ 60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 24 1600x1200-65 VESA */
-	{ 65, 1600, 1200, 5698, 304,  64, 46, 1, 192, 3,
+	{ 65, 1600, 1200, 5698, 304,  64, 46, 1, 192, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 25 1600x1200-70 VESA */
-	{ 70, 1600, 1200, 5291, 304, 64, 46, 1, 192, 3,
+	{ 70, 1600, 1200, 5291, 304, 64, 46, 1, 192, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 26 1600x1200-75 VESA */
-	{ 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3, 
+	{ 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 27 1600x1200-85 VESA */
-	{ 85, 1600, 1200, 4357, 304, 64, 46, 1, 192, 3,
+	{ 85, 1600, 1200, 4357, 304, 64, 46, 1, 192, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-	  FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 28 1792x1344-60 VESA */
-	{ 60, 1792, 1344, 4882, 328, 128, 46, 1, 200, 3,
+	{ 60, 1792, 1344, 4882, 328, 128, 46, 1, 200, 3, FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 29 1792x1344-75 VESA */
-	{ 75, 1792, 1344, 3831, 352, 96, 69, 1, 216, 3,
+	{ 75, 1792, 1344, 3831, 352, 96, 69, 1, 216, 3, FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 30 1856x1392-60 VESA */
-	{ 60, 1856, 1392, 4580, 352, 96, 43, 1, 224, 3,
+	{ 60, 1856, 1392, 4580, 352, 96, 43, 1, 224, 3, FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 31 1856x1392-75 VESA */
-	{ 75, 1856, 1392, 3472, 352, 128, 104, 1, 224, 3,
+	{ 75, 1856, 1392, 3472, 352, 128, 104, 1, 224, 3, FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 32 1920x1440-60 VESA */
-	{ 60, 1920, 1440, 4273, 344, 128, 56, 1, 200, 3,
+	{ 60, 1920, 1440, 4273, 344, 128, 56, 1, 200, 3, FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 	/* 33 1920x1440-75 VESA */
-	{ 60, 1920, 1440, 3367, 352, 144, 56, 1, 224, 3,
+	{ 60, 1920, 1440, 3367, 352, 144, 56, 1, 224, 3, FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-	  FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 };
 
 /**
@@ -404,11 +415,8 @@ static int fb_try_mode(struct fb_var_screeninfo *var, struct fb_info *info,
 		       const struct fb_videomode *mode, unsigned int bpp)
 {
     int err = 0;
-    DPRINTVAL("Trying mode ", mode->xres);
+
-    DPRINTVAL("x", mode->yres);
+    dbg("Trying mode %d x %d - %d @ %d\r\n", mode->xres, mode->yres, bpp, mode->refresh);
-    DPRINTVAL("-", bpp);
-    DPRINTVAL("@", mode->refresh);
-    DPRINT("\r\n");
     var->xres = mode->xres;
     var->yres = mode->yres;
     var->xres_virtual = mode->xres;
@@ -428,7 +436,9 @@ static int fb_try_mode(struct fb_var_screeninfo *var, struct fb_info *info,
     var->vmode = mode->vmode;
     var->refresh = mode->refresh;
    	err = info->fbops->fb_check_var(var, info);
+
     var->activate &= ~FB_ACTIVATE_TEST;
+
     return err;
 }
 
@@ -475,12 +485,14 @@ int fb_find_mode(struct fb_var_screeninfo *var,
 	unsigned int xres = 0, yres = 0, bpp = default_bpp, refresh = 0;
 	int yres_specified = 0;
 	unsigned long best, diff;
-//	DPRINT("fb_find_mode\r\n");
+
+	dbg("fb_find_mode\r\n");
+
 	/* Set up defaults */
-	if(!db)
+	if (!db)
 	{
-//		DPRINT("fb_find_mode, use default modedb\r\n");
+		dbg("fb_find_mode, use default modedb\r\n");
-		if(resolution->used && (resolution->flags & MODE_VESA_FLAG))
+		if (resolution->used && (resolution->flags & MODE_VESA_FLAG))
 		{
 			db = vesa_modes;
 			dbsize = sizeof(vesa_modes)/sizeof(*vesa_modes);
@@ -491,47 +503,46 @@ int fb_find_mode(struct fb_var_screeninfo *var,
 			dbsize = sizeof(modedb)/sizeof(*modedb);
 		}
 	}
-	if(!default_mode)
+	if (!default_mode)
 		default_mode = &modedb[DEFAULT_MODEDB_INDEX];
-	if(!default_bpp)
+	if (!default_bpp)
 		default_bpp = 8;
 	/* Did the user specify a video mode? */
-	if(resolution->used) /* fVDI mode */
+	if (resolution->used) /* fVDI mode */
 	{
 		refresh = (unsigned int)resolution->freq;
-		if(refresh)
+		if (refresh)
 			refresh_specified = 1;
 		bpp = (unsigned int)resolution->bpp;
-		if(resolution->flags & MODE_EMUL_MONO_FLAG)
+		if (resolution->flags & MODE_EMUL_MONO_FLAG)
 			bpp = 8;
-		if(bpp)
+		if (bpp)
 			bpp_specified = 1;
 		yres = (unsigned int)resolution->height;
-		if(yres)
+		if (yres)
 			yres_specified = 1;
 		xres = (unsigned int)resolution->width;
-		if(xres)
+		if (xres)
 			res_specified = 1;
 	}
-	DPRINTVAL("Trying specified video mode ",xres);
+	dbg("Trying specified video mode %d x %d\r\n", xres, yres);
-	DPRINTVAL("x",yres);
+
-	DPRINT("\r\n");
 	diff = refresh;
 	best = -1;
-	for(i = 0; i < dbsize; i++)
+	for (i = 0; i < dbsize; i++)
 	{
-		if(res_specified && res_matches(db[i], xres, yres))
+		if (res_specified && res_matches(db[i], xres, yres))
 		{
-			if(!fb_try_mode(var, info, &db[i], bpp))
+			if (!fb_try_mode(var, info, &db[i], bpp))
 			{
-				if(!refresh_specified || db[i].refresh == refresh)
+				if (!refresh_specified || db[i].refresh == refresh)
 					return 1;
 				else
 				{
 					abs = db[i].refresh - refresh;
-					if(abs < 0)
+					if (abs < 0)
 						abs = -abs;
-					if(diff > abs)
+					if (diff > abs)
 					{
 						diff = abs;
 						best = i;
@@ -540,22 +551,22 @@ int fb_find_mode(struct fb_var_screeninfo *var,
 			}
 		}
 	}
-	if(best != -1)
+
+	if (best != -1)
 	{
 		fb_try_mode(var, info, &db[best], bpp);
 		return 2;
 	}
 	diff = xres + yres;
-	DPRINT("Trying best-fit modes\r\n");
+	dbg("Trying best-fit modes\r\n");
 	best = -1;
-	for(i = 0; i < dbsize; i++)
+	for (i = 0; i < dbsize; i++)
 	{
-		if(xres <= db[i].xres && yres <= db[i].yres)
+		if (xres <= db[i].xres && yres <= db[i].yres)
 		{
-			DPRINTVAL("Trying ",db[i].xres);
+			dbg("Trying %d x %d\r\n", db[i].xres, db[i].yres);
-			DPRINTVAL("x",db[i].yres);
+
-			DPRINT("\r\n");
+			if (!fb_try_mode(var, info, &db[i], bpp))
-			if(!fb_try_mode(var, info, &db[i], bpp))
 			{
 		    if (diff > (db[i].xres - xres) + (db[i].yres - yres))
 		    {
@@ -565,20 +576,20 @@ int fb_find_mode(struct fb_var_screeninfo *var,
 			}
     }
 	}
-	if(best != -1)
+	if (best != -1)
 	{
 		fb_try_mode(var, info, &db[best], bpp);
 		return 5;
 	}
-	DPRINT("Trying default video mode\r\n");
+	dbg("Trying default video mode\r\n");
-	if(!fb_try_mode(var, info, default_mode, default_bpp))
+	if (!fb_try_mode(var, info, default_mode, default_bpp))
 		return 3;
-  DPRINT("Trying all modes\r\n");
+	dbg("Trying all modes\r\n");
-	for(i = 0; i < dbsize; i++)
+	for (i = 0; i < dbsize; i++)
 	{
-		if(!fb_try_mode(var, info, &db[i], default_bpp))
+		if (!fb_try_mode(var, info, &db[i], default_bpp))
 	    return 4;
 	}
-	DPRINT("No valid mode found\r\n");
+	dbg("No valid mode found\r\n");
 	return 0;
 }