From patchwork Mon Aug 3 15:35:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 30631 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id B1E8DB7067 for ; Tue, 4 Aug 2009 04:10:33 +1000 (EST) Received: from localhost ([127.0.0.1]:51022 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MY1zS-0005gh-Q9 for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 14:10:30 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXzaI-0002bb-9n for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXzZx-00023H-48 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:06 -0400 Received: from [199.232.76.173] (port=39442 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXzZw-00022b-32 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:00 -0400 Received: from mx2.redhat.com ([66.187.237.31]:42768) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXzZv-0004eu-Gc for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:35:59 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73FZw5n001435 for ; Mon, 3 Aug 2009 11:35:58 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73FZvBY015394; Mon, 3 Aug 2009 11:35:57 -0400 Received: from zweiblum.home.kraxel.org (vpn2-8-59.ams2.redhat.com [10.36.8.59]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with SMTP id n73FZsc5014182; Mon, 3 Aug 2009 11:35:55 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 3EC28700DA; Mon, 3 Aug 2009 17:35:49 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 17:35:23 +0200 Message-Id: <1249313748-6459-8-git-send-email-kraxel@redhat.com> In-Reply-To: <1249313748-6459-1-git-send-email-kraxel@redhat.com> References: <1249313748-6459-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 07/32] qdev/prop: convert escc.c to helper macros. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/escc.c | 47 ++++++++++------------------------------------- 1 files changed, 10 insertions(+), 37 deletions(-) diff --git a/hw/escc.c b/hw/escc.c index 2264f5d..74a96cd 100644 --- a/hw/escc.c +++ b/hw/escc.c @@ -118,7 +118,7 @@ typedef struct ChannelState { struct SerialState { SysBusDevice busdev; struct ChannelState chn[2]; - int it_shift; + uint32_t it_shift; int mmio_index; uint32_t disabled; uint32_t frequency; @@ -952,42 +952,15 @@ static SysBusDeviceInfo escc_info = { .qdev.name = "escc", .qdev.size = sizeof(SerialState), .qdev.props = (Property[]) { - { - .name = "frequency", - .info = &qdev_prop_uint32, - .offset = offsetof(SerialState, frequency), - }, - { - .name = "it_shift", - .info = &qdev_prop_uint32, - .offset = offsetof(SerialState, it_shift), - }, - { - .name = "disabled", - .info = &qdev_prop_uint32, - .offset = offsetof(SerialState, disabled), - }, - { - .name = "chrB", - .info = &qdev_prop_ptr, - .offset = offsetof(SerialState, chn[0].chr), - }, - { - .name = "chrA", - .info = &qdev_prop_ptr, - .offset = offsetof(SerialState, chn[1].chr), - }, - { - .name = "chnBtype", - .info = &qdev_prop_uint32, - .offset = offsetof(SerialState, chn[0].type), - }, - { - .name = "chnAtype", - .info = &qdev_prop_uint32, - .offset = offsetof(SerialState, chn[1].type), - }, - {/* end of list */} + DEFINE_PROP_UINT32("frequency", SerialState, frequency, 0), + DEFINE_PROP_UINT32("it_shift", SerialState, it_shift, 0), + DEFINE_PROP_UINT32("disabled", SerialState, disabled, 0), + DEFINE_PROP_UINT32("disabled", SerialState, disabled, 0), + DEFINE_PROP_UINT32("chnBtype", SerialState, chn[0].type, 0), + DEFINE_PROP_UINT32("chnAtype", SerialState, chn[1].type, 0), + DEFINE_PROP_CHR("chrB", SerialState, chn[0].chr), + DEFINE_PROP_CHR("chrA", SerialState, chn[1].chr), + DEFINE_PROP_END_OF_LIST(), } };