qerror: don't delay error message construction

[qemu.git] / ioport.h

diff --git a/ioport.h b/ioport.h
index a7a61f75239bf8b55b226bf4c8ce07afd267f9eb..23441cba088d3e865e7d49889100df1714cc5565 100644 (file)
--- a/ioport.h
+++ b/ioport.h
@@ -25,8 +25,9 @@
 #define IOPORT_H
 
 #include "qemu-common.h"
+#include "iorange.h"
 
-typedef uint32_t a_pio_addr;
+typedef uint32_t pio_addr_t;
 #define FMT_pioaddr     PRIx32
 
 #define MAX_IOPORTS     (64 * 1024)
@@ -35,19 +36,43 @@ typedef uint32_t a_pio_addr;
 /* 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);
+typedef void (IOPortDestructor)(void *opaque);
 
-int register_ioport_read(a_pio_addr start, int length, int size,
+void ioport_register(IORange *iorange);
+int register_ioport_read(pio_addr_t start, int length, int size,
                          IOPortReadFunc *func, void *opaque);
-int register_ioport_write(a_pio_addr start, int length, int size,
+int register_ioport_write(pio_addr_t start, int length, int size,
                           IOPortWriteFunc *func, void *opaque);
-void isa_unassign_ioport(a_pio_addr start, int length);
+void isa_unassign_ioport(pio_addr_t start, int length);
+bool isa_is_ioport_assigned(pio_addr_t start);
 
+void cpu_outb(pio_addr_t addr, uint8_t val);
+void cpu_outw(pio_addr_t addr, uint16_t val);
+void cpu_outl(pio_addr_t addr, uint32_t val);
+uint8_t cpu_inb(pio_addr_t addr);
+uint16_t cpu_inw(pio_addr_t addr);
+uint32_t cpu_inl(pio_addr_t addr);
 
-void cpu_outb(a_pio_addr addr, uint8_t val);
-void cpu_outw(a_pio_addr addr, uint16_t val);
-void cpu_outl(a_pio_addr addr, uint32_t val);
-uint8_t cpu_inb(a_pio_addr addr);
-uint16_t cpu_inw(a_pio_addr addr);
-uint32_t cpu_inl(a_pio_addr addr);
+struct MemoryRegion;
+struct MemoryRegionPortio;
+
+typedef struct PortioList {
+    const struct MemoryRegionPortio *ports;
+    struct MemoryRegion *address_space;
+    unsigned nr;
+    struct MemoryRegion **regions;
+    struct MemoryRegion **aliases;
+    void *opaque;
+    const char *name;
+} PortioList;
+
+void portio_list_init(PortioList *piolist,
+                      const struct MemoryRegionPortio *callbacks,
+                      void *opaque, const char *name);
+void portio_list_destroy(PortioList *piolist);
+void portio_list_add(PortioList *piolist,
+                     struct MemoryRegion *address_space,
+                     uint32_t addr);
+void portio_list_del(PortioList *piolist);
 
 #endif /* IOPORT_H */