+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
{
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;
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)
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;
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")];
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;
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)
{
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;
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;
}