Revision a8170e5e hw/arm_gic.c

b/hw/arm_gic.c
212 212
    }
213 213
}
214 214

  
215
static uint32_t gic_dist_readb(void *opaque, target_phys_addr_t offset)
215
static uint32_t gic_dist_readb(void *opaque, hwaddr offset)
216 216
{
217 217
    GICState *s = (GICState *)opaque;
218 218
    uint32_t res;
......
328 328
    return 0;
329 329
}
330 330

  
331
static uint32_t gic_dist_readw(void *opaque, target_phys_addr_t offset)
331
static uint32_t gic_dist_readw(void *opaque, hwaddr offset)
332 332
{
333 333
    uint32_t val;
334 334
    val = gic_dist_readb(opaque, offset);
......
336 336
    return val;
337 337
}
338 338

  
339
static uint32_t gic_dist_readl(void *opaque, target_phys_addr_t offset)
339
static uint32_t gic_dist_readl(void *opaque, hwaddr offset)
340 340
{
341 341
    uint32_t val;
342 342
    val = gic_dist_readw(opaque, offset);
......
344 344
    return val;
345 345
}
346 346

  
347
static void gic_dist_writeb(void *opaque, target_phys_addr_t offset,
347
static void gic_dist_writeb(void *opaque, hwaddr offset,
348 348
                            uint32_t value)
349 349
{
350 350
    GICState *s = (GICState *)opaque;
......
490 490
    hw_error("gic_dist_writeb: Bad offset %x\n", (int)offset);
491 491
}
492 492

  
493
static void gic_dist_writew(void *opaque, target_phys_addr_t offset,
493
static void gic_dist_writew(void *opaque, hwaddr offset,
494 494
                            uint32_t value)
495 495
{
496 496
    gic_dist_writeb(opaque, offset, value & 0xff);
497 497
    gic_dist_writeb(opaque, offset + 1, value >> 8);
498 498
}
499 499

  
500
static void gic_dist_writel(void *opaque, target_phys_addr_t offset,
500
static void gic_dist_writel(void *opaque, hwaddr offset,
501 501
                            uint32_t value)
502 502
{
503 503
    GICState *s = (GICState *)opaque;
......
584 584
}
585 585

  
586 586
/* Wrappers to read/write the GIC CPU interface for the current CPU */
587
static uint64_t gic_thiscpu_read(void *opaque, target_phys_addr_t addr,
587
static uint64_t gic_thiscpu_read(void *opaque, hwaddr addr,
588 588
                                 unsigned size)
589 589
{
590 590
    GICState *s = (GICState *)opaque;
591 591
    return gic_cpu_read(s, gic_get_current_cpu(s), addr);
592 592
}
593 593

  
594
static void gic_thiscpu_write(void *opaque, target_phys_addr_t addr,
594
static void gic_thiscpu_write(void *opaque, hwaddr addr,
595 595
                              uint64_t value, unsigned size)
596 596
{
597 597
    GICState *s = (GICState *)opaque;
......
601 601
/* Wrappers to read/write the GIC CPU interface for a specific CPU.
602 602
 * These just decode the opaque pointer into GICState* + cpu id.
603 603
 */
604
static uint64_t gic_do_cpu_read(void *opaque, target_phys_addr_t addr,
604
static uint64_t gic_do_cpu_read(void *opaque, hwaddr addr,
605 605
                                unsigned size)
606 606
{
607 607
    GICState **backref = (GICState **)opaque;
......
610 610
    return gic_cpu_read(s, id, addr);
611 611
}
612 612

  
613
static void gic_do_cpu_write(void *opaque, target_phys_addr_t addr,
613
static void gic_do_cpu_write(void *opaque, hwaddr addr,
614 614
                             uint64_t value, unsigned size)
615 615
{
616 616
    GICState **backref = (GICState **)opaque;

Also available in: Unified diff