Revision a8170e5e hw/gt64xxx.c

b/hw/gt64xxx.c
225 225
#define GT_PCI1_SERR1MASK    	(0xca8 >> 2)
226 226

  
227 227
#define PCI_MAPPING_ENTRY(regname)            \
228
    target_phys_addr_t regname ##_start;      \
229
    target_phys_addr_t regname ##_length;     \
228
    hwaddr regname ##_start;      \
229
    hwaddr regname ##_length;     \
230 230
    MemoryRegion regname ##_mem
231 231

  
232 232
#define TYPE_GT64120_PCI_HOST_BRIDGE "gt64120"
......
245 245
/* Adjust range to avoid touching space which isn't mappable via PCI */
246 246
/* XXX: Hardcoded values for Malta: 0x1e000000 - 0x1f100000
247 247
                                    0x1fc00000 - 0x1fd00000  */
248
static void check_reserved_space (target_phys_addr_t *start,
249
                                  target_phys_addr_t *length)
248
static void check_reserved_space (hwaddr *start,
249
                                  hwaddr *length)
250 250
{
251
    target_phys_addr_t begin = *start;
252
    target_phys_addr_t end = *start + *length;
251
    hwaddr begin = *start;
252
    hwaddr end = *start + *length;
253 253

  
254 254
    if (end >= 0x1e000000LL && end < 0x1f100000LL)
255 255
        end = 0x1e000000LL;
......
271 271

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

  
277 277
    if (s->ISD_length) {
278 278
        memory_region_del_subregion(get_system_memory(), &s->ISD_mem);
......
311 311
    }
312 312
}
313 313

  
314
static void gt64120_writel (void *opaque, target_phys_addr_t addr,
314
static void gt64120_writel (void *opaque, hwaddr addr,
315 315
                            uint64_t val, unsigned size)
316 316
{
317 317
    GT64120State *s = opaque;
......
594 594
}
595 595

  
596 596
static uint64_t gt64120_readl (void *opaque,
597
                               target_phys_addr_t addr, unsigned size)
597
                               hwaddr addr, unsigned size)
598 598
{
599 599
    GT64120State *s = opaque;
600 600
    PCIHostState *phb = PCI_HOST_BRIDGE(s);

Also available in: Unified diff