d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Translate modem status reg bits from ns16550 to SER_* values used by the

Browse Source 
tty layer.

Also annotate a switch case fall-through per style(9).
This commit is contained in:
Ian Lepore 2016-07-27 00:03:18 +00:00
parent d88e7bb082
commit d83433299b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/usb/serial/ubsa.c
View File

@ -650,11 +650,19 @@ ubsa_intr_callback(struct usb_xfer *xfer, usb_error_t error)
usbd_copy_out(pc, 0, buf, sizeof(buf));
/*
* incidentally, Belkin adapter status bits match
* UART 16550 bits
* MSR bits need translation from ns16550 to SER_* values.
* LSR bits are ns16550 in hardware and ucom.
*/
sc->sc_msr = 0;
if (buf[3] & UBSA_MSR_CTS)
sc->sc_msr |= SER_CTS;
if (buf[3] & UBSA_MSR_DCD)
sc->sc_msr |= SER_DCD;
if (buf[3] & UBSA_MSR_RI)
sc->sc_msr |= SER_RI;
if (buf[3] & UBSA_MSR_DSR)
sc->sc_msr |= SER_DSR;
sc->sc_lsr = buf[2];
sc->sc_msr = buf[3];
DPRINTF("lsr = 0x%02x, msr = 0x%02x\n",
sc->sc_lsr, sc->sc_msr);
@ -663,7 +671,7 @@ ubsa_intr_callback(struct usb_xfer *xfer, usb_error_t error)
} else {
DPRINTF("ignoring short packet, %d bytes\n", actlen);
}
/* FALLTHROUGH */
case USB_ST_SETUP:
tr_setup:
usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer));