Sun Jan 3 17:28:33 2021 UTC ()

Use sel{record,remove}_knote().


(thorpej)

diff -r1.30 -r1.31 src/sys/arch/shark/shark/opms.c

--- src/sys/arch/shark/shark/Attic/opms.c 2020/07/22 01:24:40	1.30
+++ src/sys/arch/shark/shark/Attic/opms.c 2021/01/03 17:28:33	1.31

 @@ -1,14 +1,14 @@
-/*      $NetBSD: opms.c,v 1.30 2020/07/22 01:24:40 msaitoh Exp $        */
+/*      $NetBSD: opms.c,v 1.31 2021/01/03 17:28:33 thorpej Exp $        */
 /*
  * Copyright 1997
  * Digital Equipment Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and
  * copied only in accordance with the following terms and conditions.
  * Subject to these conditions, you may download, copy, install,
  * use, modify and distribute this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce
  *    and retain this copyright notice and list of conditions as
 @@ -81,27 +81,27 @@
 **  AUTHORS:
 **
 **    Unknown.  Modified by Patrick Crilly, and John Court
 **              Digital Equipment Corporation.
 **
 **  CREATION DATE:
 **
 **    Unknown
 **
 **--
 */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.30 2020/07/22 01:24:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.31 2021/01/03 17:28:33 thorpej Exp $");
 #include "opms.h"
 #if NOPMS > 1
 #error Only one PS/2 style mouse may be configured into your system.
 #endif
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
 @@ -956,58 +956,56 @@ opmspoll(dev_t dev, int events, struct l
+        }
+    }
     splx(oldIpl);
     return (revents);
 } /* End opmspoll */
 static void
 filt_opmsrdetach(struct knote *kn)
+{
 	struct opms_softc *sc = kn->kn_hook;
 	int s;
 	s = spltty();
-	SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
+	selremove_knote(&sc->sc_rsel, kn);
 	splx(s);
+}
 static int
 filt_opmsread(struct knote *kn, long hint)
+{
 	struct opms_softc *sc = kn->kn_hook;
 	kn->kn_data = sc->sc_q.c_cc;
 	return (kn->kn_data > 0);
+}
 static const struct filterops opmsread_filtops = {
 	.f_isfd = 1,
 	.f_attach = NULL,
 	.f_detach = filt_opmsrdetach,
 	.f_event = filt_opmsread,
 };
 int
 opmskqfilter(dev_t dev, struct knote *kn)
+{
 	struct opms_softc *sc = device_lookup_private(&opms_cd, PMSUNIT(dev));
 	struct klist *klist;
 	int s;
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
 		klist = &sc->sc_rsel.sel_klist;
 		kn->kn_fop = &opmsread_filtops;
 		break;
 	default:
 		return (1);
+	}
 	kn->kn_hook = sc;
 	s = spltty();
-	SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+	selrecord_knote(&sc->sc_rsel, kn);
 	splx(s);
 	return (0);
+}