vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace grub_target_addr with more appropriate types. 

* grub-core/commands/efi/fixvideo.c (scan_card): Replace
	grub_target_addr with grub_addr.
	* grub-core/commands/iorw.c (grub_cmd_read): Replace
	grub_target_addr with grub_port.
	(grub_cmd_write): Likewise.
	* grub-core/commands/memrw.c (grub_cmd_read): Replace
	grub_target_addr with grub_addr.
	(grub_cmd_write): Likewise.
	* grub-core/video/efi_uga.c (find_line_len): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-27 14:13:24 +01:00
parent 5a0dc6fb2a
commit 584b2f8a22
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
Replace grub_target_addr with more appropriate types.
* grub-core/commands/efi/fixvideo.c (scan_card): Replace
grub_target_addr with grub_addr.
* grub-core/commands/iorw.c (grub_cmd_read): Replace
grub_target_addr with grub_port.
(grub_cmd_write): Likewise.
* grub-core/commands/memrw.c (grub_cmd_read): Replace
grub_target_addr with grub_addr.
(grub_cmd_write): Likewise.
* grub-core/video/efi_uga.c (find_line_len): Likewise.
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/efi/api.h (grub_efi_runtime_services): Add missing

2
grub-core/commands/efi/fixvideo.c
View File

@ -54,7 +54,7 @@ scan_card (grub_pci_device_t dev, grub_pci_id_t pciid)
{
if (p->pci_id == pciid)
{
grub_target_addr_t base;
grub_addr_t base;
grub_dprintf ("fixvideo", "Found graphic card: %s\n", p->name);
addr += 8 + p->mmio_bar * 4;

4
grub-core/commands/iorw.c
View File

@ -40,7 +40,7 @@ static const struct grub_arg_option options[] =
static grub_err_t
grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
{
grub_target_addr_t addr;
grub_port_t addr;
grub_uint32_t value = 0;
if (argc != 1)
@ -77,7 +77,7 @@ grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
static grub_err_t
grub_cmd_write (grub_command_t cmd, int argc, char **argv)
{
grub_target_addr_t addr;
grub_port_t addr;
grub_uint32_t value;
grub_uint32_t mask = 0xffffffff;

4
grub-core/commands/memrw.c
View File

@ -39,7 +39,7 @@ static const struct grub_arg_option options[] =
static grub_err_t
grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
{
grub_target_addr_t addr;
grub_addr_t addr;
grub_uint32_t value = 0;
char buf[sizeof ("XXXXXXXX")];
@ -76,7 +76,7 @@ grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
static grub_err_t
grub_cmd_write (grub_command_t cmd, int argc, char **argv)
{
grub_target_addr_t addr;
grub_addr_t addr;
grub_uint32_t value;
grub_uint32_t mask = 0xffffffff;

6
grub-core/video/efi_uga.c
View File

@ -54,7 +54,7 @@ static struct
static int
find_line_len (grub_uint32_t *fb_base, grub_uint32_t *line_len)
{
grub_uint32_t *base = (grub_uint32_t *) (grub_target_addr_t) *fb_base;
grub_uint32_t *base = (grub_uint32_t *) (grub_addr_t) *fb_base;
int i;
for (i = 0; i < FBTEST_COUNT; i++, base += FBTEST_STEP)
@ -67,7 +67,7 @@ find_line_len (grub_uint32_t *fb_base, grub_uint32_t *line_len)
{
if ((base[j] & RGB_MASK) == RGB_MAGIC)
{
*fb_base = (grub_uint32_t) (grub_target_addr_t) base;
*fb_base = (grub_uint32_t) (grub_addr_t) base;
*line_len = j << 2;
return 1;
@ -223,7 +223,7 @@ grub_video_uga_setup (unsigned int width, unsigned int height,
framebuffer.mode_info.width = w;
framebuffer.mode_info.height = h;
framebuffer.mode_info.pitch = uga_pitch;
framebuffer.ptr = (grub_uint8_t *) (grub_target_addr_t) uga_fb;
framebuffer.ptr = (grub_uint8_t *) (grub_addr_t) uga_fb;
found = 1;
}