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

diff --git a/hw/e1000.c b/hw/e1000.c
index be7474f7b9e9b09890b4cc5c26b47feb96d53958..943f25f2855062382f74fe9115ed1f52ba45978a 100644 (file)
--- 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 5d99e7655b9068c1b426eaa8cd3847cc37d258b5..8402eadf9b1b79825d28f4c05c94295c04aca738 100644 (file)
--- 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;