From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V35ZZ-0007kU-RV for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:34:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V35ZY-0005lg-34 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:34:17 -0400 Received: from mout.web.de ([212.227.15.14]:60373) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V35ZX-0005lQ-Pu for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:34:15 -0400 Received: from mchn199C.mchp.siemens.de ([95.157.58.223]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0Mbhiv-1UmFdo2uUn-00J3j7 for ; Sat, 27 Jul 2013 16:34:14 +0200 Message-ID: <51F3DA4F.20106@web.de> Date: Sat, 27 Jul 2013 16:33:51 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <1374652104-26756-1-git-send-email-afaerber@suse.de> <1374652104-26756-7-git-send-email-afaerber@suse.de> <51F3D4CE.9000304@suse.de> In-Reply-To: <51F3D4CE.9000304@suse.de> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ELHss2daSwPVXnS4rutn4RKV2HNiRxp5P" 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: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Cc: Peter Maydell , qemu-devel@nongnu.org, Paul Brook This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ELHss2daSwPVXnS4rutn4RKV2HNiRxp5P Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 2013-07-27 16:10, Andreas F=C3=A4rber wrote: > 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(-) >> >> 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] >=20 > Needs the following addition: >=20 > 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, > }; >=20 > -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); >=20 > s->brightness =3D 7; >=20 > 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); >=20 > - 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); >=20 > - qdev_init_gpio_in(&dev->qdev, musicpal_lcd_gpio_brigthness_in, 3);= > + qdev_init_gpio_in(dev, musicpal_lcd_gpio_brigthness_in, 3); >=20 > return 0; > } >=20 >=20 Didn't find the time to look at this yet. But do you have images to test the musicpal? Jan --ELHss2daSwPVXnS4rutn4RKV2HNiRxp5P Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlHz2lEACgkQitSsb3rl5xRbXACgj6+YCHCVJnA698e1zzz9wEtY bXEAn2wQ3M2XE0YhZQXwXvQhts87WU9F =NjTe -----END PGP SIGNATURE----- --ELHss2daSwPVXnS4rutn4RKV2HNiRxp5P--