haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

usb-serial: add support for modem lines

Browse source 
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4998 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2008-08-13 04:23:17 +00:00
parent f88e4b91be
commit abb8a13918
1 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
hw/usb-serial.c
View file

@ -47,9 +47,10 @@ do { printf("usb-serial: " fmt , ##args); } while (0)
/* SET_MDM_CTRL */ /* SET_MDM_CTRL */
#define FTDI_MDM_CTRL 3
#define FTDI_DTR 1 #define FTDI_DTR 1
#define FTDI_SET_DTR (FTDI_DTR << 8)
#define FTDI_RTS 2 #define FTDI_RTS 2
#define FTDI_SET_RTS (FTDI_RTS << 8)
/* SET_FLOW_CTRL */ /* SET_FLOW_CTRL */
@ -99,7 +100,6 @@ typedef struct {
uint8_t event_chr; uint8_t event_chr;
uint8_t error_chr; uint8_t error_chr;
uint8_t event_trigger; uint8_t event_trigger;
uint8_t lines;
QEMUSerialSetParams params; QEMUSerialSetParams params;
int latency; /* ms */ int latency; /* ms */
CharDriverState *cs; CharDriverState *cs;
@ -178,7 +178,6 @@ static void usb_serial_reset(USBSerialState *s)
s->recv_ptr = 0; s->recv_ptr = 0;
s->recv_used = 0; s->recv_used = 0;
/* TODO: purge in char driver */ /* TODO: purge in char driver */
s->lines &= ~(FTDI_DTR|FTDI_RTS);
} }
static void usb_serial_handle_reset(USBDevice *dev) static void usb_serial_handle_reset(USBDevice *dev)
@ -191,6 +190,27 @@ static void usb_serial_handle_reset(USBDevice *dev)
/* TODO: Reset char device, send BREAK? */ /* 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, static int usb_serial_handle_control(USBDevice *dev, int request, int value,
int index, int length, uint8_t *data) int index, int length, uint8_t *data)
{ {
@ -306,8 +326,24 @@ static int usb_serial_handle_control(USBDevice *dev, int request, int value,
} }
break; break;
case DeviceOutVendor | FTDI_SET_MDM_CTRL: 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; break;
}
case DeviceOutVendor | FTDI_SET_FLOW_CTRL: case DeviceOutVendor | FTDI_SET_FLOW_CTRL:
/* TODO: ioctl */ /* TODO: ioctl */
break; break;
@ -357,9 +393,9 @@ static int usb_serial_handle_control(USBDevice *dev, int request, int value,
/* TODO: TX ON/OFF */ /* TODO: TX ON/OFF */
break; break;
case DeviceInVendor | FTDI_GET_MDM_ST: case DeviceInVendor | FTDI_GET_MDM_ST:
/* TODO: return modem status */ data[0] = usb_get_modem_lines(s) | 1;
data[0] = 0; data[1] = 0;
ret = 1; ret = 2;
break; break;
case DeviceOutVendor | FTDI_SET_EVENT_CHR: case DeviceOutVendor | FTDI_SET_EVENT_CHR:
/* TODO: handle it */ /* TODO: handle it */
@ -409,8 +445,8 @@ static int usb_serial_handle_data(USBDevice *dev, USBPacket *p)
ret = USB_RET_NAK; ret = USB_RET_NAK;
break; break;
} }
/* TODO: Report serial line status */ *data++ = usb_get_modem_lines(s) | 1;
*data++ = 0; /* We do not have the uart details */
*data++ = 0; *data++ = 0;
len -= 2; len -= 2;
if (len > s->recv_used) if (len > s->recv_used)