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

Fix keyboard serial and mouse bugs 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2709 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2007-04-20 19:35:25 +00:00
parent 19221bdaf8
commit b9652ca3a5
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hw/slavio_serial.c
View File

@ -222,8 +222,6 @@ static inline void clr_rxint(ChannelState *s)
} }
if (s->txint) if (s->txint)
set_txint(s); set_txint(s);
else
s->rregs[2] = 6;
slavio_serial_update_irq(s); slavio_serial_update_irq(s);
} }
@ -237,30 +235,39 @@ static inline void set_rxint(ChannelState *s)
s->otherchn->rregs[2] = 0x30; s->otherchn->rregs[2] = 0x30;
else else
s->otherchn->rregs[2] = 0x0c; s->otherchn->rregs[2] = 0x0c;
s->rregs[3] |= 0x20;
} else { } else {
if (s->wregs[9] & 0x10) if (s->wregs[9] & 0x10)
s->rregs[2] = 0x20; s->rregs[2] = 0x20;
else else
s->rregs[2] = 0x04; s->rregs[2] = 0x04;
s->otherchn->rregs[3] |= 4;
} }
slavio_serial_update_irq(s);
} }
if (s->chn == chn_a)
s->rregs[3] |= 0x20;
else
s->otherchn->rregs[3] |= 4;
slavio_serial_update_irq(s);
} }
static inline void clr_txint(ChannelState *s) static inline void clr_txint(ChannelState *s)
{ {
s->txint = 0; s->txint = 0;
s->txint_under_svc = 0; s->txint_under_svc = 0;
if (s->chn == chn_a) if (s->chn == chn_a) {
if (s->wregs[9] & 0x10)
s->otherchn->rregs[2] = 0x60;
else
s->otherchn->rregs[2] = 0x06;
s->rregs[3] &= ~0x10; s->rregs[3] &= ~0x10;
else } else {
if (s->wregs[9] & 0x10)
s->rregs[2] = 0x60;
else
s->rregs[2] = 0x06;
s->otherchn->rregs[3] &= ~2; s->otherchn->rregs[3] &= ~2;
}
if (s->rxint) if (s->rxint)
set_rxint(s); set_rxint(s);
else
s->rregs[2] = 6;
slavio_serial_update_irq(s); slavio_serial_update_irq(s);
} }
@ -269,13 +276,20 @@ static inline void set_txint(ChannelState *s)
s->txint = 1; s->txint = 1;
if (!s->rxint_under_svc) { if (!s->rxint_under_svc) {
s->txint_under_svc = 1; s->txint_under_svc = 1;
if (s->chn == chn_a) if (s->chn == chn_a) {
s->rregs[3] |= 0x10; if (s->wregs[9] & 0x10)
else s->otherchn->rregs[2] = 0x10;
s->otherchn->rregs[3] |= 2; else
s->rregs[2] = 0; s->otherchn->rregs[2] = 0x08;
slavio_serial_update_irq(s); } else {
s->rregs[2] = 0;
}
} }
if (s->chn == chn_a)
s->rregs[3] |= 0x10;
else
s->otherchn->rregs[3] |= 2;
slavio_serial_update_irq(s);
} }
static void slavio_serial_update_parameters(ChannelState *s) static void slavio_serial_update_parameters(ChannelState *s)