[ofw] [PATCH] Cleanup XXX_PTR64 and TO_ULONG_PTR macro use from interface files
Leonid Keller
leonid at mellanox.co.il
Tue Jul 1 08:50:14 PDT 2008
Applied in 1313. Thank you.
> -----Original Message-----
> From: Fab Tillier [mailto:ftillier at windows.microsoft.com]
> Sent: Tuesday, July 01, 2008 12:46 AM
> To: Leonid Keller
> Cc: ofw at lists.openfabrics.org
> Subject: RE: [ofw] [PATCH] Cleanup XXX_PTR64 and TO_ULONG_PTR
> macro use from interface files
>
> Hi Leo,
>
> > Failed to apply it
>
> Here is the version of the patch generated using the external
> GNU diff tool.
>
> Apply thus:
> patch -p 1 < ifc.patch
>
> Let me know if you still have issues.
>
> Signed-off-by: Fab Tillier <ftillier at microsoft.com>
>
> diff -up -r -X trunk\docs\dontdiff.txt -I \$Id:
> old\inc\iba\ib_al.h trunk\inc\iba\ib_al.h
> --- old\inc\iba\ib_al.h Mon Jun 30 11:07:40 2008
> +++ trunk\inc\iba\ib_al.h Mon Jun 30 14:38:09 2008
> @@ -1,6 +1,7 @@
> /*
> * Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
> * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
> + * Portions Copyright (c) 2008 Microsoft Corporation. All
> rights reserved.
> *
> * This software is available to you under the OpenIB.org BSD license
> * below:
> @@ -58,24 +59,25 @@ extern "C"
> * 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
> {
> -TO_LONG_PTR( ib_al_handle_t , h_al) ;
> -TO_LONG_PTR( ib_qp_handle_t , h_qp) ;
> + ib_al_handle_t h_al;
> + ib_qp_handle_t h_qp;
> net32_t cid;
>
> } ib_cm_handle_t;
> @@ -123,18 +125,18 @@ typedef uint8_t ib_shmid_t[64];
> */
> typedef struct _ib_mad_element
> {
> - TO_LONG_PTR(struct _ib_mad_element* , p_next) ;
> - TO_LONG_PTR(const void* , context1) ;
> - TO_LONG_PTR(const void* , context2) ;
> + TO_LONG_PTR(struct _ib_mad_element*, p_next);
> + TO_LONG_PTR(const void*, context1);
> + TO_LONG_PTR(const void*, context2);
>
> /* Request/completion data. */
> - TO_LONG_PTR(ib_mad_t* , p_mad_buf) ;
> + TO_LONG_PTR(ib_mad_t*, p_mad_buf);
> uint32_t size;
> uint32_t
> immediate_data;
> ib_net32_t remote_qp;
>
> /* Send request information. */
> -TO_LONG_PTR( ib_av_handle_t ,
> h_av) ;
> + TO_LONG_PTR(ib_av_handle_t, h_av);
> ib_send_opt_t send_opt;
> ib_net32_t remote_qkey;
> boolean_t resp_expected;
> @@ -145,7 +147,7 @@ TO_LONG_PTR( ib_av_handle_t ,
> h_av) ;
> /* Completion information. */
> ib_wc_status_t status;
> boolean_t grh_valid;
> - TO_LONG_PTR(ib_grh_t* , p_grh) ;
> + TO_LONG_PTR(ib_grh_t*, p_grh);
>
> /* Completed receive data or send request information
> if h_av is NULL. */
> uint32_t recv_opt;
> @@ -155,8 +157,8 @@ TO_LONG_PTR( ib_av_handle_t ,
> h_av) ;
> uint8_t path_bits;
>
> /* Transaction completion data. */
> - TO_LONG_PTR(void* ,
> send_context1) ;
> - TO_LONG_PTR(void* ,
> send_context2) ;
> + TO_LONG_PTR(void*, send_context1);
> + TO_LONG_PTR(void*, send_context2);
>
> } ib_mad_element_t;
> /*
> @@ -337,8 +339,8 @@ ib_get_mad_buf(
> * 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 +397,7 @@ typedef uint32_t
> ib_al_flags_t;
> * SYNOPSIS
> */
> typedef void
> -(AL_API * FUNC_PTR64 ib_pfn_destroy_cb_t)(
> +(AL_API *ib_pfn_destroy_cb_t)(
> IN void
> *context );
> /*
> * PARAMETERS
> @@ -432,7 +434,7 @@ typedef void
> *
> * SYNOPSIS
> */
> -static const ib_pfn_destroy_cb_t ib_sync_destroy =
> (ib_pfn_destroy_cb_t)-1/*i64*/; //TODO
> +static const ib_pfn_destroy_cb_t ib_sync_destroy =
> (ib_pfn_destroy_cb_t)(LONG_PTR)-1;
> /*
> * PARAMETERS
> * Not Applicable.
> @@ -462,13 +464,13 @@ typedef struct _ib_async_event_rec
> ib_async_event_t
> code;
> uint64_t
> vendor_specific;
>
> - TO_LONG_PTR(void* ,
> context) ;
> + TO_LONG_PTR(void*,
> context);
> union _handle_t
> {
> -TO_LONG_PTR( ib_ca_handle_t ,
> h_ca) ;
> -TO_LONG_PTR( ib_cq_handle_t ,
> h_cq) ;
> -TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> -TO_LONG_PTR( struct _ib_srq* ,
> h_srq) ;
> + TO_LONG_PTR(ib_ca_handle_t,
> h_ca);
> + TO_LONG_PTR(ib_cq_handle_t,
> h_cq);
> + TO_LONG_PTR(ib_qp_handle_t,
> h_qp);
> + TO_LONG_PTR(struct _ib_srq*,
> h_srq);
>
> } handle;
>
> @@ -507,7 +509,7 @@ TO_LONG_PTR( struct
> _ib_srq* , h_
> * 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 +537,11 @@ typedef void
> */
> 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 +598,7 @@ ib_open_ca(
> */
> 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 +659,7 @@ ib_query_ca(
> */
> 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 +727,7 @@ ib_query_ca_by_guid(
> */
> 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 +787,7 @@ ib_modify_ca(
> */
> 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 +830,10 @@ ib_close_ca(
> */
> 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 +889,7 @@ ib_alloc_pd(
> */
> 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 +932,9 @@ ib_dealloc_pd(
> */
> 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 +990,9 @@ ib_create_av(
> */
> 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 +1033,7 @@ ib_query_av(
> */
> 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
> @@ -1052,7 +1054,7 @@ ib_modify_av(
> * A reference to the address vector attributes
> structure was not
> * provided.
> *
> -* IB_INVALID_PORT
> +* IB_INVALID_PORT
> * The port number supplied, through the address
> vector attributes,
> * was invalid for the given channel adapter.
> *
> @@ -1076,7 +1078,7 @@ ib_modify_av(
> */
> 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 +1110,11 @@ ib_destroy_av(
> */
> 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 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 +1194,7 @@ ib_create_srq(
> */
> 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 +1236,7 @@ ib_query_srq(
> */
> 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 +1294,7 @@ ib_modify_srq(
> */
> 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 +1339,7 @@ ib_destroy_srq(
> */
> 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 +1397,11 @@ ib_post_srq_recv(
> */
> 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 +1510,13 @@ ib_create_qp(
> */
> 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 +1625,7 @@ ib_get_spl_qp(
> */
> 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 +1666,7 @@ ib_query_qp(
> */
> 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 +1728,7 @@ ib_modify_qp(
> */
> 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 +1815,11 @@ typedef struct _ib_cq_create
> */
> 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 +1891,7 @@ ib_create_cq(
> */
> 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 +1949,7 @@ ib_modify_cq(
> */
> 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 +1987,7 @@ ib_query_cq(
> */
> 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 +2033,11 @@ ib_destroy_cq(
> */
> 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 +2104,12 @@ ib_reg_mem(
> */
> 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 +2183,7 @@ ib_reg_phys(
> */
> 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 +2224,12 @@ ib_query_mr(
> */
> 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 +2309,13 @@ ib_rereg_mem(
> */
> 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 +2401,13 @@ ib_rereg_phys(
> */
> 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 +2488,13 @@ ib_reg_shared(
> */
> 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 +2575,7 @@ ib_reg_shmid(
> */
> 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 +2616,9 @@ ib_dereg_mr(
> */
> 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 +2680,7 @@ mlnx_create_fmr(
> */
> 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 +2754,7 @@ mlnx_map_phys_fmr(
> */
> 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 +2808,7 @@ mlnx_unmap_fmr(
> */
> 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 +2863,9 @@ mlnx_destroy_fmr(
> */
> 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 +2892,7 @@ TOD
> */
> 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 +2924,13 @@ TODO
> */
> 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 net32_t* const
> p_lkey,
> + OUT net32_t* const
> p_rkey,
> + OUT mlnx_fmr_pool_el_t
> *pp_fmr_el);
> /*
> * PARAMETERS
> TODO
> @@ -2958,7 +2960,7 @@ TODO
> */
> 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 +2986,7 @@ TODO
> * 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 +3014,9 @@ TODO
> */
> 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 +3070,8 @@ ib_create_mw(
> */
> 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 +3115,8 @@ ib_query_mw(
> */
> 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 +3190,7 @@ ib_bind_mw(
> */
> 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 +3223,7 @@ ib_destroy_mw(
> */
> 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 +3287,7 @@ ib_post_send(
> */
> 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 +3345,7 @@ ib_post_recv(
> */
> 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 +3410,7 @@ ib_send_mad(
> */
> 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 +3454,7 @@ ib_cancel_mad(
> */
> 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 +3499,7 @@ ib_peek_cq(
> */
> 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 +3557,7 @@ ib_poll_cq(
> */
> 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 +3597,7 @@ ib_rearm_cq(
> */
> 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
> @@ -3645,12 +3647,12 @@ ib_rearm_n_cq(
> */
> typedef struct _ib_mcast_rec
> {
> - TO_LONG_PTR(const void* ,
> mcast_context) ;
> + TO_LONG_PTR(const void*, mcast_context);
> ib_api_status_t status;
> ib_net16_t error_status;
>
> -TO_LONG_PTR( ib_mcast_handle_t , h_mcast) ;
> - TO_LONG_PTR(ib_member_rec_t* , p_member_rec) ;
> + TO_LONG_PTR(ib_mcast_handle_t, h_mcast);
> + TO_LONG_PTR(ib_member_rec_t*, p_member_rec);
>
> } ib_mcast_rec_t;
> /*
> @@ -3694,7 +3696,7 @@ TO_LONG_PTR( ib_mcast_handle_t ,
> h_mca
> * 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
> @@ -3726,7 +3728,7 @@ typedef struct _ib_mcast_req
> boolean_t create;
> ib_member_rec_t member_rec;
>
> - TO_LONG_PTR(const void* ,
> mcast_context) ;
> + const void* mcast_context;
> ib_pfn_mcast_cb_t pfn_mcast_cb;
>
> uint32_t timeout_ms;
> @@ -3799,7 +3801,7 @@ typedef struct _ib_mcast_req
> */
> 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 +3882,7 @@ ib_join_mcast(
> */
> 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 +3928,7 @@ ib_leave_mcast(
> */
> 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 );
> @@ -4245,11 +4247,11 @@ typedef struct _ib_apr_info
> #pragma warning(disable:4324)
> typedef struct _ib_cm_req_rec
> {
> - TO_LONG_PTR(const void* , context) ;
> + const void* context;
> ib_cm_handle_t h_cm_req;
> -TO_LONG_PTR( ib_listen_handle_t , h_cm_listen) ;
> + ib_listen_handle_t h_cm_listen;
>
> - TO_LONG_PTR(const uint8_t* , p_req_pdata) ;
> + const uint8_t* p_req_pdata;
>
> ib_qp_type_t qp_type;
>
> @@ -4262,7 +4264,7 @@ TO_LONG_PTR( ib_listen_handle_t ,
> h_cm
>
> /* valid for ud qp_type only */
> ib_net16_t pkey;
> - TO_LONG_PTR(const void* ,
> sidr_context) ;
> + const void* sidr_context;
>
> } ib_cm_req_rec_t;
> #pragma warning(default:4324)
> @@ -4334,19 +4336,19 @@ TO_LONG_PTR( ib_listen_handle_t ,
> h_cm
> */
> typedef struct _ib_cm_rep_rec
> {
> - TO_LONG_PTR(const uint8_t* , p_rep_pdata) ;
> + const uint8_t* p_rep_pdata;
>
> ib_qp_type_t qp_type;
>
> ib_cm_handle_t h_cm_rep;
> /* valid for rc, uc & rd qp_type only */
> - TO_LONG_PTR(const void* , qp_context) ;
> + const void* qp_context;
> uint8_t resp_res;
> boolean_t flow_ctrl;
> ib_apr_status_t apr_status;
>
> /* valid for ud qp_type only */
> - TO_LONG_PTR(const void* ,
> sidr_context) ;
> + const void* sidr_context;
> ib_sidr_status_t status;
> ib_net32_t remote_qp;
> ib_net32_t remote_qkey;
> @@ -4422,10 +4424,10 @@ typedef struct _ib_cm_rep_rec
> */
> typedef struct _ib_cm_rtu_rec
> {
> - TO_LONG_PTR(const uint8_t* , p_rtu_pdata) ;
> + const uint8_t* p_rtu_pdata;
>
> -TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> - TO_LONG_PTR(const void* , qp_context) ;
> + ib_qp_handle_t h_qp;
> + const void* qp_context;
>
> } ib_cm_rtu_rec_t;
> /*
> @@ -4459,13 +4461,13 @@ TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> typedef struct _ib_cm_rej_rec
> {
> ib_rej_status_t rej_status;
> - TO_LONG_PTR(const uint8_t* , p_ari) ;
> + const uint8_t* p_ari;
> uint8_t ari_length;
>
> - TO_LONG_PTR(const uint8_t* , p_rej_pdata) ;
> + const uint8_t* p_rej_pdata;
>
> -TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> - TO_LONG_PTR(const void* , qp_context) ;
> + ib_qp_handle_t h_qp;
> + const void* qp_context;
>
> } ib_cm_rej_rec_t;
> /*
> @@ -4509,10 +4511,10 @@ TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> */
> typedef struct _ib_cm_mra_rec
> {
> - TO_LONG_PTR(const uint8_t* , p_mra_pdata) ;
> + const uint8_t* p_mra_pdata;
>
> -TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> - TO_LONG_PTR(const void* , qp_context) ;
> + ib_qp_handle_t h_qp;
> + const void* qp_context;
>
> } ib_cm_mra_rec_t;
> /*
> @@ -4541,16 +4543,18 @@ TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> *
> * SYNOPSIS
> */
> +#pragma warning(disable:4324)
> typedef struct _ib_cm_lap_rec
> {
> ib_cm_handle_t h_cm_lap;
> ib_path_rec_t alt_path;
>
> - TO_LONG_PTR(const uint8_t* , p_lap_pdata) ;
> + const uint8_t* p_lap_pdata;
>
> - TO_LONG_PTR(const void* , qp_context) ;
> + const void* qp_context;
>
> } ib_cm_lap_rec_t;
> +#pragma warning(default:4324)
> /*
> * FIELDS
> * p_lap_pdata
> @@ -4588,13 +4592,13 @@ typedef struct _ib_cm_apr_rec
> ib_api_status_t cm_status;
> ib_apr_status_t apr_status;
>
> - TO_LONG_PTR(const uint8_t* , p_info) ;
> + const uint8_t* p_info;
> uint8_t info_length;
>
> - TO_LONG_PTR(const uint8_t* , p_apr_pdata) ;
> + const uint8_t* p_apr_pdata;
>
> -TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> - TO_LONG_PTR(const void* , qp_context) ;
> + ib_qp_handle_t h_qp;
> + const void* qp_context;
>
> } ib_cm_apr_rec_t;
> /*
> @@ -4649,9 +4653,9 @@ typedef struct _ib_cm_dreq_rec
> {
> ib_cm_handle_t h_cm_dreq;
>
> - TO_LONG_PTR(const uint8_t* , p_dreq_pdata) ;
> + const uint8_t* p_dreq_pdata;
>
> - TO_LONG_PTR(const void* , qp_context) ;
> + const void* qp_context;
>
> } ib_cm_dreq_rec_t;
> /*
> @@ -4686,10 +4690,10 @@ typedef struct _ib_cm_drep_rec
> {
> ib_api_status_t cm_status;
>
> - TO_LONG_PTR(const uint8_t* , p_drep_pdata) ;
> + const uint8_t* p_drep_pdata;
>
> -TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> - TO_LONG_PTR(const void* , qp_context) ;
> + ib_qp_handle_t h_qp;
> + const void* qp_context;
>
> } ib_cm_drep_rec_t;
> /*
> @@ -4725,7 +4729,7 @@ TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> * 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 +4767,7 @@ typedef void
> * 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 +4811,7 @@ typedef void
> * 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 +4846,7 @@ typedef void
> * 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 +4877,7 @@ typedef void
> * 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 +4910,7 @@ typedef void
> * 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 +4942,7 @@ typedef void
> * 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 +4973,7 @@ typedef void
> * 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 +5006,7 @@ typedef void
> * 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
> @@ -5059,7 +5063,7 @@ typedef struct _ib_cm_listen
> ib_net16_t lid;
> ib_net16_t pkey;
>
> - TO_LONG_PTR(uint8_t* , p_compare_buffer) ;
> + uint8_t*
> p_compare_buffer;
> uint8_t
> compare_offset;
> uint8_t
> compare_length;
>
> @@ -5068,7 +5072,7 @@ typedef struct _ib_cm_listen
> ib_qp_type_t qp_type;
>
> /* valid for ud qp_type only */
> - TO_LONG_PTR(const void* ,
> sidr_context) ;
> + const void* sidr_context;
>
> } ib_cm_listen_t;
> /*
> @@ -5163,21 +5167,19 @@ typedef struct _ib_cm_req
>
> ib_al_flags_t flags;
> uint8_t
> max_cm_retries;
> - uint8_t req_length;
> -
> - TO_LONG_PTR(ib_path_rec_t* , p_primary_path) ;
> + TO_LONG_PTR(ib_path_rec_t*, p_primary_path);
>
> - TO_LONG_PTR(ib_pfn_cm_rep_cb_t, pfn_cm_rep_cb);
> + TO_LONG_PTR(ib_pfn_cm_rep_cb_t, pfn_cm_rep_cb);
>
> - TO_LONG_PTR(const uint8_t* , p_req_pdata) ;
> -
> + TO_LONG_PTR(const uint8_t*, p_req_pdata);
> + uint8_t req_length;
>
> ib_qp_type_t qp_type;
>
> /* valid for rc, uc & rd qp_type only */
> - TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> + TO_LONG_PTR(ib_qp_handle_t, h_qp);
>
> - TO_LONG_PTR(uint8_t* , p_compare_buffer) ;
> + TO_LONG_PTR(uint8_t*, p_compare_buffer);
> uint8_t
> compare_offset;
> uint8_t
> compare_length;
>
> @@ -5190,15 +5192,15 @@ typedef struct _ib_cm_req
> uint8_t rnr_retry_cnt;
> uint8_t retry_cnt;
>
> - TO_LONG_PTR(ib_path_rec_t* , p_alt_path ) OPTIONAL;
> + TO_LONG_PTR(ib_path_rec_t*, p_alt_path OPTIONAL);
>
> - TO_LONG_PTR(ib_pfn_cm_req_cb_t, pfn_cm_req_cb);
> - TO_LONG_PTR(ib_pfn_cm_mra_cb_t, pfn_cm_mra_cb);
> + TO_LONG_PTR(ib_pfn_cm_req_cb_t, pfn_cm_req_cb);
> + TO_LONG_PTR(ib_pfn_cm_mra_cb_t, pfn_cm_mra_cb);
> TO_LONG_PTR(ib_pfn_cm_rej_cb_t, pfn_cm_rej_cb);
>
> /* valid for ud qp_type only */
> - TO_LONG_PTR( ib_al_handle_t ,
> h_al) ;
> - TO_LONG_PTR(const void* ,
> sidr_context) ;
> + TO_LONG_PTR(ib_al_handle_t, h_al);
> + TO_LONG_PTR(const void*, sidr_context);
> uint32_t timeout_ms;
> ib_net16_t pkey;
>
> @@ -5361,10 +5363,10 @@ typedef struct _ib_cm_rep
> {
> ib_al_flags_t flags;
>
> - TO_LONG_PTR(const uint8_t* , p_rep_pdata) ;
> + TO_LONG_PTR(const uint8_t*, p_rep_pdata);
> uint8_t rep_length;
>
> -TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> + TO_LONG_PTR(ib_qp_handle_t, h_qp);
> ib_qp_type_t qp_type;
>
> /* valid for rc, uc & rd qp_type only */
> @@ -5379,14 +5381,14 @@ TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> uint8_t
> rnr_nak_timeout;
> uint8_t rnr_retry_cnt;
>
> - TO_LONG_PTR(ib_pfn_cm_rej_cb_t, pfn_cm_rej_cb);
> + TO_LONG_PTR(ib_pfn_cm_rej_cb_t, pfn_cm_rej_cb);
> TO_LONG_PTR(ib_pfn_cm_mra_cb_t, pfn_cm_mra_cb);
> TO_LONG_PTR(ib_pfn_cm_rtu_cb_t, pfn_cm_rtu_cb);
> - TO_LONG_PTR(ib_pfn_cm_lap_cb_t, pfn_cm_lap_cb);
> - TO_LONG_PTR(ib_pfn_cm_dreq_cb_t,pfn_cm_dreq_cb);
> + TO_LONG_PTR(ib_pfn_cm_lap_cb_t, pfn_cm_lap_cb);
> + TO_LONG_PTR(ib_pfn_cm_dreq_cb_t, pfn_cm_dreq_cb);
>
> - TO_LONG_PTR(ib_recv_wr_t* , p_recv_wr) ;
> - TO_LONG_PTR(ib_recv_wr_t* *, /*__ptr64*/
> pp_recv_failure) ;
> + TO_LONG_PTR(ib_recv_wr_t*, p_recv_wr);
> + TO_LONG_PTR(ib_recv_wr_t**, pp_recv_failure);
>
> /*valid for ud qp_type only */
> ib_sidr_status_t status;
> @@ -5499,7 +5501,7 @@ typedef struct _ib_cm_rtu
> uint32_t sq_depth;
> uint32_t rq_depth;
>
> - TO_LONG_PTR(const uint8_t* , p_rtu_pdata) ;
> + const uint8_t* p_rtu_pdata;
> uint8_t rtu_length;
>
> ib_pfn_cm_apr_cb_t pfn_cm_apr_cb;
> @@ -5558,9 +5560,9 @@ typedef struct _ib_cm_rej
> {
> ib_rej_status_t rej_status;
>
> - TO_LONG_PTR(ib_ari_t* , p_ari) ;
> + ib_ari_t* p_ari;
> uint8_t ari_length;
> - TO_LONG_PTR(const uint8_t* , p_rej_pdata) ;
> + const uint8_t* p_rej_pdata;
> uint8_t rej_length;
>
> } ib_cm_rej_t;
> @@ -5604,7 +5606,7 @@ typedef struct _ib_cm_mra
> {
> uint8_t svc_timeout;
>
> - TO_LONG_PTR(const uint8_t* , p_mra_pdata) ;
> + TO_LONG_PTR(const uint8_t*, p_mra_pdata);
> uint8_t mra_length;
>
> } ib_cm_mra_t;
> @@ -5641,16 +5643,16 @@ typedef struct _ib_cm_lap
> {
> ib_al_flags_t flags;
>
> - TO_LONG_PTR(const uint8_t* , p_lap_pdata) ;
> + TO_LONG_PTR(const uint8_t*, p_lap_pdata);
> uint8_t lap_length;
>
> ib_qp_type_t qp_type;
>
> /* valid for rc, uc & rd qp_type only */
> -TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> + TO_LONG_PTR(ib_qp_handle_t, h_qp);
>
> uint8_t
> remote_resp_timeout;
> - TO_LONG_PTR(ib_path_rec_t* , p_alt_path) ;
> + TO_LONG_PTR(ib_path_rec_t*, p_alt_path);
> ib_pfn_cm_apr_cb_t pfn_cm_apr_cb;
>
> } ib_cm_lap_t;
> @@ -5703,17 +5705,17 @@ TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> */
> typedef struct _ib_cm_apr
> {
> - TO_LONG_PTR(const uint8_t* , p_apr_pdata) ;
> + TO_LONG_PTR(const uint8_t*, p_apr_pdata);
> uint8_t
> apr_length;
>
> ib_qp_type_t qp_type;
>
> /* valid for rc, uc & rd qp_type only */
> -TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> + TO_LONG_PTR(ib_qp_handle_t, h_qp);
>
> ib_apr_status_t apr_status;
> uint8_t
> info_length;
> - TO_LONG_PTR(const ib_apr_info_t* , p_info) ;
> + TO_LONG_PTR(const ib_apr_info_t*, p_info);
>
> } ib_cm_apr_t;
> /*
> @@ -5760,13 +5762,13 @@ typedef struct _ib_cm_dreq
> {
> ib_al_flags_t flags;
>
> - TO_LONG_PTR(uint8_t* , p_dreq_pdata) ;
> + uint8_t* p_dreq_pdata;
> uint8_t dreq_length;
>
> ib_qp_type_t qp_type;
>
> /* valid for rc, uc & rd qp_type only */
> -TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> + ib_qp_handle_t h_qp;
> ib_pfn_cm_drep_cb_t pfn_cm_drep_cb;
>
> } ib_cm_dreq_t;
> @@ -5815,7 +5817,7 @@ TO_LONG_PTR( ib_qp_handle_t ,
> h_qp) ;
> */
> typedef struct _ib_cm_drep
> {
> - TO_LONG_PTR(uint8_t* , p_drep_pdata) ;
> + uint8_t* p_drep_pdata;
> uint8_t drep_length;
>
> } ib_cm_drep_t;
> @@ -5907,11 +5909,11 @@ typedef void
> */
> 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
> @@ -5996,7 +5998,7 @@ ib_cm_listen(
> */
> 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
> @@ -6457,7 +6459,7 @@ ib_cm_apr(
> */
> 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
> @@ -6664,7 +6666,7 @@ typedef struct _ib_cep_listen
>
> net64_t port_guid;
>
> - TO_LONG_PTR(uint8_t* , p_cmp_buf) ;
> + TO_LONG_PTR(uint8_t*, p_cmp_buf);
> uint8_t cmp_len;
> uint8_t cmp_offset;
>
> @@ -6716,9 +6718,9 @@ typedef struct _ib_cep_listen
> */
> 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
> @@ -6768,7 +6770,7 @@ ib_create_ioc(
> */
> 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
> @@ -6803,7 +6805,7 @@ ib_destroy_ioc(
> */
> 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
> @@ -6845,9 +6847,9 @@ ib_reg_ioc(
> */
> 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
> @@ -6902,7 +6904,7 @@ ib_add_svc_entry(
> */
> 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
> @@ -6937,7 +6939,7 @@ ib_remove_svc_entry(
> */
> 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 );
> /*
> @@ -6994,7 +6996,7 @@ ib_get_ca_guids(
> */
> 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 );
> /*
> @@ -7046,7 +7048,7 @@ ib_get_ca_by_gid(
> */
> 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 );
> /*
> @@ -7098,8 +7100,8 @@ ib_get_port_by_gid(
> * 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 );
> /*
> @@ -7146,11 +7148,11 @@ typedef void
> */
> 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
> @@ -7211,7 +7213,7 @@ ib_create_mad_pool(
> */
> 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
> @@ -7247,9 +7249,9 @@ ib_destroy_mad_pool(
> */
> 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
> @@ -7305,7 +7307,7 @@ ib_reg_mad_pool(
> */
> 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
> @@ -7345,7 +7347,7 @@ ib_dereg_mad_pool(
> */
> 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 );
> /*
> @@ -7475,7 +7477,7 @@ typedef struct _ib_dgrm_info
> */
> 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
> @@ -7581,17 +7583,17 @@ typedef enum _ib_mad_svc_type
> */
> typedef struct _ib_mad_svc
> {
> - TO_LONG_PTR(void*, mad_svc_context);
> + TO_LONG_PTR(void, *mad_svc_context);
> TO_LONG_PTR(ib_pfn_mad_comp_cb_t, pfn_mad_send_cb);
> - TO_LONG_PTR(ib_pfn_mad_comp_cb_t,pfn_mad_recv_cb);
> + TO_LONG_PTR(ib_pfn_mad_comp_cb_t, pfn_mad_recv_cb);
>
> boolean_t support_unsol;
> uint8_t mgmt_class;
> uint8_t mgmt_version;
> - ib_mad_svc_type_t svc_type;
> -
> boolean_t
> method_array[IB_MAX_METHODS];
>
> + ib_mad_svc_type_t svc_type;
> +
> } ib_mad_svc_t;
> /*
> * FIELDS
> @@ -7673,9 +7675,9 @@ typedef struct _ib_mad_svc
> */
> 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
> @@ -7729,7 +7731,7 @@ ib_reg_mad_svc(
> */
> typedef struct _ib_reg_svc_rec
> {
> - TO_LONG_PTR(const void* , svc_context) ;
> + const void* svc_context;
> ib_reg_svc_handle_t h_reg_svc;
> ib_api_status_t req_status;
> ib_net16_t resp_status;
> @@ -7778,7 +7780,7 @@ typedef struct _ib_reg_svc_rec
> * 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
> @@ -7882,7 +7884,7 @@ typedef struct _ib_reg_svc_req
> */
> 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 );
> /*
> @@ -8081,7 +8083,7 @@ typedef struct _ib_user_query
> ib_net16_t attr_id;
> uint32_t attr_size;
> ib_net64_t comp_mask;
> - TO_LONG_PTR(void* , p_attr) ;
> + TO_LONG_PTR(void*, p_attr);
>
> } ib_user_query_t;
> /*
> @@ -8218,12 +8220,12 @@ typedef struct _ib_guid_pair
> */
> typedef struct _ib_query_rec
> {
> - TO_LONG_PTR(const void* ,
> query_context) ;
> + const void* query_context;
> ib_api_status_t status;
>
> ib_query_type_t query_type;
> uint32_t result_cnt;
> - TO_LONG_PTR(ib_mad_element_t* , p_result_mad) ;
> + ib_mad_element_t* p_result_mad;
>
> } ib_query_rec_t;
> /*
> @@ -8489,7 +8491,7 @@ ib_get_query_svc_rec(
> * 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
> @@ -8524,14 +8526,14 @@ typedef void
> typedef struct _ib_query_req
> {
> ib_query_type_t query_type;
> - TO_LONG_PTR(const void* ,
> p_query_input) ;
> + const void* p_query_input;
> ib_net64_t port_guid;
>
> uint32_t timeout_ms;
> uint32_t retry_cnt;
> ib_al_flags_t flags;
>
> - TO_LONG_PTR(const void* ,
> query_context) ;
> + const void* query_context;
> ib_pfn_query_cb_t pfn_query_cb;
>
> } ib_query_req_t;
> @@ -8602,9 +8604,9 @@ typedef struct _ib_query_req
> */
> 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
> @@ -8663,8 +8665,8 @@ ib_query(
> */
> 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
> @@ -8929,11 +8931,11 @@ typedef struct _ib_pnp_rec
> {
> ib_pnp_event_t pnp_event;
>
> -TO_LONG_PTR( struct _al_pnp * ,
> h_pnp) ;
> -TO_LONG_PTR( struct _al_pnp * ,
> h_ioc_event) ;
> + TO_LONG_PTR(struct _al_pnp *, h_pnp);
> + TO_LONG_PTR(struct _al_pnp *, h_ioc_event);
>
> - TO_LONG_PTR(void* , pnp_context) ;
> - TO_LONG_PTR(void* , context) ;
> + TO_LONG_PTR(void*, pnp_context);
> + TO_LONG_PTR(void*, context);
> //NOTE:
> //guid and ca_guid use as key to flexi map need to
> keep these field together
> ib_net64_t guid;
> @@ -9010,7 +9012,7 @@ TO_LONG_PTR( struct _al_pnp * ,
> h_ioc
> typedef struct _ib_pnp_ca_rec
> {
> ib_pnp_rec_t pnp_rec;
> - TO_LONG_PTR(ib_ca_attr_t* , p_ca_attr) ;
> + TO_LONG_PTR(ib_ca_attr_t*, p_ca_attr);
>
> } ib_pnp_ca_rec_t;
> /*
> @@ -9057,8 +9059,8 @@ typedef struct _ib_pnp_ca_rec
> typedef struct _ib_pnp_port_rec
> {
> ib_pnp_rec_t pnp_rec;
> - TO_LONG_PTR(ib_ca_attr_t* , p_ca_attr) ;
> - TO_LONG_PTR(ib_port_attr_t* , p_port_attr) ;
> + TO_LONG_PTR(ib_ca_attr_t*, p_ca_attr);
> + TO_LONG_PTR(ib_port_attr_t*,p_port_attr);
>
> } ib_pnp_port_rec_t;
> /*
> @@ -9306,7 +9308,7 @@ typedef struct _ib_pnp_ioc_path_rec
> * 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
> @@ -9399,9 +9401,9 @@ typedef struct _ib_pnp_req
> */
> 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
> @@ -9461,7 +9463,7 @@ ib_reg_pnp(
> */
> 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
> @@ -9502,9 +9504,9 @@ ib_dereg_pnp(
> */
> typedef struct _ib_sub_rec
> {
> - TO_LONG_PTR(const void* , sub_context) ;
> + const void* sub_context;
> ib_api_status_t status;
> -TO_LONG_PTR( ib_sub_handle_t ,
> h_sub) ;
> + ib_sub_handle_t h_sub;
>
> } ib_sub_rec_t;
> /*
> @@ -9546,7 +9548,7 @@ TO_LONG_PTR( ib_sub_handle_t ,
> h_sub)
> * 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
> @@ -9583,8 +9585,8 @@ typedef void
> */
> typedef struct _ib_report_rec
> {
> - TO_LONG_PTR(const void* ,
> report_context) ;
> - TO_LONG_PTR(ib_mad_notice_attr_t* , p_notice) ;
> + const void*
> report_context;
> + ib_mad_notice_attr_t* p_notice;
>
> } ib_report_rec_t;
> /*
> @@ -9618,7 +9620,7 @@ typedef struct _ib_report_rec
> * 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
> @@ -9657,18 +9659,18 @@ typedef void
> */
> typedef struct _ib_sub_req
> {
> - TO_LONG_PTR(ib_svc_name_t* , p_class_mgr_name) ;
> - TO_LONG_PTR(ib_inform_info_t* , p_inform_info) ;
> + ib_svc_name_t* p_class_mgr_name;
> + ib_inform_info_t* p_inform_info;
> ib_net64_t port_guid;
>
> uint32_t timeout_ms;
> uint32_t retry_cnt;
> ib_al_flags_t flags;
>
> - TO_LONG_PTR(const void* , sub_context) ;
> + const void* sub_context;
> ib_pfn_sub_cb_t pfn_sub_cb;
>
> - TO_LONG_PTR(const void* ,
> report_context) ;
> + const void*
> report_context;
> ib_pfn_report_cb_t pfn_report_cb;
>
> } ib_sub_req_t;
> @@ -9739,9 +9741,9 @@ typedef struct _ib_sub_req
> */
> 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
> @@ -9799,7 +9801,7 @@ ib_subscribe(
> */
> 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
> @@ -9853,8 +9855,8 @@ ib_unsubscribe(
> */
> 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
> @@ -9928,7 +9930,7 @@ ib_reject_ioc(
> */
> 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,
> @@ -10005,8 +10007,8 @@ ib_get_guid(
> */
> 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 );
> /*
> @@ -10083,7 +10085,7 @@ ib_ci_call(
> */
> 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
> @@ -10125,7 +10127,7 @@ ib_open_al(
> */
> 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
> diff -up -r -X trunk\docs\dontdiff.txt -I \$Id:
> old\inc\iba\ib_ci.h trunk\inc\iba\ib_ci.h
> --- old\inc\iba\ib_ci.h Mon Jun 30 11:07:40 2008
> +++ trunk\inc\iba\ib_ci.h Mon Jun 30 14:38:09 2008
> @@ -1,6 +1,7 @@
> /*
> * Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
> * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
> + * Portions Copyright (c) 2008 Microsoft Corporation. All
> rights reserved.
> *
> * This software is available to you under the OpenIB.org BSD license
> * below:
> @@ -207,7 +208,7 @@ typedef ib_api_status_t
> 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 +259,9 @@ typedef ib_api_status_t
> */
> 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 +300,7 @@ typedef ib_api_status_t
>
> 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 +351,7 @@ typedef ib_api_status_t
>
> 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 +404,7 @@ typedef ib_api_status_t
>
> 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 +442,8 @@ typedef ib_api_status_t
> */
> 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 +475,9 @@ typedef void
>
> 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 +521,7 @@ typedef ib_api_status_t
>
> 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 +552,9 @@ typedef ib_api_status_t
>
> 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 +599,9 @@ typedef ib_api_status_t
>
> 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 +639,7 @@ typedef ib_api_status_t
>
> 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 +680,7 @@ typedef ib_api_status_t
>
> 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 +706,10 @@ typedef ib_api_status_t
>
> 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 +763,7 @@ typedef ib_api_status_t
>
> 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 +810,7 @@ typedef ib_api_status_t
>
> 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 +848,7 @@ typedef ib_api_status_t
>
> 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 +889,11 @@ typedef ib_api_status_t
>
> 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 +951,12 @@ typedef ib_api_status_t
>
> 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 +1019,7 @@ typedef ib_api_status_t
>
> 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 +1072,7 @@ typedef ib_api_status_t
>
> 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 +1129,7 @@ typedef ib_api_status_t
>
> 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 +1166,7 @@ typedef ib_api_status_t
>
> 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 +1216,10 @@ typedef ib_api_status_t
>
> 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 +1272,7 @@ typedef ib_api_status_t
>
> 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 +1325,7 @@ typedef ib_api_status_t
>
> 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 +1359,7 @@ typedef ib_api_status_t
>
> 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 +1401,11 @@ typedef ib_api_status_t
>
> 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 +1464,12 @@ typedef ib_api_status_t
>
> 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 +1535,7 @@ typedef ib_api_status_t
>
> 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 +1573,12 @@ typedef ib_api_status_t
>
> 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 +1645,13 @@ typedef ib_api_status_t
>
> 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 +1720,13 @@ typedef ib_api_status_t
>
> 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 +1784,7 @@ typedef ib_api_status_t
>
> 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 +1819,9 @@ typedef ib_api_status_t
> */
> 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 +1869,7 @@ typedef ib_api_status_t
> */
> 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 +1928,7 @@ typedef ib_api_status_t
> */
> 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 +1969,7 @@ typedef ib_api_status_t
> */
> 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 +2009,9 @@ typedef ib_api_status_t
>
> 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 +2054,8 @@ typedef ib_api_status_t
>
> 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 +2094,8 @@ typedef ib_api_status_t
>
> 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 +2157,7 @@ typedef ib_api_status_t
>
> 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 +2188,7 @@ typedef ib_api_status_t
>
> 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 +2249,7 @@ typedef ib_api_status_t
>
> 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 +2294,7 @@ typedef ib_api_status_t
>
> 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 +2344,7 @@ typedef ib_api_status_t
> */
> 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 +2381,7 @@ typedef ib_api_status_t
>
> 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 +2422,7 @@ typedef ib_api_status_t
>
> 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 +2478,7 @@ typedef ib_api_status_t
>
> 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 +2524,10 @@ typedef ib_api_status_t
>
> 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 +2578,7 @@ typedef ib_api_status_t
>
> 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 +2607,7 @@ typedef ib_api_status_t
>
> 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 +2671,8 @@ typedef ib_api_status_t
> */
> 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 );
> diff -up -r -X trunk\docs\dontdiff.txt -I \$Id:
> old\inc\kernel\iba\ib_al_ifc.h trunk\inc\kernel\iba\ib_al_ifc.h
> --- old\inc\kernel\iba\ib_al_ifc.h Mon Jun 30 11:07:40 2008
> +++ trunk\inc\kernel\iba\ib_al_ifc.h Mon Jun 30 14:38:09 2008
> @@ -1,5 +1,6 @@
> /*
> * Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
> + * Portions Copyright (c) 2008 Microsoft Corporation. All
> rights reserved.
> *
> * This software is available to you under the OpenIB.org BSD license
> * below:
> @@ -58,243 +59,243 @@ typedef void
>
> 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 +304,128 @@ typedef ib_api_status_t
>
> 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 net32_t* const
> p_lkey,
> + OUT net32_t* const
> p_rkey,
> + 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 +463,7 @@ typedef ib_api_status_t
>
> 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 +481,77 @@ typedef ib_api_status_t
>
> 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 +561,18 @@ typedef ib_api_status_t
>
> 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 +583,56 @@ typedef ib_api_status_t
>
> 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)(
> diff -up -r -X trunk\docs\dontdiff.txt -I \$Id:
> old\inc\kernel\iba\iou_ifc.h trunk\inc\kernel\iba\iou_ifc.h
> --- old\inc\kernel\iba\iou_ifc.h Mon Jun 30 11:07:40 2008
> +++ trunk\inc\kernel\iba\iou_ifc.h Mon Jun 30 14:38:09 2008
> @@ -70,7 +70,7 @@ typedef struct _iou_ifc_data
> net64_t ca_guid;
> net64_t chassis_guid;
> uint8_t slot;
> - net64_t guid;
> + net64_t guid;
>
> } iou_ifc_data_t;
> /*
> diff -up -r -X trunk\docs\dontdiff.txt -I \$Id:
> old\inc\user\iba\ib_uvp.h trunk\inc\user\iba\ib_uvp.h
> --- old\inc\user\iba\ib_uvp.h Mon Jun 30 11:07:40 2008
> +++ trunk\inc\user\iba\ib_uvp.h Mon Jun 30 14:38:09 2008
> @@ -1,6 +1,7 @@
> /*
> * Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
> * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
> + * Portions Copyright (c) 2008 Microsoft Corporation. All
> rights reserved.
> *
> * This software is available to you under the OpenIB.org BSD license
> * below:
> @@ -151,7 +152,7 @@ typedef ib_api_status_t
> (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 +205,7 @@ typedef ib_api_status_t
> (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 +251,7 @@ typedef ib_api_status_t
> */
> 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 +300,7 @@ typedef ib_api_status_t
>
> 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 +350,7 @@ typedef void
>
> 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 +401,7 @@ typedef ib_api_status_t
>
> 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 +438,7 @@ typedef void
>
> 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 +473,7 @@ typedef ib_api_status_t
>
> 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 +511,8 @@ typedef ib_api_status_t
>
> 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 +563,9 @@ typedef ib_api_status_t
>
> 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 +616,9 @@ typedef void
>
> 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 +663,9 @@ typedef ib_api_status_t
>
> 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 +709,7 @@ typedef void
>
> 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 +743,7 @@ typedef ib_api_status_t
>
> 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 +783,10 @@ typedef void
>
> 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 +836,9 @@ typedef ib_api_status_t
>
> 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 +883,7 @@ typedef void
>
> 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 +927,10 @@ typedef ib_api_status_t
>
> 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 +978,7 @@ typedef void
> */
> 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 +1026,7 @@ typedef ib_api_status_t
>
> 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 +1069,7 @@ typedef void
>
> 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 +1104,7 @@ typedef ib_api_status_t
>
> 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 +1145,10 @@ typedef void
>
> 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 +1206,9 @@ typedef ib_api_status_t
>
> typedef void
> (AL_API *uvp_post_create_srq_t) (
> - IN const ib_pd_handle_t FUNC_PTR64
> h_uvp_pd,
> - IN ib_api_status_t
> ioctl_status,
> - IN OUT ib_srq_handle_t FUNC_PTR64
> *ph_uvp_srq,
> + IN const ib_pd_handle_t
> h_uvp_pd,
> + IN ib_api_status_t
> ioctl_status,
> + IN OUT ib_srq_handle_t
> *ph_uvp_srq,
> IN ci_umv_buf_t
> *p_umv_buf );
>
> /*
> @@ -1254,7 +1255,7 @@ typedef void
>
> 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,8 +1310,8 @@ typedef ib_api_status_t
>
> typedef void
> (AL_API *uvp_post_modify_srq_t) (
> - IN const ib_srq_handle_t FUNC_PTR64
> h_uvp_srq,
> - IN ib_api_status_t
> ioctl_status,
> + 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 +1354,7 @@ typedef void
>
> 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,8 +1398,8 @@ typedef ib_api_status_t
>
> typedef void
> (AL_API *uvp_post_query_srq_t) (
> - IN ib_srq_handle_t
> FUNC_PTR64 h_uvp_srq,
> - IN ib_api_status_t
> ioctl_status,
> + 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 +1445,7 @@ typedef void
>
> 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,8 +1490,8 @@ typedef ib_api_status_t
>
> typedef void
> (AL_API *uvp_post_destroy_srq_t) (
> - IN const ib_srq_handle_t FUNC_PTR64
> h_uvp_srq,
> - IN ib_api_status_t
> ioctl_status );
> + IN const ib_srq_handle_t
> h_uvp_srq,
> + IN ib_api_status_t
> ioctl_status );
>
> /*
> * DESCRIPTION
> @@ -1528,10 +1529,10 @@ typedef void
>
> 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 +1593,9 @@ typedef ib_api_status_t
>
> 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 +1645,7 @@ typedef ib_api_status_t
>
> 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 +1705,7 @@ typedef ib_api_status_t
>
> 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 +1749,7 @@ typedef void
>
> 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 +1793,7 @@ typedef ib_api_status_t
>
> 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 +1840,7 @@ typedef void
>
> 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 +1885,7 @@ typedef ib_api_status_t
>
> 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 +1922,7 @@ typedef void
>
> 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 +1953,7 @@ typedef uint32_t
>
> 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 +1994,10 @@ typedef void
>
> 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 +2051,10 @@ typedef ib_api_status_t
>
> 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 +2106,7 @@ typedef void
>
> 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 +2163,7 @@ typedef ib_api_status_t
>
> 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 +2214,7 @@ typedef void
>
> 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 +2270,7 @@ typedef ib_api_status_t
>
> 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 +2317,7 @@ typedef void
>
> 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 +2354,7 @@ typedef ib_api_status_t
>
> 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 +2392,9 @@ typedef void
>
> 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 +2442,10 @@ typedef ib_api_status_t
>
> 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 +2493,7 @@ typedef void
>
> 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 +2538,10 @@ typedef ib_api_status_t
>
> 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 +2588,8 @@ typedef void
>
> 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 +2653,7 @@ typedef ib_api_status_t
>
> 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 +2689,7 @@ typedef ib_api_status_t
>
> 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 +2725,7 @@ typedef void
>
> 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 +2797,7 @@ typedef ib_api_status_t
>
> 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 +2853,7 @@ typedef ib_api_status_t
>
> 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 +2908,7 @@ typedef ib_api_status_t
>
> 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 +2949,7 @@ typedef ib_api_status_t
>
> 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 +3002,7 @@ typedef ib_api_status_t
>
> 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 +3048,7 @@ typedef ib_api_status_t
>
> 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 +3095,11 @@ typedef ib_api_status_t
>
> 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 +3157,9 @@ typedef ib_api_status_t
>
> 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 +3208,7 @@ typedef void
>
> 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 +3251,7 @@ typedef ib_api_status_t
>
> 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 );
>
> /*
>
More information about the ofw
mailing list