CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:58:46 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libscsitest: Makefile
Added Files:
src/sys/rump/dev/lib/libscsitest: scsitest_component.c
Removed Files:
src/sys/rump/dev/lib/libscsitest: component.c
Log Message:
rename component.c - scsitest_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libscsitest/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libscsitest/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libscsitest/scsitest_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/libscsitest/Makefile
diff -u src/sys/rump/dev/lib/libscsitest/Makefile:1.1 src/sys/rump/dev/lib/libscsitest/Makefile:1.2
--- src/sys/rump/dev/lib/libscsitest/Makefile:1.1 Tue Aug 24 11:23:35 2010
+++ src/sys/rump/dev/lib/libscsitest/Makefile Thu Mar 13 01:58:46 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2010/08/24 11:23:35 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 01:58:46 pooka Exp $
#
LIB= rumpdev_scsitest
IOCONF= SCSITEST.ioconf
SRCS= scsitest.c
-SRCS+= component.c
+SRCS+= scsitest_component.c
.include bsd.lib.mk
.include bsd.klinks.mk
Added files:
Index: src/sys/rump/dev/lib/libscsitest/scsitest_component.c
diff -u /dev/null src/sys/rump/dev/lib/libscsitest/scsitest_component.c:1.1
--- /dev/null Thu Mar 13 01:58:46 2014
+++ src/sys/rump/dev/lib/libscsitest/scsitest_component.c Thu Mar 13 01:58:46 2014
@@ -0,0 +1,46 @@
+/* $NetBSD: scsitest_component.c,v 1.1 2014/03/13 01:58:46 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: scsitest_component.c,v 1.1 2014/03/13 01:58:46 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/mbuf.h
+#include sys/stat.h
+
+#include ioconf.c
+
+#include rump_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_scsitest,
+ cfattach_ioconf_scsitest, cfdata_ioconf_scsitest);
+}
CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src
Committed By: martin
Date: Fri Mar 15 16:14:13 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libscsitest: scsitest.c
Log Message:
For the MMC GET_CONFIGURATION command, return a nulled feature header.
Fixes PR kern/47646.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libscsitest/scsitest.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/libscsitest/scsitest.c
diff -u src/sys/rump/dev/lib/libscsitest/scsitest.c:1.5 src/sys/rump/dev/lib/libscsitest/scsitest.c:1.6
--- src/sys/rump/dev/lib/libscsitest/scsitest.c:1.5 Sat Oct 27 17:18:40 2012
+++ src/sys/rump/dev/lib/libscsitest/scsitest.c Fri Mar 15 16:14:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: scsitest.c,v 1.5 2012/10/27 17:18:40 chs Exp $ */
+/* $NetBSD: scsitest.c,v 1.6 2013/03/15 16:14:12 martin Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.5 2012/10/27 17:18:40 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.6 2013/03/15 16:14:12 martin Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -176,7 +176,7 @@ scsitest_request(struct scsipi_channel *
break;
}
case GET_CONFIGURATION: {
-
+ memset(xs-data, 0, sizeof(struct scsipi_get_conf_data));
break;
}
case SCSI_READ_6_COMMAND: {
CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src Committed By: martin Date: Sun May 6 16:33:02 UTC 2012 Modified Files: src/sys/rump/dev/lib/libscsitest: scsitest.c Log Message: If we are not delivering a host iso file (USE_TOSI_ISO is undefined), use -1 as file descriptor initially. The -2 value confused a few other checks later and led to inconsistent media present reports. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libscsitest/scsitest.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/libscsitest/scsitest.c diff -u src/sys/rump/dev/lib/libscsitest/scsitest.c:1.1 src/sys/rump/dev/lib/libscsitest/scsitest.c:1.2 --- src/sys/rump/dev/lib/libscsitest/scsitest.c:1.1 Tue Aug 24 11:23:35 2010 +++ src/sys/rump/dev/lib/libscsitest/scsitest.c Sun May 6 16:33:02 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: scsitest.c,v 1.1 2010/08/24 11:23:35 pooka Exp $ */ +/* $NetBSD: scsitest.c,v 1.2 2012/05/06 16:33:02 martin Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.1 2010/08/24 11:23:35 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.2 2012/05/06 16:33:02 martin Exp $); #include sys/param.h #include sys/atomic.h @@ -221,7 +221,7 @@ scsitest_match(struct device *parent, st if ((isofd = rumpuser_open(MYCDISO, O_RDWR, error)) == -1) return 0; #else - isofd = -2; + isofd = -1; #endif return 1;
CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src Committed By: martin Date: Sun May 6 16:58:31 UTC 2012 Modified Files: src/sys/rump/dev/lib/libscsitest: scsitest.c Log Message: Revert previous and add a comment - I misunderstood what this code is emulating. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libscsitest/scsitest.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/libscsitest/scsitest.c diff -u src/sys/rump/dev/lib/libscsitest/scsitest.c:1.2 src/sys/rump/dev/lib/libscsitest/scsitest.c:1.3 --- src/sys/rump/dev/lib/libscsitest/scsitest.c:1.2 Sun May 6 16:33:02 2012 +++ src/sys/rump/dev/lib/libscsitest/scsitest.c Sun May 6 16:58:31 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: scsitest.c,v 1.2 2012/05/06 16:33:02 martin Exp $ */ +/* $NetBSD: scsitest.c,v 1.3 2012/05/06 16:58:31 martin Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.2 2012/05/06 16:33:02 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.3 2012/05/06 16:58:31 martin Exp $); #include sys/param.h #include sys/atomic.h @@ -221,7 +221,10 @@ scsitest_match(struct device *parent, st if ((isofd = rumpuser_open(MYCDISO, O_RDWR, error)) == -1) return 0; #else - isofd = -1; + /* + * We pretend to have a medium present initially, so != -1. + */ + isofd = -2; #endif return 1;
