Revision ee6847d1 hw/xilinx_timer.c

b/hw/xilinx_timer.c
61 61
{
62 62
    SysBusDevice busdev;
63 63
    qemu_irq irq;
64
    unsigned int nr_timers;
64
    uint32_t nr_timers;
65
    uint32_t freq_hz;
65 66
    struct xlx_timer *timers;
66 67
};
67 68

  
......
192 193
{
193 194
    struct timerblock *t = FROM_SYSBUS(typeof (*t), dev);
194 195
    unsigned int i;
195
    int timer_regs, freq_hz;
196
    int timer_regs;
196 197

  
197 198
    /* All timers share a single irq line.  */
198 199
    sysbus_init_irq(dev, &t->irq);
199 200

  
200 201
    /* Init all the ptimers.  */
201
    freq_hz = qdev_get_prop_int(&dev->qdev, "frequency", 2);
202
    t->nr_timers = qdev_get_prop_int(&dev->qdev, "nr-timers", 2);
203 202
    t->timers = qemu_mallocz(sizeof t->timers[0] * t->nr_timers);
204 203
    for (i = 0; i < t->nr_timers; i++) {
205 204
        struct xlx_timer *xt = &t->timers[i];
......
208 207
        xt->nr = i;
209 208
        xt->bh = qemu_bh_new(timer_hit, xt);
210 209
        xt->ptimer = ptimer_init(xt->bh);
211
        ptimer_set_freq(xt->ptimer, freq_hz);
210
        ptimer_set_freq(xt->ptimer, t->freq_hz);
212 211
    }
213 212

  
214 213
    timer_regs = cpu_register_io_memory(timer_read, timer_write, t);
215 214
    sysbus_init_mmio(dev, R_MAX * 4 * t->nr_timers, timer_regs);
216 215
}
217 216

  
217
static SysBusDeviceInfo xilinx_timer_info = {
218
    .init = xilinx_timer_init,
219
    .qdev.name  = "xilinx,timer",
220
    .qdev.size  = sizeof(struct timerblock),
221
    .qdev.props = (Property[]) {
222
        {
223
            .name   = "frequency",
224
            .info   = &qdev_prop_uint32,
225
            .offset = offsetof(struct timerblock, freq_hz),
226
            .defval = (uint32_t[]) { 2 },
227
        },{
228
            .name   = "nr-timers",
229
            .info   = &qdev_prop_uint32,
230
            .offset = offsetof(struct timerblock, nr_timers),
231
            .defval = (uint32_t[]) { 2 },
232
        },
233
        {/* end of list */}
234
    }
235
};
236

  
218 237
static void xilinx_timer_register(void)
219 238
{
220
    sysbus_register_dev("xilinx,timer", sizeof (struct timerblock),
221
                        xilinx_timer_init);
239
    sysbus_register_withprop(&xilinx_timer_info);
222 240
}
223 241

  
224 242
device_init(xilinx_timer_register)

Also available in: Unified diff