Remove grub_{modname}_init and grub_{modname}_fini. They should never
be used directly if it's really a module and GRUB_MOD_INIT shouldn't be used on non-modules. * grub-core/commands/boot.c (GRUB_MOD_INIT) [LOONGSON || QEMU_MIPS]: Rename to grub_boot_init. (GRUB_MOD_FINI) [LOONGSON || QEMU_MIPS]: Rename to grub_boot_fini. * grub-core/commands/keylayouts.c (GRUB_MOD_INIT) [LOONGSON || QEMU_MIPS]: Rename to grub_keylayouts_init. (GRUB_MOD_FINI) [LOONGSON || QEMU_MIPS]: Rename to grub_keylayouts_fini. * grub-core/font/font_cmd.c (GRUB_MOD_INIT) [LOONGSON || QEMU_MIPS]: Rename to grub_font_init. (GRUB_MOD_FINI) [LOONGSON || QEMU_MIPS]: Rename to grub_font_fini. * grub-core/kern/mips/loongson/init.c: Replace explicit protos with includes. (grub_machine_init): Remove empty inits. * grub-core/kern/mips/qemu_mips/init.c: Replace explicit protos with includes. (grub_machine_init): Remove empty inits. * grub-core/term/arc/console.c: Remove explicit proto. * grub-core/term/at_keyboard.c (GRUB_MOD_INIT) [LOONGSON || QEMU_MIPS]: Rename to grub_at_keyboard_init. (GRUB_MOD_FINI) [LOONGSON || QEMU_MIPS]: Rename to grub_at_keyboard_fini. * grub-core/term/gfxterm.c (GRUB_MOD_INIT) [LOONGSON || QEMU_MIPS]: Rename to grub_gfxterm_init. (GRUB_MOD_FINI) [LOONGSON || QEMU_MIPS]: Rename to grub_gfxterm_fini. * grub-core/term/i386/pc/vga_text.c (GRUB_MOD_INIT) [LOONGSON || QEMU_MIPS]: Rename to grub_vgatext_init. (GRUB_MOD_FINI) [LOONGSON || QEMU_MIPS]: Rename to grub_vgatext_fini. * grub-core/term/ieee1275/console.c: Remove explicit proto. * grub-core/term/serial.c (GRUB_MOD_INIT) [LOONGSON || QEMU_MIPS]: Rename to grub_serial_init. (GRUB_MOD_FINI) [LOONGSON || QEMU_MIPS]: Rename to grub_serial_fini. * grub-core/term/terminfo.c (GRUB_MOD_INIT) [LOONGSON || QEMU_MIPS]: Rename to grub_terminfo_init. (GRUB_MOD_FINI) [LOONGSON || QEMU_MIPS]: Rename to grub_terminfo_fini. * grub-core/video/bitmap.c (GRUB_MOD_INIT): Removed. (GRUB_MOD_FINI): Likewise. * grub-core/video/radeon_fuloong2e.c (GRUB_MOD_INIT) [LOONGSON]: Rename to grub_video_radeon_fuloong2e_init. (GRUB_MOD_FINI) [LOONGSON]: Rename to grub_video_radeon_fuloong2e_fini. * grub-core/video/sis315pro.c (GRUB_MOD_INIT) [LOONGSON]: Rename to grub_video_sis315pro_init. (GRUB_MOD_FINI) [LOONGSON]: Rename to grub_video_sis315pro_fini. * grub-core/video/sm712.c (GRUB_MOD_INIT) [LOONGSON]: Rename to grub_video_sm712_init. (GRUB_MOD_FINI) [LOONGSON]: Rename to grub_video_sm712_fini. * include/grub/at_keyboard.h (grub_at_keyboard_init): New proto. (grub_at_keyboard_fini): Likewise. * include/grub/dl.h (GRUB_MOD_INIT) [!GRUB_UTIL && !EMU]: Don't declare grub_{modname}_init. (GRUB_MOD_INIT) [!GRUB_UTIL && !EMU]: Don't declare grub_{modname}_fini. * include/grub/keyboard_layouts.h (grub_keylayouts_init) [!EMU]: New proto. (grub_keylayouts_fini) [!EMU]: Likewise. * include/grub/serial.h (grub_serial_init) [!EMU]: New proto. (grub_serial_fini) [!EMU]: Likewise. * include/grub/terminfo.h (grub_terminfo_init) [!EMU]: New proto. (grub_terminfo_fini) [!EMU]: Likewise. * include/grub/video.h (grub_font_init) [!EMU]: New proto. (grub_font_fini) [!EMU]: Likewise. (grub_gfxterm_init) [!EMU]: Likewise. (grub_gfxterm_fini) [!EMU]: Likewise. (grub_video_sm712_init) [!EMU]: Likewise. (grub_video_sm712_fini) [!EMU]: Likewise. (grub_video_sis315pro_init) [!EMU]: Likewise. (grub_video_sis315pro_fini) [!EMU]: Likewise. (grub_video_radeon_fuloong2e_init) [!EMU]: Likewise. (grub_video_radeon_fuloong2e_fini) [!EMU]: Likewise.
This commit is contained in:
parent
d5534665ff
commit
036985b8ce
25 changed files with 244 additions and 52 deletions
|
@ -35,4 +35,7 @@
|
|||
#define KEYBOARD_ISREADY(x) ((x) & 0x01)
|
||||
#define KEYBOARD_SCANCODE(x) ((x) & 0x7f)
|
||||
|
||||
extern void grub_at_keyboard_init (void);
|
||||
extern void grub_at_keyboard_fini (void);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -34,6 +34,24 @@
|
|||
*/
|
||||
#ifndef ASM_FILE
|
||||
|
||||
#if !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
|
||||
|
||||
#ifndef GRUB_MOD_INIT
|
||||
#define GRUB_MOD_INIT(name) \
|
||||
static void grub_mod_init (grub_dl_t mod __attribute__ ((unused))) __attribute__ ((used)); \
|
||||
static void \
|
||||
grub_mod_init (grub_dl_t mod __attribute__ ((unused)))
|
||||
#endif
|
||||
|
||||
#ifndef GRUB_MOD_FINI
|
||||
#define GRUB_MOD_FINI(name) \
|
||||
static void grub_mod_fini (void) __attribute__ ((used)); \
|
||||
static void \
|
||||
grub_mod_fini (void)
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
#ifndef GRUB_MOD_INIT
|
||||
#define GRUB_MOD_INIT(name) \
|
||||
static void grub_mod_init (grub_dl_t mod __attribute__ ((unused))) __attribute__ ((used)); \
|
||||
|
@ -56,6 +74,8 @@ grub_mod_fini (void)
|
|||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef ASM_FILE
|
||||
#ifdef APPLE_CC
|
||||
#define GRUB_MOD_SECTION(x) "_" #x ", _" #x ""
|
||||
|
|
|
@ -139,4 +139,9 @@ typedef enum grub_keyboard_key
|
|||
|
||||
unsigned EXPORT_FUNC(grub_term_map_key) (grub_keyboard_key_t code, int status);
|
||||
|
||||
#ifndef GRUB_MACHINE_EMU
|
||||
extern void grub_keylayouts_init (void);
|
||||
extern void grub_keylayouts_fini (void);
|
||||
#endif
|
||||
|
||||
#endif /* GRUB_KEYBOARD_LAYOUTS */
|
||||
|
|
|
@ -65,4 +65,9 @@ struct grub_preboot *EXPORT_FUNC(grub_loader_register_preboot_hook) (grub_err_t
|
|||
/* Unregister given preboot hook. */
|
||||
void EXPORT_FUNC (grub_loader_unregister_preboot_hook) (struct grub_preboot *hnd);
|
||||
|
||||
#ifndef GRUB_MACHINE_EMU
|
||||
void grub_boot_init (void);
|
||||
void grub_boot_fini (void);
|
||||
#endif
|
||||
|
||||
#endif /* ! GRUB_LOADER_HEADER */
|
||||
|
|
|
@ -173,4 +173,9 @@ struct grub_serial_port *grub_serial_find (const char *name);
|
|||
extern struct grub_serial_driver grub_ns8250_driver;
|
||||
void EXPORT_FUNC(grub_serial_unregister_driver) (struct grub_serial_driver *driver);
|
||||
|
||||
#ifndef GRUB_MACHINE_EMU
|
||||
extern void grub_serial_init (void);
|
||||
extern void grub_serial_fini (void);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -78,4 +78,9 @@ grub_err_t EXPORT_FUNC (grub_terminfo_output_register) (struct grub_term_output
|
|||
const char *type);
|
||||
grub_err_t EXPORT_FUNC (grub_terminfo_output_unregister) (struct grub_term_output *term);
|
||||
|
||||
#ifndef GRUB_MACHINE_EMU
|
||||
void grub_terminfo_init (void);
|
||||
void grub_terminfo_fini (void);
|
||||
#endif
|
||||
|
||||
#endif /* ! GRUB_TERMINFO_HEADER */
|
||||
|
|
|
@ -529,4 +529,17 @@ int EXPORT_FUNC (grub_video_get_named_color) (const char *name,
|
|||
grub_err_t EXPORT_FUNC (grub_video_parse_color) (const char *s,
|
||||
grub_video_rgba_color_t *color);
|
||||
|
||||
#ifndef GRUB_MACHINE_EMU
|
||||
extern void grub_font_init (void);
|
||||
extern void grub_font_fini (void);
|
||||
extern void grub_gfxterm_init (void);
|
||||
extern void grub_gfxterm_fini (void);
|
||||
extern void grub_video_sm712_init (void);
|
||||
extern void grub_video_sm712_fini (void);
|
||||
extern void grub_video_sis315pro_init (void);
|
||||
extern void grub_video_radeon_fuloong2e_init (void);
|
||||
extern void grub_video_sis315pro_fini (void);
|
||||
extern void grub_video_radeon_fuloong2e_fini (void);
|
||||
#endif
|
||||
|
||||
#endif /* ! GRUB_VIDEO_HEADER */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue