* [Qemu-devel] [PATCH] usb-serial: add support for modem lines
@ 2008-08-13 0:56 Samuel Thibault
2008-08-13 4:23 ` Aurelien Jarno
0 siblings, 1 reply; 2+ messages in thread
From: Samuel Thibault @ 2008-08-13 0:56 UTC (permalink / raw)
To: qemu-devel
usb-serial: add support for modem lines
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Index: hw/usb-serial.c
===================================================================
--- hw/usb-serial.c (révision 4995)
+++ hw/usb-serial.c (copie de travail)
@@ -47,9 +47,10 @@
/* SET_MDM_CTRL */
-#define FTDI_MDM_CTRL 3
#define FTDI_DTR 1
+#define FTDI_SET_DTR (FTDI_DTR << 8)
#define FTDI_RTS 2
+#define FTDI_SET_RTS (FTDI_RTS << 8)
/* SET_FLOW_CTRL */
@@ -99,7 +100,6 @@
uint8_t event_chr;
uint8_t error_chr;
uint8_t event_trigger;
- uint8_t lines;
QEMUSerialSetParams params;
int latency; /* ms */
CharDriverState *cs;
@@ -178,7 +178,6 @@
s->recv_ptr = 0;
s->recv_used = 0;
/* TODO: purge in char driver */
- s->lines &= ~(FTDI_DTR|FTDI_RTS);
}
static void usb_serial_handle_reset(USBDevice *dev)
@@ -191,6 +190,27 @@
/* TODO: Reset char device, send BREAK? */
}
+static uint8_t usb_get_modem_lines(USBSerialState *s)
+{
+ int flags;
+ uint8_t ret;
+
+ if (qemu_chr_ioctl(s->cs, CHR_IOCTL_SERIAL_GET_TIOCM, &flags) == -ENOTSUP)
+ return FTDI_CTS|FTDI_DSR|FTDI_RLSD;
+
+ ret = 0;
+ if (flags & CHR_TIOCM_CTS)
+ ret |= FTDI_CTS;
+ if (flags & CHR_TIOCM_DSR)
+ ret |= FTDI_DSR;
+ if (flags & CHR_TIOCM_RI)
+ ret |= FTDI_RI;
+ if (flags & CHR_TIOCM_CAR)
+ ret |= FTDI_RLSD;
+
+ return ret;
+}
+
static int usb_serial_handle_control(USBDevice *dev, int request, int value,
int index, int length, uint8_t *data)
{
@@ -306,8 +326,24 @@
}
break;
case DeviceOutVendor | FTDI_SET_MDM_CTRL:
- s->lines = value & FTDI_MDM_CTRL;
+ {
+ static int flags;
+ qemu_chr_ioctl(s->cs,CHR_IOCTL_SERIAL_GET_TIOCM, &flags);
+ if (value & FTDI_SET_RTS) {
+ if (value & FTDI_RTS)
+ flags |= CHR_TIOCM_RTS;
+ else
+ flags &= ~CHR_TIOCM_RTS;
+ }
+ if (value & FTDI_SET_DTR) {
+ if (value & FTDI_DTR)
+ flags |= CHR_TIOCM_DTR;
+ else
+ flags &= ~CHR_TIOCM_DTR;
+ }
+ qemu_chr_ioctl(s->cs,CHR_IOCTL_SERIAL_SET_TIOCM, &flags);
break;
+ }
case DeviceOutVendor | FTDI_SET_FLOW_CTRL:
/* TODO: ioctl */
break;
@@ -357,9 +393,9 @@
/* TODO: TX ON/OFF */
break;
case DeviceInVendor | FTDI_GET_MDM_ST:
- /* TODO: return modem status */
- data[0] = 0;
- ret = 1;
+ data[0] = usb_get_modem_lines(s) | 1;
+ data[1] = 0;
+ ret = 2;
break;
case DeviceOutVendor | FTDI_SET_EVENT_CHR:
/* TODO: handle it */
@@ -409,9 +445,9 @@
ret = USB_RET_NAK;
break;
}
- /* TODO: Report serial line status */
+ *data++ = usb_get_modem_lines(s) | 1;
+ /* We do not have the uart details */
*data++ = 0;
- *data++ = 0;
len -= 2;
if (len > s->recv_used)
len = s->recv_used;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] usb-serial: add support for modem lines
2008-08-13 0:56 [Qemu-devel] [PATCH] usb-serial: add support for modem lines Samuel Thibault
@ 2008-08-13 4:23 ` Aurelien Jarno
0 siblings, 0 replies; 2+ messages in thread
From: Aurelien Jarno @ 2008-08-13 4:23 UTC (permalink / raw)
To: qemu-devel
On Wed, Aug 13, 2008 at 01:56:46AM +0100, Samuel Thibault wrote:
> usb-serial: add support for modem lines
Committed, thanks.
> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
>
> Index: hw/usb-serial.c
> ===================================================================
> --- hw/usb-serial.c (révision 4995)
> +++ hw/usb-serial.c (copie de travail)
> @@ -47,9 +47,10 @@
>
> /* SET_MDM_CTRL */
>
> -#define FTDI_MDM_CTRL 3
> #define FTDI_DTR 1
> +#define FTDI_SET_DTR (FTDI_DTR << 8)
> #define FTDI_RTS 2
> +#define FTDI_SET_RTS (FTDI_RTS << 8)
>
> /* SET_FLOW_CTRL */
>
> @@ -99,7 +100,6 @@
> uint8_t event_chr;
> uint8_t error_chr;
> uint8_t event_trigger;
> - uint8_t lines;
> QEMUSerialSetParams params;
> int latency; /* ms */
> CharDriverState *cs;
> @@ -178,7 +178,6 @@
> s->recv_ptr = 0;
> s->recv_used = 0;
> /* TODO: purge in char driver */
> - s->lines &= ~(FTDI_DTR|FTDI_RTS);
> }
>
> static void usb_serial_handle_reset(USBDevice *dev)
> @@ -191,6 +190,27 @@
> /* TODO: Reset char device, send BREAK? */
> }
>
> +static uint8_t usb_get_modem_lines(USBSerialState *s)
> +{
> + int flags;
> + uint8_t ret;
> +
> + if (qemu_chr_ioctl(s->cs, CHR_IOCTL_SERIAL_GET_TIOCM, &flags) == -ENOTSUP)
> + return FTDI_CTS|FTDI_DSR|FTDI_RLSD;
> +
> + ret = 0;
> + if (flags & CHR_TIOCM_CTS)
> + ret |= FTDI_CTS;
> + if (flags & CHR_TIOCM_DSR)
> + ret |= FTDI_DSR;
> + if (flags & CHR_TIOCM_RI)
> + ret |= FTDI_RI;
> + if (flags & CHR_TIOCM_CAR)
> + ret |= FTDI_RLSD;
> +
> + return ret;
> +}
> +
> static int usb_serial_handle_control(USBDevice *dev, int request, int value,
> int index, int length, uint8_t *data)
> {
> @@ -306,8 +326,24 @@
> }
> break;
> case DeviceOutVendor | FTDI_SET_MDM_CTRL:
> - s->lines = value & FTDI_MDM_CTRL;
> + {
> + static int flags;
> + qemu_chr_ioctl(s->cs,CHR_IOCTL_SERIAL_GET_TIOCM, &flags);
> + if (value & FTDI_SET_RTS) {
> + if (value & FTDI_RTS)
> + flags |= CHR_TIOCM_RTS;
> + else
> + flags &= ~CHR_TIOCM_RTS;
> + }
> + if (value & FTDI_SET_DTR) {
> + if (value & FTDI_DTR)
> + flags |= CHR_TIOCM_DTR;
> + else
> + flags &= ~CHR_TIOCM_DTR;
> + }
> + qemu_chr_ioctl(s->cs,CHR_IOCTL_SERIAL_SET_TIOCM, &flags);
> break;
> + }
> case DeviceOutVendor | FTDI_SET_FLOW_CTRL:
> /* TODO: ioctl */
> break;
> @@ -357,9 +393,9 @@
> /* TODO: TX ON/OFF */
> break;
> case DeviceInVendor | FTDI_GET_MDM_ST:
> - /* TODO: return modem status */
> - data[0] = 0;
> - ret = 1;
> + data[0] = usb_get_modem_lines(s) | 1;
> + data[1] = 0;
> + ret = 2;
> break;
> case DeviceOutVendor | FTDI_SET_EVENT_CHR:
> /* TODO: handle it */
> @@ -409,9 +445,9 @@
> ret = USB_RET_NAK;
> break;
> }
> - /* TODO: Report serial line status */
> + *data++ = usb_get_modem_lines(s) | 1;
> + /* We do not have the uart details */
> *data++ = 0;
> - *data++ = 0;
> len -= 2;
> if (len > s->recv_used)
> len = s->recv_used;
>
>
>
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' aurel32@debian.org | aurelien@aurel32.net
`- people.debian.org/~aurel32 | www.aurel32.net
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-13 4:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-13 0:56 [Qemu-devel] [PATCH] usb-serial: add support for modem lines Samuel Thibault
2008-08-13 4:23 ` Aurelien Jarno
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).