2009-05-13 Pavel Roskin <proski@gnu.org>
* loader/i386/linux.c (allocate_pages): When assigning real_mode_mem, cast through grub_size_t to fix a warning. The code already makes sure that the value would fit a pointer. (grub_linux_setup_video): Cast render_target->data to grub_size_t to fix a warning.
This commit is contained in:
parent
4246b8a9e8
commit
8090fc012a
2 changed files with 11 additions and 2 deletions
|
@ -1,3 +1,11 @@
|
|||
2009-05-13 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* loader/i386/linux.c (allocate_pages): When assigning
|
||||
real_mode_mem, cast through grub_size_t to fix a warning. The
|
||||
code already makes sure that the value would fit a pointer.
|
||||
(grub_linux_setup_video): Cast render_target->data to
|
||||
grub_size_t to fix a warning.
|
||||
|
||||
2009-05-13 Javier Martín <lordhabbit@gmail.com>
|
||||
|
||||
* commands/i386/pc/drivemap.c: New file - implement drivemap
|
||||
|
|
|
@ -347,7 +347,8 @@ allocate_pages (grub_size_t prot_size)
|
|||
if (real_size + mmap_size > size)
|
||||
return 0;
|
||||
|
||||
real_mode_mem = (void *) ((addr + size) - (real_size + mmap_size));
|
||||
real_mode_mem =
|
||||
(void *) (grub_size_t) ((addr + size) - (real_size + mmap_size));
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -416,7 +417,7 @@ grub_linux_setup_video (struct linux_kernel_params *params)
|
|||
params->lfb_depth = mode_info.bpp;
|
||||
params->lfb_line_len = mode_info.pitch;
|
||||
|
||||
params->lfb_base = (void *) render_target->data;
|
||||
params->lfb_base = (grub_size_t) render_target->data;
|
||||
params->lfb_size = (params->lfb_line_len * params->lfb_height + 65535) >> 16;
|
||||
|
||||
params->red_mask_size = mode_info.red_mask_size;
|
||||
|
|
Loading…
Reference in a new issue