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>

1 files changed, 5 insertions, 5 deletions

diff --git a/hw/mac_nvram.c b/hw/mac_nvram.c
index 60cc56ef38..0c91b3f1ba 100644
--- a/hw/mac_nvram.c
+++ b/hw/mac_nvram.c
@@ -38,7 +38,7 @@
 #endif
 
 struct MacIONVRAMState {
-    a_target_phys_addr size;
+    target_phys_addr_t size;
     int mem_index;
     unsigned int it_shift;
     uint8_t *data;
@@ -72,7 +72,7 @@ void macio_nvram_write (void *opaque, uint32_t addr, uint32_t val)
 
 /* macio style NVRAM device */
 static void macio_nvram_writeb (void *opaque,
-                                a_target_phys_addr addr, uint32_t value)
+                                target_phys_addr_t addr, uint32_t value)
 {
     MacIONVRAMState *s = opaque;
 
@@ -81,7 +81,7 @@ static void macio_nvram_writeb (void *opaque,
     NVR_DPRINTF("writeb addr %04x val %x\n", (int)addr, value);
 }
 
-static uint32_t macio_nvram_readb (void *opaque, a_target_phys_addr addr)
+static uint32_t macio_nvram_readb (void *opaque, target_phys_addr_t addr)
 {
     MacIONVRAMState *s = opaque;
     uint32_t value;
@@ -128,7 +128,7 @@ static void macio_nvram_reset(void *opaque)
 {
 }
 
-MacIONVRAMState *macio_nvram_init (int *mem_index, a_target_phys_addr size,
+MacIONVRAMState *macio_nvram_init (int *mem_index, target_phys_addr_t size,
                                    unsigned int it_shift)
 {
     MacIONVRAMState *s;
@@ -148,7 +148,7 @@ MacIONVRAMState *macio_nvram_init (int *mem_index, a_target_phys_addr size,
     return s;
 }
 
-void macio_nvram_map (void *opaque, a_target_phys_addr mem_base)
+void macio_nvram_map (void *opaque, target_phys_addr_t mem_base)
 {
     MacIONVRAMState *s;