diff options
author | Matt Fleming <matt.fleming@intel.com> | 2013-07-04 09:36:37 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2013-07-04 12:29:02 +0100 |
commit | 652b197f9005fe9ef949dfca48dd28f6109bcf09 (patch) | |
tree | 2d3002a799086752f5b8d93102f843fdc1ce961b | |
parent | 0aad5be4e47048a91ce007fdb630e407cb67c381 (diff) | |
download | syslinux-652b197f9005fe9ef949dfca48dd28f6109bcf09.tar.gz syslinux-652b197f9005fe9ef949dfca48dd28f6109bcf09.tar.xz syslinux-652b197f9005fe9ef949dfca48dd28f6109bcf09.zip |
firmware: s/set_mode/text_mode/
We only ever use ->set_mode() to transition into text mode, so rename it
to something more suitable and drop the unused 'mode' argument.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r-- | com32/include/syslinux/firmware.h | 2 | ||||
-rw-r--r-- | com32/lib/sys/ansicon_write.c | 2 | ||||
-rw-r--r-- | core/bios.c | 4 | ||||
-rw-r--r-- | efi/main.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/com32/include/syslinux/firmware.h b/com32/include/syslinux/firmware.h index 032d8eec..4a43c86d 100644 --- a/com32/include/syslinux/firmware.h +++ b/com32/include/syslinux/firmware.h @@ -13,7 +13,7 @@ struct output_ops { void (*set_cursor) (int, int, bool); void (*beep) (void); void (*get_mode)(int *, int *); - void (*set_mode)(uint16_t); + void (*text_mode)(void); void (*get_cursor)(uint8_t *, uint8_t *); }; diff --git a/com32/lib/sys/ansicon_write.c b/com32/lib/sys/ansicon_write.c index f0d06338..6e70c58c 100644 --- a/com32/lib/sys/ansicon_write.c +++ b/com32/lib/sys/ansicon_write.c @@ -83,7 +83,7 @@ int __ansicon_open(struct file_info *fp) ti.cols = 80; } else { /* Force text mode */ - firmware->o_ops->set_mode(TEXT_MODE); + firmware->o_ops->text_mode(); /* Initial state */ firmware->o_ops->get_mode(&ti.cols, &ti.rows); diff --git a/core/bios.c b/core/bios.c index 71a34f8a..53223e8d 100644 --- a/core/bios.c +++ b/core/bios.c @@ -21,7 +21,7 @@ extern struct ansi_ops bios_ansi_ops; #define BIOS_COLS (*(uint16_t *)0x44A) #define BIOS_PAGE (*(uint8_t *)0x462) -static void bios_set_mode(uint16_t mode) +static void bios_text_mode(void) { syslinux_force_text_mode(); } @@ -129,7 +129,7 @@ struct output_ops bios_output_ops = { .scroll_up = bios_scroll_up, .beep = bios_beep, .get_mode = bios_get_mode, - .set_mode = bios_set_mode, + .text_mode = bios_text_mode, .get_cursor = bios_get_cursor, }; @@ -250,7 +250,7 @@ static void efi_erase(int x0, int y0, int x1, int y1, uint8_t attribute) } } -static void efi_set_mode(uint16_t mode) +static void efi_text_mode(void) { } @@ -268,7 +268,7 @@ struct output_ops efi_ops = { .set_cursor = efi_set_cursor, .scroll_up = efi_scroll_up, .get_mode = efi_get_mode, - .set_mode = efi_set_mode, + .text_mode = efi_text_mode, .get_cursor = efi_get_cursor, }; |