diff options
| -rw-r--r-- | sys/dev/usb/ucom.c | 21 | ||||
| -rw-r--r-- | sys/dev/usb/ucomvar.h | 12 |
2 files changed, 2 insertions, 31 deletions
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index 7e023c17ba6..8078e29714c 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucom.c,v 1.27 2005/11/21 18:16:43 millert Exp $ */ +/* $OpenBSD: ucom.c,v 1.28 2006/03/27 08:19:39 dlg Exp $ */ /* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */ /* @@ -573,25 +573,6 @@ ucomwrite(dev_t dev, struct uio *uio, int flag) return (error); } -#if defined(__NetBSD__) -int -ucompoll(dev_t dev, int events, usb_proc_ptr p) -{ - struct ucom_softc *sc = ucom_cd.cd_devs[UCOMUNIT(dev)]; - struct tty *tp = sc->sc_tty; - int error; - - if (sc->sc_dying) - return (EIO); - - sc->sc_refcnt++; - error = (*LINESW(tp, l_poll))(tp, events, p); - if (--sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); - return (error); -} -#endif - struct tty * ucomtty(dev_t dev) { diff --git a/sys/dev/usb/ucomvar.h b/sys/dev/usb/ucomvar.h index 9777b811cd7..033d7359e7b 100644 --- a/sys/dev/usb/ucomvar.h +++ b/sys/dev/usb/ucomvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ucomvar.h,v 1.12 2005/01/10 08:17:49 dlg Exp $ */ +/* $OpenBSD: ucomvar.h,v 1.13 2006/03/27 08:19:39 dlg Exp $ */ /* $NetBSD: ucomvar.h,v 1.10 2001/12/31 12:15:21 augustss Exp $ */ /* @@ -38,16 +38,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ - -#if defined(__NetBSD__) -/* Macros to clear/set/test flags. */ -#define SET(t, f) (t) |= (f) -#define CLR(t, f) (t) &= ~(f) -#define ISSET(t, f) ((t) & (f)) - -#include "locators.h" -#endif - #define ucomcf_portno cf_loc[UCOMBUSCF_PORTNO] #define UCOM_UNK_PORTNO UCOMBUSCF_PORTNO_DEFAULT |