[ofw] [PATCH v2] Remove FUNC_PTR64
Fab Tillier
ftillier at windows.microsoft.com
Fri Jul 11 12:35:18 PDT 2008
My first version of the patch didn't include copyrights, and my changes are only available under BSD so reference to dual license in modified files needed to be removed.
Signed-off-by: Fab Tillier <ftillier at microsoft.com>
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mlx4\kernel\hca\data.h trunk\hw\mlx4\kernel\hca\data.h
--- old\hw\mlx4\kernel\hca\data.h Fri Jul 11 12:20:50 2008
+++ trunk\hw\mlx4\kernel\hca\data.h Fri Jul 11 12:23:33 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -221,8 +222,8 @@ mlnx_local_mad (
ib_api_status_t
fw_access_ctrl(
- IN const void* FUNC_PTR64 context,
- IN const void* FUNC_PTR64 * const handle_array OPTIONAL,
+ IN const void* context,
+ IN const void** const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL);
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mlx4\kernel\hca\fw.c trunk\hw\mlx4\kernel\hca\fw.c
--- old\hw\mlx4\kernel\hca\fw.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mlx4\kernel\hca\fw.c Fri Jul 11 12:23:34 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -387,7 +388,7 @@ fw_flash_read_data (
ib_api_status_t
fw_access_ctrl(
IN const ib_ca_handle_t h_ca,
- IN const void* FUNC_PTR64* const handle_array OPTIONAL,
+ IN const void** const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN OUT ci_umv_buf_t *p_umv_buf )
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mlx4\user\hca\cq.c trunk\hw\mlx4\user\hca\cq.c
--- old\hw\mlx4\user\hca\cq.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mlx4\user\hca\cq.c Fri Jul 11 12:24:26 2008
@@ -2,6 +2,7 @@
* Copyright (c) 2005 Topspin Communications. All rights reserved.
* Copyright (c) 2005 Mellanox Technologies Ltd. All rights reserved.
* Copyright (c) 2006, 2007 Cisco Systems. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@ -345,7 +346,7 @@ static int mlx4_poll_one(struct mlx4_cq
ib_api_status_t
mlx4_poll_cq(
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist)
{
@@ -392,7 +393,7 @@ mlx4_poll_cq(
ib_api_status_t
mlx4_arm_cq (
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
IN const boolean_t solicited)
{
struct ibv_cq *ibvcq = (struct ibv_cq *)/*Ptr64ToPtr(*/ h_cq /*)*/;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mlx4\user\hca\mlx4.h trunk\hw\mlx4\user\hca\mlx4.h
--- old\hw\mlx4\user\hca\mlx4.h Fri Jul 11 12:20:50 2008
+++ trunk\hw\mlx4\user\hca\mlx4.h Fri Jul 11 12:31:18 2008
@@ -1,12 +1,10 @@
/*
* Copyright (c) 2004, 2005 Topspin Communications. All rights reserved.
* Copyright (c) 2005, 2006, 2007 Cisco Systems. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
+ * 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
@@ -305,10 +303,10 @@ void mlx4_free_buf(struct mlx4_buf *buf)
uint32_t *mlx4_alloc_db(struct mlx4_context *context, enum mlx4_db_type type);
void mlx4_free_db(struct mlx4_context *context, enum mlx4_db_type type, uint32_t *db);
-ib_api_status_t mlx4_poll_cq(const void * FUNC_PTR64 h_cq,
+ib_api_status_t mlx4_poll_cq(const void* h_cq,
ib_wc_t** const pp_free_wclist,
ib_wc_t** const pp_done_wclist);
-ib_api_status_t mlx4_arm_cq(const void * FUNC_PTR64 h_cq, const boolean_t solicited);
+ib_api_status_t mlx4_arm_cq(const void* h_cq, const boolean_t solicited);
void mlx4_cq_event(struct ibv_cq *cq);
void mlx4_cq_clean(struct mlx4_cq *cq, uint32_t qpn,
struct mlx4_srq *srq);
@@ -317,7 +315,7 @@ void mlx4_cq_resize_copy_cqes(struct mlx
int mlx4_alloc_srq_buf(struct ibv_pd *pd, struct ibv_srq_attr *attr,
struct mlx4_srq *srq);
void mlx4_free_srq_wqe(struct mlx4_srq *srq, int ind);
-ib_api_status_t mlx4_post_srq_recv(const void* FUNC_PTR64 h_srq,
+ib_api_status_t mlx4_post_srq_recv(const void* h_srq,
ib_recv_wr_t* const wr,
ib_recv_wr_t** bad_wr);
@@ -330,10 +328,10 @@ void mlx4_clear_xrc_srq(struct mlx4_cont
void mlx4_init_qp_indices(struct mlx4_qp *qp);
void mlx4_qp_init_sq_ownership(struct mlx4_qp *qp);
-ib_api_status_t mlx4_post_send(const void* FUNC_PTR64 h_qp,
+ib_api_status_t mlx4_post_send(const void* h_qp,
ib_send_wr_t* const wr,
ib_send_wr_t** bad_wr);
-ib_api_status_t mlx4_post_recv(const void* FUNC_PTR64 h_qp,
+ib_api_status_t mlx4_post_recv(const void* h_qp,
ib_recv_wr_t* const wr,
ib_recv_wr_t** bad_wr);
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mlx4\user\hca\qp.c trunk\hw\mlx4\user\hca\qp.c
--- old\hw\mlx4\user\hca\qp.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mlx4\user\hca\qp.c Fri Jul 11 12:30:59 2008
@@ -2,12 +2,10 @@
* Copyright (c) 2005 Topspin Communications. All rights reserved.
* Copyright (c) 2005 Mellanox Technologies Ltd. All rights reserved.
* Copyright (c) 2007 Cisco, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
+ * 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
@@ -210,7 +208,7 @@ static void mlx4_bf_copy(unsigned long *
ib_api_status_t
mlx4_post_send(
- IN const void* FUNC_PTR64 h_qp,
+ IN const void* h_qp,
IN ib_send_wr_t* const p_wr,
OUT ib_send_wr_t** bad_wr)
{
@@ -487,7 +485,7 @@ err_state:
ib_api_status_t
mlx4_post_recv(
- IN const void* FUNC_PTR64 h_qp,
+ IN const void* h_qp,
IN ib_recv_wr_t* const p_wr,
OUT ib_recv_wr_t** bad_wr)
{
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mlx4\user\hca\srq.c trunk\hw\mlx4\user\hca\srq.c
--- old\hw\mlx4\user\hca\srq.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mlx4\user\hca\srq.c Fri Jul 11 12:30:59 2008
@@ -1,11 +1,9 @@
/*
* Copyright (c) 2007 Cisco, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
+ * 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
@@ -54,7 +52,7 @@ void mlx4_free_srq_wqe(struct mlx4_srq *
ib_api_status_t
mlx4_post_srq_recv(
- IN const void* FUNC_PTR64 h_srq,
+ IN const void* h_srq,
IN ib_recv_wr_t* const p_wr,
OUT ib_recv_wr_t** bad_wr)
{
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\kernel\hca_data.h trunk\hw\mthca\kernel\hca_data.h
--- old\hw\mthca\kernel\hca_data.h Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\kernel\hca_data.h Fri Jul 11 12:30:59 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -315,7 +316,7 @@ mlnx_conv_hca_cap(
ib_api_status_t
mlnx_local_mad (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_av_attr_t *p_src_av_attr,
IN const ib_mad_t *p_mad_in,
@@ -343,8 +344,8 @@ mlnx_mcast_if(
ib_api_status_t
fw_access_ctrl(
- IN const void* FUNC_PTR64 context,
- IN const void* FUNC_PTR64* const handle_array OPTIONAL,
+ IN const void* context,
+ IN const void** const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL);
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\kernel\hca_direct.c trunk\hw\mthca\kernel\hca_direct.c
--- old\hw\mthca\kernel\hca_direct.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\kernel\hca_direct.c Fri Jul 11 12:30:59 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -56,7 +57,7 @@
ib_api_status_t
mlnx_post_send (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_send_wr_t *p_send_wr,
OUT ib_send_wr_t **pp_failed )
{
@@ -94,7 +95,7 @@ err_post_send:
ib_api_status_t
mlnx_post_recv (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN ib_recv_wr_t *p_recv_wr,
OUT ib_recv_wr_t **pp_failed OPTIONAL )
{
@@ -131,7 +132,7 @@ err_post_recv:
ib_api_status_t
mlnx_post_srq_recv (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN ib_recv_wr_t *p_recv_wr,
OUT ib_recv_wr_t **pp_failed OPTIONAL )
{
@@ -172,7 +173,7 @@ err_post_recv:
ib_api_status_t
mlnx_peek_cq(
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t* const p_n_cqes )
{
UNREFERENCED_PARAMETER(h_cq);
@@ -183,7 +184,7 @@ mlnx_peek_cq(
ib_api_status_t
mlnx_poll_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist )
{
@@ -222,7 +223,7 @@ err_invalid_params:
ib_api_status_t
mlnx_enable_cq_notify (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const boolean_t solicited )
{
int err;
@@ -251,7 +252,7 @@ mlnx_enable_cq_notify (
ib_api_status_t
mlnx_enable_ncomp_cq_notify (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN const uint32_t n_cqes )
{
int err;
@@ -279,8 +280,8 @@ mlnx_enable_ncomp_cq_notify (
ib_api_status_t
mlnx_bind_mw (
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_mw_handle_t h_mw,
+ IN const ib_qp_handle_t h_qp,
IN ib_bind_wr_t* const p_mw_bind,
OUT net32_t* const p_rkey )
{
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\kernel\hca_driver.c trunk\hw\mthca\kernel\hca_driver.c
--- old\hw\mthca\kernel\hca_driver.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\kernel\hca_driver.c Fri Jul 11 12:30:59 2008
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -650,8 +651,8 @@ unmap_crspace_for_all( struct ib_ucontex
ib_api_status_t
fw_access_ctrl(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
- IN const void* FUNC_PTR64* const handle_array OPTIONAL,
+ IN const ib_ca_handle_t h_ca,
+ IN const void** const handle_array OPTIONAL,
IN uint32_t num_handles,
IN ib_ci_op_t* const p_ci_op,
IN OUT ci_umv_buf_t *p_umv_buf )
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\kernel\hca_mcast.c trunk\hw\mthca\kernel\hca_mcast.c
--- old\hw\mthca\kernel\hca_mcast.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\kernel\hca_mcast.c Fri Jul 11 12:30:59 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -49,10 +50,10 @@
*/
ib_api_status_t
mlnx_attach_mcast (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_gid_t *p_mcast_gid,
IN const uint16_t mcast_lid,
- OUT ib_mcast_handle_t FUNC_PTR64 *ph_mcast,
+ OUT ib_mcast_handle_t *ph_mcast,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -136,7 +137,7 @@ end:
ib_api_status_t
mlnx_detach_mcast (
- IN const ib_mcast_handle_t FUNC_PTR64 h_mcast)
+ IN const ib_mcast_handle_t h_mcast)
{
ib_api_status_t status = IB_INVALID_PARAMETER;
int err;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\kernel\hca_memory.c trunk\hw\mthca\kernel\hca_memory.c
--- old\hw\mthca\kernel\hca_memory.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\kernel\hca_memory.c Fri Jul 11 12:30:59 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -47,11 +48,11 @@
ib_api_status_t
mlnx_register_mr (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_mr_create_t *p_mr_create,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64 *ph_mr,
+ OUT ib_mr_handle_t *ph_mr,
IN boolean_t um_call )
{
ib_api_status_t status;
@@ -118,12 +119,12 @@ err_unsupported:
ib_api_status_t
mlnx_register_pmr (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_phys_create_t* const p_pmr_create,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t* const ph_mr,
IN boolean_t um_call )
{
ib_api_status_t status;
@@ -205,7 +206,7 @@ err_mem:
ib_api_status_t
mlnx_query_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
OUT ib_mr_attr_t *p_mr_query )
{
UNREFERENCED_PARAMETER(h_mr);
@@ -217,12 +218,12 @@ mlnx_query_mr (
ib_api_status_t
mlnx_modify_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mem_modify_req,
IN const ib_mr_create_t *p_mr_create,
OUT uint32_t *p_lkey,
OUT uint32_t *p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL,
+ IN const ib_pd_handle_t h_pd OPTIONAL,
IN boolean_t um_call )
{
UNREFERENCED_PARAMETER(h_mr);
@@ -239,13 +240,13 @@ mlnx_modify_mr (
ib_api_status_t
mlnx_modify_pmr (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
+ IN const ib_mr_handle_t h_mr,
IN const ib_mr_mod_t mem_modify_req,
IN const ib_phys_create_t* const p_pmr_create,
IN OUT uint64_t* const p_vaddr,
OUT uint32_t* const p_lkey,
OUT uint32_t* const p_rkey,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd OPTIONAL,
+ IN const ib_pd_handle_t h_pd OPTIONAL,
IN boolean_t um_call )
{
UNREFERENCED_PARAMETER(h_mr);
@@ -262,13 +263,13 @@ mlnx_modify_pmr (
ib_api_status_t
mlnx_register_smr (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_mr_handle_t h_mr,
+ IN const ib_pd_handle_t h_pd,
IN const ib_access_t access_ctrl,
IN OUT uint64_t* const p_vaddr,
OUT net32_t* const p_lkey,
OUT net32_t* const p_rkey,
- OUT ib_mr_handle_t FUNC_PTR64* const ph_mr,
+ OUT ib_mr_handle_t* const ph_mr,
IN boolean_t um_call )
{
UNREFERENCED_PARAMETER(h_mr);
@@ -285,7 +286,7 @@ mlnx_register_smr (
ib_api_status_t
mlnx_deregister_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_mr)
+ IN const ib_mr_handle_t h_mr)
{
ib_api_status_t status;
int err;
@@ -331,9 +332,9 @@ err_unsupported:
ib_api_status_t
mlnx_alloc_fmr(
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const mlnx_fmr_create_t* const p_fmr_create,
- OUT mlnx_fmr_handle_t FUNC_PTR64* const ph_fmr
+ OUT mlnx_fmr_handle_t* const ph_fmr
)
{
ib_api_status_t status;
@@ -392,7 +393,7 @@ err_unsupported:
ib_api_status_t
mlnx_map_phys_fmr (
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr,
+ IN const mlnx_fmr_handle_t h_fmr,
IN const uint64_t* const page_list,
IN const int list_len,
IN OUT uint64_t* const p_vaddr,
@@ -438,7 +439,7 @@ err_dealloc_fmr:
ib_api_status_t
mlnx_unmap_fmr (
- IN const mlnx_fmr_handle_t FUNC_PTR64 *ph_fmr)
+ IN const mlnx_fmr_handle_t *ph_fmr)
{
ib_api_status_t status;
int err;
@@ -489,7 +490,7 @@ err_unsupported:
ib_api_status_t
mlnx_dealloc_fmr (
- IN const mlnx_fmr_handle_t FUNC_PTR64 h_fmr
+ IN const mlnx_fmr_handle_t h_fmr
)
{
ib_api_status_t status;
@@ -538,9 +539,9 @@ err_unsupported:
ib_api_status_t
mlnx_create_mw (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
OUT net32_t* const p_rkey,
- OUT ib_mw_handle_t FUNC_PTR64 *ph_mw,
+ OUT ib_mw_handle_t *ph_mw,
IN OUT ci_umv_buf_t *p_umv_buf )
{
UNREFERENCED_PARAMETER(h_pd);
@@ -553,8 +554,8 @@ mlnx_create_mw (
ib_api_status_t
mlnx_query_mw (
- IN const ib_mw_handle_t FUNC_PTR64 h_mw,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ IN const ib_mw_handle_t h_mw,
+ OUT ib_pd_handle_t *ph_pd,
OUT net32_t* const p_rkey,
IN OUT ci_umv_buf_t *p_umv_buf )
{
@@ -568,7 +569,7 @@ mlnx_query_mw (
ib_api_status_t
mlnx_destroy_mw (
- IN const ib_mw_handle_t FUNC_PTR64 h_mw)
+ IN const ib_mw_handle_t h_mw)
{
UNREFERENCED_PARAMETER(h_mw);
HCA_PRINT(TRACE_LEVEL_ERROR , HCA_DBG_MEMORY ,("mlnx_destroy_mw not implemented\n"));
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\kernel\hca_verbs.c trunk\hw\mthca\kernel\hca_verbs.c
--- old\hw\mthca\kernel\hca_verbs.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\kernel\hca_verbs.c Fri Jul 11 12:30:59 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -48,7 +49,7 @@
// Local declarations
ib_api_status_t
mlnx_query_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
OUT ib_qp_attr_t *p_qp_attr,
IN OUT ci_umv_buf_t *p_umv_buf );
@@ -61,7 +62,7 @@ mlnx_open_ca (
IN const ci_completion_cb_t pfn_completion_cb,
IN const ci_async_event_cb_t pfn_async_event_cb,
IN const void*const ca_context,
- OUT ib_ca_handle_t FUNC_PTR64 *ph_ca)
+ OUT ib_ca_handle_t *ph_ca)
{
mlnx_hca_t *p_hca;
ib_api_status_t status = IB_NOT_FOUND;
@@ -119,7 +120,7 @@ err_set_cb:
ib_api_status_t
mlnx_query_ca (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
OUT ib_ca_attr_t *p_ca_attr,
IN OUT uint32_t *p_byte_count,
IN OUT ci_umv_buf_t *p_umv_buf )
@@ -322,7 +323,7 @@ err_user_unsupported:
ib_api_status_t
mlnx_modify_ca (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_ca_mod_t modca_cmd,
IN const ib_port_attr_mod_t *p_port_attr)
@@ -388,7 +389,7 @@ err_unsupported:
ib_api_status_t
mlnx_close_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_ca)
+ IN ib_ca_handle_t h_ca)
{
mlnx_hob_t *hob_p = (mlnx_hob_t *)h_ca;
HCA_ENTER(HCA_DBG_SHIM);
@@ -407,9 +408,9 @@ done:
static ib_api_status_t
mlnx_um_open(
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN OUT ci_umv_buf_t* const p_umv_buf,
- OUT ib_ca_handle_t FUNC_PTR64* const ph_um_ca )
+ OUT ib_ca_handle_t* const ph_um_ca )
{
int err;
ib_api_status_t status;
@@ -507,8 +508,8 @@ end:
static void
mlnx_um_close(
- IN ib_ca_handle_t FUNC_PTR64 h_ca,
- IN ib_ca_handle_t FUNC_PTR64 h_um_ca )
+ IN ib_ca_handle_t h_ca,
+ IN ib_ca_handle_t h_um_ca )
{
struct ib_ucontext *p_ucontext = (struct ib_ucontext *)h_um_ca;
mlnx_hob_t *hob_p = (mlnx_hob_t *)h_ca;
@@ -537,9 +538,9 @@ done:
ib_api_status_t
mlnx_allocate_pd (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const ib_pd_type_t type,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ OUT ib_pd_handle_t *ph_pd,
IN OUT ci_umv_buf_t *p_umv_buf )
{
ib_api_status_t status;
@@ -592,7 +593,7 @@ err_alloc_pd:
ib_api_status_t
mlnx_deallocate_pd (
- IN ib_pd_handle_t FUNC_PTR64 h_pd)
+ IN ib_pd_handle_t h_pd)
{
ib_api_status_t status;
int err;
@@ -629,9 +630,9 @@ err_dealloc_pd:
*/
ib_api_status_t
mlnx_create_av (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const ib_av_attr_t *p_addr_vector,
- OUT ib_av_handle_t FUNC_PTR64 *ph_av,
+ OUT ib_av_handle_t *ph_av,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err = 0;
@@ -690,9 +691,9 @@ err_inval_params:
ib_api_status_t
mlnx_query_av (
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
OUT ib_av_attr_t *p_addr_vector,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ OUT ib_pd_handle_t *ph_pd,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -749,7 +750,7 @@ err_user_unsupported:
ib_api_status_t
mlnx_modify_av (
- IN const ib_av_handle_t FUNC_PTR64 h_av,
+ IN const ib_av_handle_t h_av,
IN const ib_av_attr_t *p_addr_vector,
IN OUT ci_umv_buf_t *p_umv_buf )
{
@@ -799,7 +800,7 @@ err_user_unsupported:
ib_api_status_t
mlnx_destroy_av (
- IN const ib_av_handle_t FUNC_PTR64 h_av)
+ IN const ib_av_handle_t h_av)
{
int err;
ib_api_status_t status = IB_SUCCESS;
@@ -834,10 +835,10 @@ err_destroy_ah:
ib_api_status_t
mlnx_create_srq (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const void *srq_context,
IN const ib_srq_attr_t * const p_srq_attr,
- OUT ib_srq_handle_t FUNC_PTR64 *ph_srq,
+ OUT ib_srq_handle_t *ph_srq,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -904,7 +905,7 @@ err_inval_params:
ib_api_status_t
mlnx_modify_srq (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
IN const ib_srq_attr_t* const p_srq_attr,
IN const ib_srq_attr_mask_t srq_attr_mask,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL )
@@ -936,7 +937,7 @@ mlnx_modify_srq (
ib_api_status_t
mlnx_query_srq (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq,
+ IN const ib_srq_handle_t h_srq,
OUT ib_srq_attr_t* const p_srq_attr,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL )
{
@@ -967,7 +968,7 @@ mlnx_query_srq (
ib_api_status_t
mlnx_destroy_srq (
- IN const ib_srq_handle_t FUNC_PTR64 h_srq )
+ IN const ib_srq_handle_t h_srq )
{
int err;
ib_api_status_t status = IB_SUCCESS;
@@ -1000,12 +1001,12 @@ mlnx_destroy_srq (
static ib_api_status_t
_create_qp (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const uint8_t port_num,
IN const void *qp_context,
IN const ib_qp_create_t *p_create_attr,
OUT ib_qp_attr_t *p_qp_attr,
- OUT ib_qp_handle_t FUNC_PTR64 *ph_qp,
+ OUT ib_qp_handle_t *ph_qp,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -1093,12 +1094,12 @@ end:
ib_api_status_t
mlnx_create_spl_qp (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const uint8_t port_num,
IN const void *qp_context,
IN const ib_qp_create_t *p_create_attr,
OUT ib_qp_attr_t *p_qp_attr,
- OUT ib_qp_handle_t FUNC_PTR64 *ph_qp )
+ OUT ib_qp_handle_t *ph_qp )
{
ib_api_status_t status;
PREP_IBDEV_FOR_PRINT(((struct ib_pd*)h_pd)->device);
@@ -1119,11 +1120,11 @@ mlnx_create_spl_qp (
ib_api_status_t
mlnx_create_qp (
- IN const ib_pd_handle_t FUNC_PTR64 h_pd,
+ IN const ib_pd_handle_t h_pd,
IN const void *qp_context,
IN const ib_qp_create_t *p_create_attr,
OUT ib_qp_attr_t *p_qp_attr,
- OUT ib_qp_handle_t FUNC_PTR64 *ph_qp,
+ OUT ib_qp_handle_t *ph_qp,
IN OUT ci_umv_buf_t *p_umv_buf )
{
ib_api_status_t status;
@@ -1150,7 +1151,7 @@ mlnx_create_qp (
ib_api_status_t
mlnx_modify_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t *p_modify_attr,
OUT ib_qp_attr_t *p_qp_attr OPTIONAL,
IN OUT ci_umv_buf_t *p_umv_buf OPTIONAL )
@@ -1231,7 +1232,7 @@ err_inval_params:
ib_api_status_t
mlnx_ndi_modify_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const ib_qp_mod_t *p_modify_attr,
OUT ib_qp_attr_t *p_qp_attr OPTIONAL,
IN const uint32_t buf_size,
@@ -1263,7 +1264,7 @@ mlnx_ndi_modify_qp (
ib_api_status_t
mlnx_query_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
OUT ib_qp_attr_t *p_qp_attr,
IN OUT ci_umv_buf_t *p_umv_buf )
{
@@ -1319,7 +1320,7 @@ mlnx_query_qp (
ib_api_status_t
mlnx_destroy_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_qp,
+ IN const ib_qp_handle_t h_qp,
IN const uint64_t timewait )
{
ib_api_status_t status;
@@ -1360,10 +1361,10 @@ err_destroy_qp:
ib_api_status_t
mlnx_create_cq (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const void *cq_context,
IN OUT uint32_t *p_size,
- OUT ib_cq_handle_t FUNC_PTR64 *ph_cq,
+ OUT ib_cq_handle_t *ph_cq,
IN OUT ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -1441,7 +1442,7 @@ err_cqe:
ib_api_status_t
mlnx_resize_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
IN OUT uint32_t *p_size,
IN OUT ci_umv_buf_t *p_umv_buf )
{
@@ -1456,7 +1457,7 @@ mlnx_resize_cq (
ib_api_status_t
mlnx_query_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq,
+ IN const ib_cq_handle_t h_cq,
OUT uint32_t *p_size,
IN OUT ci_umv_buf_t *p_umv_buf )
{
@@ -1471,7 +1472,7 @@ mlnx_query_cq (
ib_api_status_t
mlnx_destroy_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_cq)
+ IN const ib_cq_handle_t h_cq)
{
ib_api_status_t status;
@@ -1508,7 +1509,7 @@ err_destroy_cq:
ib_api_status_t
mlnx_local_mad (
- IN const ib_ca_handle_t FUNC_PTR64 h_ca,
+ IN const ib_ca_handle_t h_ca,
IN const uint8_t port_num,
IN const ib_av_attr_t* p_av_attr,
IN const ib_mad_t *p_mad_in,
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\kernel\ib_verbs.h trunk\hw\mthca\kernel\ib_verbs.h
--- old\hw\mthca\kernel\ib_verbs.h Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\kernel\ib_verbs.h Fri Jul 11 12:30:59 2008
@@ -6,12 +6,10 @@
* Copyright (c) 2004 Voltaire Corporation. All rights reserved.
* Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2005 Cisco Systems. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
+ * 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
@@ -728,7 +726,7 @@ struct ib_device {
mthca_qp_access_t mr_access_flags,
u64 *iova_start);
struct ib_mr * (*reg_virt_mr)(struct ib_pd *pd,
- void* FUNC_PTR64 vaddr, uint64_t length, uint64_t hca_va,
+ void* vaddr, uint64_t length, uint64_t hca_va,
mthca_qp_access_t acc, boolean_t um_call, boolean_t secure);
int (*query_mr)(struct ib_mr *mr,
struct ib_mr_attr *mr_attr);
@@ -1144,7 +1142,7 @@ static inline int ib_req_ncomp_notif(str
*/
struct ib_mr *ibv_reg_mr(struct ib_pd *pd,
mthca_qp_access_t mr_access_flags,
- void* FUNC_PTR64 vaddr,
+ void* vaddr,
uint64_t length,
uint64_t hca_va,
boolean_t um_call,
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\kernel\mt_verbs.c trunk\hw\mthca\kernel\mt_verbs.c
--- old\hw\mthca\kernel\mt_verbs.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\kernel\mt_verbs.c Fri Jul 11 12:30:59 2008
@@ -6,12 +6,10 @@
* Copyright (c) 2004 Voltaire Corporation. All rights reserved.
* Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2005 Cisco Systems. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
+ * 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
@@ -685,7 +683,7 @@ int ibv_resize_cq(struct ib_cq *cq,
struct ib_mr *ibv_reg_mr(struct ib_pd *pd,
mthca_qp_access_t mr_access_flags,
- void* FUNC_PTR64 vaddr,
+ void* vaddr,
uint64_t length,
uint64_t hca_va,
boolean_t um_call,
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\kernel\mthca_provider.c trunk\hw\mthca\kernel\mthca_provider.c
--- old\hw\mthca\kernel\mthca_provider.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\kernel\mthca_provider.c Fri Jul 11 12:30:59 2008
@@ -4,12 +4,10 @@
* Copyright (c) 2005 Cisco Systems. All rights reserved.
* Copyright (c) 2005 Mellanox Technologies. All rights reserved.
* Copyright (c) 2004 Voltaire, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
+ * 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
@@ -995,7 +993,7 @@ static struct ib_mr *mthca_reg_phys_mr(s
}
static struct ib_mr *mthca_reg_virt_mr(struct ib_pd *pd,
- void* FUNC_PTR64 vaddr, uint64_t length, uint64_t hca_va,
+ void* vaddr, uint64_t length, uint64_t hca_va,
mthca_qp_access_t acc, boolean_t um_call, boolean_t secure)
{
struct mthca_dev *dev = to_mdev(pd->device);
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\user\mlnx_ual_av.c trunk\hw\mthca\user\mlnx_ual_av.c
--- old\hw\mthca\user\mlnx_ual_av.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\user\mlnx_ual_av.c Fri Jul 11 12:30:59 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -114,10 +115,10 @@ map_itom_av_attr (
static ib_api_status_t
__pre_create_av (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN const ib_av_attr_t *p_av_attr,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_av_handle_t FUNC_PTR64 *ph_uvp_av)
+ OUT ib_av_handle_t *ph_uvp_av)
{
int err;
struct mthca_ah *ah;
@@ -210,9 +211,9 @@ end:
static void
__post_create_av (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
- IN OUT ib_av_handle_t FUNC_PTR64 *ph_uvp_av,
+ IN OUT ib_av_handle_t *ph_uvp_av,
IN OUT ci_umv_buf_t *p_umv_buf)
{
int err;
@@ -259,7 +260,7 @@ end:
static ib_api_status_t
__pre_query_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN OUT ci_umv_buf_t *p_umv_buf )
{
UNREFERENCED_PARAMETER(h_uvp_av);
@@ -272,10 +273,10 @@ __pre_query_av (
static void
__post_query_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN ib_api_status_t ioctl_status,
IN OUT ib_av_attr_t *p_addr_vector,
- IN OUT ib_pd_handle_t FUNC_PTR64 *ph_pd,
+ IN OUT ib_pd_handle_t *ph_pd,
IN OUT ci_umv_buf_t *p_umv_buf)
{
struct mthca_ah *ah = (struct mthca_ah *)h_uvp_av;
@@ -299,7 +300,7 @@ void mthca_set_av_params( struct mthca_a
static ib_api_status_t
__pre_modify_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN const ib_av_attr_t *p_addr_vector,
IN OUT ci_umv_buf_t *p_umv_buf)
{
@@ -334,7 +335,7 @@ __pre_modify_av (
static void
__post_modify_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN ib_api_status_t ioctl_status,
IN OUT ci_umv_buf_t *p_umv_buf)
{
@@ -345,7 +346,7 @@ __post_modify_av (
static ib_api_status_t
__pre_destroy_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av)
+ IN const ib_av_handle_t h_uvp_av)
{
ib_api_status_t status ;
struct mthca_ah *mthca_ah = (struct mthca_ah *)h_uvp_av;
@@ -360,7 +361,7 @@ __pre_destroy_av (
static void
__post_destroy_av (
- IN const ib_av_handle_t FUNC_PTR64 h_uvp_av,
+ IN const ib_av_handle_t h_uvp_av,
IN ib_api_status_t ioctl_status)
{
struct mthca_ah *mthca_ah = (struct mthca_ah *)h_uvp_av;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\user\mlnx_ual_ca.c trunk\hw\mthca\user\mlnx_ual_ca.c
--- old\hw\mthca\user\mlnx_ual_ca.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\user\mlnx_ual_ca.c Fri Jul 11 12:29:36 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -46,7 +47,7 @@ static ib_api_status_t
__pre_open_ca (
IN const ib_net64_t ca_guid,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_ca_handle_t FUNC_PTR64 *ph_uvp_ca)
+ OUT ib_ca_handle_t *ph_uvp_ca)
{
ib_api_status_t status = IB_SUCCESS;
@@ -77,7 +78,7 @@ static ib_api_status_t
__post_open_ca (
IN const ib_net64_t ca_guid,
IN ib_api_status_t ioctl_status,
- IN OUT ib_ca_handle_t FUNC_PTR64 *ph_uvp_ca,
+ IN OUT ib_ca_handle_t *ph_uvp_ca,
IN ci_umv_buf_t *p_umv_buf )
{
ib_api_status_t status = ioctl_status;
@@ -123,7 +124,7 @@ err_alloc_context:
static ib_api_status_t
__pre_query_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_ca_attr_t *p_ca_attr,
IN size_t byte_count,
IN ci_umv_buf_t *p_umv_buf )
@@ -169,7 +170,7 @@ __pre_query_ca (
static void
__post_query_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status,
IN ib_ca_attr_t *p_ca_attr,
IN size_t byte_count,
@@ -199,7 +200,7 @@ __post_query_ca (
static ib_api_status_t
__pre_modify_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN uint8_t port_num,
IN ib_ca_mod_t ca_mod,
IN const ib_port_attr_mod_t* p_port_attr_mod)
@@ -212,7 +213,7 @@ __pre_modify_ca (
static void
__post_modify_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -222,7 +223,7 @@ __post_modify_ca (
static ib_api_status_t
__pre_close_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca)
+ IN ib_ca_handle_t h_uvp_ca)
{
UVP_ENTER(UVP_DBG_SHIM);
UVP_EXIT(UVP_DBG_SHIM);
@@ -232,7 +233,7 @@ __pre_close_ca (
static ib_api_status_t
__post_close_ca (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status )
{
mlnx_ual_hobul_t *p_hobul = (mlnx_ual_hobul_t *)((void*)h_uvp_ca);
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\user\mlnx_ual_cq.c trunk\hw\mthca\user\mlnx_ual_cq.c
--- old\hw\mthca\user\mlnx_ual_cq.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\user\mlnx_ual_cq.c Fri Jul 11 12:29:36 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -44,10 +45,10 @@ extern uint32_t mlnx_dbg_lvl;
static ib_api_status_t
__pre_create_cq (
- IN const ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
- IN OUT uint32_t* const p_size,
+ IN const ib_ca_handle_t h_uvp_ca,
+ IN OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_cq_handle_t FUNC_PTR64 *ph_uvp_cq)
+ OUT ib_cq_handle_t *ph_uvp_cq)
{
struct ibv_cq *ibv_cq;
ib_api_status_t status = IB_SUCCESS;
@@ -98,10 +99,10 @@ end:
static void
__post_create_cq (
- IN const ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN const ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status,
IN const uint32_t size,
- IN OUT ib_cq_handle_t FUNC_PTR64 *ph_uvp_cq,
+ IN OUT ib_cq_handle_t *ph_uvp_cq,
IN ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -144,7 +145,7 @@ end:
static ib_api_status_t
__pre_query_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq,
+ IN const ib_cq_handle_t h_uvp_cq,
OUT uint32_t* const p_size,
IN OUT ci_umv_buf_t *p_umv_buf)
{
@@ -161,7 +162,7 @@ __pre_query_cq (
static ib_api_status_t
__pre_destroy_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq)
+ IN const ib_cq_handle_t h_uvp_cq)
{
UVP_ENTER(UVP_DBG_CQ);
UVP_EXIT(UVP_DBG_CQ);
@@ -170,7 +171,7 @@ __pre_destroy_cq (
static void
__post_destroy_cq (
- IN const ib_cq_handle_t FUNC_PTR64 h_uvp_cq,
+ IN const ib_cq_handle_t h_uvp_cq,
IN ib_api_status_t ioctl_status)
{
int err;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\user\mlnx_ual_mcast.c trunk\hw\mthca\user\mlnx_ual_mcast.c
--- old\hw\mthca\user\mlnx_ual_mcast.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\user\mlnx_ual_mcast.c Fri Jul 11 12:29:36 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -38,11 +39,11 @@
static ib_api_status_t
__pre_attach_mcast (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN const ib_gid_t *p_mcast_gid,
IN const uint16_t mcast_lid,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_mcast_handle_t FUNC_PTR64 *ph_mcast)
+ OUT ib_mcast_handle_t *ph_mcast)
{
UNREFERENCED_PARAMETER(ph_mcast);
@@ -61,9 +62,9 @@ __pre_attach_mcast (
static void
__post_attach_mcast (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status,
- IN OUT ib_mcast_handle_t FUNC_PTR64 *ph_mcast,
+ IN OUT ib_mcast_handle_t *ph_mcast,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -74,7 +75,7 @@ __post_attach_mcast (
static ib_api_status_t
__pre_detach_mcast (
- IN ib_mcast_handle_t FUNC_PTR64 h_uvp_mcast,
+ IN ib_mcast_handle_t h_uvp_mcast,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -91,7 +92,7 @@ __pre_detach_mcast (
static void
__post_detach_mcast (
- IN ib_mcast_handle_t FUNC_PTR64 h_uvp_mcast,
+ IN ib_mcast_handle_t h_uvp_mcast,
IN ib_api_status_t ioctl_status,
IN OUT ci_umv_buf_t *p_umv_buf)
{
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\user\mlnx_ual_mrw.c trunk\hw\mthca\user\mlnx_ual_mrw.c
--- old\hw\mthca\user\mlnx_ual_mrw.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\user\mlnx_ual_mrw.c Fri Jul 11 12:29:36 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -39,10 +40,10 @@
static ib_api_status_t
__pre_register_mr (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN const ib_mr_create_t *p_mr_create,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_mr_handle_t FUNC_PTR64 *ph_uvp_mr)
+ OUT ib_mr_handle_t *ph_uvp_mr)
{
UNREFERENCED_PARAMETER(ph_uvp_mr);
@@ -59,11 +60,11 @@ __pre_register_mr (
static void
__post_register_mr (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
IN const uint32_t *p_lkey,
IN const uint32_t *p_rkey,
- IN OUT const ib_mr_handle_t FUNC_PTR64 *ph_uvp_mr,
+ IN OUT const ib_mr_handle_t *ph_uvp_mr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -74,7 +75,7 @@ __post_register_mr (
static ib_api_status_t
__pre_query_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_mr_handle_t h_uvp_mr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -90,7 +91,7 @@ __pre_query_mr (
static void
__post_query_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_mr_handle_t h_uvp_mr,
IN ib_api_status_t ioctl_status,
IN const ib_mr_attr_t *p_mr_query,
IN OUT ci_umv_buf_t *p_umv_buf)
@@ -103,8 +104,8 @@ __post_query_mr (
static ib_api_status_t
__pre_modify_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd OPTIONAL,
+ IN const ib_mr_handle_t h_uvp_mr,
+ IN const ib_pd_handle_t h_uvp_pd OPTIONAL,
IN const ib_mr_mod_t mr_mod_mask,
IN const ib_mr_create_t *p_mr_create OPTIONAL,
IN OUT ci_umv_buf_t *p_umv_buf)
@@ -122,8 +123,8 @@ __pre_modify_mr (
static void
__post_modify_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd OPTIONAL,
+ IN const ib_mr_handle_t h_uvp_mr,
+ IN const ib_pd_handle_t h_uvp_pd OPTIONAL,
IN ib_api_status_t ioctl_status,
IN const uint32_t *p_lkey,
IN const uint32_t *p_rkey,
@@ -137,8 +138,8 @@ __post_modify_mr (
static ib_api_status_t
__pre_register_smr (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_pd_handle_t h_uvp_pd,
+ IN const ib_mr_handle_t h_uvp_mr,
IN const ib_access_t access_ctrl,
IN void *p_vaddr,
IN OUT ci_umv_buf_t *p_umv_buf)
@@ -156,13 +157,13 @@ __pre_register_smr (
static void
__post_register_smr (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_pd_handle_t h_uvp_pd,
+ IN const ib_mr_handle_t h_uvp_mr,
IN ib_api_status_t ioctl_status,
IN const void *p_vaddr,
IN const uint32_t *p_lkey,
IN const uint32_t *p_rkey,
- OUT const ib_mr_handle_t FUNC_PTR64 *ph_uvp_smr,
+ OUT const ib_mr_handle_t *ph_uvp_smr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -173,7 +174,7 @@ __post_register_smr (
static ib_api_status_t
__pre_deregister_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_mr_handle_t h_uvp_mr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
@@ -184,7 +185,7 @@ __pre_deregister_mr (
static void
__post_deregister_mr (
- IN const ib_mr_handle_t FUNC_PTR64 h_uvp_mr,
+ IN const ib_mr_handle_t h_uvp_mr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UVP_ENTER(UVP_DBG_SHIM);
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\user\mlnx_ual_osbypass.c trunk\hw\mthca\user\mlnx_ual_osbypass.c
--- old\hw\mthca\user\mlnx_ual_osbypass.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\user\mlnx_ual_osbypass.c Fri Jul 11 12:21:40 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -56,7 +57,7 @@ static ib_api_status_t __to_status(int e
static ib_api_status_t
__post_send (
- IN const void* FUNC_PTR64 h_qp,
+ IN const void* h_qp,
IN ib_send_wr_t* const p_send_wr,
OUT ib_send_wr_t** pp_send_failure )
{
@@ -84,7 +85,7 @@ __post_send (
static ib_api_status_t
__post_recv (
- IN const void* FUNC_PTR64 h_qp,
+ IN const void* h_qp,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t** pp_recv_failure )
{
@@ -112,7 +113,7 @@ __post_recv (
static ib_api_status_t
__post_srq_recv (
- IN const void* FUNC_PTR64 h_srq,
+ IN const void* h_srq,
IN ib_recv_wr_t* const p_recv_wr,
OUT ib_recv_wr_t** pp_recv_failure )
{
@@ -139,7 +140,7 @@ __post_srq_recv (
static ib_api_status_t
__poll_cq (
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
IN OUT ib_wc_t** const pp_free_wclist,
OUT ib_wc_t** const pp_done_wclist )
{
@@ -178,7 +179,7 @@ err_invalid_params:
static ib_api_status_t
__enable_cq_notify (
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
IN const boolean_t solicited )
{
int err;
@@ -203,7 +204,7 @@ exit:
static ib_api_status_t
__enable_ncomp_cq_notify (
- IN const void* FUNC_PTR64 h_cq,
+ IN const void* h_cq,
IN const uint32_t n_cqes )
{
// Not yet implemented
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\user\mlnx_ual_pd.c trunk\hw\mthca\user\mlnx_ual_pd.c
--- old\hw\mthca\user\mlnx_ual_pd.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\user\mlnx_ual_pd.c Fri Jul 11 12:29:36 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -42,9 +43,9 @@
static ib_api_status_t
__pre_allocate_pd (
- IN const ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN const ib_ca_handle_t h_uvp_ca,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_pd_handle_t FUNC_PTR64 *ph_uvp_pd)
+ OUT ib_pd_handle_t *ph_uvp_pd)
{
ib_api_status_t status = IB_SUCCESS;
@@ -74,9 +75,9 @@ err_memory:
static void
__post_allocate_pd (
- IN ib_ca_handle_t FUNC_PTR64 h_uvp_ca,
+ IN ib_ca_handle_t h_uvp_ca,
IN ib_api_status_t ioctl_status,
- IN OUT ib_pd_handle_t FUNC_PTR64 *ph_uvp_pd,
+ IN OUT ib_pd_handle_t *ph_uvp_pd,
IN ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -130,7 +131,7 @@ end:
static ib_api_status_t
__pre_deallocate_pd (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd)
+ IN const ib_pd_handle_t h_uvp_pd)
{
mlnx_ual_pd_info_t *p_pd_info = (mlnx_ual_pd_info_t *)((void *)h_uvp_pd);
UVP_ENTER(UVP_DBG_SHIM);
@@ -142,7 +143,7 @@ __pre_deallocate_pd (
static void
__post_deallocate_pd (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status )
{
int err;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\user\mlnx_ual_qp.c trunk\hw\mthca\user\mlnx_ual_qp.c
--- old\hw\mthca\user\mlnx_ual_qp.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\user\mlnx_ual_qp.c Fri Jul 11 12:29:36 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -41,7 +42,7 @@
static void
__nd_modify_qp(
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
OUT void** pp_outbuf,
OUT DWORD* p_size
)
@@ -69,7 +70,7 @@ static ib_qp_state_t __qp_state_to_ibal(
static uint32_t
__nd_get_qp_state(
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp
+ IN const ib_qp_handle_t h_uvp_qp
)
{
struct ibv_qp *ibv_qp = (struct ibv_qp *)h_uvp_qp;
@@ -80,10 +81,10 @@ __nd_get_qp_state(
static ib_api_status_t
__pre_create_qp (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN const ib_qp_create_t *p_create_attr,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_qp_handle_t FUNC_PTR64 *ph_uvp_qp)
+ OUT ib_qp_handle_t *ph_uvp_qp)
{
int err;
struct ibv_qp *ibv_qp;
@@ -150,9 +151,9 @@ end:
static ib_api_status_t
__post_create_qp (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
- IN OUT ib_qp_handle_t FUNC_PTR64 *ph_uvp_qp,
+ IN OUT ib_qp_handle_t *ph_uvp_qp,
IN ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -194,7 +195,7 @@ end:
static ib_api_status_t
__pre_modify_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN const ib_qp_mod_t *p_modify_attr,
IN OUT ci_umv_buf_t *p_umv_buf)
{
@@ -227,7 +228,7 @@ err_memory:
static void
__post_modify_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status,
IN OUT ci_umv_buf_t *p_umv_buf)
{
@@ -270,7 +271,7 @@ err_modify_qp:
static ib_api_status_t
__pre_query_qp (
- IN ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN ib_qp_handle_t h_uvp_qp,
IN OUT ci_umv_buf_t *p_umv_buf)
{
UNREFERENCED_PARAMETER(h_uvp_qp);
@@ -285,7 +286,7 @@ __pre_query_qp (
static void
__post_query_qp (
- IN ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status,
IN OUT ib_qp_attr_t *p_query_attr,
IN OUT ci_umv_buf_t *p_umv_buf)
@@ -308,7 +309,7 @@ __post_query_qp (
static ib_api_status_t
__pre_destroy_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp)
+ IN const ib_qp_handle_t h_uvp_qp)
{
int err;
@@ -323,7 +324,7 @@ __pre_destroy_qp (
static void
__post_destroy_qp (
- IN const ib_qp_handle_t FUNC_PTR64 h_uvp_qp,
+ IN const ib_qp_handle_t h_uvp_qp,
IN ib_api_status_t ioctl_status)
{
int err;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\hw\mthca\user\mlnx_ual_srq.c trunk\hw\mthca\user\mlnx_ual_srq.c
--- old\hw\mthca\user\mlnx_ual_srq.c Fri Jul 11 12:20:50 2008
+++ trunk\hw\mthca\user\mlnx_ual_srq.c Fri Jul 11 12:29:36 2008
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2005 SilverStorm Technologies. All rights reserved.
* Copyright (c) 2004-2005 Mellanox Technologies, Inc. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -66,10 +67,10 @@ static void __free_srq(struct mthca_srq
static ib_api_status_t
__pre_create_srq (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,// Fix me: if needed
+ IN const ib_pd_handle_t h_uvp_pd,// Fix me: if needed
IN const ib_srq_attr_t *p_srq_attr,
IN OUT ci_umv_buf_t *p_umv_buf,
- OUT ib_srq_handle_t FUNC_PTR64 *ph_uvp_srq)
+ OUT ib_srq_handle_t *ph_uvp_srq)
{
struct mthca_srq *srq;
ib_api_status_t status = IB_SUCCESS;
@@ -172,9 +173,9 @@ end:
static void
__post_create_srq (
- IN const ib_pd_handle_t FUNC_PTR64 h_uvp_pd,
+ IN const ib_pd_handle_t h_uvp_pd,
IN ib_api_status_t ioctl_status,
- IN OUT ib_srq_handle_t FUNC_PTR64 *ph_uvp_srq,
+ IN OUT ib_srq_handle_t *ph_uvp_srq,
IN ci_umv_buf_t *p_umv_buf )
{
int err;
@@ -219,7 +220,7 @@ __post_create_srq (
static void
__post_destroy_srq (
- IN const ib_srq_handle_t FUNC_PTR64 h_uvp_srq,
+ IN const ib_srq_handle_t h_uvp_srq,
IN ib_api_status_t ioctl_status)
{
int err;
diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: old\inc\iba\ib_types.h trunk\inc\iba\ib_types.h
--- old\inc\iba\ib_types.h Fri Jul 11 12:20:50 2008
+++ trunk\inc\iba\ib_types.h Fri Jul 11 12:29:35 2008
@@ -3,6 +3,7 @@
* Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2006 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Portions Copyright (c) 2008 Microsoft Corporation. All rights reserved.
*
* This software is available to you under the OpenIB.org BSD license
* below:
@@ -40,10 +41,6 @@
#include <complib/cl_byteswap.h>
//#include <al_fmr_pool.h>
-#ifndef FUNC_PTR64
-#define FUNC_PTR64
-#endif
-
#ifndef TYPEDEF_PTR64
#define TYPEDEF_PTR64
#endif
@@ -10927,7 +10924,7 @@ typedef struct _mlnx_fmr_pool_create
enum ib_access_flags access_ctrl;
int pool_size;
int dirty_watermark;
- void (FUNC_PTR64 *flush_function)(mlnx_fmr_pool_handle_t h_pool, void *arg) ;
+ void (*flush_function)(mlnx_fmr_pool_handle_t h_pool, void *arg);
void *flush_arg;
boolean_t cache;
} mlnx_fmr_pool_create_t;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: FUNC_PTR64.patch
Type: application/octet-stream
Size: 57950 bytes
Desc: FUNC_PTR64.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20080711/c87ab357/attachment.obj>
More information about the ofw
mailing list