diff options
| author | Peter Maydell | 2018-06-19 17:57:43 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-19 17:57:43 +0200 |
| commit | 727f8d87aaf8588fd6510ce310e61f757d3e7c46 (patch) | |
| tree | 76d8ea35289bb035e5e0df6047e5226476a47391 /hw | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | hw/isa/smc37c669: Change the parallel I/O base to 378H (diff) | |
| download | qemu-727f8d87aaf8588fd6510ce310e61f757d3e7c46.tar.gz qemu-727f8d87aaf8588fd6510ce310e61f757d3e7c46.tar.xz qemu-727f8d87aaf8588fd6510ce310e61f757d3e7c46.zip | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/isa/smc37c669-superio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/isa/smc37c669-superio.c b/hw/isa/smc37c669-superio.c index aa233c6967..64466a9373 100644 --- a/hw/isa/smc37c669-superio.c +++ b/hw/isa/smc37c669-superio.c @@ -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) |