summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2020-02-20 16:56:54 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2020-02-20 16:56:54 +0000
commitec03129c70182f2b24dd73c23b65e21de8134a24 (patch)
treeaff61980f07f1f0d612de2436534affed30f3ae6 /sys/dev
parent00bbf32646352eb0f9b77ee2a5ab19f6b3f53f7b (diff)
Replace field f_isfd with field f_flags in struct filterops to allow
adding more filter properties without cluttering the struct. OK mpi@, anton@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi.c4
-rw-r--r--sys/dev/hotplug.c4
-rw-r--r--sys/dev/midi.c6
-rw-r--r--sys/dev/pci/drm/drm_drv.c4
-rw-r--r--sys/dev/rnd.c6
-rw-r--r--sys/dev/usb/ugen.c8
-rw-r--r--sys/dev/usb/uhid.c6
-rw-r--r--sys/dev/vscsi.c4
-rw-r--r--sys/dev/wscons/wsevent.c4
9 files changed, 23 insertions, 23 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 7db2b8874af..1514bb81db6 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.377 2019/12/31 13:48:31 visa Exp $ */
+/* $OpenBSD: acpi.c,v 1.378 2020/02/20 16:56:52 visa Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -3450,7 +3450,7 @@ void acpi_filtdetach(struct knote *);
int acpi_filtread(struct knote *, long);
const struct filterops acpiread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = acpi_filtdetach,
.f_event = acpi_filtread,
diff --git a/sys/dev/hotplug.c b/sys/dev/hotplug.c
index 8f6042cbd9d..ac9b589238a 100644
--- a/sys/dev/hotplug.c
+++ b/sys/dev/hotplug.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hotplug.c,v 1.18 2019/12/31 13:48:31 visa Exp $ */
+/* $OpenBSD: hotplug.c,v 1.19 2020/02/20 16:56:52 visa Exp $ */
/*
* Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
*
@@ -39,7 +39,7 @@ void filt_hotplugrdetach(struct knote *);
int filt_hotplugread(struct knote *, long);
const struct filterops hotplugread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_hotplugrdetach,
.f_event = filt_hotplugread,
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index 7a96e87ccf5..bea0a601db1 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: midi.c,v 1.45 2019/12/31 13:48:31 visa Exp $ */
+/* $OpenBSD: midi.c,v 1.46 2020/02/20 16:56:52 visa Exp $ */
/*
* Copyright (c) 2003, 2004 Alexandre Ratchov
@@ -67,7 +67,7 @@ void filt_midiwdetach(struct knote *);
int filt_midiwrite(struct knote *, long);
const struct filterops midiwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_midiwdetach,
.f_event = filt_midiwrite,
@@ -77,7 +77,7 @@ void filt_midirdetach(struct knote *);
int filt_midiread(struct knote *, long);
const struct filterops midiread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_midirdetach,
.f_event = filt_midiread,
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index 2f7c81e5aac..0dd934858cc 100644
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: drm_drv.c,v 1.170 2020/01/05 08:39:46 jsg Exp $ */
+/* $OpenBSD: drm_drv.c,v 1.171 2020/02/20 16:56:52 visa Exp $ */
/*-
* Copyright 2007-2009 Owain G. Ainsworth <oga@openbsd.org>
* Copyright © 2008 Intel Corporation
@@ -496,7 +496,7 @@ filt_drmkms(struct knote *kn, long hint)
}
const struct filterops drm_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_drmdetach,
.f_event = filt_drmkms,
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c
index 97a1320f5a5..eb328e5efda 100644
--- a/sys/dev/rnd.c
+++ b/sys/dev/rnd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rnd.c,v 1.200 2019/12/31 13:48:31 visa Exp $ */
+/* $OpenBSD: rnd.c,v 1.201 2020/02/20 16:56:52 visa Exp $ */
/*
* Copyright (c) 2011 Theo de Raadt.
@@ -242,14 +242,14 @@ static void _rs_seed(u_char *, size_t);
static void _rs_clearseed(const void *p, size_t s);
const struct filterops randomread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_randomdetach,
.f_event = filt_randomread,
};
const struct filterops randomwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_randomdetach,
.f_event = filt_randomwrite,
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 7c2cd6d8178..40b151483c9 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ugen.c,v 1.101 2020/01/04 11:37:33 mpi Exp $ */
+/* $OpenBSD: ugen.c,v 1.102 2020/02/20 16:56:52 visa 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 $ */
@@ -1329,21 +1329,21 @@ filt_ugenread_isoc(struct knote *kn, long hint)
}
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,
};
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,
};
const struct filterops ugen_seltrue_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ugenrdetach,
.f_event = filt_seltrue,
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 979105a069d..9211f740379 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhid.c,v 1.76 2020/01/18 09:00:52 visa Exp $ */
+/* $OpenBSD: uhid.c,v 1.77 2020/02/20 16:56:52 visa Exp $ */
/* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -461,14 +461,14 @@ filt_uhidread(struct knote *kn, long hint)
}
const struct filterops uhidread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_uhidrdetach,
.f_event = filt_uhidread,
};
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/vscsi.c b/sys/dev/vscsi.c
index 7a85d6fef66..5b8f9994537 100644
--- a/sys/dev/vscsi.c
+++ b/sys/dev/vscsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vscsi.c,v 1.47 2020/02/05 16:29:29 krw Exp $ */
+/* $OpenBSD: vscsi.c,v 1.48 2020/02/20 16:56:52 visa Exp $ */
/*
* Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
@@ -114,7 +114,7 @@ void filt_vscsidetach(struct knote *);
int filt_vscsiread(struct knote *, long);
const struct filterops vscsi_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_vscsidetach,
.f_event = filt_vscsiread,
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index 883d70d96b5..36a8dd9eaa0 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsevent.c,v 1.22 2019/12/31 13:48:31 visa Exp $ */
+/* $OpenBSD: wsevent.c,v 1.23 2020/02/20 16:56:52 visa Exp $ */
/* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */
/*
@@ -89,7 +89,7 @@ void filt_wseventdetach(struct knote *);
int filt_wseventread(struct knote *, long);
const struct filterops wsevent_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_wseventdetach,
.f_event = filt_wseventread,