From patchwork Thu Feb 9 17:05:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 140407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7D044B6F9F for ; Fri, 10 Feb 2012 04:06:59 +1100 (EST) Received: from localhost ([::1]:52357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvXST-000868-DK for incoming@patchwork.ozlabs.org; Thu, 09 Feb 2012 12:06:57 -0500 Received: from eggs.gnu.org ([140.186.70.92]:34842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvXRU-0005qo-6u for qemu-devel@nongnu.org; Thu, 09 Feb 2012 12:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvXRM-0003aq-DG for qemu-devel@nongnu.org; Thu, 09 Feb 2012 12:05:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3878) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvXRL-0003aU-VO for qemu-devel@nongnu.org; Thu, 09 Feb 2012 12:05:48 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q19H5lUE020937 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 9 Feb 2012 12:05:47 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q19H5j1T023523; Thu, 9 Feb 2012 12:05:45 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 1031940FA0; Thu, 9 Feb 2012 18:05:43 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 9 Feb 2012 18:05:33 +0100 Message-Id: <1328807143-29499-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1328807143-29499-1-git-send-email-kraxel@redhat.com> References: <1328807143-29499-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann , gleb@redhat.com Subject: [Qemu-devel] [PATCH v4 01/11] acpi: move around structs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/acpi.h | 48 +++++++++++++++++++++++------------------------- 1 files changed, 23 insertions(+), 25 deletions(-) diff --git a/hw/acpi.h b/hw/acpi.h index c141e65..5c43b7d 100644 --- a/hw/acpi.h +++ b/hw/acpi.h @@ -73,9 +73,11 @@ /* PM2_CNT */ #define ACPI_BITMASK_ARB_DISABLE 0x0001 -/* PM_TMR */ -struct ACPIPMTimer; +/* structs */ typedef struct ACPIPMTimer ACPIPMTimer; +typedef struct ACPIPM1EVT ACPIPM1EVT; +typedef struct ACPIPM1CNT ACPIPM1CNT; +typedef struct ACPIGPE ACPIGPE; typedef void (*acpi_update_sci_fn)(ACPIPMTimer *tmr); @@ -86,6 +88,25 @@ struct ACPIPMTimer { acpi_update_sci_fn update_sci; }; +struct ACPIPM1EVT { + uint16_t sts; + uint16_t en; +}; + +struct ACPIPM1CNT { + uint16_t cnt; + qemu_irq cmos_s3; +}; + +struct ACPIGPE { + uint32_t blk; + uint8_t len; + + uint8_t *sts; + uint8_t *en; +}; + +/* PM_TMR */ void acpi_pm_tmr_update(ACPIPMTimer *tmr, bool enable); void acpi_pm_tmr_calc_overflow_time(ACPIPMTimer *tmr); uint32_t acpi_pm_tmr_get(ACPIPMTimer *tmr); @@ -100,26 +121,12 @@ static inline int64_t acpi_pm_tmr_get_clock(void) } /* PM1a_EVT: piix and ich9 don't implement PM1b. */ -struct ACPIPM1EVT -{ - uint16_t sts; - uint16_t en; -}; -typedef struct ACPIPM1EVT ACPIPM1EVT; - uint16_t acpi_pm1_evt_get_sts(ACPIPM1EVT *pm1, int64_t overflow_time); void acpi_pm1_evt_write_sts(ACPIPM1EVT *pm1, ACPIPMTimer *tmr, uint16_t val); void acpi_pm1_evt_power_down(ACPIPM1EVT *pm1, ACPIPMTimer *tmr); void acpi_pm1_evt_reset(ACPIPM1EVT *pm1); /* PM1a_CNT: piix and ich9 don't implement PM1b CNT. */ -struct ACPIPM1CNT { - uint16_t cnt; - - qemu_irq cmos_s3; -}; -typedef struct ACPIPM1CNT ACPIPM1CNT; - void acpi_pm1_cnt_init(ACPIPM1CNT *pm1_cnt, qemu_irq cmos_s3); void acpi_pm1_cnt_write(ACPIPM1EVT *pm1a, ACPIPM1CNT *pm1_cnt, uint16_t val); void acpi_pm1_cnt_update(ACPIPM1CNT *pm1_cnt, @@ -127,15 +134,6 @@ void acpi_pm1_cnt_update(ACPIPM1CNT *pm1_cnt, void acpi_pm1_cnt_reset(ACPIPM1CNT *pm1_cnt); /* GPE0 */ -struct ACPIGPE { - uint32_t blk; - uint8_t len; - - uint8_t *sts; - uint8_t *en; -}; -typedef struct ACPIGPE ACPIGPE; - void acpi_gpe_init(ACPIGPE *gpe, uint8_t len); void acpi_gpe_blk(ACPIGPE *gpe, uint32_t blk); void acpi_gpe_reset(ACPIGPE *gpe);