[Bugfix] vbetest doesn't return to text mode

[Bugfix] vbetest doesn't return to text mode

[phcoder]

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

Hello. In text mode bits_per_pixel isn't set. Because of it 
grub_vbe_set_video_mode refuses to go back to text mode after vbetest 
command. Here is a bugfix
Thanks
Vladimir 'phcoder' Serbinenko

[-- Attachment #2: vbefix.diff --]
[-- Type: text/x-diff, Size: 985 bytes --]

Index: video/i386/pc/vbe.c
===================================================================
--- video/i386/pc/vbe.c	(revision 1973)
+++ video/i386/pc/vbe.c	(working copy)
@@ -215,6 +215,8 @@
     case 15: framebuffer.bytes_per_pixel = 2; break;
     case 8: framebuffer.bytes_per_pixel = 1; break;
     default:
+      if (mode <= 3 || mode ==  7)
+	break; 
       grub_vbe_bios_set_mode (old_mode, 0);
       return grub_error (GRUB_ERR_BAD_DEVICE,
                          "cannot set VBE mode %x",
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 1973)
+++ ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2009-02-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Don't check bits_per_pixel in text mode
+
+	* video/i386/pc/vbe.c (grub_vbe_set_video_mode): Don't check 
+	bits_per_pixel in text mode
+
 2009-02-04  Felix Zielcke  <fzielcke@z-51.de>
 
 	util/getroot.c (grub_util_get_grub_dev): Add support for /dev/mdNpN and

Re: [Bugfix] vbetest doesn't return to text mode

[Vesa Jääskeläinen]

phcoder wrote:
> Hello. In text mode bits_per_pixel isn't set. Because of it
> grub_vbe_set_video_mode refuses to go back to text mode after vbetest
> command. Here is a bugfix

Thanks for the report that there was a problem.

I didn't like the hackishm in that patch so I rewrote that part of the
code so it can also handle text modes.

Thanks,
Vesa Jääskeläinen