diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-10-25 16:53:01 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-05 12:51:47 +0000 |
| commit | fc8f32cbea0692c0d130bb596107373c1dd30222 (patch) | |
| tree | 6786b43ea79ed7824b189fca557ffb73f7698e09 | |
| parent | 3e3335f63161ce93b1b6c556a68d20ffc3527964 (diff) | |
| download | syslinux-fc8f32cbea0692c0d130bb596107373c1dd30222.tar.gz syslinux-fc8f32cbea0692c0d130bb596107373c1dd30222.tar.xz syslinux-fc8f32cbea0692c0d130bb596107373c1dd30222.zip | |
vesa: Change the prototype of __vesacon_init()
commit 97402a0a1639 ("efi, vesa: Fix vesa initialization and video
mode resolution") should have updated the BIOS version of the vesa
code too.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | com32/lib/sys/vesa/initvesa.c | 8 | ||||
| -rw-r--r-- | com32/lib/sys/vesa/video.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/com32/lib/sys/vesa/initvesa.c b/com32/lib/sys/vesa/initvesa.c index 9a1ae384..d227629d 100644 --- a/com32/lib/sys/vesa/initvesa.c +++ b/com32/lib/sys/vesa/initvesa.c @@ -329,7 +329,7 @@ static int init_text_display(void) return 0; } -int __vesacon_init(int x, int y) +int __vesacon_init(int *x, int *y) { int rv; @@ -337,12 +337,12 @@ int __vesacon_init(int x, int y) if (x86_init_fpu()) return 10; - rv = vesacon_set_mode(x, y); + rv = vesacon_set_mode(*x, *y); if (rv) { /* Try to see if we can just patch the BIOS... */ - if (__vesacon_i915resolution(x, y)) + if (__vesacon_i915resolution(*x, *y)) return rv; - if (vesacon_set_mode(x, y)) + if (vesacon_set_mode(*x, *y)) return rv; } diff --git a/com32/lib/sys/vesa/video.h b/com32/lib/sys/vesa/video.h index d14494b1..de068457 100644 --- a/com32/lib/sys/vesa/video.h +++ b/com32/lib/sys/vesa/video.h @@ -81,7 +81,7 @@ extern const uint8_t __vesacon_linear_to_srgb[4080]; int __vesacon_init_background(void); int vesacon_load_background(const char *); -int __vesacon_init(int, int); +int __vesacon_init(int *, int *); void __vesacon_init_cursor(int); void __vesacon_erase(int, int, int, int, attr_t); void __vesacon_scroll_up(int, attr_t); |