diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/hw.h | 5 | ||||
| -rw-r--r-- | hw/isa.h | 8 |
2 files changed, 3 insertions, 10 deletions
diff --git a/hw/hw.h b/hw/hw.h index 2e43c1fe3d..a424d28f8e 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -10,6 +10,7 @@ #include "cpu-common.h" #endif +#include "ioport.h" #include "irq.h" /* VM Load/Save */ @@ -266,8 +267,4 @@ void qemu_register_reset(QEMUResetHandler *func, void *opaque); typedef int QEMUBootSetHandler(void *opaque, const char *boot_device); void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque); -/* These should really be in isa.h, but are here to make pc.h happy. */ -typedef void (IOPortWriteFunc)(void *opaque, uint32_t address, uint32_t data); -typedef uint32_t (IOPortReadFunc)(void *opaque, uint32_t address); - #endif diff --git a/hw/isa.h b/hw/isa.h index a8c1a56a45..f126eccb14 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -2,13 +2,9 @@ #define HW_ISA_H /* ISA bus */ -extern target_phys_addr_t isa_mem_base; +#include "ioport.h" -int register_ioport_read(int start, int length, int size, - IOPortReadFunc *func, void *opaque); -int register_ioport_write(int start, int length, int size, - IOPortWriteFunc *func, void *opaque); -void isa_unassign_ioport(int start, int length); +extern target_phys_addr_t isa_mem_base; void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size); |