b16: fix interrupt acknowledgement
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJUwOE1AAoJEEy22O7T6HE4Rk4P/jAriY03WoTzwhLBE8Rj9J+t 2hY9sKTmB06Kn9tbdBhC/dqS4SFqdX6K4sSumw+AxWQL08OAR4z7EOass8eXUJ9G chAsvs+98fV2jYY0IA8OO2tyQL4PK/RUjOsOtqw/AQKCNIZ4BXjsLIlbSCZ9sp5b 2i5Plqc7dkfIUT21s6Exr0YFGOgL/nSbAHa8aeHe3Iy85wG7YcEbkMKSPFYkkJhy LfnK5/LbOKzQL0xfmINJ7D8HasOhb440B+XVlr1+pNOtf8BfndMoT0N8WrimICke N+9zikUboWT53wbEct8J+4XouXJnDu/xXbQF0IRnNmZb5ThMssIjwm6DfLb1WbQY v866UdVULtEUsoQNMpoQk2WKT27Tm6afmQtZlXPcBLpAMdBxBMX/zJIgSSGS3cMZ ekhd+SMlgrjExjaXOHLo6wRp526VieRsr59CSi4hIh4vypPJ7VOQ3PM7kD4Cpr/E 54eHCJgNSUlahD3aflHT2npXwVkmn/7sF0gbKKo/Rnv482eM2Rcp8Xk+Z8E1LDVt wwC+vH/sr+r5ceWILd38cT9KPNggszmPeE3snKe36BszgBlqyjLo8l8VqjjTvxMe M8WVUdoKGxW9M8AYL0vLhqBHem+TbEmetVZs/uWPajGQaRw7h2f7OKWGIQtubYlt UP1xWuRbLSdUHWpEgorE =aqey -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20150122-1' into staging b16: fix interrupt acknowledgement # gpg: Signature made Thu 22 Jan 2015 11:38:29 GMT using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-audio-20150122-1: sb16: fix interrupt acknowledgement Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
c6441452b5
|
@ -999,7 +999,7 @@ static IO_READ_PROTO (dsp_read)
|
||||||
retval = (!s->out_data_len || s->highspeed) ? 0 : 0x80;
|
retval = (!s->out_data_len || s->highspeed) ? 0 : 0x80;
|
||||||
if (s->mixer_regs[0x82] & 1) {
|
if (s->mixer_regs[0x82] & 1) {
|
||||||
ack = 1;
|
ack = 1;
|
||||||
s->mixer_regs[0x82] &= 1;
|
s->mixer_regs[0x82] &= ~1;
|
||||||
qemu_irq_lower (s->pic);
|
qemu_irq_lower (s->pic);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1008,7 +1008,7 @@ static IO_READ_PROTO (dsp_read)
|
||||||
retval = 0xff;
|
retval = 0xff;
|
||||||
if (s->mixer_regs[0x82] & 2) {
|
if (s->mixer_regs[0x82] & 2) {
|
||||||
ack = 1;
|
ack = 1;
|
||||||
s->mixer_regs[0x82] &= 2;
|
s->mixer_regs[0x82] &= ~2;
|
||||||
qemu_irq_lower (s->pic);
|
qemu_irq_lower (s->pic);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue