2010-11-26 Robert Millan <rmh@gnu.org>

	* grub-core/term/i386/pc/vga_text.c (VGA_TEXT_SCREEN): Beautify.
	Update all users.

diff --git a/ChangeLog b/ChangeLog
index f9e24a808ba0b8ab9abcf6b3c59e1bb29f1cb74a..0cb1628cc5a8f8a75cd3479faff9698fb5fd4ed6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-26  Robert Millan  <rmh@gnu.org>
+
+       * grub-core/term/i386/pc/vga_text.c (VGA_TEXT_SCREEN): Beautify.
+       Update all users.
+
 2010-11-26  Colin Watson  <cjwatson@ubuntu.com>
 
        Fix LVM-on-RAID probing.

diff --git a/grub-core/term/i386/pc/vga_text.c b/grub-core/term/i386/pc/vga_text.c
index 1685b3db0a0687849436b9bfa9c4496e3237607b..fbb65ae0cf3023fe6d183bfff59f33eeed6164f1 100644 (file)
--- a/grub-core/term/i386/pc/vga_text.c
+++ b/grub-core/term/i386/pc/vga_text.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007, 2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2007, 2008, 2010  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,18 +27,18 @@
 
 static int grub_curr_x, grub_curr_y;
 
-#define VGA_TEXT_SCREEN                0xb8000
+#define VGA_TEXT_SCREEN                ((grub_uint16_t *) 0xb8000)
 
 static void
 screen_write_char (int x, int y, short c)
 {
-  ((short *) VGA_TEXT_SCREEN)[y * COLS + x] = c;
+  VGA_TEXT_SCREEN[y * COLS + x] = c;
 }
 
 static short
 screen_read_char (int x, int y)
 {
-  return ((short *) VGA_TEXT_SCREEN)[y * COLS + x];
+  return VGA_TEXT_SCREEN[y * COLS + x];
 }
 
 static void
@@ -120,7 +120,7 @@ grub_vga_text_cls (struct grub_term_output *term)
 {
   int i;
   for (i = 0; i < ROWS * COLS; i++)
-    ((short *) VGA_TEXT_SCREEN)[i] = ' ' | (grub_console_cur_color << 8);
+    VGA_TEXT_SCREEN[i] = ' ' | (grub_console_cur_color << 8);
   grub_vga_text_gotoxy (term, 0, 0);
 }