aboutsummaryrefslogtreecommitdiff
path: root/share/examples/kld/cdev/module
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2003-08-03 10:39:29 +0000
committerMartin Blapp <mbr@FreeBSD.org>2003-08-03 10:39:29 +0000
commitfffc6e58d90fb163e7fc5c404411e02660e28c84 (patch)
tree0d4b73fc06955d9d95dd780e6536a978b16813f2 /share/examples/kld/cdev/module
parent745f3305030f5b38e4e3858218ed01e523d5aff4 (diff)
Notes
Diffstat (limited to 'share/examples/kld/cdev/module')
-rw-r--r--share/examples/kld/cdev/module/Makefile9
-rw-r--r--share/examples/kld/cdev/module/cdevmod.c25
2 files changed, 11 insertions, 23 deletions
diff --git a/share/examples/kld/cdev/module/Makefile b/share/examples/kld/cdev/module/Makefile
index 042427b56331..a35c5001395d 100644
--- a/share/examples/kld/cdev/module/Makefile
+++ b/share/examples/kld/cdev/module/Makefile
@@ -4,13 +4,4 @@
KMOD= cdev
SRCS= cdev.c cdevmod.c
-/dev/cdev:
- mknod ${.TARGET} c 32 0
-
-un/dev/cdev: .PHONY
- rm -f /dev/cdev
-
.include <bsd.kmod.mk>
-
-load: /dev/cdev
-unload: un/dev/cdev
diff --git a/share/examples/kld/cdev/module/cdevmod.c b/share/examples/kld/cdev/module/cdevmod.c
index cb80a72277c0..ceb6ce053217 100644
--- a/share/examples/kld/cdev/module/cdevmod.c
+++ b/share/examples/kld/cdev/module/cdevmod.c
@@ -75,23 +75,20 @@
#include "cdev.h"
+#if __FreeBSD_version < 500000
#define CDEV_MAJOR 32
+#else
+#define CDEV_MAJOR MAJOR_AUTO
+#endif
static struct cdevsw my_devsw = {
- /* open */ mydev_open,
- /* close */ mydev_close,
- /* read */ mydev_read,
- /* write */ mydev_write,
- /* ioctl */ mydev_ioctl,
- /* poll */ nopoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "cdev",
- /* maj */ CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ D_TTY,
- /* bmaj */ -1
+ /* open */ .d_open = mydev_open,
+ /* close */ .d_close = mydev_close,
+ /* read */ .d_read = mydev_read,
+ /* write */ .d_write = mydev_write,
+ /* ioctl */ .d_ioctl = mydev_ioctl,
+ /* name */ .d_name = "cdev",
+ /* maj */ .d_maj = CDEV_MAJOR
};
/*