CVS commit: src/sys/rump/dev/lib/libumass
Module Name:src
Committed By: jdolecek
Date: Mon Apr 13 11:27:22 UTC 2020
Modified Files:
src/sys/rump/dev/lib/libumass: Makefile
Log Message:
unhook umass_isdata.c from here too
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libumass/Makefile
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/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.10 src/sys/rump/dev/lib/libumass/Makefile:1.11
--- src/sys/rump/dev/lib/libumass/Makefile:1.10 Mon Oct 19 16:16:34 2015
+++ src/sys/rump/dev/lib/libumass/Makefile Mon Apr 13 11:27:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/10/19 16:16:34 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2020/04/13 11:27:22 jdolecek Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -9,7 +9,7 @@ COMMENT=USB mass storage driver
IOCONF= UMASS.ioconf
.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
-SRCS= umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
+SRCS= umass.c umass_quirks.c umass_scsipi.c
SRCS+= umass_component.c
.else
CVS commit: src/sys/rump/dev/lib/libumass
Module Name:src
Committed By: pooka
Date: Sat Jun 13 23:33:20 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libumass: Makefile
Log Message:
fix snafu to enable umass component also for amd64
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libumass/Makefile
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/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.7 src/sys/rump/dev/lib/libumass/Makefile:1.8
--- src/sys/rump/dev/lib/libumass/Makefile:1.7 Thu Mar 13 01:54:59 2014
+++ src/sys/rump/dev/lib/libumass/Makefile Sat Jun 13 23:33:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/13 01:54:59 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/13 23:33:20 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -6,7 +6,7 @@
LIB= rumpdev_umass
IOCONF= UMASS.ioconf
-.if ${MACHINE} == i386
+.if ${MACHINE} == i386 || ${MACHINE} == amd64
SRCS= umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
SRCS+= umass_component.c
CVS commit: src/sys/rump/dev/lib/libumass
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:54:59 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libumass: Makefile
Added Files:
src/sys/rump/dev/lib/libumass: umass_component.c
Removed Files:
src/sys/rump/dev/lib/libumass: component.c
Log Message:
rename component.c - umass_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libumass/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libumass/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libumass/umass_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/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.6 src/sys/rump/dev/lib/libumass/Makefile:1.7
--- src/sys/rump/dev/lib/libumass/Makefile:1.6 Mon Aug 23 20:49:53 2010
+++ src/sys/rump/dev/lib/libumass/Makefile Thu Mar 13 01:54:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/08/23 20:49:53 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2014/03/13 01:54:59 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -9,7 +9,7 @@ IOCONF= UMASS.ioconf
.if ${MACHINE} == i386
SRCS= umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
-SRCS+= component.c
+SRCS+= umass_component.c
.else
SRCS= dummy.c
.endif
Added files:
Index: src/sys/rump/dev/lib/libumass/umass_component.c
diff -u /dev/null src/sys/rump/dev/lib/libumass/umass_component.c:1.1
--- /dev/null Thu Mar 13 01:54:59 2014
+++ src/sys/rump/dev/lib/libumass/umass_component.c Thu Mar 13 01:54:59 2014
@@ -0,0 +1,19 @@
+/* $NetBSD: umass_component.c,v 1.1 2014/03/13 01:54:59 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);
+}
CVS commit: src/sys/rump/dev/lib/libumass
Module Name:src
Committed By: pooka
Date: Wed Feb 17 20:44:34 UTC 2010
Modified Files:
src/sys/rump/dev/lib/libumass: Makefile
Log Message:
Support SCSIVERBOSE.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libumass/Makefile
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/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.3 src/sys/rump/dev/lib/libumass/Makefile:1.4
--- src/sys/rump/dev/lib/libumass/Makefile:1.3 Tue Feb 16 20:42:45 2010
+++ src/sys/rump/dev/lib/libumass/Makefile Wed Feb 17 20:44:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/02/16 20:42:45 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2010/02/17 20:44:34 pooka Exp $
#
#
# umass. includes scsibus+sd for simplicity due to the umass code
@@ -24,5 +24,10 @@
CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpvfs
+.if 1
+SRCS+= scsipi_verbose.c
+CPPFLAGS+= -DSCSIVERBOSE
+.endif
+
.include bsd.lib.mk
.include bsd.klinks.mk
