Commit 727f8d87 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-axp-20180618' into staging 



Place parallel device properly, fixing vga

# gpg: Signature made Mon 18 Jun 2018 17:45:50 BST
# gpg:                using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-axp-20180618:
  hw/isa/smc37c669: Change the parallel I/O base to 378H

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0f01b9fd 75cacb12

hw/isa/smc37c669-superio.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static bool is_parallel_enabled(ISASuperIODevice *sio, uint8_t index) 


static uint16_t get_parallel_iobase(ISASuperIODevice *sio, uint8_t index)

{

    return 0x3bc;

    return 0x378;

}



static unsigned int get_parallel_irq(ISASuperIODevice *sio, uint8_t index)