summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/dev
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-09-23 16:51:15 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-09-23 16:51:15 +0000
commit6bb276a1685d8546283d224a3d249c66cc329264 (patch)
tree5e1c80d6cad38a8a82f5832e1e315103e7029eb9 /sys/arch/sparc/dev
parent96675671ec2520ade2f83b31563ab4da72bd443d (diff)
Replace select backends with poll backends. selscan() and pollscan()
now call the poll backend. With this change we implement greater poll(2) functionality instead of emulating it via the select backend. Adapted from NetBSD and including some changes from FreeBSD. Tested by many, deraadt@ OK
Diffstat (limited to 'sys/arch/sparc/dev')
-rw-r--r--sys/arch/sparc/dev/magma.c12
-rw-r--r--sys/arch/sparc/dev/spif.c10
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/sparc/dev/magma.c b/sys/arch/sparc/dev/magma.c
index 60c457aa1bd..d6c52594442 100644
--- a/sys/arch/sparc/dev/magma.c
+++ b/sys/arch/sparc/dev/magma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magma.c,v 1.15 2003/08/15 20:32:14 tedu Exp $ */
+/* $OpenBSD: magma.c,v 1.16 2003/09/23 16:51:11 millert Exp $ */
/*
* magma.c
*
@@ -1398,7 +1398,7 @@ int s, opt;
* mbppread read from mbpp
* mbppwrite write to mbpp
* mbppioctl do ioctl on mbpp
- * mbppselect do select on mbpp
+ * mbpppoll do poll on mbpp
* mbpp_rw general rw routine
* mbpp_timeout rw timeout
* mbpp_start rw start after delay
@@ -1589,15 +1589,15 @@ int s;
}
/*
- * select routine
+ * poll routine
*/
int
-mbppselect(dev, rw, p)
+mbpppoll(dev, events, p)
dev_t dev;
-int rw;
+int events;
struct proc *p;
{
- return(ENODEV);
+ return(seltrue(dev, events, p));
}
int
diff --git a/sys/arch/sparc/dev/spif.c b/sys/arch/sparc/dev/spif.c
index c56255e8a49..6642bcc5d81 100644
--- a/sys/arch/sparc/dev/spif.c
+++ b/sys/arch/sparc/dev/spif.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spif.c,v 1.16 2003/08/15 20:32:14 tedu Exp $ */
+/* $OpenBSD: spif.c,v 1.17 2003/09/23 16:51:11 millert Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -97,7 +97,7 @@ int sbppread(dev_t, struct uio *, int);
int sbppwrite(dev_t, struct uio *, int);
int sbpp_rw(dev_t, struct uio *);
int spifppcintr(void *);
-int sbppselect(dev_t, int, struct proc *);
+int sbpppoll(dev_t, int, struct proc *);
int sbppioctl(dev_t, u_long, caddr_t, int, struct proc *);
struct cfattach spif_ca = {
@@ -1075,12 +1075,12 @@ sbpp_rw(dev, uio)
}
int
-sbppselect(dev, rw, p)
+sbpppoll(dev, events, p)
dev_t dev;
- int rw;
+ int events;
struct proc *p;
{
- return (ENODEV);
+ return (seltrue(dev, events, p));
}
int