* grub-core/video/bochs.c (grub_video_bochs_setup): Use

	grub_video_mode_type_t.
	* grub-core/video/cirrus.c (grub_video_cirrus_setup): Likewise.
	* grub-core/video/i386/pc/vbe.c (grub_video_vbe_setup): Likewise.
	* grub-core/video/i386/pc/vga.c (grub_video_vga_setup): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 6218e9f12520aa203f4e58bdb94370e984fa9761..20fdfc86c5d51612db1302ced251788191da439b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/video/bochs.c (grub_video_bochs_setup): Use
+       grub_video_mode_type_t.
+       * grub-core/video/cirrus.c (grub_video_cirrus_setup): Likewise.
+       * grub-core/video/i386/pc/vbe.c (grub_video_vbe_setup): Likewise.
+       * grub-core/video/i386/pc/vga.c (grub_video_vga_setup): Likewise.
+
 2011-03-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-install.in: Correct the x86-64 name as x86_64.

diff --git a/grub-core/video/bochs.c b/grub-core/video/bochs.c
index 5def0985b3318fd26db08c18d6119c798364fbc4..832cd990311cc14059a61a4049880593fc5c75a0 100644 (file)
--- a/grub-core/video/bochs.c
+++ b/grub-core/video/bochs.c
@@ -199,7 +199,8 @@ grub_video_bochs_set_palette (unsigned int start, unsigned int count,
 
 static grub_err_t
 grub_video_bochs_setup (unsigned int width, unsigned int height,
-                       unsigned int mode_type, unsigned int mode_mask)
+                       grub_video_mode_type_t mode_type,
+                       grub_video_mode_type_t mode_mask)
 {
   int depth;
   grub_err_t err;

diff --git a/grub-core/video/cirrus.c b/grub-core/video/cirrus.c
index b8b0142ad1ad489ed13528ec99c20049a15b4002..a964c85cdd795e314197f328a91f56a28da028a0 100644 (file)
--- a/grub-core/video/cirrus.c
+++ b/grub-core/video/cirrus.c
@@ -235,7 +235,8 @@ grub_video_cirrus_set_palette (unsigned int start, unsigned int count,
 
 static grub_err_t
 grub_video_cirrus_setup (unsigned int width, unsigned int height,
-                        unsigned int mode_type, unsigned int mode_mask)
+                        grub_video_mode_type_t mode_type,
+                        grub_video_mode_type_t mode_mask)
 {
   int depth;
   grub_err_t err;

diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
index 2ddb4ca8085be47bd811446b0a57380820500adb..08bf124b6e7b88aeea55c4ac6549ba7f0e3d55c4 100644 (file)
--- a/grub-core/video/i386/pc/vbe.c
+++ b/grub-core/video/i386/pc/vbe.c
@@ -688,7 +688,8 @@ grub_video_vbe_iterate (int (*hook) (const struct grub_video_mode_info *info))
 
 static grub_err_t
 grub_video_vbe_setup (unsigned int width, unsigned int height,
-                      unsigned int mode_type, unsigned int mode_mask)
+                      grub_video_mode_type_t mode_type, 
+                     grub_video_mode_type_t mode_mask)
 {
   grub_uint16_t *p;
   struct grub_vbe_mode_info_block vbe_mode_info;

diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c
index 41b8d3eb1671316b24b83cf24107a74a38a5d262..19770ce0af225b90c5764175ad5f5d2a366f19fc 100644 (file)
--- a/grub-core/video/i386/pc/vga.c
+++ b/grub-core/video/i386/pc/vga.c
@@ -116,7 +116,8 @@ grub_video_vga_init (void)
 
 static grub_err_t
 grub_video_vga_setup (unsigned int width, unsigned int height,
-                      unsigned int mode_type, unsigned int mode_mask)
+                      grub_video_mode_type_t mode_type,
+                     grub_video_mode_type_t mode_mask)
 {
   grub_err_t err;