4c4
< __FBSDID("$FreeBSD: head/sys/dev/usb/serial/uslcom.c 239180 2012-08-10 15:29:41Z hselasky $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/serial/uslcom.c 239260 2012-08-14 22:21:46Z gavin $");
21a22,27
> /*
> * Driver for Silicon Laboratories CP2101/CP2102/CP2103/CP2104/CP2105
> * USB-Serial adapters. Based on datasheet AN571, publicly available from
> * http://www.silabs.com/Support%20Documents/TechnicalDocs/AN571.pdf
> */
>
64,65d69
< #define USLCOM_SET_DATA_BITS(x) ((x) << 8)
<
71,78c75,82
< #define USLCOM_UART 0x00
< #define USLCOM_SET_BAUD_DIV 0x01
< #define USLCOM_DATA 0x03
< #define USLCOM_BREAK 0x05
< #define USLCOM_CTRL 0x07
< #define USLCOM_RCTRL 0x08
< #define USLCOM_SET_FLOWCTRL 0x13
< #define USLCOM_SET_BAUD_RATE 0x1e
---
> #define USLCOM_IFC_ENABLE 0x00
> #define USLCOM_SET_BAUDDIV 0x01
> #define USLCOM_SET_LINE_CTL 0x03
> #define USLCOM_SET_BREAK 0x05
> #define USLCOM_SET_MHS 0x07
> #define USLCOM_GET_MDMSTS 0x08
> #define USLCOM_SET_FLOW 0x13
> #define USLCOM_SET_BAUDRATE 0x1e
81,83c85,87
< /* USLCOM_UART values */
< #define USLCOM_UART_DISABLE 0x00
< #define USLCOM_UART_ENABLE 0x01
---
> /* USLCOM_IFC_ENABLE values */
> #define USLCOM_IFC_ENABLE_DIS 0x00
> #define USLCOM_IFC_ENABLE_EN 0x01
85,93c89,97
< /* USLCOM_CTRL/USLCOM_RCTRL values */
< #define USLCOM_CTRL_DTR_ON 0x0001
< #define USLCOM_CTRL_DTR_SET 0x0100
< #define USLCOM_CTRL_RTS_ON 0x0002
< #define USLCOM_CTRL_RTS_SET 0x0200
< #define USLCOM_CTRL_CTS 0x0010
< #define USLCOM_CTRL_DSR 0x0020
< #define USLCOM_CTRL_RI 0x0040
< #define USLCOM_CTRL_DCD 0x0080
---
> /* USLCOM_SET_MHS/USLCOM_GET_MDMSTS values */
> #define USLCOM_MHS_DTR_ON 0x0001
> #define USLCOM_MHS_DTR_SET 0x0100
> #define USLCOM_MHS_RTS_ON 0x0002
> #define USLCOM_MHS_RTS_SET 0x0200
> #define USLCOM_MHS_CTS 0x0010
> #define USLCOM_MHS_DSR 0x0020
> #define USLCOM_MHS_RI 0x0040
> #define USLCOM_MHS_DCD 0x0080
95,96c99,100
< /* USLCOM_SET_BAUD_DIV values */
< #define USLCOM_BAUD_REF 3686400 /* 3.6864 MHz */
---
> /* USLCOM_SET_BAUDDIV values */
> #define USLCOM_BAUDDIV_REF 3686400 /* 3.6864 MHz */
98c102
< /* USLCOM_DATA values */
---
> /* USLCOM_SET_LINE_CTL values */
103a108
> #define USLCOM_SET_DATA_BITS(x) ((x) << 8)
105,107c110,112
< /* USLCOM_BREAK values */
< #define USLCOM_BREAK_OFF 0x00
< #define USLCOM_BREAK_ON 0x01
---
> /* USLCOM_SET_BREAK values */
> #define USLCOM_SET_BREAK_OFF 0x00
> #define USLCOM_SET_BREAK_ON 0x01
109c114
< /* USLCOM_SET_FLOWCTRL values - 1st word */
---
> /* USLCOM_SET_FLOW values - 1st word */
112c117
< /* USLCOM_SET_FLOWCTRL values - 2nd word */
---
> /* USLCOM_SET_FLOW values - 2nd word */
463,464c468,469
< req.bRequest = USLCOM_UART;
< USETW(req.wValue, USLCOM_UART_ENABLE);
---
> req.bRequest = USLCOM_IFC_ENABLE;
> USETW(req.wValue, USLCOM_IFC_ENABLE_EN);
487,488c492,493
< req.bRequest = USLCOM_UART;
< USETW(req.wValue, USLCOM_UART_DISABLE);
---
> req.bRequest = USLCOM_IFC_ENABLE;
> USETW(req.wValue, USLCOM_IFC_ENABLE_DIS);
507,508c512,513
< ctl = onoff ? USLCOM_CTRL_DTR_ON : 0;
< ctl |= USLCOM_CTRL_DTR_SET;
---
> ctl = onoff ? USLCOM_MHS_DTR_ON : 0;
> ctl |= USLCOM_MHS_DTR_SET;
511c516
< req.bRequest = USLCOM_CTRL;
---
> req.bRequest = USLCOM_SET_MHS;
531,532c536,537
< ctl = onoff ? USLCOM_CTRL_RTS_ON : 0;
< ctl |= USLCOM_CTRL_RTS_SET;
---
> ctl = onoff ? USLCOM_MHS_RTS_ON : 0;
> ctl |= USLCOM_MHS_RTS_SET;
535c540
< req.bRequest = USLCOM_CTRL;
---
> req.bRequest = USLCOM_SET_MHS;
566c571
< req.bRequest = USLCOM_SET_BAUD_RATE;
---
> req.bRequest = USLCOM_SET_BAUDRATE;
603c608
< req.bRequest = USLCOM_DATA;
---
> req.bRequest = USLCOM_SET_LINE_CTL;
616,617d620
< flowctrl[2] = 0;
< flowctrl[3] = 0;
621,622d623
< flowctrl[2] = 0;
< flowctrl[3] = 0;
623a625,626
> flowctrl[2] = 0;
> flowctrl[3] = 0;
625c628
< req.bRequest = USLCOM_SET_FLOWCTRL;
---
> req.bRequest = USLCOM_SET_FLOW;
652c655
< uint16_t brk = onoff ? USLCOM_BREAK_ON : USLCOM_BREAK_OFF;
---
> uint16_t brk = onoff ? USLCOM_SET_BREAK_ON : USLCOM_SET_BREAK_OFF;
655c658
< req.bRequest = USLCOM_BREAK;
---
> req.bRequest = USLCOM_SET_BREAK;
790c793
< if (buf & USLCOM_CTRL_CTS)
---
> if (buf & USLCOM_MHS_CTS)
792c795
< if (buf & USLCOM_CTRL_DSR)
---
> if (buf & USLCOM_MHS_DSR)
794c797
< if (buf & USLCOM_CTRL_RI)
---
> if (buf & USLCOM_MHS_RI)
796c799
< if (buf & USLCOM_CTRL_DCD)
---
> if (buf & USLCOM_MHS_DCD)
809c812
< req.bRequest = USLCOM_RCTRL;
---
> req.bRequest = USLCOM_GET_MDMSTS;