diff options
| author | thomas <thomas@FreeBSD.org> | 2013-06-23 20:22:49 +0000 |
|---|---|---|
| committer | thomas <thomas@FreeBSD.org> | 2013-06-23 20:22:49 +0000 |
| commit | 8874e12d54773cac33ac1b7323719d36c42ac567 (patch) | |
| tree | 4d469e422c455acfba533a91df005ce7ddffcadc /sys/dev/usb | |
| parent | 4d4ec64569e3f71688538012410252e8cb7aaa89 (diff) | |
| download | FreeBSD-src-8874e12d54773cac33ac1b7323719d36c42ac567.zip FreeBSD-src-8874e12d54773cac33ac1b7323719d36c42ac567.tar.gz | |
Revert previous change to uark.c (restore previous rev), which was
committed by mistake.
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/serial/uark.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/sys/dev/usb/serial/uark.c b/sys/dev/usb/serial/uark.c index e318cdf..f0737f2 100644 --- a/sys/dev/usb/serial/uark.c +++ b/sys/dev/usb/serial/uark.c @@ -92,7 +92,6 @@ struct uark_softc { uint8_t sc_msr; uint8_t sc_lsr; - uint8_t sc_irda; /* Set to 1 for IrDA */ }; /* prototypes */ @@ -174,12 +173,8 @@ MODULE_DEPEND(uark, ucom, 1, 1, 1); MODULE_DEPEND(uark, usb, 1, 1, 1); MODULE_VERSION(uark, 1); -#define UARK_TYPE_SERIAL 0 -#define UARK_TYPE_IRDA 1 - static const STRUCT_USB_HOST_ID uark_devs[] = { - {USB_VPI(USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116, UARK_TYPE_SERIAL)}, - {USB_VPI(USB_VENDOR_ARKMICRO2, USB_PRODUCT_ARKMICRO2_ARK3118, UARK_TYPE_IRDA)}, + {USB_VPI(USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116, 0)}, }; static int @@ -212,7 +207,6 @@ uark_attach(device_t dev) ucom_ref(&sc->sc_super_ucom); sc->sc_udev = uaa->device; - sc->sc_irda = (USB_GET_DRIVER_INFO (uaa) == UARK_TYPE_IRDA); iface_index = UARK_IFACE_INDEX; error = usbd_transfer_setup @@ -384,15 +378,6 @@ uark_cfg_param(struct ucom_softc *ucom, struct termios *t) uint32_t speed = t->c_ospeed; uint16_t data; - if (!(sc->sc_irda)) { - uark_cfg_write(sc, 0xb, 0); - } else { - uark_cfg_write(sc, 0xb, 1); - uark_cfg_write(sc, 0xc, 0); - uark_cfg_write(sc, 0xd, 0x41); - uark_cfg_write(sc, 0xa, 1); - } - /* * NOTE: When reverse computing the baud rate from the "data" all * allowed baud rates are within 3% of the initial baud rate. @@ -434,10 +419,6 @@ uark_cfg_param(struct ucom_softc *ucom, struct termios *t) } uark_cfg_write(sc, 3, 0x00); uark_cfg_write(sc, 3, data); - - uark_cfg_write(sc, 0xe, 0); - if (sc->sc_irda) - uark_cfg_write (sc, 9, 0); } static void |
