mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/isa/pc87312: Use uint16_t for the ISA I/O base address

Browse Source 
This matches the isa_register_ioport() prototype.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180308223946.26784-7-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2018-03-08 23:39:27 +01:00 committed by Paolo Bonzini
parent 010d2dc473
commit 4e00105a76
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/isa/pc87312.c
View File

@ -69,9 +69,9 @@ static inline bool is_parallel_enabled(PC87312State *s)
return s->regs[REG_FER] & FER_PARALLEL_EN; return s->regs[REG_FER] & FER_PARALLEL_EN;
} }
static const uint32_t parallel_base[] = { 0x378, 0x3bc, 0x278, 0x00 }; static const uint16_t parallel_base[] = { 0x378, 0x3bc, 0x278, 0x00 };
static inline uint32_t get_parallel_iobase(PC87312State *s) static inline uint16_t get_parallel_iobase(PC87312State *s)
{ {
return parallel_base[s->regs[REG_FAR] & FAR_PARALLEL_ADDR]; return parallel_base[s->regs[REG_FAR] & FAR_PARALLEL_ADDR];
} }
@ -92,12 +92,12 @@ static inline uint32_t get_parallel_irq(PC87312State *s)
/* UARTs */ /* UARTs */
static const uint32_t uart_base[2][4] = { static const uint16_t uart_base[2][4] = {
{ 0x3e8, 0x338, 0x2e8, 0x220 }, { 0x3e8, 0x338, 0x2e8, 0x220 },
{ 0x2e8, 0x238, 0x2e0, 0x228 } { 0x2e8, 0x238, 0x2e0, 0x228 }
}; };
static inline uint32_t get_uart_iobase(PC87312State *s, int i) static inline uint16_t get_uart_iobase(PC87312State *s, int i)
{ {
int idx; int idx;
idx = (s->regs[REG_FAR] >> (2 * i + 2)) & 0x3; idx = (s->regs[REG_FAR] >> (2 * i + 2)) & 0x3;
@ -130,7 +130,7 @@ static inline bool is_fdc_enabled(PC87312State *s)
return s->regs[REG_FER] & FER_FDC_EN; return s->regs[REG_FER] & FER_FDC_EN;
} }
static inline uint32_t get_fdc_iobase(PC87312State *s) static inline uint16_t get_fdc_iobase(PC87312State *s)
{ {
return (s->regs[REG_FER] & FER_FDC_ADDR) ? 0x370 : 0x3f0; return (s->regs[REG_FER] & FER_FDC_ADDR) ? 0x370 : 0x3f0;
} }
@ -143,7 +143,7 @@ static inline bool is_ide_enabled(PC87312State *s)
return s->regs[REG_FER] & FER_IDE_EN; return s->regs[REG_FER] & FER_IDE_EN;
} }
static inline uint32_t get_ide_iobase(PC87312State *s) static inline uint16_t get_ide_iobase(PC87312State *s)
{ {
return (s->regs[REG_FER] & FER_IDE_ADDR) ? 0x170 : 0x1f0; return (s->regs[REG_FER] & FER_IDE_ADDR) ? 0x170 : 0x1f0;
} }
@ -373,7 +373,7 @@ static const VMStateDescription vmstate_pc87312 = {
}; };
static Property pc87312_properties[] = { static Property pc87312_properties[] = {
DEFINE_PROP_UINT32("iobase", PC87312State, iobase, 0x398), DEFINE_PROP_UINT16("iobase", PC87312State, iobase, 0x398),
DEFINE_PROP_UINT8("config", PC87312State, config, 1), DEFINE_PROP_UINT8("config", PC87312State, config, 1),
DEFINE_PROP_END_OF_LIST() DEFINE_PROP_END_OF_LIST()
}; };

2
include/hw/isa/pc87312.h
View File

@ -34,7 +34,7 @@
typedef struct PC87312State { typedef struct PC87312State {
ISADevice dev; ISADevice dev;
uint32_t iobase; uint16_t iobase;
uint8_t config; /* initial configuration */ uint8_t config; /* initial configuration */
struct { struct {