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

lm32: milkymist fixes and MAINTAINER update 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlSi2LcACgkQEdFA3D+Yo3hXxwCeIbljHO3iJxqCs3/hI0TfeFOe
 TcIAnAv/LUHGz6ook7SoD+Vk3uyzQGXA
 =p0xG
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-01-09 15:38:20 +00:00
parent 59a0419856 4eab7a0a23
commit 7d010ae9e0
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MAINTAINERS
View File

@ -98,8 +98,12 @@ LM32
M: Michael Walle <michael@walle.cc> M: Michael Walle <michael@walle.cc>
S: Maintained S: Maintained
F: target-lm32/ F: target-lm32/
F: disas/lm32.c
F: hw/lm32/ 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/ F: tests/tcg/lm32/
M68K M68K

19
hw/input/milkymist-softusb.c
View File

@ -194,10 +194,13 @@ static void softusb_kbd_hid_datain(HIDState *hs)
return; 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) { if (len == 8) {
softusb_kbd_changed(s); softusb_kbd_changed(s);
}
} }
} }
@ -212,11 +215,13 @@ static void softusb_mouse_hid_datain(HIDState *hs)
return; return;
} }
len = hid_pointer_poll(hs, s->mouse_hid_buffer, while (hid_has_events(hs)) {
sizeof(s->mouse_hid_buffer)); len = hid_pointer_poll(hs, s->mouse_hid_buffer,
sizeof(s->mouse_hid_buffer));
if (len == 4) { if (len == 4) {
softusb_mouse_changed(s); softusb_mouse_changed(s);
}
} }
} }