[ofw] [PATCH] Remove XXX_PTR64 and TO_ULONG_PTR from OpenSM

Leonid Keller leonid at mellanox.co.il
Sun Jul 13 01:56:58 PDT 2008


Applied in 1375. Thank you. 

> -----Original Message-----
> From: ofw-bounces at lists.openfabrics.org 
> [mailto:ofw-bounces at lists.openfabrics.org] On Behalf Of Fab Tillier
> Sent: Friday, July 11, 2008 6:48 PM
> To: ofw at lists.openfabrics.org
> Subject: [ofw] [PATCH] Remove XXX_PTR64 and TO_ULONG_PTR from OpenSM
> 
> This patch removes XXX_PTR64 and TO_ULONG_PTR from OpenSM.
> 
> Signed-off-by: Fab Tillier <ftillier at microsoft.com>
> 
> diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: 
> old\ulp\opensm\user\include\iba\ib_types.h 
> trunk\ulp\opensm\user\include\iba\ib_types.h
> --- old\ulp\opensm\user\include\iba\ib_types.h  Thu Jun 26 
> 21:00:30 2008
> +++ trunk\ulp\opensm\user\include\iba\ib_types.h        Fri 
> Jul 11 08:36:57 2008
> @@ -2,6 +2,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:
> @@ -65,21 +66,6 @@ BEGIN_C_DECLS
>      #define __ptr64
>  #endif
> 
> -#ifndef FUNC_PTR64
> -#define FUNC_PTR64
> -#endif
> -
> -#ifndef TYPEDEF_PTR64
> -#define TYPEDEF_PTR64
> -#endif
> -
> -#ifndef VOID_PTR64
> -#define VOID_PTR64
> -#endif
> -
> -#ifndef STRUCT_PTR64
> -#define STRUCT_PTR64
> -#endif
> 
>  #define IB_CONCAT(str1, str2) str1##str2
> 
> @@ -7881,16 +7867,16 @@ typedef uint16_t                      
>                   ib_sidr_status_t;
>   */
> 
> 
> -typedef struct _ib_ca* TYPEDEF_PTR64                   
> ib_ca_handle_t ;
> -typedef struct _ib_pd* TYPEDEF_PTR64                   
> ib_pd_handle_t ;
> -typedef struct _ib_rdd* TYPEDEF_PTR64                  
> ib_rdd_handle_t;
> -typedef struct _ib_mr* TYPEDEF_PTR64                   
> ib_mr_handle_t;
> -typedef struct _ib_mw* TYPEDEF_PTR64                   
> ib_mw_handle_t;
> -typedef struct _ib_qp* TYPEDEF_PTR64                   
> ib_qp_handle_t;
> -typedef struct _ib_eec* TYPEDEF_PTR64                  
> ib_eec_handle_t;
> -typedef struct _ib_cq* TYPEDEF_PTR64                   
> ib_cq_handle_t;
> -typedef struct _ib_av* TYPEDEF_PTR64                   
> ib_av_handle_t;
> -typedef struct _ib_mcast* TYPEDEF_PTR64                
> ib_mcast_handle_t;
> +typedef struct _ib_ca*                 ib_ca_handle_t ;
> +typedef struct _ib_pd*                 ib_pd_handle_t ;
> +typedef struct _ib_rdd*                        ib_rdd_handle_t;
> +typedef struct _ib_mr*                 ib_mr_handle_t;
> +typedef struct _ib_mw*                 ib_mw_handle_t;
> +typedef struct _ib_qp*                 ib_qp_handle_t;
> +typedef struct _ib_eec*                        ib_eec_handle_t;
> +typedef struct _ib_cq*                 ib_cq_handle_t;
> +typedef struct _ib_av*                 ib_av_handle_t;
> +typedef struct _ib_mcast*              ib_mcast_handle_t;
>  /* Currently for windows branch, use the extended version of 
> ib special verbs struct
>         in order to be compliant with Infinicon ib_types; 
> later we'll change it to support
>         OpenSM ib_types.h */
> diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: 
> old\ulp\opensm\user\include\iba\ib_types_extended.h 
> trunk\ulp\opensm\user\include\iba\ib_types_extended.h
> --- old\ulp\opensm\user\include\iba\ib_types_extended.h Thu 
> Jun 26 21:00:30 2008
> +++ trunk\ulp\opensm\user\include\iba\ib_types_extended.h     
>   Fri Jul 11 08:36:57 2008
> @@ -2,6 +2,7 @@
>   * Copyright (c) 2004,2005 Voltaire, Inc. All rights reserved.
>   * Copyright (c) 2002-2005 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:
> @@ -82,7 +83,7 @@
> 
> 
> 
> -typedef struct _ib_srq*  TYPEDEF_PTR64  ib_srq_handle_t ;
> +typedef struct _ib_srq*                ib_srq_handle_t ;
> 
>  /*
>   *     The following definitions are shared between the 
> Access Layer and VPD
> diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: 
> old\ulp\opensm\user\include\vendor\osm_vendor_al.h 
> trunk\ulp\opensm\user\include\vendor\osm_vendor_al.h
> --- old\ulp\opensm\user\include\vendor\osm_vendor_al.h  Thu 
> Jun 26 21:00:30 2008
> +++ trunk\ulp\opensm\user\include\vendor\osm_vendor_al.h      
>   Fri Jul 11 08:45:44 2008
> @@ -2,6 +2,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:
> @@ -274,13 +275,13 @@ osm_ca_info_get_ca_guid(  */
>  typedef        struct _osm_vendor
>  {
> -TO_LONG_PTR(   ib_al_handle_t ,                h_al) ;
> +       ib_al_handle_t          h_al;
>         osm_log_t                       *p_log;
>         uint32_t                        ca_count;
>         osm_ca_info_t           *p_ca_info;
>         uint32_t                        timeout;
> -TO_LONG_PTR(   ib_ca_handle_t ,                h_ca) ;
> -TO_LONG_PTR(   ib_pd_handle_t ,                h_pd) ;
> +       ib_ca_handle_t          h_ca;
> +       ib_pd_handle_t          h_pd;
> 
>  } osm_vendor_t;
>  /*
> @@ -337,7 +338,7 @@ typedef struct _osm_vend_wrap_t
>      uint32_t                                   size;
>         osm_bind_handle_t                       h_bind;
>         ib_mad_element_t                        *p_elem;
> -TO_LONG_PTR(   ib_av_handle_t ,                              
>   h_av) ;
> +       ib_av_handle_t                          h_av;
>         void*                                           p_resp_madw;
> 
>  }osm_vend_wrap_t;
> diff -up -r -X trunk\docs\dontdiff.txt -I \$Id: 
> old\ulp\opensm\user\libvendor\osm_vendor_al.c 
> trunk\ulp\opensm\user\libvendor\osm_vendor_al.c
> --- old\ulp\opensm\user\libvendor\osm_vendor_al.c       Thu 
> Jun 26 21:00:30 2008
> +++ trunk\ulp\opensm\user\libvendor\osm_vendor_al.c     Fri 
> Jul 11 08:36:57 2008
> @@ -2,6 +2,7 @@
>   * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
>   * Copyright (c) 2002-2005 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:
> @@ -80,14 +81,14 @@ typedef struct _osm_al_bind_info  {
>    osm_vendor_t                *p_vend;
>    void                        *client_context;
> -  ib_qp_handle_t VOID_PTR64                 h_qp;
> -  ib_mad_svc_handle_t VOID_PTR64               h_svc;
> +  ib_qp_handle_t                 h_qp;
> +  ib_mad_svc_handle_t               h_svc;
>    uint8_t                        port_num;
> -  ib_pool_key_t VOID_PTR64                  pool_key;
> +  ib_pool_key_t                  pool_key;
>    osm_vend_mad_recv_callback_t      rcv_callback;
>    osm_vend_mad_send_err_callback_t  send_err_callback;
>    osm_mad_pool_t                 *p_osm_pool;
> -  ib_av_handle_t VOID_PTR64                 h_dr_av;
> +  ib_av_handle_t                 h_dr_av;
> 
>  } osm_al_bind_info_t;
>  /*
> @@ -219,7 +220,7 @@ __osm_al_err_callback(  */  static void 
> AL_API  __osm_al_send_callback(
> -  IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
> +  IN const ib_mad_svc_handle_t h_mad_svc,
>    IN void *mad_svc_context,
>    IN ib_mad_element_t *p_elem )
>  {
> @@ -229,7 +230,7 @@ __osm_al_send_callback(
>    osm_vend_wrap_t* p_vw = osm_madw_get_vend_ptr( p_madw );
>    ib_mad_t *p_mad = ib_get_mad_buf( p_elem );
>    ib_av_attr_t         av_attr;
> -  ib_pd_handle_t VOID_PTR64            h_pd;
> +  ib_pd_handle_t               h_pd;
>    ib_api_status_t status_elem,status;
>    osm_madw_t *p_new_madw;
> 
> @@ -317,7 +318,7 @@ __osm_al_send_callback(
>   */
>   static void AL_API
>  __osm_al_rcv_callback(
> -  IN const ib_mad_svc_handle_t FUNC_PTR64 h_mad_svc,
> +  IN const ib_mad_svc_handle_t h_mad_svc,
>    IN void *mad_svc_context,
>    IN ib_mad_element_t *p_elem )
>  {
> 



More information about the ofw mailing list