From: eitan Date: Tue, 4 Apr 2006 08:56:20 +0000 (+0000) Subject: [OpenSM] - cosmetic changes X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fe7ddbf25ebb48cdc519d88101408d2c79fa7d65;p=~shefty%2Frdma-win.git [OpenSM] - cosmetic changes git-svn-id: svn://openib.tc.cornell.edu/gen1@281 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- diff --git a/trunk/ulp/opensm/user/include/vendor/osm_vendor_sa_api.h b/trunk/ulp/opensm/user/include/vendor/osm_vendor_sa_api.h index 5c4cd9c5..e985b82a 100644 --- a/trunk/ulp/opensm/user/include/vendor/osm_vendor_sa_api.h +++ b/trunk/ulp/opensm/user/include/vendor/osm_vendor_sa_api.h @@ -34,8 +34,8 @@ /* * Abstract: - * Specification of the OpenSM SA API. This API uses the basic osm vendor - * API to provide SA Client interface. + * Specification of the OpenSM SA Client API. This API uses the basic osm + * vendor API to provide SA Client interface. * * Environment: * Linux User Mode @@ -111,61 +111,61 @@ typedef enum _osmv_query_type OSMV_QUERY_PATH_REC_BY_LIDS, OSMV_QUERY_UD_MULTICAST_SET, - OSMV_QUERY_UD_MULTICAST_DELETE + OSMV_QUERY_UD_MULTICAST_DELETE, } osmv_query_type_t; /* * VALUES * OSMV_QUERY_USER_DEFINED * Query the SA based on user-defined input. Queries of this type -* should reference an osmv_user_query_t structure as input into the +* should reference an osmv_user_query_t structure as input to the * query. * * OSMV_QUERY_SVC_REC_BY_NAME * Query for service records based on the service name. Queries of * this type should reference an ib_svc_name_t structure as input -* into the query. +* to the query. * * OSMV_QUERY_SVC_REC_BY_ID * Query for service records based on the service ID. Queries of -* this type should reference an ib_net64_t value that indicates the -* ID of the service being requested. +* this type should reference an ib_net64_t value that indicates +* the ID of the service being requested. * * OSMV_QUERY_NODE_REC_BY_NODE_GUID * Query for node information based on the node's GUID. Queries of -* this type should reference an ib_net64_t value that indicates the -* GUID of the node being requested. +* this type should reference an ib_net64_t value that indicates +* the GUID of the node being requested. * * OSMV_QUERY_PORT_REC_BY_LID -* Query for port information based on the port's base LID. Queries of -* this type should reference an ib_net16_t value that indicates the -* base LID of the port being requested. +* Query for port information based on the port's base LID. Queries +* of this type should reference an ib_net16_t value that indicates +* the base LID of the port being requested. * * OSMV_QUERY_PORT_REC_BY_LID_AND_NUM * Query for port information based on the port's LID and port num. * Queries of this type should reference an osmv_user_query_t -* structure as input into the query. The port num and lid should +* structure as input to the query. The port num and lid should * be provided by it. * * OSMV_QUERY_PATH_REC_BY_PORT_GUIDS * Query for path records between the specified pair of port GUIDs. -* Queries of this type should reference an osmv_guid_pair_t structure -* that indicates the GUIDs of the path being requested. +* Queries of this type should reference an osmv_guid_pair_t +* structure that indicates the GUIDs of the path being requested. * * OSMV_QUERY_PATH_REC_BY_GIDS * Query for path records between the specified pair of port GIDs. -* Queries of this type should reference an osmv_gid_pair_t structure -* that indicates the GIDs of the path being requested. +* Queries of this type should reference an osmv_gid_pair_t +* structure that indicates the GIDs of the path being requested. * * OSMV_QUERY_PATH_REC_BY_LIDS * Query for path records between the specified pair of port LIDs. -* Queries of this type should reference an osmv_lid_pair_t structure -* that indicates the LIDs of the path being requested. +* Queries of this type should reference an osmv_lid_pair_t +* structure that indicates the LIDs of the path being requested. * * NOTES * This enum is used to define abstracted queries provided by the access * layer. Users may issue queries not listed here by sending MADs directly -* to the subnet administrator or a class manager. These queries are +* to subnet administration or a class manager. These queries are * intended to represent those most often used by clients. * * SEE ALSO @@ -196,14 +196,14 @@ typedef struct _osmv_user_query * FIELDS * * method -* Method to be run +* Method to be used * * attr_id * Attribute identifier of query data. * * attr_offset -* Size of the query attribute, in 8-byte words. Users can set this -* value by passing in the sizeof( attribute ) into the +* Size of the query attribute, in 8-byte words. Users can set +* this value by passing in the sizeof( attribute ) into the * ib_get_attr_offset() routine. * * comp_mask @@ -216,8 +216,8 @@ typedef struct _osmv_user_query * NOTES * This structure is used to describe a user-defined query. The attribute * ID, attribute offset, component mask, and attribute structure must match -* those defined by the IBA specification. Users should refer to chapter 15 -* of the IBA specification for additional details. +* those defined by the IBA specification. Users should refer to chapter +* 15 of the IBA specification for additional details. * * SEE ALSO * osmv_query_type_t, ib_get_attr_offset, ib_get_attr_size, osmv_query_sa @@ -336,30 +336,30 @@ typedef struct _osmv_query_res /* * FIELDS * query_context -* User-defined context information associated with the query through -* the osm_vendor_query_sa call. +* User-defined context information associated with the query +* through the osm_vendor_query_sa call. * * status * Indicates the success of the query operation. * * query_type * Indicates the type of query for which the results are being returned. -* This matches the query_type specified through the osm_vendor_query_sa -* call. +* This matches the query_type specified through the +* osm_vendor_query_sa call. * * result_cnt * The number of result structures that were returned by the query. * * p_result_madw -* For queries returning IB_SUCCESS or IB_REMOTE_ERROR, this references -* the MAD wrapper returned by the subnet administrator containing the list -* of results or the returned error code. +* For queries returning IB_SUCCESS or IB_REMOTE_ERROR, this +* references the MAD wrapper returned by subnet administration +* containing the list of results or the returned error code. * * NOTES * A query result structure is returned to a client through their * osmv_pfn_query_cb_t routine to notify them of the results of a subnet * administration query. If the query was successful or received an error -* from the subnet administrator, p_result_madw will reference a MAD wrapper +* from subnet administration, p_result_madw will reference a MAD wrapper * containing the results. The MAD referenced by p_result_madw is owned by * the user and remains available even after their callback returns. Users * must call osm_mad_pool_put() to return the MAD wrapper back to the @@ -411,10 +411,10 @@ osmv_get_query_result( * [in] A zero-based index indicating which result to return. * * NOTES -* This call returns a pointer to the start of a result structure from a call -* to osmv_query_sa(). The type of result structure must be known to the user -* either through the user's context or the query_type returned as part of -* the osmv_query_res_t structure. +* This call returns a pointer to the start of a result structure from a +* call to osmv_query_sa(). The type of result structure must be known to +* the user either through the user's context or the query_type returned as +* part of the osmv_query_res_t structure. * * SEE ALSO * osmv_query_res_t, osm_madw_t @@ -496,8 +496,8 @@ osmv_get_query_portinfo_rec( * [in] A zero-based index indicating which result to return. * * NOTES -* This call returns a pointer to the start of a port info record result from -* a call to osmv_query_sa(). +* This call returns a pointer to the start of a port info record result +* from a call to osmv_query_sa(). * * SEE ALSO * osmv_query_res_t, osm_madw_t, osmv_get_query_result, ib_portinfo_record_t @@ -593,7 +593,7 @@ osmv_get_query_svc_rec( * osmv_pfn_query_cb_t * * DESCRIPTION -* User-defined callback invoked on completion of a subnet administrator +* User-defined callback invoked on completion of subnet administration * query. * * SYNOPSIS @@ -604,17 +604,17 @@ typedef void /* * PARAMETERS * p_query_res -* [in] This is a reference to a structure containing the result of the -* query. +* [in] This is a reference to a structure containing the result of +* the query. * * NOTES * This routine is invoked to notify a client of the result of a subnet * administration query. The p_query_rec parameter references the result * of the query and, in the case of a successful query, any information -* returned by the subnet administrator. +* returned by subnet administration. * -* In the kernel, this callback is usually invoked using a tasklet, dependent -* on the implementation of the underlying verbs provider driver. +* In the kernel, this callback is usually invoked using a tasklet, +* dependent on the implementation of the underlying verbs provider driver. * * SEE ALSO * osmv_query_res_t @@ -626,8 +626,8 @@ typedef void * osmv_query_req_t * * DESCRIPTION -* Information used to request an access layer provided query of the subnet -* administrator. +* Information used to request an access layer provided query of subnet +* administration. * * SYNOPSIS */ @@ -651,9 +651,9 @@ typedef struct _osmv_query_req * Indicates the type of query that the access layer should perform. * * p_query_input -* A pointer to the input for the query. The data referenced by this -* structure is dependent on the type of query being requested and is -* determined by the specified query_type. +* A pointer to the input for the query. The data referenced by +* this structure is dependent on the type of query being requested +* and is determined by the specified query_type. * * sm_key * The M_Key to be provided with the SA MAD for authentication. @@ -664,24 +664,24 @@ typedef struct _osmv_query_req * this query until retrying or timing out the request. * * retry_cnt -* Specifies the number of times that the query will be retried before -* failing the request. +* Specifies the number of times that the query will be retried +* before failing the request. * * flags * Used to describe the mode of operation. Set to IB_FLAGS_SYNC to * process the called routine synchronously. * * query_context -* User-defined context information associated with this query. The -* context data is returned to the user as a part of their query -* callback. +* User-defined context information associated with this query. +* The context data is returned to the user as a part of their +* query callback. * * pfn_query_cb * A user-defined callback that is invoked upon completion of the query. * * NOTES * This structure is used when requesting an osm vendor provided query -* of the subnet administrator. Clients specify the type of query through +* of subnet administration. Clients specify the type of query through * the query_type field. Based on the type of query, the p_query_input * field is set to reference the appropriate data structure. * @@ -762,7 +762,7 @@ osmv_query_sa( * * RETURN VALUE * IB_SUCCESS if completed successfuly (or in ASYNC mode -* if the erquest was sent). +* if the request was sent). * * NOTES * diff --git a/trunk/ulp/opensm/user/opensm/osm_pkey_rcv.c b/trunk/ulp/opensm/user/opensm/osm_pkey_rcv.c index 6e3f9b49..7897906a 100644 --- a/trunk/ulp/opensm/user/opensm/osm_pkey_rcv.c +++ b/trunk/ulp/opensm/user/opensm/osm_pkey_rcv.c @@ -200,7 +200,7 @@ osm_pkey_rcv_process( if( osm_log_is_active( p_rcv->p_log, OSM_LOG_VERBOSE ) ) { osm_log( p_rcv->p_log, OSM_LOG_ERROR, - "osm_pkey_rcv_process: " + "osm_pkey_rcv_process: ERR 4807: " "Got invalid port number 0x%X\n", port_num ); } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_informinfo.c b/trunk/ulp/opensm/user/opensm/osm_sa_informinfo.c index a00ac1f8..083e0d15 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_informinfo.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_informinfo.c @@ -423,7 +423,7 @@ osm_infr_rcv_process_set_method( ); } - /* If Record exist with matching InformInfo */ + /* If record exists with matching InformInfo */ p_infr = osm_infr_get_by_rec( p_rcv->p_subn, p_rcv->p_log, diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_path_record_ctrl.c b/trunk/ulp/opensm/user/opensm/osm_sa_path_record_ctrl.c index 50057384..52fa1723 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_path_record_ctrl.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_path_record_ctrl.c @@ -58,7 +58,7 @@ /********************************************************************** **********************************************************************/ -void +static void __osm_pr_rcv_ctrl_disp_callback( IN void *context, IN void *p_data ) diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_service_record_ctrl.c b/trunk/ulp/opensm/user/opensm/osm_sa_service_record_ctrl.c index f7ca42be..82bb91a5 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_service_record_ctrl.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_service_record_ctrl.c @@ -54,7 +54,7 @@ /********************************************************************** **********************************************************************/ -void +static void __osm_sr_rcv_ctrl_disp_callback( IN void *context, IN void *p_data ) @@ -121,4 +121,3 @@ osm_sr_rcv_ctrl_init( OSM_LOG_EXIT( p_log ); return( status ); } - diff --git a/trunk/ulp/opensm/user/osmtest/include/osmt_mtl_regular_qp.h b/trunk/ulp/opensm/user/osmtest/include/osmt_mtl_regular_qp.h index 83e68f05..b22acc4a 100644 --- a/trunk/ulp/opensm/user/osmtest/include/osmt_mtl_regular_qp.h +++ b/trunk/ulp/opensm/user/osmtest/include/osmt_mtl_regular_qp.h @@ -172,7 +172,6 @@ int osmt_mtl_mad_post_recv_bufs( /* Poll given CQ for completion max_poll times (POLL_SLEEP [usec] delays). result in wc_desc_p. */ -#ifndef __KERNEL__ VAPI_ret_t osmt_mtl_mad_poll4cqe( VAPI_hca_hndl_t hca, /*handle for HCA*/ VAPI_cq_hndl_t cq, /*handle for Completion Queue - Rcv/Send */ @@ -181,7 +180,6 @@ VAPI_ret_t osmt_mtl_mad_poll4cqe( u_int32_t poll_sleep, /*timeout for each polling */ VAPI_ud_av_hndl_t *avh_p /* address vectopr handle to cleanup */ ); -#endif #endif diff --git a/trunk/ulp/opensm/user/osmtest/include/osmtest.h b/trunk/ulp/opensm/user/osmtest/include/osmtest.h index 4cfa8672..42197499 100644 --- a/trunk/ulp/opensm/user/osmtest/include/osmtest.h +++ b/trunk/ulp/opensm/user/osmtest/include/osmtest.h @@ -100,7 +100,6 @@ osmtest_opt_t; *********/ - /****s* OSMTest/osmtest_t * NAME * osmtest_t @@ -128,8 +127,7 @@ typedef struct _osmtest cl_qpool_t link_pool; uint16_t max_lid; -} -osmtest_t; +} osmtest_t; /* * FIELDS @@ -179,10 +177,7 @@ typedef struct _osmtest_req_context { osmtest_t *p_osmt; osmv_query_res_t result; - -} -osmtest_req_context_t; - +} osmtest_req_context_t; typedef struct _osmtest_mgrp_t { diff --git a/trunk/ulp/opensm/user/osmtest/osmt_mtl_regular_qp.c b/trunk/ulp/opensm/user/osmtest/osmt_mtl_regular_qp.c index 0afcf5cf..882918bf 100644 --- a/trunk/ulp/opensm/user/osmtest/osmt_mtl_regular_qp.c +++ b/trunk/ulp/opensm/user/osmtest/osmt_mtl_regular_qp.c @@ -51,7 +51,7 @@ * * Creation date: * - * Version: $Id: osmt_mtl_regular_qp.c 3941 2005-11-02 13:32:04Z halr $ + * Version: $Id: osmt_mtl_regular_qp.c 6088 2006-03-29 19:57:49Z halr $ * * Authors: * Eitan Zahavi @@ -400,7 +400,6 @@ int osmt_mtl_mad_post_recv_bufs(osmt_mtl_mad_res_t* res, void *buf_array, } -#ifndef __KERNEL__ VAPI_ret_t osmt_mtl_mad_poll4cqe(VAPI_hca_hndl_t hca,VAPI_cq_hndl_t cq, VAPI_wc_desc_t *wc_desc_p, u_int32_t max_poll, u_int32_t poll_sleep, @@ -442,21 +441,5 @@ VAPI_ret_t osmt_mtl_mad_poll4cqe(VAPI_hca_hndl_t hca,VAPI_cq_hndl_t cq, return VAPI_OK; } -#endif - - - -#ifdef __KERNEL__ -int init_module(void) -{ - MTL_TRACE1("mad module loaded.\n"); - return(0); -} - -void cleanup_module(void) -{ - MTL_TRACE1("mad module unloaded.\n"); -} -#endif #endif /* OSM_VENDOR_INTF_MTL */