summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2021-09-26 01:16:07 +0000
committerthorpej <thorpej@NetBSD.org>2021-09-26 01:16:07 +0000
commit984815da5deb3389246602307ceec792a2d19aa6 (patch)
tree9458badf3aeb2c4e60a80604e48a1af3cc59d335 /sys/dev
parent8ddd7641e766d828bca282f42daa3524eb570fa2 (diff)
Change the kqueue filterops::f_isfd field to filterops::f_flags, and
define a flag FILTEROP_ISFD that has the meaning of the prior f_isfd. Field and flag name aligned with OpenBSD. This does not constitute a functional or ABI change, as the field location and size, and the value placed in that field, are the same as the previous code, but we're bumping __NetBSD_Version__ so 3rd-party module source code can adapt, as needed. NetBSD 9.99.89
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/apm/apm.c6
-rw-r--r--sys/dev/audio/audio.c8
-rw-r--r--sys/dev/hpc/apm/apmdev.c6
-rw-r--r--sys/dev/ir/irframe_tty.c8
-rw-r--r--sys/dev/midi.c8
-rw-r--r--sys/dev/pci/oboe.c8
-rw-r--r--sys/dev/pci/vio9p.c8
-rw-r--r--sys/dev/pci/xmm7360.c6
-rw-r--r--sys/dev/putter/putter.c6
-rw-r--r--sys/dev/qbus/qd.c8
-rw-r--r--sys/dev/sbus/bpp.c8
-rw-r--r--sys/dev/scsipi/ch.c8
-rw-r--r--sys/dev/sequencer.c8
-rw-r--r--sys/dev/sun/event.c6
-rw-r--r--sys/dev/sysmon/sysmon_power.c8
-rw-r--r--sys/dev/usb/udsir.c8
-rw-r--r--sys/dev/usb/ugen.c12
-rw-r--r--sys/dev/usb/uhid.c8
-rw-r--r--sys/dev/usb/uirda.c8
-rw-r--r--sys/dev/usb/usb.c6
-rw-r--r--sys/dev/usb/ustir.c8
-rw-r--r--sys/dev/wscons/wsevent.c6
22 files changed, 83 insertions, 83 deletions
diff --git a/sys/dev/apm/apm.c b/sys/dev/apm/apm.c
index 12a444f561c..0577e2cce93 100644
--- a/sys/dev/apm/apm.c
+++ b/sys/dev/apm/apm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apm.c,v 1.34 2020/12/19 01:18:58 thorpej Exp $ */
+/* $NetBSD: apm.c,v 1.35 2021/09/26 01:16:08 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.34 2020/12/19 01:18:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.35 2021/09/26 01:16:08 thorpej Exp $");
#include "opt_apm.h"
@@ -884,7 +884,7 @@ filt_apmread(struct knote *kn, long hint)
}
static const struct filterops apmread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_apmrdetach,
.f_event = filt_apmread,
diff --git a/sys/dev/audio/audio.c b/sys/dev/audio/audio.c
index 23782d26496..85bcd3cff3e 100644
--- a/sys/dev/audio/audio.c
+++ b/sys/dev/audio/audio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.107 2021/09/07 13:24:46 andvar Exp $ */
+/* $NetBSD: audio.c,v 1.108 2021/09/26 01:16:08 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.107 2021/09/07 13:24:46 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.108 2021/09/26 01:16:08 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -3296,7 +3296,7 @@ audio_poll(struct audio_softc *sc, int events, struct lwp *l,
}
static const struct filterops audioread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_audioread_detach,
.f_event = filt_audioread_event,
@@ -3343,7 +3343,7 @@ filt_audioread_event(struct knote *kn, long hint)
}
static const struct filterops audiowrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_audiowrite_detach,
.f_event = filt_audiowrite_event,
diff --git a/sys/dev/hpc/apm/apmdev.c b/sys/dev/hpc/apm/apmdev.c
index 21eb96afe1b..33420574f17 100644
--- a/sys/dev/hpc/apm/apmdev.c
+++ b/sys/dev/hpc/apm/apmdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apmdev.c,v 1.33 2020/12/19 01:18:59 thorpej Exp $ */
+/* $NetBSD: apmdev.c,v 1.34 2021/09/26 01:16:08 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.33 2020/12/19 01:18:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.34 2021/09/26 01:16:08 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_apm.h"
@@ -925,7 +925,7 @@ filt_apmread(struct knote *kn, long hint)
}
static const struct filterops apmread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_apmrdetach,
.f_event = filt_apmread,
diff --git a/sys/dev/ir/irframe_tty.c b/sys/dev/ir/irframe_tty.c
index 49ffb821c4d..b13119d2889 100644
--- a/sys/dev/ir/irframe_tty.c
+++ b/sys/dev/ir/irframe_tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.64 2020/12/19 01:18:59 thorpej Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.65 2021/09/26 01:16:09 thorpej Exp $ */
/*
* TODO
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.64 2020/12/19 01:18:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.65 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -830,14 +830,14 @@ filt_irframetwrite(struct knote *kn, long hint)
}
static const struct filterops irframetread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_irframetrdetach,
.f_event = filt_irframetread,
};
static const struct filterops irframetwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_irframetwdetach,
.f_event = filt_irframetwrite,
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index b8e0ac36865..f3f0ffe7387 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midi.c,v 1.94 2021/08/07 16:19:08 thorpej Exp $ */
+/* $NetBSD: midi.c,v 1.95 2021/09/26 01:16:08 thorpej Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.94 2021/08/07 16:19:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.95 2021/09/26 01:16:08 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "midi.h"
@@ -1764,7 +1764,7 @@ filt_midiread(struct knote *kn, long hint)
}
static const struct filterops midiread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_midirdetach,
.f_event = filt_midiread,
@@ -1812,7 +1812,7 @@ filt_midiwrite(struct knote *kn, long hint)
}
static const struct filterops midiwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_midiwdetach,
.f_event = filt_midiwrite,
diff --git a/sys/dev/pci/oboe.c b/sys/dev/pci/oboe.c
index 067b7c8bc5f..bfdaf1c1025 100644
--- a/sys/dev/pci/oboe.c
+++ b/sys/dev/pci/oboe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.49 2021/08/07 16:19:14 thorpej Exp $ */
+/* $NetBSD: oboe.c,v 1.50 2021/09/26 01:16:09 thorpej Exp $ */
/* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.49 2021/08/07 16:19:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.50 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -495,14 +495,14 @@ filt_oboewdetach(struct knote *kn)
}
static const struct filterops oboeread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_oboerdetach,
.f_event = filt_oboeread,
};
static const struct filterops oboewrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_oboewdetach,
.f_event = filt_seltrue,
diff --git a/sys/dev/pci/vio9p.c b/sys/dev/pci/vio9p.c
index cad81294df3..6063ca8d7c7 100644
--- a/sys/dev/pci/vio9p.c
+++ b/sys/dev/pci/vio9p.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vio9p.c,v 1.3 2021/01/20 19:46:48 reinoud Exp $ */
+/* $NetBSD: vio9p.c,v 1.4 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 2019 Internet Initiative Japan, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vio9p.c,v 1.3 2021/01/20 19:46:48 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vio9p.c,v 1.4 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -408,7 +408,7 @@ filt_vio9p_read(struct knote *kn, long hint)
}
static const struct filterops vio9p_read_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_vio9p_detach,
.f_event = filt_vio9p_read,
@@ -424,7 +424,7 @@ filt_vio9p_write(struct knote *kn, long hint)
}
static const struct filterops vio9p_write_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_vio9p_detach,
.f_event = filt_vio9p_write,
diff --git a/sys/dev/pci/xmm7360.c b/sys/dev/pci/xmm7360.c
index f94580a3573..6a97464d124 100644
--- a/sys/dev/pci/xmm7360.c
+++ b/sys/dev/pci/xmm7360.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xmm7360.c,v 1.9 2021/08/07 16:19:14 thorpej Exp $ */
+/* $NetBSD: xmm7360.c,v 1.10 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Device driver for Intel XMM7360 LTE modems, eg. Fibocom L850-GL.
@@ -75,7 +75,7 @@ MODULE_DEVICE_TABLE(pci, xmm7360_ids);
#include "opt_gateway.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.9 2021/08/07 16:19:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.10 2021/09/26 01:16:09 thorpej Exp $");
#endif
#include <sys/param.h>
@@ -261,7 +261,7 @@ typedef struct kmutex spinlock_t;
SLIST_INSERT_HEAD(klist, kn, kn_selnext)
#define klist_remove(klist, kn) \
SLIST_REMOVE(klist, kn, knote, kn_selnext)
-#define XMM_KQ_ISFD_INITIALIZER .f_isfd = 1
+#define XMM_KQ_ISFD_INITIALIZER .f_flags = FILTEROP_ISFD
#define tty_lock() mutex_spin_enter(&tty_lock)
#define tty_unlock() mutex_spin_exit(&tty_lock)
#define tty_locked() KASSERT(mutex_owned(&tty_lock))
diff --git a/sys/dev/putter/putter.c b/sys/dev/putter/putter.c
index bb3f7caa3ed..01e2ff14d2d 100644
--- a/sys/dev/putter/putter.c
+++ b/sys/dev/putter/putter.c
@@ -1,4 +1,4 @@
-/* $NetBSD: putter.c,v 1.38 2020/12/18 02:54:34 thorpej Exp $ */
+/* $NetBSD: putter.c,v 1.39 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.38 2020/12/18 02:54:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.39 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -492,7 +492,7 @@ filt_putter(struct knote *kn, long hint)
}
static const struct filterops putter_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_putterdetach,
.f_event = filt_putter,
diff --git a/sys/dev/qbus/qd.c b/sys/dev/qbus/qd.c
index 0855d97c8c6..08fcaad28fa 100644
--- a/sys/dev/qbus/qd.c
+++ b/sys/dev/qbus/qd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qd.c,v 1.58 2020/12/18 02:41:35 thorpej Exp $ */
+/* $NetBSD: qd.c,v 1.59 2021/09/26 01:16:09 thorpej Exp $ */
/*-
* Copyright (c) 1988 Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.58 2020/12/18 02:41:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.59 2021/09/26 01:16:09 thorpej Exp $");
#include "opt_ddb.h"
@@ -1581,14 +1581,14 @@ filt_qdwrite(struct knote *kn, long hint)
}
static const struct filterops qdread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_qdrdetach,
.f_event = filt_qdread,
};
static const struct filterops qdwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_qdrdetach,
.f_event = filt_qdwrite,
diff --git a/sys/dev/sbus/bpp.c b/sys/dev/sbus/bpp.c
index 78c2b469811..b66317af1b1 100644
--- a/sys/dev/sbus/bpp.c
+++ b/sys/dev/sbus/bpp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bpp.c,v 1.46 2020/12/18 02:04:17 thorpej Exp $ */
+/* $NetBSD: bpp.c,v 1.47 2021/09/26 01:16:09 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.46 2020/12/18 02:04:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.47 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -521,7 +521,7 @@ filt_bppread(struct knote *kn, long hint)
}
static const struct filterops bppread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_bpprdetach,
.f_event = filt_bppread,
@@ -551,7 +551,7 @@ filt_bpfwrite(struct knote *kn, long hint)
}
static const struct filterops bppwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_bppwdetach,
.f_event = filt_bpfwrite,
diff --git a/sys/dev/scsipi/ch.c b/sys/dev/scsipi/ch.c
index 0ea1df6f498..25449a27276 100644
--- a/sys/dev/scsipi/ch.c
+++ b/sys/dev/scsipi/ch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ch.c,v 1.93 2020/12/18 01:55:22 thorpej Exp $ */
+/* $NetBSD: ch.c,v 1.94 2021/09/26 01:16:09 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.93 2020/12/18 01:55:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.94 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -488,14 +488,14 @@ filt_chread(struct knote *kn, long hint)
}
static const struct filterops chread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_chdetach,
.f_event = filt_chread,
};
static const struct filterops chwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_chdetach,
.f_event = filt_seltrue,
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c
index 8e490045189..d50f4075141 100644
--- a/sys/dev/sequencer.c
+++ b/sys/dev/sequencer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sequencer.c,v 1.73 2020/12/19 01:18:58 thorpej Exp $ */
+/* $NetBSD: sequencer.c,v 1.74 2021/09/26 01:16:08 thorpej Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.73 2020/12/19 01:18:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.74 2021/09/26 01:16:08 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "sequencer.h"
@@ -927,7 +927,7 @@ filt_sequencerread(struct knote *kn, long hint)
}
static const struct filterops sequencerread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_sequencerrdetach,
.f_event = filt_sequencerread,
@@ -965,7 +965,7 @@ filt_sequencerwrite(struct knote *kn, long hint)
}
static const struct filterops sequencerwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_sequencerwdetach,
.f_event = filt_sequencerwrite,
diff --git a/sys/dev/sun/event.c b/sys/dev/sun/event.c
index 8bb52734752..9e3ea5b5bcd 100644
--- a/sys/dev/sun/event.c
+++ b/sys/dev/sun/event.c
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.25 2020/12/18 01:54:22 thorpej Exp $ */
+/* $NetBSD: event.c,v 1.26 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.25 2020/12/18 01:54:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.26 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -197,7 +197,7 @@ filt_evread(struct knote *kn, long hint)
}
static const struct filterops ev_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_evrdetach,
.f_event = filt_evread,
diff --git a/sys/dev/sysmon/sysmon_power.c b/sys/dev/sysmon/sysmon_power.c
index ed9c4f7b490..13675faa40c 100644
--- a/sys/dev/sysmon/sysmon_power.c
+++ b/sys/dev/sysmon/sysmon_power.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.66 2020/12/18 01:46:39 thorpej Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.67 2021/09/26 01:16:09 thorpej Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.66 2020/12/18 01:46:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.67 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -554,14 +554,14 @@ filt_sysmon_power_read(struct knote *kn, long hint)
}
static const struct filterops sysmon_power_read_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_sysmon_power_rdetach,
.f_event = filt_sysmon_power_read,
};
static const struct filterops sysmon_power_write_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_sysmon_power_rdetach,
.f_event = filt_seltrue,
diff --git a/sys/dev/usb/udsir.c b/sys/dev/usb/udsir.c
index 99759012c87..4fd5a870910 100644
--- a/sys/dev/usb/udsir.c
+++ b/sys/dev/usb/udsir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: udsir.c,v 1.14 2021/08/07 16:19:17 thorpej Exp $ */
+/* $NetBSD: udsir.c,v 1.15 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.14 2021/08/07 16:19:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.15 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -663,14 +663,14 @@ udsir_poll(void *h, int events, struct lwp *l)
}
static const struct filterops udsirread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_udsirrdetach,
.f_event = filt_udsirread,
};
static const struct filterops udsirwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_udsirwdetach,
.f_event = filt_udsirwrite,
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 0bdad978f9f..34cc6bb122d 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.167 2021/09/07 10:44:04 riastradh Exp $ */
+/* $NetBSD: ugen.c,v 1.168 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.167 2021/09/07 10:44:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.168 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2230,28 +2230,28 @@ filt_ugenwrite_bulk(struct knote *kn, long hint)
}
static const struct filterops ugenread_intr_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ugenrdetach,
.f_event = filt_ugenread_intr,
};
static const struct filterops ugenread_isoc_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ugenrdetach,
.f_event = filt_ugenread_isoc,
};
static const struct filterops ugenread_bulk_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ugenrdetach,
.f_event = filt_ugenread_bulk,
};
static const struct filterops ugenwrite_bulk_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ugenrdetach,
.f_event = filt_ugenwrite_bulk,
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 92b0d8bcb8b..20ff6adc507 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.117 2020/12/18 01:40:20 thorpej Exp $ */
+/* $NetBSD: uhid.c,v 1.118 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.117 2020/12/18 01:40:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.118 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -856,14 +856,14 @@ filt_uhidread(struct knote *kn, long hint)
}
static const struct filterops uhidread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_uhidrdetach,
.f_event = filt_uhidread,
};
static const struct filterops uhid_seltrue_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_uhidrdetach,
.f_event = filt_seltrue,
diff --git a/sys/dev/usb/uirda.c b/sys/dev/usb/uirda.c
index 7f8d37fcadf..5162fede306 100644
--- a/sys/dev/usb/uirda.c
+++ b/sys/dev/usb/uirda.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.50 2021/08/07 16:19:17 thorpej Exp $ */
+/* $NetBSD: uirda.c,v 1.51 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.50 2021/08/07 16:19:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.51 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -641,14 +641,14 @@ filt_uirdawdetach(struct knote *kn)
}
static const struct filterops uirdaread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_uirdardetach,
.f_event = filt_uirdaread,
};
static const struct filterops uirdawrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_uirdawdetach,
.f_event = filt_seltrue,
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 8be68ad747b..0526750a6a1 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.196 2021/06/13 14:48:10 riastradh Exp $ */
+/* $NetBSD: usb.c,v 1.197 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.196 2021/06/13 14:48:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.197 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1134,7 +1134,7 @@ filt_usbread(struct knote *kn, long hint)
}
static const struct filterops usbread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_usbrdetach,
.f_event = filt_usbread,
diff --git a/sys/dev/usb/ustir.c b/sys/dev/usb/ustir.c
index 87ec66d4134..7856659f0c5 100644
--- a/sys/dev/usb/ustir.c
+++ b/sys/dev/usb/ustir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.49 2021/08/07 16:19:17 thorpej Exp $ */
+/* $NetBSD: ustir.c,v 1.50 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.49 2021/08/07 16:19:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.50 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1095,14 +1095,14 @@ filt_ustirwrite(struct knote *kn, long hint)
}
static const struct filterops ustirread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ustirrdetach,
.f_event = filt_ustirread,
};
static const struct filterops ustirwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ustirwdetach,
.f_event = filt_ustirwrite,
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index 540bf74f9a3..9241effd82f 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.46 2020/12/18 01:41:23 thorpej Exp $ */
+/* $NetBSD: wsevent.c,v 1.47 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.46 2020/12/18 01:41:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.47 2021/09/26 01:16:10 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -326,7 +326,7 @@ filt_wseventread(struct knote *kn, long hint)
}
static const struct filterops wsevent_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_wseventrdetach,
.f_event = filt_wseventread,