diff options
| author |   balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-02-10 13:34:48 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-02-10 13:34:48 +0000 |
| commit | 52ccc5e0c5d6e001c51dd38755d4d577b7b51592 (patch) | |
| tree | 3258ede46648955098eb9a7354ef0c0793bf7033 | |
| parent | Don't error out on zero-length chunks in writev, as to mimic Linux (Kirill A.... (diff) | |
| download | qemu-kvm-52ccc5e0c5d6e001c51dd38755d4d577b7b51592.tar.gz qemu-kvm-52ccc5e0c5d6e001c51dd38755d4d577b7b51592.tar.bz2 qemu-kvm-52ccc5e0c5d6e001c51dd38755d4d577b7b51592.zip | |
Fix parallel port software emulation (Hervé Poussineau).
Remove __iomem, also unused.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3971 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/e1000.c | 1 | ||||
| -rw-r--r-- | hw/parallel.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/hw/e1000.c b/hw/e1000.c index be7474f7b..943f25f28 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 5d99e7655..8402eadf9 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; |