diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-02-11 09:32:49 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-02-11 09:32:49 +0000 |
| commit | b8d741d25ef27ba31ccc912c959c02a4c121e518 (patch) | |
| tree | f99dc347e7a1cf1165c6806b660dc28984685540 /sys/dev/usb | |
| parent | dce620e3ef56a4430bdfd9e6318c0eba7a8a2730 (diff) | |
Back out the "it is not completely clear" part of revision 1.18 - it
effectively swapped RTS and DTR, apparently on all versions of the chip.
From NetBSD
ok djm@
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/uplcom.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index eccb02c1ae6..b591bac331e 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uplcom.c,v 1.26 2006/02/07 23:35:11 brad Exp $ */ +/* $OpenBSD: uplcom.c,v 1.27 2006/02/11 09:32:48 brad Exp $ */ /* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -88,15 +88,6 @@ int uplcomdebug = 0; #define RSAQ_STATUS_DSR 0x02 #define RSAQ_STATUS_DCD 0x01 -#define UPLCOM_FLOW_OUT_CTS 0x0001 -#define UPLCOM_FLOW_OUT_DSR 0x0002 -#define UPLCOM_FLOW_IN_DSR 0x0004 -#define UPLCOM_FLOW_IN_DTR 0x0008 -#define UPLCOM_FLOW_IN_RTS 0x0010 -#define UPLCOM_FLOW_OUT_RTS 0x0020 -#define UPLCOM_FLOW_OUT_XON 0x0080 -#define UPLCOM_FLOW_IN_XON 0x0100 - struct uplcom_softc { USBBASEDEVICE sc_dev; /* base device */ usbd_device_handle sc_udev; /* USB device */ @@ -489,8 +480,8 @@ uplcom_set_line_state(struct uplcom_softc *sc) if (sc->sc_rts == -1) sc->sc_rts = 0; - ls = (sc->sc_dtr ? UPLCOM_FLOW_OUT_DSR : 0) | - (sc->sc_rts ? UPLCOM_FLOW_OUT_CTS : 0); + ls = (sc->sc_dtr ? UCDC_LINE_DTR : 0) | + (sc->sc_rts ? UCDC_LINE_RTS : 0); req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SET_CONTROL_LINE_STATE; |