aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--com32/include/syslinux/firmware.h2
-rw-r--r--com32/lib/sys/vesa/screencpy.c4
-rw-r--r--core/bios.c7
-rw-r--r--efi/vesa.c2
4 files changed, 8 insertions, 7 deletions
diff --git a/com32/include/syslinux/firmware.h b/com32/include/syslinux/firmware.h
index 268e0c80..13ba1591 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 char *, size_t, struct win_info *);
+ void (*screencpy)(size_t, const uint32_t *, size_t, struct win_info *);
int (*font_query)(uint8_t **);
};
diff --git a/com32/lib/sys/vesa/screencpy.c b/com32/lib/sys/vesa/screencpy.c
index 5c6d9151..d78109bc 100644
--- a/com32/lib/sys/vesa/screencpy.c
+++ b/com32/lib/sys/vesa/screencpy.c
@@ -70,8 +70,8 @@ void __vesacon_copy_to_screen(size_t dst, const uint32_t * src, size_t npixels)
{
size_t bytes = npixels * __vesacon_bytes_per_pixel;
char rowbuf[bytes + 4] __aligned(4);
- const char *s;
+ const uint32_t *s;
- s = (const char *)__vesacon_format_pixels(rowbuf, src, npixels);
+ s = (const uint32_t *)__vesacon_format_pixels(rowbuf, src, npixels);
firmware->vesa->screencpy(dst, s, bytes, &wi);
}
diff --git a/core/bios.c b/core/bios.c
index d0ceffc7..1becd280 100644
--- a/core/bios.c
+++ b/core/bios.c
@@ -414,13 +414,14 @@ 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 char * src,
+static void bios_vesacon_screencpy(size_t dst, const uint32_t * src,
size_t bytes, struct win_info *wi)
{
size_t win_pos, win_off;
size_t win_size = wi->win_size;
size_t omask = win_size - 1;
char *win_base = wi->win_base;
+ const char *s = (const char *)src;
size_t l;
while (bytes) {
@@ -431,10 +432,10 @@ static void bios_vesacon_screencpy(size_t dst, const char * src,
set_window_pos(wi, win_pos);
l = min(bytes, win_size - win_off);
- memcpy(win_base + win_off, src, l);
+ memcpy(win_base + win_off, s, l);
bytes -= l;
- src += l;
+ s += l;
dst += l;
}
}
diff --git a/efi/vesa.c b/efi/vesa.c
index 87308fd5..e3e9e0f7 100644
--- a/efi/vesa.c
+++ b/efi/vesa.c
@@ -274,7 +274,7 @@ exit:
return err;
}
-static void efi_vesacon_screencpy(size_t dst, const char *s,
+static void efi_vesacon_screencpy(size_t dst, const uint32_t *s,
size_t bytes, struct win_info *wi)
{
size_t win_off;