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

87 files changed:
core/al/al.c
core/al/al.h
core/al/al_av.c
core/al/al_av.h
core/al/al_ca.c
core/al/al_ca.h
core/al/al_ci_ca.h
core/al/al_ci_ca_shared.c
core/al/al_cm_cep.h
core/al/al_cm_qp.c
core/al/al_common.h
core/al/al_cq.c
core/al/al_cq.h
core/al/al_dm.c
core/al/al_dm.h
core/al/al_mad.c
core/al/al_mad.h
core/al/al_mad_pool.h
core/al/al_mcast.c
core/al/al_mcast.h
core/al/al_mgr.h
core/al/al_mgr_shared.c
core/al/al_mr.h
core/al/al_mr_shared.c
core/al/al_mw.c
core/al/al_mw.h
core/al/al_pd.c
core/al/al_pd.h
core/al/al_pnp.h
core/al/al_proxy.h
core/al/al_qp.c
core/al/al_qp.h
core/al/al_query.c
core/al/al_query.h
core/al/al_reg_svc.c
core/al/al_res_mgr.c
core/al/al_res_mgr.h
core/al/al_srq.c
core/al/al_srq.h
core/al/al_sub.c
core/al/al_verbs.h
core/al/ib_common.c
core/al/kernel/al_ci_ca.c
core/al/kernel/al_cm_cep.c
core/al/kernel/al_dev.c
core/al/kernel/al_fmr_pool.c
core/al/kernel/al_fmr_pool.h
core/al/kernel/al_ioc_pnp.c
core/al/kernel/al_mad_pool.c
core/al/kernel/al_mgr.c
core/al/kernel/al_mr.c
core/al/kernel/al_ndi_cm.c
core/al/kernel/al_ndi_cm.h
core/al/kernel/al_ndi_cq.c
core/al/kernel/al_ndi_cq.h
core/al/kernel/al_pnp.c
core/al/kernel/al_proxy.c
core/al/kernel/al_proxy_cep.c
core/al/kernel/al_proxy_ndi.c
core/al/kernel/al_proxy_subnet.c
core/al/kernel/al_proxy_verbs.c
core/al/kernel/al_sa_req.c
core/al/kernel/al_smi.c
core/al/kernel/al_smi.h
core/al/user/al_mad_pool.c
core/al/user/ual_av.c
core/al/user/ual_ca.c
core/al/user/ual_ci_ca.c
core/al/user/ual_ci_ca.h
core/al/user/ual_cm_cep.c
core/al/user/ual_cq.c
core/al/user/ual_mad.c
core/al/user/ual_mad.h
core/al/user/ual_mad_pool.c
core/al/user/ual_mcast.c
core/al/user/ual_mcast.h
core/al/user/ual_mgr.c
core/al/user/ual_mgr.h
core/al/user/ual_mr.c
core/al/user/ual_mw.c
core/al/user/ual_pd.c
core/al/user/ual_pnp.c
core/al/user/ual_qp.c
core/al/user/ual_qp.h
core/al/user/ual_res_mgr.h
core/al/user/ual_sa_req.c
core/al/user/ual_srq.c

index 0d6e0ff..f1e648f 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
@@ -68,11 +69,11 @@ free_al(
 #ifdef CL_KERNEL\r
 ib_api_status_t\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
 #else\r
 ib_api_status_t\r
 do_close_al(\r
-       IN              const   ib_al_handle_t  FUNC_PTR64      h_al )\r
+       IN              const   ib_al_handle_t                          h_al )\r
 #endif\r
 {\r
        AL_ENTER( AL_DBG_MGR );\r
@@ -96,7 +97,7 @@ void
 destroying_al(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_al_handle_t VOID_PTR64                       h_al;\r
+       ib_al_handle_t                  h_al;\r
        cl_list_item_t                  *p_list_item;\r
        al_sa_req_t                             *p_sa_req;\r
 \r
@@ -124,7 +125,7 @@ destroying_al(
 \r
 static void\r
 __free_mads(\r
-       IN                              const   ib_al_handle_t VOID_PTR64               h_al )\r
+       IN                              const   ib_al_handle_t          h_al )\r
 {\r
        cl_list_item_t                  *p_list_item;\r
        al_mad_element_t                *p_mad_element;\r
@@ -153,7 +154,7 @@ void
 free_al(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_al_handle_t VOID_PTR64                       h_al;\r
+       ib_al_handle_t                  h_al;\r
 \r
        CL_ASSERT( p_obj );\r
        h_al = PARENT_STRUCT( p_obj, ib_al_t, obj );\r
@@ -178,7 +179,7 @@ ib_query_ca_by_guid(
                OUT                     ib_ca_attr_t* const                     p_ca_attr OPTIONAL,\r
        IN      OUT                     uint32_t* const                         p_size )\r
 {\r
-       ib_ca_handle_t VOID_PTR64               h_ca;\r
+       ib_ca_handle_t          h_ca;\r
        ib_api_status_t         status;\r
 \r
        AL_ENTER( AL_DBG_CA );\r
@@ -210,7 +211,7 @@ ib_query_ca_by_guid(
 \r
 void\r
 al_insert_mad(\r
-       IN              const   ib_al_handle_t VOID_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN                              al_mad_element_t*       const   p_mad )\r
 {\r
        /* Assert that the MAD does not already have an owner. */\r
@@ -250,7 +251,7 @@ al_remove_mad(
 \r
 void\r
 al_handoff_mad(\r
-       IN              const   ib_al_handle_t VOID_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN                              ib_mad_element_t*       const   p_mad_element )\r
 {\r
        al_mad_element_t                *p_mad;\r
@@ -272,7 +273,7 @@ al_handoff_mad(
 \r
 void\r
 al_insert_key(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN                              al_pool_key_t* const            p_pool_key )\r
 {\r
        ref_al_obj( &h_al->obj );\r
@@ -313,8 +314,8 @@ al_remove_key(
 \r
 void\r
 al_dereg_pool(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
-       IN                              ib_pool_handle_t FUNC_PTR64 const               h_pool )\r
+       IN              const   ib_al_handle_t                          h_al,\r
+       IN                              ib_pool_handle_t const          h_pool )\r
 {\r
        cl_qlist_t                              destroy_list;\r
        cl_list_item_t                  *p_list_item, *p_next_item;\r
@@ -366,7 +367,7 @@ al_dereg_pool(
 \r
 void\r
 al_insert_query(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN                              al_query_t* const                       p_query )\r
 {\r
        p_query->h_al = h_al;\r
@@ -407,8 +408,8 @@ __match_query(
 \r
 void\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
        cl_list_item_t  *p_item;\r
 \r
index 816fde2..07e402d 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
@@ -99,7 +100,7 @@ typedef struct _ib_al
 ib_api_status_t\r
 init_al(\r
        IN                              al_obj_t                                        *p_parent_obj,\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al );\r
+       IN              const   ib_al_handle_t                          h_al );\r
 \r
 \r
 void\r
@@ -118,21 +119,21 @@ free_al(
  */\r
 ib_api_status_t\r
 al_insert_pnp(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
-       IN              const   ib_pnp_handle_t FUNC_PTR64                              h_pnp );\r
+       IN              const   ib_al_handle_t                          h_al,\r
+       IN              const   ib_pnp_handle_t                         h_pnp );\r
 \r
 /*\r
  * Remove a pnp registration from the PnP vector.\r
  */\r
 void\r
 al_remove_pnp(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
-       IN              const   ib_pnp_handle_t FUNC_PTR64                              h_pnp );\r
+       IN              const   ib_al_handle_t                          h_al,\r
+       IN              const   ib_pnp_handle_t                         h_pnp );\r
 \r
 \r
 void\r
 al_insert_mad(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN                              al_mad_element_t*       const   p_mad );\r
 \r
 \r
@@ -143,13 +144,13 @@ al_remove_mad(
 \r
 void\r
 al_handoff_mad(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN                              ib_mad_element_t*       const   p_mad_element );\r
 \r
 \r
 void\r
 al_insert_key(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN                              al_pool_key_t* const            p_pool_key );\r
 \r
 \r
@@ -160,13 +161,13 @@ al_remove_key(
 \r
 void\r
 al_dereg_pool(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
-       IN                              ib_pool_handle_t FUNC_PTR64 const               h_pool );\r
+       IN              const   ib_al_handle_t                          h_al,\r
+       IN                              ib_pool_handle_t const          h_pool );\r
 \r
 \r
 void\r
 al_insert_query(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN                              al_query_t* const                       p_query );\r
 \r
 \r
@@ -176,7 +177,7 @@ al_remove_query(
 \r
 void\r
 al_insert_conn(\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_handle_t                          h_conn );\r
 \r
 void\r
@@ -188,14 +189,14 @@ al_remove_conn(
 // TODO: we can remove the type parameter.\r
 uint64_t\r
 al_hdl_insert(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN                              void* const                                     p_obj,\r
        IN              const   uint32_t                                        type );\r
 \r
 \r
 static inline uint64_t\r
 al_hdl_lock_insert(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN                              void* const                                     p_obj,\r
        IN              const   uint32_t                                        type )\r
 {\r
@@ -209,10 +210,10 @@ al_hdl_lock_insert(
 \r
 void\r
 al_hdl_free(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   uint64_t                                        hdl );\r
 \r
-//static inline size_t  //NEW_SIZE_T\r
+\r
 static inline uint64_t\r
 al_hdl_insert_obj(\r
        IN                              al_obj_t* const                         p_obj )\r
@@ -247,34 +248,29 @@ al_hdl_free_obj(
 \r
 al_obj_t*\r
 al_hdl_ref(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   uint64_t                                        hdl,\r
-       //IN            const   size_t                                  hdl, //NEW_SIZE_T\r
        IN              const   uint32_t                                        type );\r
 \r
 /* Validate an object. */\r
 void*\r
 al_hdl_chk(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   uint64_t                                        hdl,\r
-       //IN            const   size_t                                  hdl, //NEW_SIZE_T\r
        IN              const   uint32_t                                        type );\r
 \r
 /* Validate and remove an object. */\r
 void*\r
 al_hdl_get(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   uint64_t                                        hdl,\r
-       //IN            const   size_t                                  hdl, //NEW_SIZE_T\r
        IN              const   uint32_t                                        type );\r
 \r
 /* Validate and removes a MAD element. */\r
 static inline ib_mad_element_t*\r
 al_hdl_get_mad(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
-       IN              const   uint64_t                                        hdl\r
-       //IN            const   size_t                                  hdl //NEW_SIZE_T\r
-       )\r
+       IN              const   ib_al_handle_t                          h_al,\r
+       IN              const   uint64_t                                        hdl )\r
 {\r
        return (ib_mad_element_t*)al_hdl_get( h_al, hdl, AL_OBJ_TYPE_H_MAD );\r
 }\r
@@ -282,17 +278,15 @@ al_hdl_get_mad(
 /* Validate and reference a connection.  Used for MRA */\r
 struct _al_conn*\r
 al_hdl_ref_conn(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   uint64_t                                        hdl,\r
-       //IN            const   size_t                                  hdl, //NEW_SIZE_T\r
        IN              const   uint32_t                                        sub_type );\r
 \r
 /* Validate, reference, and remove a connection. */\r
 struct _al_conn*\r
 al_hdl_get_conn(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   uint64_t                                        hdl,\r
-       //IN            const   size_t                                  hdl, //NEW_SIZE_T\r
        IN              const   uint32_t                                        sub_type );\r
 \r
 #endif /* CL_KERNEL */\r
index 269443d..fff207c 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
@@ -66,11 +67,11 @@ av_ctor(
                OUT                     cl_pool_item_t** const          pp_pool_item )\r
 {\r
        ib_api_status_t                 status;\r
-       ib_av_handle_t VOID_PTR64                       h_av;\r
+       ib_av_handle_t                  h_av;\r
 \r
        UNUSED_PARAM( context );\r
 \r
-       h_av = (ib_av_handle_t VOID_PTR64)p_object;\r
+       h_av = (ib_av_handle_t)p_object;\r
        cl_memclr( h_av, sizeof( ib_av_t ) );\r
 \r
        construct_al_obj( &h_av->obj, AL_OBJ_TYPE_H_AV );\r
@@ -81,7 +82,7 @@ av_ctor(
                return CL_ERROR;\r
        }\r
 \r
-       *pp_pool_item = &((ib_av_handle_t VOID_PTR64)p_object)->obj.pool_item;\r
+       *pp_pool_item = &((ib_av_handle_t)p_object)->obj.pool_item;\r
 \r
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &h_av->obj );\r
@@ -114,13 +115,13 @@ av_dtor(
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf )\r
 {\r
        ib_api_status_t                 status;\r
-       ib_av_handle_t VOID_PTR64                       h_av;\r
+       ib_av_handle_t                  h_av;\r
 \r
        CL_ASSERT( h_pd );\r
 \r
@@ -167,7 +168,7 @@ create_av(
 \r
 ib_api_status_t\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
        AL_ENTER( AL_DBG_AV );\r
 \r
@@ -191,7 +192,7 @@ __cleanup_av(
        IN                              struct _al_obj                          *p_obj )\r
 {\r
        ib_api_status_t                 status;\r
-       ib_av_handle_t VOID_PTR64                       h_av;\r
+       ib_av_handle_t                  h_av;\r
 \r
        CL_ASSERT( p_obj );\r
        h_av = PARENT_STRUCT( p_obj, ib_av_t, obj );\r
@@ -214,7 +215,7 @@ static void
 __return_av(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_av_handle_t VOID_PTR64                       h_av;\r
+       ib_av_handle_t                  h_av;\r
 \r
        h_av = PARENT_STRUCT( p_obj, ib_av_t, obj );\r
        reset_al_obj( p_obj );\r
@@ -225,9 +226,9 @@ __return_av(
 \r
 ib_api_status_t\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
        return query_av( h_av, p_av_attr, ph_pd, NULL );\r
 }\r
@@ -236,9 +237,9 @@ ib_query_av(
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf )\r
 {\r
        ib_api_status_t                 status;\r
@@ -273,7 +274,7 @@ query_av(
 \r
 ib_api_status_t\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_mod )\r
 {\r
        return modify_av( h_av, p_av_mod, NULL );\r
@@ -282,7 +283,7 @@ ib_modify_av(
 \r
 ib_api_status_t\r
 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_mod,\r
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf )\r
 {\r
index d5d21f1..ffbff2f 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
@@ -42,7 +43,7 @@
 typedef struct _ib_av\r
 {\r
        al_obj_t                                        obj;\r
-TO_LONG_PTR(   ib_av_handle_t ,                                h_ci_av) ;              /* Actual HW CI AV. */\r
+       ib_av_handle_t                          h_ci_av;                /* Actual HW CI AV. */\r
 \r
        ib_av_attr_t                            av_attr;\r
 \r
@@ -66,23 +67,23 @@ av_dtor(
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
 \r
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
 \r
 \r
 ib_api_status_t\r
 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_mod,\r
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
 \r
index e5bf250..e056cf3 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
@@ -71,11 +72,11 @@ __free_ca(
 \r
 ib_api_status_t\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
        ib_api_status_t status;\r
 \r
@@ -97,14 +98,14 @@ ib_open_ca(
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf OPTIONAL )\r
 {\r
-       ib_ca_handle_t VOID_PTR64                       h_ca;\r
+       ib_ca_handle_t                  h_ca;\r
        ib_api_status_t                 status;\r
        al_obj_type_t                   obj_type = AL_OBJ_TYPE_H_CA;\r
 \r
@@ -116,7 +117,7 @@ open_ca(
        }\r
 \r
        /* Allocate a CA instance. */\r
-       h_ca = (ib_ca_handle_t VOID_PTR64)cl_zalloc( sizeof( ib_ca_t ) );\r
+       h_ca = (ib_ca_handle_t)cl_zalloc( sizeof( ib_ca_t ) );\r
        if( !h_ca )\r
        {\r
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
@@ -183,7 +184,7 @@ open_ca(
  */\r
 ib_api_status_t\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
        AL_ENTER( AL_DBG_CA );\r
@@ -210,7 +211,7 @@ __cleanup_ca(
        IN                              struct _al_obj                          *p_obj )\r
 {\r
 #if defined(CL_KERNEL)\r
-       ib_ca_handle_t VOID_PTR64                       h_ca;\r
+       ib_ca_handle_t                  h_ca;\r
 \r
        CL_ASSERT( p_obj );\r
        h_ca = PARENT_STRUCT( p_obj, ib_ca_t, obj );\r
@@ -232,7 +233,7 @@ static void
 __free_ca(\r
        IN                              struct _al_obj                          *p_obj )\r
 {\r
-       ib_ca_handle_t VOID_PTR64                       h_ca;\r
+       ib_ca_handle_t                  h_ca;\r
 \r
        CL_ASSERT( p_obj );\r
        h_ca = PARENT_STRUCT( p_obj, ib_ca_t, obj );\r
@@ -245,7 +246,7 @@ __free_ca(
 \r
 ib_api_status_t\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
@@ -256,7 +257,7 @@ ib_query_ca(
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf )\r
@@ -286,7 +287,7 @@ query_ca(
 \r
 ib_api_status_t\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
@@ -319,10 +320,10 @@ ib_modify_ca(
  */\r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
 \r
@@ -348,11 +349,11 @@ ib_alloc_pd(
 \r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
 \r
@@ -378,8 +379,8 @@ ib_create_cq(
 \r
 ib_api_status_t\r
 al_convert_to_ci_handles(\r
-       IN                              void* FUNC_PTR64 *              const   dst_handle_array,\r
-       IN              const   void* FUNC_PTR64 *              const   src_handle_array,\r
+       IN                              void**                          const   dst_handle_array,\r
+       IN              const   void**                          const   src_handle_array,\r
        IN                              uint32_t                                        num_handles )\r
 {\r
        uint32_t                i;\r
index fae76f9..afd38b1 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
@@ -48,7 +49,7 @@ typedef struct _ib_ca
        ib_pfn_event_cb_t               pfn_event_cb;\r
        cl_list_item_t                  list_item;\r
 #if defined(CL_KERNEL)\r
-TO_LONG_PTR(   ib_ca_handle_t ,                        h_um_ca) ; \r
+       ib_ca_handle_t                  h_um_ca;\r
 #endif\r
 \r
 }      ib_ca_t;\r
@@ -56,17 +57,17 @@ TO_LONG_PTR(        ib_ca_handle_t ,                        h_um_ca) ;
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf OPTIONAL );\r
 \r
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
@@ -74,8 +75,8 @@ query_ca(
 \r
 ib_api_status_t\r
 al_convert_to_ci_handles(\r
-       IN                              void* FUNC_PTR64 *              const   dst_handle_array,\r
-       IN              const   void* FUNC_PTR64 *              const   src_handle_array,\r
+       IN                              void**                          const   dst_handle_array,\r
+       IN              const   void**                          const   src_handle_array,\r
        IN                              uint32_t                                        num_handles );\r
 \r
 \r
index 88af421..aaa39d9 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
@@ -59,7 +60,7 @@ create_ci_ca(
 \r
 DEVICE_OBJECT*\r
 get_ca_dev(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca );\r
+       IN              const   ib_ca_handle_t                          h_ca );\r
 #endif\r
 \r
 \r
@@ -73,11 +74,11 @@ typedef struct _al_ci_ca
 \r
        verbs_interface_t                       verbs;\r
 \r
-TO_LONG_PTR(   ib_ca_handle_t ,                                h_ci_ca) ;              /* CI handle */\r
-TO_LONG_PTR(   ib_ca_handle_t ,                                h_ca) ;                         /* AL handle */\r
-TO_LONG_PTR(   ib_pd_handle_t ,                                h_pd) ;                         /* AL handle */\r
-TO_LONG_PTR(   ib_pd_handle_t ,                                h_pd_alias) ;           /* AL handle */\r
-TO_LONG_PTR(   ib_pool_key_t ,                         pool_key) ;             /* AL handle */\r
+       ib_ca_handle_t                          h_ci_ca;                /* CI handle */\r
+       ib_ca_handle_t                          h_ca;                   /* AL handle */\r
+       ib_pd_handle_t                          h_pd;                   /* AL handle */\r
+       ib_pd_handle_t                          h_pd_alias;             /* AL handle */\r
+       ib_pool_key_t                           pool_key;               /* AL handle */\r
 \r
        /* Opened instances of this CA. */\r
        cl_qlist_t                                      ca_list;\r
@@ -122,11 +123,11 @@ typedef struct _event_item
 void\r
 add_ca(\r
        IN                              al_ci_ca_t* const                       p_ci_ca,\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca );\r
+       IN              const   ib_ca_handle_t                          h_ca );\r
 \r
 void\r
 remove_ca(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca );\r
+       IN              const   ib_ca_handle_t                          h_ca );\r
 \r
 \r
 void\r
@@ -200,8 +201,8 @@ ci_ca_unlock_attr(
 \r
 ib_api_status_t\r
 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
        IN                              ci_umv_buf_t*           const   p_umv_buf OPTIONAL );\r
index b3d641f..759f0cd 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
@@ -88,7 +89,7 @@ free_ci_ca(
 void\r
 add_ca(\r
        IN                              al_ci_ca_t* const                       p_ci_ca,\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca )\r
+       IN              const   ib_ca_handle_t                          h_ca )\r
 {\r
        cl_spinlock_acquire( &p_ci_ca->obj.lock );\r
        cl_qlist_insert_tail( &p_ci_ca->ca_list, &h_ca->list_item );\r
@@ -100,7 +101,7 @@ add_ca(
 \r
 void\r
 remove_ca(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca )\r
+       IN              const   ib_ca_handle_t                          h_ca )\r
 {\r
        al_ci_ca_t                      *p_ci_ca;\r
 \r
@@ -204,7 +205,7 @@ ci_ca_async_event(
 \r
        CL_ASSERT( p_event_rec );\r
 \r
-       p_obj = (al_obj_t* VOID_PTR64)p_event_rec->context;\r
+       p_obj = (al_obj_t*)p_event_rec->context;\r
 \r
        /* Block the destruction of the object until a reference is taken. */\r
        cl_spinlock_acquire( &p_obj->lock );\r
@@ -272,7 +273,7 @@ ci_ca_process_event_cb(
        p_event_item = PARENT_STRUCT( p_async_item, event_item_t,\r
                async_item.pool_item );\r
 \r
-       p_obj = (al_obj_t* VOID_PTR64)p_event_item->event_rec.context;\r
+       p_obj = (al_obj_t*)p_event_item->event_rec.context;\r
 \r
        switch( p_event_item->event_rec.code )\r
        {\r
@@ -362,11 +363,11 @@ ca_process_async_event_cb(
 {\r
        al_ci_ca_t*                             p_ci_ca;\r
        cl_list_item_t*                 p_list_item;\r
-       ib_ca_handle_t VOID_PTR64                       h_ca;\r
+       ib_ca_handle_t                  h_ca;\r
        ib_async_event_rec_t    event_rec;\r
 \r
        CL_ASSERT( p_event_rec );\r
-       p_ci_ca = (al_ci_ca_t* VOID_PTR64)p_event_rec->context;\r
+       p_ci_ca = (al_ci_ca_t*)p_event_rec->context;\r
 \r
        /* Report the CA event to all clients. */\r
        cl_spinlock_acquire( &p_ci_ca->obj.lock );\r
@@ -396,7 +397,7 @@ void
 ca_async_event_cb(\r
        IN                              ib_async_event_rec_t* const     p_event_rec )\r
 {\r
-       ib_ca_handle_t VOID_PTR64                       h_ca;\r
+       ib_ca_handle_t                  h_ca;\r
 \r
        CL_ASSERT( p_event_rec );\r
        h_ca = p_event_rec->handle.h_ca;\r
index 574d416..4656234 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
@@ -60,7 +61,7 @@
 \r
 typedef void\r
 (*al_pfn_cep_cb_t)(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   net32_t                                         cid );\r
 /* PARAMETERS\r
 *      h_al\r
@@ -89,7 +90,7 @@ create_cep_mgr(
 \r
 void\r
 al_cep_cleanup_al(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al );\r
+       IN              const   ib_al_handle_t                          h_al );\r
 \r
 \r
 ib_api_status_t\r
@@ -118,14 +119,14 @@ al_destroy_cep(
 \r
 ib_api_status_t\r
 al_cep_listen(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN                              ib_cep_listen_t* const          p_listen_info );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_pre_req(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN              const   ib_cm_req_t* const                      p_cm_req,\r
                OUT                     ib_qp_mod_t* const                      p_init );\r
@@ -133,50 +134,50 @@ al_cep_pre_req(
 \r
 ib_api_status_t\r
 al_cep_send_req(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_pre_rep(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
-       IN                              void* FUNC_PTR64                                context,\r
+       IN                              void*                                           context,\r
        IN              const   ib_cm_rep_t* const                      p_cm_rep,\r
                OUT                     ib_qp_mod_t* const                      p_init );\r
 \r
 ib_api_status_t\r
 al_cep_pre_rep_ex(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN                              al_pfn_cep_cb_t                         pfn_cb,\r
-       IN                              void* FUNC_PTR64                                context,\r
+       IN                              void*                                           context,\r
        IN              const   ib_cm_rep_t* const                      p_cm_rep,\r
                OUT                     ib_qp_mod_t* const                      p_init );\r
 \r
 ib_api_status_t\r
 al_cep_send_rep(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_get_rtr_attr(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
                OUT                     ib_qp_mod_t* const                      p_rtr );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_get_rts_attr(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
                OUT                     ib_qp_mod_t* const                      p_rts );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_rtu(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN              const   uint8_t*                                        p_pdata OPTIONAL,\r
        IN                              uint8_t                                         pdata_len );\r
@@ -184,7 +185,7 @@ al_cep_rtu(
 \r
 ib_api_status_t\r
 al_cep_rej(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN                              ib_rej_status_t                         rej_status,\r
        IN              const   uint8_t* const                          p_ari,\r
@@ -195,21 +196,21 @@ al_cep_rej(
 \r
 ib_api_status_t\r
 al_cep_mra(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN              const   ib_cm_mra_t* const                      p_cm_mra );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_lap(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN              const   ib_cm_lap_t* const                      p_cm_lap );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_pre_apr(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN              const   ib_cm_apr_t* const                      p_cm_apr,\r
                OUT                     ib_qp_mod_t* const                      p_apr );\r
@@ -217,13 +218,13 @@ al_cep_pre_apr(
 \r
 ib_api_status_t\r
 al_cep_send_apr(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_dreq(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN              const   uint8_t* const                          p_pdata OPTIONAL,\r
        IN              const   uint8_t                                         pdata_len );\r
@@ -231,35 +232,35 @@ al_cep_dreq(
 \r
 ib_api_status_t\r
 al_cep_drep(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN              const   ib_cm_drep_t* const                     p_cm_drep );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_get_timewait(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
                OUT                     uint64_t* const                         p_timewait_us );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_migrate(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_established(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid );\r
 \r
 \r
 ib_api_status_t\r
 al_cep_poll(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
-               OUT                     void* FUNC_PTR64 *                              p_context,\r
+               OUT                     void**                                          p_context,\r
                OUT                     net32_t* const                          p_new_cid,\r
                OUT                     ib_mad_element_t** const        pp_mad );\r
 \r
@@ -268,20 +269,20 @@ al_cep_poll(
 \r
 NTSTATUS\r
 al_cep_queue_irp(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN                              IRP* const                                      p_irp );\r
 \r
 NTSTATUS\r
 al_cep_get_cid(\r
-       IN              ib_al_handle_t FUNC_PTR64                                               h_al,\r
+       IN              ib_al_handle_t                                          h_al,\r
        IN              net32_t                 const                           cid,\r
        IN              PIRP                                                            h_ioctl\r
        );\r
 \r
 ib_api_status_t\r
 al_cep_get_pdata(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN      OUT                     uint8_t                                         *p_psize,\r
                OUT                     uint8_t*                                        pdata );\r
@@ -309,9 +310,9 @@ typedef struct _al_cep_sreq
 {\r
        ib_net64_t                                      svc_id;\r
 \r
-       TO_LONG_PTR(ib_path_rec_t* ,            p_path) ;\r
+       ib_path_rec_t*                          p_path;\r
 \r
-       TO_LONG_PTR(const uint8_t* ,            p_pdata) ;\r
+       const uint8_t*                          p_pdata;\r
        uint8_t                                         pdata_len;\r
 \r
        uint8_t                                         max_cm_retries;\r
@@ -352,7 +353,7 @@ typedef struct _al_cep_sreq
 \r
 ib_api_status_t\r
 al_cep_sreq(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN              const   al_cep_sreq_t* const            p_sreq );\r
 \r
@@ -371,8 +372,8 @@ typedef struct _al_cep_srep
        net32_t                                         qp_num;\r
        net32_t                                         qkey;\r
 \r
-       TO_LONG_PTR(const uint8_t*,     p_pdata);\r
-       TO_LONG_PTR(const void*, p_info);\r
+       const uint8_t*                          p_pdata;\r
+       const void*                                     p_info;\r
 \r
        uint8_t                                         pdata_len;\r
        uint8_t                                         info_len;\r
@@ -410,7 +411,7 @@ typedef struct _al_cep_srep
 \r
 ib_api_status_t\r
 al_cep_srep(\r
-       IN                              ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN                              ib_al_handle_t                          h_al,\r
        IN                              net32_t                                         cid,\r
        IN              const   al_cep_srep_t* const            p_sreq );\r
 \r
index 40111df..a897336 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
@@ -55,7 +56,7 @@ typedef struct _al_listen
        ib_pfn_cm_req_cb_t                      pfn_cm_req_cb;\r
 \r
        /* valid for ud qp_type only */\r
-       TO_LONG_PTR(const void* , sidr_context);\r
+       const void*                                     sidr_context;\r
 \r
 }      al_listen_t;\r
 \r
@@ -69,7 +70,7 @@ typedef struct _al_listen
 typedef struct _cep_async_mad\r
 {\r
        cl_async_proc_item_t    item;\r
-       ib_al_handle_t VOID_PTR64                       h_al;\r
+       ib_al_handle_t                  h_al;\r
        net32_t                                 cid;\r
 \r
 }      cep_async_mad_t;\r
@@ -86,7 +87,7 @@ typedef struct _cep_async_mad
  */\r
 static void\r
 __cep_timewait_qp(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp )\r
+       IN              const   ib_qp_handle_t                          h_qp )\r
 {\r
        uint64_t                        timewait = 0;\r
        ib_qp_mod_t                     qp_mod;\r
@@ -298,7 +299,7 @@ __proc_listen(
  */\r
 static void\r
 __proc_conn_timeout(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp )\r
+       IN              const   ib_qp_handle_t                          h_qp )\r
 {\r
        ib_cm_rej_rec_t         rej_rec;\r
        net32_t                         cid;\r
@@ -341,7 +342,7 @@ __proc_conn_timeout(
  */\r
 static void\r
 __proc_lap_timeout(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp )\r
+       IN              const   ib_qp_handle_t                          h_qp )\r
 {\r
        ib_cm_apr_rec_t         apr_rec;\r
 \r
@@ -369,7 +370,7 @@ __proc_lap_timeout(
  */\r
 static void\r
 __proc_dconn_timeout(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp )\r
+       IN              const   ib_qp_handle_t                          h_qp )\r
 {\r
        ib_cm_drep_rec_t        drep_rec;\r
        net32_t                         cid;\r
@@ -872,11 +873,11 @@ __process_cep_cb(
 static void\r
 __cm_handler(\r
 #endif\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   net32_t                                         cid )\r
 {\r
        ib_api_status_t         status;\r
-       void* VOID_PTR64                context;\r
+       void*                           context;\r
        net32_t                         new_cid;\r
        ib_mad_element_t        *p_mad;\r
        ib_cm_handle_t          h_cm;\r
@@ -890,20 +891,20 @@ __cm_handler(
                /* Something to do - WOOT!!! */\r
                if( new_cid != AL_INVALID_CID )\r
                {\r
-                       __proc_listen( (al_listen_t* VOID_PTR64)context,\r
+                       __proc_listen( (al_listen_t*)context,\r
                                new_cid, ib_get_mad_buf( p_mad ) );\r
                }\r
                else if( p_mad->status != IB_SUCCESS )\r
                {\r
                        /* Context is a QP handle, and a sent MAD timed out. */\r
                        __proc_failed_send(\r
-                               (ib_qp_handle_t VOID_PTR64)context, ib_get_mad_buf( p_mad ) );\r
+                               (ib_qp_handle_t)context, ib_get_mad_buf( p_mad ) );\r
                }\r
                else\r
                {\r
                        h_cm.h_al = h_al;\r
                        h_cm.cid = cid;\r
-                       h_cm.h_qp = (ib_qp_handle_t VOID_PTR64)context;\r
+                       h_cm.h_qp = (ib_qp_handle_t)context;\r
                        __proc_conn( &h_cm, ib_get_mad_buf( p_mad ) );\r
                }\r
                ib_put_mad( p_mad );\r
@@ -938,7 +939,7 @@ __process_cep_async(
  */\r
 static void\r
 __cm_handler(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al,\r
+       IN              const   ib_al_handle_t                          h_al,\r
        IN              const   net32_t                                         cid )\r
 {\r
        cep_async_mad_t *p_async_mad;\r
@@ -972,7 +973,7 @@ __cm_handler(
  */\r
 ib_api_status_t\r
 __cep_init_qp(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN                              ib_qp_mod_t* const                      p_init )\r
 {\r
        ib_qp_mod_t                     qp_mod;\r
@@ -1051,7 +1052,7 @@ __cep_pre_req(
 \r
 static ib_api_status_t\r
 __cep_conn_req(\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_req_t* const                      p_cm_req )\r
 {\r
        ib_api_status_t         status;\r
@@ -1201,7 +1202,7 @@ ib_cm_req(
 static ib_api_status_t\r
 __cep_rts_qp(\r
        IN              const   ib_cm_handle_t                          h_cm,\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN              const   ib_access_t                                     access_ctrl,\r
        IN              const   uint32_t                                        sq_depth,\r
        IN              const   uint32_t                                        rq_depth )\r
@@ -1292,7 +1293,7 @@ __cep_pre_rep(
        if( p_cm_rep->p_recv_wr )\r
        {\r
                status = ib_post_recv( p_cm_rep->h_qp, p_cm_rep->p_recv_wr,\r
-                       (ib_recv_wr_t** VOID_PTR64)p_cm_rep->pp_recv_failure );\r
+                       (ib_recv_wr_t**)p_cm_rep->pp_recv_failure );\r
                if( status != IB_SUCCESS )\r
                {\r
                        AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
@@ -1854,7 +1855,7 @@ ib_cm_apr(
 \r
 ib_api_status_t\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
        ib_api_status_t status;\r
        al_conn_qp_t    *p_conn_qp;\r
@@ -1915,11 +1916,11 @@ __free_listen(
 \r
 static ib_api_status_t\r
 __cep_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
        ib_api_status_t         status;\r
        al_listen_t                     *p_listen;\r
@@ -2003,11 +2004,11 @@ __cep_listen(
 \r
 ib_api_status_t\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
        ib_api_status_t         status;\r
 \r
@@ -2034,7 +2035,7 @@ ib_cm_listen(
 \r
 ib_api_status_t\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
        AL_ENTER( AL_DBG_CM );\r
index 9aea281..65ff058 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
@@ -227,7 +228,7 @@ typedef struct _al_obj
        cl_state_t                                      state;\r
 \r
        uint64_t                                        hdl;    /* User Handle. */\r
-    TO_LONG_PTR(       ib_al_handle_t,                         h_al) ;         /* Owning AL instance. */\r
+       ib_al_handle_t                          h_al;   /* Owning AL instance. */\r
 \r
 #ifdef CL_KERNEL\r
        /*\r
index ad5d873..ef5f800 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
@@ -71,14 +72,14 @@ free_cq(
  */\r
 ib_api_status_t\r
 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,\r
-               OUT                     ib_cq_handle_t FUNC_PTR64* const                ph_cq,\r
+               OUT                     ib_cq_handle_t* const           ph_cq,\r
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf )\r
 {\r
-       ib_cq_handle_t VOID_PTR64                       h_cq;\r
+       ib_cq_handle_t                  h_cq;\r
        ib_api_status_t                 status;\r
        al_obj_type_t                   obj_type = AL_OBJ_TYPE_H_CQ;\r
 \r
@@ -169,7 +170,7 @@ create_cq(
 \r
 ib_api_status_t\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
        AL_ENTER( AL_DBG_CQ );\r
@@ -193,10 +194,10 @@ void
 destroying_cq(\r
        IN                              struct _al_obj                          *p_obj )\r
 {\r
-       ib_cq_handle_t VOID_PTR64               h_cq;\r
+       ib_cq_handle_t          h_cq;\r
        cl_list_item_t          *p_item;\r
        cl_obj_rel_t            *p_rel;\r
-       ib_qp_handle_t VOID_PTR64               h_qp;\r
+       ib_qp_handle_t          h_qp;\r
 \r
        CL_ASSERT( p_obj );\r
        h_cq = PARENT_STRUCT( p_obj, ib_cq_t, obj );\r
@@ -209,7 +210,7 @@ destroying_cq(
        {\r
                p_rel = PARENT_STRUCT( p_item, cl_obj_rel_t, pool_item.list_item );\r
                p_rel->p_parent_obj = NULL;\r
-               h_qp = (ib_qp_handle_t VOID_PTR64)p_rel->p_child_obj;\r
+               h_qp = (ib_qp_handle_t)p_rel->p_child_obj;\r
                if( h_qp )\r
                {\r
                        /* Take a reference to prevent the QP from being destroyed. */\r
@@ -234,7 +235,7 @@ void
 cleanup_cq(\r
        IN                              struct _al_obj                          *p_obj )\r
 {\r
-       ib_cq_handle_t VOID_PTR64                       h_cq;\r
+       ib_cq_handle_t                  h_cq;\r
        ib_api_status_t                 status;\r
 \r
        CL_ASSERT( p_obj );\r
@@ -257,7 +258,7 @@ void
 free_cq(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_cq_handle_t VOID_PTR64                       h_cq;\r
+       ib_cq_handle_t                  h_cq;\r
 \r
        CL_ASSERT( p_obj );\r
        h_cq = PARENT_STRUCT( p_obj, ib_cq_t, obj );\r
@@ -269,7 +270,7 @@ free_cq(
 \r
 void\r
 cq_attach_qp(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN                              cl_obj_rel_t* const                     p_qp_rel )\r
 {\r
        p_qp_rel->p_parent_obj = (cl_obj_t*)h_cq;\r
@@ -282,7 +283,7 @@ cq_attach_qp(
 \r
 void\r
 cq_detach_qp(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN                              cl_obj_rel_t* const                     p_qp_rel )\r
 {\r
        if( p_qp_rel->p_parent_obj )\r
@@ -298,7 +299,7 @@ cq_detach_qp(
 \r
 ib_api_status_t\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
        return modify_cq( h_cq, p_size, NULL );\r
@@ -307,7 +308,7 @@ ib_modify_cq(
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf )\r
 {\r
@@ -336,7 +337,7 @@ modify_cq(
 \r
 ib_api_status_t\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
        return query_cq( h_cq, p_size, NULL );\r
@@ -346,7 +347,7 @@ ib_query_cq(
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf )\r
 {\r
@@ -375,7 +376,7 @@ query_cq(
 \r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
@@ -403,7 +404,7 @@ ib_peek_cq(
 \r
 ib_api_status_t\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
@@ -438,7 +439,7 @@ ib_poll_cq(
 \r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
@@ -461,7 +462,7 @@ ib_rearm_cq(
 \r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
@@ -494,10 +495,10 @@ void
 cq_async_event_cb(\r
        IN                              ib_async_event_rec_t* const     p_event_rec )\r
 {\r
-       ib_cq_handle_t VOID_PTR64                       h_cq;\r
+       ib_cq_handle_t                  h_cq;\r
 \r
        CL_ASSERT( p_event_rec );\r
-       h_cq = (ib_cq_handle_t VOID_PTR64)p_event_rec->context;\r
+       h_cq = (ib_cq_handle_t)p_event_rec->context;\r
 \r
        p_event_rec->context = (void*)h_cq->obj.context;\r
        p_event_rec->handle.h_cq = h_cq;\r
index 63a9d08..b80b137 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
 \r
 typedef void\r
 (*pfn_proc_comp_t)(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq );\r
+       IN              const   ib_cq_handle_t                          h_cq );\r
 \r
 typedef ib_api_status_t\r
 (*pfn_peek_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_n_cqes );\r
 \r
 typedef ib_api_status_t\r
 (*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
 (*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
 (*pfn_rearm_n_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   uint32_t                                        n_cqes );\r
 \r
 #ifdef CL_KERNEL\r
@@ -86,21 +87,21 @@ typedef struct _ib_cq
        ib_pfn_comp_cb_t                        pfn_user_comp_cb;\r
        cl_waitobj_handle_t                     h_wait_obj;\r
 \r
-TO_LONG_PTR(   ib_cq_handle_t ,                                h_ci_cq) ; \r
+       ib_cq_handle_t                          h_ci_cq;\r
 \r
        /* Function pointers for the various speed path operations. */\r
 #ifndef CL_KERNEL\r
        pfn_peek_cq_t                           pfn_peek;\r
-TO_LONG_PTR(   ib_cq_handle_t ,                                h_peek_cq) ; \r
+       ib_cq_handle_t                          h_peek_cq;\r
 \r
        pfn_poll_cq_t                           pfn_poll;\r
-TO_LONG_PTR(   ib_cq_handle_t ,                                h_poll_cq) ; \r
+       ib_cq_handle_t                          h_poll_cq;\r
 \r
        pfn_rearm_cq_t                          pfn_rearm;\r
-TO_LONG_PTR(   ib_cq_handle_t ,                                h_rearm_cq) ; \r
+       ib_cq_handle_t                          h_rearm_cq;\r
 \r
        pfn_rearm_n_cq_t                        pfn_rearm_n;\r
-TO_LONG_PTR(   ib_cq_handle_t ,                                h_rearm_n_cq) ; \r
+       ib_cq_handle_t                          h_rearm_n_cq;\r
 #endif\r
 \r
        ib_pfn_event_cb_t                       pfn_event_cb;\r
@@ -117,24 +118,24 @@ TO_LONG_PTR(      ib_cq_handle_t ,                                h_rearm_n_cq) ;
 \r
 ib_api_status_t\r
 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,\r
-               OUT                     ib_cq_handle_t FUNC_PTR64* const                ph_cq,\r
+               OUT                     ib_cq_handle_t* const           ph_cq,\r
        IN OUT                  ci_umv_buf_t* const                     p_umv_buf );\r
 \r
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
 \r
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
 \r
@@ -146,13 +147,13 @@ cq_async_event_cb(
 \r
 void\r
 cq_attach_qp(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN                              cl_obj_rel_t* const                     p_qp_rel );\r
 \r
 \r
 void\r
 cq_detach_qp(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN                              cl_obj_rel_t* const                     p_qp_rel );\r
 \r
 #endif /* __AL_CQ_H__ */\r
index 9259cfe..6930410 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
@@ -83,20 +84,20 @@ acquire_iou(
 \r
 al_iou_t*\r
 get_iou(\r
-       IN              const   ib_ioc_handle_t FUNC_PTR64                              h_ioc );\r
+       IN              const   ib_ioc_handle_t                         h_ioc );\r
 \r
-ib_ioc_handle_t VOID_PTR64\r
+ib_ioc_handle_t \r
 get_ioc(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca );\r
+       IN              const   ib_ca_handle_t                          h_ca );\r
 \r
 ib_api_status_t\r
 add_ioc(\r
        IN                              al_iou_t*                                       p_iou,\r
-       IN                              ib_ioc_handle_t FUNC_PTR64                              h_ioc );\r
+       IN                              ib_ioc_handle_t                         h_ioc );\r
 \r
 void\r
 ioc_change(\r
-       IN                              ib_ioc_handle_t FUNC_PTR64                              h_ioc );\r
+       IN                              ib_ioc_handle_t                         h_ioc );\r
 \r
 void\r
 iou_change(\r
@@ -121,7 +122,7 @@ free_dm_agent(
 ib_api_status_t\r
 dm_agent_reg_pnp(\r
        IN                              ib_pnp_class_t                          pnp_class,\r
-       IN                              ib_pnp_handle_t FUNC_PTR64*                     ph_pnp );\r
+       IN                              ib_pnp_handle_t *                       ph_pnp );\r
 \r
 ib_api_status_t\r
 dm_agent_pnp_cb(\r
@@ -157,13 +158,13 @@ iou_port_event_cb(
 \r
 void\r
 dm_agent_send_cb(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              void*                                           mad_svc_context,\r
        IN                              ib_mad_element_t*                       p_mad_response );\r
 \r
 void\r
 dm_agent_recv_cb(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              void*                                           mad_svc_context,\r
        IN                              ib_mad_element_t*                       p_mad_request );\r
 \r
@@ -208,11 +209,11 @@ get_svc_entries(
 \r
 ib_api_status_t\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
-       ib_ioc_handle_t VOID_PTR64                      h_ioc;\r
+       ib_ioc_handle_t                 h_ioc;\r
 \r
        AL_ENTER( AL_DBG_IOC );\r
 \r
@@ -249,7 +250,7 @@ ib_create_ioc(
 \r
 ib_api_status_t\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
        AL_ENTER( AL_DBG_IOC );\r
 \r
@@ -275,7 +276,7 @@ void
 free_ioc(\r
        IN                              al_obj_t*                                       p_obj )\r
 {\r
-       ib_ioc_handle_t VOID_PTR64                      h_ioc;\r
+       ib_ioc_handle_t                 h_ioc;\r
 \r
        CL_ASSERT( p_obj );\r
 \r
@@ -307,7 +308,7 @@ free_ioc(
 \r
 ib_api_status_t\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
        al_iou_t*                               p_iou;\r
        ib_api_status_t                 status;\r
@@ -336,11 +337,11 @@ ib_reg_ioc(
 \r
 ib_api_status_t\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
-       ib_svc_handle_t VOID_PTR64                      h_svc;\r
+       ib_svc_handle_t                 h_svc;\r
        ib_api_status_t                 status;\r
 \r
        AL_ENTER( AL_DBG_IOC );\r
@@ -379,7 +380,7 @@ ib_add_svc_entry(
                AL_EXIT( AL_DBG_IOC );\r
                return IB_INSUFFICIENT_RESOURCES;\r
        }\r
-       h_svc = cl_zalloc( sizeof( ib_svc_handle_t VOID_PTR64 ) );\r
+       h_svc = cl_zalloc( sizeof( ib_svc_handle_t ) );\r
        if( !h_svc )\r
        {\r
                AL_EXIT( AL_DBG_IOC );\r
@@ -434,9 +435,9 @@ ib_add_svc_entry(
 \r
 ib_api_status_t\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
-       ib_ioc_handle_t VOID_PTR64                      h_ioc;\r
+       ib_ioc_handle_t                 h_ioc;\r
 \r
        AL_ENTER( AL_DBG_IOC );\r
 \r
@@ -493,7 +494,7 @@ void
 free_svc_entry(\r
        IN                              al_obj_t*                                       p_obj )\r
 {\r
-       ib_svc_handle_t VOID_PTR64                      h_svc;\r
+       ib_svc_handle_t                 h_svc;\r
 \r
        CL_ASSERT( p_obj );\r
        h_svc = PARENT_STRUCT( p_obj, al_svc_entry_t, obj );\r
@@ -546,7 +547,7 @@ acquire_iou(
  */\r
 al_iou_t*\r
 get_iou(\r
-       IN              const   ib_ioc_handle_t FUNC_PTR64                              h_ioc )\r
+       IN              const   ib_ioc_handle_t                         h_ioc )\r
 {\r
        CL_ASSERT( h_ioc );\r
 \r
@@ -560,13 +561,13 @@ get_iou(
 \r
 \r
 \r
-ib_ioc_handle_t VOID_PTR64\r
+ib_ioc_handle_t \r
 get_ioc(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca )\r
+       IN              const   ib_ca_handle_t                          h_ca )\r
 {\r
        cl_list_item_t*                 p_ioc_item;\r
        al_iou_t*                               p_iou;\r
-       ib_ioc_handle_t VOID_PTR64                      h_ioc;\r
+       ib_ioc_handle_t                 h_ioc;\r
        boolean_t                               found;\r
        ib_api_status_t                 status;\r
 \r
@@ -640,7 +641,7 @@ get_ioc(
 ib_api_status_t\r
 add_ioc(\r
        IN                              al_iou_t*                                       p_iou,\r
-       IN                              ib_ioc_handle_t FUNC_PTR64                              h_ioc )\r
+       IN                              ib_ioc_handle_t                         h_ioc )\r
 {\r
        cl_list_item_t*                 p_list_item;\r
        al_obj_t*                               p_obj;\r
@@ -708,7 +709,7 @@ add_ioc(
 \r
 void\r
 ioc_change(\r
-       IN                              ib_ioc_handle_t FUNC_PTR64                              h_ioc )\r
+       IN                              ib_ioc_handle_t                         h_ioc )\r
 {\r
        CL_ASSERT( h_ioc );\r
 \r
@@ -801,7 +802,7 @@ iou_port_svc_reg_cb(
 \r
        CL_ASSERT( p_reg_svc_rec );\r
 \r
-       p_iou_port = (al_iou_port_t* VOID_PTR64)p_reg_svc_rec->svc_context;\r
+       p_iou_port = (al_iou_port_t*)p_reg_svc_rec->svc_context;\r
 \r
        if( p_reg_svc_rec->req_status != IB_SUCCESS )\r
                deref_al_obj( &p_iou_port->obj );\r
@@ -945,7 +946,7 @@ free_dm_agent(
 ib_api_status_t\r
 dm_agent_reg_pnp(\r
        IN                              ib_pnp_class_t                          pnp_class,\r
-       IN                              ib_pnp_handle_t FUNC_PTR64*                     ph_pnp )\r
+       IN                              ib_pnp_handle_t *                       ph_pnp )\r
 {\r
        ib_api_status_t                 status;\r
        ib_pnp_req_t                    pnp_req;\r
@@ -1027,7 +1028,7 @@ create_iou(
        IN                              ib_pnp_rec_t*                           p_pnp_rec )\r
 {\r
        al_iou_t*                               p_iou;\r
-       ib_ca_handle_t VOID_PTR64                       h_ca;\r
+       ib_ca_handle_t                  h_ca;\r
        ib_api_status_t                 status;\r
 \r
        CL_ASSERT( p_pnp_rec );\r
@@ -1107,7 +1108,7 @@ cleanup_iou(
 {\r
        al_iou_t*                               p_iou;\r
        cl_list_item_t*                 p_ioc_item;\r
-       ib_ioc_handle_t VOID_PTR64                      h_ioc;\r
+       ib_ioc_handle_t                 h_ioc;\r
 \r
        CL_ASSERT( p_obj );\r
        p_iou = PARENT_STRUCT( p_obj, al_iou_t, obj );\r
@@ -1350,7 +1351,7 @@ iou_port_event_cb(
  */\r
 void\r
 dm_agent_send_cb(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              void*                                           mad_svc_context,\r
        IN                              ib_mad_element_t*                       p_mad_response )\r
 {\r
@@ -1375,7 +1376,7 @@ dm_agent_send_cb(
  */\r
 void\r
 dm_agent_recv_cb(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              void*                                           mad_svc_context,\r
        IN                              ib_mad_element_t*                       p_mad_request )\r
 {\r
@@ -1594,7 +1595,7 @@ get_io_unit_info(
 {\r
        ib_iou_info_t*                  p_iou_info;\r
        cl_list_item_t*                 p_ioc_item;\r
-       ib_ioc_handle_t VOID_PTR64                      h_ioc;\r
+       ib_ioc_handle_t                 h_ioc;\r
        uint8_t                                 slot;\r
 \r
        CL_ASSERT( p_iou );\r
@@ -1651,7 +1652,7 @@ get_ioc_profile(
 {\r
        ib_ioc_profile_t*               p_ioc_profile;\r
        cl_list_item_t*                 p_ioc_item;\r
-       ib_ioc_handle_t VOID_PTR64                      h_ioc;\r
+       ib_ioc_handle_t                 h_ioc;\r
 \r
        CL_ASSERT( p_iou );\r
        CL_ASSERT( p_dm_mad );\r
@@ -1710,7 +1711,7 @@ get_svc_entries(
        ib_svc_entries_t*               p_svc_entries;\r
        cl_list_item_t*                 p_ioc_item;\r
        cl_list_item_t*                 p_list_item;\r
-       ib_ioc_handle_t VOID_PTR64                      h_ioc;\r
+       ib_ioc_handle_t                 h_ioc;\r
        al_obj_t*                               p_obj;\r
        al_svc_entry_t*                 p_svc_entry;\r
        uint8_t                                 i, j, k;\r
index d40227d..ebd30bd 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
@@ -40,8 +41,8 @@
 typedef struct _dm_agent               /* Global device management agent struct */\r
 {\r
        al_obj_t                                        obj;            /* Child of al_mgr_t */\r
-TO_LONG_PTR(   ib_pnp_handle_t ,                               h_ca_pnp) ;     /* Handle for CA PnP events */\r
-TO_LONG_PTR(   ib_pnp_handle_t ,                               h_port_pnp) ;   /* Handle for Port PnP events */\r
+       ib_pnp_handle_t                         h_ca_pnp;       /* Handle for CA PnP events */\r
+       ib_pnp_handle_t                         h_port_pnp;     /* Handle for Port PnP events */\r
 \r
        /*\r
         * Lock and state to synchronize user-mode device management\r
@@ -71,10 +72,10 @@ typedef struct _al_iou_port         /* Per-port object of an IO unit */
        net64_t                                         port_guid;\r
        ib_gid_t                                        port_gid;\r
        ib_net16_t                                      port_pkey;\r
-TO_LONG_PTR(   ib_qp_handle_t ,                                h_qp_alias) ; \r
-TO_LONG_PTR(   ib_mad_svc_handle_t ,                   h_mad_svc) ; \r
+       ib_qp_handle_t                          h_qp_alias;\r
+       ib_mad_svc_handle_t                     h_mad_svc;\r
 \r
-TO_LONG_PTR(   struct _al_pool_key* ,                          pool_key) ; \r
+       ib_pool_key_t                           pool_key;\r
 \r
        ib_reg_svc_handle_t                     svc_handle;     /* Service registration handle */\r
 \r
index 72a1d5e..77641f3 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
@@ -139,7 +140,7 @@ __send_timer_cb(
 \r
 static void\r
 __check_send_queue(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc );\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc );\r
 \r
 static void\r
 __recv_timer_cb(\r
@@ -147,8 +148,8 @@ __recv_timer_cb(
 \r
 static ib_api_status_t\r
 __init_send_mad(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
-       IN              const   ib_mad_send_handle_t FUNC_PTR64         h_send,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
+       IN              const   ib_mad_send_handle_t            h_send,\r
        IN                              ib_mad_element_t* const         p_mad_element );\r
 \r
 static boolean_t\r
@@ -160,57 +161,57 @@ __does_send_req_rmpp(
 static void\r
 __queue_mad_wr(\r
        IN              const   al_mad_reg_handle_t                     h_mad_reg,\r
-       IN              const   ib_mad_send_handle_t FUNC_PTR64         h_send );\r
+       IN              const   ib_mad_send_handle_t            h_send );\r
 \r
 static void\r
 __queue_rmpp_seg(\r
        IN              const   al_mad_reg_handle_t                     h_mad_reg,\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send );\r
+       IN                              ib_mad_send_handle_t            h_send );\r
 \r
 static ib_api_status_t\r
 __create_send_av(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send );\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
+       IN                              ib_mad_send_handle_t            h_send );\r
 \r
 static void\r
 __cleanup_mad_send(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send );\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
+       IN                              ib_mad_send_handle_t            h_send );\r
 \r
 static __inline void\r
 __set_retry_time(\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send );\r
+       IN                              ib_mad_send_handle_t            h_send );\r
 \r
 static void\r
 __mad_svc_send_done(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              al_mad_wr_t                                     *p_mad_wr,\r
        IN                              ib_wc_t                                         *p_wc );\r
 \r
 static boolean_t\r
 __is_send_mad_done(\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send,\r
+       IN                              ib_mad_send_handle_t            h_send,\r
        IN                              ib_wc_t                                         *p_wc );\r
 \r
 static void\r
 __notify_send_comp(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
+       IN                              ib_mad_send_handle_t            h_send,\r
        IN                              ib_wc_status_t                          wc_status );\r
 \r
 static void\r
 __mad_svc_recv_done(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t                        *p_mad_element );\r
 \r
 static void\r
 __process_recv_resp(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t                        *p_mad_element );\r
 \r
 static cl_status_t\r
 __do_rmpp_recv(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN      OUT                     ib_mad_element_t                        **pp_mad_element );\r
 \r
 static __inline boolean_t\r
@@ -225,39 +226,39 @@ __is_internal_send(
 \r
 static cl_status_t\r
 __process_rmpp_data(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN      OUT                     ib_mad_element_t                        **pp_mad_element );\r
 \r
 static void\r
 __process_rmpp_ack(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t                        *p_mad_element );\r
 \r
 static void\r
 __process_rmpp_nack(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t                        *p_mad_element );\r
 \r
 static cl_status_t\r
 __process_segment(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              al_mad_rmpp_t                           *p_rmpp,\r
        IN      OUT                     ib_mad_element_t                        **pp_mad_element,\r
                OUT                     ib_mad_element_t                        **pp_rmpp_resp_mad );\r
 \r
 static al_mad_rmpp_t*\r
 __find_rmpp(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN      OUT                     ib_mad_element_t                        *p_mad_element );\r
 \r
 static al_mad_rmpp_t*\r
 __get_mad_rmpp(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t                        *p_mad_element );\r
 \r
 static void\r
 __put_mad_rmpp(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              al_mad_rmpp_t                           *p_rmpp );\r
 \r
 static void\r
@@ -271,7 +272,7 @@ __get_rmpp_ack(
 \r
 ib_net64_t\r
 __get_send_tid(\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send )\r
+       IN                              ib_mad_send_handle_t            h_send )\r
 {\r
        return ((ib_mad_t*)ib_get_mad_buf( h_send->p_send_mad ))->trans_id;\r
 }\r
@@ -281,7 +282,7 @@ ib_mad_t*
 get_mad_hdr_from_wr(\r
        IN                              al_mad_wr_t* const                      p_mad_wr )\r
 {\r
-       ib_mad_send_handle_t VOID_PTR64 h_send;\r
+       ib_mad_send_handle_t    h_send;\r
 \r
        CL_ASSERT( p_mad_wr );\r
 \r
@@ -353,7 +354,7 @@ build_mad_recv(
 ib_api_status_t\r
 create_mad_disp(\r
        IN                              al_obj_t* const                         p_parent_obj,\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN                              al_mad_disp_handle_t* const     ph_mad_disp )\r
 {\r
        al_mad_disp_handle_t    h_mad_disp;\r
@@ -465,7 +466,7 @@ __free_mad_disp(
 static al_mad_reg_handle_t\r
 __mad_disp_reg(\r
        IN              const   al_mad_disp_handle_t            h_mad_disp,\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              const   ib_mad_svc_t                            *p_mad_svc,\r
        IN              const   pfn_mad_svc_send_done_t         pfn_send_done,\r
        IN              const   pfn_mad_svc_recv_done_t         pfn_recv_done )\r
@@ -881,8 +882,8 @@ mad_disp_recv_done(
 {\r
        ib_mad_t                                *p_mad_hdr;\r
        al_mad_reg_handle_t             h_mad_reg;\r
-       ib_al_handle_t  VOID_PTR64                      h_al;\r
-       ib_mad_svc_handle_t VOID_PTR64          h_mad_svc;\r
+       ib_al_handle_t                  h_al;\r
+       ib_mad_svc_handle_t             h_mad_svc;\r
 \r
        cl_vector_t                             *p_class_vector;\r
        cl_ptr_vector_t                 *p_method_ptr_vector;\r
@@ -1007,7 +1008,7 @@ mad_disp_recv_done(
        cl_spinlock_release( &h_mad_disp->obj.lock );\r
 \r
        /* Handoff the MAD to the correct AL instance. */\r
-       h_al = qp_get_al( (ib_qp_handle_t VOID_PTR64)(h_mad_svc->obj.p_parent_obj) );\r
+       h_al = qp_get_al( (ib_qp_handle_t)(h_mad_svc->obj.p_parent_obj) );\r
        al_handoff_mad( h_al, p_mad_element );\r
 \r
        h_mad_reg->pfn_recv_done( h_mad_svc, p_mad_element );\r
@@ -1097,13 +1098,13 @@ __use_tid_routing(
  */\r
 ib_api_status_t\r
 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
        ib_api_status_t         status;\r
        cl_status_t                     cl_status;\r
-       ib_mad_svc_handle_t VOID_PTR64  h_mad_svc;\r
+       ib_mad_svc_handle_t     h_mad_svc;\r
        al_qp_alias_t           *p_qp_alias;\r
        ib_qp_attr_t            qp_attr;\r
 \r
@@ -1212,9 +1213,9 @@ static void
 __destroying_mad_svc(\r
        IN                              struct _al_obj                          *p_obj )\r
 {\r
-       ib_qp_handle_t VOID_PTR64                       h_qp;\r
-       ib_mad_svc_handle_t VOID_PTR64          h_mad_svc;\r
-       ib_mad_send_handle_t VOID_PTR64 h_send;\r
+       ib_qp_handle_t                  h_qp;\r
+       ib_mad_svc_handle_t             h_mad_svc;\r
+       ib_mad_send_handle_t    h_send;\r
        cl_list_item_t                  *p_list_item;\r
        int32_t                                 timeout_ms;\r
 #ifdef CL_KERNEL\r
@@ -1226,7 +1227,7 @@ __destroying_mad_svc(
        h_mad_svc = PARENT_STRUCT( p_obj, al_mad_svc_t, obj );\r
 \r
        /* Deregister the MAD service. */\r
-       h_qp = (ib_qp_handle_t VOID_PTR64)p_obj->p_parent_obj;\r
+       h_qp = (ib_qp_handle_t)p_obj->p_parent_obj;\r
        if( h_qp->pfn_dereg_mad_svc )\r
                h_qp->pfn_dereg_mad_svc( h_mad_svc );\r
 \r
@@ -1316,7 +1317,7 @@ static void
 __cleanup_mad_svc(\r
        IN                              struct _al_obj                          *p_obj )\r
 {\r
-       ib_mad_svc_handle_t VOID_PTR64          h_mad_svc;\r
+       ib_mad_svc_handle_t             h_mad_svc;\r
        al_mad_rmpp_t                   *p_rmpp;\r
        cl_list_item_t                  *p_list_item;\r
 \r
@@ -1348,7 +1349,7 @@ void
 free_mad_svc(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_mad_svc_handle_t VOID_PTR64  h_mad_svc;\r
+       ib_mad_svc_handle_t     h_mad_svc;\r
 \r
        CL_ASSERT( p_obj );\r
        h_mad_svc = PARENT_STRUCT( p_obj, al_mad_svc_t, obj );\r
@@ -1361,13 +1362,13 @@ free_mad_svc(
 \r
 ib_api_status_t\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
        ib_api_status_t                         status = IB_SUCCESS;\r
 #ifdef CL_KERNEL\r
-       ib_mad_send_handle_t VOID_PTR64         h_send;\r
+       ib_mad_send_handle_t            h_send;\r
        ib_mad_element_t                        *p_cur_mad, *p_next_mad;\r
 #endif\r
 \r
@@ -1456,8 +1457,8 @@ ib_send_mad(
 \r
 static ib_api_status_t\r
 __init_send_mad(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
-       IN              const   ib_mad_send_handle_t FUNC_PTR64         h_send,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
+       IN              const   ib_mad_send_handle_t            h_send,\r
        IN                              ib_mad_element_t* const         p_mad_element )\r
 {\r
        ib_rmpp_mad_t           *p_rmpp_hdr;\r
@@ -1533,8 +1534,8 @@ __init_send_mad(
 \r
 static ib_api_status_t\r
 __create_send_av(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send )\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
+       IN                              ib_mad_send_handle_t            h_send )\r
 {\r
        ib_av_attr_t            av_attr;\r
        ib_mad_element_t        *p_mad_element;\r
@@ -1611,7 +1612,7 @@ __does_send_req_rmpp(
 static void\r
 __queue_rmpp_seg(\r
        IN              const   al_mad_reg_handle_t                     h_mad_reg,\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send )\r
+       IN                              ib_mad_send_handle_t            h_send )\r
 {\r
        ib_rmpp_mad_t           *p_rmpp_hdr;\r
 \r
@@ -1690,7 +1691,7 @@ __queue_rmpp_seg(
 static void\r
 __queue_mad_wr(\r
        IN              const   al_mad_reg_handle_t                     h_mad_reg,\r
-       IN              const   ib_mad_send_handle_t FUNC_PTR64         h_send )\r
+       IN              const   ib_mad_send_handle_t            h_send )\r
 {\r
        ib_send_wr_t            *p_send_wr;\r
        al_mad_element_t        *p_al_element;\r
@@ -1717,7 +1718,7 @@ __queue_mad_wr(
 #else\r
                p_rmpp_dst = (uint8_t*)(uintn_t)p_al_element->mad_ds.vaddr;\r
 #endif\r
-               p_rmpp_src = (uint8_t* VOID_PTR64)h_send->p_send_mad->p_mad_buf;\r
+               p_rmpp_src = (uint8_t*)h_send->p_send_mad->p_mad_buf;\r
                p_rmpp_hdr = (ib_rmpp_mad_t*)p_rmpp_src;\r
 \r
                if( h_send->p_send_mad->p_mad_buf->mgmt_class == IB_MCLASS_SUBN_ADM )\r
@@ -1771,7 +1772,7 @@ __mad_svc_find_send(
        IN              const   cl_list_item_t* const           p_list_item,\r
        IN                              void*                                           context )\r
 {\r
-       ib_mad_send_handle_t VOID_PTR64 h_send;\r
+       ib_mad_send_handle_t    h_send;\r
 \r
        h_send = PARENT_STRUCT( p_list_item, al_mad_send_t, pool_item );\r
 \r
@@ -1785,12 +1786,12 @@ __mad_svc_find_send(
 \r
 ib_api_status_t\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
 #ifdef CL_KERNEL\r
        cl_list_item_t                  *p_list_item;\r
-       ib_mad_send_handle_t VOID_PTR64 h_send;\r
+       ib_mad_send_handle_t    h_send;\r
 #else\r
        ib_api_status_t                 status;\r
 #endif\r
@@ -1846,13 +1847,13 @@ ib_cancel_mad(
 \r
 ib_api_status_t\r
 ib_delay_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
        IN              const   uint32_t                                        delay_ms )\r
 {\r
 #ifdef CL_KERNEL\r
        cl_list_item_t                  *p_list_item;\r
-       ib_mad_send_handle_t VOID_PTR64 h_send;\r
+       ib_mad_send_handle_t    h_send;\r
 #endif\r
 \r
        AL_ENTER( AL_DBG_MAD_SVC );\r
@@ -1907,11 +1908,11 @@ ib_delay_mad(
  */\r
 static void\r
 __mad_svc_send_done(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              al_mad_wr_t                                     *p_mad_wr,\r
        IN                              ib_wc_t                                         *p_wc )\r
 {\r
-       ib_mad_send_handle_t VOID_PTR64 h_send;\r
+       ib_mad_send_handle_t    h_send;\r
 \r
        AL_ENTER( AL_DBG_MAD_SVC );\r
        CL_ASSERT( h_mad_svc && p_mad_wr && !p_wc->p_next );\r
@@ -1991,8 +1992,8 @@ __mad_svc_send_done(
  */\r
 static void\r
 __notify_send_comp(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
+       IN                              ib_mad_send_handle_t            h_send,\r
        IN                              ib_wc_status_t                          wc_status )\r
 {\r
        AL_ENTER( AL_DBG_MAD_SVC );\r
@@ -2026,8 +2027,8 @@ __notify_send_comp(
  */\r
 static void\r
 __cleanup_mad_send(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send )\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
+       IN                              ib_mad_send_handle_t            h_send )\r
 {\r
        /* Release any address vectors that we may have created. */\r
        if( h_send->h_av )\r
@@ -2046,7 +2047,7 @@ __cleanup_mad_send(
 \r
 static boolean_t\r
 __is_send_mad_done(\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send,\r
+       IN                              ib_mad_send_handle_t            h_send,\r
        IN                              ib_wc_t                                         *p_wc )\r
 {\r
        AL_ENTER( AL_DBG_MAD_SVC );\r
@@ -2106,14 +2107,14 @@ __is_send_mad_done(
  * Try to find a send that matches the received response.  This call must\r
  * be synchronized with access to the MAD service send_list.\r
  */\r
-static ib_mad_send_handle_t VOID_PTR64\r
+static ib_mad_send_handle_t\r
 __mad_svc_match_recv(\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_recv_mad )\r
 {\r
        ib_mad_t                                *p_recv_hdr;\r
        cl_list_item_t                  *p_list_item;\r
-       ib_mad_send_handle_t VOID_PTR64 h_send;\r
+       ib_mad_send_handle_t    h_send;\r
 \r
        AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
@@ -2142,7 +2143,7 @@ __mad_svc_match_recv(
 \r
 static void\r
 __mad_svc_recv_done(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t                        *p_mad_element )\r
 {\r
        ib_mad_t                                *p_mad_hdr;\r
@@ -2227,11 +2228,11 @@ __mad_svc_recv_done(
  */\r
 static void\r
 __process_recv_resp(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t                        *p_mad_element )\r
 {\r
        ib_mad_t                                *p_mad_hdr;\r
-       ib_mad_send_handle_t VOID_PTR64 h_send;\r
+       ib_mad_send_handle_t    h_send;\r
 \r
        /*\r
         * Try to find the send.  The send may have already timed out or\r
@@ -2256,8 +2257,8 @@ __process_recv_resp(
        h_send->p_send_mad->status = IB_WCS_SUCCESS;\r
 \r
        /* Record the send contexts with the receive. */\r
-       p_mad_element->send_context1 = (void* VOID_PTR64)h_send->p_send_mad->context1;\r
-       p_mad_element->send_context2 = (void* VOID_PTR64)h_send->p_send_mad->context2;\r
+       p_mad_element->send_context1 = (void*)h_send->p_send_mad->context1;\r
+       p_mad_element->send_context2 = (void*)h_send->p_send_mad->context2;\r
 \r
        if( h_send->retry_time == MAX_TIME )\r
        {\r
@@ -2366,7 +2367,7 @@ __is_internal_send(
  */\r
 static cl_status_t\r
 __do_rmpp_recv(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN      OUT                     ib_mad_element_t                        **pp_mad_element )\r
 {\r
        ib_rmpp_mad_t           *p_rmpp_mad;\r
@@ -2418,7 +2419,7 @@ __do_rmpp_recv(
  */\r
 static cl_status_t\r
 __process_rmpp_data(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN      OUT                     ib_mad_element_t                        **pp_mad_element )\r
 {\r
        ib_mad_element_t        *p_rmpp_resp_mad = NULL;\r
@@ -2515,7 +2516,7 @@ __process_rmpp_data(
  */\r
 static al_mad_rmpp_t*\r
 __find_rmpp(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN      OUT                     ib_mad_element_t                        *p_mad_element )\r
 {\r
        al_mad_rmpp_t                   *p_rmpp;\r
@@ -2559,7 +2560,7 @@ __find_rmpp(
  */\r
 static al_mad_rmpp_t*\r
 __get_mad_rmpp(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t                        *p_mad_element )\r
 {\r
        al_mad_rmpp_t           *p_rmpp;\r
@@ -2593,7 +2594,7 @@ __get_mad_rmpp(
  */\r
 static void\r
 __put_mad_rmpp(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              al_mad_rmpp_t                           *p_rmpp )\r
 {\r
        /* Remove the tracking structure from the reassembly list. */\r
@@ -2612,7 +2613,7 @@ __put_mad_rmpp(
  */\r
 static cl_status_t\r
 __process_segment(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              al_mad_rmpp_t                           *p_rmpp,\r
        IN      OUT                     ib_mad_element_t                        **pp_mad_element,\r
                OUT                     ib_mad_element_t                        **pp_rmpp_resp_mad )\r
@@ -2647,18 +2648,18 @@ __process_segment(
                if( (*pp_mad_element)->p_mad_buf->mgmt_class == IB_MCLASS_SUBN_ADM )\r
                {\r
                        /* Copy the received data into our reassembly buffer. */\r
-                       p_src_seg = ((uint8_t* VOID_PTR64)(*pp_mad_element)->p_mad_buf) +\r
+                       p_src_seg = ((uint8_t*)(*pp_mad_element)->p_mad_buf) +\r
                                IB_SA_MAD_HDR_SIZE;\r
-                       p_dst_seg = ((uint8_t* VOID_PTR64)p_rmpp->p_mad_element->p_mad_buf) +\r
+                       p_dst_seg = ((uint8_t*)p_rmpp->p_mad_element->p_mad_buf) +\r
                                IB_SA_MAD_HDR_SIZE + IB_SA_DATA_SIZE * (cur_seg - 1);\r
                        cl_memcpy( p_dst_seg, p_src_seg, IB_SA_DATA_SIZE );\r
                }\r
                else \r
                {\r
                        /* Copy the received data into our reassembly buffer. */\r
-                       p_src_seg = ((uint8_t* VOID_PTR64)(*pp_mad_element)->p_mad_buf) +\r
+                       p_src_seg = ((uint8_t*)(*pp_mad_element)->p_mad_buf) +\r
                                MAD_RMPP_HDR_SIZE;\r
-                       p_dst_seg = ((uint8_t* VOID_PTR64)p_rmpp->p_mad_element->p_mad_buf) +\r
+                       p_dst_seg = ((uint8_t*)p_rmpp->p_mad_element->p_mad_buf) +\r
                                MAD_RMPP_HDR_SIZE + MAD_RMPP_DATA_SIZE * (cur_seg - 1);\r
                        cl_memcpy( p_dst_seg, p_src_seg, MAD_RMPP_DATA_SIZE );\r
                }\r
@@ -2815,10 +2816,10 @@ __init_reply_element(
  */\r
 static void\r
 __process_rmpp_ack(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t                        *p_mad_element )\r
 {\r
-       ib_mad_send_handle_t VOID_PTR64 h_send;\r
+       ib_mad_send_handle_t    h_send;\r
        ib_rmpp_mad_t                   *p_rmpp_mad;\r
        boolean_t                               send_done = FALSE;\r
        ib_wc_status_t                  wc_status = IB_WCS_SUCCESS;\r
@@ -2919,10 +2920,10 @@ __process_rmpp_ack(
  */\r
 static void\r
 __process_rmpp_nack(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t                        *p_mad_element )\r
 {\r
-       ib_mad_send_handle_t VOID_PTR64 h_send;\r
+       ib_mad_send_handle_t    h_send;\r
        ib_rmpp_mad_t                   *p_rmpp_mad;\r
 \r
        AL_ENTER( AL_DBG_MAD_SVC );\r
@@ -2959,7 +2960,7 @@ __process_rmpp_nack(
 \r
 static __inline void\r
 __set_retry_time(\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_send )\r
+       IN                              ib_mad_send_handle_t            h_send )\r
 {\r
        h_send->retry_time =\r
                (uint64_t)(h_send->p_send_mad->timeout_ms + h_send->delay) * 1000Ui64 +\r
@@ -2975,7 +2976,7 @@ __send_timer_cb(
 {\r
        AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
-       __check_send_queue( (ib_mad_svc_handle_t VOID_PTR64)context );\r
+       __check_send_queue( (ib_mad_svc_handle_t)context );\r
 \r
        AL_EXIT( AL_DBG_MAD_SVC );\r
 }\r
@@ -2988,9 +2989,9 @@ __send_timer_cb(
  */\r
 static void\r
 __check_send_queue(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc )\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc )\r
 {\r
-       ib_mad_send_handle_t VOID_PTR64 h_send;\r
+       ib_mad_send_handle_t    h_send;\r
        cl_list_item_t                  *p_list_item, *p_next_item;\r
        uint64_t                                cur_time;\r
        cl_qlist_t                              timeout_list;\r
@@ -3121,14 +3122,14 @@ static void
 __recv_timer_cb(\r
        IN                              void                                            *context )\r
 {\r
-       ib_mad_svc_handle_t VOID_PTR64          h_mad_svc;\r
+       ib_mad_svc_handle_t             h_mad_svc;\r
        al_mad_rmpp_t                   *p_rmpp;\r
        cl_list_item_t                  *p_list_item, *p_next_item;\r
        boolean_t                               restart_timer;\r
 \r
        AL_ENTER( AL_DBG_MAD_SVC );\r
 \r
-       h_mad_svc = (ib_mad_svc_handle_t VOID_PTR64)context;\r
+       h_mad_svc = (ib_mad_svc_handle_t)context;\r
 \r
        cl_spinlock_acquire( &h_mad_svc->obj.lock );\r
 \r
@@ -3165,7 +3166,7 @@ __recv_timer_cb(
 \r
 ib_api_status_t\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
        IN                              void*                                           p_mad_out )\r
@@ -3193,7 +3194,7 @@ ib_local_mad(
 \r
 ib_api_status_t\r
 al_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   void* const                                     p_mad_in,\r
index e285dcb..ff6cb9c 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
@@ -57,7 +58,7 @@
 typedef struct _al_mad_disp\r
 {\r
        al_obj_t                                        obj;\r
-TO_LONG_PTR(   ib_qp_handle_t ,                                h_qp) ; \r
+       ib_qp_handle_t                          h_qp;\r
 \r
        /* Client information. */\r
        cl_vector_t                                     client_vector;\r
@@ -76,19 +77,19 @@ typedef al_mad_disp_t                       *al_mad_disp_handle_t;
 \r
 typedef void\r
 (*pfn_mad_svc_send_done_t)(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              al_mad_wr_t                                     *p_mad_wr,\r
        IN                              ib_wc_t                                         *p_wc );\r
 \r
 typedef void\r
 (*pfn_mad_svc_recv_done_t)(\r
-       IN                              ib_mad_svc_handle_t FUNC_PTR64                  h_mad_svc,\r
+       IN                              ib_mad_svc_handle_t                     h_mad_svc,\r
        IN                              ib_mad_element_t                        *p_mad_element );\r
 \r
 \r
 typedef struct _al_mad_disp_reg\r
 {\r
-TO_LONG_PTR(   ib_mad_svc_handle_t ,                   h_mad_svc) ; \r
+       ib_mad_svc_handle_t                     h_mad_svc;\r
        al_mad_disp_handle_t            h_mad_disp;\r
        uint32_t                                        client_id;\r
        atomic32_t                                      ref_cnt;\r
@@ -114,7 +115,7 @@ typedef     al_mad_disp_reg_t*              al_mad_reg_handle_t;
 ib_api_status_t\r
 create_mad_disp(\r
        IN                              al_obj_t* const                         p_parent_obj,\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN                              al_mad_disp_handle_t* const     ph_mad_disp );\r
 \r
 void\r
@@ -154,7 +155,7 @@ typedef struct _al_mad_svc
        cl_timer_t                                      recv_timer;\r
 \r
        /* The PD and port number are used to create address vectors on sends. */\r
-TO_LONG_PTR(   ib_pd_handle_t ,                                h_pd) ; \r
+       ib_pd_handle_t                          h_pd;\r
        uint8_t                                         port_num;\r
 \r
 }      al_mad_svc_t;\r
@@ -170,14 +171,14 @@ free_mad_svc(
  */\r
 ib_api_status_t\r
 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
 \r
 ib_api_status_t\r
 al_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_av_attr,\r
        IN              const   void* const                                     p_mad_in,\r
@@ -228,7 +229,7 @@ get_mad_hdr_from_wr(
 \r
 ib_api_status_t\r
 ib_delay_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
        IN              const   uint32_t                                        delay_ms );\r
 \r
index 90f8a2c..6acac50 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
@@ -40,7 +41,7 @@
 \r
 typedef struct _al_pool\r
 {\r
-       al_obj_t                                obj;                    /* Child of ib_al_handle_t VOID_PTR64 */\r
+       al_obj_t                                obj;                    /* Child of ib_al_handle_t */\r
 #if defined( CL_KERNEL )\r
        NPAGED_LOOKASIDE_LIST   mad_stack;\r
 #else\r
@@ -87,15 +88,15 @@ typedef struct _al_pool_key
         * pool key with the AL instance in order to synchronize destruction.\r
         */\r
        boolean_t                               in_al_list;\r
-TO_LONG_PTR(   ib_al_handle_t ,                        h_al) ; \r
+       ib_al_handle_t                  h_al;\r
        cl_list_item_t                  al_item;                /* Chain in ib_al_t for dereg */\r
        cl_list_item_t                  pool_item;              /* Chain in al_pool_t for grow */\r
 \r
-TO_LONG_PTR(   ib_pool_handle_t ,              h_pool) ; \r
+       ib_pool_handle_t                h_pool;\r
 #ifndef CL_KERNEL\r
-TO_LONG_PTR(   ib_pd_handle_t ,                        h_pd) ; \r
+       ib_pd_handle_t                  h_pd;\r
 #else\r
-TO_LONG_PTR(   ib_mr_handle_t ,                        h_mr) ; \r
+       ib_mr_handle_t                  h_mr;\r
        net32_t                                 lkey;\r
 #endif\r
 \r
@@ -103,27 +104,23 @@ TO_LONG_PTR(      ib_mr_handle_t ,                        h_mr) ;
        atomic32_t                              mad_cnt;\r
 \r
        /* For alias keys, maintain a reference to the actual pool key. */\r
-TO_LONG_PTR(   ib_pool_key_t ,                 pool_key) ; \r
+       ib_pool_key_t                   pool_key;\r
 \r
 }      al_pool_key_t;\r
 \r
 \r
 ib_api_status_t\r
 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         pp_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            pp_pool_key );\r
 \r
 /* Deregister a MAD pool key if it is of the expected type. */\r
 ib_api_status_t\r
 dereg_mad_pool(\r
-       IN              const   ib_pool_key_t FUNC_PTR64                                pool_key,\r
+       IN              const   ib_pool_key_t                           pool_key,\r
        IN              const   al_key_type_t                           expected_type );\r
 \r
-\r
-typedef void\r
-(* VOID_PTR64 pfn_mad_dbg_t)(void);\r
-\r
 typedef struct _al_mad_element\r
 {\r
        /*\r
@@ -131,10 +128,10 @@ typedef struct _al_mad_element
         * the SMI and MAD QPs to track received MADs.\r
         */\r
        cl_list_item_t                  list_item;\r
-TO_LONG_PTR(   ib_al_handle_t ,                        h_al) ;                         /* Track out-of-pool MAD owner */\r
+       ib_al_handle_t                  h_al;                   /* Track out-of-pool MAD owner */\r
        cl_list_item_t                  al_item;                /* Out-of-pool MAD owner chain */\r
        ib_mad_element_t                element;\r
-TO_LONG_PTR(   ib_pool_key_t ,                 pool_key) ;             /* For getting mads for RMPP ACK */\r
+       ib_pool_key_t                   pool_key;               /* For getting mads for RMPP ACK */\r
        ib_local_ds_t                   grh_ds;                 /* GRH + 256 byte buffer. */\r
        ib_local_ds_t                   mad_ds;                 /* Registered 256-byte buffer. */\r
        ib_mad_t                                *p_al_mad_buf;  /* Allocated send/recv buffer. */\r
@@ -160,7 +157,7 @@ al_resize_mad(
 typedef struct _mad_array\r
 {\r
        al_obj_t                                obj;                    /* Child of al_pool_t */\r
-TO_LONG_PTR(   ib_pool_handle_t ,              h_pool) ; \r
+       ib_pool_handle_t                h_pool;\r
        size_t                                  sizeof_array;\r
        void*                                   p_data;\r
 \r
@@ -172,7 +169,7 @@ typedef struct _mad_item
 {\r
        al_mad_element_t                al_mad_element;\r
 #if defined( CL_KERNEL )\r
-TO_LONG_PTR(   ib_pool_key_t ,                 pool_key) ; \r
+       ib_pool_key_t                   pool_key;\r
 #else\r
        mad_array_t*                    p_mad_array;\r
 #endif\r
@@ -208,7 +205,7 @@ typedef struct _al_mad_send
 {\r
        cl_pool_item_t                          pool_item;\r
        ib_mad_element_t                        *p_send_mad;\r
-TO_LONG_PTR(   ib_av_handle_t ,                                h_av) ; \r
+       ib_av_handle_t                          h_av;\r
 \r
        al_mad_wr_t                                     mad_wr;\r
 \r
@@ -258,14 +255,14 @@ typedef struct _al_mad_rmpp
 \r
 \r
 \r
-ib_mad_send_handle_t FUNC_PTR64\r
+ib_mad_send_handle_t\r
 get_mad_send(\r
        IN              const   al_mad_element_t                        *p_mad_element );\r
 \r
 \r
 void\r
 put_mad_send(\r
-       IN                              ib_mad_send_handle_t FUNC_PTR64         h_mad_send );\r
+       IN                              ib_mad_send_handle_t            h_mad_send );\r
 \r
 \r
 al_mad_rmpp_t*\r
index 0358712..fe6fde5 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
@@ -102,10 +103,10 @@ __free_attach(
 \r
 ib_api_status_t\r
 al_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
-       ib_mcast_handle_t VOID_PTR64            h_mcast;\r
+       ib_mcast_handle_t               h_mcast;\r
        ib_api_status_t                 status;\r
        cl_status_t                             cl_status;\r
        boolean_t                               sync;\r
@@ -227,13 +228,13 @@ static void
 __destroying_mcast(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_mcast_handle_t VOID_PTR64            h_mcast; \r
+       ib_mcast_handle_t               h_mcast;\r
        ib_user_query_t                 sa_mad_data;\r
        ib_api_status_t                 status;\r
 \r
        AL_ENTER( AL_DBG_MCAST );\r
 \r
-       h_mcast = PARENT_STRUCT( p_obj, ib_mcast_t, obj ); /// !!!!\r
+       h_mcast = PARENT_STRUCT( p_obj, ib_mcast_t, obj );\r
 \r
        if( h_mcast->state != SA_REG_STARTING && h_mcast->state != SA_REG_ACTIVE )\r
        {\r
@@ -284,7 +285,7 @@ static void
 __cleanup_mcast(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_mcast_handle_t VOID_PTR64            h_mcast;\r
+       ib_mcast_handle_t               h_mcast;\r
        ib_api_status_t                 status;\r
 \r
        AL_ENTER( AL_DBG_MCAST );\r
@@ -317,7 +318,7 @@ static void
 __free_mcast(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_mcast_handle_t VOID_PTR64            h_mcast;\r
+       ib_mcast_handle_t               h_mcast;\r
 \r
        h_mcast = PARENT_STRUCT( p_obj, ib_mcast_t, obj );\r
 \r
@@ -418,7 +419,7 @@ join_req_cb(
        IN                              al_sa_req_t                                     *p_sa_req,\r
        IN                              ib_mad_element_t                        *p_mad_response )\r
 {\r
-       ib_mcast_handle_t VOID_PTR64            h_mcast;\r
+       ib_mcast_handle_t               h_mcast;\r
        ib_sa_mad_t                             *p_sa_mad;\r
 \r
        AL_ENTER( AL_DBG_MCAST );\r
@@ -464,7 +465,7 @@ join_async_cb(
        IN                              cl_async_proc_item_t            *p_item )\r
 {\r
        ib_api_status_t                 status;\r
-       ib_mcast_handle_t VOID_PTR64            h_mcast;\r
+       ib_mcast_handle_t               h_mcast;\r
        ib_mcast_rec_t                  mcast_rec;\r
        boolean_t                               sync;\r
 \r
@@ -547,7 +548,7 @@ join_async_cb(
 \r
 ib_api_status_t\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
 \r
@@ -576,7 +577,7 @@ leave_req_cb(
        IN                              al_sa_req_t                                     *p_sa_req,\r
        IN                              ib_mad_element_t                        *p_mad_response )\r
 {\r
-       ib_mcast_handle_t VOID_PTR64            h_mcast;\r
+       ib_mcast_handle_t               h_mcast;\r
 \r
        AL_ENTER( AL_DBG_MCAST );\r
        h_mcast = PARENT_STRUCT( p_sa_req, ib_mcast_t, sa_dereg_req );\r
@@ -601,7 +602,7 @@ leave_req_cb(
  */\r
 ib_api_status_t\r
 al_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                     al_attach_handle_t                      *ph_attach,\r
index 0f2aa16..4c3c0a2 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
@@ -47,9 +48,9 @@
 typedef struct _al_attach\r
 {\r
        al_obj_t                                        obj;\r
-TO_LONG_PTR(   ib_mcast_handle_t ,                     h_ci_mcast) ;           /* CI CA handle from attach */\r
+       ib_mcast_handle_t                       h_ci_mcast;             /* CI CA handle from attach */\r
 \r
-}      al_attach_t, * VOID_PTR64 al_attach_handle_t;\r
+}      al_attach_t, *al_attach_handle_t;\r
 \r
 \r
 typedef struct _ib_mcast\r
@@ -59,7 +60,7 @@ typedef struct _ib_mcast
        al_sa_req_t                                     sa_reg_req;\r
        al_sa_req_t                                     sa_dereg_req;\r
 \r
-TO_LONG_PTR(   ib_mcast_handle_t ,                     h_ci_mcast) ; \r
+       ib_mcast_handle_t                       h_ci_mcast;\r
 \r
        cl_async_proc_item_t            async;\r
 \r
@@ -87,12 +88,12 @@ TO_LONG_PTR(        ib_mcast_handle_t ,                     h_ci_mcast) ;
 \r
 void\r
 al_cancel_mcast(\r
-       IN              const   ib_mcast_handle_t FUNC_PTR64                    h_mcast );\r
+       IN              const   ib_mcast_handle_t                       h_mcast );\r
 \r
 \r
 ib_api_status_t\r
 al_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
 \r
@@ -102,7 +103,7 @@ al_join_mcast(
  */\r
 ib_api_status_t\r
 al_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                     al_attach_handle_t                      *ph_attach,\r
index 0487bf4..583374c 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
@@ -68,11 +69,11 @@ typedef struct _al_mgr
  * Note that the exported symbols are only exported for the bus driver\r
  * (loader) and are not intended for use by any normal AL clients.\r
  */\r
-AL_EXPORT cl_async_proc_t      *gp_async_proc_mgr;\r
-AL_EXPORT cl_async_proc_t      *gp_async_pnp_mgr;\r
-AL_EXPORT al_mgr_t                     *gp_al_mgr;\r
-AL_EXPORT ib_al_handle_t VOID_PTR64    gh_al ; \r
-ib_pool_handle_t                       gh_mad_pool ; \r
+cl_async_proc_t                *gp_async_proc_mgr;\r
+cl_async_proc_t                *gp_async_pnp_mgr;\r
+al_mgr_t                       *gp_al_mgr;\r
+ib_al_handle_t         gh_al;\r
+ib_pool_handle_t       gh_mad_pool;\r
 \r
 \r
 ib_api_status_t\r
@@ -81,7 +82,7 @@ create_al_mgr( void );
 \r
 void\r
 print_al_objs(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al );\r
+       IN              const   ib_al_handle_t                          h_al );\r
 \r
 void\r
 print_al_obj(\r
@@ -94,14 +95,14 @@ print_tail_al_objs( void );
 al_ci_ca_t*\r
 acquire_ci_ca(\r
        IN              const   ib_net64_t                                      ci_ca_guid,\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca );\r
+       IN              const   ib_ca_handle_t                          h_ca );\r
 \r
 void\r
 release_ci_ca(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca );\r
+       IN              const   ib_ca_handle_t                          h_ca );\r
 \r
 \r
-AL_EXPORT ib_ca_handle_t FUNC_PTR64 AL_API\r
+ib_ca_handle_t\r
 acquire_ca(\r
        IN              const   ib_net64_t                                      ci_ca_guid );\r
 \r
index 1178789..02bd472 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
@@ -44,8 +45,8 @@
 #include "al_mgr.h"\r
 #include "al_pnp.h"\r
 \r
-ib_al_handle_t VOID_PTR64                      gh_al = NULL;\r
-ib_pool_handle_t VOID_PTR64            gh_mad_pool = NULL;\r
+ib_al_handle_t                 gh_al = NULL;\r
+ib_pool_handle_t               gh_mad_pool = NULL;\r
 al_mgr_t                               *gp_al_mgr = NULL;\r
 cl_async_proc_t                        *gp_async_proc_mgr = NULL;\r
 cl_async_proc_t                        *gp_async_pnp_mgr = NULL;\r
@@ -69,7 +70,7 @@ print_al_obj(
 \r
 void\r
 print_al_objs(\r
-       IN              const   ib_al_handle_t FUNC_PTR64                               h_al )\r
+       IN              const   ib_al_handle_t                          h_al )\r
 {\r
        al_obj_t                *p_obj;\r
        cl_list_item_t  *p_list_item;\r
@@ -150,7 +151,7 @@ find_ci_ca(
 al_ci_ca_t*\r
 acquire_ci_ca(\r
        IN              const   ib_net64_t                                      ci_ca_guid,\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca )\r
+       IN              const   ib_ca_handle_t                          h_ca )\r
 {\r
        al_ci_ca_t                      *p_ci_ca;\r
 \r
@@ -171,7 +172,7 @@ acquire_ci_ca(
 \r
 void\r
 release_ci_ca(\r
-       IN              const   ib_ca_handle_t FUNC_PTR64                               h_ca )\r
+       IN              const   ib_ca_handle_t                          h_ca )\r
 {\r
        AL_ENTER( AL_DBG_MGR );\r
        remove_ca( h_ca );\r
@@ -207,7 +208,7 @@ remove_ci_ca(
 \r
 \r
 \r
-ib_ca_handle_t VOID_PTR64\r
+ib_ca_handle_t\r
 acquire_ca(\r
        IN              const   ib_net64_t                                      ci_ca_guid )\r
 {\r
@@ -237,7 +238,7 @@ acquire_ca(
 \r
 static ib_api_status_t\r
 __get_guid_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
        IN              const   uintn_t                                         type,\r
                OUT                     ib_net64_t* const                       p_guid )\r
@@ -344,7 +345,7 @@ end:
 \r
 ib_api_status_t\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
@@ -373,7 +374,7 @@ ib_get_ca_by_gid(
 \r
 ib_api_status_t\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
@@ -405,7 +406,7 @@ ib_get_port_by_gid(
  */\r
 ib_api_status_t\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
@@ -624,7 +625,7 @@ __get_port_guid(
 \r
 ib_api_status_t\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
index 0b29c65..07b5880 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
@@ -59,7 +60,7 @@ typedef struct _al_shmid
 typedef struct _ib_mr\r
 {\r
        al_obj_t                                        obj;\r
-TO_LONG_PTR(   ib_mr_handle_t ,                                h_ci_mr) ;      /* Actual HW handle. */\r
+       ib_mr_handle_t                          h_ci_mr;        /* Actual HW handle. */\r
 \r
        /* Reference to any memory registrations shared between processes. */\r
        al_shmid_t                                      *p_shmid;\r
@@ -82,81 +83,81 @@ mr_dtor(
 \r
 ib_api_status_t\r
 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
        IN                              boolean_t                                       um_call );\r
 \r
 \r
 ib_api_status_t\r
 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
        IN                              boolean_t                                       um_call );\r
 \r
 \r
 ib_api_status_t\r
 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
        IN                              boolean_t                                       um_call );\r
 \r
 \r
 ib_api_status_t\r
 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
        IN                              boolean_t                                       um_call );\r
 \r
 \r
 ib_api_status_t\r
 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
        IN                              boolean_t                                       um_call );\r
 \r
 \r
 ib_api_status_t\r
 dereg_mr(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr );\r
+       IN              const   ib_mr_handle_t                          h_mr );\r
 \r
 ib_api_status_t\r
 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
        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
 \r
 #ifdef CL_KERNEL\r
 typedef struct _mlnx_fmr\r
 {\r
        al_obj_t                                        obj;\r
-TO_LONG_PTR(   struct _mlnx_fmr *,                     h_ci_fmr) ;     /* Actual HW handle. */\r
-       TO_LONG_PTR(struct _mlnx_fmr *   ,      p_next) ;\r
+       mlnx_fmr_handle_t                       h_ci_fmr;       /* Actual HW handle. */\r
+       struct _mlnx_fmr*                       p_next;\r
 }      mlnx_fmr_t;\r
 \r
 \r
index 37e2c68..ef5192d 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
@@ -63,11 +64,11 @@ mr_ctor(
                OUT                     cl_pool_item_t** const          pp_pool_item )\r
 {\r
        ib_api_status_t                 status;\r
-       ib_mr_handle_t VOID_PTR64                       h_mr;\r
+       ib_mr_handle_t                  h_mr;\r
 \r
        UNUSED_PARAM( context );\r
 \r
-       h_mr = (ib_mr_handle_t VOID_PTR64)p_object;\r
+       h_mr = (ib_mr_handle_t)p_object;\r
        cl_memclr( h_mr, sizeof( ib_mr_t ) );\r
 \r
        construct_al_obj( &h_mr->obj, AL_OBJ_TYPE_H_MR );\r
@@ -78,7 +79,7 @@ mr_ctor(
                return CL_ERROR;\r
        }\r
 \r
-       *pp_pool_item = &((ib_mr_handle_t VOID_PTR64)p_object)->obj.pool_item;\r
+       *pp_pool_item = &((ib_mr_handle_t)p_object)->obj.pool_item;\r
 \r
        /* Release the reference taken in init_al_obj. */\r
        deref_al_obj( &h_mr->obj );\r
@@ -115,7 +116,7 @@ __cleanup_mr(
        IN                              struct _al_obj                          *p_obj )\r
 {\r
        ib_api_status_t                 status;\r
-       ib_mr_handle_t VOID_PTR64                       h_mr;\r
+       ib_mr_handle_t                  h_mr;\r
 \r
        CL_ASSERT( p_obj );\r
        h_mr = PARENT_STRUCT( p_obj, ib_mr_t, obj );\r
@@ -146,7 +147,7 @@ static void
 __return_mr(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_mr_handle_t VOID_PTR64                       h_mr;\r
+       ib_mr_handle_t                  h_mr;\r
 \r
        h_mr = PARENT_STRUCT( p_obj, ib_mr_t, obj );\r
        reset_al_obj( p_obj );\r
@@ -157,11 +158,11 @@ __return_mr(
 \r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
 \r
@@ -187,14 +188,14 @@ ib_reg_mem(
 \r
 ib_api_status_t\r
 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
        IN                              boolean_t                                       um_call )\r
 {\r
-       ib_mr_handle_t VOID_PTR64                       h_mr;\r
+       ib_mr_handle_t                  h_mr;\r
        ib_api_status_t                 status;\r
 \r
        AL_ENTER( AL_DBG_MR );\r
@@ -243,14 +244,14 @@ reg_mem(
 \r
 ib_api_status_t\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
-       ib_mr_handle_t VOID_PTR64                       h_mr;\r
+       ib_mr_handle_t                  h_mr;\r
        ib_api_status_t                 status;\r
 \r
        AL_ENTER( AL_DBG_MR );\r
@@ -308,12 +309,12 @@ ib_reg_phys(
 \r
 ib_api_status_t\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
        if( AL_OBJ_INVALID_HANDLE( h_mr, AL_OBJ_TYPE_H_MR ) )\r
        {\r
@@ -328,12 +329,12 @@ ib_rereg_mem(
 \r
 ib_api_status_t\r
 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
        IN                              boolean_t                                       um_call )\r
 {\r
        ib_api_status_t         status;\r
@@ -381,13 +382,13 @@ rereg_mem(
 \r
 ib_api_status_t\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
        ib_api_status_t         status;\r
 \r
@@ -439,13 +440,13 @@ ib_rereg_phys(
 \r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
 \r
@@ -474,16 +475,16 @@ ib_reg_shared(
 \r
 ib_api_status_t\r
 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
        IN                              boolean_t                                       um_call )\r
 {\r
-       ib_mr_handle_t VOID_PTR64                       h_new_mr;\r
+       ib_mr_handle_t                  h_new_mr;\r
        ib_api_status_t                 status;\r
 \r
        AL_ENTER( AL_DBG_MR );\r
@@ -533,7 +534,7 @@ reg_shared(
 \r
 ib_api_status_t\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
        ib_api_status_t         status;\r
 \r
@@ -559,7 +560,7 @@ ib_dereg_mr(
 \r
 ib_api_status_t\r
 dereg_mr(\r
-       IN              const   ib_mr_handle_t FUNC_PTR64                               h_mr )\r
+       IN              const   ib_mr_handle_t                          h_mr )\r
 {\r
        ib_api_status_t         status;\r
 \r
@@ -598,7 +599,7 @@ dereg_mr(
 \r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
index 9c450ce..10b92ce 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
@@ -61,12 +62,12 @@ free_mw(
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf )\r
 {\r
-       ib_mw_handle_t VOID_PTR64                       h_mw;\r
+       ib_mw_handle_t                  h_mw;\r
        ib_api_status_t                 status;\r
        al_obj_type_t                   obj_type = AL_OBJ_TYPE_H_MW;\r
 \r
@@ -125,7 +126,7 @@ create_mw(
 \r
 ib_api_status_t\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
        ib_api_status_t         status;\r
 \r
@@ -152,7 +153,7 @@ ib_destroy_mw(
 \r
 ib_api_status_t\r
 destroy_mw(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw )\r
+       IN              const   ib_mw_handle_t                          h_mw )\r
 {\r
        ib_api_status_t         status;\r
 \r
@@ -183,7 +184,7 @@ void
 destroying_mw(\r
        IN                              struct _al_obj                          *p_obj )\r
 {\r
-       ib_mw_handle_t VOID_PTR64                       h_mw;\r
+       ib_mw_handle_t                  h_mw;\r
 \r
        CL_ASSERT( p_obj );\r
        h_mw = PARENT_STRUCT( p_obj, ib_mw_t, obj );\r
@@ -201,7 +202,7 @@ void
 free_mw(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_mw_handle_t VOID_PTR64                       h_mw;\r
+       ib_mw_handle_t                  h_mw;\r
 \r
        CL_ASSERT( p_obj );\r
        h_mw = PARENT_STRUCT( p_obj, ib_mw_t, obj );\r
@@ -214,8 +215,8 @@ free_mw(
 \r
 ib_api_status_t\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
        return query_mw( h_mw, ph_pd, p_rkey, NULL );\r
@@ -224,12 +225,12 @@ ib_query_mw(
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf )\r
 {\r
-       ib_pd_handle_t VOID_PTR64                       h_ci_pd;\r
+       ib_pd_handle_t                  h_ci_pd;\r
        ib_api_status_t                 status;\r
 \r
        AL_ENTER( AL_DBG_MW );\r
index fdc11ea..cdaa97b 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
@@ -46,7 +47,7 @@ typedef struct _ib_mw
 \r
        /* List item used to store MW in PD list for proper destruction order. */\r
        cl_list_item_t                          pd_list_item;\r
-TO_LONG_PTR(   ib_mw_handle_t ,                                h_ci_mw) ;      /* Actual HW handle. */\r
+       ib_mw_handle_t                          h_ci_mw;        /* Actual HW handle. */\r
 \r
 }      ib_mw_t;\r
 \r
@@ -54,21 +55,21 @@ TO_LONG_PTR(        ib_mw_handle_t ,                                h_ci_mw) ;      /* Actual HW handle. */
 \r
 ib_api_status_t\r
 create_mw(\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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
 \r
 \r
 ib_api_status_t\r
 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                     uint32_t* const                         p_rkey,\r
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
 \r
 ib_api_status_t\r
 destroy_mw(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw );\r
+       IN              const   ib_mw_handle_t                          h_mw );\r
 \r
 #endif /* __AL_MW_H__ */\r
index f446a69..436fc01 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
@@ -72,13 +73,13 @@ free_pd(
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf )\r
 {\r
-       ib_pd_handle_t VOID_PTR64                       h_pd;\r
+       ib_pd_handle_t                  h_pd;\r
        ib_api_status_t                 status;\r
        al_obj_type_t                   obj_type = AL_OBJ_TYPE_H_PD;\r
 \r
@@ -91,7 +92,7 @@ alloc_pd(
        }\r
 \r
        /* Allocate a protection domain. */\r
-       h_pd = (ib_pd_handle_t VOID_PTR64)cl_zalloc( sizeof( ib_pd_t ) );\r
+       h_pd = (ib_pd_handle_t)cl_zalloc( sizeof( ib_pd_t ) );\r
        if( !h_pd )\r
        {\r
                return IB_INSUFFICIENT_MEMORY;\r
@@ -155,7 +156,7 @@ alloc_pd(
 \r
 ib_api_status_t\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
        AL_ENTER( AL_DBG_PD );\r
@@ -182,10 +183,10 @@ void
 destroying_pd(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_al_handle_t VOID_PTR64                       h_al;\r
-       ib_ca_handle_t VOID_PTR64                       h_ca;\r
-       ib_pd_handle_t VOID_PTR64                       h_pd;\r
-       ib_mw_handle_t VOID_PTR64                       h_mw;\r
+       ib_al_handle_t                  h_al;\r
+       ib_ca_handle_t                  h_ca;\r
+       ib_pd_handle_t                  h_pd;\r
+       ib_mw_handle_t                  h_mw;\r
        cl_list_item_t                  *p_list_item;\r
        ib_api_status_t                 status;\r
 \r
@@ -220,7 +221,7 @@ void
 cleanup_pd(\r
        IN                              struct _al_obj                          *p_obj )\r
 {\r
-       ib_pd_handle_t VOID_PTR64                       h_pd;\r
+       ib_pd_handle_t                  h_pd;\r
        ib_api_status_t                 status;\r
 \r
        CL_ASSERT( p_obj );\r
@@ -251,7 +252,7 @@ void
 free_pd(\r
        IN                              al_obj_t                                        *p_obj )\r
 {\r
-       ib_pd_handle_t VOID_PTR64                       h_pd;\r
+       ib_pd_handle_t                  h_pd;\r
 \r
        CL_ASSERT( p_obj );\r
        h_pd = PARENT_STRUCT( p_obj, ib_pd_t, obj );\r
@@ -262,11 +263,11 @@ free_pd(
 \r
 ib_api_status_t\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   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
        ib_api_status_t                 status;\r
 \r
@@ -318,11 +319,11 @@ ib_create_srq(
 \r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
 \r
@@ -333,14 +334,11 @@ ib_create_qp(
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PD_HANDLE\n") );\r
                return IB_INVALID_PD_HANDLE;\r
        }\r
-\r
        if( !p_qp_create || !ph_qp )\r
        {\r
-\r
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
-\r
        if (h_pd->obj.p_ci_ca && h_pd->obj.p_ci_ca->p_pnp_attr)\r
        {\r
                if ((p_qp_create->rq_depth > h_pd->obj.p_ci_ca->p_pnp_attr->max_wrs) ||\r
@@ -371,13 +369,13 @@ ib_create_qp(
 \r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
 \r
@@ -404,9 +402,9 @@ ib_get_spl_qp(
 \r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
 \r
@@ -432,9 +430,9 @@ ib_create_av(
 \r
 ib_api_status_t\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
        ib_api_status_t                 status;\r
 \r
@@ -459,9 +457,9 @@ ib_create_mw(
 \r
 void\r
 pd_insert_mw(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw )\r
+       IN              const   ib_mw_handle_t                          h_mw )\r
 {\r
-       ib_pd_handle_t VOID_PTR64               h_pd;\r
+       ib_pd_handle_t          h_pd;\r
 \r
        CL_ASSERT( h_mw );\r
        h_pd = PARENT_STRUCT( h_mw->obj.p_parent_obj, ib_pd_t, obj );\r
@@ -475,9 +473,9 @@ pd_insert_mw(
 \r
 void\r
 pd_remove_mw(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw )\r
+       IN              const   ib_mw_handle_t                          h_mw )\r
 {\r
-       ib_pd_handle_t VOID_PTR64               h_pd;\r
+       ib_pd_handle_t          h_pd;\r
 \r
        CL_ASSERT( h_mw );\r
        h_pd = PARENT_STRUCT( h_mw->obj.p_parent_obj, ib_pd_t, obj );\r
index 6f874f7..4d55867 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
@@ -53,7 +54,7 @@ typedef struct _ib_pd
        cl_qlist_t                                      mw_list;\r
 \r
        ib_pd_type_t                            type;\r
-TO_LONG_PTR(   ib_pd_handle_t ,                                h_ci_pd) ;              /* Actual CI PD handle. */\r
+       ib_pd_handle_t                          h_ci_pd;                /* Actual CI PD handle. */\r
 \r
 }      ib_pd_t;\r
 \r
@@ -61,20 +62,20 @@ TO_LONG_PTR(        ib_pd_handle_t ,                                h_ci_pd) ;              /* Actual CI PD handle. */
 \r
 ib_api_status_t\r
 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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
 \r
 \r
 void\r
 pd_insert_mw(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw );\r
+       IN              const   ib_mw_handle_t                          h_mw );\r
 \r
 void\r
 pd_remove_mw(\r
-       IN              const   ib_mw_handle_t FUNC_PTR64                               h_mw );\r
+       IN              const   ib_mw_handle_t                          h_mw );\r
 \r
 \r
 #endif /* __AL_PD_H__ */\r
index 643bb57..3992b43 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
@@ -210,10 +211,10 @@ pnp_reg_complete(
 \r
 ib_api_status_t\r
 al_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
        IN                              KEVENT                                          *p_sync_event,\r
-               OUT                     ib_pnp_handle_t FUNC_PTR64* const               ph_pnp );\r
+               OUT                     ib_pnp_handle_t* const          ph_pnp );\r
 \r
 #endif /* CL_KERNEL */\r
 \r
index f6c49ba..ea39237 100644 (file)
@@ -114,7 +114,7 @@ typedef struct _al_dev_open_context
        cl_ioctl_handle_t       h_misc_ioctl;\r
 \r
        /* Per-process AL handle. */\r
-TO_LONG_PTR(   ib_al_handle_t  ,               h_al) ; \r
+       ib_al_handle_t          h_al;\r
 \r
 }      al_dev_open_context_t;\r
 \r
index 838dc1e..4e081bb 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
 #include "al_verbs.h"\r
 \r
 #include "ib_common.h"\r
-#include "basetsd.h"\r
 \r
 \r
 #define UNBOUND_PORT_GUID              0\r
 \r
 \r
-extern ib_pool_handle_t VOID_PTR64                     gh_mad_pool;\r
+extern ib_pool_handle_t                        gh_mad_pool;\r
 \r
 \r
 /*\r
@@ -97,8 +97,8 @@ init_base_qp(
 \r
 ib_api_status_t\r
 init_raw_qp(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
-       IN              const   ib_pd_handle_t FUNC_PTR64                               h_pd,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
+       IN              const   ib_pd_handle_t                          h_pd,\r
        IN              const   ib_net64_t                                      port_guid OPTIONAL,\r
        IN              const   ib_qp_create_t* const           p_qp_create,\r
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
@@ -106,54 +106,54 @@ init_raw_qp(
 ib_api_status_t\r
 init_conn_qp(\r
        IN                              al_conn_qp_t* const                     p_conn_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      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
 \r
 ib_api_status_t\r
 init_dgrm_qp(\r
        IN                              al_dgrm_qp_t* const                     p_dgrm_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      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
 \r
 ib_api_status_t\r
 init_special_qp(\r
        IN                              al_special_qp_t* const          p_special_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
 \r
 ib_api_status_t\r
 init_qp_alias(\r
        IN                              al_qp_alias_t* const            p_qp_alias,\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
 \r
 ib_api_status_t\r
 init_mad_qp(\r
        IN                              al_mad_qp_t* const                      p_mad_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   ib_pfn_event_cb_t                       pfn_qp_event_cb );\r
 \r
 ib_api_status_t\r
 init_mad_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 );\r
 \r
 \r
 ib_api_status_t\r
 al_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
        IN      OUT                     ci_umv_buf_t* const                     p_umv_buf );\r
 \r
 \r
 ib_api_status_t\r
 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 );\r
 \r
 ib_api_status_t\r
@@ -162,24 +162,24 @@ mad_qp_post_recvs(
 \r
 ib_api_status_t\r
 ud_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 );\r
 \r
 ib_api_status_t\r
 special_qp_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 );\r
 \r
 void\r
 mad_qp_queue_mad(\r
-       IN              const   ib_qp_handle_t FUNC_PTR64                               h_qp,\r
+       IN              const   ib_qp_handle_t                          h_qp,\r
        IN                              al_mad_wr_t* const                      p_mad_wr );\r
 \r
 void\r
 mad_qp_resume_sends(\r
-       IN                              ib_qp_handle_t FUNC_PTR64                               h_qp );\r
+       IN                              ib_qp_handle_t                          h_qp );\r
 \r
 void\r
 mad_qp_flush_send(\r
@@ -188,18 +188,18 @@ mad_qp_flush_send(
 \r
 void\r
 mad_recv_comp_cb(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN                              void                                            *cq_context );\r
 \r
 void\r
 mad_send_comp_cb(\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN                              void                                            *cq_context );\r
 \r
 void\r
 mad_qp_comp(\r
        IN                              al_mad_qp_t*                            p_mad_qp,\r
-       IN              const   ib_cq_handle_t FUNC_PTR64                               h_cq,\r
+       IN              const   ib_cq_handle_t                          h_cq,\r
        IN                              ib_wc_type_t                            wc_type );\r
 \r
 void\r
@@ -214,38 +214,38 @@ mad_qp_cq_event_cb(
 ib_api_status_t\r
 alloc_qp(\r
        IN              const   ib_qp_type_t                            qp_type,\r
-               OUT                     ib_qp_handle_t FUNC_PTR64* const                ph_qp )\r
+               OUT                     ib_qp_handle_t* const           ph_qp )\r
 {\r
-       ib_qp_handle_t VOID_PTR64                               h_qp;\r
+       ib_qp_handle_t                          h_qp;\r
 \r
        switch( qp_type )\r
        {\r
        case IB_QPT_RELIABLE_CONN:\r
        case IB_QPT_UNRELIABLE_CONN:\r
-               h_qp = (ib_qp_handle_t VOID_PTR64)cl_zalloc( sizeof( al_conn_qp_t ) );\r
+               h_qp = (ib_qp_handle_t)cl_zalloc( sizeof( al_conn_qp_t ) );\r
                break;\r
 \r
        case IB_QPT_UNRELIABLE_DGRM:\r
-               h_qp = (ib_qp_handle_t VOID_PTR64)cl_zalloc( sizeof( al_dgrm_qp_t ) );\r
+               h_qp = (ib_qp_handle_t)cl_zalloc( sizeof( al_dgrm_qp_t ) );\r
                break;\r
 \r
        case IB_QPT_QP0:\r
        case IB_QPT_QP1:\r
-               h_qp = (ib_qp_handle_t VOID_PTR64)cl_zalloc( sizeof( al_special_qp_t ) );\r
+               h_qp = (ib_qp_handle_t)cl_zalloc( sizeof( al_special_qp_t ) );\r
                break;\r
 \r
        case IB_QPT_RAW_IPV6:\r
        case IB_QPT_RAW_ETHER:\r
-               h_qp = (ib_qp_handle_t VOID_PTR64)cl_zalloc( sizeof( ib_qp_t ) );\r
+               h_qp = (ib_qp_handle_t)cl_zalloc( sizeof( ib_qp_t ) );\r
                break;\r
 \r
        case IB_QPT_MAD:\r
-        &