Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src obsolete the installed <rump/scsitest.h> header and make it ...
details: https://anonhg.NetBSD.org/src/rev/86ca7242854e
branches: trunk
changeset: 328932:86ca7242854e
user: pooka <pooka%NetBSD.org@localhost>
date: Fri Apr 25 00:24:39 2014 +0000
description:
obsolete the installed <rump/scsitest.h> header and make it private
to tests/dev/scsipi
diffstat:
distrib/sets/lists/comp/mi | 4 +-
sys/rump/include/rump/Makefile | 4 +--
sys/rump/include/rump/scsitest.h | 38 ---------------------------------
tests/dev/scsipi/Makefile | 4 ++-
tests/dev/scsipi/libscsitest/scsitest.c | 7 +++--
tests/dev/scsipi/libscsitest/scsitest.h | 38 +++++++++++++++++++++++++++++++++
tests/dev/scsipi/t_cd.c | 5 ++-
7 files changed, 51 insertions(+), 49 deletions(-)
diffs (185 lines):
diff -r 7e0265ff56e2 -r 86ca7242854e distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Fri Apr 25 00:23:26 2014 +0000
+++ b/distrib/sets/lists/comp/mi Fri Apr 25 00:24:39 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1890 2014/04/24 21:46:44 pooka Exp $
+# $NetBSD: mi,v 1.1891 2014/04/25 00:24:39 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3058,7 +3058,7 @@
./usr/include/rump/rumpuser_port.h comp-c-include rump
./usr/include/rump/rumpvfs_if_pub.h comp-c-include rump
./usr/include/rump/rumpvnode_if.h comp-c-include rump
-./usr/include/rump/scsitest.h comp-c-include rump
+./usr/include/rump/scsitest.h comp-obsolete obsolete
./usr/include/rump/ukfs.h comp-c-include rump
./usr/include/sa.h comp-obsolete obsolete
./usr/include/saslc.h comp-c-include crypto
diff -r 7e0265ff56e2 -r 86ca7242854e sys/rump/include/rump/Makefile
--- a/sys/rump/include/rump/Makefile Fri Apr 25 00:23:26 2014 +0000
+++ b/sys/rump/include/rump/Makefile Fri Apr 25 00:24:39 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/12/18 20:14:02 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2014/04/25 00:24:39 pooka Exp $
.include <bsd.own.mk>
@@ -9,8 +9,6 @@
INCS+= rumpdefs.h rumperr.h rumpuser.h rumpvnode_if.h
INCS+= rumpkern_if_pub.h rumpvfs_if_pub.h rumpnet_if_pub.h
-
-INCS+= scsitest.h
.endif
.include <bsd.kinc.mk>
diff -r 7e0265ff56e2 -r 86ca7242854e sys/rump/include/rump/scsitest.h
--- a/sys/rump/include/rump/scsitest.h Fri Apr 25 00:23:26 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/* $NetBSD: scsitest.h,v 1.1 2010/08/24 13:19:04 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.
- */
-
-#ifndef _RUMP_SCSITEST_H_
-#define _RUMP_SCSITEST_H_
-
-enum {
- RUMP_SCSITEST_NOISYSYNC,
- RUMP_SCSITEST_MAXERROR
-};
-
-extern unsigned rump_scsitest_err[RUMP_SCSITEST_MAXERROR];
-
-#endif /* _RUMP_SCSITEST_H_ */
diff -r 7e0265ff56e2 -r 86ca7242854e tests/dev/scsipi/Makefile
--- a/tests/dev/scsipi/Makefile Fri Apr 25 00:23:26 2014 +0000
+++ b/tests/dev/scsipi/Makefile Fri Apr 25 00:24:39 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/04/24 21:46:44 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2014/04/25 00:24:39 pooka Exp $
#
.include <bsd.own.mk>
@@ -7,6 +7,8 @@
TESTS_C= t_cd
+CPPFLAGS+= -I${.CURDIR}/libscsitest
+
# kernel component required by test
SUBDIR= libscsitest
SCSITESTDIR!= cd ${.CURDIR}/libscsitest && ${PRINTOBJDIR}
diff -r 7e0265ff56e2 -r 86ca7242854e tests/dev/scsipi/libscsitest/scsitest.c
--- a/tests/dev/scsipi/libscsitest/scsitest.c Fri Apr 25 00:23:26 2014 +0000
+++ b/tests/dev/scsipi/libscsitest/scsitest.c Fri Apr 25 00:24:39 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: scsitest.c,v 1.1 2014/04/24 21:46:44 pooka Exp $ */
+/* $NetBSD: scsitest.c,v 1.2 2014/04/25 00:24:39 pooka 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 2014/04/24 21:46:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsitest.c,v 1.2 2014/04/25 00:24:39 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -51,7 +51,8 @@
#include <dev/scsipi/scsipi_all.h>
#include <rump/rumpuser.h>
-#include <rump/scsitest.h>
+
+#include "scsitest.h"
int scsitest_match(device_t, cfdata_t, void *);
void scsitest_attach(device_t, device_t, void *);
diff -r 7e0265ff56e2 -r 86ca7242854e tests/dev/scsipi/libscsitest/scsitest.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/dev/scsipi/libscsitest/scsitest.h Fri Apr 25 00:24:39 2014 +0000
@@ -0,0 +1,38 @@
+/* $NetBSD: scsitest.h,v 1.1 2014/04/25 00:24:39 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.
+ */
+
+#ifndef _RUMP_SCSITEST_H_
+#define _RUMP_SCSITEST_H_
+
+enum {
+ RUMP_SCSITEST_NOISYSYNC,
+ RUMP_SCSITEST_MAXERROR
+};
+
+extern unsigned rump_scsitest_err[RUMP_SCSITEST_MAXERROR];
+
+#endif /* _RUMP_SCSITEST_H_ */
diff -r 7e0265ff56e2 -r 86ca7242854e tests/dev/scsipi/t_cd.c
--- a/tests/dev/scsipi/t_cd.c Fri Apr 25 00:23:26 2014 +0000
+++ b/tests/dev/scsipi/t_cd.c Fri Apr 25 00:24:39 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cd.c,v 1.6 2013/03/15 16:18:49 martin Exp $ */
+/* $NetBSD: t_cd.c,v 1.7 2014/04/25 00:24:39 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -36,7 +36,8 @@
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
-#include <rump/scsitest.h>
+
+#include "scsitest.h"
#include "../../h_macros.h"
Home |
Main Index |
Thread Index |
Old Index