ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
balrog 2008-02-10 13:34:48 +00:00
parent 7bedce8d85
commit 52ccc5e0c5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/e1000.c
View File

@ -27,7 +27,6 @@
#include "pci.h" #include "pci.h"
#include "net.h" #include "net.h"
#define __iomem
#include "e1000_hw.h" #include "e1000_hw.h"
#define DEBUG #define DEBUG

3
hw/parallel.c
View File

@ -101,6 +101,7 @@ parallel_ioport_write_sw(void *opaque, uint32_t addr, uint32_t val)
parallel_update_irq(s); parallel_update_irq(s);
break; break;
case PARA_REG_CTR: case PARA_REG_CTR:
val |= 0xc0;
if ((val & PARA_CTR_INIT) == 0 ) { if ((val & PARA_CTR_INIT) == 0 ) {
s->status = PARA_STS_BUSY; s->status = PARA_STS_BUSY;
s->status |= PARA_STS_ACK; 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_ACK;
s->status |= PARA_STS_ONLINE; s->status |= PARA_STS_ONLINE;
s->status |= PARA_STS_ERROR; s->status |= PARA_STS_ERROR;
s->status |= PARA_STS_TMOUT;
s->control = PARA_CTR_SELECT; s->control = PARA_CTR_SELECT;
s->control |= PARA_CTR_INIT; s->control |= PARA_CTR_INIT;
s->control |= 0xc0;
s->irq = irq; s->irq = irq;
s->irq_pending = 0; s->irq_pending = 0;
s->chr = chr; s->chr = chr;