serial interrupt fix (Hampa Hug)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1049 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/serial.c b/hw/serial.c
index 0fc1ccb9d0d8c367c9b9ede803c88b75dce39c72..3fe482c3913e7f98080b66f36ea13186d1a9b133 100644 (file)
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -133,7 +133,10 @@ static void serial_ioport_write(void *opaque, uint32_t addr, uint32_t val)
         if (s->lcr & UART_LCR_DLAB) {
             s->divider = (s->divider & 0x00ff) | (val << 8);
         } else {
-            s->ier = val;
+            s->ier = val & 0x0f;
+            if (s->lsr & UART_LSR_THRE) {
+                s->thr_ipending = 1;
+            }
             serial_update_irq(s);
         }
         break;
@@ -143,7 +146,7 @@ static void serial_ioport_write(void *opaque, uint32_t addr, uint32_t val)
         s->lcr = val;
         break;
     case 4:
-        s->mcr = val;
+        s->mcr = val & 0x1f;
         break;
     case 5:
         break;