gwj / at91sam9263 · Commits

Commit 52ccc5e0c5d6e001c51dd38755d4d577b7b51592

Authored by balrog
1 parent 7bedce8d

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
Inline Side-by-side
Showing 2 changed files with 3 additions and 1 deletions
hw/e1000.c
  View file @52ccc5e
@@ -27,7 +27,6 @@ @@ -27,7 +27,6 @@
27 #include "pci.h" 27 #include "pci.h"
28 #include "net.h" 28 #include "net.h"
29 29
30 -#define __iomem  
31 #include "e1000_hw.h" 30 #include "e1000_hw.h"
32 31
33 #define DEBUG 32 #define DEBUG
hw/parallel.c
  View file @52ccc5e
@@ -101,6 +101,7 @@ parallel_ioport_write_sw(void *opaque, uint32_t addr, uint32_t val) @@ -101,6 +101,7 @@ parallel_ioport_write_sw(void *opaque, uint32_t addr, uint32_t val)
101 parallel_update_irq(s); 101 parallel_update_irq(s);
102 break; 102 break;
103 case PARA_REG_CTR: 103 case PARA_REG_CTR:
  104 + val |= 0xc0;
104 if ((val & PARA_CTR_INIT) == 0 ) { 105 if ((val & PARA_CTR_INIT) == 0 ) {
105 s->status = PARA_STS_BUSY; 106 s->status = PARA_STS_BUSY;
106 s->status |= PARA_STS_ACK; 107 s->status |= PARA_STS_ACK;
@@ -414,8 +415,10 @@ static void parallel_reset(ParallelState *s, qemu_irq irq, CharDriverState *chr) @@ -414,8 +415,10 @@ static void parallel_reset(ParallelState *s, qemu_irq irq, CharDriverState *chr)
414 s->status |= PARA_STS_ACK; 415 s->status |= PARA_STS_ACK;
415 s->status |= PARA_STS_ONLINE; 416 s->status |= PARA_STS_ONLINE;
416 s->status |= PARA_STS_ERROR; 417 s->status |= PARA_STS_ERROR;
  418 + s->status |= PARA_STS_TMOUT;
417 s->control = PARA_CTR_SELECT; 419 s->control = PARA_CTR_SELECT;
418 s->control |= PARA_CTR_INIT; 420 s->control |= PARA_CTR_INIT;
  421 + s->control |= 0xc0;
419 s->irq = irq; 422 s->irq = irq;
420 s->irq_pending = 0; 423 s->irq_pending = 0;
421 s->chr = chr; 424 s->chr = chr;