From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V365Z-0002BB-O2 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 11:07:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V35w5-0004UX-Fp for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:57:35 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37044 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V35Ez-0000yc-IZ for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:13:02 -0400 Message-ID: <51F3D569.1040808@suse.de> Date: Sat, 27 Jul 2013 16:12:57 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1374652104-26756-1-git-send-email-afaerber@suse.de> <1374652104-26756-20-git-send-email-afaerber@suse.de> In-Reply-To: <1374652104-26756-20-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 19/29] spitz: QOM'ify SpitzKeyboardState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Paul Brook Am 24.07.2013 09:48, schrieb Andreas F=C3=A4rber: > Signed-off-by: Andreas F=C3=A4rber > --- > hw/arm/spitz.c | 17 ++++++++++------- > 1 file changed, 10 insertions(+), 7 deletions(-) >=20 > diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c > index 0bf5c5c..70f23b3 100644 > --- a/hw/arm/spitz.c > +++ b/hw/arm/spitz.c > @@ -215,8 +215,13 @@ static const int spitz_gpiomap[5] =3D { > SPITZ_GPIO_SWA, SPITZ_GPIO_SWB, > }; > =20 > +#define TYPE_SPITZ_KEYBOARD "spitz-keyboard" > +#define SPITZ_KEYBOARD(obj) \ > + OBJECT_CHECK(SpitzKeyboardState, (obj), TYPE_SPITZ_KEYBOARD) > + > typedef struct { > - SysBusDevice busdev; > + SysBusDevice parent_obj; > + > qemu_irq sense[SPITZ_KEY_SENSE_NUM]; > qemu_irq gpiomap[5]; > int keymap[0x80]; > @@ -461,8 +466,8 @@ static void spitz_keyboard_register(PXA2xxState *cp= u) > DeviceState *dev; > SpitzKeyboardState *s; > =20 > - dev =3D sysbus_create_simple("spitz-keyboard", -1, NULL); > - s =3D FROM_SYSBUS(SpitzKeyboardState, SYS_BUS_DEVICE(dev)); > + dev =3D sysbus_create_simple(TYPE_SPITZ_KEYBOARD, -1, NULL); > + s =3D SPITZ_KEYBOARD(dev); > =20 > for (i =3D 0; i < SPITZ_KEY_SENSE_NUM; i ++) > qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(cpu->gpio, spit= z_gpio_key_sense[i])); > @@ -487,11 +492,9 @@ static void spitz_keyboard_register(PXA2xxState *c= pu) > =20 > static int spitz_keyboard_init(SysBusDevice *dev) > { > - SpitzKeyboardState *s; > + SpitzKeyboardState *s =3D SPITZ_KEYBOARD(dev); > int i, j; > =20 > - s =3D FROM_SYSBUS(SpitzKeyboardState, dev); > - > for (i =3D 0; i < 0x80; i ++) > s->keymap[i] =3D -1; > for (i =3D 0; i < SPITZ_KEY_SENSE_NUM + 1; i ++) [snip] Needs the following addition. Andreas diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 70f23b3..34f9582 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -490,8 +490,9 @@ static void spitz_keyboard_register(PXA2xxState *cpu) qemu_add_kbd_event_handler(spitz_keyboard_handler, s); } -static int spitz_keyboard_init(SysBusDevice *dev) +static int spitz_keyboard_init(SysBusDevice *sbd) { + DeviceState *dev =3D DEVICE(sbd); SpitzKeyboardState *s =3D SPITZ_KEYBOARD(dev); int i, j; @@ -505,8 +506,8 @@ static int spitz_keyboard_init(SysBusDevice *dev) spitz_keyboard_pre_map(s); s->kbdtimer =3D qemu_new_timer_ns(vm_clock, spitz_keyboard_tick, s); - qdev_init_gpio_in(&dev->qdev, spitz_keyboard_strobe, SPITZ_KEY_STROBE_NUM); - qdev_init_gpio_out(&dev->qdev, s->sense, SPITZ_KEY_SENSE_NUM); + qdev_init_gpio_in(dev, spitz_keyboard_strobe, SPITZ_KEY_STROBE_NUM); + qdev_init_gpio_out(dev, s->sense, SPITZ_KEY_SENSE_NUM); 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