gwj / at91sam9263 · Commits

Commit 4efe27556dea874030f1cd53a6d70452ee064fba

Authored by aliguori
1 parent 0e1f5a0c

better type checking for vga (Glauber Costa) 

unsigned long is too bad of a type. Use ram_addr_t instead.

aligurori: fixed a compile warning in this patch

Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5790 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 4 changed files with 7 additions and 7 deletions
hw/cirrus_vga.c
  View file @4efe275
@@ -3231,7 +3231,7 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci) @@ -3231,7 +3231,7 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci)
3231 ***************************************/ 3231 ***************************************/
3232 3232
3233 void isa_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base, 3233 void isa_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base,
3234 - unsigned long vga_ram_offset, int vga_ram_size) 3234 + ram_addr_t vga_ram_offset, int vga_ram_size)
3235 { 3235 {
3236 CirrusVGAState *s; 3236 CirrusVGAState *s;
3237 3237
@@ -3273,7 +3273,7 @@ static void cirrus_pci_mmio_map(PCIDevice *d, int region_num, @@ -3273,7 +3273,7 @@ static void cirrus_pci_mmio_map(PCIDevice *d, int region_num,
3273 } 3273 }
3274 3274
3275 void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, 3275 void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
3276 - unsigned long vga_ram_offset, int vga_ram_size) 3276 + ram_addr_t vga_ram_offset, int vga_ram_size)
3277 { 3277 {
3278 PCICirrusVGAState *d; 3278 PCICirrusVGAState *d;
3279 uint8_t *pci_conf; 3279 uint8_t *pci_conf;
@@ -134,9 +134,9 @@ int isa_vga_mm_init(DisplayState *ds, uint8_t *vga_ram_base, @@ -134,9 +134,9 @@ int isa_vga_mm_init(DisplayState *ds, uint8_t *vga_ram_base,
134 134
135 /* cirrus_vga.c */ 135 /* cirrus_vga.c */
136 void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, 136 void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
137 - unsigned long vga_ram_offset, int vga_ram_size); 137 + ram_addr_t vga_ram_offset, int vga_ram_size);
138 void isa_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base, 138 void isa_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base,
139 - unsigned long vga_ram_offset, int vga_ram_size); 139 + ram_addr_t vga_ram_offset, int vga_ram_size);
140 140
141 /* ide.c */ 141 /* ide.c */
142 void isa_ide_init(int iobase, int iobase2, qemu_irq irq, 142 void isa_ide_init(int iobase, int iobase2, qemu_irq irq,
hw/vga.c
  View file @4efe275
@@ -2105,7 +2105,7 @@ static void vga_map(PCIDevice *pci_dev, int region_num, @@ -2105,7 +2105,7 @@ static void vga_map(PCIDevice *pci_dev, int region_num,
2105 } 2105 }
2106 2106
2107 void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base, 2107 void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base,
2108 - unsigned long vga_ram_offset, int vga_ram_size) 2108 + ram_addr_t vga_ram_offset, int vga_ram_size)
2109 { 2109 {
2110 int i, j, v, b; 2110 int i, j, v, b;
2111 2111
hw/vga_int.h
  View file @4efe275
@@ -100,7 +100,7 @@ typedef void (* vga_update_retrace_info_fn)(struct VGAState *s); @@ -100,7 +100,7 @@ typedef void (* vga_update_retrace_info_fn)(struct VGAState *s);
100 100
101 #define VGA_STATE_COMMON \ 101 #define VGA_STATE_COMMON \
102 uint8_t *vram_ptr; \ 102 uint8_t *vram_ptr; \
103 - unsigned long vram_offset; \ 103 + ram_addr_t vram_offset; \
104 unsigned int vram_size; \ 104 unsigned int vram_size; \
105 unsigned long bios_offset; \ 105 unsigned long bios_offset; \
106 unsigned int bios_size; \ 106 unsigned int bios_size; \
@@ -186,7 +186,7 @@ static inline int c6_to_8(int v) @@ -186,7 +186,7 @@ static inline int c6_to_8(int v)
186 } 186 }
187 187
188 void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base, 188 void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base,
189 - unsigned long vga_ram_offset, int vga_ram_size); 189 + ram_addr_t vga_ram_offset, int vga_ram_size);
190 void vga_init(VGAState *s); 190 void vga_init(VGAState *s);
191 uint32_t vga_mem_readb(void *opaque, target_phys_addr_t addr); 191 uint32_t vga_mem_readb(void *opaque, target_phys_addr_t addr);
192 void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val); 192 void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val);