[ofa-general] [PATCH] opensm/vendor: replace osm_vendor_select.h by osm_config.h
Sasha Khapyorsky
sashak at voltaire.com
Sat Oct 11 11:43:14 PDT 2008
osm_config.h and config.h have mad interface already defined. No need to
redefine in osm_vendor_select.h.
Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
opensm/include/Makefile.am | 1 -
opensm/include/vendor/osm_vendor.h | 4 +-
opensm/include/vendor/osm_vendor_select.h | 70 -----------------------------
opensm/libvendor/Makefile.am | 1 -
opensm/libvendor/osm_vendor_al.c | 2 -
opensm/libvendor/osm_vendor_ibumad.c | 2 -
opensm/libvendor/osm_vendor_mtl.c | 2 -
opensm/libvendor/osm_vendor_test.c | 2 -
opensm/libvendor/osm_vendor_umadt.c | 2 -
9 files changed, 2 insertions(+), 84 deletions(-)
delete mode 100644 opensm/include/vendor/osm_vendor_select.h
diff --git a/opensm/include/Makefile.am b/opensm/include/Makefile.am
index f1b4504..1df1abc 100644
--- a/opensm/include/Makefile.am
+++ b/opensm/include/Makefile.am
@@ -21,7 +21,6 @@ EXTRA_DIST = \
$(srcdir)/vendor/osm_vendor_mlx_transport.h \
$(srcdir)/vendor/osm_vendor_mlx_inout.h \
$(srcdir)/vendor/osm_vendor_mtl_hca_guid.h \
- $(srcdir)/vendor/osm_vendor_select.h \
$(srcdir)/vendor/osm_vendor_test.h \
$(srcdir)/vendor/osm_vendor_ts.h \
$(srcdir)/vendor/osm_vendor_mlx_txn.h \
diff --git a/opensm/include/vendor/osm_vendor.h b/opensm/include/vendor/osm_vendor.h
index 747c090..4d0ae4c 100644
--- a/opensm/include/vendor/osm_vendor.h
+++ b/opensm/include/vendor/osm_vendor.h
@@ -42,7 +42,7 @@
this is the generic include file which includes
the proper vendor specific file
*/
-#include <vendor/osm_vendor_select.h>
+#include <opensm/osm_config.h>
#if defined( OSM_VENDOR_INTF_TEST )
#include <vendor/osm_vendor_test.h>
@@ -67,5 +67,5 @@
#include <vendor/osm_vendor_al.h>
#elif
#error No MAD Interface selected!
-#error Choose an interface in osm_vendor_select.h
+#error Choose an interface in osm_config.h
#endif
diff --git a/opensm/include/vendor/osm_vendor_select.h b/opensm/include/vendor/osm_vendor_select.h
deleted file mode 100644
index a7d12dc..0000000
--- a/opensm/include/vendor/osm_vendor_select.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- *
- * - 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.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*
- * Abstract:
- * Include file that defines which vendor files to compile.
- */
-
-#ifndef _OSM_VENDOR_SELECT_H_
-#define _OSM_VENDOR_SELECT_H_
-
-/////////////////////////////////////////////////////
-//
-// MAD INTERFACE SELECTION
-//
-/////////////////////////////////////////////////////
-
-/*
- TEST and UMADT must be specified in the 'make' command line,
- with VENDOR=test or VENDOR=umadt.
-*/
-#ifndef OSM_VENDOR_INTF_OPENIB
-#ifndef OSM_VENDOR_INTF_TEST
-#ifndef OSM_VENDOR_INTF_UMADT
-#ifndef OSM_VENDOR_INTF_MTL
-#ifndef OSM_VENDOR_INTF_TS
-#ifndef OSM_VENDOR_INTF_SIM
-#ifndef OSM_VENDOR_INTF_AL
-#define OSM_VENDOR_INTF_OPENIB
-#endif /* AL */
-#endif /* TS */
-#endif /* SIM */
-#endif /* MTL */
-#endif /* UMADT */
-#endif /* TEST */
-#endif /* OPENIB */
-
-#endif /* _OSM_VENDOR_SELECT_H_ */
diff --git a/opensm/libvendor/Makefile.am b/opensm/libvendor/Makefile.am
index 63282f4..22f7a08 100644
--- a/opensm/libvendor/Makefile.am
+++ b/opensm/libvendor/Makefile.am
@@ -23,7 +23,6 @@ osmvendor_api_version=$(shell grep LIBVERSION= $(srcdir)/libosmvendor.ver | sed
COMM_HDRS= $(srcdir)/../include/vendor/osm_vendor_api.h \
$(srcdir)/../include/vendor/osm_vendor.h \
- $(srcdir)/../include/vendor/osm_vendor_select.h \
$(srcdir)/../include/vendor/osm_vendor_sa_api.h
if OSMV_OPENIB
diff --git a/opensm/libvendor/osm_vendor_al.c b/opensm/libvendor/osm_vendor_al.c
index 6f8b690..0db6880 100644
--- a/opensm/libvendor/osm_vendor_al.c
+++ b/opensm/libvendor/osm_vendor_al.c
@@ -49,8 +49,6 @@
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <vendor/osm_vendor_select.h>
-
#ifdef OSM_VENDOR_INTF_AL
#include <stdlib.h>
diff --git a/opensm/libvendor/osm_vendor_ibumad.c b/opensm/libvendor/osm_vendor_ibumad.c
index 96fd01b..ab18623 100644
--- a/opensm/libvendor/osm_vendor_ibumad.c
+++ b/opensm/libvendor/osm_vendor_ibumad.c
@@ -48,8 +48,6 @@
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <vendor/osm_vendor_select.h>
-
#ifdef OSM_VENDOR_INTF_OPENIB
#include <unistd.h>
diff --git a/opensm/libvendor/osm_vendor_mtl.c b/opensm/libvendor/osm_vendor_mtl.c
index 7f6c0cd..e81bb8e 100644
--- a/opensm/libvendor/osm_vendor_mtl.c
+++ b/opensm/libvendor/osm_vendor_mtl.c
@@ -37,8 +37,6 @@
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <vendor/osm_vendor_select.h>
-
#ifdef OSM_VENDOR_INTF_MTL
#include <stdlib.h>
diff --git a/opensm/libvendor/osm_vendor_test.c b/opensm/libvendor/osm_vendor_test.c
index c3b3e3d..67fc0e2 100644
--- a/opensm/libvendor/osm_vendor_test.c
+++ b/opensm/libvendor/osm_vendor_test.c
@@ -46,8 +46,6 @@
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <vendor/osm_vendor_select.h>
-
#ifdef OSM_VENDOR_INTF_TEST
#include <stdlib.h>
diff --git a/opensm/libvendor/osm_vendor_umadt.c b/opensm/libvendor/osm_vendor_umadt.c
index 0a8aea0..8237f3d 100644
--- a/opensm/libvendor/osm_vendor_umadt.c
+++ b/opensm/libvendor/osm_vendor_umadt.c
@@ -49,8 +49,6 @@
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <vendor/osm_vendor_select.h>
-
#ifdef OSM_VENDOR_INTF_UMADT
#include <stdlib.h>
--
1.6.0.1.196.g01914
More information about the general
mailing list