[syslinux:firmware] firmware: correct the get_cursor() argument types
syslinux-bot for Matt Fleming
matt.fleming at intel.com
Thu Jun 20 06:51:13 PDT 2013
Commit-ID: 17bb7fc8d7f7a3c5daf21f61aaa1663805cafa92
Gitweb: http://www.syslinux.org/commit/17bb7fc8d7f7a3c5daf21f61aaa1663805cafa92
Author: Matt Fleming <matt.fleming at intel.com>
AuthorDate: Wed, 19 Jun 2013 16:04:47 +0100
Committer: Matt Fleming <matt.fleming at intel.com>
CommitDate: Wed, 19 Jun 2013 16:04:47 +0100
firmware: correct the get_cursor() argument types
We only ever pass uint8_t * to get_cursor(), so update the prototypes
and fix the following compiler warnings,
In function ‘__ansicon_open’:
com32/lib/sys/ansicon_write.c:93:6: warning: passing argument 1 of ‘firmware->o_ops->get_cursor’ from incompatible pointer type [enabled by default]
com32/lib/sys/ansicon_write.c:93:6: note: expected ‘int *’ but argument is of type ‘uint8_t *’
com32/lib/sys/ansicon_write.c:93:6: warning: passing argument 2 of ‘firmware->o_ops->get_cursor’ from incompatible pointer type [enabled by default]
com32/lib/sys/ansicon_write.c:93:6: note: expected ‘int *’ but argument is of type ‘uint8_t *’
Signed-off-by: Matt Fleming <matt.fleming at intel.com>
---
com32/include/syslinux/firmware.h | 2 +-
core/bios.c | 2 +-
efi/main.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/com32/include/syslinux/firmware.h b/com32/include/syslinux/firmware.h
index 13ba159..636faea 100644
--- a/com32/include/syslinux/firmware.h
+++ b/com32/include/syslinux/firmware.h
@@ -14,7 +14,7 @@ struct output_ops {
void (*beep) (void);
void (*get_mode)(int *, int *);
void (*set_mode)(uint16_t);
- void (*get_cursor)(int *, int *);
+ void (*get_cursor)(uint8_t *, uint8_t *);
};
struct input_ops {
diff --git a/core/bios.c b/core/bios.c
index 3972e00..c676820 100644
--- a/core/bios.c
+++ b/core/bios.c
@@ -34,7 +34,7 @@ static void bios_get_mode(int *cols, int *rows)
static uint16_t cursor_type; /* Saved cursor pattern */
-static void bios_get_cursor(int *x, int *y)
+static void bios_get_cursor(uint8_t *x, uint8_t *y)
{
com32sys_t ireg, oreg;
diff --git a/efi/main.c b/efi/main.c
index 16810ac..ae7ae05 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -254,7 +254,7 @@ static void efi_set_mode(uint16_t mode)
{
}
-static void efi_get_cursor(int *x, int *y)
+static void efi_get_cursor(uint8_t *x, uint8_t *y)
{
SIMPLE_TEXT_OUTPUT_INTERFACE *out = ST->ConOut;
*x = out->Mode->CursorColumn;
More information about the Syslinux-commits
mailing list