Revision a8170e5e hw/vga-isa-mm.c

b/hw/vga-isa-mm.c
36 36
} ISAVGAMMState;
37 37

  
38 38
/* Memory mapped interface */
39
static uint32_t vga_mm_readb (void *opaque, target_phys_addr_t addr)
39
static uint32_t vga_mm_readb (void *opaque, hwaddr addr)
40 40
{
41 41
    ISAVGAMMState *s = opaque;
42 42

  
......
44 44
}
45 45

  
46 46
static void vga_mm_writeb (void *opaque,
47
                           target_phys_addr_t addr, uint32_t value)
47
                           hwaddr addr, uint32_t value)
48 48
{
49 49
    ISAVGAMMState *s = opaque;
50 50

  
51 51
    vga_ioport_write(&s->vga, addr >> s->it_shift, value & 0xff);
52 52
}
53 53

  
54
static uint32_t vga_mm_readw (void *opaque, target_phys_addr_t addr)
54
static uint32_t vga_mm_readw (void *opaque, hwaddr addr)
55 55
{
56 56
    ISAVGAMMState *s = opaque;
57 57

  
......
59 59
}
60 60

  
61 61
static void vga_mm_writew (void *opaque,
62
                           target_phys_addr_t addr, uint32_t value)
62
                           hwaddr addr, uint32_t value)
63 63
{
64 64
    ISAVGAMMState *s = opaque;
65 65

  
66 66
    vga_ioport_write(&s->vga, addr >> s->it_shift, value & 0xffff);
67 67
}
68 68

  
69
static uint32_t vga_mm_readl (void *opaque, target_phys_addr_t addr)
69
static uint32_t vga_mm_readl (void *opaque, hwaddr addr)
70 70
{
71 71
    ISAVGAMMState *s = opaque;
72 72

  
......
74 74
}
75 75

  
76 76
static void vga_mm_writel (void *opaque,
77
                           target_phys_addr_t addr, uint32_t value)
77
                           hwaddr addr, uint32_t value)
78 78
{
79 79
    ISAVGAMMState *s = opaque;
80 80

  
......
97 97
    .endianness = DEVICE_NATIVE_ENDIAN,
98 98
};
99 99

  
100
static void vga_mm_init(ISAVGAMMState *s, target_phys_addr_t vram_base,
101
                        target_phys_addr_t ctrl_base, int it_shift,
100
static void vga_mm_init(ISAVGAMMState *s, hwaddr vram_base,
101
                        hwaddr ctrl_base, int it_shift,
102 102
                        MemoryRegion *address_space)
103 103
{
104 104
    MemoryRegion *s_ioport_ctrl, *vga_io_memory;
......
123 123
    memory_region_set_coalescing(vga_io_memory);
124 124
}
125 125

  
126
int isa_vga_mm_init(target_phys_addr_t vram_base,
127
                    target_phys_addr_t ctrl_base, int it_shift,
126
int isa_vga_mm_init(hwaddr vram_base,
127
                    hwaddr ctrl_base, int it_shift,
128 128
                    MemoryRegion *address_space)
129 129
{
130 130
    ISAVGAMMState *s;

Also available in: Unified diff