diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
| commit | c227f0995e1722a1abccc28cadf0664266bd8043 (patch) | |
| tree | 39e92c2f818e3e8144978740b914731613af0e40 /hw/vga_int.h | |
| parent | 99a0949b720a0936da2052cb9a46db04ffc6db29 (diff) | |
| download | qemu-c227f0995e1722a1abccc28cadf0664266bd8043.tar.gz | |
Revert "Get rid of _t suffix"
In the very least, a change like this requires discussion on the list.
The naming convention is goofy and it causes a massive merge problem. Something
like this _must_ be presented on the list first so people can provide input
and cope with it.
This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/vga_int.h')
| -rw-r--r-- | hw/vga_int.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/vga_int.h b/hw/vga_int.h index 8740f2a2fb..c162c07103 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -100,7 +100,7 @@ typedef void (* vga_update_retrace_info_fn)(struct VGACommonState *s); typedef struct VGACommonState { uint8_t *vram_ptr; - a_ram_addr vram_offset; + ram_addr_t vram_offset; unsigned int vram_size; uint32_t lfb_addr; uint32_t lfb_end; @@ -196,8 +196,8 @@ void vga_common_save(QEMUFile *f, void *opaque); int vga_common_load(QEMUFile *f, void *opaque, int version_id); uint32_t vga_ioport_read(void *opaque, uint32_t addr); void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val); -uint32_t vga_mem_readb(void *opaque, a_target_phys_addr addr); -void vga_mem_writeb(void *opaque, a_target_phys_addr addr, uint32_t val); +uint32_t vga_mem_readb(void *opaque, target_phys_addr_t addr); +void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val); void vga_invalidate_scanlines(VGACommonState *s, int y1, int y2); int ppm_save(const char *filename, struct DisplaySurface *ds); |