[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/6] hw/char/parallel-isa: Export ISAParallelState
From: |
Bernhard Beschow |
Subject: |
[PATCH v2 5/6] hw/char/parallel-isa: Export ISAParallelState |
Date: |
Sun, 21 May 2023 14:30:48 +0200 |
In order to replace string literals with the TYPE_ISA_PARALLEL macro we need to
export the whole structure as well.
Suggested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
include/hw/char/parallel-isa.h | 46 ++++++++++++++++++++++++++++++++++
hw/char/parallel.c | 13 +---------
2 files changed, 47 insertions(+), 12 deletions(-)
create mode 100644 include/hw/char/parallel-isa.h
diff --git a/include/hw/char/parallel-isa.h b/include/hw/char/parallel-isa.h
new file mode 100644
index 0000000000..27bdacf1a3
--- /dev/null
+++ b/include/hw/char/parallel-isa.h
@@ -0,0 +1,46 @@
+/*
+ * QEMU ISA Parallel PORT emulation
+ *
+ * Copyright (c) 2003-2005 Fabrice Bellard
+ * Copyright (c) 2007 Marko Kohtala
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef HW_PARALLEL_ISA_H
+#define HW_PARALLEL_ISA_H
+
+#include "parallel.h"
+
+#include "hw/isa/isa.h"
+#include "qom/object.h"
+
+#define TYPE_ISA_PARALLEL "isa-parallel"
+OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL)
+
+struct ISAParallelState {
+ ISADevice parent_obj;
+
+ uint32_t index;
+ uint32_t iobase;
+ uint32_t isairq;
+ ParallelState state;
+};
+
+#endif /* HW_PARALLEL_ISA_H */
diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index 522301f43a..d89f750cc1 100644
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -31,6 +31,7 @@
#include "hw/qdev-properties.h"
#include "hw/qdev-properties-system.h"
#include "migration/vmstate.h"
+#include "hw/char/parallel-isa.h"
#include "hw/char/parallel.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
@@ -51,18 +52,6 @@
#define PARA_REG_EPP_ADDR 3
#define PARA_REG_EPP_DATA 4
-#define TYPE_ISA_PARALLEL "isa-parallel"
-OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL)
-
-struct ISAParallelState {
- ISADevice parent_obj;
-
- uint32_t index;
- uint32_t iobase;
- uint32_t isairq;
- ParallelState state;
-};
-
static void parallel_update_irq(ParallelState *s)
{
if (s->irq_pending)
--
2.40.1
- [PATCH v2 0/6] Trivial cleanups, Bernhard Beschow, 2023/05/21
- [PATCH v2 3/6] hw/isa/i82378: Remove unused "io" attribute, Bernhard Beschow, 2023/05/21
- [PATCH v2 5/6] hw/char/parallel-isa: Export ISAParallelState,
Bernhard Beschow <=
- [PATCH v2 4/6] hw/char/parallel: Export ParallelState, Bernhard Beschow, 2023/05/21
- [PATCH v2 2/6] hw/arm/omap: Remove unused omap_uart_attach(), Bernhard Beschow, 2023/05/21
- [PATCH v2 6/6] hw/char/parallel: Replace string literals by TYPE_ISA_PARALLEL macro, Bernhard Beschow, 2023/05/21
- [PATCH v2 1/6] hw/timer/i8254_common: Share "iobase" property via base class, Bernhard Beschow, 2023/05/21