From patchwork Fri Dec 18 11:01:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 41381 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 ozlabs.org (Postfix) with ESMTPS id A10E1B6F07 for ; Fri, 18 Dec 2009 22:04:40 +1100 (EST) Received: from localhost ([127.0.0.1]:41538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLadR-0007V6-Q5 for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2009 06:04:37 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NLaaO-00068X-WE for qemu-devel@nongnu.org; Fri, 18 Dec 2009 06:01:29 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NLaaJ-000674-4A for qemu-devel@nongnu.org; Fri, 18 Dec 2009 06:01:27 -0500 Received: from [199.232.76.173] (port=33826 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLaaI-00066p-T1 for qemu-devel@nongnu.org; Fri, 18 Dec 2009 06:01:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:25998) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NLaaG-0004DO-9k for qemu-devel@nongnu.org; Fri, 18 Dec 2009 06:01:20 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBIB1JYs019824 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 18 Dec 2009 06:01:19 -0500 Received: from zweiblum.home.kraxel.org (vpn1-6-184.ams2.redhat.com [10.36.6.184]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBIB1FiN017474; Fri, 18 Dec 2009 06:01:15 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id D39B370FCD; Fri, 18 Dec 2009 12:01:14 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org, seabios@seabios.org Date: Fri, 18 Dec 2009 12:01:09 +0100 Message-Id: <1261134074-11795-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1261134074-11795-1-git-send-email-kraxel@redhat.com> References: <1261134074-11795-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 3/8] fw_cfg: make calls typesafe 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/fw_cfg.c | 26 ++++++++++++-------------- hw/fw_cfg.h | 16 +++++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c index b25afff..2e3662d 100644 --- a/hw/fw_cfg.c +++ b/hw/fw_cfg.c @@ -45,11 +45,11 @@ typedef struct _FWCfgEntry { FWCfgCallback callback; } FWCfgEntry; -typedef struct _FWCfgState { +struct _FWCfgState { FWCfgEntry entries[2][FW_CFG_MAX_ENTRY]; uint16_t cur_entry; uint32_t cur_offset; -} FWCfgState; +}; static void fw_cfg_write(FWCfgState *s, uint8_t value) { @@ -210,9 +210,8 @@ static const VMStateDescription vmstate_fw_cfg = { } }; -int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint32_t len) +int fw_cfg_add_bytes(FWCfgState *s, uint16_t key, uint8_t *data, uint32_t len) { - FWCfgState *s = opaque; int arch = !!(key & FW_CFG_ARCH_LOCAL); key &= FW_CFG_ENTRY_MASK; @@ -226,37 +225,36 @@ int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint32_t len) return 1; } -int fw_cfg_add_i16(void *opaque, uint16_t key, uint16_t value) +int fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value) { uint16_t *copy; copy = qemu_malloc(sizeof(value)); *copy = cpu_to_le16(value); - return fw_cfg_add_bytes(opaque, key, (uint8_t *)copy, sizeof(value)); + return fw_cfg_add_bytes(s, key, (uint8_t *)copy, sizeof(value)); } -int fw_cfg_add_i32(void *opaque, uint16_t key, uint32_t value) +int fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value) { uint32_t *copy; copy = qemu_malloc(sizeof(value)); *copy = cpu_to_le32(value); - return fw_cfg_add_bytes(opaque, key, (uint8_t *)copy, sizeof(value)); + return fw_cfg_add_bytes(s, key, (uint8_t *)copy, sizeof(value)); } -int fw_cfg_add_i64(void *opaque, uint16_t key, uint64_t value) +int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value) { uint64_t *copy; copy = qemu_malloc(sizeof(value)); *copy = cpu_to_le64(value); - return fw_cfg_add_bytes(opaque, key, (uint8_t *)copy, sizeof(value)); + return fw_cfg_add_bytes(s, key, (uint8_t *)copy, sizeof(value)); } -int fw_cfg_add_callback(void *opaque, uint16_t key, FWCfgCallback callback, +int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback, void *callback_opaque, uint8_t *data, size_t len) { - FWCfgState *s = opaque; int arch = !!(key & FW_CFG_ARCH_LOCAL); if (!(key & FW_CFG_WRITE_CHANNEL)) @@ -275,8 +273,8 @@ int fw_cfg_add_callback(void *opaque, uint16_t key, FWCfgCallback callback, return 1; } -void *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, - target_phys_addr_t ctl_addr, target_phys_addr_t data_addr) +FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, + target_phys_addr_t ctl_addr, target_phys_addr_t data_addr) { FWCfgState *s; int io_ctl_memory, io_data_memory; diff --git a/hw/fw_cfg.h b/hw/fw_cfg.h index 7070c94..b06665e 100644 --- a/hw/fw_cfg.h +++ b/hw/fw_cfg.h @@ -37,14 +37,16 @@ #ifndef NO_QEMU_PROTOS typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); -int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint32_t len); -int fw_cfg_add_i16(void *opaque, uint16_t key, uint16_t value); -int fw_cfg_add_i32(void *opaque, uint16_t key, uint32_t value); -int fw_cfg_add_i64(void *opaque, uint16_t key, uint64_t value); -int fw_cfg_add_callback(void *opaque, uint16_t key, FWCfgCallback callback, +typedef struct _FWCfgState FWCfgState; +int fw_cfg_add_bytes(FWCfgState *s, uint16_t key, uint8_t *data, uint32_t len); +int fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value); +int fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value); +int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value); +int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback, void *callback_opaque, uint8_t *data, size_t len); -void *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, - target_phys_addr_t crl_addr, target_phys_addr_t data_addr); +int fw_cfg_add_file(FWCfgState *s, uint8_t type, uint8_t *data, uint32_t len); +FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, + target_phys_addr_t crl_addr, target_phys_addr_t data_addr); #endif /* NO_QEMU_PROTOS */