[ofw] [PATCH] winof: remove null *_PTR64 macros
Sean Hefty
sean.hefty at intel.com
Wed Apr 30 14:34:44 PDT 2008
This removes the empty *_PTR64 macros introduced by the __ptr64 removal patch.
Signed-off-by: Sean Hefty <sean.hefty at intel.com>
---
I tried to run a compile test, but the trunk doesn't compile. So, I verified
compile the best that I could. There are real compile errors in the tools
subdirectory, which look unrelated to these changes.
The __ptr64 patch should have done this, so that we didn't have to go back
and re-touch every one of these lines a second time.
Index: core/al/al.c
===================================================================
--- core/al/al.c (revision 1094)
+++ core/al/al.c (working copy)
@@ -68,11 +68,11 @@
#ifdef CL_KERNEL
ib_api_status_t
ib_close_al(
- IN const ib_al_handle_t FUNC_PTR64 h_al )
+ IN const ib_al_handle_t h_al )
#else
ib_api_status_t
do_close_al(
- IN const ib_al_handle_t FUNC_PTR64 h_al )
+ IN const ib_al_handle_t h_al )
#endif
{
AL_ENTER( AL_DBG_MGR );
@@ -96,7 +96,7 @@
destroying_al(
IN al_obj_t *p_obj )
{
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
cl_list_item_t *p_list_item;
al_sa_req_t *p_sa_req;
@@ -124,7 +124,7 @@
static void
__free_mads(
- IN const ib_al_handle_t VOID_PTR64 h_al )
+ IN const ib_al_handle_t h_al )
{
cl_list_item_t *p_list_item;
al_mad_element_t *p_mad_element;
@@ -153,7 +153,7 @@
free_al(
IN al_obj_t *p_obj )
{
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
CL_ASSERT( p_obj );
h_al = PARENT_STRUCT( p_obj, ib_al_t, obj );
@@ -178,7 +178,7 @@
OUT ib_ca_attr_t* const p_ca_attr OPTIONAL,
IN OUT uint32_t* const p_size )
{
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_api_status_t status;
AL_ENTER( AL_DBG_CA );
@@ -210,7 +210,7 @@
void
al_insert_mad(
- IN const ib_al_handle_t VOID_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN al_mad_element_t* const p_mad )
{
/* Assert that the MAD does not already have an owner. */
@@ -250,7 +250,7 @@
void
al_handoff_mad(
- IN const ib_al_handle_t VOID_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN ib_mad_element_t* const p_mad_element )
{
al_mad_element_t *p_mad;
@@ -272,7 +272,7 @@
void
al_insert_key(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN al_pool_key_t* const p_pool_key )
{
ref_al_obj( &h_al->obj );
@@ -313,8 +313,8 @@
void
al_dereg_pool(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
- IN ib_pool_handle_t FUNC_PTR64 const h_pool )
+ IN const ib_al_handle_t h_al,
+ IN ib_pool_handle_t const h_pool )
{
cl_qlist_t destroy_list;
cl_list_item_t *p_list_item, *p_next_item;
@@ -366,7 +366,7 @@
void
al_insert_query(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN al_query_t* const p_query )
{
p_query->h_al = h_al;
@@ -407,8 +407,8 @@
void
ib_cancel_query(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
- IN const ib_query_handle_t FUNC_PTR64 h_query )
+ IN const ib_al_handle_t h_al,
+ IN const ib_query_handle_t h_query )
{
cl_list_item_t *p_item;
Index: core/al/al.h
===================================================================
--- core/al/al.h (revision 1094)
+++ core/al/al.h (working copy)
@@ -99,7 +99,7 @@
ib_api_status_t
init_al(
IN al_obj_t *p_parent_obj,
- IN const ib_al_handle_t FUNC_PTR64 h_al );
+ IN const ib_al_handle_t h_al );
void
@@ -118,21 +118,21 @@
*/
ib_api_status_t
al_insert_pnp(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
- IN const ib_pnp_handle_t FUNC_PTR64 h_pnp );
+ IN const ib_al_handle_t h_al,
+ IN const ib_pnp_handle_t h_pnp );
/*
* Remove a pnp registration from the PnP vector.
*/
void
al_remove_pnp(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
- IN const ib_pnp_handle_t FUNC_PTR64 h_pnp );
+ IN const ib_al_handle_t h_al,
+ IN const ib_pnp_handle_t h_pnp );
void
al_insert_mad(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN al_mad_element_t* const p_mad );
@@ -143,13 +143,13 @@
void
al_handoff_mad(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN ib_mad_element_t* const p_mad_element );
void
al_insert_key(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN al_pool_key_t* const p_pool_key );
@@ -160,13 +160,13 @@
void
al_dereg_pool(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
- IN ib_pool_handle_t FUNC_PTR64 const h_pool );
+ IN const ib_al_handle_t h_al,
+ IN ib_pool_handle_t const h_pool );
void
al_insert_query(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN al_query_t* const p_query );
@@ -176,7 +176,7 @@
void
al_insert_conn(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_cm_handle_t h_conn );
void
@@ -188,14 +188,14 @@
// TODO: we can remove the type parameter.
uint64_t
al_hdl_insert(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN void* const p_obj,
IN const uint32_t type );
static inline uint64_t
al_hdl_lock_insert(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN void* const p_obj,
IN const uint32_t type )
{
@@ -209,7 +209,7 @@
void
al_hdl_free(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const uint64_t hdl );
//static inline size_t //NEW_SIZE_T
@@ -247,33 +247,29 @@
al_obj_t*
al_hdl_ref(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const uint64_t hdl,
- //IN const size_t hdl, //NEW_SIZE_T
IN const uint32_t type );
/* Validate an object. */
void*
al_hdl_chk(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const uint64_t hdl,
- //IN const size_t hdl, //NEW_SIZE_T
IN const uint32_t type );
/* Validate and remove an object. */
void*
al_hdl_get(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const uint64_t hdl,
- //IN const size_t hdl, //NEW_SIZE_T
IN const uint32_t type );
/* Validate and removes a MAD element. */
static inline ib_mad_element_t*
al_hdl_get_mad(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const uint64_t hdl
- //IN const size_t hdl //NEW_SIZE_T
)
{
return (ib_mad_element_t*)al_hdl_get( h_al, hdl, AL_OBJ_TYPE_H_MAD );
@@ -282,17 +278,15 @@
/* Validate and reference a connection. Used for MRA */
struct _al_conn*
al_hdl_ref_conn(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const uint64_t hdl,
- //IN const size_t hdl, //NEW_SIZE_T
IN const uint32_t sub_type );
/* Validate, reference, and remove a connection. */
struct _al_conn*
al_hdl_get_conn(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const uint64_t hdl,
- //IN const size_t hdl, //NEW_SIZE_T
IN const uint32_t sub_type );
#endif /* CL_KERNEL */
Index: core/al/al_av.c
===================================================================
--- core/al/al_av.c (revision 1094)
+++ core/al/al_av.c (working copy)
@@ -66,11 +66,11 @@
OUT cl_pool_item_t** const pp_pool_item )
{
ib_api_status_t status;
- ib_av_handle_t VOID_PTR64 h_av;
+ ib_av_handle_t h_av;
UNUSED_PARAM( context );
- h_av = (ib_av_handle_t VOID_PTR64)p_object;
+ h_av = (ib_av_handle_t)p_object;
cl_memclr( h_av, sizeof( ib_av_t ) );
construct_al_obj( &h_av->obj, AL_OBJ_TYPE_H_AV );
@@ -81,7 +81,7 @@
return CL_ERROR;
}
- *pp_pool_item = &((ib_av_handle_t VOID_PTR64)p_object)->obj.pool_item;
+ *pp_pool_item = &((ib_av_handle_t)p_object)->obj.pool_item;
/* Release the reference taken in init_al_obj. */
deref_al_obj( &h_av->obj );
@@ -114,13 +114,13 @@
ib_api_status_t
create_av(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t* const p_av_attr,
- OUT ib_av_handle_t FUNC_PTR64* const ph_av,
+ OUT ib_av_handle_t * const ph_av,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
ib_api_status_t status;
- ib_av_handle_t VOID_PTR64 h_av;
+ ib_av_handle_t h_av;
CL_ASSERT( h_pd );
@@ -167,7 +167,7 @@
ib_api_status_t
ib_destroy_av(
- IN const ib_av_handle_t FUNC_PTR64 h_av )
+ IN const ib_av_handle_t h_av )
{
AL_ENTER( AL_DBG_AV );
@@ -191,7 +191,7 @@
IN struct _al_obj *p_obj )
{
ib_api_status_t status;
- ib_av_handle_t VOID_PTR64 h_av;
+ ib_av_handle_t h_av;
CL_ASSERT( p_obj );
h_av = PARENT_STRUCT( p_obj, ib_av_t, obj );
@@ -214,7 +214,7 @@
__return_av(
IN al_obj_t *p_obj )
{
- ib_av_handle_t VOID_PTR64 h_av;
+ ib_av_handle_t h_av;
h_av = PARENT_STRUCT( p_obj, ib_av_t, obj );
reset_al_obj( p_obj );
@@ -225,9 +225,9 @@
ib_api_status_t
ib_query_av(
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
OUT ib_av_attr_t* const p_av_attr,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd )
+ OUT ib_pd_handle_t * const ph_pd )
{
return query_av( h_av, p_av_attr, ph_pd, NULL );
}
@@ -236,9 +236,9 @@
ib_api_status_t
query_av(
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
OUT ib_av_attr_t* const p_av_attr,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd,
+ OUT ib_pd_handle_t * const ph_pd,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
ib_api_status_t status;
@@ -273,7 +273,7 @@
ib_api_status_t
ib_modify_av(
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
IN const ib_av_attr_t* const p_av_mod )
{
return modify_av( h_av, p_av_mod, NULL );
@@ -282,7 +282,7 @@
ib_api_status_t
modify_av(
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
IN const ib_av_attr_t* const p_av_mod,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
Index: core/al/al_av.h
===================================================================
--- core/al/al_av.h (revision 1094)
+++ core/al/al_av.h (working copy)
@@ -66,23 +66,23 @@
ib_api_status_t
create_av(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t* const p_av_attr,
- OUT ib_av_handle_t FUNC_PTR64* const ph_av,
+ OUT ib_av_handle_t* const ph_av,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
query_av(
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
OUT ib_av_attr_t* const p_av_attr,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd,
+ OUT ib_pd_handle_t* const ph_pd,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
modify_av(
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
IN const ib_av_attr_t* const p_av_mod,
IN OUT ci_umv_buf_t* const p_umv_buf );
Index: core/al/al_ca.c
===================================================================
--- core/al/al_ca.c (revision 1094)
+++ core/al/al_ca.c (working copy)
@@ -71,11 +71,11 @@
ib_api_status_t
ib_open_ca(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_net64_t ca_guid,
IN const ib_pfn_event_cb_t pfn_ca_event_cb OPTIONAL,
IN const void* const ca_context,
- OUT ib_ca_handle_t FUNC_PTR64* const ph_ca )
+ OUT ib_ca_handle_t* const ph_ca )
{
ib_api_status_t status;
@@ -97,14 +97,14 @@
ib_api_status_t
open_ca(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_net64_t ca_guid,
IN const ib_pfn_event_cb_t pfn_ca_event_cb OPTIONAL,
IN const void* const ca_context,
- OUT ib_ca_handle_t FUNC_PTR64* const ph_ca,
+ OUT ib_ca_handle_t* const ph_ca,
IN OUT ci_umv_buf_t* const p_umv_buf OPTIONAL )
{
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_api_status_t status;
al_obj_type_t obj_type = AL_OBJ_TYPE_H_CA;
@@ -116,7 +116,7 @@
}
/* Allocate a CA instance. */
- h_ca = (ib_ca_handle_t VOID_PTR64)cl_zalloc( sizeof( ib_ca_t ) );
+ h_ca = (ib_ca_handle_t)cl_zalloc( sizeof( ib_ca_t ) );
if( !h_ca )
{
AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,
@@ -183,7 +183,7 @@
*/
ib_api_status_t
ib_close_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL )
{
AL_ENTER( AL_DBG_CA );
@@ -210,7 +210,7 @@
IN struct _al_obj *p_obj )
{
#if defined(CL_KERNEL)
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
CL_ASSERT( p_obj );
h_ca = PARENT_STRUCT( p_obj, ib_ca_t, obj );
@@ -232,7 +232,7 @@
__free_ca(
IN struct _al_obj *p_obj )
{
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
CL_ASSERT( p_obj );
h_ca = PARENT_STRUCT( p_obj, ib_ca_t, obj );
@@ -245,7 +245,7 @@
ib_api_status_t
ib_query_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
OUT ib_ca_attr_t* const p_ca_attr OPTIONAL,
IN OUT uint32_t* const p_size )
{
@@ -256,7 +256,7 @@
ib_api_status_t
query_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
OUT ib_ca_attr_t* const p_ca_attr OPTIONAL,
IN OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t* const p_umv_buf )
@@ -286,7 +286,7 @@
ib_api_status_t
ib_modify_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_ca_mod_t ca_mod,
IN const ib_port_attr_mod_t* const p_port_attr_mod )
@@ -319,10 +319,10 @@
*/
ib_api_status_t
ib_alloc_pd(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_pd_type_t pd_type,
IN const void * const pd_context,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd )
+ OUT ib_pd_handle_t* const ph_pd )
{
ib_api_status_t status;
@@ -348,11 +348,11 @@
ib_api_status_t
ib_create_cq(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN OUT ib_cq_create_t* const p_cq_create,
IN const void* const cq_context,
IN const ib_pfn_event_cb_t pfn_cq_event_cb OPTIONAL,
- OUT ib_cq_handle_t FUNC_PTR64* const ph_cq )
+ OUT ib_cq_handle_t* const ph_cq )
{
ib_api_status_t status;
@@ -378,9 +378,9 @@
ib_api_status_t
al_convert_to_ci_handles(
- IN void* FUNC_PTR64 * const dst_handle_array,
- IN const void* FUNC_PTR64 * const src_handle_array,
- IN uint32_t num_handles )
+ IN void** const dst_handle_array,
+ IN const void** const src_handle_array,
+ IN uint32_t num_handles )
{
uint32_t i;
al_obj_t *p_al_obj;
Index: core/al/al_ca.h
===================================================================
--- core/al/al_ca.h (revision 1094)
+++ core/al/al_ca.h (working copy)
@@ -56,17 +56,17 @@
ib_api_status_t
open_ca(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_net64_t ca_guid,
IN const ib_pfn_event_cb_t pfn_ca_event_cb OPTIONAL,
IN const void* const ca_context,
- OUT ib_ca_handle_t FUNC_PTR64* const ph_ca,
+ OUT ib_ca_handle_t* const ph_ca,
IN OUT ci_umv_buf_t* const p_umv_buf OPTIONAL );
ib_api_status_t
query_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
OUT ib_ca_attr_t* const p_ca_attr OPTIONAL,
IN OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t* const p_umv_buf );
@@ -74,9 +74,9 @@
ib_api_status_t
al_convert_to_ci_handles(
- IN void* FUNC_PTR64 * const dst_handle_array,
- IN const void* FUNC_PTR64 * const src_handle_array,
- IN uint32_t num_handles );
+ IN void** const dst_handle_array,
+ IN const void** const src_handle_array,
+ IN uint32_t num_handles );
#endif /* __AL_CA_H__ */
Index: core/al/al_ci_ca.h
===================================================================
--- core/al/al_ci_ca.h (revision 1094)
+++ core/al/al_ci_ca.h (working copy)
@@ -59,7 +59,7 @@
DEVICE_OBJECT*
get_ca_dev(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca );
+ IN const ib_ca_handle_t h_ca );
#endif
@@ -122,11 +122,11 @@
void
add_ca(
IN al_ci_ca_t* const p_ci_ca,
- IN const ib_ca_handle_t FUNC_PTR64 h_ca );
+ IN const ib_ca_handle_t h_ca );
void
remove_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca );
+ IN const ib_ca_handle_t h_ca );
void
@@ -200,8 +200,8 @@
ib_api_status_t
ci_call(
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const void* FUNC_PTR64 * const handle_array OPTIONAL,
+ IN ib_ca_handle_t h_ca,
+ IN const void** const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN ci_umv_buf_t* const p_umv_buf OPTIONAL );
Index: core/al/al_ci_ca_shared.c
===================================================================
--- core/al/al_ci_ca_shared.c (revision 1094)
+++ core/al/al_ci_ca_shared.c (working copy)
@@ -88,7 +88,7 @@
void
add_ca(
IN al_ci_ca_t* const p_ci_ca,
- IN const ib_ca_handle_t FUNC_PTR64 h_ca )
+ IN const ib_ca_handle_t h_ca )
{
cl_spinlock_acquire( &p_ci_ca->obj.lock );
cl_qlist_insert_tail( &p_ci_ca->ca_list, &h_ca->list_item );
@@ -100,7 +100,7 @@
void
remove_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca )
+ IN const ib_ca_handle_t h_ca )
{
al_ci_ca_t *p_ci_ca;
@@ -204,7 +204,7 @@
CL_ASSERT( p_event_rec );
- p_obj = (al_obj_t* VOID_PTR64)p_event_rec->context;
+ p_obj = (al_obj_t*)p_event_rec->context;
/* Block the destruction of the object until a reference is taken. */
cl_spinlock_acquire( &p_obj->lock );
@@ -272,7 +272,7 @@
p_event_item = PARENT_STRUCT( p_async_item, event_item_t,
async_item.pool_item );
- p_obj = (al_obj_t* VOID_PTR64)p_event_item->event_rec.context;
+ p_obj = (al_obj_t*)p_event_item->event_rec.context;
switch( p_event_item->event_rec.code )
{
@@ -362,11 +362,11 @@
{
al_ci_ca_t* p_ci_ca;
cl_list_item_t* p_list_item;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_async_event_rec_t event_rec;
CL_ASSERT( p_event_rec );
- p_ci_ca = (al_ci_ca_t* VOID_PTR64)p_event_rec->context;
+ p_ci_ca = (al_ci_ca_t*)p_event_rec->context;
/* Report the CA event to all clients. */
cl_spinlock_acquire( &p_ci_ca->obj.lock );
@@ -396,7 +396,7 @@
ca_async_event_cb(
IN ib_async_event_rec_t* const p_event_rec )
{
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
CL_ASSERT( p_event_rec );
h_ca = p_event_rec->handle.h_ca;
Index: core/al/al_cm_cep.h
===================================================================
--- core/al/al_cm_cep.h (revision 1094)
+++ core/al/al_cm_cep.h (working copy)
@@ -60,7 +60,7 @@
typedef void
(*al_pfn_cep_cb_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const net32_t cid );
/* PARAMETERS
* h_al
@@ -89,14 +89,14 @@
void
al_cep_cleanup_al(
- IN const ib_al_handle_t FUNC_PTR64 h_al );
+ IN const ib_al_handle_t h_al );
ib_api_status_t
al_create_cep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN al_pfn_cep_cb_t pfn_cb,
- IN void* FUNC_PTR64 context,
+ IN void* context,
OUT net32_t* const p_cid );
/*
* NOTES
@@ -110,7 +110,7 @@
/* Destruction is asynchronous. */
ib_api_status_t
al_destroy_cep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN ib_pfn_destroy_cb_t pfn_destroy_cb );
/*
@@ -118,14 +118,14 @@
ib_api_status_t
al_cep_listen(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN ib_cep_listen_t* const p_listen_info );
ib_api_status_t
al_cep_pre_req(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_req_t* const p_cm_req,
OUT ib_qp_mod_t* const p_init );
@@ -133,50 +133,50 @@
ib_api_status_t
al_cep_send_req(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid );
ib_api_status_t
al_cep_pre_rep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
- IN void* FUNC_PTR64 context,
+ IN void* context,
IN const ib_cm_rep_t* const p_cm_rep,
OUT ib_qp_mod_t* const p_init );
ib_api_status_t
al_cep_pre_rep_ex(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN al_pfn_cep_cb_t pfn_cb,
- IN void* FUNC_PTR64 context,
+ IN void* context,
IN const ib_cm_rep_t* const p_cm_rep,
OUT ib_qp_mod_t* const p_init );
ib_api_status_t
al_cep_send_rep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid );
ib_api_status_t
al_cep_get_rtr_attr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
OUT ib_qp_mod_t* const p_rtr );
ib_api_status_t
al_cep_get_rts_attr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
OUT ib_qp_mod_t* const p_rts );
ib_api_status_t
al_cep_rtu(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const uint8_t* p_pdata OPTIONAL,
IN uint8_t pdata_len );
@@ -184,7 +184,7 @@
ib_api_status_t
al_cep_rej(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN ib_rej_status_t rej_status,
IN const uint8_t* const p_ari,
@@ -195,21 +195,21 @@
ib_api_status_t
al_cep_mra(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_mra_t* const p_cm_mra );
ib_api_status_t
al_cep_lap(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_lap_t* const p_cm_lap );
ib_api_status_t
al_cep_pre_apr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_apr_t* const p_cm_apr,
OUT ib_qp_mod_t* const p_apr );
@@ -217,13 +217,13 @@
ib_api_status_t
al_cep_send_apr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid );
ib_api_status_t
al_cep_dreq(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const uint8_t* const p_pdata OPTIONAL,
IN const uint8_t pdata_len );
@@ -231,35 +231,35 @@
ib_api_status_t
al_cep_drep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_drep_t* const p_cm_drep );
ib_api_status_t
al_cep_get_timewait(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
OUT uint64_t* const p_timewait_us );
ib_api_status_t
al_cep_migrate(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid );
ib_api_status_t
al_cep_established(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid );
ib_api_status_t
al_cep_poll(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
- OUT void* FUNC_PTR64 * p_context,
+ OUT void** p_context,
OUT net32_t* const p_new_cid,
OUT ib_mad_element_t** const pp_mad );
@@ -268,27 +268,27 @@
NTSTATUS
al_cep_queue_irp(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN IRP* const p_irp );
NTSTATUS
al_cep_get_cid(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t const cid,
IN PIRP h_ioctl
);
ib_api_status_t
al_cep_get_pdata(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN OUT uint8_t *p_psize,
OUT uint8_t* pdata );
ib_api_status_t
al_cep_set_pdata(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN uint8_t psize,
IN uint8_t* pdata );
@@ -352,7 +352,7 @@
ib_api_status_t
al_cep_sreq(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const al_cep_sreq_t* const p_sreq );
@@ -410,7 +410,7 @@
ib_api_status_t
al_cep_srep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const al_cep_srep_t* const p_sreq );
Index: core/al/al_cm_qp.c
===================================================================
--- core/al/al_cm_qp.c (revision 1094)
+++ core/al/al_cm_qp.c (working copy)
@@ -69,7 +69,7 @@
typedef struct _cep_async_mad
{
cl_async_proc_item_t item;
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
net32_t cid;
} cep_async_mad_t;
@@ -86,7 +86,7 @@
*/
static void
__cep_timewait_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN const ib_qp_handle_t h_qp )
{
uint64_t timewait = 0;
ib_qp_mod_t qp_mod;
@@ -298,7 +298,7 @@
*/
static void
__proc_conn_timeout(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN const ib_qp_handle_t h_qp )
{
ib_cm_rej_rec_t rej_rec;
net32_t cid;
@@ -341,7 +341,7 @@
*/
static void
__proc_lap_timeout(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN const ib_qp_handle_t h_qp )
{
ib_cm_apr_rec_t apr_rec;
@@ -369,7 +369,7 @@
*/
static void
__proc_dconn_timeout(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN const ib_qp_handle_t h_qp )
{
ib_cm_drep_rec_t drep_rec;
net32_t cid;
@@ -403,7 +403,7 @@
static void
__proc_failed_send(
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_qp_handle_t h_qp,
IN const ib_mad_t* const p_mad )
{
AL_ENTER( AL_DBG_CM );
@@ -872,11 +872,11 @@
static void
__cm_handler(
#endif
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const net32_t cid )
{
ib_api_status_t status;
- void* VOID_PTR64 context;
+ void* context;
net32_t new_cid;
ib_mad_element_t *p_mad;
ib_cm_handle_t h_cm;
@@ -890,20 +890,20 @@
/* Something to do - WOOT!!! */
if( new_cid != AL_INVALID_CID )
{
- __proc_listen( (al_listen_t* VOID_PTR64)context,
+ __proc_listen( (al_listen_t*)context,
new_cid, ib_get_mad_buf( p_mad ) );
}
else if( p_mad->status != IB_SUCCESS )
{
/* Context is a QP handle, and a sent MAD timed out. */
__proc_failed_send(
- (ib_qp_handle_t VOID_PTR64)context, ib_get_mad_buf( p_mad ) );
+ (ib_qp_handle_t)context, ib_get_mad_buf( p_mad ) );
}
else
{
h_cm.h_al = h_al;
h_cm.cid = cid;
- h_cm.h_qp = (ib_qp_handle_t VOID_PTR64)context;
+ h_cm.h_qp = (ib_qp_handle_t)context;
__proc_conn( &h_cm, ib_get_mad_buf( p_mad ) );
}
ib_put_mad( p_mad );
@@ -938,7 +938,7 @@
*/
static void
__cm_handler(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const net32_t cid )
{
cep_async_mad_t *p_async_mad;
@@ -972,7 +972,7 @@
*/
ib_api_status_t
__cep_init_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_qp_mod_t* const p_init )
{
ib_qp_mod_t qp_mod;
@@ -1051,7 +1051,7 @@
static ib_api_status_t
__cep_conn_req(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_cm_req_t* const p_cm_req )
{
ib_api_status_t status;
@@ -1201,7 +1201,7 @@
static ib_api_status_t
__cep_rts_qp(
IN const ib_cm_handle_t h_cm,
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_access_t access_ctrl,
IN const uint32_t sq_depth,
IN const uint32_t rq_depth )
@@ -1292,7 +1292,7 @@
if( p_cm_rep->p_recv_wr )
{
status = ib_post_recv( p_cm_rep->h_qp, p_cm_rep->p_recv_wr,
- (ib_recv_wr_t** VOID_PTR64)p_cm_rep->pp_recv_failure );
+ (ib_recv_wr_t**)p_cm_rep->pp_recv_failure );
if( status != IB_SUCCESS )
{
AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,
@@ -1854,7 +1854,7 @@
ib_api_status_t
ib_force_apm(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN const ib_qp_handle_t h_qp )
{
ib_api_status_t status;
al_conn_qp_t *p_conn_qp;
@@ -1915,11 +1915,11 @@
static ib_api_status_t
__cep_listen(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_cm_listen_t* const p_cm_listen,
IN const ib_pfn_listen_err_cb_t pfn_listen_err_cb,
IN const void* const listen_context,
- OUT ib_listen_handle_t FUNC_PTR64* const ph_cm_listen )
+ OUT ib_listen_handle_t* const ph_cm_listen )
{
ib_api_status_t status;
al_listen_t *p_listen;
@@ -2003,11 +2003,11 @@
ib_api_status_t
ib_cm_listen(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_cm_listen_t* const p_cm_listen,
IN const ib_pfn_listen_err_cb_t pfn_listen_err_cb,
IN const void* const listen_context,
- OUT ib_listen_handle_t FUNC_PTR64* const ph_cm_listen )
+ OUT ib_listen_handle_t* const ph_cm_listen )
{
ib_api_status_t status;
@@ -2034,7 +2034,7 @@
ib_api_status_t
ib_cm_cancel(
- IN const ib_listen_handle_t FUNC_PTR64 h_cm_listen,
+ IN const ib_listen_handle_t h_cm_listen,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL )
{
AL_ENTER( AL_DBG_CM );
Index: core/al/al_cq.c
===================================================================
--- core/al/al_cq.c (revision 1094)
+++ core/al/al_cq.c (working copy)
@@ -71,14 +71,14 @@
*/
ib_api_status_t
create_cq(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN OUT ib_cq_create_t* const p_cq_create,
IN const void* const cq_context,
IN const ib_pfn_event_cb_t pfn_cq_event_cb,
- OUT ib_cq_handle_t FUNC_PTR64* const ph_cq,
+ OUT ib_cq_handle_t* const ph_cq,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
ib_api_status_t status;
al_obj_type_t obj_type = AL_OBJ_TYPE_H_CQ;
@@ -169,7 +169,7 @@
ib_api_status_t
ib_destroy_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL )
{
AL_ENTER( AL_DBG_CQ );
@@ -193,10 +193,10 @@
destroying_cq(
IN struct _al_obj *p_obj )
{
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
cl_list_item_t *p_item;
cl_obj_rel_t *p_rel;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
CL_ASSERT( p_obj );
h_cq = PARENT_STRUCT( p_obj, ib_cq_t, obj );
@@ -209,7 +209,7 @@
{
p_rel = PARENT_STRUCT( p_item, cl_obj_rel_t, pool_item.list_item );
p_rel->p_parent_obj = NULL;
- h_qp = (ib_qp_handle_t VOID_PTR64)p_rel->p_child_obj;
+ h_qp = (ib_qp_handle_t)p_rel->p_child_obj;
if( h_qp )
{
/* Take a reference to prevent the QP from being destroyed. */
@@ -234,7 +234,7 @@
cleanup_cq(
IN struct _al_obj *p_obj )
{
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
ib_api_status_t status;
CL_ASSERT( p_obj );
@@ -257,7 +257,7 @@
free_cq(
IN al_obj_t *p_obj )
{
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
CL_ASSERT( p_obj );
h_cq = PARENT_STRUCT( p_obj, ib_cq_t, obj );
@@ -269,7 +269,7 @@
void
cq_attach_qp(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN cl_obj_rel_t* const p_qp_rel )
{
p_qp_rel->p_parent_obj = (cl_obj_t*)h_cq;
@@ -282,7 +282,7 @@
void
cq_detach_qp(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN cl_obj_rel_t* const p_qp_rel )
{
if( p_qp_rel->p_parent_obj )
@@ -298,7 +298,7 @@
ib_api_status_t
ib_modify_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT uint32_t* const p_size )
{
return modify_cq( h_cq, p_size, NULL );
@@ -307,7 +307,7 @@
ib_api_status_t
modify_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
@@ -336,7 +336,7 @@
ib_api_status_t
ib_query_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_size )
{
return query_cq( h_cq, p_size, NULL );
@@ -346,7 +346,7 @@
ib_api_status_t
query_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
@@ -375,7 +375,7 @@
ib_api_status_t
ib_peek_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_n_cqes )
{
ib_api_status_t status;
@@ -403,7 +403,7 @@
ib_api_status_t
ib_poll_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist )
{
@@ -438,7 +438,7 @@
ib_api_status_t
ib_rearm_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const boolean_t solicited )
{
ib_api_status_t status;
@@ -461,7 +461,7 @@
ib_api_status_t
ib_rearm_n_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const uint32_t n_cqes )
{
ib_api_status_t status;
@@ -494,10 +494,10 @@
cq_async_event_cb(
IN ib_async_event_rec_t* const p_event_rec )
{
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
CL_ASSERT( p_event_rec );
- h_cq = (ib_cq_handle_t VOID_PTR64)p_event_rec->context;
+ h_cq = (ib_cq_handle_t)p_event_rec->context;
p_event_rec->context = (void*)h_cq->obj.context;
p_event_rec->handle.h_cq = h_cq;
Index: core/al/al_cq.h
===================================================================
--- core/al/al_cq.h (revision 1094)
+++ core/al/al_cq.h (working copy)
@@ -37,27 +37,27 @@
typedef void
(*pfn_proc_comp_t)(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq );
+ IN const ib_cq_handle_t h_cq );
typedef ib_api_status_t
(*pfn_peek_cq_t)(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_n_cqes );
typedef ib_api_status_t
(*pfn_poll_cq_t)(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist );
typedef ib_api_status_t
(*pfn_rearm_cq_t)(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const boolean_t solicited );
typedef ib_api_status_t
(*pfn_rearm_n_cq_t)(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const uint32_t n_cqes );
#ifdef CL_KERNEL
@@ -117,24 +117,24 @@
ib_api_status_t
create_cq(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN OUT ib_cq_create_t* const p_cq_create,
IN const void* const cq_context,
IN const ib_pfn_event_cb_t pfn_cq_event_cb,
- OUT ib_cq_handle_t FUNC_PTR64* const ph_cq,
+ OUT ib_cq_handle_t* const ph_cq,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
modify_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
query_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t* const p_umv_buf );
@@ -146,13 +146,13 @@
void
cq_attach_qp(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN cl_obj_rel_t* const p_qp_rel );
void
cq_detach_qp(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN cl_obj_rel_t* const p_qp_rel );
#endif /* __AL_CQ_H__ */
Index: core/al/al_dm.c
===================================================================
--- core/al/al_dm.c (revision 1094)
+++ core/al/al_dm.c (working copy)
@@ -83,20 +83,20 @@
al_iou_t*
get_iou(
- IN const ib_ioc_handle_t FUNC_PTR64 h_ioc );
+ IN const ib_ioc_handle_t h_ioc );
-ib_ioc_handle_t VOID_PTR64
+ib_ioc_handle_t
get_ioc(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca );
+ IN const ib_ca_handle_t h_ca );
ib_api_status_t
add_ioc(
IN al_iou_t* p_iou,
- IN ib_ioc_handle_t FUNC_PTR64 h_ioc );
+ IN ib_ioc_handle_t h_ioc );
void
ioc_change(
- IN ib_ioc_handle_t FUNC_PTR64 h_ioc );
+ IN ib_ioc_handle_t h_ioc );
void
iou_change(
@@ -121,7 +121,7 @@
ib_api_status_t
dm_agent_reg_pnp(
IN ib_pnp_class_t pnp_class,
- IN ib_pnp_handle_t FUNC_PTR64* ph_pnp );
+ IN ib_pnp_handle_t * ph_pnp );
ib_api_status_t
dm_agent_pnp_cb(
@@ -157,13 +157,13 @@
void
dm_agent_send_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void* mad_svc_context,
IN ib_mad_element_t* p_mad_response );
void
dm_agent_recv_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void* mad_svc_context,
IN ib_mad_element_t* p_mad_request );
@@ -208,11 +208,11 @@
ib_api_status_t
ib_create_ioc(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_ioc_profile_t* const p_ioc_profile,
- OUT ib_ioc_handle_t FUNC_PTR64* const ph_ioc )
+ OUT ib_ioc_handle_t * const ph_ioc )
{
- ib_ioc_handle_t VOID_PTR64 h_ioc;
+ ib_ioc_handle_t h_ioc;
AL_ENTER( AL_DBG_IOC );
@@ -249,7 +249,7 @@
ib_api_status_t
ib_destroy_ioc(
- IN const ib_ioc_handle_t FUNC_PTR64 h_ioc )
+ IN const ib_ioc_handle_t h_ioc )
{
AL_ENTER( AL_DBG_IOC );
@@ -275,7 +275,7 @@
free_ioc(
IN al_obj_t* p_obj )
{
- ib_ioc_handle_t VOID_PTR64 h_ioc;
+ ib_ioc_handle_t h_ioc;
CL_ASSERT( p_obj );
@@ -307,7 +307,7 @@
ib_api_status_t
ib_reg_ioc(
- IN const ib_ioc_handle_t FUNC_PTR64 h_ioc )
+ IN const ib_ioc_handle_t h_ioc )
{
al_iou_t* p_iou;
ib_api_status_t status;
@@ -336,11 +336,11 @@
ib_api_status_t
ib_add_svc_entry(
- IN const ib_ioc_handle_t FUNC_PTR64 h_ioc,
+ IN const ib_ioc_handle_t h_ioc,
IN const ib_svc_entry_t* const p_svc_entry,
- OUT ib_svc_handle_t FUNC_PTR64* const ph_svc )
+ OUT ib_svc_handle_t * const ph_svc )
{
- ib_svc_handle_t VOID_PTR64 h_svc;
+ ib_svc_handle_t h_svc;
ib_api_status_t status;
AL_ENTER( AL_DBG_IOC );
@@ -379,7 +379,7 @@
AL_EXIT( AL_DBG_IOC );
return IB_INSUFFICIENT_RESOURCES;
}
- h_svc = cl_zalloc( sizeof( ib_svc_handle_t VOID_PTR64 ) );
+ h_svc = cl_zalloc( sizeof( ib_svc_handle_t ) );
if( !h_svc )
{
AL_EXIT( AL_DBG_IOC );
@@ -434,9 +434,9 @@
ib_api_status_t
ib_remove_svc_entry(
- IN const ib_svc_handle_t FUNC_PTR64 h_svc )
+ IN const ib_svc_handle_t h_svc )
{
- ib_ioc_handle_t VOID_PTR64 h_ioc;
+ ib_ioc_handle_t h_ioc;
AL_ENTER( AL_DBG_IOC );
@@ -493,7 +493,7 @@
free_svc_entry(
IN al_obj_t* p_obj )
{
- ib_svc_handle_t VOID_PTR64 h_svc;
+ ib_svc_handle_t h_svc;
CL_ASSERT( p_obj );
h_svc = PARENT_STRUCT( p_obj, al_svc_entry_t, obj );
@@ -546,7 +546,7 @@
*/
al_iou_t*
get_iou(
- IN const ib_ioc_handle_t FUNC_PTR64 h_ioc )
+ IN const ib_ioc_handle_t h_ioc )
{
CL_ASSERT( h_ioc );
@@ -560,13 +560,13 @@
-ib_ioc_handle_t VOID_PTR64
+ib_ioc_handle_t
get_ioc(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca )
+ IN const ib_ca_handle_t h_ca )
{
cl_list_item_t* p_ioc_item;
al_iou_t* p_iou;
- ib_ioc_handle_t VOID_PTR64 h_ioc;
+ ib_ioc_handle_t h_ioc;
boolean_t found;
ib_api_status_t status;
@@ -640,7 +640,7 @@
ib_api_status_t
add_ioc(
IN al_iou_t* p_iou,
- IN ib_ioc_handle_t FUNC_PTR64 h_ioc )
+ IN ib_ioc_handle_t h_ioc )
{
cl_list_item_t* p_list_item;
al_obj_t* p_obj;
@@ -708,7 +708,7 @@
void
ioc_change(
- IN ib_ioc_handle_t FUNC_PTR64 h_ioc )
+ IN ib_ioc_handle_t h_ioc )
{
CL_ASSERT( h_ioc );
@@ -801,7 +801,7 @@
CL_ASSERT( p_reg_svc_rec );
- p_iou_port = (al_iou_port_t* VOID_PTR64)p_reg_svc_rec->svc_context;
+ p_iou_port = (al_iou_port_t* )p_reg_svc_rec->svc_context;
if( p_reg_svc_rec->req_status != IB_SUCCESS )
deref_al_obj( &p_iou_port->obj );
@@ -945,7 +945,7 @@
ib_api_status_t
dm_agent_reg_pnp(
IN ib_pnp_class_t pnp_class,
- IN ib_pnp_handle_t FUNC_PTR64* ph_pnp )
+ IN ib_pnp_handle_t * ph_pnp )
{
ib_api_status_t status;
ib_pnp_req_t pnp_req;
@@ -1027,7 +1027,7 @@
IN ib_pnp_rec_t* p_pnp_rec )
{
al_iou_t* p_iou;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_api_status_t status;
CL_ASSERT( p_pnp_rec );
@@ -1107,7 +1107,7 @@
{
al_iou_t* p_iou;
cl_list_item_t* p_ioc_item;
- ib_ioc_handle_t VOID_PTR64 h_ioc;
+ ib_ioc_handle_t h_ioc;
CL_ASSERT( p_obj );
p_iou = PARENT_STRUCT( p_obj, al_iou_t, obj );
@@ -1350,7 +1350,7 @@
*/
void
dm_agent_send_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void* mad_svc_context,
IN ib_mad_element_t* p_mad_response )
{
@@ -1375,7 +1375,7 @@
*/
void
dm_agent_recv_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void* mad_svc_context,
IN ib_mad_element_t* p_mad_request )
{
@@ -1594,7 +1594,7 @@
{
ib_iou_info_t* p_iou_info;
cl_list_item_t* p_ioc_item;
- ib_ioc_handle_t VOID_PTR64 h_ioc;
+ ib_ioc_handle_t h_ioc;
uint8_t slot;
CL_ASSERT( p_iou );
@@ -1651,7 +1651,7 @@
{
ib_ioc_profile_t* p_ioc_profile;
cl_list_item_t* p_ioc_item;
- ib_ioc_handle_t VOID_PTR64 h_ioc;
+ ib_ioc_handle_t h_ioc;
CL_ASSERT( p_iou );
CL_ASSERT( p_dm_mad );
@@ -1710,7 +1710,7 @@
ib_svc_entries_t* p_svc_entries;
cl_list_item_t* p_ioc_item;
cl_list_item_t* p_list_item;
- ib_ioc_handle_t VOID_PTR64 h_ioc;
+ ib_ioc_handle_t h_ioc;
al_obj_t* p_obj;
al_svc_entry_t* p_svc_entry;
uint8_t i, j, k;
Index: core/al/al_mad.c
===================================================================
--- core/al/al_mad.c (revision 1094)
+++ core/al/al_mad.c (working copy)
@@ -139,7 +139,7 @@
static void
__check_send_queue(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc );
+ IN ib_mad_svc_handle_t h_mad_svc );
static void
__recv_timer_cb(
@@ -147,8 +147,8 @@
static ib_api_status_t
__init_send_mad(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
- IN const ib_mad_send_handle_t FUNC_PTR64 h_send,
+ IN ib_mad_svc_handle_t h_mad_svc,
+ IN const ib_mad_send_handle_t h_send,
IN ib_mad_element_t* const p_mad_element );
static boolean_t
@@ -160,57 +160,57 @@
static void
__queue_mad_wr(
IN const al_mad_reg_handle_t h_mad_reg,
- IN const ib_mad_send_handle_t FUNC_PTR64 h_send );
+ IN const ib_mad_send_handle_t h_send );
static void
__queue_rmpp_seg(
IN const al_mad_reg_handle_t h_mad_reg,
- IN ib_mad_send_handle_t FUNC_PTR64 h_send );
+ IN ib_mad_send_handle_t h_send );
static ib_api_status_t
__create_send_av(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
- IN ib_mad_send_handle_t FUNC_PTR64 h_send );
+ IN ib_mad_svc_handle_t h_mad_svc,
+ IN ib_mad_send_handle_t h_send );
static void
__cleanup_mad_send(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
- IN ib_mad_send_handle_t FUNC_PTR64 h_send );
+ IN ib_mad_svc_handle_t h_mad_svc,
+ IN ib_mad_send_handle_t h_send );
static __inline void
__set_retry_time(
- IN ib_mad_send_handle_t FUNC_PTR64 h_send );
+ IN ib_mad_send_handle_t h_send );
static void
__mad_svc_send_done(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN al_mad_wr_t *p_mad_wr,
IN ib_wc_t *p_wc );
static boolean_t
__is_send_mad_done(
- IN ib_mad_send_handle_t FUNC_PTR64 h_send,
+ IN ib_mad_send_handle_t h_send,
IN ib_wc_t *p_wc );
static void
__notify_send_comp(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
- IN ib_mad_send_handle_t FUNC_PTR64 h_send,
+ IN ib_mad_svc_handle_t h_mad_svc,
+ IN ib_mad_send_handle_t h_send,
IN ib_wc_status_t wc_status );
static void
__mad_svc_recv_done(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t *p_mad_element );
static void
__process_recv_resp(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t *p_mad_element );
static cl_status_t
__do_rmpp_recv(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN OUT ib_mad_element_t **pp_mad_element );
static __inline boolean_t
@@ -225,39 +225,39 @@
static cl_status_t
__process_rmpp_data(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN OUT ib_mad_element_t **pp_mad_element );
static void
__process_rmpp_ack(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t *p_mad_element );
static void
__process_rmpp_nack(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t *p_mad_element );
static cl_status_t
__process_segment(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN al_mad_rmpp_t *p_rmpp,
IN OUT ib_mad_element_t **pp_mad_element,
OUT ib_mad_element_t **pp_rmpp_resp_mad );
static al_mad_rmpp_t*
__find_rmpp(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN OUT ib_mad_element_t *p_mad_element );
static al_mad_rmpp_t*
__get_mad_rmpp(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t *p_mad_element );
static void
__put_mad_rmpp(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN al_mad_rmpp_t *p_rmpp );
static void
@@ -271,7 +271,7 @@
ib_net64_t
__get_send_tid(
- IN ib_mad_send_handle_t FUNC_PTR64 h_send )
+ IN ib_mad_send_handle_t h_send )
{
return ((ib_mad_t*)ib_get_mad_buf( h_send->p_send_mad ))->trans_id;
}
@@ -281,7 +281,7 @@
get_mad_hdr_from_wr(
IN al_mad_wr_t* const p_mad_wr )
{
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
CL_ASSERT( p_mad_wr );
@@ -353,7 +353,7 @@
ib_api_status_t
create_mad_disp(
IN al_obj_t* const p_parent_obj,
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN al_mad_disp_handle_t* const ph_mad_disp )
{
al_mad_disp_handle_t h_mad_disp;
@@ -465,7 +465,7 @@
static al_mad_reg_handle_t
__mad_disp_reg(
IN const al_mad_disp_handle_t h_mad_disp,
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN const ib_mad_svc_t *p_mad_svc,
IN const pfn_mad_svc_send_done_t pfn_send_done,
IN const pfn_mad_svc_recv_done_t pfn_recv_done )
@@ -881,8 +881,8 @@
{
ib_mad_t *p_mad_hdr;
al_mad_reg_handle_t h_mad_reg;
- ib_al_handle_t VOID_PTR64 h_al;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_al_handle_t h_al;
+ ib_mad_svc_handle_t h_mad_svc;
cl_vector_t *p_class_vector;
cl_ptr_vector_t *p_method_ptr_vector;
@@ -1007,7 +1007,7 @@
cl_spinlock_release( &h_mad_disp->obj.lock );
/* Handoff the MAD to the correct AL instance. */
- h_al = qp_get_al( (ib_qp_handle_t VOID_PTR64)(h_mad_svc->obj.p_parent_obj) );
+ h_al = qp_get_al( (ib_qp_handle_t )(h_mad_svc->obj.p_parent_obj) );
al_handoff_mad( h_al, p_mad_element );
h_mad_reg->pfn_recv_done( h_mad_svc, p_mad_element );
@@ -1097,13 +1097,13 @@
*/
ib_api_status_t
reg_mad_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mad_svc_t* const p_mad_svc,
- OUT ib_mad_svc_handle_t FUNC_PTR64* const ph_mad_svc )
+ OUT ib_mad_svc_handle_t * const ph_mad_svc )
{
ib_api_status_t status;
cl_status_t cl_status;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
al_qp_alias_t *p_qp_alias;
ib_qp_attr_t qp_attr;
@@ -1212,9 +1212,9 @@
__destroying_mad_svc(
IN struct _al_obj *p_obj )
{
- ib_qp_handle_t VOID_PTR64 h_qp;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_qp_handle_t h_qp;
+ ib_mad_svc_handle_t h_mad_svc;
+ ib_mad_send_handle_t h_send;
cl_list_item_t *p_list_item;
int32_t timeout_ms;
#ifdef CL_KERNEL
@@ -1226,7 +1226,7 @@
h_mad_svc = PARENT_STRUCT( p_obj, al_mad_svc_t, obj );
/* Deregister the MAD service. */
- h_qp = (ib_qp_handle_t VOID_PTR64)p_obj->p_parent_obj;
+ h_qp = (ib_qp_handle_t )p_obj->p_parent_obj;
if( h_qp->pfn_dereg_mad_svc )
h_qp->pfn_dereg_mad_svc( h_mad_svc );
@@ -1316,7 +1316,7 @@
__cleanup_mad_svc(
IN struct _al_obj *p_obj )
{
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
al_mad_rmpp_t *p_rmpp;
cl_list_item_t *p_list_item;
@@ -1348,7 +1348,7 @@
free_mad_svc(
IN al_obj_t *p_obj )
{
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
CL_ASSERT( p_obj );
h_mad_svc = PARENT_STRUCT( p_obj, al_mad_svc_t, obj );
@@ -1361,13 +1361,13 @@
ib_api_status_t
ib_send_mad(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element_list,
OUT ib_mad_element_t **pp_mad_failure OPTIONAL )
{
ib_api_status_t status = IB_SUCCESS;
#ifdef CL_KERNEL
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
ib_mad_element_t *p_cur_mad, *p_next_mad;
#endif
@@ -1456,8 +1456,8 @@
static ib_api_status_t
__init_send_mad(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
- IN const ib_mad_send_handle_t FUNC_PTR64 h_send,
+ IN ib_mad_svc_handle_t h_mad_svc,
+ IN const ib_mad_send_handle_t h_send,
IN ib_mad_element_t* const p_mad_element )
{
ib_rmpp_mad_t *p_rmpp_hdr;
@@ -1533,8 +1533,8 @@
static ib_api_status_t
__create_send_av(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
- IN ib_mad_send_handle_t FUNC_PTR64 h_send )
+ IN ib_mad_svc_handle_t h_mad_svc,
+ IN ib_mad_send_handle_t h_send )
{
ib_av_attr_t av_attr;
ib_mad_element_t *p_mad_element;
@@ -1611,7 +1611,7 @@
static void
__queue_rmpp_seg(
IN const al_mad_reg_handle_t h_mad_reg,
- IN ib_mad_send_handle_t FUNC_PTR64 h_send )
+ IN ib_mad_send_handle_t h_send )
{
ib_rmpp_mad_t *p_rmpp_hdr;
@@ -1690,7 +1690,7 @@
static void
__queue_mad_wr(
IN const al_mad_reg_handle_t h_mad_reg,
- IN const ib_mad_send_handle_t FUNC_PTR64 h_send )
+ IN const ib_mad_send_handle_t h_send )
{
ib_send_wr_t *p_send_wr;
al_mad_element_t *p_al_element;
@@ -1717,7 +1717,7 @@
#else
p_rmpp_dst = (uint8_t*)(uintn_t)p_al_element->mad_ds.vaddr;
#endif
- p_rmpp_src = (uint8_t* VOID_PTR64)h_send->p_send_mad->p_mad_buf;
+ p_rmpp_src = (uint8_t* )h_send->p_send_mad->p_mad_buf;
p_rmpp_hdr = (ib_rmpp_mad_t*)p_rmpp_src;
if( h_send->p_send_mad->p_mad_buf->mgmt_class == IB_MCLASS_SUBN_ADM )
@@ -1771,7 +1771,7 @@
IN const cl_list_item_t* const p_list_item,
IN void* context )
{
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
h_send = PARENT_STRUCT( p_list_item, al_mad_send_t, pool_item );
@@ -1785,12 +1785,12 @@
ib_api_status_t
ib_cancel_mad(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element )
{
#ifdef CL_KERNEL
cl_list_item_t *p_list_item;
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
#else
ib_api_status_t status;
#endif
@@ -1846,13 +1846,13 @@
ib_api_status_t
ib_delay_mad(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element,
IN const uint32_t delay_ms )
{
#ifdef CL_KERNEL
cl_list_item_t *p_list_item;
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
#endif
AL_ENTER( AL_DBG_MAD_SVC );
@@ -1907,11 +1907,11 @@
*/
static void
__mad_svc_send_done(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN al_mad_wr_t *p_mad_wr,
IN ib_wc_t *p_wc )
{
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
AL_ENTER( AL_DBG_MAD_SVC );
CL_ASSERT( h_mad_svc && p_mad_wr && !p_wc->p_next );
@@ -1991,8 +1991,8 @@
*/
static void
__notify_send_comp(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
- IN ib_mad_send_handle_t FUNC_PTR64 h_send,
+ IN ib_mad_svc_handle_t h_mad_svc,
+ IN ib_mad_send_handle_t h_send,
IN ib_wc_status_t wc_status )
{
AL_ENTER( AL_DBG_MAD_SVC );
@@ -2026,8 +2026,8 @@
*/
static void
__cleanup_mad_send(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
- IN ib_mad_send_handle_t FUNC_PTR64 h_send )
+ IN ib_mad_svc_handle_t h_mad_svc,
+ IN ib_mad_send_handle_t h_send )
{
/* Release any address vectors that we may have created. */
if( h_send->h_av )
@@ -2046,7 +2046,7 @@
static boolean_t
__is_send_mad_done(
- IN ib_mad_send_handle_t FUNC_PTR64 h_send,
+ IN ib_mad_send_handle_t h_send,
IN ib_wc_t *p_wc )
{
AL_ENTER( AL_DBG_MAD_SVC );
@@ -2106,14 +2106,14 @@
* Try to find a send that matches the received response. This call must
* be synchronized with access to the MAD service send_list.
*/
-static ib_mad_send_handle_t VOID_PTR64
+static ib_mad_send_handle_t
__mad_svc_match_recv(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_recv_mad )
{
ib_mad_t *p_recv_hdr;
cl_list_item_t *p_list_item;
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
AL_ENTER( AL_DBG_MAD_SVC );
@@ -2142,7 +2142,7 @@
static void
__mad_svc_recv_done(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t *p_mad_element )
{
ib_mad_t *p_mad_hdr;
@@ -2227,11 +2227,11 @@
*/
static void
__process_recv_resp(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t *p_mad_element )
{
ib_mad_t *p_mad_hdr;
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
/*
* Try to find the send. The send may have already timed out or
@@ -2256,8 +2256,8 @@
h_send->p_send_mad->status = IB_WCS_SUCCESS;
/* Record the send contexts with the receive. */
- p_mad_element->send_context1 = (void* VOID_PTR64)h_send->p_send_mad->context1;
- p_mad_element->send_context2 = (void* VOID_PTR64)h_send->p_send_mad->context2;
+ p_mad_element->send_context1 = (void* )h_send->p_send_mad->context1;
+ p_mad_element->send_context2 = (void* )h_send->p_send_mad->context2;
if( h_send->retry_time == MAX_TIME )
{
@@ -2366,7 +2366,7 @@
*/
static cl_status_t
__do_rmpp_recv(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN OUT ib_mad_element_t **pp_mad_element )
{
ib_rmpp_mad_t *p_rmpp_mad;
@@ -2418,7 +2418,7 @@
*/
static cl_status_t
__process_rmpp_data(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN OUT ib_mad_element_t **pp_mad_element )
{
ib_mad_element_t *p_rmpp_resp_mad = NULL;
@@ -2515,7 +2515,7 @@
*/
static al_mad_rmpp_t*
__find_rmpp(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN OUT ib_mad_element_t *p_mad_element )
{
al_mad_rmpp_t *p_rmpp;
@@ -2559,7 +2559,7 @@
*/
static al_mad_rmpp_t*
__get_mad_rmpp(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t *p_mad_element )
{
al_mad_rmpp_t *p_rmpp;
@@ -2593,7 +2593,7 @@
*/
static void
__put_mad_rmpp(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN al_mad_rmpp_t *p_rmpp )
{
/* Remove the tracking structure from the reassembly list. */
@@ -2612,7 +2612,7 @@
*/
static cl_status_t
__process_segment(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN al_mad_rmpp_t *p_rmpp,
IN OUT ib_mad_element_t **pp_mad_element,
OUT ib_mad_element_t **pp_rmpp_resp_mad )
@@ -2647,18 +2647,18 @@
if( (*pp_mad_element)->p_mad_buf->mgmt_class == IB_MCLASS_SUBN_ADM )
{
/* Copy the received data into our reassembly buffer. */
- p_src_seg = ((uint8_t* VOID_PTR64)(*pp_mad_element)->p_mad_buf) +
+ p_src_seg = ((uint8_t* )(*pp_mad_element)->p_mad_buf) +
IB_SA_MAD_HDR_SIZE;
- p_dst_seg = ((uint8_t* VOID_PTR64)p_rmpp->p_mad_element->p_mad_buf) +
+ p_dst_seg = ((uint8_t* )p_rmpp->p_mad_element->p_mad_buf) +
IB_SA_MAD_HDR_SIZE + IB_SA_DATA_SIZE * (cur_seg - 1);
cl_memcpy( p_dst_seg, p_src_seg, IB_SA_DATA_SIZE );
}
else
{
/* Copy the received data into our reassembly buffer. */
- p_src_seg = ((uint8_t* VOID_PTR64)(*pp_mad_element)->p_mad_buf) +
+ p_src_seg = ((uint8_t* )(*pp_mad_element)->p_mad_buf) +
MAD_RMPP_HDR_SIZE;
- p_dst_seg = ((uint8_t* VOID_PTR64)p_rmpp->p_mad_element->p_mad_buf) +
+ p_dst_seg = ((uint8_t* )p_rmpp->p_mad_element->p_mad_buf) +
MAD_RMPP_HDR_SIZE + MAD_RMPP_DATA_SIZE * (cur_seg - 1);
cl_memcpy( p_dst_seg, p_src_seg, MAD_RMPP_DATA_SIZE );
}
@@ -2815,10 +2815,10 @@
*/
static void
__process_rmpp_ack(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t *p_mad_element )
{
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
ib_rmpp_mad_t *p_rmpp_mad;
boolean_t send_done = FALSE;
ib_wc_status_t wc_status = IB_WCS_SUCCESS;
@@ -2919,10 +2919,10 @@
*/
static void
__process_rmpp_nack(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t *p_mad_element )
{
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
ib_rmpp_mad_t *p_rmpp_mad;
AL_ENTER( AL_DBG_MAD_SVC );
@@ -2959,7 +2959,7 @@
static __inline void
__set_retry_time(
- IN ib_mad_send_handle_t FUNC_PTR64 h_send )
+ IN ib_mad_send_handle_t h_send )
{
h_send->retry_time =
(uint64_t)(h_send->p_send_mad->timeout_ms + h_send->delay) * 1000Ui64 +
@@ -2975,7 +2975,7 @@
{
AL_ENTER( AL_DBG_MAD_SVC );
- __check_send_queue( (ib_mad_svc_handle_t VOID_PTR64)context );
+ __check_send_queue( (ib_mad_svc_handle_t )context );
AL_EXIT( AL_DBG_MAD_SVC );
}
@@ -2988,9 +2988,9 @@
*/
static void
__check_send_queue(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc )
+ IN ib_mad_svc_handle_t h_mad_svc )
{
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
cl_list_item_t *p_list_item, *p_next_item;
uint64_t cur_time;
cl_qlist_t timeout_list;
@@ -3121,14 +3121,14 @@
__recv_timer_cb(
IN void *context )
{
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
al_mad_rmpp_t *p_rmpp;
cl_list_item_t *p_list_item, *p_next_item;
boolean_t restart_timer;
AL_ENTER( AL_DBG_MAD_SVC );
- h_mad_svc = (ib_mad_svc_handle_t VOID_PTR64)context;
+ h_mad_svc = (ib_mad_svc_handle_t )context;
cl_spinlock_acquire( &h_mad_svc->obj.lock );
@@ -3165,7 +3165,7 @@
ib_api_status_t
ib_local_mad(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const void* const p_mad_in,
IN void* p_mad_out )
@@ -3193,7 +3193,7 @@
ib_api_status_t
al_local_mad(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_av_attr_t* p_src_av_attr,
IN const void* const p_mad_in,
Index: core/al/al_mad.h
===================================================================
--- core/al/al_mad.h (revision 1094)
+++ core/al/al_mad.h (working copy)
@@ -76,13 +76,13 @@
typedef void
(*pfn_mad_svc_send_done_t)(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN al_mad_wr_t *p_mad_wr,
IN ib_wc_t *p_wc );
typedef void
(*pfn_mad_svc_recv_done_t)(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t *p_mad_element );
@@ -114,7 +114,7 @@
ib_api_status_t
create_mad_disp(
IN al_obj_t* const p_parent_obj,
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN al_mad_disp_handle_t* const ph_mad_disp );
void
@@ -170,14 +170,14 @@
*/
ib_api_status_t
reg_mad_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mad_svc_t* const p_mad_svc,
- OUT ib_mad_svc_handle_t FUNC_PTR64* const ph_mad_svc );
+ OUT ib_mad_svc_handle_t * const ph_mad_svc );
ib_api_status_t
al_local_mad(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_av_attr_t* p_av_attr,
IN const void* const p_mad_in,
@@ -228,7 +228,7 @@
ib_api_status_t
ib_delay_mad(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element,
IN const uint32_t delay_ms );
Index: core/al/al_mad_pool.h
===================================================================
--- core/al/al_mad_pool.h (revision 1094)
+++ core/al/al_mad_pool.h (working copy)
@@ -40,7 +40,7 @@
typedef struct _al_pool
{
- al_obj_t obj; /* Child of ib_al_handle_t VOID_PTR64 */
+ al_obj_t obj; /* Child of ib_al_handle_t */
#if defined( CL_KERNEL )
NPAGED_LOOKASIDE_LIST mad_stack;
#else
@@ -110,19 +110,19 @@
ib_api_status_t
reg_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- OUT ib_pool_key_t FUNC_PTR64* const pp_pool_key );
+ IN const ib_pool_handle_t h_pool,
+ IN const ib_pd_handle_t h_pd,
+ OUT ib_pool_key_t * const pp_pool_key );
/* Deregister a MAD pool key if it is of the expected type. */
ib_api_status_t
dereg_mad_pool(
- IN const ib_pool_key_t FUNC_PTR64 pool_key,
+ IN const ib_pool_key_t pool_key,
IN const al_key_type_t expected_type );
typedef void
-(* VOID_PTR64 pfn_mad_dbg_t)(void);
+(* pfn_mad_dbg_t)(void);
typedef struct _al_mad_element
{
@@ -258,14 +258,14 @@
-ib_mad_send_handle_t FUNC_PTR64
+ib_mad_send_handle_t
get_mad_send(
IN const al_mad_element_t *p_mad_element );
void
put_mad_send(
- IN ib_mad_send_handle_t FUNC_PTR64 h_mad_send );
+ IN ib_mad_send_handle_t h_mad_send );
al_mad_rmpp_t*
Index: core/al/al_mcast.c
===================================================================
--- core/al/al_mcast.c (revision 1094)
+++ core/al/al_mcast.c (working copy)
@@ -102,10 +102,10 @@
ib_api_status_t
al_join_mcast(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mcast_req_t* const p_mcast_req )
{
- ib_mcast_handle_t VOID_PTR64 h_mcast;
+ ib_mcast_handle_t h_mcast;
ib_api_status_t status;
cl_status_t cl_status;
boolean_t sync;
@@ -227,7 +227,7 @@
__destroying_mcast(
IN al_obj_t *p_obj )
{
- ib_mcast_handle_t VOID_PTR64 h_mcast;
+ ib_mcast_handle_t h_mcast;
ib_user_query_t sa_mad_data;
ib_api_status_t status;
@@ -284,7 +284,7 @@
__cleanup_mcast(
IN al_obj_t *p_obj )
{
- ib_mcast_handle_t VOID_PTR64 h_mcast;
+ ib_mcast_handle_t h_mcast;
ib_api_status_t status;
AL_ENTER( AL_DBG_MCAST );
@@ -317,7 +317,7 @@
__free_mcast(
IN al_obj_t *p_obj )
{
- ib_mcast_handle_t VOID_PTR64 h_mcast;
+ ib_mcast_handle_t h_mcast;
h_mcast = PARENT_STRUCT( p_obj, ib_mcast_t, obj );
@@ -418,7 +418,7 @@
IN al_sa_req_t *p_sa_req,
IN ib_mad_element_t *p_mad_response )
{
- ib_mcast_handle_t VOID_PTR64 h_mcast;
+ ib_mcast_handle_t h_mcast;
ib_sa_mad_t *p_sa_mad;
AL_ENTER( AL_DBG_MCAST );
@@ -464,7 +464,7 @@
IN cl_async_proc_item_t *p_item )
{
ib_api_status_t status;
- ib_mcast_handle_t VOID_PTR64 h_mcast;
+ ib_mcast_handle_t h_mcast;
ib_mcast_rec_t mcast_rec;
boolean_t sync;
@@ -547,7 +547,7 @@
ib_api_status_t
ib_leave_mcast(
- IN const ib_mcast_handle_t FUNC_PTR64 h_mcast,
+ IN const ib_mcast_handle_t h_mcast,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL )
{
@@ -576,7 +576,7 @@
IN al_sa_req_t *p_sa_req,
IN ib_mad_element_t *p_mad_response )
{
- ib_mcast_handle_t VOID_PTR64 h_mcast;
+ ib_mcast_handle_t h_mcast;
AL_ENTER( AL_DBG_MCAST );
h_mcast = PARENT_STRUCT( p_sa_req, ib_mcast_t, sa_dereg_req );
@@ -601,7 +601,7 @@
*/
ib_api_status_t
al_attach_mcast(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_gid_t *p_mcast_gid,
IN const ib_net16_t mcast_lid,
OUT al_attach_handle_t *ph_attach,
Index: core/al/al_mcast.h
===================================================================
--- core/al/al_mcast.h (revision 1094)
+++ core/al/al_mcast.h (working copy)
@@ -49,7 +49,7 @@
al_obj_t obj;
TO_LONG_PTR( ib_mcast_handle_t , h_ci_mcast) ; /* CI CA handle from attach */
-} al_attach_t, * VOID_PTR64 al_attach_handle_t;
+} al_attach_t, * al_attach_handle_t;
typedef struct _ib_mcast
@@ -87,12 +87,12 @@
void
al_cancel_mcast(
- IN const ib_mcast_handle_t FUNC_PTR64 h_mcast );
+ IN const ib_mcast_handle_t h_mcast );
ib_api_status_t
al_join_mcast(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mcast_req_t* const p_mcast_req );
@@ -102,7 +102,7 @@
*/
ib_api_status_t
al_attach_mcast(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_gid_t *p_mcast_gid,
IN const ib_net16_t mcast_lid,
OUT al_attach_handle_t *ph_attach,
Index: core/al/al_mgr.h
===================================================================
--- core/al/al_mgr.h (revision 1094)
+++ core/al/al_mgr.h (working copy)
@@ -71,7 +71,7 @@
AL_EXPORT cl_async_proc_t *gp_async_proc_mgr;
AL_EXPORT cl_async_proc_t *gp_async_pnp_mgr;
AL_EXPORT al_mgr_t *gp_al_mgr;
-AL_EXPORT ib_al_handle_t VOID_PTR64 gh_al ;
+AL_EXPORT ib_al_handle_t gh_al ;
ib_pool_handle_t gh_mad_pool ;
@@ -81,7 +81,7 @@
void
print_al_objs(
- IN const ib_al_handle_t FUNC_PTR64 h_al );
+ IN const ib_al_handle_t h_al );
void
print_al_obj(
@@ -94,14 +94,14 @@
al_ci_ca_t*
acquire_ci_ca(
IN const ib_net64_t ci_ca_guid,
- IN const ib_ca_handle_t FUNC_PTR64 h_ca );
+ IN const ib_ca_handle_t h_ca );
void
release_ci_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca );
+ IN const ib_ca_handle_t h_ca );
-AL_EXPORT ib_ca_handle_t FUNC_PTR64 AL_API
+AL_EXPORT ib_ca_handle_t AL_API
acquire_ca(
IN const ib_net64_t ci_ca_guid );
Index: core/al/al_mgr_shared.c
===================================================================
--- core/al/al_mgr_shared.c (revision 1094)
+++ core/al/al_mgr_shared.c (working copy)
@@ -44,8 +44,8 @@
#include "al_mgr.h"
#include "al_pnp.h"
-ib_al_handle_t VOID_PTR64 gh_al = NULL;
-ib_pool_handle_t VOID_PTR64 gh_mad_pool = NULL;
+ib_al_handle_t gh_al = NULL;
+ib_pool_handle_t gh_mad_pool = NULL;
al_mgr_t *gp_al_mgr = NULL;
cl_async_proc_t *gp_async_proc_mgr = NULL;
cl_async_proc_t *gp_async_pnp_mgr = NULL;
@@ -69,7 +69,7 @@
void
print_al_objs(
- IN const ib_al_handle_t FUNC_PTR64 h_al )
+ IN const ib_al_handle_t h_al )
{
al_obj_t *p_obj;
cl_list_item_t *p_list_item;
@@ -150,7 +150,7 @@
al_ci_ca_t*
acquire_ci_ca(
IN const ib_net64_t ci_ca_guid,
- IN const ib_ca_handle_t FUNC_PTR64 h_ca )
+ IN const ib_ca_handle_t h_ca )
{
al_ci_ca_t *p_ci_ca;
@@ -171,7 +171,7 @@
void
release_ci_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca )
+ IN const ib_ca_handle_t h_ca )
{
AL_ENTER( AL_DBG_MGR );
remove_ca( h_ca );
@@ -207,7 +207,7 @@
-ib_ca_handle_t VOID_PTR64
+ib_ca_handle_t
acquire_ca(
IN const ib_net64_t ci_ca_guid )
{
@@ -237,7 +237,7 @@
static ib_api_status_t
__get_guid_by_gid (
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN const ib_gid_t* const p_gid,
IN const uintn_t type,
OUT ib_net64_t* const p_guid )
@@ -344,7 +344,7 @@
ib_api_status_t
ib_get_ca_by_gid(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN const ib_gid_t* const p_gid,
OUT ib_net64_t* const p_ca_guid )
{
@@ -373,7 +373,7 @@
ib_api_status_t
ib_get_port_by_gid(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN const ib_gid_t* const p_gid,
OUT ib_net64_t* const p_port_guid )
{
@@ -405,7 +405,7 @@
*/
ib_api_status_t
ib_get_ca_guids(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
OUT ib_net64_t* const p_guid_array OPTIONAL,
IN OUT size_t* const p_guid_cnt )
{
@@ -624,7 +624,7 @@
ib_api_status_t
ib_get_guid(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN const uint32_t index,
IN const ib_pnp_class_t device_type,
IN const uint64_t attr_mask,
Index: core/al/al_mr.h
===================================================================
--- core/al/al_mr.h (revision 1094)
+++ core/al/al_mr.h (working copy)
@@ -82,73 +82,73 @@
ib_api_status_t
reg_mem(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_mr_create_t* const p_mr_create,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t * const ph_mr,
IN boolean_t um_call );
ib_api_status_t
reg_phys(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_phys_create_t* const p_phys_create,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t * const ph_mr,
IN boolean_t um_call );
ib_api_status_t
reg_shared(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_mr_handle_t h_mr,
+ IN const ib_pd_handle_t h_pd,
IN const ib_access_t access_ctrl,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t * const ph_mr,
IN boolean_t um_call );
ib_api_status_t
rereg_mem(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_mr_create_t* const p_mr_create OPTIONAL,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL,
+ IN const ib_pd_handle_t h_pd OPTIONAL,
IN boolean_t um_call );
ib_api_status_t
rereg_phys(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_phys_create_t* const p_phys_create OPTIONAL,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL,
+ IN const ib_pd_handle_t h_pd OPTIONAL,
IN boolean_t um_call );
ib_api_status_t
dereg_mr(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr );
+ IN const ib_mr_handle_t h_mr );
ib_api_status_t
reg_shmid(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_shmid_t shmid,
IN const ib_mr_create_t* const p_mr_create,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr );
+ OUT ib_mr_handle_t * const ph_mr );
#ifdef CL_KERNEL
Index: core/al/al_mr_shared.c
===================================================================
--- core/al/al_mr_shared.c (revision 1094)
+++ core/al/al_mr_shared.c (working copy)
@@ -63,11 +63,11 @@
OUT cl_pool_item_t** const pp_pool_item )
{
ib_api_status_t status;
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
UNUSED_PARAM( context );
- h_mr = (ib_mr_handle_t VOID_PTR64)p_object;
+ h_mr = (ib_mr_handle_t )p_object;
cl_memclr( h_mr, sizeof( ib_mr_t ) );
construct_al_obj( &h_mr->obj, AL_OBJ_TYPE_H_MR );
@@ -78,7 +78,7 @@
return CL_ERROR;
}
- *pp_pool_item = &((ib_mr_handle_t VOID_PTR64)p_object)->obj.pool_item;
+ *pp_pool_item = &((ib_mr_handle_t )p_object)->obj.pool_item;
/* Release the reference taken in init_al_obj. */
deref_al_obj( &h_mr->obj );
@@ -115,7 +115,7 @@
IN struct _al_obj *p_obj )
{
ib_api_status_t status;
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
CL_ASSERT( p_obj );
h_mr = PARENT_STRUCT( p_obj, ib_mr_t, obj );
@@ -146,7 +146,7 @@
__return_mr(
IN al_obj_t *p_obj )
{
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
h_mr = PARENT_STRUCT( p_obj, ib_mr_t, obj );
reset_al_obj( p_obj );
@@ -157,11 +157,11 @@
ib_api_status_t
ib_reg_mem(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_mr_create_t* const p_mr_create,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr )
+ OUT ib_mr_handle_t * const ph_mr )
{
ib_api_status_t status;
@@ -187,14 +187,14 @@
ib_api_status_t
reg_mem(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_mr_create_t* const p_mr_create,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t * const ph_mr,
IN boolean_t um_call )
{
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
ib_api_status_t status;
AL_ENTER( AL_DBG_MR );
@@ -243,14 +243,14 @@
ib_api_status_t
ib_reg_phys(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_phys_create_t* const p_phys_create,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr )
+ OUT ib_mr_handle_t * const ph_mr )
{
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
ib_api_status_t status;
AL_ENTER( AL_DBG_MR );
@@ -308,12 +308,12 @@
ib_api_status_t
ib_rereg_mem(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_mr_create_t* const p_mr_create OPTIONAL,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL )
+ IN const ib_pd_handle_t h_pd OPTIONAL )
{
if( AL_OBJ_INVALID_HANDLE( h_mr, AL_OBJ_TYPE_H_MR ) )
{
@@ -328,12 +328,12 @@
ib_api_status_t
rereg_mem(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_mr_create_t* const p_mr_create OPTIONAL,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL,
+ IN const ib_pd_handle_t h_pd OPTIONAL,
IN boolean_t um_call )
{
ib_api_status_t status;
@@ -381,13 +381,13 @@
ib_api_status_t
ib_rereg_phys(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_phys_create_t* const p_phys_create OPTIONAL,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL )
+ IN const ib_pd_handle_t h_pd OPTIONAL )
{
ib_api_status_t status;
@@ -439,13 +439,13 @@
ib_api_status_t
ib_reg_shared(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_mr_handle_t h_mr,
+ IN const ib_pd_handle_t h_pd,
IN const ib_access_t access_ctrl,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr )
+ OUT ib_mr_handle_t * const ph_mr )
{
ib_api_status_t status;
@@ -474,16 +474,16 @@
ib_api_status_t
reg_shared(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_mr_handle_t h_mr,
+ IN const ib_pd_handle_t h_pd,
IN const ib_access_t access_ctrl,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t * const ph_mr,
IN boolean_t um_call )
{
- ib_mr_handle_t VOID_PTR64 h_new_mr;
+ ib_mr_handle_t h_new_mr;
ib_api_status_t status;
AL_ENTER( AL_DBG_MR );
@@ -533,7 +533,7 @@
ib_api_status_t
ib_dereg_mr(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr )
+ IN const ib_mr_handle_t h_mr )
{
ib_api_status_t status;
@@ -559,7 +559,7 @@
ib_api_status_t
dereg_mr(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr )
+ IN const ib_mr_handle_t h_mr )
{
ib_api_status_t status;
@@ -598,7 +598,7 @@
ib_api_status_t
ib_query_mr(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
OUT ib_mr_attr_t* const p_mr_attr )
{
ib_api_status_t status;
Index: core/al/al_mw.c
===================================================================
--- core/al/al_mw.c (revision 1094)
+++ core/al/al_mw.c (working copy)
@@ -61,12 +61,12 @@
ib_api_status_t
create_mw(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
OUT net32_t* const p_rkey,
- OUT ib_mw_handle_t FUNC_PTR64* const ph_mw,
+ OUT ib_mw_handle_t * const ph_mw,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
- ib_mw_handle_t VOID_PTR64 h_mw;
+ ib_mw_handle_t h_mw;
ib_api_status_t status;
al_obj_type_t obj_type = AL_OBJ_TYPE_H_MW;
@@ -125,7 +125,7 @@
ib_api_status_t
ib_destroy_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw )
+ IN const ib_mw_handle_t h_mw )
{
ib_api_status_t status;
@@ -152,7 +152,7 @@
ib_api_status_t
destroy_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw )
+ IN const ib_mw_handle_t h_mw )
{
ib_api_status_t status;
@@ -183,7 +183,7 @@
destroying_mw(
IN struct _al_obj *p_obj )
{
- ib_mw_handle_t VOID_PTR64 h_mw;
+ ib_mw_handle_t h_mw;
CL_ASSERT( p_obj );
h_mw = PARENT_STRUCT( p_obj, ib_mw_t, obj );
@@ -201,7 +201,7 @@
free_mw(
IN al_obj_t *p_obj )
{
- ib_mw_handle_t VOID_PTR64 h_mw;
+ ib_mw_handle_t h_mw;
CL_ASSERT( p_obj );
h_mw = PARENT_STRUCT( p_obj, ib_mw_t, obj );
@@ -214,8 +214,8 @@
ib_api_status_t
ib_query_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd,
+ IN const ib_mw_handle_t h_mw,
+ OUT ib_pd_handle_t * const ph_pd,
OUT net32_t* const p_rkey )
{
return query_mw( h_mw, ph_pd, p_rkey, NULL );
@@ -224,12 +224,12 @@
ib_api_status_t
query_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd,
+ IN const ib_mw_handle_t h_mw,
+ OUT ib_pd_handle_t * const ph_pd,
OUT net32_t* const p_rkey,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
- ib_pd_handle_t VOID_PTR64 h_ci_pd;
+ ib_pd_handle_t h_ci_pd;
ib_api_status_t status;
AL_ENTER( AL_DBG_MW );
Index: core/al/al_mw.h
===================================================================
--- core/al/al_mw.h (revision 1094)
+++ core/al/al_mw.h (working copy)
@@ -54,21 +54,21 @@
ib_api_status_t
create_mw(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
OUT uint32_t* const p_rkey,
- OUT ib_mw_handle_t FUNC_PTR64* const ph_mw,
+ OUT ib_mw_handle_t * const ph_mw,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
query_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd,
+ IN const ib_mw_handle_t h_mw,
+ OUT ib_pd_handle_t * const ph_pd,
OUT uint32_t* const p_rkey,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
destroy_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw );
+ IN const ib_mw_handle_t h_mw );
#endif /* __AL_MW_H__ */
Index: core/al/al_pd.c
===================================================================
--- core/al/al_pd.c (revision 1094)
+++ core/al/al_pd.c (working copy)
@@ -72,13 +72,13 @@
ib_api_status_t
alloc_pd(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_pd_type_t pd_type,
IN const void * const pd_context,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd,
+ OUT ib_pd_handle_t * const ph_pd,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
ib_api_status_t status;
al_obj_type_t obj_type = AL_OBJ_TYPE_H_PD;
@@ -91,7 +91,7 @@
}
/* Allocate a protection domain. */
- h_pd = (ib_pd_handle_t VOID_PTR64)cl_zalloc( sizeof( ib_pd_t ) );
+ h_pd = (ib_pd_handle_t )cl_zalloc( sizeof( ib_pd_t ) );
if( !h_pd )
{
return IB_INSUFFICIENT_MEMORY;
@@ -155,7 +155,7 @@
ib_api_status_t
ib_dealloc_pd(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL )
{
AL_ENTER( AL_DBG_PD );
@@ -182,10 +182,10 @@
destroying_pd(
IN al_obj_t *p_obj )
{
- ib_al_handle_t VOID_PTR64 h_al;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_pd_handle_t VOID_PTR64 h_pd;
- ib_mw_handle_t VOID_PTR64 h_mw;
+ ib_al_handle_t h_al;
+ ib_ca_handle_t h_ca;
+ ib_pd_handle_t h_pd;
+ ib_mw_handle_t h_mw;
cl_list_item_t *p_list_item;
ib_api_status_t status;
@@ -220,7 +220,7 @@
cleanup_pd(
IN struct _al_obj *p_obj )
{
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
ib_api_status_t status;
CL_ASSERT( p_obj );
@@ -251,7 +251,7 @@
free_pd(
IN al_obj_t *p_obj )
{
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
CL_ASSERT( p_obj );
h_pd = PARENT_STRUCT( p_obj, ib_pd_t, obj );
@@ -262,11 +262,11 @@
ib_api_status_t
ib_create_srq(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_srq_attr_t* const p_srq_attr,
IN const void* const srq_context,
IN const ib_pfn_event_cb_t pfn_srq_event_cb OPTIONAL,
- OUT ib_srq_handle_t FUNC_PTR64* const ph_srq )
+ OUT ib_srq_handle_t * const ph_srq )
{
ib_api_status_t status;
@@ -318,11 +318,11 @@
ib_api_status_t
ib_create_qp(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_qp_create_t* const p_qp_create,
IN const void* const qp_context,
IN const ib_pfn_event_cb_t pfn_qp_event_cb OPTIONAL,
- OUT ib_qp_handle_t FUNC_PTR64* const ph_qp )
+ OUT ib_qp_handle_t * const ph_qp )
{
ib_api_status_t status;
@@ -371,13 +371,13 @@
ib_api_status_t
ib_get_spl_qp(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid,
IN const ib_qp_create_t* const p_qp_create,
IN const void* const qp_context,
IN const ib_pfn_event_cb_t pfn_qp_event_cb OPTIONAL,
- OUT ib_pool_key_t FUNC_PTR64* const p_pool_key OPTIONAL,
- OUT ib_qp_handle_t FUNC_PTR64* const ph_qp )
+ OUT ib_pool_key_t * const p_pool_key OPTIONAL,
+ OUT ib_qp_handle_t * const ph_qp )
{
ib_api_status_t status;
@@ -404,9 +404,9 @@
ib_api_status_t
ib_create_av(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t* const p_av_attr,
- OUT ib_av_handle_t FUNC_PTR64* const ph_av )
+ OUT ib_av_handle_t * const ph_av )
{
ib_api_status_t status;
@@ -432,9 +432,9 @@
ib_api_status_t
ib_create_mw(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
OUT net32_t* const p_rkey,
- OUT ib_mw_handle_t FUNC_PTR64* const ph_mw )
+ OUT ib_mw_handle_t * const ph_mw )
{
ib_api_status_t status;
@@ -459,9 +459,9 @@
void
pd_insert_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw )
+ IN const ib_mw_handle_t h_mw )
{
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
CL_ASSERT( h_mw );
h_pd = PARENT_STRUCT( h_mw->obj.p_parent_obj, ib_pd_t, obj );
@@ -475,9 +475,9 @@
void
pd_remove_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw )
+ IN const ib_mw_handle_t h_mw )
{
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
CL_ASSERT( h_mw );
h_pd = PARENT_STRUCT( h_mw->obj.p_parent_obj, ib_pd_t, obj );
Index: core/al/al_pd.h
===================================================================
--- core/al/al_pd.h (revision 1094)
+++ core/al/al_pd.h (working copy)
@@ -61,20 +61,20 @@
ib_api_status_t
alloc_pd(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_pd_type_t pd_type,
IN const void * const pd_context,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd,
+ OUT ib_pd_handle_t * const ph_pd,
IN OUT ci_umv_buf_t* const p_umv_buf );
void
pd_insert_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw );
+ IN const ib_mw_handle_t h_mw );
void
pd_remove_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw );
+ IN const ib_mw_handle_t h_mw );
#endif /* __AL_PD_H__ */
Index: core/al/al_pnp.h
===================================================================
--- core/al/al_pnp.h (revision 1094)
+++ core/al/al_pnp.h (working copy)
@@ -210,10 +210,10 @@
ib_api_status_t
al_reg_pnp(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_pnp_req_t* const p_pnp_req,
IN KEVENT *p_sync_event,
- OUT ib_pnp_handle_t FUNC_PTR64* const ph_pnp );
+ OUT ib_pnp_handle_t* const ph_pnp );
#endif /* CL_KERNEL */
Index: core/al/al_proxy_ioctl.h
===================================================================
--- core/al/al_proxy_ioctl.h (revision 1094)
+++ core/al/al_proxy_ioctl.h (working copy)
@@ -194,7 +194,7 @@
*/
typedef union _misc_cb_ioctl_rec
{
- void* VOID_PTR64 context;
+ void* context;
/* Asynchronous event records */
ib_async_event_rec_t event_rec;
Index: core/al/al_qp.c
===================================================================
--- core/al/al_qp.c (revision 1094)
+++ core/al/al_qp.c (working copy)
@@ -67,7 +67,7 @@
#define UNBOUND_PORT_GUID 0
-extern ib_pool_handle_t VOID_PTR64 gh_mad_pool;
+extern ib_pool_handle_t gh_mad_pool;
/*
@@ -96,8 +96,8 @@
ib_api_status_t
init_raw_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_qp_handle_t h_qp,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid OPTIONAL,
IN const ib_qp_create_t* const p_qp_create,
IN OUT ci_umv_buf_t* const p_umv_buf );
@@ -105,54 +105,54 @@
ib_api_status_t
init_conn_qp(
IN al_conn_qp_t* const p_conn_qp,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_qp_create_t* const p_qp_create,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
init_dgrm_qp(
IN al_dgrm_qp_t* const p_dgrm_qp,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_qp_create_t* const p_qp_create,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
init_special_qp(
IN al_special_qp_t* const p_special_qp,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid,
IN const ib_qp_create_t* const p_qp_create );
ib_api_status_t
init_qp_alias(
IN al_qp_alias_t* const p_qp_alias,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid,
IN const ib_qp_create_t* const p_qp_create );
ib_api_status_t
init_mad_qp(
IN al_mad_qp_t* const p_mad_qp,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_qp_create_t* const p_qp_create,
IN const ib_pfn_event_cb_t pfn_qp_event_cb );
ib_api_status_t
init_mad_dgrm_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_dgrm_info_t* const p_dgrm_info );
ib_api_status_t
al_modify_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
init_dgrm_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_dgrm_info_t* const p_dgrm_info );
ib_api_status_t
@@ -161,24 +161,24 @@
ib_api_status_t
ud_post_send(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t **pp_send_failure );
ib_api_status_t
special_qp_post_send(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t **pp_send_failure );
void
mad_qp_queue_mad(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN al_mad_wr_t* const p_mad_wr );
void
mad_qp_resume_sends(
- IN ib_qp_handle_t FUNC_PTR64 h_qp );
+ IN ib_qp_handle_t h_qp );
void
mad_qp_flush_send(
@@ -187,18 +187,18 @@
void
mad_recv_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
void
mad_send_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
void
mad_qp_comp(
IN al_mad_qp_t* p_mad_qp,
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN ib_wc_type_t wc_type );
void
@@ -213,38 +213,38 @@
ib_api_status_t
alloc_qp(
IN const ib_qp_type_t qp_type,
- OUT ib_qp_handle_t FUNC_PTR64* const ph_qp )
+ OUT ib_qp_handle_t * const ph_qp )
{
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
switch( qp_type )
{
case IB_QPT_RELIABLE_CONN:
case IB_QPT_UNRELIABLE_CONN:
- h_qp = (ib_qp_handle_t VOID_PTR64)cl_zalloc( sizeof( al_conn_qp_t ) );
+ h_qp = (ib_qp_handle_t )cl_zalloc( sizeof( al_conn_qp_t ) );
break;
case IB_QPT_UNRELIABLE_DGRM:
- h_qp = (ib_qp_handle_t VOID_PTR64)cl_zalloc( sizeof( al_dgrm_qp_t ) );
+ h_qp = (ib_qp_handle_t )cl_zalloc( sizeof( al_dgrm_qp_t ) );
break;
case IB_QPT_QP0:
case IB_QPT_QP1:
- h_qp = (ib_qp_handle_t VOID_PTR64)cl_zalloc( sizeof( al_special_qp_t ) );
+ h_qp = (ib_qp_handle_t )cl_zalloc( sizeof( al_special_qp_t ) );
break;
case IB_QPT_RAW_IPV6:
case IB_QPT_RAW_ETHER:
- h_qp = (ib_qp_handle_t VOID_PTR64)cl_zalloc( sizeof( ib_qp_t ) );
+ h_qp = (ib_qp_handle_t )cl_zalloc( sizeof( ib_qp_t ) );
break;
case IB_QPT_MAD:
- h_qp = (ib_qp_handle_t VOID_PTR64)cl_zalloc( sizeof( al_mad_qp_t ) );
+ h_qp = (ib_qp_handle_t )cl_zalloc( sizeof( al_mad_qp_t ) );
break;
case IB_QPT_QP0_ALIAS:
case IB_QPT_QP1_ALIAS:
- h_qp = (ib_qp_handle_t VOID_PTR64)cl_zalloc( sizeof( al_qp_alias_t ) );
+ h_qp = (ib_qp_handle_t )cl_zalloc( sizeof( al_qp_alias_t ) );
break;
default:
@@ -279,15 +279,15 @@
*/
ib_api_status_t
create_qp(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_qp_create_t* const p_qp_create,
IN const void* const qp_context,
IN const ib_pfn_event_cb_t pfn_qp_event_cb,
- OUT ib_qp_handle_t FUNC_PTR64* const ph_qp,
+ OUT ib_qp_handle_t * const ph_qp,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
ib_api_status_t status;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
if( !p_qp_create || !ph_qp )
{
@@ -381,17 +381,17 @@
ib_api_status_t
get_spl_qp(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid,
IN const ib_qp_create_t* const p_qp_create,
IN const void* const qp_context,
IN const ib_pfn_event_cb_t pfn_qp_event_cb,
- OUT ib_pool_key_t FUNC_PTR64* const p_pool_key OPTIONAL,
- OUT ib_qp_handle_t FUNC_PTR64* const ph_qp,
+ OUT ib_pool_key_t * const p_pool_key OPTIONAL,
+ OUT ib_qp_handle_t * const ph_qp,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
ib_api_status_t status;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
if( !p_qp_create || !ph_qp )
{
@@ -508,7 +508,7 @@
static ib_api_status_t
al_bad_modify_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
@@ -521,7 +521,7 @@
static ib_api_status_t
al_bad_post_send(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr,
IN ib_send_wr_t **pp_send_failure OPTIONAL )
{
@@ -534,7 +534,7 @@
static ib_api_status_t
al_bad_post_recv(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_recv_wr_t* const p_recv_wr,
IN ib_recv_wr_t **p_recv_failure OPTIONAL )
{
@@ -547,7 +547,7 @@
static ib_api_status_t
al_bad_init_dgrm_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_dgrm_info_t* const p_dgrm_info )
{
UNUSED_PARAM( h_qp );
@@ -558,9 +558,9 @@
static ib_api_status_t
al_bad_reg_mad_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mad_svc_t* const p_mad_svc,
- OUT ib_mad_svc_handle_t FUNC_PTR64* const ph_mad_svc )
+ OUT ib_mad_svc_handle_t * const ph_mad_svc )
{
UNUSED_PARAM( h_qp );
UNUSED_PARAM( p_mad_svc );
@@ -571,7 +571,7 @@
static ib_api_status_t
al_bad_dereg_mad_svc(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc )
+ IN const ib_mad_svc_handle_t h_mad_svc )
{
UNUSED_PARAM( h_mad_svc );
return IB_INVALID_PARAMETER;
@@ -580,7 +580,7 @@
static void
al_bad_queue_mad(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN al_mad_wr_t* const p_mad_wr )
{
UNUSED_PARAM( h_qp );
@@ -590,7 +590,7 @@
static void
al_bad_resume_mad(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN const ib_qp_handle_t h_qp )
{
UNUSED_PARAM( h_qp );
return;
@@ -599,7 +599,7 @@
static ib_api_status_t
al_bad_join_mcast(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mcast_req_t* const p_mcast_req )
{
UNUSED_PARAM( h_qp );
@@ -661,8 +661,8 @@
ib_api_status_t
init_raw_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_qp_handle_t h_qp,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid OPTIONAL,
IN const ib_qp_create_t* const p_qp_create,
IN OUT ci_umv_buf_t* const p_umv_buf )
@@ -748,7 +748,7 @@
ib_api_status_t
init_conn_qp(
IN al_conn_qp_t* const p_conn_qp,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_qp_create_t* const p_qp_create,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
@@ -768,7 +768,7 @@
ib_api_status_t
init_dgrm_qp(
IN al_dgrm_qp_t* const p_dgrm_qp,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_qp_create_t* const p_qp_create,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
@@ -795,7 +795,7 @@
ib_api_status_t
init_special_qp(
IN al_special_qp_t* const p_special_qp,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid,
IN const ib_qp_create_t* const p_qp_create )
{
@@ -825,7 +825,7 @@
ib_api_status_t
init_qp_alias(
IN al_qp_alias_t* const p_qp_alias,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid,
IN const ib_qp_create_t* const p_qp_create )
{
@@ -878,14 +878,14 @@
ib_api_status_t
init_mad_qp(
IN al_mad_qp_t* const p_mad_qp,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_qp_create_t* const p_qp_create,
IN const ib_pfn_event_cb_t pfn_qp_event_cb )
{
ib_cq_create_t cq_create;
ib_qp_create_t qp_create;
- ib_al_handle_t VOID_PTR64 h_al;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_al_handle_t h_al;
+ ib_ca_handle_t h_ca;
ib_api_status_t status;
CL_ASSERT( p_mad_qp );
@@ -1017,7 +1017,7 @@
ib_api_status_t
ib_destroy_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL )
{
AL_ENTER( AL_DBG_QP );
@@ -1045,7 +1045,7 @@
destroying_qp(
IN al_obj_t *p_obj )
{
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
al_mad_qp_t *p_mad_qp;
al_qp_alias_t *p_qp_alias;
net32_t cid;
@@ -1152,7 +1152,7 @@
cleanup_qp(
IN al_obj_t *p_obj )
{
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
al_mad_qp_t* p_mad_qp;
al_mad_wr_t* p_mad_wr;
cl_list_item_t* p_list_item;
@@ -1243,7 +1243,7 @@
free_qp(
IN al_obj_t *p_obj )
{
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
CL_ASSERT( p_obj );
h_qp = PARENT_STRUCT( p_obj, ib_qp_t, obj );
@@ -1260,7 +1260,7 @@
ib_api_status_t
ib_query_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
OUT ib_qp_attr_t* const p_qp_attr )
{
return query_qp( h_qp, p_qp_attr, NULL );
@@ -1269,7 +1269,7 @@
ib_api_status_t
query_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
OUT ib_qp_attr_t* const p_qp_attr,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
@@ -1310,7 +1310,7 @@
ib_api_status_t
ib_modify_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod )
{
return modify_qp( h_qp, p_qp_mod, NULL );
@@ -1320,7 +1320,7 @@
ib_api_status_t
modify_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
@@ -1349,7 +1349,7 @@
ib_api_status_t
al_modify_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
@@ -1386,7 +1386,7 @@
ib_api_status_t
ndi_modify_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod,
IN const uint32_t buf_size,
IN uint8_t* const p_outbuf)
@@ -1410,7 +1410,7 @@
ib_api_status_t
ib_init_dgrm_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_dgrm_info_t* const p_dgrm_info OPTIONAL )
{
ib_api_status_t status;
@@ -1459,7 +1459,7 @@
*/
ib_api_status_t
init_dgrm_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_dgrm_info_t* const p_dgrm_info OPTIONAL )
{
al_dgrm_qp_t *p_dgrm_qp;
@@ -1533,7 +1533,7 @@
ib_api_status_t
init_mad_dgrm_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_dgrm_info_t* const p_dgrm_info )
{
al_mad_qp_t *p_mad_qp;
@@ -1566,9 +1566,9 @@
ib_api_status_t
ib_reg_mad_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mad_svc_t* const p_mad_svc,
- OUT ib_mad_svc_handle_t FUNC_PTR64* const ph_mad_svc )
+ OUT ib_mad_svc_handle_t * const ph_mad_svc )
{
ib_api_status_t status;
@@ -1593,7 +1593,7 @@
ib_api_status_t
ib_join_mcast(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mcast_req_t* const p_mcast_req )
{
ib_api_status_t status;
@@ -1624,7 +1624,7 @@
*/
ib_api_status_t
ib_post_send(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t **pp_send_failure OPTIONAL )
{
@@ -1660,7 +1660,7 @@
ib_api_status_t
ud_post_send(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t **pp_send_failure )
{
@@ -1682,7 +1682,7 @@
/* Restore all AV handles. */
for( p_wr = p_send_wr; p_wr; p_wr = p_wr->p_next )
- p_wr->dgrm.ud.h_av = (ib_av_handle_t VOID_PTR64)p_wr->dgrm.ud.rsvd;
+ p_wr->dgrm.ud.h_av = (ib_av_handle_t )p_wr->dgrm.ud.rsvd;
return status;
}
@@ -1697,7 +1697,7 @@
*/
void
special_qp_queue_mad(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN al_mad_wr_t* const p_mad_wr )
{
al_special_qp_t* p_special_qp;
@@ -1717,7 +1717,7 @@
void
special_qp_resume_sends(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN const ib_qp_handle_t h_qp )
{
al_special_qp_t* p_special_qp;
cl_list_item_t* p_list_item;
@@ -1753,7 +1753,7 @@
void
mad_qp_queue_mad(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN al_mad_wr_t* const p_mad_wr )
{
al_mad_qp_t *p_mad_qp;
@@ -1771,7 +1771,7 @@
void
mad_qp_resume_sends(
- IN ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN ib_qp_handle_t h_qp )
{
al_mad_qp_t *p_mad_qp;
cl_list_item_t* p_list_item;
@@ -1839,7 +1839,7 @@
ib_api_status_t
ib_post_recv(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_recv_failure OPTIONAL )
{
@@ -1926,7 +1926,7 @@
void
mad_recv_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
al_mad_qp_t *p_mad_qp;
@@ -1942,7 +1942,7 @@
void
mad_send_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
al_mad_qp_t *p_mad_qp;
@@ -1962,7 +1962,7 @@
void
mad_qp_comp(
IN al_mad_qp_t* p_mad_qp,
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN ib_wc_type_t wc_type )
{
ib_wc_t wc;
@@ -2062,7 +2062,7 @@
if( p_event_rec->code == IB_AE_SQ_DRAINED )
return;
- p_mad_qp = (al_mad_qp_t* VOID_PTR64)p_event_rec->context;
+ p_mad_qp = (al_mad_qp_t* )p_event_rec->context;
/* Nothing to do here. */
}
@@ -2076,10 +2076,10 @@
qp_async_event_cb(
IN ib_async_event_rec_t* const p_event_rec )
{
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
CL_ASSERT( p_event_rec );
- h_qp = (ib_qp_handle_t VOID_PTR64)p_event_rec->context;
+ h_qp = (ib_qp_handle_t )p_event_rec->context;
#if defined(CL_KERNEL)
switch( p_event_rec->code )
@@ -2112,12 +2112,12 @@
ib_api_status_t
ib_bind_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_mw_handle_t h_mw,
+ IN const ib_qp_handle_t h_qp,
IN ib_bind_wr_t * const p_mw_bind,
OUT net32_t * const p_rkey )
{
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
ib_api_status_t status;
AL_ENTER( AL_DBG_MW );
Index: core/al/al_qp.h
===================================================================
--- core/al/al_qp.h (revision 1094)
+++ core/al/al_qp.h (working copy)
@@ -50,54 +50,54 @@
typedef ib_api_status_t
(*ib_pfn_modify_qp_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod,
IN OUT ci_umv_buf_t* const p_umv_buf );
typedef ib_api_status_t
(*ib_pfn_post_send_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr,
IN ib_send_wr_t **pp_send_failure OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_post_recv_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_recv_wr_t* const p_recv_wr,
IN ib_recv_wr_t **p_recv_failure OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_init_dgrm_svc_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_dgrm_info_t* const p_dgrm_info );
typedef ib_api_status_t
(*ib_pfn_reg_mad_svc_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mad_svc_t* const p_mad_svc,
- OUT ib_mad_svc_handle_t FUNC_PTR64* const ph_mad_svc );
+ OUT ib_mad_svc_handle_t * const ph_mad_svc );
typedef ib_api_status_t
(*ib_pfn_dereg_mad_svc_t)(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc );
+ IN const ib_mad_svc_handle_t h_mad_svc );
typedef void
(*ib_pfn_queue_mad_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN al_mad_wr_t* const p_mad_wr );
typedef void
(*ib_pfn_resume_mad_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp );
+ IN const ib_qp_handle_t h_qp );
typedef ib_api_status_t
(*ib_pfn_join_mcast_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mcast_req_t* const p_mcast_req );
typedef ib_api_status_t
(*ib_pfn_leave_mcast_t)(
- IN const ib_mcast_handle_t FUNC_PTR64 h_mcast );
+ IN const ib_mcast_handle_t h_mcast );
/*
@@ -242,42 +242,42 @@
ib_api_status_t
create_qp(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_qp_create_t* const p_qp_create,
IN const void* const qp_context,
IN const ib_pfn_event_cb_t pfn_qp_event_cb,
- OUT ib_qp_handle_t FUNC_PTR64* const ph_qp,
+ OUT ib_qp_handle_t * const ph_qp,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
query_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
OUT ib_qp_attr_t* const p_qp_attr,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
modify_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
get_spl_qp(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid,
IN const ib_qp_create_t* const p_qp_create,
IN const void* const qp_context,
IN const ib_pfn_event_cb_t pfn_qp_event_cb,
- OUT ib_pool_key_t FUNC_PTR64* const p_pool_key OPTIONAL,
- OUT ib_qp_handle_t FUNC_PTR64* const ph_qp,
+ OUT ib_pool_key_t * const p_pool_key OPTIONAL,
+ OUT ib_qp_handle_t * const ph_qp,
IN OUT ci_umv_buf_t* const p_umv_buf );
-ib_mad_send_handle_t FUNC_PTR64
+ib_mad_send_handle_t
get_send_mad_wp(
IN const al_qp_alias_t *p_qp_alias );
@@ -286,17 +286,17 @@
void
put_send_mad_wp(
IN const al_qp_alias_t *p_qp_alias,
- IN const ib_mad_send_handle_t FUNC_PTR64 h_send_mad );
+ IN const ib_mad_send_handle_t h_send_mad );
void
special_qp_resume_sends(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp );
+ IN const ib_qp_handle_t h_qp );
void
special_qp_queue_mad(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN al_mad_wr_t* const p_mad_wr );
@@ -306,9 +306,9 @@
/* Return the AL instance associated with this QP. */
-static inline ib_al_handle_t FUNC_PTR64
+static inline ib_al_handle_t
qp_get_al(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN const ib_qp_handle_t h_qp )
{
return h_qp->obj.h_al;
}
Index: core/al/al_query.c
===================================================================
--- core/al/al_query.c (revision 1094)
+++ core/al/al_query.c (working copy)
@@ -66,9 +66,9 @@
ib_api_status_t
ib_query(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_query_req_t* const p_query_req,
- OUT ib_query_handle_t FUNC_PTR64* const ph_query OPTIONAL )
+ OUT ib_query_handle_t * const ph_query OPTIONAL )
{
al_query_t *p_query;
ib_api_status_t status;
@@ -166,7 +166,7 @@
{
case IB_QUERY_USER_DEFINED:
AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_QUERY, ("USER_DEFINED\n") );
- p_sa_req = (ib_user_query_t* VOID_PTR64)p_query_req->p_query_input;
+ p_sa_req = (ib_user_query_t* )p_query_req->p_query_input;
if( !p_sa_req->method )
{
AL_EXIT( AL_DBG_QUERY );
@@ -198,7 +198,7 @@
sa_req.attr_size = sizeof( ib_service_record_t );
sa_req.comp_mask = IB_SR_COMPMASK_SID;
sa_req.p_attr = &rec.svc;
- rec.svc.service_id = *(ib_net64_t* VOID_PTR64)(p_query_req->p_query_input);
+ rec.svc.service_id = *(ib_net64_t* )(p_query_req->p_query_input);
break;
case IB_QUERY_CLASS_PORT_INFO:
@@ -222,7 +222,7 @@
sa_req.comp_mask = IB_NR_COMPMASK_NODEGUID;
sa_req.p_attr = &rec.node;
rec.node.node_info.node_guid =
- *(ib_net64_t* VOID_PTR64)(p_query_req->p_query_input);
+ *(ib_net64_t* )(p_query_req->p_query_input);
break;
case IB_QUERY_PORT_REC_BY_LID:
@@ -232,7 +232,7 @@
sa_req.comp_mask = IB_PIR_COMPMASK_BASELID;
sa_req.p_attr = &rec.portinfo;
rec.portinfo.port_info.base_lid =
- *(ib_net16_t* VOID_PTR64)(p_query_req->p_query_input);
+ *(ib_net16_t* )(p_query_req->p_query_input);
break;
case IB_QUERY_PATH_REC_BY_PORT_GUIDS:
@@ -242,9 +242,9 @@
sa_req.comp_mask = (IB_PR_COMPMASK_DGID |
IB_PR_COMPMASK_SGID | IB_PR_COMPMASK_NUM_PATH);
sa_req.p_attr = &rec.path;
- ib_gid_set_default( &rec.path.dgid, ((ib_guid_pair_t* VOID_PTR64)
+ ib_gid_set_default( &rec.path.dgid, ((ib_guid_pair_t* )
(p_query_req->p_query_input))->dest_guid );
- ib_gid_set_default( &rec.path.sgid, ((ib_guid_pair_t* VOID_PTR64)
+ ib_gid_set_default( &rec.path.sgid, ((ib_guid_pair_t* )
(p_query_req->p_query_input))->src_guid );
rec.path.num_path = 1;
break;
@@ -256,9 +256,9 @@
sa_req.comp_mask = (IB_PR_COMPMASK_DGID |
IB_PR_COMPMASK_SGID | IB_PR_COMPMASK_NUM_PATH);
sa_req.p_attr = &rec.path;
- cl_memcpy( &rec.path.dgid, &((ib_gid_pair_t* VOID_PTR64)
+ cl_memcpy( &rec.path.dgid, &((ib_gid_pair_t* )
(p_query_req->p_query_input))->dest_gid, sizeof( ib_gid_t ) );
- cl_memcpy( &rec.path.sgid, &((ib_gid_pair_t* VOID_PTR64)
+ cl_memcpy( &rec.path.sgid, &((ib_gid_pair_t* )
(p_query_req->p_query_input))->src_gid, sizeof( ib_gid_t ) );
rec.path.num_path = 1;
break;
@@ -273,9 +273,9 @@
(IB_PR_COMPMASK_DLID | IB_PR_COMPMASK_SLID);
sa_req.p_attr = &rec.path;
rec.path.dlid =
- ((ib_lid_pair_t* VOID_PTR64)(p_query_req->p_query_input))->dest_lid;
+ ((ib_lid_pair_t* )(p_query_req->p_query_input))->dest_lid;
rec.path.slid =
- ((ib_lid_pair_t* VOID_PTR64)(p_query_req->p_query_input))->src_lid;
+ ((ib_lid_pair_t* )(p_query_req->p_query_input))->src_lid;
#ifdef PR102982
rec.path.num_path = 1;
#endif
Index: core/al/al_reg_svc.c
===================================================================
--- core/al/al_reg_svc.c (revision 1094)
+++ core/al/al_reg_svc.c (working copy)
@@ -257,7 +257,7 @@
ib_api_status_t
ib_reg_svc(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_reg_svc_req_t* const p_reg_svc_req,
OUT ib_reg_svc_handle_t* const ph_reg_svc )
{
Index: core/al/al_res_mgr.c
===================================================================
--- core/al/al_res_mgr.c (revision 1094)
+++ core/al/al_res_mgr.c (working copy)
@@ -163,7 +163,7 @@
/*
* Get a memory region structure to track registration requests.
*/
-struct _ib_mr* VOID_PTR64
+struct _ib_mr*
alloc_mr()
{
al_obj_t *p_obj;
@@ -197,7 +197,7 @@
*/
void
put_mr(
- IN struct _ib_mr* FUNC_PTR64 h_mr )
+ IN struct _ib_mr* h_mr )
{
cl_spinlock_acquire( &gp_res_mgr->obj.lock );
cl_qpool_put( &gp_res_mgr->mr_pool, &h_mr->obj.pool_item );
@@ -210,7 +210,7 @@
/*
* Get a fast memory region structure to track registration requests.
*/
-mlnx_fmr_handle_t VOID_PTR64
+mlnx_fmr_handle_t
alloc_mlnx_fmr()
{
al_obj_t *p_obj;
@@ -244,7 +244,7 @@
*/
void
put_mlnx_fmr(
- IN mlnx_fmr_handle_t FUNC_PTR64 h_fmr )
+ IN mlnx_fmr_handle_t h_fmr )
{
cl_spinlock_acquire( &gp_res_mgr->obj.lock );
cl_qpool_put( &gp_res_mgr->fmr_pool, &h_fmr->obj.pool_item );
@@ -257,7 +257,7 @@
/*
* Get an address vector from the available pool.
*/
-ib_av_handle_t VOID_PTR64
+ib_av_handle_t
alloc_av()
{
al_obj_t *p_obj;
@@ -290,7 +290,7 @@
*/
void
put_av(
- IN ib_av_handle_t FUNC_PTR64 h_av )
+ IN ib_av_handle_t h_av )
{
cl_spinlock_acquire( &gp_res_mgr->obj.lock );
cl_qpool_put( &gp_res_mgr->av_pool, &h_av->obj.pool_item );
Index: core/al/al_res_mgr.h
===================================================================
--- core/al/al_res_mgr.h (revision 1094)
+++ core/al/al_res_mgr.h (working copy)
@@ -67,31 +67,31 @@
IN al_obj_t *p_parent_obj );
-struct _ib_mr* FUNC_PTR64
+struct _ib_mr*
alloc_mr(void);
void
put_mr(
- IN struct _ib_mr* FUNC_PTR64 h_mr );
+ IN struct _ib_mr* h_mr );
#ifdef CL_KERNEL
-mlnx_fmr_handle_t FUNC_PTR64
+mlnx_fmr_handle_t
alloc_mlnx_fmr(void);
void
put_mlnx_fmr(
- IN mlnx_fmr_handle_t FUNC_PTR64 h_fmr );
+ IN mlnx_fmr_handle_t h_fmr );
#endif
-ib_av_handle_t FUNC_PTR64
+ib_av_handle_t
alloc_av(void);
void
put_av(
- IN ib_av_handle_t FUNC_PTR64 h_av );
+ IN ib_av_handle_t h_av );
#endif /* __AL_RES_MGR_H__ */
Index: core/al/al_srq.c
===================================================================
--- core/al/al_srq.c (revision 1094)
+++ core/al/al_srq.c (working copy)
@@ -68,7 +68,7 @@
ib_destroy_srq(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL )
{
AL_ENTER( AL_DBG_SRQ );
@@ -101,10 +101,10 @@
destroying_srq(
IN struct _al_obj *p_obj )
{
- ib_srq_handle_t VOID_PTR64 h_srq;
+ ib_srq_handle_t h_srq;
cl_list_item_t *p_item;
cl_obj_rel_t *p_rel;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
CL_ASSERT( p_obj );
h_srq = PARENT_STRUCT( p_obj, ib_srq_t, obj );
@@ -117,7 +117,7 @@
{
p_rel = PARENT_STRUCT( p_item, cl_obj_rel_t, pool_item.list_item );
p_rel->p_parent_obj = NULL;
- h_qp = (ib_qp_handle_t VOID_PTR64)p_rel->p_child_obj;
+ h_qp = (ib_qp_handle_t )p_rel->p_child_obj;
if( h_qp )
{
/* Take a reference to prevent the QP from being destroyed. */
@@ -134,7 +134,7 @@
cleanup_srq(
IN struct _al_obj *p_obj )
{
- ib_srq_handle_t VOID_PTR64 h_srq;
+ ib_srq_handle_t h_srq;
ib_api_status_t status;
CL_ASSERT( p_obj );
@@ -156,7 +156,7 @@
free_srq(
IN al_obj_t *p_obj )
{
- ib_srq_handle_t VOID_PTR64 h_srq;
+ ib_srq_handle_t h_srq;
CL_ASSERT( p_obj );
h_srq = PARENT_STRUCT( p_obj, ib_srq_t, obj );
@@ -168,7 +168,7 @@
void
srq_attach_qp(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN cl_obj_rel_t* const p_qp_rel )
{
p_qp_rel->p_parent_obj = (cl_obj_t*)h_srq;
@@ -181,7 +181,7 @@
void
srq_detach_qp(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN cl_obj_rel_t* const p_qp_rel )
{
if( p_qp_rel->p_parent_obj )
@@ -197,7 +197,7 @@
ib_api_status_t
ib_modify_srq(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr,
IN const ib_srq_attr_mask_t srq_attr_mask )
{
@@ -207,7 +207,7 @@
ib_api_status_t
modify_srq(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr,
IN const ib_srq_attr_mask_t srq_attr_mask,
IN OUT ci_umv_buf_t* const p_umv_buf )
@@ -269,7 +269,7 @@
ib_api_status_t
ib_query_srq(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
OUT ib_srq_attr_t* const p_srq_attr )
{
return query_srq( h_srq, p_srq_attr, NULL );
@@ -279,7 +279,7 @@
ib_api_status_t
query_srq(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
OUT ib_srq_attr_t* const p_srq_attr,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
@@ -310,14 +310,14 @@
*/
ib_api_status_t
create_srq(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_srq_attr_t* const p_srq_attr,
IN const void* const srq_context,
IN const ib_pfn_event_cb_t pfn_srq_event_cb,
- OUT ib_srq_handle_t FUNC_PTR64* const ph_srq,
+ OUT ib_srq_handle_t * const ph_srq,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
- ib_srq_handle_t VOID_PTR64 h_srq;
+ ib_srq_handle_t h_srq;
ib_api_status_t status;
al_obj_type_t obj_type = AL_OBJ_TYPE_H_SRQ;
@@ -376,10 +376,10 @@
srq_async_event_cb(
IN ib_async_event_rec_t* const p_event_rec )
{
- ib_srq_handle_t VOID_PTR64 h_srq;
+ ib_srq_handle_t h_srq;
CL_ASSERT( p_event_rec );
- h_srq = (ib_srq_handle_t VOID_PTR64)p_event_rec->context;
+ h_srq = (ib_srq_handle_t )p_event_rec->context;
#if defined(CL_KERNEL)
switch( p_event_rec->code )
@@ -408,7 +408,7 @@
ib_api_status_t
ib_post_srq_recv(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_recv_failure OPTIONAL )
{
Index: core/al/al_srq.h
===================================================================
--- core/al/al_srq.h (revision 1094)
+++ core/al/al_srq.h (working copy)
@@ -44,7 +44,7 @@
typedef ib_api_status_t
(*ib_pfn_post_srq_recv_t)(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN ib_recv_wr_t* const p_recv_wr,
IN ib_recv_wr_t **p_recv_failure OPTIONAL );
@@ -67,24 +67,24 @@
ib_api_status_t
create_srq(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_srq_attr_t* const p_srq_attr,
IN const void* const srq_context,
IN const ib_pfn_event_cb_t pfn_srq_event_cb,
- OUT ib_srq_handle_t FUNC_PTR64* const ph_srq,
+ OUT ib_srq_handle_t * const ph_srq,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
query_srq(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
OUT ib_srq_attr_t* const p_srq_attr,
IN OUT ci_umv_buf_t* const p_umv_buf );
ib_api_status_t
modify_srq(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr,
IN const ib_srq_attr_mask_t srq_attr_mask,
IN OUT ci_umv_buf_t* const p_umv_buf );
@@ -96,12 +96,12 @@
void
srq_attach_qp(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN cl_obj_rel_t* const p_qp_rel );
void
srq_detach_qp(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN cl_obj_rel_t* const p_qp_rel );
#endif /* __AL_QP_H__ */
Index: core/al/al_sub.c
===================================================================
--- core/al/al_sub.c (revision 1094)
+++ core/al/al_sub.c (working copy)
@@ -46,9 +46,9 @@
ib_api_status_t
ib_subscribe(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_sub_req_t* const p_sub_req,
- OUT ib_sub_handle_t FUNC_PTR64* const ph_sub )
+ OUT ib_sub_handle_t* const ph_sub )
{
ib_api_status_t status;
@@ -74,7 +74,7 @@
ib_api_status_t
ib_unsubscribe(
- IN const ib_sub_handle_t FUNC_PTR64 h_sub,
+ IN const ib_sub_handle_t h_sub,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL )
{
AL_ENTER( AL_DBG_SUB );
Index: core/al/al_verbs.h
===================================================================
--- core/al/al_verbs.h (revision 1094)
+++ core/al/al_verbs.h (working copy)
@@ -74,9 +74,9 @@
static inline ib_api_status_t
verbs_create_cq(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN OUT ib_cq_create_t* const p_cq_create,
- IN ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN ib_cq_handle_t h_cq,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
return h_ca->obj.p_ci_ca->verbs.create_cq(
@@ -195,8 +195,8 @@
static inline ib_api_status_t
verbs_allocate_pd(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
- IN ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_ca_handle_t h_ca,
+ IN ib_pd_handle_t h_pd,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
return h_ca->obj.p_ci_ca->verbs.allocate_pd(
@@ -209,8 +209,8 @@
*/
static inline ib_api_status_t
allocate_pd_alias(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd )
+ IN const ib_ca_handle_t h_ca,
+ IN const ib_pd_handle_t h_pd )
{
UNUSED_PARAM( h_ca );
h_pd->h_ci_pd = h_pd->obj.p_ci_ca->h_pd->h_ci_pd;
@@ -220,7 +220,7 @@
static inline void
deallocate_pd_alias(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd )
+ IN const ib_pd_handle_t h_pd )
{
deref_al_obj( &h_pd->obj.p_ci_ca->h_pd->obj );
}
@@ -233,8 +233,8 @@
static inline ib_api_status_t
verbs_create_srq(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- IN ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_pd_handle_t h_pd,
+ IN ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
@@ -277,9 +277,9 @@
static inline ib_api_status_t
verbs_get_spl_qp(
- IN ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN ib_pd_handle_t h_pd,
IN uint8_t port_num,
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_qp_handle_t h_qp,
IN ib_qp_create_t *p_qp_create,
IN ib_qp_attr_t *p_qp_attr )
{
@@ -300,8 +300,8 @@
static inline ib_api_status_t
verbs_create_qp(
- IN ib_pd_handle_t FUNC_PTR64 h_pd,
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_pd_handle_t h_pd,
+ IN ib_qp_handle_t h_qp,
IN ib_qp_create_t *p_qp_create,
IN ib_qp_attr_t *p_qp_attr,
IN OUT ci_umv_buf_t* const p_umv_buf )
@@ -367,7 +367,7 @@
#define verbs_attach_mcast(h_mcast) \
h_mcast->obj.p_ci_ca->verbs.attach_mcast( \
- ((ib_qp_handle_t VOID_PTR64)h_mcast->obj.p_parent_obj)->h_ci_qp, &h_mcast->member_rec.mgid, \
+ ((ib_qp_handle_t )h_mcast->obj.p_parent_obj)->h_ci_qp, &h_mcast->member_rec.mgid, \
h_mcast->member_rec.mlid, &h_mcast->h_ci_mcast, \
NULL)
@@ -377,8 +377,8 @@
static inline ib_api_status_t
verbs_ci_call(
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const void* FUNC_PTR64 * const handle_array OPTIONAL,
+ IN ib_ca_handle_t h_ca,
+ IN const void* * const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN ci_umv_buf_t* const p_umv_buf OPTIONAL )
@@ -402,7 +402,7 @@
#define verbs_check_av(h_av) ((h_av)->h_ci_av || (h_av)->obj.hdl)
#define convert_av_handle(h_qp, h_av) \
- ((h_qp)->h_ci_qp?(h_av)->h_ci_av:(ib_av_handle_t VOID_PTR64)(h_av)->obj.hdl)
+ ((h_qp)->h_ci_qp?(h_av)->h_ci_av:(ib_av_handle_t )(h_av)->obj.hdl)
#define verbs_destroy_av(h_av) \
ual_destroy_av(h_av)
@@ -423,9 +423,9 @@
static inline ib_api_status_t
verbs_create_cq(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN OUT ib_cq_create_t* const p_cq_create,
- IN ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN ib_cq_handle_t h_cq,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
UNUSED_PARAM( p_umv_buf );
@@ -522,8 +522,8 @@
static inline ib_api_status_t
verbs_allocate_pd(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
- IN ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_ca_handle_t h_ca,
+ IN ib_pd_handle_t h_pd,
IN OUT ci_umv_buf_t* const p_umv_buf )
{
UNUSED_PARAM( p_umv_buf );
@@ -535,8 +535,8 @@
*/
static inline ib_api_status_t
allocate_pd_alias(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd )
+ IN const ib_ca_handle_t h_ca,
+ IN const ib_pd_handle_t h_pd )
{
return ual_allocate_pd( h_ca, h_pd->type, h_pd );
}
@@ -600,7 +600,7 @@
static inline ib_api_status_t
verbs_local_mad(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_av_attr_t* p_src_av_attr,
IN const void* const p_mad_in,
Index: core/al/ib_common.c
===================================================================
--- core/al/ib_common.c (revision 1094)
+++ core/al/ib_common.c (working copy)
@@ -98,19 +98,19 @@
/* Fix up the pointers to point within the destination buffer. */
p_dest->p_page_size =
- (uint32_t* VOID_PTR64)(((uint8_t* VOID_PTR64)p_dest->p_page_size) + offset);
+ (uint32_t* )(((uint8_t* )p_dest->p_page_size) + offset);
p_tmp_port_attr =
- (ib_port_attr_t* VOID_PTR64)(((uint8_t* VOID_PTR64)p_dest->p_port_attr) + offset);
+ (ib_port_attr_t* )(((uint8_t* )p_dest->p_port_attr) + offset);
/* Fix up each port attribute's gid and pkey table pointers. */
for( i = 0; i < p_dest->num_ports; i++ )
{
- p_tmp_port_attr[i].p_gid_table = (ib_gid_t* VOID_PTR64)
- (((uint8_t* VOID_PTR64)p_tmp_port_attr[i].p_gid_table) + offset);
+ p_tmp_port_attr[i].p_gid_table = (ib_gid_t* )
+ (((uint8_t* )p_tmp_port_attr[i].p_gid_table) + offset);
- p_tmp_port_attr[i].p_pkey_table =(ib_net16_t* VOID_PTR64)
- (((uint8_t* VOID_PTR64)p_tmp_port_attr[i].p_pkey_table) + offset);
+ p_tmp_port_attr[i].p_pkey_table =(ib_net16_t* )
+ (((uint8_t* )p_tmp_port_attr[i].p_pkey_table) + offset);
}
p_dest->p_port_attr = p_tmp_port_attr;
}
Index: core/al/kernel/al_ci_ca.c
===================================================================
--- core/al/kernel/al_ci_ca.c (revision 1094)
+++ core/al/kernel/al_ci_ca.c (working copy)
@@ -320,7 +320,7 @@
ci_ca_comp_cb(
IN void *cq_context )
{
- ib_cq_handle_t VOID_PTR64 h_cq = (ib_cq_handle_t VOID_PTR64)cq_context;
+ ib_cq_handle_t h_cq = (ib_cq_handle_t )cq_context;
if( h_cq->h_wait_obj )
KeSetEvent( h_cq->h_wait_obj, IO_NETWORK_INCREMENT, FALSE );
@@ -441,8 +441,8 @@
ib_api_status_t
ib_ci_call(
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const void* FUNC_PTR64 * const handle_array OPTIONAL,
+ IN ib_ca_handle_t h_ca,
+ IN const void* * const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op )
{
@@ -453,13 +453,13 @@
ib_api_status_t
ci_call(
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const void* FUNC_PTR64 * const handle_array OPTIONAL,
+ IN ib_ca_handle_t h_ca,
+ IN const void* * const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN ci_umv_buf_t* const p_umv_buf OPTIONAL )
{
- void* VOID_PTR64 * p_handle_array;
+ void* * p_handle_array;
ib_api_status_t status;
AL_ENTER( AL_DBG_CA );
@@ -477,7 +477,7 @@
p_handle_array = NULL;
if ( num_handles )
{
- p_handle_array = cl_zalloc( sizeof(void* VOID_PTR64) * num_handles );
+ p_handle_array = cl_zalloc( sizeof(void* ) * num_handles );
if( !p_handle_array )
return IB_INSUFFICIENT_MEMORY;
@@ -511,7 +511,7 @@
DEVICE_OBJECT*
get_ca_dev(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca )
+ IN const ib_ca_handle_t h_ca )
{
ASSERT( h_ca );
Index: core/al/kernel/al_cm_cep.c
===================================================================
--- core/al/kernel/al_cm_cep.c (revision 1094)
+++ core/al/kernel/al_cm_cep.c (working copy)
@@ -111,7 +111,7 @@
cl_timer_t timewait_timer;
cl_qlist_t timewait_list;
- ib_pnp_handle_t VOID_PTR64 h_pnp;
+ ib_pnp_handle_t h_pnp;
} al_cep_mgr_t;
@@ -123,11 +123,11 @@
cl_map_item_t item;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_pd_handle_t VOID_PTR64 h_pd;
- ib_qp_handle_t VOID_PTR64 h_qp;
- ib_pool_key_t VOID_PTR64 pool_key;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_ca_handle_t h_ca;
+ ib_pd_handle_t h_pd;
+ ib_qp_handle_t h_qp;
+ ib_pool_key_t pool_key;
+ ib_mad_svc_handle_t h_mad_svc;
net64_t port_guid;
uint8_t port_num;
@@ -328,7 +328,7 @@
* problem since all outstanding sends should be completed before the
* mad service completes its destruction and the handle becomes invalid.
*/
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
ib_mad_element_t *p_send_mad;
/* Number of outstanding MADs. Delays destruction of CEP destruction. */
@@ -382,7 +382,7 @@
typedef struct _cep_cid
{
/* Owning AL handle. NULL if invalid. */
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
/* Pointer to CEP, or index of next free entry if h_al is NULL. */
kcep_t *p_cep;
/* For REJ Retry support */
@@ -433,9 +433,9 @@
static inline void
__bind_cep(
IN kcep_t* const p_cep,
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN al_pfn_cep_cb_t pfn_cb,
- IN void* FUNC_PTR64 context );
+ IN void* context );
static inline void
__unbind_cep(
@@ -458,7 +458,7 @@
static inline kcep_t*
__lookup_cep(
- IN ib_al_handle_t FUNC_PTR64 h_al OPTIONAL,
+ IN ib_al_handle_t h_al OPTIONAL,
IN net32_t cid );
static inline kcep_t*
@@ -1963,7 +1963,7 @@
static void
__cep_mad_recv_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void *context,
IN ib_mad_element_t *p_mad )
{
@@ -2177,7 +2177,7 @@
static void
__cep_mad_send_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void *context,
IN ib_mad_element_t *p_mad )
{
@@ -2196,7 +2196,7 @@
p_port_cep = (cep_agent_t*)context;
- p_cep = (kcep_t* VOID_PTR64)p_mad->context1;
+ p_cep = (kcep_t* )p_mad->context1;
/*
* The connection context is not set when performing immediate responses,
@@ -2592,7 +2592,7 @@
static inline kcep_t*
__lookup_cep(
- IN ib_al_handle_t FUNC_PTR64 h_al OPTIONAL,
+ IN ib_al_handle_t h_al OPTIONAL,
IN net32_t cid )
{
size_t idx;
@@ -3022,9 +3022,9 @@
CL_ASSERT( p_pnp_rec->context );
/* Destroy the port agent. */
- ref_al_obj( &((cep_agent_t* VOID_PTR64)p_pnp_rec->context)->obj );
- ((cep_agent_t* VOID_PTR64)p_pnp_rec->context)->obj.pfn_destroy(
- &((cep_agent_t* VOID_PTR64)p_pnp_rec->context)->obj, NULL );
+ ref_al_obj( &((cep_agent_t* )p_pnp_rec->context)->obj );
+ ((cep_agent_t* )p_pnp_rec->context)->obj.pfn_destroy(
+ &((cep_agent_t* )p_pnp_rec->context)->obj, NULL );
break;
default:
@@ -3371,7 +3371,7 @@
{
NTSTATUS nt_status;
net32_t* p_new_cid = (net32_t*)cl_ioctl_out_buf( p_irp );
- kcep_t* p_cep = (kcep_t* VOID_PTR64)p_mad->send_context1;
+ kcep_t* p_cep = (kcep_t* )p_mad->send_context1;
*p_new_cid = p_cep->cid;
nt_status = STATUS_SUCCESS;
@@ -3383,7 +3383,7 @@
static ib_api_status_t
__cep_set_pdata(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN uint8_t psize,
IN uint8_t* pdata )
@@ -3450,7 +3450,7 @@
/* get a pending IRP */
if ( !IsListEmpty( &p_cep->irp_que ) )
{
- kcep_t* p_new_cep = (kcep_t* VOID_PTR64)p_mad->send_context1;
+ kcep_t* p_new_cep = (kcep_t* )p_mad->send_context1;
// get IRP
p_list_entry = RemoveHeadList( &p_cep->irp_que );
@@ -3458,12 +3458,12 @@
// store REQ private data
__cep_set_pdata(
- (ib_al_handle_t VOID_PTR64)p_irp->Tail.Overlay.DriverContext[1],
+ (ib_al_handle_t )p_irp->Tail.Overlay.DriverContext[1],
p_new_cep->cid, sizeof(p_req->pdata), (uint8_t*)p_req->pdata );
AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,
("set %d of REQ pdata to CEP with cid %d, h_al %p\n",
sizeof(p_req->pdata), p_new_cep->cid,
- (ib_al_handle_t VOID_PTR64)p_irp->Tail.Overlay.DriverContext[1] ));
+ (ib_al_handle_t )p_irp->Tail.Overlay.DriverContext[1] ));
// complete GetConnectionReq IRP
#pragma warning(push, 3)
@@ -3660,9 +3660,9 @@
static inline void
__bind_cep(
IN kcep_t* const p_cep,
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN al_pfn_cep_cb_t pfn_cb,
- IN void* FUNC_PTR64 context )
+ IN void* context )
{
CL_ASSERT( p_cep );
CL_ASSERT( p_cep->p_cid );
@@ -3958,7 +3958,7 @@
p_mad->p_next = NULL;
if( p_mad->send_context1 )
{
- p_new_cep = (kcep_t* VOID_PTR64)p_mad->send_context1;
+ p_new_cep = (kcep_t* )p_mad->send_context1;
__unbind_cep( p_new_cep );
__cleanup_cep( p_new_cep );
@@ -4086,9 +4086,9 @@
ib_api_status_t
al_create_cep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN al_pfn_cep_cb_t pfn_cb,
- IN void* FUNC_PTR64 context,
+ IN void* context,
OUT net32_t* const p_cid )
{
kcep_t *p_cep;
@@ -4123,7 +4123,7 @@
ib_api_status_t
al_destroy_cep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN ib_pfn_destroy_cb_t pfn_destroy_cb )
{
@@ -4178,7 +4178,7 @@
ib_api_status_t
al_cep_listen(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN ib_cep_listen_t* const p_listen_info )
{
@@ -4665,7 +4665,7 @@
ib_api_status_t
al_cep_pre_req(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_req_t* const p_cm_req,
OUT ib_qp_mod_t* const p_init )
@@ -4752,7 +4752,7 @@
ib_api_status_t
al_cep_send_req(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid )
{
ib_api_status_t status;
@@ -4925,7 +4925,7 @@
ib_api_status_t
__al_cep_pre_rep(
IN kcep_t *p_cep,
- IN void* FUNC_PTR64 context,
+ IN void* context,
IN const ib_cm_rep_t* const p_cm_rep,
OUT ib_qp_mod_t* const p_init )
{
@@ -4990,9 +4990,9 @@
ib_api_status_t
al_cep_pre_rep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
- IN void* FUNC_PTR64 context,
+ IN void* context,
IN const ib_cm_rep_t* const p_cm_rep,
OUT ib_qp_mod_t* const p_init )
{
@@ -5025,10 +5025,10 @@
ib_api_status_t
al_cep_pre_rep_ex(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN al_pfn_cep_cb_t pfn_cb,
- IN void* FUNC_PTR64 context,
+ IN void* context,
IN const ib_cm_rep_t* const p_cm_rep,
OUT ib_qp_mod_t* const p_init )
{
@@ -5065,7 +5065,7 @@
ib_api_status_t
al_cep_send_rep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid )
{
ib_api_status_t status;
@@ -5156,7 +5156,7 @@
ib_api_status_t
al_cep_rtu(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const uint8_t* p_pdata OPTIONAL,
IN uint8_t pdata_len )
@@ -5218,7 +5218,7 @@
ib_api_status_t
al_cep_rej(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN ib_rej_status_t rej_status,
IN const uint8_t* const p_ari,
@@ -5312,7 +5312,7 @@
ib_api_status_t
al_cep_mra(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_mra_t* const p_cm_mra )
{
@@ -5450,7 +5450,7 @@
ib_api_status_t
al_cep_lap(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_lap_t* const p_cm_lap )
{
@@ -5581,7 +5581,7 @@
ib_api_status_t
al_cep_pre_apr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_apr_t* const p_cm_apr,
OUT ib_qp_mod_t* const p_apr )
@@ -5671,7 +5671,7 @@
ib_api_status_t
al_cep_send_apr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid )
{
ib_api_status_t status;
@@ -5727,7 +5727,7 @@
ib_api_status_t
al_cep_dreq(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const uint8_t* const p_pdata,
IN const uint8_t pdata_len )
@@ -5797,7 +5797,7 @@
ib_api_status_t
al_cep_drep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_drep_t* const p_cm_drep )
{
@@ -5852,7 +5852,7 @@
ib_api_status_t
al_cep_migrate(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid )
{
ib_api_status_t status;
@@ -5904,7 +5904,7 @@
ib_api_status_t
al_cep_established(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid )
{
ib_api_status_t status;
@@ -5949,7 +5949,7 @@
ib_api_status_t
al_cep_get_rtr_attr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
OUT ib_qp_mod_t* const p_rtr )
{
@@ -6015,7 +6015,7 @@
ib_api_status_t
al_cep_get_rts_attr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
OUT ib_qp_mod_t* const p_rts )
{
@@ -6090,7 +6090,7 @@
ib_api_status_t
al_cep_get_timewait(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
OUT uint64_t* const p_timewait_us )
{
@@ -6119,9 +6119,9 @@
ib_api_status_t
al_cep_poll(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
- OUT void* FUNC_PTR64 * p_context,
+ OUT void* * p_context,
OUT net32_t* const p_new_cid,
OUT ib_mad_element_t** const pp_mad )
{
@@ -6159,7 +6159,7 @@
(*pp_mad)->p_next = NULL;
/* We're done with the input CEP. Reuse the variable */
- p_cep = (kcep_t* VOID_PTR64)(*pp_mad)->send_context1;
+ p_cep = (kcep_t* )(*pp_mad)->send_context1;
if( p_cep )
*p_new_cid = p_cep->cid;
else
@@ -6180,7 +6180,7 @@
IN IRP* p_irp )
{
net32_t cid;
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
KLOCK_QUEUE_HANDLE hdl;
kcep_t *p_cep;
@@ -6190,7 +6190,7 @@
CL_ASSERT( p_irp );
cid = (net32_t)(size_t)p_irp->Tail.Overlay.DriverContext[0];
- h_al = (ib_al_handle_t VOID_PTR64)p_irp->Tail.Overlay.DriverContext[1];
+ h_al = (ib_al_handle_t )p_irp->Tail.Overlay.DriverContext[1];
CL_ASSERT( h_al );
KeAcquireInStackQueuedSpinLock( &gp_cep_mgr->lock, &hdl );
@@ -6208,7 +6208,7 @@
NTSTATUS
al_cep_queue_irp(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN IRP* const p_irp )
{
@@ -6257,7 +6257,7 @@
void
al_cep_cleanup_al(
- IN const ib_al_handle_t FUNC_PTR64 h_al )
+ IN const ib_al_handle_t h_al )
{
cl_list_item_t *p_item;
net32_t cid;
@@ -6322,7 +6322,7 @@
NTSTATUS
al_cep_get_cid(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t const cid,
IN PIRP p_irp
)
@@ -6367,7 +6367,7 @@
/* store REQ private data */
p_req = (mad_cm_req_t*)ib_get_mad_buf( p_mad );
- p_new_cep = (kcep_t* VOID_PTR64)p_mad->send_context1;
+ p_new_cep = (kcep_t* )p_mad->send_context1;
__cep_set_pdata( h_al, p_new_cep->cid,
sizeof(p_req->pdata), (uint8_t*)p_req->pdata );
AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR ,
@@ -6387,7 +6387,7 @@
ib_api_status_t
al_cep_get_pdata(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN OUT uint8_t *p_psize,
OUT uint8_t* pdata )
@@ -6441,7 +6441,7 @@
ib_api_status_t
al_cep_set_pdata(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN uint8_t psize,
IN uint8_t* pdata )
Index: core/al/kernel/al_dev.c
===================================================================
--- core/al/kernel/al_dev.c (revision 1094)
+++ core/al/kernel/al_dev.c (working copy)
@@ -234,7 +234,7 @@
IN al_dev_open_context_t *p_context )
{
ib_pnp_req_t pnp_req;
- ib_pnp_handle_t VOID_PTR64 h_pnp;
+ ib_pnp_handle_t h_pnp;
ib_api_status_t status;
/* Register for PnP events. */
Index: core/al/kernel/al_fmr_pool.c
===================================================================
--- core/al/kernel/al_fmr_pool.c (revision 1094)
+++ core/al/kernel/al_fmr_pool.c (working copy)
@@ -118,7 +118,7 @@
{
ib_api_status_t status;
mlnx_fmr_pool_element_t *p_fmr_el;
- mlnx_fmr_handle_t VOID_PTR64 h_fmr = NULL;
+ mlnx_fmr_handle_t h_fmr = NULL;
cl_qlist_t unmap_list;
cl_list_item_t *p_list_item;
cl_qlist_t *bucket;
@@ -190,7 +190,7 @@
}
if (p_pool->flush_function)
- p_pool->flush_function( (mlnx_fmr_pool_handle_t VOID_PTR64)p_pool, p_pool->flush_arg);
+ p_pool->flush_function( (mlnx_fmr_pool_handle_t )p_pool, p_pool->flush_arg);
}
if (!flush_req)
@@ -320,9 +320,9 @@
ib_api_status_t
mlnx_create_fmr_pool(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const mlnx_fmr_pool_create_t *p_fmr_pool_attr,
- OUT mlnx_fmr_pool_handle_t FUNC_PTR64* const ph_pool )
+ OUT mlnx_fmr_pool_handle_t * const ph_pool )
{
ib_api_status_t status = IB_SUCCESS;
mlnx_fmr_pool_t *p_pool;
@@ -472,7 +472,7 @@
goto err_alloc_cache_el;
}
- p_fmr_el->h_pool = (mlnx_fmr_pool_handle_t VOID_PTR64)p_pool;
+ p_fmr_el->h_pool = (mlnx_fmr_pool_handle_t )p_pool;
p_fmr_el->remap_count = 0;
p_fmr_el->ref_count = 0;
@@ -550,7 +550,7 @@
*/
ib_api_status_t
mlnx_destroy_fmr_pool(
- IN const mlnx_fmr_pool_handle_t FUNC_PTR64 h_pool)
+ IN const mlnx_fmr_pool_handle_t h_pool)
{
mlnx_fmr_pool_t *p_pool = (mlnx_fmr_pool_t*)h_pool;
@@ -572,7 +572,7 @@
ib_api_status_t
-mlnx_flush_fmr_pool(mlnx_fmr_pool_handle_t VOID_PTR64 h_pool)
+mlnx_flush_fmr_pool(mlnx_fmr_pool_handle_t h_pool)
{
ib_api_status_t status = IB_SUCCESS;
@@ -598,13 +598,13 @@
ib_api_status_t
mlnx_map_phys_fmr_pool(
- IN const mlnx_fmr_pool_handle_t FUNC_PTR64 h_pool ,
+ IN const mlnx_fmr_pool_handle_t h_pool ,
IN const uint64_t* const page_list,
IN const int list_len,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT mlnx_fmr_pool_el_t FUNC_PTR64 *pp_fmr_el)
+ OUT mlnx_fmr_pool_el_t *pp_fmr_el)
{
ib_api_status_t status = IB_SUCCESS;
@@ -688,7 +688,7 @@
}
end:
- *pp_fmr_el = (mlnx_fmr_pool_el_t VOID_PTR64)p_fmr_el;
+ *pp_fmr_el = (mlnx_fmr_pool_el_t )p_fmr_el;
*p_lkey = p_fmr_el->lkey;
*p_rkey = p_fmr_el->rkey;
*p_vaddr = p_fmr_el->io_virtual_address;
@@ -702,13 +702,13 @@
ib_api_status_t
mlnx_unmap_fmr_pool(
- IN mlnx_fmr_pool_el_t FUNC_PTR64 p_fmr_el )
+ IN mlnx_fmr_pool_el_t p_fmr_el )
{
mlnx_fmr_pool_t *p_pool;
p_pool = (mlnx_fmr_pool_t*)p_fmr_el->h_pool;
- if( AL_OBJ_INVALID_HANDLE( (mlnx_fmr_pool_handle_t FUNC_PTR64)p_pool, AL_OBJ_TYPE_H_FMR_POOL ) )
+ if( AL_OBJ_INVALID_HANDLE( (mlnx_fmr_pool_handle_t )p_pool, AL_OBJ_TYPE_H_FMR_POOL ) )
{
AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_HANDLE\n") );
return IB_INVALID_HANDLE;
Index: core/al/kernel/al_ioc_pnp.c
===================================================================
--- core/al/kernel/al_ioc_pnp.c (revision 1094)
+++ core/al/kernel/al_ioc_pnp.c (working copy)
@@ -109,7 +109,7 @@
cl_qlist_t iou_reg_list;
cl_qlist_t ioc_reg_list;
- ib_pnp_handle_t VOID_PTR64 h_pnp;
+ ib_pnp_handle_t h_pnp;
cl_async_proc_item_t async_item;
boolean_t async_item_is_busy;
@@ -137,13 +137,13 @@
net64_t ca_guid;
net64_t port_guid;
- ib_qp_handle_t VOID_PTR64 h_qp;
- ib_pool_key_t VOID_PTR64 pool_key;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_qp_handle_t h_qp;
+ ib_pool_key_t pool_key;
+ ib_mad_svc_handle_t h_mad_svc;
atomic32_t query_cnt;
- ib_query_handle_t VOID_PTR64 h_node_query;
- ib_query_handle_t VOID_PTR64 h_path_query;
+ ib_query_handle_t h_node_query;
+ ib_query_handle_t h_path_query;
ib_mad_element_t *p_node_element;
ib_mad_element_t *p_path_element;
uint32_t num_nodes;
@@ -448,13 +448,13 @@
******************************************************************************/
static void
__ioc_pnp_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_request_mad );
static void
__ioc_pnp_send_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_response );
@@ -1254,9 +1254,9 @@
case IB_PNP_PORT_REMOVE:
/* Destroy the port service. */
- ref_al_obj( &((ioc_pnp_svc_t* VOID_PTR64)p_pnp_rec->context)->obj );
- ((ioc_pnp_svc_t* VOID_PTR64)p_pnp_rec->context)->obj.pfn_destroy(
- &((ioc_pnp_svc_t* VOID_PTR64)p_pnp_rec->context)->obj, NULL );
+ ref_al_obj( &((ioc_pnp_svc_t* )p_pnp_rec->context)->obj );
+ ((ioc_pnp_svc_t* )p_pnp_rec->context)->obj.pfn_destroy(
+ &((ioc_pnp_svc_t* )p_pnp_rec->context)->obj, NULL );
p_pnp_rec->context = NULL;
default:
@@ -1274,7 +1274,7 @@
IN const ib_pnp_rec_t* const p_pnp_rec )
{
ib_api_status_t status;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_qp_create_t qp_create;
ib_mad_svc_t mad_svc;
ib_pnp_port_rec_t *p_pnp_port_rec;
@@ -1609,7 +1609,7 @@
AL_ENTER( AL_DBG_PNP );
- p_svc = (ioc_pnp_svc_t* VOID_PTR64)p_query_rec->query_context;
+ p_svc = (ioc_pnp_svc_t* )p_query_rec->query_context;
if( p_svc->obj.state != CL_DESTROYING &&
p_query_rec->status == IB_SUCCESS && p_query_rec->result_cnt )
@@ -1647,7 +1647,7 @@
AL_ENTER( AL_DBG_PNP );
- p_svc = (ioc_pnp_svc_t* VOID_PTR64)p_query_rec->query_context;
+ p_svc = (ioc_pnp_svc_t* )p_query_rec->query_context;
if( p_svc->obj.state != CL_DESTROYING &&
p_query_rec->status == IB_SUCCESS && p_query_rec->result_cnt )
@@ -2048,7 +2048,7 @@
static void
__ioc_pnp_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_response )
{
@@ -2062,26 +2062,26 @@
UNUSED_PARAM( mad_svc_context );
CL_ASSERT( !p_mad_response->p_next );
- p_results = (ioc_sweep_results_t* VOID_PTR64)p_mad_response->send_context1;
+ p_results = (ioc_sweep_results_t* )p_mad_response->send_context1;
if( !p_mad_response->p_mad_buf->status )
{
/* Query was successful */
switch( p_mad_response->p_mad_buf->attr_id )
{
case IB_MAD_ATTR_IO_UNIT_INFO:
- p_iou = (iou_node_t* VOID_PTR64)p_mad_response->send_context2;
+ p_iou = (iou_node_t* )p_mad_response->send_context2;
__iou_info_resp( p_iou,
(ib_dm_mad_t*)p_mad_response->p_mad_buf );
break;
case IB_MAD_ATTR_IO_CONTROLLER_PROFILE:
- p_iou = (iou_node_t* VOID_PTR64)p_mad_response->send_context2;
+ p_iou = (iou_node_t* )p_mad_response->send_context2;
__ioc_profile_resp( p_iou,
(ib_dm_mad_t*)p_mad_response->p_mad_buf );
break;
case IB_MAD_ATTR_SERVICE_ENTRIES:
- p_ioc = (iou_ioc_t* VOID_PTR64)p_mad_response->send_context2;
+ p_ioc = (iou_ioc_t* )p_mad_response->send_context2;
__svc_entry_resp( p_ioc,
(ib_dm_mad_t*)p_mad_response->p_mad_buf );
break;
@@ -2163,7 +2163,7 @@
static void
__ioc_pnp_send_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_request_mad )
{
@@ -2180,14 +2180,14 @@
CL_ASSERT( p_request_mad->p_next == NULL );
- p_results = (ioc_sweep_results_t* VOID_PTR64)p_request_mad->context1;
+ p_results = (ioc_sweep_results_t* )p_request_mad->context1;
if( p_request_mad->status != IB_WCS_SUCCESS )
{
switch( p_request_mad->p_mad_buf->attr_id )
{
case IB_MAD_ATTR_IO_UNIT_INFO:
- p_iou = (iou_node_t* VOID_PTR64)p_request_mad->context2;
+ p_iou = (iou_node_t* )p_request_mad->context2;
if( p_request_mad->status == IB_WCS_TIMEOUT_RETRY_ERR )
{
/* Move to the next path for the node and try the query again. */
@@ -2211,7 +2211,7 @@
break;
case IB_MAD_ATTR_SERVICE_ENTRIES:
- p_ioc = (iou_ioc_t* VOID_PTR64)p_request_mad->context2;
+ p_ioc = (iou_ioc_t* )p_request_mad->context2;
cl_spinlock_acquire( &p_ioc->p_iou->lock );
cl_qmap_remove_item( &p_ioc->p_iou->ioc_map, &p_ioc->map_item );
cl_spinlock_release( &p_ioc->p_iou->lock );
@@ -2517,7 +2517,7 @@
{
p_mad_list = p_mad->p_next;
p_mad->p_next = NULL;
- p_ioc = (iou_ioc_t* VOID_PTR64)p_mad->context2;
+ p_ioc = (iou_ioc_t* )p_mad->context2;
cl_atomic_dec( &p_ioc->ref_cnt );
ib_put_mad( p_mad );
if( !cl_atomic_dec( &p_results->p_svc->query_cnt ) &&
Index: core/al/kernel/al_mad_pool.c
===================================================================
--- core/al/kernel/al_mad_pool.c (revision 1094)
+++ core/al/kernel/al_mad_pool.c (working copy)
@@ -49,7 +49,7 @@
typedef struct _mad_send
{
al_mad_send_t mad_send;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
} mad_send_t;
@@ -59,7 +59,7 @@
typedef struct _mad_rmpp
{
al_mad_rmpp_t mad_rmpp;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
} mad_rmpp_t;
@@ -107,13 +107,13 @@
*/
ib_api_status_t
ib_create_mad_pool(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const size_t min,
IN const size_t max,
IN const size_t grow_size,
- OUT ib_pool_handle_t FUNC_PTR64* const ph_pool )
+ OUT ib_pool_handle_t * const ph_pool )
{
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
ib_api_status_t status;
AL_ENTER( AL_DBG_MAD_POOL );
@@ -194,8 +194,8 @@
__destroying_pool(
IN al_obj_t* p_obj )
{
- ib_pool_handle_t VOID_PTR64 h_pool;
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_pool_handle_t h_pool;
+ ib_al_handle_t h_al;
AL_ENTER( AL_DBG_MAD_POOL );
@@ -221,7 +221,7 @@
__free_pool(
IN al_obj_t* p_obj )
{
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
CL_ASSERT( p_obj );
h_pool = PARENT_STRUCT( p_obj, al_pool_t, obj );
@@ -240,7 +240,7 @@
*/
ib_api_status_t
ib_destroy_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool )
+ IN const ib_pool_handle_t h_pool )
{
cl_list_item_t* p_array_item;
al_obj_t* p_obj;
@@ -288,9 +288,9 @@
*/
ib_api_status_t
ib_reg_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- OUT ib_pool_key_t FUNC_PTR64* const pp_pool_key )
+ IN const ib_pool_handle_t h_pool,
+ IN const ib_pd_handle_t h_pd,
+ OUT ib_pool_key_t * const pp_pool_key )
{
ib_api_status_t status;
@@ -320,12 +320,12 @@
ib_api_status_t
reg_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- OUT ib_pool_key_t FUNC_PTR64* const pp_pool_key )
+ IN const ib_pool_handle_t h_pool,
+ IN const ib_pd_handle_t h_pd,
+ OUT ib_pool_key_t * const pp_pool_key )
{
al_pool_key_t* p_pool_key;
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
ib_api_status_t status;
al_key_type_t key_type;
@@ -434,7 +434,7 @@
}
/* Return the pool key. */
- *pp_pool_key = (ib_pool_key_t VOID_PTR64)p_pool_key;
+ *pp_pool_key = (ib_pool_key_t )p_pool_key;
AL_EXIT( AL_DBG_MAD_POOL );
return IB_SUCCESS;
@@ -567,7 +567,7 @@
*/
ib_api_status_t
ib_dereg_mad_pool(
- IN const ib_pool_key_t FUNC_PTR64 pool_key )
+ IN const ib_pool_key_t pool_key )
{
ib_api_status_t status;
@@ -596,7 +596,7 @@
*/
ib_api_status_t
dereg_mad_pool(
- IN const ib_pool_key_t FUNC_PTR64 pool_key,
+ IN const ib_pool_key_t pool_key,
IN const al_key_type_t expected_type )
{
AL_ENTER( AL_DBG_MAD_POOL );
@@ -627,7 +627,7 @@
*/
static ib_api_status_t
__get_mad_element(
- IN const ib_pool_key_t FUNC_PTR64 pool_key,
+ IN const ib_pool_key_t pool_key,
OUT al_mad_element_t** pp_mad_element )
{
mad_item_t* p_mad_item;
@@ -677,7 +677,7 @@
ref_al_obj( &pool_key->obj );
cl_atomic_inc( &pool_key->mad_cnt );
- p_mad_item->al_mad_element.pool_key = (ib_pool_key_t VOID_PTR64)pool_key;
+ p_mad_item->al_mad_element.pool_key = (ib_pool_key_t )pool_key;
/* Return the MAD element. */
*pp_mad_element = &p_mad_item->al_mad_element;
@@ -695,7 +695,7 @@
IN al_mad_element_t* p_mad_element )
{
mad_item_t* p_mad_item;
- ib_pool_key_t VOID_PTR64 pool_key;
+ ib_pool_key_t pool_key;
CL_ASSERT( p_mad_element );
p_mad_item = PARENT_STRUCT( p_mad_element, mad_item_t, al_mad_element );
@@ -716,7 +716,7 @@
-ib_mad_send_handle_t VOID_PTR64
+ib_mad_send_handle_t
get_mad_send(
IN const al_mad_element_t *p_mad_element )
{
@@ -752,10 +752,10 @@
void
put_mad_send(
- IN ib_mad_send_handle_t FUNC_PTR64 h_mad_send )
+ IN ib_mad_send_handle_t h_mad_send )
{
mad_send_t *p_mad_send;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
p_mad_send = PARENT_STRUCT( h_mad_send, mad_send_t, mad_send );
h_pool = p_mad_send->h_pool;
@@ -798,7 +798,7 @@
IN al_mad_rmpp_t* h_mad_rmpp )
{
mad_rmpp_t *p_mad_rmpp;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
p_mad_rmpp = PARENT_STRUCT( h_mad_rmpp, mad_rmpp_t, mad_rmpp );
@@ -812,7 +812,7 @@
ib_api_status_t
ib_get_mad(
- IN const ib_pool_key_t FUNC_PTR64 pool_key,
+ IN const ib_pool_key_t pool_key,
IN const size_t buf_size,
OUT ib_mad_element_t **pp_mad_element )
{
Index: core/al/kernel/al_mgr.c
===================================================================
--- core/al/kernel/al_mgr.c (revision 1094)
+++ core/al/kernel/al_mgr.c (working copy)
@@ -347,7 +347,7 @@
p_h = (al_handle_t*)p_element;
/* Chain free entries one after another. */
- p_h->p_obj = (al_obj_t*)(uintn_t)++(((ib_al_handle_t VOID_PTR64)context)->free_hdl);
+ p_h->p_obj = (al_obj_t*)(uintn_t)++(((ib_al_handle_t )context)->free_hdl);
p_h->type = AL_OBJ_TYPE_UNKNOWN;
return CL_SUCCESS;
@@ -360,9 +360,9 @@
*/
ib_api_status_t
ib_open_al(
- OUT ib_al_handle_t FUNC_PTR64* const ph_al )
+ OUT ib_al_handle_t * const ph_al )
{
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
ib_api_status_t status;
cl_status_t cl_status;
@@ -447,7 +447,7 @@
uint64_t
al_hdl_insert(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN void* const p_obj,
IN const uint32_t type )
{
@@ -493,7 +493,7 @@
void
al_hdl_free(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const uint64_t hdl )
{
al_handle_t *p_h;
@@ -509,7 +509,7 @@
al_obj_t*
al_hdl_ref(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const uint64_t hdl,
IN const uint32_t type )
{
@@ -560,7 +560,7 @@
void*
al_hdl_chk(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const uint64_t hdl,
IN const uint32_t type )
{
@@ -583,7 +583,7 @@
void*
al_hdl_get(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const uint64_t hdl,
IN const uint32_t type )
{
Index: core/al/kernel/al_mr.c
===================================================================
--- core/al/kernel/al_mr.c (revision 1094)
+++ core/al/kernel/al_mr.c (working copy)
@@ -72,11 +72,11 @@
OUT cl_pool_item_t** const pp_pool_item )
{
ib_api_status_t status;
- mlnx_fmr_handle_t VOID_PTR64 h_fmr;
+ mlnx_fmr_handle_t h_fmr;
UNUSED_PARAM( context );
- h_fmr = (mlnx_fmr_handle_t VOID_PTR64)p_object;
+ h_fmr = (mlnx_fmr_handle_t )p_object;
cl_memclr( h_fmr, sizeof(mlnx_fmr_t) );
construct_al_obj( &h_fmr->obj, AL_OBJ_TYPE_H_FMR );
@@ -87,7 +87,7 @@
return CL_ERROR;
}
- *pp_pool_item = &((mlnx_fmr_handle_t VOID_PTR64)p_object)->obj.pool_item;
+ *pp_pool_item = &((mlnx_fmr_handle_t )p_object)->obj.pool_item;
/* Release the reference taken in init_al_obj. */
deref_al_obj( &h_fmr->obj );
@@ -124,7 +124,7 @@
IN struct _al_obj *p_obj )
{
ib_api_status_t status;
- mlnx_fmr_handle_t VOID_PTR64 h_fmr;
+ mlnx_fmr_handle_t h_fmr;
CL_ASSERT( p_obj );
h_fmr = PARENT_STRUCT( p_obj, mlnx_fmr_t, obj );
@@ -146,7 +146,7 @@
__return_mlnx_fmr(
IN al_obj_t *p_obj )
{
- mlnx_fmr_handle_t VOID_PTR64 h_fmr;
+ mlnx_fmr_handle_t h_fmr;
h_fmr = PARENT_STRUCT( p_obj, mlnx_fmr_t, obj );
reset_al_obj( p_obj );
@@ -157,11 +157,11 @@
ib_api_status_t
mlnx_create_fmr(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const mlnx_fmr_create_t* const p_fmr_create,
- OUT mlnx_fmr_handle_t FUNC_PTR64* const ph_fmr )
+ OUT mlnx_fmr_handle_t * const ph_fmr )
{
- mlnx_fmr_handle_t VOID_PTR64 h_fmr;
+ mlnx_fmr_handle_t h_fmr;
ib_api_status_t status;
AL_ENTER( AL_DBG_MR );
@@ -217,7 +217,7 @@
ib_api_status_t
mlnx_map_phys_fmr(
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr,
+ IN const mlnx_fmr_handle_t h_fmr,
IN const uint64_t* const paddr_list,
IN const int list_len,
IN OUT uint64_t* const p_vaddr,
@@ -260,12 +260,12 @@
ib_api_status_t
mlnx_unmap_fmr(
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr )
+ IN const mlnx_fmr_handle_t h_fmr )
{
ib_api_status_t status;
mlnx_fmr_t *p_fmr = (mlnx_fmr_t*)h_fmr;
mlnx_fmr_t *p_cur_fmr;
- mlnx_fmr_handle_t VOID_PTR64 *p_fmr_array;
+ mlnx_fmr_handle_t *p_fmr_array;
int i;
AL_ENTER( AL_DBG_MR );
@@ -281,7 +281,7 @@
i++;
// allocate the array
- p_fmr_array = cl_zalloc((i+1)*sizeof(mlnx_fmr_handle_t VOID_PTR64));
+ p_fmr_array = cl_zalloc((i+1)*sizeof(mlnx_fmr_handle_t ));
if (!p_fmr_array)
{
AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_FMR_HANDLE\n") );
@@ -312,7 +312,7 @@
ib_api_status_t
mlnx_destroy_fmr(
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr )
+ IN const mlnx_fmr_handle_t h_fmr )
{
ib_api_status_t status;
@@ -356,18 +356,18 @@
ib_api_status_t
ib_create_shmid(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const int shmid,
IN const ib_mr_create_t* const p_mr_create,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr )
+ OUT ib_mr_handle_t * const ph_mr )
{
ib_api_status_t status;
cl_status_t cl_status;
net32_t lkey;
net32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
AL_ENTER( AL_DBG_MR );
@@ -491,13 +491,13 @@
ib_api_status_t
ib_reg_shmid(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_shmid_t shmid,
IN const ib_mr_create_t* const p_mr_create,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr )
+ OUT ib_mr_handle_t * const ph_mr )
{
return reg_shmid( h_pd, shmid, p_mr_create, p_vaddr, p_lkey, p_rkey, ph_mr );
}
@@ -505,13 +505,13 @@
ib_api_status_t
reg_shmid(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_shmid_t shmid,
IN const ib_mr_create_t* const p_mr_create,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr )
+ OUT ib_mr_handle_t * const ph_mr )
{
UNUSED_PARAM( h_pd );
UNUSED_PARAM( shmid );
@@ -528,7 +528,7 @@
uint64_t vaddr;
net32_t lkey;
net32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_mr, h_reg_mr;
+ ib_mr_handle_t h_mr, h_reg_mr;
AL_ENTER( AL_DBG_MR );
Index: core/al/kernel/al_ndi_cm.c
===================================================================
--- core/al/kernel/al_ndi_cm.c (revision 1094)
+++ core/al/kernel/al_ndi_cm.c (working copy)
@@ -90,7 +90,7 @@
static inline void
__ndi_complete_irp(
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_qp_handle_t h_qp,
IN PIRP Irp,
IN NTSTATUS code
)
@@ -108,7 +108,7 @@
static inline void
__ndi_complete_irp_ex(
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_qp_handle_t h_qp,
IN NTSTATUS code,
IN ndi_cm_state_t new_state
)
@@ -132,7 +132,7 @@
*/
static void
__cep_timewait_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN const ib_qp_handle_t h_qp )
{
uint64_t timewait = 0;
ib_qp_mod_t qp_mod;
@@ -182,7 +182,7 @@
static ib_api_status_t
__ndi_qp2rts(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN uint8_t init_depth,
IN uint8_t resp_res,
IN PIRP p_irp,
@@ -327,7 +327,7 @@
)
{
ndi_qp_csq_t *p_ndi_csq = (ndi_qp_csq_t*)Csq;
- ib_qp_handle_t VOID_PTR64 h_qp = p_ndi_csq->h_qp;
+ ib_qp_handle_t h_qp = p_ndi_csq->h_qp;
UNUSED_PARAM( Irql );
AL_ENTER( AL_DBG_NDI );
@@ -341,7 +341,7 @@
)
{
ndi_qp_csq_t *p_ndi_csq = (ndi_qp_csq_t*)Csq;
- ib_qp_handle_t VOID_PTR64 h_qp = p_ndi_csq->h_qp;
+ ib_qp_handle_t h_qp = p_ndi_csq->h_qp;
UNUSED_PARAM( Irql );
AL_ENTER( AL_DBG_NDI );
@@ -355,7 +355,7 @@
)
{
ndi_qp_csq_t *p_ndi_csq = (ndi_qp_csq_t*)Csq;
- ib_qp_handle_t VOID_PTR64 h_qp = p_ndi_csq->h_qp;
+ ib_qp_handle_t h_qp = p_ndi_csq->h_qp;
net32_t cid;
AL_ENTER( AL_DBG_NDI );
@@ -412,7 +412,7 @@
void
ndi_qp_flush_ques(
- IN ib_qp_handle_t FUNC_PTR64 h_qp
+ IN ib_qp_handle_t h_qp
)
{
AL_ENTER( AL_DBG_NDI );
@@ -427,7 +427,7 @@
NTSTATUS
ndi_qp_init(
- IN ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN ib_qp_handle_t h_qp )
{
NTSTATUS status;
@@ -473,7 +473,7 @@
void
ndi_qp_destroy(
- IN ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN ib_qp_handle_t h_qp )
{
AL_ENTER( AL_DBG_NDI );
@@ -492,7 +492,7 @@
void
ndi_qp_free(
- IN ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN ib_qp_handle_t h_qp )
{
AL_ENTER( AL_DBG_NDI );
@@ -519,7 +519,7 @@
IN void* context )
{
NTSTATUS status;
- ib_qp_handle_t VOID_PTR64 h_qp = (ib_qp_handle_t VOID_PTR64)context;
+ ib_qp_handle_t h_qp = (ib_qp_handle_t )context;
UNUSED_PARAM(p_dev_obj);
AL_ENTER( AL_DBG_NDI );
@@ -549,7 +549,7 @@
{
net32_t cid;
NTSTATUS status;
- ib_qp_handle_t VOID_PTR64 h_qp = p_cm->h_qp;
+ ib_qp_handle_t h_qp = p_cm->h_qp;
ndi_qp_csq_t *p_ndi_csq = h_qp->p_irp_que;
AL_ENTER( AL_DBG_NDI );
@@ -745,10 +745,10 @@
static void
__ndi_cm_handler(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const net32_t cid )
{
- void* VOID_PTR64 context;
+ void* context;
net32_t new_cid;
ib_mad_element_t *p_mad_el;
ib_cm_handle_t h_cm;
@@ -758,7 +758,7 @@
while( al_cep_poll( h_al, cid, &context, &new_cid, &p_mad_el ) == IB_SUCCESS )
{
ib_mad_t*p_mad = ib_get_mad_buf( p_mad_el );
- ib_qp_handle_t VOID_PTR64 h_qp = (ib_qp_handle_t VOID_PTR64)context;
+ ib_qp_handle_t h_qp = (ib_qp_handle_t )context;
if( p_mad_el->status != IB_SUCCESS )
{
@@ -835,7 +835,7 @@
static void
__ndi_fill_cm_req(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN ual_ndi_req_cm_ioctl_in_t *p_req,
IN ib_path_rec_t *p_path_rec,
OUT ib_cm_req_t *p_cm_req)
@@ -890,8 +890,8 @@
uint8_t pkt_life;
ib_qp_mod_t qp_mod;
ib_path_rec_t *p_path_rec;
- ual_ndi_req_cm_ioctl_in_t *p_req = (ual_ndi_req_cm_ioctl_in_t* VOID_PTR64)p_query_rec->query_context;
- ib_qp_handle_t VOID_PTR64 h_qp = (ib_qp_handle_t VOID_PTR64)p_req->h_qp;
+ ual_ndi_req_cm_ioctl_in_t *p_req = (ual_ndi_req_cm_ioctl_in_t* )p_query_rec->query_context;
+ ib_qp_handle_t h_qp = (ib_qp_handle_t )p_req->h_qp;
net32_t cid, old_cid;
AL_ENTER( AL_DBG_NDI );
@@ -994,7 +994,7 @@
ib_gid_pair_t user_query;
ib_query_req_t query_req;
ib_api_status_t status;
- ib_qp_handle_t VOID_PTR64 h_qp = (ib_qp_handle_t VOID_PTR64)p_req->h_qp;
+ ib_qp_handle_t h_qp = (ib_qp_handle_t )p_req->h_qp;
AL_ENTER( AL_DBG_NDI );
@@ -1040,8 +1040,8 @@
{
cl_ioctl_handle_t h_ioctl;
ib_service_record_t *service_record;
- ual_ndi_req_cm_ioctl_in_t *p_req = (ual_ndi_req_cm_ioctl_in_t* VOID_PTR64)p_query_rec->query_context;
- ib_qp_handle_t VOID_PTR64 h_qp = (ib_qp_handle_t VOID_PTR64)p_req->h_qp;
+ ual_ndi_req_cm_ioctl_in_t *p_req = (ual_ndi_req_cm_ioctl_in_t* )p_query_rec->query_context;
+ ib_qp_handle_t h_qp = (ib_qp_handle_t )p_req->h_qp;
AL_ENTER( AL_DBG_NDI );
@@ -1074,7 +1074,7 @@
/* Send asynchronous query to SA for a GUID. Return STATUS_PENDING on success. */
NTSTATUS
__ndi_ats_query(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN cl_ioctl_handle_t h_ioctl,
IN ual_ndi_req_cm_ioctl_in_t *p_req )
{
@@ -1162,7 +1162,7 @@
NTSTATUS
ndi_req_cm(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN cl_ioctl_handle_t h_ioctl,
IN ual_ndi_req_cm_ioctl_in_t *p_req
)
@@ -1225,7 +1225,7 @@
NTSTATUS nt_status;
ib_qp_mod_t qp_mod;
ib_api_status_t status;
- ib_qp_handle_t VOID_PTR64 h_qp = p_irp->Tail.Overlay.DriverContext[0];
+ ib_qp_handle_t h_qp = p_irp->Tail.Overlay.DriverContext[0];
ual_ndi_rtu_cm_ioctl_in_t *p_rtu =
(ual_ndi_rtu_cm_ioctl_in_t*)cl_ioctl_in_buf( p_irp );
uint8_t pdata[IB_REJ_PDATA_SIZE];
@@ -1296,7 +1296,7 @@
cl_status_t
ndi_rtu_cm(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN PIRP p_irp
)
{
@@ -1340,7 +1340,7 @@
NTSTATUS nt_status;
ib_qp_mod_t qp_mod;
ib_api_status_t status;
- ib_qp_handle_t VOID_PTR64 h_qp = p_irp->Tail.Overlay.DriverContext[0];
+ ib_qp_handle_t h_qp = p_irp->Tail.Overlay.DriverContext[0];
ual_ndi_rep_cm_ioctl_in_t *p_rep =
(ual_ndi_rep_cm_ioctl_in_t*)cl_ioctl_in_buf( p_irp );
@@ -1407,7 +1407,7 @@
static void
__ndi_fill_cm_rep(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN ual_ndi_rep_cm_ioctl_in_t *p_rep,
OUT ib_cm_rep_t *p_cm_rep)
{
@@ -1434,7 +1434,7 @@
NTSTATUS
ndi_rep_cm(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN net32_t const cid,
IN PIRP p_irp,
IN ual_ndi_rep_cm_ioctl_in_t *p_rep
@@ -1523,7 +1523,7 @@
NTSTATUS
ndi_dreq_cm(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN PIRP p_irp
)
{
Index: core/al/kernel/al_ndi_cm.h
===================================================================
--- core/al/kernel/al_ndi_cm.h (revision 1094)
+++ core/al/kernel/al_ndi_cm.h (working copy)
@@ -91,21 +91,21 @@
ib_api_status_t
ndi_modify_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod,
IN const uint32_t buf_size,
IN uint8_t* const p_outbuf);
NTSTATUS
ndi_req_cm(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN cl_ioctl_handle_t h_ioctl,
IN ual_ndi_req_cm_ioctl_in_t *p_req
);
NTSTATUS
ndi_rep_cm(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN net32_t const cid,
IN cl_ioctl_handle_t h_ioctl,
IN ual_ndi_rep_cm_ioctl_in_t *p_ndi_rep_cm
@@ -113,32 +113,32 @@
cl_status_t
ndi_rtu_cm(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN PIRP p_irp
);
NTSTATUS
ndi_dreq_cm(
- IN ib_qp_handle_t FUNC_PTR64 const h_qp,
+ IN ib_qp_handle_t const h_qp,
IN PIRP p_irp
);
void
ndi_qp_flush_ques(
- IN ib_qp_handle_t FUNC_PTR64 h_qp );
+ IN ib_qp_handle_t h_qp );
NTSTATUS
ndi_qp_init(
- IN ib_qp_handle_t FUNC_PTR64 h_qp );
+ IN ib_qp_handle_t h_qp );
void
ndi_qp_destroy(
- IN ib_qp_handle_t FUNC_PTR64 h_qp );
+ IN ib_qp_handle_t h_qp );
void
ndi_qp_free(
- IN ib_qp_handle_t FUNC_PTR64 h_qp );
+ IN ib_qp_handle_t h_qp );
#endif
Index: core/al/kernel/al_ndi_cq.c
===================================================================
--- core/al/kernel/al_ndi_cq.c (revision 1094)
+++ core/al/kernel/al_ndi_cq.c (working copy)
@@ -79,7 +79,7 @@
#pragma warning(disable:4706)
void ndi_cq_compl_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
PIRP Irp;
@@ -103,7 +103,7 @@
void ndi_cq_error_cb(
IN ib_async_event_rec_t *p_err_rec)
{
- ib_cq_handle_t VOID_PTR64 h_cq = p_err_rec->handle.h_cq;
+ ib_cq_handle_t h_cq = p_err_rec->handle.h_cq;
AL_ENTER( AL_DBG_NDI );
__ndi_flush_que( &h_cq->compl, STATUS_INTERNAL_ERROR );
__ndi_flush_que( &h_cq->error, STATUS_INTERNAL_ERROR );
@@ -119,7 +119,7 @@
/* flush a queue of pending requests */
void
ndi_cq_flush_ques(
- IN ib_cq_handle_t FUNC_PTR64 h_cq
+ IN ib_cq_handle_t h_cq
)
{
AL_ENTER( AL_DBG_NDI );
@@ -219,7 +219,7 @@
)
{
ndi_cq_csq_t *p_ndi_csq = (ndi_cq_csq_t*)Csq;
- ib_cq_handle_t VOID_PTR64 h_cq = p_ndi_csq->h_cq;
+ ib_cq_handle_t h_cq = p_ndi_csq->h_cq;
UNUSED_PARAM( Irql );
AL_ENTER( AL_DBG_NDI );
@@ -233,7 +233,7 @@
)
{
ndi_cq_csq_t *p_ndi_csq = (ndi_cq_csq_t*)Csq;
- ib_cq_handle_t VOID_PTR64 h_cq = p_ndi_csq->h_cq;
+ ib_cq_handle_t h_cq = p_ndi_csq->h_cq;
UNUSED_PARAM( Irql );
AL_ENTER( AL_DBG_NDI );
@@ -247,7 +247,7 @@
)
{
ndi_cq_csq_t *p_ndi_csq = (ndi_cq_csq_t*)Csq;
- ib_cq_handle_t VOID_PTR64 h_cq = p_ndi_csq->h_cq;
+ ib_cq_handle_t h_cq = p_ndi_csq->h_cq;
AL_ENTER( AL_DBG_NDI );
cl_ioctl_complete( Irp, CL_CANCELED, 0 );
@@ -257,7 +257,7 @@
NTSTATUS
ndi_cq_init(
- IN ib_cq_handle_t FUNC_PTR64 h_cq )
+ IN ib_cq_handle_t h_cq )
{
NTSTATUS status;
Index: core/al/kernel/al_ndi_cq.h
===================================================================
--- core/al/kernel/al_ndi_cq.h (revision 1094)
+++ core/al/kernel/al_ndi_cq.h (working copy)
@@ -44,15 +44,15 @@
void
ndi_cq_flush_ques(
- IN ib_cq_handle_t FUNC_PTR64 h_cq );
+ IN ib_cq_handle_t h_cq );
NTSTATUS
ndi_cq_init(
- IN ib_cq_handle_t FUNC_PTR64 h_cq );
+ IN ib_cq_handle_t h_cq );
void
ndi_cq_compl_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
void
Index: core/al/kernel/al_pnp.c
===================================================================
--- core/al/kernel/al_pnp.c (revision 1094)
+++ core/al/kernel/al_pnp.c (working copy)
@@ -774,9 +774,9 @@
ib_api_status_t
ib_reg_pnp(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_pnp_req_t* const p_pnp_req,
- OUT ib_pnp_handle_t FUNC_PTR64* const ph_pnp )
+ OUT ib_pnp_handle_t * const ph_pnp )
{
ib_api_status_t status;
KEVENT event;
@@ -818,10 +818,10 @@
ib_api_status_t
al_reg_pnp(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_pnp_req_t* const p_pnp_req,
IN KEVENT *p_sync_event,
- OUT ib_pnp_handle_t FUNC_PTR64* const ph_pnp )
+ OUT ib_pnp_handle_t * const ph_pnp )
{
ib_api_status_t status;
al_pnp_t* p_reg;
@@ -907,7 +907,7 @@
ib_api_status_t
ib_dereg_pnp(
- IN const ib_pnp_handle_t FUNC_PTR64 h_pnp,
+ IN const ib_pnp_handle_t h_pnp,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL )
{
AL_ENTER( AL_DBG_PNP );
@@ -1714,8 +1714,8 @@
ib_api_status_t
ib_reject_ioc(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
- IN const ib_pnp_handle_t FUNC_PTR64 h_event )
+ IN const ib_al_handle_t h_al,
+ IN const ib_pnp_handle_t h_event )
{
AL_ENTER( AL_DBG_PNP );
Index: core/al/kernel/al_proxy.c
===================================================================
--- core/al/kernel/al_proxy.c (revision 1094)
+++ core/al/kernel/al_proxy.c (working copy)
@@ -114,8 +114,8 @@
(ual_reg_shmid_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_pd_handle_t VOID_PTR64 h_pd;
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_pd_handle_t h_pd;
+ ib_mr_handle_t h_mr;
uint64_t vaddr;
net32_t lkey, rkey;
@@ -130,7 +130,7 @@
}
/* Validate PD handle */
- h_pd = (ib_pd_handle_t VOID_PTR64)
+ h_pd = (ib_pd_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_pd, AL_OBJ_TYPE_H_PD );
if( !h_pd )
{
@@ -862,7 +862,7 @@
break;
}
- p_evt_rec->pnp.h_pnp = (ib_pnp_handle_t VOID_PTR64)p_pnp_rec->h_pnp->obj.hdl;
+ p_evt_rec->pnp.h_pnp = (ib_pnp_handle_t )p_pnp_rec->h_pnp->obj.hdl;
p_pnp_rec->h_pnp->obj.hdl_valid = TRUE;
hdl =
@@ -967,7 +967,7 @@
ib_pnp_req_t pnp_req;
ib_api_status_t status, *p_user_status;
uint64_t *p_user_hdl;
- ib_pnp_handle_t VOID_PTR64 h_pnp;
+ ib_pnp_handle_t h_pnp;
cl_status_t cl_status;
KEVENT *p_sync_event;
NTSTATUS nt_status;
@@ -1113,7 +1113,7 @@
al_dev_open_context_t *p_context;
IO_STACK_LOCATION *p_io_stack;
proxy_pnp_evt_t *p_evt;
- ib_pnp_handle_t VOID_PTR64 h_pnp;
+ ib_pnp_handle_t h_pnp;
IRP *p_old_irp;
AL_ENTER( AL_DBG_PNP );
@@ -1197,7 +1197,7 @@
uint64_t *p_hdl;
al_dev_open_context_t *p_context;
IO_STACK_LOCATION *p_io_stack;
- ib_pnp_handle_t VOID_PTR64 h_pnp;
+ ib_pnp_handle_t h_pnp;
AL_ENTER( AL_DBG_PNP );
p_context = p_open_context;
@@ -1220,7 +1220,7 @@
p_hdl = cl_ioctl_in_buf( h_ioctl );
- h_pnp = (ib_pnp_handle_t VOID_PTR64)
+ h_pnp = (ib_pnp_handle_t )
al_hdl_ref( p_context->h_al, *p_hdl, AL_OBJ_TYPE_H_PNP );
if( !h_pnp )
{
Index: core/al/kernel/al_proxy_cep.c
===================================================================
--- core/al/kernel/al_proxy_cep.c (revision 1094)
+++ core/al/kernel/al_proxy_cep.c (working copy)
@@ -52,7 +52,7 @@
OUT size_t *p_ret_bytes )
{
al_dev_open_context_t *p_context;
- void* VOID_PTR64 * p_user_context; //TODO use ioctl here
+ void* * p_user_context; //TODO use ioctl here
ual_create_cep_ioctl_t *p_ioctl;
AL_ENTER( AL_DBG_CM );
@@ -61,7 +61,7 @@
p_ioctl = (ual_create_cep_ioctl_t*)cl_ioctl_out_buf( h_ioctl );
/* Validate user parameters. */
- if( cl_ioctl_in_size( h_ioctl ) != sizeof(void* VOID_PTR64) ||
+ if( cl_ioctl_in_size( h_ioctl ) != sizeof(void* ) ||
cl_ioctl_out_size( h_ioctl ) != sizeof(ual_create_cep_ioctl_t) )
{
AL_EXIT( AL_DBG_CM );
@@ -83,7 +83,7 @@
static inline void
__complete_get_event_ioctl(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN IRP* const p_irp,
IN NTSTATUS status )
{
@@ -176,7 +176,7 @@
{
al_dev_open_context_t *p_context;
ual_cep_req_ioctl_t *p_ioctl;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
AL_ENTER( AL_DBG_CM );
@@ -203,7 +203,7 @@
p_ioctl->in.cm_req.p_req_pdata = p_ioctl->in.pdata;
/* Get the kernel QP handle. */
- h_qp = (ib_qp_handle_t VOID_PTR64)al_hdl_ref(
+ h_qp = (ib_qp_handle_t )al_hdl_ref(
p_context->h_al, (uint64_t)p_ioctl->in.cm_req.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -267,7 +267,7 @@
{
al_dev_open_context_t *p_context;
ual_cep_rep_ioctl_t *p_ioctl;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
AL_ENTER( AL_DBG_CM );
@@ -288,7 +288,7 @@
p_ioctl->in.cm_rep.p_rep_pdata = p_ioctl->in.pdata;
/* Get the kernel QP handle. */
- h_qp = (ib_qp_handle_t VOID_PTR64)al_hdl_ref(
+ h_qp = (ib_qp_handle_t )al_hdl_ref(
p_context->h_al, (uint64_t)p_ioctl->in.cm_rep.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -525,7 +525,7 @@
al_dev_open_context_t *p_context;
ual_cep_lap_ioctl_t *p_ioctl;
ib_api_status_t status;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
AL_ENTER( AL_DBG_CM );
@@ -547,7 +547,7 @@
p_ioctl->pdata;
/* Get the kernel QP handle. */
- h_qp = (ib_qp_handle_t VOID_PTR64)al_hdl_ref(
+ h_qp = (ib_qp_handle_t )al_hdl_ref(
p_context->h_al, (uint64_t)p_ioctl->cm_lap.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -577,7 +577,7 @@
{
al_dev_open_context_t *p_context;
ual_cep_apr_ioctl_t *p_ioctl;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
AL_ENTER( AL_DBG_CM );
@@ -600,7 +600,7 @@
p_ioctl->in.cm_apr.p_apr_pdata = p_ioctl->in.pdata;
/* Get the kernel QP handle. */
- h_qp = (ib_qp_handle_t VOID_PTR64)al_hdl_ref(
+ h_qp = (ib_qp_handle_t )al_hdl_ref(
p_context->h_al, (uint64_t)p_ioctl->in.cm_apr.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -898,7 +898,7 @@
{
al_dev_open_context_t *p_context;
ual_cep_get_pdata_ioctl_t *p_ioctl;
- ib_qp_handle_t VOID_PTR64 h_qp = NULL;
+ ib_qp_handle_t h_qp = NULL;
net32_t cid;
ib_api_status_t status;
cl_status_t cl_status;
@@ -925,7 +925,7 @@
if ( p_ioctl->in.h_qp )
{
/* Get the kernel QP handle. */
- h_qp = (ib_qp_handle_t VOID_PTR64)al_hdl_ref(
+ h_qp = (ib_qp_handle_t )al_hdl_ref(
p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
Index: core/al/kernel/al_proxy_cm.c
===================================================================
--- core/al/kernel/al_proxy_cm.c (revision 1094)
+++ core/al/kernel/al_proxy_cm.c (working copy)
@@ -68,7 +68,7 @@
{
p_cm_req_rec->h_cm_listen->obj.hdl_valid = TRUE;
p_ioctl_rec->req_rec.h_cm_listen =
- (ib_listen_handle_t VOID_PTR64)p_cm_req_rec->h_cm_listen->obj.hdl;
+ (ib_listen_handle_t )p_cm_req_rec->h_cm_listen->obj.hdl;
}
p_context = p_cm_req_rec->h_cm_req->h_al->p_context;
@@ -213,7 +213,7 @@
CL_ASSERT( p_cm_rtu_rec->h_qp );
p_context = p_cm_rtu_rec->h_qp->obj.h_al->p_context;
- p_ioctl_rec->rtu_rec.h_qp = (ib_qp_handle_t VOID_PTR64)p_cm_rtu_rec->h_qp->obj.hdl;
+ p_ioctl_rec->rtu_rec.h_qp = (ib_qp_handle_t )p_cm_rtu_rec->h_qp->obj.hdl;
cl_memcpy( &p_ioctl_rec->rtu_pdata,
p_cm_rtu_rec->p_rtu_pdata, IB_RTU_PDATA_SIZE );
@@ -354,7 +354,7 @@
CL_ASSERT( p_cm_drep_rec->h_qp );
p_context = p_cm_drep_rec->h_qp->obj.h_al->p_context;
- p_ioctl_rec->drep_rec.h_qp = (ib_qp_handle_t VOID_PTR64)p_cm_drep_rec->h_qp->obj.hdl;
+ p_ioctl_rec->drep_rec.h_qp = (ib_qp_handle_t )p_cm_drep_rec->h_qp->obj.hdl;
/*
* If we're already closing the device - do not queue a callback, since
@@ -391,7 +391,7 @@
p_ioctl_rec->mra_rec.p_mra_pdata = NULL;
CL_ASSERT( p_cm_mra_rec->h_qp );
- p_ioctl_rec->mra_rec.h_qp = (ib_qp_handle_t VOID_PTR64)p_cm_mra_rec->h_qp->obj.hdl;
+ p_ioctl_rec->mra_rec.h_qp = (ib_qp_handle_t )p_cm_mra_rec->h_qp->obj.hdl;
p_context = p_cm_mra_rec->h_qp->obj.h_al->p_context;
/*
@@ -443,7 +443,7 @@
}
CL_ASSERT( p_cm_rej_rec->h_qp );
- p_ioctl_rec->rej_rec.h_qp = (ib_qp_handle_t VOID_PTR64)p_cm_rej_rec->h_qp->obj.hdl;
+ p_ioctl_rec->rej_rec.h_qp = (ib_qp_handle_t )p_cm_rej_rec->h_qp->obj.hdl;
p_context = p_cm_rej_rec->h_qp->obj.h_al->p_context;
/*
@@ -555,7 +555,7 @@
p_ioctl_rec->apr_rec.p_apr_pdata = NULL;
p_context = p_cm_apr_rec->h_qp->obj.h_al->p_context;
- p_ioctl_rec->apr_rec.h_qp = (ib_qp_handle_t VOID_PTR64)p_cm_apr_rec->h_qp->obj.hdl;
+ p_ioctl_rec->apr_rec.h_qp = (ib_qp_handle_t )p_cm_apr_rec->h_qp->obj.hdl;
/*
* If we're already closing the device - do not queue a callback, since
@@ -598,7 +598,7 @@
cb_info.rec_type = LISTEN_ERROR_REC;
cb_info.ioctl_rec.listen_err = *p_err_rec;
cb_info.ioctl_rec.listen_err.h_cm_listen =
- (ib_listen_handle_t VOID_PTR64)p_err_rec->h_cm_listen->obj.hdl;
+ (ib_listen_handle_t )p_err_rec->h_cm_listen->obj.hdl;
/* Proxy handle must be valid now. */
if( !p_err_rec->h_cm_listen->obj.hdl_valid )
@@ -622,7 +622,7 @@
(ual_cm_req_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
size_t in_buf_sz;
uint8_t *p_buf;
@@ -661,7 +661,7 @@
if( p_ioctl->in.cm_req.qp_type == IB_QPT_RELIABLE_CONN ||
p_ioctl->in.cm_req.qp_type == IB_QPT_UNRELIABLE_CONN )
{
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -725,7 +725,7 @@
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
ib_cm_handle_t h_cm_req;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
size_t in_buf_sz;
AL_ENTER( AL_DBG_CM );
@@ -753,7 +753,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate QP handle. */
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -804,7 +804,7 @@
(ual_cm_dreq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
size_t in_buf_sz;
AL_ENTER( AL_DBG_CM );
@@ -835,7 +835,7 @@
if( p_ioctl->in.cm_dreq.qp_type == IB_QPT_RELIABLE_CONN ||
p_ioctl->in.cm_dreq.qp_type == IB_QPT_UNRELIABLE_CONN )
{
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -934,7 +934,7 @@
{
ual_cm_listen_ioctl_t *p_ioctl =
(ual_cm_listen_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
- ib_listen_handle_t VOID_PTR64 h_listen;
+ ib_listen_handle_t h_listen;
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
size_t in_buf_sz;
@@ -1004,7 +1004,7 @@
{
ual_cm_cancel_ioctl_t *p_ioctl =
(ual_cm_cancel_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
- ib_listen_handle_t VOID_PTR64 h_cm_listen;
+ ib_listen_handle_t h_cm_listen;
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
@@ -1023,7 +1023,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate listen handle. */
- h_cm_listen = (ib_listen_handle_t VOID_PTR64)al_hdl_ref(
+ h_cm_listen = (ib_listen_handle_t )al_hdl_ref(
p_context->h_al, p_ioctl->in.h_cm_listen, AL_OBJ_TYPE_H_LISTEN );
if( !h_cm_listen )
{
@@ -1237,7 +1237,7 @@
(ual_cm_lap_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
size_t in_buf_sz;
AL_ENTER( AL_DBG_CM );
@@ -1265,7 +1265,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate qp handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -1281,7 +1281,7 @@
if( p_ioctl->in.cm_lap.p_lap_pdata )
{
p_ioctl->in.cm_lap.p_lap_pdata =
- (uint8_t* VOID_PTR64)((&p_ioctl->in.cm_lap.p_lap_pdata) + 1);
+ (uint8_t* )((&p_ioctl->in.cm_lap.p_lap_pdata) + 1);
}
p_ioctl->out.status = ib_cm_lap( &p_ioctl->in.cm_lap );
@@ -1304,7 +1304,7 @@
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
ib_cm_handle_t h_cm_lap;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
size_t in_buf_sz;
uint8_t *p_buf;
@@ -1342,7 +1342,7 @@
}
/* Validate qp handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
Index: core/al/kernel/al_proxy_ndi.c
===================================================================
--- core/al/kernel/al_proxy_ndi.c (revision 1094)
+++ core/al/kernel/al_proxy_ndi.c (working copy)
@@ -72,8 +72,8 @@
(ual_create_cq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_ca_handle_t h_ca;
+ ib_cq_handle_t h_cq;
ib_cq_create_t cq_create;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -91,7 +91,7 @@
}
/* Validate CA handle */
- h_ca = (ib_ca_handle_t VOID_PTR64)
+ h_ca = (ib_ca_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_ca, AL_OBJ_TYPE_H_CA );
if( !h_ca )
{
@@ -159,7 +159,7 @@
cl_status_t cl_status;
ual_ndi_notify_cq_ioctl_in_t *p_ioctl;
al_dev_open_context_t *p_context;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
UNUSED_PARAM(p_ret_bytes);
AL_ENTER( AL_DBG_NDI );
@@ -175,7 +175,7 @@
}
/* Validate CQ handle */
- h_cq = (ib_cq_handle_t VOID_PTR64)
+ h_cq = (ib_cq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->h_cq, AL_OBJ_TYPE_H_CQ );
if( !h_cq )
{
@@ -203,7 +203,7 @@
OUT size_t *p_ret_bytes )
{
cl_status_t cl_status;
- ib_cq_handle_t VOID_PTR64 h_cq = NULL;
+ ib_cq_handle_t h_cq = NULL;
al_dev_open_context_t *p_context;
UNUSED_PARAM(p_ret_bytes);
@@ -219,7 +219,7 @@
}
/* Validate CQ handle */
- h_cq = (ib_cq_handle_t VOID_PTR64)
+ h_cq = (ib_cq_handle_t )
al_hdl_ref( p_context->h_al,
*(uint64_t*)cl_ioctl_in_buf( h_ioctl ), AL_OBJ_TYPE_H_CQ );
if( !h_cq )
@@ -247,7 +247,7 @@
{
cl_status_t cl_status;
ib_api_status_t status;
- ib_qp_handle_t VOID_PTR64 h_qp = NULL;
+ ib_qp_handle_t h_qp = NULL;
al_dev_open_context_t *p_context;
ual_ndi_modify_qp_ioctl_in_t *p_req =
(ual_ndi_modify_qp_ioctl_in_t*)cl_ioctl_in_buf( h_ioctl );
@@ -266,7 +266,7 @@
}
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)al_hdl_ref( p_context->h_al, p_req->h_qp, AL_OBJ_TYPE_H_QP );
+ h_qp = (ib_qp_handle_t )al_hdl_ref( p_context->h_al, p_req->h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
cl_status = CL_INVALID_HANDLE;
@@ -310,7 +310,7 @@
OUT size_t *p_ret_bytes )
{
cl_status_t cl_status;
- ib_qp_handle_t VOID_PTR64 h_qp = NULL;
+ ib_qp_handle_t h_qp = NULL;
al_dev_open_context_t *p_context;
ual_ndi_req_cm_ioctl_in_t *p_parm, *p_req =
(ual_ndi_req_cm_ioctl_in_t*)cl_ioctl_in_buf( h_ioctl );
@@ -328,7 +328,7 @@
}
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)al_hdl_ref( p_context->h_al, p_req->h_qp, AL_OBJ_TYPE_H_QP );
+ h_qp = (ib_qp_handle_t )al_hdl_ref( p_context->h_al, p_req->h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
cl_status = CL_INVALID_HANDLE;
@@ -377,7 +377,7 @@
OUT size_t *p_ret_bytes )
{
cl_status_t cl_status;
- ib_qp_handle_t VOID_PTR64 h_qp = NULL;
+ ib_qp_handle_t h_qp = NULL;
al_dev_open_context_t *p_context;
net32_t cid;
ual_ndi_rep_cm_ioctl_in_t *p_rep =
@@ -397,7 +397,7 @@
}
/* Get and validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)al_hdl_ref( p_context->h_al, p_rep->h_qp, AL_OBJ_TYPE_H_QP );
+ h_qp = (ib_qp_handle_t )al_hdl_ref( p_context->h_al, p_rep->h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
cl_status = CL_INVALID_HANDLE;
@@ -487,7 +487,7 @@
OUT size_t *p_ret_bytes )
{
cl_status_t cl_status;
- ib_qp_handle_t VOID_PTR64 h_qp = NULL;
+ ib_qp_handle_t h_qp = NULL;
al_dev_open_context_t *p_context;
ual_ndi_rtu_cm_ioctl_in_t *p_rtu =
(ual_ndi_rtu_cm_ioctl_in_t*)cl_ioctl_in_buf( h_ioctl );
@@ -506,7 +506,7 @@
}
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)al_hdl_ref( p_context->h_al, p_rtu->h_qp, AL_OBJ_TYPE_H_QP );
+ h_qp = (ib_qp_handle_t )al_hdl_ref( p_context->h_al, p_rtu->h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
cl_status = CL_INVALID_HANDLE;
@@ -538,7 +538,7 @@
OUT size_t *p_ret_bytes )
{
cl_status_t cl_status;
- ib_qp_handle_t VOID_PTR64 h_qp = NULL;
+ ib_qp_handle_t h_qp = NULL;
al_dev_open_context_t *p_context;
UNUSED_PARAM(p_ret_bytes);
@@ -555,7 +555,7 @@
}
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)al_hdl_ref( p_context->h_al,
+ h_qp = (ib_qp_handle_t )al_hdl_ref( p_context->h_al,
*(uint64_t*)cl_ioctl_in_buf( h_ioctl ), AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
Index: core/al/kernel/al_proxy_subnet.c
===================================================================
--- core/al/kernel/al_proxy_subnet.c (revision 1094)
+++ core/al/kernel/al_proxy_subnet.c (working copy)
@@ -56,7 +56,7 @@
#include "al_proxy.h"
-extern ib_pool_handle_t VOID_PTR64 gh_mad_pool;
+extern ib_pool_handle_t gh_mad_pool;
@@ -380,9 +380,9 @@
(ual_send_mad_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
- ib_pool_key_t VOID_PTR64 pool_key = NULL;
- ib_av_handle_t VOID_PTR64 h_av = NULL;
+ ib_mad_svc_handle_t h_mad_svc;
+ ib_pool_key_t pool_key = NULL;
+ ib_av_handle_t h_av = NULL;
ib_mad_element_t *p_mad_el;
al_mad_element_t *p_al_el;
ib_mad_t *p_mad_buf, *p_usr_buf;
@@ -400,7 +400,7 @@
}
/* Validate mad svc handle. */
- h_mad_svc = (ib_mad_svc_handle_t VOID_PTR64)al_hdl_ref(
+ h_mad_svc = (ib_mad_svc_handle_t )al_hdl_ref(
p_context->h_al, p_ioctl->in.h_mad_svc, AL_OBJ_TYPE_H_MAD_SVC );
if( !h_mad_svc )
{
@@ -409,7 +409,7 @@
}
/* Validate the pool key */
- pool_key = (ib_pool_key_t VOID_PTR64)al_hdl_ref(
+ pool_key = (ib_pool_key_t )al_hdl_ref(
p_context->h_al, p_ioctl->in.pool_key, AL_OBJ_TYPE_H_POOL_KEY );
if( !pool_key )
{
@@ -420,7 +420,7 @@
/* Validate the AV handle in the mad element if it is not NULL. */
if( p_ioctl->in.h_av )
{
- h_av = (ib_av_handle_t VOID_PTR64)
+ h_av = (ib_av_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_av, AL_OBJ_TYPE_H_AV );
if( !h_av )
{
@@ -630,7 +630,7 @@
static void
__proxy_mad_send_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
@@ -676,7 +676,7 @@
static void
__proxy_mad_recv_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
@@ -696,7 +696,7 @@
cb_info.ioctl_rec.mad_recv_cb_ioctl_rec.mad_svc_context = mad_svc_context;
cb_info.ioctl_rec.mad_recv_cb_ioctl_rec.elem_size = p_mad_element->size;
cb_info.ioctl_rec.mad_recv_cb_ioctl_rec.p_send_mad =
- (ib_mad_element_t* VOID_PTR64)p_mad_element->send_context1;
+ (ib_mad_element_t* )p_mad_element->send_context1;
/*
* If we're already closing the device - do not queue a callback, since
@@ -744,8 +744,8 @@
(ual_reg_mad_svc_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_qp_handle_t VOID_PTR64 h_qp;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_qp_handle_t h_qp;
+ ib_mad_svc_handle_t h_mad_svc;
AL_ENTER( AL_DBG_MAD );
@@ -762,7 +762,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -808,7 +808,7 @@
{
ual_dereg_mad_svc_ioctl_t *p_ioctl;
al_dev_open_context_t *p_context;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
AL_ENTER( AL_DBG_MAD );
@@ -828,7 +828,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate MAD service. */
- h_mad_svc = (ib_mad_svc_handle_t VOID_PTR64)al_hdl_ref(
+ h_mad_svc = (ib_mad_svc_handle_t )al_hdl_ref(
p_context->h_al, p_ioctl->in.h_mad_svc, AL_OBJ_TYPE_H_MAD_SVC );
if( !h_mad_svc )
{
@@ -862,8 +862,8 @@
(ual_reg_mad_pool_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_pd_handle_t VOID_PTR64 h_pd;
- ib_pool_key_t VOID_PTR64 pool_key;
+ ib_pd_handle_t h_pd;
+ ib_pool_key_t pool_key;
AL_ENTER( AL_DBG_MAD );
@@ -880,7 +880,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate PD handle */
- h_pd = (ib_pd_handle_t VOID_PTR64)
+ h_pd = (ib_pd_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_pd, AL_OBJ_TYPE_H_PD );
if( !h_pd )
{
@@ -934,7 +934,7 @@
(ual_dereg_mad_pool_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_pool_key_t VOID_PTR64 pool_key;
+ ib_pool_key_t pool_key;
AL_ENTER( AL_DBG_MAD );
@@ -952,7 +952,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate pool key */
- pool_key = (ib_pool_key_t VOID_PTR64)al_hdl_ref(
+ pool_key = (ib_pool_key_t )al_hdl_ref(
p_context->h_al, p_ioctl->in.pool_key, AL_OBJ_TYPE_H_POOL_KEY );
if( !pool_key )
{
@@ -985,7 +985,7 @@
{
ual_cancel_mad_ioctl_t *p_ioctl;
al_dev_open_context_t *p_context;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
AL_ENTER( AL_DBG_MAD );
@@ -1005,7 +1005,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate MAD service handle. */
- h_mad_svc = (ib_mad_svc_handle_t VOID_PTR64)al_hdl_ref(
+ h_mad_svc = (ib_mad_svc_handle_t )al_hdl_ref(
p_context->h_al, p_ioctl->in.h_mad_svc, AL_OBJ_TYPE_H_MAD_SVC );
if( !h_mad_svc )
{
@@ -1039,7 +1039,7 @@
(ual_local_mad_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_api_status_t status;
AL_ENTER( AL_DBG_MAD );
@@ -1062,7 +1062,7 @@
}
/* Validate CA handle */
- h_ca = (ib_ca_handle_t VOID_PTR64)
+ h_ca = (ib_ca_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_ca, AL_OBJ_TYPE_H_CA );
if( !h_ca )
{
Index: core/al/kernel/al_proxy_verbs.c
===================================================================
--- core/al/kernel/al_proxy_verbs.c (revision 1094)
+++ core/al/kernel/al_proxy_verbs.c (working copy)
@@ -334,7 +334,7 @@
proxy_ca_err_cb(
IN ib_async_event_rec_t *p_err_rec)
{
- ib_ca_handle_t VOID_PTR64 h_ca = p_err_rec->handle.h_ca;
+ ib_ca_handle_t h_ca = p_err_rec->handle.h_ca;
al_dev_open_context_t *p_context = h_ca->obj.h_al->p_context;
misc_cb_ioctl_info_t cb_info;
@@ -352,7 +352,7 @@
cb_info.rec_type = CA_ERROR_REC;
/* Return the Proxy's open_ca handle and the user's context */
cb_info.ioctl_rec.event_rec = *p_err_rec;
- cb_info.ioctl_rec.event_rec.handle.h_ca = (ib_ca_handle_t VOID_PTR64)h_ca->obj.hdl;
+ cb_info.ioctl_rec.event_rec.handle.h_ca = (ib_ca_handle_t )h_ca->obj.hdl;
/* The proxy handle must be valid now. */
if( !h_ca->obj.hdl_valid )
@@ -380,7 +380,7 @@
(ual_open_ca_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -446,7 +446,7 @@
(ual_query_ca_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_ca_attr_t *p_ca_attr = NULL;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -467,7 +467,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate CA handle */
- h_ca = (ib_ca_handle_t VOID_PTR64)
+ h_ca = (ib_ca_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_ca, AL_OBJ_TYPE_H_CA );
if( !h_ca )
{
@@ -552,7 +552,7 @@
(ual_modify_ca_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
AL_ENTER( AL_DBG_CA );
@@ -569,7 +569,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate CA handle */
- h_ca = (ib_ca_handle_t VOID_PTR64)
+ h_ca = (ib_ca_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_ca, AL_OBJ_TYPE_H_CA );
if( !h_ca )
{
@@ -602,7 +602,7 @@
(ual_close_ca_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
AL_ENTER( AL_DBG_CA );
@@ -619,7 +619,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate CA handle */
- h_ca = (ib_ca_handle_t VOID_PTR64)
+ h_ca = (ib_ca_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_ca, AL_OBJ_TYPE_H_CA );
if( !h_ca )
{
@@ -649,7 +649,7 @@
IN al_dev_open_context_t* const p_context,
IN uint64_t* const um_handle_array,
IN uint32_t num_handles,
- OUT void* FUNC_PTR64 * const p_handle_array )
+ OUT void* * const p_handle_array )
{
uint32_t i;
@@ -685,11 +685,11 @@
(ual_ci_call_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ci_umv_buf_t *p_umv_buf = NULL;
void* p_ci_op_buf = NULL;
void* p_ci_op_user_buf = NULL;
- void* VOID_PTR64 * p_handle_array = NULL;
+ void* * p_handle_array = NULL;
size_t ci_op_buf_size;
ib_api_status_t status;
uint32_t num_handles;
@@ -719,7 +719,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate CA handle */
- h_ca = (ib_ca_handle_t VOID_PTR64)
+ h_ca = (ib_ca_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_ca, AL_OBJ_TYPE_H_CA );
if( !h_ca )
{
@@ -734,7 +734,7 @@
/* Validate the handle array */
if( num_handles )
{
- p_handle_array = cl_malloc( sizeof(void* VOID_PTR64) * num_handles );
+ p_handle_array = cl_malloc( sizeof(void* ) * num_handles );
if( !p_handle_array )
{
p_ioctl->out.status = IB_INSUFFICIENT_MEMORY;
@@ -819,7 +819,7 @@
if( p_handle_array )
{
while( num_handles-- )
- deref_al_obj( (al_obj_t* VOID_PTR64)p_handle_array[num_handles] );
+ deref_al_obj( (al_obj_t* )p_handle_array[num_handles] );
cl_free( p_handle_array );
}
if( p_ci_op_buf )
@@ -850,8 +850,8 @@
(ual_alloc_pd_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_ca_handle_t h_ca;
+ ib_pd_handle_t h_pd;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -867,7 +867,7 @@
}
/* Validate CA handle */
- h_ca = (ib_ca_handle_t VOID_PTR64)
+ h_ca = (ib_ca_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_ca, AL_OBJ_TYPE_H_CA );
if( !h_ca )
{
@@ -926,7 +926,7 @@
(ual_dealloc_pd_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
AL_ENTER( AL_DBG_PD );
@@ -943,7 +943,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate PD handle */
- h_pd = (ib_pd_handle_t VOID_PTR64)al_hdl_ref(
+ h_pd = (ib_pd_handle_t )al_hdl_ref(
p_context->h_al, p_ioctl->in.h_pd, AL_OBJ_TYPE_H_PD );
if( !h_pd )
{
@@ -967,7 +967,7 @@
proxy_srq_err_cb(
IN ib_async_event_rec_t *p_err_rec )
{
- ib_srq_handle_t VOID_PTR64 h_srq = p_err_rec->handle.h_srq;
+ ib_srq_handle_t h_srq = p_err_rec->handle.h_srq;
al_dev_open_context_t *p_context = h_srq->obj.h_al->p_context;
misc_cb_ioctl_info_t cb_info;
@@ -987,7 +987,7 @@
cb_info.rec_type = SRQ_ERROR_REC;
/* Return the Proxy's SRQ handle and the user's context */
cb_info.ioctl_rec.event_rec = *p_err_rec;
- cb_info.ioctl_rec.event_rec.handle.h_srq = (ib_srq_handle_t VOID_PTR64)h_srq->obj.hdl;
+ cb_info.ioctl_rec.event_rec.handle.h_srq = (ib_srq_handle_t )h_srq->obj.hdl;
/* The proxy handle must be valid now. */
if( !h_srq->obj.hdl_valid )
@@ -1016,8 +1016,8 @@
(ual_create_srq_ioctl_t*)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_pd_handle_t VOID_PTR64 h_pd;
- ib_srq_handle_t VOID_PTR64 h_srq;
+ ib_pd_handle_t h_pd;
+ ib_srq_handle_t h_srq;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
ib_pfn_event_cb_t pfn_ev;
@@ -1034,7 +1034,7 @@
}
/* Validate handles. */
- h_pd = (ib_pd_handle_t VOID_PTR64)
+ h_pd = (ib_pd_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_pd, AL_OBJ_TYPE_H_PD );
if( !h_pd)
{
@@ -1097,7 +1097,7 @@
(ual_query_srq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_srq_handle_t VOID_PTR64 h_srq;
+ ib_srq_handle_t h_srq;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -1113,7 +1113,7 @@
}
/* Validate SRQ handle */
- h_srq = (ib_srq_handle_t VOID_PTR64)
+ h_srq = (ib_srq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_srq, AL_OBJ_TYPE_H_SRQ );
if( !h_srq )
{
@@ -1164,7 +1164,7 @@
(ual_modify_srq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_srq_handle_t VOID_PTR64 h_srq;
+ ib_srq_handle_t h_srq;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -1180,7 +1180,7 @@
}
/* Validate SRQ handle */
- h_srq = (ib_srq_handle_t VOID_PTR64)
+ h_srq = (ib_srq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_srq, AL_OBJ_TYPE_H_SRQ );
if( !h_srq )
{
@@ -1229,7 +1229,7 @@
(ual_destroy_srq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_srq_handle_t VOID_PTR64 h_srq;
+ ib_srq_handle_t h_srq;
AL_ENTER( AL_DBG_SRQ );
@@ -1246,7 +1246,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate SRQ handle */
- h_srq = (ib_srq_handle_t VOID_PTR64)
+ h_srq = (ib_srq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_srq, AL_OBJ_TYPE_H_SRQ );
if( !h_srq )
{
@@ -1271,7 +1271,7 @@
proxy_qp_err_cb(
IN ib_async_event_rec_t *p_err_rec )
{
- ib_qp_handle_t VOID_PTR64 h_qp = p_err_rec->handle.h_qp;
+ ib_qp_handle_t h_qp = p_err_rec->handle.h_qp;
al_dev_open_context_t *p_context = h_qp->obj.h_al->p_context;
misc_cb_ioctl_info_t cb_info;
@@ -1291,7 +1291,7 @@
cb_info.rec_type = QP_ERROR_REC;
/* Return the Proxy's QP handle and the user's context */
cb_info.ioctl_rec.event_rec = *p_err_rec;
- cb_info.ioctl_rec.event_rec.handle.h_qp = (ib_qp_handle_t VOID_PTR64)h_qp->obj.hdl;
+ cb_info.ioctl_rec.event_rec.handle.h_qp = (ib_qp_handle_t )h_qp->obj.hdl;
/* The proxy handle must be valid now. */
if( !h_qp->obj.hdl_valid )
@@ -1322,10 +1322,10 @@
(ual_create_qp_ioctl_t*)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_pd_handle_t VOID_PTR64 h_pd;
- ib_qp_handle_t VOID_PTR64 h_qp;
- ib_srq_handle_t VOID_PTR64 h_srq = NULL;
- ib_cq_handle_t VOID_PTR64 h_sq_cq, h_rq_cq;
+ ib_pd_handle_t h_pd;
+ ib_qp_handle_t h_qp;
+ ib_srq_handle_t h_srq = NULL;
+ ib_cq_handle_t h_sq_cq, h_rq_cq;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
ib_pfn_event_cb_t pfn_ev;
@@ -1342,14 +1342,14 @@
}
/* Validate handles. */
- h_pd = (ib_pd_handle_t VOID_PTR64)
+ h_pd = (ib_pd_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_pd, AL_OBJ_TYPE_H_PD );
- h_sq_cq = (ib_cq_handle_t VOID_PTR64)al_hdl_ref( p_context->h_al,
+ h_sq_cq = (ib_cq_handle_t )al_hdl_ref( p_context->h_al,
(uint64_t)p_ioctl->in.qp_create.h_sq_cq, AL_OBJ_TYPE_H_CQ );
- h_rq_cq = (ib_cq_handle_t VOID_PTR64)al_hdl_ref( p_context->h_al,
+ h_rq_cq = (ib_cq_handle_t )al_hdl_ref( p_context->h_al,
(uint64_t)p_ioctl->in.qp_create.h_rq_cq, AL_OBJ_TYPE_H_CQ );
if (p_ioctl->in.qp_create.h_srq) {
- h_srq = (ib_srq_handle_t VOID_PTR64)al_hdl_ref( p_context->h_al,
+ h_srq = (ib_srq_handle_t )al_hdl_ref( p_context->h_al,
(uint64_t)p_ioctl->in.qp_create.h_srq, AL_OBJ_TYPE_H_SRQ );
if( !h_srq)
{
@@ -1453,7 +1453,7 @@
(ual_query_qp_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -1469,7 +1469,7 @@
}
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -1491,7 +1491,7 @@
if( p_ioctl->out.attr.h_pd )
{
p_ioctl->out.attr.h_pd =
- (ib_pd_handle_t VOID_PTR64)p_ioctl->out.attr.h_pd->obj.hdl;
+ (ib_pd_handle_t )p_ioctl->out.attr.h_pd->obj.hdl;
}
else
{
@@ -1500,7 +1500,7 @@
if( p_ioctl->out.attr.h_sq_cq )
{
p_ioctl->out.attr.h_sq_cq =
- (ib_cq_handle_t VOID_PTR64)p_ioctl->out.attr.h_sq_cq->obj.hdl;
+ (ib_cq_handle_t )p_ioctl->out.attr.h_sq_cq->obj.hdl;
}
else
{
@@ -1509,7 +1509,7 @@
if( p_ioctl->out.attr.h_rq_cq )
{
p_ioctl->out.attr.h_rq_cq =
- (ib_cq_handle_t VOID_PTR64)p_ioctl->out.attr.h_rq_cq->obj.hdl;
+ (ib_cq_handle_t )p_ioctl->out.attr.h_rq_cq->obj.hdl;
}
else
{
@@ -1518,7 +1518,7 @@
if( p_ioctl->out.attr.h_srq )
{
p_ioctl->out.attr.h_srq =
- (ib_srq_handle_t VOID_PTR64)p_ioctl->out.attr.h_srq->obj.hdl;
+ (ib_srq_handle_t )p_ioctl->out.attr.h_srq->obj.hdl;
}
else
{
@@ -1559,7 +1559,7 @@
(ual_modify_qp_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -1575,7 +1575,7 @@
}
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -1624,7 +1624,7 @@
(ual_destroy_qp_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
AL_ENTER( AL_DBG_QP );
@@ -1641,7 +1641,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -1674,8 +1674,8 @@
(ual_create_av_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_pd_handle_t VOID_PTR64 h_pd;
- ib_av_handle_t VOID_PTR64 h_av;
+ ib_pd_handle_t h_pd;
+ ib_av_handle_t h_av;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -1691,7 +1691,7 @@
}
/* Validate PD handle */
- h_pd = (ib_pd_handle_t VOID_PTR64)
+ h_pd = (ib_pd_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_pd, AL_OBJ_TYPE_H_PD );
if( !h_pd )
{
@@ -1752,8 +1752,8 @@
(ual_query_av_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_av_handle_t VOID_PTR64 h_av;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_av_handle_t h_av;
+ ib_pd_handle_t h_pd;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -1769,7 +1769,7 @@
}
/* Validate AV handle */
- h_av = (ib_av_handle_t VOID_PTR64)
+ h_av = (ib_av_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_av, AL_OBJ_TYPE_H_AV );
if( !h_av )
{
@@ -1827,7 +1827,7 @@
(ual_modify_av_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_av_handle_t VOID_PTR64 h_av;
+ ib_av_handle_t h_av;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -1843,7 +1843,7 @@
}
/* Validate AV handle */
- h_av = (ib_av_handle_t VOID_PTR64)
+ h_av = (ib_av_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_av, AL_OBJ_TYPE_H_AV );
if( !h_av )
{
@@ -1894,7 +1894,7 @@
(ual_destroy_av_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_av_handle_t VOID_PTR64 h_av;
+ ib_av_handle_t h_av;
AL_ENTER( AL_DBG_AV );
@@ -1911,7 +1911,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate AV handle */
- h_av = (ib_av_handle_t VOID_PTR64)
+ h_av = (ib_av_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_av, AL_OBJ_TYPE_H_AV );
if( !h_av )
{
@@ -1943,7 +1943,7 @@
(ual_modify_cq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
uint32_t size;
@@ -1960,7 +1960,7 @@
}
/* Validate CQ handle */
- h_cq = (ib_cq_handle_t VOID_PTR64)
+ h_cq = (ib_cq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_cq, AL_OBJ_TYPE_H_CQ );
if( !h_cq )
{
@@ -2007,7 +2007,7 @@
*/
static void
proxy_cq_comp_cb(
- IN ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN ib_cq_handle_t h_cq,
IN void *cq_context )
{
comp_cb_ioctl_info_t cb_info;
@@ -2045,7 +2045,7 @@
proxy_cq_err_cb(
IN ib_async_event_rec_t *p_err_rec)
{
- ib_cq_handle_t VOID_PTR64 h_cq = p_err_rec->handle.h_cq;
+ ib_cq_handle_t h_cq = p_err_rec->handle.h_cq;
al_dev_open_context_t *p_context = h_cq->obj.h_al->p_context;
misc_cb_ioctl_info_t cb_info;
@@ -2063,7 +2063,7 @@
cb_info.rec_type = CQ_ERROR_REC;
/* Return the Proxy's cq handle and the user's context */
cb_info.ioctl_rec.event_rec = *p_err_rec;
- cb_info.ioctl_rec.event_rec.handle.h_cq = (ib_cq_handle_t VOID_PTR64)h_cq->obj.hdl;
+ cb_info.ioctl_rec.event_rec.handle.h_cq = (ib_cq_handle_t )h_cq->obj.hdl;
/* The proxy handle must be valid now. */
if( !h_cq->obj.hdl_valid )
@@ -2089,8 +2089,8 @@
(ual_create_cq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_ca_handle_t h_ca;
+ ib_cq_handle_t h_cq;
ib_cq_create_t cq_create;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -2108,7 +2108,7 @@
}
/* Validate CA handle */
- h_ca = (ib_ca_handle_t VOID_PTR64)
+ h_ca = (ib_ca_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_ca, AL_OBJ_TYPE_H_CA );
if( !h_ca )
{
@@ -2198,7 +2198,7 @@
(ual_query_cq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -2214,7 +2214,7 @@
}
/* Validate CQ handle */
- h_cq = (ib_cq_handle_t VOID_PTR64)
+ h_cq = (ib_cq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_cq, AL_OBJ_TYPE_H_CQ );
if( !h_cq )
{
@@ -2265,7 +2265,7 @@
(ual_destroy_cq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
cl_waitobj_handle_t h_wait_obj;
AL_ENTER( AL_DBG_CQ );
@@ -2283,7 +2283,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate CQ handle */
- h_cq = (ib_cq_handle_t VOID_PTR64)
+ h_cq = (ib_cq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_cq, AL_OBJ_TYPE_H_CQ );
if( !h_cq )
{
@@ -2321,8 +2321,8 @@
(ual_post_send_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_qp_handle_t VOID_PTR64 h_qp;
- ib_av_handle_t VOID_PTR64 h_av;
+ ib_qp_handle_t h_qp;
+ ib_av_handle_t h_av;
ib_send_wr_t *p_wr;
ib_send_wr_t *p_send_failure;
uintn_t i = 0;
@@ -2359,7 +2359,7 @@
p_send_failure = p_wr = p_ioctl->in.send_wr;
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -2376,7 +2376,7 @@
if( h_qp->type == IB_QPT_UNRELIABLE_DGRM )
{
/* Validate the AV handle for UD */
- h_av = (ib_av_handle_t VOID_PTR64)al_hdl_ref( p_context->h_al,
+ h_av = (ib_av_handle_t )al_hdl_ref( p_context->h_al,
(uint64_t)p_wr[i].dgrm.ud.h_av, AL_OBJ_TYPE_H_AV );
if( !h_av )
{
@@ -2466,7 +2466,7 @@
(ual_post_recv_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
ib_recv_wr_t *p_wr;
ib_recv_wr_t *p_recv_failure;
uintn_t i;
@@ -2504,7 +2504,7 @@
p_recv_failure = p_wr = p_ioctl->in.recv_wr;
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -2587,7 +2587,7 @@
(ual_post_srq_recv_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_srq_handle_t VOID_PTR64 h_srq;
+ ib_srq_handle_t h_srq;
ib_recv_wr_t *p_wr;
ib_recv_wr_t *p_recv_failure;
uintn_t i;
@@ -2625,7 +2625,7 @@
p_recv_failure = p_wr = p_ioctl->in.recv_wr;
/* Validate SRQ handle */
- h_srq = (ib_srq_handle_t VOID_PTR64)
+ h_srq = (ib_srq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_srq, AL_OBJ_TYPE_H_QP );
if( !h_srq )
{
@@ -2707,7 +2707,7 @@
(ual_peek_cq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
AL_ENTER( AL_DBG_CQ );
@@ -2724,7 +2724,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate CQ handle */
- h_cq = (ib_cq_handle_t VOID_PTR64)
+ h_cq = (ib_cq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_cq, AL_OBJ_TYPE_H_CQ );
if( !h_cq )
{
@@ -2755,7 +2755,7 @@
{
ual_poll_cq_ioctl_t *p_ioctl;
al_dev_open_context_t *p_context;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
ib_wc_t *p_free_wc;
ib_wc_t *p_done_wc = NULL;
uint32_t i, num_wc;
@@ -2790,7 +2790,7 @@
}
/* Validate CQ handle. */
- h_cq = (ib_cq_handle_t VOID_PTR64)
+ h_cq = (ib_cq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_cq, AL_OBJ_TYPE_H_CQ );
if( !h_cq )
{
@@ -2858,7 +2858,7 @@
(ual_rearm_cq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
AL_ENTER( AL_DBG_CQ );
@@ -2875,7 +2875,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate CQ handle */
- h_cq = (ib_cq_handle_t VOID_PTR64)
+ h_cq = (ib_cq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_cq, AL_OBJ_TYPE_H_CQ );
if( !h_cq )
{
@@ -2908,7 +2908,7 @@
(ual_rearm_n_cq_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
AL_ENTER( AL_DBG_CQ );
@@ -2925,7 +2925,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate CQ handle */
- h_cq = (ib_cq_handle_t VOID_PTR64)
+ h_cq = (ib_cq_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_cq, AL_OBJ_TYPE_H_CQ );
if( !h_cq )
{
@@ -2957,8 +2957,8 @@
(ual_reg_mem_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_pd_handle_t VOID_PTR64 h_pd;
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_pd_handle_t h_pd;
+ ib_mr_handle_t h_mr;
ib_api_status_t status;
AL_ENTER( AL_DBG_MR );
@@ -2973,7 +2973,7 @@
}
/* Validate PD handle */
- h_pd = (ib_pd_handle_t VOID_PTR64)
+ h_pd = (ib_pd_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_pd, AL_OBJ_TYPE_H_PD );
if( !h_pd )
{
@@ -3030,7 +3030,7 @@
(ual_query_mr_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
ib_api_status_t status;
AL_ENTER( AL_DBG_MR );
@@ -3045,7 +3045,7 @@
}
/* Validate MR handle */
- h_mr = (ib_mr_handle_t VOID_PTR64)
+ h_mr = (ib_mr_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_mr, AL_OBJ_TYPE_H_MR );
if( !h_mr )
{
@@ -3059,7 +3059,7 @@
{
/* Replace the pd handle with proxy's handle */
p_ioctl->out.attr.h_pd =
- (ib_pd_handle_t VOID_PTR64)p_ioctl->out.attr.h_pd->obj.hdl;
+ (ib_pd_handle_t )p_ioctl->out.attr.h_pd->obj.hdl;
}
else
{
@@ -3092,8 +3092,8 @@
(ual_rereg_mem_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_mr_handle_t VOID_PTR64 h_mr;
- ib_pd_handle_t VOID_PTR64 h_pd = NULL;
+ ib_mr_handle_t h_mr;
+ ib_pd_handle_t h_pd = NULL;
ib_mr_create_t *p_mr_create;
ib_api_status_t status;
@@ -3109,7 +3109,7 @@
}
/* Validate MR handle */
- h_mr = (ib_mr_handle_t VOID_PTR64)
+ h_mr = (ib_mr_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_mr, AL_OBJ_TYPE_H_MR );
if( !h_mr )
{
@@ -3132,7 +3132,7 @@
goto proxy_modify_mr_err;
}
/* This is a modify PD request, validate the PD handle */
- h_pd = (ib_pd_handle_t VOID_PTR64)
+ h_pd = (ib_pd_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_pd, AL_OBJ_TYPE_H_PD );
if( !h_pd )
{
@@ -3188,8 +3188,8 @@
(ual_reg_shared_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_pd_handle_t VOID_PTR64 h_pd;
- ib_mr_handle_t VOID_PTR64 h_mr, h_cur_mr;
+ ib_pd_handle_t h_pd;
+ ib_mr_handle_t h_mr, h_cur_mr;
ib_api_status_t status;
uint64_t vaddr;
@@ -3209,7 +3209,7 @@
* in this process's context.
*/
/* Validate MR handle */
- h_cur_mr = (ib_mr_handle_t VOID_PTR64)
+ h_cur_mr = (ib_mr_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_mr, AL_OBJ_TYPE_H_MR );
if( !h_cur_mr )
{
@@ -3219,7 +3219,7 @@
}
/* Validate the PD handle */
- h_pd = (ib_pd_handle_t VOID_PTR64)
+ h_pd = (ib_pd_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_pd, AL_OBJ_TYPE_H_PD );
if( !h_pd )
{
@@ -3273,7 +3273,7 @@
(ual_dereg_mr_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
AL_ENTER( AL_DBG_MR );
@@ -3290,7 +3290,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate MR handle */
- h_mr = (ib_mr_handle_t VOID_PTR64)
+ h_mr = (ib_mr_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_mr, AL_OBJ_TYPE_H_MR );
if( !h_mr )
{
@@ -3323,8 +3323,8 @@
(ual_create_mw_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_pd_handle_t VOID_PTR64 h_pd;
- ib_mw_handle_t VOID_PTR64 h_mw;
+ ib_pd_handle_t h_pd;
+ ib_mw_handle_t h_mw;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -3340,7 +3340,7 @@
}
/* Validate PD handle */
- h_pd = (ib_pd_handle_t VOID_PTR64)
+ h_pd = (ib_pd_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_pd, AL_OBJ_TYPE_H_PD );
if( !h_pd )
{
@@ -3399,10 +3399,10 @@
(ual_query_mw_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_mw_handle_t VOID_PTR64 h_mw;
+ ib_mw_handle_t h_mw;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
AL_ENTER( AL_DBG_MW );
@@ -3416,7 +3416,7 @@
}
/* Validate MW handle */
- h_mw = (ib_mw_handle_t VOID_PTR64)
+ h_mw = (ib_mw_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_mw, AL_OBJ_TYPE_H_MW );
if( !h_mw )
{
@@ -3475,9 +3475,9 @@
(ual_bind_mw_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_mw_handle_t VOID_PTR64 h_mw;
- ib_qp_handle_t VOID_PTR64 h_qp;
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mw_handle_t h_mw;
+ ib_qp_handle_t h_qp;
+ ib_mr_handle_t h_mr;
ib_api_status_t status;
AL_ENTER( AL_DBG_MW );
@@ -3492,7 +3492,7 @@
}
/* Validate MW handle */
- h_mw = (ib_mw_handle_t VOID_PTR64)
+ h_mw = (ib_mw_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_mw, AL_OBJ_TYPE_H_MW );
if( !h_mw )
{
@@ -3501,7 +3501,7 @@
}
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
@@ -3510,7 +3510,7 @@
}
/* Validate MR handle */
- h_mr = (ib_mr_handle_t VOID_PTR64)al_hdl_ref( p_context->h_al,
+ h_mr = (ib_mr_handle_t )al_hdl_ref( p_context->h_al,
(uint64_t)p_ioctl->in.mw_bind.h_mr, AL_OBJ_TYPE_H_MR );
if( !h_mr )
{
@@ -3556,7 +3556,7 @@
(ual_destroy_mw_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_mw_handle_t VOID_PTR64 h_mw;
+ ib_mw_handle_t h_mw;
AL_ENTER( AL_DBG_MW );
@@ -3573,7 +3573,7 @@
*p_ret_bytes = sizeof(p_ioctl->out);
/* Validate MW handle */
- h_mw = (ib_mw_handle_t VOID_PTR64)
+ h_mw = (ib_mw_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_mw, AL_OBJ_TYPE_H_MW );
if( !h_mw )
{
@@ -3601,8 +3601,8 @@
(ual_spl_qp_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_pd_handle_t VOID_PTR64 h_pd;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_pd_handle_t h_pd;
+ ib_qp_handle_t h_qp;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -3618,7 +3618,7 @@
}
/* Validate pd handle */
- h_pd = (ib_pd_handle_t VOID_PTR64)
+ h_pd = (ib_pd_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_pd, AL_OBJ_TYPE_H_PD );
if( !h_pd )
{
@@ -3675,7 +3675,7 @@
(ual_attach_mcast_ioctl_t *)cl_ioctl_in_buf( h_ioctl );
al_dev_open_context_t *p_context =
(al_dev_open_context_t *)p_open_context;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
al_attach_handle_t h_attach;
ci_umv_buf_t *p_umv_buf = NULL;
ib_api_status_t status;
@@ -3692,7 +3692,7 @@
}
/* Validate QP handle */
- h_qp = (ib_qp_handle_t VOID_PTR64)
+ h_qp = (ib_qp_handle_t )
al_hdl_ref( p_context->h_al, p_ioctl->in.h_qp, AL_OBJ_TYPE_H_QP );
if( !h_qp )
{
Index: core/al/kernel/al_sa_req.c
===================================================================
--- core/al/kernel/al_sa_req.c (revision 1094)
+++ core/al/kernel/al_sa_req.c (working copy)
@@ -52,7 +52,7 @@
typedef struct _sa_req_mgr
{
al_obj_t obj; /* Child of gp_al_mgr */
- ib_pnp_handle_t VOID_PTR64 h_pnp; /* Handle for CA PnP events */
+ ib_pnp_handle_t h_pnp; /* Handle for CA PnP events */
} sa_req_mgr_t;
@@ -95,13 +95,13 @@
void
sa_req_send_comp_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad );
void
sa_req_recv_comp_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad );
@@ -232,7 +232,7 @@
{
sa_req_svc_t *p_sa_req_svc;
ib_av_attr_t av_attr;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
ib_api_status_t status;
AL_ENTER( AL_DBG_SA_REQ );
@@ -432,7 +432,7 @@
ib_qp_create_t qp_create;
ib_mad_svc_t mad_svc;
ib_api_status_t status;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_av_attr_t av_attr;
AL_ENTER( AL_DBG_SA_REQ );
@@ -704,7 +704,7 @@
*/
void
sa_req_send_comp_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_request_mad )
{
@@ -751,7 +751,7 @@
*/
void
sa_req_recv_comp_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_response )
{
Index: core/al/kernel/al_smi.c
===================================================================
--- core/al/kernel/al_smi.c (revision 1094)
+++ core/al/kernel/al_smi.c (working copy)
@@ -136,18 +136,18 @@
void
spl_qp_send_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
void
spl_qp_recv_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
void
spl_qp_comp(
IN spl_qp_svc_t* p_spl_qp_svc,
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN ib_wc_type_t wc_type );
ib_api_status_t
@@ -187,13 +187,13 @@
void
spl_qp_alias_send_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element );
void
spl_qp_alias_recv_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_response );
@@ -515,7 +515,7 @@
{
cl_status_t cl_status;
spl_qp_svc_t* p_spl_qp_svc;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_cq_create_t cq_create;
ib_qp_create_t qp_create;
ib_qp_attr_t qp_attr;
@@ -582,7 +582,7 @@
/* Attach the special QP service to the parent object. */
status = attach_al_obj(
- (al_obj_t* VOID_PTR64)p_pnp_rec->pnp_rec.pnp_context, &p_spl_qp_svc->obj );
+ (al_obj_t* )p_pnp_rec->pnp_rec.pnp_context, &p_spl_qp_svc->obj );
if( status != IB_SUCCESS )
{
p_spl_qp_svc->obj.pfn_destroy( &p_spl_qp_svc->obj, NULL );
@@ -1050,7 +1050,7 @@
al_mad_send_t* p_mad_send;
ib_mad_t* p_mad;
ib_smp_t* p_smp;
- ib_av_handle_t VOID_PTR64 h_av;
+ ib_av_handle_t h_av;
mad_route_t route;
boolean_t local, loopback, discard;
@@ -1198,7 +1198,7 @@
*/
ib_api_status_t
spl_qp_svc_send(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr )
{
spl_qp_svc_t* p_spl_qp_svc;
@@ -2453,7 +2453,7 @@
*/
void
spl_qp_send_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void* cq_context )
{
spl_qp_svc_t* p_spl_qp_svc;
@@ -2528,7 +2528,7 @@
*/
void
spl_qp_recv_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void* cq_context )
{
spl_qp_svc_t* p_spl_qp_svc;
@@ -2595,7 +2595,7 @@
void
spl_qp_comp(
IN spl_qp_svc_t* p_spl_qp_svc,
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN ib_wc_type_t wc_type )
{
ib_wc_t wc;
@@ -3169,7 +3169,7 @@
*/
void
spl_qp_alias_send_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void* mad_svc_context,
IN ib_mad_element_t* p_mad_element )
{
@@ -3200,7 +3200,7 @@
*/
void
spl_qp_alias_recv_cb(
- IN ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN ib_mad_svc_handle_t h_mad_svc,
IN void* mad_svc_context,
IN ib_mad_element_t* p_mad_response )
{
Index: core/al/kernel/al_smi.h
===================================================================
--- core/al/kernel/al_smi.h (revision 1094)
+++ core/al/kernel/al_smi.h (working copy)
@@ -234,7 +234,7 @@
ib_api_status_t
spl_qp_svc_send(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr );
Index: core/al/user/al_mad_pool.c
===================================================================
--- core/al/user/al_mad_pool.c (revision 1094)
+++ core/al/user/al_mad_pool.c (working copy)
@@ -51,7 +51,7 @@
typedef struct _mad_reg
{
al_obj_t obj; /* Child of al_pool_key_t */
- struct _ib_mr* VOID_PTR64 h_mr;
+ struct _ib_mr* h_mr;
net32_t lkey;
net32_t rkey;
mad_array_t* p_mad_array;
@@ -63,7 +63,7 @@
typedef struct _mad_send
{
al_mad_send_t mad_send;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
} mad_send_t;
@@ -73,7 +73,7 @@
typedef struct _mad_rmpp
{
al_mad_rmpp_t mad_rmpp;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
} mad_rmpp_t;
@@ -119,7 +119,7 @@
static ib_api_status_t
__grow_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
+ IN const ib_pool_handle_t h_pool,
OUT mad_item_t** pp_mad_item OPTIONAL );
static void
@@ -145,13 +145,13 @@
*/
ib_api_status_t
ib_create_mad_pool(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const size_t min,
IN const size_t max,
IN const size_t grow_size,
- OUT ib_pool_handle_t FUNC_PTR64* const ph_pool )
+ OUT ib_pool_handle_t * const ph_pool )
{
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
ib_api_status_t status;
cl_status_t cl_status;
@@ -267,8 +267,8 @@
__destroying_pool(
IN al_obj_t* p_obj )
{
- ib_pool_handle_t VOID_PTR64 h_pool;
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_pool_handle_t h_pool;
+ ib_al_handle_t h_al;
AL_ENTER(AL_DBG_MAD_POOL);
@@ -294,7 +294,7 @@
__free_pool(
IN al_obj_t* p_obj )
{
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
CL_ASSERT( p_obj );
h_pool = PARENT_STRUCT( p_obj, al_pool_t, obj );
@@ -312,7 +312,7 @@
*/
ib_api_status_t
ib_destroy_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool )
+ IN const ib_pool_handle_t h_pool )
{
cl_list_item_t* p_array_item;
al_obj_t* p_obj;
@@ -360,14 +360,14 @@
*/
ib_api_status_t
ib_reg_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- OUT ib_pool_key_t FUNC_PTR64* const pp_pool_key )
+ IN const ib_pool_handle_t h_pool,
+ IN const ib_pd_handle_t h_pd,
+ OUT ib_pool_key_t * const pp_pool_key )
{
al_pool_key_t* p_pool_key;
cl_list_item_t* p_array_item;
al_obj_t* p_obj;
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
mad_array_t* p_mad_array;
ib_api_status_t status;
al_key_type_t key_type;
@@ -496,7 +496,7 @@
}
/* Return the pool key. */
- *pp_pool_key = (ib_pool_key_t VOID_PTR64)p_pool_key;
+ *pp_pool_key = (ib_pool_key_t )p_pool_key;
/* Release the reference taken in init_al_obj. */
deref_al_obj( &p_pool_key->obj );
@@ -718,7 +718,7 @@
*/
ib_api_status_t
ib_dereg_mad_pool(
- IN const ib_pool_key_t FUNC_PTR64 pool_key )
+ IN const ib_pool_key_t pool_key )
{
ib_api_status_t status;
@@ -747,7 +747,7 @@
*/
ib_api_status_t
dereg_mad_pool(
- IN const ib_pool_key_t FUNC_PTR64 pool_key ,
+ IN const ib_pool_key_t pool_key ,
IN const al_key_type_t expected_type )
{
AL_ENTER(AL_DBG_MAD_POOL);
@@ -778,11 +778,11 @@
*/
static ib_api_status_t
__get_mad_element(
- IN const ib_pool_key_t FUNC_PTR64 pool_key,
+ IN const ib_pool_key_t pool_key,
OUT al_mad_element_t** pp_mad_element )
{
al_pool_key_t* p_pool_key;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
cl_list_item_t* p_item;
mad_item_t* p_mad_item;
ib_api_status_t status;
@@ -835,7 +835,7 @@
/* Hold a reference on the array while a MAD element is removed. */
ref_al_obj( &p_mad_item->p_mad_array->obj );
- p_mad_item->al_mad_element.pool_key = (ib_pool_key_t VOID_PTR64)pool_key;
+ p_mad_item->al_mad_element.pool_key = (ib_pool_key_t )pool_key;
/* Return the MAD element. */
*pp_mad_element = &p_mad_item->al_mad_element;
@@ -878,7 +878,7 @@
cl_qlist_t *p_list;
al_obj_t *p_obj;
mad_reg_t *p_reg;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
CL_ASSERT( p_pool_key );
CL_ASSERT( p_mad_item != NULL );
@@ -962,7 +962,7 @@
IN al_mad_element_t* p_mad_element )
{
mad_item_t* p_mad_item;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
CL_ASSERT( p_mad_element );
p_mad_item = PARENT_STRUCT( p_mad_element, mad_item_t, al_mad_element );
@@ -992,7 +992,7 @@
*/
static ib_api_status_t
__grow_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
+ IN const ib_pool_handle_t h_pool,
OUT mad_item_t** pp_mad_item OPTIONAL )
{
size_t i;
@@ -1155,7 +1155,7 @@
IN al_obj_t* p_obj )
{
mad_array_t* p_mad_array;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
cl_list_item_t* p_key_item;
al_pool_key_t* p_pool_key;
cl_list_item_t* p_reg_item;
@@ -1227,14 +1227,14 @@
-ib_mad_send_handle_t VOID_PTR64
+ib_mad_send_handle_t
get_mad_send(
IN const al_mad_element_t *p_mad_element )
{
mad_item_t* p_mad_item;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
cl_pool_item_t *p_pool_item;
- ib_mad_send_handle_t VOID_PTR64 h_send;
+ ib_mad_send_handle_t h_send;
CL_ASSERT( p_mad_element );
@@ -1265,7 +1265,7 @@
void
put_mad_send(
- IN ib_mad_send_handle_t FUNC_PTR64 h_mad_send )
+ IN ib_mad_send_handle_t h_mad_send )
{
mad_send_t *p_mad_send;
@@ -1304,7 +1304,7 @@
IN const al_mad_element_t *p_mad_element )
{
mad_item_t* p_mad_item;
- ib_pool_handle_t VOID_PTR64 h_pool;
+ ib_pool_handle_t h_pool;
cl_pool_item_t *p_pool_item;
CL_ASSERT( p_mad_element );
@@ -1344,7 +1344,7 @@
ib_api_status_t
ib_get_mad(
- IN const ib_pool_key_t FUNC_PTR64 pool_key,
+ IN const ib_pool_key_t pool_key,
IN const size_t buf_size,
OUT ib_mad_element_t **pp_mad_element )
{
Index: core/al/user/ual_av.c
===================================================================
--- core/al/user/ual_av.c (revision 1094)
+++ core/al/user/ual_av.c (working copy)
@@ -48,9 +48,9 @@
ib_api_status_t
ual_create_av(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t* const p_av_attr,
- IN OUT ib_av_handle_t FUNC_PTR64 h_av )
+ IN OUT ib_av_handle_t h_av )
{
ual_create_av_ioctl_t ioctl_buf;
uintn_t bytes_ret;
@@ -119,9 +119,9 @@
*/
ib_api_status_t
ual_pd_alias_create_av(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t* const p_av_attr,
- IN OUT ib_av_handle_t FUNC_PTR64 h_av )
+ IN OUT ib_av_handle_t h_av )
{
ual_create_av_ioctl_t ioctl_buf;
uintn_t bytes_ret;
@@ -167,7 +167,7 @@
*/
ib_api_status_t
ual_destroy_av(
- IN ib_av_handle_t FUNC_PTR64 h_av )
+ IN ib_av_handle_t h_av )
{
ual_destroy_av_ioctl_t ioctl_buf;
uintn_t bytes_ret;
@@ -239,7 +239,7 @@
ib_api_status_t
ual_modify_av(
- IN ib_av_handle_t FUNC_PTR64 h_av,
+ IN ib_av_handle_t h_av,
IN const ib_av_attr_t* const p_av_attr)
{
ual_modify_av_ioctl_t ioctl_buf;
@@ -311,9 +311,9 @@
ib_api_status_t
ual_query_av(
- IN ib_av_handle_t FUNC_PTR64 h_av,
+ IN ib_av_handle_t h_av,
OUT ib_av_attr_t* const p_av_attr,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd )
+ OUT ib_pd_handle_t * const ph_pd )
{
ual_query_av_ioctl_t ioctl_buf;
uintn_t bytes_ret;
Index: core/al/user/ual_ca.c
===================================================================
--- core/al/user/ual_ca.c (revision 1094)
+++ core/al/user/ual_ca.c (working copy)
@@ -255,7 +255,7 @@
ib_api_status_t
ual_query_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
OUT ib_ca_attr_t* const p_ca_attr OPTIONAL,
IN OUT uint32_t* const p_size )
{
@@ -321,7 +321,7 @@
ib_api_status_t
ual_modify_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_ca_mod_t ca_mod,
IN const ib_port_attr_mod_t* const p_port_attr_mod )
@@ -382,7 +382,7 @@
static ib_api_status_t
__convert_to_proxy_handles(
IN uint64_t* const dst_handle_array,
- IN const void* FUNC_PTR64 * const src_handle_array,
+ IN const void* * const src_handle_array,
IN uint32_t num_handles )
{
uint32_t i;
@@ -390,7 +390,7 @@
for( i = 0; i < num_handles; i++ )
{
- p_al_obj = (al_obj_t* VOID_PTR64)src_handle_array[i];
+ p_al_obj = (al_obj_t* )src_handle_array[i];
if( (p_al_obj->type != AL_OBJ_TYPE_H_PD) &&
(p_al_obj->type != AL_OBJ_TYPE_H_CQ) &&
(p_al_obj->type != AL_OBJ_TYPE_H_AV) &&
@@ -410,8 +410,8 @@
ib_api_status_t
ib_ci_call(
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const void* FUNC_PTR64 * const handle_array OPTIONAL,
+ IN ib_ca_handle_t h_ca,
+ IN const void* * const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op )
{
@@ -421,7 +421,7 @@
cl_status_t cl_status;
ib_api_status_t status;
uvp_interface_t uvp_intf;
- void* * VOID_PTR64 p_uvp_handle_array = NULL ;
+ void* * p_uvp_handle_array = NULL ;
AL_ENTER( AL_DBG_CA );
@@ -460,7 +460,7 @@
return status;
}
- p_uvp_handle_array = cl_zalloc( sizeof(void* VOID_PTR64) * num_handles );
+ p_uvp_handle_array = cl_zalloc( sizeof(void* ) * num_handles );
if( !p_uvp_handle_array )
{
cl_free( p_ca_ioctl );
Index: core/al/user/ual_ci_ca.c
===================================================================
--- core/al/user/ual_ci_ca.c (revision 1094)
+++ core/al/user/ual_ci_ca.c (working copy)
@@ -49,8 +49,8 @@
#endif
-extern ib_pool_handle_t VOID_PTR64 gh_mad_pool;
-extern ib_al_handle_t VOID_PTR64 gh_al;
+extern ib_pool_handle_t gh_mad_pool;
+extern ib_al_handle_t gh_al;
extern cl_async_proc_t *gp_async_proc_mgr;
#define EVENT_POOL_MIN 4
@@ -79,7 +79,7 @@
ib_api_status_t
create_ci_ca(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN al_obj_t *p_parent_obj,
IN ib_net64_t ca_guid )
{
Index: core/al/user/ual_ci_ca.h
===================================================================
--- core/al/user/ual_ci_ca.h (revision 1094)
+++ core/al/user/ual_ci_ca.h (working copy)
@@ -43,7 +43,7 @@
ib_api_status_t
create_ci_ca(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN al_obj_t *p_parent_obj,
IN ib_net64_t ca_guid );
@@ -55,7 +55,7 @@
#if 0
ib_api_status_t
ual_close_ca(
- IN ib_ca_handle_t FUNC_PTR64 h_ca);
+ IN ib_ca_handle_t h_ca);
#else
ib_api_status_t
ual_close_ca(
@@ -64,213 +64,213 @@
ib_api_status_t
ual_modify_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_ca_mod_t ca_mod,
IN const ib_port_attr_mod_t* const p_port_attr_mod );
ib_api_status_t
ual_query_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
OUT ib_ca_attr_t* const p_ca_attr OPTIONAL,
IN OUT uint32_t* const p_size );
ib_api_status_t
ual_allocate_pd(
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN ib_ca_handle_t h_ca,
IN const ib_pd_type_t pd_type,
- IN OUT ib_pd_handle_t FUNC_PTR64 h_pd );
+ IN OUT ib_pd_handle_t h_pd );
ib_api_status_t
ual_deallocate_pd(
- IN ib_pd_handle_t FUNC_PTR64 h_pd );
+ IN ib_pd_handle_t h_pd );
ib_api_status_t
ual_create_av(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t* const p_av_attr,
- IN OUT ib_av_handle_t FUNC_PTR64 h_av );
+ IN OUT ib_av_handle_t h_av );
ib_api_status_t
ual_pd_alias_create_av(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t* const p_av_attr,
- IN OUT ib_av_handle_t FUNC_PTR64 h_av );
+ IN OUT ib_av_handle_t h_av );
ib_api_status_t
ual_destroy_av(
- IN ib_av_handle_t FUNC_PTR64 h_av );
+ IN ib_av_handle_t h_av );
ib_api_status_t
ual_modify_av(
- IN ib_av_handle_t FUNC_PTR64 h_av,
+ IN ib_av_handle_t h_av,
IN const ib_av_attr_t* const p_av_attr);
ib_api_status_t
ual_query_av(
- IN ib_av_handle_t FUNC_PTR64 h_av,
+ IN ib_av_handle_t h_av,
OUT ib_av_attr_t* const p_av_attr,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd );
+ OUT ib_pd_handle_t * const ph_pd );
ib_api_status_t
ual_create_srq(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- IN OUT ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_pd_handle_t h_pd,
+ IN OUT ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr);
ib_api_status_t
ual_modify_srq(
- IN ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr,
IN const ib_srq_attr_mask_t srq_attr_mask );
ib_api_status_t
ual_query_srq(
- IN ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN ib_srq_handle_t h_srq,
OUT ib_srq_attr_t* p_srq_attr );
ib_api_status_t
ual_destroy_srq(
- IN ib_srq_handle_t FUNC_PTR64 h_srq );
+ IN ib_srq_handle_t h_srq );
ib_api_status_t
ual_create_qp(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- IN OUT ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_pd_handle_t h_pd,
+ IN OUT ib_qp_handle_t h_qp,
IN const ib_qp_create_t* const p_qp_create,
IN ib_qp_attr_t* p_qp_attr );
ib_api_status_t
ual_modify_qp(
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod,
IN ib_qp_attr_t* p_qp_attr );
ib_api_status_t
ual_query_qp(
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_qp_handle_t h_qp,
OUT ib_qp_attr_t* p_qp_attr );
ib_api_status_t
ual_destroy_qp(
- IN ib_qp_handle_t FUNC_PTR64 h_qp );
+ IN ib_qp_handle_t h_qp );
ib_api_status_t
ual_create_cq(
IN struct _al_ci_ca* const p_ci_ca,
IN ib_cq_create_t* const p_cq_create,
- IN OUT ib_cq_handle_t FUNC_PTR64 h_cq );
+ IN OUT ib_cq_handle_t h_cq );
ib_api_status_t
ual_modify_cq(
- IN ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN ib_cq_handle_t h_cq,
IN OUT uint32_t* p_size );
ib_api_status_t
ual_query_cq(
- IN ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN ib_cq_handle_t h_cq,
OUT uint32_t* p_size );
ib_api_status_t
ual_destroy_cq(
- IN ib_cq_handle_t FUNC_PTR64 h_cq );
+ IN ib_cq_handle_t h_cq );
ib_api_status_t
ual_reg_mem(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_mr_create_t* const p_mr_create,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN OUT ib_mr_handle_t FUNC_PTR64 h_mr );
+ IN OUT ib_mr_handle_t h_mr );
ib_api_status_t
ual_dereg_mr(
- IN ib_mr_handle_t FUNC_PTR64 h_mr );
+ IN ib_mr_handle_t h_mr );
ib_api_status_t
ual_modify_mr(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_mr_create_t* const p_mr_create OPTIONAL,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL );
+ IN const ib_pd_handle_t h_pd OPTIONAL );
ib_api_status_t
ual_query_mr(
- IN ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN ib_mr_handle_t h_mr,
OUT ib_mr_attr_t* p_mr_attr );
ib_api_status_t
ual_reg_shared(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_mr_handle_t h_mr,
+ IN const ib_pd_handle_t h_pd,
IN const ib_access_t access_ctrl,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN OUT ib_mr_handle_t FUNC_PTR64 h_new_mr );
+ IN OUT ib_mr_handle_t h_new_mr );
ib_api_status_t
ual_create_mw(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
OUT net32_t* const p_rkey,
- IN OUT ib_mw_handle_t FUNC_PTR64 h_mw );
+ IN OUT ib_mw_handle_t h_mw );
ib_api_status_t
ual_destroy_mw(
- IN ib_mw_handle_t FUNC_PTR64 h_mw );
+ IN ib_mw_handle_t h_mw );
ib_api_status_t
ual_query_mw(
- IN ib_mw_handle_t FUNC_PTR64 h_mw,
- OUT ib_pd_handle_t FUNC_PTR64* ph_pd,
+ IN ib_mw_handle_t h_mw,
+ OUT ib_pd_handle_t * ph_pd,
OUT net32_t* const p_rkey );
ib_api_status_t
ual_bind_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_mw_handle_t h_mw,
+ IN const ib_qp_handle_t h_qp,
IN ib_bind_wr_t* p_mw_bind,
OUT net32_t* const p_rkey );
ib_api_status_t
ual_post_send(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t **pp_send_failure );
ib_api_status_t
ual_post_recv(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_recv_failure );
ib_api_status_t
ual_post_srq_recv(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_recv_failure );
ib_api_status_t
ual_peek_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_n_cqes );
ib_api_status_t
ual_poll_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist );
ib_api_status_t
ual_rearm_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const boolean_t solicited );
ib_api_status_t
ual_rearm_n_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const uint32_t n_cqes );
typedef struct _ual_ci_interface
Index: core/al/user/ual_cm_cep.c
===================================================================
--- core/al/user/ual_cm_cep.c (revision 1094)
+++ core/al/user/ual_cm_cep.c (working copy)
@@ -74,7 +74,7 @@
typedef struct _al_ucep
{
al_pfn_cep_cb_t pfn_cb;
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
cl_list_item_t al_item;
ib_pfn_destroy_cb_t pfn_destroy_cb;
@@ -194,7 +194,7 @@
void
al_cep_cleanup_al(
- IN const ib_al_handle_t FUNC_PTR64 h_al )
+ IN const ib_al_handle_t h_al )
{
cl_list_item_t *p_item;
net32_t cid;
@@ -241,10 +241,10 @@
ib_api_status_t
__create_ucep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN al_pfn_cep_cb_t pfn_cb,
- IN void* FUNC_PTR64 context,
+ IN void* context,
OUT net32_t* const p_cid )
{
ucep_t *p_cep;
@@ -340,9 +340,9 @@
ib_api_status_t
al_create_cep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN al_pfn_cep_cb_t pfn_cb,
- IN void* FUNC_PTR64 context,
+ IN void* context,
OUT net32_t* const p_cid )
{
ib_api_status_t status;
@@ -362,7 +362,7 @@
*/
ib_api_status_t
al_destroy_cep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL )
{
@@ -423,7 +423,7 @@
ib_api_status_t
al_cep_listen(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN ib_cep_listen_t* const p_listen_info )
{
@@ -476,7 +476,7 @@
ib_api_status_t
al_cep_pre_req(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_req_t* const p_cm_req,
OUT ib_qp_mod_t* const p_init )
@@ -506,7 +506,7 @@
cl_memclr(&ioctl, sizeof(ioctl));
ioctl.in.cid = cid;
ioctl.in.cm_req = *p_cm_req;
- ioctl.in.cm_req.h_qp = (ib_qp_handle_t VOID_PTR64)p_cm_req->h_qp->obj.hdl;
+ ioctl.in.cm_req.h_qp = (ib_qp_handle_t )p_cm_req->h_qp->obj.hdl;
ioctl.in.paths[0] = *(p_cm_req->p_primary_path);
if( p_cm_req->p_alt_path )
ioctl.in.paths[1] = *(p_cm_req->p_alt_path);
@@ -557,7 +557,7 @@
ib_api_status_t
al_cep_send_req(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid )
{
ib_api_status_t status;
@@ -587,9 +587,9 @@
ib_api_status_t
al_cep_pre_rep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
- IN void* FUNC_PTR64 context,
+ IN void* context,
IN const ib_cm_rep_t* const p_cm_rep,
OUT ib_qp_mod_t* const p_init )
{
@@ -633,7 +633,7 @@
ioctl.in.context = context;
ioctl.in.cid = cid;
ioctl.in.cm_rep = *p_cm_rep;
- ioctl.in.cm_rep.h_qp = (ib_qp_handle_t VOID_PTR64)p_cm_rep->h_qp->obj.hdl;
+ ioctl.in.cm_rep.h_qp = (ib_qp_handle_t )p_cm_rep->h_qp->obj.hdl;
/* Copy private data, if any. */
if( p_cm_rep->p_rep_pdata )
{
@@ -667,7 +667,7 @@
ib_api_status_t
al_cep_send_rep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid )
{
ib_api_status_t status;
@@ -697,7 +697,7 @@
ib_api_status_t
al_cep_get_rtr_attr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
OUT ib_qp_mod_t* const p_rtr )
{
@@ -737,7 +737,7 @@
ib_api_status_t
al_cep_get_rts_attr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
OUT ib_qp_mod_t* const p_rts )
{
@@ -777,7 +777,7 @@
ib_api_status_t
al_cep_rtu(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const uint8_t* p_pdata OPTIONAL,
IN uint8_t pdata_len )
@@ -825,7 +825,7 @@
ib_api_status_t
al_cep_rej(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN ib_rej_status_t rej_status,
IN const uint8_t* const p_ari,
@@ -897,7 +897,7 @@
ib_api_status_t
al_cep_mra(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_mra_t* const p_cm_mra )
{
@@ -951,7 +951,7 @@
ib_api_status_t
al_cep_lap(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_lap_t* const p_cm_lap )
{
@@ -981,7 +981,7 @@
cl_memclr(&ioctl,sizeof (ioctl));
ioctl.cid = cid;
ioctl.cm_lap = *p_cm_lap;
- ioctl.cm_lap.h_qp = (ib_qp_handle_t VOID_PTR64)p_cm_lap->h_qp->obj.hdl;
+ ioctl.cm_lap.h_qp = (ib_qp_handle_t )p_cm_lap->h_qp->obj.hdl;
ioctl.alt_path = *(p_cm_lap->p_alt_path);
/* Copy private data, if any. */
if( p_cm_lap->p_lap_pdata )
@@ -1013,7 +1013,7 @@
ib_api_status_t
al_cep_pre_apr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_apr_t* const p_cm_apr,
OUT ib_qp_mod_t* const p_apr )
@@ -1037,7 +1037,7 @@
cl_memclr(&ioctl, sizeof (ioctl));
ioctl.in.cid = cid;
ioctl.in.cm_apr = *p_cm_apr;
- ioctl.in.cm_apr.h_qp = (ib_qp_handle_t VOID_PTR64)p_cm_apr->h_qp->obj.hdl;
+ ioctl.in.cm_apr.h_qp = (ib_qp_handle_t )p_cm_apr->h_qp->obj.hdl;
if( p_cm_apr->p_info )
{
if( p_cm_apr->info_length > IB_APR_INFO_SIZE )
@@ -1083,7 +1083,7 @@
ib_api_status_t
al_cep_send_apr(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid )
{
ib_api_status_t status;
@@ -1113,7 +1113,7 @@
ib_api_status_t
al_cep_dreq(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const uint8_t* const p_pdata OPTIONAL,
IN const uint8_t pdata_len )
@@ -1165,7 +1165,7 @@
ib_api_status_t
al_cep_drep(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
IN const ib_cm_drep_t* const p_cm_drep )
{
@@ -1219,7 +1219,7 @@
ib_api_status_t
al_cep_get_timewait(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
OUT uint64_t* const p_timewait_us )
{
@@ -1259,21 +1259,21 @@
//
//ib_api_status_t
//al_cep_migrate(
-// IN ib_al_handle_t VOID_PTR64 h_al,
+// IN ib_al_handle_t h_al,
// IN net32_t cid );
//
//
//ib_api_status_t
//al_cep_established(
-// IN ib_al_handle_t VOID_PTR64 h_al,
+// IN ib_al_handle_t h_al,
// IN net32_t cid );
ib_api_status_t
al_cep_poll(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN net32_t cid,
- OUT void* FUNC_PTR64 * p_context,
+ OUT void* * p_context,
OUT net32_t* const p_new_cid,
OUT ib_mad_element_t** const pp_mad )
{
Index: core/al/user/ual_cq.c
===================================================================
--- core/al/user/ual_cq.c (revision 1094)
+++ core/al/user/ual_cq.c (working copy)
@@ -50,7 +50,7 @@
ual_create_cq(
IN al_ci_ca_t* const p_ci_ca,
IN ib_cq_create_t* const p_cq_create,
- IN OUT ib_cq_handle_t FUNC_PTR64 h_cq )
+ IN OUT ib_cq_handle_t h_cq )
{
ual_create_cq_ioctl_t cq_ioctl;
uintn_t bytes_ret;
@@ -181,7 +181,7 @@
ib_api_status_t
ual_destroy_cq(
- IN ib_cq_handle_t FUNC_PTR64 h_cq )
+ IN ib_cq_handle_t h_cq )
{
ual_destroy_cq_ioctl_t cq_ioctl;
uintn_t bytes_ret;
@@ -233,7 +233,7 @@
ib_api_status_t
ual_modify_cq(
- IN ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN ib_cq_handle_t h_cq,
IN OUT uint32_t* p_size )
{
ual_modify_cq_ioctl_t cq_ioctl;
@@ -295,7 +295,7 @@
ib_api_status_t
ual_query_cq(
- IN ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN ib_cq_handle_t h_cq,
OUT uint32_t* p_size )
{
ual_query_cq_ioctl_t cq_ioctl;
@@ -361,7 +361,7 @@
ib_api_status_t
ual_peek_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_n_cqes )
{
ual_peek_cq_ioctl_t cq_ioctl;
@@ -397,7 +397,7 @@
ib_api_status_t
ual_poll_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist )
{
@@ -496,7 +496,7 @@
ib_api_status_t
ual_rearm_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const boolean_t solicited )
{
ual_rearm_cq_ioctl_t cq_ioctl;
@@ -530,7 +530,7 @@
ib_api_status_t
ual_rearm_n_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const uint32_t n_cqes )
{
ual_rearm_n_cq_ioctl_t cq_ioctl;
Index: core/al/user/ual_mad.c
===================================================================
--- core/al/user/ual_mad.c (revision 1094)
+++ core/al/user/ual_mad.c (working copy)
@@ -54,7 +54,7 @@
__destroying_ual_mad_svc(
IN struct _al_obj *p_obj )
{
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
AL_ENTER(AL_DBG_MAD_SVC);
CL_ASSERT( p_obj );
@@ -69,14 +69,14 @@
ib_api_status_t
ual_reg_mad_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mad_svc_t* const p_mad_svc,
- OUT ib_mad_svc_handle_t FUNC_PTR64* const ph_mad_svc )
+ OUT ib_mad_svc_handle_t * const ph_mad_svc )
{
ib_api_status_t status;
cl_status_t cl_status;
uintn_t bytes_ret;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
al_qp_alias_t *p_qp_alias;
ual_reg_mad_svc_ioctl_t ioctl_buf;
@@ -155,7 +155,7 @@
ib_api_status_t
ual_dereg_mad_svc(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc )
+ IN const ib_mad_svc_handle_t h_mad_svc )
{
ual_dereg_mad_svc_ioctl_t ioctl_buf;
uintn_t bytes_ret;
@@ -189,7 +189,7 @@
ib_api_status_t
ual_send_one_mad(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element )
{
ual_send_mad_ioctl_t ioctl_buf;
@@ -251,7 +251,7 @@
ib_api_status_t
ual_spl_qp_mad_send(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element_list,
OUT ib_mad_element_t **pp_mad_failure OPTIONAL )
{
@@ -283,7 +283,7 @@
ib_api_status_t
ual_spl_qp_cancel_mad(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element )
{
ual_cancel_mad_ioctl_t ioctl_buf;
@@ -323,9 +323,9 @@
ib_api_status_t
ual_create_reg_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- IN OUT ib_pool_key_t FUNC_PTR64 p_pool_key )
+ IN const ib_pool_handle_t h_pool,
+ IN const ib_pd_handle_t h_pd,
+ IN OUT ib_pool_key_t p_pool_key )
{
ual_reg_mad_pool_ioctl_t ioctl_buf;
uintn_t bytes_ret;
@@ -370,7 +370,7 @@
void
ual_dereg_destroy_mad_pool(
- IN const ib_pool_key_t FUNC_PTR64 pool_key )
+ IN const ib_pool_key_t pool_key )
{
ual_dereg_mad_pool_ioctl_t ioctl_buf;
uintn_t bytes_ret;
@@ -410,7 +410,7 @@
*/
ib_api_status_t
ual_get_recv_mad(
- IN ib_pool_key_t FUNC_PTR64 p_pool_key,
+ IN ib_pool_key_t p_pool_key,
IN const uint64_t h_mad,
IN const size_t buf_size,
OUT ib_mad_element_t** const pp_mad_element )
@@ -488,7 +488,7 @@
ib_api_status_t
ual_local_mad(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN ib_mad_t* const p_mad_in,
IN ib_mad_t* p_mad_out )
Index: core/al/user/ual_mad.h
===================================================================
--- core/al/user/ual_mad.h (revision 1094)
+++ core/al/user/ual_mad.h (working copy)
@@ -43,52 +43,52 @@
*/
ib_api_status_t
ual_reg_global_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
- OUT ib_pool_key_t FUNC_PTR64* const pp_pool_key );
+ IN const ib_pool_handle_t h_pool,
+ OUT ib_pool_key_t * const pp_pool_key );
ib_api_status_t
ual_reg_mad_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mad_svc_t* const p_mad_svc,
- OUT ib_mad_svc_handle_t FUNC_PTR64* const ph_mad_svc );
+ OUT ib_mad_svc_handle_t * const ph_mad_svc );
ib_api_status_t
ual_dereg_mad_svc(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc );
+ IN const ib_mad_svc_handle_t h_mad_svc );
ib_api_status_t
ual_spl_qp_mad_send(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element_list,
OUT ib_mad_element_t **pp_mad_failure OPTIONAL );
ib_api_status_t
ual_spl_qp_cancel_mad(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element );
void
ual_dereg_destroy_mad_pool(
- IN const ib_pool_key_t FUNC_PTR64 pool_key );
+ IN const ib_pool_key_t pool_key );
ib_api_status_t
ual_create_reg_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- IN ib_pool_key_t FUNC_PTR64 p_pool_key );
+ IN const ib_pool_handle_t h_pool,
+ IN const ib_pd_handle_t h_pd,
+ IN ib_pool_key_t p_pool_key );
ib_api_status_t
ual_get_recv_mad(
- IN ib_pool_key_t FUNC_PTR64 p_pool_key,
+ IN ib_pool_key_t p_pool_key,
IN const uint64_t h_mad,
IN const size_t buf_size,
OUT ib_mad_element_t** const pp_mad_element );
ib_api_status_t
ual_local_mad(
-IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const void* const p_mad_in,
IN void* p_mad_out );
Index: core/al/user/ual_mad_pool.c
===================================================================
--- core/al/user/ual_mad_pool.c (revision 1094)
+++ core/al/user/ual_mad_pool.c (working copy)
@@ -56,8 +56,8 @@
*/
ib_api_status_t
ual_reg_global_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
- OUT ib_pool_key_t FUNC_PTR64* const pp_pool_key )
+ IN const ib_pool_handle_t h_pool,
+ OUT ib_pool_key_t* const pp_pool_key )
{
al_pool_key_t* p_pool_key;
ib_api_status_t status;
@@ -109,7 +109,7 @@
p_pool_key->h_al = p_pool_key->obj.h_al;
/* Return the pool key. */
- *pp_pool_key = (ib_pool_key_t VOID_PTR64)p_pool_key;
+ *pp_pool_key = (ib_pool_key_t)p_pool_key;
/* Release the reference taken in init_al_obj. */
deref_al_obj( &p_pool_key->obj );
Index: core/al/user/ual_mcast.c
===================================================================
--- core/al/user/ual_mcast.c (revision 1094)
+++ core/al/user/ual_mcast.c (working copy)
@@ -46,13 +46,13 @@
ib_api_status_t
ual_attach_mcast(
- IN ib_mcast_handle_t FUNC_PTR64 h_mcast )
+ IN ib_mcast_handle_t h_mcast )
{
ual_attach_mcast_ioctl_t ioctl_buf;
uintn_t bytes_ret;
cl_status_t cl_status;
ib_api_status_t status = IB_ERROR;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
uvp_interface_t uvp_intf;
AL_ENTER( AL_DBG_MCAST );
@@ -98,7 +98,7 @@
status = ioctl_buf.out.status;
if( status == IB_SUCCESS ){
h_mcast->obj.hdl = ioctl_buf.out.h_attach;
- h_mcast->h_ci_mcast = (ib_mcast_handle_t VOID_PTR64)ioctl_buf.out.h_attach;
+ h_mcast->h_ci_mcast = (ib_mcast_handle_t )ioctl_buf.out.h_attach;
}
}
@@ -116,13 +116,13 @@
ib_api_status_t
ual_detach_mcast(
- IN ib_mcast_handle_t FUNC_PTR64 h_mcast )
+ IN ib_mcast_handle_t h_mcast )
{
ual_detach_mcast_ioctl_t ioctl_buf;
uintn_t bytes_ret;
cl_status_t cl_status;
ib_api_status_t status;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_qp_handle_t h_qp;
uvp_interface_t uvp_intf;
AL_ENTER( AL_DBG_MCAST );
Index: core/al/user/ual_mcast.h
===================================================================
--- core/al/user/ual_mcast.h (revision 1094)
+++ core/al/user/ual_mcast.h (working copy)
@@ -35,10 +35,10 @@
ib_api_status_t
ual_attach_mcast(
- IN ib_mcast_handle_t FUNC_PTR64 h_mcast );
+ IN ib_mcast_handle_t h_mcast );
ib_api_status_t
ual_detach_mcast(
- IN ib_mcast_handle_t FUNC_PTR64 h_mcast );
+ IN ib_mcast_handle_t h_mcast );
#endif /* __UAL_MCAST_H__ */
Index: core/al/user/ual_mgr.c
===================================================================
--- core/al/user/ual_mgr.c (revision 1094)
+++ core/al/user/ual_mgr.c (working copy)
@@ -58,9 +58,9 @@
/* Global AL manager handle is defined in al_mgr_shared.c */
-extern ib_al_handle_t VOID_PTR64 gh_al;
+extern ib_al_handle_t gh_al;
extern al_mgr_t* gp_al_mgr;
-extern ib_pool_handle_t VOID_PTR64 gh_mad_pool;
+extern ib_pool_handle_t gh_mad_pool;
atomic32_t g_open_cnt = 0;
@@ -706,9 +706,9 @@
__process_comp_cb(
IN comp_cb_ioctl_info_t* p_comp_cb_info )
{
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
CL_ASSERT( p_comp_cb_info->cq_context );
- h_cq = (ib_cq_handle_t VOID_PTR64)(p_comp_cb_info->cq_context);
+ h_cq = (ib_cq_handle_t )(p_comp_cb_info->cq_context);
if( ref_al_obj( &h_cq->obj ) > 1 )
{
@@ -830,7 +830,7 @@
/* We got a send completion. */
ib_mad_element_t *p_element;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc = (ib_mad_svc_handle_t VOID_PTR64)
+ ib_mad_svc_handle_t h_mad_svc = (ib_mad_svc_handle_t )
p_misc_cb_info->ioctl_rec.mad_send_cb_ioctl_rec.mad_svc_context;
/* Copy the data to the user's element. */
@@ -860,13 +860,13 @@
uintn_t bytes_ret;
cl_status_t cl_status;
ib_api_status_t status;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
ib_mad_element_t *p_mad = NULL;
ib_mad_element_t *p_send_mad;
ib_mad_t *p_mad_buf = NULL;
ib_grh_t *p_grh = NULL;
- h_mad_svc = (ib_mad_svc_handle_t VOID_PTR64)
+ h_mad_svc = (ib_mad_svc_handle_t )
p_misc_cb_info->ioctl_rec.mad_recv_cb_ioctl_rec.mad_svc_context;
p_send_mad =
@@ -888,7 +888,7 @@
* in case of failure.
*/
if( status == IB_SUCCESS )
- al_handoff_mad( (ib_al_handle_t VOID_PTR64)h_mad_svc->obj.h_al, p_mad );
+ al_handoff_mad( (ib_al_handle_t )h_mad_svc->obj.h_al, p_mad );
else if( p_send_mad )
p_send_mad->status = IB_WCS_TIMEOUT_RETRY_ERR;
@@ -929,7 +929,7 @@
p_mad->p_grh = p_grh;
/* Restore the client's send context1 */
if( p_send_mad )
- p_mad->send_context1 = (void* VOID_PTR64)p_send_mad->context1;
+ p_mad->send_context1 = (void* )p_send_mad->context1;
h_mad_svc->pfn_user_recv_cb( h_mad_svc,
(void*)h_mad_svc->obj.context, p_mad );
@@ -1090,7 +1090,7 @@
*/
ib_api_status_t
ib_open_al(
- OUT ib_al_handle_t FUNC_PTR64* const ph_al )
+ OUT ib_al_handle_t * const ph_al )
{
ib_api_status_t status;
@@ -1111,7 +1111,7 @@
ib_api_status_t
ib_close_al(
- IN const ib_al_handle_t FUNC_PTR64 h_al )
+ IN const ib_al_handle_t h_al )
{
ib_api_status_t status;
@@ -1126,9 +1126,9 @@
ib_api_status_t
do_open_al(
- OUT ib_al_handle_t FUNC_PTR64* const ph_al )
+ OUT ib_al_handle_t * const ph_al )
{
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
ib_api_status_t status;
AL_ENTER(AL_DBG_MGR);
@@ -1161,7 +1161,7 @@
}
/* Allocate an access layer instance. */
- h_al = (ib_al_handle_t VOID_PTR64)cl_zalloc( sizeof( ib_al_t ) );
+ h_al = (ib_al_handle_t )cl_zalloc( sizeof( ib_al_t ) );
if( !h_al )
{
AL_PRINT(TRACE_LEVEL_ERROR ,AL_DBG_ERROR , ("cl_malloc failed\n") );
@@ -1211,7 +1211,7 @@
}
/* Return UAL's handle to caller */
- *ph_al = (ib_al_handle_t VOID_PTR64)h_al;
+ *ph_al = (ib_al_handle_t )h_al;
/* Release the reference taken in init_al_obj. */
deref_al_obj( &h_al->obj );
Index: core/al/user/ual_mgr.h
===================================================================
--- core/al/user/ual_mgr.h (revision 1094)
+++ core/al/user/ual_mgr.h (working copy)
@@ -86,11 +86,11 @@
ib_api_status_t
do_open_al(
- OUT ib_al_handle_t FUNC_PTR64* const ph_al );
+ OUT ib_al_handle_t* const ph_al );
ib_api_status_t
do_close_al(
- IN const ib_al_handle_t FUNC_PTR64 h_al );
+ IN const ib_al_handle_t h_al );
/*
Index: core/al/user/ual_mr.c
===================================================================
--- core/al/user/ual_mr.c (revision 1094)
+++ core/al/user/ual_mr.c (working copy)
@@ -51,11 +51,11 @@
ib_api_status_t
ual_reg_mem(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_mr_create_t* const p_mr_create,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN OUT ib_mr_handle_t FUNC_PTR64 h_mr )
+ IN OUT ib_mr_handle_t h_mr )
{
ual_reg_mem_ioctl_t mr_ioctl;
uintn_t bytes_ret;
@@ -99,7 +99,7 @@
ib_api_status_t
ual_dereg_mr(
- IN ib_mr_handle_t FUNC_PTR64 h_mr )
+ IN ib_mr_handle_t h_mr )
{
ual_dereg_mr_ioctl_t mr_ioctl;
uintn_t bytes_ret;
@@ -131,12 +131,12 @@
ib_api_status_t
ual_modify_mr(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_mr_create_t* const p_mr_create OPTIONAL,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL )
+ IN const ib_pd_handle_t h_pd OPTIONAL )
{
ual_rereg_mem_ioctl_t mr_ioctl;
uintn_t bytes_ret;
@@ -182,7 +182,7 @@
ib_api_status_t
ual_query_mr(
- IN ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN ib_mr_handle_t h_mr,
OUT ib_mr_attr_t* p_mr_attr )
{
ual_query_mr_ioctl_t mr_ioctl;
@@ -219,13 +219,13 @@
ib_api_status_t
ual_reg_shared(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_mr_handle_t h_mr,
+ IN const ib_pd_handle_t h_pd,
IN const ib_access_t access_ctrl,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN OUT ib_mr_handle_t FUNC_PTR64 h_new_mr )
+ IN OUT ib_mr_handle_t h_new_mr )
{
ual_reg_shared_ioctl_t mr_ioctl;
uintn_t bytes_ret;
@@ -267,19 +267,19 @@
ib_api_status_t
ib_reg_shmid(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_shmid_t shmid,
IN const ib_mr_create_t* const p_mr_create,
OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr )
+ OUT ib_mr_handle_t * const ph_mr )
{
ual_reg_shmid_ioctl_t mr_ioctl;
uintn_t bytes_ret;
cl_status_t cl_status;
ib_api_status_t status;
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
AL_ENTER( AL_DBG_MR );
Index: core/al/user/ual_mw.c
===================================================================
--- core/al/user/ual_mw.c (revision 1094)
+++ core/al/user/ual_mw.c (working copy)
@@ -50,9 +50,9 @@
ib_api_status_t
ual_create_mw(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
OUT net32_t* const p_rkey,
- IN OUT ib_mw_handle_t FUNC_PTR64 h_mw )
+ IN OUT ib_mw_handle_t h_mw )
{
ual_create_mw_ioctl_t mw_ioctl;
uintn_t bytes_ret;
@@ -117,7 +117,7 @@
ib_api_status_t
ual_destroy_mw(
- IN ib_mw_handle_t FUNC_PTR64 h_mw )
+ IN ib_mw_handle_t h_mw )
{
ual_destroy_mw_ioctl_t mw_ioctl;
uintn_t bytes_ret;
@@ -177,8 +177,8 @@
ib_api_status_t
ual_query_mw(
- IN ib_mw_handle_t FUNC_PTR64 h_mw,
- OUT ib_pd_handle_t FUNC_PTR64* ph_pd,
+ IN ib_mw_handle_t h_mw,
+ OUT ib_pd_handle_t * ph_pd,
OUT net32_t* const p_rkey )
{
ual_query_mw_ioctl_t mw_ioctl;
@@ -224,7 +224,7 @@
if( IB_SUCCESS == status )
{
*p_rkey = mw_ioctl.out.rkey;
- *ph_pd = ((ib_pd_handle_t VOID_PTR64)mw_ioctl.out.pd_context)->h_ci_pd;
+ *ph_pd = ((ib_pd_handle_t )mw_ioctl.out.pd_context)->h_ci_pd;
}
/* Post uvp call */
@@ -241,8 +241,8 @@
ib_api_status_t
ual_bind_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_mw_handle_t h_mw,
+ IN const ib_qp_handle_t h_qp,
IN ib_bind_wr_t* p_mw_bind,
OUT net32_t* const p_rkey )
{
@@ -250,7 +250,7 @@
cl_status_t cl_status;
ib_api_status_t status;
uintn_t bytes_ret;
- ib_mr_handle_t VOID_PTR64 h_user_mr;
+ ib_mr_handle_t h_user_mr;
/*
* Check whether a vendor library is available and the
* bind_mw call is implemented. If so, the call terminates
@@ -278,7 +278,7 @@
mw_ioctl.in.h_mw = h_mw->obj.hdl;
mw_ioctl.in.h_qp = h_qp->obj.hdl;
mw_ioctl.in.mw_bind = *p_mw_bind;
- mw_ioctl.in.mw_bind.h_mr = (ib_mr_handle_t VOID_PTR64)p_mw_bind->h_mr->obj.hdl;
+ mw_ioctl.in.mw_bind.h_mr = (ib_mr_handle_t )p_mw_bind->h_mr->obj.hdl;
cl_status = do_al_dev_ioctl( UAL_BIND_MW,
&mw_ioctl.in, sizeof(mw_ioctl.in), &mw_ioctl.out, sizeof(mw_ioctl.out),
Index: core/al/user/ual_pd.c
===================================================================
--- core/al/user/ual_pd.c (revision 1094)
+++ core/al/user/ual_pd.c (working copy)
@@ -47,16 +47,16 @@
ib_api_status_t
ual_allocate_pd(
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN ib_ca_handle_t h_ca,
IN const ib_pd_type_t pd_type,
- IN OUT ib_pd_handle_t FUNC_PTR64 h_pd )
+ IN OUT ib_pd_handle_t h_pd )
{
/* The first two arguments is probably not needed */
ual_alloc_pd_ioctl_t pd_ioctl;
uintn_t bytes_ret;
cl_status_t cl_status;
ib_api_status_t status;
- ib_ca_handle_t VOID_PTR64 h_uvp_ca;
+ ib_ca_handle_t h_uvp_ca;
uvp_interface_t uvp_intf = h_ca->obj.p_ci_ca->verbs.user_verbs;
AL_ENTER( AL_DBG_PD );
@@ -116,7 +116,7 @@
ib_api_status_t
ual_deallocate_pd(
- IN ib_pd_handle_t FUNC_PTR64 h_pd )
+ IN ib_pd_handle_t h_pd )
{
ual_dealloc_pd_ioctl_t pd_ioctl;
uintn_t bytes_ret;
Index: core/al/user/ual_pnp.c
===================================================================
--- core/al/user/ual_pnp.c (revision 1094)
+++ core/al/user/ual_pnp.c (working copy)
@@ -262,9 +262,9 @@
ib_api_status_t
ib_reg_pnp(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_pnp_req_t* const p_pnp_req,
- OUT ib_pnp_handle_t FUNC_PTR64* const ph_pnp )
+ OUT ib_pnp_handle_t * const ph_pnp )
{
ib_api_status_t status;
al_pnp_t* p_reg;
@@ -372,7 +372,7 @@
ib_api_status_t
ib_dereg_pnp(
- IN const ib_pnp_handle_t FUNC_PTR64 h_pnp,
+ IN const ib_pnp_handle_t h_pnp,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL )
{
AL_ENTER( AL_DBG_PNP );
@@ -393,8 +393,8 @@
ib_api_status_t
ib_reject_ioc(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
- IN const ib_pnp_handle_t FUNC_PTR64 h_event )
+ IN const ib_al_handle_t h_al,
+ IN const ib_pnp_handle_t h_event )
{
AL_ENTER( AL_DBG_PNP );
@@ -427,8 +427,8 @@
(uintn_t)(ib_ca_attr_t*)p_port_rec->p_ca_attr;
ib_fixup_ca_attr( (ib_ca_attr_t*)(p_port_rec + 1), p_port_rec->p_ca_attr );
p_port_rec->p_ca_attr = (ib_ca_attr_t*)(size_t)(p_port_rec + 1);
- p_port_rec->p_port_attr = (ib_port_attr_t* VOID_PTR64)
- (((uint8_t* VOID_PTR64)p_port_rec->p_port_attr) + offset);
+ p_port_rec->p_port_attr = (ib_port_attr_t* )
+ (((uint8_t* )p_port_rec->p_port_attr) + offset);
}
Index: core/al/user/ual_qp.c
===================================================================
--- core/al/user/ual_qp.c (revision 1094)
+++ core/al/user/ual_qp.c (working copy)
@@ -51,7 +51,7 @@
#endif
ib_api_status_t
ual_post_send(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t **pp_send_failure OPTIONAL )
{
@@ -158,7 +158,7 @@
ib_api_status_t
ual_post_recv(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_recv_failure OPTIONAL )
{
@@ -267,8 +267,8 @@
ib_api_status_t
ual_create_qp(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- IN OUT ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_pd_handle_t h_pd,
+ IN OUT ib_qp_handle_t h_qp,
IN const ib_qp_create_t* const p_qp_create,
IN ib_qp_attr_t* p_qp_attr )
{
@@ -313,12 +313,12 @@
qp_ioctl.in.h_pd = h_pd->obj.hdl;
qp_ioctl.in.qp_create = *p_qp_create;
qp_ioctl.in.qp_create.h_rq_cq =
- (ib_cq_handle_t VOID_PTR64)p_qp_create->h_rq_cq->obj.hdl;
+ (ib_cq_handle_t )p_qp_create->h_rq_cq->obj.hdl;
qp_ioctl.in.qp_create.h_sq_cq =
- (ib_cq_handle_t VOID_PTR64)p_qp_create->h_sq_cq->obj.hdl;
+ (ib_cq_handle_t )p_qp_create->h_sq_cq->obj.hdl;
if (p_qp_create->h_srq)
qp_ioctl.in.qp_create.h_srq =
- (ib_srq_handle_t VOID_PTR64)p_qp_create->h_srq->obj.hdl;
+ (ib_srq_handle_t )p_qp_create->h_srq->obj.hdl;
qp_ioctl.in.context = h_qp;
qp_ioctl.in.ev_notify = (h_qp->pfn_event_cb != NULL) ? TRUE : FALSE;
@@ -391,7 +391,7 @@
ib_api_status_t
ual_destroy_qp(
- IN ib_qp_handle_t FUNC_PTR64 h_qp )
+ IN ib_qp_handle_t h_qp )
{
ual_destroy_qp_ioctl_t qp_ioctl;
uintn_t bytes_ret;
@@ -441,7 +441,7 @@
ib_api_status_t
ual_modify_qp(
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod,
IN ib_qp_attr_t* p_qp_attr)
{
@@ -508,7 +508,7 @@
ib_api_status_t
ual_query_qp(
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_qp_handle_t h_qp,
OUT ib_qp_attr_t* p_qp_attr )
{
ual_query_qp_ioctl_t qp_ioctl;
@@ -517,7 +517,7 @@
ib_api_status_t status;
uvp_interface_t uvp_intf = h_qp->obj.p_ci_ca->verbs.user_verbs;
ib_qp_attr_t* p_attr;
- ib_pd_handle_t VOID_PTR64 h_ual_pd;
+ ib_pd_handle_t h_ual_pd;
AL_ENTER( AL_DBG_QP );
@@ -590,7 +590,7 @@
ib_api_status_t
ual_init_qp_alias(
IN al_qp_alias_t* const p_qp_alias,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid,
IN const ib_qp_create_t* const p_qp_create )
{
Index: core/al/user/ual_qp.h
===================================================================
--- core/al/user/ual_qp.h (revision 1094)
+++ core/al/user/ual_qp.h (working copy)
@@ -39,7 +39,7 @@
ib_api_status_t
ual_init_qp_alias(
IN al_qp_alias_t* const p_qp_alias,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid,
IN const ib_qp_create_t* const p_qp_create );
Index: core/al/user/ual_srq.c
===================================================================
--- core/al/user/ual_srq.c (revision 1094)
+++ core/al/user/ual_srq.c (working copy)
@@ -52,7 +52,7 @@
ib_api_status_t
ual_post_srq_recv(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_recv_failure OPTIONAL )
{
@@ -161,8 +161,8 @@
ib_api_status_t
ual_create_srq(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- IN OUT ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_pd_handle_t h_pd,
+ IN OUT ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr)
{
/* The first argument is probably not needed */
@@ -253,7 +253,7 @@
ib_api_status_t
ual_modify_srq(
- IN ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr,
IN const ib_srq_attr_mask_t srq_attr_mask)
{
@@ -320,7 +320,7 @@
ib_api_status_t
ual_query_srq(
- IN ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN ib_srq_handle_t h_srq,
OUT ib_srq_attr_t* p_srq_attr )
{
ual_query_srq_ioctl_t srq_ioctl;
@@ -389,7 +389,7 @@
ib_api_status_t
ual_destroy_srq(
- IN ib_srq_handle_t FUNC_PTR64 h_srq )
+ IN ib_srq_handle_t h_srq )
{
ual_destroy_srq_ioctl_t srq_ioctl;
uintn_t bytes_ret;
Index: core/iou/kernel/iou_ioc_mgr.c
===================================================================
--- core/iou/kernel/iou_ioc_mgr.c (revision 1094)
+++ core/iou/kernel/iou_ioc_mgr.c (working copy)
@@ -422,7 +422,7 @@
IOU_ENTER( IOU_DBG_PNP );
CL_ASSERT( p_pnp_rec );
- p_ioc_mgr = (ioc_mgr_t* VOID_PTR64)p_pnp_rec->pnp_context;
+ p_ioc_mgr = (ioc_mgr_t*)p_pnp_rec->pnp_context;
switch( p_pnp_rec->pnp_event )
{
Index: hw/mthca/kernel/hca_data.h
===================================================================
--- hw/mthca/kernel/hca_data.h (revision 1094)
+++ hw/mthca/kernel/hca_data.h (working copy)
@@ -219,7 +219,7 @@
#ifdef WIN_TO_BE_REMOVED
// removed as it is found in p_ext->cl_ext.p_pdo
- const void* VOID_PTR64 p_dev_obj; // Driver PDO
+ const void* p_dev_obj; // Driver PDO
#endif
} mlnx_hca_t;
@@ -315,7 +315,7 @@
ib_api_status_t
mlnx_local_mad (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_av_attr_t *p_src_av_attr,
IN const ib_mad_t *p_mad_in,
@@ -343,8 +343,8 @@
ib_api_status_t
fw_access_ctrl(
- IN const void* FUNC_PTR64 context,
- IN const void* FUNC_PTR64* const handle_array OPTIONAL,
+ IN const void* context,
+ IN const void* * const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL);
Index: hw/mthca/kernel/hca_direct.c
===================================================================
--- hw/mthca/kernel/hca_direct.c (revision 1094)
+++ hw/mthca/kernel/hca_direct.c (working copy)
@@ -56,7 +56,7 @@
ib_api_status_t
mlnx_post_send (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t *p_send_wr,
OUT ib_send_wr_t **pp_failed )
{
@@ -94,7 +94,7 @@
ib_api_status_t
mlnx_post_recv (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_recv_wr_t *p_recv_wr,
OUT ib_recv_wr_t **pp_failed OPTIONAL )
{
@@ -131,7 +131,7 @@
ib_api_status_t
mlnx_post_srq_recv (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN ib_recv_wr_t *p_recv_wr,
OUT ib_recv_wr_t **pp_failed OPTIONAL )
{
@@ -172,7 +172,7 @@
ib_api_status_t
mlnx_peek_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_n_cqes )
{
UNREFERENCED_PARAMETER(h_cq);
@@ -183,7 +183,7 @@
ib_api_status_t
mlnx_poll_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist )
{
@@ -222,7 +222,7 @@
ib_api_status_t
mlnx_enable_cq_notify (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const boolean_t solicited )
{
int err;
@@ -251,7 +251,7 @@
ib_api_status_t
mlnx_enable_ncomp_cq_notify (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const uint32_t n_cqes )
{
int err;
@@ -279,8 +279,8 @@
ib_api_status_t
mlnx_bind_mw (
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_mw_handle_t h_mw,
+ IN const ib_qp_handle_t h_qp,
IN ib_bind_wr_t* const p_mw_bind,
OUT net32_t* const p_rkey )
{
Index: hw/mthca/kernel/hca_driver.c
===================================================================
--- hw/mthca/kernel/hca_driver.c (revision 1094)
+++ hw/mthca/kernel/hca_driver.c (working copy)
@@ -650,8 +650,8 @@
ib_api_status_t
fw_access_ctrl(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const void* FUNC_PTR64* const handle_array OPTIONAL,
+ IN const ib_ca_handle_t h_ca,
+ IN const void** const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN OUT ci_umv_buf_t *p_umv_buf )
Index: hw/mthca/kernel/hca_mcast.c
===================================================================
--- hw/mthca/kernel/hca_mcast.c (revision 1094)
+++ hw/mthca/kernel/hca_mcast.c (working copy)
@@ -49,10 +49,10 @@
*/
ib_api_status_t
mlnx_attach_mcast (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_gid_t *p_mcast_gid,
IN const uint16_t mcast_lid,
- OUT ib_mcast_handle_t FUNC_PTR64 *ph_mcast,
+ OUT ib_mcast_handle_t *ph_mcast,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -113,7 +113,7 @@
cl_ntoh64(*(uint64_t*)&mcast_p->mcast_gid.raw[8] )));
// return the result
- if (ph_mcast) *ph_mcast = (ib_mcast_handle_t VOID_PTR64)mcast_p;
+ if (ph_mcast) *ph_mcast = (ib_mcast_handle_t )mcast_p;
status = IB_SUCCESS;
goto end;
@@ -136,7 +136,7 @@
ib_api_status_t
mlnx_detach_mcast (
- IN const ib_mcast_handle_t FUNC_PTR64 h_mcast)
+ IN const ib_mcast_handle_t h_mcast)
{
ib_api_status_t status = IB_INVALID_PARAMETER;
int err;
Index: hw/mthca/kernel/hca_memory.c
===================================================================
--- hw/mthca/kernel/hca_memory.c (revision 1094)
+++ hw/mthca/kernel/hca_memory.c (working copy)
@@ -47,11 +47,11 @@
ib_api_status_t
mlnx_register_mr (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_mr_create_t *p_mr_create,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64 *ph_mr,
+ OUT ib_mr_handle_t *ph_mr,
IN boolean_t um_call )
{
ib_api_status_t status;
@@ -100,7 +100,7 @@
// results
*p_lkey = mr_p->lkey;
*p_rkey = cl_hton32( mr_p->rkey );
- if (ph_mr) *ph_mr = (ib_mr_handle_t VOID_PTR64)mr_p;
+ if (ph_mr) *ph_mr = (ib_mr_handle_t )mr_p;
status = IB_SUCCESS;
err_reg_mr:
@@ -118,12 +118,12 @@
ib_api_status_t
mlnx_register_pmr (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_phys_create_t* const p_pmr_create,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t * const ph_mr,
IN boolean_t um_call )
{
ib_api_status_t status;
@@ -183,7 +183,7 @@
// results
done:
- if (ph_mr) *ph_mr = (ib_mr_handle_t VOID_PTR64)mr_p;
+ if (ph_mr) *ph_mr = (ib_mr_handle_t )mr_p;
*p_lkey = mr_p->lkey;
*p_rkey = cl_hton32( mr_p->rkey );
//NB: p_vaddr was not changed
@@ -205,7 +205,7 @@
ib_api_status_t
mlnx_query_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
OUT ib_mr_attr_t *p_mr_query )
{
UNREFERENCED_PARAMETER(h_mr);
@@ -217,12 +217,12 @@
ib_api_status_t
mlnx_modify_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mem_modify_req,
IN const ib_mr_create_t *p_mr_create,
OUT uint32_t *p_lkey,
OUT uint32_t *p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL,
+ IN const ib_pd_handle_t h_pd OPTIONAL,
IN boolean_t um_call )
{
UNREFERENCED_PARAMETER(h_mr);
@@ -239,13 +239,13 @@
ib_api_status_t
mlnx_modify_pmr (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mem_modify_req,
IN const ib_phys_create_t* const p_pmr_create,
IN OUT uint64_t* const p_vaddr,
OUT uint32_t* const p_lkey,
OUT uint32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL,
+ IN const ib_pd_handle_t h_pd OPTIONAL,
IN boolean_t um_call )
{
UNREFERENCED_PARAMETER(h_mr);
@@ -262,13 +262,13 @@
ib_api_status_t
mlnx_register_smr (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_mr_handle_t h_mr,
+ IN const ib_pd_handle_t h_pd,
IN const ib_access_t access_ctrl,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t * const ph_mr,
IN boolean_t um_call )
{
UNREFERENCED_PARAMETER(h_mr);
@@ -285,7 +285,7 @@
ib_api_status_t
mlnx_deregister_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr)
+ IN const ib_mr_handle_t h_mr)
{
ib_api_status_t status;
int err;
@@ -331,9 +331,9 @@
ib_api_status_t
mlnx_alloc_fmr(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const mlnx_fmr_create_t* const p_fmr_create,
- OUT mlnx_fmr_handle_t FUNC_PTR64* const ph_fmr
+ OUT mlnx_fmr_handle_t * const ph_fmr
)
{
ib_api_status_t status;
@@ -374,7 +374,7 @@
}
// results
- if (ph_fmr) *ph_fmr = (mlnx_fmr_handle_t VOID_PTR64)fmr_p;
+ if (ph_fmr) *ph_fmr = (mlnx_fmr_handle_t )fmr_p;
status = IB_SUCCESS;
err_alloc_fmr:
@@ -392,7 +392,7 @@
ib_api_status_t
mlnx_map_phys_fmr (
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr,
+ IN const mlnx_fmr_handle_t h_fmr,
IN const uint64_t* const page_list,
IN const int list_len,
IN OUT uint64_t* const p_vaddr,
@@ -438,7 +438,7 @@
ib_api_status_t
mlnx_unmap_fmr (
- IN const mlnx_fmr_handle_t FUNC_PTR64 *ph_fmr)
+ IN const mlnx_fmr_handle_t *ph_fmr)
{
ib_api_status_t status;
int err;
@@ -489,7 +489,7 @@
ib_api_status_t
mlnx_dealloc_fmr (
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr
+ IN const mlnx_fmr_handle_t h_fmr
)
{
ib_api_status_t status;
@@ -538,9 +538,9 @@
ib_api_status_t
mlnx_create_mw (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
OUT net32_t* const p_rkey,
- OUT ib_mw_handle_t FUNC_PTR64 *ph_mw,
+ OUT ib_mw_handle_t *ph_mw,
IN OUT ci_umv_buf_t *p_umv_buf )
{
UNREFERENCED_PARAMETER(h_pd);
@@ -553,8 +553,8 @@
ib_api_status_t
mlnx_query_mw (
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ IN const ib_mw_handle_t h_mw,
+ OUT ib_pd_handle_t *ph_pd,
OUT net32_t* const p_rkey,
IN OUT ci_umv_buf_t *p_umv_buf )
{
@@ -568,7 +568,7 @@
ib_api_status_t
mlnx_destroy_mw (
- IN const ib_mw_handle_t FUNC_PTR64 h_mw)
+ IN const ib_mw_handle_t h_mw)
{
UNREFERENCED_PARAMETER(h_mw);
HCA_PRINT(TRACE_LEVEL_ERROR , HCA_DBG_MEMORY ,("mlnx_destroy_mw not implemented\n"));
Index: hw/mthca/kernel/hca_verbs.c
===================================================================
--- hw/mthca/kernel/hca_verbs.c (revision 1094)
+++ hw/mthca/kernel/hca_verbs.c (working copy)
@@ -48,7 +48,7 @@
// Local declarations
ib_api_status_t
mlnx_query_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
OUT ib_qp_attr_t *p_qp_attr,
IN OUT ci_umv_buf_t *p_umv_buf );
@@ -61,7 +61,7 @@
IN const ci_completion_cb_t pfn_completion_cb,
IN const ci_async_event_cb_t pfn_async_event_cb,
IN const void*const ca_context,
- OUT ib_ca_handle_t FUNC_PTR64 *ph_ca)
+ OUT ib_ca_handle_t *ph_ca)
{
mlnx_hca_t *p_hca;
ib_api_status_t status = IB_NOT_FOUND;
@@ -119,7 +119,7 @@
ib_api_status_t
mlnx_query_ca (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
OUT ib_ca_attr_t *p_ca_attr,
IN OUT uint32_t *p_byte_count,
IN OUT ci_umv_buf_t *p_umv_buf )
@@ -259,7 +259,7 @@
// get gids, using cache
for (i=0; i < hca_ports[port_num].gid_tbl_len; ++i) {
- union ib_gid * VOID_PTR64 gid = (union ib_gid *)&p_ca_attr->p_port_attr[port_num].p_gid_table[i];
+ union ib_gid * gid = (union ib_gid *)&p_ca_attr->p_port_attr[port_num].p_gid_table[i];
err = ib_get_cached_gid( ib_dev, port_num + start_port(ib_dev), i, (union ib_gid *)gid );
//TODO: do we need to convert gids to little endian
if (err) {
@@ -322,7 +322,7 @@
ib_api_status_t
mlnx_modify_ca (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_ca_mod_t modca_cmd,
IN const ib_port_attr_mod_t *p_port_attr)
@@ -388,7 +388,7 @@
ib_api_status_t
mlnx_close_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_ca)
+ IN ib_ca_handle_t h_ca)
{
mlnx_hob_t *hob_p = (mlnx_hob_t *)h_ca;
HCA_ENTER(HCA_DBG_SHIM);
@@ -407,9 +407,9 @@
static ib_api_status_t
mlnx_um_open(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN OUT ci_umv_buf_t* const p_umv_buf,
- OUT ib_ca_handle_t FUNC_PTR64* const ph_um_ca )
+ OUT ib_ca_handle_t * const ph_um_ca )
{
int err;
ib_api_status_t status;
@@ -485,7 +485,7 @@
cl_spinlock_release( &ext_p->uctx_lock );
// return the result
- if (ph_um_ca) *ph_um_ca = (ib_ca_handle_t VOID_PTR64)p_context;
+ if (ph_um_ca) *ph_um_ca = (ib_ca_handle_t )p_context;
status = IB_SUCCESS;
goto end;
@@ -507,8 +507,8 @@
static void
mlnx_um_close(
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
- IN ib_ca_handle_t FUNC_PTR64 h_um_ca )
+ IN ib_ca_handle_t h_ca,
+ IN ib_ca_handle_t h_um_ca )
{
struct ib_ucontext *p_ucontext = (struct ib_ucontext *)h_um_ca;
mlnx_hob_t *hob_p = (mlnx_hob_t *)h_ca;
@@ -537,9 +537,9 @@
ib_api_status_t
mlnx_allocate_pd (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_pd_type_t type,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ OUT ib_pd_handle_t *ph_pd,
IN OUT ci_umv_buf_t *p_umv_buf )
{
ib_api_status_t status;
@@ -574,7 +574,7 @@
}
// return the result
- if (ph_pd) *ph_pd = (ib_pd_handle_t VOID_PTR64)ib_pd_p;
+ if (ph_pd) *ph_pd = (ib_pd_handle_t )ib_pd_p;
status = IB_SUCCESS;
@@ -592,7 +592,7 @@
ib_api_status_t
mlnx_deallocate_pd (
- IN ib_pd_handle_t FUNC_PTR64 h_pd)
+ IN ib_pd_handle_t h_pd)
{
ib_api_status_t status;
int err;
@@ -629,9 +629,9 @@
*/
ib_api_status_t
mlnx_create_av (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t *p_addr_vector,
- OUT ib_av_handle_t FUNC_PTR64 *ph_av,
+ OUT ib_av_handle_t *ph_av,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err = 0;
@@ -671,7 +671,7 @@
}
// return the result
- if (ph_av) *ph_av = (ib_av_handle_t VOID_PTR64)ib_av_p;
+ if (ph_av) *ph_av = (ib_av_handle_t )ib_av_p;
status = IB_SUCCESS;
@@ -690,9 +690,9 @@
ib_api_status_t
mlnx_query_av (
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
OUT ib_av_attr_t *p_addr_vector,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ OUT ib_pd_handle_t *ph_pd,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -734,7 +734,7 @@
#endif
// results
- *ph_pd = (ib_pd_handle_t VOID_PTR64)ib_ah_p->pd;
+ *ph_pd = (ib_pd_handle_t )ib_ah_p->pd;
err_conv_mthca_av:
err_user_unsupported:
@@ -749,7 +749,7 @@
ib_api_status_t
mlnx_modify_av (
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
IN const ib_av_attr_t *p_addr_vector,
IN OUT ci_umv_buf_t *p_umv_buf )
{
@@ -799,7 +799,7 @@
ib_api_status_t
mlnx_destroy_av (
- IN const ib_av_handle_t FUNC_PTR64 h_av)
+ IN const ib_av_handle_t h_av)
{
int err;
ib_api_status_t status = IB_SUCCESS;
@@ -834,10 +834,10 @@
ib_api_status_t
mlnx_create_srq (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const void *srq_context,
IN const ib_srq_attr_t * const p_srq_attr,
- OUT ib_srq_handle_t FUNC_PTR64 *ph_srq,
+ OUT ib_srq_handle_t *ph_srq,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -884,7 +884,7 @@
srq_p->srq_context = (void*)srq_context;
// return the result
- if (ph_srq) *ph_srq = (ib_srq_handle_t VOID_PTR64)srq_p;
+ if (ph_srq) *ph_srq = (ib_srq_handle_t )srq_p;
status = IB_SUCCESS;
@@ -904,7 +904,7 @@
ib_api_status_t
mlnx_modify_srq (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr,
IN const ib_srq_attr_mask_t srq_attr_mask,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL )
@@ -936,7 +936,7 @@
ib_api_status_t
mlnx_query_srq (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
OUT ib_srq_attr_t* const p_srq_attr,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL )
{
@@ -967,7 +967,7 @@
ib_api_status_t
mlnx_destroy_srq (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq )
+ IN const ib_srq_handle_t h_srq )
{
int err;
ib_api_status_t status = IB_SUCCESS;
@@ -1000,12 +1000,12 @@
static ib_api_status_t
_create_qp (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const uint8_t port_num,
IN const void *qp_context,
IN const ib_qp_create_t *p_create_attr,
OUT ib_qp_attr_t *p_qp_attr,
- OUT ib_qp_handle_t FUNC_PTR64 *ph_qp,
+ OUT ib_qp_handle_t *ph_qp,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -1064,13 +1064,13 @@
// Query QP to obtain requested attributes
if (p_qp_attr) {
- status = mlnx_query_qp ((ib_qp_handle_t VOID_PTR64)ib_qp_p, p_qp_attr, p_umv_buf);
+ status = mlnx_query_qp ((ib_qp_handle_t )ib_qp_p, p_qp_attr, p_umv_buf);
if (status != IB_SUCCESS)
goto err_query_qp;
}
// return the results
- if (ph_qp) *ph_qp = (ib_qp_handle_t VOID_PTR64)ib_qp_p;
+ if (ph_qp) *ph_qp = (ib_qp_handle_t )ib_qp_p;
status = IB_SUCCESS;
goto end;
@@ -1093,12 +1093,12 @@
ib_api_status_t
mlnx_create_spl_qp (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const uint8_t port_num,
IN const void *qp_context,
IN const ib_qp_create_t *p_create_attr,
OUT ib_qp_attr_t *p_qp_attr,
- OUT ib_qp_handle_t FUNC_PTR64 *ph_qp )
+ OUT ib_qp_handle_t *ph_qp )
{
ib_api_status_t status;
PREP_IBDEV_FOR_PRINT(((struct ib_pd*)h_pd)->device);
@@ -1119,11 +1119,11 @@
ib_api_status_t
mlnx_create_qp (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const void *qp_context,
IN const ib_qp_create_t *p_create_attr,
OUT ib_qp_attr_t *p_qp_attr,
- OUT ib_qp_handle_t FUNC_PTR64 *ph_qp,
+ OUT ib_qp_handle_t *ph_qp,
IN OUT ci_umv_buf_t *p_umv_buf )
{
ib_api_status_t status;
@@ -1150,7 +1150,7 @@
ib_api_status_t
mlnx_modify_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t *p_modify_attr,
OUT ib_qp_attr_t *p_qp_attr OPTIONAL,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL )
@@ -1194,7 +1194,7 @@
// Query QP to obtain requested attributes
query_qp:
if (p_qp_attr) {
- status = mlnx_query_qp ((ib_qp_handle_t VOID_PTR64)ib_qp_p, p_qp_attr, p_umv_buf);
+ status = mlnx_query_qp ((ib_qp_handle_t )ib_qp_p, p_qp_attr, p_umv_buf);
if (status != IB_SUCCESS)
goto err_query_qp;
}
@@ -1231,7 +1231,7 @@
ib_api_status_t
mlnx_ndi_modify_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t *p_modify_attr,
OUT ib_qp_attr_t *p_qp_attr OPTIONAL,
IN const uint32_t buf_size,
@@ -1263,7 +1263,7 @@
ib_api_status_t
mlnx_query_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
OUT ib_qp_attr_t *p_qp_attr,
IN OUT ci_umv_buf_t *p_umv_buf )
{
@@ -1281,7 +1281,7 @@
// fill the structure
//TODO: this function is to be implemented via ibv_query_qp, which is not supported now
- p_qp_attr->h_pd = (ib_pd_handle_t VOID_PTR64)qp_p->ibqp.pd;
+ p_qp_attr->h_pd = (ib_pd_handle_t )qp_p->ibqp.pd;
p_qp_attr->qp_type = qp_p->ibqp.qp_type;
p_qp_attr->sq_max_inline = qp_p->qp_init_attr.cap.max_inline_data;
p_qp_attr->sq_depth = qp_p->qp_init_attr.cap.max_send_wr;
@@ -1289,8 +1289,8 @@
p_qp_attr->sq_sge = qp_p->qp_init_attr.cap.max_send_sge;
p_qp_attr->rq_sge = qp_p->qp_init_attr.cap.max_recv_sge;
p_qp_attr->resp_res = qp_p->resp_depth;
- p_qp_attr->h_sq_cq = (ib_cq_handle_t VOID_PTR64)qp_p->ibqp.send_cq;
- p_qp_attr->h_rq_cq = (ib_cq_handle_t VOID_PTR64)qp_p->ibqp.recv_cq;
+ p_qp_attr->h_sq_cq = (ib_cq_handle_t )qp_p->ibqp.send_cq;
+ p_qp_attr->h_rq_cq = (ib_cq_handle_t )qp_p->ibqp.recv_cq;
p_qp_attr->sq_signaled = qp_p->sq_policy == IB_SIGNAL_ALL_WR;
p_qp_attr->state = mlnx_qps_to_ibal( qp_p->state );
p_qp_attr->num = cl_hton32(qp_p->ibqp.qp_num);
@@ -1319,7 +1319,7 @@
ib_api_status_t
mlnx_destroy_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const uint64_t timewait )
{
ib_api_status_t status;
@@ -1360,10 +1360,10 @@
ib_api_status_t
mlnx_create_cq (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const void *cq_context,
IN OUT uint32_t *p_size,
- OUT ib_cq_handle_t FUNC_PTR64 *ph_cq,
+ OUT ib_cq_handle_t *ph_cq,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -1421,7 +1421,7 @@
// *p_size = *p_size; // return the same value
*p_size = ib_cq_p->cqe;
- if (ph_cq) *ph_cq = (ib_cq_handle_t VOID_PTR64)cq_p;
+ if (ph_cq) *ph_cq = (ib_cq_handle_t )cq_p;
status = IB_SUCCESS;
@@ -1441,7 +1441,7 @@
ib_api_status_t
mlnx_resize_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT uint32_t *p_size,
IN OUT ci_umv_buf_t *p_umv_buf )
{
@@ -1456,7 +1456,7 @@
ib_api_status_t
mlnx_query_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t *p_size,
IN OUT ci_umv_buf_t *p_umv_buf )
{
@@ -1471,7 +1471,7 @@
ib_api_status_t
mlnx_destroy_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq)
+ IN const ib_cq_handle_t h_cq)
{
ib_api_status_t status;
@@ -1508,7 +1508,7 @@
ib_api_status_t
mlnx_local_mad (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_av_attr_t* p_av_attr,
IN const ib_mad_t *p_mad_in,
Index: hw/mthca/kernel/ib_verbs.h
===================================================================
--- hw/mthca/kernel/ib_verbs.h (revision 1094)
+++ hw/mthca/kernel/ib_verbs.h (working copy)
@@ -756,7 +756,7 @@
mthca_qp_access_t mr_access_flags,
u64 *iova_start);
struct ib_mr * (*reg_virt_mr)(struct ib_pd *pd,
- void* FUNC_PTR64 vaddr, uint64_t length, uint64_t hca_va,
+ void* vaddr, uint64_t length, uint64_t hca_va,
mthca_qp_access_t acc, boolean_t um_call);
int (*query_mr)(struct ib_mr *mr,
struct ib_mr_attr *mr_attr);
@@ -1171,7 +1171,7 @@
*/
struct ib_mr *ibv_reg_mr(struct ib_pd *pd,
mthca_qp_access_t mr_access_flags,
- void* FUNC_PTR64 vaddr,
+ void* vaddr,
uint64_t length,
uint64_t hca_va,
boolean_t um_call
Index: hw/mthca/kernel/mt_verbs.c
===================================================================
--- hw/mthca/kernel/mt_verbs.c (revision 1094)
+++ hw/mthca/kernel/mt_verbs.c (working copy)
@@ -685,7 +685,7 @@
struct ib_mr *ibv_reg_mr(struct ib_pd *pd,
mthca_qp_access_t mr_access_flags,
- void* FUNC_PTR64 vaddr,
+ void* vaddr,
uint64_t length,
uint64_t hca_va,
boolean_t um_call
Index: hw/mthca/kernel/mthca_mad.c
===================================================================
--- hw/mthca/kernel/mthca_mad.c (revision 1094)
+++ hw/mthca/kernel/mthca_mad.c (working copy)
@@ -130,7 +130,7 @@
SPIN_LOCK_PREP(lh);
/* fill the template */
- wr.ds_array = (ib_local_ds_t* VOID_PTR64)(void*)&gather_list;
+ wr.ds_array = (ib_local_ds_t* )(void*)&gather_list;
wr.num_ds = 1;
wr.wr_type = WR_SEND;
wr.send_opt = IB_SEND_OPT_SIGNALED;
@@ -150,7 +150,7 @@
memcpy(tmad->sg.page, mad, sizeof *mad);
- wr.dgrm.ud.rsvd = (void* VOID_PTR64)&((struct ib_mad *)tmad->sg.page)->mad_hdr;
+ wr.dgrm.ud.rsvd = (void* )&((struct ib_mad *)tmad->sg.page)->mad_hdr;
wr.wr_id = (u64)(ULONG_PTR)tmad;
gather_list.addr = tmad->sg.dma_address;
gather_list.length = tmad->sg.length;
@@ -163,7 +163,7 @@
* it's OK for our devices).
*/
spin_lock_irqsave(&dev->sm_lock, &lh);
- wr.dgrm.ud.h_av = (ib_av_handle_t VOID_PTR64)dev->sm_ah[port_num - 1];
+ wr.dgrm.ud.h_av = (ib_av_handle_t )dev->sm_ah[port_num - 1];
if (wr.dgrm.ud.h_av) {
HCA_PRINT( TRACE_LEVEL_ERROR ,HCA_DBG_MAD ,(" ib_post_send_mad not ported \n" ));
ret = -EINVAL;
Index: hw/mthca/kernel/mthca_provider.c
===================================================================
--- hw/mthca/kernel/mthca_provider.c (revision 1094)
+++ hw/mthca/kernel/mthca_provider.c (working copy)
@@ -994,7 +994,7 @@
}
static struct ib_mr *mthca_reg_virt_mr(struct ib_pd *pd,
- void* FUNC_PTR64 vaddr, uint64_t length, uint64_t hca_va,
+ void* vaddr, uint64_t length, uint64_t hca_va,
mthca_qp_access_t acc, boolean_t um_call)
{
struct mthca_dev *dev = to_mdev(pd->device);
Index: hw/mthca/user/mlnx_ual_av.c
===================================================================
--- hw/mthca/user/mlnx_ual_av.c (revision 1094)
+++ hw/mthca/user/mlnx_ual_av.c (working copy)
@@ -114,10 +114,10 @@
static ib_api_status_t
__pre_create_av (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN const ib_av_attr_t *p_av_attr,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_av_handle_t FUNC_PTR64 *ph_uvp_av)
+ OUT ib_av_handle_t *ph_uvp_av)
{
int err;
struct mthca_ah *ah;
@@ -210,9 +210,9 @@
static void
__post_create_av (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
- IN OUT ib_av_handle_t FUNC_PTR64 *ph_uvp_av,
+ IN OUT ib_av_handle_t *ph_uvp_av,
IN OUT ci_umv_buf_t *p_umv_buf)
{
int err;
@@ -243,7 +243,7 @@
}
ah->key = page->mr.lkey;
}
- *ph_uvp_av = (ib_av_handle_t VOID_PTR64)ah;
+ *ph_uvp_av = (ib_av_handle_t )ah;
}
else {
mthca_free_av(ah);
@@ -259,7 +259,7 @@
static ib_api_status_t
__pre_query_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN OUT ci_umv_buf_t *p_umv_buf )
{
UNREFERENCED_PARAMETER(h_uvp_av);
@@ -272,10 +272,10 @@
static void
__post_query_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN ib_api_status_t ioctl_status,
IN OUT ib_av_attr_t *p_addr_vector,
- IN OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ IN OUT ib_pd_handle_t *ph_pd,
IN OUT ci_umv_buf_t *p_umv_buf)
{
struct mthca_ah *ah = (struct mthca_ah *)h_uvp_av;
@@ -289,7 +289,7 @@
{
cl_memcpy (p_addr_vector, &ah->av_attr, sizeof (ib_av_attr_t));
if (ph_pd)
- *ph_pd = (ib_pd_handle_t VOID_PTR64)ah->h_uvp_pd;
+ *ph_pd = (ib_pd_handle_t )ah->h_uvp_pd;
}
UVP_EXIT(UVP_DBG_AV);
@@ -299,7 +299,7 @@
static ib_api_status_t
__pre_modify_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN const ib_av_attr_t *p_addr_vector,
IN OUT ci_umv_buf_t *p_umv_buf)
{
@@ -334,7 +334,7 @@
static void
__post_modify_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN ib_api_status_t ioctl_status,
IN OUT ci_umv_buf_t *p_umv_buf)
{
@@ -345,7 +345,7 @@
static ib_api_status_t
__pre_destroy_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av)
+ IN const ib_av_handle_t h_uvp_av)
{
ib_api_status_t status ;
struct mthca_ah *mthca_ah = (struct mthca_ah *)h_uvp_av;
@@ -360,7 +360,7 @@
static void
__post_destroy_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN ib_api_status_t ioctl_status)
{
struct mthca_ah *mthca_ah = (struct mthca_ah *)h_uvp_av;
Index: hw/mthca/user/mlnx_ual_ca.c
===================================================================
--- hw/mthca/user/mlnx_ual_ca.c (revision 1094)
+++ hw/mthca/user/mlnx_ual_ca.c (working copy)
@@ -46,7 +46,7 @@
__pre_open_ca (
IN const ib_net64_t ca_guid,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_ca_handle_t FUNC_PTR64 *ph_uvp_ca)
+ OUT ib_ca_handle_t *ph_uvp_ca)
{
ib_api_status_t status = IB_SUCCESS;
@@ -77,7 +77,7 @@
__post_open_ca (
IN const ib_net64_t ca_guid,
IN ib_api_status_t ioctl_status,
- IN OUT ib_ca_handle_t FUNC_PTR64 *ph_uvp_ca,
+ IN OUT ib_ca_handle_t *ph_uvp_ca,
IN ci_umv_buf_t *p_umv_buf )
{
ib_api_status_t status = ioctl_status;
@@ -110,7 +110,7 @@
/* return results */
new_ca->ibv_ctx = ibvcontext;
new_ca->p_hca_attr = NULL;
- *ph_uvp_ca = (ib_ca_handle_t VOID_PTR64)new_ca;
+ *ph_uvp_ca = (ib_ca_handle_t )new_ca;
}
err_memory:
@@ -123,7 +123,7 @@
static ib_api_status_t
__pre_query_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_ca_attr_t *p_ca_attr,
IN size_t byte_count,
IN ci_umv_buf_t *p_umv_buf )
@@ -169,7 +169,7 @@
static void
__post_query_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status,
IN ib_ca_attr_t *p_ca_attr,
IN size_t byte_count,
@@ -199,7 +199,7 @@
static ib_api_status_t
__pre_modify_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN uint8_t port_num,
IN ib_ca_mod_t ca_mod,
IN const ib_port_attr_mod_t* p_port_attr_mod)
@@ -212,7 +212,7 @@
static void
__post_modify_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -222,7 +222,7 @@
static ib_api_status_t
__pre_close_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca)
+ IN ib_ca_handle_t h_uvp_ca)
{
UVP_ENTER(UVP_DBG_SHIM);
UVP_EXIT(UVP_DBG_SHIM);
@@ -232,7 +232,7 @@
static ib_api_status_t
__post_close_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status )
{
mlnx_ual_hobul_t *p_hobul = (mlnx_ual_hobul_t *)((void*)h_uvp_ca);
Index: hw/mthca/user/mlnx_ual_cq.c
===================================================================
--- hw/mthca/user/mlnx_ual_cq.c (revision 1094)
+++ hw/mthca/user/mlnx_ual_cq.c (working copy)
@@ -44,10 +44,10 @@
static ib_api_status_t
__pre_create_cq (
- IN const ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN const ib_ca_handle_t h_uvp_ca,
IN OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_cq_handle_t FUNC_PTR64 *ph_uvp_cq)
+ OUT ib_cq_handle_t *ph_uvp_cq)
{
struct ibv_cq *ibv_cq;
ib_api_status_t status = IB_SUCCESS;
@@ -98,10 +98,10 @@
static void
__post_create_cq (
- IN const ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN const ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status,
IN const uint32_t size,
- IN OUT ib_cq_handle_t FUNC_PTR64 *ph_uvp_cq,
+ IN OUT ib_cq_handle_t *ph_uvp_cq,
IN ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -128,7 +128,7 @@
goto err_create_cq;
}
- *ph_uvp_cq = (ib_cq_handle_t VOID_PTR64)ibv_cq;
+ *ph_uvp_cq = (ib_cq_handle_t )ibv_cq;
}
goto end;
@@ -144,7 +144,7 @@
static ib_api_status_t
__pre_query_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq,
+ IN const ib_cq_handle_t h_uvp_cq,
OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t *p_umv_buf)
{
@@ -161,7 +161,7 @@
static ib_api_status_t
__pre_destroy_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq)
+ IN const ib_cq_handle_t h_uvp_cq)
{
UVP_ENTER(UVP_DBG_CQ);
UVP_EXIT(UVP_DBG_CQ);
@@ -170,7 +170,7 @@
static void
__post_destroy_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq,
+ IN const ib_cq_handle_t h_uvp_cq,
IN ib_api_status_t ioctl_status)
{
int err;
Index: hw/mthca/user/mlnx_ual_mcast.c
===================================================================
--- hw/mthca/user/mlnx_ual_mcast.c (revision 1094)
+++ hw/mthca/user/mlnx_ual_mcast.c (working copy)
@@ -38,11 +38,11 @@
static ib_api_status_t
__pre_attach_mcast (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN const ib_gid_t *p_mcast_gid,
IN const uint16_t mcast_lid,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_mcast_handle_t FUNC_PTR64 *ph_mcast)
+ OUT ib_mcast_handle_t *ph_mcast)
{
UNREFERENCED_PARAMETER(ph_mcast);
@@ -61,9 +61,9 @@
static void
__post_attach_mcast (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status,
- IN OUT ib_mcast_handle_t FUNC_PTR64 *ph_mcast,
+ IN OUT ib_mcast_handle_t *ph_mcast,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -74,7 +74,7 @@
static ib_api_status_t
__pre_detach_mcast (
- IN ib_mcast_handle_t FUNC_PTR64 h_uvp_mcast,
+ IN ib_mcast_handle_t h_uvp_mcast,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -91,7 +91,7 @@
static void
__post_detach_mcast (
- IN ib_mcast_handle_t FUNC_PTR64 h_uvp_mcast,
+ IN ib_mcast_handle_t h_uvp_mcast,
IN ib_api_status_t ioctl_status,
IN OUT ci_umv_buf_t *p_umv_buf)
{
Index: hw/mthca/user/mlnx_ual_mrw.c
===================================================================
--- hw/mthca/user/mlnx_ual_mrw.c (revision 1094)
+++ hw/mthca/user/mlnx_ual_mrw.c (working copy)
@@ -39,10 +39,10 @@
static ib_api_status_t
__pre_register_mr (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN const ib_mr_create_t *p_mr_create,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_mr_handle_t FUNC_PTR64 *ph_uvp_mr)
+ OUT ib_mr_handle_t *ph_uvp_mr)
{
UNREFERENCED_PARAMETER(ph_uvp_mr);
@@ -59,11 +59,11 @@
static void
__post_register_mr (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
IN const uint32_t *p_lkey,
IN const uint32_t *p_rkey,
- IN OUT const ib_mr_handle_t FUNC_PTR64 *ph_uvp_mr,
+ IN OUT const ib_mr_handle_t *ph_uvp_mr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -74,7 +74,7 @@
static ib_api_status_t
__pre_query_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_mr_handle_t h_uvp_mr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -90,7 +90,7 @@
static void
__post_query_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_mr_handle_t h_uvp_mr,
IN ib_api_status_t ioctl_status,
IN const ib_mr_attr_t *p_mr_query,
IN OUT ci_umv_buf_t *p_umv_buf)
@@ -103,8 +103,8 @@
static ib_api_status_t
__pre_modify_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd OPTIONAL,
+ IN const ib_mr_handle_t h_uvp_mr,
+ IN const ib_pd_handle_t h_uvp_pd OPTIONAL,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_mr_create_t *p_mr_create OPTIONAL,
IN OUT ci_umv_buf_t *p_umv_buf)
@@ -122,8 +122,8 @@
static void
__post_modify_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd OPTIONAL,
+ IN const ib_mr_handle_t h_uvp_mr,
+ IN const ib_pd_handle_t h_uvp_pd OPTIONAL,
IN ib_api_status_t ioctl_status,
IN const uint32_t *p_lkey,
IN const uint32_t *p_rkey,
@@ -137,8 +137,8 @@
static ib_api_status_t
__pre_register_smr (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_pd_handle_t h_uvp_pd,
+ IN const ib_mr_handle_t h_uvp_mr,
IN const ib_access_t access_ctrl,
IN void *p_vaddr,
IN OUT ci_umv_buf_t *p_umv_buf)
@@ -156,13 +156,13 @@
static void
__post_register_smr (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_pd_handle_t h_uvp_pd,
+ IN const ib_mr_handle_t h_uvp_mr,
IN ib_api_status_t ioctl_status,
IN const void *p_vaddr,
IN const uint32_t *p_lkey,
IN const uint32_t *p_rkey,
- OUT const ib_mr_handle_t FUNC_PTR64 *ph_uvp_smr,
+ OUT const ib_mr_handle_t *ph_uvp_smr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -173,7 +173,7 @@
static ib_api_status_t
__pre_deregister_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_mr_handle_t h_uvp_mr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -184,7 +184,7 @@
static void
__post_deregister_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_mr_handle_t h_uvp_mr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
Index: hw/mthca/user/mlnx_ual_osbypass.c
===================================================================
--- hw/mthca/user/mlnx_ual_osbypass.c (revision 1094)
+++ hw/mthca/user/mlnx_ual_osbypass.c (working copy)
@@ -56,7 +56,7 @@
static ib_api_status_t
__post_send (
- IN const void* FUNC_PTR64 h_qp,
+ IN const void* h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t** pp_send_failure )
{
@@ -84,7 +84,7 @@
static ib_api_status_t
__post_recv (
- IN const void* FUNC_PTR64 h_qp,
+ IN const void* h_qp,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t** pp_recv_failure )
{
@@ -112,7 +112,7 @@
static ib_api_status_t
__post_srq_recv (
- IN const void* FUNC_PTR64 h_srq,
+ IN const void* h_srq,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t** pp_recv_failure )
{
@@ -139,7 +139,7 @@
static ib_api_status_t
__poll_cq (
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist )
{
@@ -178,7 +178,7 @@
static ib_api_status_t
__enable_cq_notify (
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
IN const boolean_t solicited )
{
int err;
@@ -203,7 +203,7 @@
static ib_api_status_t
__enable_ncomp_cq_notify (
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
IN const uint32_t n_cqes )
{
// Not yet implemented
Index: hw/mthca/user/mlnx_ual_pd.c
===================================================================
--- hw/mthca/user/mlnx_ual_pd.c (revision 1094)
+++ hw/mthca/user/mlnx_ual_pd.c (working copy)
@@ -42,9 +42,9 @@
static ib_api_status_t
__pre_allocate_pd (
- IN const ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN const ib_ca_handle_t h_uvp_ca,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_uvp_pd)
+ OUT ib_pd_handle_t *ph_uvp_pd)
{
ib_api_status_t status = IB_SUCCESS;
@@ -74,9 +74,9 @@
static void
__post_allocate_pd (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status,
- IN OUT ib_pd_handle_t FUNC_PTR64 *ph_uvp_pd,
+ IN OUT ib_pd_handle_t *ph_uvp_pd,
IN ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -113,7 +113,7 @@
/* return results */
p_new_pd->ibv_pd = ibv_pd;
p_new_pd->p_hobul = p_hobul;
- *ph_uvp_pd = (ib_pd_handle_t VOID_PTR64)p_new_pd;
+ *ph_uvp_pd = (ib_pd_handle_t )p_new_pd;
}
goto end;
@@ -130,7 +130,7 @@
static ib_api_status_t
__pre_deallocate_pd (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd)
+ IN const ib_pd_handle_t h_uvp_pd)
{
mlnx_ual_pd_info_t *p_pd_info = (mlnx_ual_pd_info_t *)((void *)h_uvp_pd);
UVP_ENTER(UVP_DBG_SHIM);
@@ -142,7 +142,7 @@
static void
__post_deallocate_pd (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status )
{
int err;
Index: hw/mthca/user/mlnx_ual_qp.c
===================================================================
--- hw/mthca/user/mlnx_ual_qp.c (revision 1094)
+++ hw/mthca/user/mlnx_ual_qp.c (working copy)
@@ -41,7 +41,7 @@
static void
__nd_modify_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
OUT void** pp_outbuf,
OUT DWORD* p_size
)
@@ -69,7 +69,7 @@
static uint32_t
__nd_get_qp_state(
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp
+ IN const ib_qp_handle_t h_uvp_qp
)
{
struct ibv_qp *ibv_qp = (struct ibv_qp *)h_uvp_qp;
@@ -80,10 +80,10 @@
static ib_api_status_t
__pre_create_qp (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN const ib_qp_create_t *p_create_attr,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_qp_handle_t FUNC_PTR64 *ph_uvp_qp)
+ OUT ib_qp_handle_t *ph_uvp_qp)
{
int err;
struct ibv_qp *ibv_qp;
@@ -150,9 +150,9 @@
static ib_api_status_t
__post_create_qp (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
- IN OUT ib_qp_handle_t FUNC_PTR64 *ph_uvp_qp,
+ IN OUT ib_qp_handle_t *ph_uvp_qp,
IN ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -179,7 +179,7 @@
goto err_create_cq;
}
- *ph_uvp_qp = (ib_qp_handle_t VOID_PTR64)ibv_qp;
+ *ph_uvp_qp = (ib_qp_handle_t )ibv_qp;
}
goto end;
@@ -194,7 +194,7 @@
static ib_api_status_t
__pre_modify_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN const ib_qp_mod_t *p_modify_attr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
@@ -227,7 +227,7 @@
static void
__post_modify_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status,
IN OUT ci_umv_buf_t *p_umv_buf)
{
@@ -270,7 +270,7 @@
static ib_api_status_t
__pre_query_qp (
- IN ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN ib_qp_handle_t h_uvp_qp,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UNREFERENCED_PARAMETER(h_uvp_qp);
@@ -285,7 +285,7 @@
static void
__post_query_qp (
- IN ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status,
IN OUT ib_qp_attr_t *p_query_attr,
IN OUT ci_umv_buf_t *p_umv_buf)
@@ -308,7 +308,7 @@
static ib_api_status_t
__pre_destroy_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp)
+ IN const ib_qp_handle_t h_uvp_qp)
{
int err;
@@ -323,7 +323,7 @@
static void
__post_destroy_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status)
{
int err;
Index: hw/mthca/user/mlnx_ual_srq.c
===================================================================
--- hw/mthca/user/mlnx_ual_srq.c (revision 1094)
+++ hw/mthca/user/mlnx_ual_srq.c (working copy)
@@ -70,10 +70,10 @@
static ib_api_status_t
__pre_create_srq (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,// Fix me: if needed
+ IN const ib_pd_handle_t h_uvp_pd,// Fix me: if needed
IN const ib_srq_attr_t *p_srq_attr,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_srq_handle_t FUNC_PTR64 *ph_uvp_srq)
+ OUT ib_srq_handle_t *ph_uvp_srq)
{
struct mthca_srq *srq;
ib_api_status_t status = IB_SUCCESS;
@@ -180,9 +180,9 @@
static void
__post_create_srq (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
- IN OUT ib_srq_handle_t FUNC_PTR64 *ph_uvp_srq,
+ IN OUT ib_srq_handle_t *ph_uvp_srq,
IN ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -214,7 +214,7 @@
if (mthca_is_memfree(ibv_pd->context))
mthca_set_db_qn(srq->db, MTHCA_DB_TYPE_SRQ, srq->srqn);
- *ph_uvp_srq = (ib_srq_handle_t VOID_PTR64)srq;
+ *ph_uvp_srq = (ib_srq_handle_t )srq;
}
else
__free_srq(srq);
@@ -227,7 +227,7 @@
static void
__post_destroy_srq (
- IN const ib_srq_handle_t FUNC_PTR64 h_uvp_srq,
+ IN const ib_srq_handle_t h_uvp_srq,
IN ib_api_status_t ioctl_status)
{
int err;
Index: inc/iba/ib_al.h
===================================================================
--- inc/iba/ib_al.h (revision 1094)
+++ inc/iba/ib_al.h (working copy)
@@ -58,19 +58,19 @@
* of a user.
****/
-typedef struct _ib_al* TYPEDEF_PTR64 ib_al_handle_t;
-typedef struct _al_pnp* TYPEDEF_PTR64 ib_pnp_handle_t;
-typedef struct _al_reg_svc* TYPEDEF_PTR64 ib_reg_svc_handle_t;
-typedef struct _al_mad_send* TYPEDEF_PTR64 ib_mad_send_handle_t;
-typedef struct _al_mad_svc* TYPEDEF_PTR64 ib_mad_svc_handle_t;
-typedef struct _al_query* TYPEDEF_PTR64 ib_query_handle_t;
-typedef struct _al_sub* TYPEDEF_PTR64 ib_sub_handle_t;
-typedef struct _al_listen* TYPEDEF_PTR64 ib_listen_handle_t;
-typedef struct _al_ioc* TYPEDEF_PTR64 ib_ioc_handle_t;
-typedef struct _al_svc_entry* TYPEDEF_PTR64 ib_svc_handle_t;
-typedef struct _al_pool_key* TYPEDEF_PTR64 ib_pool_key_t;
-typedef struct _al_pool* TYPEDEF_PTR64 ib_pool_handle_t;
-typedef struct _mlnx_fmr_pool_element* TYPEDEF_PTR64 mlnx_fmr_pool_el_t;
+typedef struct _ib_al* ib_al_handle_t;
+typedef struct _al_pnp* ib_pnp_handle_t;
+typedef struct _al_reg_svc* ib_reg_svc_handle_t;
+typedef struct _al_mad_send* ib_mad_send_handle_t;
+typedef struct _al_mad_svc* ib_mad_svc_handle_t;
+typedef struct _al_query* ib_query_handle_t;
+typedef struct _al_sub* ib_sub_handle_t;
+typedef struct _al_listen* ib_listen_handle_t;
+typedef struct _al_ioc* ib_ioc_handle_t;
+typedef struct _al_svc_entry* ib_svc_handle_t;
+typedef struct _al_pool_key* ib_pool_key_t;
+typedef struct _al_pool* ib_pool_handle_t;
+typedef struct _mlnx_fmr_pool_element* mlnx_fmr_pool_el_t;
typedef struct _ib_cm_handle
{
@@ -337,8 +337,8 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_comp_cb_t)(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+(AL_API * ib_pfn_comp_cb_t)(
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
/*
* PARAMETERS
@@ -395,7 +395,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_destroy_cb_t)(
+(AL_API * ib_pfn_destroy_cb_t)(
IN void *context );
/*
* PARAMETERS
@@ -507,7 +507,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_event_cb_t)(
+(AL_API * ib_pfn_event_cb_t)(
IN ib_async_event_rec_t *p_event_rec );
/*
* PARAMETERS
@@ -535,11 +535,11 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_open_ca(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_net64_t ca_guid,
IN const ib_pfn_event_cb_t pfn_ca_event_cb OPTIONAL,
IN const void* const ca_context,
- OUT ib_ca_handle_t FUNC_PTR64* const ph_ca );
+ OUT ib_ca_handle_t * const ph_ca );
/*
* PARAMETERS
* h_al
@@ -596,7 +596,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_query_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
OUT ib_ca_attr_t* const p_ca_attr OPTIONAL,
IN OUT uint32_t* const p_size );
/*
@@ -657,7 +657,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_query_ca_by_guid(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_net64_t ca_guid,
OUT ib_ca_attr_t* const p_ca_attr OPTIONAL,
IN OUT uint32_t* const p_size );
@@ -725,7 +725,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_modify_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_ca_mod_t ca_mod,
IN const ib_port_attr_mod_t* const p_port_attr_mod );
@@ -785,7 +785,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_close_ca(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL );
/*
* PARAMETERS
@@ -828,10 +828,10 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_alloc_pd(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_pd_type_t pd_type,
IN const void* const pd_context,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd );
+ OUT ib_pd_handle_t * const ph_pd );
/*
* PARAMETERS
* h_ca
@@ -887,7 +887,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_dealloc_pd(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL );
/*
* PARAMETERS
@@ -930,9 +930,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_create_av(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t* const p_av_attr,
- OUT ib_av_handle_t FUNC_PTR64* const ph_av );
+ OUT ib_av_handle_t * const ph_av );
/*
* PARAMETERS
* h_pd
@@ -988,9 +988,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_query_av(
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
OUT ib_av_attr_t* const p_av_attr,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd );
+ OUT ib_pd_handle_t * const ph_pd );
/*
* PARAMETERS
* h_av
@@ -1031,7 +1031,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_modify_av(
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
IN const ib_av_attr_t* const p_av_attr );
/*
* PARAMETERS
@@ -1076,7 +1076,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_destroy_av(
- IN const ib_av_handle_t FUNC_PTR64 h_av );
+ IN const ib_av_handle_t h_av );
/*
* PARAMETERS
* h_av
@@ -1108,11 +1108,11 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_create_srq(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_srq_attr_t* const p_srq_attr,
IN const void* const srq_context,
IN const ib_pfn_event_cb_t pfn_srq_event_cb OPTIONAL,
- OUT ib_srq_handle_t FUNC_PTR64* const ph_srq );
+ OUT ib_srq_handle_t * const ph_srq );
/*
* PARAMETERS
* h_pd
@@ -1192,7 +1192,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_query_srq(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
OUT ib_srq_attr_t* const p_srq_attr );
/*
* PARAMETERS
@@ -1234,7 +1234,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_modify_srq(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr,
IN const ib_srq_attr_mask_t srq_attr_mask );
/*
@@ -1292,7 +1292,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_destroy_srq(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL );
/*
* PARAMETERS
@@ -1337,7 +1337,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_post_srq_recv(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_recv_failure OPTIONAL );
/*
@@ -1395,11 +1395,11 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_create_qp(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_qp_create_t* const p_qp_create,
IN const void* const qp_context,
IN const ib_pfn_event_cb_t pfn_qp_event_cb OPTIONAL,
- OUT ib_qp_handle_t FUNC_PTR64* const ph_qp );
+ OUT ib_qp_handle_t * const ph_qp );
/*
* PARAMETERS
* h_pd
@@ -1508,13 +1508,13 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_get_spl_qp(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid,
IN const ib_qp_create_t* const p_qp_create,
IN const void* const qp_context,
IN const ib_pfn_event_cb_t pfn_qp_event_cb OPTIONAL,
- OUT ib_pool_key_t FUNC_PTR64* const p_pool_key OPTIONAL,
- OUT ib_qp_handle_t FUNC_PTR64* const ph_qp );
+ OUT ib_pool_key_t * const p_pool_key OPTIONAL,
+ OUT ib_qp_handle_t * const ph_qp );
/*
* PARAMETERS
* h_pd
@@ -1623,7 +1623,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_query_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
OUT ib_qp_attr_t* const p_qp_attr );
/*
* PARAMETERS
@@ -1664,7 +1664,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_modify_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod );
/*
* PARAMETERS
@@ -1726,7 +1726,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_destroy_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL );
/*
* PARAMETERS
@@ -1813,11 +1813,11 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_create_cq(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN OUT ib_cq_create_t* const p_cq_create,
IN const void* const cq_context,
IN const ib_pfn_event_cb_t pfn_cq_event_cb OPTIONAL,
- OUT ib_cq_handle_t FUNC_PTR64* const ph_cq );
+ OUT ib_cq_handle_t * const ph_cq );
/*
* PARAMETERS
* h_ca
@@ -1889,7 +1889,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_modify_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT uint32_t* const p_size );
/*
* PARAMETERS
@@ -1947,7 +1947,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_query_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_size );
/*
* PARAMETERS
@@ -1985,7 +1985,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_destroy_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL );
/*
* PARAMETERS
@@ -2031,11 +2031,11 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_reg_mem(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_mr_create_t* const p_mr_create,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr );
+ OUT ib_mr_handle_t * const ph_mr );
/*
* PARAMETERS
* h_pd
@@ -2102,12 +2102,12 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_reg_phys(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_phys_create_t* const p_phys_create,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr );
+ OUT ib_mr_handle_t * const ph_mr );
/*
* PARAMETERS
* h_pd
@@ -2181,7 +2181,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_query_mr(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
OUT ib_mr_attr_t* const p_mr_attr );
/*
* PARAMETERS
@@ -2222,12 +2222,12 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_rereg_mem(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_mr_create_t* const p_mr_create OPTIONAL,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL );
+ IN const ib_pd_handle_t h_pd OPTIONAL );
/*
* PARAMETERS
* h_mr
@@ -2307,13 +2307,13 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_rereg_phys(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_phys_create_t* const p_phys_create OPTIONAL,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL );
+ IN const ib_pd_handle_t h_pd OPTIONAL );
/*
* PARAMETERS
* h_mr
@@ -2399,13 +2399,13 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_reg_shared(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_mr_handle_t h_mr,
+ IN const ib_pd_handle_t h_pd,
IN const ib_access_t access_ctrl,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr );
+ OUT ib_mr_handle_t * const ph_mr );
/*
* PARAMETERS
* h_mr
@@ -2486,13 +2486,13 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_reg_shmid(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_shmid_t shmid,
IN const ib_mr_create_t* const p_mr_create,
OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr );
+ OUT ib_mr_handle_t * const ph_mr );
/*
* PARAMETERS
* h_pd
@@ -2573,7 +2573,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_dereg_mr(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr );
+ IN const ib_mr_handle_t h_mr );
/*
* PARAMETERS
* h_mr
@@ -2614,9 +2614,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
mlnx_create_fmr(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const mlnx_fmr_create_t* const p_fmr_create,
- OUT mlnx_fmr_handle_t FUNC_PTR64* const ph_fmr );
+ OUT mlnx_fmr_handle_t * const ph_fmr );
/*
* PARAMETERS
* h_pd
@@ -2678,7 +2678,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
mlnx_map_phys_fmr(
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr,
+ IN const mlnx_fmr_handle_t h_fmr,
IN const uint64_t* const paddr_list,
IN const int list_len,
IN OUT uint64_t* const p_vaddr,
@@ -2752,7 +2752,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
mlnx_unmap_fmr(
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr );
+ IN const mlnx_fmr_handle_t h_fmr );
/*
* PARAMETERS
* h_fmr
@@ -2806,7 +2806,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
mlnx_destroy_fmr(
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr );
+ IN const mlnx_fmr_handle_t h_fmr );
/*
* PARAMETERS
* h_fmr
@@ -2861,9 +2861,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
mlnx_create_fmr_pool(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const mlnx_fmr_pool_create_t *p_fmr_pool_attr,
- OUT mlnx_fmr_pool_handle_t FUNC_PTR64* const ph_pool );
+ OUT mlnx_fmr_pool_handle_t * const ph_pool );
/*
* PARAMETERS
TODO
@@ -2890,7 +2890,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
mlnx_destroy_fmr_pool(
- IN const mlnx_fmr_pool_handle_t FUNC_PTR64 h_pool );
+ IN const mlnx_fmr_pool_handle_t h_pool );
/*
* PARAMETERS
TODO
@@ -2922,13 +2922,13 @@
*/
AL_EXPORT ib_api_status_t AL_API
mlnx_map_phys_fmr_pool(
- IN const mlnx_fmr_pool_handle_t FUNC_PTR64 h_pool ,
+ IN const mlnx_fmr_pool_handle_t h_pool ,
IN const uint64_t* const paddr_list,
IN const int list_len,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT mlnx_fmr_pool_el_t FUNC_PTR64 *pp_fmr_el);
+ OUT mlnx_fmr_pool_el_t *pp_fmr_el);
/*
* PARAMETERS
TODO
@@ -2958,7 +2958,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
mlnx_unmap_fmr_pool(
- IN mlnx_fmr_pool_el_t FUNC_PTR64 p_fmr_el );
+ IN mlnx_fmr_pool_el_t p_fmr_el );
/*
* PARAMETERS
TODO
@@ -2984,7 +2984,7 @@
* SYNOPSIS
*/
ib_api_status_t
-mlnx_flush_fmr_pool(mlnx_fmr_pool_handle_t FUNC_PTR64 h_pool) ;
+mlnx_flush_fmr_pool(mlnx_fmr_pool_handle_t h_pool) ;
/*
* PARAMETERS
TODO
@@ -3012,9 +3012,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_create_mw(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
OUT net32_t* const p_rkey,
- OUT ib_mw_handle_t FUNC_PTR64* const ph_mw );
+ OUT ib_mw_handle_t * const ph_mw );
/*
* PARAMETERS
* h_pd
@@ -3068,8 +3068,8 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_query_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd,
+ IN const ib_mw_handle_t h_mw,
+ OUT ib_pd_handle_t * const ph_pd,
OUT net32_t* const p_rkey );
/*
* PARAMETERS
@@ -3113,8 +3113,8 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_bind_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_mw_handle_t h_mw,
+ IN const ib_qp_handle_t h_qp,
IN ib_bind_wr_t* const p_mw_bind,
OUT net32_t* const p_rkey );
/*
@@ -3188,7 +3188,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_destroy_mw(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw );
+ IN const ib_mw_handle_t h_mw );
/*
* PARAMETERS
* h_mw
@@ -3221,7 +3221,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_post_send(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t **pp_send_failure OPTIONAL );
/*
@@ -3285,7 +3285,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_post_recv(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_recv_failure OPTIONAL );
/*
@@ -3343,7 +3343,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_send_mad(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element_list,
OUT ib_mad_element_t **pp_mad_failure OPTIONAL );
/*
@@ -3408,7 +3408,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_cancel_mad(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element );
/*
* PARAMETERS
@@ -3452,7 +3452,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_peek_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_n_cqes );
/*
* PARAMETERS
@@ -3497,7 +3497,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_poll_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist );
/*
@@ -3555,7 +3555,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_rearm_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const boolean_t solicited );
/*
* PARAMETERS
@@ -3595,7 +3595,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_rearm_n_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const uint32_t n_cqes );
/*
* PARAMETERS
@@ -3694,7 +3694,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_mcast_cb_t)(
+(AL_API * ib_pfn_mcast_cb_t)(
IN ib_mcast_rec_t *p_mcast_rec );
/*
* PARAMETERS
@@ -3799,7 +3799,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_join_mcast(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mcast_req_t* const p_mcast_req );
/*
* PARAMETERS
@@ -3880,7 +3880,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_leave_mcast(
- IN const ib_mcast_handle_t FUNC_PTR64 h_mcast,
+ IN const ib_mcast_handle_t h_mcast,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL );
/*
* PARAMETERS
@@ -3926,7 +3926,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_local_mad(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const void* const p_mad_in,
OUT void* p_mad_out );
@@ -4725,7 +4725,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_cm_req_cb_t)(
+(AL_API * ib_pfn_cm_req_cb_t)(
IN ib_cm_req_rec_t *p_cm_req_rec );
/*
* PARAMETERS
@@ -4763,7 +4763,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_cm_rep_cb_t)(
+(AL_API * ib_pfn_cm_rep_cb_t)(
IN ib_cm_rep_rec_t *p_cm_rep_rec );
/*
* PARAMETERS
@@ -4807,7 +4807,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_cm_rtu_cb_t)(
+(AL_API * ib_pfn_cm_rtu_cb_t)(
IN ib_cm_rtu_rec_t *p_cm_rtu_rec );
/*
* PARAMETERS
@@ -4842,7 +4842,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_cm_rej_cb_t)(
+(AL_API * ib_pfn_cm_rej_cb_t)(
IN ib_cm_rej_rec_t *p_cm_rej_rec );
/*
* PARAMETERS
@@ -4873,7 +4873,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_cm_mra_cb_t)(
+(AL_API * ib_pfn_cm_mra_cb_t)(
IN ib_cm_mra_rec_t *p_cm_mra_rec );
/*
@@ -4906,7 +4906,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_cm_lap_cb_t)(
+(AL_API * ib_pfn_cm_lap_cb_t)(
IN ib_cm_lap_rec_t *p_cm_lap_rec );
/*
* PARAMETERS
@@ -4938,7 +4938,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_cm_apr_cb_t)(
+(AL_API * ib_pfn_cm_apr_cb_t)(
IN ib_cm_apr_rec_t *p_cm_apr_rec );
/*
* PARAMETERS
@@ -4969,7 +4969,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_cm_dreq_cb_t)(
+(AL_API * ib_pfn_cm_dreq_cb_t)(
IN ib_cm_dreq_rec_t *p_cm_dreq_rec );
/*
* PARAMETERS
@@ -5002,7 +5002,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_cm_drep_cb_t)(
+(AL_API * ib_pfn_cm_drep_cb_t)(
IN ib_cm_drep_rec_t *p_cm_drep_rec );
/*
* PARAMETERS
@@ -5878,7 +5878,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_listen_err_cb_t)(
+(AL_API * ib_pfn_listen_err_cb_t)(
IN ib_listen_err_rec_t *p_listen_err_rec );
/*
* PARAMETERS
@@ -5906,11 +5906,11 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_cm_listen(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_cm_listen_t* const p_cm_listen,
IN const ib_pfn_listen_err_cb_t pfn_listen_err_cb,
IN const void* const listen_context,
- OUT ib_listen_handle_t FUNC_PTR64* const ph_cm_listen );
+ OUT ib_listen_handle_t * const ph_cm_listen );
/*
* PARAMETERS
* h_al
@@ -5995,7 +5995,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_cm_cancel(
- IN const ib_listen_handle_t FUNC_PTR64 h_cm_listen,
+ IN const ib_listen_handle_t h_cm_listen,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL );
/*
* PARAMETERS
@@ -6456,7 +6456,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_force_apm(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp );
+ IN const ib_qp_handle_t h_qp );
/*
* PARAMETERS
* h_qp
@@ -6715,9 +6715,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_create_ioc(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_ioc_profile_t* const p_ioc_profile,
- OUT ib_ioc_handle_t FUNC_PTR64* const ph_ioc );
+ OUT ib_ioc_handle_t * const ph_ioc );
/*
* PARAMETERS
* h_ca
@@ -6767,7 +6767,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_destroy_ioc(
- IN const ib_ioc_handle_t FUNC_PTR64 h_ioc );
+ IN const ib_ioc_handle_t h_ioc );
/*
* PARAMETERS
* h_ioc
@@ -6802,7 +6802,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_reg_ioc(
- IN const ib_ioc_handle_t FUNC_PTR64 h_ioc );
+ IN const ib_ioc_handle_t h_ioc );
/*
* PARAMETERS
* h_ioc
@@ -6844,9 +6844,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_add_svc_entry(
- IN const ib_ioc_handle_t FUNC_PTR64 h_ioc,
+ IN const ib_ioc_handle_t h_ioc,
IN const ib_svc_entry_t* const p_svc_entry,
- OUT ib_svc_handle_t FUNC_PTR64* const ph_svc );
+ OUT ib_svc_handle_t * const ph_svc );
/*
* PARAMETERS
* h_ioc
@@ -6901,7 +6901,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_remove_svc_entry(
- IN const ib_svc_handle_t FUNC_PTR64 h_svc );
+ IN const ib_svc_handle_t h_svc );
/*
* PARAMETERS
* h_svc
@@ -6936,7 +6936,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_get_ca_guids(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
OUT ib_net64_t* const p_guid_array OPTIONAL,
IN OUT size_t* const p_guid_cnt );
/*
@@ -6993,7 +6993,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_get_ca_by_gid(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN const ib_gid_t* const p_gid,
OUT ib_net64_t* const p_ca_guid );
/*
@@ -7045,7 +7045,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_get_port_by_gid(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN const ib_gid_t* const p_gid,
OUT ib_net64_t* const p_port_guid );
/*
@@ -7097,8 +7097,8 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_mad_comp_cb_t)(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+(AL_API * ib_pfn_mad_comp_cb_t)(
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element );
/*
@@ -7145,11 +7145,11 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_create_mad_pool(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const size_t min,
IN const size_t max,
IN const size_t grow_size,
- OUT ib_pool_handle_t FUNC_PTR64* const ph_pool );
+ OUT ib_pool_handle_t * const ph_pool );
/*
* PARAMETERS
* h_al
@@ -7210,7 +7210,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_destroy_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool );
+ IN const ib_pool_handle_t h_pool );
/*
* PARAMETERS
* h_pool
@@ -7246,9 +7246,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_reg_mad_pool(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- OUT ib_pool_key_t FUNC_PTR64* const p_pool_key );
+ IN const ib_pool_handle_t h_pool,
+ IN const ib_pd_handle_t h_pd,
+ OUT ib_pool_key_t * const p_pool_key );
/*
* PARAMETERS
* h_pool
@@ -7304,7 +7304,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_dereg_mad_pool(
- IN const ib_pool_key_t FUNC_PTR64 pool_key );
+ IN const ib_pool_key_t pool_key );
/*
* PARAMETERS
* pool_key
@@ -7344,7 +7344,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_get_mad(
- IN const ib_pool_key_t FUNC_PTR64 pool_key,
+ IN const ib_pool_key_t pool_key,
IN const size_t buf_size,
OUT ib_mad_element_t **pp_mad_element );
/*
@@ -7474,7 +7474,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_init_dgrm_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_dgrm_info_t* const p_dgrm_info OPTIONAL );
/*
* PARAMETERS
@@ -7672,9 +7672,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_reg_mad_svc(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mad_svc_t* const p_mad_svc,
- OUT ib_mad_svc_handle_t FUNC_PTR64* const ph_mad_svc );
+ OUT ib_mad_svc_handle_t * const ph_mad_svc );
/*
* PARAMETERS
* h_qp
@@ -7777,7 +7777,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_reg_svc_cb_t)(
+(AL_API * ib_pfn_reg_svc_cb_t)(
IN ib_reg_svc_rec_t *p_reg_svc_rec );
/*
* PARAMETERS
@@ -7881,7 +7881,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_reg_svc(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_reg_svc_req_t* const p_reg_svc_req,
OUT ib_reg_svc_handle_t* const ph_reg_svc );
/*
@@ -8488,7 +8488,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_query_cb_t)(
+(AL_API * ib_pfn_query_cb_t)(
IN ib_query_rec_t *p_query_rec );
/*
* PARAMETERS
@@ -8601,9 +8601,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_query(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_query_req_t* const p_query_req,
- OUT ib_query_handle_t FUNC_PTR64* const ph_query OPTIONAL );
+ OUT ib_query_handle_t * const ph_query OPTIONAL );
/*
* PARAMETERS
* h_al
@@ -8662,8 +8662,8 @@
*/
AL_EXPORT void AL_API
ib_cancel_query(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
- IN const ib_query_handle_t FUNC_PTR64 h_query );
+ IN const ib_al_handle_t h_al,
+ IN const ib_query_handle_t h_query );
/*
* PARAMETERS
* h_al
@@ -9305,7 +9305,7 @@
* SYNOPSIS
*/
typedef ib_api_status_t
-(AL_API * FUNC_PTR64 ib_pfn_pnp_cb_t)(
+(AL_API * ib_pfn_pnp_cb_t)(
IN ib_pnp_rec_t *p_pnp_rec );
/*
* PARAMETERS
@@ -9398,9 +9398,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_reg_pnp(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_pnp_req_t* const p_pnp_req,
- OUT ib_pnp_handle_t FUNC_PTR64* const ph_pnp );
+ OUT ib_pnp_handle_t * const ph_pnp );
/*
* PARAMETERS
* h_al
@@ -9460,7 +9460,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_dereg_pnp(
- IN const ib_pnp_handle_t FUNC_PTR64 h_pnp,
+ IN const ib_pnp_handle_t h_pnp,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL );
/*
* PARAMETERS
@@ -9545,7 +9545,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_sub_cb_t)(
+(AL_API * ib_pfn_sub_cb_t)(
IN ib_sub_rec_t *p_sub_rec );
/*
* PARAMETERS
@@ -9617,7 +9617,7 @@
* SYNOPSIS
*/
typedef void
-(AL_API * FUNC_PTR64 ib_pfn_report_cb_t)(
+(AL_API * ib_pfn_report_cb_t)(
IN ib_report_rec_t *p_report_rec );
/*
* PARAMETERS
@@ -9738,9 +9738,9 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_subscribe(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_sub_req_t* const p_sub_req,
- OUT ib_sub_handle_t FUNC_PTR64* const ph_sub );
+ OUT ib_sub_handle_t * const ph_sub );
/*
* PARAMETERS
* h_al
@@ -9798,7 +9798,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_unsubscribe(
- IN const ib_sub_handle_t FUNC_PTR64 h_sub,
+ IN const ib_sub_handle_t h_sub,
IN const ib_pfn_destroy_cb_t pfn_destroy_cb OPTIONAL );
/*
* PARAMETERS
@@ -9852,8 +9852,8 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_reject_ioc(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
- IN const ib_pnp_handle_t FUNC_PTR64 h_ioc_event );
+ IN const ib_al_handle_t h_al,
+ IN const ib_pnp_handle_t h_ioc_event );
/*
* PARAMETERS
* h_al
@@ -9927,7 +9927,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_get_guid(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN const uint32_t index,
IN const ib_pnp_class_t device_type,
IN const uint64_t attr_mask,
@@ -10004,8 +10004,8 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_ci_call(
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const void* FUNC_PTR64 * const handle_array OPTIONAL,
+ IN ib_ca_handle_t h_ca,
+ IN const void* * const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op );
/*
@@ -10082,7 +10082,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_open_al(
- OUT ib_al_handle_t FUNC_PTR64* const ph_al );
+ OUT ib_al_handle_t * const ph_al );
/*
* PARAMETERS
* ph_al
@@ -10124,7 +10124,7 @@
*/
AL_EXPORT ib_api_status_t AL_API
ib_close_al(
- IN const ib_al_handle_t FUNC_PTR64 h_al );
+ IN const ib_al_handle_t h_al );
/*
* PARAMETERS
* h_al
Index: inc/iba/ib_ci.h
===================================================================
--- inc/iba/ib_ci.h (revision 1094)
+++ inc/iba/ib_ci.h (working copy)
@@ -207,7 +207,7 @@
IN const ci_completion_cb_t pfn_completion_cb,
IN const ci_async_event_cb_t pfn_async_event_cb,
IN const void* const ca_context,
- OUT ib_ca_handle_t FUNC_PTR64 *ph_ca );
+ OUT ib_ca_handle_t *ph_ca );
/*
* DESCRIPTION
* This routine returns a handle to an open instance of a HCA. Client can call
@@ -258,9 +258,9 @@
*/
typedef ib_api_status_t
(*ci_um_open_ca_t) (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN OUT ci_umv_buf_t* const p_umv_buf,
- OUT ib_ca_handle_t FUNC_PTR64* const ph_um_ca );
+ OUT ib_ca_handle_t * const ph_um_ca );
/*
* DESCRIPTION
* This routine is used called on behalf of a user-mode application to
@@ -299,7 +299,7 @@
typedef ib_api_status_t
(*ci_query_ca) (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
OUT ib_ca_attr_t *p_ca_attr OPTIONAL,
IN OUT uint32_t *p_size,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
@@ -350,7 +350,7 @@
typedef ib_api_status_t
(*ci_modify_ca) (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_ca_mod_t ca_mod,
IN const ib_port_attr_mod_t *p_port_attr_mod );
@@ -403,7 +403,7 @@
typedef ib_api_status_t
(*ci_close_ca) (
- IN ib_ca_handle_t FUNC_PTR64 h_ca );
+ IN ib_ca_handle_t h_ca );
/*
* DESCRIPTION
* This routine is called when the client no longer wishes to use HCA
@@ -441,8 +441,8 @@
*/
typedef void
(*ci_um_close_ca_t) (
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
- IN ib_ca_handle_t FUNC_PTR64 h_um_ca );
+ IN ib_ca_handle_t h_ca,
+ IN ib_ca_handle_t h_um_ca );
/*
* DESCRIPTION
* This routine is called when the client no longer wishes to use HCA
@@ -474,9 +474,9 @@
typedef ib_api_status_t
(*ci_allocate_pd) (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_pd_type_t type,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ OUT ib_pd_handle_t *ph_pd,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
* DESCRIPTION
@@ -520,7 +520,7 @@
typedef ib_api_status_t
(*ci_deallocate_pd) (
- IN ib_pd_handle_t FUNC_PTR64 h_pd );
+ IN ib_pd_handle_t h_pd );
/*
* DESCRIPTION
@@ -551,9 +551,9 @@
typedef ib_api_status_t
(*ci_create_av) (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t *p_av_attr,
- OUT ib_av_handle_t FUNC_PTR64 *ph_av,
+ OUT ib_av_handle_t *ph_av,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
@@ -598,9 +598,9 @@
typedef ib_api_status_t
(*ci_query_av) (
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
OUT ib_av_attr_t *p_av_attr,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ OUT ib_pd_handle_t *ph_pd,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
@@ -638,7 +638,7 @@
typedef ib_api_status_t
(*ci_modify_av) (
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
IN const ib_av_attr_t *p_av_attr,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
@@ -679,7 +679,7 @@
typedef ib_api_status_t
(*ci_destroy_av) (
- IN const ib_av_handle_t FUNC_PTR64 h_av );
+ IN const ib_av_handle_t h_av );
/*
* DESCRIPTION
* This routine destroys the specified address handle. After the routine
@@ -705,10 +705,10 @@
typedef ib_api_status_t
(*ci_create_srq) (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const void *srq_context,
IN const ib_srq_attr_t * const p_srq_attr,
- OUT ib_srq_handle_t FUNC_PTR64 *ph_srq,
+ OUT ib_srq_handle_t *ph_srq,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
* DESCRIPTION
@@ -762,7 +762,7 @@
typedef ib_api_status_t
(*ci_modify_srq) (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr,
IN const ib_srq_attr_mask_t srq_attr_mask,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
@@ -809,7 +809,7 @@
typedef ib_api_status_t
(*ci_query_srq) (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
OUT ib_srq_attr_t* const p_srq_attr,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
@@ -847,7 +847,7 @@
typedef ib_api_status_t
(*ci_destroy_srq) (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq );
+ IN const ib_srq_handle_t h_srq );
/*
* DESCRIPTION
* Destroys the associated srq. The srq could have outstanding work requests
@@ -888,11 +888,11 @@
typedef ib_api_status_t
(*ci_create_qp) (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const void *qp_context,
IN const ib_qp_create_t *p_create_attr,
OUT ib_qp_attr_t *p_qp_attr,
- OUT ib_qp_handle_t FUNC_PTR64 *ph_qp,
+ OUT ib_qp_handle_t *ph_qp,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
* DESCRIPTION
@@ -950,12 +950,12 @@
typedef ib_api_status_t
(*ci_create_spl_qp) (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const uint8_t port_num,
IN const void *qp_context,
IN const ib_qp_create_t *p_create_attr,
OUT ib_qp_attr_t *p_qp_attr,
- OUT ib_qp_handle_t FUNC_PTR64 *ph_qp );
+ OUT ib_qp_handle_t *ph_qp );
/*
* DESCRIPTION
* Create and return a handle to for the indicated service type on the
@@ -1018,7 +1018,7 @@
typedef ib_api_status_t
(*ci_modify_qp) (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t *p_modify_attr,
OUT ib_qp_attr_t *p_qp_attr OPTIONAL,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
@@ -1071,7 +1071,7 @@
typedef ib_api_status_t
(*ci_ndi_modify_qp) (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t *p_modify_attr,
OUT ib_qp_attr_t *p_qp_attr OPTIONAL,
IN const uint32_t buf_size,
@@ -1128,7 +1128,7 @@
typedef ib_api_status_t
(*ci_query_qp) (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
OUT ib_qp_attr_t* const p_qp_attr,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
@@ -1165,7 +1165,7 @@
typedef ib_api_status_t
(*ci_destroy_qp) (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const uint64_t timewait );
/*
* DESCRIPTION
@@ -1215,10 +1215,10 @@
typedef ib_api_status_t
(*ci_create_cq) (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const void *cq_context,
IN OUT uint32_t* const p_size,
- OUT ib_cq_handle_t FUNC_PTR64 *ph_cq,
+ OUT ib_cq_handle_t *ph_cq,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
* DESCRIPTION
@@ -1271,7 +1271,7 @@
typedef ib_api_status_t
(*ci_resize_cq) (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
@@ -1324,7 +1324,7 @@
typedef ib_api_status_t
(*ci_query_cq) (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t *p_size,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
@@ -1358,7 +1358,7 @@
typedef ib_api_status_t
(*ci_destroy_cq) (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq );
+ IN const ib_cq_handle_t h_cq );
/*
* DESCRIPTION
* Destroys a completion queue. If any queue pairs are still bound
@@ -1400,11 +1400,11 @@
typedef ib_api_status_t
(*ci_register_mr) (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_mr_create_t* const p_mr_create,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t * const ph_mr,
IN boolean_t um_call );
/*
* DESCRIPTION
@@ -1463,12 +1463,12 @@
typedef ib_api_status_t
(*ci_register_pmr) (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_phys_create_t*const p_pmr_create,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t * const ph_mr,
IN boolean_t um_call );
/*
* DESCRIPTION
@@ -1534,7 +1534,7 @@
typedef ib_api_status_t
(*ci_query_mr) (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
OUT ib_mr_attr_t* const p_mr_query );
/*
* DESCRIPTION
@@ -1572,12 +1572,12 @@
typedef ib_api_status_t
(*ci_modify_mr) (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_modify_mask,
IN const ib_mr_create_t* const p_mr_create OPTIONAL,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL,
+ IN const ib_pd_handle_t h_pd OPTIONAL,
IN boolean_t um_call );
/*
* DESCRIPTION
@@ -1644,13 +1644,13 @@
typedef ib_api_status_t
(*ci_modify_pmr) (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_modify_mask,
IN const ib_phys_create_t* const p_pmr_create,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL,
+ IN const ib_pd_handle_t h_pd OPTIONAL,
IN boolean_t um_call );
/*
* DESCRIPTION
@@ -1719,13 +1719,13 @@
typedef ib_api_status_t
(*ci_register_smr) (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_mr_handle_t h_mr,
+ IN const ib_pd_handle_t h_pd,
IN const ib_access_t access_ctrl,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t * const ph_mr,
IN boolean_t um_call );
/*
* DESCRIPTION
@@ -1783,7 +1783,7 @@
typedef ib_api_status_t
(*ci_deregister_mr) (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr );
+ IN const ib_mr_handle_t h_mr );
/*
* DESCRIPTION
* This routine deregisters a memory region from the HCA. The region can
@@ -1818,9 +1818,9 @@
*/
typedef ib_api_status_t
(*ci_alloc_mlnx_fmr) (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN mlnx_fmr_create_t const *p_fmr_ctreate,
- OUT mlnx_fmr_handle_t FUNC_PTR64* const ph_fmr);
+ OUT mlnx_fmr_handle_t * const ph_fmr);
/*
* DESCRIPTION
* //TODO
@@ -1868,7 +1868,7 @@
*/
typedef ib_api_status_t
(*ci_map_phys_mlnx_fmr) (
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr,
+ IN const mlnx_fmr_handle_t h_fmr,
IN const uint64_t* const paddr_list,
IN const int list_len,
IN OUT uint64_t* const p_vaddr,
@@ -1927,7 +1927,7 @@
*/
typedef ib_api_status_t
(*ci_unmap_mlnx_fmr) (
- IN const mlnx_fmr_handle_t FUNC_PTR64 *ph_fmr);
+ IN const mlnx_fmr_handle_t *ph_fmr);
/*
* DESCRIPTION
* //TODO
@@ -1968,7 +1968,7 @@
*/
typedef ib_api_status_t
(*ci_dealloc_mlnx_fmr) (
- IN mlnx_fmr_handle_t FUNC_PTR64 const h_fmr);
+ IN mlnx_fmr_handle_t const h_fmr);
/*
* DESCRIPTION
* //TODO
@@ -2008,9 +2008,9 @@
typedef ib_api_status_t
(*ci_create_mw) (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
OUT net32_t* const p_rkey,
- OUT ib_mw_handle_t FUNC_PTR64 *ph_mw,
+ OUT ib_mw_handle_t *ph_mw,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
* DESCRIPTION
@@ -2053,8 +2053,8 @@
typedef ib_api_status_t
(*ci_query_mw) (
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ IN const ib_mw_handle_t h_mw,
+ OUT ib_pd_handle_t *ph_pd,
OUT net32_t* const p_rkey,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
@@ -2093,8 +2093,8 @@
typedef ib_api_status_t
(*ci_bind_mw) (
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_mw_handle_t h_mw,
+ IN const ib_qp_handle_t h_qp,
IN ib_bind_wr_t* const p_mw_bind,
OUT net32_t* const p_rkey );
/*
@@ -2156,7 +2156,7 @@
typedef ib_api_status_t
(*ci_destroy_mw) (
- IN const ib_mw_handle_t FUNC_PTR64 h_mw );
+ IN const ib_mw_handle_t h_mw );
/*
* DESCRIPTION
* This routine deallocates a window entry created via a ci_create_mw.
@@ -2187,7 +2187,7 @@
typedef ib_api_status_t
(*ci_post_send) (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t **pp_failed );
/*
@@ -2248,7 +2248,7 @@
typedef ib_api_status_t
(*ci_post_srq_recv) (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_failed );
/*
@@ -2293,7 +2293,7 @@
typedef ib_api_status_t
(*ci_post_recv) (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_failed );
/*
@@ -2343,7 +2343,7 @@
*/
typedef ib_api_status_t
(*ci_peek_cq) (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_n_cqes );
/*
* PARAMETERS
@@ -2380,7 +2380,7 @@
typedef ib_api_status_t
(*ci_poll_cq) (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist );
/*
@@ -2421,7 +2421,7 @@
typedef ib_api_status_t
(*ci_enable_cq_notify) (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const boolean_t solicited );
/*
* DESCRIPTION
@@ -2477,7 +2477,7 @@
typedef ib_api_status_t
(*ci_enable_ncomp_cq_notify) (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const uint32_t n_cqes );
/*
* DESCRIPTION
@@ -2523,10 +2523,10 @@
typedef ib_api_status_t
(*ci_attach_mcast) (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_gid_t *p_mcast_gid,
IN const ib_net16_t mcast_lid,
- OUT ib_mcast_handle_t FUNC_PTR64 *ph_mcast,
+ OUT ib_mcast_handle_t *ph_mcast,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
/*
* DESCRIPTION
@@ -2577,7 +2577,7 @@
typedef ib_api_status_t
(*ci_detach_mcast) (
- IN const ib_mcast_handle_t FUNC_PTR64 h_mcast );
+ IN const ib_mcast_handle_t h_mcast );
/*
* DESCRIPTION
* This routine detaches a queue pair from its previously associated multicast
@@ -2606,7 +2606,7 @@
typedef ib_api_status_t
(*ci_local_mad) (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_av_attr_t *p_src_av_attr,
IN const ib_mad_t *p_mad_in,
@@ -2670,8 +2670,8 @@
*/
typedef ib_api_status_t
(*ci_vendor_call)(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const void* FUNC_PTR64* const handle_array OPTIONAL,
+ IN const ib_ca_handle_t h_ca,
+ IN const void* * const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL );
Index: inc/iba/ib_types.h
===================================================================
--- inc/iba/ib_types.h (revision 1094)
+++ inc/iba/ib_types.h (working copy)
@@ -40,23 +40,6 @@
#include <complib/cl_byteswap.h>
//#include <al_fmr_pool.h>
-#ifndef FUNC_PTR64
-#define FUNC_PTR64
-#endif
-
-#ifndef TYPEDEF_PTR64
-#define TYPEDEF_PTR64
-#endif
-
-#ifndef VOID_PTR64
-#define VOID_PTR64
-#endif
-
-#ifndef STRUCT_PTR64
-#define STRUCT_PTR64
-#endif
-
-
#pragma warning( disable : 4201)
#pragma warning( disable :4305)
@@ -8655,17 +8638,17 @@
*/
-typedef struct _ib_ca* TYPEDEF_PTR64 ib_ca_handle_t;
-typedef struct _ib_pd* TYPEDEF_PTR64 ib_pd_handle_t;
-typedef struct _ib_mr* TYPEDEF_PTR64 ib_mr_handle_t;
-typedef struct _ib_mw* TYPEDEF_PTR64 ib_mw_handle_t;
-typedef struct _ib_qp* TYPEDEF_PTR64 ib_qp_handle_t;
-typedef struct _ib_srq* TYPEDEF_PTR64 ib_srq_handle_t;
-typedef struct _ib_cq* TYPEDEF_PTR64 ib_cq_handle_t;
-typedef struct _ib_av* TYPEDEF_PTR64 ib_av_handle_t;
-typedef struct _ib_mcast* TYPEDEF_PTR64 ib_mcast_handle_t;
-typedef struct _mlnx_fmr* TYPEDEF_PTR64 mlnx_fmr_handle_t;
-typedef struct _mlnx_fmr_pool* TYPEDEF_PTR64 mlnx_fmr_pool_handle_t;
+typedef struct _ib_ca* ib_ca_handle_t;
+typedef struct _ib_pd* ib_pd_handle_t;
+typedef struct _ib_mr* ib_mr_handle_t;
+typedef struct _ib_mw* ib_mw_handle_t;
+typedef struct _ib_qp* ib_qp_handle_t;
+typedef struct _ib_srq* ib_srq_handle_t;
+typedef struct _ib_cq* ib_cq_handle_t;
+typedef struct _ib_av* ib_av_handle_t;
+typedef struct _ib_mcast* ib_mcast_handle_t;
+typedef struct _mlnx_fmr* mlnx_fmr_handle_t;
+typedef struct _mlnx_fmr_pool* mlnx_fmr_pool_handle_t;
/****d* Access Layer/ib_api_status_t
@@ -10921,7 +10904,7 @@
enum ib_access_flags access_ctrl;
int pool_size;
int dirty_watermark;
- void (FUNC_PTR64 *flush_function)(mlnx_fmr_pool_handle_t h_pool, void *arg) ;
+ void ( *flush_function)(mlnx_fmr_pool_handle_t h_pool, void *arg) ;
void *flush_arg;
boolean_t cache;
} mlnx_fmr_pool_create_t;
@@ -11325,7 +11308,7 @@
IN uint32_t buf_info;
IN OUT int32_t status;
OUT uint32_t num_bytes_ret;
- IN OUT void* FUNC_PTR64 p_buf OPTIONAL;
+ IN OUT void* p_buf OPTIONAL;
} ib_ci_op_t;
/*
Index: inc/kernel/iba/ib_al_ifc.h
===================================================================
--- inc/kernel/iba/ib_al_ifc.h (revision 1094)
+++ inc/kernel/iba/ib_al_ifc.h (working copy)
@@ -58,243 +58,243 @@
typedef ib_api_status_t
(*ib_pfn_open_ca_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_net64_t ca_guid,
IN const ib_pfn_event_cb_t ca_event_cb OPTIONAL,
IN const void* const ca_context,
- OUT ib_ca_handle_t FUNC_PTR64* const ph_ca );
+ OUT ib_ca_handle_t * const ph_ca );
typedef ib_api_status_t
(*ib_pfn_query_ca_t)(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
OUT ib_ca_attr_t* const p_ca_attr OPTIONAL,
IN OUT uint32_t* const p_size );
typedef DEVICE_OBJECT*
(*ib_pfn_get_ca_dev_t)(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca );
+ IN const ib_ca_handle_t h_ca );
typedef ib_api_status_t
(*ib_pfn_query_ca_by_guid_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_net64_t ca_guid,
OUT ib_ca_attr_t* const p_ca_attr OPTIONAL,
IN OUT size_t* const p_size );
typedef ib_api_status_t
(*ib_pfn_modify_ca_t)(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_ca_mod_t ca_mod,
IN const ib_port_attr_mod_t* const p_port_attr_mod );
typedef ib_api_status_t
(*ib_pfn_close_ca_t)(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_pfn_destroy_cb_t destroy_cb OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_alloc_pd_t)(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_pd_type_t pd_type,
IN const void* const pd_context,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd );
+ OUT ib_pd_handle_t * const ph_pd );
typedef ib_api_status_t
(*ib_pfn_dealloc_pd_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_pfn_destroy_cb_t destroy_cb OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_create_av_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t* const p_av_attr,
- OUT ib_av_handle_t FUNC_PTR64* const ph_av );
+ OUT ib_av_handle_t * const ph_av );
typedef ib_api_status_t
(*ib_pfn_query_av_t)(
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
OUT ib_av_attr_t* const p_av_attr,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd );
+ OUT ib_pd_handle_t * const ph_pd );
typedef ib_api_status_t
(*ib_pfn_modify_av_t)(
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
IN const ib_av_attr_t* const p_av_attr );
typedef ib_api_status_t
(*ib_pfn_destroy_av_t)(
- IN const ib_av_handle_t FUNC_PTR64 h_av );
+ IN const ib_av_handle_t h_av );
typedef ib_api_status_t
(*ib_pfn_create_srq_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_srq_attr_t* const p_srq_attr,
IN const void* const srq_context,
IN const ib_pfn_event_cb_t srq_event_cb OPTIONAL,
- OUT ib_srq_handle_t FUNC_PTR64* const ph_srq );
+ OUT ib_srq_handle_t * const ph_srq );
typedef ib_api_status_t
(*ib_pfn_query_srq_t)(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
OUT ib_srq_attr_t* const p_srq_attr );
typedef ib_api_status_t
(*ib_pfn_modify_srq_t)(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr,
IN const ib_srq_attr_mask_t srq_attr_mask );
typedef ib_api_status_t
(*ib_pfn_destroy_srq_t)(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN const ib_pfn_destroy_cb_t destroy_cb OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_post_srq_recv_t)(
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_recv_failure OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_create_qp_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_qp_create_t* const p_qp_create,
IN const void* const qp_context,
IN const ib_pfn_event_cb_t qp_event_cb OPTIONAL,
- OUT ib_qp_handle_t FUNC_PTR64* const ph_qp );
+ OUT ib_qp_handle_t * const ph_qp );
typedef ib_api_status_t
(*ib_pfn_get_spl_qp_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_net64_t port_guid,
IN const ib_qp_create_t* const p_qp_create,
IN const void* const qp_context,
IN const ib_pfn_event_cb_t qp_event_cb OPTIONAL,
- OUT ib_pool_key_t FUNC_PTR64* const p_pool_key OPTIONAL,
- OUT ib_qp_handle_t FUNC_PTR64* const ph_qp );
+ OUT ib_pool_key_t * const p_pool_key OPTIONAL,
+ OUT ib_qp_handle_t * const ph_qp );
typedef ib_api_status_t
(*ib_pfn_query_qp_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
OUT ib_qp_attr_t* const p_qp_attr );
typedef ib_api_status_t
(*ib_pfn_modify_qp_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t* const p_qp_mod );
typedef ib_api_status_t
(*ib_pfn_destroy_qp_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_pfn_destroy_cb_t destroy_cb OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_create_cq_t)(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN OUT ib_cq_create_t* const p_cq_create,
IN const void* const cq_context,
IN const ib_pfn_event_cb_t cq_event_cb OPTIONAL,
- OUT ib_cq_handle_t FUNC_PTR64* const ph_cq );
+ OUT ib_cq_handle_t * const ph_cq );
typedef ib_api_status_t
(*ib_pfn_modify_cq_t)(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT uint32_t* const p_size );
typedef ib_api_status_t
(*ib_pfn_query_cq_t)(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_size );
typedef ib_api_status_t
(*ib_pfn_destroy_cq_t)(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const ib_pfn_destroy_cb_t destroy_cb OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_reg_mem_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_mr_create_t* const p_mr_create,
OUT uint32_t* const p_lkey,
OUT uint32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr );
+ OUT ib_mr_handle_t * const ph_mr );
typedef ib_api_status_t
(*ib_pfn_reg_phys_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_phys_create_t* const p_phys_create,
IN OUT uint64_t* const p_vaddr,
OUT uint32_t* const p_lkey,
OUT uint32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr );
+ OUT ib_mr_handle_t * const ph_mr );
typedef ib_api_status_t
(*ib_pfn_query_mr_t)(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
OUT ib_mr_attr_t* const p_mr_attr );
typedef ib_api_status_t
(*ib_pfn_rereg_mem_t)(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_mr_create_t* const p_mr_create OPTIONAL,
OUT uint32_t* const p_lkey,
OUT uint32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL );
+ IN const ib_pd_handle_t h_pd OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_rereg_phys_t)(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_phys_create_t* const p_phys_create OPTIONAL,
IN OUT void** const p_vaddr,
OUT uint32_t* const p_lkey,
OUT uint32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL );
+ IN const ib_pd_handle_t h_pd OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_reg_shared_t)(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_mr_handle_t h_mr,
+ IN const ib_pd_handle_t h_pd,
IN const ib_access_t access_ctrl,
IN OUT void** const p_vaddr,
OUT uint32_t* const p_lkey,
OUT uint32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr );
+ OUT ib_mr_handle_t * const ph_mr );
typedef ib_api_status_t
(*ib_pfn_create_shmid_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const int shmid,
IN const ib_mr_create_t* const p_mr_create,
OUT uint32_t* const p_lkey,
OUT uint32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr );
+ OUT ib_mr_handle_t * const ph_mr );
typedef ib_api_status_t
(*ib_pfn_reg_shmid_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_shmid_t shmid,
IN const ib_mr_create_t* const p_mr_create,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr );
+ OUT ib_mr_handle_t * const ph_mr );
typedef ib_api_status_t
(*ib_pfn_dereg_mr_t)(
- IN const ib_mr_handle_t FUNC_PTR64 h_mr );
+ IN const ib_mr_handle_t h_mr );
typedef ib_api_status_t
(*mlnx_pfn_create_fmr_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const mlnx_fmr_create_t* const p_fmr_create,
- OUT mlnx_fmr_handle_t FUNC_PTR64* const ph_fmr );
+ OUT mlnx_fmr_handle_t * const ph_fmr );
typedef ib_api_status_t
(*mlnx_pfn_map_phys_fmr_t)(
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr,
+ IN const mlnx_fmr_handle_t h_fmr,
IN const uint64_t* const paddr_list,
IN const int list_len,
IN OUT uint64_t* const p_vaddr,
@@ -303,128 +303,128 @@
typedef ib_api_status_t
(*mlnx_pfn_unmap_fmr_t)(
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr );
+ IN const mlnx_fmr_handle_t h_fmr );
typedef ib_api_status_t
(*mlnx_pfn_destroy_fmr_t)(
- IN mlnx_fmr_handle_t FUNC_PTR64 const h_fmr );
+ IN mlnx_fmr_handle_t const h_fmr );
typedef ib_api_status_t
(*mlnx_pfn_create_fmr_pool_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const mlnx_fmr_pool_create_t *p_fmr_pool_attr,
- OUT mlnx_fmr_pool_handle_t FUNC_PTR64* const ph_pool );
+ OUT mlnx_fmr_pool_handle_t * const ph_pool );
typedef ib_api_status_t
(*mlnx_pfn_destroy_fmr_pool_t)(
- IN const mlnx_fmr_pool_handle_t FUNC_PTR64 h_pool );
+ IN const mlnx_fmr_pool_handle_t h_pool );
typedef ib_api_status_t
(*mlnx_pfn_map_phys_fmr_pool_t)(
- IN const mlnx_fmr_pool_handle_t FUNC_PTR64 h_pool ,
+ IN const mlnx_fmr_pool_handle_t h_pool ,
IN const uint64_t* const paddr_list,
IN const int list_len,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT mlnx_fmr_pool_el_t FUNC_PTR64 *p_fmr_el);
+ OUT mlnx_fmr_pool_el_t *p_fmr_el);
typedef ib_api_status_t
(*mlnx_pfn_unmap_fmr_pool_t)(
- IN mlnx_fmr_pool_el_t FUNC_PTR64 p_fmr_el );
+ IN mlnx_fmr_pool_el_t p_fmr_el );
typedef ib_api_status_t
(*mlnx_pfn_flush_fmr_pool_t)(
- IN const mlnx_fmr_pool_handle_t FUNC_PTR64 h_pool );
+ IN const mlnx_fmr_pool_handle_t h_pool );
typedef ib_api_status_t
(*ib_pfn_create_mw_t)(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
OUT uint32_t* const p_rkey,
- OUT ib_mw_handle_t FUNC_PTR64* const ph_mw );
+ OUT ib_mw_handle_t * const ph_mw );
typedef ib_api_status_t
(*ib_pfn_query_mw_t)(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- OUT ib_pd_handle_t FUNC_PTR64* const ph_pd,
+ IN const ib_mw_handle_t h_mw,
+ OUT ib_pd_handle_t * const ph_pd,
OUT uint32_t* const p_rkey );
typedef ib_api_status_t
(*ib_pfn_bind_mw_t)(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_mw_handle_t h_mw,
+ IN const ib_qp_handle_t h_qp,
IN ib_bind_wr_t* const p_mw_bind,
OUT uint32_t* const p_rkey );
typedef ib_api_status_t
(*ib_pfn_destroy_mw_t)(
- IN const ib_mw_handle_t FUNC_PTR64 h_mw );
+ IN const ib_mw_handle_t h_mw );
typedef ib_api_status_t
(*ib_pfn_post_send_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t **pp_send_failure OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_post_recv_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t **pp_recv_failure OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_send_mad_t)(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element_list,
OUT ib_mad_element_t **pp_mad_failure OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_cancel_mad_t)(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN ib_mad_element_t* const p_mad_element );
typedef ib_api_status_t
(*ib_pfn_poll_cq_t)(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist );
typedef ib_api_status_t
(*ib_pfn_rearm_cq_t)(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const boolean_t solicited );
typedef ib_api_status_t
(*ib_pfn_join_mcast_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mcast_req_t* const p_mcast_req );
typedef ib_api_status_t
(*ib_pfn_leave_mcast_t)(
- IN const ib_mcast_handle_t FUNC_PTR64 h_mcast,
+ IN const ib_mcast_handle_t h_mcast,
IN const ib_pfn_destroy_cb_t destroy_cb );
typedef ib_api_status_t
(*ib_pfn_local_mad_t)(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const void* const p_mad_in,
OUT void* p_mad_out );
typedef ib_api_status_t
(*ib_pfn_cm_listen_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_cm_listen_t* const p_cm_listen,
IN const ib_pfn_listen_err_cb_t listen_err_cb,
IN const void* const listen_context,
- OUT ib_listen_handle_t FUNC_PTR64* const ph_cm_listen );
+ OUT ib_listen_handle_t * const ph_cm_listen );
typedef ib_api_status_t
(*ib_pfn_cm_cancel_t)(
- IN const ib_listen_handle_t FUNC_PTR64 h_cm_listen,
+ IN const ib_listen_handle_t h_cm_listen,
IN const ib_pfn_destroy_cb_t destroy_cb OPTIONAL );
typedef ib_api_status_t
@@ -462,7 +462,7 @@
typedef ib_api_status_t
(*ib_pfn_force_apm_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp );
+ IN const ib_qp_handle_t h_qp );
typedef ib_api_status_t
(*ib_pfn_cm_dreq_t)(
@@ -480,77 +480,77 @@
typedef ib_api_status_t
(*ib_pfn_create_ioc_t)(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_ioc_profile_t* const p_ioc_profile,
- OUT ib_ioc_handle_t FUNC_PTR64* const ph_ioc );
+ OUT ib_ioc_handle_t * const ph_ioc );
typedef ib_api_status_t
(*ib_pfn_destroy_ioc_t)(
- IN const ib_ioc_handle_t FUNC_PTR64 h_ioc );
+ IN const ib_ioc_handle_t h_ioc );
typedef ib_api_status_t
(*ib_pfn_reg_ioc_t)(
- IN const ib_ioc_handle_t FUNC_PTR64 h_ioc );
+ IN const ib_ioc_handle_t h_ioc );
typedef ib_api_status_t
(*ib_pfn_add_svc_entry_t)(
- IN const ib_ioc_handle_t FUNC_PTR64 h_ioc,
+ IN const ib_ioc_handle_t h_ioc,
IN const ib_svc_entry_t* const p_svc_entry,
- OUT ib_svc_handle_t FUNC_PTR64* const ph_svc );
+ OUT ib_svc_handle_t * const ph_svc );
typedef ib_api_status_t
(*ib_pfn_remove_svc_entry_t)(
- IN const ib_svc_handle_t FUNC_PTR64 h_svc );
+ IN const ib_svc_handle_t h_svc );
typedef ib_api_status_t
(*ib_pfn_get_ca_guids_t)(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
OUT ib_net64_t* const p_guid_array OPTIONAL,
IN OUT uintn_t* const p_guid_cnt );
typedef ib_api_status_t
(*ib_pfn_get_ca_by_gid_t)(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN const ib_gid_t* const p_gid,
OUT ib_net64_t* const p_ca_guid );
typedef ib_api_status_t
(*ib_pfn_get_ca_by_gid_t)(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN const ib_gid_t* const p_gid,
OUT ib_net64_t* const p_ca_guid );
typedef ib_api_status_t
(*ib_pfn_get_port_by_gid_t)(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN const ib_gid_t* const p_gid,
OUT ib_net64_t* const p_port_guid );
typedef ib_api_status_t
(*ib_pfn_create_mad_pool_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const size_t min,
IN const size_t max,
IN const size_t grow_size,
- OUT ib_pool_handle_t FUNC_PTR64* const ph_pool );
+ OUT ib_pool_handle_t * const ph_pool );
typedef ib_api_status_t
(*ib_pfn_destroy_mad_pool_t)(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool );
+ IN const ib_pool_handle_t h_pool );
typedef ib_api_status_t
(*ib_pfn_reg_mad_pool_t)(
- IN const ib_pool_handle_t FUNC_PTR64 h_pool,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
- OUT ib_pool_key_t FUNC_PTR64* const p_pool_key );
+ IN const ib_pool_handle_t h_pool,
+ IN const ib_pd_handle_t h_pd,
+ OUT ib_pool_key_t * const p_pool_key );
typedef ib_api_status_t
(*ib_pfn_dereg_mad_pool_t)(
- IN const ib_pool_key_t FUNC_PTR64 pool_key );
+ IN const ib_pool_key_t pool_key );
typedef ib_api_status_t
(*ib_pfn_get_mad_t)(
- IN const ib_pool_key_t FUNC_PTR64 pool_key,
+ IN const ib_pool_key_t pool_key,
IN const size_t buf_size,
OUT ib_mad_element_t **pp_mad_element );
@@ -560,18 +560,18 @@
typedef ib_api_status_t
(*ib_pfn_init_dgrm_svc_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_dgrm_info_t* const p_dgrm_info OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_reg_mad_svc_t)(
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_mad_svc_t* const p_mad_svc,
- OUT ib_mad_svc_handle_t FUNC_PTR64* const ph_mad_svc );
+ OUT ib_mad_svc_handle_t * const ph_mad_svc );
typedef ib_api_status_t
(*ib_pfn_reg_svc_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_reg_svc_req_t* const p_reg_svc_req,
OUT ib_reg_svc_handle_t* const ph_reg_svc );
@@ -582,56 +582,56 @@
typedef ib_api_status_t
(*ib_pfn_query_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_query_req_t* const p_query_req,
- OUT ib_query_handle_t FUNC_PTR64* const ph_query OPTIONAL );
+ OUT ib_query_handle_t * const ph_query OPTIONAL );
typedef void
(*ib_pfn_cancel_query_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
- IN const ib_query_handle_t FUNC_PTR64 query_hndl );
+ IN const ib_al_handle_t h_al,
+ IN const ib_query_handle_t query_hndl );
typedef ib_api_status_t
(*ib_pfn_reg_pnp_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_pnp_req_t* const p_pnp_req,
- OUT ib_pnp_handle_t FUNC_PTR64* const ph_pnp );
+ OUT ib_pnp_handle_t * const ph_pnp );
typedef ib_api_status_t
(*ib_pfn_dereg_pnp_t)(
- IN const ib_pnp_handle_t FUNC_PTR64 h_pnp,
+ IN const ib_pnp_handle_t h_pnp,
IN const ib_pfn_destroy_cb_t destroy_cb OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_subscribe_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
+ IN const ib_al_handle_t h_al,
IN const ib_sub_req_t* const p_sub_req,
- OUT ib_sub_handle_t FUNC_PTR64* const ph_sub );
+ OUT ib_sub_handle_t * const ph_sub );
typedef ib_api_status_t
(*ib_pfn_unsubscribe_t)(
- IN const ib_sub_handle_t FUNC_PTR64 h_sub,
+ IN const ib_sub_handle_t h_sub,
IN const ib_pfn_destroy_cb_t destroy_cb OPTIONAL );
typedef ib_api_status_t
(*ib_pfn_reject_ioc_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al,
- IN const ib_pnp_handle_t FUNC_PTR64 h_ioc_event );
+ IN const ib_al_handle_t h_al,
+ IN const ib_pnp_handle_t h_ioc_event );
typedef ib_api_status_t
(*ib_pfn_ci_call_t)(
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const void* FUNC_PTR64 * const handle_array OPTIONAL,
+ IN ib_ca_handle_t h_ca,
+ IN const void* * const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op );
typedef ib_api_status_t
(*ib_pfn_open_al_t)(
- OUT ib_al_handle_t FUNC_PTR64* const ph_al );
+ OUT ib_al_handle_t * const ph_al );
typedef ib_api_status_t
(*ib_pfn_close_al_t)(
- IN const ib_al_handle_t FUNC_PTR64 h_al );
+ IN const ib_al_handle_t h_al );
typedef const char*
(*ib_pfn_get_err_str_t)(
Index: inc/user/iba/ib_uvp.h
===================================================================
--- inc/user/iba/ib_uvp.h (revision 1094)
+++ inc/user/iba/ib_uvp.h (working copy)
@@ -151,7 +151,7 @@
(AL_API *uvp_pre_open_ca_t) (
IN const ib_net64_t ca_guid,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_ca_handle_t FUNC_PTR64 *ph_uvp_ca);
+ OUT ib_ca_handle_t *ph_uvp_ca);
/*
* DESCRIPTION
@@ -204,7 +204,7 @@
(AL_API *uvp_post_open_ca_t) (
IN const ib_net64_t ca_guid,
IN ib_api_status_t ioctl_status,
- IN OUT ib_ca_handle_t FUNC_PTR64 *ph_uvp_ca,
+ IN OUT ib_ca_handle_t *ph_uvp_ca,
IN ci_umv_buf_t *p_umv_buf );
/*
* DESCRIPTION
@@ -250,7 +250,7 @@
*/
typedef ib_api_status_t
(AL_API *uvp_pre_query_ca) (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_ca_attr_t *p_ca_attr,
IN size_t byte_count,
IN ci_umv_buf_t *p_umv_buf );
@@ -299,7 +299,7 @@
typedef void
(AL_API *uvp_post_query_ca_t) (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status,
IN ib_ca_attr_t *p_ca_attr,
IN size_t byte_count,
@@ -349,7 +349,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_modify_ca) (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN uint8_t port_num,
IN ib_ca_mod_t ca_mod,
IN const ib_port_attr_mod_t* const p_port_attr_mod );
@@ -400,7 +400,7 @@
typedef void
(AL_API *uvp_post_modify_ca_t) (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status );
/*
@@ -437,7 +437,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_close_ca_t) (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca );
+ IN ib_ca_handle_t h_uvp_ca );
/*
* DESCRIPTION
@@ -472,7 +472,7 @@
typedef ib_api_status_t
(AL_API *uvp_post_close_ca_t) (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status );
/*
@@ -510,8 +510,8 @@
typedef ib_api_status_t
(AL_API *uvp_pre_ci_call) (
- IN const ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
- IN const void* FUNC_PTR64 * const handle_array OPTIONAL,
+ IN const ib_ca_handle_t h_uvp_ca,
+ IN const void* * const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN OUT ci_umv_buf_t *p_umv_buf);
@@ -562,9 +562,9 @@
typedef void
(AL_API *uvp_post_ci_call) (
- IN const ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN const ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status,
- IN const void* FUNC_PTR64 * const handle_array OPTIONAL,
+ IN const void* * const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN OUT ci_umv_buf_t *p_umv_buf);
@@ -615,9 +615,9 @@
typedef ib_api_status_t
(AL_API *uvp_pre_allocate_pd) (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_uvp_pd);
+ OUT ib_pd_handle_t *ph_uvp_pd);
/*
* DESCRIPTION
@@ -662,9 +662,9 @@
typedef void
(AL_API *uvp_post_allocate_pd_t) (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status,
- IN OUT ib_pd_handle_t FUNC_PTR64 *ph_uvp_pd,
+ IN OUT ib_pd_handle_t *ph_uvp_pd,
IN ci_umv_buf_t *p_umv_buf );
/*
@@ -708,7 +708,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_deallocate_pd) (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd );
+ IN const ib_pd_handle_t h_uvp_pd );
/*
* DESCRIPTION
@@ -742,7 +742,7 @@
typedef void
(AL_API *uvp_post_deallocate_pd_t) (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status );
/*
@@ -782,10 +782,10 @@
typedef ib_api_status_t
(AL_API *uvp_pre_create_av) (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN const ib_av_attr_t *p_addr_vector,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_av_handle_t FUNC_PTR64 *ph_uvp_av);
+ OUT ib_av_handle_t *ph_uvp_av);
/*
* DESCRIPTION
* uvp_pre_create_av() is implemented by vendor. It is the pre-ioctl
@@ -835,9 +835,9 @@
typedef void
(AL_API *uvp_post_create_av_t) (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
- IN OUT ib_av_handle_t FUNC_PTR64 *ph_uvp_av,
+ IN OUT ib_av_handle_t *ph_uvp_av,
IN ci_umv_buf_t *p_umv_buf );
/*
* DESCRIPTION
@@ -882,7 +882,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_query_av) (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN OUT ci_umv_buf_t *p_umv_buf );
/*
@@ -926,10 +926,10 @@
typedef void
(AL_API *uvp_post_query_av_t) (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN ib_api_status_t ioctl_status,
IN OUT ib_av_attr_t *p_addr_vector,
- IN OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ IN OUT ib_pd_handle_t *ph_pd,
IN ci_umv_buf_t *p_umv_buf );
/*
@@ -977,7 +977,7 @@
*/
typedef ib_api_status_t
(AL_API *uvp_pre_modify_av) (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN const ib_av_attr_t *p_addr_vector,
IN OUT ci_umv_buf_t *p_umv_buf );
/*
@@ -1025,7 +1025,7 @@
typedef void
(AL_API *uvp_post_modify_av_t) (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN ib_api_status_t ioctl_status,
IN ci_umv_buf_t *p_umv_buf );
@@ -1068,7 +1068,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_destroy_av) (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av );
+ IN const ib_av_handle_t h_uvp_av );
/*
* DESCRIPTION
@@ -1103,7 +1103,7 @@
typedef void
(AL_API *uvp_post_destroy_av_t) (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN ib_api_status_t ioctl_status );
/*
@@ -1144,10 +1144,10 @@
typedef ib_api_status_t
(AL_API *uvp_pre_create_srq) (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN const ib_srq_attr_t* const p_srq_attr,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_srq_handle_t FUNC_PTR64 *ph_uvp_srq);
+ OUT ib_srq_handle_t *ph_uvp_srq);
/*
* DESCRIPTION
@@ -1205,9 +1205,9 @@
typedef void
(AL_API *uvp_post_create_srq_t) (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
- IN OUT ib_srq_handle_t FUNC_PTR64 *ph_uvp_srq,
+ IN OUT ib_srq_handle_t *ph_uvp_srq,
IN ci_umv_buf_t *p_umv_buf );
/*
@@ -1254,7 +1254,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_modify_srq) (
- IN const ib_srq_handle_t FUNC_PTR64 h_uvp_srq,
+ IN const ib_srq_handle_t h_uvp_srq,
IN const ib_srq_attr_t * const p_srq_attr,
IN const ib_srq_attr_mask_t srq_attr_mask,
IN OUT ci_umv_buf_t *p_umv_buf );
@@ -1309,7 +1309,7 @@
typedef void
(AL_API *uvp_post_modify_srq_t) (
- IN const ib_srq_handle_t FUNC_PTR64 h_uvp_srq,
+ IN const ib_srq_handle_t h_uvp_srq,
IN ib_api_status_t ioctl_status,
IN ci_umv_buf_t *p_umv_buf );
@@ -1353,7 +1353,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_query_srq) (
- IN ib_srq_handle_t FUNC_PTR64 h_uvp_srq,
+ IN ib_srq_handle_t h_uvp_srq,
IN OUT ci_umv_buf_t *p_umv_buf );
/*
@@ -1397,7 +1397,7 @@
typedef void
(AL_API *uvp_post_query_srq_t) (
- IN ib_srq_handle_t FUNC_PTR64 h_uvp_srq,
+ IN ib_srq_handle_t h_uvp_srq,
IN ib_api_status_t ioctl_status,
IN ib_srq_attr_t *p_query_attr,
IN ci_umv_buf_t *p_umv_buf );
@@ -1444,7 +1444,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_destroy_srq) (
- IN const ib_srq_handle_t FUNC_PTR64 h_uvp_srq );
+ IN const ib_srq_handle_t h_uvp_srq );
/*
* DESCRIPTION
@@ -1489,7 +1489,7 @@
typedef void
(AL_API *uvp_post_destroy_srq_t) (
- IN const ib_srq_handle_t FUNC_PTR64 h_uvp_srq,
+ IN const ib_srq_handle_t h_uvp_srq,
IN ib_api_status_t ioctl_status );
/*
@@ -1528,10 +1528,10 @@
typedef ib_api_status_t
(AL_API *uvp_pre_create_qp) (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN const ib_qp_create_t *p_create_attr,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_qp_handle_t FUNC_PTR64 *ph_uvp_qp);
+ OUT ib_qp_handle_t *ph_uvp_qp);
/*
* DESCRIPTION
@@ -1592,9 +1592,9 @@
typedef ib_api_status_t
(AL_API *uvp_post_create_qp_t) (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
- IN OUT ib_qp_handle_t FUNC_PTR64 *ph_uvp_qp,
+ IN OUT ib_qp_handle_t *ph_uvp_qp,
IN ci_umv_buf_t *p_umv_buf );
/*
@@ -1644,7 +1644,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_modify_qp) (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN const ib_qp_mod_t *p_modify_attr,
IN OUT ci_umv_buf_t *p_umv_buf );
@@ -1704,7 +1704,7 @@
typedef void
(AL_API *uvp_post_modify_qp_t) (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status,
IN ci_umv_buf_t *p_umv_buf );
@@ -1748,7 +1748,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_query_qp) (
- IN ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN ib_qp_handle_t h_uvp_qp,
IN OUT ci_umv_buf_t *p_umv_buf );
/*
@@ -1792,7 +1792,7 @@
typedef void
(AL_API *uvp_post_query_qp_t) (
- IN ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status,
IN ib_qp_attr_t *p_query_attr,
IN ci_umv_buf_t *p_umv_buf );
@@ -1839,7 +1839,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_destroy_qp) (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp );
+ IN const ib_qp_handle_t h_uvp_qp );
/*
* DESCRIPTION
@@ -1884,7 +1884,7 @@
typedef void
(AL_API *uvp_post_destroy_qp_t) (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status );
/*
@@ -1921,7 +1921,7 @@
typedef uint32_t
(AL_API *uvp_nd_get_qp_state_t) (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp
+ IN const ib_qp_handle_t h_uvp_qp
);
/*
@@ -1952,7 +1952,7 @@
typedef void
(AL_API *uvp_nd_modify_qp_t) (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
OUT void** pp_outbuf,
OUT DWORD* p_size
);
@@ -1993,10 +1993,10 @@
typedef ib_api_status_t
(AL_API *uvp_pre_create_cq) (
- IN const ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN const ib_ca_handle_t h_uvp_ca,
IN OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_cq_handle_t FUNC_PTR64 *ph_uvp_cq);
+ OUT ib_cq_handle_t *ph_uvp_cq);
/*
* DESCRIPTION
* uvp_pre_create_cq() is implemented by vendor. It is the pre-ioctl routine
@@ -2050,10 +2050,10 @@
typedef void
(AL_API *uvp_post_create_cq_t) (
- IN const ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN const ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status,
IN const uint32_t size,
- IN OUT ib_cq_handle_t FUNC_PTR64 *ph_uvp_cq,
+ IN OUT ib_cq_handle_t *ph_uvp_cq,
IN ci_umv_buf_t *p_umv_buf );
/*
@@ -2105,7 +2105,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_resize_cq) (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq,
+ IN const ib_cq_handle_t h_uvp_cq,
IN OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t *p_umv_buf );
@@ -2162,7 +2162,7 @@
typedef void
(AL_API *uvp_post_resize_cq_t) (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq,
+ IN const ib_cq_handle_t h_uvp_cq,
IN ib_api_status_t ioctl_status,
IN const uint32_t size,
IN ci_umv_buf_t *p_umv_buf );
@@ -2213,7 +2213,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_query_cq) (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq,
+ IN const ib_cq_handle_t h_uvp_cq,
IN OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t *p_umv_buf );
@@ -2269,7 +2269,7 @@
typedef void
(AL_API *uvp_post_query_cq_t) (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq,
+ IN const ib_cq_handle_t h_uvp_cq,
IN ib_api_status_t ioctl_status,
IN const uint32_t size,
IN ci_umv_buf_t *p_umv_buf );
@@ -2316,7 +2316,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_destroy_cq) (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq );
+ IN const ib_cq_handle_t h_uvp_cq );
/*
* DESCRIPTION
@@ -2353,7 +2353,7 @@
typedef void
(AL_API *uvp_post_destroy_cq_t) (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq,
+ IN const ib_cq_handle_t h_uvp_cq,
IN ib_api_status_t ioctl_status );
/*
@@ -2391,9 +2391,9 @@
typedef ib_api_status_t
(AL_API *uvp_pre_create_mw) (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_mw_handle_t FUNC_PTR64 *ph_uvp_mw);
+ OUT ib_mw_handle_t *ph_uvp_mw);
/*
* DESCRIPTION
* uvp_pre_create_mw() is implemented by vendor. It is the pre-ioctl routine
@@ -2441,10 +2441,10 @@
typedef void
(AL_API *uvp_post_create_mw_t) (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
IN net32_t rkey,
- IN OUT ib_mw_handle_t FUNC_PTR64 *ph_uvp_mw,
+ IN OUT ib_mw_handle_t *ph_uvp_mw,
IN ci_umv_buf_t *p_umv_buf );
/*
* DESCRIPTION
@@ -2492,7 +2492,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_query_mw) (
- IN const ib_mw_handle_t FUNC_PTR64 h_uvp_mw,
+ IN const ib_mw_handle_t h_uvp_mw,
IN OUT ci_umv_buf_t *p_umv_buf );
/*
@@ -2537,10 +2537,10 @@
typedef void
(AL_API *uvp_post_query_mw_t) (
- IN const ib_mw_handle_t FUNC_PTR64 h_uvp_mw,
+ IN const ib_mw_handle_t h_uvp_mw,
IN ib_api_status_t ioctl_status,
IN net32_t rkey,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ OUT ib_pd_handle_t *ph_pd,
IN ci_umv_buf_t *p_umv_buf );
/*
* DESCRIPTION
@@ -2587,8 +2587,8 @@
typedef ib_api_status_t
(AL_API *uvp_bind_mw) (
- IN const ib_mw_handle_t FUNC_PTR64 h_uvp_mw,
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_mw_handle_t h_uvp_mw,
+ IN const ib_qp_handle_t h_uvp_qp,
IN ib_bind_wr_t *p_mw_bind,
OUT net32_t* const p_rkey );
/*
@@ -2652,7 +2652,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_destroy_mw) (
- IN const ib_mw_handle_t FUNC_PTR64 h_uvp_mw );
+ IN const ib_mw_handle_t h_uvp_mw );
/*
* DESCRIPTION
@@ -2688,7 +2688,7 @@
typedef void
(AL_API *uvp_post_destroy_mw_t) (
- IN const ib_mw_handle_t FUNC_PTR64 h_uvp_mw,
+ IN const ib_mw_handle_t h_uvp_mw,
IN ib_api_status_t ioctl_status );
/*
* DESCRIPTION
@@ -2724,7 +2724,7 @@
typedef ib_api_status_t
(AL_API *uvp_post_send) (
- IN const void* FUNC_PTR64 h_qp,
+ IN const void* h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t** pp_send_failure );
/*
@@ -2796,7 +2796,7 @@
typedef ib_api_status_t
(AL_API *uvp_post_recv) (
- IN const void* FUNC_PTR64 h_qp,
+ IN const void* h_qp,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t** pp_recv_failure );
@@ -2852,7 +2852,7 @@
typedef ib_api_status_t
(AL_API *uvp_post_srq_recv) (
- IN const void* FUNC_PTR64 h_srq,
+ IN const void* h_srq,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t** pp_recv_failure );
@@ -2907,7 +2907,7 @@
typedef ib_api_status_t
(AL_API *uvp_peek_cq) (
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
OUT uint32_t* const p_n_cqes );
/*
@@ -2948,7 +2948,7 @@
typedef ib_api_status_t
(AL_API *uvp_poll_cq) (
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist );
@@ -3001,7 +3001,7 @@
typedef ib_api_status_t
(AL_API *uvp_rearm_cq) (
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
IN const boolean_t solicited );
/*
@@ -3047,7 +3047,7 @@
typedef ib_api_status_t
(AL_API *uvp_rearm_n_cq) (
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
IN const uint32_t n_cqes );
/*
@@ -3094,11 +3094,11 @@
typedef ib_api_status_t
(AL_API *uvp_pre_attach_mcast) (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN const ib_gid_t *p_mcast_gid,
IN const uint16_t mcast_lid,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_mcast_handle_t FUNC_PTR64 *ph_mcast);
+ OUT ib_mcast_handle_t *ph_mcast);
/*
* DESCRIPTION
@@ -3156,9 +3156,9 @@
typedef void
(AL_API *uvp_post_attach_mcast) (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status,
- IN OUT ib_mcast_handle_t FUNC_PTR64 *ph_mcast,
+ IN OUT ib_mcast_handle_t *ph_mcast,
IN ci_umv_buf_t *p_umv_buf );
/*
@@ -3207,7 +3207,7 @@
typedef ib_api_status_t
(AL_API *uvp_pre_detach_mcast) (
- IN ib_mcast_handle_t FUNC_PTR64 h_uvp_mcast );
+ IN ib_mcast_handle_t h_uvp_mcast );
/*
* DESCRIPTION
@@ -3250,7 +3250,7 @@
typedef void
(AL_API *uvp_post_detach_mcast) (
- IN ib_mcast_handle_t FUNC_PTR64 h_uvp_mcast,
+ IN ib_mcast_handle_t h_uvp_mcast,
IN ib_api_status_t ioctl_status );
/*
Index: tests/alts/allocdeallocpd.c
===================================================================
--- tests/alts/allocdeallocpd.c (revision 1094)
+++ tests/alts/allocdeallocpd.c (working copy)
@@ -51,9 +51,9 @@
al_test_alloc_dealloc_pd(void)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca;
+ ib_pd_handle_t h_pd;
ALTS_ENTER( ALTS_DBG_VERBOSE );
Index: tests/alts/alts_common.h
===================================================================
--- tests/alts/alts_common.h (revision 1094)
+++ tests/alts/alts_common.h (working copy)
@@ -245,19 +245,19 @@
*/
ib_api_status_t
-alts_open_al( ib_al_handle_t FUNC_PTR64 *ph_al );
+alts_open_al( ib_al_handle_t *ph_al );
ib_api_status_t
-alts_close_al( ib_al_handle_t FUNC_PTR64 ph_al );
+alts_close_al( ib_al_handle_t ph_al );
ib_api_status_t
alts_open_ca(
- IN ib_al_handle_t FUNC_PTR64 h_al,
- OUT ib_ca_handle_t FUNC_PTR64 *p_alts_ca_h
+ IN ib_al_handle_t h_al,
+ OUT ib_ca_handle_t *p_alts_ca_h
);
ib_api_status_t
-alts_close_ca( IN ib_ca_handle_t FUNC_PTR64 alts_ca_h );
+alts_close_ca( IN ib_ca_handle_t alts_ca_h );
void
alts_ca_err_cb( ib_async_event_rec_t *p_err_rec);
@@ -284,7 +284,7 @@
void
alts_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
void
Index: tests/alts/alts_misc.c
===================================================================
--- tests/alts/alts_misc.c (revision 1094)
+++ tests/alts/alts_misc.c (working copy)
@@ -50,7 +50,7 @@
ib_api_status_t
alts_open_al(
- ib_al_handle_t VOID_PTR64 *ph_al )
+ ib_al_handle_t *ph_al )
{
ib_api_status_t ib_status;
@@ -74,7 +74,7 @@
ib_api_status_t
alts_close_al(
- ib_al_handle_t VOID_PTR64 h_al )
+ ib_al_handle_t h_al )
{
ib_api_status_t ib_status;
@@ -97,8 +97,8 @@
ib_api_status_t
alts_open_ca(
- IN ib_al_handle_t FUNC_PTR64 h_al,
- OUT ib_ca_handle_t FUNC_PTR64 *p_alts_ca_h )
+ IN ib_al_handle_t h_al,
+ OUT ib_ca_handle_t *p_alts_ca_h )
{
ib_api_status_t ib_status = IB_SUCCESS;
size_t guid_count;
@@ -168,7 +168,7 @@
ib_api_status_t
alts_close_ca(
- IN ib_ca_handle_t FUNC_PTR64 alts_ca_h
+ IN ib_ca_handle_t alts_ca_h
)
{
ib_api_status_t ib_status;
Index: tests/alts/cmtests.c
===================================================================
--- tests/alts/cmtests.c (revision 1094)
+++ tests/alts/cmtests.c (working copy)
@@ -64,7 +64,7 @@
ib_qp_type_t test_type;
ib_pfn_comp_cb_t pfn_comp_cb;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_ca_attr_t *p_ca_attr;
ib_port_attr_t *p_src_port_attr;
ib_port_attr_t *p_dest_port_attr;
@@ -81,20 +81,20 @@
ib_net16_t slid;
ib_net16_t dlid;
- ib_pool_key_t VOID_PTR64 h_src_pool;
- ib_pool_key_t VOID_PTR64 h_dest_pool;
+ ib_pool_key_t h_src_pool;
+ ib_pool_key_t h_dest_pool;
- ib_mad_svc_handle_t VOID_PTR64 h_src_mad_svc;
- ib_mad_svc_handle_t VOID_PTR64 h_dest_mad_svc;
+ ib_mad_svc_handle_t h_src_mad_svc;
+ ib_mad_svc_handle_t h_dest_mad_svc;
boolean_t num_cq;
- ib_cq_handle_t VOID_PTR64 h_cq;
- ib_cq_handle_t VOID_PTR64 h_cq_alt;
+ ib_cq_handle_t h_cq;
+ ib_cq_handle_t h_cq_alt;
uint32_t cq_size;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
- ib_qp_handle_t VOID_PTR64 h_qp[MAX_QPS];
+ ib_qp_handle_t h_qp[MAX_QPS];
uint32_t qkey;
ib_qp_attr_t qp_attr[MAX_QPS];
@@ -107,8 +107,8 @@
uint32_t ds_list_depth;
uint32_t msg_size; // Initialize this field
- ib_av_handle_t VOID_PTR64 h_av_src;
- ib_av_handle_t VOID_PTR64 h_av_dest;
+ ib_av_handle_t h_av_src;
+ ib_av_handle_t h_av_dest;
uint32_t send_done;
uint32_t recv_done;
@@ -127,7 +127,7 @@
ib_cm_req_t req_dest;
ib_cm_listen_t listen;
- ib_listen_handle_t VOID_PTR64 h_cm_listen;
+ ib_listen_handle_t h_cm_listen;
ib_cm_rep_t rep_dest;
@@ -148,7 +148,7 @@
cl_event_t destroy_event;
boolean_t handoff;
- ib_listen_handle_t VOID_PTR64 h_cm_listen_handoff;
+ ib_listen_handle_t h_cm_listen_handoff;
ib_net64_t handoff_svc_id;
mem_region_t mem_region[10];
@@ -162,8 +162,8 @@
{
alts_cm_ca_obj_t alts_obj;
- ib_cq_handle_t VOID_PTR64 h_cq[MAX_SERVER];
- ib_qp_handle_t VOID_PTR64 h_qp[MAX_SERVER];
+ ib_cq_handle_t h_cq[MAX_SERVER];
+ ib_qp_handle_t h_qp[MAX_SERVER];
} alts_serv_object_t;
@@ -182,7 +182,7 @@
ib_api_status_t
alts_cm_activate_qp(
alts_cm_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp );
+ ib_qp_handle_t h_qp );
ib_api_status_t
alts_cm_check_active_ports(
@@ -212,47 +212,47 @@
*/
ib_api_status_t
alts_cm_rc_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_rc_rej_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_handoff_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_rc_flush_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_rc_no_cm_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_rc_rdma_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_rc_mra_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_uc_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_cm_sidr_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
#define ALTS_TEST_MGMT_CLASS 0x56
@@ -261,7 +261,7 @@
/*
* Gloabal Variables
*/
-ib_al_handle_t VOID_PTR64 h_al;
+ib_al_handle_t h_al;
ib_dgrm_info_t dgrm_info;
ib_mad_svc_t mad_svc;
ib_send_wr_t send_wr;
@@ -294,7 +294,7 @@
al_test_cm(void)
{
ib_api_status_t ib_status = IB_ERROR;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_ca_handle_t h_ca = NULL;
uint32_t bsize;
ib_ca_attr_t *p_ca_attr = NULL;
//alts_cm_ca_obj_t ca_obj; // for testing stack
@@ -867,13 +867,13 @@
uint32_t i = 0, id;
ib_wc_t *p_free_wcl, *p_done_cl= NULL;
alts_cm_ca_obj_t *p_ca_obj;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
ALTS_ENTER( ALTS_DBG_VERBOSE );
CL_ASSERT(cq_context);
- h_cq = *((ib_cq_handle_t VOID_PTR64*)cq_context);
+ h_cq = *((ib_cq_handle_t *)cq_context);
p_ca_obj = gp_ca_obj;
ib_status = ib_rearm_cq(h_cq, FALSE);
@@ -1120,7 +1120,7 @@
uint32_t i = 0, id;
ib_wc_t *p_free_wcl, *p_done_cl= NULL;
alts_cm_ca_obj_t *p_ca_obj;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
alts_rdma_t *p_data;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -1129,7 +1129,7 @@
CL_ASSERT(cq_context);
- h_cq = *((ib_cq_handle_t VOID_PTR64*)cq_context);
+ h_cq = *((ib_cq_handle_t *)cq_context);
p_ca_obj = gp_ca_obj;
ib_status = ib_rearm_cq(h_cq, FALSE);
@@ -1220,7 +1220,7 @@
void
cm_rc_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -1229,7 +1229,7 @@
void
cm_ud_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -1238,7 +1238,7 @@
void
cm_rdma_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -1852,7 +1852,7 @@
CL_ASSERT( p_cm_dreq_rec );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_dreq_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t* )p_cm_dreq_rec->qp_context;
CL_ASSERT( p_ca_obj );
p_ca_obj->cm_cbs++; // count crows
@@ -1880,7 +1880,7 @@
if(( p_cm_rep_rec->qp_type == IB_QPT_RELIABLE_CONN ) ||
( p_cm_rep_rec->qp_type == IB_QPT_UNRELIABLE_CONN ))
{
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rep_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t* )p_cm_rep_rec->qp_context;
CL_ASSERT( p_ca_obj );
p_ca_obj->cm_cbs++; // count crows
@@ -1921,7 +1921,7 @@
p_cm_rep_rec->remote_qp,
p_cm_rep_rec->remote_qkey ));
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rep_rec->sidr_context;
+ p_ca_obj = (alts_cm_ca_obj_t* )p_cm_rep_rec->sidr_context;
CL_ASSERT( p_ca_obj );
p_ca_obj->cm_cbs++; // count crows
@@ -1945,7 +1945,7 @@
ALTS_ENTER( ALTS_DBG_VERBOSE );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rej_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t* )p_cm_rej_rec->qp_context;
// only use context if qp was set up
if( p_ca_obj )
@@ -1964,7 +1964,7 @@
ALTS_ENTER( ALTS_DBG_VERBOSE );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_mra_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t* )p_cm_mra_rec->qp_context;
CL_ASSERT( p_ca_obj );
@@ -1993,7 +1993,7 @@
CL_ASSERT( p_cm_rtu_rec );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rtu_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t* )p_cm_rtu_rec->qp_context;
CL_ASSERT( p_ca_obj );
p_ca_obj->cm_cbs++; // count crows
@@ -2026,7 +2026,7 @@
CL_ASSERT( p_cm_req_rec );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_req_rec->context;
+ p_ca_obj = (alts_cm_ca_obj_t* )p_cm_req_rec->context;
CL_ASSERT( p_ca_obj );
@@ -2372,7 +2372,7 @@
CL_ASSERT( p_cm_drep_rec );
- p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_drep_rec->qp_context;
+ p_ca_obj = (alts_cm_ca_obj_t* )p_cm_drep_rec->qp_context;
CL_ASSERT( p_ca_obj );
p_ca_obj->cm_cbs++; // count crows
@@ -2446,7 +2446,7 @@
ib_api_status_t
alts_cm_rc_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2581,7 +2581,7 @@
ib_api_status_t
alts_cm_rc_rej_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2710,7 +2710,7 @@
ib_api_status_t
alts_cm_handoff_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2849,7 +2849,7 @@
ib_api_status_t
alts_cm_rc_flush_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2995,7 +2995,7 @@
ib_api_status_t
alts_cm_activate_qp(
alts_cm_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp
+ ib_qp_handle_t h_qp
)
{
@@ -3154,7 +3154,7 @@
ib_api_status_t
alts_rc_no_cm_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -3649,7 +3649,7 @@
ib_api_status_t
alts_cm_rc_rdma_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -3880,7 +3880,7 @@
ib_api_status_t
alts_rc_mra_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -4016,7 +4016,7 @@
ib_api_status_t
alts_cm_uc_test (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -4150,7 +4150,7 @@
ib_api_status_t
alts_cm_sidr_tests (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
Index: tests/alts/createanddestroycq.c
===================================================================
--- tests/alts/createanddestroycq.c (revision 1094)
+++ tests/alts/createanddestroycq.c (working copy)
@@ -78,12 +78,12 @@
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_cq_handle_t VOID_PTR64 h_cq = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca;
+ ib_cq_handle_t h_cq = NULL;
cl_status_t cl_status;
ib_cq_create_t cq_create;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
int iteration = 0;
#ifdef CL_KERNEL
cl_event_t cq_event;
@@ -296,7 +296,7 @@
void
alts_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
ALTS_ENTER( ALTS_DBG_VERBOSE );
Index: tests/alts/createanddestroyqp.c
===================================================================
--- tests/alts/createanddestroyqp.c (revision 1094)
+++ tests/alts/createanddestroyqp.c (working copy)
@@ -80,11 +80,11 @@
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_cq_handle_t VOID_PTR64 h_cq = NULL;
- ib_qp_handle_t VOID_PTR64 h_qp = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca;
+ ib_cq_handle_t h_cq = NULL;
+ ib_qp_handle_t h_qp = NULL;
+ ib_pd_handle_t h_pd;
cl_status_t cl_status;
ib_cq_create_t cq_create;
ib_qp_create_t qp_create;
Index: tests/alts/createdestroyav.c
===================================================================
--- tests/alts/createdestroyav.c (revision 1094)
+++ tests/alts/createdestroyav.c (working copy)
@@ -75,13 +75,13 @@
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
+ ib_al_handle_t h_al = NULL;
size_t guid_count;
ib_port_attr_t *p_alts_port_attr;
ib_av_attr_t alts_av_attr, query_av_attr;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_pd_handle_t VOID_PTR64 h_pd, h_pd1;
- ib_av_handle_t VOID_PTR64 h_av;
+ ib_ca_handle_t h_ca;
+ ib_pd_handle_t h_pd, h_pd1;
+ ib_av_handle_t h_av;
ib_net64_t ca_guid_array[ALTS_MAX_CA];
uint32_t bsize;
ib_ca_attr_t *alts_ca_attr = NULL;
Index: tests/alts/creatememwindow.c
===================================================================
--- tests/alts/creatememwindow.c (revision 1094)
+++ tests/alts/creatememwindow.c (working copy)
@@ -59,16 +59,16 @@
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
+ ib_pd_handle_t h_pd = NULL;
ib_mr_create_t virt_mem;
char *ptr = NULL, *ptr_align;
size_t mask;
uint32_t lkey;
uint32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_mr = NULL;
+ ib_mr_handle_t h_mr = NULL;
ib_mr_attr_t alts_mr_attr;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -166,9 +166,9 @@
{
uint32_t rkey_mw;
- ib_mw_handle_t VOID_PTR64 h_mw;
+ ib_mw_handle_t h_mw;
- ib_pd_handle_t VOID_PTR64 h_pd_query;
+ ib_pd_handle_t h_pd_query;
uint32_t rkey_mw_query;
ib_status = ib_create_mw(h_pd,&rkey_mw,&h_mw);
Index: tests/alts/ibquery.c
===================================================================
--- tests/alts/ibquery.c (revision 1094)
+++ tests/alts/ibquery.c (working copy)
@@ -83,9 +83,9 @@
al_test_query(void)
{
ib_api_status_t ib_status = IB_ERROR;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
+ ib_al_handle_t h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_ca_handle_t h_ca = NULL;
uint32_t bsize;
uint32_t i;
ib_ca_attr_t *p_ca_attr = NULL;
Index: tests/alts/madtests.c
===================================================================
--- tests/alts/madtests.c (revision 1094)
+++ tests/alts/madtests.c (working copy)
@@ -66,7 +66,7 @@
ib_api_status_t status;
uint32_t test_type;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_ca_attr_t *p_ca_attr;
ib_port_attr_t *p_src_port_attr;
ib_port_attr_t *p_dest_port_attr;
@@ -83,18 +83,18 @@
ib_net16_t slid;
ib_net16_t dlid;
- ib_pool_key_t VOID_PTR64 h_src_pool;
- ib_pool_key_t VOID_PTR64 h_dest_pool;
+ ib_pool_key_t h_src_pool;
+ ib_pool_key_t h_dest_pool;
- ib_mad_svc_handle_t VOID_PTR64 h_src_mad_svc;
- ib_mad_svc_handle_t VOID_PTR64 h_dest_mad_svc;
+ ib_mad_svc_handle_t h_src_mad_svc;
+ ib_mad_svc_handle_t h_dest_mad_svc;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
uint32_t cq_size;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
- ib_qp_handle_t VOID_PTR64 h_qp[MAX_QPS];
+ ib_qp_handle_t h_qp[MAX_QPS];
uint32_t qkey;
ib_qp_attr_t qp_attr[MAX_QPS];
@@ -108,8 +108,8 @@
uint32_t ds_list_depth;
uint32_t msg_size; // Initialize this field
- ib_av_handle_t VOID_PTR64 h_av_src;
- ib_av_handle_t VOID_PTR64 h_av_dest;
+ ib_av_handle_t h_av_src;
+ ib_av_handle_t h_av_dest;
uint32_t send_done;
uint32_t send_done_error;
@@ -140,7 +140,7 @@
ib_api_status_t
mad_activate_svc(
alts_mad_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp );
+ ib_qp_handle_t h_qp );
ib_api_status_t
alts_spl_destroy_resources(
@@ -176,7 +176,7 @@
void
mad_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
/*
@@ -196,65 +196,65 @@
void
mad_svc_send_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element );
void
mad_svc_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element );
void
mad_svc_qp0_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element );
ib_api_status_t
alts_qp1_loopback(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp1_2_ports(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp1_2_ports_100(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp1_pingpong(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp0_loopback(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp0_2_ports(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp0_2_ports_100(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp0_pingpong(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_qp0_ping_switch (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
#define ALTS_TEST_MGMT_CLASS 0x56
@@ -264,7 +264,7 @@
/*
* Gloabal Variables
*/
-ib_al_handle_t VOID_PTR64 h_al;
+ib_al_handle_t h_al;
ib_dgrm_info_t dgrm_info;
ib_mad_svc_t mad_svc;
ib_send_wr_t send_wr;
@@ -293,7 +293,7 @@
al_test_mad(void)
{
ib_api_status_t ib_status = IB_ERROR;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_ca_handle_t h_ca = NULL;
uint32_t bsize;
ib_ca_attr_t *p_ca_attr = NULL;
//alts_mad_ca_obj_t ca_obj; // for testing stack
@@ -969,10 +969,10 @@
ib_api_status_t
mad_activate_svc(
alts_mad_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp )
+ ib_qp_handle_t h_qp )
{
ib_api_status_t ib_status;
- ib_mad_svc_handle_t VOID_PTR64 h_mad_svc;
+ ib_mad_svc_handle_t h_mad_svc;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -1302,7 +1302,7 @@
void
mad_svc_send_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
@@ -1369,7 +1369,7 @@
void
mad_svc_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
@@ -1444,7 +1444,7 @@
void
mad_svc_qp0_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
@@ -1682,7 +1682,7 @@
void
mad_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
ib_api_status_t ib_status;
@@ -1826,7 +1826,7 @@
ib_api_status_t
alts_qp1_loopback(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -1956,7 +1956,7 @@
ib_api_status_t
alts_qp1_2_ports(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2086,7 +2086,7 @@
ib_api_status_t
alts_qp1_2_ports_100(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2216,7 +2216,7 @@
ib_api_status_t
alts_qp1_pingpong(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2349,7 +2349,7 @@
ib_api_status_t
alts_qp0_loopback(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2481,7 +2481,7 @@
ib_api_status_t
alts_qp0_2_ports(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2613,7 +2613,7 @@
ib_api_status_t
alts_qp0_2_ports_100(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2745,7 +2745,7 @@
ib_api_status_t
alts_qp0_pingpong(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2879,7 +2879,7 @@
ib_api_status_t
alts_qp0_ping_switch (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
Index: tests/alts/multisendrecv.c
===================================================================
--- tests/alts/multisendrecv.c (revision 1094)
+++ tests/alts/multisendrecv.c (working copy)
@@ -67,7 +67,7 @@
ib_api_status_t status;
uint32_t test_type;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_ca_attr_t *p_ca_attr;
ib_port_attr_t *p_src_port_attr;
ib_port_attr_t *p_dest_port_attr;
@@ -81,12 +81,12 @@
ib_net16_t slid;
ib_net16_t dlid;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
uint32_t cq_size;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
- ib_qp_handle_t VOID_PTR64 h_qp[MAX_QPS];
+ ib_qp_handle_t h_qp[MAX_QPS];
ib_net32_t qkey;
ib_qp_attr_t qp_attr[MAX_QPS];
@@ -100,7 +100,7 @@
uint32_t ds_list_depth;
uint32_t msg_size; // Initialize this field
- ib_av_handle_t VOID_PTR64 h_av_src;
+ ib_av_handle_t h_av_src;
mem_region_t mem_region[200];
uint32_t cq_done; // total completions
@@ -126,7 +126,7 @@
ib_api_status_t
alts_activate_qp(
alts_multisr_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp );
+ ib_qp_handle_t h_qp );
ib_api_status_t
alts_destroy_resources(
@@ -178,12 +178,12 @@
void
ud_multisend_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
void
rc_multisend_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
/*
* CQ Error callback function
@@ -202,32 +202,32 @@
ib_api_status_t
alts_ud_loopback (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_ud_2_ports (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_ud_2_ports_100_msgs (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_rc_loopback (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_rc_2_ports (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
ib_api_status_t
alts_rc_2_ports_100_msgs (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size );
/*
@@ -258,8 +258,8 @@
al_test_multi_send_recv(void)
{
ib_api_status_t ib_status = IB_ERROR;
- ib_al_handle_t VOID_PTR64 h_al;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_al_handle_t h_al;
+ ib_ca_handle_t h_ca = NULL;
uint32_t bsize;
ib_ca_attr_t *p_ca_attr = NULL;
//alts_multisr_ca_obj_t ca_obj; // for testing stack
@@ -904,7 +904,7 @@
ib_api_status_t
alts_activate_qp(
alts_multisr_ca_obj_t *p_ca_obj,
- ib_qp_handle_t VOID_PTR64 h_qp
+ ib_qp_handle_t h_qp
)
{
@@ -1411,7 +1411,7 @@
void
ud_multisend_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -1420,7 +1420,7 @@
void
rc_multisend_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -1508,7 +1508,7 @@
*/
ib_api_status_t
alts_ud_loopback (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -1645,7 +1645,7 @@
ib_api_status_t
alts_ud_2_ports (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -1789,7 +1789,7 @@
ib_api_status_t
alts_ud_2_ports_100_msgs (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -1934,7 +1934,7 @@
ib_api_status_t
alts_rc_loopback (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2084,7 +2084,7 @@
ib_api_status_t
alts_rc_2_ports (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
@@ -2228,7 +2228,7 @@
ib_api_status_t
alts_rc_2_ports_100_msgs (
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
uint32_t ca_attr_size )
{
ib_api_status_t ib_status = IB_ERROR, ib_status2;
Index: tests/alts/openclose.c
===================================================================
--- tests/alts/openclose.c (revision 1094)
+++ tests/alts/openclose.c (working copy)
@@ -39,7 +39,7 @@
ib_api_status_t
al_test_openclose(void)
{
- ib_al_handle_t VOID_PTR64 ph_al;
+ ib_al_handle_t ph_al;
ib_api_status_t ib_status = IB_SUCCESS;
ALTS_ENTER( ALTS_DBG_VERBOSE );
Index: tests/alts/querycaattr.c
===================================================================
--- tests/alts/querycaattr.c (revision 1094)
+++ tests/alts/querycaattr.c (working copy)
@@ -74,14 +74,14 @@
boolean_t modify_attr
)
{
- ib_al_handle_t VOID_PTR64 h_al = NULL;
+ ib_al_handle_t h_al = NULL;
ib_api_status_t ib_status = IB_SUCCESS;
ib_api_status_t ret_status = IB_SUCCESS;
size_t guid_count;
ib_net64_t ca_guid_array[ALTS_MAX_CA];
ib_ca_attr_t *alts_ca_attr;
uintn_t i;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_ca_handle_t h_ca = NULL;
uint32_t bsize;
ib_port_attr_mod_t port_attr_mod;
Index: tests/alts/registermemregion.c
===================================================================
--- tests/alts/registermemregion.c (revision 1094)
+++ tests/alts/registermemregion.c (working copy)
@@ -58,16 +58,16 @@
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
+ ib_pd_handle_t h_pd = NULL;
ib_mr_create_t virt_mem;
char *ptr = NULL, *ptr_align;
size_t mask;
uint32_t lkey;
uint32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_mr = NULL;
+ ib_mr_handle_t h_mr = NULL;
ib_mr_attr_t alts_mr_attr;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -236,15 +236,15 @@
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
+ ib_pd_handle_t h_pd = NULL;
ib_mr_create_t virt_mem;
char *ptr = NULL;
uint32_t lkey;
uint32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_mr = NULL;
+ ib_mr_handle_t h_mr = NULL;
ib_mr_attr_t alts_mr_attr;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -403,9 +403,9 @@
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
+ ib_pd_handle_t h_pd = NULL;
ib_phys_range_t phys_range;
ib_phys_create_t phys_mem;
@@ -413,7 +413,7 @@
void *virt_addr = NULL;
uint32_t lkey;
uint32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_mr = NULL;
+ ib_mr_handle_t h_mr = NULL;
ib_mr_attr_t alts_mr_attr;
ALTS_ENTER( ALTS_DBG_VERBOSE );
@@ -553,9 +553,9 @@
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
- ib_pd_handle_t VOID_PTR64 h_pd = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
+ ib_pd_handle_t h_pd = NULL;
ib_mr_create_t virt_mem;
uint64_t virt_ptr = 0;
@@ -563,8 +563,8 @@
size_t mask;
uint32_t lkey;
uint32_t rkey;
- ib_mr_handle_t VOID_PTR64 h_base_mr = NULL;
- ib_mr_handle_t VOID_PTR64 h_mr = NULL;
+ ib_mr_handle_t h_base_mr = NULL;
+ ib_mr_handle_t h_mr = NULL;
ib_mr_attr_t alts_mr_attr;
ALTS_ENTER( ALTS_DBG_VERBOSE );
Index: tests/alts/registerpnp.c
===================================================================
--- tests/alts/registerpnp.c (revision 1094)
+++ tests/alts/registerpnp.c (working copy)
@@ -47,10 +47,10 @@
ib_api_status_t
al_test_register_pnp(void)
{
- ib_al_handle_t VOID_PTR64 h_al;
+ ib_al_handle_t h_al;
ib_api_status_t ib_status = IB_SUCCESS;
ib_pnp_req_t pnp_req;
- ib_pnp_handle_t VOID_PTR64 h_pnp;
+ ib_pnp_handle_t h_pnp;
ALTS_ENTER( ALTS_DBG_VERBOSE );
Index: tests/alts/reregister_hca.c
===================================================================
--- tests/alts/reregister_hca.c (revision 1094)
+++ tests/alts/reregister_hca.c (working copy)
@@ -54,8 +54,8 @@
)
{
ib_api_status_t ib_status = IB_SUCCESS;
- ib_al_handle_t VOID_PTR64 h_al = NULL;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_al_handle_t h_al = NULL;
+ ib_ca_handle_t h_ca = NULL;
ib_ci_op_t ci_op;
ALTS_ENTER( ALTS_DBG_VERBOSE );
Index: tests/alts/smatests.c
===================================================================
--- tests/alts/smatests.c (revision 1094)
+++ tests/alts/smatests.c (working copy)
@@ -60,20 +60,20 @@
typedef struct _alts_sma_object
{
ib_api_status_t status;
- ib_al_handle_t VOID_PTR64 h_al;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_al_handle_t h_al;
+ ib_ca_handle_t h_ca;
ib_ca_attr_t *p_ca_attr;
ib_port_attr_t *p_send_port_attr;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
uint32_t cq_size;
- ib_pool_key_t VOID_PTR64 h_mad_pool;
- ib_qp_handle_t VOID_PTR64 h_qp0;
+ ib_pool_key_t h_mad_pool;
+ ib_qp_handle_t h_qp0;
- ib_mad_svc_handle_t VOID_PTR64 h_sma_mad_svc;
+ ib_mad_svc_handle_t h_sma_mad_svc;
} alts_sma_object_t;
@@ -99,14 +99,14 @@
);
void
alts_sma_mad_svc_send_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element
);
void
alts_sma_mad_svc_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element
);
@@ -401,7 +401,7 @@
void
alts_sma_mad_svc_send_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
@@ -414,7 +414,7 @@
void
alts_sma_mad_svc_recv_cb(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_mad_element )
{
Index: tests/cmtest/user/cmtest_main.c
===================================================================
--- tests/cmtest/user/cmtest_main.c (revision 1094)
+++ tests/cmtest/user/cmtest_main.c (working copy)
@@ -73,8 +73,8 @@
typedef struct _ib_root
{
- ib_al_handle_t VOID_PTR64 h_al;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_al_handle_t h_al;
+ ib_pd_handle_t h_pd;
/* Input parameters to control test. */
int32_t num_nodes;
@@ -92,7 +92,7 @@
uint32_t msg_size;
- ib_ca_handle_t VOID_PTR64 h_ca;
+ ib_ca_handle_t h_ca;
ib_net16_t l_lid;
ib_net16_t r_lid;
ib_net64_t ca_guid;
@@ -103,7 +103,7 @@
/* cm info */
boolean_t is_server;
- ib_listen_handle_t VOID_PTR64 h_listen;
+ ib_listen_handle_t h_listen;
ib_path_rec_t path_rec;
/* CQ info. */
@@ -115,7 +115,7 @@
ib_qp_mod_t qp_mod_init;
/* reg mem info */
- ib_mr_handle_t VOID_PTR64 h_mr;
+ ib_mr_handle_t h_mr;
uint32_t lkey;
uint32_t rkey;
uint8_t *p_mem;
@@ -152,9 +152,9 @@
{
uint64_t id;
- ib_cq_handle_t VOID_PTR64 h_send_cq;
- ib_cq_handle_t VOID_PTR64 h_recv_cq;
- ib_qp_handle_t VOID_PTR64 h_qp;
+ ib_cq_handle_t h_send_cq;
+ ib_cq_handle_t h_recv_cq;
+ ib_qp_handle_t h_qp;
uint32_t max_inline;
cmnode_state_t state;
@@ -245,7 +245,7 @@
static boolean_t
__poll_cq(
IN ib_node_t *p_node,
- IN ib_cq_handle_t FUNC_PTR64 h_cq );
+ IN ib_cq_handle_t h_cq );
/**********************************************************************
@@ -928,7 +928,7 @@
static void AL_API
__cq_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void* cq_context )
{
ib_node_t *p_node = (ib_node_t*)cq_context;
@@ -1374,7 +1374,7 @@
{
ib_api_status_t status;
ib_pnp_req_t pnp_req;
- ib_pnp_handle_t VOID_PTR64 h_pnp;
+ ib_pnp_handle_t h_pnp;
cl_memclr( &pnp_req, sizeof( ib_pnp_req_t ) );
pnp_req.pnp_class = IB_PNP_PORT;
@@ -1790,7 +1790,7 @@
static boolean_t
__poll_cq(
IN ib_node_t *p_node,
- IN ib_cq_handle_t FUNC_PTR64 h_cq )
+ IN ib_cq_handle_t h_cq )
{
ib_api_status_t status = IB_SUCCESS;
ib_wc_t free_wc[2];
Index: tests/limits/user/limits_main.c
===================================================================
--- tests/limits/user/limits_main.c (revision 1094)
+++ tests/limits/user/limits_main.c (working copy)
@@ -269,13 +269,13 @@
struct __mr_buf
{
cl_list_item_t list_item;
- ib_mr_handle_t VOID_PTR64 h_mr;
- char buf[8192 - sizeof(ib_mr_handle_t VOID_PTR64) - sizeof(cl_list_item_t)];
+ ib_mr_handle_t h_mr;
+ char buf[8192 - sizeof(ib_mr_handle_t ) - sizeof(cl_list_item_t)];
};
static void
__test_mr(
- ib_pd_handle_t VOID_PTR64 h_pd )
+ ib_pd_handle_t h_pd )
{
ib_api_status_t status = IB_SUCCESS;
struct __mr_buf *p_mr;
@@ -346,12 +346,12 @@
struct __cq
{
cl_list_item_t list_item;
- ib_cq_handle_t VOID_PTR64 h_cq;
+ ib_cq_handle_t h_cq;
};
static void
__test_cq(
- ib_ca_handle_t VOID_PTR64 h_ca,
+ ib_ca_handle_t h_ca,
boolean_t resize )
{
ib_api_status_t status = IB_SUCCESS;
@@ -447,9 +447,9 @@
char* argv[] )
{
ib_api_status_t status;
- ib_al_handle_t VOID_PTR64 h_al;
- ib_ca_handle_t VOID_PTR64 h_ca;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_al_handle_t h_al;
+ ib_ca_handle_t h_ca;
+ ib_pd_handle_t h_pd;
size_t size;
net64_t *ca_guids;
Index: tools/fwupdate/user/flint.cpp
===================================================================
--- tools/fwupdate/user/flint.cpp (revision 1094)
+++ tools/fwupdate/user/flint.cpp (working copy)
@@ -591,8 +591,8 @@
M_DEBUG("Specify HCA to work with\n");
return status;
}
- m_mf.ph_al = (ib_al_handle_t VOID_PTR64 *)(intn_t)&m_mf.h_al;
- m_mf.ph_ca = (ib_ca_handle_t VOID_PTR64 *)(intn_t)&m_mf.h_ca;
+ m_mf.ph_al = (ib_al_handle_t *)(intn_t)&m_mf.h_al;
+ m_mf.ph_ca = (ib_ca_handle_t *)(intn_t)&m_mf.h_ca;
if ( !(hca_open()))
{
M_DEBUG("Failed to open HCA \n");
Index: tools/perftests/user/read_bw/read_bw.c
===================================================================
--- tools/perftests/user/read_bw/read_bw.c (revision 1094)
+++ tools/perftests/user/read_bw/read_bw.c (working copy)
@@ -55,7 +55,7 @@
void
pp_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -82,7 +82,7 @@
ctx->size = size;
ctx->tx_depth = user_parm->tx_depth;
- ctx->qp = malloc(sizeof (ib_qp_handle_t VOID_PTR64));
+ ctx->qp = malloc(sizeof (ib_qp_handle_t ));
if (!ctx->qp) {
perror("malloc");
return NULL;
Index: tools/perftests/user/read_lat/read_lat.c
===================================================================
--- tools/perftests/user/read_lat/read_lat.c (revision 1094)
+++ tools/perftests/user/read_lat/read_lat.c (working copy)
@@ -59,7 +59,7 @@
void
pp_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -86,7 +86,7 @@
ctx->size = size;
ctx->tx_depth = user_parm->tx_depth;
- ctx->qp = malloc(sizeof (ib_qp_handle_t VOID_PTR64));
+ ctx->qp = malloc(sizeof (ib_qp_handle_t ));
if (!ctx->qp) {
perror("malloc");
return NULL;
Index: tools/perftests/user/send_bw/send_bw.c
===================================================================
--- tools/perftests/user/send_bw/send_bw.c (revision 1094)
+++ tools/perftests/user/send_bw/send_bw.c (working copy)
@@ -61,7 +61,7 @@
void
pp_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -85,7 +85,7 @@
if (!ctx)
return NULL;
- ctx->qp = malloc(sizeof (ib_qp_handle_t VOID_PTR64));
+ ctx->qp = malloc(sizeof (ib_qp_handle_t ));
if (!ctx->qp) {
perror("malloc");
return NULL;
@@ -576,7 +576,7 @@
struct pingpong_dest *rem_dest, int size)
{
- ib_qp_handle_t VOID_PTR64 qp;
+ ib_qp_handle_t qp;
int scnt, ccnt, rcnt;
ib_recv_wr_t *bad_wr_recv;
ib_api_status_t ib_status;
@@ -723,7 +723,7 @@
struct pingpong_dest *rem_dest, int size)
{
- ib_qp_handle_t VOID_PTR64 qp;
+ ib_qp_handle_t qp;
int scnt, ccnt, rcnt;
ib_recv_wr_t *bad_wr_recv;
ib_api_status_t ib_status;
Index: tools/perftests/user/send_lat/send_lat.c
===================================================================
--- tools/perftests/user/send_lat/send_lat.c (revision 1094)
+++ tools/perftests/user/send_lat/send_lat.c (working copy)
@@ -57,7 +57,7 @@
void
pp_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -79,7 +79,7 @@
if (!ctx)
return NULL;
- ctx->qp = malloc(sizeof (ib_qp_handle_t VOID_PTR64));
+ ctx->qp = malloc(sizeof (ib_qp_handle_t ));
if (!ctx->qp) {
perror("malloc");
return NULL;
@@ -600,7 +600,7 @@
struct pingpong_dest *rem_dest, int size)
{
ib_api_status_t ib_status;
- ib_qp_handle_t VOID_PTR64 qp;
+ ib_qp_handle_t qp;
ib_recv_wr_t rwr;
ib_recv_wr_t *bad_wr_recv;
volatile char *poll_buf;
Index: tools/perftests/user/write_bw/write_bw.c
===================================================================
--- tools/perftests/user/write_bw/write_bw.c (revision 1094)
+++ tools/perftests/user/write_bw/write_bw.c (working copy)
@@ -58,7 +58,7 @@
void
pp_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -83,7 +83,7 @@
ctx->size = size;
ctx->tx_depth = user_parm->tx_depth;
- ctx->qp = malloc(sizeof (ib_qp_handle_t VOID_PTR64) * user_parm->numofqps );
+ ctx->qp = malloc(sizeof (ib_qp_handle_t ) * user_parm->numofqps );
if (!ctx->qp) {
perror("malloc");
return NULL;
@@ -527,7 +527,7 @@
struct pingpong_dest *rem_dest, int size)
{
ib_api_status_t ib_status;
- ib_qp_handle_t VOID_PTR64 qp;
+ ib_qp_handle_t qp;
int scnt, ccnt ;
int index;
ib_send_wr_t *bad_wr;
Index: tools/perftests/user/write_lat/write_lat.c
===================================================================
--- tools/perftests/user/write_lat/write_lat.c (revision 1094)
+++ tools/perftests/user/write_lat/write_lat.c (working copy)
@@ -57,7 +57,7 @@
void
pp_cq_comp_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
UNUSED_PARAM( h_cq );
@@ -84,7 +84,7 @@
ctx->size = size;
ctx->tx_depth = user_parm->tx_depth;
- ctx->qp = malloc(sizeof (ib_qp_handle_t VOID_PTR64));
+ ctx->qp = malloc(sizeof (ib_qp_handle_t ));
if (!ctx->qp) {
perror("malloc");
return NULL;
Index: tools/vstat/user/vstat_main.c
===================================================================
--- tools/vstat/user/vstat_main.c (revision 1094)
+++ tools/vstat/user/vstat_main.c (working copy)
@@ -340,7 +340,7 @@
}
/* Internal Functions */
-void vstat_get_counters(ib_ca_handle_t VOID_PTR64 h_ca,uint8_t port_num)
+void vstat_get_counters(ib_ca_handle_t h_ca,uint8_t port_num)
{
ib_mad_t *mad_in = NULL;
ib_mad_t *mad_out = NULL;
@@ -393,7 +393,7 @@
}
-void vstat_get_port_info(ib_ca_handle_t VOID_PTR64 h_ca,uint8_t port_num, ib_port_info_t* vstat_port_info)
+void vstat_get_port_info(ib_ca_handle_t h_ca,uint8_t port_num, ib_port_info_t* vstat_port_info)
{
ib_mad_t *mad_in = NULL;
ib_mad_t *mad_out = NULL;
@@ -435,7 +435,7 @@
BOOLEAN getCounters
)
{
- ib_al_handle_t VOID_PTR64 h_al = NULL;
+ ib_al_handle_t h_al = NULL;
ib_api_status_t ib_status = IB_SUCCESS;
ib_api_status_t ret_status = IB_SUCCESS;
size_t guid_count;
@@ -443,7 +443,7 @@
ib_ca_attr_t *vstat_ca_attr;
ib_port_info_t vstat_port_info[2];
size_t i;
- ib_ca_handle_t VOID_PTR64 h_ca = NULL;
+ ib_ca_handle_t h_ca = NULL;
uint32_t bsize;
ib_port_attr_mod_t port_attr_mod;
uint8_t port_idx;
Index: ulp/dapl/dapl/common/dapl_adapter_util.h
===================================================================
--- ulp/dapl/dapl/common/dapl_adapter_util.h (revision 1094)
+++ ulp/dapl/dapl/common/dapl_adapter_util.h (working copy)
@@ -192,23 +192,23 @@
DAT_RETURN dapls_ib_completion_poll (
IN ib_hca_handle_t hca_handle,
- IN ib_cq_handle_t FUNC_PTR64 cq_handle,
+ IN ib_cq_handle_t cq_handle,
IN ib_work_completion_t *cqe_ptr);
DAT_RETURN dapls_ib_completion_notify (
IN ib_hca_handle_t hca_handle,
- IN ib_cq_handle_t FUNC_PTR64 cq_handle,
+ IN ib_cq_handle_t cq_handle,
IN ib_notification_type_t type);
DAT_RETURN
dapls_ib_n_completions_notify (
IN ib_hca_handle_t hca_handle,
- IN ib_cq_handle_t FUNC_PTR64 cq_handle,
+ IN ib_cq_handle_t cq_handle,
IN uint32_t n_cqes);
DAT_RETURN
dapls_ib_peek_cq (
- IN ib_cq_handle_t FUNC_PTR64 cq_handle,
+ IN ib_cq_handle_t cq_handle,
OUT uint32_t* p_n_cqes);
DAT_RETURN
Index: ulp/dapl/dapl/common/dapl_evd_dto_callb.c
===================================================================
--- ulp/dapl/dapl/common/dapl_evd_dto_callb.c (revision 1094)
+++ ulp/dapl/dapl/common/dapl_evd_dto_callb.c (working copy)
@@ -71,7 +71,7 @@
void
dapl_evd_dto_callback (
IN ib_hca_handle_t hca_handle,
- IN ib_cq_handle_t FUNC_PTR64 cq_handle,
+ IN ib_cq_handle_t cq_handle,
IN void* user_context)
{
DAPL_EVD *evd_ptr;
Index: ulp/dapl/dapl/common/dapl_evd_util.c
===================================================================
--- ulp/dapl/dapl/common/dapl_evd_util.c (revision 1094)
+++ ulp/dapl/dapl/common/dapl_evd_util.c (working copy)
@@ -1184,7 +1184,7 @@
{
ib_work_completion_t cur_cqe;
DAT_RETURN dat_status;
- ib_cq_handle_t VOID_PTR64 cq_handle;
+ ib_cq_handle_t cq_handle;
ib_hca_handle_t hca_handle;
DAPL_EP *ep_ptr;
DAT_EVENT *event;
@@ -1291,7 +1291,7 @@
OUT DAT_EVENT *event)
{
DAT_RETURN dat_status;
- ib_cq_handle_t VOID_PTR64 cq_handle;
+ ib_cq_handle_t cq_handle;
ib_hca_handle_t hca_handle;
ib_work_completion_t cur_cqe;
DAPL_EP *ep_ptr;
Index: ulp/dapl/dapl/common/dapl_evd_util.h
===================================================================
--- ulp/dapl/dapl/common/dapl_evd_util.h (revision 1094)
+++ ulp/dapl/dapl/common/dapl_evd_util.h (working copy)
@@ -121,7 +121,7 @@
/* dto verb callback */
extern void dapl_evd_dto_callback (
IN ib_hca_handle_t ib_hca_handle,
- IN ib_cq_handle_t FUNC_PTR64 ib_cq_handle,
+ IN ib_cq_handle_t ib_cq_handle,
IN void* context);
/* async verb callbacks */
Index: ulp/dapl/dapl/ibal/dapl_ibal_cm.c
===================================================================
--- ulp/dapl/dapl/ibal/dapl_ibal_cm.c (revision 1094)
+++ ulp/dapl/dapl/ibal/dapl_ibal_cm.c (working copy)
@@ -53,7 +53,7 @@
{
DAPL_HCA *hca_ptr;
- hca_ptr = (DAPL_HCA * VOID_PTR64) p_reg_svc_rec->svc_context;
+ hca_ptr = (DAPL_HCA * ) p_reg_svc_rec->svc_context;
dapl_os_assert (hca_ptr);
@@ -475,7 +475,7 @@
p_path_rec = ib_get_query_path_rec (p_query_rec->p_result_mad, 0);
if (p_path_rec)
{
- dapl_os_memcpy ((void * VOID_PTR64) p_query_rec->query_context,
+ dapl_os_memcpy ((void * ) p_query_rec->query_context,
(void *) p_path_rec,
sizeof (ib_path_rec_t));
dapl_dbg_log ( DAPL_DBG_TYPE_CM | DAPL_DBG_TYPE_CALLBACK,
@@ -499,7 +499,7 @@
p_svc_rec = ib_get_query_svc_rec (p_query_rec->p_result_mad, 0);
if (p_svc_rec)
{
- dapl_os_memcpy ((void * VOID_PTR64) p_query_rec->query_context,
+ dapl_os_memcpy ((void * ) p_query_rec->query_context,
(void *) p_svc_rec,
sizeof (ib_service_record_t));
dapl_dbg_log (
@@ -522,7 +522,7 @@
{
ib_user_query_t *p_user_query;
- p_user_query =(ib_user_query_t * VOID_PTR64)p_query_rec->query_context;
+ p_user_query =(ib_user_query_t * )p_query_rec->query_context;
if (p_user_query)
{
switch (p_user_query->attr_id)
@@ -627,7 +627,7 @@
dapl_os_assert (p_cm_dreq_rec);
- ep_ptr = (DAPL_EP * VOID_PTR64) p_cm_dreq_rec->qp_context;
+ ep_ptr = (DAPL_EP * ) p_cm_dreq_rec->qp_context;
if ( ep_ptr == NULL ||
ep_ptr->header.magic == DAPL_MAGIC_INVALID )
@@ -675,7 +675,7 @@
dapls_cr_callback ( p_cm_dreq_rec->h_cm_dreq,
IB_CME_DISCONNECTED,
- (void * VOID_PTR64) p_cm_dreq_rec->p_dreq_pdata,
+ (void * ) p_cm_dreq_rec->p_dreq_pdata,
(void *) sp_ptr,
NULL);
}
@@ -685,7 +685,7 @@
dapl_evd_connection_callback ( p_cm_dreq_rec->h_cm_dreq,
IB_CME_DISCONNECTED,
- (void * VOID_PTR64) p_cm_dreq_rec->p_dreq_pdata,
+ (void * ) p_cm_dreq_rec->p_dreq_pdata,
p_cm_dreq_rec->qp_context);
}
}
@@ -699,7 +699,7 @@
dapl_os_assert (p_cm_drep_rec != NULL);
- ep_ptr = (DAPL_EP * VOID_PTR64) p_cm_drep_rec->qp_context;
+ ep_ptr = (DAPL_EP * ) p_cm_drep_rec->qp_context;
if (ep_ptr)
{
@@ -722,7 +722,7 @@
dapls_cr_callback ( ep_ptr->cm_handle,
IB_CME_DISCONNECTED,
- (void * VOID_PTR64) p_cm_drep_rec->p_drep_pdata,
+ (void * ) p_cm_drep_rec->p_drep_pdata,
(void *) sp_ptr,
NULL);
}
@@ -732,7 +732,7 @@
dapl_evd_connection_callback ( ep_ptr->cm_handle,
IB_CME_DISCONNECTED,
- (void * VOID_PTR64) p_cm_drep_rec->p_drep_pdata,
+ (void * ) p_cm_drep_rec->p_drep_pdata,
p_cm_drep_rec->qp_context);
}
}
@@ -754,10 +754,10 @@
dapl_os_memzero (&cm_rtu, sizeof ( ib_cm_rtu_t ));
- dapl_os_assert ( ((DAPL_HEADER * VOID_PTR64) p_cm_rep_rec->qp_context)->magic ==
+ dapl_os_assert ( ((DAPL_HEADER * ) p_cm_rep_rec->qp_context)->magic ==
DAPL_MAGIC_EP );
- ep_ptr = (DAPL_EP * VOID_PTR64) p_cm_rep_rec->qp_context;
+ ep_ptr = (DAPL_EP * ) p_cm_rep_rec->qp_context;
dapl_dbg_log (DAPL_DBG_TYPE_CM,
"--> DiCRpcb: EP = %p local_max_rdma_read_in %d\n",
ep_ptr, p_cm_rep_rec->resp_res);
@@ -789,7 +789,7 @@
cm_cb_op = IB_CME_LOCAL_FAILURE;
}
- prd_ptr = (DAPL_PRIVATE * VOID_PTR64) p_cm_rep_rec->p_rep_pdata;
+ prd_ptr = (DAPL_PRIVATE * ) p_cm_rep_rec->p_rep_pdata;
#ifdef DAPL_DBG
#if 0
@@ -814,7 +814,7 @@
p_cm_rep_rec->h_cm_rep,
cm_cb_op,
(void *) prd_ptr,
- (void * VOID_PTR64) p_cm_rep_rec->qp_context);
+ (void * ) p_cm_rep_rec->qp_context);
}
@@ -827,7 +827,7 @@
dapl_os_assert (p_cm_rej_rec);
- ep_ptr = (DAPL_EP * VOID_PTR64) p_cm_rej_rec->qp_context;
+ ep_ptr = (DAPL_EP * ) p_cm_rej_rec->qp_context;
dapl_dbg_log (DAPL_DBG_TYPE_CM,
"--> DiCRjcb: EP = %p QP = %p rej reason = 0x%x\n",
@@ -888,7 +888,7 @@
{
dapls_cr_callback ( ep_ptr->cm_handle,
cm_event,
- (void * VOID_PTR64) p_cm_rej_rec->p_rej_pdata,
+ (void * ) p_cm_rej_rec->p_rej_pdata,
(void *) ((DAPL_CR *) ep_ptr->cr_ptr)->sp_ptr,
NULL);
}
@@ -896,8 +896,8 @@
{
dapl_evd_connection_callback ( ep_ptr->cm_handle,
cm_event,
- (void * VOID_PTR64) p_cm_rej_rec->p_rej_pdata,
- (void * VOID_PTR64) p_cm_rej_rec->qp_context);
+ (void * ) p_cm_rej_rec->p_rej_pdata,
+ (void * ) p_cm_rej_rec->qp_context);
}
}
@@ -912,7 +912,7 @@
dapl_os_assert (p_cm_req_rec);
- sp_ptr = (DAPL_SP * VOID_PTR64) p_cm_req_rec->context;
+ sp_ptr = (DAPL_SP * ) p_cm_req_rec->context;
dapl_os_assert (sp_ptr);
@@ -993,8 +993,8 @@
dapls_cr_callback ( p_cm_req_rec->h_cm_req,
IB_CME_CONNECTION_REQUEST_PENDING,
- (void * VOID_PTR64) p_cm_req_rec->p_req_pdata,
- (void * VOID_PTR64) p_cm_req_rec->context,
+ (void * ) p_cm_req_rec->p_req_pdata,
+ (void * ) p_cm_req_rec->context,
(DAT_IA_ADDRESS_PTR)&dest_ia_addr);
}
@@ -1016,7 +1016,7 @@
dapl_os_assert (p_cm_rtu_rec != NULL);
- ep_ptr = (DAPL_EP * VOID_PTR64) p_cm_rtu_rec->qp_context;
+ ep_ptr = (DAPL_EP * ) p_cm_rtu_rec->qp_context;
dapl_dbg_log (DAPL_DBG_TYPE_CM | DAPL_DBG_TYPE_CALLBACK,
"--> DiCRucb: EP = %p QP = %p\n", ep_ptr, ep_ptr->qp_handle);
@@ -1029,7 +1029,7 @@
dapls_cr_callback ( ep_ptr->cm_handle,
IB_CME_CONNECTED,
- (void * VOID_PTR64) p_cm_rtu_rec->p_rtu_pdata,
+ (void * ) p_cm_rtu_rec->p_rtu_pdata,
(void *) sp_ptr,
NULL);
@@ -1039,7 +1039,7 @@
dapl_evd_connection_callback (
ep_ptr->cm_handle,
IB_CME_CONNECTED,
- (void * VOID_PTR64) p_cm_rtu_rec->p_rtu_pdata,
+ (void * ) p_cm_rtu_rec->p_rtu_pdata,
(void *) ep_ptr);
}
}
Index: ulp/dapl/dapl/ibal/dapl_ibal_dto.h
===================================================================
--- ulp/dapl/dapl/ibal/dapl_ibal_dto.h (revision 1094)
+++ ulp/dapl/dapl/ibal/dapl_ibal_dto.h (working copy)
@@ -30,7 +30,7 @@
extern DAT_RETURN
dapls_ib_cq_late_alloc (
- IN ib_pd_handle_t FUNC_PTR64 pd_handle,
+ IN ib_pd_handle_t pd_handle,
IN DAPL_EVD *evd_ptr);
#define DAPL_DEFAULT_DS_ENTRIES 8
Index: ulp/dapl/dapl/ibal/dapl_ibal_mrdb.c
===================================================================
--- ulp/dapl/dapl/ibal/dapl_ibal_mrdb.c (revision 1094)
+++ ulp/dapl/dapl/ibal/dapl_ibal_mrdb.c (working copy)
@@ -213,7 +213,7 @@
DAT_RETURN dapls_mrdb_record_update (
IN DAPL_HCA *hca_ptr,
IN DAT_LMR_COOKIE shared_mem_id,
- IN struct _ib_mr* FUNC_PTR64 mr_handle)
+ IN struct _ib_mr* mr_handle)
{
cl_status_t cl_status;
mrdb_rec_update_ioctl_t ioctl_buf;
@@ -274,7 +274,7 @@
IN DAPL_HCA *hca_ptr,
IN DAT_LMR_COOKIE shared_mem_id,
OUT int *p_ib_shmid,
- OUT struct _ib_mr* FUNC_PTR64 *p_mr_handle)
+ OUT struct _ib_mr* *p_mr_handle)
{
cl_status_t cl_status;
mrdb_rec_query_ioctl_t ioctl_buf;
Index: ulp/dapl/dapl/ibal/dapl_ibal_qp.c
===================================================================
--- ulp/dapl/dapl/ibal/dapl_ibal_qp.c (revision 1094)
+++ ulp/dapl/dapl/ibal/dapl_ibal_qp.c (working copy)
@@ -118,9 +118,9 @@
DAT_RETURN dat_status;
ib_api_status_t ib_status;
ib_qp_create_t qp_create;
- ib_pd_handle_t VOID_PTR64 ib_pd_handle;
- ib_cq_handle_t VOID_PTR64 cq_recv;
- ib_cq_handle_t VOID_PTR64 cq_send;
+ ib_pd_handle_t ib_pd_handle;
+ ib_cq_handle_t cq_recv;
+ ib_cq_handle_t cq_send;
dapl_ibal_ca_t *p_ca;
dapl_ibal_port_t *p_active_port;
ib_qp_attr_t qp_attr;
@@ -138,7 +138,7 @@
dapl_os_assert ( recv_evd_ptr != DAT_HANDLE_NULL );
{
- cq_recv = (ib_cq_handle_t VOID_PTR64) recv_evd_ptr->ib_cq_handle;
+ cq_recv = (ib_cq_handle_t ) recv_evd_ptr->ib_cq_handle;
if ((cq_recv == IB_INVALID_HANDLE) &&
( 0 != (recv_evd_ptr->evd_flags & ~DAT_EVD_SOFTWARE_FLAG) ))
@@ -160,7 +160,7 @@
return (dat_status);
}
- cq_recv = (ib_cq_handle_t VOID_PTR64) recv_evd_ptr->ib_cq_handle;
+ cq_recv = (ib_cq_handle_t ) recv_evd_ptr->ib_cq_handle;
dapl_dbg_log (DAPL_DBG_TYPE_EP,
"--> DsQA: alloc_recv_CQ = %p\n", cq_recv);
@@ -169,7 +169,7 @@
dapl_os_assert ( request_evd_ptr != DAT_HANDLE_NULL );
{
- cq_send = (ib_cq_handle_t VOID_PTR64) request_evd_ptr->ib_cq_handle;
+ cq_send = (ib_cq_handle_t ) request_evd_ptr->ib_cq_handle;
if ((cq_send == IB_INVALID_HANDLE) &&
( 0 != (request_evd_ptr->evd_flags & ~DAT_EVD_SOFTWARE_FLAG) ))
@@ -191,7 +191,7 @@
return (dat_status);
}
- cq_send = (ib_cq_handle_t VOID_PTR64) request_evd_ptr->ib_cq_handle;
+ cq_send = (ib_cq_handle_t ) request_evd_ptr->ib_cq_handle;
dapl_dbg_log (DAPL_DBG_TYPE_EP,
"--> DsQA: alloc_send_CQ = %p\n", cq_send);
}
@@ -292,7 +292,7 @@
IN DAPL_EP *ep_ptr )
{
- ib_qp_handle_t VOID_PTR64 qp_handle;
+ ib_qp_handle_t qp_handle;
UNREFERENCED_PARAMETER(ia_ptr);
dapl_dbg_log (DAPL_DBG_TYPE_EP,
@@ -345,7 +345,7 @@
{
ib_qp_attr_t qp_attr;
ib_api_status_t ib_status;
- ib_qp_handle_t VOID_PTR64 qp_handle;
+ ib_qp_handle_t qp_handle;
ib_qp_state_t qp_state;
ib_qp_mod_t qp_mod;
ib_av_attr_t *p_av_attr;
@@ -454,7 +454,7 @@
ib_api_status_t
dapls_modify_qp_state_to_error (
- ib_qp_handle_t VOID_PTR64 qp_handle )
+ ib_qp_handle_t qp_handle )
{
ib_qp_mod_t qp_mod;
ib_api_status_t ib_status;
@@ -474,7 +474,7 @@
ib_api_status_t
dapls_modify_qp_state_to_reset (
- ib_qp_handle_t VOID_PTR64 qp_handle )
+ ib_qp_handle_t qp_handle )
{
ib_qp_mod_t qp_mod;
ib_api_status_t ib_status;
@@ -494,7 +494,7 @@
ib_api_status_t
dapls_modify_qp_state_to_init (
- IN ib_qp_handle_t FUNC_PTR64 qp_handle,
+ IN ib_qp_handle_t qp_handle,
IN DAT_EP_ATTR *p_attr,
IN dapl_ibal_port_t *p_port )
{
@@ -524,7 +524,7 @@
ib_api_status_t
dapls_modify_qp_state_to_rtr (
- ib_qp_handle_t VOID_PTR64 qp_handle,
+ ib_qp_handle_t qp_handle,
ib_net32_t dest_qp,
ib_lid_t dest_lid,
dapl_ibal_port_t *p_port)
@@ -562,7 +562,7 @@
ib_api_status_t
dapls_modify_qp_state_to_rts (
- ib_qp_handle_t VOID_PTR64 qp_handle )
+ ib_qp_handle_t qp_handle )
{
ib_qp_mod_t qp_mod;
ib_api_status_t ib_status;
Index: ulp/dapl/dapl/ibal/dapl_ibal_util.c
===================================================================
--- ulp/dapl/dapl/ibal/dapl_ibal_util.c (revision 1094)
+++ ulp/dapl/dapl/ibal/dapl_ibal_util.c (working copy)
@@ -437,7 +437,7 @@
static dapl_ibal_ca_t *
dapli_alloc_ca(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN ib_net64_t ca_guid)
{
dapl_ibal_ca_t *p_ca;
@@ -540,7 +540,7 @@
static dapl_ibal_ca_t *
dapli_add_ca(
- IN ib_al_handle_t FUNC_PTR64 h_al,
+ IN ib_al_handle_t h_al,
IN ib_net64_t ca_guid)
{
dapl_ibal_ca_t *p_ca;
@@ -907,7 +907,7 @@
*/
static void
dapli_ib_cq_completion_cb (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
DAPL_EVD *evd_ptr;
@@ -953,7 +953,7 @@
*/
DAT_RETURN
dapls_ib_cq_late_alloc (
- IN ib_pd_handle_t FUNC_PTR64 pd_handle,
+ IN ib_pd_handle_t pd_handle,
IN DAPL_EVD *evd_ptr)
{
ib_cq_create_t cq_create;
@@ -977,7 +977,7 @@
}
ib_status = ib_create_cq (
- (ib_ca_handle_t VOID_PTR64)ibal_ca->h_ca,
+ (ib_ca_handle_t )ibal_ca->h_ca,
&cq_create,
evd_ptr /* context */,
dapli_ibal_cq_async_error_callback,
@@ -1368,7 +1368,7 @@
IN DAT_MEM_PRIV_FLAGS privileges)
{
ib_api_status_t ib_status;
- ib_mr_handle_t VOID_PTR64 mr_handle;
+ ib_mr_handle_t mr_handle;
ib_mr_create_t mr_create;
uint32_t l_key, r_key;
@@ -1483,9 +1483,9 @@
IN DAT_MEM_PRIV_FLAGS privileges)
{
DAT_VADDR virt_addr;
- ib_mr_handle_t VOID_PTR64 mr_handle;
+ ib_mr_handle_t mr_handle;
ib_api_status_t ib_status;
- ib_mr_handle_t VOID_PTR64 new_mr_handle;
+ ib_mr_handle_t new_mr_handle;
ib_access_t access_ctrl;
uint32_t l_key, r_key;
ib_mr_create_t mr_create;
@@ -1501,7 +1501,7 @@
mr_create.vaddr = (void *) virt_addr;
mr_create.access_ctrl = access_ctrl;
- mr_handle = (ib_mr_handle_t VOID_PTR64) lmr->mr_handle;
+ mr_handle = (ib_mr_handle_t ) lmr->mr_handle;
dapl_dbg_log (DAPL_DBG_TYPE_UTIL,
"--> DsIMRS: orig mr_handle %p vaddr %p\n",
@@ -1575,7 +1575,7 @@
{
ib_api_status_t ib_status;
uint32_t r_key;
- ib_mw_handle_t VOID_PTR64 mw_handle;
+ ib_mw_handle_t mw_handle;
ib_status = ib_create_mw (
((DAPL_PZ *)rmr->param.pz_handle)->pd_handle,
@@ -2051,7 +2051,7 @@
DAT_RETURN
dapls_ib_completion_poll (
IN ib_hca_handle_t hca_handle,
- IN ib_cq_handle_t FUNC_PTR64 cq_handle,
+ IN ib_cq_handle_t cq_handle,
IN ib_work_completion_t* cqe_ptr)
{
ib_api_status_t ib_status;
@@ -2082,7 +2082,7 @@
DAT_RETURN
dapls_ib_completion_notify (
IN ib_hca_handle_t hca_handle,
- IN ib_cq_handle_t FUNC_PTR64 cq_handle,
+ IN ib_cq_handle_t cq_handle,
IN ib_notification_type_t type)
{
ib_api_status_t ib_status;
@@ -2103,7 +2103,7 @@
DAT_RETURN
dapls_ib_n_completions_notify (
IN ib_hca_handle_t hca_handle,
- IN ib_cq_handle_t FUNC_PTR64 cq_handle,
+ IN ib_cq_handle_t cq_handle,
IN uint32_t n_cqes)
{
ib_api_status_t ib_status;
@@ -2119,7 +2119,7 @@
DAT_RETURN
dapls_ib_peek_cq (
- IN ib_cq_handle_t FUNC_PTR64 cq_handle,
+ IN ib_cq_handle_t cq_handle,
OUT uint32_t* p_n_cqes)
{
ib_api_status_t ib_status;
Index: ulp/dapl/doc/dapl_shared_memory_design.txt
===================================================================
--- ulp/dapl/doc/dapl_shared_memory_design.txt (revision 1094)
+++ ulp/dapl/doc/dapl_shared_memory_design.txt (working copy)
@@ -102,8 +102,8 @@
ib_int32_t
ib_mr_shared_register_us(
ib_hca_handle_t hca_handle,
- ib_mr_handle_t FUNC_PTR64 *mr_handle, /* IN-OUT: could be changed */
- ib_pd_handle_t FUNC_PTR64 pd_handle, /* IN */
+ ib_mr_handle_t *mr_handle, /* IN-OUT: could be changed */
+ ib_pd_handle_t pd_handle, /* IN */
ib_uint32_t access_control, /* IN */
ib_uint32_t *l_key, /* OUT */
ib_uint32_t *r_key, /* OUT: if remote access needed */
@@ -180,7 +180,7 @@
DAT_RETURN
dapls_mrdb_record_update (
IN DAPL_LMR_COOKIE cookie,
- IN ib_mr_handle_t FUNC_PTR64 mr_handle );
+ IN ib_mr_handle_t mr_handle );
If there is a record for the specified cookie, the MR handle field is
set to the specified mr_handle value and the initialized field is set
@@ -189,7 +189,7 @@
DAT_RETURN
dapls_mrdb_record_query (
IN DAPL_LMR_COOKIE cookie,
- OUT ib_mr_handle_t FUNC_PTR64 *mr_handle );
+ OUT ib_mr_handle_t *mr_handle );
If there is a record for the specified cookie and the initialized
field is true, the MR handle field is returned and the reference
Index: ulp/ipoib/kernel/ipoib_adapter.c
===================================================================
--- ulp/ipoib/kernel/ipoib_adapter.c (revision 1094)
+++ ulp/ipoib/kernel/ipoib_adapter.c (working copy)
@@ -783,7 +783,7 @@
IN ipoib_adapter_t* const p_adapter )
{
ib_api_status_t status;
- ib_pnp_handle_t VOID_PTR64 h_pnp;
+ ib_pnp_handle_t h_pnp;
IPOIB_ENTER( IPOIB_DBG_INIT );
Index: ulp/ipoib/kernel/ipoib_driver.c
===================================================================
--- ulp/ipoib/kernel/ipoib_driver.c (revision 1094)
+++ ulp/ipoib/kernel/ipoib_driver.c (working copy)
@@ -2481,7 +2481,7 @@
CL_ASSERT( p_reg_svc_rec );
CL_ASSERT( p_reg_svc_rec->svc_context );
- p_reg = (ats_reg_t* VOID_PTR64)p_reg_svc_rec->svc_context;
+ p_reg = (ats_reg_t*)p_reg_svc_rec->svc_context;
port_num = p_reg->p_adapter->guids.port_num;
cl_obj_lock( &p_reg->p_adapter->obj );
Index: ulp/ipoib/kernel/ipoib_endpoint.c
===================================================================
--- ulp/ipoib/kernel/ipoib_endpoint.c (revision 1094)
+++ ulp/ipoib/kernel/ipoib_endpoint.c (working copy)
@@ -58,10 +58,10 @@
static ib_api_status_t
__create_mcast_av(
- IN ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN ib_pd_handle_t h_pd,
IN uint8_t port_num,
IN ib_member_rec_t* const p_member_rec,
- OUT ib_av_handle_t* FUNC_PTR64 const ph_av );
+ OUT ib_av_handle_t* const ph_av );
static inline ipoib_port_t*
__endpt_parent(
@@ -112,10 +112,10 @@
static ib_api_status_t
__create_mcast_av(
- IN ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN ib_pd_handle_t h_pd,
IN uint8_t port_num,
IN ib_member_rec_t* const p_member_rec,
- OUT ib_av_handle_t* FUNC_PTR64 const ph_av )
+ OUT ib_av_handle_t* const ph_av )
{
ib_av_attr_t av_attr;
uint32_t flow_lbl;
@@ -158,7 +158,7 @@
ib_api_status_t
ipoib_endpt_set_mcast(
IN ipoib_endpt_t* const p_endpt,
- IN ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN ib_pd_handle_t h_pd,
IN uint8_t port_num,
IN ib_mcast_rec_t* const p_mcast_rec )
{
@@ -355,7 +355,7 @@
IPOIB_ENTER( IPOIB_DBG_ENDPT );
- p_endpt = (ipoib_endpt_t*VOID_PTR64)p_query_rec->query_context;
+ p_endpt = (ipoib_endpt_t*)p_query_rec->query_context;
p_port = __endpt_parent( p_endpt );
cl_obj_lock( &p_endpt->obj );
Index: ulp/ipoib/kernel/ipoib_endpoint.h
===================================================================
--- ulp/ipoib/kernel/ipoib_endpoint.h (revision 1094)
+++ ulp/ipoib/kernel/ipoib_endpoint.h (working copy)
@@ -121,7 +121,7 @@
ib_api_status_t
ipoib_endpt_set_mcast(
IN ipoib_endpt_t* const p_endpt,
- IN ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN ib_pd_handle_t h_pd,
IN uint8_t port_num,
IN ib_mcast_rec_t* const p_mcast_rec );
Index: ulp/ipoib/kernel/ipoib_port.c
===================================================================
--- ulp/ipoib/kernel/ipoib_port.c (revision 1094)
+++ ulp/ipoib/kernel/ipoib_port.c (working copy)
@@ -208,7 +208,7 @@
static void
__recv_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
static void
@@ -321,7 +321,7 @@
static void
__send_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context );
@@ -1534,7 +1534,7 @@
static void
__recv_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
ipoib_port_t *p_port;
@@ -3885,7 +3885,7 @@
static void
__send_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *cq_context )
{
ipoib_port_t *p_port;
@@ -4778,7 +4778,7 @@
IPOIB_ENTER( IPOIB_DBG_INIT );
- p_port = (ipoib_port_t* VOID_PTR64)p_query_rec->query_context;
+ p_port = (ipoib_port_t* )p_query_rec->query_context;
cl_obj_lock( &p_port->obj );
p_port->ib_mgr.h_query = NULL;
@@ -4932,7 +4932,7 @@
IPOIB_ENTER( IPOIB_DBG_INIT );
- p_port = (ipoib_port_t* VOID_PTR64)p_query_rec->query_context;
+ p_port = (ipoib_port_t* )p_query_rec->query_context;
cl_obj_lock( &p_port->obj );
p_port->ib_mgr.h_query = NULL;
@@ -5203,7 +5203,7 @@
IPOIB_ENTER( IPOIB_DBG_INIT );
- p_port = (ipoib_port_t* VOID_PTR64)p_mcast_rec->mcast_context;
+ p_port = (ipoib_port_t* )p_mcast_rec->mcast_context;
cl_obj_lock( &p_port->obj );
if( p_port->state != IB_QPS_INIT )
@@ -5323,7 +5323,7 @@
{
UNUSED_PARAM( p_event_rec );
CL_ASSERT( p_event_rec->context );
- ((ipoib_port_t* VOID_PTR64)p_event_rec->context)->p_adapter->hung = TRUE;
+ ((ipoib_port_t* )p_event_rec->context)->p_adapter->hung = TRUE;
}
@@ -5333,7 +5333,7 @@
{
UNUSED_PARAM( p_event_rec );
CL_ASSERT( p_event_rec->context );
- ((ipoib_port_t* VOID_PTR64)p_event_rec->context)->p_adapter->hung = TRUE;
+ ((ipoib_port_t* )p_event_rec->context)->p_adapter->hung = TRUE;
}
@@ -5522,7 +5522,7 @@
IPOIB_ENTER( IPOIB_DBG_MCAST );
- p_port = (ipoib_port_t* VOID_PTR64)p_mcast_rec->mcast_context;
+ p_port = (ipoib_port_t* )p_mcast_rec->mcast_context;
cl_obj_lock( &p_port->obj );
if( p_port->state != IB_QPS_RTS )
@@ -5622,7 +5622,7 @@
IPOIB_ENTER( IPOIB_DBG_MCAST );
- p_port = (ipoib_port_t* VOID_PTR64)context;
+ p_port = (ipoib_port_t* )context;
IPOIB_PRINT( TRACE_LEVEL_VERBOSE, IPOIB_DBG_MCAST,("p_port->mcast_cnt = %d\n", p_port->mcast_cnt));
@@ -5650,7 +5650,7 @@
IPOIB_ENTER( IPOIB_DBG_MCAST );
- p_port = (ipoib_port_t* VOID_PTR64)context;
+ p_port = (ipoib_port_t* )context;
ipoib_port_deref( p_port, ref_leave_mcast);
IPOIB_PRINT_EXIT( TRACE_LEVEL_INFORMATION, IPOIB_DBG_MCAST,
Index: ulp/opensm/user/include/iba/ib_types.h
===================================================================
--- ulp/opensm/user/include/iba/ib_types.h (revision 1094)
+++ ulp/opensm/user/include/iba/ib_types.h (working copy)
@@ -65,22 +65,6 @@
#define __ptr64
#endif
-#ifndef FUNC_PTR64
-#define FUNC_PTR64
-#endif
-
-#ifndef TYPEDEF_PTR64
-#define TYPEDEF_PTR64
-#endif
-
-#ifndef VOID_PTR64
-#define VOID_PTR64
-#endif
-
-#ifndef STRUCT_PTR64
-#define STRUCT_PTR64
-#endif
-
#define CONCAT(str1, str2) str1##str2
#define TO_LONG_PTR(type,member_name) \
@@ -7881,16 +7865,16 @@
*/
-typedef struct _ib_ca* TYPEDEF_PTR64 ib_ca_handle_t ;
-typedef struct _ib_pd* TYPEDEF_PTR64 ib_pd_handle_t ;
-typedef struct _ib_rdd* TYPEDEF_PTR64 ib_rdd_handle_t;
-typedef struct _ib_mr* TYPEDEF_PTR64 ib_mr_handle_t;
-typedef struct _ib_mw* TYPEDEF_PTR64 ib_mw_handle_t;
-typedef struct _ib_qp* TYPEDEF_PTR64 ib_qp_handle_t;
-typedef struct _ib_eec* TYPEDEF_PTR64 ib_eec_handle_t;
-typedef struct _ib_cq* TYPEDEF_PTR64 ib_cq_handle_t;
-typedef struct _ib_av* TYPEDEF_PTR64 ib_av_handle_t;
-typedef struct _ib_mcast* TYPEDEF_PTR64 ib_mcast_handle_t;
+typedef struct _ib_ca* ib_ca_handle_t ;
+typedef struct _ib_pd* ib_pd_handle_t ;
+typedef struct _ib_rdd* ib_rdd_handle_t;
+typedef struct _ib_mr* ib_mr_handle_t;
+typedef struct _ib_mw* ib_mw_handle_t;
+typedef struct _ib_qp* ib_qp_handle_t;
+typedef struct _ib_eec* ib_eec_handle_t;
+typedef struct _ib_cq* ib_cq_handle_t;
+typedef struct _ib_av* ib_av_handle_t;
+typedef struct _ib_mcast* ib_mcast_handle_t;
/* Currently for windows branch, use the extended version of ib special verbs struct
in order to be compliant with Infinicon ib_types; later we'll change it to support
OpenSM ib_types.h */
Index: ulp/opensm/user/include/iba/ib_types_extended.h
===================================================================
--- ulp/opensm/user/include/iba/ib_types_extended.h (revision 1094)
+++ ulp/opensm/user/include/iba/ib_types_extended.h (working copy)
@@ -57,23 +57,6 @@
#define __ptr64
#endif
-#ifndef FUNC_PTR64
-#define FUNC_PTR64
-#endif
-
-#ifndef TYPEDEF_PTR64
-#define TYPEDEF_PTR64
-#endif
-
-#ifndef VOID_PTR64
-#define VOID_PTR64
-#endif
-
-#ifndef STRUCT_PTR64
-#define STRUCT_PTR64
-#endif
-
-
//#ifndef CONCAT
#define CONCAT(str1, str2) str1##str2
//#endif
@@ -108,7 +91,7 @@
-typedef struct _ib_srq* TYPEDEF_PTR64 ib_srq_handle_t ;
+typedef struct _ib_srq* ib_srq_handle_t ;
/*
* The following definitions are shared between the Access Layer and VPD
@@ -2580,7 +2563,7 @@
IN uint32_t buf_info;
IN OUT int32_t status;
OUT uint32_t num_bytes_ret;
- IN OUT void* FUNC_PTR64 p_buf OPTIONAL;
+ IN OUT void* p_buf OPTIONAL;
} ib_ci_op_t;
/*
Index: ulp/opensm/user/libvendor/osm_vendor_al.c
===================================================================
--- ulp/opensm/user/libvendor/osm_vendor_al.c (revision 1094)
+++ ulp/opensm/user/libvendor/osm_vendor_al.c (working copy)
@@ -80,14 +80,14 @@
{
osm_vendor_t *p_vend;
void *client_context;
- ib_qp_handle_t VOID_PTR64 h_qp;
- ib_mad_svc_handle_t VOID_PTR64 h_svc;
+ ib_qp_handle_t h_qp;
+ ib_mad_svc_handle_t h_svc;
uint8_t port_num;
- ib_pool_key_t VOID_PTR64 pool_key;
+ ib_pool_key_t pool_key;
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;
- ib_av_handle_t VOID_PTR64 h_dr_av;
+ ib_av_handle_t h_dr_av;
} osm_al_bind_info_t;
/*
@@ -219,7 +219,7 @@
*/
static void AL_API
__osm_al_send_callback(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_elem )
{
@@ -229,7 +229,7 @@
osm_vend_wrap_t* p_vw = osm_madw_get_vend_ptr( p_madw );
ib_mad_t *p_mad = ib_get_mad_buf( p_elem );
ib_av_attr_t av_attr;
- ib_pd_handle_t VOID_PTR64 h_pd;
+ ib_pd_handle_t h_pd;
ib_api_status_t status_elem,status;
osm_madw_t *p_new_madw;
@@ -317,7 +317,7 @@
*/
static void AL_API
__osm_al_rcv_callback(
- IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
+ IN const ib_mad_svc_handle_t h_mad_svc,
IN void *mad_svc_context,
IN ib_mad_element_t *p_elem )
{
Index: ulp/srp/kernel/srp_connection.c
===================================================================
--- ulp/srp/kernel/srp_connection.c (revision 1094)
+++ ulp/srp/kernel/srp_connection.c (working copy)
@@ -286,7 +286,7 @@
__srp_cm_dreq_cb(
IN ib_cm_dreq_rec_t *p_cm_dreq_rec )
{
- srp_session_t *p_srp_session = (srp_session_t* VOID_PTR64)p_cm_dreq_rec->qp_context;
+ srp_session_t *p_srp_session = (srp_session_t* )p_cm_dreq_rec->qp_context;
srp_hba_t *p_hba = p_srp_session->p_hba;
ib_cm_drep_t cm_drep;
ib_api_status_t status;
@@ -334,9 +334,9 @@
__srp_cm_reply_cb(
IN ib_cm_rep_rec_t *p_cm_reply)
{
- srp_session_t *p_srp_session = (srp_session_t* VOID_PTR64)p_cm_reply->qp_context;
+ srp_session_t *p_srp_session = (srp_session_t* )p_cm_reply->qp_context;
srp_connection_t *p_connection;
- srp_login_rsp_t *p_srp_login_rsp = (srp_login_rsp_t* VOID_PTR64)p_cm_reply->p_rep_pdata;
+ srp_login_rsp_t *p_srp_login_rsp = (srp_login_rsp_t* )p_cm_reply->p_rep_pdata;
ib_api_status_t status;
union
{
@@ -529,9 +529,9 @@
__srp_cm_rej_cb(
IN ib_cm_rej_rec_t *p_cm_reject)
{
- srp_session_t *p_srp_session = (srp_session_t* VOID_PTR64)p_cm_reject->qp_context;
+ srp_session_t *p_srp_session = (srp_session_t* )p_cm_reject->qp_context;
srp_connection_t *p_connection;
- srp_login_rej_t *p_srp_login_rej = (srp_login_rej_t* VOID_PTR64)p_cm_reject->p_rej_pdata;
+ srp_login_rej_t *p_srp_login_rej = (srp_login_rej_t* )p_cm_reject->p_rej_pdata;
cl_status_t cl_status;
SRP_ENTER( SRP_DBG_PNP );
Index: ulp/srp/kernel/srp_data_path.c
===================================================================
--- ulp/srp/kernel/srp_data_path.c (revision 1094)
+++ ulp/srp/kernel/srp_data_path.c (working copy)
@@ -80,7 +80,7 @@
net32_t lkey;
net32_t rkey;
srp_session_t *p_srp_session;
- mlnx_fmr_pool_el_t VOID_PTR64 p_fmr_el;
+ mlnx_fmr_pool_el_t p_fmr_el;
SRP_ENTER( SRP_DBG_DATA );
@@ -334,7 +334,7 @@
*/
void
srp_send_completion_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *p_context )
{
srp_session_t *p_srp_session = (srp_session_t *)p_context;
@@ -895,7 +895,7 @@
*/
void
srp_recv_completion_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *p_context )
{
srp_session_t *p_srp_session = (srp_session_t *)p_context;
Index: ulp/srp/kernel/srp_data_path.h
===================================================================
--- ulp/srp/kernel/srp_data_path.h (revision 1094)
+++ ulp/srp/kernel/srp_data_path.h (working copy)
@@ -54,12 +54,12 @@
void
srp_send_completion_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *p_context );
void
srp_recv_completion_cb(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN void *p_context );
BOOLEAN
Index: ulp/srp/kernel/srp_descriptors.c
===================================================================
--- ulp/srp/kernel/srp_descriptors.c (revision 1094)
+++ ulp/srp/kernel/srp_descriptors.c (working copy)
@@ -59,8 +59,8 @@
__srp_create_recv_descriptors(
IN OUT srp_descriptors_t *p_descriptors,
IN ib_al_ifc_t* const p_ifc,
- IN ib_pd_handle_t FUNC_PTR64 h_pd,
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_pd_handle_t h_pd,
+ IN ib_qp_handle_t h_qp,
IN net32_t lkey)
{
ib_api_status_t status = IB_SUCCESS;
@@ -104,7 +104,7 @@
for ( i = 0; i < p_descriptors->recv_descriptor_count; i++ )
{
p_descriptor->wr.p_next = NULL;
- p_descriptor->wr.wr_id = (uint64_t)((void* VOID_PTR64)p_descriptor);
+ p_descriptor->wr.wr_id = (uint64_t)((void* )p_descriptor);
p_descriptor->wr.num_ds = 1;
p_descriptor->wr.ds_array = p_descriptor->ds;
@@ -151,8 +151,8 @@
IN uint32_t recv_descriptor_count,
IN uint32_t recv_data_segment_size,
IN ib_al_ifc_t* const p_ifc,
- IN ib_pd_handle_t FUNC_PTR64 h_pd,
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_pd_handle_t h_pd,
+ IN ib_qp_handle_t h_qp,
IN net32_t lkey)
{
ib_api_status_t status;
Index: ulp/srp/kernel/srp_descriptors.h
===================================================================
--- ulp/srp/kernel/srp_descriptors.h (revision 1094)
+++ ulp/srp/kernel/srp_descriptors.h (working copy)
@@ -95,8 +95,8 @@
IN uint32_t recv_descriptor_count,
IN uint32_t recv_data_segment_size,
IN ib_al_ifc_t* const p_ifc,
- IN ib_pd_handle_t FUNC_PTR64 h_pd,
- IN ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN ib_pd_handle_t h_pd,
+ IN ib_qp_handle_t h_qp,
IN net32_t lkey);
ib_api_status_t
Index: ulp/srp/kernel/srp_event.c
===================================================================
--- ulp/srp/kernel/srp_event.c (revision 1094)
+++ ulp/srp/kernel/srp_event.c (working copy)
@@ -52,7 +52,7 @@
srp_async_event_handler_cb(
IN ib_async_event_rec_t *p_event_rec )
{
- srp_session_t *p_srp_session = (srp_session_t * VOID_PTR64)p_event_rec->context;
+ srp_session_t *p_srp_session = (srp_session_t *)p_event_rec->context;
SRP_ENTER( SRP_DBG_PNP );
Index: ulp/srp/kernel/srp_hba.c
===================================================================
--- ulp/srp/kernel/srp_hba.c (revision 1094)
+++ ulp/srp/kernel/srp_hba.c (working copy)
@@ -899,7 +899,7 @@
SRP_ENTER( SRP_DBG_PNP );
- p_hba = (srp_hba_t* VOID_PTR64)p_pnp_rec->pnp_context;
+ p_hba = (srp_hba_t*)p_pnp_rec->pnp_context;
p_ioc_rec = (ib_pnp_ioc_rec_t*)p_pnp_rec;
p_ioc_path = (ib_pnp_ioc_path_rec_t*)p_pnp_rec;
Index: ulp/wsd/user/extensions.c
===================================================================
--- ulp/wsd/user/extensions.c (revision 1094)
+++ ulp/wsd/user/extensions.c (working copy)
@@ -402,7 +402,7 @@
/* Format the send work request and post. */
send_wr.p_next = NULL;
- send_wr.wr_id = (uint64_t)(void* VOID_PTR64)wr;
+ send_wr.wr_id = (uint64_t)(void* )wr;
send_wr.wr_type = wr_type;
send_wr.send_opt = 0;
send_wr.num_ds = dwBufferCount;
@@ -414,7 +414,7 @@
lpOverlapped->InternalHigh = 0;
for( ds_idx = 0; ds_idx < dwBufferCount; ds_idx++ )
{
- local_ds[ds_idx].vaddr = (uint64_t)(void* VOID_PTR64)lpBuffers[ds_idx].buf;
+ local_ds[ds_idx].vaddr = (uint64_t)(void* )lpBuffers[ds_idx].buf;
local_ds[ds_idx].length = lpBuffers[ds_idx].len;
local_ds[ds_idx].lkey =
((struct memory_node*)lpBuffers[ds_idx].handle)->p_reg1->lkey;
Index: ulp/wsd/user/ib_cm.c
===================================================================
--- ulp/wsd/user/ib_cm.c (revision 1094)
+++ ulp/wsd/user/ib_cm.c (working copy)
@@ -113,7 +113,7 @@
IN ib_cm_req_rec_t *p_cm_req_rec )
{
struct ibsp_socket_info *socket_info =
- (struct ibsp_socket_info * VOID_PTR64)p_cm_req_rec->context;
+ (struct ibsp_socket_info * )p_cm_req_rec->context;
struct listen_incoming *incoming;
IBSP_ENTER( IBSP_DBG_CM );
@@ -208,7 +208,7 @@
IN ib_cm_rep_rec_t *p_cm_rep_rec )
{
struct ibsp_socket_info *socket_info =
- (struct ibsp_socket_info * VOID_PTR64)p_cm_rep_rec->qp_context;
+ (struct ibsp_socket_info * )p_cm_rep_rec->qp_context;
ib_cm_rtu_t cm_rtu;
ib_api_status_t status;
@@ -291,7 +291,7 @@
IN ib_cm_rtu_rec_t *p_cm_rtu_rec )
{
struct ibsp_socket_info *socket_info =
- (struct ibsp_socket_info * VOID_PTR64)p_cm_rtu_rec->qp_context;
+ (struct ibsp_socket_info * )p_cm_rtu_rec->qp_context;
IBSP_ENTER( IBSP_DBG_CM );
@@ -336,7 +336,7 @@
wr = &socket_info->recv_wr[socket_info->recv_idx];
/* Update the work request ID. */
- wr->recv.wr_id = (uint64_t)(void* VOID_PTR64)wr;
+ wr->recv.wr_id = (uint64_t)(void* )wr;
/*
* Increment the count before posting so it doesn't go
@@ -421,7 +421,7 @@
IN ib_cm_rej_rec_t *p_cm_rej_rec )
{
struct ibsp_socket_info *socket_info =
- (struct ibsp_socket_info * VOID_PTR64)p_cm_rej_rec->qp_context;
+ (struct ibsp_socket_info * )p_cm_rej_rec->qp_context;
IBSP_ENTER( IBSP_DBG_CM );
@@ -504,14 +504,14 @@
ib_cm_drep_t cm_drep;
struct disconnect_reason *reason;
struct ibsp_socket_info *socket_info =
- (struct ibsp_socket_info * VOID_PTR64)p_cm_dreq_rec->qp_context;
+ (struct ibsp_socket_info * )p_cm_dreq_rec->qp_context;
IBSP_ENTER( IBSP_DBG_CM );
IBSP_PRINT(TRACE_LEVEL_INFORMATION, IBSP_DBG_CM,
("socket=%p state=%s\n",
socket_info, IBSP_SOCKET_STATE_STR( socket_info->socket_state )) );
- reason = (struct disconnect_reason * VOID_PTR64)p_cm_dreq_rec->p_dreq_pdata;
+ reason = (struct disconnect_reason * )p_cm_dreq_rec->p_dreq_pdata;
cl_spinlock_acquire( &socket_info->mutex1 );
Index: ulp/wsd/user/ibsp_iblow.c
===================================================================
--- ulp/wsd/user/ibsp_iblow.c (revision 1094)
+++ ulp/wsd/user/ibsp_iblow.c (working copy)
@@ -66,8 +66,8 @@
IBSP_ENTER( IBSP_DBG_IO );
- wr = (struct _wr * VOID_PTR64)wc->wr_id;
- p_recv_wr = (struct _recv_wr * VOID_PTR64)wc->wr_id;
+ wr = (struct _wr * )wc->wr_id;
+ p_recv_wr = (struct _recv_wr * )wc->wr_id;
CL_ASSERT( wr );
@@ -110,7 +110,7 @@
#ifdef IBSP_LOGGING
cl_spinlock_acquire( &socket_info->recv_lock );
DataLogger_WriteData(&socket_info->RecvDataLogger,
- p_recv_wr->idx, (void * VOID_PTR64)p_recv_wr->ds_array[0].vaddr,
+ p_recv_wr->idx, (void * )p_recv_wr->ds_array[0].vaddr,
wc->length);
cl_spinlock_release( &socket_info->recv_lock );
#endif
@@ -251,7 +251,7 @@
// if( idx >= QP_ATTRIB_RQ_DEPTH )
// idx += QP_ATTRIB_RQ_DEPTH;
- // CL_ASSERT( wc->wr_id == (uint64_t)(void* VOID_PTR64)&socket_info->recv_wr[idx] );
+ // CL_ASSERT( wc->wr_id == (uint64_t)(void* )&socket_info->recv_wr[idx] );
// cl_atomic_dec( &socket_info->recv_cnt );
// cl_spinlock_release( &socket_info->recv_lock );
//}
@@ -259,7 +259,7 @@
if( wc->status == IB_SUCCESS && p_recv_wr->ds_array[0].length >= 40 )
{
debug_dump_buffer( IBSP_DBG_WQ, "RECV",
- (void * VOID_PTR64)p_recv_wr->ds_array[0].vaddr, 40 );
+ (void * )p_recv_wr->ds_array[0].vaddr, 40 );
}
cl_atomic_dec( &g_ibsp.recv_count );
@@ -279,7 +279,7 @@
// idx = socket_info->send_idx - (uint8_t)socket_info->send_cnt;
// if( idx >= QP_ATTRIB_SQ_DEPTH )
// idx += QP_ATTRIB_SQ_DEPTH;
- // CL_ASSERT( wc->wr_id == (uint64_t)(void* VOID_PTR64)&socket_info->send_wr[idx] );
+ // CL_ASSERT( wc->wr_id == (uint64_t)(void* )&socket_info->send_wr[idx] );
// cl_atomic_dec( &socket_info->send_cnt );
// cl_spinlock_release( &socket_info->send_lock );
//}
Index: ulp/wsd/user/ibsp_ip.c
===================================================================
--- ulp/wsd/user/ibsp_ip.c (revision 1094)
+++ ulp/wsd/user/ibsp_ip.c (working copy)
@@ -272,7 +272,7 @@
ib_query_rec_t *p_query_rec )
{
struct query_guid_context *query_context =
- (struct query_guid_context * VOID_PTR64)p_query_rec->query_context;
+ (struct query_guid_context * )p_query_rec->query_context;
ib_service_record_t *service_record;
IBSP_ENTER( IBSP_DBG_HW );
@@ -312,7 +312,7 @@
ib_user_query_t user_query;
struct query_guid_context query_context;
ib_service_record_t service_record;
- ib_query_handle_t VOID_PTR64 query_handle;
+ ib_query_handle_t query_handle;
ib_query_req_t query_req;
ib_api_status_t status;
@@ -393,7 +393,7 @@
ib_query_rec_t *p_query_rec )
{
struct query_pr_context *query_context =
- (struct query_pr_context * VOID_PTR64)p_query_rec->query_context;
+ (struct query_pr_context * )p_query_rec->query_context;
ib_api_status_t status;
IBSP_ENTER( IBSP_DBG_HW );
@@ -433,7 +433,7 @@
{
ib_gid_pair_t user_query;
struct query_pr_context query_context;
- ib_query_handle_t VOID_PTR64 query_handle;
+ ib_query_handle_t query_handle;
ib_query_req_t query_req;
ib_api_status_t status;
uint8_t pkt_life;
Index: ulp/wsd/user/ibsp_mem.c
===================================================================
--- ulp/wsd/user/ibsp_mem.c (revision 1094)
+++ ulp/wsd/user/ibsp_mem.c (working copy)
@@ -100,7 +100,7 @@
struct memory_node *
ibsp_reg_mem(
IN struct ibsp_socket_info *s,
- IN ib_pd_handle_t FUNC_PTR64 pd,
+ IN ib_pd_handle_t pd,
IN void *start,
IN size_t len,
IN ib_access_t access_ctrl,
Index: ulp/wsd/user/ibsp_perfmon.c
===================================================================
--- ulp/wsd/user/ibsp_perfmon.c (revision 1094)
+++ ulp/wsd/user/ibsp_perfmon.c (working copy)
@@ -420,7 +420,7 @@
IBSP_ENTER( IBSP_DBG_PERFMON );
- p_mem = (pm_shmem_t * VOID_PTR64 )g_pm_stat.p_shmem;
+ p_mem = (pm_shmem_t *)g_pm_stat.p_shmem;
if( p_mem == NULL )
{
Index: ulp/wsd/user/ibsp_pnp.c
===================================================================
--- ulp/wsd/user/ibsp_pnp.c (revision 1094)
+++ ulp/wsd/user/ibsp_pnp.c (working copy)
@@ -319,7 +319,7 @@
break;
case IB_PNP_CA_REMOVE:
- pnp_ca_remove( (struct ibsp_hca* VOID_PTR64)pnp_rec->context );
+ pnp_ca_remove( (struct ibsp_hca*)pnp_rec->context );
break;
/* Port events */
@@ -335,7 +335,7 @@
break;
case IB_PNP_PORT_REMOVE:
- pnp_port_remove( (struct ibsp_port* VOID_PTR64)pnp_rec->context );
+ pnp_port_remove( (struct ibsp_port*)pnp_rec->context );
break;
case IB_PNP_PKEY_CHANGE:
Index: ulp/wsd/user/ibspdll.c
===================================================================
--- ulp/wsd/user/ibspdll.c (revision 1094)
+++ ulp/wsd/user/ibspdll.c (working copy)
@@ -1621,7 +1621,7 @@
/* Looks good. Post the receive buffer. */
wr->recv.p_next = NULL;
- wr->recv.wr_id = (uint64_t)(void* VOID_PTR64)wr;
+ wr->recv.wr_id = (uint64_t)(void* )wr;
wr->recv.num_ds = dwBufferCount;
wr->recv.ds_array = wr->ds_array;
@@ -1643,7 +1643,7 @@
}
wr->ds_array[ds_idx].vaddr =
- (uint64_t)(void* VOID_PTR64)lpBuffers[ds_idx].buf;
+ (uint64_t)(void* )lpBuffers[ds_idx].buf;
wr->ds_array[ds_idx].length = lpBuffers[ds_idx].len;
wr->ds_array[ds_idx].lkey = node->p_reg1->lkey;
}
@@ -1847,7 +1847,7 @@
lpOverlapped->InternalHigh = 0;
for( ds_idx = 0; ds_idx < dwBufferCount; ds_idx++ )
{
- local_ds[ds_idx].vaddr = (uint64_t)(void* VOID_PTR64)lpBuffers[ds_idx].buf;
+ local_ds[ds_idx].vaddr = (uint64_t)(void* )lpBuffers[ds_idx].buf;
local_ds[ds_idx].length = lpBuffers[ds_idx].len;
lpOverlapped->InternalHigh += lpBuffers[ds_idx].len;
Index: ulp/wsd/user/ibspproto.h
===================================================================
--- ulp/wsd/user/ibspproto.h (revision 1094)
+++ ulp/wsd/user/ibspproto.h (working copy)
@@ -249,7 +249,7 @@
struct memory_node *
ibsp_reg_mem(
IN struct ibsp_socket_info *s,
- IN ib_pd_handle_t FUNC_PTR64 pd,
+ IN ib_pd_handle_t pd,
IN void *start,
IN size_t len,
IN ib_access_t access_ctrl,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: rm-ptr64.patch
Type: application/octet-stream
Size: 505960 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20080430/7c6ec815/attachment.obj>
More information about the ofw
mailing list