[openib-general] [PATCH] OpenSM: Move osm_mtl_bind.h from include/opensm to include/vendor
Hal Rosenstock
halr at voltaire.com
Fri Jan 26 11:13:15 PST 2007
OpenSM: Move osm_mtl_bind.h from include/opensm to include/vendor
where it belongs as it is vendor specific
Signed-off-by: Hal Rosenstock <halr at voltaire.com>
osm/include/Makefile.am | 4 ++--
osm/include/{opensm => vendor}/osm_mtl_bind.h | 0
osm/libvendor/osm_vendor_mtl.c | 3 +--
osm/libvendor/osm_vendor_mtl_transaction_mgr.c | 2 +-
osm/opensm/Makefile.am | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
rename osm/include/{opensm/osm_mtl_bind.h => vendor/osm_mtl_bind.h} (100%)
diff --git a/osm/include/Makefile.am b/osm/include/Makefile.am
index 5a186ff..5efc11a 100644
--- a/osm/include/Makefile.am
+++ b/osm/include/Makefile.am
@@ -32,7 +32,6 @@ EXTRA_DIST = \
$(srcdir)/opensm/osm_console.h \
$(srcdir)/opensm/osm_req.h \
$(srcdir)/opensm/osm_mcm_info.h \
- $(srcdir)/opensm/osm_mtl_bind.h \
$(srcdir)/opensm/osm_sa_pkey_record.h \
$(srcdir)/opensm/osm_inform.h \
$(srcdir)/opensm/osm_path.h \
@@ -153,6 +152,7 @@ EXTRA_DIST = \
$(srcdir)/vendor/osm_vendor_mlx_txn.h \
$(srcdir)/vendor/osm_vendor_al.h \
$(srcdir)/vendor/osm_vendor_mtl.h \
- $(srcdir)/vendor/osm_vendor_sa_api.h
+ $(srcdir)/vendor/osm_vendor_sa_api.h \
+ $(srcdir)/vendor/osm_mtl_bind.h
dist-hook:
diff --git a/osm/libvendor/osm_vendor_mtl.c b/osm/libvendor/osm_vendor_mtl.c
index 408213e..51561e7 100644
--- a/osm/libvendor/osm_vendor_mtl.c
+++ b/osm/libvendor/osm_vendor_mtl.c
@@ -53,8 +53,7 @@
#include <opensm/osm_subnet.h>
#include <opensm/osm_opensm.h>
#include <vendor/osm_vendor_mtl_transaction_mgr.h>
-
-#include <opensm/osm_mtl_bind.h>
+#include <vendor/osm_mtl_bind.h>
/*
Since a race can accure on requests. Meaning - a response is received before
diff --git a/osm/libvendor/osm_vendor_mtl_transaction_mgr.c b/osm/libvendor/osm_vendor_mtl_transaction_mgr.c
index 08f7833..8f2eb3a 100644
--- a/osm/libvendor/osm_vendor_mtl_transaction_mgr.c
+++ b/osm/libvendor/osm_vendor_mtl_transaction_mgr.c
@@ -50,7 +50,7 @@
#include <vendor/osm_vendor_mtl_transaction_mgr.h>
#ifdef OSM_VENDOR_INTF_MTL
-#include <opensm/osm_mtl_bind.h>
+#include <vendor/osm_mtl_bind.h>
#endif
/* this is the callback function of the timer */
diff --git a/osm/include/opensm/osm_mtl_bind.h b/osm/include/opensm/osm_mtl_bind.h
deleted file mode 100644
index e1bc747..0000000
--- a/osm/include/opensm/osm_mtl_bind.h
+++ /dev/null
@@ -1,144 +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.
- *
- */
-
-#ifndef _OSM_BIND_H_
-#define _OSM_BIND_H_
-
-#include <opensm/osm_helper.h>
-#include <vendor/osm_vendor_mtl.h>
-#include <vendor/osm_vendor_api.h>
-#include <opensm/osm_subnet.h>
-#include <opensm/osm_opensm.h>
-
-#ifdef __cplusplus
-# define BEGIN_C_DECLS extern "C" {
-# define END_C_DECLS }
-#else /* !__cplusplus */
-# define BEGIN_C_DECLS
-# define END_C_DECLS
-#endif /* __cplusplus */
-
-BEGIN_C_DECLS
-
-/****s* OpenSM: Vendor/osm_vendor_mgt_bind
-* NAME
-* osm_vendor_mgt_bind_t
-*
-* DESCRIPTION
-* Tracks the handles returned by IB_MGT to the SMI and GSI
-* Nulled on init of the vendor obj. Populated on first bind.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_vendor_mgt_bind
-{
- boolean_t smi_init, gsi_init;
- IB_MGT_mad_hndl_t smi_mads_hdl;
- IB_MGT_mad_hndl_t gsi_mads_hdl;
- struct _osm_mtl_bind_info *smi_p_bind;
-}
-osm_vendor_mgt_bind_t;
-
-/*
-* FIELDS
-* smi_mads_hdl
-* Handle returned by IB_MGT_get_handle to the IB_MGT_SMI
-*
-* gsi_mads_hdl
-* Handle returned by IB_MGT_get_handle to the IB_MGT_GSI
-*
-* SEE ALSO
-*********/
-
-/****s* OpenSM: Vendor osm_mtl_bind_info_t
-* NAME
-* osm_mtl_bind_info_t
-*
-* DESCRIPTION
-* Handle to the result of binding a class callbacks to IB_MGT.
-*
-* SYNOPSIS
-*/
-typedef struct _osm_mtl_bind_info
-{
- IB_MGT_mad_hndl_t mad_hndl;
- osm_vendor_t *p_vend;
- void *client_context;
- VAPI_hca_hndl_t hca_hndl;
- VAPI_hca_id_t hca_id;
- uint8_t port_num;
- osm_vend_mad_recv_callback_t rcv_callback;
- osm_vend_mad_send_err_callback_t send_err_callback;
- osm_mad_pool_t *p_osm_pool;
-}
-osm_mtl_bind_info_t;
-
-/*
-* FIELDS
-* mad_hndl
-* the handle returned from the registration in IB_MGT
-*
-* p_vend
-* Pointer to the vendor object.
-*
-* client_context
-* User's context passed during osm_bind
-*
-* hca_id
-* HCA Id we bind to.
-*
-* port_num
-* Port number (within the HCA) of the bound port.
-*
-* rcv_callback
-* OSM Callback function to be called on receive of MAD.
-*
-* send_err_callback
-* OSM Callback to be called on send error.
-*
-* p_osm_pool
-* Points to the MAD pool used by OSM
-*
-*
-* SEE ALSO
-*********/
-ib_api_status_t
-osm_mtl_send_mad(
- IN osm_mtl_bind_info_t *p_bind,
- IN osm_madw_t * const p_madw);
-
-END_C_DECLS
-
-#endif // _OSM_BIND_H_
diff --git a/osm/include/vendor/osm_mtl_bind.h b/osm/include/vendor/osm_mtl_bind.h
new file mode 100644
index 0000000..e1bc747
--- /dev/null
+++ b/osm/include/vendor/osm_mtl_bind.h
@@ -0,0 +1,144 @@
+/*
+ * 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.
+ *
+ */
+
+#ifndef _OSM_BIND_H_
+#define _OSM_BIND_H_
+
+#include <opensm/osm_helper.h>
+#include <vendor/osm_vendor_mtl.h>
+#include <vendor/osm_vendor_api.h>
+#include <opensm/osm_subnet.h>
+#include <opensm/osm_opensm.h>
+
+#ifdef __cplusplus
+# define BEGIN_C_DECLS extern "C" {
+# define END_C_DECLS }
+#else /* !__cplusplus */
+# define BEGIN_C_DECLS
+# define END_C_DECLS
+#endif /* __cplusplus */
+
+BEGIN_C_DECLS
+
+/****s* OpenSM: Vendor/osm_vendor_mgt_bind
+* NAME
+* osm_vendor_mgt_bind_t
+*
+* DESCRIPTION
+* Tracks the handles returned by IB_MGT to the SMI and GSI
+* Nulled on init of the vendor obj. Populated on first bind.
+*
+* SYNOPSIS
+*/
+typedef struct _osm_vendor_mgt_bind
+{
+ boolean_t smi_init, gsi_init;
+ IB_MGT_mad_hndl_t smi_mads_hdl;
+ IB_MGT_mad_hndl_t gsi_mads_hdl;
+ struct _osm_mtl_bind_info *smi_p_bind;
+}
+osm_vendor_mgt_bind_t;
+
+/*
+* FIELDS
+* smi_mads_hdl
+* Handle returned by IB_MGT_get_handle to the IB_MGT_SMI
+*
+* gsi_mads_hdl
+* Handle returned by IB_MGT_get_handle to the IB_MGT_GSI
+*
+* SEE ALSO
+*********/
+
+/****s* OpenSM: Vendor osm_mtl_bind_info_t
+* NAME
+* osm_mtl_bind_info_t
+*
+* DESCRIPTION
+* Handle to the result of binding a class callbacks to IB_MGT.
+*
+* SYNOPSIS
+*/
+typedef struct _osm_mtl_bind_info
+{
+ IB_MGT_mad_hndl_t mad_hndl;
+ osm_vendor_t *p_vend;
+ void *client_context;
+ VAPI_hca_hndl_t hca_hndl;
+ VAPI_hca_id_t hca_id;
+ uint8_t port_num;
+ osm_vend_mad_recv_callback_t rcv_callback;
+ osm_vend_mad_send_err_callback_t send_err_callback;
+ osm_mad_pool_t *p_osm_pool;
+}
+osm_mtl_bind_info_t;
+
+/*
+* FIELDS
+* mad_hndl
+* the handle returned from the registration in IB_MGT
+*
+* p_vend
+* Pointer to the vendor object.
+*
+* client_context
+* User's context passed during osm_bind
+*
+* hca_id
+* HCA Id we bind to.
+*
+* port_num
+* Port number (within the HCA) of the bound port.
+*
+* rcv_callback
+* OSM Callback function to be called on receive of MAD.
+*
+* send_err_callback
+* OSM Callback to be called on send error.
+*
+* p_osm_pool
+* Points to the MAD pool used by OSM
+*
+*
+* SEE ALSO
+*********/
+ib_api_status_t
+osm_mtl_send_mad(
+ IN osm_mtl_bind_info_t *p_bind,
+ IN osm_madw_t * const p_madw);
+
+END_C_DECLS
+
+#endif // _OSM_BIND_H_
More information about the general
mailing list