Module Name: src
Committed By: pooka
Date: Thu Mar 13 01:58:20 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libscsipi: Makefile
Added Files:
src/sys/rump/dev/lib/libscsipi: scsipi_component.c
Removed Files:
src/sys/rump/dev/lib/libscsipi: component.c
Log Message:
rename component.c -> scsipi_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libscsipi/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libscsipi/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libscsipi/scsipi_component.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/dev/lib/libscsipi/Makefile
diff -u src/sys/rump/dev/lib/libscsipi/Makefile:1.1 src/sys/rump/dev/lib/libscsipi/Makefile:1.2
--- src/sys/rump/dev/lib/libscsipi/Makefile:1.1 Mon Aug 23 20:49:53 2010
+++ src/sys/rump/dev/lib/libscsipi/Makefile Thu Mar 13 01:58:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/08/23 20:49:53 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 01:58:20 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/scsipi
@@ -14,7 +14,7 @@ SRCS+= cd.c sd.c
SRCS+= scsipi_verbose.c
.endif
-SRCS+= component.c
+SRCS+= scsipi_component.c
CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libscsipi/scsipi_component.c
diff -u /dev/null src/sys/rump/dev/lib/libscsipi/scsipi_component.c:1.1
--- /dev/null Thu Mar 13 01:58:20 2014
+++ src/sys/rump/dev/lib/libscsipi/scsipi_component.c Thu Mar 13 01:58:20 2014
@@ -0,0 +1,39 @@
+/* $NetBSD: scsipi_component.c,v 1.1 2014/03/13 01:58:20 pooka Exp $ */
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/kmem.h>
+#include <sys/stat.h>
+
+#include "ioconf.c"
+
+#include "rump_private.h"
+#include "rump_dev_private.h"
+#include "rump_vfs_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern struct bdevsw sd_bdevsw, cd_bdevsw;
+ extern struct cdevsw sd_cdevsw, cd_cdevsw;
+ devmajor_t bmaj, cmaj;
+
+ config_init_component(cfdriver_ioconf_scsipi,
+ cfattach_ioconf_scsipi, cfdata_ioconf_scsipi);
+
+ bmaj = cmaj = -1;
+ FLAWLESSCALL(devsw_attach("sd", &sd_bdevsw, &bmaj, &sd_cdevsw, &cmaj));
+
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/sd0", 'a',
+ bmaj, 0, 8));
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rsd0", 'a',
+ cmaj, 0, 8));
+
+ bmaj = cmaj = -1;
+ FLAWLESSCALL(devsw_attach("cd", &cd_bdevsw, &bmaj, &cd_cdevsw, &cmaj));
+
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, "/dev/cd0", 'a',
+ bmaj, 0, 8));
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rcd0", 'a',
+ cmaj, 0, 8));
+}
