diff options
Diffstat (limited to 'ioport.c')
| -rw-r--r-- | ioport.c | 37 |
1 files changed, 18 insertions, 19 deletions
@@ -136,7 +136,7 @@ static int ioport_bsize(int size, int *bsize) } /* size is the word size in byte */ -int register_ioport_read(int start, int length, int size, +int register_ioport_read(pio_addr_t start, int length, int size, IOPortReadFunc *func, void *opaque) { int i, bsize; @@ -155,7 +155,7 @@ int register_ioport_read(int start, int length, int size, } /* size is the word size in byte */ -int register_ioport_write(int start, int length, int size, +int register_ioport_write(pio_addr_t start, int length, int size, IOPortWriteFunc *func, void *opaque) { int i, bsize; @@ -173,7 +173,7 @@ int register_ioport_write(int start, int length, int size, return 0; } -void isa_unassign_ioport(int start, int length) +void isa_unassign_ioport(pio_addr_t start, int length) { int i; @@ -192,9 +192,9 @@ void isa_unassign_ioport(int start, int length) /***********************************************************/ -void cpu_outb(CPUState *env, int addr, int val) +void cpu_outb(CPUState *env, pio_addr_t addr, uint8_t val) { - LOG_IOPORT("outb: %04x %02x\n", addr, val); + LOG_IOPORT("outb: %04"FMT_pioaddr" %02"PRIx8"\n", addr, val); ioport_write(0, addr, val); #ifdef CONFIG_KQEMU if (env) @@ -202,9 +202,9 @@ void cpu_outb(CPUState *env, int addr, int val) #endif } -void cpu_outw(CPUState *env, int addr, int val) +void cpu_outw(CPUState *env, pio_addr_t addr, uint16_t val) { - LOG_IOPORT("outw: %04x %04x\n", addr, val); + LOG_IOPORT("outw: %04"FMT_pioaddr" %04"PRIx16"\n", addr, val); ioport_write(1, addr, val); #ifdef CONFIG_KQEMU if (env) @@ -212,9 +212,9 @@ void cpu_outw(CPUState *env, int addr, int val) #endif } -void cpu_outl(CPUState *env, int addr, int val) +void cpu_outl(CPUState *env, pio_addr_t addr, uint32_t val) { - LOG_IOPORT("outl: %04x %08x\n", addr, val); + LOG_IOPORT("outl: %04"FMT_pioaddr" %08"PRIx32"\n", addr, val); ioport_write(2, addr, val); #ifdef CONFIG_KQEMU if (env) @@ -222,11 +222,11 @@ void cpu_outl(CPUState *env, int addr, int val) #endif } -int cpu_inb(CPUState *env, int addr) +uint8_t cpu_inb(CPUState *env, pio_addr_t addr) { - int val; + uint8_t val; val = ioport_read(0, addr); - LOG_IOPORT("inb : %04x %02x\n", addr, val); + LOG_IOPORT("inb : %04"FMT_pioaddr" %02"PRIx8"\n", addr, val); #ifdef CONFIG_KQEMU if (env) env->last_io_time = cpu_get_time_fast(); @@ -234,11 +234,11 @@ int cpu_inb(CPUState *env, int addr) return val; } -int cpu_inw(CPUState *env, int addr) +uint16_t cpu_inw(CPUState *env, pio_addr_t addr) { - int val; + uint16_t val; val = ioport_read(1, addr); - LOG_IOPORT("inw : %04x %04x\n", addr, val); + LOG_IOPORT("inw : %04"FMT_pioaddr" %04"PRIx16"\n", addr, val); #ifdef CONFIG_KQEMU if (env) env->last_io_time = cpu_get_time_fast(); @@ -246,15 +246,14 @@ int cpu_inw(CPUState *env, int addr) return val; } -int cpu_inl(CPUState *env, int addr) +uint32_t cpu_inl(CPUState *env, pio_addr_t addr) { - int val; + uint32_t val; val = ioport_read(2, addr); - LOG_IOPORT("inl : %04x %08x\n", addr, val); + LOG_IOPORT("inl : %04"FMT_pioaddr" %08"PRIx32"\n", addr, val); #ifdef CONFIG_KQEMU if (env) env->last_io_time = cpu_get_time_fast(); #endif return val; } - |