Module Name: src
Committed By: pooka
Date: Wed Jul 7 10:47:39 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: devsw.c
src/sys/rump/librump/rumpvfs: devnull.c
Log Message:
Borrow /dev/mem major from i386 for /dev/null and autogenerate node.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpkern/devsw.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpvfs/devnull.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/devsw.c
diff -u src/sys/rump/librump/rumpkern/devsw.c:1.3 src/sys/rump/librump/rumpkern/devsw.c:1.4
--- src/sys/rump/librump/rumpkern/devsw.c:1.3 Wed Jul 7 10:46:20 2010
+++ src/sys/rump/librump/rumpkern/devsw.c Wed Jul 7 10:47:39 2010
@@ -43,7 +43,7 @@
{ "rumpblk", 197, 197, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "cons", -1, 0, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "ctty", -1, 1, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
- { "mem", -1, 2, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
+ { "null", -1, 2, DEVNODE_SINGLE, 0, { 0, 0 }},
{ "wd", 0, 3, DEVNODE_VECTOR, 0, { 8, 8 }},
{ "swap", 1, 4, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "pts", -1, 5, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
Index: src/sys/rump/librump/rumpvfs/devnull.c
diff -u src/sys/rump/librump/rumpvfs/devnull.c:1.1 src/sys/rump/librump/rumpvfs/devnull.c:1.2
--- src/sys/rump/librump/rumpvfs/devnull.c:1.1 Thu Dec 17 00:29:46 2009
+++ src/sys/rump/librump/rumpvfs/devnull.c Wed Jul 7 10:47:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: devnull.c,v 1.1 2009/12/17 00:29:46 pooka Exp $ */
+/* $NetBSD: devnull.c,v 1.2 2010/07/07 10:47:39 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: devnull.c,v 1.1 2009/12/17 00:29:46 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: devnull.c,v 1.2 2010/07/07 10:47:39 pooka Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -42,8 +42,6 @@
#include "rump_vfs_private.h"
-static devmajor_t null_bmaj, null_cmaj;
-
static dev_type_open(rump_devnullopen);
static dev_type_read(rump_devnullrw);
@@ -55,14 +53,14 @@
int
rump_devnull_init()
{
+ devmajor_t null_bmaj, null_cmaj;
int error;
null_bmaj = null_cmaj = NODEVMAJOR;
error = devsw_attach("null", NULL, &null_bmaj, &null_cdevsw,&null_cmaj);
- if (error != 0)
- return error;
+ KASSERT(error || null_cmaj == 2);
- return rump_vfs_makeonedevnode(S_IFCHR, "/dev/null", null_cmaj, 0);
+ return error;
}
static int
