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>
diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c
index d762f91..6affef6 100644
--- a/hw/omap_lcdc.c
+++ b/hw/omap_lcdc.c
@@ -24,8 +24,8 @@
struct omap_lcd_panel_s {
qemu_irq irq;
DisplayState *state;
- a_ram_addr imif_base;
- a_ram_addr emiff_base;
+ ram_addr_t imif_base;
+ ram_addr_t emiff_base;
int plm;
int tft;
@@ -117,7 +117,7 @@
draw_line_func draw_line;
int size, height, first, last;
int width, linesize, step, bpp, frame_offset;
- a_target_phys_addr frame_base;
+ target_phys_addr_t frame_base;
if (!omap_lcd || omap_lcd->plm == 1 ||
!omap_lcd->enable || !ds_get_bits_per_pixel(omap_lcd->state))
@@ -325,7 +325,7 @@
}
}
-static uint32_t omap_lcdc_read(void *opaque, a_target_phys_addr addr)
+static uint32_t omap_lcdc_read(void *opaque, target_phys_addr_t addr)
{
struct omap_lcd_panel_s *s = (struct omap_lcd_panel_s *) opaque;
@@ -357,7 +357,7 @@
return 0;
}
-static void omap_lcdc_write(void *opaque, a_target_phys_addr addr,
+static void omap_lcdc_write(void *opaque, target_phys_addr_t addr,
uint32_t value)
{
struct omap_lcd_panel_s *s = (struct omap_lcd_panel_s *) opaque;
@@ -435,9 +435,9 @@
s->ctrl = 0;
}
-struct omap_lcd_panel_s *omap_lcdc_init(a_target_phys_addr base, qemu_irq irq,
+struct omap_lcd_panel_s *omap_lcdc_init(target_phys_addr_t base, qemu_irq irq,
struct omap_dma_lcd_channel_s *dma,
- a_ram_addr imif_base, a_ram_addr emiff_base, omap_clk clk)
+ ram_addr_t imif_base, ram_addr_t emiff_base, omap_clk clk)
{
int iomemtype;
struct omap_lcd_panel_s *s = (struct omap_lcd_panel_s *)
