Commit 7d010ae9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mwalle/tags/lm32-fixes/20141229' into staging 



lm32: milkymist fixes and MAINTAINER update

# gpg: Signature made Tue 30 Dec 2014 16:54:15 GMT using DSA key ID 3F98A378
# gpg: Can't check signature: public key not found

* remotes/mwalle/tags/lm32-fixes/20141229:
  MAINTAINERS: add myself to lm32 and milkymist
  milkymist: softmmu: fix event handling

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 59a04198 4eab7a0a

MAINTAINERS

+5 −1
Original line number Diff line number Diff line
@@ -98,8 +98,12 @@ LM32 
M: Michael Walle <michael@walle.cc>

S: Maintained

F: target-lm32/

F: disas/lm32.c

F: hw/lm32/

F: hw/char/lm32_*

F: hw/*/lm32_*

F: hw/*/milkymist-*

F: include/hw/char/lm32_juart.h

F: include/hw/lm32/

F: tests/tcg/lm32/



M68K

hw/input/milkymist-softusb.c

+12 −7
Original line number Diff line number Diff line
@@ -194,12 +194,15 @@ static void softusb_kbd_hid_datain(HIDState *hs) 
        return;

    }



    len = hid_keyboard_poll(hs, s->kbd_hid_buffer, sizeof(s->kbd_hid_buffer));

    while (hid_has_events(hs)) {

        len = hid_keyboard_poll(hs, s->kbd_hid_buffer,

                sizeof(s->kbd_hid_buffer));



        if (len == 8) {

            softusb_kbd_changed(s);

        }

    }

}



static void softusb_mouse_hid_datain(HIDState *hs)

{
@@ -212,6 +215,7 @@ static void softusb_mouse_hid_datain(HIDState *hs) 
        return;

    }



    while (hid_has_events(hs)) {

        len = hid_pointer_poll(hs, s->mouse_hid_buffer,

                sizeof(s->mouse_hid_buffer));
@@ -219,6 +223,7 @@ static void softusb_mouse_hid_datain(HIDState *hs) 
            softusb_mouse_changed(s);

        }

    }

}



static void milkymist_softusb_reset(DeviceState *d)

{