Commit c6441452 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8f970eff 9939375c

hw/audio/sb16.c

+2 −2
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ static IO_READ_PROTO (dsp_read) 
        retval = (!s->out_data_len || s->highspeed) ? 0 : 0x80;

        if (s->mixer_regs[0x82] & 1) {

            ack = 1;

            s->mixer_regs[0x82] &= 1;

            s->mixer_regs[0x82] &= ~1;

            qemu_irq_lower (s->pic);

        }

        break;
@@ -1008,7 +1008,7 @@ static IO_READ_PROTO (dsp_read) 
        retval = 0xff;

        if (s->mixer_regs[0x82] & 2) {

            ack = 1;

            s->mixer_regs[0x82] &= 2;

            s->mixer_regs[0x82] &= ~2;

            qemu_irq_lower (s->pic);

        }

        break;