[TESTS] This patch removes XXX_PTR64 and TO_ULONG_PTR macro use from interface files.
authorleonidk <leonidk@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Tue, 1 Jul 2008 15:26:01 +0000 (15:26 +0000)
committerleonidk <leonidk@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Tue, 1 Jul 2008 15:26:01 +0000 (15:26 +0000)
Signed-off-by: Fab Tillier <ftillier@microsoft.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1313 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

inc/iba/ib_al.h
inc/iba/ib_ci.h
inc/kernel/iba/ib_al_ifc.h
inc/kernel/iba/iou_ifc.h
inc/user/iba/ib_uvp.h

index dc9cb2e..c25ef11 100644 (file)
@@ -1,6 +1,7 @@
 /*\r
  * Copyright (c) 2005 SilverStorm Technologies.  All rights reserved.\r
  * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. \r
+ * Portions Copyright (c) 2008 Microsoft Corporation.  All rights reserved.\r
  *\r
  * This software is available to you under the OpenIB.org BSD license\r
  * below:\r
@@ -58,24 +59,25 @@ extern "C"
 *      of a user.\r
 ****/\r
 \r
-typedef struct _ib_al* TYPEDEF_PTR64                   ib_al_handle_t;\r
-typedef struct _al_pnp* TYPEDEF_PTR64                  ib_pnp_handle_t;\r
-typedef struct _al_reg_svc* TYPEDEF_PTR64              ib_reg_svc_handle_t;\r
-typedef struct _al_mad_send* TYPEDEF_PTR64     ib_mad_send_handle_t;\r
-typedef struct _al_mad_svc* TYPEDEF_PTR64              ib_mad_svc_handle_t;\r
-typedef struct _al_query* TYPEDEF_PTR64                ib_query_handle_t;\r
-typedef struct _al_sub* TYPEDEF_PTR64                  ib_sub_handle_t;\r
-typedef struct _al_listen* TYPEDEF_PTR64               ib_listen_handle_t;\r
-typedef struct _al_ioc* TYPEDEF_PTR64                  ib_ioc_handle_t;\r
-typedef struct _al_svc_entry* TYPEDEF_PTR64    ib_svc_handle_t;\r
-typedef struct _al_pool_key* TYPEDEF_PTR64     ib_pool_key_t;\r
-typedef struct _al_pool* TYPEDEF_PTR64         ib_pool_handle_t;\r
-typedef struct _mlnx_fmr_pool_element* TYPEDEF_PTR64   mlnx_fmr_pool_el_t;\r
+typedef struct _ib_al*                                 ib_al_handle_t;\r
+typedef struct _al_pnp*                                        ib_pnp_handle_t;\r
+typedef struct _al_reg_svc*                            ib_reg_svc_handle_t;\r
+typedef struct _al_mad_send*                   ib_mad_send_handle_t;\r
+typedef struct _al_mad_svc*                            ib_mad_svc_handle_t;\r
+typedef struct _al_query*                              ib_query_handle_t;\r
+typedef struct _al_sub*                                        ib_sub_handle_t;\r
+typedef struct _al_listen*                             ib_listen_handle_t;\r
+typedef struct _al_ioc*                                        ib_ioc_handle_t;\r
+typedef struct _al_svc_entry*                  ib_svc_handle_t;\r
+typedef struct _al_pool_key*                   ib_pool_key_t;\r
+typedef struct _al_pool*                               ib_pool_handle_t;\r
+typedef struct _mlnx_fmr_pool_element* mlnx_fmr_pool_el_t;\r
+\r
 \r
 typedef struct _ib_cm_handle\r
 {\r
-TO_LONG_PTR(   ib_al_handle_t ,                h_al) ; \r
-TO_LONG_PTR(   ib_qp_handle_t ,                h_qp) ; \r
+       ib_al_handle_t          h_al;\r
+       ib_qp_handle_t          h_qp;\r
        net32_t                         cid;\r
 \r
 }      ib_cm_handle_t;\r
@@ -123,18 +125,18 @@ typedef uint8_t           ib_shmid_t[64];
 */\r
 typedef struct _ib_mad_element\r
 {\r
-       TO_LONG_PTR(struct _ib_mad_element* , p_next) ;\r
-       TO_LONG_PTR(const void* ,                       context1) ;\r
-       TO_LONG_PTR(const void* ,                       context2) ;\r
+       TO_LONG_PTR(struct _ib_mad_element*, p_next);\r
+       TO_LONG_PTR(const void*,        context1);\r
+       TO_LONG_PTR(const void*,        context2);\r
 \r
        /* Request/completion data. */\r
-       TO_LONG_PTR(ib_mad_t* ,                 p_mad_buf) ;\r
+       TO_LONG_PTR(ib_mad_t*,          p_mad_buf);\r
        uint32_t                                        size;\r
        uint32_t                                        immediate_data;\r
        ib_net32_t                                      remote_qp;\r
 \r
        /* Send request information. */\r
-TO_LONG_PTR(   ib_av_handle_t ,                                h_av) ; \r
+       TO_LONG_PTR(ib_av_handle_t,     h_av);\r
        ib_send_opt_t                           send_opt;\r
        ib_net32_t                                      remote_qkey;\r
        boolean_t                                       resp_expected;\r
@@ -145,7 +147,7 @@ TO_LONG_PTR(        ib_av_handle_t ,                                h_av) ;
        /* Completion information. */\r
        ib_wc_status_t                          status;\r
        boolean_t                                       grh_valid;\r
-       TO_LONG_PTR(ib_grh_t* ,                 p_grh) ;\r
+       TO_LONG_PTR(ib_grh_t*,          p_grh);\r
 \r
        /* Completed receive data or send request information if h_av is NULL. */\r
        uint32_t                                        recv_opt;\r
@@ -155,8 +157,8 @@ TO_LONG_PTR(        ib_av_handle_t ,                                h_av) ;
        uint8_t                                         path_bits;\r
 \r
        /* Transaction completion data. */\r
-       TO_LONG_PTR(void* ,                             send_context1) ;\r
-       TO_LONG_PTR(void* ,                             send_context2) ;\r
+       TO_LONG_PTR(void*,                      send_context1);\r
+       TO_LONG_PTR(void*,                      send_context2);\r
 \r
 }      ib_mad_element_t;\r
 /*\r
@@ -337,8 +339,8 @@ ib_get_mad_buf(
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_comp_cb_t)(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+(AL_API *ib_pfn_comp_cb_t)(\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN                              void                                            *cq_context );\r
 /*\r
 * PARAMETERS\r
@@ -395,7 +397,7 @@ typedef uint32_t                                                    ib_al_flags_t;
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_destroy_cb_t)(\r
+(AL_API *ib_pfn_destroy_cb_t)(\r
        IN                              void                                            *context );\r
 /*\r
 * PARAMETERS\r
@@ -432,7 +434,7 @@ typedef void
 *\r
 * SYNOPSIS\r
 */\r
-static const ib_pfn_destroy_cb_t ib_sync_destroy = (ib_pfn_destroy_cb_t)-1/*i64*/; //TODO\r
+static const ib_pfn_destroy_cb_t ib_sync_destroy = (ib_pfn_destroy_cb_t)(LONG_PTR)-1;\r
 /*\r
 * PARAMETERS\r
 *      Not Applicable.\r
@@ -462,13 +464,13 @@ typedef struct _ib_async_event_rec
        ib_async_event_t                                                        code;\r
        uint64_t                                                                        vendor_specific;\r
 \r
-       TO_LONG_PTR(void* ,                                                             context) ;\r
+       TO_LONG_PTR(void*,                                                      context);\r
        union _handle_t\r
        {\r
-TO_LONG_PTR(           ib_ca_handle_t ,                                                        h_ca) ; \r
-TO_LONG_PTR(           ib_cq_handle_t ,                                                        h_cq) ; \r
-TO_LONG_PTR(           ib_qp_handle_t ,                                                        h_qp) ; \r
-TO_LONG_PTR(           struct _ib_srq* ,                                                       h_srq) ; \r
+               TO_LONG_PTR(ib_ca_handle_t,                             h_ca);\r
+               TO_LONG_PTR(ib_cq_handle_t,                             h_cq);\r
+               TO_LONG_PTR(ib_qp_handle_t,                             h_qp);\r
+               TO_LONG_PTR(struct _ib_srq*,                    h_srq);\r
 \r
        } handle;\r
 \r
@@ -507,7 +509,7 @@ TO_LONG_PTR(                struct _ib_srq* ,                                                       h_srq) ;
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_event_cb_t)(\r
+(AL_API *ib_pfn_event_cb_t)(\r
        IN                              ib_async_event_rec_t            *p_event_rec );\r
 /*\r
 * PARAMETERS\r
@@ -535,11 +537,11 @@ typedef void
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_open_ca(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_net64_t                                      ca_guid,\r
        IN              const   ib_pfn_event_cb_t                       pfn_ca_event_cb OPTIONAL,\r
        IN              const   void* const                                     ca_context,\r
-               OUT                     ib_ca_handle_t FUNC_PTR64* const                ph_ca );\r
+               OUT                     ib_ca_handle_t* const           ph_ca );\r
 /*\r
 * PARAMETERS\r
 *      h_al\r
@@ -596,7 +598,7 @@ ib_open_ca(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_query_ca(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
                OUT                     ib_ca_attr_t* const                     p_ca_attr OPTIONAL,\r
        IN      OUT                     uint32_t* const                         p_size );\r
 /*\r
@@ -657,7 +659,7 @@ ib_query_ca(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_query_ca_by_guid(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_net64_t                                      ca_guid,\r
                OUT                     ib_ca_attr_t* const                     p_ca_attr OPTIONAL,\r
        IN      OUT                     uint32_t* const                         p_size );\r
@@ -725,7 +727,7 @@ ib_query_ca_by_guid(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_modify_ca(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   uint8_t                                         port_num,\r
        IN              const   ib_ca_mod_t                                     ca_mod,\r
        IN              const   ib_port_attr_mod_t* const       p_port_attr_mod );\r
@@ -785,7 +787,7 @@ ib_modify_ca(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_close_ca(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL );\r
 /*\r
 * PARAMETERS\r
@@ -828,10 +830,10 @@ ib_close_ca(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_alloc_pd(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   ib_pd_type_t                            pd_type,\r
        IN              const   void* const                                     pd_context,\r
-               OUT                     ib_pd_handle_t FUNC_PTR64* const                ph_pd );\r
+               OUT                     ib_pd_handle_t* const           ph_pd );\r
 /*\r
 * PARAMETERS\r
 *      h_ca\r
@@ -887,7 +889,7 @@ ib_alloc_pd(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_dealloc_pd(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL );\r
 /*\r
 * PARAMETERS\r
@@ -930,9 +932,9 @@ ib_dealloc_pd(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_create_av(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_av_attr_t* const                     p_av_attr,\r
-               OUT                     ib_av_handle_t FUNC_PTR64* const                ph_av );\r
+               OUT                     ib_av_handle_t* const           ph_av );\r
 /*\r
 * PARAMETERS\r
 *      h_pd\r
@@ -988,9 +990,9 @@ ib_create_av(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_query_av(\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_av,\r
+       IN              const   ib_av_handle_t                          h_av,\r
                OUT                     ib_av_attr_t* const                     p_av_attr,\r
-               OUT                     ib_pd_handle_t FUNC_PTR64* const                ph_pd );\r
+               OUT                     ib_pd_handle_t* const           ph_pd );\r
 /*\r
 * PARAMETERS\r
 *      h_av\r
@@ -1031,7 +1033,7 @@ ib_query_av(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_modify_av(\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_av,\r
+       IN              const   ib_av_handle_t                          h_av,\r
        IN              const   ib_av_attr_t* const                     p_av_attr );\r
 /*\r
 * PARAMETERS\r
@@ -1052,7 +1054,7 @@ ib_modify_av(
 *              A reference to the address vector attributes structure was not\r
 *              provided.\r
 *\r
-*      IB_INVALID_PORT\r
+*      IB_INVALID_PORT\r
 *              The port number supplied, through the address vector attributes,\r
 *              was invalid for the given channel adapter.\r
 *\r
@@ -1076,7 +1078,7 @@ ib_modify_av(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_destroy_av(\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_av );\r
+       IN              const   ib_av_handle_t                          h_av );\r
 /*\r
 * PARAMETERS\r
 *      h_av\r
@@ -1108,11 +1110,11 @@ ib_destroy_av(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_create_srq(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                       h_pd,\r
+       IN              const   ib_pd_handle_t                  h_pd,\r
        IN              const   ib_srq_attr_t* const            p_srq_attr,\r
-       IN              const   void* const                             srq_context,\r
+       IN              const   void* const                             srq_context,\r
        IN              const   ib_pfn_event_cb_t                       pfn_srq_event_cb OPTIONAL,\r
-               OUT             ib_srq_handle_t FUNC_PTR64* const               ph_srq );\r
+               OUT             ib_srq_handle_t* const          ph_srq );\r
 /*\r
 * PARAMETERS\r
 *      h_pd\r
@@ -1192,7 +1194,7 @@ ib_create_srq(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_query_srq(\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_srq,\r
+       IN              const   ib_srq_handle_t                         h_srq,\r
                OUT                     ib_srq_attr_t* const                    p_srq_attr );\r
 /*\r
 * PARAMETERS\r
@@ -1234,7 +1236,7 @@ ib_query_srq(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_modify_srq(\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                      h_srq,\r
+       IN              const   ib_srq_handle_t                 h_srq,\r
        IN              const   ib_srq_attr_t* const            p_srq_attr,\r
        IN              const   ib_srq_attr_mask_t                      srq_attr_mask );\r
 /*\r
@@ -1292,7 +1294,7 @@ ib_modify_srq(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_destroy_srq(\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_srq,\r
+       IN              const   ib_srq_handle_t                         h_srq,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL );\r
 /*\r
 * PARAMETERS\r
@@ -1337,7 +1339,7 @@ ib_destroy_srq(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_post_srq_recv(\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_srq,\r
+       IN              const   ib_srq_handle_t                         h_srq,\r
        IN                              ib_recv_wr_t* const                     p_recv_wr,\r
                OUT                     ib_recv_wr_t                            **pp_recv_failure OPTIONAL );\r
 /*\r
@@ -1395,11 +1397,11 @@ ib_post_srq_recv(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_create_qp(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_qp_create_t* const           p_qp_create,\r
        IN              const   void* const                                     qp_context,\r
        IN              const   ib_pfn_event_cb_t                       pfn_qp_event_cb OPTIONAL,\r
-               OUT                     ib_qp_handle_t FUNC_PTR64* const                ph_qp );\r
+               OUT                     ib_qp_handle_t* const           ph_qp );\r
 /*\r
 * PARAMETERS\r
 *      h_pd\r
@@ -1508,13 +1510,13 @@ ib_create_qp(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_get_spl_qp(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_net64_t                                      port_guid,\r
        IN              const   ib_qp_create_t* const           p_qp_create,\r
        IN              const   void* const                                     qp_context,\r
        IN              const   ib_pfn_event_cb_t                       pfn_qp_event_cb OPTIONAL,\r
-               OUT                     ib_pool_key_t FUNC_PTR64* const         p_pool_key OPTIONAL,\r
-               OUT                     ib_qp_handle_t FUNC_PTR64* const                ph_qp );\r
+               OUT                     ib_pool_key_t* const            p_pool_key OPTIONAL,\r
+               OUT                     ib_qp_handle_t* const           ph_qp );\r
 /*\r
 * PARAMETERS\r
 *      h_pd\r
@@ -1623,7 +1625,7 @@ ib_get_spl_qp(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_query_qp(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
                OUT                     ib_qp_attr_t* const                     p_qp_attr );\r
 /*\r
 * PARAMETERS\r
@@ -1664,7 +1666,7 @@ ib_query_qp(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_modify_qp(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_qp_mod_t* const                      p_qp_mod );\r
 /*\r
 * PARAMETERS\r
@@ -1726,7 +1728,7 @@ ib_modify_qp(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_destroy_qp(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL );\r
 /*\r
 * PARAMETERS\r
@@ -1813,11 +1815,11 @@ typedef struct _ib_cq_create
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_create_cq(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN      OUT                     ib_cq_create_t* const           p_cq_create,\r
        IN              const   void* const                                     cq_context,\r
        IN              const   ib_pfn_event_cb_t                       pfn_cq_event_cb OPTIONAL,\r
-               OUT                     ib_cq_handle_t FUNC_PTR64* const                ph_cq );\r
+               OUT                     ib_cq_handle_t* const           ph_cq );\r
 /*\r
 * PARAMETERS\r
 *      h_ca\r
@@ -1889,7 +1891,7 @@ ib_create_cq(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_modify_cq(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN      OUT                     uint32_t* const                         p_size );\r
 /*\r
 * PARAMETERS\r
@@ -1947,7 +1949,7 @@ ib_modify_cq(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_query_cq(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64               h_cq,\r
+       IN              const   ib_cq_handle_t          h_cq,\r
        OUT             uint32_t* const                         p_size );\r
 /*\r
 * PARAMETERS\r
@@ -1985,7 +1987,7 @@ ib_query_cq(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_destroy_cq(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL );\r
 /*\r
 * PARAMETERS\r
@@ -2031,11 +2033,11 @@ ib_destroy_cq(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_reg_mem(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_mr_create_t* const           p_mr_create,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64* const                ph_mr );\r
+               OUT                     ib_mr_handle_t* const           ph_mr );\r
 /*\r
 * PARAMETERS\r
 *      h_pd\r
@@ -2102,12 +2104,12 @@ ib_reg_mem(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_reg_phys(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_phys_create_t* const         p_phys_create,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64* const                ph_mr );\r
+               OUT                     ib_mr_handle_t* const           ph_mr );\r
 /*\r
 * PARAMETERS\r
 *      h_pd\r
@@ -2181,7 +2183,7 @@ ib_reg_phys(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_query_mr(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr,\r
+       IN              const   ib_mr_handle_t                          h_mr,\r
                OUT                     ib_mr_attr_t* const                     p_mr_attr );\r
 /*\r
 * PARAMETERS\r
@@ -2222,12 +2224,12 @@ ib_query_mr(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_rereg_mem(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr,\r
+       IN              const   ib_mr_handle_t                          h_mr,\r
        IN              const   ib_mr_mod_t                                     mr_mod_mask,\r
        IN              const   ib_mr_create_t* const           p_mr_create OPTIONAL,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd OPTIONAL );\r
+       IN              const   ib_pd_handle_t                          h_pd OPTIONAL );\r
 /*\r
 * PARAMETERS\r
 *      h_mr\r
@@ -2307,13 +2309,13 @@ ib_rereg_mem(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_rereg_phys(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr,\r
+       IN              const   ib_mr_handle_t                          h_mr,\r
        IN              const   ib_mr_mod_t                                     mr_mod_mask,\r
        IN              const   ib_phys_create_t* const         p_phys_create OPTIONAL,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd OPTIONAL );\r
+       IN              const   ib_pd_handle_t                          h_pd OPTIONAL );\r
 /*\r
 * PARAMETERS\r
 *      h_mr\r
@@ -2399,13 +2401,13 @@ ib_rereg_phys(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_reg_shared(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_mr_handle_t                          h_mr,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_access_t                                     access_ctrl,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64* const                ph_mr );\r
+               OUT                     ib_mr_handle_t* const           ph_mr );\r
 /*\r
 * PARAMETERS\r
 *      h_mr\r
@@ -2486,13 +2488,13 @@ ib_reg_shared(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_reg_shmid(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_shmid_t                                      shmid,\r
        IN              const   ib_mr_create_t* const           p_mr_create,\r
                OUT                     uint64_t* const                         p_vaddr,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64* const                ph_mr );\r
+               OUT                     ib_mr_handle_t* const           ph_mr );\r
 /*\r
 * PARAMETERS\r
 *      h_pd\r
@@ -2573,7 +2575,7 @@ ib_reg_shmid(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_dereg_mr(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr );\r
+       IN              const   ib_mr_handle_t                          h_mr );\r
 /*\r
 * PARAMETERS\r
 *      h_mr\r
@@ -2614,9 +2616,9 @@ ib_dereg_mr(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 mlnx_create_fmr(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   mlnx_fmr_create_t* const        p_fmr_create,\r
-               OUT                     mlnx_fmr_handle_t FUNC_PTR64* const     ph_fmr );\r
+               OUT                     mlnx_fmr_handle_t* const        ph_fmr );\r
 /*\r
 * PARAMETERS\r
 *      h_pd\r
@@ -2678,7 +2680,7 @@ mlnx_create_fmr(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 mlnx_map_phys_fmr(\r
-       IN              const   mlnx_fmr_handle_t FUNC_PTR64                    h_fmr,\r
+       IN              const   mlnx_fmr_handle_t                       h_fmr,\r
        IN              const   uint64_t* const                         paddr_list,\r
        IN              const   int                                                     list_len,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
@@ -2752,7 +2754,7 @@ mlnx_map_phys_fmr(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 mlnx_unmap_fmr(\r
-       IN              const   mlnx_fmr_handle_t FUNC_PTR64                    h_fmr );\r
+       IN              const   mlnx_fmr_handle_t                       h_fmr );\r
 /*\r
 * PARAMETERS\r
 *      h_fmr\r
@@ -2806,7 +2808,7 @@ mlnx_unmap_fmr(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 mlnx_destroy_fmr(\r
-       IN              const   mlnx_fmr_handle_t FUNC_PTR64                    h_fmr );\r
+       IN              const   mlnx_fmr_handle_t                       h_fmr );\r
 /*\r
 * PARAMETERS\r
 *      h_fmr\r
@@ -2861,9 +2863,9 @@ mlnx_destroy_fmr(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 mlnx_create_fmr_pool(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   mlnx_fmr_pool_create_t          *p_fmr_pool_attr,\r
-       OUT             mlnx_fmr_pool_handle_t FUNC_PTR64* const                ph_pool );\r
+       OUT             mlnx_fmr_pool_handle_t* const           ph_pool );\r
 /*\r
 * PARAMETERS\r
 TODO\r
@@ -2890,7 +2892,7 @@ TOD
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 mlnx_destroy_fmr_pool(\r
-       IN              const   mlnx_fmr_pool_handle_t FUNC_PTR64                       h_pool );\r
+       IN              const   mlnx_fmr_pool_handle_t                  h_pool );\r
 /*\r
 * PARAMETERS\r
 TODO\r
@@ -2922,13 +2924,13 @@ TODO
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 mlnx_map_phys_fmr_pool(\r
-       IN              const   mlnx_fmr_pool_handle_t FUNC_PTR64               h_pool ,\r
+       IN              const   mlnx_fmr_pool_handle_t          h_pool ,\r
        IN              const   uint64_t* const                         paddr_list,\r
        IN              const   int                                                     list_len,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
-       OUT             net32_t* const                                  p_lkey,\r
-       OUT             net32_t* const                                  p_rkey,\r
-       OUT                             mlnx_fmr_pool_el_t FUNC_PTR64           *pp_fmr_el);\r
+       OUT             net32_t* const                                  p_lkey,\r
+       OUT             net32_t* const                                  p_rkey,\r
+       OUT                             mlnx_fmr_pool_el_t              *pp_fmr_el);\r
 /*\r
 * PARAMETERS\r
 TODO\r
@@ -2958,7 +2960,7 @@ TODO
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 mlnx_unmap_fmr_pool(\r
-       IN                      mlnx_fmr_pool_el_t FUNC_PTR64                   p_fmr_el );\r
+       IN                      mlnx_fmr_pool_el_t                      p_fmr_el );\r
 /*\r
 * PARAMETERS\r
 TODO\r
@@ -2984,7 +2986,7 @@ TODO
 * SYNOPSIS\r
 */\r
 ib_api_status_t\r
-mlnx_flush_fmr_pool(mlnx_fmr_pool_handle_t FUNC_PTR64 h_pool) \r
+mlnx_flush_fmr_pool(mlnx_fmr_pool_handle_t  h_pool)\r
 /*\r
 * PARAMETERS\r
 TODO\r
@@ -3012,9 +3014,9 @@ TODO
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_create_mw(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
                OUT                     net32_t* const                          p_rkey,\r
-               OUT                     ib_mw_handle_t FUNC_PTR64* const                ph_mw );\r
+               OUT                     ib_mw_handle_t* const           ph_mw );\r
 /*\r
 * PARAMETERS\r
 *      h_pd\r
@@ -3068,8 +3070,8 @@ ib_create_mw(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_query_mw(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw,\r
-               OUT                     ib_pd_handle_t FUNC_PTR64* const                ph_pd,\r
+       IN              const   ib_mw_handle_t                          h_mw,\r
+               OUT                     ib_pd_handle_t* const           ph_pd,\r
                OUT                     net32_t* const                          p_rkey );\r
 /*\r
 * PARAMETERS\r
@@ -3113,8 +3115,8 @@ ib_query_mw(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_bind_mw(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw,\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_mw_handle_t                          h_mw,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN                              ib_bind_wr_t* const                     p_mw_bind,\r
                OUT                     net32_t* const                          p_rkey );\r
 /*\r
@@ -3188,7 +3190,7 @@ ib_bind_mw(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_destroy_mw(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw );\r
+       IN              const   ib_mw_handle_t                          h_mw );\r
 /*\r
 * PARAMETERS\r
 *      h_mw\r
@@ -3221,7 +3223,7 @@ ib_destroy_mw(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_post_send(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN                              ib_send_wr_t* const                     p_send_wr,\r
                OUT                     ib_send_wr_t                            **pp_send_failure OPTIONAL );\r
 /*\r
@@ -3285,7 +3287,7 @@ ib_post_send(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_post_recv(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN                              ib_recv_wr_t* const                     p_recv_wr,\r
                OUT                     ib_recv_wr_t                            **pp_recv_failure OPTIONAL );\r
 /*\r
@@ -3343,7 +3345,7 @@ ib_post_recv(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_send_mad(\r
-       IN              const   ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN              const   ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t* const         p_mad_element_list,\r
                OUT                     ib_mad_element_t                        **pp_mad_failure OPTIONAL );\r
 /*\r
@@ -3408,7 +3410,7 @@ ib_send_mad(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_cancel_mad(\r
-       IN              const   ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN              const   ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t* const         p_mad_element );\r
 /*\r
 * PARAMETERS\r
@@ -3452,7 +3454,7 @@ ib_cancel_mad(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_peek_cq(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        OUT                             uint32_t* const                         p_n_cqes );\r
 /*\r
 * PARAMETERS\r
@@ -3497,7 +3499,7 @@ ib_peek_cq(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_poll_cq(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN      OUT                     ib_wc_t** const                         pp_free_wclist,\r
                OUT                     ib_wc_t** const                         pp_done_wclist );\r
 /*\r
@@ -3555,7 +3557,7 @@ ib_poll_cq(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_rearm_cq(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN              const   boolean_t                                       solicited );\r
 /*\r
 * PARAMETERS\r
@@ -3595,7 +3597,7 @@ ib_rearm_cq(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_rearm_n_cq(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN              const   uint32_t                                        n_cqes );\r
 /*\r
 * PARAMETERS\r
@@ -3645,12 +3647,12 @@ ib_rearm_n_cq(
 */\r
 typedef struct _ib_mcast_rec\r
 {\r
-       TO_LONG_PTR(const void* ,                       mcast_context) ;\r
+       TO_LONG_PTR(const void*,        mcast_context);\r
        ib_api_status_t                         status;\r
        ib_net16_t                                      error_status;\r
 \r
-TO_LONG_PTR(   ib_mcast_handle_t ,                     h_mcast) ; \r
-       TO_LONG_PTR(ib_member_rec_t* ,  p_member_rec) ;\r
+       TO_LONG_PTR(ib_mcast_handle_t, h_mcast);\r
+       TO_LONG_PTR(ib_member_rec_t*, p_member_rec);\r
 \r
 }      ib_mcast_rec_t;\r
 /*\r
@@ -3694,7 +3696,7 @@ TO_LONG_PTR(      ib_mcast_handle_t ,                     h_mcast) ;
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_mcast_cb_t)(\r
+(AL_API *ib_pfn_mcast_cb_t)(\r
        IN                              ib_mcast_rec_t                          *p_mcast_rec );\r
 /*\r
 * PARAMETERS\r
@@ -3726,7 +3728,7 @@ typedef struct _ib_mcast_req
        boolean_t                                       create;\r
        ib_member_rec_t                         member_rec;\r
 \r
-       TO_LONG_PTR(const void* ,                       mcast_context) ;\r
+       const void*                                     mcast_context;\r
        ib_pfn_mcast_cb_t                       pfn_mcast_cb;\r
 \r
        uint32_t                                        timeout_ms;\r
@@ -3799,7 +3801,7 @@ typedef struct _ib_mcast_req
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_join_mcast(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_mcast_req_t* const           p_mcast_req );\r
 /*\r
 * PARAMETERS\r
@@ -3880,7 +3882,7 @@ ib_join_mcast(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_leave_mcast(\r
-       IN              const   ib_mcast_handle_t FUNC_PTR64                    h_mcast,\r
+       IN              const   ib_mcast_handle_t                       h_mcast,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL );\r
 /*\r
 * PARAMETERS\r
@@ -3926,7 +3928,7 @@ ib_leave_mcast(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_local_mad(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   uint8_t                                         port_num,\r
        IN              const   void* const                                     p_mad_in,\r
                OUT                     void*                                           p_mad_out );\r
@@ -4245,11 +4247,11 @@ typedef struct _ib_apr_info
 #pragma warning(disable:4324)\r
 typedef struct _ib_cm_req_rec\r
 {\r
-       TO_LONG_PTR(const void* ,                       context) ;\r
+       const void*                                     context;\r
        ib_cm_handle_t                          h_cm_req;\r
-TO_LONG_PTR(   ib_listen_handle_t ,                    h_cm_listen) ; \r
+       ib_listen_handle_t                      h_cm_listen;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_req_pdata) ;\r
+       const uint8_t*                          p_req_pdata;\r
 \r
        ib_qp_type_t                            qp_type;\r
 \r
@@ -4262,7 +4264,7 @@ TO_LONG_PTR(      ib_listen_handle_t ,                    h_cm_listen) ;
 \r
        /* valid for ud qp_type only */\r
        ib_net16_t                                      pkey;\r
-       TO_LONG_PTR(const void* ,                       sidr_context) ;\r
+       const void*                                     sidr_context;\r
 \r
 }      ib_cm_req_rec_t;\r
 #pragma warning(default:4324)\r
@@ -4334,19 +4336,19 @@ TO_LONG_PTR(    ib_listen_handle_t ,                    h_cm_listen) ;
 */\r
 typedef struct _ib_cm_rep_rec\r
 {\r
-       TO_LONG_PTR(const uint8_t* ,            p_rep_pdata) ;\r
+       const uint8_t*                          p_rep_pdata;\r
 \r
        ib_qp_type_t                            qp_type;\r
 \r
        ib_cm_handle_t                          h_cm_rep;\r
        /* valid for rc, uc & rd qp_type only */\r
-       TO_LONG_PTR(const void* ,                       qp_context) ;\r
+       const void*                                     qp_context;\r
        uint8_t                                         resp_res;\r
        boolean_t                                       flow_ctrl;\r
        ib_apr_status_t                         apr_status;\r
 \r
        /* valid for ud qp_type only */\r
-       TO_LONG_PTR(const void* ,                       sidr_context) ;\r
+       const void*                                     sidr_context;\r
        ib_sidr_status_t                        status;\r
        ib_net32_t                                      remote_qp;\r
        ib_net32_t                                      remote_qkey;\r
@@ -4422,10 +4424,10 @@ typedef struct _ib_cm_rep_rec
 */\r
 typedef struct _ib_cm_rtu_rec\r
 {\r
-       TO_LONG_PTR(const uint8_t* ,            p_rtu_pdata) ;\r
+       const uint8_t*                          p_rtu_pdata;\r
 \r
-TO_LONG_PTR(   ib_qp_handle_t ,                                h_qp) ; \r
-       TO_LONG_PTR(const void* ,                       qp_context) ;\r
+       ib_qp_handle_t                          h_qp;\r
+       const void*                                     qp_context;\r
 \r
 }      ib_cm_rtu_rec_t;\r
 /*\r
@@ -4459,13 +4461,13 @@ TO_LONG_PTR(    ib_qp_handle_t ,                                h_qp) ;
 typedef struct _ib_cm_rej_rec\r
 {\r
        ib_rej_status_t                         rej_status;\r
-       TO_LONG_PTR(const uint8_t* ,            p_ari) ;\r
+       const uint8_t*                          p_ari;\r
        uint8_t                                         ari_length;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_rej_pdata) ;\r
+       const uint8_t*                          p_rej_pdata;\r
 \r
-TO_LONG_PTR(   ib_qp_handle_t ,                                h_qp) ; \r
-       TO_LONG_PTR(const void* ,                       qp_context) ;\r
+       ib_qp_handle_t                          h_qp;\r
+       const void*                                     qp_context;\r
 \r
 }      ib_cm_rej_rec_t;\r
 /*\r
@@ -4509,10 +4511,10 @@ TO_LONG_PTR(    ib_qp_handle_t ,                                h_qp) ;
 */\r
 typedef struct _ib_cm_mra_rec\r
 {\r
-       TO_LONG_PTR(const uint8_t* ,            p_mra_pdata) ;\r
+       const uint8_t*                          p_mra_pdata;\r
 \r
-TO_LONG_PTR(   ib_qp_handle_t ,                                h_qp) ; \r
-       TO_LONG_PTR(const void* ,                       qp_context) ;\r
+       ib_qp_handle_t                          h_qp;\r
+       const void*                                     qp_context;\r
 \r
 }      ib_cm_mra_rec_t;\r
 /*\r
@@ -4541,16 +4543,18 @@ TO_LONG_PTR(    ib_qp_handle_t ,                                h_qp) ;
 *\r
 * SYNOPSIS\r
 */\r
+#pragma warning(disable:4324)\r
 typedef struct _ib_cm_lap_rec\r
 {\r
        ib_cm_handle_t                          h_cm_lap;\r
        ib_path_rec_t                           alt_path;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_lap_pdata) ;\r
+       const uint8_t*                          p_lap_pdata;\r
 \r
-       TO_LONG_PTR(const void* ,                       qp_context) ;\r
+       const void*                                     qp_context;\r
 \r
 }      ib_cm_lap_rec_t;\r
+#pragma warning(default:4324)\r
 /*\r
 * FIELDS\r
 *      p_lap_pdata\r
@@ -4588,13 +4592,13 @@ typedef struct _ib_cm_apr_rec
        ib_api_status_t                         cm_status;\r
        ib_apr_status_t                         apr_status;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_info) ;\r
+       const uint8_t*                          p_info;\r
        uint8_t                                         info_length;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_apr_pdata) ;\r
+       const uint8_t*                          p_apr_pdata;\r
 \r
-TO_LONG_PTR(   ib_qp_handle_t ,                                h_qp) ; \r
-       TO_LONG_PTR(const void* ,                       qp_context) ;\r
+       ib_qp_handle_t                          h_qp;\r
+       const void*                                     qp_context;\r
 \r
 }      ib_cm_apr_rec_t;\r
 /*\r
@@ -4649,9 +4653,9 @@ typedef struct _ib_cm_dreq_rec
 {\r
        ib_cm_handle_t                          h_cm_dreq;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_dreq_pdata) ;\r
+       const uint8_t*                          p_dreq_pdata;\r
 \r
-       TO_LONG_PTR(const void* ,                       qp_context) ;\r
+       const void*                                     qp_context;\r
 \r
 }      ib_cm_dreq_rec_t;\r
 /*\r
@@ -4686,10 +4690,10 @@ typedef struct _ib_cm_drep_rec
 {\r
        ib_api_status_t                         cm_status;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_drep_pdata) ;\r
+       const uint8_t*                          p_drep_pdata;\r
 \r
-TO_LONG_PTR(   ib_qp_handle_t ,                                h_qp) ; \r
-       TO_LONG_PTR(const void* ,                       qp_context) ;\r
+       ib_qp_handle_t                          h_qp;\r
+       const void*                                     qp_context;\r
 \r
 }      ib_cm_drep_rec_t;\r
 /*\r
@@ -4725,7 +4729,7 @@ TO_LONG_PTR(      ib_qp_handle_t ,                                h_qp) ;
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_cm_req_cb_t)(\r
+(AL_API *ib_pfn_cm_req_cb_t)(\r
        IN                              ib_cm_req_rec_t                         *p_cm_req_rec );\r
 /*\r
 * PARAMETERS\r
@@ -4763,7 +4767,7 @@ typedef void
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_cm_rep_cb_t)(\r
+(AL_API *ib_pfn_cm_rep_cb_t)(\r
        IN                              ib_cm_rep_rec_t                         *p_cm_rep_rec );\r
 /*\r
 * PARAMETERS\r
@@ -4807,7 +4811,7 @@ typedef void
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_cm_rtu_cb_t)(\r
+(AL_API *ib_pfn_cm_rtu_cb_t)(\r
        IN                              ib_cm_rtu_rec_t                         *p_cm_rtu_rec );\r
 /*\r
 * PARAMETERS\r
@@ -4842,7 +4846,7 @@ typedef void
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_cm_rej_cb_t)(\r
+(AL_API *ib_pfn_cm_rej_cb_t)(\r
        IN                              ib_cm_rej_rec_t                         *p_cm_rej_rec );\r
 /*\r
 * PARAMETERS\r
@@ -4873,7 +4877,7 @@ typedef void
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_cm_mra_cb_t)(\r
+(AL_API *ib_pfn_cm_mra_cb_t)(\r
        IN                              ib_cm_mra_rec_t                         *p_cm_mra_rec );\r
 \r
 /*\r
@@ -4906,7 +4910,7 @@ typedef void
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_cm_lap_cb_t)(\r
+(AL_API *ib_pfn_cm_lap_cb_t)(\r
        IN                              ib_cm_lap_rec_t                         *p_cm_lap_rec );\r
 /*\r
 * PARAMETERS\r
@@ -4938,7 +4942,7 @@ typedef void
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_cm_apr_cb_t)(\r
+(AL_API *ib_pfn_cm_apr_cb_t)(\r
        IN                              ib_cm_apr_rec_t                         *p_cm_apr_rec );\r
 /*\r
 * PARAMETERS\r
@@ -4969,7 +4973,7 @@ typedef void
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_cm_dreq_cb_t)(\r
+(AL_API *ib_pfn_cm_dreq_cb_t)(\r
        IN                              ib_cm_dreq_rec_t                        *p_cm_dreq_rec );\r
 /*\r
 * PARAMETERS\r
@@ -5002,7 +5006,7 @@ typedef void
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_cm_drep_cb_t)(\r
+(AL_API *ib_pfn_cm_drep_cb_t)(\r
        IN                              ib_cm_drep_rec_t                        *p_cm_drep_rec );\r
 /*\r
 * PARAMETERS\r
@@ -5059,7 +5063,7 @@ typedef struct _ib_cm_listen
        ib_net16_t                                      lid;\r
        ib_net16_t                                      pkey;\r
 \r
-       TO_LONG_PTR(uint8_t* ,                  p_compare_buffer) ;\r
+       uint8_t*                                        p_compare_buffer;\r
        uint8_t                                         compare_offset;\r
        uint8_t                                         compare_length;\r
 \r
@@ -5068,7 +5072,7 @@ typedef struct _ib_cm_listen
        ib_qp_type_t                            qp_type;\r
 \r
        /* valid for ud qp_type only */\r
-       TO_LONG_PTR(const void* ,                       sidr_context) ;\r
+       const void*                                     sidr_context;\r
 \r
 }      ib_cm_listen_t;\r
 /*\r
@@ -5163,21 +5167,19 @@ typedef struct _ib_cm_req
 \r
        ib_al_flags_t                           flags;\r
        uint8_t                                         max_cm_retries;\r
-    uint8_t                                            req_length;\r
-    \r
-       TO_LONG_PTR(ib_path_rec_t* ,            p_primary_path) ;\r
+       TO_LONG_PTR(ib_path_rec_t*,     p_primary_path);\r
 \r
-       TO_LONG_PTR(ib_pfn_cm_rep_cb_t, pfn_cm_rep_cb);\r
+       TO_LONG_PTR(ib_pfn_cm_rep_cb_t, pfn_cm_rep_cb);\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_req_pdata) ;\r
-       \r
+       TO_LONG_PTR(const uint8_t*,     p_req_pdata);\r
+       uint8_t                                         req_length;\r
 \r
        ib_qp_type_t                            qp_type;\r
 \r
        /* valid for rc, uc & rd qp_type only */\r
-    TO_LONG_PTR(       ib_qp_handle_t ,                                h_qp) ; \r
+       TO_LONG_PTR(ib_qp_handle_t,     h_qp);\r
 \r
-       TO_LONG_PTR(uint8_t* ,                  p_compare_buffer) ;\r
+       TO_LONG_PTR(uint8_t*,           p_compare_buffer);\r
        uint8_t                                         compare_offset;\r
        uint8_t                                         compare_length;\r
 \r
@@ -5190,15 +5192,15 @@ typedef struct _ib_cm_req
        uint8_t                                         rnr_retry_cnt;\r
        uint8_t                                         retry_cnt;\r
 \r
-       TO_LONG_PTR(ib_path_rec_t* ,            p_alt_path ) OPTIONAL;\r
+       TO_LONG_PTR(ib_path_rec_t*,     p_alt_path OPTIONAL);\r
 \r
-       TO_LONG_PTR(ib_pfn_cm_req_cb_t, pfn_cm_req_cb);\r
-       TO_LONG_PTR(ib_pfn_cm_mra_cb_t, pfn_cm_mra_cb);\r
+       TO_LONG_PTR(ib_pfn_cm_req_cb_t, pfn_cm_req_cb);\r
+       TO_LONG_PTR(ib_pfn_cm_mra_cb_t, pfn_cm_mra_cb);\r
        TO_LONG_PTR(ib_pfn_cm_rej_cb_t, pfn_cm_rej_cb);\r
 \r
        /* valid for ud qp_type only */\r
-    TO_LONG_PTR(       ib_al_handle_t ,                                h_al) ; \r
-       TO_LONG_PTR(const void* ,                       sidr_context) ;\r
+       TO_LONG_PTR(ib_al_handle_t,     h_al);\r
+       TO_LONG_PTR(const void*,        sidr_context);\r
        uint32_t                                        timeout_ms;\r
        ib_net16_t                                      pkey;\r
 \r
@@ -5361,10 +5363,10 @@ typedef struct _ib_cm_rep
 {\r
        ib_al_flags_t                           flags;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_rep_pdata) ;\r
+       TO_LONG_PTR(const uint8_t*,     p_rep_pdata);\r
        uint8_t                                         rep_length;\r
 \r
-TO_LONG_PTR(   ib_qp_handle_t ,                                h_qp) ; \r
+       TO_LONG_PTR(ib_qp_handle_t,     h_qp);\r
        ib_qp_type_t                            qp_type;\r
 \r
        /* valid for rc, uc & rd qp_type only */\r
@@ -5379,14 +5381,14 @@ TO_LONG_PTR(    ib_qp_handle_t ,                                h_qp) ;
        uint8_t                                         rnr_nak_timeout;\r
        uint8_t                                         rnr_retry_cnt;\r
 \r
-       TO_LONG_PTR(ib_pfn_cm_rej_cb_t, pfn_cm_rej_cb);\r
+       TO_LONG_PTR(ib_pfn_cm_rej_cb_t, pfn_cm_rej_cb);\r
        TO_LONG_PTR(ib_pfn_cm_mra_cb_t, pfn_cm_mra_cb);\r
        TO_LONG_PTR(ib_pfn_cm_rtu_cb_t, pfn_cm_rtu_cb);\r
-       TO_LONG_PTR(ib_pfn_cm_lap_cb_t, pfn_cm_lap_cb);\r
-       TO_LONG_PTR(ib_pfn_cm_dreq_cb_t,pfn_cm_dreq_cb);\r
+       TO_LONG_PTR(ib_pfn_cm_lap_cb_t, pfn_cm_lap_cb);\r
+       TO_LONG_PTR(ib_pfn_cm_dreq_cb_t, pfn_cm_dreq_cb);\r
 \r
-       TO_LONG_PTR(ib_recv_wr_t* ,                     p_recv_wr) ;\r
-       TO_LONG_PTR(ib_recv_wr_t* *, /*__ptr64*/        pp_recv_failure) ;\r
+       TO_LONG_PTR(ib_recv_wr_t*,      p_recv_wr);\r
+       TO_LONG_PTR(ib_recv_wr_t**,     pp_recv_failure);\r
 \r
        /*valid for ud qp_type only */\r
        ib_sidr_status_t                        status;\r
@@ -5499,7 +5501,7 @@ typedef struct _ib_cm_rtu
        uint32_t                                        sq_depth;\r
        uint32_t                                        rq_depth;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_rtu_pdata) ;\r
+       const uint8_t*                          p_rtu_pdata;\r
        uint8_t                                         rtu_length;\r
 \r
        ib_pfn_cm_apr_cb_t                      pfn_cm_apr_cb;\r
@@ -5558,9 +5560,9 @@ typedef struct _ib_cm_rej
 {\r
        ib_rej_status_t                         rej_status;\r
 \r
-       TO_LONG_PTR(ib_ari_t* ,                 p_ari) ;\r
+       ib_ari_t*                                       p_ari;\r
        uint8_t                                         ari_length;\r
-       TO_LONG_PTR(const uint8_t* ,            p_rej_pdata) ;\r
+       const uint8_t*                          p_rej_pdata;\r
        uint8_t                                         rej_length;\r
 \r
 }      ib_cm_rej_t;\r
@@ -5604,7 +5606,7 @@ typedef struct _ib_cm_mra
 {\r
        uint8_t                                         svc_timeout;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_mra_pdata) ;\r
+       TO_LONG_PTR(const uint8_t*,     p_mra_pdata);\r
        uint8_t                                         mra_length;\r
 \r
 }      ib_cm_mra_t;\r
@@ -5641,16 +5643,16 @@ typedef struct _ib_cm_lap
 {\r
        ib_al_flags_t                           flags;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_lap_pdata) ;\r
+       TO_LONG_PTR(const uint8_t*,     p_lap_pdata);\r
        uint8_t                                         lap_length;\r
 \r
        ib_qp_type_t                            qp_type;\r
 \r
        /* valid for rc, uc & rd qp_type only */\r
-TO_LONG_PTR(   ib_qp_handle_t ,                                h_qp) ; \r
+       TO_LONG_PTR(ib_qp_handle_t,     h_qp);\r
 \r
        uint8_t                                         remote_resp_timeout;\r
-       TO_LONG_PTR(ib_path_rec_t* ,            p_alt_path) ;\r
+       TO_LONG_PTR(ib_path_rec_t*,     p_alt_path);\r
        ib_pfn_cm_apr_cb_t                      pfn_cm_apr_cb;\r
 \r
 }      ib_cm_lap_t;\r
@@ -5703,17 +5705,17 @@ TO_LONG_PTR(    ib_qp_handle_t ,                                h_qp) ;
 */\r
 typedef struct _ib_cm_apr\r
 {\r
-       TO_LONG_PTR(const uint8_t* ,                    p_apr_pdata) ;\r
+       TO_LONG_PTR(const uint8_t*,             p_apr_pdata);\r
        uint8_t                                                 apr_length;\r
 \r
        ib_qp_type_t                                    qp_type;\r
 \r
        /* valid for rc, uc & rd qp_type only */\r
-TO_LONG_PTR(   ib_qp_handle_t ,                                        h_qp) \r
+       TO_LONG_PTR(ib_qp_handle_t,             h_qp)\r
 \r
        ib_apr_status_t                                 apr_status;\r
        uint8_t                                                 info_length;\r
-       TO_LONG_PTR(const ib_apr_info_t* ,      p_info) ;\r
+       TO_LONG_PTR(const ib_apr_info_t*, p_info);\r
 \r
 }      ib_cm_apr_t;\r
 /*\r
@@ -5760,13 +5762,13 @@ typedef struct _ib_cm_dreq
 {\r
        ib_al_flags_t                           flags;\r
 \r
-       TO_LONG_PTR(uint8_t* ,                  p_dreq_pdata) ;\r
+       uint8_t*                                        p_dreq_pdata;\r
        uint8_t                                         dreq_length;\r
 \r
        ib_qp_type_t                            qp_type;\r
 \r
        /* valid for rc, uc & rd qp_type only */\r
-TO_LONG_PTR(   ib_qp_handle_t ,                                h_qp) ; \r
+       ib_qp_handle_t                          h_qp;\r
        ib_pfn_cm_drep_cb_t                     pfn_cm_drep_cb;\r
 \r
 }      ib_cm_dreq_t;\r
@@ -5815,7 +5817,7 @@ TO_LONG_PTR(      ib_qp_handle_t ,                                h_qp) ;
 */\r
 typedef struct _ib_cm_drep\r
 {\r
-       TO_LONG_PTR(uint8_t* ,                  p_drep_pdata) ;\r
+       uint8_t*                                        p_drep_pdata;\r
        uint8_t                                         drep_length;\r
 \r
 }      ib_cm_drep_t;\r
@@ -5907,11 +5909,11 @@ typedef void
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_cm_listen(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_cm_listen_t* const           p_cm_listen,\r
        IN              const   ib_pfn_listen_err_cb_t          pfn_listen_err_cb,\r
        IN              const   void* const                                     listen_context,\r
-               OUT                     ib_listen_handle_t FUNC_PTR64* const    ph_cm_listen );\r
+               OUT                     ib_listen_handle_t* const       ph_cm_listen );\r
 /*\r
 * PARAMETERS\r
 *      h_al\r
@@ -5996,7 +5998,7 @@ ib_cm_listen(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_cm_cancel(\r
-       IN              const   ib_listen_handle_t FUNC_PTR64                   h_cm_listen,\r
+       IN              const   ib_listen_handle_t                      h_cm_listen,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL );\r
 /*\r
 * PARAMETERS\r
@@ -6457,7 +6459,7 @@ ib_cm_apr(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_force_apm(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp );\r
+       IN              const   ib_qp_handle_t                          h_qp );\r
 /*\r
 * PARAMETERS\r
 *      h_qp\r
@@ -6664,7 +6666,7 @@ typedef struct _ib_cep_listen
 \r
        net64_t                                         port_guid;\r
 \r
-       TO_LONG_PTR(uint8_t* ,                  p_cmp_buf) ;\r
+       TO_LONG_PTR(uint8_t*,           p_cmp_buf);\r
        uint8_t                                         cmp_len;\r
        uint8_t                                         cmp_offset;\r
 \r
@@ -6716,9 +6718,9 @@ typedef struct _ib_cep_listen
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_create_ioc(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   ib_ioc_profile_t* const         p_ioc_profile,\r
-               OUT                     ib_ioc_handle_t FUNC_PTR64* const               ph_ioc );\r
+               OUT                     ib_ioc_handle_t* const          ph_ioc );\r
 /*\r
 * PARAMETERS\r
 *      h_ca\r
@@ -6768,7 +6770,7 @@ ib_create_ioc(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_destroy_ioc(\r
-       IN              const   ib_ioc_handle_t FUNC_PTR64                              h_ioc );\r
+       IN              const   ib_ioc_handle_t                         h_ioc );\r
 /*\r
 * PARAMETERS\r
 *      h_ioc\r
@@ -6803,7 +6805,7 @@ ib_destroy_ioc(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_reg_ioc(\r
-       IN              const   ib_ioc_handle_t FUNC_PTR64                              h_ioc );\r
+       IN              const   ib_ioc_handle_t                         h_ioc );\r
 /*\r
 * PARAMETERS\r
 *      h_ioc\r
@@ -6845,9 +6847,9 @@ ib_reg_ioc(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_add_svc_entry(\r
-       IN              const   ib_ioc_handle_t FUNC_PTR64                              h_ioc,\r
+       IN              const   ib_ioc_handle_t                         h_ioc,\r
        IN              const   ib_svc_entry_t* const           p_svc_entry,\r
-               OUT                     ib_svc_handle_t FUNC_PTR64* const               ph_svc );\r
+               OUT                     ib_svc_handle_t* const          ph_svc );\r
 /*\r
 * PARAMETERS\r
 *      h_ioc\r
@@ -6902,7 +6904,7 @@ ib_add_svc_entry(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_remove_svc_entry(\r
-       IN              const   ib_svc_handle_t FUNC_PTR64                              h_svc );\r
+       IN              const   ib_svc_handle_t                         h_svc );\r
 /*\r
 * PARAMETERS\r
 *      h_svc\r
@@ -6937,7 +6939,7 @@ ib_remove_svc_entry(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_get_ca_guids(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
                OUT                     ib_net64_t* const                       p_guid_array OPTIONAL,\r
        IN      OUT                     size_t* const                           p_guid_cnt );\r
 /*\r
@@ -6994,7 +6996,7 @@ ib_get_ca_guids(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_get_ca_by_gid(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN              const   ib_gid_t* const                         p_gid,\r
                OUT                     ib_net64_t* const                       p_ca_guid );\r
 /*\r
@@ -7046,7 +7048,7 @@ ib_get_ca_by_gid(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_get_port_by_gid(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN              const   ib_gid_t* const                         p_gid,\r
                OUT                     ib_net64_t* const                       p_port_guid );\r
 /*\r
@@ -7098,8 +7100,8 @@ ib_get_port_by_gid(
 * SYNOPSIS\r
 */\r
 typedef        void\r
-(AL_API * FUNC_PTR64 ib_pfn_mad_comp_cb_t)(\r
-       IN              const   ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+(AL_API *ib_pfn_mad_comp_cb_t)(\r
+       IN              const   ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              void                                            *mad_svc_context,\r
        IN                              ib_mad_element_t                        *p_mad_element );\r
 /*\r
@@ -7146,11 +7148,11 @@ typedef void
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_create_mad_pool(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   size_t                                          min,\r
        IN              const   size_t                                          max,\r
        IN              const   size_t                                          grow_size,\r
-               OUT                     ib_pool_handle_t FUNC_PTR64* const              ph_pool );\r
+               OUT                     ib_pool_handle_t* const         ph_pool );\r
 /*\r
 * PARAMETERS\r
 *      h_al\r
@@ -7211,7 +7213,7 @@ ib_create_mad_pool(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_destroy_mad_pool(\r
-       IN              const   ib_pool_handle_t FUNC_PTR64                     h_pool );\r
+       IN              const   ib_pool_handle_t                        h_pool );\r
 /*\r
 * PARAMETERS\r
 *      h_pool\r
@@ -7247,9 +7249,9 @@ ib_destroy_mad_pool(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_reg_mad_pool(\r
-       IN              const   ib_pool_handle_t FUNC_PTR64                     h_pool,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
-               OUT                     ib_pool_key_t FUNC_PTR64* const         p_pool_key );\r
+       IN              const   ib_pool_handle_t                        h_pool,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
+               OUT                     ib_pool_key_t* const            p_pool_key );\r
 /*\r
 * PARAMETERS\r
 *      h_pool\r
@@ -7305,7 +7307,7 @@ ib_reg_mad_pool(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_dereg_mad_pool(\r
-       IN              const   ib_pool_key_t FUNC_PTR64                                pool_key );\r
+       IN              const   ib_pool_key_t                           pool_key );\r
 /*\r
 * PARAMETERS\r
 *      pool_key\r
@@ -7345,7 +7347,7 @@ ib_dereg_mad_pool(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_get_mad(\r
-       IN              const   ib_pool_key_t FUNC_PTR64                                pool_key,\r
+       IN              const   ib_pool_key_t                           pool_key,\r
        IN              const   size_t                                          buf_size,\r
                OUT                     ib_mad_element_t                        **pp_mad_element );\r
 /*\r
@@ -7475,7 +7477,7 @@ typedef struct _ib_dgrm_info
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_init_dgrm_svc(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_dgrm_info_t* const           p_dgrm_info OPTIONAL );\r
 /*\r
 * PARAMETERS\r
@@ -7581,17 +7583,17 @@ typedef enum _ib_mad_svc_type
 */\r
 typedef struct _ib_mad_svc\r
 {\r
-       TO_LONG_PTR(void*, mad_svc_context);\r
+       TO_LONG_PTR(void,                       *mad_svc_context);\r
        TO_LONG_PTR(ib_pfn_mad_comp_cb_t, pfn_mad_send_cb);\r
-       TO_LONG_PTR(ib_pfn_mad_comp_cb_t,pfn_mad_recv_cb);\r
+       TO_LONG_PTR(ib_pfn_mad_comp_cb_t, pfn_mad_recv_cb);\r
 \r
        boolean_t                                       support_unsol;\r
        uint8_t                                         mgmt_class;\r
        uint8_t                                         mgmt_version;\r
-    ib_mad_svc_type_t                  svc_type;\r
-    \r
        boolean_t                                       method_array[IB_MAX_METHODS];\r
 \r
+    ib_mad_svc_type_t                  svc_type;\r
+\r
 }      ib_mad_svc_t;\r
 /*\r
 * FIELDS\r
@@ -7673,9 +7675,9 @@ typedef struct _ib_mad_svc
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_reg_mad_svc(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_mad_svc_t* const                     p_mad_svc,\r
-               OUT                     ib_mad_svc_handle_t FUNC_PTR64* const   ph_mad_svc );\r
+               OUT                     ib_mad_svc_handle_t* const      ph_mad_svc );\r
 /*\r
 * PARAMETERS\r
 *      h_qp\r
@@ -7729,7 +7731,7 @@ ib_reg_mad_svc(
 */\r
 typedef struct _ib_reg_svc_rec\r
 {\r
-       TO_LONG_PTR(const void* ,                       svc_context) ;\r
+       const void*                                     svc_context;\r
        ib_reg_svc_handle_t                     h_reg_svc;\r
        ib_api_status_t                         req_status;\r
        ib_net16_t                                      resp_status;\r
@@ -7778,7 +7780,7 @@ typedef struct _ib_reg_svc_rec
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_reg_svc_cb_t)(\r
+(AL_API *ib_pfn_reg_svc_cb_t)(\r
        IN                              ib_reg_svc_rec_t                        *p_reg_svc_rec );\r
 /*\r
 * PARAMETERS\r
@@ -7882,7 +7884,7 @@ typedef struct _ib_reg_svc_req
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_reg_svc(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_reg_svc_req_t* const         p_reg_svc_req,\r
                OUT                     ib_reg_svc_handle_t* const      ph_reg_svc );\r
 /*\r
@@ -8081,7 +8083,7 @@ typedef struct _ib_user_query
        ib_net16_t                              attr_id;\r
        uint32_t                                attr_size;\r
        ib_net64_t                              comp_mask;\r
-       TO_LONG_PTR(void* ,                     p_attr) ;\r
+       TO_LONG_PTR(void*,              p_attr);\r
 \r
 }      ib_user_query_t;\r
 /*\r
@@ -8218,12 +8220,12 @@ typedef struct _ib_guid_pair
 */\r
 typedef struct _ib_query_rec\r
 {\r
-       TO_LONG_PTR(const void* ,                       query_context) ;\r
+       const void*                                     query_context;\r
        ib_api_status_t                         status;\r
 \r
        ib_query_type_t                         query_type;\r
        uint32_t                                        result_cnt;\r
-       TO_LONG_PTR(ib_mad_element_t* , p_result_mad) ;\r
+       ib_mad_element_t*                       p_result_mad;\r
 \r
 }      ib_query_rec_t;\r
 /*\r
@@ -8489,7 +8491,7 @@ ib_get_query_svc_rec(
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_query_cb_t)(\r
+(AL_API *ib_pfn_query_cb_t)(\r
        IN                              ib_query_rec_t                          *p_query_rec );\r
 /*\r
 * PARAMETERS\r
@@ -8524,14 +8526,14 @@ typedef void
 typedef struct _ib_query_req\r
 {\r
        ib_query_type_t                         query_type;\r
-       TO_LONG_PTR(const void* ,                       p_query_input) ;\r
+       const void*                                     p_query_input;\r
        ib_net64_t                                      port_guid;\r
 \r
        uint32_t                                        timeout_ms;\r
        uint32_t                                        retry_cnt;\r
        ib_al_flags_t                           flags;\r
 \r
-       TO_LONG_PTR(const void* ,                       query_context) ;\r
+       const void*                                     query_context;\r
        ib_pfn_query_cb_t                       pfn_query_cb;\r
 \r
 }      ib_query_req_t;\r
@@ -8602,9 +8604,9 @@ typedef struct _ib_query_req
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_query(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_query_req_t* const           p_query_req,\r
-               OUT                     ib_query_handle_t FUNC_PTR64* const     ph_query OPTIONAL );\r
+               OUT                     ib_query_handle_t* const        ph_query OPTIONAL );\r
 /*\r
 * PARAMETERS\r
 *      h_al\r
@@ -8663,8 +8665,8 @@ ib_query(
 */\r
 AL_EXPORT void AL_API\r
 ib_cancel_query(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
-       IN              const   ib_query_handle_t FUNC_PTR64                    h_query );\r
+       IN              const   ib_al_handle_t                          h_al,\r
+       IN              const   ib_query_handle_t                       h_query );\r
 /*\r
 * PARAMETERS\r
 *      h_al\r
@@ -8929,11 +8931,11 @@ typedef struct _ib_pnp_rec
 {\r
        ib_pnp_event_t                          pnp_event;\r
 \r
-TO_LONG_PTR(   struct _al_pnp * ,                              h_pnp) ; \r
-TO_LONG_PTR(   struct _al_pnp * ,                              h_ioc_event) ; \r
+       TO_LONG_PTR(struct _al_pnp *, h_pnp);\r
+       TO_LONG_PTR(struct _al_pnp *, h_ioc_event);\r
 \r
-       TO_LONG_PTR(void* ,                             pnp_context) ;\r
-       TO_LONG_PTR(void* ,                             context) ;\r
+       TO_LONG_PTR(void*,                      pnp_context);\r
+       TO_LONG_PTR(void*,                      context);\r
        //NOTE:\r
        //guid and ca_guid use as key to flexi map need to keep these field together\r
        ib_net64_t                                      guid;\r
@@ -9010,7 +9012,7 @@ TO_LONG_PTR(      struct _al_pnp * ,                              h_ioc_event) ;
 typedef struct _ib_pnp_ca_rec\r
 {\r
        ib_pnp_rec_t                            pnp_rec;\r
-       TO_LONG_PTR(ib_ca_attr_t* ,             p_ca_attr) ;\r
+       TO_LONG_PTR(ib_ca_attr_t*,      p_ca_attr);\r
 \r
 }      ib_pnp_ca_rec_t;\r
 /*\r
@@ -9057,8 +9059,8 @@ typedef struct _ib_pnp_ca_rec
 typedef struct _ib_pnp_port_rec\r
 {\r
        ib_pnp_rec_t                            pnp_rec;\r
-       TO_LONG_PTR(ib_ca_attr_t* ,             p_ca_attr) ;\r
-       TO_LONG_PTR(ib_port_attr_t* ,           p_port_attr) ;\r
+       TO_LONG_PTR(ib_ca_attr_t*,      p_ca_attr);\r
+       TO_LONG_PTR(ib_port_attr_t*,p_port_attr);\r
 \r
 }      ib_pnp_port_rec_t;\r
 /*\r
@@ -9306,7 +9308,7 @@ typedef struct _ib_pnp_ioc_path_rec
 * SYNOPSIS\r
 */\r
 typedef ib_api_status_t\r
-(AL_API * FUNC_PTR64 ib_pfn_pnp_cb_t)(\r
+(AL_API *ib_pfn_pnp_cb_t)(\r
        IN                              ib_pnp_rec_t                            *p_pnp_rec );\r
 /*\r
 * PARAMETERS\r
@@ -9399,9 +9401,9 @@ typedef struct _ib_pnp_req
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_reg_pnp(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_pnp_req_t* const                     p_pnp_req,\r
-               OUT                     ib_pnp_handle_t FUNC_PTR64* const               ph_pnp );\r
+               OUT                     ib_pnp_handle_t* const          ph_pnp );\r
 /*\r
 * PARAMETERS\r
 *      h_al\r
@@ -9461,7 +9463,7 @@ ib_reg_pnp(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_dereg_pnp(\r
-       IN              const   ib_pnp_handle_t FUNC_PTR64                              h_pnp,\r
+       IN              const   ib_pnp_handle_t                         h_pnp,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL );\r
 /*\r
 * PARAMETERS\r
@@ -9502,9 +9504,9 @@ ib_dereg_pnp(
 */\r
 typedef struct _ib_sub_rec\r
 {\r
-       TO_LONG_PTR(const void* ,                       sub_context) ;\r
+       const void*                                     sub_context;\r
        ib_api_status_t                         status;\r
-TO_LONG_PTR(   ib_sub_handle_t ,                               h_sub) ; \r
+       ib_sub_handle_t                         h_sub;\r
 \r
 }      ib_sub_rec_t;\r
 /*\r
@@ -9546,7 +9548,7 @@ TO_LONG_PTR(      ib_sub_handle_t ,                               h_sub) ;
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_sub_cb_t)(\r
+(AL_API *ib_pfn_sub_cb_t)(\r
        IN                              ib_sub_rec_t                            *p_sub_rec );\r
 /*\r
 * PARAMETERS\r
@@ -9583,8 +9585,8 @@ typedef void
 */\r
 typedef struct _ib_report_rec\r
 {\r
-       TO_LONG_PTR(const void* ,                               report_context) ;\r
-       TO_LONG_PTR(ib_mad_notice_attr_t* ,     p_notice) ;\r
+       const void*                                             report_context;\r
+       ib_mad_notice_attr_t*                   p_notice;\r
 \r
 }      ib_report_rec_t;\r
 /*\r
@@ -9618,7 +9620,7 @@ typedef struct _ib_report_rec
 * SYNOPSIS\r
 */\r
 typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_report_cb_t)(\r
+(AL_API *ib_pfn_report_cb_t)(\r
        IN                              ib_report_rec_t                         *p_report_rec );\r
 /*\r
 * PARAMETERS\r
@@ -9657,18 +9659,18 @@ typedef void
 */\r
 typedef struct _ib_sub_req\r
 {\r
-       TO_LONG_PTR(ib_svc_name_t* ,            p_class_mgr_name) ;\r
-       TO_LONG_PTR(ib_inform_info_t* , p_inform_info) ;\r
+       ib_svc_name_t*                          p_class_mgr_name;\r
+       ib_inform_info_t*                       p_inform_info;\r
        ib_net64_t                                      port_guid;\r
 \r
        uint32_t                                        timeout_ms;\r
        uint32_t                                        retry_cnt;\r
        ib_al_flags_t                           flags;\r
 \r
-       TO_LONG_PTR(const void* ,                       sub_context) ;\r
+       const void*                                     sub_context;\r
        ib_pfn_sub_cb_t                         pfn_sub_cb;\r
 \r
-       TO_LONG_PTR(const void* ,                       report_context) ;\r
+       const void*                                     report_context;\r
        ib_pfn_report_cb_t                      pfn_report_cb;\r
 \r
 }      ib_sub_req_t;\r
@@ -9739,9 +9741,9 @@ typedef struct _ib_sub_req
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_subscribe(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_sub_req_t* const                     p_sub_req,\r
-               OUT                     ib_sub_handle_t FUNC_PTR64* const               ph_sub );\r
+               OUT                     ib_sub_handle_t* const          ph_sub );\r
 /*\r
 * PARAMETERS\r
 *      h_al\r
@@ -9799,7 +9801,7 @@ ib_subscribe(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_unsubscribe(\r
-       IN              const   ib_sub_handle_t FUNC_PTR64                              h_sub,\r
+       IN              const   ib_sub_handle_t                         h_sub,\r
        IN              const   ib_pfn_destroy_cb_t                     pfn_destroy_cb OPTIONAL );\r
 /*\r
 * PARAMETERS\r
@@ -9853,8 +9855,8 @@ ib_unsubscribe(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_reject_ioc(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
-       IN              const   ib_pnp_handle_t FUNC_PTR64                              h_ioc_event );\r
+       IN              const   ib_al_handle_t                          h_al,\r
+       IN              const   ib_pnp_handle_t                         h_ioc_event );\r
 /*\r
 * PARAMETERS\r
 *      h_al\r
@@ -9928,7 +9930,7 @@ ib_reject_ioc(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_get_guid(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN              const   uint32_t                                        index,\r
        IN              const   ib_pnp_class_t                          device_type,\r
        IN              const   uint64_t                                        attr_mask,\r
@@ -10005,8 +10007,8 @@ ib_get_guid(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_ci_call(\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_ca,\r
-       IN              const   void* FUNC_PTR64 *              const   handle_array    OPTIONAL,\r
+       IN                              ib_ca_handle_t                          h_ca,\r
+       IN              const   void**                          const   handle_array    OPTIONAL,\r
        IN                              uint32_t                                        num_handles,\r
        IN                              ib_ci_op_t*                     const   p_ci_op );\r
 /*\r
@@ -10083,7 +10085,7 @@ ib_ci_call(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_open_al(\r
-               OUT                     ib_al_handle_t FUNC_PTR64* const                ph_al );\r
+               OUT                     ib_al_handle_t* const           ph_al );\r
 /*\r
 * PARAMETERS\r
 *      ph_al\r
@@ -10125,7 +10127,7 @@ ib_open_al(
 */\r
 AL_EXPORT ib_api_status_t AL_API\r
 ib_close_al(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al );\r
+       IN              const   ib_al_handle_t                          h_al );\r
 /*\r
 * PARAMETERS\r
 *      h_al\r
index 921d719..d92dabc 100644 (file)
@@ -1,6 +1,7 @@
 /*\r
  * Copyright (c) 2005 SilverStorm Technologies.  All rights reserved.\r
  * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. \r
+ * Portions Copyright (c) 2008 Microsoft Corporation.  All rights reserved.\r
  *\r
  * This software is available to you under the OpenIB.org BSD license\r
  * below:\r
@@ -207,7 +208,7 @@ typedef ib_api_status_t
        IN              const   ci_completion_cb_t                      pfn_completion_cb,\r
        IN              const   ci_async_event_cb_t                     pfn_async_event_cb,\r
        IN              const   void* const                                     ca_context,\r
-               OUT                     ib_ca_handle_t FUNC_PTR64                               *ph_ca );\r
+               OUT                     ib_ca_handle_t                          *ph_ca );\r
 /*\r
 * DESCRIPTION\r
 *      This routine returns a handle to an open instance of a HCA. Client can call\r
@@ -258,9 +259,9 @@ typedef ib_api_status_t
 */\r
 typedef ib_api_status_t\r
 (*ci_um_open_ca_t) (\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf,\r
-               OUT                     ib_ca_handle_t FUNC_PTR64* const                ph_um_ca );\r
+               OUT                     ib_ca_handle_t* const           ph_um_ca );\r
 /*\r
 * DESCRIPTION\r
 *      This routine is used called on behalf of a user-mode application to\r
@@ -299,7 +300,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_query_ca) (\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
                OUT                     ib_ca_attr_t                            *p_ca_attr OPTIONAL,\r
        IN      OUT                     uint32_t                                        *p_size,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
@@ -350,7 +351,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_modify_ca) (\r
-       IN      const ib_ca_handle_t FUNC_PTR64         h_ca,\r
+       IN      const ib_ca_handle_t            h_ca,\r
        IN      const uint8_t                           port_num,\r
        IN      const ib_ca_mod_t                       ca_mod,\r
        IN      const ib_port_attr_mod_t        *p_port_attr_mod );\r
@@ -403,7 +404,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_close_ca) (\r
-       IN              ib_ca_handle_t FUNC_PTR64       h_ca );\r
+       IN              ib_ca_handle_t  h_ca );\r
 /*\r
 * DESCRIPTION\r
 *      This routine is called when the client no longer wishes to use HCA\r
@@ -441,8 +442,8 @@ typedef ib_api_status_t
 */\r
 typedef void\r
 (*ci_um_close_ca_t) (\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_ca,\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_um_ca );\r
+       IN                              ib_ca_handle_t                          h_ca,\r
+       IN                              ib_ca_handle_t                          h_um_ca );\r
 /*\r
 * DESCRIPTION\r
 *      This routine is called when the client no longer wishes to use HCA\r
@@ -474,9 +475,9 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (*ci_allocate_pd) (\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   ib_pd_type_t                            type,\r
-               OUT                     ib_pd_handle_t FUNC_PTR64                               *ph_pd,\r
+               OUT                     ib_pd_handle_t                          *ph_pd,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
 * DESCRIPTION\r
@@ -520,7 +521,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_deallocate_pd) (\r
-       IN              ib_pd_handle_t FUNC_PTR64               h_pd );\r
+       IN              ib_pd_handle_t          h_pd );\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -551,9 +552,9 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_create_av) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_av_attr_t                            *p_av_attr,\r
-               OUT                     ib_av_handle_t FUNC_PTR64                               *ph_av,\r
+               OUT                     ib_av_handle_t                          *ph_av,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 \r
 /*\r
@@ -598,9 +599,9 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_query_av) (\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_av,\r
+       IN              const   ib_av_handle_t                          h_av,\r
                OUT                     ib_av_attr_t                            *p_av_attr,\r
-               OUT                     ib_pd_handle_t FUNC_PTR64                               *ph_pd,\r
+               OUT                     ib_pd_handle_t                          *ph_pd,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 \r
 /*\r
@@ -638,7 +639,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_modify_av) (\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_av,\r
+       IN              const   ib_av_handle_t                          h_av,\r
        IN              const   ib_av_attr_t                            *p_av_attr,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
@@ -679,7 +680,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_destroy_av) (\r
-       IN      const   ib_av_handle_t FUNC_PTR64               h_av );\r
+       IN      const   ib_av_handle_t          h_av );\r
 /*\r
 * DESCRIPTION\r
 *      This routine destroys the specified address handle. After the routine\r
@@ -705,10 +706,10 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_create_srq) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                       h_pd,\r
+       IN              const   ib_pd_handle_t                  h_pd,\r
        IN              const   void                                            *srq_context,\r
        IN              const   ib_srq_attr_t * const           p_srq_attr,\r
-               OUT                     ib_srq_handle_t FUNC_PTR64                      *ph_srq,\r
+               OUT                     ib_srq_handle_t                 *ph_srq,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
 * DESCRIPTION\r
@@ -762,7 +763,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_modify_srq) (\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_srq,\r
+       IN              const   ib_srq_handle_t                         h_srq,\r
        IN              const   ib_srq_attr_t* const                    p_srq_attr,\r
        IN              const   ib_srq_attr_mask_t                      srq_attr_mask,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
@@ -809,7 +810,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_query_srq) (\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_srq,\r
+       IN              const   ib_srq_handle_t                         h_srq,\r
                OUT                     ib_srq_attr_t* const                    p_srq_attr,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
@@ -847,7 +848,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_destroy_srq) (\r
-       IN      const   ib_srq_handle_t FUNC_PTR64              h_srq );\r
+       IN      const   ib_srq_handle_t         h_srq );\r
 /*\r
 * DESCRIPTION\r
 *      Destroys the associated srq. The srq could have outstanding work requests\r
@@ -888,11 +889,11 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_create_qp) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   void                                            *qp_context,\r
        IN              const   ib_qp_create_t                          *p_create_attr,\r
                OUT                     ib_qp_attr_t                            *p_qp_attr,\r
-               OUT                     ib_qp_handle_t FUNC_PTR64                               *ph_qp,\r
+               OUT                     ib_qp_handle_t                          *ph_qp,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
 * DESCRIPTION\r
@@ -950,12 +951,12 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_create_spl_qp) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64               h_pd,\r
+       IN              const   ib_pd_handle_t          h_pd,\r
        IN              const   uint8_t                         port_num,\r
        IN              const   void                            *qp_context,\r
        IN              const   ib_qp_create_t          *p_create_attr,\r
                OUT                     ib_qp_attr_t            *p_qp_attr,\r
-               OUT                     ib_qp_handle_t FUNC_PTR64               *ph_qp );\r
+               OUT                     ib_qp_handle_t          *ph_qp );\r
 /*\r
 * DESCRIPTION\r
 *      Create and return a handle to for the indicated service type on the\r
@@ -1018,7 +1019,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_modify_qp) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_qp_mod_t                                     *p_modify_attr,\r
                OUT                     ib_qp_attr_t                            *p_qp_attr OPTIONAL,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
@@ -1071,7 +1072,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_ndi_modify_qp) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_qp_mod_t                                     *p_modify_attr,\r
                OUT                     ib_qp_attr_t                            *p_qp_attr OPTIONAL,\r
        IN              const   uint32_t                                        buf_size,\r
@@ -1128,7 +1129,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_query_qp) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
                OUT                     ib_qp_attr_t* const                     p_qp_attr,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
@@ -1165,7 +1166,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_destroy_qp) (\r
-       IN      const   ib_qp_handle_t FUNC_PTR64               h_qp,\r
+       IN      const   ib_qp_handle_t          h_qp,\r
        IN      const   uint64_t                        timewait );\r
 /*\r
 * DESCRIPTION\r
@@ -1215,10 +1216,10 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_create_cq) (\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   void                                            *cq_context,\r
        IN      OUT                     uint32_t* const                         p_size,\r
-               OUT                     ib_cq_handle_t FUNC_PTR64                               *ph_cq,\r
+               OUT                     ib_cq_handle_t                          *ph_cq,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
 * DESCRIPTION\r
@@ -1271,7 +1272,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_resize_cq) (\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN      OUT                     uint32_t* const                         p_size,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
@@ -1324,7 +1325,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_query_cq) (\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
                OUT                     uint32_t                                        *p_size,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
@@ -1358,7 +1359,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_destroy_cq) (\r
-       IN      const   ib_cq_handle_t FUNC_PTR64               h_cq );\r
+       IN      const   ib_cq_handle_t          h_cq );\r
 /*\r
 * DESCRIPTION\r
 *      Destroys a completion queue. If any queue pairs are still bound\r
@@ -1400,11 +1401,11 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_register_mr) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_mr_create_t* const           p_mr_create,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64*      const           ph_mr,\r
+               OUT                     ib_mr_handle_t *        const           ph_mr,\r
        IN                              boolean_t                                       um_call );\r
 /*\r
 * DESCRIPTION\r
@@ -1463,12 +1464,12 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_register_pmr) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_phys_create_t*const          p_pmr_create,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64* const                ph_mr,\r
+               OUT                     ib_mr_handle_t* const           ph_mr,\r
        IN                              boolean_t                                       um_call );\r
 /*\r
 * DESCRIPTION\r
@@ -1534,7 +1535,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_query_mr) (\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                       h_mr,\r
+       IN              const   ib_mr_handle_t                  h_mr,\r
                OUT                     ib_mr_attr_t*   const   p_mr_query );\r
 /*\r
 * DESCRIPTION\r
@@ -1572,12 +1573,12 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_modify_mr) (\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr,\r
+       IN              const   ib_mr_handle_t                          h_mr,\r
        IN              const   ib_mr_mod_t                                     mr_modify_mask,\r
        IN              const   ib_mr_create_t* const           p_mr_create OPTIONAL,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd OPTIONAL,\r
+       IN              const   ib_pd_handle_t                          h_pd OPTIONAL,\r
        IN                              boolean_t                                       um_call );\r
 /*\r
 * DESCRIPTION\r
@@ -1644,13 +1645,13 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_modify_pmr) (\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr,\r
+       IN              const   ib_mr_handle_t                          h_mr,\r
        IN              const   ib_mr_mod_t                                     mr_modify_mask,\r
        IN              const   ib_phys_create_t* const         p_pmr_create,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd OPTIONAL,\r
+       IN              const   ib_pd_handle_t                          h_pd OPTIONAL,\r
        IN                              boolean_t                                       um_call );\r
 /*\r
 * DESCRIPTION\r
@@ -1719,13 +1720,13 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_register_smr) (\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_mr_handle_t                          h_mr,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_access_t                                     access_ctrl,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64* const                ph_mr,\r
+               OUT                     ib_mr_handle_t* const           ph_mr,\r
        IN                              boolean_t                                       um_call );\r
 /*\r
 * DESCRIPTION\r
@@ -1783,7 +1784,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_deregister_mr) (\r
-       IN      const   ib_mr_handle_t FUNC_PTR64               h_mr );\r
+       IN      const   ib_mr_handle_t          h_mr );\r
 /*\r
 * DESCRIPTION\r
 *      This routine deregisters  a memory region from the HCA. The region can\r
@@ -1818,9 +1819,9 @@ typedef ib_api_status_t
 */\r
 typedef ib_api_status_t\r
 (*ci_alloc_mlnx_fmr) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN                              mlnx_fmr_create_t const         *p_fmr_ctreate,\r
-               OUT                     mlnx_fmr_handle_t FUNC_PTR64* const     ph_fmr);\r
+               OUT                     mlnx_fmr_handle_t* const        ph_fmr);\r
 /*\r
 * DESCRIPTION\r
 *      //TODO \r
@@ -1868,7 +1869,7 @@ typedef ib_api_status_t
 */\r
 typedef ib_api_status_t\r
 (*ci_map_phys_mlnx_fmr) (\r
-       IN              const   mlnx_fmr_handle_t FUNC_PTR64                    h_fmr,\r
+       IN              const   mlnx_fmr_handle_t                       h_fmr,\r
        IN              const   uint64_t* const                         paddr_list,\r
        IN              const   int                                                     list_len,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
@@ -1927,7 +1928,7 @@ typedef ib_api_status_t
 */\r
 typedef ib_api_status_t\r
 (*ci_unmap_mlnx_fmr) (\r
-       IN              const   mlnx_fmr_handle_t FUNC_PTR64                    *ph_fmr);\r
+       IN              const   mlnx_fmr_handle_t                       *ph_fmr);\r
 /*\r
 * DESCRIPTION\r
 *      //TODO\r
@@ -1968,7 +1969,7 @@ typedef ib_api_status_t
 */\r
 typedef ib_api_status_t\r
 (*ci_dealloc_mlnx_fmr) (\r
-       IN                      mlnx_fmr_handle_t FUNC_PTR64    const           h_fmr);\r
+       IN                      mlnx_fmr_handle_t       const           h_fmr);\r
 /*\r
 * DESCRIPTION\r
 *      //TODO\r
@@ -2008,9 +2009,9 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_create_mw) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
                OUT                     net32_t* const                          p_rkey,\r
-               OUT                     ib_mw_handle_t FUNC_PTR64                               *ph_mw,\r
+               OUT                     ib_mw_handle_t                          *ph_mw,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
 * DESCRIPTION\r
@@ -2053,8 +2054,8 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_query_mw) (\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw,\r
-               OUT                     ib_pd_handle_t FUNC_PTR64                               *ph_pd,\r
+       IN              const   ib_mw_handle_t                          h_mw,\r
+               OUT                     ib_pd_handle_t                          *ph_pd,\r
                OUT                     net32_t* const                          p_rkey,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
@@ -2093,8 +2094,8 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_bind_mw) (\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw,\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_mw_handle_t                          h_mw,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN                              ib_bind_wr_t* const                     p_mw_bind,\r
                OUT                     net32_t* const                          p_rkey );\r
 /*\r
@@ -2156,7 +2157,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_destroy_mw) (\r
-       IN      const   ib_mw_handle_t FUNC_PTR64               h_mw );\r
+       IN      const   ib_mw_handle_t          h_mw );\r
 /*\r
 * DESCRIPTION\r
 *      This routine deallocates a window entry created via a ci_create_mw.\r
@@ -2187,7 +2188,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_post_send) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                       h_qp,\r
+       IN              const   ib_qp_handle_t                  h_qp,\r
        IN                              ib_send_wr_t*   const   p_send_wr,\r
                OUT                     ib_send_wr_t                    **pp_failed );\r
 /*\r
@@ -2248,7 +2249,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_post_srq_recv) (\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                      h_srq,\r
+       IN              const   ib_srq_handle_t                 h_srq,\r
        IN                              ib_recv_wr_t*   const   p_recv_wr,\r
                OUT                     ib_recv_wr_t                    **pp_failed );\r
 /*\r
@@ -2293,7 +2294,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_post_recv) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                       h_qp,\r
+       IN              const   ib_qp_handle_t                  h_qp,\r
        IN                              ib_recv_wr_t*   const   p_recv_wr,\r
                OUT                     ib_recv_wr_t                    **pp_failed );\r
 /*\r
@@ -2343,7 +2344,7 @@ typedef ib_api_status_t
 */\r
 typedef ib_api_status_t\r
 (*ci_peek_cq) (\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        OUT                             uint32_t* const                         p_n_cqes );\r
 /*\r
 * PARAMETERS\r
@@ -2380,7 +2381,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_poll_cq) (\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN      OUT                     ib_wc_t** const                         pp_free_wclist,\r
                OUT                     ib_wc_t** const                         pp_done_wclist );\r
 /*\r
@@ -2421,7 +2422,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_enable_cq_notify) (\r
-       IN      const   ib_cq_handle_t FUNC_PTR64               h_cq,\r
+       IN      const   ib_cq_handle_t          h_cq,\r
        IN      const   boolean_t                       solicited );\r
 /*\r
 * DESCRIPTION\r
@@ -2477,7 +2478,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_enable_ncomp_cq_notify) (\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN              const   uint32_t                                        n_cqes );\r
 /*\r
 * DESCRIPTION\r
@@ -2523,10 +2524,10 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_attach_mcast) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_gid_t                                        *p_mcast_gid,\r
        IN              const   ib_net16_t                                      mcast_lid,\r
-               OUT                     ib_mcast_handle_t FUNC_PTR64                    *ph_mcast,\r
+               OUT                     ib_mcast_handle_t                       *ph_mcast,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
 /*\r
 * DESCRIPTION\r
@@ -2577,7 +2578,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_detach_mcast) (\r
-       IN      const   ib_mcast_handle_t FUNC_PTR64            h_mcast );\r
+       IN      const   ib_mcast_handle_t               h_mcast );\r
 /*\r
 * DESCRIPTION\r
 *      This routine detaches a queue pair from its previously associated multicast\r
@@ -2606,7 +2607,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ci_local_mad) (\r
-       IN              const   ib_ca_handle_t FUNC_PTR64               h_ca,\r
+       IN              const   ib_ca_handle_t          h_ca,\r
        IN              const   uint8_t                         port_num,\r
        IN              const   ib_av_attr_t                    *p_src_av_attr,\r
        IN              const   ib_mad_t                        *p_mad_in,\r
@@ -2670,8 +2671,8 @@ typedef ib_api_status_t
 */\r
 typedef ib_api_status_t\r
 (*ci_vendor_call)(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
-       IN              const   void* FUNC_PTR64* const         handle_array    OPTIONAL,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
+       IN              const   void** const                            handle_array    OPTIONAL,\r
        IN                              uint32_t                                        num_handles,\r
        IN                              ib_ci_op_t* const                       p_ci_op,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf OPTIONAL );\r
index 890e490..b4e6eae 100644 (file)
@@ -1,5 +1,6 @@
 /*\r
  * Copyright (c) 2005 SilverStorm Technologies.  All rights reserved.\r
+ * Portions Copyright (c) 2008 Microsoft Corporation.  All rights reserved.\r
  *\r
  * This software is available to you under the OpenIB.org BSD license\r
  * below:\r
@@ -58,243 +59,243 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_open_ca_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_net64_t                                      ca_guid,\r
        IN              const   ib_pfn_event_cb_t                       ca_event_cb OPTIONAL,\r
        IN              const   void* const                                     ca_context,\r
-               OUT                     ib_ca_handle_t FUNC_PTR64* const                ph_ca );\r
+               OUT                     ib_ca_handle_t* const           ph_ca );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_query_ca_t)(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
                OUT                     ib_ca_attr_t* const                     p_ca_attr OPTIONAL,\r
        IN      OUT                     uint32_t* const                         p_size );\r
 \r
 typedef DEVICE_OBJECT*\r
 (*ib_pfn_get_ca_dev_t)(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca );\r
+       IN              const   ib_ca_handle_t                          h_ca );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_query_ca_by_guid_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_net64_t                                      ca_guid,\r
                OUT                     ib_ca_attr_t* const                     p_ca_attr OPTIONAL,\r
        IN      OUT                     size_t* const                           p_size );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_modify_ca_t)(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   uint8_t                                         port_num,\r
        IN              const   ib_ca_mod_t                                     ca_mod,\r
        IN              const   ib_port_attr_mod_t* const       p_port_attr_mod );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_close_ca_t)(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   ib_pfn_destroy_cb_t                     destroy_cb OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_alloc_pd_t)(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   ib_pd_type_t                            pd_type,\r
        IN              const   void* const                                     pd_context,\r
-               OUT                     ib_pd_handle_t FUNC_PTR64* const                ph_pd );\r
+               OUT                     ib_pd_handle_t* const           ph_pd );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_dealloc_pd_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_pfn_destroy_cb_t                     destroy_cb OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_create_av_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_av_attr_t* const                     p_av_attr,\r
-               OUT                     ib_av_handle_t FUNC_PTR64* const                ph_av );\r
+               OUT                     ib_av_handle_t* const           ph_av );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_query_av_t)(\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_av,\r
+       IN              const   ib_av_handle_t                          h_av,\r
                OUT                     ib_av_attr_t* const                     p_av_attr,\r
-               OUT                     ib_pd_handle_t FUNC_PTR64* const                ph_pd );\r
+               OUT                     ib_pd_handle_t* const           ph_pd );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_modify_av_t)(\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_av,\r
+       IN              const   ib_av_handle_t                          h_av,\r
        IN              const   ib_av_attr_t* const                     p_av_attr );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_destroy_av_t)(\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_av );\r
+       IN              const   ib_av_handle_t                          h_av );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_create_srq_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_srq_attr_t* const                    p_srq_attr,\r
        IN              const   void* const                                     srq_context,\r
        IN              const   ib_pfn_event_cb_t                               srq_event_cb OPTIONAL,\r
-               OUT                     ib_srq_handle_t FUNC_PTR64* const                       ph_srq );\r
+               OUT                     ib_srq_handle_t* const                  ph_srq );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_query_srq_t)(\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_srq,\r
+       IN              const   ib_srq_handle_t                         h_srq,\r
                OUT                     ib_srq_attr_t* const                    p_srq_attr );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_modify_srq_t)(\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_srq,\r
+       IN              const   ib_srq_handle_t                         h_srq,\r
        IN              const   ib_srq_attr_t* const                    p_srq_attr,\r
        IN              const   ib_srq_attr_mask_t                              srq_attr_mask );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_destroy_srq_t)(\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_srq,\r
+       IN              const   ib_srq_handle_t                         h_srq,\r
        IN              const   ib_pfn_destroy_cb_t                     destroy_cb OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_post_srq_recv_t)(\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_srq,\r
+       IN              const   ib_srq_handle_t                         h_srq,\r
        IN                              ib_recv_wr_t* const                     p_recv_wr,\r
                OUT                     ib_recv_wr_t                            **pp_recv_failure OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_create_qp_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_qp_create_t* const           p_qp_create,\r
        IN              const   void* const                                     qp_context,\r
        IN              const   ib_pfn_event_cb_t                       qp_event_cb OPTIONAL,\r
-               OUT                     ib_qp_handle_t FUNC_PTR64* const                ph_qp );\r
+               OUT                     ib_qp_handle_t* const           ph_qp );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_get_spl_qp_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_net64_t                                      port_guid,\r
        IN              const   ib_qp_create_t* const           p_qp_create,\r
        IN              const   void* const                                     qp_context,\r
        IN              const   ib_pfn_event_cb_t                       qp_event_cb OPTIONAL,\r
-               OUT                     ib_pool_key_t FUNC_PTR64* const         p_pool_key OPTIONAL,\r
-               OUT                     ib_qp_handle_t FUNC_PTR64* const                ph_qp );\r
+               OUT                     ib_pool_key_t* const            p_pool_key OPTIONAL,\r
+               OUT                     ib_qp_handle_t* const           ph_qp );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_query_qp_t)(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
                OUT                     ib_qp_attr_t* const                     p_qp_attr );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_modify_qp_t)(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_qp_mod_t* const                      p_qp_mod );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_destroy_qp_t)(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_pfn_destroy_cb_t                     destroy_cb OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_create_cq_t)(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN      OUT                     ib_cq_create_t* const           p_cq_create,\r
        IN              const   void* const                                     cq_context,\r
        IN              const   ib_pfn_event_cb_t                       cq_event_cb OPTIONAL,\r
-               OUT                     ib_cq_handle_t FUNC_PTR64* const                ph_cq );\r
+               OUT                     ib_cq_handle_t* const           ph_cq );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_modify_cq_t)(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN      OUT                     uint32_t* const                         p_size );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_query_cq_t)(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
                OUT                     uint32_t* const                         p_size );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_destroy_cq_t)(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN              const   ib_pfn_destroy_cb_t                     destroy_cb OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_reg_mem_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_mr_create_t* const           p_mr_create,\r
                OUT                     uint32_t* const                         p_lkey,\r
                OUT                     uint32_t* const                         p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64* const                ph_mr );\r
+               OUT                     ib_mr_handle_t* const           ph_mr );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_reg_phys_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_phys_create_t* const         p_phys_create,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
                OUT                     uint32_t* const                         p_lkey,\r
                OUT                     uint32_t* const                         p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64* const                ph_mr );\r
+               OUT                     ib_mr_handle_t* const           ph_mr );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_query_mr_t)(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr,\r
+       IN              const   ib_mr_handle_t                          h_mr,\r
                OUT                     ib_mr_attr_t* const                     p_mr_attr );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_rereg_mem_t)(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr,\r
+       IN              const   ib_mr_handle_t                          h_mr,\r
        IN              const   ib_mr_mod_t                                     mr_mod_mask,\r
        IN              const   ib_mr_create_t* const           p_mr_create OPTIONAL,\r
                OUT                     uint32_t* const                         p_lkey,\r
                OUT                     uint32_t* const                         p_rkey,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd OPTIONAL );\r
+       IN              const   ib_pd_handle_t                          h_pd OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_rereg_phys_t)(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr,\r
+       IN              const   ib_mr_handle_t                          h_mr,\r
        IN              const   ib_mr_mod_t                                     mr_mod_mask,\r
        IN              const   ib_phys_create_t* const         p_phys_create OPTIONAL,\r
        IN      OUT                     void** const                            p_vaddr,\r
                OUT                     uint32_t* const                         p_lkey,\r
                OUT                     uint32_t* const                         p_rkey,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd OPTIONAL );\r
+       IN              const   ib_pd_handle_t                          h_pd OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_reg_shared_t)(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_mr_handle_t                          h_mr,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_access_t                                     access_ctrl,\r
        IN      OUT                     void** const                            p_vaddr,\r
                OUT                     uint32_t* const                         p_lkey,\r
                OUT                     uint32_t* const                         p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64* const                ph_mr );\r
+               OUT                     ib_mr_handle_t* const           ph_mr );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_create_shmid_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   int                                                     shmid,\r
        IN              const   ib_mr_create_t* const           p_mr_create,\r
                OUT                     uint32_t* const                         p_lkey,\r
                OUT                     uint32_t* const                         p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64* const                ph_mr );\r
+               OUT                     ib_mr_handle_t* const           ph_mr );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_reg_shmid_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_shmid_t                                      shmid,\r
        IN              const   ib_mr_create_t* const           p_mr_create,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
                OUT                     net32_t* const                          p_lkey,\r
                OUT                     net32_t* const                          p_rkey,\r
-               OUT                     ib_mr_handle_t FUNC_PTR64* const                ph_mr );\r
+               OUT                     ib_mr_handle_t* const           ph_mr );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_dereg_mr_t)(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr );\r
+       IN              const   ib_mr_handle_t                          h_mr );\r
 \r
 typedef ib_api_status_t\r
 (*mlnx_pfn_create_fmr_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   mlnx_fmr_create_t* const        p_fmr_create,\r
-               OUT                     mlnx_fmr_handle_t FUNC_PTR64* const     ph_fmr );\r
+               OUT                     mlnx_fmr_handle_t* const        ph_fmr );\r
 \r
 typedef ib_api_status_t\r
 (*mlnx_pfn_map_phys_fmr_t)(\r
-       IN              const   mlnx_fmr_handle_t FUNC_PTR64                    h_fmr,\r
+       IN              const   mlnx_fmr_handle_t                       h_fmr,\r
        IN              const   uint64_t* const                         paddr_list,\r
        IN              const   int                                                     list_len,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
@@ -303,128 +304,128 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*mlnx_pfn_unmap_fmr_t)(\r
-       IN              const   mlnx_fmr_handle_t FUNC_PTR64                    h_fmr );\r
+       IN              const   mlnx_fmr_handle_t                       h_fmr );\r
 \r
 typedef ib_api_status_t\r
 (*mlnx_pfn_destroy_fmr_t)(\r
-       IN              mlnx_fmr_handle_t FUNC_PTR64 const                              h_fmr );\r
+       IN              mlnx_fmr_handle_t  const                                h_fmr );\r
 \r
 \r
 typedef ib_api_status_t\r
 (*mlnx_pfn_create_fmr_pool_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   mlnx_fmr_pool_create_t          *p_fmr_pool_attr,\r
-       OUT             mlnx_fmr_pool_handle_t FUNC_PTR64* const                        ph_pool );\r
+       OUT             mlnx_fmr_pool_handle_t* const                   ph_pool );\r
 \r
 \r
 typedef ib_api_status_t\r
 (*mlnx_pfn_destroy_fmr_pool_t)(\r
-       IN              const   mlnx_fmr_pool_handle_t FUNC_PTR64                       h_pool );\r
+       IN              const   mlnx_fmr_pool_handle_t                  h_pool );\r
 \r
 \r
 typedef ib_api_status_t\r
 (*mlnx_pfn_map_phys_fmr_pool_t)(\r
-       IN              const   mlnx_fmr_pool_handle_t FUNC_PTR64               h_pool ,\r
+       IN              const   mlnx_fmr_pool_handle_t          h_pool ,\r
        IN              const   uint64_t* const                         paddr_list,\r
        IN              const   int                                                     list_len,\r
        IN      OUT                     uint64_t* const                         p_vaddr,\r
-       OUT             net32_t* const                                  p_lkey,\r
-       OUT             net32_t* const                                  p_rkey,\r
-       OUT                             mlnx_fmr_pool_el_t FUNC_PTR64                   *p_fmr_el);\r
+       OUT             net32_t* const                                  p_lkey,\r
+       OUT             net32_t* const                                  p_rkey,\r
+       OUT                             mlnx_fmr_pool_el_t                      *p_fmr_el);\r
 \r
 typedef ib_api_status_t\r
 (*mlnx_pfn_unmap_fmr_pool_t)(\r
-       IN                      mlnx_fmr_pool_el_t FUNC_PTR64                           p_fmr_el );\r
+       IN                      mlnx_fmr_pool_el_t                              p_fmr_el );\r
 \r
 typedef ib_api_status_t\r
 (*mlnx_pfn_flush_fmr_pool_t)(\r
-       IN              const   mlnx_fmr_pool_handle_t FUNC_PTR64                       h_pool );\r
+       IN              const   mlnx_fmr_pool_handle_t                  h_pool );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_create_mw_t)(\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
                OUT                     uint32_t* const                         p_rkey,\r
-               OUT                     ib_mw_handle_t FUNC_PTR64* const                        ph_mw );\r
+               OUT                     ib_mw_handle_t* const                   ph_mw );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_query_mw_t)(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw,\r
-               OUT                     ib_pd_handle_t FUNC_PTR64* const                        ph_pd,\r
+       IN              const   ib_mw_handle_t                          h_mw,\r
+               OUT                     ib_pd_handle_t* const                   ph_pd,\r
                OUT                     uint32_t* const                         p_rkey );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_bind_mw_t)(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw,\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_mw_handle_t                          h_mw,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN                              ib_bind_wr_t* const                     p_mw_bind,\r
                OUT                     uint32_t* const                         p_rkey );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_destroy_mw_t)(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw );\r
+       IN              const   ib_mw_handle_t                          h_mw );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_post_send_t)(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN                              ib_send_wr_t* const                     p_send_wr,\r
                OUT                     ib_send_wr_t                            **pp_send_failure OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_post_recv_t)(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN                              ib_recv_wr_t* const                     p_recv_wr,\r
                OUT                     ib_recv_wr_t                            **pp_recv_failure OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_send_mad_t)(\r
-       IN              const   ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN              const   ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t* const         p_mad_element_list,\r
                OUT                     ib_mad_element_t                        **pp_mad_failure OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_cancel_mad_t)(\r
-       IN              const   ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN              const   ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t* const         p_mad_element );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_poll_cq_t)(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN      OUT                     ib_wc_t** const                         pp_free_wclist,\r
                OUT                     ib_wc_t** const                         pp_done_wclist );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_rearm_cq_t)(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN              const   boolean_t                                       solicited );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_join_mcast_t)(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_mcast_req_t* const           p_mcast_req );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_leave_mcast_t)(\r
-       IN              const   ib_mcast_handle_t FUNC_PTR64                    h_mcast,\r
+       IN              const   ib_mcast_handle_t                       h_mcast,\r
        IN              const   ib_pfn_destroy_cb_t                     destroy_cb );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_local_mad_t)(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   uint8_t                                         port_num,\r
        IN              const   void* const                                     p_mad_in,\r
                OUT                     void*                                           p_mad_out );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_cm_listen_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_cm_listen_t* const           p_cm_listen,\r
        IN              const   ib_pfn_listen_err_cb_t          listen_err_cb,\r
        IN              const   void* const                                     listen_context,\r
-               OUT                     ib_listen_handle_t FUNC_PTR64* const    ph_cm_listen );\r
+               OUT                     ib_listen_handle_t* const       ph_cm_listen );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_cm_cancel_t)(\r
-       IN              const   ib_listen_handle_t FUNC_PTR64                   h_cm_listen,\r
+       IN              const   ib_listen_handle_t                      h_cm_listen,\r
        IN              const   ib_pfn_destroy_cb_t                     destroy_cb OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
@@ -462,7 +463,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_force_apm_t)(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp );\r
+       IN              const   ib_qp_handle_t                          h_qp );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_cm_dreq_t)(\r
@@ -480,77 +481,77 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_create_ioc_t)(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca,\r
+       IN              const   ib_ca_handle_t                          h_ca,\r
        IN              const   ib_ioc_profile_t* const         p_ioc_profile,\r
-               OUT                     ib_ioc_handle_t FUNC_PTR64* const               ph_ioc );\r
+               OUT                     ib_ioc_handle_t* const          ph_ioc );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_destroy_ioc_t)(\r
-       IN              const   ib_ioc_handle_t FUNC_PTR64                              h_ioc );\r
+       IN              const   ib_ioc_handle_t                         h_ioc );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_reg_ioc_t)(\r
-       IN              const   ib_ioc_handle_t FUNC_PTR64                              h_ioc );\r
+       IN              const   ib_ioc_handle_t                         h_ioc );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_add_svc_entry_t)(\r
-       IN              const   ib_ioc_handle_t FUNC_PTR64                              h_ioc,\r
+       IN              const   ib_ioc_handle_t                         h_ioc,\r
        IN              const   ib_svc_entry_t* const           p_svc_entry,\r
-               OUT                     ib_svc_handle_t FUNC_PTR64* const               ph_svc );\r
+               OUT                     ib_svc_handle_t* const          ph_svc );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_remove_svc_entry_t)(\r
-       IN              const   ib_svc_handle_t FUNC_PTR64                              h_svc );\r
+       IN              const   ib_svc_handle_t                         h_svc );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_get_ca_guids_t)(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
                OUT                     ib_net64_t* const                       p_guid_array OPTIONAL,\r
        IN      OUT                     uintn_t* const                          p_guid_cnt );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_get_ca_by_gid_t)(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN              const   ib_gid_t* const                         p_gid,\r
                OUT                     ib_net64_t* const                       p_ca_guid );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_get_ca_by_gid_t)(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN              const   ib_gid_t* const                         p_gid,\r
                OUT                     ib_net64_t* const                       p_ca_guid );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_get_port_by_gid_t)(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN              const   ib_gid_t* const                         p_gid,\r
                OUT                     ib_net64_t* const                       p_port_guid );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_create_mad_pool_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   size_t                                          min,\r
        IN              const   size_t                                          max,\r
        IN              const   size_t                                          grow_size,\r
-               OUT                     ib_pool_handle_t FUNC_PTR64* const              ph_pool );\r
+               OUT                     ib_pool_handle_t* const         ph_pool );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_destroy_mad_pool_t)(\r
-       IN              const   ib_pool_handle_t FUNC_PTR64                     h_pool );\r
+       IN              const   ib_pool_handle_t                        h_pool );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_reg_mad_pool_t)(\r
-       IN              const   ib_pool_handle_t FUNC_PTR64                     h_pool,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
-               OUT                     ib_pool_key_t FUNC_PTR64* const         p_pool_key );\r
+       IN              const   ib_pool_handle_t                        h_pool,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
+               OUT                     ib_pool_key_t* const            p_pool_key );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_dereg_mad_pool_t)(\r
-       IN              const   ib_pool_key_t FUNC_PTR64                                pool_key );\r
+       IN              const   ib_pool_key_t                           pool_key );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_get_mad_t)(\r
-       IN              const   ib_pool_key_t FUNC_PTR64                                pool_key,\r
+       IN              const   ib_pool_key_t                           pool_key,\r
        IN              const   size_t                                          buf_size,\r
                OUT                     ib_mad_element_t                        **pp_mad_element );\r
 \r
@@ -560,18 +561,18 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_init_dgrm_svc_t)(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_dgrm_info_t* const           p_dgrm_info OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_reg_mad_svc_t)(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_mad_svc_t* const                     p_mad_svc,\r
-               OUT                     ib_mad_svc_handle_t FUNC_PTR64* const   ph_mad_svc );\r
+               OUT                     ib_mad_svc_handle_t* const      ph_mad_svc );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_reg_svc_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_reg_svc_req_t* const         p_reg_svc_req,\r
                OUT                     ib_reg_svc_handle_t* const      ph_reg_svc );\r
 \r
@@ -582,56 +583,56 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_query_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_query_req_t* const           p_query_req,\r
-               OUT                     ib_query_handle_t FUNC_PTR64* const     ph_query OPTIONAL );\r
+               OUT                     ib_query_handle_t* const        ph_query OPTIONAL );\r
 \r
 typedef void\r
 (*ib_pfn_cancel_query_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
-       IN              const   ib_query_handle_t FUNC_PTR64                    query_hndl );\r
+       IN              const   ib_al_handle_t                          h_al,\r
+       IN              const   ib_query_handle_t                       query_hndl );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_reg_pnp_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_pnp_req_t* const                     p_pnp_req,\r
-               OUT                     ib_pnp_handle_t FUNC_PTR64* const               ph_pnp );\r
+               OUT                     ib_pnp_handle_t* const          ph_pnp );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_dereg_pnp_t)(\r
-       IN              const   ib_pnp_handle_t FUNC_PTR64                              h_pnp,\r
+       IN              const   ib_pnp_handle_t                         h_pnp,\r
        IN              const   ib_pfn_destroy_cb_t                     destroy_cb OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_subscribe_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_sub_req_t* const                     p_sub_req,\r
-               OUT                     ib_sub_handle_t FUNC_PTR64* const               ph_sub );\r
+               OUT                     ib_sub_handle_t* const          ph_sub );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_unsubscribe_t)(\r
-       IN              const   ib_sub_handle_t FUNC_PTR64                              h_sub,\r
+       IN              const   ib_sub_handle_t                         h_sub,\r
        IN              const   ib_pfn_destroy_cb_t                     destroy_cb OPTIONAL );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_reject_ioc_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
-       IN              const   ib_pnp_handle_t FUNC_PTR64                              h_ioc_event );\r
+       IN              const   ib_al_handle_t                          h_al,\r
+       IN              const   ib_pnp_handle_t                         h_ioc_event );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_ci_call_t)(\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_ca,\r
-       IN              const   void* FUNC_PTR64 *              const   handle_array    OPTIONAL,\r
+       IN                              ib_ca_handle_t                          h_ca,\r
+       IN              const   void**                          const   handle_array    OPTIONAL,\r
        IN                              uint32_t                                        num_handles,\r
        IN                              ib_ci_op_t*                     const   p_ci_op );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_open_al_t)(\r
-               OUT                     ib_al_handle_t FUNC_PTR64* const                ph_al );\r
+               OUT                     ib_al_handle_t* const           ph_al );\r
 \r
 typedef ib_api_status_t\r
 (*ib_pfn_close_al_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al );\r
+       IN              const   ib_al_handle_t                          h_al );\r
 \r
 typedef const char*\r
 (*ib_pfn_get_err_str_t)(\r
index 2741397..ca34e9c 100644 (file)
@@ -70,7 +70,7 @@ typedef struct _iou_ifc_data
        net64_t                                 ca_guid;\r
        net64_t                                 chassis_guid;\r
        uint8_t                                 slot;\r
-       net64_t                                 guid;\r
+       net64_t                                 guid;\r
 \r
 }      iou_ifc_data_t;\r
 /*\r
index 07c3c52..a6fbd03 100644 (file)
@@ -1,6 +1,7 @@
 /*\r
  * Copyright (c) 2005 SilverStorm Technologies.  All rights reserved.\r
  * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. \r
+ * Portions Copyright (c) 2008 Microsoft Corporation.  All rights reserved.\r
  *\r
  * This software is available to you under the OpenIB.org BSD license\r
  * below:\r
@@ -151,7 +152,7 @@ typedef ib_api_status_t
 (AL_API *uvp_pre_open_ca_t) (\r
        IN              const   ib_net64_t                                      ca_guid,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf,\r
-               OUT                     ib_ca_handle_t FUNC_PTR64                               *ph_uvp_ca);\r
+               OUT                     ib_ca_handle_t                          *ph_uvp_ca);\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -204,7 +205,7 @@ typedef ib_api_status_t
 (AL_API *uvp_post_open_ca_t) (\r
        IN              const   ib_net64_t                                      ca_guid,\r
        IN                              ib_api_status_t                         ioctl_status,\r
-       IN      OUT                     ib_ca_handle_t FUNC_PTR64                               *ph_uvp_ca,\r
+       IN      OUT                     ib_ca_handle_t                          *ph_uvp_ca,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 /*\r
 * DESCRIPTION\r
@@ -250,7 +251,7 @@ typedef ib_api_status_t
 */\r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_query_ca) (\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_uvp_ca,\r
+       IN                              ib_ca_handle_t                          h_uvp_ca,\r
        IN                              ib_ca_attr_t                            *p_ca_attr,\r
        IN                              size_t                                          byte_count,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
@@ -299,7 +300,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_query_ca_t) (\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_uvp_ca,\r
+       IN                              ib_ca_handle_t                          h_uvp_ca,\r
        IN                              ib_api_status_t                         ioctl_status,\r
        IN                              ib_ca_attr_t                            *p_ca_attr,\r
        IN                              size_t                                          byte_count,\r
@@ -349,7 +350,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_modify_ca) (\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_uvp_ca,\r
+       IN                              ib_ca_handle_t                          h_uvp_ca,\r
        IN                              uint8_t                                         port_num,\r
        IN                              ib_ca_mod_t                                     ca_mod,\r
        IN              const   ib_port_attr_mod_t* const       p_port_attr_mod );\r
@@ -400,7 +401,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_modify_ca_t) (\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_uvp_ca,\r
+       IN                              ib_ca_handle_t                          h_uvp_ca,\r
        IN                              ib_api_status_t                         ioctl_status );\r
 \r
 /*\r
@@ -437,7 +438,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_close_ca_t) (\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_uvp_ca );\r
+       IN                              ib_ca_handle_t                          h_uvp_ca );\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -472,7 +473,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_post_close_ca_t) (\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_uvp_ca,\r
+       IN                              ib_ca_handle_t                          h_uvp_ca,\r
        IN                              ib_api_status_t                         ioctl_status );\r
 \r
 /*\r
@@ -510,8 +511,8 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_ci_call) (\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_uvp_ca,\r
-       IN              const   void* FUNC_PTR64 *              const   handle_array    OPTIONAL,\r
+       IN              const   ib_ca_handle_t                          h_uvp_ca,\r
+       IN              const   void**                          const   handle_array    OPTIONAL,\r
        IN                              uint32_t                                        num_handles,\r
        IN                              ib_ci_op_t*                     const   p_ci_op,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf);\r
@@ -562,9 +563,9 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_ci_call) (\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_uvp_ca,\r
+       IN              const   ib_ca_handle_t                          h_uvp_ca,\r
        IN                              ib_api_status_t                         ioctl_status,\r
-       IN              const   void* FUNC_PTR64 *              const   handle_array    OPTIONAL,\r
+       IN              const   void*  *                const   handle_array    OPTIONAL,\r
        IN                              uint32_t                                        num_handles,\r
        IN                              ib_ci_op_t*                     const   p_ci_op,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf);\r
@@ -615,9 +616,9 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_allocate_pd) (\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_uvp_ca,\r
+       IN                              ib_ca_handle_t                          h_uvp_ca,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf,\r
-               OUT                     ib_pd_handle_t FUNC_PTR64                               *ph_uvp_pd);\r
+               OUT                     ib_pd_handle_t                          *ph_uvp_pd);\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -662,9 +663,9 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_allocate_pd_t) (\r
-       IN                              ib_ca_handle_t FUNC_PTR64                               h_uvp_ca,\r
+       IN                              ib_ca_handle_t                          h_uvp_ca,\r
        IN                              ib_api_status_t                         ioctl_status,\r
-       IN      OUT                     ib_pd_handle_t FUNC_PTR64                               *ph_uvp_pd,\r
+       IN      OUT                     ib_pd_handle_t                          *ph_uvp_pd,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 \r
 /*\r
@@ -708,7 +709,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_deallocate_pd) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_uvp_pd );\r
+       IN              const   ib_pd_handle_t                          h_uvp_pd );\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -742,7 +743,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_deallocate_pd_t) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_uvp_pd,\r
+       IN              const   ib_pd_handle_t                          h_uvp_pd,\r
        IN                              ib_api_status_t                         ioctl_status );\r
 \r
 /*\r
@@ -782,10 +783,10 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_create_av) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_uvp_pd,\r
+       IN              const   ib_pd_handle_t                          h_uvp_pd,\r
        IN              const   ib_av_attr_t                            *p_addr_vector,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf,\r
-               OUT                     ib_av_handle_t FUNC_PTR64                               *ph_uvp_av);\r
+               OUT                     ib_av_handle_t                          *ph_uvp_av);\r
 /*\r
 * DESCRIPTION\r
 *      uvp_pre_create_av() is implemented by vendor. It is the pre-ioctl\r
@@ -835,9 +836,9 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_create_av_t) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_uvp_pd,\r
+       IN              const   ib_pd_handle_t                          h_uvp_pd,\r
        IN                              ib_api_status_t                         ioctl_status,\r
-       IN      OUT                     ib_av_handle_t FUNC_PTR64                               *ph_uvp_av,\r
+       IN      OUT                     ib_av_handle_t                          *ph_uvp_av,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 /*\r
 * DESCRIPTION\r
@@ -882,7 +883,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_query_av) (\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_uvp_av,\r
+       IN              const   ib_av_handle_t                          h_uvp_av,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf );\r
 \r
 /*\r
@@ -926,10 +927,10 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_query_av_t) (\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_uvp_av,\r
+       IN              const   ib_av_handle_t                          h_uvp_av,\r
        IN                              ib_api_status_t                         ioctl_status,\r
        IN      OUT                     ib_av_attr_t                            *p_addr_vector,\r
-       IN      OUT                     ib_pd_handle_t FUNC_PTR64                               *ph_pd,\r
+       IN      OUT                     ib_pd_handle_t                          *ph_pd,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 \r
 /*\r
@@ -977,7 +978,7 @@ typedef void
 */\r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_modify_av) (\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_uvp_av,\r
+       IN              const   ib_av_handle_t                          h_uvp_av,\r
        IN              const   ib_av_attr_t                            *p_addr_vector,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf );\r
 /*\r
@@ -1025,7 +1026,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_modify_av_t) (\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_uvp_av,\r
+       IN              const   ib_av_handle_t                          h_uvp_av,\r
        IN                              ib_api_status_t                         ioctl_status,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 \r
@@ -1068,7 +1069,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_destroy_av) (\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_uvp_av );\r
+       IN              const   ib_av_handle_t                          h_uvp_av );\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -1103,7 +1104,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_destroy_av_t) (\r
-       IN              const   ib_av_handle_t FUNC_PTR64                               h_uvp_av,\r
+       IN              const   ib_av_handle_t                          h_uvp_av,\r
        IN                              ib_api_status_t                         ioctl_status );\r
 \r
 /*\r
@@ -1144,10 +1145,10 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_create_srq) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_uvp_pd,\r
+       IN              const   ib_pd_handle_t                          h_uvp_pd,\r
        IN              const   ib_srq_attr_t* const                    p_srq_attr,\r
        IN      OUT             ci_umv_buf_t                            *p_umv_buf,\r
-               OUT             ib_srq_handle_t FUNC_PTR64                              *ph_uvp_srq);\r
+               OUT             ib_srq_handle_t                         *ph_uvp_srq);\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -1205,9 +1206,9 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_create_srq_t) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_uvp_pd,\r
-       IN                              ib_api_status_t                         ioctl_status,\r
-       IN      OUT             ib_srq_handle_t FUNC_PTR64                              *ph_uvp_srq,\r
+       IN              const   ib_pd_handle_t                          h_uvp_pd,\r
+       IN                              ib_api_status_t                 ioctl_status,\r
+       IN      OUT             ib_srq_handle_t                         *ph_uvp_srq,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 \r
 /*\r
@@ -1254,7 +1255,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_modify_srq) (\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                      h_uvp_srq,\r
+       IN              const   ib_srq_handle_t                 h_uvp_srq,\r
        IN              const   ib_srq_attr_t * const           p_srq_attr,\r
        IN              const   ib_srq_attr_mask_t                      srq_attr_mask,\r
        IN      OUT             ci_umv_buf_t                            *p_umv_buf );\r
@@ -1309,8 +1310,8 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_modify_srq_t) (\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_uvp_srq,\r
-       IN                              ib_api_status_t                         ioctl_status,\r
+       IN              const   ib_srq_handle_t                         h_uvp_srq,\r
+       IN                              ib_api_status_t                 ioctl_status,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 \r
 /*\r
@@ -1353,7 +1354,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_query_srq) (\r
-       IN                              ib_srq_handle_t FUNC_PTR64                              h_uvp_srq,\r
+       IN                              ib_srq_handle_t                         h_uvp_srq,\r
        IN      OUT             ci_umv_buf_t                            *p_umv_buf );\r
 \r
 /*\r
@@ -1397,8 +1398,8 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_query_srq_t) (\r
-       IN                              ib_srq_handle_t FUNC_PTR64                              h_uvp_srq,\r
-       IN                              ib_api_status_t                         ioctl_status,\r
+       IN                              ib_srq_handle_t                         h_uvp_srq,\r
+       IN                              ib_api_status_t                 ioctl_status,\r
        IN                              ib_srq_attr_t                           *p_query_attr,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 \r
@@ -1444,7 +1445,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_destroy_srq) (\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_uvp_srq );\r
+       IN              const   ib_srq_handle_t                         h_uvp_srq );\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -1489,8 +1490,8 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_destroy_srq_t) (\r
-       IN              const   ib_srq_handle_t FUNC_PTR64                              h_uvp_srq,\r
-       IN                              ib_api_status_t                         ioctl_status );\r
+       IN              const   ib_srq_handle_t                         h_uvp_srq,\r
+       IN                              ib_api_status_t                 ioctl_status );\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -1528,10 +1529,10 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_create_qp) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_uvp_pd,\r
+       IN              const   ib_pd_handle_t                          h_uvp_pd,\r
        IN              const   ib_qp_create_t                          *p_create_attr,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf,\r
-               OUT                     ib_qp_handle_t FUNC_PTR64                               *ph_uvp_qp);\r
+               OUT                     ib_qp_handle_t                          *ph_uvp_qp);\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -1592,9 +1593,9 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_post_create_qp_t) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_uvp_pd,\r
+       IN              const   ib_pd_handle_t                          h_uvp_pd,\r
        IN                              ib_api_status_t                         ioctl_status,\r
-       IN      OUT                     ib_qp_handle_t FUNC_PTR64                               *ph_uvp_qp,\r
+       IN      OUT                     ib_qp_handle_t                          *ph_uvp_qp,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 \r
 /*\r
@@ -1644,7 +1645,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_modify_qp) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_uvp_qp,\r
+       IN              const   ib_qp_handle_t                          h_uvp_qp,\r
        IN              const   ib_qp_mod_t                                     *p_modify_attr,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf );\r
 \r
@@ -1704,7 +1705,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_modify_qp_t) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_uvp_qp,\r
+       IN              const   ib_qp_handle_t                          h_uvp_qp,\r
        IN                              ib_api_status_t                         ioctl_status,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 \r
@@ -1748,7 +1749,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_query_qp) (\r
-       IN                              ib_qp_handle_t FUNC_PTR64                               h_uvp_qp,\r
+       IN                              ib_qp_handle_t                          h_uvp_qp,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf );\r
 \r
 /*\r
@@ -1792,7 +1793,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_query_qp_t) (\r
-       IN                              ib_qp_handle_t FUNC_PTR64                               h_uvp_qp,\r
+       IN                              ib_qp_handle_t                          h_uvp_qp,\r
        IN                              ib_api_status_t                         ioctl_status,\r
        IN                              ib_qp_attr_t                            *p_query_attr,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
@@ -1839,7 +1840,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_destroy_qp) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_uvp_qp );\r
+       IN              const   ib_qp_handle_t                          h_uvp_qp );\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -1884,7 +1885,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_destroy_qp_t) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_uvp_qp,\r
+       IN              const   ib_qp_handle_t                          h_uvp_qp,\r
        IN                              ib_api_status_t                         ioctl_status );\r
 \r
 /*\r
@@ -1921,7 +1922,7 @@ typedef void
 \r
 typedef uint32_t\r
 (AL_API *uvp_nd_get_qp_state_t) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_uvp_qp\r
+       IN              const   ib_qp_handle_t                          h_uvp_qp\r
        );\r
 \r
 /*\r
@@ -1952,7 +1953,7 @@ typedef uint32_t
 \r
 typedef void\r
 (AL_API *uvp_nd_modify_qp_t) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_uvp_qp,\r
+       IN              const   ib_qp_handle_t                          h_uvp_qp,\r
        OUT                             void**                                          pp_outbuf,\r
        OUT                             DWORD*                                  p_size\r
        );\r
@@ -1993,10 +1994,10 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_create_cq) (\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_uvp_ca,\r
+       IN              const   ib_ca_handle_t                          h_uvp_ca,\r
        IN      OUT                     uint32_t*                       const   p_size,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf,\r
-               OUT                     ib_cq_handle_t FUNC_PTR64                               *ph_uvp_cq);\r
+               OUT                     ib_cq_handle_t                          *ph_uvp_cq);\r
 /*\r
 * DESCRIPTION\r
 *      uvp_pre_create_cq() is implemented by vendor. It is the pre-ioctl routine\r
@@ -2050,10 +2051,10 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_create_cq_t) (\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_uvp_ca,\r
+       IN              const   ib_ca_handle_t                          h_uvp_ca,\r
        IN                              ib_api_status_t                         ioctl_status,\r
        IN              const   uint32_t                                        size,\r
-       IN      OUT                     ib_cq_handle_t FUNC_PTR64                               *ph_uvp_cq,\r
+       IN      OUT                     ib_cq_handle_t                          *ph_uvp_cq,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 \r
 /*\r
@@ -2105,7 +2106,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_resize_cq) (\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_uvp_cq,\r
+       IN              const   ib_cq_handle_t                          h_uvp_cq,\r
        IN      OUT                     uint32_t*                       const   p_size,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf );\r
 \r
@@ -2162,7 +2163,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_resize_cq_t) (\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_uvp_cq,\r
+       IN              const   ib_cq_handle_t                          h_uvp_cq,\r
        IN                              ib_api_status_t                         ioctl_status,\r
        IN              const   uint32_t                                        size,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
@@ -2213,7 +2214,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_query_cq) (\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_uvp_cq,\r
+       IN              const   ib_cq_handle_t                          h_uvp_cq,\r
        IN      OUT                     uint32_t* const                         p_size,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf );\r
 \r
@@ -2269,7 +2270,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_query_cq_t) (\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_uvp_cq,\r
+       IN              const   ib_cq_handle_t                          h_uvp_cq,\r
        IN                              ib_api_status_t                         ioctl_status,\r
        IN              const   uint32_t                                        size,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
@@ -2316,7 +2317,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_destroy_cq) (\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_uvp_cq );\r
+       IN              const   ib_cq_handle_t                          h_uvp_cq );\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -2353,7 +2354,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_destroy_cq_t) (\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_uvp_cq,\r
+       IN              const   ib_cq_handle_t                          h_uvp_cq,\r
        IN                              ib_api_status_t                         ioctl_status );\r
 \r
 /*\r
@@ -2391,9 +2392,9 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_create_mw) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_uvp_pd,\r
+       IN              const   ib_pd_handle_t                          h_uvp_pd,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf,\r
-               OUT                     ib_mw_handle_t FUNC_PTR64                               *ph_uvp_mw);\r
+               OUT                     ib_mw_handle_t                          *ph_uvp_mw);\r
 /*\r
 * DESCRIPTION\r
 *      uvp_pre_create_mw() is implemented by vendor. It is the pre-ioctl routine\r
@@ -2441,10 +2442,10 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_create_mw_t) (\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_uvp_pd,\r
+       IN              const   ib_pd_handle_t                          h_uvp_pd,\r
        IN                              ib_api_status_t                         ioctl_status,\r
        IN                              net32_t                                         rkey,\r
-       IN      OUT                     ib_mw_handle_t FUNC_PTR64                               *ph_uvp_mw,\r
+       IN      OUT                     ib_mw_handle_t                          *ph_uvp_mw,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 /*\r
 * DESCRIPTION\r
@@ -2492,7 +2493,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_query_mw) (\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_uvp_mw,\r
+       IN              const   ib_mw_handle_t                          h_uvp_mw,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf );\r
 \r
 /*\r
@@ -2537,10 +2538,10 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_query_mw_t) (\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_uvp_mw,\r
+       IN              const   ib_mw_handle_t                          h_uvp_mw,\r
        IN                              ib_api_status_t                         ioctl_status,\r
        IN                              net32_t                                         rkey,\r
-               OUT                     ib_pd_handle_t FUNC_PTR64                               *ph_pd,\r
+               OUT                     ib_pd_handle_t                          *ph_pd,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 /*\r
 * DESCRIPTION\r
@@ -2587,8 +2588,8 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_bind_mw) (\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_uvp_mw,\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_uvp_qp,\r
+       IN              const   ib_mw_handle_t                          h_uvp_mw,\r
+       IN              const   ib_qp_handle_t                          h_uvp_qp,\r
        IN                              ib_bind_wr_t                            *p_mw_bind,\r
                OUT                     net32_t* const                          p_rkey );\r
 /*\r
@@ -2652,7 +2653,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_destroy_mw) (\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_uvp_mw );\r
+       IN              const   ib_mw_handle_t                          h_uvp_mw );\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -2688,7 +2689,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_destroy_mw_t) (\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_uvp_mw,\r
+       IN              const   ib_mw_handle_t                          h_uvp_mw,\r
        IN                              ib_api_status_t                         ioctl_status );\r
 /*\r
 * DESCRIPTION\r
@@ -2724,7 +2725,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_post_send) (\r
-       IN              const   void*           FUNC_PTR64                      h_qp,\r
+       IN              const   void*                                           h_qp,\r
        IN                              ib_send_wr_t*   const           p_send_wr,\r
                OUT                     ib_send_wr_t**                          pp_send_failure );\r
 /*\r
@@ -2796,7 +2797,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_post_recv) (\r
-       IN              const   void* FUNC_PTR64                                h_qp,\r
+       IN              const   void*                                           h_qp,\r
        IN                              ib_recv_wr_t*   const           p_recv_wr,\r
                OUT                     ib_recv_wr_t**                          pp_recv_failure );\r
 \r
@@ -2852,7 +2853,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_post_srq_recv) (\r
-       IN              const   void* FUNC_PTR64                                h_srq,\r
+       IN              const   void*                                           h_srq,\r
        IN                              ib_recv_wr_t*   const           p_recv_wr,\r
                OUT                     ib_recv_wr_t**                          pp_recv_failure );\r
 \r
@@ -2907,7 +2908,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_peek_cq) (\r
-       IN              const   void*           FUNC_PTR64                      h_cq,\r
+       IN              const   void*                                           h_cq,\r
                OUT                     uint32_t* const                         p_n_cqes );\r
 \r
 /*\r
@@ -2948,7 +2949,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_poll_cq) (\r
-       IN              const   void*           FUNC_PTR64                      h_cq,\r
+       IN              const   void*                                           h_cq,\r
        IN      OUT                     ib_wc_t**       const                   pp_free_wclist,\r
                OUT                     ib_wc_t**       const                   pp_done_wclist );\r
 \r
@@ -3001,7 +3002,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_rearm_cq) (\r
-       IN              const   void*           FUNC_PTR64                      h_cq,\r
+       IN              const   void*                                           h_cq,\r
        IN              const   boolean_t                                       solicited );\r
 \r
 /*\r
@@ -3047,7 +3048,7 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_rearm_n_cq) (\r
-       IN              const   void*           FUNC_PTR64                      h_cq,\r
+       IN              const   void*                                           h_cq,\r
        IN              const   uint32_t                                        n_cqes );\r
 \r
 /*\r
@@ -3094,11 +3095,11 @@ typedef ib_api_status_t
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_attach_mcast) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_uvp_qp,\r
+       IN              const   ib_qp_handle_t                          h_uvp_qp,\r
        IN              const   ib_gid_t                                        *p_mcast_gid,\r
        IN              const   uint16_t                                        mcast_lid,\r
        IN      OUT                     ci_umv_buf_t                            *p_umv_buf,\r
-               OUT                     ib_mcast_handle_t FUNC_PTR64                    *ph_mcast);\r
+               OUT                     ib_mcast_handle_t                       *ph_mcast);\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -3156,9 +3157,9 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_attach_mcast) (\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_uvp_qp,\r
+       IN              const   ib_qp_handle_t                          h_uvp_qp,\r
        IN                              ib_api_status_t                         ioctl_status,\r
-       IN      OUT                     ib_mcast_handle_t FUNC_PTR64                    *ph_mcast,\r
+       IN      OUT                     ib_mcast_handle_t                       *ph_mcast,\r
        IN                              ci_umv_buf_t                            *p_umv_buf );\r
 \r
 /*\r
@@ -3207,7 +3208,7 @@ typedef void
 \r
 typedef ib_api_status_t\r
 (AL_API *uvp_pre_detach_mcast) (\r
-       IN                              ib_mcast_handle_t FUNC_PTR64                    h_uvp_mcast );\r
+       IN                              ib_mcast_handle_t                       h_uvp_mcast );\r
 \r
 /*\r
 * DESCRIPTION\r
@@ -3250,7 +3251,7 @@ typedef ib_api_status_t
 \r
 typedef void\r
 (AL_API *uvp_post_detach_mcast) (\r
-       IN                              ib_mcast_handle_t FUNC_PTR64                    h_uvp_mcast,\r
+       IN                              ib_mcast_handle_t                       h_uvp_mcast,\r
        IN                              ib_api_status_t                         ioctl_status );\r
 \r
 /*\r