summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/ugen.c8
-rw-r--r--sys/dev/usb/uhid.c8
-rw-r--r--sys/dev/usb/usb.c6
-rw-r--r--sys/dev/usb/usb_port.h6
-rw-r--r--sys/dev/usb/uscanner.c6
5 files changed, 15 insertions, 19 deletions
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index e3f7b2648ac..4393764fcb0 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ugen.c,v 1.43 2007/06/10 14:49:01 mbalmer Exp $ */
+/* $OpenBSD: ugen.c,v 1.44 2007/06/11 09:26:55 mk Exp $ */
/* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */
@@ -1340,7 +1340,7 @@ filt_ugenrdetach(struct knote *kn)
int s;
s = splusb();
- SLIST_REMOVE(&sce->rsel.sel_klist, kn, knote, kn_selnext);
+ SLIST_REMOVE(&sce->rsel.si_note, kn, knote, kn_selnext);
splx(s);
}
@@ -1399,7 +1399,7 @@ ugenkqfilter(dev_t dev, struct knote *kn)
switch (kn->kn_filter) {
case EVFILT_READ:
- klist = &sce->rsel.sel_klist;
+ klist = &sce->rsel.si_note;
switch (sce->edesc->bmAttributes & UE_XFERTYPE) {
case UE_INTERRUPT:
kn->kn_fop = &ugenread_intr_filtops;
@@ -1421,7 +1421,7 @@ ugenkqfilter(dev_t dev, struct knote *kn)
break;
case EVFILT_WRITE:
- klist = &sce->rsel.sel_klist;
+ klist = &sce->rsel.si_note;
switch (sce->edesc->bmAttributes & UE_XFERTYPE) {
case UE_INTERRUPT:
case UE_ISOCHRONOUS:
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index aa0d9643a92..9dee93d92f6 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhid.c,v 1.35 2007/06/10 10:53:48 mbalmer Exp $ */
+/* $OpenBSD: uhid.c,v 1.36 2007/06/11 09:26:55 mk Exp $ */
/* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -559,7 +559,7 @@ filt_uhidrdetach(struct knote *kn)
int s;
s = splusb();
- SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
+ SLIST_REMOVE(&sc->sc_rsel.si_note, kn, knote, kn_selnext);
splx(s);
}
@@ -592,12 +592,12 @@ uhidkqfilter(dev_t dev, struct knote *kn)
switch (kn->kn_filter) {
case EVFILT_READ:
- klist = &sc->sc_rsel.sel_klist;
+ klist = &sc->sc_rsel.si_note;
kn->kn_fop = &uhidread_filtops;
break;
case EVFILT_WRITE:
- klist = &sc->sc_rsel.sel_klist;
+ klist = &sc->sc_rsel.si_note;
kn->kn_fop = &uhid_seltrue_filtops;
break;
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index ba562e5d241..ff47575c85e 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb.c,v 1.48 2007/06/10 17:46:27 mbalmer Exp $ */
+/* $OpenBSD: usb.c,v 1.49 2007/06/11 09:26:55 mk Exp $ */
/* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */
/*
@@ -599,7 +599,7 @@ filt_usbrdetach(struct knote *kn)
int s;
s = splusb();
- SLIST_REMOVE(&usb_selevent.sel_klist, kn, knote, kn_selnext);
+ SLIST_REMOVE(&usb_selevent.si_note, kn, knote, kn_selnext);
splx(s);
}
@@ -627,7 +627,7 @@ usbkqfilter(dev_t dev, struct knote *kn)
case EVFILT_READ:
if (minor(dev) != USB_DEV_MINOR)
return (1);
- klist = &usb_selevent.sel_klist;
+ klist = &usb_selevent.si_note;
kn->kn_fop = &usbread_filtops;
break;
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 128f4191639..c8fd0892559 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_port.h,v 1.81 2007/06/11 06:14:24 mbalmer Exp $ */
+/* $OpenBSD: usb_port.h,v 1.82 2007/06/11 09:26:55 mk Exp $ */
/* $NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */
@@ -60,8 +60,6 @@
#define PQUIRK_NOSENSE ADEV_NOSENSE /* can't REQUEST SENSE */
#define PQUIRK_ONLYBIG SDEV_ONLYBIG
-#define sel_klist si_note
-
typedef struct proc *usb_proc_ptr;
#define UCOMBUSCF_PORTNO 0
@@ -71,8 +69,6 @@ typedef struct proc *usb_proc_ptr;
#define mstohz(ms) ((ms) * hz / 1000)
-#define sel_klist si_note
-
#define IF_INPUT(ifp, m) ether_input_mbuf((ifp), (m))
#define swap_bytes_change_sign16_le swap_bytes_change_sign16
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 41c95c7b740..93f5d83e969 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uscanner.c,v 1.29 2007/06/10 14:49:01 mbalmer Exp $ */
+/* $OpenBSD: uscanner.c,v 1.30 2007/06/11 09:26:55 mk Exp $ */
/* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */
/*
@@ -640,7 +640,7 @@ filt_uscannerdetach(struct knote *kn)
{
struct uscanner_softc *sc = (void *)kn->kn_hook;
- SLIST_REMOVE(&sc->sc_selq.sel_klist, kn, knote, kn_selnext);
+ SLIST_REMOVE(&sc->sc_selq.si_note, kn, knote, kn_selnext);
}
struct filterops uscanner_seltrue_filtops =
@@ -665,7 +665,7 @@ uscannerkqfilter(dev_t dev, struct knote *kn)
* yield any data or a write will happen.
* Pretend they will.
*/
- klist = &sc->sc_selq.sel_klist;
+ klist = &sc->sc_selq.si_note;
kn->kn_fop = &uscanner_seltrue_filtops;
break;