Make new grub_vbe_bios_* functions static.

diff --git a/ChangeLog.vbe-autodetect b/ChangeLog.vbe-autodetect
index d8034b8851c04a7140b22e7ca556d027357d86d0..46aacef7b9f41f2e696df9c01a73906872f0b0cb 100644 (file)
--- a/ChangeLog.vbe-autodetect
+++ b/ChangeLog.vbe-autodetect
@@ -1,4 +1,4 @@
-2010-12-14  Colin Watson  <cjwatson@ubuntu.com>
+2011-01-15  Colin Watson  <cjwatson@ubuntu.com>
 
        Preferred resolution detection for VBE.
 
@@ -25,9 +25,6 @@
        (grub_video_edid_preferred_mode): Likewise.
        * include/grub/i386/pc/vbe.h (struct grub_vbe_flat_panel_info): New
        structure.
-       (grub_vbe_bios_get_flat_panel_info): Add prototype.
-       (grub_vbe_bios_get_ddc_capabilities): Likewise.
-       (grub_vbe_bios_read_edid): Likewise.
 
        * grub-core/commands/videoinfo.c (print_edid): New function.
        (grub_cmd_videoinfo): Print EDID if available.

diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
index c6bb733a943757c27cb199731c44fe60135e7731..29b67beebf93372752d3e477ec27d57ffb1ae2b0 100644 (file)
--- a/grub-core/video/i386/pc/vbe.c
+++ b/grub-core/video/i386/pc/vbe.c
@@ -274,7 +274,7 @@ grub_vbe_bios_get_pm_interface (grub_uint16_t *segment, grub_uint16_t *offset,
 }
 
 /* Call VESA BIOS 0x4f11 to get flat panel information, return status.  */
-grub_vbe_status_t
+static grub_vbe_status_t
 grub_vbe_bios_get_flat_panel_info (struct grub_vbe_flat_panel_info *flat_panel_info)
 {
   struct grub_bios_int_registers regs;
@@ -289,7 +289,7 @@ grub_vbe_bios_get_flat_panel_info (struct grub_vbe_flat_panel_info *flat_panel_i
 }
 
 /* Call VESA BIOS 0x4f15 to get DDC availability, return status.  */
-grub_vbe_status_t
+static grub_vbe_status_t
 grub_vbe_bios_get_ddc_capabilities (grub_uint8_t *level)
 {
   struct grub_bios_int_registers regs;
@@ -307,7 +307,7 @@ grub_vbe_bios_get_ddc_capabilities (grub_uint8_t *level)
 }
 
 /* Call VESA BIOS 0x4f15 to read EDID information, return status.  */
-grub_vbe_status_t
+static grub_vbe_status_t
 grub_vbe_bios_read_edid (struct grub_video_edid_info *edid_info)
 {
   struct grub_bios_int_registers regs;

diff --git a/include/grub/i386/pc/vbe.h b/include/grub/i386/pc/vbe.h
index 0422558db3b3c29c16c231990cf16fe52771e22f..09ad7eb6451407d5952dd3f0946336249ec5784a 100644 (file)
--- a/include/grub/i386/pc/vbe.h
+++ b/include/grub/i386/pc/vbe.h
@@ -214,15 +214,6 @@ grub_vbe_bios_get_scanline_length (grub_uint32_t *length);
 grub_vbe_status_t 
 grub_vbe_bios_get_display_start (grub_uint32_t *x,
                                 grub_uint32_t *y);
-/* Call VESA BIOS 0x4f11 to get flat panel information, return status.  */
-grub_vbe_status_t
-grub_vbe_bios_get_flat_panel_info (struct grub_vbe_flat_panel_info *flat_panel_info);
-/* Call VESA BIOS 0x4f15 to get DDC availability, return status.  */
-grub_vbe_status_t
-grub_vbe_bios_get_ddc_capabilities (grub_uint8_t *level);
-/* Call VESA BIOS 0x4f15 to read EDID information, return status.  */
-grub_vbe_status_t
-grub_vbe_bios_read_edid (struct grub_video_edid_info *edid_data);
 
 grub_vbe_status_t grub_vbe_bios_getset_dac_palette_width (int set, int *width);