Commit 7e13ea57 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mwalle/tags/lm32-queue/20160620' into staging 



lm32/milkymist: some qomifying

# gpg: Signature made Mon 20 Jun 2016 17:27:53 BST
# gpg:                using RSA key 0xB458ABB0D8D378E3
# gpg: Good signature from "Michael Walle <michael@walle.cc>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2190 3E48 4537 A7C2 90CE  3EB2 B458 ABB0 D8D3 78E3

* remotes/mwalle/tags/lm32-queue/20160620:
  milkymist: update specification URLs
  hw/intc: QOM'ify lm32_pic.c
  hw/display: QOM'ify milkymist-vgafb.c
  hw/display: QOM'ify milkymist-tmu2.c
  hw/timer: QOM'ify milkymist_sysctl
  hw/timer: QOM'ify lm32_timer

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7fa124b2 6dbbe243

hw/audio/milkymist-ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 *

 *

 * Specification available at:

 *   http://www.milkymist.org/socdoc/ac97.pdf

 *   http://milkymist.walle.cc/socdoc/ac97.pdf

 */



#include "qemu/osdep.h"

hw/char/milkymist-uart.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 *

 *

 * Specification available at:

 *   http://www.milkymist.org/socdoc/uart.pdf

 *   http://milkymist.walle.cc/socdoc/uart.pdf

 */



#include "qemu/osdep.h"

hw/display/milkymist-tmu2.c

+15 −11
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
 *

 *

 * Specification available at:

 *   http://www.milkymist.org/socdoc/tmu2.pdf

 *   http://milkymist.walle.cc/socdoc/tmu2.pdf

 *

 */
@@ -443,21 +443,25 @@ static void milkymist_tmu2_reset(DeviceState *d) 
    }

}



static int milkymist_tmu2_init(SysBusDevice *dev)

static void milkymist_tmu2_init(Object *obj)

{

    MilkymistTMU2State *s = MILKYMIST_TMU2(dev);



    if (tmu2_glx_init(s)) {

        return 1;

    }

    MilkymistTMU2State *s = MILKYMIST_TMU2(obj);

    SysBusDevice *dev = SYS_BUS_DEVICE(obj);



    sysbus_init_irq(dev, &s->irq);



    memory_region_init_io(&s->regs_region, OBJECT(s), &tmu2_mmio_ops, s,

    memory_region_init_io(&s->regs_region, obj, &tmu2_mmio_ops, s,

            "milkymist-tmu2", R_MAX * 4);

    sysbus_init_mmio(dev, &s->regs_region);

}



    return 0;

static void milkymist_tmu2_realize(DeviceState *dev, Error **errp)

{

    MilkymistTMU2State *s = MILKYMIST_TMU2(dev);



    if (tmu2_glx_init(s)) {

        error_setg(errp, "tmu2_glx_init failed");

    }

}



static const VMStateDescription vmstate_milkymist_tmu2 = {
@@ -473,9 +477,8 @@ static const VMStateDescription vmstate_milkymist_tmu2 = { 
static void milkymist_tmu2_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = milkymist_tmu2_init;

    dc->realize = milkymist_tmu2_realize;

    dc->reset = milkymist_tmu2_reset;

    dc->vmsd = &vmstate_milkymist_tmu2;

}
@@ -484,6 +487,7 @@ static const TypeInfo milkymist_tmu2_info = { 
    .name          = TYPE_MILKYMIST_TMU2,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(MilkymistTMU2State),

    .instance_init = milkymist_tmu2_init,

    .class_init    = milkymist_tmu2_class_init,

};

hw/display/milkymist-vgafb.c

+11 −7
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 *

 *

 * Specification available at:

 *   http://www.milkymist.org/socdoc/vgafb.pdf

 *   http://milkymist.walle.cc/socdoc/vgafb.pdf

 */



#include "qemu/osdep.h"
@@ -292,17 +292,21 @@ static const GraphicHwOps vgafb_ops = { 
    .gfx_update  = vgafb_update_display,

};



static int milkymist_vgafb_init(SysBusDevice *dev)

static void milkymist_vgafb_init(Object *obj)

{

    MilkymistVgafbState *s = MILKYMIST_VGAFB(dev);

    MilkymistVgafbState *s = MILKYMIST_VGAFB(obj);

    SysBusDevice *dev = SYS_BUS_DEVICE(obj);



    memory_region_init_io(&s->regs_region, OBJECT(s), &vgafb_mmio_ops, s,

            "milkymist-vgafb", R_MAX * 4);

    sysbus_init_mmio(dev, &s->regs_region);

}



    s->con = graphic_console_init(DEVICE(dev), 0, &vgafb_ops, s);

static void milkymist_vgafb_realize(DeviceState *dev, Error **errp)

{

    MilkymistVgafbState *s = MILKYMIST_VGAFB(dev);



    return 0;

    s->con = graphic_console_init(dev, 0, &vgafb_ops, s);

}



static int vgafb_post_load(void *opaque, int version_id)
@@ -331,18 +335,18 @@ static Property milkymist_vgafb_properties[] = { 
static void milkymist_vgafb_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = milkymist_vgafb_init;

    dc->reset = milkymist_vgafb_reset;

    dc->vmsd = &vmstate_milkymist_vgafb;

    dc->props = milkymist_vgafb_properties;

    dc->realize = milkymist_vgafb_realize;

}



static const TypeInfo milkymist_vgafb_info = {

    .name          = TYPE_MILKYMIST_VGAFB,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(MilkymistVgafbState),

    .instance_init = milkymist_vgafb_init,

    .class_init    = milkymist_vgafb_class_init,

};

hw/intc/lm32_pic.c

+5 −7
Original line number Diff line number Diff line
@@ -152,17 +152,16 @@ static void pic_reset(DeviceState *d) 
    }

}



static int lm32_pic_init(SysBusDevice *sbd)

static void lm32_pic_init(Object *obj)

{

    DeviceState *dev = DEVICE(sbd);

    LM32PicState *s = LM32_PIC(dev);

    DeviceState *dev = DEVICE(obj);

    LM32PicState *s = LM32_PIC(obj);

    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);



    qdev_init_gpio_in(dev, irq_handler, 32);

    sysbus_init_irq(sbd, &s->parent_irq);



    pic = s;



    return 0;

}



static const VMStateDescription vmstate_lm32_pic = {
@@ -181,9 +180,7 @@ static const VMStateDescription vmstate_lm32_pic = { 
static void lm32_pic_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = lm32_pic_init;

    dc->reset = pic_reset;

    dc->vmsd = &vmstate_lm32_pic;

}
@@ -192,6 +189,7 @@ static const TypeInfo lm32_pic_info = { 
    .name          = TYPE_LM32_PIC,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(LM32PicState),

    .instance_init = lm32_pic_init,

    .class_init    = lm32_pic_class_init,

};