Revision a8170e5e hw/vga.c
b/hw/vga.c | ||
---|---|---|
172 | 172 |
static void vga_update_memory_access(VGACommonState *s) |
173 | 173 |
{ |
174 | 174 |
MemoryRegion *region, *old_region = s->chain4_alias; |
175 |
target_phys_addr_t base, offset, size;
|
|
175 |
hwaddr base, offset, size;
|
|
176 | 176 |
|
177 | 177 |
s->chain4_alias = NULL; |
178 | 178 |
|
... | ... | |
785 | 785 |
} |
786 | 786 |
|
787 | 787 |
/* called for accesses between 0xa0000 and 0xc0000 */ |
788 |
uint32_t vga_mem_readb(VGACommonState *s, target_phys_addr_t addr)
|
|
788 |
uint32_t vga_mem_readb(VGACommonState *s, hwaddr addr)
|
|
789 | 789 |
{ |
790 | 790 |
int memory_map_mode, plane; |
791 | 791 |
uint32_t ret; |
... | ... | |
842 | 842 |
} |
843 | 843 |
|
844 | 844 |
/* called for accesses between 0xa0000 and 0xc0000 */ |
845 |
void vga_mem_writeb(VGACommonState *s, target_phys_addr_t addr, uint32_t val)
|
|
845 |
void vga_mem_writeb(VGACommonState *s, hwaddr addr, uint32_t val)
|
|
846 | 846 |
{ |
847 | 847 |
int memory_map_mode, plane, write_mode, b, func_select, mask; |
848 | 848 |
uint32_t write_mask, bit_mask, set_mask; |
... | ... | |
2152 | 2152 |
dpy_update(s->ds, 0, 0, s->last_width, height); |
2153 | 2153 |
} |
2154 | 2154 |
|
2155 |
static uint64_t vga_mem_read(void *opaque, target_phys_addr_t addr,
|
|
2155 |
static uint64_t vga_mem_read(void *opaque, hwaddr addr,
|
|
2156 | 2156 |
unsigned size) |
2157 | 2157 |
{ |
2158 | 2158 |
VGACommonState *s = opaque; |
... | ... | |
2160 | 2160 |
return vga_mem_readb(s, addr); |
2161 | 2161 |
} |
2162 | 2162 |
|
2163 |
static void vga_mem_write(void *opaque, target_phys_addr_t addr,
|
|
2163 |
static void vga_mem_write(void *opaque, hwaddr addr,
|
|
2164 | 2164 |
uint64_t data, unsigned size) |
2165 | 2165 |
{ |
2166 | 2166 |
VGACommonState *s = opaque; |
Also available in: Unified diff