mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-24 11:29:10 +00:00
Code Issues Releases Activity

Some minor corrections to a modem driver.

Browse Source 
PR:		usb/162307
MFC after:	3 days
This commit is contained in:
Hans Petter Selasky 2011-11-09 09:15:57 +00:00
parent 58b1333ae5
commit 5086c26a6c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=227383
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/usb/serial/uslcom.c
View File

@ -100,18 +100,17 @@ SYSCTL_INT(_hw_usb_uslcom, OID_AUTO, debug, CTLFLAG_RW,
#define USLCOM_PARITY_ODD 0x10
#define USLCOM_PARITY_EVEN 0x20
#define USLCOM_PORT_NO 0xFFFF /* XXX think this should be 0 --hps */
#define USLCOM_PORT_NO 0x0000
/* USLCOM_BREAK values */
#define USLCOM_BREAK_OFF 0x00
#define USLCOM_BREAK_ON 0x01
/* USLCOM_SET_FLOWCTRL values - 1st word */
#define USLCOM_FLOW_DTR_ON 0x00000001
#define USLCOM_FLOW_DTR_ON 0x00000001 /* DTR static active */
#define USLCOM_FLOW_CTS_HS 0x00000008 /* CTS handshake */
#define USLCOM_FLOW_RESERVED 0xFFFFFF80
/* USLCOM_SET_FLOWCTRL values - 2nd word */
#define USLCOM_FLOW_RTS_ON 0x00000040
#define USLCOM_FLOW_RTS_ON 0x00000040 /* RTS static active */
#define USLCOM_FLOW_RTS_HS 0x00000080 /* RTS handshake */
enum {
@ -540,14 +539,12 @@ uslcom_param(struct ucom_softc *ucom, struct termios *t)
}
if (t->c_cflag & CRTSCTS) {
flowctrl[0] = htole32(USLCOM_FLOW_RESERVED |
USLCOM_FLOW_DTR_ON | USLCOM_FLOW_CTS_HS);
flowctrl[0] = htole32(USLCOM_FLOW_DTR_ON | USLCOM_FLOW_CTS_HS);
flowctrl[1] = htole32(USLCOM_FLOW_RTS_HS);
flowctrl[2] = 0;
flowctrl[3] = 0;
} else {
flowctrl[0] = htole32(USLCOM_FLOW_RESERVED |
USLCOM_FLOW_DTR_ON);
flowctrl[0] = htole32(USLCOM_FLOW_DTR_ON);
flowctrl[1] = htole32(USLCOM_FLOW_RTS_ON);
flowctrl[2] = 0;
flowctrl[3] = 0;
@ -692,7 +689,7 @@ uslcom_control_callback(struct usb_xfer *xfer, usb_error_t error)
req.bmRequestType = USLCOM_READ;
req.bRequest = USLCOM_RCTRL;
USETW(req.wValue, 0);
USETW(req.wIndex, 0);
USETW(req.wIndex, USLCOM_PORT_NO);
USETW(req.wLength, sizeof(buf));
usbd_xfer_set_frames(xfer, 2);