From 17b80ff15f8ad31697a0ac929d9b8f27a3cff7fe Mon Sep 17 00:00:00 2001
From: mbr <mbr@FreeBSD.org>
Date: Sun, 3 Aug 2003 10:39:29 +0000
Subject: Fix the cdev kld example.

PR:		52954
Submitted by:	Priit Piipuu <priit.piipuu@mail.ee>
Reviewed by:	phk
---
 share/examples/kld/cdev/module/Makefile  |  9 ---------
 share/examples/kld/cdev/module/cdevmod.c | 25 +++++++++++--------------
 share/examples/kld/cdev/test/Makefile    |  2 ++
 share/examples/kld/cdev/test/testcdev.c  |  1 +
 4 files changed, 14 insertions(+), 23 deletions(-)

(limited to 'share/examples/kld/cdev')

diff --git a/share/examples/kld/cdev/module/Makefile b/share/examples/kld/cdev/module/Makefile
index 042427b..a35c500 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 cb80a72..ceb6ce0 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
 };
 
 /* 
diff --git a/share/examples/kld/cdev/test/Makefile b/share/examples/kld/cdev/test/Makefile
index 2ca3d21..ac228f9 100644
--- a/share/examples/kld/cdev/test/Makefile
+++ b/share/examples/kld/cdev/test/Makefile
@@ -89,4 +89,6 @@ unload:
 	@echo
 	${MODSTAT} -n cdev
 
+install:
+
 .include <bsd.prog.mk>
diff --git a/share/examples/kld/cdev/test/testcdev.c b/share/examples/kld/cdev/test/testcdev.c
index d69c3f5..0a61181 100644
--- a/share/examples/kld/cdev/test/testcdev.c
+++ b/share/examples/kld/cdev/test/testcdev.c
@@ -75,6 +75,7 @@
 #include <fcntl.h>
 #include <paths.h>
 #include <string.h>
+#include <sys/types.h>
 #include <sys/ioccom.h>
 
 #define CDEV_IOCTL1     _IOR('C', 1, u_int)
-- 
cgit v1.1