summary refs log tree commit diff stats
path: root/hw/lm32_uart.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2013-03-23 14:23:26 +0000
committerBlue Swirl <blauwirbel@gmail.com>2013-03-23 14:23:26 +0000
commitf7c61bf8fc1b05613b49d1dd2300d1a1fbc927de (patch)
tree3c25bcedc8bceaf355720888604c8c251f3c68c4 /hw/lm32_uart.c
parentd76bb73549fcac07524aea5135280ea533a94fd6 (diff)
parentb1e5fff4afd0c47148b0d9f9341887ae2c3eb9af (diff)
downloadfocaccia-qemu-f7c61bf8fc1b05613b49d1dd2300d1a1fbc927de.tar.gz
focaccia-qemu-f7c61bf8fc1b05613b49d1dd2300d1a1fbc927de.zip
Merge branch 'for-upstream' of git://github.com/mwalle/qemu
* 'for-upstream' of git://github.com/mwalle/qemu:
  configure: rename OpenGL feature to GLX
  configure: proper OpenGL/GLX probe
  target-lm32: use HELPER() macro
  target-lm32: flush tlb after clearing env
  target-lm32: remove dead code
  target-lm32: fix cmpgui and cmpgeui opcodes
  tests: tcg: lm32: add more test cases
  target-lm32: don't log cpu state in translation
  lm32_uart: fix receive buffering
  milkymist-uart: fix receive buffering
  lm32-dis: fix NULL pointer dereference
  target-lm32: fix debug memory access
Diffstat (limited to 'hw/lm32_uart.c')
-rw-r--r--hw/lm32_uart.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/lm32_uart.c b/hw/lm32_uart.c
index 02f6f89174..32bc37ac96 100644
--- a/hw/lm32_uart.c
+++ b/hw/lm32_uart.c
@@ -137,6 +137,7 @@ static uint64_t uart_read(void *opaque, hwaddr addr,
         r = s->regs[R_RXTX];
         s->regs[R_LSR] &= ~LSR_DR;
         uart_update_irq(s);
+        qemu_chr_accept_input(s->chr);
         break;
     case R_IIR:
     case R_LSR: