[syslinux:firmware] firmware: s/set_mode/text_mode/
syslinux-bot for Matt Fleming
matt.fleming at intel.com
Thu Jul 4 06:27:05 PDT 2013
Commit-ID: 652b197f9005fe9ef949dfca48dd28f6109bcf09
Gitweb: http://www.syslinux.org/commit/652b197f9005fe9ef949dfca48dd28f6109bcf09
Author: Matt Fleming <matt.fleming at intel.com>
AuthorDate: Thu, 4 Jul 2013 09:36:37 +0100
Committer: Matt Fleming <matt.fleming at intel.com>
CommitDate: Thu, 4 Jul 2013 12:29:02 +0100
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 at intel.com>
---
com32/include/syslinux/firmware.h | 2 +-
com32/lib/sys/ansicon_write.c | 2 +-
core/bios.c | 4 ++--
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 032d8ee..4a43c86 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 f0d0633..6e70c58 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 71a34f8..53223e8 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,
};
diff --git a/efi/main.c b/efi/main.c
index f21b66e..55d1ced 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -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,
};
More information about the Syslinux-commits
mailing list