* grub-core/bus/usb/usb.c (attach_hooks): Make static.
* grub-core/bus/usb/usbhub.c (hubs): Likewise. * grub-core/commands/hashsum.c (aliases): Likewise. * grub-core/commands/setpci.c (pci_registers): Likewise. * grub-core/disk/usbms.c (attach_hook): Likewise. * grub-core/fs/zfs/zfs.c (decomp_table): Likewise. (zio_checksum_table): Likewise. * grub-core/gettext/gettext.c (grub_gettext_msg_list): Likewise. * grub-core/gfxmenu/gfxmenu.c (cached_view): Likewise. * grub-core/lib/legacy_parse.c (legacy_commands): Likewise. * grub-core/lib/relocator.c (leftovers): Likewise. (extra_blocks): Likewise. * grub-core/loader/i386/bsd.c (relocator): Likewise. * grub-core/loader/i386/multiboot_mbi.c (modules): Likewise. (modules_last): Likewise. * grub-core/loader/i386/xnu.c (table_aliases): Likewise. (devices): Likewise. * grub-core/loader/multiboot_mbi2.c (modules): Likewise. (modules_last): Likewise. * grub-core/normal/auth.c (users): Likewise. * grub-core/normal/context.c (initial_menu): Likewise. (current_menu): Likewise. * grub-core/normal/crypto.c (crypto_specs): Likewise. * grub-core/term/serial.c (grub_serial_ports): Likewise. (grub_serial_terminfo_input_template): Likewise. (grub_serial_terminfo_output_template): Likewise. (grub_serial_terminfo_input): Likewise. (grub_serial_terminfo_output): Likewise. (registered): Likewise. * grub-core/term/usb_keyboard.c (attach_hook): Likewise.
This commit is contained in:
parent
40fc46599d
commit
7d4e39d65a
20 changed files with 61 additions and 28 deletions
33
ChangeLog
33
ChangeLog
|
@ -1,3 +1,36 @@
|
||||||
|
2011-03-23 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
|
* grub-core/bus/usb/usb.c (attach_hooks): Make static.
|
||||||
|
* grub-core/bus/usb/usbhub.c (hubs): Likewise.
|
||||||
|
* grub-core/commands/hashsum.c (aliases): Likewise.
|
||||||
|
* grub-core/commands/setpci.c (pci_registers): Likewise.
|
||||||
|
* grub-core/disk/usbms.c (attach_hook): Likewise.
|
||||||
|
* grub-core/fs/zfs/zfs.c (decomp_table): Likewise.
|
||||||
|
(zio_checksum_table): Likewise.
|
||||||
|
* grub-core/gettext/gettext.c (grub_gettext_msg_list): Likewise.
|
||||||
|
* grub-core/gfxmenu/gfxmenu.c (cached_view): Likewise.
|
||||||
|
* grub-core/lib/legacy_parse.c (legacy_commands): Likewise.
|
||||||
|
* grub-core/lib/relocator.c (leftovers): Likewise.
|
||||||
|
(extra_blocks): Likewise.
|
||||||
|
* grub-core/loader/i386/bsd.c (relocator): Likewise.
|
||||||
|
* grub-core/loader/i386/multiboot_mbi.c (modules): Likewise.
|
||||||
|
(modules_last): Likewise.
|
||||||
|
* grub-core/loader/i386/xnu.c (table_aliases): Likewise.
|
||||||
|
(devices): Likewise.
|
||||||
|
* grub-core/loader/multiboot_mbi2.c (modules): Likewise.
|
||||||
|
(modules_last): Likewise.
|
||||||
|
* grub-core/normal/auth.c (users): Likewise.
|
||||||
|
* grub-core/normal/context.c (initial_menu): Likewise.
|
||||||
|
(current_menu): Likewise.
|
||||||
|
* grub-core/normal/crypto.c (crypto_specs): Likewise.
|
||||||
|
* grub-core/term/serial.c (grub_serial_ports): Likewise.
|
||||||
|
(grub_serial_terminfo_input_template): Likewise.
|
||||||
|
(grub_serial_terminfo_output_template): Likewise.
|
||||||
|
(grub_serial_terminfo_input): Likewise.
|
||||||
|
(grub_serial_terminfo_output): Likewise.
|
||||||
|
(registered): Likewise.
|
||||||
|
* grub-core/term/usb_keyboard.c (attach_hook): Likewise.
|
||||||
|
|
||||||
2011-03-23 Vladimir Serbinenko <phcoder@gmail.com>
|
2011-03-23 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
* grub-core/video/bochs.c (grub_video_bochs_setup): Use
|
* grub-core/video/bochs.c (grub_video_bochs_setup): Use
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <grub/term.h>
|
#include <grub/term.h>
|
||||||
|
|
||||||
static grub_usb_controller_dev_t grub_usb_list;
|
static grub_usb_controller_dev_t grub_usb_list;
|
||||||
struct grub_usb_attach_desc *attach_hooks;
|
static struct grub_usb_attach_desc *attach_hooks;
|
||||||
|
|
||||||
void
|
void
|
||||||
grub_usb_controller_dev_register (grub_usb_controller_dev_t usb)
|
grub_usb_controller_dev_register (grub_usb_controller_dev_t usb)
|
||||||
|
|
|
@ -39,7 +39,7 @@ struct grub_usb_hub
|
||||||
grub_usb_device_t dev;
|
grub_usb_device_t dev;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct grub_usb_hub *hubs;
|
static struct grub_usb_hub *hubs;
|
||||||
|
|
||||||
/* Add a device that currently has device number 0 and resides on
|
/* Add a device that currently has device number 0 and resides on
|
||||||
CONTROLLER, the Hub reported that the device speed is SPEED. */
|
CONTROLLER, the Hub reported that the device speed is SPEED. */
|
||||||
|
|
|
@ -36,7 +36,7 @@ static const struct grub_arg_option options[] = {
|
||||||
{0, 0, 0, 0, 0, 0}
|
{0, 0, 0, 0, 0, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct { const char *name; const char *hashname; } aliases[] =
|
static struct { const char *name; const char *hashname; } aliases[] =
|
||||||
{
|
{
|
||||||
{"sha256sum", "sha256"},
|
{"sha256sum", "sha256"},
|
||||||
{"sha512sum", "sha512"},
|
{"sha512sum", "sha512"},
|
||||||
|
|
|
@ -32,7 +32,7 @@ struct pci_register
|
||||||
unsigned size;
|
unsigned size;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct pci_register pci_registers[] =
|
static struct pci_register pci_registers[] =
|
||||||
{
|
{
|
||||||
{"VENDOR_ID", GRUB_PCI_REG_VENDOR , 2},
|
{"VENDOR_ID", GRUB_PCI_REG_VENDOR , 2},
|
||||||
{"DEVICE_ID", GRUB_PCI_REG_DEVICE , 2},
|
{"DEVICE_ID", GRUB_PCI_REG_DEVICE , 2},
|
||||||
|
|
|
@ -408,7 +408,7 @@ static struct grub_scsi_dev grub_usbms_dev =
|
||||||
.write = grub_usbms_write
|
.write = grub_usbms_write
|
||||||
};
|
};
|
||||||
|
|
||||||
struct grub_usb_attach_desc attach_hook =
|
static struct grub_usb_attach_desc attach_hook =
|
||||||
{
|
{
|
||||||
.class = GRUB_USB_CLASS_MASS_STORAGE,
|
.class = GRUB_USB_CLASS_MASS_STORAGE,
|
||||||
.hook = grub_usbms_attach
|
.hook = grub_usbms_attach
|
||||||
|
|
|
@ -161,7 +161,7 @@ struct grub_zfs_data
|
||||||
grub_disk_addr_t vdev_phys_sector;
|
grub_disk_addr_t vdev_phys_sector;
|
||||||
};
|
};
|
||||||
|
|
||||||
decomp_entry_t decomp_table[ZIO_COMPRESS_FUNCTIONS] = {
|
static decomp_entry_t decomp_table[ZIO_COMPRESS_FUNCTIONS] = {
|
||||||
{"inherit", NULL}, /* ZIO_COMPRESS_INHERIT */
|
{"inherit", NULL}, /* ZIO_COMPRESS_INHERIT */
|
||||||
{"on", lzjb_decompress}, /* ZIO_COMPRESS_ON */
|
{"on", lzjb_decompress}, /* ZIO_COMPRESS_ON */
|
||||||
{"off", NULL}, /* ZIO_COMPRESS_OFF */
|
{"off", NULL}, /* ZIO_COMPRESS_OFF */
|
||||||
|
@ -201,7 +201,7 @@ zio_checksum_off (const void *buf __attribute__ ((unused)),
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Checksum Table and Values */
|
/* Checksum Table and Values */
|
||||||
zio_checksum_info_t zio_checksum_table[ZIO_CHECKSUM_FUNCTIONS] = {
|
static zio_checksum_info_t zio_checksum_table[ZIO_CHECKSUM_FUNCTIONS] = {
|
||||||
{NULL, 0, 0, "inherit"},
|
{NULL, 0, 0, "inherit"},
|
||||||
{NULL, 0, 0, "on"},
|
{NULL, 0, 0, "on"},
|
||||||
{zio_checksum_off, 0, 0, "off"},
|
{zio_checksum_off, 0, 0, "off"},
|
||||||
|
|
|
@ -49,7 +49,7 @@ struct grub_gettext_msg
|
||||||
const char *translated;
|
const char *translated;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct grub_gettext_msg *grub_gettext_msg_list = NULL;
|
static struct grub_gettext_msg *grub_gettext_msg_list = NULL;
|
||||||
|
|
||||||
#define GETTEXT_MAGIC_NUMBER 0
|
#define GETTEXT_MAGIC_NUMBER 0
|
||||||
#define GETTEXT_FILE_FORMAT 4
|
#define GETTEXT_FILE_FORMAT 4
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#include <grub/gfxmenu_view.h>
|
#include <grub/gfxmenu_view.h>
|
||||||
#include <grub/time.h>
|
#include <grub/time.h>
|
||||||
|
|
||||||
grub_gfxmenu_view_t cached_view;
|
static grub_gfxmenu_view_t cached_view;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
grub_gfxmenu_viewer_fini (void *data __attribute__ ((unused)))
|
grub_gfxmenu_viewer_fini (void *data __attribute__ ((unused)))
|
||||||
|
|
|
@ -58,7 +58,7 @@ struct legacy_command
|
||||||
const char *longdesc;
|
const char *longdesc;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct legacy_command legacy_commands[] =
|
static struct legacy_command legacy_commands[] =
|
||||||
{
|
{
|
||||||
{"blocklist", "blocklist '%s'\n", NULL, 0, 1, {TYPE_FILE}, 0, "FILE",
|
{"blocklist", "blocklist '%s'\n", NULL, 0, 1, {TYPE_FILE}, 0, "FILE",
|
||||||
"Print the blocklist notation of the file FILE."},
|
"Print the blocklist notation of the file FILE."},
|
||||||
|
|
|
@ -77,10 +77,10 @@ struct grub_relocator_fw_leftover
|
||||||
grub_uint8_t freebytes[GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT / 8];
|
grub_uint8_t freebytes[GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT / 8];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct grub_relocator_fw_leftover *leftovers;
|
static struct grub_relocator_fw_leftover *leftovers;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct grub_relocator_extra_block *extra_blocks;
|
static struct grub_relocator_extra_block *extra_blocks;
|
||||||
|
|
||||||
void *
|
void *
|
||||||
get_virtual_current_address (grub_relocator_chunk_t in)
|
get_virtual_current_address (grub_relocator_chunk_t in)
|
||||||
|
|
|
@ -65,7 +65,7 @@ static void *kern_chunk_src;
|
||||||
static grub_uint32_t bootflags;
|
static grub_uint32_t bootflags;
|
||||||
static int is_elf_kernel, is_64bit;
|
static int is_elf_kernel, is_64bit;
|
||||||
static grub_uint32_t openbsd_root;
|
static grub_uint32_t openbsd_root;
|
||||||
struct grub_relocator *relocator = NULL;
|
static struct grub_relocator *relocator = NULL;
|
||||||
static struct grub_openbsd_ramdisk_descriptor openbsd_ramdisk;
|
static struct grub_openbsd_ramdisk_descriptor openbsd_ramdisk;
|
||||||
|
|
||||||
struct bsd_tag
|
struct bsd_tag
|
||||||
|
|
|
@ -46,7 +46,7 @@ struct module
|
||||||
int cmdline_size;
|
int cmdline_size;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct module *modules, *modules_last;
|
static struct module *modules, *modules_last;
|
||||||
static grub_size_t cmdline_size;
|
static grub_size_t cmdline_size;
|
||||||
static grub_size_t total_modcmd;
|
static grub_size_t total_modcmd;
|
||||||
static unsigned modcnt;
|
static unsigned modcnt;
|
||||||
|
|
|
@ -49,7 +49,7 @@ struct tbl_alias
|
||||||
char *name;
|
char *name;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct tbl_alias table_aliases[] =
|
static struct tbl_alias table_aliases[] =
|
||||||
{
|
{
|
||||||
{GRUB_EFI_ACPI_20_TABLE_GUID, "ACPI_20"},
|
{GRUB_EFI_ACPI_20_TABLE_GUID, "ACPI_20"},
|
||||||
{GRUB_EFI_ACPI_TABLE_GUID, "ACPI"},
|
{GRUB_EFI_ACPI_TABLE_GUID, "ACPI"},
|
||||||
|
@ -219,7 +219,7 @@ struct property_descriptor
|
||||||
void *data;
|
void *data;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct grub_xnu_devprop_device_descriptor *devices = 0;
|
static struct grub_xnu_devprop_device_descriptor *devices = 0;
|
||||||
|
|
||||||
grub_err_t
|
grub_err_t
|
||||||
grub_xnu_devprop_remove_property (struct grub_xnu_devprop_device_descriptor *dev,
|
grub_xnu_devprop_remove_property (struct grub_xnu_devprop_device_descriptor *dev,
|
||||||
|
|
|
@ -54,7 +54,7 @@ struct module
|
||||||
int cmdline_size;
|
int cmdline_size;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct module *modules, *modules_last;
|
static struct module *modules, *modules_last;
|
||||||
static grub_size_t cmdline_size;
|
static grub_size_t cmdline_size;
|
||||||
static grub_size_t total_modcmd;
|
static grub_size_t total_modcmd;
|
||||||
static unsigned modcnt;
|
static unsigned modcnt;
|
||||||
|
|
|
@ -34,7 +34,7 @@ struct grub_auth_user
|
||||||
int authenticated;
|
int authenticated;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct grub_auth_user *users = NULL;
|
static struct grub_auth_user *users = NULL;
|
||||||
|
|
||||||
grub_err_t
|
grub_err_t
|
||||||
grub_auth_register_authentication (const char *user,
|
grub_auth_register_authentication (const char *user,
|
||||||
|
|
|
@ -31,8 +31,8 @@ struct menu_pointer
|
||||||
struct menu_pointer *prev;
|
struct menu_pointer *prev;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct menu_pointer initial_menu;
|
static struct menu_pointer initial_menu;
|
||||||
struct menu_pointer *current_menu = &initial_menu;
|
static struct menu_pointer *current_menu = &initial_menu;
|
||||||
|
|
||||||
void
|
void
|
||||||
grub_env_unset_menu (void)
|
grub_env_unset_menu (void)
|
||||||
|
|
|
@ -31,7 +31,7 @@ struct load_spec
|
||||||
char *modname;
|
char *modname;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct load_spec *crypto_specs = NULL;
|
static struct load_spec *crypto_specs = NULL;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
grub_crypto_autoload (const char *name)
|
grub_crypto_autoload (const char *name)
|
||||||
|
|
|
@ -41,7 +41,7 @@ static const struct grub_arg_option options[] =
|
||||||
{0, 0, 0, 0, 0, 0}
|
{0, 0, 0, 0, 0, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct grub_serial_port *grub_serial_ports;
|
static struct grub_serial_port *grub_serial_ports;
|
||||||
|
|
||||||
struct grub_serial_output_state
|
struct grub_serial_output_state
|
||||||
{
|
{
|
||||||
|
@ -69,7 +69,7 @@ serial_fetch (grub_term_input_t term)
|
||||||
return data->port->driver->fetch (data->port);
|
return data->port->driver->fetch (data->port);
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct grub_serial_input_state grub_serial_terminfo_input_template =
|
static const struct grub_serial_input_state grub_serial_terminfo_input_template =
|
||||||
{
|
{
|
||||||
.tinfo =
|
.tinfo =
|
||||||
{
|
{
|
||||||
|
@ -77,7 +77,7 @@ const struct grub_serial_input_state grub_serial_terminfo_input_template =
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct grub_serial_output_state grub_serial_terminfo_output_template =
|
static const struct grub_serial_output_state grub_serial_terminfo_output_template =
|
||||||
{
|
{
|
||||||
.tinfo =
|
.tinfo =
|
||||||
{
|
{
|
||||||
|
@ -87,11 +87,11 @@ const struct grub_serial_output_state grub_serial_terminfo_output_template =
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct grub_serial_input_state grub_serial_terminfo_input;
|
static struct grub_serial_input_state grub_serial_terminfo_input;
|
||||||
|
|
||||||
struct grub_serial_output_state grub_serial_terminfo_output;
|
static struct grub_serial_output_state grub_serial_terminfo_output;
|
||||||
|
|
||||||
int registered = 0;
|
static int registered = 0;
|
||||||
|
|
||||||
static struct grub_term_input grub_serial_term_input =
|
static struct grub_term_input grub_serial_term_input =
|
||||||
{
|
{
|
||||||
|
|
|
@ -435,7 +435,7 @@ grub_usb_keyboard_getkeystatus (struct grub_term_input *term)
|
||||||
return interpret_status (termdata->status) | termdata->mods;
|
return interpret_status (termdata->status) | termdata->mods;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct grub_usb_attach_desc attach_hook =
|
static struct grub_usb_attach_desc attach_hook =
|
||||||
{
|
{
|
||||||
.class = GRUB_USB_CLASS_HID,
|
.class = GRUB_USB_CLASS_HID,
|
||||||
.hook = grub_usb_keyboard_attach
|
.hook = grub_usb_keyboard_attach
|
||||||
|
|
Loading…
Reference in a new issue