mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file

Browse Source 
We are going to require the macro from other files, too, so move
this #define to the header file.

Message-Id: <20230512124033.502654-9-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2023-05-10 21:22:50 +02:00
parent cf2528a536
commit 963e94a97b
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/char/parallel-isa.c
View File

@ -21,7 +21,7 @@ static void parallel_init(ISABus *bus, int index, Chardev *chr)
DeviceState *dev; DeviceState *dev;
ISADevice *isadev; ISADevice *isadev;
isadev = isa_new("isa-parallel"); isadev = isa_new(TYPE_ISA_PARALLEL);
dev = DEVICE(isadev); dev = DEVICE(isadev);
qdev_prop_set_uint32(dev, "index", index); qdev_prop_set_uint32(dev, "index", index);
qdev_prop_set_chr(dev, "chardev", chr); qdev_prop_set_chr(dev, "chardev", chr);

1
hw/char/parallel.c
View File

@ -93,7 +93,6 @@ typedef struct ParallelState {
PortioList portio_list; PortioList portio_list;
} ParallelState; } ParallelState;
#define TYPE_ISA_PARALLEL "isa-parallel"
OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL) OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL)
struct ISAParallelState { struct ISAParallelState {

3
hw/isa/isa-superio.c
View File

@ -16,6 +16,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "chardev/char.h" #include "chardev/char.h"
#include "hw/char/parallel.h"
#include "hw/block/fdc.h" #include "hw/block/fdc.h"
#include "hw/isa/superio.h" #include "hw/isa/superio.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
@ -51,7 +52,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)
} else { } else {
name = g_strdup_printf("parallel%d", i); name = g_strdup_printf("parallel%d", i);
} }
isa = isa_new("isa-parallel"); isa = isa_new(TYPE_ISA_PARALLEL);
d = DEVICE(isa); d = DEVICE(isa);
qdev_prop_set_uint32(d, "index", i); qdev_prop_set_uint32(d, "index", i);
if (k->parallel.get_iobase) { if (k->parallel.get_iobase) {

2
include/hw/char/parallel.h
View File

@ -4,6 +4,8 @@
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "chardev/char.h" #include "chardev/char.h"
#define TYPE_ISA_PARALLEL "isa-parallel"
void parallel_hds_isa_init(ISABus *bus, int n); void parallel_hds_isa_init(ISABus *bus, int n);
bool parallel_mm_init(MemoryRegion *address_space, bool parallel_mm_init(MemoryRegion *address_space,