memory: Rename memory_region_init_ram() to memory_region_init_ram_nomigrate()

[qemu.git] / hw / display / jazz_led.c

diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c
index 12b1707cb292059aae01d55b6b09ebb9c2ffc492..3c97d56434724d3de596a21a7637228a7a2ad8c2 100644 (file)
--- a/hw/display/jazz_led.c
+++ b/hw/display/jazz_led.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
  * THE SOFTWARE.
  */
 

+#include "qemu/osdep.h"

 #include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"


@@ -226,15 +227,17 @@ static void jazz_led_invalidate_display(void *opaque)
 static void jazz_led_text_update(void *opaque, console_ch_t *chardata)
 {
     LedState *s = opaque;
 static void jazz_led_text_update(void *opaque, console_ch_t *chardata)
 {
     LedState *s = opaque;

-    char buf[2];
+    char buf[3];

 
     dpy_text_cursor(s->con, -1, -1);
     qemu_console_resize(s->con, 2, 1);
 
     /* TODO: draw the segments */
 
     dpy_text_cursor(s->con, -1, -1);
     qemu_console_resize(s->con, 2, 1);
 
     /* TODO: draw the segments */

-    snprintf(buf, 2, "%02hhx\n", s->segments);
-    console_write_ch(chardata++, 0x00200100 | buf[0]);
-    console_write_ch(chardata++, 0x00200100 | buf[1]);
+    snprintf(buf, 3, "%02hhx", s->segments);
+    console_write_ch(chardata++, ATTR2CHTYPE(buf[0], QEMU_COLOR_BLUE,
+                                             QEMU_COLOR_BLACK, 1));
+    console_write_ch(chardata++, ATTR2CHTYPE(buf[1], QEMU_COLOR_BLUE,
+                                             QEMU_COLOR_BLACK, 1));

 
     dpy_text_update(s->con, 0, 0, 2, 1);
 }
 
     dpy_text_update(s->con, 0, 0, 2, 1);
 }


@@ -264,16 +267,20 @@ static const GraphicHwOps jazz_led_ops = {
     .text_update = jazz_led_text_update,
 };
 
     .text_update = jazz_led_text_update,
 };
 

-static int jazz_led_init(SysBusDevice *dev)
+static void jazz_led_init(Object *obj)

 {
 {

-    LedState *s = JAZZ_LED(dev);
+    LedState *s = JAZZ_LED(obj);
+    SysBusDevice *dev = SYS_BUS_DEVICE(obj);

 
 

-    memory_region_init_io(&s->iomem, OBJECT(s), &led_ops, s, "led", 1);
+    memory_region_init_io(&s->iomem, obj, &led_ops, s, "led", 1);

     sysbus_init_mmio(dev, &s->iomem);
     sysbus_init_mmio(dev, &s->iomem);

+}

 
 

-    s->con = graphic_console_init(DEVICE(dev), 0, &jazz_led_ops, s);
+static void jazz_led_realize(DeviceState *dev, Error **errp)
+{
+    LedState *s = JAZZ_LED(dev);

 
 

-    return 0;
+    s->con = graphic_console_init(dev, 0, &jazz_led_ops, s);

 }
 
 static void jazz_led_reset(DeviceState *d)
 }
 
 static void jazz_led_reset(DeviceState *d)


@@ -288,18 +295,18 @@ static void jazz_led_reset(DeviceState *d)
 static void jazz_led_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
 static void jazz_led_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);

-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);

 
 

-    k->init = jazz_led_init;

     dc->desc = "Jazz LED display",
     dc->vmsd = &vmstate_jazz_led;
     dc->reset = jazz_led_reset;
     dc->desc = "Jazz LED display",
     dc->vmsd = &vmstate_jazz_led;
     dc->reset = jazz_led_reset;

+    dc->realize = jazz_led_realize;

 }
 
 static const TypeInfo jazz_led_info = {
     .name          = TYPE_JAZZ_LED,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(LedState),
 }
 
 static const TypeInfo jazz_led_info = {
     .name          = TYPE_JAZZ_LED,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(LedState),

+    .instance_init = jazz_led_init,

     .class_init    = jazz_led_class_init,
 };
 
     .class_init    = jazz_led_class_init,
 };