From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHuYk-0002o0-AC for qemu-devel@nongnu.org; Mon, 24 Feb 2014 07:23:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WHuYf-0003mP-Cl for qemu-devel@nongnu.org; Mon, 24 Feb 2014 07:22:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WHuYf-0003mH-4y for qemu-devel@nongnu.org; Mon, 24 Feb 2014 07:22:53 -0500 From: Gerd Hoffmann Date: Mon, 24 Feb 2014 13:22:21 +0100 Message-Id: <1393244541-29715-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1393244541-29715-1-git-send-email-kraxel@redhat.com> References: <1393244541-29715-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 1/1] hda-audio: qom cleanups List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Vassili Karpov (malc)" , Gerd Hoffmann , =?UTF-8?q?Andreas=20F=C3=A4rber?= Add HDA_AUDIO type and macro, drop DO_UPCAST(). Had to add a abstract hda audio class as parent for all hda-* variants to make that fly. Killed some init code duplication while being at it. Cc: Andreas F=C3=A4rber Signed-off-by: Gerd Hoffmann --- hw/audio/hda-codec.c | 60 ++++++++++++++++++++++++++++------------------= ------ 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index 986f2a9..a67ca91 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -157,6 +157,9 @@ struct HDAAudioStream { uint32_t bpos; }; =20 +#define TYPE_HDA_AUDIO "hda-audio" +#define HDA_AUDIO(obj) OBJECT_CHECK(HDAAudioState, (obj), TYPE_HDA_AUDIO= ) + struct HDAAudioState { HDACodecDevice hda; const char *name; @@ -288,7 +291,7 @@ static void hda_audio_setup(HDAAudioStream *st) =20 static void hda_audio_command(HDACodecDevice *hda, uint32_t nid, uint32_= t data) { - HDAAudioState *a =3D DO_UPCAST(HDAAudioState, hda, hda); + HDAAudioState *a =3D HDA_AUDIO(hda); HDAAudioStream *st; const desc_node *node =3D NULL; const desc_param *param; @@ -448,7 +451,7 @@ fail: =20 static void hda_audio_stream(HDACodecDevice *hda, uint32_t stnr, bool ru= nning, bool output) { - HDAAudioState *a =3D DO_UPCAST(HDAAudioState, hda, hda); + HDAAudioState *a =3D HDA_AUDIO(hda); int s; =20 a->running_compat[stnr] =3D running; @@ -469,7 +472,7 @@ static void hda_audio_stream(HDACodecDevice *hda, uin= t32_t stnr, bool running, b =20 static int hda_audio_init(HDACodecDevice *hda, const struct desc_codec *= desc) { - HDAAudioState *a =3D DO_UPCAST(HDAAudioState, hda, hda); + HDAAudioState *a =3D HDA_AUDIO(hda); HDAAudioStream *st; const desc_node *node; const desc_param *param; @@ -514,7 +517,7 @@ static int hda_audio_init(HDACodecDevice *hda, const = struct desc_codec *desc) =20 static int hda_audio_exit(HDACodecDevice *hda) { - HDAAudioState *a =3D DO_UPCAST(HDAAudioState, hda, hda); + HDAAudioState *a =3D HDA_AUDIO(hda); HDAAudioStream *st; int i; =20 @@ -561,7 +564,7 @@ static int hda_audio_post_load(void *opaque, int vers= ion) =20 static void hda_audio_reset(DeviceState *dev) { - HDAAudioState *a =3D DO_UPCAST(HDAAudioState, hda.qdev, dev); + HDAAudioState *a =3D HDA_AUDIO(dev); HDAAudioStream *st; int i; =20 @@ -613,7 +616,7 @@ static Property hda_audio_properties[] =3D { =20 static int hda_audio_init_output(HDACodecDevice *hda) { - HDAAudioState *a =3D DO_UPCAST(HDAAudioState, hda, hda); + HDAAudioState *a =3D HDA_AUDIO(hda); =20 if (!a->mixer) { return hda_audio_init(hda, &output_nomixemu); @@ -624,7 +627,7 @@ static int hda_audio_init_output(HDACodecDevice *hda) =20 static int hda_audio_init_duplex(HDACodecDevice *hda) { - HDAAudioState *a =3D DO_UPCAST(HDAAudioState, hda, hda); + HDAAudioState *a =3D HDA_AUDIO(hda); =20 if (!a->mixer) { return hda_audio_init(hda, &duplex_nomixemu); @@ -635,7 +638,7 @@ static int hda_audio_init_duplex(HDACodecDevice *hda) =20 static int hda_audio_init_micro(HDACodecDevice *hda) { - HDAAudioState *a =3D DO_UPCAST(HDAAudioState, hda, hda); + HDAAudioState *a =3D HDA_AUDIO(hda); =20 if (!a->mixer) { return hda_audio_init(hda, µ_nomixemu); @@ -644,25 +647,39 @@ static int hda_audio_init_micro(HDACodecDevice *hda= ) } } =20 -static void hda_audio_output_class_init(ObjectClass *klass, void *data) +static void hda_audio_base_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); HDACodecDeviceClass *k =3D HDA_CODEC_DEVICE_CLASS(klass); =20 - k->init =3D hda_audio_init_output; k->exit =3D hda_audio_exit; k->command =3D hda_audio_command; k->stream =3D hda_audio_stream; set_bit(DEVICE_CATEGORY_SOUND, dc->categories); - dc->desc =3D "HDA Audio Codec, output-only (line-out)"; dc->reset =3D hda_audio_reset; dc->vmsd =3D &vmstate_hda_audio; dc->props =3D hda_audio_properties; } =20 +static const TypeInfo hda_audio_info =3D { + .name =3D TYPE_HDA_AUDIO, + .parent =3D TYPE_HDA_CODEC_DEVICE, + .class_init =3D hda_audio_base_class_init, + .abstract =3D true, +}; + +static void hda_audio_output_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + HDACodecDeviceClass *k =3D HDA_CODEC_DEVICE_CLASS(klass); + + k->init =3D hda_audio_init_output; + dc->desc =3D "HDA Audio Codec, output-only (line-out)"; +} + static const TypeInfo hda_audio_output_info =3D { .name =3D "hda-output", - .parent =3D TYPE_HDA_CODEC_DEVICE, + .parent =3D TYPE_HDA_AUDIO, .instance_size =3D sizeof(HDAAudioState), .class_init =3D hda_audio_output_class_init, }; @@ -673,19 +690,12 @@ static void hda_audio_duplex_class_init(ObjectClass= *klass, void *data) HDACodecDeviceClass *k =3D HDA_CODEC_DEVICE_CLASS(klass); =20 k->init =3D hda_audio_init_duplex; - k->exit =3D hda_audio_exit; - k->command =3D hda_audio_command; - k->stream =3D hda_audio_stream; - set_bit(DEVICE_CATEGORY_SOUND, dc->categories); dc->desc =3D "HDA Audio Codec, duplex (line-out, line-in)"; - dc->reset =3D hda_audio_reset; - dc->vmsd =3D &vmstate_hda_audio; - dc->props =3D hda_audio_properties; } =20 static const TypeInfo hda_audio_duplex_info =3D { .name =3D "hda-duplex", - .parent =3D TYPE_HDA_CODEC_DEVICE, + .parent =3D TYPE_HDA_AUDIO, .instance_size =3D sizeof(HDAAudioState), .class_init =3D hda_audio_duplex_class_init, }; @@ -696,25 +706,19 @@ static void hda_audio_micro_class_init(ObjectClass = *klass, void *data) HDACodecDeviceClass *k =3D HDA_CODEC_DEVICE_CLASS(klass); =20 k->init =3D hda_audio_init_micro; - k->exit =3D hda_audio_exit; - k->command =3D hda_audio_command; - k->stream =3D hda_audio_stream; - set_bit(DEVICE_CATEGORY_SOUND, dc->categories); dc->desc =3D "HDA Audio Codec, duplex (speaker, microphone)"; - dc->reset =3D hda_audio_reset; - dc->vmsd =3D &vmstate_hda_audio; - dc->props =3D hda_audio_properties; } =20 static const TypeInfo hda_audio_micro_info =3D { .name =3D "hda-micro", - .parent =3D TYPE_HDA_CODEC_DEVICE, + .parent =3D TYPE_HDA_AUDIO, .instance_size =3D sizeof(HDAAudioState), .class_init =3D hda_audio_micro_class_init, }; =20 static void hda_audio_register_types(void) { + type_register_static(&hda_audio_info); type_register_static(&hda_audio_output_info); type_register_static(&hda_audio_duplex_info); type_register_static(&hda_audio_micro_info); --=20 1.8.3.1