Module Name: src
Committed By: pooka
Date: Mon Aug 23 20:49:54 UTC 2010
Modified Files:
src/sys/rump/dev: Makefile.rumpdev
src/sys/rump/dev/lib/libumass: Makefile UMASS.ioconf
Added Files:
src/sys/rump/dev/lib/libscsipi: Makefile SCSIPI.ioconf component.c
shlib_version
src/sys/rump/dev/lib/libscsipi/opt: atapibus.h opt_compat_freebsd.h
opt_scsi.h scsibus.h wd.h
src/sys/rump/dev/lib/libumass: component.c
Removed Files:
src/sys/rump/dev/lib/libumass: sd_at_scsibus_at_umass.c
src/sys/rump/dev/lib/libumass/opt: atapibus.h opt_compat_freebsd.h
opt_scsi.h scsibus.h wd.h
Log Message:
Split scsipi out of librumpdev_umass into librumpdev_scsipi. umass
still compile time depends on scsipi in the sense of "ifdef
NATAPIBLUES", but I'm not going to fix that now.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/dev/Makefile.rumpdev
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libscsipi/Makefile \
src/sys/rump/dev/lib/libscsipi/SCSIPI.ioconf \
src/sys/rump/dev/lib/libscsipi/component.c \
src/sys/rump/dev/lib/libscsipi/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libscsipi/opt/atapibus.h \
src/sys/rump/dev/lib/libscsipi/opt/opt_compat_freebsd.h \
src/sys/rump/dev/lib/libscsipi/opt/opt_scsi.h \
src/sys/rump/dev/lib/libscsipi/opt/scsibus.h \
src/sys/rump/dev/lib/libscsipi/opt/wd.h
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libumass/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libumass/UMASS.ioconf
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libumass/component.c
cvs rdiff -u -r1.5 -r0 src/sys/rump/dev/lib/libumass/sd_at_scsibus_at_umass.c
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libumass/opt/atapibus.h \
src/sys/rump/dev/lib/libumass/opt/opt_compat_freebsd.h \
src/sys/rump/dev/lib/libumass/opt/opt_scsi.h \
src/sys/rump/dev/lib/libumass/opt/scsibus.h \
src/sys/rump/dev/lib/libumass/opt/wd.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/dev/Makefile.rumpdev
diff -u src/sys/rump/dev/Makefile.rumpdev:1.14 src/sys/rump/dev/Makefile.rumpdev:1.15
--- src/sys/rump/dev/Makefile.rumpdev:1.14 Wed Jun 30 16:14:18 2010
+++ src/sys/rump/dev/Makefile.rumpdev Mon Aug 23 20:49:53 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.rumpdev,v 1.14 2010/06/30 16:14:18 pooka Exp $
+# $NetBSD: Makefile.rumpdev,v 1.15 2010/08/23 20:49:53 pooka Exp $
#
RUMPDEVLIST= audio bpf cgd disk dm fss netsmb pad putter raidframe \
- rnd sysmon ubt ucom ugenhc ulpt umass usb wscons
+ rnd scsipi sysmon ubt ucom ugenhc ulpt umass usb wscons
.for var in ${RUMPDEVLIST}
RUMPDEVLIBS+=lib${var}
Index: src/sys/rump/dev/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.5 src/sys/rump/dev/lib/libumass/Makefile:1.6
--- src/sys/rump/dev/lib/libumass/Makefile:1.5 Mon Mar 1 15:41:15 2010
+++ src/sys/rump/dev/lib/libumass/Makefile Mon Aug 23 20:49:53 2010
@@ -1,33 +1,20 @@
-# $NetBSD: Makefile,v 1.5 2010/03/01 15:41:15 pooka Exp $
-#
-#
-# umass. includes scsibus+sd for simplicity due to the umass code
-# needing compile time knowledge of its presence. fixxxme
+# $NetBSD: Makefile,v 1.6 2010/08/23 20:49:53 pooka Exp $
#
-.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../dev/scsipi
+.PATH: ${.CURDIR}/../../../../dev/usb
LIB= rumpdev_umass
IOCONF= UMASS.ioconf
.if ${MACHINE} == "i386"
SRCS= umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
-SRCS+= scsipiconf.c scsipi_base.c scsipi_ioctl.c scsi_base.c scsiconf.c
-SRCS+= atapi_base.c atapiconf.c
-
-SRCS+= cd.c sd.c
-SRCS+= sd_at_scsibus_at_umass.c
+SRCS+= component.c
.else
SRCS= dummy.c
.endif
-CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpvfs
-
-.if 1
-SRCS+= scsipi_verbose.c
-CPPFLAGS+= -DSCSIVERBOSE
-.endif
+CPPFLAGS+= -I${.CURDIR}/../libscsipi/opt# -I${RUMPTOP}/librump/rumpvfs
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
Index: src/sys/rump/dev/lib/libumass/UMASS.ioconf
diff -u src/sys/rump/dev/lib/libumass/UMASS.ioconf:1.3 src/sys/rump/dev/lib/libumass/UMASS.ioconf:1.4
--- src/sys/rump/dev/lib/libumass/UMASS.ioconf:1.3 Mon Mar 8 10:24:37 2010
+++ src/sys/rump/dev/lib/libumass/UMASS.ioconf Mon Aug 23 20:49:53 2010
@@ -1,31 +1,12 @@
-# $NetBSD: UMASS.ioconf,v 1.3 2010/03/08 10:24:37 pooka Exp $
-#
-
-#
-# Technically we should not have drive components (sd, cd) in here,
-# since in the future we might want to attach them via a completely
-# separate mechanism (say, with the scsi host controller in rump).
-# But, bundle them up for now.
+# $NetBSD: UMASS.ioconf,v 1.4 2010/08/23 20:49:53 pooka Exp $
#
ioconf umass
include "conf/files"
include "dev/usb/files.usb"
-include "dev/scsipi/files.scsipi"
-include "rump/dev/files.rump"
pseudo-root uhub*
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
-
-# SCSI support
-scsibus* at scsi?
-sd* at scsibus? target ? lun ?
-cd* at scsibus? target ? lun ?
-
-# ATAPI support
-atapibus* at atapi?
-sd* at atapibus? drive ? flags 0x0000
-cd* at atapibus? drive ? flags 0x0000
Added files:
Index: src/sys/rump/dev/lib/libscsipi/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libscsipi/Makefile:1.1
--- /dev/null Mon Aug 23 20:49:54 2010
+++ src/sys/rump/dev/lib/libscsipi/Makefile Mon Aug 23 20:49:53 2010
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2010/08/23 20:49:53 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../dev/scsipi
+
+LIB= rumpdev_scsipi
+IOCONF= SCSIPI.ioconf
+
+SRCS+= scsipiconf.c scsipi_base.c scsipi_ioctl.c scsi_base.c scsiconf.c
+SRCS+= atapi_base.c atapiconf.c
+SRCS+= cd.c sd.c
+
+.if 1
+SRCS+= scsipi_verbose.c
+.endif
+
+SRCS+= component.c
+
+CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpvfs
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/dev/lib/libscsipi/SCSIPI.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libscsipi/SCSIPI.ioconf:1.1
--- /dev/null Mon Aug 23 20:49:54 2010
+++ src/sys/rump/dev/lib/libscsipi/SCSIPI.ioconf Mon Aug 23 20:49:53 2010
@@ -0,0 +1,20 @@
+# $NetBSD: SCSIPI.ioconf,v 1.1 2010/08/23 20:49:53 pooka Exp $
+#
+
+ioconf scsipi
+
+include "conf/files"
+include "dev/scsipi/files.scsipi"
+
+pseudo-root scsi*
+pseudo-root atapi*
+
+# SCSI support
+scsibus* at scsi?
+sd* at scsibus? target ? lun ?
+cd* at scsibus? target ? lun ?
+
+# ATAPI support
+atapibus* at atapi?
+sd* at atapibus? drive ? flags 0x0000
+cd* at atapibus? drive ? flags 0x0000
Index: src/sys/rump/dev/lib/libscsipi/component.c
diff -u /dev/null src/sys/rump/dev/lib/libscsipi/component.c:1.1
--- /dev/null Mon Aug 23 20:49:54 2010
+++ src/sys/rump/dev/lib/libscsipi/component.c Mon Aug 23 20:49:53 2010
@@ -0,0 +1,39 @@
+/* $NetBSD: component.c,v 1.1 2010/08/23 20:49:53 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));
+}
Index: src/sys/rump/dev/lib/libscsipi/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libscsipi/shlib_version:1.1
--- /dev/null Mon Aug 23 20:49:54 2010
+++ src/sys/rump/dev/lib/libscsipi/shlib_version Mon Aug 23 20:49:53 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/08/23 20:49:53 pooka Exp $
+#
+major=0
+minor=0
Index: src/sys/rump/dev/lib/libscsipi/opt/atapibus.h
diff -u /dev/null src/sys/rump/dev/lib/libscsipi/opt/atapibus.h:1.1
--- /dev/null Mon Aug 23 20:49:54 2010
+++ src/sys/rump/dev/lib/libscsipi/opt/atapibus.h Mon Aug 23 20:49:53 2010
@@ -0,0 +1,3 @@
+/* $NetBSD: atapibus.h,v 1.1 2010/08/23 20:49:53 pooka Exp $ */
+
+#define NATAPIBUS 1
Index: src/sys/rump/dev/lib/libscsipi/opt/opt_compat_freebsd.h
diff -u /dev/null src/sys/rump/dev/lib/libscsipi/opt/opt_compat_freebsd.h:1.1
--- /dev/null Mon Aug 23 20:49:54 2010
+++ src/sys/rump/dev/lib/libscsipi/opt/opt_compat_freebsd.h Mon Aug 23 20:49:54 2010
@@ -0,0 +1 @@
+/* $NetBSD: opt_compat_freebsd.h,v 1.1 2010/08/23 20:49:54 pooka Exp $ */
Index: src/sys/rump/dev/lib/libscsipi/opt/opt_scsi.h
diff -u /dev/null src/sys/rump/dev/lib/libscsipi/opt/opt_scsi.h:1.1
--- /dev/null Mon Aug 23 20:49:54 2010
+++ src/sys/rump/dev/lib/libscsipi/opt/opt_scsi.h Mon Aug 23 20:49:54 2010
@@ -0,0 +1 @@
+/* $NetBSD: opt_scsi.h,v 1.1 2010/08/23 20:49:54 pooka Exp $ */
Index: src/sys/rump/dev/lib/libscsipi/opt/scsibus.h
diff -u /dev/null src/sys/rump/dev/lib/libscsipi/opt/scsibus.h:1.1
--- /dev/null Mon Aug 23 20:49:54 2010
+++ src/sys/rump/dev/lib/libscsipi/opt/scsibus.h Mon Aug 23 20:49:54 2010
@@ -0,0 +1,3 @@
+/* $NetBSD: scsibus.h,v 1.1 2010/08/23 20:49:54 pooka Exp $ */
+
+#define NSCSIBUS 1
Index: src/sys/rump/dev/lib/libscsipi/opt/wd.h
diff -u /dev/null src/sys/rump/dev/lib/libscsipi/opt/wd.h:1.1
--- /dev/null Mon Aug 23 20:49:54 2010
+++ src/sys/rump/dev/lib/libscsipi/opt/wd.h Mon Aug 23 20:49:54 2010
@@ -0,0 +1 @@
+/* $NetBSD: wd.h,v 1.1 2010/08/23 20:49:54 pooka Exp $ */
Index: src/sys/rump/dev/lib/libumass/component.c
diff -u /dev/null src/sys/rump/dev/lib/libumass/component.c:1.1
--- /dev/null Mon Aug 23 20:49:54 2010
+++ src/sys/rump/dev/lib/libumass/component.c Mon Aug 23 20:49:53 2010
@@ -0,0 +1,19 @@
+/* $NetBSD: component.c,v 1.1 2010/08/23 20:49:53 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"
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_umass,
+ cfattach_ioconf_umass, cfdata_ioconf_umass);
+}
