From patchwork Sun Jan 10 15:24:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 565463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 909C6140134 for ; Mon, 11 Jan 2016 02:27:38 +1100 (AEDT) Received: from localhost ([::1]:47251 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIHu4-0006Pw-8w for incoming@patchwork.ozlabs.org; Sun, 10 Jan 2016 10:27:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIHrl-0001oI-8R for qemu-devel@nongnu.org; Sun, 10 Jan 2016 10:25:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIHri-0006Y4-Fn for qemu-devel@nongnu.org; Sun, 10 Jan 2016 10:25:13 -0500 Received: from smtp2-g21.free.fr ([212.27.42.2]:52048) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIHri-0006Wm-4c for qemu-devel@nongnu.org; Sun, 10 Jan 2016 10:25:10 -0500 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp2-g21.free.fr (Postfix) with ESMTP id 310374B01E6; Sun, 10 Jan 2016 16:24:00 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sun, 10 Jan 2016 16:24:48 +0100 Message-Id: <1452439498-21098-10-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452439498-21098-1-git-send-email-hpoussin@reactos.org> References: <1452439498-21098-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 212.27.42.2 Cc: Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH v2 09/19] i8257: move state definition to new independent header 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 We will now be able to embed the i8257 interrupt controller in another object. Signed-off-by: Hervé Poussineau --- hw/dma/i8257.c | 35 +---------------------------------- include/hw/isa/i8257.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 34 deletions(-) create mode 100644 include/hw/isa/i8257.h diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 2eb6d42..5210e0e 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -23,10 +23,10 @@ */ #include "hw/hw.h" #include "hw/isa/isa.h" +#include "hw/isa/i8257.h" #include "qemu/main-loop.h" #include "trace.h" -#define TYPE_I8257 "i8257" #define I8257(obj) \ OBJECT_CHECK(I8257State, (obj), TYPE_I8257) @@ -41,42 +41,9 @@ #define ldebug(...) #endif -typedef struct I8257Regs { - int now[2]; - uint16_t base[2]; - uint8_t mode; - uint8_t page; - uint8_t pageh; - uint8_t dack; - uint8_t eop; - DMA_transfer_handler transfer_handler; - void *opaque; -} I8257Regs; - #define ADDR 0 #define COUNT 1 -typedef struct I8257State { - ISADevice parent_obj; - - int32_t base; - int32_t page_base; - int32_t pageh_base; - int32_t dshift; - - uint8_t status; - uint8_t command; - uint8_t mask; - uint8_t flip_flop; - I8257Regs regs[4]; - MemoryRegion channel_io; - MemoryRegion cont_io; - - QEMUBH *dma_bh; - bool dma_bh_scheduled; - int running; -} I8257State; - static I8257State *dma_controllers[2]; enum { diff --git a/include/hw/isa/i8257.h b/include/hw/isa/i8257.h new file mode 100644 index 0000000..8d34ed1 --- /dev/null +++ b/include/hw/isa/i8257.h @@ -0,0 +1,42 @@ +#ifndef HW_I8257_H +#define HW_I8257_H + +#define TYPE_I8257 "i8257" + +typedef struct I8257Regs { + int now[2]; + uint16_t base[2]; + uint8_t mode; + uint8_t page; + uint8_t pageh; + uint8_t dack; + uint8_t eop; + DMA_transfer_handler transfer_handler; + void *opaque; +} I8257Regs; + +typedef struct I8257State { + /* */ + ISADevice parent_obj; + + /* */ + int32_t base; + int32_t page_base; + int32_t pageh_base; + int32_t dshift; + + uint8_t status; + uint8_t command; + uint8_t mask; + uint8_t flip_flop; + I8257Regs regs[4]; + MemoryRegion channel_io; + MemoryRegion cont_io; + + QEMUBH *dma_bh; + bool dma_bh_scheduled; + int running; +} I8257State; + +#endif +