aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-01-07 14:42:16 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-01-07 20:29:16 +0000
commit15a67011987c341814533ac4d8e23c9a72dc7605 (patch)
treee0fda9dab4fd8ce8043a4d6b3f6cce23e0e7f518
parent714e64ac377a158960abe85035b275c71325530e (diff)
downloadsyslinux-15a67011987c341814533ac4d8e23c9a72dc7605.tar.gz
syslinux-15a67011987c341814533ac4d8e23c9a72dc7605.tar.xz
syslinux-15a67011987c341814533ac4d8e23c9a72dc7605.zip
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@intel.com>
-rw-r--r--com32/include/syslinux/firmware.h2
-rw-r--r--core/bios.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/com32/include/syslinux/firmware.h b/com32/include/syslinux/firmware.h
index 13ba1591..268e0c80 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 7b41f398..d0ceffc7 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;