Message ID | 20180308223946.26784-8-f4bug@amsat.org |
---|---|
State | New |
Headers | show |
Series | remove i386/pc dependency: generic SuperIO | expand |
On 08/03/18 22:39, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/isa/pc87312.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c > index 105c23e680..fda91fed21 100644 > --- a/hw/isa/pc87312.c > +++ b/hw/isa/pc87312.c > @@ -76,9 +76,9 @@ static inline uint16_t get_parallel_iobase(PC87312State *s) > return parallel_base[s->regs[REG_FAR] & FAR_PARALLEL_ADDR]; > } > > -static const uint32_t parallel_irq[] = { 5, 7, 5, 0 }; > +static const unsigned int parallel_irq[] = { 5, 7, 5, 0 }; > > -static inline uint32_t get_parallel_irq(PC87312State *s) > +static inline unsigned int get_parallel_irq(PC87312State *s) > { > int idx; > idx = (s->regs[REG_FAR] & FAR_PARALLEL_ADDR); > @@ -110,7 +110,7 @@ static inline uint16_t get_uart_iobase(PC87312State *s, int i) > } > } > > -static inline uint32_t get_uart_irq(PC87312State *s, int i) > +static inline unsigned int get_uart_irq(PC87312State *s, int i) > { > int idx; > idx = (s->regs[REG_FAR] >> (2 * i + 2)) & 0x3; > Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> ATB, Mark.
diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 105c23e680..fda91fed21 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -76,9 +76,9 @@ static inline uint16_t get_parallel_iobase(PC87312State *s) return parallel_base[s->regs[REG_FAR] & FAR_PARALLEL_ADDR]; } -static const uint32_t parallel_irq[] = { 5, 7, 5, 0 }; +static const unsigned int parallel_irq[] = { 5, 7, 5, 0 }; -static inline uint32_t get_parallel_irq(PC87312State *s) +static inline unsigned int get_parallel_irq(PC87312State *s) { int idx; idx = (s->regs[REG_FAR] & FAR_PARALLEL_ADDR); @@ -110,7 +110,7 @@ static inline uint16_t get_uart_iobase(PC87312State *s, int i) } } -static inline uint32_t get_uart_irq(PC87312State *s, int i) +static inline unsigned int get_uart_irq(PC87312State *s, int i) { int idx; idx = (s->regs[REG_FAR] >> (2 * i + 2)) & 0x3;
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/isa/pc87312.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)