[Qemu-devel] [PULL 0/2] lm32: milkymist fixes and MAINTAINERS update

[Qemu-devel] [PULL 0/2] lm32: milkymist fixes and MAINTAINERS update

[Michael Walle]

Hi Peter,

please pull these two commits which were posted to the ML some time ago.

---

The following changes since commit ab0302ee764fd702465aef6d88612cdff4302809:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20141223' into staging (2014-12-23 15:05:22 +0000)

are available in the git repository at:

  git://github.com/mwalle/qemu.git 

for you to fetch changes up to 4eab7a0a2394275a611a19aef6619402ad524b63:

  MAINTAINERS: add myself to lm32 and milkymist (2014-12-29 17:25:17 +0100)

----------------------------------------------------------------
Michael Walle (2):
      milkymist: softmmu: fix event handling
      MAINTAINERS: add myself to lm32 and milkymist

 MAINTAINERS                  |  6 +++++-
 hw/input/milkymist-softusb.c | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

-- 
2.1.4

[Qemu-devel] [PULL 1/2] milkymist: softmmu: fix event handling

[Michael Walle]

Keys which send more than one scancode (esp. windows key) weren't handled
correctly since commit 1ff5eedd. Two events were put into the input event
queue but only one was processed. This fixes this by fetching all pending
events in the callback handler.

Signed-off-by: Michael Walle <michael@walle.cc>
Cc: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/input/milkymist-softusb.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c
index 5a427f0..7b0f4db 100644
--- a/hw/input/milkymist-softusb.c
+++ b/hw/input/milkymist-softusb.c
@@ -194,10 +194,13 @@ 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);
+        if (len == 8) {
+            softusb_kbd_changed(s);
+        }
     }
 }
 
@@ -212,11 +215,13 @@ static void softusb_mouse_hid_datain(HIDState *hs)
         return;
     }
 
-    len = hid_pointer_poll(hs, s->mouse_hid_buffer,
-            sizeof(s->mouse_hid_buffer));
+    while (hid_has_events(hs)) {
+        len = hid_pointer_poll(hs, s->mouse_hid_buffer,
+                sizeof(s->mouse_hid_buffer));
 
-    if (len == 4) {
-        softusb_mouse_changed(s);
+        if (len == 4) {
+            softusb_mouse_changed(s);
+        }
     }
 }
 
-- 
2.1.4

[Qemu-devel] [PULL 2/2] MAINTAINERS: add myself to lm32 and milkymist

[Michael Walle]

Add myself to lm32 and milkymist files.

Signed-off-by: Michael Walle <michael@walle.cc>
---
 MAINTAINERS | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 01cfb05..7fc3cdb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
-- 
2.1.4

Re: [Qemu-devel] [PULL 0/2] lm32: milkymist fixes and MAINTAINERS update

[Michael Walle]

[-- Attachment #1: Type: text/plain, Size: 92 bytes --]

Oh sorry. Something went wrong with the pull request. I'll make a new one asap.

-michael 

[-- Attachment #2: Type: text/html, Size: 104 bytes --]

[Qemu-devel] [PULL RESEND 0/2] lm32: milkymist fixes and MAINTAINERS update

[Michael Walle]

Hi Peter,

please pull these two commits which were posted to the ML some time ago.

---

The following changes since commit ab0302ee764fd702465aef6d88612cdff4302809:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20141223' into staging (2014-12-23 15:05:22 +0000)

are available in the git repository at:

  git://github.com/mwalle/qemu.git tags/lm32-fixes/20141229

for you to fetch changes up to 4eab7a0a2394275a611a19aef6619402ad524b63:

  MAINTAINERS: add myself to lm32 and milkymist (2014-12-29 17:25:17 +0100)

----------------------------------------------------------------
Michael Walle (2):
      milkymist: softmmu: fix event handling
      MAINTAINERS: add myself to lm32 and milkymist

 MAINTAINERS                  |  6 +++++-
 hw/input/milkymist-softusb.c | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)
-- 
2.1.4

Re: [Qemu-devel] [PULL RESEND 0/2] lm32: milkymist fixes and MAINTAINERS update

[Peter Maydell]

On 30 December 2014 at 17:03, Michael Walle <michael@walle.cc> wrote:
> Hi Peter,
>
> please pull these two commits which were posted to the ML some time ago.
>
> ---
>
> The following changes since commit ab0302ee764fd702465aef6d88612cdff4302809:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20141223' into staging (2014-12-23 15:05:22 +0000)
>
> are available in the git repository at:
>
>   git://github.com/mwalle/qemu.git tags/lm32-fixes/20141229
>
> for you to fetch changes up to 4eab7a0a2394275a611a19aef6619402ad524b63:
>
>   MAINTAINERS: add myself to lm32 and milkymist (2014-12-29 17:25:17 +0100)
>

Applied, thanks.

-- PMM