Revision a8170e5e hw/bonito.c

b/hw/bonito.c
211 211
    MemoryRegion iomem_ldma;
212 212
    MemoryRegion iomem_cop;
213 213

  
214
    target_phys_addr_t bonito_pciio_start;
215
    target_phys_addr_t bonito_pciio_length;
214
    hwaddr bonito_pciio_start;
215
    hwaddr bonito_pciio_length;
216 216
    int bonito_pciio_handle;
217 217

  
218
    target_phys_addr_t bonito_localio_start;
219
    target_phys_addr_t bonito_localio_length;
218
    hwaddr bonito_localio_start;
219
    hwaddr bonito_localio_length;
220 220
    int bonito_localio_handle;
221 221

  
222 222
} PCIBonitoState;
......
232 232
    PCIBonitoState *pci_dev;
233 233
};
234 234

  
235
static void bonito_writel(void *opaque, target_phys_addr_t addr,
235
static void bonito_writel(void *opaque, hwaddr addr,
236 236
                          uint64_t val, unsigned size)
237 237
{
238 238
    PCIBonitoState *s = opaque;
......
295 295
    }
296 296
}
297 297

  
298
static uint64_t bonito_readl(void *opaque, target_phys_addr_t addr,
298
static uint64_t bonito_readl(void *opaque, hwaddr addr,
299 299
                             unsigned size)
300 300
{
301 301
    PCIBonitoState *s = opaque;
......
322 322
    },
323 323
};
324 324

  
325
static void bonito_pciconf_writel(void *opaque, target_phys_addr_t addr,
325
static void bonito_pciconf_writel(void *opaque, hwaddr addr,
326 326
                                  uint64_t val, unsigned size)
327 327
{
328 328
    PCIBonitoState *s = opaque;
......
332 332
    d->config_write(d, addr, val, 4);
333 333
}
334 334

  
335
static uint64_t bonito_pciconf_readl(void *opaque, target_phys_addr_t addr,
335
static uint64_t bonito_pciconf_readl(void *opaque, hwaddr addr,
336 336
                                     unsigned size)
337 337
{
338 338

  
......
355 355
    },
356 356
};
357 357

  
358
static uint64_t bonito_ldma_readl(void *opaque, target_phys_addr_t addr,
358
static uint64_t bonito_ldma_readl(void *opaque, hwaddr addr,
359 359
                                  unsigned size)
360 360
{
361 361
    uint32_t val;
......
366 366
    return val;
367 367
}
368 368

  
369
static void bonito_ldma_writel(void *opaque, target_phys_addr_t addr,
369
static void bonito_ldma_writel(void *opaque, hwaddr addr,
370 370
                               uint64_t val, unsigned size)
371 371
{
372 372
    PCIBonitoState *s = opaque;
......
384 384
    },
385 385
};
386 386

  
387
static uint64_t bonito_cop_readl(void *opaque, target_phys_addr_t addr,
387
static uint64_t bonito_cop_readl(void *opaque, hwaddr addr,
388 388
                                 unsigned size)
389 389
{
390 390
    uint32_t val;
......
395 395
    return val;
396 396
}
397 397

  
398
static void bonito_cop_writel(void *opaque, target_phys_addr_t addr,
398
static void bonito_cop_writel(void *opaque, hwaddr addr,
399 399
                              uint64_t val, unsigned size)
400 400
{
401 401
    PCIBonitoState *s = opaque;
......
413 413
    },
414 414
};
415 415

  
416
static uint32_t bonito_sbridge_pciaddr(void *opaque, target_phys_addr_t addr)
416
static uint32_t bonito_sbridge_pciaddr(void *opaque, hwaddr addr)
417 417
{
418 418
    PCIBonitoState *s = opaque;
419 419
    PCIHostState *phb = PCI_HOST_BRIDGE(s->pcihost);
......
449 449
    return pciaddr;
450 450
}
451 451

  
452
static void bonito_spciconf_writeb(void *opaque, target_phys_addr_t addr,
452
static void bonito_spciconf_writeb(void *opaque, hwaddr addr,
453 453
                                   uint32_t val)
454 454
{
455 455
    PCIBonitoState *s = opaque;
......
475 475
    pci_set_word(d->config + PCI_STATUS, status);
476 476
}
477 477

  
478
static void bonito_spciconf_writew(void *opaque, target_phys_addr_t addr,
478
static void bonito_spciconf_writew(void *opaque, hwaddr addr,
479 479
                                   uint32_t val)
480 480
{
481 481
    PCIBonitoState *s = opaque;
......
503 503
    pci_set_word(d->config + PCI_STATUS, status);
504 504
}
505 505

  
506
static void bonito_spciconf_writel(void *opaque, target_phys_addr_t addr,
506
static void bonito_spciconf_writel(void *opaque, hwaddr addr,
507 507
                                   uint32_t val)
508 508
{
509 509
    PCIBonitoState *s = opaque;
......
531 531
    pci_set_word(d->config + PCI_STATUS, status);
532 532
}
533 533

  
534
static uint32_t bonito_spciconf_readb(void *opaque, target_phys_addr_t addr)
534
static uint32_t bonito_spciconf_readb(void *opaque, hwaddr addr)
535 535
{
536 536
    PCIBonitoState *s = opaque;
537 537
    PCIDevice *d = PCI_DEVICE(s);
......
557 557
    return pci_data_read(phb->bus, phb->config_reg, 1);
558 558
}
559 559

  
560
static uint32_t bonito_spciconf_readw(void *opaque, target_phys_addr_t addr)
560
static uint32_t bonito_spciconf_readw(void *opaque, hwaddr addr)
561 561
{
562 562
    PCIBonitoState *s = opaque;
563 563
    PCIDevice *d = PCI_DEVICE(s);
......
585 585
    return pci_data_read(phb->bus, phb->config_reg, 2);
586 586
}
587 587

  
588
static uint32_t bonito_spciconf_readl(void *opaque, target_phys_addr_t addr)
588
static uint32_t bonito_spciconf_readl(void *opaque, hwaddr addr)
589 589
{
590 590
    PCIBonitoState *s = opaque;
591 591
    PCIDevice *d = PCI_DEVICE(s);

Also available in: Unified diff