[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6556] fix use of host serial port
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [6556] fix use of host serial port |
Date: |
Sun, 08 Feb 2009 14:46:18 +0000 |
Revision: 6556
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6556
Author: aurel32
Date: 2009-02-08 14:46:17 +0000 (Sun, 08 Feb 2009)
Log Message:
-----------
fix use of host serial port
Signed-off-by: David Ahern <address@hidden>
Acked-by: Stefano Stabellini <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
Modified Paths:
--------------
trunk/qemu-char.c
Modified: trunk/qemu-char.c
===================================================================
--- trunk/qemu-char.c 2009-02-08 13:05:12 UTC (rev 6555)
+++ trunk/qemu-char.c 2009-02-08 14:46:17 UTC (rev 6556)
@@ -1047,17 +1047,17 @@
int *targ = (int *)arg;
ioctl(s->fd_in, TIOCMGET, &sarg);
*targ = 0;
- if (sarg | TIOCM_CTS)
+ if (sarg & TIOCM_CTS)
*targ |= CHR_TIOCM_CTS;
- if (sarg | TIOCM_CAR)
+ if (sarg & TIOCM_CAR)
*targ |= CHR_TIOCM_CAR;
- if (sarg | TIOCM_DSR)
+ if (sarg & TIOCM_DSR)
*targ |= CHR_TIOCM_DSR;
- if (sarg | TIOCM_RI)
+ if (sarg & TIOCM_RI)
*targ |= CHR_TIOCM_RI;
- if (sarg | TIOCM_DTR)
+ if (sarg & TIOCM_DTR)
*targ |= CHR_TIOCM_DTR;
- if (sarg | TIOCM_RTS)
+ if (sarg & TIOCM_RTS)
*targ |= CHR_TIOCM_RTS;
}
break;
@@ -1065,9 +1065,20 @@
{
int sarg = *(int *)arg;
int targ = 0;
- if (sarg | CHR_TIOCM_DTR)
+ ioctl(s->fd_in, TIOCMGET, &targ);
+ targ &= ~(CHR_TIOCM_CTS | CHR_TIOCM_CAR | CHR_TIOCM_DSR
+ | CHR_TIOCM_RI | CHR_TIOCM_DTR | CHR_TIOCM_RTS);
+ if (sarg & CHR_TIOCM_CTS)
+ targ |= TIOCM_CTS;
+ if (sarg & CHR_TIOCM_CAR)
+ targ |= TIOCM_CAR;
+ if (sarg & CHR_TIOCM_DSR)
+ targ |= TIOCM_DSR;
+ if (sarg & CHR_TIOCM_RI)
+ targ |= TIOCM_RI;
+ if (sarg & CHR_TIOCM_DTR)
targ |= TIOCM_DTR;
- if (sarg | CHR_TIOCM_RTS)
+ if (sarg & CHR_TIOCM_RTS)
targ |= TIOCM_RTS;
ioctl(s->fd_in, TIOCMSET, &targ);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6556] fix use of host serial port,
Aurelien Jarno <=