Revision c227f099 hw/gt64xxx.c

b/hw/gt64xxx.c
27 27
#include "pci.h"
28 28
#include "pc.h"
29 29

  
30
typedef a_target_phys_addr a_pci_addr;
30
typedef target_phys_addr_t pci_addr_t;
31 31
#include "pci_host.h"
32 32

  
33 33
//#define DEBUG
......
229 229
typedef PCIHostState GT64120PCIState;
230 230

  
231 231
#define PCI_MAPPING_ENTRY(regname)            \
232
    a_target_phys_addr regname ##_start;      \
233
    a_target_phys_addr regname ##_length;     \
232
    target_phys_addr_t regname ##_start;      \
233
    target_phys_addr_t regname ##_length;     \
234 234
    int regname ##_handle
235 235

  
236 236
typedef struct GT64120State {
......
243 243
/* Adjust range to avoid touching space which isn't mappable via PCI */
244 244
/* XXX: Hardcoded values for Malta: 0x1e000000 - 0x1f100000
245 245
                                    0x1fc00000 - 0x1fd00000  */
246
static void check_reserved_space (a_target_phys_addr *start,
247
                                  a_target_phys_addr *length)
246
static void check_reserved_space (target_phys_addr_t *start,
247
                                  target_phys_addr_t *length)
248 248
{
249
    a_target_phys_addr begin = *start;
250
    a_target_phys_addr end = *start + *length;
249
    target_phys_addr_t begin = *start;
250
    target_phys_addr_t end = *start + *length;
251 251

  
252 252
    if (end >= 0x1e000000LL && end < 0x1f100000LL)
253 253
        end = 0x1e000000LL;
......
269 269

  
270 270
static void gt64120_isd_mapping(GT64120State *s)
271 271
{
272
    a_target_phys_addr start = s->regs[GT_ISD] << 21;
273
    a_target_phys_addr length = 0x1000;
272
    target_phys_addr_t start = s->regs[GT_ISD] << 21;
273
    target_phys_addr_t length = 0x1000;
274 274

  
275 275
    if (s->ISD_length)
276 276
        cpu_register_physical_memory(s->ISD_start, s->ISD_length,
......
303 303
    }
304 304
}
305 305

  
306
static void gt64120_writel (void *opaque, a_target_phys_addr addr,
306
static void gt64120_writel (void *opaque, target_phys_addr_t addr,
307 307
                            uint32_t val)
308 308
{
309 309
    GT64120State *s = opaque;
......
583 583
}
584 584

  
585 585
static uint32_t gt64120_readl (void *opaque,
586
                               a_target_phys_addr addr)
586
                               target_phys_addr_t addr)
587 587
{
588 588
    GT64120State *s = opaque;
589 589
    uint32_t val;

Also available in: Unified diff