Revision a8170e5e hw/usb/hcd-xhci.c

b/hw/usb/hcd-xhci.c
2364 2364
    xhci_mfwrap_update(xhci);
2365 2365
}
2366 2366

  
2367
static uint64_t xhci_cap_read(void *ptr, target_phys_addr_t reg, unsigned size)
2367
static uint64_t xhci_cap_read(void *ptr, hwaddr reg, unsigned size)
2368 2368
{
2369 2369
    XHCIState *xhci = ptr;
2370 2370
    uint32_t ret;
......
2431 2431
    return ret;
2432 2432
}
2433 2433

  
2434
static uint64_t xhci_port_read(void *ptr, target_phys_addr_t reg, unsigned size)
2434
static uint64_t xhci_port_read(void *ptr, hwaddr reg, unsigned size)
2435 2435
{
2436 2436
    XHCIPort *port = ptr;
2437 2437
    uint32_t ret;
......
2455 2455
    return ret;
2456 2456
}
2457 2457

  
2458
static void xhci_port_write(void *ptr, target_phys_addr_t reg,
2458
static void xhci_port_write(void *ptr, hwaddr reg,
2459 2459
                            uint64_t val, unsigned size)
2460 2460
{
2461 2461
    XHCIPort *port = ptr;
......
2493 2493
    }
2494 2494
}
2495 2495

  
2496
static uint64_t xhci_oper_read(void *ptr, target_phys_addr_t reg, unsigned size)
2496
static uint64_t xhci_oper_read(void *ptr, hwaddr reg, unsigned size)
2497 2497
{
2498 2498
    XHCIState *xhci = ptr;
2499 2499
    uint32_t ret;
......
2535 2535
    return ret;
2536 2536
}
2537 2537

  
2538
static void xhci_oper_write(void *ptr, target_phys_addr_t reg,
2538
static void xhci_oper_write(void *ptr, hwaddr reg,
2539 2539
                            uint64_t val, unsigned size)
2540 2540
{
2541 2541
    XHCIState *xhci = ptr;
......
2596 2596
    }
2597 2597
}
2598 2598

  
2599
static uint64_t xhci_runtime_read(void *ptr, target_phys_addr_t reg,
2599
static uint64_t xhci_runtime_read(void *ptr, hwaddr reg,
2600 2600
                                  unsigned size)
2601 2601
{
2602 2602
    XHCIState *xhci = ptr;
......
2644 2644
    return ret;
2645 2645
}
2646 2646

  
2647
static void xhci_runtime_write(void *ptr, target_phys_addr_t reg,
2647
static void xhci_runtime_write(void *ptr, hwaddr reg,
2648 2648
                               uint64_t val, unsigned size)
2649 2649
{
2650 2650
    XHCIState *xhci = ptr;
......
2700 2700
    }
2701 2701
}
2702 2702

  
2703
static uint64_t xhci_doorbell_read(void *ptr, target_phys_addr_t reg,
2703
static uint64_t xhci_doorbell_read(void *ptr, hwaddr reg,
2704 2704
                                   unsigned size)
2705 2705
{
2706 2706
    /* doorbells always read as 0 */
......
2708 2708
    return 0;
2709 2709
}
2710 2710

  
2711
static void xhci_doorbell_write(void *ptr, target_phys_addr_t reg,
2711
static void xhci_doorbell_write(void *ptr, hwaddr reg,
2712 2712
                                uint64_t val, unsigned size)
2713 2713
{
2714 2714
    XHCIState *xhci = ptr;

Also available in: Unified diff