Revision ee6847d1 hw/slavio_timer.c

b/hw/slavio_timer.c
374 374
    SLAVIO_TIMERState *d;
375 375

  
376 376
    dev = qdev_create(NULL, "slavio_timer");
377
    qdev_set_prop_int(dev, "slave_index", slave_index);
378
    qdev_set_prop_int(dev, "num_slaves", num_slaves);
379
    qdev_set_prop_ptr(dev, "master", master);
377
    qdev_prop_set_uint32(dev, "slave_index", slave_index);
378
    qdev_prop_set_uint32(dev, "num_slaves", num_slaves);
379
    qdev_prop_set_ptr(dev, "master", master);
380 380
    qdev_init(dev);
381 381
    s = sysbus_from_qdev(dev);
382 382
    sysbus_connect_irq(s, 0, irq);
......
394 394
    QEMUBH *bh;
395 395

  
396 396
    sysbus_init_irq(dev, &s->irq);
397
    s->num_slaves = qdev_get_prop_int(&dev->qdev, "num_slaves", 0);
398
    s->slave_index = qdev_get_prop_int(&dev->qdev, "slave_index", 0);
399
    s->master = qdev_get_prop_ptr(&dev->qdev, "master");
400 397

  
401 398
    if (!s->master || s->slave_index < s->master->num_slaves) {
402 399
        bh = qemu_bh_new(slavio_timer_irq, s);
......
438 435
    .init = slavio_timer_init1,
439 436
    .qdev.name  = "slavio_timer",
440 437
    .qdev.size  = sizeof(SLAVIO_TIMERState),
441
    .qdev.props = (DevicePropList[]) {
442
        {.name = "num_slaves", .type = PROP_TYPE_INT},
443
        {.name = "slave_index", .type = PROP_TYPE_INT},
444
        {.name = "master", .type = PROP_TYPE_PTR},
445
        {.name = NULL}
438
    .qdev.props = (Property[]) {
439
        {
440
            .name = "num_slaves",
441
            .info = &qdev_prop_uint32,
442
            .offset = offsetof(SLAVIO_TIMERState, num_slaves),
443
        },
444
        {
445
            .name = "slave_index",
446
            .info = &qdev_prop_uint32,
447
            .offset = offsetof(SLAVIO_TIMERState, slave_index),
448
        },
449
        {
450
            .name = "master",
451
            .info = &qdev_prop_ptr,
452
            .offset = offsetof(SLAVIO_TIMERState, master),
453
        },
454
        {/* end of property list */}
446 455
    }
447 456
};
448 457

  

Also available in: Unified diff