mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 15:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

hw/char/parallel: Move portio_list from ParallelState to ISAParallelState

Browse Source 
ParallelState::portio_list isn't used inside ParallelState context but only
inside ISAParallelState context, so move it there.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <20240114123911.4877-4-shentey@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Bernhard Beschow
2024-01-14 13:39:03 +01:00
committed by Michael S. Tsirkin
parent ff453ce281
commit ee3d1f1b46
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/char/parallel.c
View File

@ -532,7 +532,7 @@ static void parallel_isa_realizefn(DeviceState *dev, Error **errp)
s->status = dummy; s->status = dummy;
} }
isa_register_portio_list(isadev, &s->portio_list, base, isa_register_portio_list(isadev, &isa->portio_list, base,
(s->hw_driver (s->hw_driver
? &isa_parallel_portio_hw_list[0] ? &isa_parallel_portio_hw_list[0]
: &isa_parallel_portio_sw_list[0]), : &isa_parallel_portio_sw_list[0]),

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

@ -12,6 +12,7 @@
#include "parallel.h" #include "parallel.h"
#include "exec/ioport.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "qom/object.h" #include "qom/object.h"
@ -25,6 +26,7 @@ struct ISAParallelState {
uint32_t iobase; uint32_t iobase;
uint32_t isairq; uint32_t isairq;
ParallelState state; ParallelState state;
PortioList portio_list;
}; };
#endif /* HW_PARALLEL_ISA_H */ #endif /* HW_PARALLEL_ISA_H */

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

@ -1,7 +1,6 @@
#ifndef HW_PARALLEL_H #ifndef HW_PARALLEL_H
#define HW_PARALLEL_H #define HW_PARALLEL_H
#include "exec/ioport.h"
#include "exec/memory.h" #include "exec/memory.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/irq.h" #include "hw/irq.h"
@ -22,7 +21,6 @@ typedef struct ParallelState {
uint32_t last_read_offset; /* For debugging */ uint32_t last_read_offset; /* For debugging */
/* Memory-mapped interface */ /* Memory-mapped interface */
int it_shift; int it_shift;
PortioList portio_list;
} ParallelState; } ParallelState;
void parallel_hds_isa_init(ISABus *bus, int n); void parallel_hds_isa_init(ISABus *bus, int n);