[TESTS] This patch removes XXX_PTR64 and TO_ULONG_PTR macro use from \tests.

Signed-off-by: Fab Tillier <ftillier@microsoft.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1312 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/tests/alts/allocdeallocpd.c b/tests/alts/allocdeallocpd.c
index 10d29a5..350dad8 100644 (file)
--- a/tests/alts/allocdeallocpd.c
+++ b/tests/alts/allocdeallocpd.c
@@ -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
@@ -51,9 +52,9 @@ ib_api_status_t
 al_test_alloc_dealloc_pd(void)\r
 {\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
-       ib_al_handle_t VOID_PTR64 h_al = NULL;\r
-       ib_ca_handle_t VOID_PTR64 h_ca;\r
-       ib_pd_handle_t VOID_PTR64 h_pd;\r
+       ib_al_handle_t h_al = NULL;\r
+       ib_ca_handle_t h_ca;\r
+       ib_pd_handle_t h_pd;\r
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r
 \r

diff --git a/tests/alts/alts_common.h b/tests/alts/alts_common.h
index b8684a7..41bf18e 100644 (file)
--- a/tests/alts/alts_common.h
+++ b/tests/alts/alts_common.h
@@ -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 _mem_region\r
 {\r
        void            *buffer;\r
-    TO_LONG_PTR(struct _ib_mr* ,mr_h) ; \r
+       struct _ib_mr* mr_h;\r
        uint32_t        lkey;\r
        uint32_t        rkey;\r
 \r
@@ -245,19 +246,19 @@ al_test_register_shared_mem( void );
  */\r
 \r
 ib_api_status_t\r
-alts_open_al( ib_al_handle_t FUNC_PTR64        *ph_al );\r
+alts_open_al( ib_al_handle_t   *ph_al );\r
 \r
 ib_api_status_t\r
-alts_close_al( ib_al_handle_t FUNC_PTR64       ph_al );\r
+alts_close_al( ib_al_handle_t  ph_al );\r
 \r
 ib_api_status_t\r
 alts_open_ca(\r
-       IN ib_al_handle_t FUNC_PTR64    h_al,\r
-       OUT ib_ca_handle_t FUNC_PTR64   *p_alts_ca_h\r
+       IN ib_al_handle_t       h_al,\r
+       OUT ib_ca_handle_t      *p_alts_ca_h\r
        );\r
 \r
 ib_api_status_t\r
-alts_close_ca( IN ib_ca_handle_t FUNC_PTR64 alts_ca_h );\r
+alts_close_ca( IN ib_ca_handle_t alts_ca_h );\r
 \r
 void\r
 alts_ca_err_cb( ib_async_event_rec_t   *p_err_rec);\r
@@ -284,7 +285,7 @@ alts_qp_destroy_cb(
 \r
 void\r
 alts_cq_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

diff --git a/tests/alts/alts_misc.c b/tests/alts/alts_misc.c
index 5871d4c..ae29f36 100644 (file)
--- a/tests/alts/alts_misc.c
+++ b/tests/alts/alts_misc.c
@@ -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
@@ -50,7 +51,7 @@
 \r
 ib_api_status_t\r
 alts_open_al(\r
-       ib_al_handle_t VOID_PTR64       *ph_al )\r
+       ib_al_handle_t  *ph_al )\r
 {\r
        ib_api_status_t ib_status;\r
 \r
@@ -74,7 +75,7 @@ alts_open_al(
 \r
 ib_api_status_t\r
 alts_close_al(\r
-       ib_al_handle_t VOID_PTR64       h_al )\r
+       ib_al_handle_t  h_al )\r
 {\r
        ib_api_status_t ib_status;\r
 \r
@@ -97,8 +98,8 @@ alts_close_al(
 \r
 ib_api_status_t\r
 alts_open_ca(\r
-       IN      ib_al_handle_t FUNC_PTR64       h_al,\r
-       OUT ib_ca_handle_t FUNC_PTR64   *p_alts_ca_h )\r
+       IN      ib_al_handle_t  h_al,\r
+       OUT ib_ca_handle_t      *p_alts_ca_h )\r
 {\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
        size_t guid_count;\r
@@ -168,7 +169,7 @@ alts_open_ca(
 \r
 ib_api_status_t\r
 alts_close_ca(\r
-       IN ib_ca_handle_t FUNC_PTR64 alts_ca_h\r
+       IN ib_ca_handle_t alts_ca_h\r
        )\r
 {\r
        ib_api_status_t ib_status;\r

diff --git a/tests/alts/cmtests.c b/tests/alts/cmtests.c
index 5b67485..cde0f42 100644 (file)
--- a/tests/alts/cmtests.c
+++ b/tests/alts/cmtests.c
@@ -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
@@ -64,7 +65,7 @@ typedef struct _alts_cm_ca_obj
        ib_qp_type_t            test_type;\r
        ib_pfn_comp_cb_t        pfn_comp_cb;\r
 \r
-       ib_ca_handle_t VOID_PTR64               h_ca;\r
+       ib_ca_handle_t          h_ca;\r
        ib_ca_attr_t            *p_ca_attr;\r
        ib_port_attr_t          *p_src_port_attr;\r
        ib_port_attr_t          *p_dest_port_attr;\r
@@ -81,20 +82,20 @@ typedef struct _alts_cm_ca_obj
        ib_net16_t                      slid;\r
        ib_net16_t                      dlid;\r
 \r
-       ib_pool_key_t VOID_PTR64                h_src_pool;\r
-       ib_pool_key_t VOID_PTR64                h_dest_pool;\r
+       ib_pool_key_t           h_src_pool;\r
+       ib_pool_key_t           h_dest_pool;\r
 \r
-       ib_mad_svc_handle_t VOID_PTR64  h_src_mad_svc;\r
-       ib_mad_svc_handle_t VOID_PTR64  h_dest_mad_svc;\r
+       ib_mad_svc_handle_t     h_src_mad_svc;\r
+       ib_mad_svc_handle_t     h_dest_mad_svc;\r
 \r
        boolean_t                       num_cq;\r
-       ib_cq_handle_t VOID_PTR64               h_cq;\r
-       ib_cq_handle_t VOID_PTR64               h_cq_alt;\r
+       ib_cq_handle_t          h_cq;\r
+       ib_cq_handle_t          h_cq_alt;\r
        uint32_t                        cq_size;\r
 \r
-       ib_pd_handle_t VOID_PTR64               h_pd;\r
+       ib_pd_handle_t          h_pd;\r
 \r
-       ib_qp_handle_t VOID_PTR64               h_qp[MAX_QPS];\r
+       ib_qp_handle_t          h_qp[MAX_QPS];\r
        uint32_t                        qkey;\r
 \r
        ib_qp_attr_t            qp_attr[MAX_QPS];\r
@@ -107,8 +108,8 @@ typedef struct _alts_cm_ca_obj
        uint32_t                        ds_list_depth;\r
        uint32_t                        msg_size; // Initialize this field\r
 \r
-       ib_av_handle_t VOID_PTR64               h_av_src;\r
-       ib_av_handle_t VOID_PTR64               h_av_dest;\r
+       ib_av_handle_t          h_av_src;\r
+       ib_av_handle_t          h_av_dest;\r
 \r
        uint32_t                        send_done;\r
        uint32_t                        recv_done;\r
@@ -127,7 +128,7 @@ typedef struct _alts_cm_ca_obj
        ib_cm_req_t                     req_dest;\r
 \r
        ib_cm_listen_t          listen;\r
-       ib_listen_handle_t VOID_PTR64   h_cm_listen;\r
+       ib_listen_handle_t      h_cm_listen;\r
 \r
        ib_cm_rep_t                     rep_dest;\r
 \r
@@ -148,7 +149,7 @@ typedef struct _alts_cm_ca_obj
        cl_event_t                      destroy_event;\r
 \r
        boolean_t                       handoff;\r
-       ib_listen_handle_t VOID_PTR64   h_cm_listen_handoff;\r
+       ib_listen_handle_t      h_cm_listen_handoff;\r
        ib_net64_t                      handoff_svc_id;\r
 \r
        mem_region_t            mem_region[10];\r
@@ -162,8 +163,8 @@ typedef struct _alts_serv_object
 {\r
        alts_cm_ca_obj_t        alts_obj;\r
 \r
-       ib_cq_handle_t VOID_PTR64               h_cq[MAX_SERVER];\r
-       ib_qp_handle_t VOID_PTR64               h_qp[MAX_SERVER];\r
+       ib_cq_handle_t          h_cq[MAX_SERVER];\r
+       ib_qp_handle_t          h_qp[MAX_SERVER];\r
 \r
 }      alts_serv_object_t;\r
 \r
@@ -182,7 +183,7 @@ typedef struct      _alts_rmda
 ib_api_status_t\r
 alts_cm_activate_qp(\r
        alts_cm_ca_obj_t *p_ca_obj,\r
-       ib_qp_handle_t VOID_PTR64 h_qp );\r
+       ib_qp_handle_t h_qp );\r
 \r
 ib_api_status_t\r
 alts_cm_check_active_ports(\r
@@ -212,47 +213,47 @@ __mra_thread(
  */\r
 ib_api_status_t\r
 alts_cm_rc_tests (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_cm_rc_rej_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_cm_handoff_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_cm_rc_flush_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_rc_no_cm_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_cm_rc_rdma_tests (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_rc_mra_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_cm_uc_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_cm_sidr_tests (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 #define ALTS_TEST_MGMT_CLASS   0x56\r
@@ -261,7 +262,7 @@ alts_cm_sidr_tests (
 /*\r
  * Gloabal Variables\r
  */\r
-ib_al_handle_t VOID_PTR64              h_al;\r
+ib_al_handle_t         h_al;\r
 ib_dgrm_info_t         dgrm_info;\r
 ib_mad_svc_t           mad_svc;\r
 ib_send_wr_t           send_wr;\r
@@ -294,7 +295,7 @@ ib_api_status_t
 al_test_cm(void)\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR;\r
-       ib_ca_handle_t VOID_PTR64               h_ca = NULL;\r
+       ib_ca_handle_t          h_ca = NULL;\r
        uint32_t                        bsize;         \r
        ib_ca_attr_t            *p_ca_attr = NULL;\r
        //alts_cm_ca_obj_t      ca_obj; // for testing stack\r
@@ -867,13 +868,13 @@ rc_cm_cq_comp_cb(
        uint32_t i = 0, id;\r
        ib_wc_t *p_free_wcl, *p_done_cl= NULL;\r
        alts_cm_ca_obj_t *p_ca_obj;\r
-       ib_cq_handle_t VOID_PTR64       h_cq;\r
+       ib_cq_handle_t  h_cq;\r
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r
 \r
        CL_ASSERT(cq_context);\r
 \r
-       h_cq = *((ib_cq_handle_t VOID_PTR64*)cq_context);\r
+       h_cq = *((ib_cq_handle_t*)cq_context);\r
        p_ca_obj = gp_ca_obj;\r
 \r
        ib_status = ib_rearm_cq(h_cq, FALSE);\r
@@ -1120,7 +1121,7 @@ rdma_cq_comp_cb(
        uint32_t i = 0, id;\r
        ib_wc_t *p_free_wcl, *p_done_cl= NULL;\r
        alts_cm_ca_obj_t *p_ca_obj;\r
-       ib_cq_handle_t VOID_PTR64       h_cq;\r
+       ib_cq_handle_t  h_cq;\r
        alts_rdma_t             *p_data;\r
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r
@@ -1129,7 +1130,7 @@ rdma_cq_comp_cb(
 \r
        CL_ASSERT(cq_context);\r
 \r
-       h_cq = *((ib_cq_handle_t VOID_PTR64*)cq_context);\r
+       h_cq = *((ib_cq_handle_t*)cq_context);\r
        p_ca_obj = gp_ca_obj;\r
 \r
        ib_status = ib_rearm_cq(h_cq, FALSE);\r
@@ -1220,7 +1221,7 @@ rdma_cq_comp_cb(
 \r
 void\r
 cm_rc_cq_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
        UNUSED_PARAM( h_cq );\r
@@ -1229,7 +1230,7 @@ cm_rc_cq_comp_cb(
 \r
 void\r
 cm_ud_cq_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
        UNUSED_PARAM( h_cq );\r
@@ -1238,7 +1239,7 @@ cm_ud_cq_comp_cb(
 \r
 void\r
 cm_rdma_cq_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
        UNUSED_PARAM( h_cq );\r
@@ -1852,7 +1853,7 @@ alts_cm_dreq_cb(
 \r
        CL_ASSERT( p_cm_dreq_rec );\r
 \r
-       p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_dreq_rec->qp_context;\r
+       p_ca_obj = (alts_cm_ca_obj_t*)p_cm_dreq_rec->qp_context;\r
        CL_ASSERT( p_ca_obj );\r
 \r
        p_ca_obj->cm_cbs++;             // count crows\r
@@ -1880,7 +1881,7 @@ alts_cm_rep_cb(
        if(( p_cm_rep_rec->qp_type == IB_QPT_RELIABLE_CONN ) ||\r
                ( p_cm_rep_rec->qp_type == IB_QPT_UNRELIABLE_CONN ))\r
        {\r
-               p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rep_rec->qp_context;\r
+               p_ca_obj = (alts_cm_ca_obj_t*)p_cm_rep_rec->qp_context;\r
                CL_ASSERT( p_ca_obj );\r
 \r
                p_ca_obj->cm_cbs++;             // count crows\r
@@ -1921,7 +1922,7 @@ alts_cm_rep_cb(
                        p_cm_rep_rec->remote_qp,\r
                        p_cm_rep_rec->remote_qkey ));\r
 \r
-               p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rep_rec->sidr_context;\r
+               p_ca_obj = (alts_cm_ca_obj_t*)p_cm_rep_rec->sidr_context;\r
                CL_ASSERT( p_ca_obj );\r
 \r
                p_ca_obj->cm_cbs++;             // count crows\r
@@ -1945,7 +1946,7 @@ alts_cm_rej_cb(
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r
 \r
-       p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rej_rec->qp_context;\r
+       p_ca_obj = (alts_cm_ca_obj_t*)p_cm_rej_rec->qp_context;\r
 \r
        // only use context if qp was set up\r
        if( p_ca_obj )\r
@@ -1964,7 +1965,7 @@ alts_cm_mra_cb(
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r
 \r
-       p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_mra_rec->qp_context;\r
+       p_ca_obj = (alts_cm_ca_obj_t*)p_cm_mra_rec->qp_context;\r
        CL_ASSERT( p_ca_obj );\r
 \r
 \r
@@ -1993,7 +1994,7 @@ alts_cm_rtu_cb(
 \r
        CL_ASSERT( p_cm_rtu_rec );\r
 \r
-       p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_rtu_rec->qp_context;\r
+       p_ca_obj = (alts_cm_ca_obj_t*)p_cm_rtu_rec->qp_context;\r
        CL_ASSERT( p_ca_obj );\r
 \r
        p_ca_obj->cm_cbs++;             // count crows\r
@@ -2026,7 +2027,7 @@ alts_cm_req_cb(
 \r
        CL_ASSERT( p_cm_req_rec );\r
 \r
-       p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_req_rec->context;\r
+       p_ca_obj = (alts_cm_ca_obj_t*)p_cm_req_rec->context;\r
 \r
        CL_ASSERT( p_ca_obj );\r
 \r
@@ -2372,7 +2373,7 @@ alts_cm_drep_cb(
 \r
        CL_ASSERT( p_cm_drep_rec );\r
 \r
-       p_ca_obj = (alts_cm_ca_obj_t* VOID_PTR64)p_cm_drep_rec->qp_context;\r
+       p_ca_obj = (alts_cm_ca_obj_t*)p_cm_drep_rec->qp_context;\r
        CL_ASSERT( p_ca_obj );\r
 \r
        p_ca_obj->cm_cbs++;             // count crows\r
@@ -2446,7 +2447,7 @@ cm_destroy_end:
 \r
 ib_api_status_t\r
 alts_cm_rc_tests (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2581,7 +2582,7 @@ alts_cm_rc_tests (
 \r
 ib_api_status_t\r
 alts_cm_rc_rej_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2710,7 +2711,7 @@ alts_cm_rc_rej_test (
 \r
 ib_api_status_t\r
 alts_cm_handoff_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2849,7 +2850,7 @@ alts_cm_handoff_test (
 \r
 ib_api_status_t\r
 alts_cm_rc_flush_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2995,7 +2996,7 @@ alts_cm_rc_flush_test (
 ib_api_status_t\r
 alts_cm_activate_qp(\r
        alts_cm_ca_obj_t *p_ca_obj,\r
-       ib_qp_handle_t VOID_PTR64 h_qp\r
+       ib_qp_handle_t h_qp\r
        )\r
 {\r
 \r
@@ -3154,7 +3155,7 @@ alts_cm_activate_qp(
 \r
 ib_api_status_t\r
 alts_rc_no_cm_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -3649,7 +3650,7 @@ alts_rc_rdma_message_passing(
 \r
 ib_api_status_t\r
 alts_cm_rc_rdma_tests (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -3880,7 +3881,7 @@ __mra_thread(
 \r
 ib_api_status_t\r
 alts_rc_mra_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -4016,7 +4017,7 @@ alts_rc_mra_test (
 \r
 ib_api_status_t\r
 alts_cm_uc_test (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -4150,7 +4151,7 @@ alts_cm_uc_test (
 \r
 ib_api_status_t\r
 alts_cm_sidr_tests (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r

diff --git a/tests/alts/createanddestroycq.c b/tests/alts/createanddestroycq.c
index 475792b..f1cc008 100644 (file)
--- a/tests/alts/createanddestroycq.c
+++ b/tests/alts/createanddestroycq.c
@@ -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
@@ -78,12 +79,12 @@ alts_cq(
        )\r
 {\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
-       ib_al_handle_t VOID_PTR64       h_al = NULL;\r
-       ib_ca_handle_t VOID_PTR64       h_ca;\r
-       ib_cq_handle_t VOID_PTR64       h_cq = NULL;\r
+       ib_al_handle_t  h_al = NULL;\r
+       ib_ca_handle_t  h_ca;\r
+       ib_cq_handle_t  h_cq = NULL;\r
        cl_status_t             cl_status;\r
        ib_cq_create_t  cq_create;\r
-       ib_pd_handle_t VOID_PTR64       h_pd;\r
+       ib_pd_handle_t  h_pd;\r
        int                             iteration = 0;\r
 #ifdef CL_KERNEL\r
        cl_event_t              cq_event;\r
@@ -296,7 +297,7 @@ alts_cq(
 \r
 void\r
 alts_cq_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
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r

diff --git a/tests/alts/createanddestroyqp.c b/tests/alts/createanddestroyqp.c
index ad91900..39f864c 100644 (file)
--- a/tests/alts/createanddestroyqp.c
+++ b/tests/alts/createanddestroyqp.c
@@ -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
@@ -80,11 +81,11 @@ alts_qp(
        )\r
 {\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
-       ib_al_handle_t VOID_PTR64               h_al = NULL;\r
-       ib_ca_handle_t VOID_PTR64       h_ca;\r
-       ib_cq_handle_t VOID_PTR64       h_cq = NULL;\r
-       ib_qp_handle_t VOID_PTR64       h_qp = NULL;    \r
-       ib_pd_handle_t VOID_PTR64       h_pd;   \r
+       ib_al_handle_t          h_al = NULL;\r
+       ib_ca_handle_t  h_ca;\r
+       ib_cq_handle_t  h_cq = NULL;\r
+       ib_qp_handle_t  h_qp = NULL;    \r
+       ib_pd_handle_t  h_pd;   \r
        cl_status_t             cl_status;\r
        ib_cq_create_t  cq_create;\r
        ib_qp_create_t  qp_create;      \r

diff --git a/tests/alts/createdestroyav.c b/tests/alts/createdestroyav.c
index 9edf1c0..ca7c710 100644 (file)
--- a/tests/alts/createdestroyav.c
+++ b/tests/alts/createdestroyav.c
@@ -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
@@ -75,13 +76,13 @@ alts_av(
        )\r
 {\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
-       ib_al_handle_t VOID_PTR64 h_al = NULL;\r
+       ib_al_handle_t h_al = NULL;\r
        size_t guid_count;\r
        ib_port_attr_t *p_alts_port_attr;\r
        ib_av_attr_t alts_av_attr, query_av_attr;\r
-       ib_ca_handle_t VOID_PTR64 h_ca;\r
-       ib_pd_handle_t VOID_PTR64 h_pd, h_pd1;\r
-       ib_av_handle_t VOID_PTR64 h_av;\r
+       ib_ca_handle_t h_ca;\r
+       ib_pd_handle_t h_pd, h_pd1;\r
+       ib_av_handle_t h_av;\r
        ib_net64_t ca_guid_array[ALTS_MAX_CA];\r
        uint32_t bsize;\r
        ib_ca_attr_t *alts_ca_attr = NULL;\r

diff --git a/tests/alts/creatememwindow.c b/tests/alts/creatememwindow.c
index 54e962e..e14ef2d 100644 (file)
--- a/tests/alts/creatememwindow.c
+++ b/tests/alts/creatememwindow.c
@@ -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,16 +60,16 @@ al_test_create_mem_window(
        )\r
 {\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
-       ib_al_handle_t VOID_PTR64 h_al = NULL;\r
-       ib_ca_handle_t VOID_PTR64 h_ca = NULL;\r
-       ib_pd_handle_t VOID_PTR64 h_pd = NULL;\r
+       ib_al_handle_t h_al = NULL;\r
+       ib_ca_handle_t h_ca = NULL;\r
+       ib_pd_handle_t h_pd = NULL;\r
 \r
        ib_mr_create_t virt_mem;\r
        char *ptr = NULL, *ptr_align;\r
        size_t          mask; \r
        uint32_t        lkey;\r
        uint32_t        rkey;\r
-       ib_mr_handle_t VOID_PTR64       h_mr = NULL;\r
+       ib_mr_handle_t  h_mr = NULL;\r
        ib_mr_attr_t    alts_mr_attr;\r
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r
@@ -166,9 +167,9 @@ al_test_create_mem_window(
                {\r
 \r
                        uint32_t rkey_mw;\r
-                       ib_mw_handle_t VOID_PTR64 h_mw;\r
+                       ib_mw_handle_t h_mw;\r
 \r
-                       ib_pd_handle_t VOID_PTR64 h_pd_query;\r
+                       ib_pd_handle_t h_pd_query;\r
                        uint32_t rkey_mw_query;\r
 \r
                        ib_status = ib_create_mw(h_pd,&rkey_mw,&h_mw);\r

diff --git a/tests/alts/ibquery.c b/tests/alts/ibquery.c
index 770c399..d2f2ec5 100644 (file)
--- a/tests/alts/ibquery.c
+++ b/tests/alts/ibquery.c
@@ -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,9 +84,9 @@ ib_api_status_t
 al_test_query(void)\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR;\r
-       ib_al_handle_t VOID_PTR64               h_al = NULL;\r
+       ib_al_handle_t          h_al = NULL;\r
 \r
-       ib_ca_handle_t VOID_PTR64               h_ca = NULL;\r
+       ib_ca_handle_t          h_ca = NULL;\r
        uint32_t                        bsize;\r
        uint32_t                        i;\r
        ib_ca_attr_t            *p_ca_attr = NULL;\r

diff --git a/tests/alts/madtests.c b/tests/alts/madtests.c
index a1e6277..d206a02 100644 (file)
--- a/tests/alts/madtests.c
+++ b/tests/alts/madtests.c
@@ -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,7 +67,7 @@ typedef struct _alts_mad_ca_obj
        ib_api_status_t         status;\r
        uint32_t                        test_type;\r
 \r
-       ib_ca_handle_t VOID_PTR64               h_ca;\r
+       ib_ca_handle_t          h_ca;\r
        ib_ca_attr_t            *p_ca_attr;\r
        ib_port_attr_t          *p_src_port_attr;\r
        ib_port_attr_t          *p_dest_port_attr;\r
@@ -83,18 +84,18 @@ typedef struct _alts_mad_ca_obj
        ib_net16_t                      slid;\r
        ib_net16_t                      dlid;\r
 \r
-       ib_pool_key_t VOID_PTR64                h_src_pool;\r
-       ib_pool_key_t VOID_PTR64                h_dest_pool;\r
+       ib_pool_key_t           h_src_pool;\r
+       ib_pool_key_t           h_dest_pool;\r
 \r
-       ib_mad_svc_handle_t VOID_PTR64  h_src_mad_svc;\r
-       ib_mad_svc_handle_t VOID_PTR64  h_dest_mad_svc;\r
+       ib_mad_svc_handle_t     h_src_mad_svc;\r
+       ib_mad_svc_handle_t     h_dest_mad_svc;\r
 \r
-       ib_cq_handle_t VOID_PTR64               h_cq;\r
+       ib_cq_handle_t          h_cq;\r
        uint32_t                        cq_size;\r
 \r
-       ib_pd_handle_t VOID_PTR64               h_pd;\r
+       ib_pd_handle_t          h_pd;\r
 \r
-       ib_qp_handle_t VOID_PTR64               h_qp[MAX_QPS];\r
+       ib_qp_handle_t          h_qp[MAX_QPS];\r
        uint32_t                        qkey;\r
 \r
        ib_qp_attr_t            qp_attr[MAX_QPS];\r
@@ -108,8 +109,8 @@ typedef struct _alts_mad_ca_obj
        uint32_t                        ds_list_depth;\r
        uint32_t                        msg_size; // Initialize this field\r
 \r
-       ib_av_handle_t VOID_PTR64               h_av_src;\r
-       ib_av_handle_t VOID_PTR64               h_av_dest;\r
+       ib_av_handle_t          h_av_src;\r
+       ib_av_handle_t          h_av_dest;\r
 \r
        uint32_t                        send_done;\r
        uint32_t                        send_done_error;\r
@@ -140,7 +141,7 @@ mad_create_resources(
 ib_api_status_t\r
 mad_activate_svc(\r
        alts_mad_ca_obj_t *p_ca_obj,\r
-       ib_qp_handle_t VOID_PTR64 h_qp );\r
+       ib_qp_handle_t h_qp );\r
 \r
 ib_api_status_t\r
 alts_spl_destroy_resources(\r
@@ -176,7 +177,7 @@ mad_qp_destroy_cb(
 \r
 void\r
 mad_cq_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
 /*\r
@@ -196,65 +197,65 @@ mad_qp_err_cb(
 \r
 void\r
 mad_svc_send_cb(\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                              void                                            *mad_svc_context,\r
        IN                              ib_mad_element_t                        *p_mad_element );\r
 \r
 void\r
 mad_svc_recv_cb(\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                              void                                            *mad_svc_context,\r
        IN                              ib_mad_element_t                        *p_mad_element );\r
 \r
 void\r
 mad_svc_qp0_recv_cb(\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                              void                                            *mad_svc_context,\r
        IN                              ib_mad_element_t                        *p_mad_element );\r
 \r
 ib_api_status_t\r
 alts_qp1_loopback(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_qp1_2_ports(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_qp1_2_ports_100(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_qp1_pingpong(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_qp0_loopback(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_qp0_2_ports(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_qp0_2_ports_100(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_qp0_pingpong(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_qp0_ping_switch (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 #define ALTS_TEST_MGMT_CLASS   0x56\r
@@ -264,7 +265,7 @@ alts_qp0_ping_switch (
 /*\r
  * Gloabal Variables\r
  */\r
-ib_al_handle_t VOID_PTR64              h_al;\r
+ib_al_handle_t         h_al;\r
 ib_dgrm_info_t         dgrm_info;\r
 ib_mad_svc_t           mad_svc;\r
 ib_send_wr_t           send_wr;\r
@@ -293,7 +294,7 @@ ib_api_status_t
 al_test_mad(void)\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR;\r
-       ib_ca_handle_t VOID_PTR64               h_ca = NULL;\r
+       ib_ca_handle_t          h_ca = NULL;\r
        uint32_t                        bsize; \r
        ib_ca_attr_t            *p_ca_attr = NULL;\r
        //alts_mad_ca_obj_t     ca_obj; // for testing stack\r
@@ -969,10 +970,10 @@ mad_post_recvs(
 ib_api_status_t\r
 mad_activate_svc(\r
        alts_mad_ca_obj_t *p_ca_obj,\r
-       ib_qp_handle_t VOID_PTR64 h_qp )\r
+       ib_qp_handle_t h_qp )\r
 {\r
        ib_api_status_t ib_status;\r
-       ib_mad_svc_handle_t VOID_PTR64  h_mad_svc;\r
+       ib_mad_svc_handle_t     h_mad_svc;\r
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r
 \r
@@ -1302,7 +1303,7 @@ alts_send_mad_resp(
 \r
 void\r
 mad_svc_send_cb(\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                              void                                            *mad_svc_context,\r
        IN                              ib_mad_element_t                        *p_mad_element )\r
 {\r
@@ -1369,7 +1370,7 @@ mad_svc_send_cb(
 \r
 void\r
 mad_svc_recv_cb(\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                              void                                            *mad_svc_context,\r
        IN                              ib_mad_element_t                        *p_mad_element )\r
 {\r
@@ -1444,7 +1445,7 @@ mad_svc_recv_cb(
 \r
 void\r
 mad_svc_qp0_recv_cb(\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                              void                                            *mad_svc_context,\r
        IN                              ib_mad_element_t                        *p_mad_element )\r
 {\r
@@ -1682,7 +1683,7 @@ mad_create_spl_resources(
 \r
 void\r
 mad_cq_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
        ib_api_status_t ib_status;\r
@@ -1826,7 +1827,7 @@ mad_cq_destroy_cb(
 \r
 ib_api_status_t\r
 alts_qp1_loopback(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -1956,7 +1957,7 @@ alts_qp1_loopback(
 \r
 ib_api_status_t\r
 alts_qp1_2_ports(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2086,7 +2087,7 @@ alts_qp1_2_ports(
 \r
 ib_api_status_t\r
 alts_qp1_2_ports_100(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2216,7 +2217,7 @@ alts_qp1_2_ports_100(
 \r
 ib_api_status_t\r
 alts_qp1_pingpong(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2349,7 +2350,7 @@ alts_qp1_pingpong(
 \r
 ib_api_status_t\r
 alts_qp0_loopback(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2481,7 +2482,7 @@ alts_qp0_loopback(
 \r
 ib_api_status_t\r
 alts_qp0_2_ports(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2613,7 +2614,7 @@ alts_qp0_2_ports(
 \r
 ib_api_status_t\r
 alts_qp0_2_ports_100(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2745,7 +2746,7 @@ alts_qp0_2_ports_100(
 \r
 ib_api_status_t\r
 alts_qp0_pingpong(\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2879,7 +2880,7 @@ alts_qp0_pingpong(
 \r
 ib_api_status_t\r
 alts_qp0_ping_switch (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r

diff --git a/tests/alts/multisendrecv.c b/tests/alts/multisendrecv.c
index 076cf50..590da80 100644 (file)
--- a/tests/alts/multisendrecv.c
+++ b/tests/alts/multisendrecv.c
@@ -2,6 +2,7 @@
 * Copyright (c) 2005 Mellanox Technologies.  All rights reserved.\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
@@ -67,7 +68,7 @@ typedef struct _alts_multisr_ca_obj
        ib_api_status_t         status;\r
        uint32_t                        test_type;\r
 \r
-       ib_ca_handle_t VOID_PTR64               h_ca;\r
+       ib_ca_handle_t          h_ca;\r
        ib_ca_attr_t            *p_ca_attr;\r
        ib_port_attr_t          *p_src_port_attr;\r
        ib_port_attr_t          *p_dest_port_attr;\r
@@ -81,12 +82,12 @@ typedef struct _alts_multisr_ca_obj
        ib_net16_t                      slid;\r
        ib_net16_t                      dlid;\r
 \r
-       ib_cq_handle_t VOID_PTR64               h_cq;\r
+       ib_cq_handle_t          h_cq;\r
        uint32_t                        cq_size;\r
 \r
-       ib_pd_handle_t VOID_PTR64               h_pd;\r
+       ib_pd_handle_t          h_pd;\r
 \r
-       ib_qp_handle_t VOID_PTR64               h_qp[MAX_QPS];\r
+       ib_qp_handle_t          h_qp[MAX_QPS];\r
        ib_net32_t                      qkey;\r
 \r
        ib_qp_attr_t            qp_attr[MAX_QPS];\r
@@ -100,7 +101,7 @@ typedef struct _alts_multisr_ca_obj
        uint32_t                        ds_list_depth;\r
        uint32_t                        msg_size; // Initialize this field\r
 \r
-       ib_av_handle_t VOID_PTR64               h_av_src;\r
+       ib_av_handle_t          h_av_src;\r
        mem_region_t            mem_region[200];\r
 \r
        uint32_t                        cq_done;                // total completions\r
@@ -126,7 +127,7 @@ alts_create_resources(
 ib_api_status_t\r
 alts_activate_qp(\r
        alts_multisr_ca_obj_t *p_ca_obj,\r
-       ib_qp_handle_t VOID_PTR64 h_qp );\r
+       ib_qp_handle_t h_qp );\r
 \r
 ib_api_status_t\r
 alts_destroy_resources(\r
@@ -178,12 +179,12 @@ multisend_cq_comp_cb(
 \r
 void\r
 ud_multisend_cq_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
 rc_multisend_cq_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
  * CQ Error callback function\r
@@ -202,32 +203,32 @@ multisend_qp_err_cb(
 \r
 ib_api_status_t\r
 alts_ud_loopback (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_ud_2_ports (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_ud_2_ports_100_msgs (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_rc_loopback (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_rc_2_ports (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 ib_api_status_t\r
 alts_rc_2_ports_100_msgs (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size );\r
 \r
 /*\r
@@ -258,8 +259,8 @@ ib_api_status_t
 al_test_multi_send_recv(void)\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR;\r
-       ib_al_handle_t VOID_PTR64               h_al;\r
-       ib_ca_handle_t VOID_PTR64               h_ca = NULL;\r
+       ib_al_handle_t          h_al;\r
+       ib_ca_handle_t          h_ca = NULL;\r
        uint32_t                        bsize; \r
        ib_ca_attr_t            *p_ca_attr = NULL;\r
        //alts_multisr_ca_obj_t ca_obj; // for testing stack\r
@@ -904,7 +905,7 @@ alts_deregister_mem(
 ib_api_status_t\r
 alts_activate_qp(\r
        alts_multisr_ca_obj_t *p_ca_obj,\r
-       ib_qp_handle_t VOID_PTR64 h_qp\r
+       ib_qp_handle_t h_qp\r
        )\r
 {\r
 \r
@@ -1411,7 +1412,7 @@ poll_loop:
 \r
 void\r
 ud_multisend_cq_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
        UNUSED_PARAM( h_cq );\r
@@ -1420,7 +1421,7 @@ ud_multisend_cq_comp_cb(
 \r
 void\r
 rc_multisend_cq_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
        UNUSED_PARAM( h_cq );\r
@@ -1508,7 +1509,7 @@ multisend_cq_destroy_cb(
  */\r
 ib_api_status_t\r
 alts_ud_loopback (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -1645,7 +1646,7 @@ alts_ud_loopback (
 \r
 ib_api_status_t\r
 alts_ud_2_ports (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -1789,7 +1790,7 @@ alts_ud_2_ports (
 \r
 ib_api_status_t\r
 alts_ud_2_ports_100_msgs (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -1934,7 +1935,7 @@ alts_ud_2_ports_100_msgs (
 \r
 ib_api_status_t\r
 alts_rc_loopback (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2084,7 +2085,7 @@ alts_rc_loopback (
 \r
 ib_api_status_t\r
 alts_rc_2_ports (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r
@@ -2228,7 +2229,7 @@ alts_rc_2_ports (
 \r
 ib_api_status_t\r
 alts_rc_2_ports_100_msgs (\r
-       ib_ca_handle_t VOID_PTR64       h_ca,\r
+       ib_ca_handle_t  h_ca,\r
        uint32_t                ca_attr_size )\r
 {\r
        ib_api_status_t         ib_status = IB_ERROR, ib_status2;\r

diff --git a/tests/alts/openclose.c b/tests/alts/openclose.c
index 6251818..5b404ca 100644 (file)
--- a/tests/alts/openclose.c
+++ b/tests/alts/openclose.c
@@ -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
@@ -39,7 +40,7 @@
 ib_api_status_t\r
 al_test_openclose(void)\r
 {\r
-       ib_al_handle_t VOID_PTR64       ph_al;\r
+       ib_al_handle_t  ph_al;\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r

diff --git a/tests/alts/querycaattr.c b/tests/alts/querycaattr.c
index 1a1a4ca..c0a0232 100644 (file)
--- a/tests/alts/querycaattr.c
+++ b/tests/alts/querycaattr.c
@@ -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
@@ -74,14 +75,14 @@ alts_ca_attr(
        boolean_t modify_attr\r
        )\r
 {\r
-       ib_al_handle_t VOID_PTR64       h_al = NULL;\r
+       ib_al_handle_t  h_al = NULL;\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
        ib_api_status_t ret_status = IB_SUCCESS;\r
        size_t guid_count;\r
        ib_net64_t ca_guid_array[ALTS_MAX_CA];\r
        ib_ca_attr_t *alts_ca_attr;\r
        uintn_t i;\r
-       ib_ca_handle_t VOID_PTR64 h_ca = NULL;\r
+       ib_ca_handle_t h_ca = NULL;\r
        uint32_t bsize;\r
        ib_port_attr_mod_t port_attr_mod;\r
 \r

diff --git a/tests/alts/registermemregion.c b/tests/alts/registermemregion.c
index fc7f7a2..7dc9bab 100644 (file)
--- a/tests/alts/registermemregion.c
+++ b/tests/alts/registermemregion.c
@@ -1,6 +1,7 @@
 /*\r
  * Copyright (c) 2005 SilverStorm Technologies.  All rights reserved.\r
  * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. \r
+ * Portions Copyright (c) 2008 Microsoft Corporation.  All rights reserved.\r
  *\r
  * This software is available to you under the OpenIB.org BSD license\r
  * below:\r
@@ -58,16 +59,16 @@ al_test_register_mem(
        )\r
 {\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
-       ib_al_handle_t VOID_PTR64 h_al = NULL;\r
-       ib_ca_handle_t VOID_PTR64 h_ca = NULL;\r
-       ib_pd_handle_t VOID_PTR64 h_pd = NULL;\r
+       ib_al_handle_t h_al = NULL;\r
+       ib_ca_handle_t h_ca = NULL;\r
+       ib_pd_handle_t h_pd = NULL;\r
 \r
        ib_mr_create_t virt_mem;\r
        char *ptr = NULL, *ptr_align;\r
        size_t mask; \r
        uint32_t        lkey;\r
        uint32_t        rkey;\r
-       ib_mr_handle_t VOID_PTR64       h_mr = NULL;\r
+       ib_mr_handle_t  h_mr = NULL;\r
        ib_mr_attr_t    alts_mr_attr;\r
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r
@@ -236,15 +237,15 @@ al_test_register_var_mem(
        )\r
 {\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
-       ib_al_handle_t VOID_PTR64 h_al = NULL;\r
-       ib_ca_handle_t VOID_PTR64 h_ca = NULL;\r
-       ib_pd_handle_t VOID_PTR64 h_pd = NULL;\r
+       ib_al_handle_t h_al = NULL;\r
+       ib_ca_handle_t h_ca = NULL;\r
+       ib_pd_handle_t h_pd = NULL;\r
 \r
        ib_mr_create_t virt_mem;\r
        char *ptr = NULL;\r
        uint32_t        lkey;\r
        uint32_t        rkey;\r
-       ib_mr_handle_t VOID_PTR64       h_mr = NULL;\r
+       ib_mr_handle_t  h_mr = NULL;\r
        ib_mr_attr_t    alts_mr_attr;\r
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r
@@ -403,9 +404,9 @@ al_test_register_phys_mem(
        )\r
 {\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
-       ib_al_handle_t VOID_PTR64 h_al = NULL;\r
-       ib_ca_handle_t VOID_PTR64 h_ca = NULL;\r
-       ib_pd_handle_t VOID_PTR64 h_pd = NULL;\r
+       ib_al_handle_t h_al = NULL;\r
+       ib_ca_handle_t h_ca = NULL;\r
+       ib_pd_handle_t h_pd = NULL;\r
 \r
        ib_phys_range_t phys_range;\r
        ib_phys_create_t phys_mem;\r
@@ -413,7 +414,7 @@ al_test_register_phys_mem(
        void                    *virt_addr = NULL;\r
        uint32_t                lkey;\r
        uint32_t                rkey;\r
-       ib_mr_handle_t VOID_PTR64       h_mr = NULL;\r
+       ib_mr_handle_t  h_mr = NULL;\r
        ib_mr_attr_t    alts_mr_attr;\r
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r
@@ -553,9 +554,9 @@ al_test_register_shared_mem(
        )\r
 {\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
-       ib_al_handle_t VOID_PTR64 h_al = NULL;\r
-       ib_ca_handle_t VOID_PTR64 h_ca = NULL;\r
-       ib_pd_handle_t VOID_PTR64 h_pd = NULL;\r
+       ib_al_handle_t h_al = NULL;\r
+       ib_ca_handle_t h_ca = NULL;\r
+       ib_pd_handle_t h_pd = NULL;\r
 \r
        ib_mr_create_t virt_mem;\r
        uint64_t virt_ptr = 0;\r
@@ -563,8 +564,8 @@ al_test_register_shared_mem(
        size_t mask; \r
        uint32_t        lkey;\r
        uint32_t        rkey;\r
-       ib_mr_handle_t VOID_PTR64       h_base_mr = NULL;\r
-       ib_mr_handle_t VOID_PTR64       h_mr = NULL;\r
+       ib_mr_handle_t  h_base_mr = NULL;\r
+       ib_mr_handle_t  h_mr = NULL;\r
        ib_mr_attr_t    alts_mr_attr;\r
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r

diff --git a/tests/alts/registerpnp.c b/tests/alts/registerpnp.c
index 7e3673d..b243d3e 100644 (file)
--- a/tests/alts/registerpnp.c
+++ b/tests/alts/registerpnp.c
@@ -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,10 +48,10 @@ al_test_pnp_callback(
 ib_api_status_t\r
 al_test_register_pnp(void)\r
 {\r
-       ib_al_handle_t VOID_PTR64       h_al;\r
+       ib_al_handle_t  h_al;\r
        ib_api_status_t ib_status = IB_SUCCESS;\r
        ib_pnp_req_t    pnp_req;\r
-       ib_pnp_handle_t VOID_PTR64 h_pnp;\r
+       ib_pnp_handle_t h_pnp;\r
 \r
 \r
        ALTS_ENTER( ALTS_DBG_VERBOSE );\r

diff --git a/tests/alts/reregister_hca.c b/tests/alts/reregister_hca.c
index 7ae46ba..e5825da 100644 (file)
--- a/tests/alts/reregister_hca.c
+++ b/tests/alts/reregister_hca.c
@@ -1,104 +1,104 @@
-
-/*
- * Copyright (c) 2005 SilverStorm Technologies.  All rights reserved.
- * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. 
- *
- * This software is available to you under the OpenIB.org BSD license
- * below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * $Id$
- */
-
-#include <iba/ib_types.h>
-#include <iba/ib_al.h>
-#include <complib/cl_memory.h>
-#include <complib/cl_timer.h>
-#include <alts_debug.h>
-#include <alts_common.h>
-#include <mthca/mthca_vc.h>
-
-
-/*
- * Function prototypes
- */
-
-
-/*
- * Test Case RegisterMemRegion
- */
-ib_api_status_t
-al_test_reregister_hca(
-       void
-       )
-{
-       ib_api_status_t ib_status = IB_SUCCESS;
-       ib_al_handle_t VOID_PTR64 h_al = NULL;
-       ib_ca_handle_t VOID_PTR64 h_ca = NULL;
-       ib_ci_op_t ci_op;
-
-       ALTS_ENTER( ALTS_DBG_VERBOSE );
-
-       while(1)
-       {
-               /* Open AL */
-               ib_status = alts_open_al(&h_al);
-
-               if(ib_status != IB_SUCCESS)
-                       break;
-
-               CL_ASSERT(h_al);
-
-               /* Open CA */
-               ib_status = alts_open_ca(h_al,&h_ca);
-               if(ib_status != IB_SUCCESS)
-                       break;
-
-               CL_ASSERT(h_ca);
-
-               /* send ioctl */
-               memset( &ci_op, 0, sizeof(ci_op) );
-               ci_op.command = FW_REREGISTER_HCA;
-
-               ib_status = ib_ci_call (h_ca, NULL, 0, &ci_op);
-               if(ib_status != IB_SUCCESS)
-                       ALTS_PRINT( ALTS_DBG_ERROR,
-                               ("ib_ci_call failed status = %s\n",
-                               ib_get_err_str(ib_status)) );
-               else
-                       ALTS_PRINT( ALTS_DBG_INFO, 
-                               ("ib_ci_call PASSED.\n") );
-               break;
-       }
-
-       if(h_ca)
-               alts_close_ca(h_ca);
-
-       if(h_al)
-               alts_close_al(h_al);
-
-       ALTS_EXIT( ALTS_DBG_VERBOSE);
-       return ib_status;
-}
-
+/*\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
+ *     Redistribution and use in source and binary forms, with or\r
+ *     without modification, are permitted provided that the following\r
+ *     conditions are met:\r
+ *\r
+ *      - Redistributions of source code must retain the above\r
+ *        copyright notice, this list of conditions and the following\r
+ *        disclaimer.\r
+ *\r
+ *      - Redistributions in binary form must reproduce the above\r
+ *        copyright notice, this list of conditions and the following\r
+ *        disclaimer in the documentation and/or other materials\r
+ *        provided with the distribution.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
+ * SOFTWARE.\r
+ *\r
+ * $Id$\r
+ */\r
+\r
+#include <iba/ib_types.h>\r
+#include <iba/ib_al.h>\r
+#include <complib/cl_memory.h>\r
+#include <complib/cl_timer.h>\r
+#include <alts_debug.h>\r
+#include <alts_common.h>\r
+#include <mthca/mthca_vc.h>\r
+\r
+\r
+/*\r
+ * Function prototypes\r
+ */\r
+\r
+\r
+/*\r
+ * Test Case RegisterMemRegion\r
+ */\r
+ib_api_status_t\r
+al_test_reregister_hca(\r
+       void\r
+       )\r
+{\r
+       ib_api_status_t ib_status = IB_SUCCESS;\r
+       ib_al_handle_t h_al = NULL;\r
+       ib_ca_handle_t h_ca = NULL;\r
+       ib_ci_op_t ci_op;\r
+\r
+       ALTS_ENTER( ALTS_DBG_VERBOSE );\r
+\r
+       while(1)\r
+       {\r
+               /* Open AL */\r
+               ib_status = alts_open_al(&h_al);\r
+\r
+               if(ib_status != IB_SUCCESS)\r
+                       break;\r
+\r
+               CL_ASSERT(h_al);\r
+\r
+               /* Open CA */\r
+               ib_status = alts_open_ca(h_al,&h_ca);\r
+               if(ib_status != IB_SUCCESS)\r
+                       break;\r
+\r
+               CL_ASSERT(h_ca);\r
+\r
+               /* send ioctl */\r
+               memset( &ci_op, 0, sizeof(ci_op) );\r
+               ci_op.command = FW_REREGISTER_HCA;\r
+\r
+               ib_status = ib_ci_call (h_ca, NULL, 0, &ci_op);\r
+               if(ib_status != IB_SUCCESS)\r
+                       ALTS_PRINT( ALTS_DBG_ERROR,\r
+                               ("ib_ci_call failed status = %s\n",\r
+                               ib_get_err_str(ib_status)) );\r
+               else\r
+                       ALTS_PRINT( ALTS_DBG_INFO, \r
+                               ("ib_ci_call PASSED.\n") );\r
+               break;\r
+       }\r
+\r
+       if(h_ca)\r
+               alts_close_ca(h_ca);\r
+\r
+       if(h_al)\r
+               alts_close_al(h_al);\r
+\r
+       ALTS_EXIT( ALTS_DBG_VERBOSE);\r
+       return ib_status;\r
+}\r
+\r

diff --git a/tests/alts/smatests.c b/tests/alts/smatests.c
index 831f1a1..0b8a2f4 100644 (file)
--- a/tests/alts/smatests.c
+++ b/tests/alts/smatests.c
@@ -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
@@ -60,20 +61,20 @@ extern ib_mad_svc_t         mad_svc;
 typedef struct _alts_sma_object\r
 {\r
        ib_api_status_t         status;\r
-       ib_al_handle_t VOID_PTR64               h_al;\r
-       ib_ca_handle_t VOID_PTR64               h_ca;\r
+       ib_al_handle_t          h_al;\r
+       ib_ca_handle_t          h_ca;\r
        ib_ca_attr_t            *p_ca_attr;\r
        ib_port_attr_t          *p_send_port_attr;\r
 \r
-       ib_pd_handle_t VOID_PTR64               h_pd;\r
+       ib_pd_handle_t          h_pd;\r
 \r
-       ib_cq_handle_t VOID_PTR64               h_cq;\r
+       ib_cq_handle_t          h_cq;\r
        uint32_t                        cq_size;\r
 \r
-       ib_pool_key_t VOID_PTR64                h_mad_pool;\r
-       ib_qp_handle_t VOID_PTR64               h_qp0;\r
+       ib_pool_key_t           h_mad_pool;\r
+       ib_qp_handle_t          h_qp0;\r
 \r
-       ib_mad_svc_handle_t VOID_PTR64 h_sma_mad_svc;\r
+       ib_mad_svc_handle_t h_sma_mad_svc;\r
 \r
 } alts_sma_object_t;\r
 \r
@@ -99,14 +100,14 @@ sma_mad_qp_err_cb(
 );\r
 void\r
 alts_sma_mad_svc_send_cb(\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                              void                                            *mad_svc_context,\r
        IN                              ib_mad_element_t                        *p_mad_element\r
 );\r
 \r
 void\r
 alts_sma_mad_svc_recv_cb(\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                              void                                            *mad_svc_context,\r
        IN                              ib_mad_element_t                        *p_mad_element\r
 );\r
@@ -401,7 +402,7 @@ alts_init_tst_resource_sma(alts_sma_object_t *p_alts_sma_obj)
 \r
 void\r
 alts_sma_mad_svc_send_cb(\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      void                                    *mad_svc_context,\r
        IN      ib_mad_element_t                *p_mad_element )\r
 {\r
@@ -414,7 +415,7 @@ alts_sma_mad_svc_send_cb(
 \r
 void\r
 alts_sma_mad_svc_recv_cb(\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      void                                    *mad_svc_context,\r
        IN      ib_mad_element_t                *p_mad_element )\r
 {\r

diff --git a/tests/cmtest/user/cmtest_main.c b/tests/cmtest/user/cmtest_main.c
index 3c08995..3d7fbf5 100644 (file)
--- a/tests/cmtest/user/cmtest_main.c
+++ b/tests/cmtest/user/cmtest_main.c
@@ -1,6 +1,7 @@
 /*\r
  * Copyright (c) 2005 SilverStorm Technologies.  All rights reserved.\r
  * Copyright (c) 1996-2002 Intel Corporation. All rights reserved. \r
+ * Portions Copyright (c) 2008 Microsoft Corp.  All rights reserved.\r
  *\r
  * This software is available to you under the OpenIB.org BSD license\r
  * below:\r
@@ -73,8 +74,8 @@ typedef enum _cmtest_state
 \r
 typedef struct _ib_root\r
 {\r
-       ib_al_handle_t VOID_PTR64               h_al;\r
-       ib_pd_handle_t VOID_PTR64               h_pd;\r
+       ib_al_handle_t          h_al;\r
+       ib_pd_handle_t          h_pd;\r
 \r
        /* Input parameters to control test. */\r
        int32_t                         num_nodes;\r
@@ -92,7 +93,7 @@ typedef struct _ib_root
 \r
        uint32_t                        msg_size;\r
 \r
-       ib_ca_handle_t VOID_PTR64               h_ca;\r
+       ib_ca_handle_t          h_ca;\r
        ib_net16_t                      l_lid;\r
        ib_net16_t                      r_lid;\r
        ib_net64_t                      ca_guid;\r
@@ -103,7 +104,7 @@ typedef struct _ib_root
 \r
        /* cm info */\r
        boolean_t                       is_server;\r
-       ib_listen_handle_t VOID_PTR64   h_listen;\r
+       ib_listen_handle_t      h_listen;\r
        ib_path_rec_t           path_rec;\r
 \r
        /* CQ info. */\r
@@ -115,7 +116,7 @@ typedef struct _ib_root
        ib_qp_mod_t                     qp_mod_init;\r
 \r
        /* reg mem info */\r
-       ib_mr_handle_t VOID_PTR64               h_mr;\r
+       ib_mr_handle_t          h_mr;\r
        uint32_t                        lkey;\r
        uint32_t                        rkey;\r
        uint8_t                         *p_mem;\r
@@ -152,9 +153,9 @@ typedef struct      _ib_node
 {\r
        uint64_t                        id;\r
 \r
-       ib_cq_handle_t VOID_PTR64               h_send_cq;\r
-       ib_cq_handle_t VOID_PTR64               h_recv_cq;\r
-       ib_qp_handle_t VOID_PTR64               h_qp;\r
+       ib_cq_handle_t          h_send_cq;\r
+       ib_cq_handle_t          h_recv_cq;\r
+       ib_qp_handle_t          h_qp;\r
        uint32_t                        max_inline;\r
 \r
        cmnode_state_t          state;\r
@@ -245,7 +246,7 @@ __drep_cb(
 static boolean_t\r
 __poll_cq(\r
        IN                              ib_node_t                                       *p_node,\r
-       IN                              ib_cq_handle_t FUNC_PTR64                               h_cq );\r
+       IN                              ib_cq_handle_t                          h_cq );\r
 \r
 \r
 /**********************************************************************\r
@@ -928,7 +929,7 @@ __drep_cb(
 \r
 static void AL_API\r
 __cq_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
        ib_node_t               *p_node = (ib_node_t*)cq_context;\r
@@ -1374,7 +1375,7 @@ __reg_pnp()
 {\r
        ib_api_status_t         status;\r
        ib_pnp_req_t            pnp_req;\r
-       ib_pnp_handle_t VOID_PTR64              h_pnp;\r
+       ib_pnp_handle_t         h_pnp;\r
 \r
        cl_memclr( &pnp_req, sizeof( ib_pnp_req_t ) );\r
        pnp_req.pnp_class = IB_PNP_PORT;\r
@@ -1790,7 +1791,7 @@ __send_msgs()
 static boolean_t\r
 __poll_cq(\r
        IN                              ib_node_t                                       *p_node,\r
-       IN                              ib_cq_handle_t FUNC_PTR64                               h_cq )\r
+       IN                              ib_cq_handle_t                          h_cq )\r
 {\r
        ib_api_status_t status = IB_SUCCESS;\r
        ib_wc_t                 free_wc[2];\r

diff --git a/tests/limits/user/limits_main.c b/tests/limits/user/limits_main.c
index c76d38c..c23f2d4 100644 (file)
--- a/tests/limits/user/limits_main.c
+++ b/tests/limits/user/limits_main.c
@@ -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
@@ -269,13 +270,13 @@ __parse_options(
 struct __mr_buf\r
 {\r
        cl_list_item_t  list_item;\r
-       ib_mr_handle_t VOID_PTR64       h_mr;\r
-       char                    buf[8192 - sizeof(ib_mr_handle_t VOID_PTR64) - sizeof(cl_list_item_t)];\r
+       ib_mr_handle_t  h_mr;\r
+       char                    buf[8192 - sizeof(ib_mr_handle_t) - sizeof(cl_list_item_t)];\r
 };\r
 \r
 static void\r
 __test_mr(\r
-       ib_pd_handle_t VOID_PTR64                               h_pd )\r
+       ib_pd_handle_t                          h_pd )\r
 {\r
        ib_api_status_t         status = IB_SUCCESS;\r
        struct __mr_buf         *p_mr;\r
@@ -346,12 +347,12 @@ __test_mr(
 struct __cq\r
 {\r
        cl_list_item_t          list_item;\r
-       ib_cq_handle_t VOID_PTR64               h_cq;\r
+       ib_cq_handle_t          h_cq;\r
 };\r
 \r
 static void\r
 __test_cq(\r
-       ib_ca_handle_t VOID_PTR64                               h_ca,\r
+       ib_ca_handle_t                          h_ca,\r
        boolean_t                                       resize )\r
 {\r
        ib_api_status_t         status = IB_SUCCESS;\r
@@ -447,9 +448,9 @@ main(
        char*                                           argv[] )\r
 {\r
        ib_api_status_t         status;\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_al_handle_t          h_al;\r
+       ib_ca_handle_t          h_ca;\r
+       ib_pd_handle_t          h_pd;\r
        size_t                          size;\r
        net64_t                         *ca_guids;\r
 \r

diff --git a/tests/wsd/user/test2/ibwrap.h b/tests/wsd/user/test2/ibwrap.h
index 0279b53..0b30d8c 100644 (file)
--- a/tests/wsd/user/test2/ibwrap.h
+++ b/tests/wsd/user/test2/ibwrap.h
@@ -1,11 +1,11 @@
 #include <iba/ib_al.h>\r
 \r
 struct qp_pack {\r
-TO_LONG_PTR(   ib_al_handle_t  , al_handle) ; \r
-TO_LONG_PTR(   ib_ca_handle_t , hca_handle) ; \r
-TO_LONG_PTR(   ib_pd_handle_t , pd_handle) ; \r
-TO_LONG_PTR(   ib_qp_handle_t , qp_handle) ; \r
-TO_LONG_PTR(   ib_cq_handle_t , cq_handle) ; \r
+       ib_al_handle_t al_handle;\r
+       ib_ca_handle_t hca_handle;\r
+       ib_pd_handle_t pd_handle;\r
+       ib_qp_handle_t qp_handle;\r
+       ib_cq_handle_t cq_handle;\r
 \r
        atomic32_t wq_posted;\r
 \r

diff --git a/tests/wsd/user/test3/ibwrap.h b/tests/wsd/user/test3/ibwrap.h
index 1b2e738..c4e4ec3 100644 (file)
--- a/tests/wsd/user/test3/ibwrap.h
+++ b/tests/wsd/user/test3/ibwrap.h
@@ -1,11 +1,11 @@
 #include <iba/ib_al.h>\r
 \r
 struct qp_pack {\r
-TO_LONG_PTR(   ib_al_handle_t  , al_handle) ; \r
-TO_LONG_PTR(   ib_ca_handle_t , hca_handle) ; \r
-TO_LONG_PTR(   ib_pd_handle_t , pd_handle) ; \r
-TO_LONG_PTR(   ib_qp_handle_t , qp_handle) ; \r
-TO_LONG_PTR(   ib_cq_handle_t , cq_handle) ; \r
+       ib_al_handle_t al_handle;\r
+       ib_ca_handle_t hca_handle;\r
+       ib_pd_handle_t pd_handle;\r
+       ib_qp_handle_t qp_handle;\r
+       ib_cq_handle_t cq_handle;\r
 \r
        atomic32_t wq_posted;\r
 \r