@@ -24,18 +24,6 @@
*/
#include "hw/char/serial.h"
-#include "hw/isa/isa.h"
-
-#define ISA_SERIAL(obj) OBJECT_CHECK(ISASerialState, (obj), TYPE_ISA_SERIAL)
-
-typedef struct ISASerialState {
- ISADevice parent_obj;
-
- uint32_t index;
- uint32_t iobase;
- uint32_t isairq;
- SerialState state;
-} ISASerialState;
static const int isa_serial_io[MAX_SERIAL_PORTS] = {
0x3f8, 0x2f8, 0x3e8, 0x2e8
@@ -26,6 +26,7 @@
#define HW_SERIAL_H 1
#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_space,
/* serial-isa.c */
#define TYPE_ISA_SERIAL "isa-serial"
+#define ISA_SERIAL(obj) OBJECT_CHECK(ISASerialState, (obj), TYPE_ISA_SERIAL)
+
+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);
#endif
To be used for embedding the device. Add gtk-doc private/public markers for parent field. Signed-off-by: Andreas Färber <afaerber@suse.de> --- hw/char/serial-isa.c | 12 ------------ include/hw/char/serial.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-)