[syslinux:firmware] vesa: Correct screencpy() prototype
syslinux-bot for Matt Fleming
matt.fleming at intel.com
Mon Jan 7 12:51:08 PST 2013
Commit-ID: 15a67011987c341814533ac4d8e23c9a72dc7605
Gitweb: http://www.syslinux.org/commit/15a67011987c341814533ac4d8e23c9a72dc7605
Author: Matt Fleming <matt.fleming at intel.com>
AuthorDate: Mon, 7 Jan 2013 14:42:16 +0000
Committer: Matt Fleming <matt.fleming at intel.com>
CommitDate: Mon, 7 Jan 2013 20:29:16 +0000
vesa: Correct screencpy() prototype
The 'src' argument should actually be const char * because the BIOS
code performs pointer arithmetic on it.
Signed-off-by: Matt Fleming <matt.fleming at intel.com>
---
com32/include/syslinux/firmware.h | 2 +-
core/bios.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/com32/include/syslinux/firmware.h b/com32/include/syslinux/firmware.h
index 13ba159..268e0c8 100644
--- a/com32/include/syslinux/firmware.h
+++ b/com32/include/syslinux/firmware.h
@@ -33,7 +33,7 @@ struct win_info;
struct vesa_ops {
int (*set_mode)(struct vesa_info *, int *, int *, enum vesa_pixel_format *);
- void (*screencpy)(size_t, const uint32_t *, size_t, struct win_info *);
+ void (*screencpy)(size_t, const char *, size_t, struct win_info *);
int (*font_query)(uint8_t **);
};
diff --git a/core/bios.c b/core/bios.c
index 7b41f39..d0ceffc 100644
--- a/core/bios.c
+++ b/core/bios.c
@@ -414,7 +414,7 @@ static void set_window_pos(struct win_info *wi, size_t win_pos)
__intcall(0x10, &ireg, NULL);
}
-static void bios_vesacon_screencpy(size_t dst, const uint32_t * src,
+static void bios_vesacon_screencpy(size_t dst, const char * src,
size_t bytes, struct win_info *wi)
{
size_t win_pos, win_off;
More information about the Syslinux-commits
mailing list