Revision c3143ba8 hw/dma/pl330.c

b/hw/dma/pl330.c
577 577

  
578 578
static inline void pl330_fault(PL330Chan *ch, uint32_t flags)
579 579
{
580
    DB_PRINT("ch: %p, flags: %x\n", ch, flags);
580
    DB_PRINT("ch: %p, flags: %" PRIx32 "\n", ch, flags);
581 581
    ch->fault_type |= flags;
582 582
    if (ch->state == pl330_chan_fault) {
583 583
        return;
......
723 723
    ch->stall = pl330_queue_put_insn(&ch->parent->read_queue, ch->src,
724 724
                                    size, num, inc, 0, ch->tag);
725 725
    if (!ch->stall) {
726
        DB_PRINT("channel:%d address:%08x size:%d num:%d %c\n",
726
        DB_PRINT("channel:%" PRId8 " address:%08" PRIx32 " size:%" PRIx32
727
                 " num:%" PRId32 " %c\n",
727 728
                 ch->tag, ch->src, size, num, inc ? 'Y' : 'N');
728 729
        ch->src += inc ? size * num - (ch->src & (size - 1)) : 0;
729 730
    }
......
868 869
    }
869 870
    if (ch->parent->inten & (1 << ev_id)) {
870 871
        ch->parent->int_status |= (1 << ev_id);
871
        DB_PRINT("event interrupt raised %d\n", ev_id);
872
        DB_PRINT("event interrupt raised %" PRId8 "\n", ev_id);
872 873
        qemu_irq_raise(ch->parent->irq[ev_id]);
873 874
    }
874 875
    ch->parent->ev_status |= (1 << ev_id);
......
895 896
    ch->stall = pl330_queue_put_insn(&ch->parent->write_queue, ch->dst,
896 897
                                    size, num, inc, 0, ch->tag);
897 898
    if (!ch->stall) {
898
        DB_PRINT("channel:%d address:%08x size:%d num:%d %c\n",
899
        DB_PRINT("channel:%" PRId8 " address:%08" PRIx32 " size:%" PRIx32
900
                 " num:%" PRId32 " %c\n",
899 901
                 ch->tag, ch->dst, size, num, inc ? 'Y' : 'N');
900 902
        ch->dst += inc ? size * num - (ch->dst & (size - 1)) : 0;
901 903
    }
......
1154 1156

  
1155 1157
        dma_memory_read(&address_space_memory, q->addr, buf, len);
1156 1158
        if (PL330_ERR_DEBUG > 1) {
1157
            DB_PRINT("PL330 read from memory @%08x (size = %08x):\n",
1159
            DB_PRINT("PL330 read from memory @%08" PRIx32 " (size = %08x):\n",
1158 1160
                      q->addr, len);
1159 1161
            qemu_hexdump((char *)buf, stderr, "", len);
1160 1162
        }
......
1186 1188
        if (fifo_res == PL330_FIFO_OK || q->z) {
1187 1189
            dma_memory_write(&address_space_memory, q->addr, buf, len);
1188 1190
            if (PL330_ERR_DEBUG > 1) {
1189
                DB_PRINT("PL330 read from memory @%08x (size = %08x):\n",
1190
                         q->addr, len);
1191
                DB_PRINT("PL330 read from memory @%08" PRIx32
1192
                         " (size = %08x):\n", q->addr, len);
1191 1193
                qemu_hexdump((char *)buf, stderr, "", len);
1192 1194
            }
1193 1195
            if (q->inc) {
......
1276 1278
    args[2] = (s->dbg[1] >>  8) & 0xff;
1277 1279
    args[3] = (s->dbg[1] >> 16) & 0xff;
1278 1280
    args[4] = (s->dbg[1] >> 24) & 0xff;
1279
    DB_PRINT("chan id: %d\n", chan_id);
1281
    DB_PRINT("chan id: %" PRIx8 "\n", chan_id);
1280 1282
    if (s->dbg[0] & 1) {
1281 1283
        ch = &s->chan[chan_id];
1282 1284
    } else {
......
1466 1468
static uint64_t pl330_iomem_read(void *opaque, hwaddr offset,
1467 1469
        unsigned size)
1468 1470
{
1469
    int ret = pl330_iomem_read_imp(opaque, offset);
1470
    DB_PRINT("addr: %08x data: %08x\n", (unsigned)offset, ret);
1471
    uint32_t ret = pl330_iomem_read_imp(opaque, offset);
1472
    DB_PRINT("addr: %08" HWADDR_PRIx " data: %08" PRIx32 "\n", offset, ret);
1471 1473
    return ret;
1472 1474
}
1473 1475

  
......
1553 1555
        s->cfg[1] |= 5;
1554 1556
        break;
1555 1557
    default:
1556
        error_setg(errp, "Bad value for i-cache_len property: %d\n",
1558
        error_setg(errp, "Bad value for i-cache_len property: %" PRIx8 "\n",
1557 1559
                   s->i_cache_len);
1558 1560
        return;
1559 1561
    }
......
1588 1590
        s->cfg[CFG_CRD] |= 0x4;
1589 1591
        break;
1590 1592
    default:
1591
        error_setg(errp, "Bad value for data_width property: %d\n",
1593
        error_setg(errp, "Bad value for data_width property: %" PRIx8 "\n",
1592 1594
                   s->data_width);
1593 1595
        return;
1594 1596
    }

Also available in: Unified diff