Module Name: src
Committed By: pooka
Date: Thu Feb 10 11:00:45 UTC 2011
Modified Files:
src/sys/rump/librump/rumpvfs: devnodes.c
src/sys/sys: conf.h
Log Message:
Make it possible to specify a minor number for an autogenerated device node.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpvfs/devnodes.c
cvs rdiff -u -r1.138 -r1.139 src/sys/sys/conf.h
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/rumpvfs/devnodes.c
diff -u src/sys/rump/librump/rumpvfs/devnodes.c:1.5 src/sys/rump/librump/rumpvfs/devnodes.c:1.6
--- src/sys/rump/librump/rumpvfs/devnodes.c:1.5 Fri Apr 30 21:02:36 2010
+++ src/sys/rump/librump/rumpvfs/devnodes.c Thu Feb 10 11:00:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: devnodes.c,v 1.5 2010/04/30 21:02:36 pooka Exp $ */
+/* $NetBSD: devnodes.c,v 1.6 2011/02/10 11:00:45 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: devnodes.c,v 1.5 2010/04/30 21:02:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: devnodes.c,v 1.6 2011/02/10 11:00:45 pooka Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -170,6 +170,7 @@
rump_vfs_builddevs(struct devsw_conv *dcvec, size_t dcvecsize)
{
char *pnbuf = PNBUF_GET();
+ devminor_t themin;
struct devsw_conv *dc;
size_t i;
int v1, v2;
@@ -181,8 +182,14 @@
case DEVNODE_DONTBOTHER:
break;
case DEVNODE_SINGLE:
+ if (dc->d_flags & DEVNODE_FLAG_ISMINOR0) {
+ themin = dc->d_vectdim[0];
+ } else {
+ themin = 0;
+ }
makeonenode(pnbuf,
- dc->d_bmajor, dc->d_cmajor, 0, dc->d_name, -1, -1);
+ dc->d_bmajor, dc->d_cmajor, themin,
+ dc->d_name, -1, -1);
break;
case DEVNODE_VECTOR:
for (v1 = 0; v1 < dc->d_vectdim[0]; v1++) {
Index: src/sys/sys/conf.h
diff -u src/sys/sys/conf.h:1.138 src/sys/sys/conf.h:1.139
--- src/sys/sys/conf.h:1.138 Wed Jan 5 17:00:25 2011
+++ src/sys/sys/conf.h Thu Feb 10 11:00:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.h,v 1.138 2011/01/05 17:00:25 jmcneill Exp $ */
+/* $NetBSD: conf.h,v 1.139 2011/02/10 11:00:45 pooka Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -231,9 +231,13 @@
enum devnode_class {
DEVNODE_DONTBOTHER,
DEVNODE_SINGLE,
- DEVNODE_VECTOR
+ DEVNODE_VECTOR,
};
#define DEVNODE_FLAG_LINKZERO 0x01 /* create name -> name0 link */
+#define DEVNODE_FLAG_ISMINOR0 0x02 /* vector[0] specifies minor */
+#ifdef notyet
+#define DEVNODE_FLAG_ISMINOR1 0x04 /* vector[1] specifies starting minor */
+#endif
struct devsw_conv {
const char *d_name;
