Upstream: Move ioport code to ioport.[hc]

Change-Id: I41aa30fff127338665a6a32fa66dcd43dd3bfe8b

2 files changed, 3 insertions, 11 deletions

diff --git a/hw/hw.h b/hw/hw.h
index 89c0ef0..b987097 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -35,6 +35,7 @@ typedef int (QEMUFileRateLimit)(void *opaque);
  * the old rate otherwise
  */
 typedef size_t (QEMUFileSetRateLimit)(void *opaque, size_t new_rate);
+typedef size_t (QEMUFileGetRateLimit)(void *opaque);
 
 QEMUFile *qemu_fopen_ops(void *opaque, QEMUFilePutBufferFunc *put_buffer,
                          QEMUFileGetBufferFunc *get_buffer,
@@ -260,8 +261,4 @@ void qemu_register_reset(QEMUResetHandler *func, int order, 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 a8c1a56..f00a993 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -2,13 +2,8 @@
 #define HW_ISA_H
 /* ISA bus */
 
-extern target_phys_addr_t isa_mem_base;
-
-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);
+#include "ioport.h"
+#include "qdev.h"
 
 void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size);