From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcHP5-0002FT-BK for qemu-devel@nongnu.org; Sun, 29 Mar 2015 13:53:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcHP4-0003af-Dy for qemu-devel@nongnu.org; Sun, 29 Mar 2015 13:53:43 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 29 Mar 2015 19:53:18 +0200 Message-Id: <1427651603-9210-4-git-send-email-afaerber@suse.de> In-Reply-To: <1427651603-9210-1-git-send-email-afaerber@suse.de> References: <1427651603-9210-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH RFC for-2.3? 3/8] serial: Move ISASerialState to header List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, armbru@redhat.com, hpoussin@reactos.org, qemu-ppc@nongnu.org, jsnow@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= To be used for embedding the device. Add gtk-doc private/public markers for parent field. Signed-off-by: Andreas F=C3=A4rber --- hw/char/serial-isa.c | 12 ------------ include/hw/char/serial.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index f3db024..ae2235b 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -24,18 +24,6 @@ */ =20 #include "hw/char/serial.h" -#include "hw/isa/isa.h" - -#define ISA_SERIAL(obj) OBJECT_CHECK(ISASerialState, (obj), TYPE_ISA_SER= IAL) - -typedef struct ISASerialState { - ISADevice parent_obj; - - uint32_t index; - uint32_t iobase; - uint32_t isairq; - SerialState state; -} ISASerialState; =20 static const int isa_serial_io[MAX_SERIAL_PORTS] =3D { 0x3f8, 0x2f8, 0x3e8, 0x2e8 diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index 15beb6b..77cb95f 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -26,6 +26,7 @@ #define HW_SERIAL_H 1 =20 #include "hw/hw.h" +#include "hw/isa/isa.h" #include "sysemu/sysemu.h" #include "exec/memory.h" #include "qemu/fifo8.h" @@ -92,6 +93,19 @@ SerialState *serial_mm_init(MemoryRegion *address_spac= e, =20 /* serial-isa.c */ #define TYPE_ISA_SERIAL "isa-serial" +#define ISA_SERIAL(obj) OBJECT_CHECK(ISASerialState, (obj), TYPE_ISA_SER= IAL) + +typedef struct ISASerialState { + /*< private >*/ + ISADevice parent_obj; + /*< public >*/ + + uint32_t index; + uint32_t iobase; + uint32_t isairq; + SerialState state; +} ISASerialState; + void serial_hds_isa_init(ISABus *bus, int n); =20 #endif --=20 2.1.4