From 52ccc5e0c5d6e001c51dd38755d4d577b7b51592 Mon Sep 17 00:00:00 2001 From: balrog Date: Sun, 10 Feb 2008 13:34:48 +0000 Subject: [PATCH] =?utf8?q?Fix=20parallel=20port=20software=20emulation=20(?= =?utf8?q?Herv=C3=A9=20Poussineau).=20Remove=20=5F=5Fiomem,=20also=20unuse?= =?utf8?q?d.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3971 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/e1000.c | 1 - hw/parallel.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/e1000.c b/hw/e1000.c index be7474f..943f25f 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -27,7 +27,6 @@ #include "pci.h" #include "net.h" -#define __iomem #include "e1000_hw.h" #define DEBUG diff --git a/hw/parallel.c b/hw/parallel.c index 5d99e76..8402ead 100644 --- a/hw/parallel.c +++ b/hw/parallel.c @@ -101,6 +101,7 @@ parallel_ioport_write_sw(void *opaque, uint32_t addr, uint32_t val) parallel_update_irq(s); break; case PARA_REG_CTR: + val |= 0xc0; if ((val & PARA_CTR_INIT) == 0 ) { s->status = PARA_STS_BUSY; s->status |= PARA_STS_ACK; @@ -414,8 +415,10 @@ static void parallel_reset(ParallelState *s, qemu_irq irq, CharDriverState *chr) s->status |= PARA_STS_ACK; s->status |= PARA_STS_ONLINE; s->status |= PARA_STS_ERROR; + s->status |= PARA_STS_TMOUT; s->control = PARA_CTR_SELECT; s->control |= PARA_CTR_INIT; + s->control |= 0xc0; s->irq = irq; s->irq_pending = 0; s->chr = chr; -- 2.7.4