Module Name: src
Committed By: agc
Date: Sat Nov 19 16:41:56 UTC 2011
Modified Files:
src/etc: MAKEDEV.tmpl
src/sys/conf: majors
src/sys/dev/iscsi: iscsi.h
Log Message:
grab major 203 for the iSCSI communications device (between kernel
driver and /sbin/iscsid)
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.59 -r1.60 src/sys/conf/majors
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/iscsi/iscsi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.147 src/etc/MAKEDEV.tmpl:1.148
--- src/etc/MAKEDEV.tmpl:1.147 Tue Nov 8 19:36:30 2011
+++ src/etc/MAKEDEV.tmpl Sat Nov 19 16:41:55 2011
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.147 2011/11/08 19:36:30 apb Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.148 2011/11/19 16:41:55 agc Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -289,6 +289,9 @@
# wsfont* console font control
# wsmux* wscons event multiplexor
# xenevt Xen event interface
+#
+# iSCSI communication devices
+# iscsi* iSCSI driver and /sbin/iscsid communication
#
@@ -2092,6 +2095,11 @@ zfs)
makedir zpool 755
;;
+iscsi[0-9]*)
+ unit=${i#iscsi}
+ mkdev iscsi${unit} c %iscsi_chr% 0 600
+ ;;
+
midevend)
%MI_DEVICES_END%
local)
Index: src/sys/conf/majors
diff -u src/sys/conf/majors:1.59 src/sys/conf/majors:1.60
--- src/sys/conf/majors:1.59 Sat Oct 15 10:18:24 2011
+++ src/sys/conf/majors Sat Nov 19 16:41:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: majors,v 1.59 2011/10/15 10:18:24 tron Exp $
+# $NetBSD: majors,v 1.60 2011/11/19 16:41:56 agc Exp $
#
# Device majors for Machine-Independent drivers.
#
@@ -48,4 +48,5 @@ device-major flash char 199 block 19
device-major dtv char 200 dtv
device-major iic char 201 iic
device-major filemon char 202 filemon
+device-major iscsi char 203 iscsi
Index: src/sys/dev/iscsi/iscsi.h
diff -u src/sys/dev/iscsi/iscsi.h:1.2 src/sys/dev/iscsi/iscsi.h:1.3
--- src/sys/dev/iscsi/iscsi.h:1.2 Sat Oct 29 16:04:39 2011
+++ src/sys/dev/iscsi/iscsi.h Sat Nov 19 16:41:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi.h,v 1.2 2011/10/29 16:04:39 christos Exp $ */
+/* $NetBSD: iscsi.h,v 1.3 2011/11/19 16:41:56 agc Exp $ */
/*-
* Copyright (c) 2004,2006,2011 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#ifndef _ISCSI_H
#define _ISCSI_H
-#define ISCSI_DEV_MAJOR 202
+#define ISCSI_DEV_MAJOR 203
#define ISCSI_STRING_LENGTH (223+1)
#define ISCSI_ADDRESS_LENGTH (255+1)
