Remove the now-unused d_poll field from struct cdevsw.
This diff adjusts the various conf.{c,h} bits. To avoid making this
patch too unwieldy, I leave the removal of the device poll functions
for another patch.
(Compile-)tested on amd64, arm64, armv7, i386, loongson, macppc, octeon,
powerpc64, riscv64 and sparc64.
OK?
Index: arch/amd64/amd64/conf.c
===================================================================
RCS file: src/sys/arch/amd64/amd64/conf.c,v
retrieving revision 1.74
diff -u -p -r1.74 conf.c
--- arch/amd64/amd64/conf.c 11 Nov 2021 10:03:08 -0000 1.74
+++ arch/amd64/amd64/conf.c 27 Jun 2022 14:19:10 -0000
@@ -79,14 +79,14 @@ int nblkdev = nitems(bdevsw);
#define cdev_ocis_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, seltrue, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
/* open, close, read */
#define cdev_nvram_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, (dev_type_ioctl((*))) enodev, \
- (dev_type_stop((*))) enodev, 0, seltrue, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
/* open, close, ioctl */
@@ -95,7 +95,7 @@ int nblkdev = nitems(bdevsw);
(dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, \
dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, seltrue, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
#define mmread mmrw
Index: arch/amd64/include/conf.h
===================================================================
RCS file: src/sys/arch/amd64/include/conf.h,v
retrieving revision 1.8
diff -u -p -r1.8 conf.h
--- arch/amd64/include/conf.h 13 May 2020 08:32:43 -0000 1.8
+++ arch/amd64/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -46,7 +46,7 @@ cdev_decl(bios);
#define cdev_acpi_init(c,n) {\
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(acpi);
Index: arch/arm/include/conf.h
===================================================================
RCS file: src/sys/arch/arm/include/conf.h,v
retrieving revision 1.11
diff -u -p -r1.11 conf.h
--- arch/arm/include/conf.h 21 May 2016 21:24:36 -0000 1.11
+++ arch/arm/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -61,7 +61,7 @@ cdev_decl(fd);
#define cdev_apm_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(com);
@@ -74,7 +74,7 @@ cdev_decl(spkr);
#define cdev_openprom_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, selfalse, \
+ (dev_type_stop((*))) nullop, 0, \
(dev_type_mmap((*))) enodev }
cdev_decl(openprom);
Index: arch/arm64/include/conf.h
===================================================================
RCS file: src/sys/arch/arm64/include/conf.h,v
retrieving revision 1.3
diff -u -p -r1.3 conf.h
--- arch/arm64/include/conf.h 23 Jan 2019 09:57:36 -0000 1.3
+++ arch/arm64/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -43,7 +43,7 @@ cdev_decl(mm);
#define cdev_openprom_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, selfalse, \
+ (dev_type_stop((*))) nullop, 0, \
(dev_type_mmap((*))) enodev }
cdev_decl(openprom);
@@ -52,7 +52,7 @@ cdev_decl(openprom);
#define cdev_acpiapm_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(apm);
Index: arch/i386/i386/conf.c
===================================================================
RCS file: src/sys/arch/i386/i386/conf.c,v
retrieving revision 1.172
diff -u -p -r1.172 conf.c
--- arch/i386/i386/conf.c 11 Nov 2021 10:03:09 -0000 1.172
+++ arch/i386/i386/conf.c 27 Jun 2022 14:19:10 -0000
@@ -81,21 +81,21 @@ int nblkdev = nitems(bdevsw);
#define cdev_joy_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, seltrue, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
/* open, close, ioctl */
#define cdev_ocis_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, seltrue, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
/* open, close, read */
#define cdev_nvram_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, (dev_type_ioctl((*))) enodev, \
- (dev_type_stop((*))) enodev, 0, seltrue, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
#define mmread mmrw
Index: arch/i386/include/conf.h
===================================================================
RCS file: src/sys/arch/i386/include/conf.h,v
retrieving revision 1.19
diff -u -p -r1.19 conf.h
--- arch/i386/include/conf.h 25 May 2020 06:37:53 -0000 1.19
+++ arch/i386/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -43,7 +43,7 @@ cdev_decl(fd);
#define cdev_acpiapm_init(c,n) {\
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(spkr);
Index: arch/landisk/include/conf.h
===================================================================
RCS file: src/sys/arch/landisk/include/conf.h,v
retrieving revision 1.6
diff -u -p -r1.6 conf.h
--- arch/landisk/include/conf.h 4 Jul 2011 16:52:41 -0000 1.6
+++ arch/landisk/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -63,7 +63,7 @@ cdev_decl(fd);
#define cdev_apm_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(com);
Index: arch/loongson/include/conf.h
===================================================================
RCS file: src/sys/arch/loongson/include/conf.h,v
retrieving revision 1.3
diff -u -p -r1.3 conf.h
--- arch/loongson/include/conf.h 4 Jul 2011 16:52:41 -0000 1.3
+++ arch/loongson/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -36,7 +36,7 @@
#define cdev_apm_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(apm);
Index: arch/luna88k/include/conf.h
===================================================================
RCS file: src/sys/arch/luna88k/include/conf.h,v
retrieving revision 1.6
diff -u -p -r1.6 conf.h
--- arch/luna88k/include/conf.h 13 May 2020 08:10:03 -0000 1.6
+++ arch/luna88k/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -53,18 +53,18 @@ cdev_decl(wd);
dev_init(c,n,open), dev_init(c,n,close), \
(dev_type_read((*))) enodev, dev_init(c,n,write), \
dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, seltrue, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
+ 0, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
/* open, close, ioctl, mmap */
#define cdev_pcex_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
dev_init(c,n,mmap) }
/* open, close, ioctl, mmap */
#define cdev_xp_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
dev_init(c,n,mmap) }
Index: arch/macppc/include/conf.h
===================================================================
RCS file: src/sys/arch/macppc/include/conf.h,v
retrieving revision 1.14
diff -u -p -r1.14 conf.h
--- arch/macppc/include/conf.h 4 Jul 2011 16:52:41 -0000 1.14
+++ arch/macppc/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -40,7 +40,7 @@ cdev_decl(mm);
#define cdev_apm_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(apm);
@@ -50,7 +50,7 @@ cdev_decl(zs);
#define cdev_openprom_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, selfalse, \
+ (dev_type_stop((*))) nullop, 0, \
(dev_type_mmap((*))) enodev }
cdev_decl(openprom);
Index: arch/octeon/include/conf.h
===================================================================
RCS file: src/sys/arch/octeon/include/conf.h,v
retrieving revision 1.3
diff -u -p -r1.3 conf.h
--- arch/octeon/include/conf.h 17 Jul 2019 14:36:32 -0000 1.3
+++ arch/octeon/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -39,14 +39,14 @@
#define cdev_octboot_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, selfalse, \
+ (dev_type_stop((*))) nullop, 0, \
(dev_type_mmap((*))) enodev }
/* open, close, ioctl */
#define cdev_openprom_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, selfalse, \
+ (dev_type_stop((*))) nullop, 0, \
(dev_type_mmap((*))) enodev }
cdev_decl(octboot);
Index: arch/powerpc64/include/conf.h
===================================================================
RCS file: src/sys/arch/powerpc64/include/conf.h,v
retrieving revision 1.4
diff -u -p -r1.4 conf.h
--- arch/powerpc64/include/conf.h 16 Jul 2020 19:37:58 -0000 1.4
+++ arch/powerpc64/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -10,14 +10,14 @@ cdev_decl(opalcons);
#define cdev_kexec_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, selfalse, \
+ (dev_type_stop((*))) nullop, 0, \
(dev_type_mmap((*))) enodev }
/* open, close, ioctl */
#define cdev_openprom_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, selfalse, \
+ (dev_type_stop((*))) nullop, 0, \
(dev_type_mmap((*))) enodev }
cdev_decl(kexec);
Index: arch/riscv64/include/conf.h
===================================================================
RCS file: src/sys/arch/riscv64/include/conf.h,v
retrieving revision 1.3
diff -u -p -r1.3 conf.h
--- arch/riscv64/include/conf.h 5 Oct 2021 18:32:28 -0000 1.3
+++ arch/riscv64/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -42,7 +42,7 @@ cdev_decl(mm);
#define cdev_openprom_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, selfalse, \
+ (dev_type_stop((*))) nullop, 0, \
(dev_type_mmap((*))) enodev }
cdev_decl(openprom);
Index: arch/sparc64/include/conf.h
===================================================================
RCS file: src/sys/arch/sparc64/include/conf.h,v
retrieving revision 1.26
diff -u -p -r1.26 conf.h
--- arch/sparc64/include/conf.h 23 May 2020 11:29:37 -0000 1.26
+++ arch/sparc64/include/conf.h 27 Jun 2022 14:19:10 -0000
@@ -40,7 +40,7 @@ cdev_decl(openprom);
#define cdev_openprom_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, selfalse, \
+ (dev_type_stop((*))) nullop, 0, \
(dev_type_mmap((*))) enodev }
cdev_decl(uperf);
@@ -49,7 +49,7 @@ cdev_decl(uperf);
#define cdev_uperf_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, selfalse, \
+ (dev_type_stop((*))) nullop, 0, \
(dev_type_mmap((*))) enodev }
cdev_decl(vdsp);
@@ -58,13 +58,13 @@ cdev_decl(vdsp);
#define cdev_vdsp_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, selfalse, \
+ (dev_type_stop((*))) nullop, 0, \
(dev_type_mmap((*))) enodev }
#define cdev_gen_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
- 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
+ 0, (dev_type_mmap((*))) enodev, \
0, 0, dev_init(c,n,kqfilter) }
cdev_decl(cn);
@@ -125,6 +125,6 @@ cdev_decl(sbpp);
#define cdev_bpp_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
- 0, seltrue, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
+ 0, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
cdev_decl(bpp);
Index: sys/conf.h
===================================================================
RCS file: src/sys/sys/conf.h,v
retrieving revision 1.157
diff -u -p -r1.157 conf.h
--- sys/conf.h 27 Jun 2022 14:11:44 -0000 1.157
+++ sys/conf.h 27 Jun 2022 14:19:10 -0000
@@ -142,7 +142,6 @@ struct cdevsw {
int (*d_stop)(struct tty *tp, int rw);
struct tty *
(*d_tty)(dev_t dev);
- int (*d_poll)(dev_t dev, int events, struct proc *p);
paddr_t (*d_mmap)(dev_t, off_t, int);
u_int d_type;
u_int d_flags;
@@ -158,89 +157,88 @@ extern struct cdevsw cdevsw[];
#define dev_type_write(n) int n(dev_t, struct uio *, int)
#define dev_type_stop(n) int n(struct tty *, int)
#define dev_type_tty(n) struct tty *n(dev_t)
-#define dev_type_poll(n) int n(dev_t, int, struct proc *)
#define dev_type_mmap(n) paddr_t n(dev_t, off_t, int)
#define dev_type_kqfilter(n) int n(dev_t, struct knote *)
#define cdev_decl(n) \
dev_decl(n,open); dev_decl(n,close); dev_decl(n,read); \
dev_decl(n,write); dev_decl(n,ioctl); dev_decl(n,stop); \
- dev_decl(n,tty); dev_decl(n,poll); dev_decl(n,mmap); \
+ dev_decl(n,tty); dev_decl(n,mmap); \
dev_decl(n,kqfilter)
/* open, close, read, write, ioctl */
#define cdev_disk_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, seltrue, (dev_type_mmap((*))) enodev, \
+ 0, (dev_type_mmap((*))) enodev, \
D_DISK, 0, seltrue_kqfilter }
/* open, close, read, write, ioctl */
#define cdev_tape_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, seltrue, (dev_type_mmap((*))) enodev, \
+ 0, (dev_type_mmap((*))) enodev, \
0, 0, seltrue_kqfilter }
/* open, close, read, write, ioctl, stop, tty */
#define cdev_tty_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \
- dev_init(c,n,tty), ttpoll, (dev_type_mmap((*))) enodev, \
+ dev_init(c,n,tty), (dev_type_mmap((*))) enodev, \
D_TTY, 0, ttkqfilter }
-/* open, close, read, ioctl, poll, kqfilter */
+/* open, close, read, ioctl, kqfilter */
#define cdev_mouse_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev , 0, 0, dev_init(c,n,kqfilter) }
#define cdev_notdef() { \
(dev_type_open((*))) enodev, (dev_type_close((*))) enodev, \
(dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \
(dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \
- 0, seltrue, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
+ 0, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
-/* open, close, read, write, ioctl, poll, kqfilter -- XXX should be a tty */
+/* open, close, read, write, ioctl, kqfilter -- XXX should be a tty */
#define cdev_cn_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \
- 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
+ 0, (dev_type_mmap((*))) enodev, \
D_TTY, 0, dev_init(c,n,kqfilter) }
-/* open, read, write, ioctl, poll, kqfilter -- XXX should be a tty */
+/* open, read, write, ioctl, kqfilter -- XXX should be a tty */
#define cdev_ctty_init(c,n) { \
dev_init(c,n,open), (dev_type_close((*))) nullop, dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
- 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
+ 0, (dev_type_mmap((*))) enodev, \
D_TTY, 0, dev_init(c,n,kqfilter) }
/* open, close, read, write, ioctl, mmap */
#define cdev_mm_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, seltrue, dev_init(c,n,mmap), \
+ (dev_type_stop((*))) enodev, 0, dev_init(c,n,mmap), \
0, 0, seltrue_kqfilter }
-/* open, close, read, write, ioctl, tty, poll, kqfilter */
+/* open, close, read, write, ioctl, tty, kqfilter */
#define cdev_ptc_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
- dev_init(c,n,tty), dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
+ dev_init(c,n,tty), (dev_type_mmap((*))) enodev, \
D_TTY, 0, dev_init(c,n,kqfilter) }
/* open, close, read, write, ioctl, mmap */
#define cdev_ptm_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, (dev_type_mmap((*))) enodev }
+ (dev_type_stop((*))) enodev, 0, (dev_type_mmap((*))) enodev }
-/* open, close, read, ioctl, poll, kqfilter XXX should be a generic device */
+/* open, close, read, ioctl, kqfilter XXX should be a generic device */
#define cdev_log_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
/* open */
@@ -248,223 +246,223 @@ extern struct cdevsw cdevsw[];
dev_init(c,n,open), (dev_type_close((*))) enodev, \
(dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \
(dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \
- 0, selfalse, (dev_type_mmap((*))) enodev }
+ 0, (dev_type_mmap((*))) enodev }
-/* open, close, read, write, ioctl, poll, kqfilter -- XXX should be generic
device */
+/* open, close, read, write, ioctl, kqfilter -- XXX should be generic device */
#define cdev_tun_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
+ 0, (dev_type_mmap((*))) enodev, \
0, 0, dev_init(c,n,kqfilter) }
-/* open, close, ioctl, poll, kqfilter -- XXX should be generic device */
+/* open, close, ioctl, kqfilter -- XXX should be generic device */
#define cdev_vscsi_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), \
(dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \
dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
+ 0, (dev_type_mmap((*))) enodev, \
0, 0, dev_init(c,n,kqfilter) }
-/* open, close, read, write, ioctl, poll, kqfilter -- XXX should be generic
device */
+/* open, close, read, write, ioctl, kqfilter -- XXX should be generic device */
#define cdev_pppx_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
+ 0, (dev_type_mmap((*))) enodev, \
0, 0, dev_init(c,n,kqfilter) }
-/* open, close, read, write, ioctl, poll, kqfilter, cloning -- XXX should be
generic device */
+/* open, close, read, write, ioctl, kqfilter, cloning -- XXX should be generic
device */
#define cdev_bpf_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
+ 0, (dev_type_mmap((*))) enodev, \
0, D_CLONE, dev_init(c,n,kqfilter) }
/* open, close, ioctl */
#define cdev_ch_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev }
/* open, close, ioctl */
#define cdev_uk_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev }
/* open, close, ioctl, mmap */
#define cdev_fb_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
dev_init(c,n,mmap) }
-/* open, close, read, write, ioctl, poll, kqfilter */
+/* open, close, read, write, ioctl, kqfilter */
#define cdev_audio_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
-/* open, close, read, write, ioctl, poll, kqfilter */
+/* open, close, read, write, ioctl, kqfilter */
#define cdev_midi_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
/* open, close, read */
#define cdev_ksyms_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, (dev_type_ioctl((*))) enodev, \
- (dev_type_stop((*))) enodev, 0, seltrue, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
/* open, close, ioctl */
#define cdev_kstat_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev }
-/* open, close, read, write, ioctl, stop, tty, poll, mmap, kqfilter */
+/* open, close, read, write, ioctl, stop, tty, mmap, kqfilter */
#define cdev_wsdisplay_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \
- dev_init(c,n,tty), dev_init(c,n,poll), dev_init(c,n,mmap), \
+ dev_init(c,n,tty), dev_init(c,n,mmap), \
D_TTY, 0, dev_init(c,n,kqfilter) }
-/* open, close, read, write, ioctl, poll, kqfilter */
+/* open, close, read, write, ioctl, kqfilter */
#define cdev_random_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, seltrue, (dev_type_mmap((*))) enodev, \
+ 0, (dev_type_mmap((*))) enodev, \
0, 0, dev_init(c,n,kqfilter) }
-/* open, close, ioctl, poll, nokqfilter */
+/* open, close, ioctl, nokqfilter */
#define cdev_usb_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev }
/* open, close, write */
#define cdev_ulpt_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
dev_init(c,n,write), (dev_type_ioctl((*))) enodev, \
- (dev_type_stop((*))) enodev, 0, selfalse, (dev_type_mmap((*))) enodev }
+ (dev_type_stop((*))) enodev, 0, (dev_type_mmap((*))) enodev }
/* open, close, ioctl */
#define cdev_pf_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev }
-/* open, close, read, write, ioctl, poll, kqfilter */
+/* open, close, read, write, ioctl, kqfilter */
#define cdev_usbdev_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, 0, 0, \
+ 0, (dev_type_mmap((*))) enodev, 0, 0, \
dev_init(c,n,kqfilter) }
-/* open, close, read, write, ioctl, poll, kqfilter */
+/* open, close, read, write, ioctl, kqfilter */
#define cdev_fido_init(c,n) { \
dev_init(c,n,open), dev_init(c,uhid,close), dev_init(c,uhid,read), \
dev_init(c,uhid,write), dev_init(c,fido,ioctl), \
- (dev_type_stop((*))) enodev, 0, dev_init(c,uhid,poll), \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,uhid,kqfilter) }
-/* open, close, read, write, ioctl, poll, kqfilter */
+/* open, close, read, write, ioctl, kqfilter */
#define cdev_ujoy_init(c,n) { \
dev_init(c,n,open), dev_init(c,uhid,close), dev_init(c,uhid,read), \
dev_init(c,uhid,write), dev_init(c,ujoy,ioctl), \
- (dev_type_stop((*))) enodev, 0, dev_init(c,uhid,poll), \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,uhid,kqfilter) }
/* open, close, init */
#define cdev_pci_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev }
/* open, close, ioctl */
#define cdev_radio_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev }
-/* open, close, ioctl, read, mmap, poll, kqfilter */
+/* open, close, ioctl, read, mmap, kqfilter */
#define cdev_video_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
+ (dev_type_stop((*))) enodev, 0, \
dev_init(c,n,mmap), 0, 0, dev_init(c,n,kqfilter) }
/* open, close, write, ioctl */
#define cdev_spkr_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, seltrue, (dev_type_mmap((*))) enodev, \
+ 0, (dev_type_mmap((*))) enodev, \
0, 0, seltrue_kqfilter }
/* open, close, write */
#define cdev_lpt_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
dev_init(c,n,write), (dev_type_ioctl((*))) enodev, \
- (dev_type_stop((*))) enodev, 0, seltrue, (dev_type_mmap((*))) enodev, \
+ (dev_type_stop((*))) enodev, 0, (dev_type_mmap((*))) enodev, \
0, 0, seltrue_kqfilter }
/* open, close, read, ioctl, mmap */
#define cdev_bktr_init(c, n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, seltrue, dev_init(c,n,mmap), \
+ (dev_type_stop((*))) enodev, 0, dev_init(c,n,mmap), \
0, 0, seltrue_kqfilter }
-/* open, close, read, ioctl, poll, kqfilter */
+/* open, close, read, ioctl, kqfilter */
#define cdev_hotplug_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
/* open, close, ioctl */
#define cdev_gpio_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev }
/* open, close, ioctl */
#define cdev_bio_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev }
-/* open, close, read, ioctl, poll, mmap, nokqfilter */
+/* open, close, read, ioctl, mmap, nokqfilter */
#define cdev_drm_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c, n, read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
+ (dev_type_stop((*))) enodev, 0, \
dev_init(c,n,mmap), 0, D_CLONE, dev_init(c,n,kqfilter) }
/* open, close, ioctl */
#define cdev_amdmsr_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev }
-/* open, close, read, write, poll, ioctl */
+/* open, close, read, write, ioctl */
#define cdev_fuse_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, D_CLONE, dev_init(c,n,kqfilter) }
/* open, close, ioctl */
@@ -473,28 +471,28 @@ extern struct cdevsw cdevsw[];
(dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, \
dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev }
/* open, close, ioctl */
#define cdev_ipmi_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, seltrue, (dev_type_mmap((*))) enodev, \
+ (dev_type_stop((*))) enodev, 0, (dev_type_mmap((*))) enodev, \
0, 0, seltrue_kqfilter }
/* open, close, ioctl, mmap */
#define cdev_kcov_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_init(c,n,mmap)), 0, D_CLONE }
/* open, close, read, ioctl */
#define cdev_dt_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) enodev, 0, selfalse, \
+ (dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, D_CLONE }
#endif
