[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 07/26] char/serial: cosmetic fixes.
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 07/26] char/serial: cosmetic fixes. |
Date: |
Fri, 14 Jun 2013 14:50:23 +0400 |
From: Peter Crosthwaite <address@hidden>
Some cosmetic fixes to char/serial fixing some checkpatch errors.
Cc: address@hidden
Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/char/serial.c | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 66b6348..bd6813e 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -263,8 +263,9 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition
cond, void *opaque)
if (s->tsr_retry <= 0) {
if (s->fcr & UART_FCR_FE) {
s->tsr = fifo_get(s,XMIT_FIFO);
- if (!s->xmit_fifo.count)
+ if (!s->xmit_fifo.count) {
s->lsr |= UART_LSR_THRE;
+ }
} else if ((s->lsr & UART_LSR_THRE)) {
return FALSE;
} else {
@@ -461,10 +462,11 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr
addr, unsigned size)
} else {
if(s->fcr & UART_FCR_FE) {
ret = fifo_get(s,RECV_FIFO);
- if (s->recv_fifo.count == 0)
+ if (s->recv_fifo.count == 0) {
s->lsr &= ~(UART_LSR_DR | UART_LSR_BI);
- else
+ } else {
qemu_mod_timer(s->fifo_timeout_timer, qemu_get_clock_ns
(vm_clock) + s->char_transmit_time * 4);
+ }
s->timeout_ipending = 0;
} else {
ret = s->rbr;
@@ -534,15 +536,21 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr
addr, unsigned size)
static int serial_can_receive(SerialState *s)
{
if(s->fcr & UART_FCR_FE) {
- if(s->recv_fifo.count < UART_FIFO_LENGTH)
- /* Advertise (fifo.itl - fifo.count) bytes when count < ITL, and 1 if
above. If UART_FIFO_LENGTH - fifo.count is
- advertised the effect will be to almost always fill the fifo
completely before the guest has a chance to respond,
- effectively overriding the ITL that the guest has set. */
- return (s->recv_fifo.count <= s->recv_fifo.itl) ?
s->recv_fifo.itl - s->recv_fifo.count : 1;
- else
- return 0;
+ if (s->recv_fifo.count < UART_FIFO_LENGTH) {
+ /*
+ * Advertise (fifo.itl - fifo.count) bytes when count < ITL, and 1
+ * if above. If UART_FIFO_LENGTH - fifo.count is advertised the
+ * effect will be to almost always fill the fifo completely before
+ * the guest has a chance to respond, effectively overriding the
ITL
+ * that the guest has set.
+ */
+ return (s->recv_fifo.count <= s->recv_fifo.itl) ?
+ s->recv_fifo.itl - s->recv_fifo.count : 1;
+ } else {
+ return 0;
+ }
} else {
- return !(s->lsr & UART_LSR_DR);
+ return !(s->lsr & UART_LSR_DR);
}
}
--
1.7.10.4
- [Qemu-trivial] [PULL 13/26] device tree: Fix cppcheck warning, (continued)
- [Qemu-trivial] [PULL 13/26] device tree: Fix cppcheck warning, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 15/26] target-sparc: Replace free by g_free, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 23/26] main-loop: do not include slirp/slirp.h, use libslirp.h instead, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 10/26] gtk: implement -full-screen, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 16/26] hw/xen: Use g_free instead of free and fix potential memory leaks, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 24/26] create qemu_openpty_raw() helper function and move it to a separate file, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 14/26] hw/scsi: Don't increment a boolean value, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 26/26] piix: fix some printf errors when debug is enabled, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 09/26] char/serial: serial_ioport_write: Factor out common code, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 20/26] KVM: PPC: Add dummy kvm_arch_init_irq_routing(), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 07/26] char/serial: cosmetic fixes.,
Michael Tokarev <=
- [Qemu-trivial] [PULL 17/26] ivshmem: add missing error exit(2), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 08/26] char/serial: Use generic Fifo8, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 22/26] libcacard/vscclient: fix leakage of socket on error paths, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 18/26] KVM: ARM: Add dummy kvm_arch_init_irq_routing(), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 21/26] linux-headers: Update to v3.10-rc5, Michael Tokarev, 2013/06/14
- Re: [Qemu-trivial] [PULL 00/26] Trivial-patches pull request for 2013-06-14, Anthony Liguori, 2013/06/17