diff options
author | Matt Fleming <matt.fleming@intel.com> | 2013-06-19 16:04:47 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2013-06-19 16:04:47 +0100 |
commit | 17bb7fc8d7f7a3c5daf21f61aaa1663805cafa92 (patch) | |
tree | d230a5514137fa0b09678da60671dda4cc748389 | |
parent | 8de6b5aa8bf1e01c9cf183ed414c755d4f263f03 (diff) | |
download | syslinux-17bb7fc8d7f7a3c5daf21f61aaa1663805cafa92.tar.gz syslinux-17bb7fc8d7f7a3c5daf21f61aaa1663805cafa92.tar.xz syslinux-17bb7fc8d7f7a3c5daf21f61aaa1663805cafa92.zip |
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@intel.com>
-rw-r--r-- | com32/include/syslinux/firmware.h | 2 | ||||
-rw-r--r-- | core/bios.c | 2 | ||||
-rw-r--r-- | 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 13ba1591..636faeaa 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 3972e00c..c6768204 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; @@ -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; |