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, 11 insertions, 11 deletions

diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index 87d13f998..8f9ae4a20 100644
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -27,7 +27,7 @@
 #include "pci.h"
 #include "pc.h"
 
-typedef a_target_phys_addr a_pci_addr;
+typedef target_phys_addr_t pci_addr_t;
 #include "pci_host.h"
 
 //#define DEBUG
@@ -229,8 +229,8 @@ typedef a_target_phys_addr a_pci_addr;
 typedef PCIHostState GT64120PCIState;
 
 #define PCI_MAPPING_ENTRY(regname)            \
-    a_target_phys_addr regname ##_start;      \
-    a_target_phys_addr regname ##_length;     \
+    target_phys_addr_t regname ##_start;      \
+    target_phys_addr_t regname ##_length;     \
     int regname ##_handle
 
 typedef struct GT64120State {
@@ -243,11 +243,11 @@ typedef struct GT64120State {
 /* Adjust range to avoid touching space which isn't mappable via PCI */
 /* XXX: Hardcoded values for Malta: 0x1e000000 - 0x1f100000
                                     0x1fc00000 - 0x1fd00000  */
-static void check_reserved_space (a_target_phys_addr *start,
-                                  a_target_phys_addr *length)
+static void check_reserved_space (target_phys_addr_t *start,
+                                  target_phys_addr_t *length)
 {
-    a_target_phys_addr begin = *start;
-    a_target_phys_addr end = *start + *length;
+    target_phys_addr_t begin = *start;
+    target_phys_addr_t end = *start + *length;
 
     if (end >= 0x1e000000LL && end < 0x1f100000LL)
         end = 0x1e000000LL;
@@ -269,8 +269,8 @@ static void check_reserved_space (a_target_phys_addr *start,
 
 static void gt64120_isd_mapping(GT64120State *s)
 {
-    a_target_phys_addr start = s->regs[GT_ISD] << 21;
-    a_target_phys_addr length = 0x1000;
+    target_phys_addr_t start = s->regs[GT_ISD] << 21;
+    target_phys_addr_t length = 0x1000;
 
     if (s->ISD_length)
         cpu_register_physical_memory(s->ISD_start, s->ISD_length,
@@ -303,7 +303,7 @@ static void gt64120_pci_mapping(GT64120State *s)
     }
 }
 
-static void gt64120_writel (void *opaque, a_target_phys_addr addr,
+static void gt64120_writel (void *opaque, target_phys_addr_t addr,
                             uint32_t val)
 {
     GT64120State *s = opaque;
@@ -583,7 +583,7 @@ static void gt64120_writel (void *opaque, a_target_phys_addr addr,
 }
 
 static uint32_t gt64120_readl (void *opaque,
-                               a_target_phys_addr addr)
+                               target_phys_addr_t addr)
 {
     GT64120State *s = opaque;
     uint32_t val;