- Include opt_vesa.h in vesa.c so that the VESA_DEBUG option is actually

  propagated from the kernel config file to the source.
- Add some more debug messages to list each mode that is rejected or found.

1 files changed, 15 insertions, 1 deletions

diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 3fc68af..c324ba8 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -27,6 +27,7 @@
  */
 
 #include "opt_vga.h"
+#include "opt_vesa.h"
 
 #ifndef VGA_NO_MODE_CHANGE
 
@@ -678,8 +679,16 @@ vesa_bios_init(void)
 			continue;
 #else
 		if ((vmode.v_modeattr & (V_MODEOPTINFO | V_MODENONVGA))
-		    != (V_MODEOPTINFO))
+		    != (V_MODEOPTINFO)) {
+#if VESA_DEBUG > 1
+			printf(
+		"Rejecting VESA %s mode: %d x %d x %d bpp  attr = %x\n",
+			    vmode.v_modeattr & V_MODEGRAPHICS ? "graphics" : "text",
+			    vmode.v_width, vmode.v_height, vmode.v_bpp,
+			    vmode.v_modeattr);
+#endif
 			continue;
+		}
 #endif
 
 		/* expand the array if necessary */
@@ -698,6 +707,11 @@ vesa_bios_init(void)
 			vesa_vmode = p;
 		}
 
+#if VESA_DEBUG > 1
+		printf("Found VESA %s mode: %d x %d x %d bpp\n",
+		    vmode.v_modeattr & V_MODEGRAPHICS ? "graphics" : "text",
+		    vmode.v_width, vmode.v_height, vmode.v_bpp);
+#endif
 		/* copy some fields */
 		bzero(&vesa_vmode[modes], sizeof(vesa_vmode[modes]));
 		vesa_vmode[modes].vi_mode = vesa_vmodetab[i];