[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH qom-next for-1.6 06/29] musicpal: QOM'ify musicp
From: |
Jan Kiszka |
Subject: |
Re: [Qemu-devel] [PATCH qom-next for-1.6 06/29] musicpal: QOM'ify musicpal_lcd_state |
Date: |
Sat, 27 Jul 2013 16:33:51 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
On 2013-07-27 16:10, Andreas Färber wrote:
> Am 24.07.2013 09:48, schrieb Andreas Färber:
>> Signed-off-by: Andreas Färber <address@hidden>
>> ---
>> 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 = {
>>
>> #define MP_LCD_TEXTCOLOR 0xe0e0ff /* RRGGBB */
>>
>> +#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 = {
>>
>> static int musicpal_lcd_init(SysBusDevice *dev)
>> {
>> - musicpal_lcd_state *s = FROM_SYSBUS(musicpal_lcd_state, dev);
>> + musicpal_lcd_state *s = MUSICPAL_LCD(dev);
>>
>> s->brightness = 7;
>>
> [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 = {
> .gfx_update = lcd_refresh,
> };
>
> -static int musicpal_lcd_init(SysBusDevice *dev)
> +static int musicpal_lcd_init(SysBusDevice *sbd)
> {
> + DeviceState *dev = DEVICE(sbd);
> musicpal_lcd_state *s = MUSICPAL_LCD(dev);
>
> s->brightness = 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 = graphic_console_init(DEVICE(dev), &musicpal_gfx_ops, s);
> + s->con = 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;
> }
>
>
Didn't find the time to look at this yet. But do you have images to test
the musicpal?
Jan
signature.asc
Description: OpenPGP digital signature
- [Qemu-devel] [PATCH qom-next for-1.6 00/29] arm: QOM cast cleanups, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 01/29] armv7m: QOM'ify BitBandState, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 02/29] highbank: QOM'ify HighbankRegsState, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 04/29] integratorcp: QOM'ify icp_pic_state, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 03/29] integratorcp: QOM'ify integratorcm_state, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 05/29] musicpal: QOM'ify mv88w8618_eth_state, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 06/29] musicpal: QOM'ify musicpal_lcd_state, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 07/29] musicpal: Use TYPE_MV88W8618_ETH, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 08/29] musicpal: QOM'ify mv88w8618_pic_state, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 09/29] musicpal: QOM'ify mv88w8618_pit_state, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 10/29] musicpal: QOM'ify mv88w8618_flashcfg, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 12/29] musicpal: QOM'ify musicpal_key_state, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 11/29] musicpal: QOM'ify musicpal_gpio_state, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 13/29] pxa2xx: QOM'ify PXA2xxSSPState, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 14/29] pxa2xx: QOM'ify PXA2xxRTCState, Andreas Färber, 2013/07/24