2 files changed, 41 insertions, 11 deletions

diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index ecbac638b98e..ea828f0f0eb0 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbd.c,v 1.9 1999/05/18 11:05:58 yokota Exp $
+ * $Id: atkbd.c,v 1.10 1999/05/20 09:49:33 yokota Exp $
  */
 
 #include "atkbd.h"
@@ -64,11 +64,26 @@ static d_read_t		atkbdread;
 static d_ioctl_t	atkbdioctl;
 static d_poll_t		atkbdpoll;
 
-static struct  cdevsw atkbd_cdevsw = {
-	atkbdopen,	atkbdclose,	atkbdread,	nowrite,
-	atkbdioctl,	nostop,		nullreset,	nodevtotty,
-	atkbdpoll,	nommap,		NULL,		ATKBD_DRIVER_NAME,
-	NULL,		-1,
+static struct cdevsw atkbd_cdevsw = {
+	/* open */	atkbdopen,
+	/* close */	atkbdclose,
+	/* read */	atkbdread,
+	/* write */	nowrite,
+	/* ioctl */	atkbdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	atkbdpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	ATKBD_DRIVER_NAME,
+	/* parms */	noparms,
+	/* maj */	-1,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 #endif /* KBD_INSTALL_CDEV */
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 75624229f014..47d9d5e71205 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: kbd.c,v 1.6 1999/05/18 11:08:39 yokota Exp $
+ * $Id: kbd.c,v 1.7 1999/05/30 14:55:24 phk Exp $
  */
 
 #include "kbd.h"
@@ -406,10 +406,25 @@ static d_mmap_t		kbdmmap;
 #define CDEV_MAJOR	112
 
 static struct cdevsw kbd_cdevsw = {
-	kbdopen,	kbdclose,	kbdread,	kbdwrite,   /* ??? */
-	kbdioctl,	nullstop,	noreset,	kbddevtotty,
-	kbdpoll,	kbdmmap,	nostrategy,	"kbd",
-	NULL,		-1,		nodump,		nopsize,
+	/* open */	kbdopen,
+	/* close */	kbdclose,
+	/* read */	kbdread,
+	/* write */	kbdwrite,
+	/* ioctl */	kbdioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	kbddevtotty,
+	/* poll */	kbdpoll,
+	/* mmap */	kbdmmap,
+	/* strategy */	nostrategy,
+	/* name */	"kbd",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 static void