From 0d2205d785b52631b292d9c27a974a971e5d098f Mon Sep 17 00:00:00 2001 From: shefty Date: Thu, 3 Jul 2008 20:25:19 +0000 Subject: [PATCH] winverbs: update uvp_if patch Add documentation for get interface call by guid. Signed-off-by: Sean Hefty git-svn-id: svn://openib.tc.cornell.edu/gen1@1333 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- branches/winverbs/patches/uvp_if.txt | 110 ++++++++++++++------------- 1 file changed, 59 insertions(+), 51 deletions(-) diff --git a/branches/winverbs/patches/uvp_if.txt b/branches/winverbs/patches/uvp_if.txt index 097fc40b..61d1e82c 100644 --- a/branches/winverbs/patches/uvp_if.txt +++ b/branches/winverbs/patches/uvp_if.txt @@ -1,6 +1,6 @@ diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/core/al/user/ual_ca.c branches\winverbs/core/al/user/ual_ca.c ---- trunk/core/al/user/ual_ca.c 2008-06-03 21:35:25.166625000 -0700 -+++ branches\winverbs/core/al/user/ual_ca.c 2008-06-03 21:24:28.322875000 -0700 +--- trunk/core/al/user/ual_ca.c 2008-06-30 12:51:02.617251300 -0700 ++++ branches\winverbs/core/al/user/ual_ca.c 2008-07-03 10:59:46.593750000 -0700 @@ -116,7 +116,8 @@ open_vendor_lib( return IB_SUCCESS; } @@ -21,8 +21,8 @@ diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/core/al/user/ual_ca.c br AL_EXIT( AL_DBG_CA ); return IB_SUCCESS; diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/core/al/user/ual_support.h branches\winverbs/core/al/user/ual_support.h ---- trunk/core/al/user/ual_support.h 2008-06-03 21:35:25.182250000 -0700 -+++ branches\winverbs/core/al/user/ual_support.h 2008-06-03 21:24:28.338500000 -0700 +--- trunk/core/al/user/ual_support.h 2008-06-30 12:51:02.632876600 -0700 ++++ branches\winverbs/core/al/user/ual_support.h 2008-07-03 10:59:46.625000000 -0700 @@ -80,14 +80,6 @@ al_unload_uvp( FreeLibrary( h_uvp_lib ); } @@ -39,8 +39,8 @@ diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/core/al/user/ual_support al_uvp_lib_err( IN uint32_t dbg_lvl, diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/hw/mlx4/user/hca/mlx4.c branches\winverbs/hw/mlx4/user/hca/mlx4.c ---- trunk/hw/mlx4/user/hca/mlx4.c 2008-06-03 21:35:25.197875000 -0700 -+++ branches\winverbs/hw/mlx4/user/hca/mlx4.c 2008-06-03 21:24:28.354125000 -0700 +--- trunk/hw/mlx4/user/hca/mlx4.c 2008-07-03 11:11:44.984375000 -0700 ++++ branches\winverbs/hw/mlx4/user/hca/mlx4.c 2008-07-03 10:59:46.656250000 -0700 @@ -180,22 +180,8 @@ void mlx4_free_context(struct ibv_contex cl_free(context); } @@ -124,8 +124,8 @@ diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/hw/mlx4/user/hca/mlx4.c + return status; +} diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/hw/mthca/user/mlnx_ual_main.c branches\winverbs/hw/mthca/user/mlnx_ual_main.c ---- trunk/hw/mthca/user/mlnx_ual_main.c 2008-06-03 21:35:25.213500000 -0700 -+++ branches\winverbs/hw/mthca/user/mlnx_ual_main.c 2008-06-03 21:24:28.369750000 -0700 +--- trunk/hw/mthca/user/mlnx_ual_main.c 2008-06-30 12:51:02.711003100 -0700 ++++ branches\winverbs/hw/mthca/user/mlnx_ual_main.c 2008-07-03 10:59:46.687500000 -0700 @@ -135,70 +135,30 @@ uvp_init() __declspec(dllexport) ib_api_status_t @@ -220,8 +220,8 @@ diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/hw/mthca/user/mlnx_ual_m } - diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/inc/user/iba/ib_uvp.h branches\winverbs/inc/user/iba/ib_uvp.h ---- trunk/inc/user/iba/ib_uvp.h 2008-06-03 21:35:25.229125000 -0700 -+++ branches\winverbs/inc/user/iba/ib_uvp.h 2008-06-03 21:24:28.385375000 -0700 +--- trunk/inc/user/iba/ib_uvp.h 2008-07-03 11:11:45.218750000 -0700 ++++ branches\winverbs/inc/user/iba/ib_uvp.h 2008-07-03 11:22:27.734375000 -0700 @@ -36,6 +36,7 @@ #include #include @@ -230,22 +230,17 @@ diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/inc/user/iba/ib_uvp.h br /****h* UAL_UVP_Interface/user-mode Verbs * NAME -@@ -3342,121 +3343,61 @@ typedef void +@@ -3342,8 +3343,6 @@ typedef void /********/ -/********/ - --/****s* user-mode Verbs/uvp_interface_t --* NAME --* uvp_interface_t -- Interface holding supported Vendor APIs --* --* PURPOSE --* The following structure is supplied by a Vendor library --* providing verbs functionality. --* --* SOURCE --*/ + /****s* user-mode Verbs/uvp_interface_t + * NAME + * uvp_interface_t -- Interface holding supported Vendor APIs +@@ -3356,107 +3355,59 @@ typedef void + */ typedef struct _uvp_interface { - ib_net64_t guid; @@ -356,7 +351,7 @@ diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/inc/user/iba/ib_uvp.h br uvp_pre_create_mw pre_create_mw; uvp_post_create_mw_t post_create_mw; uvp_pre_query_mw pre_query_mw; -@@ -3464,38 +3405,21 @@ typedef struct _uvp_interface +@@ -3464,38 +3415,21 @@ typedef struct _uvp_interface uvp_pre_destroy_mw pre_destroy_mw; uvp_post_destroy_mw_t post_destroy_mw; @@ -395,54 +390,67 @@ diff -up -r -X trunk\docs\dontdiff.txt -I '\$Id:' trunk/inc/user/iba/ib_uvp.h br uvp_nd_modify_qp_t nd_modify_qp; uvp_nd_get_qp_state_t nd_get_qp_state; uvp_wv_pre_create_qp wv_pre_create_qp; -@@ -3503,46 +3427,11 @@ typedef struct _uvp_interface +@@ -3505,35 +3439,42 @@ typedef struct _uvp_interface - } uvp_interface_t; + /********/ --/********/ +// {A1F1EA66-4D17-4d04-B910-893F658241D0} +DEFINE_GUID(IID_UVP, +0xa1f1ea66, 0x4d17, 0x4d04, 0xb9, 0x10, 0x89, 0x3f, 0x65, 0x82, 0x41, 0xd0); - --/****f* user-mode Verbs/uvp_get_interface --* NAME ++ + /****f* user-mode Verbs/uvp_get_interface + * NAME -* uvp_get_interface -- Get the Vendor's supported Verbs calls --* --* SYNOPSIS --*/ ++* uvp_get_interface -- Get the Vendor's supported function calls + * + * SYNOPSIS + */ typedef ib_api_status_t --(AL_API *uvp_get_interface_t)( + (AL_API *uvp_get_interface_t)( - IN OUT uvp_interface_t* const p_uvp ); --/* --* DESCRIPTION ++ IN GUID iid, ++ IN OUT void* pifc); + /* + * DESCRIPTION -* This routine is called by UAL to get the functions supported by -* a vendor's library. Upon discovering a new CA, UAL will look for -* the appropriate vendor library, load the library and query using -* this function to get the supported interfaces. --* ++* This routine is called to get the functions supported by ++* a vendor's library. It may be used to obtain the list of ++* verb calls supported by a vendor. + * -* If the vendor does not support an interface function, it should be -* set to NULL in the interface structure returned. --* --* PARAMETERS ++* If the vendor does not support an interface, it should returns ++* IB_UNSUPPORTED. The specific details of each interface returned ++* is dependent upon the requested interface. + * + * PARAMETERS -* p_uvp -* [in out] Pointer to the uvp_interface_t structure that has the function -* vector to support verbs functionality. --* --* RETURN VALUE --* IB_SUCCESS ++* iid ++* [in] GUID of the requested interface. ++* pifc ++* [in out] Pointer to the structure that that will receive the ++* interface functions. + * + * RETURN VALUE + * IB_SUCCESS -* The registration is successful. -* IB_INSUFFICIENT_MEMORY -* Insufficient memory to satisfy request --* --* PORTABILITY --* User mode --* --* SEE ALSO --* uvp_interface_t --* --********/ -- --/********/ -+(AL_API *uvp_get_interface_t)(GUID iid, void* pifc); ++* The interface was returned successfully. ++* IB_UNSUPPORTED ++* The requested interface isn't supported by the vendor's library. + * + * PORTABILITY + * User mode +@@ -3543,6 +3484,4 @@ typedef ib_api_status_t + * + ********/ +-/********/ +- #endif // __IB_UAL_UVP_H__ -- 2.46.0