 @@ -1,14 +1,14 @@
-/*	$NetBSD: event.c,v 1.19 2021/09/26 16:36:19 thorpej Exp $ */
+/*	$NetBSD: event.c,v 1.20 2022/05/26 14:30:36 tsutsui Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -35,27 +35,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)event.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * Internal `Firm_event' interface for the keyboard and mouse drivers.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.19 2021/09/26 16:36:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.20 2022/05/26 14:30:36 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/select.h>
 #include <sys/poll.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <machine/vuid_event.h>
 @@ -91,87 +91,87 @@ ev_fini(struct evvar *ev)
 /*
  * User-level interface: read, select.
  * (User cannot write an event queue.)
  */
 int
 ev_read(struct evvar *ev, struct uio *uio, int flags)
+{
 	int n, cnt, put, error;
 	/*
 	 * Make sure we can return at least 1.
 	 */
 	if (uio->uio_resid < sizeof(struct firm_event))
-		return (EMSGSIZE);	/* ??? */
+		return EMSGSIZE;	/* ??? */
 	mutex_enter(ev->ev_lock);
 	while (ev->ev_get == ev->ev_put) {
 		if (flags & IO_NDELAY) {
 			mutex_exit(ev->ev_lock);
-			return (EWOULDBLOCK);
+			return EWOULDBLOCK;
+		}
 		ev->ev_wanted = true;
 		error = cv_wait_sig(&ev->ev_cv, ev->ev_lock);
 		if (error != 0) {
 			mutex_exit(ev->ev_lock);
-			return (error);
+			return error;
+		}
+	}
 	/*
 	 * Move firm_events from tail end of queue (there is at least one
 	 * there).
 	 */
 	if (ev->ev_put < ev->ev_get)
 		cnt = EV_QSIZE - ev->ev_get;	/* events in [get..QSIZE) */
 	else
 		cnt = ev->ev_put - ev->ev_get;	/* events in [get..put) */
 	put = ev->ev_put;
 	mutex_exit(ev->ev_lock);
 	n = howmany(uio->uio_resid, sizeof(struct firm_event));
 	if (cnt > n)
 		cnt = n;
 	error = uiomove((void *)&ev->ev_q[ev->ev_get],
 	    cnt * sizeof(struct firm_event), uio);
 	n -= cnt;
 	/*
 	 * If we do not wrap to 0, used up all our space, or had an error,
 	 * stop.  Otherwise move from front of queue to put index, if there
 	 * is anything there to move.
 	 */
 	if ((ev->ev_get = (ev->ev_get + cnt) % EV_QSIZE) != 0 ||
 	    n == 0 || error || (cnt = put) == 0)
-		return (error);
+		return error;
 	if (cnt > n)
 		cnt = n;
 	error = uiomove((void *)&ev->ev_q[0],
 	    cnt * sizeof(struct firm_event), uio);
 	ev->ev_get = cnt;
-	return (error);
+	return error;
+}
 int
 ev_poll(struct evvar *ev, int events, struct lwp *l)
+{
 	int revents = 0;
 	mutex_enter(ev->ev_lock);
 	if (events & (POLLIN | POLLRDNORM)) {
 		if (ev->ev_get == ev->ev_put)
 			selrecord(l, &ev->ev_sel);
 		else
 			revents |= events & (POLLIN | POLLRDNORM);
+	}
 	revents |= events & (POLLOUT | POLLWRNORM);
 	mutex_exit(ev->ev_lock);
-	return (revents);
+	return revents;
+}
 void
 ev_wakeup(struct evvar *ev)
+{
 	mutex_enter(ev->ev_lock);
 	selnotify(&ev->ev_sel, 0, 0);
 	if (ev->ev_wanted) {
 		ev->ev_wanted = false;
 		cv_signal(&ev->ev_cv);
+	}
 	mutex_exit(ev->ev_lock);
 @@ -223,24 +223,24 @@ static const struct filterops ev_filtops
 	.f_event = filt_evread,
 };
 int
 ev_kqfilter(struct evvar *ev, struct knote *kn)
+{
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
 		kn->kn_fop = &ev_filtops;
 		break;
 	default:
-		return (EINVAL);
+		return EINVAL;
+	}
 	kn->kn_hook = ev;
 	mutex_enter(ev->ev_lock);
 	selrecord_knote(&ev->ev_sel, kn);
 	mutex_exit(ev->ev_lock);
-	return (0);
+	return 0;
+}