Revision a8170e5e hw/intel-hda.c

b/hw/intel-hda.c
206 206

  
207 207
/* --------------------------------------------------------------------- */
208 208

  
209
static target_phys_addr_t intel_hda_addr(uint32_t lbase, uint32_t ubase)
209
static hwaddr intel_hda_addr(uint32_t lbase, uint32_t ubase)
210 210
{
211
    target_phys_addr_t addr;
211
    hwaddr addr;
212 212

  
213 213
    addr = ((uint64_t)ubase << 32) | lbase;
214 214
    return addr;
......
295 295

  
296 296
static void intel_hda_corb_run(IntelHDAState *d)
297 297
{
298
    target_phys_addr_t addr;
298
    hwaddr addr;
299 299
    uint32_t rp, verb;
300 300

  
301 301
    if (d->ics & ICH6_IRS_BUSY) {
......
332 332
{
333 333
    HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus);
334 334
    IntelHDAState *d = container_of(bus, IntelHDAState, codecs);
335
    target_phys_addr_t addr;
335
    hwaddr addr;
336 336
    uint32_t wp, ex;
337 337

  
338 338
    if (d->ics & ICH6_IRS_BUSY) {
......
381 381
{
382 382
    HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus);
383 383
    IntelHDAState *d = container_of(bus, IntelHDAState, codecs);
384
    target_phys_addr_t addr;
384
    hwaddr addr;
385 385
    uint32_t s, copy, left;
386 386
    IntelHDAStream *st;
387 387
    bool irq = false;
......
453 453

  
454 454
static void intel_hda_parse_bdl(IntelHDAState *d, IntelHDAStream *st)
455 455
{
456
    target_phys_addr_t addr;
456
    hwaddr addr;
457 457
    uint8_t buf[16];
458 458
    uint32_t i;
459 459

  
......
890 890

  
891 891
};
892 892

  
893
static const IntelHDAReg *intel_hda_reg_find(IntelHDAState *d, target_phys_addr_t addr)
893
static const IntelHDAReg *intel_hda_reg_find(IntelHDAState *d, hwaddr addr)
894 894
{
895 895
    const IntelHDAReg *reg;
896 896

  
......
1033 1033

  
1034 1034
/* --------------------------------------------------------------------- */
1035 1035

  
1036
static void intel_hda_mmio_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
1036
static void intel_hda_mmio_writeb(void *opaque, hwaddr addr, uint32_t val)
1037 1037
{
1038 1038
    IntelHDAState *d = opaque;
1039 1039
    const IntelHDAReg *reg = intel_hda_reg_find(d, addr);
......
1041 1041
    intel_hda_reg_write(d, reg, val, 0xff);
1042 1042
}
1043 1043

  
1044
static void intel_hda_mmio_writew(void *opaque, target_phys_addr_t addr, uint32_t val)
1044
static void intel_hda_mmio_writew(void *opaque, hwaddr addr, uint32_t val)
1045 1045
{
1046 1046
    IntelHDAState *d = opaque;
1047 1047
    const IntelHDAReg *reg = intel_hda_reg_find(d, addr);
......
1049 1049
    intel_hda_reg_write(d, reg, val, 0xffff);
1050 1050
}
1051 1051

  
1052
static void intel_hda_mmio_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
1052
static void intel_hda_mmio_writel(void *opaque, hwaddr addr, uint32_t val)
1053 1053
{
1054 1054
    IntelHDAState *d = opaque;
1055 1055
    const IntelHDAReg *reg = intel_hda_reg_find(d, addr);
......
1057 1057
    intel_hda_reg_write(d, reg, val, 0xffffffff);
1058 1058
}
1059 1059

  
1060
static uint32_t intel_hda_mmio_readb(void *opaque, target_phys_addr_t addr)
1060
static uint32_t intel_hda_mmio_readb(void *opaque, hwaddr addr)
1061 1061
{
1062 1062
    IntelHDAState *d = opaque;
1063 1063
    const IntelHDAReg *reg = intel_hda_reg_find(d, addr);
......
1065 1065
    return intel_hda_reg_read(d, reg, 0xff);
1066 1066
}
1067 1067

  
1068
static uint32_t intel_hda_mmio_readw(void *opaque, target_phys_addr_t addr)
1068
static uint32_t intel_hda_mmio_readw(void *opaque, hwaddr addr)
1069 1069
{
1070 1070
    IntelHDAState *d = opaque;
1071 1071
    const IntelHDAReg *reg = intel_hda_reg_find(d, addr);
......
1073 1073
    return intel_hda_reg_read(d, reg, 0xffff);
1074 1074
}
1075 1075

  
1076
static uint32_t intel_hda_mmio_readl(void *opaque, target_phys_addr_t addr)
1076
static uint32_t intel_hda_mmio_readl(void *opaque, hwaddr addr)
1077 1077
{
1078 1078
    IntelHDAState *d = opaque;
1079 1079
    const IntelHDAReg *reg = intel_hda_reg_find(d, addr);

Also available in: Unified diff