2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>

	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
	of disk to dsk to avoid shadowing.
	(find_free_slot): Fix prototype.
	* util/getroot.c (grub_util_is_dmraid): Make static.
	* include/grub/time.h (grub_get_rtc) [GRUB_MACHINE_EMU || GRUB_UTIL]:
	Add missing prototype.
	* util/sdl.c (grub_video_sdl_set_viewport): Remove.

diff --git a/ChangeLog b/ChangeLog
index 4de8073eec163884342108c130bc3924fa5de269..ec3318c5b0573221cb8e581f32987aa3a67c678f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,9 +5,14 @@
        * util/grub-emu.c (ENABLE_RELOCATABLE): New definition.
        (grub_arch_modules_addr): Return 0 and not NULL.
        * util/misc.c (ENABLE_RELOCATABLE): New definition.
-       (xstrdup): USe newstr instead of dup.
+       (xstrdup): Use newstr instead of dup.
        * util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
        of disk to dsk to avoid shadowing.
+       (find_free_slot): Fix prototype.
+       * util/getroot.c (grub_util_is_dmraid): Make static.
+       * include/grub/time.h (grub_get_rtc) [GRUB_MACHINE_EMU || GRUB_UTIL]:
+       Add missing prototype.
+       * util/sdl.c (grub_video_sdl_set_viewport): Remove.
 
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 

diff --git a/include/grub/time.h b/include/grub/time.h
index 5aafdc9ed6359c71653907ed906ab843d056df71..ae2617edb15bfa2157adef0ea113cc87cb879290 100644 (file)
--- a/include/grub/time.h
+++ b/include/grub/time.h
@@ -25,6 +25,8 @@
 
 #if defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL)
 #define GRUB_TICKS_PER_SECOND 100000
+/* Return the real time in ticks.  */
+grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void);
 #else
 #include <grub/machine/time.h>
 #endif

diff --git a/util/getroot.c b/util/getroot.c
index 6357c8a268ab66e221f8b15132bc3fd3b4670d65..82393635cd33bbfcbb24da19af49a32af8dbc4be 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -460,7 +460,8 @@ grub_guess_root_device (const char *dir)
 
   return os_dev;
 }
-int
+
+static int
 grub_util_is_dmraid (const char *os_dev)
 {
   if (! strncmp (os_dev, "/dev/mapper/nvidia_", 19))

diff --git a/util/hostdisk.c b/util/hostdisk.c
index 9a3f30ce048ea60968591011d1d6bd045a751912..98d3d53aebfc8876d77fe3379f7c239e020def54 100644 (file)
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -137,7 +137,7 @@ find_grub_drive (const char *name)
 }
 
 static int
-find_free_slot ()
+find_free_slot (void)
 {
   unsigned int i;
 

diff --git a/util/sdl.c b/util/sdl.c
index a5a310518fca43c0d2fd11f36ad63c63d5fefafc..d261db6b0975e8c45599529474c2cb0750c38722 100644 (file)
--- a/util/sdl.c
+++ b/util/sdl.c
@@ -179,32 +179,6 @@ grub_video_sdl_set_palette (unsigned int start, unsigned int count,
   return grub_video_fb_set_palette (start, count, palette_data);
 }
 
-grub_err_t
-grub_video_sdl_set_viewport (unsigned int x, unsigned int y,
-                            unsigned int width, unsigned int height)
-{
-  /* Make sure viewport is withing screen dimensions.  If viewport was set
-     to be out of the region, mark its size as zero.  */
-  if (x > (unsigned) window->w)
-    {
-      x = 0;
-      width = 0;
-    }
-
-  if (y > (unsigned) window->h)
-    {
-      y = 0;
-      height = 0;
-    }
-
-  if (x + width > (unsigned) window->w)
-    width = window->w - x;
-
-  if (y + height > (unsigned) window->h)
-    height = window->h - y;
-  return grub_video_fb_set_viewport (x, y, width, height);
-}
-
 static grub_err_t
 grub_video_sdl_swap_buffers (void)
 {