From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V39yT-0006RV-QP for qemu-devel@nongnu.org; Sat, 27 Jul 2013 15:16:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V39tH-0006NX-20 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 15:11:01 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37007 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V35CV-0000lI-7m for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:10:27 -0400 Message-ID: <51F3D4CE.9000304@suse.de> Date: Sat, 27 Jul 2013 16:10:22 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1374652104-26756-1-git-send-email-afaerber@suse.de> <1374652104-26756-7-git-send-email-afaerber@suse.de> In-Reply-To: <1374652104-26756-7-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH qom-next for-1.6 06/29] musicpal: QOM'ify musicpal_lcd_state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Jan Kiszka , Paul Brook Am 24.07.2013 09:48, schrieb Andreas F=C3=A4rber: > Signed-off-by: Andreas F=C3=A4rber > --- > hw/arm/musicpal.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) >=20 > diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c > index 293ab26..e7efed9 100644 > --- a/hw/arm/musicpal.c > +++ b/hw/arm/musicpal.c > @@ -461,8 +461,15 @@ static const TypeInfo mv88w8618_eth_info =3D { > =20 > #define MP_LCD_TEXTCOLOR 0xe0e0ff /* RRGGBB */ > =20 > +#define TYPE_MUSICPAL_LCD "musicpal_lcd" > +#define MUSICPAL_LCD(obj) \ > + OBJECT_CHECK(musicpal_lcd_state, (obj), TYPE_MUSICPAL_LCD) > + > typedef struct musicpal_lcd_state { > - SysBusDevice busdev; > + /*< private >*/ > + SysBusDevice parent_obj; > + /*< public >*/ > + > MemoryRegion iomem; > uint32_t brightness; > uint32_t mode; > @@ -615,7 +622,7 @@ static const GraphicHwOps musicpal_gfx_ops =3D { > =20 > static int musicpal_lcd_init(SysBusDevice *dev) > { > - musicpal_lcd_state *s =3D FROM_SYSBUS(musicpal_lcd_state, dev); > + musicpal_lcd_state *s =3D MUSICPAL_LCD(dev); > =20 > s->brightness =3D 7; > =20 [snip] Needs the following addition: diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 6065051..9174b87 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -621,20 +621,21 @@ static const GraphicHwOps musicpal_gfx_ops =3D { .gfx_update =3D lcd_refresh, }; -static int musicpal_lcd_init(SysBusDevice *dev) +static int musicpal_lcd_init(SysBusDevice *sbd) { + DeviceState *dev =3D DEVICE(sbd); musicpal_lcd_state *s =3D MUSICPAL_LCD(dev); s->brightness =3D 7; memory_region_init_io(&s->iomem, OBJECT(s), &musicpal_lcd_ops, s, "musicpal-lcd", MP_LCD_SIZE); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); - s->con =3D graphic_console_init(DEVICE(dev), &musicpal_gfx_ops, s); + s->con =3D graphic_console_init(dev, &musicpal_gfx_ops, s); qemu_console_resize(s->con, 128*3, 64*3); - qdev_init_gpio_in(&dev->qdev, musicpal_lcd_gpio_brigthness_in, 3); + qdev_init_gpio_in(dev, musicpal_lcd_gpio_brigthness_in, 3); return 0; } --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg