From patchwork Thu Oct 11 09:00:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mao Zhongyi X-Patchwork-Id: 982357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cmss.chinamobile.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42W4hx69jyz9sjH for ; Thu, 11 Oct 2018 20:01:53 +1100 (AEDT) Received: from localhost ([::1]:33039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWqt-0007nZ-EI for incoming@patchwork.ozlabs.org; Thu, 11 Oct 2018 05:01:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWpw-0007kh-7S for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:01:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAWpg-0005bB-Md for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:00:52 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:15207) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWpd-0005Xn-3T for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:00:34 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.13]) by rmmx-syy-dmz-app06-12006 (RichMail) with SMTP id 2ee65bbf1129d91-01ec7; Thu, 11 Oct 2018 17:00:26 +0800 (CST) X-RM-TRANSID: 2ee65bbf1129d91-01ec7 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from maozy-host.lan (unknown[112.25.154.149]) by rmsmtp-syy-appsvr07-12007 (RichMail) with SMTP id 2ee75bbf111afd5-16a4c; Thu, 11 Oct 2018 17:00:26 +0800 (CST) X-RM-TRANSID: 2ee75bbf111afd5-16a4c From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Thu, 11 Oct 2018 17:00:04 +0800 Message-Id: <20181011090007.1103-2-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181011090007.1103-1-maozhongyi@cmss.chinamobile.com> References: <20181011090007.1103-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.80 Subject: [Qemu-devel] [PATCH 1/4] wm8750: remove duplicate macro X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Mao Zhongyi Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The header file wm8750.h contains '#define TYPE_WM8750 "wm8750"' macro, but '#define CODEC "wm8750"' macro is redefined in wm8750.c, just remove the local CODEC macro and replace it with TYPE_WM8750. Cc: Gerd Hoffmann Signed-off-by: Mao Zhongyi --- hw/audio/wm8750.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c index f4aa838f62..4be3602079 100644 --- a/hw/audio/wm8750.c +++ b/hw/audio/wm8750.c @@ -15,8 +15,6 @@ #define IN_PORT_N 3 #define OUT_PORT_N 3 -#define CODEC "wm8750" - typedef struct { int adc; int adc_hz; @@ -204,11 +202,11 @@ static void wm8750_set_format(WM8750State *s) in_fmt.fmt = AUD_FMT_S16; s->adc_voice[0] = AUD_open_in(&s->card, s->adc_voice[0], - CODEC ".input1", s, wm8750_audio_in_cb, &in_fmt); + TYPE_WM8750 ".input1", s, wm8750_audio_in_cb, &in_fmt); s->adc_voice[1] = AUD_open_in(&s->card, s->adc_voice[1], - CODEC ".input2", s, wm8750_audio_in_cb, &in_fmt); + TYPE_WM8750 ".input2", s, wm8750_audio_in_cb, &in_fmt); s->adc_voice[2] = AUD_open_in(&s->card, s->adc_voice[2], - CODEC ".input3", s, wm8750_audio_in_cb, &in_fmt); + TYPE_WM8750 ".input3", s, wm8750_audio_in_cb, &in_fmt); /* Setup output */ out_fmt.endianness = 0; @@ -217,12 +215,12 @@ static void wm8750_set_format(WM8750State *s) out_fmt.fmt = AUD_FMT_S16; s->dac_voice[0] = AUD_open_out(&s->card, s->dac_voice[0], - CODEC ".speaker", s, wm8750_audio_out_cb, &out_fmt); + TYPE_WM8750 ".speaker", s, wm8750_audio_out_cb, &out_fmt); s->dac_voice[1] = AUD_open_out(&s->card, s->dac_voice[1], - CODEC ".headphone", s, wm8750_audio_out_cb, &out_fmt); + TYPE_WM8750 ".headphone", s, wm8750_audio_out_cb, &out_fmt); /* MONOMIX is also in stereo for simplicity */ s->dac_voice[2] = AUD_open_out(&s->card, s->dac_voice[2], - CODEC ".monomix", s, wm8750_audio_out_cb, &out_fmt); + TYPE_WM8750 ".monomix", s, wm8750_audio_out_cb, &out_fmt); /* no sense emulating OUT3 which is a mix of other outputs */ wm8750_vol_update(s); @@ -584,7 +582,7 @@ static int wm8750_post_load(void *opaque, int version_id) } static const VMStateDescription vmstate_wm8750 = { - .name = CODEC, + .name = TYPE_WM8750, .version_id = 0, .minimum_version_id = 0, .pre_save = wm8750_pre_save, @@ -621,7 +619,7 @@ static void wm8750_realize(DeviceState *dev, Error **errp) { WM8750State *s = WM8750(dev); - AUD_register_card(CODEC, &s->card); + AUD_register_card(TYPE_WM8750, &s->card); wm8750_reset(I2C_SLAVE(s)); } From patchwork Thu Oct 11 09:00:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mao Zhongyi X-Patchwork-Id: 982355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cmss.chinamobile.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42W4hw4Ss2z9sj4 for ; Thu, 11 Oct 2018 20:01:51 +1100 (AEDT) Received: from localhost ([::1]:33037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWqo-0007lD-Bs for incoming@patchwork.ozlabs.org; Thu, 11 Oct 2018 05:01:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWpy-0007km-FB for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:00:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAWpk-0005c3-5n for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:00:54 -0400 Received: from cmccmta3.chinamobile.com ([221.176.66.81]:29657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWpi-0005ah-Sx for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:00:40 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.13]) by rmmx-syy-dmz-app09-12009 (RichMail) with SMTP id 2ee95bbf1132441-02a1b; Thu, 11 Oct 2018 17:00:34 +0800 (CST) X-RM-TRANSID: 2ee95bbf1132441-02a1b X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from maozy-host.lan (unknown[112.25.154.149]) by rmsmtp-syy-appsvr07-12007 (RichMail) with SMTP id 2ee75bbf111afd5-16a92; Thu, 11 Oct 2018 17:00:33 +0800 (CST) X-RM-TRANSID: 2ee75bbf111afd5-16a92 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Thu, 11 Oct 2018 17:00:06 +0800 Message-Id: <20181011090007.1103-4-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181011090007.1103-1-maozhongyi@cmss.chinamobile.com> References: <20181011090007.1103-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.81 Subject: [Qemu-devel] [PATCH 3/4] audio: use object link instead of qdev property to pass wm8750 reference X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jan Kiszka , Gerd Hoffmann , Mao Zhongyi Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" According to qdev-properties.h, properties of pointer type should be avoided, it seems a link type property is a good substitution. Cc: Jan Kiszka Cc: Peter Maydell Cc: Gerd Hoffmann To: qemu-arm@nongnu.org Signed-off-by: Mao Zhongyi --- hw/arm/musicpal.c | 3 ++- hw/audio/marvell_88w8618.c | 14 ++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 3dafb41b0b..ac266f9253 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1695,7 +1695,8 @@ static void musicpal_init(MachineState *machine) wm8750_dev = i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR); dev = qdev_create(NULL, "mv88w8618_audio"); s = SYS_BUS_DEVICE(dev); - qdev_prop_set_ptr(dev, TYPE_WM8750, wm8750_dev); + object_property_set_link(OBJECT(dev), OBJECT(wm8750_dev), + TYPE_WM8750, NULL); qdev_init_nofail(dev); sysbus_mmio_map(s, 0, MP_AUDIO_BASE); sysbus_connect_irq(s, 0, pic[MP_AUDIO_IRQ]); diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index cf6ce6979b..baab4a3d53 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -15,6 +15,7 @@ #include "hw/i2c/i2c.h" #include "hw/audio/wm8750.h" #include "audio/audio.h" +#include "qapi/error.h" #define MP_AUDIO_SIZE 0x00001000 @@ -252,6 +253,11 @@ static void mv88w8618_audio_init(Object *obj) memory_region_init_io(&s->iomem, obj, &mv88w8618_audio_ops, s, "audio", MP_AUDIO_SIZE); sysbus_init_mmio(dev, &s->iomem); + + object_property_add_link(OBJECT(dev), "mv88w8618", TYPE_WM8750, + (Object **) &s->wm, + qdev_prop_allow_set_link_before_realize, + 0, &error_abort); } static void mv88w8618_audio_realize(DeviceState *dev, Error **errp) @@ -279,11 +285,6 @@ static const VMStateDescription mv88w8618_audio_vmsd = { } }; -static Property mv88w8618_audio_properties[] = { - DEFINE_PROP_PTR(TYPE_WM8750, mv88w8618_audio_state, wm), - {/* end of list */}, -}; - static void mv88w8618_audio_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -291,9 +292,6 @@ static void mv88w8618_audio_class_init(ObjectClass *klass, void *data) dc->realize = mv88w8618_audio_realize; dc->reset = mv88w8618_audio_reset; dc->vmsd = &mv88w8618_audio_vmsd; - dc->props = mv88w8618_audio_properties; - /* Reason: pointer property "wm8750" */ - dc->user_creatable = false; } static const TypeInfo mv88w8618_audio_info = { From patchwork Thu Oct 11 09:00:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mao Zhongyi X-Patchwork-Id: 982359 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cmss.chinamobile.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42W4ps189lz9sjF for ; Thu, 11 Oct 2018 20:06:59 +1100 (AEDT) Received: from localhost ([::1]:33061 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWvn-0002aX-Qr for incoming@patchwork.ozlabs.org; Thu, 11 Oct 2018 05:06:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWq2-0007l9-21 for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:01:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAWpk-0005c9-Cu for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:00:57 -0400 Received: from cmccmta3.chinamobile.com ([221.176.66.81]:54544) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAWpj-0005bZ-NA for qemu-devel@nongnu.org; Thu, 11 Oct 2018 05:00:40 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.13]) by rmmx-syy-dmz-app11-12011 (RichMail) with SMTP id 2eeb5bbf1136033-01c54; Thu, 11 Oct 2018 17:00:38 +0800 (CST) X-RM-TRANSID: 2eeb5bbf1136033-01c54 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from maozy-host.lan (unknown[112.25.154.149]) by rmsmtp-syy-appsvr07-12007 (RichMail) with SMTP id 2ee75bbf111afd5-16ab1; Thu, 11 Oct 2018 17:00:38 +0800 (CST) X-RM-TRANSID: 2ee75bbf111afd5-16ab1 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Thu, 11 Oct 2018 17:00:07 +0800 Message-Id: <20181011090007.1103-5-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181011090007.1103-1-maozhongyi@cmss.chinamobile.com> References: <20181011090007.1103-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.81 Subject: [Qemu-devel] [PATCH 4/4] audio: use existing macros istead of hardcoded strings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jan Kiszka , Gerd Hoffmann , Mao Zhongyi Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Cc: Jan Kiszka Cc: Peter Maydell Cc: Gerd Hoffmann To: qemu-arm@nongnu.org Signed-off-by: Mao Zhongyi --- hw/arm/musicpal.c | 16 ++++++++-------- hw/audio/marvell_88w8618.c | 3 +-- include/hw/audio/wm8750.h | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index ac266f9253..6425f1d50f 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -406,7 +406,7 @@ static void mv88w8618_eth_realize(DeviceState *dev, Error **errp) } static const VMStateDescription mv88w8618_eth_vmsd = { - .name = "mv88w8618_eth", + .name = TYPE_MV88W8618_ETH, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -645,7 +645,7 @@ static void musicpal_lcd_init(Object *obj) } static const VMStateDescription musicpal_lcd_vmsd = { - .name = "musicpal_lcd", + .name = TYPE_MUSICPAL_LCD, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -771,7 +771,7 @@ static void mv88w8618_pic_init(Object *obj) } static const VMStateDescription mv88w8618_pic_vmsd = { - .name = "mv88w8618_pic", + .name = TYPE_MV88W8618_PIC, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -951,7 +951,7 @@ static const VMStateDescription mv88w8618_timer_vmsd = { }; static const VMStateDescription mv88w8618_pit_vmsd = { - .name = "mv88w8618_pit", + .name = TYPE_MV88W8618_PIT, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -1038,7 +1038,7 @@ static void mv88w8618_flashcfg_init(Object *obj) } static const VMStateDescription mv88w8618_flashcfg_vmsd = { - .name = "mv88w8618_flashcfg", + .name = TYPE_MV88W8618_FLASHCFG, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -1375,7 +1375,7 @@ static void musicpal_gpio_init(Object *obj) } static const VMStateDescription musicpal_gpio_vmsd = { - .name = "musicpal_gpio", + .name = TYPE_MUSICPAL_GPIO, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -1539,7 +1539,7 @@ static void musicpal_key_init(Object *obj) } static const VMStateDescription musicpal_key_vmsd = { - .name = "musicpal_key", + .name = TYPE_MUSICPAL_KEY, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -1693,7 +1693,7 @@ static void musicpal_init(MachineState *machine) } wm8750_dev = i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR); - dev = qdev_create(NULL, "mv88w8618_audio"); + dev = qdev_create(NULL, TYPE_MV88W8618_AUDIO); s = SYS_BUS_DEVICE(dev); object_property_set_link(OBJECT(dev), OBJECT(wm8750_dev), TYPE_WM8750, NULL); diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index baab4a3d53..dbdddf8ef4 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -39,7 +39,6 @@ #define MP_AUDIO_CLOCK_24MHZ (1 << 9) #define MP_AUDIO_MONO (1 << 14) -#define TYPE_MV88W8618_AUDIO "mv88w8618_audio" #define MV88W8618_AUDIO(obj) \ OBJECT_CHECK(mv88w8618_audio_state, (obj), TYPE_MV88W8618_AUDIO) @@ -268,7 +267,7 @@ static void mv88w8618_audio_realize(DeviceState *dev, Error **errp) } static const VMStateDescription mv88w8618_audio_vmsd = { - .name = "mv88w8618_audio", + .name = TYPE_MV88W8618_AUDIO, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { diff --git a/include/hw/audio/wm8750.h b/include/hw/audio/wm8750.h index 84e7a119bb..e12cb886d1 100644 --- a/include/hw/audio/wm8750.h +++ b/include/hw/audio/wm8750.h @@ -17,6 +17,7 @@ #include "hw/hw.h" #define TYPE_WM8750 "wm8750" +#define TYPE_MV88W8618_AUDIO "mv88w8618_audio" typedef void data_req_cb(void *opaque, int free_out, int free_in);