[openib-general] Re: [PATCH] kDAPL: remove typedef DAT_NAME_PTR

James Lentini jlentini at netapp.com
Fri May 13 10:24:45 PDT 2005


Committed in revision 2336.

On Thu, 12 May 2005, Tom Duffy wrote:

tduffy> Remove typedef DAT_NAME_PTR.  Also get rid of DAT_UVERYLONG & DAT_PADDR
tduffy> that are not used anywhere outside of dat.h.  Also, a little more
tduffy> whitespace cleaning that should have been done with the DAT_RETURN
tduffy> patch.
tduffy> 
tduffy> Signed-off-by: Tom Duffy <tduffy at sun.com>
tduffy> 
tduffy> diff -Nurp -X /home/tduffy/dontdiff linux-kernel/dat/api.c linux-kernel2/dat/api.c
tduffy> --- linux-kernel/dat/api.c	2005-05-12 10:08:24.774000000 -0700
tduffy> +++ linux-kernel2/dat/api.c	2005-05-12 11:02:59.847003000 -0700
tduffy> @@ -575,7 +575,7 @@ static u32 dat_strerror_minor(u32 value,
tduffy>   * Function: dat_ia_openv
tduffy>   ***********************************************************************/
tduffy>  
tduffy> -u32 dat_ia_openv(const DAT_NAME_PTR name, int async_event_qlen,
tduffy> +u32 dat_ia_openv(const char *name, int async_event_qlen,
tduffy>  		 DAT_EVD_HANDLE *async_event_handle, DAT_IA_HANDLE *ia_handle,
tduffy>  		 u32 dat_major, u32 dat_minor, boolean_t thread_safety)
tduffy>  {
tduffy> diff -Nurp -X /home/tduffy/dontdiff linux-kernel/dat/dat.h linux-kernel2/dat/dat.h
tduffy> --- linux-kernel/dat/dat.h	2005-05-12 10:25:26.111007000 -0700
tduffy> +++ linux-kernel2/dat/dat.h	2005-05-12 11:14:17.374001000 -0700
tduffy> @@ -37,11 +37,6 @@
tduffy>  #define DAT_VERSION_MINOR 2
tduffy>  #define DAT_THREADSAFE FALSE
tduffy>  
tduffy> -/* unsigned longest native to compiler */
tduffy> -typedef unsigned long long DAT_UVERYLONG;
tduffy> -
tduffy> -typedef u64 DAT_PADDR;
tduffy> -
tduffy>  /*
tduffy>   * All return codes are actually a 3-way tuple:
tduffy>   *
tduffy> @@ -352,7 +347,6 @@ typedef enum dat_handle_type {
tduffy>  	DAT_HANDLE_TYPE_SRQ
tduffy>  } DAT_HANDLE_TYPE;
tduffy>  
tduffy> -typedef char *DAT_NAME_PTR;
tduffy>  #define DAT_NAME_MAX_LENGTH     256
tduffy>  
tduffy>  struct dat_named_attr {
tduffy> @@ -370,7 +364,7 @@ typedef enum {
tduffy>  typedef union dat_context {
tduffy>  	void *as_ptr;
tduffy>  	u64 as_64;
tduffy> -	DAT_UVERYLONG as_index;
tduffy> +	unsigned long long as_index;
tduffy>  } DAT_CONTEXT;
tduffy>  
tduffy>  typedef DAT_CONTEXT DAT_DTO_COOKIE;
tduffy> @@ -983,7 +977,7 @@ typedef union dat_region_description {
tduffy>  	DAT_LMR_HANDLE for_lmr_handle;
tduffy>  	void *for_pointer;	/* For kdapl only */
tduffy>  	void *for_array;	/* For kdapl only */
tduffy> -	DAT_PADDR for_pa;	/* For kdapl only */
tduffy> +	u64 for_pa;		/* For kdapl only */
tduffy>  } DAT_REGION_DESCRIPTION;
tduffy>  
tduffy>  /* LMR Arguments */
tduffy> @@ -1103,179 +1097,176 @@ struct dat_provider_attr {
tduffy>   *
tduffy>   ****************************************************************/
tduffy>  
tduffy> -typedef u32 (*DAT_IA_OPEN_FUNC) (
tduffy> -        const DAT_NAME_PTR, int, DAT_EVD_HANDLE *, DAT_IA_HANDLE *);
tduffy> +typedef u32 (*DAT_IA_OPEN_FUNC)(const char *, int, DAT_EVD_HANDLE *,
tduffy> +				DAT_IA_HANDLE *);
tduffy>  
tduffy> -typedef u32 (*DAT_IA_OPENV_FUNC) (
tduffy> -        const DAT_NAME_PTR, int, DAT_EVD_HANDLE *, DAT_IA_HANDLE *,
tduffy> -        u32, u32, boolean_t);
tduffy> +typedef u32 (*DAT_IA_OPENV_FUNC)(const char *, int, DAT_EVD_HANDLE *,
tduffy> +				 DAT_IA_HANDLE *, u32, u32, boolean_t);
tduffy>  
tduffy> -typedef u32 (*DAT_IA_CLOSE_FUNC) (DAT_IA_HANDLE, DAT_CLOSE_FLAGS);
tduffy> +typedef u32 (*DAT_IA_CLOSE_FUNC)(DAT_IA_HANDLE, DAT_CLOSE_FLAGS);
tduffy>  
tduffy> -typedef u32 (*DAT_IA_QUERY_FUNC) (DAT_IA_HANDLE, DAT_EVD_HANDLE *,
tduffy> -					 struct dat_ia_attr *,
tduffy> -					 struct dat_provider_attr *);
tduffy> +typedef u32 (*DAT_IA_QUERY_FUNC)(DAT_IA_HANDLE, DAT_EVD_HANDLE *,
tduffy> +				 struct dat_ia_attr *,
tduffy> +				 struct dat_provider_attr *);
tduffy>  
tduffy> -typedef u32 (*DAT_SET_CONSUMER_CONTEXT_FUNC) (DAT_HANDLE, DAT_CONTEXT);
tduffy> +typedef u32 (*DAT_SET_CONSUMER_CONTEXT_FUNC)(DAT_HANDLE, DAT_CONTEXT);
tduffy>  
tduffy> -typedef u32 (*DAT_GET_CONSUMER_CONTEXT_FUNC) (DAT_HANDLE, DAT_CONTEXT *);
tduffy> +typedef u32 (*DAT_GET_CONSUMER_CONTEXT_FUNC)(DAT_HANDLE, DAT_CONTEXT *);
tduffy>  
tduffy> -typedef u32 (*DAT_GET_HANDLE_TYPE_FUNC) (DAT_HANDLE, DAT_HANDLE_TYPE *);
tduffy> +typedef u32 (*DAT_GET_HANDLE_TYPE_FUNC)(DAT_HANDLE, DAT_HANDLE_TYPE *);
tduffy>  
tduffy> -typedef u32 (*DAT_CR_QUERY_FUNC) (DAT_CR_HANDLE, struct dat_cr_param *);
tduffy> +typedef u32 (*DAT_CR_QUERY_FUNC)(DAT_CR_HANDLE, struct dat_cr_param *);
tduffy>  
tduffy> -typedef u32 (*DAT_CR_ACCEPT_FUNC) (DAT_CR_HANDLE, DAT_EP_HANDLE, int,
tduffy> -				   const void*);
tduffy> +typedef u32 (*DAT_CR_ACCEPT_FUNC)(DAT_CR_HANDLE, DAT_EP_HANDLE, int,
tduffy> +				  const void*);
tduffy>  
tduffy> -typedef u32 (*DAT_CR_REJECT_FUNC) (DAT_CR_HANDLE);
tduffy> +typedef u32 (*DAT_CR_REJECT_FUNC)(DAT_CR_HANDLE);
tduffy>  
tduffy> -typedef u32 (*DAT_CR_HANDOFF_FUNC) (DAT_CR_HANDLE, DAT_CONN_QUAL);
tduffy> +typedef u32 (*DAT_CR_HANDOFF_FUNC)(DAT_CR_HANDLE, DAT_CONN_QUAL);
tduffy>  
tduffy> -typedef u32 (*DAT_EVD_RESIZE_FUNC) (DAT_EVD_HANDLE, int);
tduffy> +typedef u32 (*DAT_EVD_RESIZE_FUNC)(DAT_EVD_HANDLE, int);
tduffy>  
tduffy> -typedef u32 (*DAT_EVD_POST_SE_FUNC) (DAT_EVD_HANDLE,
tduffy> -					    const struct dat_event *);
tduffy> +typedef u32 (*DAT_EVD_POST_SE_FUNC)(DAT_EVD_HANDLE, const struct dat_event *);
tduffy>  
tduffy> -typedef u32 (*DAT_EVD_DEQUEUE_FUNC) (DAT_EVD_HANDLE, struct dat_event *);
tduffy> +typedef u32 (*DAT_EVD_DEQUEUE_FUNC)(DAT_EVD_HANDLE, struct dat_event *);
tduffy>  
tduffy> -typedef u32 (*DAT_EVD_FREE_FUNC) (DAT_EVD_HANDLE);
tduffy> +typedef u32 (*DAT_EVD_FREE_FUNC)(DAT_EVD_HANDLE);
tduffy>  
tduffy> -typedef u32 (*DAT_EVD_QUERY_FUNC) (DAT_EVD_HANDLE,
tduffy> -					  struct dat_evd_param *);
tduffy> +typedef u32 (*DAT_EVD_QUERY_FUNC)(DAT_EVD_HANDLE, struct dat_evd_param *);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_CREATE_FUNC) (
tduffy> -        DAT_IA_HANDLE, DAT_PZ_HANDLE, DAT_EVD_HANDLE, DAT_EVD_HANDLE, 
tduffy> -        DAT_EVD_HANDLE, const struct dat_ep_attr *, DAT_EP_HANDLE *);
tduffy> +typedef u32 (*DAT_EP_CREATE_FUNC)(DAT_IA_HANDLE, DAT_PZ_HANDLE, DAT_EVD_HANDLE,
tduffy> +				  DAT_EVD_HANDLE, DAT_EVD_HANDLE,
tduffy> +				  const struct dat_ep_attr *, DAT_EP_HANDLE *);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_CREATE_WITH_SRQ_FUNC) (
tduffy> -        DAT_IA_HANDLE, DAT_PZ_HANDLE, DAT_EVD_HANDLE, DAT_EVD_HANDLE,
tduffy> -        DAT_EVD_HANDLE, DAT_SRQ_HANDLE, const struct dat_ep_attr *, DAT_EP_HANDLE *);
tduffy> +typedef u32 (*DAT_EP_CREATE_WITH_SRQ_FUNC)(DAT_IA_HANDLE, DAT_PZ_HANDLE,
tduffy> +					   DAT_EVD_HANDLE, DAT_EVD_HANDLE,
tduffy> +					   DAT_EVD_HANDLE, DAT_SRQ_HANDLE,
tduffy> +					   const struct dat_ep_attr *,
tduffy> +					   DAT_EP_HANDLE *);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_QUERY_FUNC) (DAT_EP_HANDLE, struct dat_ep_param *);
tduffy> +typedef u32 (*DAT_EP_QUERY_FUNC)(DAT_EP_HANDLE, struct dat_ep_param *);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_MODIFY_FUNC) (
tduffy> -        DAT_EP_HANDLE, DAT_EP_PARAM_MASK, const struct dat_ep_param *);
tduffy> +typedef u32 (*DAT_EP_MODIFY_FUNC)(DAT_EP_HANDLE, DAT_EP_PARAM_MASK,
tduffy> +				  const struct dat_ep_param *);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_CONNECT_FUNC) (DAT_EP_HANDLE, DAT_IA_ADDRESS_PTR,
tduffy> -				    DAT_CONN_QUAL, DAT_TIMEOUT, int,
tduffy> -				    const void *, DAT_QOS, DAT_CONNECT_FLAGS);
tduffy> +typedef u32 (*DAT_EP_CONNECT_FUNC)(DAT_EP_HANDLE, DAT_IA_ADDRESS_PTR,
tduffy> +				   DAT_CONN_QUAL, DAT_TIMEOUT, int,
tduffy> +				   const void *, DAT_QOS, DAT_CONNECT_FLAGS);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_DUP_CONNECT_FUNC) (DAT_EP_HANDLE, DAT_EP_HANDLE,
tduffy> -					DAT_TIMEOUT, int, const void *,
tduffy> -					DAT_QOS);
tduffy> +typedef u32 (*DAT_EP_DUP_CONNECT_FUNC)(DAT_EP_HANDLE, DAT_EP_HANDLE,
tduffy> +				       DAT_TIMEOUT, int, const void *, DAT_QOS);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_DISCONNECT_FUNC) (DAT_EP_HANDLE, DAT_CLOSE_FLAGS);
tduffy> +typedef u32 (*DAT_EP_DISCONNECT_FUNC)(DAT_EP_HANDLE, DAT_CLOSE_FLAGS);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_POST_SEND_FUNC) (
tduffy> -        DAT_EP_HANDLE, int, struct dat_lmr_triplet *, DAT_DTO_COOKIE, 
tduffy> -        DAT_COMPLETION_FLAGS);
tduffy> +typedef u32 (*DAT_EP_POST_SEND_FUNC)(DAT_EP_HANDLE, int,
tduffy> +				     struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> +				     DAT_COMPLETION_FLAGS);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_POST_RECV_FUNC) (
tduffy> -        DAT_EP_HANDLE, int, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> -        DAT_COMPLETION_FLAGS);
tduffy> +typedef u32 (*DAT_EP_POST_RECV_FUNC)(DAT_EP_HANDLE, int,
tduffy> +				     struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> +				     DAT_COMPLETION_FLAGS);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_POST_RDMA_READ_FUNC) (
tduffy> -        DAT_EP_HANDLE, int, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> -        const struct dat_rmr_triplet *, DAT_COMPLETION_FLAGS);
tduffy> +typedef u32 (*DAT_EP_POST_RDMA_READ_FUNC)(DAT_EP_HANDLE, int,
tduffy> +					  struct dat_lmr_triplet *,
tduffy> +					  DAT_DTO_COOKIE,
tduffy> +					  const struct dat_rmr_triplet *,
tduffy> +					  DAT_COMPLETION_FLAGS);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_POST_RDMA_WRITE_FUNC) (
tduffy> -        DAT_EP_HANDLE, int, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
tduffy> -        const struct dat_rmr_triplet *, DAT_COMPLETION_FLAGS);
tduffy> +typedef u32 (*DAT_EP_POST_RDMA_WRITE_FUNC)(DAT_EP_HANDLE, int,
tduffy> +					   struct dat_lmr_triplet *,
tduffy> +					   DAT_DTO_COOKIE,
tduffy> +					   const struct dat_rmr_triplet *,
tduffy> +					   DAT_COMPLETION_FLAGS);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_GET_STATUS_FUNC) (
tduffy> -        DAT_EP_HANDLE, DAT_EP_STATE *, boolean_t *, boolean_t *);
tduffy> +typedef u32 (*DAT_EP_GET_STATUS_FUNC)(DAT_EP_HANDLE, DAT_EP_STATE *,
tduffy> +				      boolean_t *, boolean_t *);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_FREE_FUNC) (DAT_EP_HANDLE);
tduffy> +typedef u32 (*DAT_EP_FREE_FUNC)(DAT_EP_HANDLE);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_RESET_FUNC) (DAT_EP_HANDLE);
tduffy> +typedef u32 (*DAT_EP_RESET_FUNC)(DAT_EP_HANDLE);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_RECV_QUERY_FUNC) (
tduffy> -        DAT_EP_HANDLE, int *, int *);
tduffy> +typedef u32 (*DAT_EP_RECV_QUERY_FUNC)(DAT_EP_HANDLE, int *, int *);
tduffy>  
tduffy> -typedef u32 (*DAT_EP_SET_WATERMARK_FUNC) (
tduffy> -        DAT_EP_HANDLE, int, int);
tduffy> +typedef u32 (*DAT_EP_SET_WATERMARK_FUNC)(DAT_EP_HANDLE, int, int);
tduffy>  
tduffy> -typedef u32 (*DAT_LMR_FREE_FUNC) (DAT_LMR_HANDLE);
tduffy> +typedef u32 (*DAT_LMR_FREE_FUNC)(DAT_LMR_HANDLE);
tduffy>  
tduffy> -typedef u32 (*DAT_LMR_QUERY_FUNC) (DAT_LMR_HANDLE,
tduffy> -					  struct dat_lmr_param *);
tduffy> +typedef u32 (*DAT_LMR_QUERY_FUNC)(DAT_LMR_HANDLE, struct dat_lmr_param *);
tduffy>  
tduffy> -typedef u32 (*DAT_LMR_SYNC_RDMA_READ_FUNC) (
tduffy> -        DAT_IA_HANDLE, const struct dat_lmr_triplet *, DAT_VLEN);
tduffy> +typedef u32 (*DAT_LMR_SYNC_RDMA_READ_FUNC)(DAT_IA_HANDLE,
tduffy> +					   const struct dat_lmr_triplet *,
tduffy> +					   DAT_VLEN);
tduffy>  
tduffy> -typedef u32 (*DAT_LMR_SYNC_RDMA_WRITE_FUNC) (
tduffy> -        DAT_IA_HANDLE, const struct dat_lmr_triplet *, DAT_VLEN);
tduffy> +typedef u32 (*DAT_LMR_SYNC_RDMA_WRITE_FUNC)(DAT_IA_HANDLE,
tduffy> +					    const struct dat_lmr_triplet *,
tduffy> +					    DAT_VLEN);
tduffy>  
tduffy> -typedef u32 (*DAT_RMR_CREATE_FUNC) (DAT_PZ_HANDLE, DAT_RMR_HANDLE *);
tduffy> +typedef u32 (*DAT_RMR_CREATE_FUNC)(DAT_PZ_HANDLE, DAT_RMR_HANDLE *);
tduffy>  
tduffy> -typedef u32 (*DAT_RMR_QUERY_FUNC) (DAT_RMR_HANDLE, struct dat_rmr_param *);
tduffy> +typedef u32 (*DAT_RMR_QUERY_FUNC)(DAT_RMR_HANDLE, struct dat_rmr_param *);
tduffy>  
tduffy> -typedef u32 (*DAT_RMR_BIND_FUNC) (
tduffy> -        DAT_RMR_HANDLE, const struct dat_lmr_triplet *, DAT_MEM_PRIV_FLAGS,
tduffy> -        DAT_EP_HANDLE, DAT_RMR_COOKIE, DAT_COMPLETION_FLAGS, DAT_RMR_CONTEXT *);
tduffy> +typedef u32 (*DAT_RMR_BIND_FUNC)(DAT_RMR_HANDLE, const struct dat_lmr_triplet *,
tduffy> +				 DAT_MEM_PRIV_FLAGS, DAT_EP_HANDLE,
tduffy> +				 DAT_RMR_COOKIE, DAT_COMPLETION_FLAGS,
tduffy> +				 DAT_RMR_CONTEXT *);
tduffy>  
tduffy> -typedef u32 (*DAT_RMR_FREE_FUNC) (DAT_RMR_HANDLE);
tduffy> +typedef u32 (*DAT_RMR_FREE_FUNC)(DAT_RMR_HANDLE);
tduffy>  
tduffy> -typedef u32 (*DAT_PSP_CREATE_FUNC) (
tduffy> -        DAT_IA_HANDLE, DAT_CONN_QUAL, DAT_EVD_HANDLE, DAT_PSP_FLAGS, 
tduffy> -        DAT_PSP_HANDLE *);
tduffy> +typedef u32 (*DAT_PSP_CREATE_FUNC)(DAT_IA_HANDLE, DAT_CONN_QUAL, DAT_EVD_HANDLE,
tduffy> +				   DAT_PSP_FLAGS, DAT_PSP_HANDLE *);
tduffy>  
tduffy> -typedef u32 (*DAT_PSP_CREATE_ANY_FUNC) (
tduffy> -        DAT_IA_HANDLE, DAT_CONN_QUAL *, DAT_EVD_HANDLE, DAT_PSP_FLAGS,
tduffy> -        DAT_PSP_HANDLE *);
tduffy> +typedef u32 (*DAT_PSP_CREATE_ANY_FUNC)(DAT_IA_HANDLE, DAT_CONN_QUAL *,
tduffy> +				       DAT_EVD_HANDLE, DAT_PSP_FLAGS,
tduffy> +				       DAT_PSP_HANDLE *);
tduffy>  
tduffy> -typedef u32 (*DAT_PSP_QUERY_FUNC) (DAT_PSP_HANDLE,
tduffy> -					  struct dat_psp_param *);
tduffy> +typedef u32 (*DAT_PSP_QUERY_FUNC)(DAT_PSP_HANDLE, struct dat_psp_param *);
tduffy>  
tduffy> -typedef u32 (*DAT_PSP_FREE_FUNC) (DAT_PSP_HANDLE);
tduffy> +typedef u32 (*DAT_PSP_FREE_FUNC)(DAT_PSP_HANDLE);
tduffy>  
tduffy> -typedef u32 (*DAT_RSP_CREATE_FUNC) (
tduffy> -        DAT_IA_HANDLE, DAT_CONN_QUAL, DAT_EP_HANDLE, DAT_EVD_HANDLE, 
tduffy> -        DAT_RSP_HANDLE *);
tduffy> +typedef u32 (*DAT_RSP_CREATE_FUNC)(DAT_IA_HANDLE, DAT_CONN_QUAL, DAT_EP_HANDLE,
tduffy> +				   DAT_EVD_HANDLE, DAT_RSP_HANDLE *);
tduffy>  
tduffy> -typedef u32 (*DAT_RSP_QUERY_FUNC) (DAT_RSP_HANDLE,
tduffy> -					  struct dat_rsp_param *);
tduffy> +typedef u32 (*DAT_RSP_QUERY_FUNC)(DAT_RSP_HANDLE, struct dat_rsp_param *);
tduffy>  
tduffy> -typedef u32 (*DAT_RSP_FREE_FUNC) (DAT_RSP_HANDLE);
tduffy> +typedef u32 (*DAT_RSP_FREE_FUNC)(DAT_RSP_HANDLE);
tduffy>  
tduffy> -typedef u32 (*DAT_PZ_CREATE_FUNC) (DAT_IA_HANDLE, DAT_PZ_HANDLE *);
tduffy> +typedef u32 (*DAT_PZ_CREATE_FUNC)(DAT_IA_HANDLE, DAT_PZ_HANDLE *);
tduffy>  
tduffy> -typedef u32 (*DAT_PZ_QUERY_FUNC) (DAT_PZ_HANDLE, struct dat_pz_param *);
tduffy> +typedef u32 (*DAT_PZ_QUERY_FUNC)(DAT_PZ_HANDLE, struct dat_pz_param *);
tduffy>  
tduffy> -typedef u32 (*DAT_PZ_FREE_FUNC) (DAT_PZ_HANDLE);
tduffy> +typedef u32 (*DAT_PZ_FREE_FUNC)(DAT_PZ_HANDLE);
tduffy>  
tduffy> -typedef u32 (*DAT_SRQ_CREATE_FUNC) (
tduffy> -        DAT_IA_HANDLE, DAT_PZ_HANDLE, struct dat_srq_attr *, DAT_SRQ_HANDLE *);
tduffy> +typedef u32 (*DAT_SRQ_CREATE_FUNC)(DAT_IA_HANDLE, DAT_PZ_HANDLE,
tduffy> +				   struct dat_srq_attr *, DAT_SRQ_HANDLE *);
tduffy>  
tduffy> -typedef u32 (*DAT_SRQ_SET_LW_FUNC) (DAT_SRQ_HANDLE, int);
tduffy> +typedef u32 (*DAT_SRQ_SET_LW_FUNC)(DAT_SRQ_HANDLE, int);
tduffy>  
tduffy> -typedef u32 (*DAT_SRQ_FREE_FUNC) (DAT_SRQ_HANDLE);
tduffy> +typedef u32 (*DAT_SRQ_FREE_FUNC)(DAT_SRQ_HANDLE);
tduffy>  
tduffy> -typedef u32 (*DAT_SRQ_QUERY_FUNC) (DAT_SRQ_HANDLE,
tduffy> -					  struct dat_srq_param *);
tduffy> +typedef u32 (*DAT_SRQ_QUERY_FUNC)(DAT_SRQ_HANDLE, struct dat_srq_param *);
tduffy>  
tduffy> -typedef u32 (*DAT_SRQ_RESIZE_FUNC) (DAT_SRQ_HANDLE, int);
tduffy> +typedef u32 (*DAT_SRQ_RESIZE_FUNC)(DAT_SRQ_HANDLE, int);
tduffy>  
tduffy> -typedef u32 (*DAT_SRQ_POST_RECV_FUNC) (
tduffy> -        DAT_SRQ_HANDLE, int, struct dat_lmr_triplet *, DAT_DTO_COOKIE);
tduffy> +typedef u32 (*DAT_SRQ_POST_RECV_FUNC)(DAT_SRQ_HANDLE, int,
tduffy> +				      struct dat_lmr_triplet *, DAT_DTO_COOKIE);
tduffy>  
tduffy> -typedef u32 (*DAT_LMR_KCREATE_FUNC) (
tduffy> -        DAT_IA_HANDLE, DAT_MEM_TYPE, DAT_REGION_DESCRIPTION, DAT_VLEN,
tduffy> -        DAT_PZ_HANDLE, DAT_MEM_PRIV_FLAGS, DAT_MEM_OPTIMIZE_FLAGS,
tduffy> -        DAT_LMR_HANDLE *, DAT_LMR_CONTEXT *, DAT_RMR_CONTEXT *, DAT_VLEN *,
tduffy> -        DAT_VADDR *);
tduffy> +typedef u32 (*DAT_LMR_KCREATE_FUNC)(DAT_IA_HANDLE, DAT_MEM_TYPE,
tduffy> +				    DAT_REGION_DESCRIPTION, DAT_VLEN,
tduffy> +				    DAT_PZ_HANDLE, DAT_MEM_PRIV_FLAGS,
tduffy> +				    DAT_MEM_OPTIMIZE_FLAGS, DAT_LMR_HANDLE *,
tduffy> +				    DAT_LMR_CONTEXT *, DAT_RMR_CONTEXT *,
tduffy> +				    DAT_VLEN *, DAT_VADDR *);
tduffy>  
tduffy> -typedef u32 (*DAT_IA_MEMTYPE_HINT_FUNC) (
tduffy> -        DAT_IA_HANDLE, DAT_MEM_TYPE, DAT_VLEN, DAT_MEM_OPTIMIZE_FLAGS,
tduffy> -        DAT_VLEN *, DAT_VADDR *);
tduffy> +typedef u32 (*DAT_IA_MEMTYPE_HINT_FUNC)(DAT_IA_HANDLE, DAT_MEM_TYPE, DAT_VLEN,
tduffy> +					DAT_MEM_OPTIMIZE_FLAGS, DAT_VLEN *,
tduffy> +					DAT_VADDR *);
tduffy>  
tduffy> -typedef u32 (*DAT_EVD_KCREATE_FUNC) (
tduffy> -        DAT_IA_HANDLE, int, DAT_UPCALL_POLICY,
tduffy> -	const struct dat_upcall_object *,
tduffy> -        DAT_EVD_FLAGS, DAT_EVD_HANDLE *);
tduffy> +typedef u32 (*DAT_EVD_KCREATE_FUNC) (DAT_IA_HANDLE, int, DAT_UPCALL_POLICY,
tduffy> +				     const struct dat_upcall_object *,
tduffy> +				     DAT_EVD_FLAGS, DAT_EVD_HANDLE *);
tduffy>  
tduffy> -typedef u32 (*DAT_EVD_MODIFY_UPCALL_FUNC) (
tduffy> -        DAT_EVD_HANDLE, DAT_UPCALL_POLICY, const struct dat_upcall_object *);
tduffy> +typedef u32 (*DAT_EVD_MODIFY_UPCALL_FUNC)(DAT_EVD_HANDLE, DAT_UPCALL_POLICY,
tduffy> +					  const struct dat_upcall_object *);
tduffy>  
tduffy>  struct dat_provider {
tduffy>  	const char *device_name;
tduffy> @@ -1377,7 +1368,7 @@ extern u32 dat_registry_remove_provider(
tduffy>  /*
tduffy>   * DAT registry functions for consumers
tduffy>   */
tduffy> -extern u32 dat_ia_openv(const DAT_NAME_PTR name, int async_event_qlen,
tduffy> +extern u32 dat_ia_openv(const char *name, int async_event_qlen,
tduffy>  			DAT_EVD_HANDLE *async_event_handle,
tduffy>  			DAT_IA_HANDLE *ia_handle, u32 dat_major, u32 dat_minor,
tduffy>  			boolean_t thread_safety);
tduffy> diff -Nurp -X /home/tduffy/dontdiff linux-kernel/dat-provider/dapl.h linux-kernel2/dat-provider/dapl.h
tduffy> --- linux-kernel/dat-provider/dapl.h	2005-05-12 10:06:07.536001000 -0700
tduffy> +++ linux-kernel2/dat-provider/dapl.h	2005-05-12 11:02:59.834000000 -0700
tduffy> @@ -474,7 +474,7 @@ typedef char DAPL_HCA_NAME[DAPL_HCA_NAME
tduffy>   * DAT API functions
tduffy>   */
tduffy>  
tduffy> -extern u32 dapl_ia_open(const DAT_NAME_PTR name, int async_evd_qlen,
tduffy> +extern u32 dapl_ia_open(const char *name, int async_evd_qlen,
tduffy>  			DAT_EVD_HANDLE *async_evd_handle_ptr,
tduffy>  			DAT_IA_HANDLE *ia_handle_ptr);
tduffy>  
tduffy> diff -Nurp -X /home/tduffy/dontdiff linux-kernel/dat-provider/dapl_ia_open.c linux-kernel2/dat-provider/dapl_ia_open.c
tduffy> --- linux-kernel/dat-provider/dapl_ia_open.c	2005-05-12 09:34:59.157003000 -0700
tduffy> +++ linux-kernel2/dat-provider/dapl_ia_open.c	2005-05-12 11:02:59.837003000 -0700
tduffy> @@ -51,7 +51,7 @@
tduffy>   * That function maps the DAT_NAME parameter of dat_ia_open to a DAT_PROVIDER,
tduffy>   * and calls this function.
tduffy>   */
tduffy> -u32 dapl_ia_open(const DAT_NAME_PTR name, int async_evd_qlen,
tduffy> +u32 dapl_ia_open(const char *name, int async_evd_qlen,
tduffy>  		 DAT_EVD_HANDLE *async_evd_handle_ptr,
tduffy>  		 DAT_IA_HANDLE *ia_handle_ptr)
tduffy>  {
tduffy> diff -Nurp -X /home/tduffy/dontdiff linux-kernel/test/dapltest/cmd/dapl_netaddr.c linux-kernel2/test/dapltest/cmd/dapl_netaddr.c
tduffy> --- linux-kernel/test/dapltest/cmd/dapl_netaddr.c	2005-05-11 08:53:17.661015000 -0700
tduffy> +++ linux-kernel2/test/dapltest/cmd/dapl_netaddr.c	2005-05-12 11:02:59.874000000 -0700
tduffy> @@ -50,7 +50,7 @@ DT_NetAddrFree (Per_Test_Data_t * pt_ptr
tduffy>  
tduffy>  boolean_t
tduffy>  DT_NetAddrLookupHostAddress (DAT_IA_ADDRESS_PTR	to_netaddr,
tduffy> -			    DAT_NAME_PTR 	hostname)
tduffy> +			    char *	hostname)
tduffy>  {
tduffy>      struct addrinfo *target;
tduffy>      int rval;
tduffy> diff -Nurp -X /home/tduffy/dontdiff linux-kernel/test/dapltest/include/dapl_proto.h linux-kernel2/test/dapltest/include/dapl_proto.h
tduffy> --- linux-kernel/test/dapltest/include/dapl_proto.h	2005-05-12 09:34:59.322003000 -0700
tduffy> +++ linux-kernel2/test/dapltest/include/dapl_proto.h	2005-05-12 11:02:59.881011000 -0700
tduffy> @@ -604,7 +604,7 @@ void	    DT_assert_fail (DT_Tdep_Print_H
tduffy>  			    char *file, 
tduffy>  			    char *baseFile, 
tduffy>  			    int line);
tduffy> -int	    DT_ia_open (DAT_NAME_PTR dev_name, DAT_IA_HANDLE *ia_handle);
tduffy> +int	    DT_ia_open (char *dev_name, DAT_IA_HANDLE *ia_handle);
tduffy>  int	    DT_ep_create (Params_t *params_ptr,
tduffy>  			  DAT_IA_HANDLE ia_handle, 
tduffy>  			  DAT_PZ_HANDLE pz_handle,
tduffy> diff -Nurp -X /home/tduffy/dontdiff linux-kernel/test/dapltest/test/dapl_fft_endpoint.c linux-kernel2/test/dapltest/test/dapl_fft_endpoint.c
tduffy> --- linux-kernel/test/dapltest/test/dapl_fft_endpoint.c	2005-05-12 09:28:43.503023000 -0700
tduffy> +++ linux-kernel2/test/dapltest/test/dapl_fft_endpoint.c	2005-05-12 11:03:25.510004000 -0700
tduffy> @@ -59,7 +59,7 @@ int DT_endpoint_generic (Params_t *param
tduffy>      evd_handle = DAT_HANDLE_NULL;
tduffy>      phead = params_ptr->phead;
tduffy>  
tduffy> -    rc = dat_ia_open ((const DAT_NAME_PTR)dev_name,
tduffy> +    rc = dat_ia_open ((const char *)dev_name,
tduffy>  	    DEFAULT_QUEUE_LEN, &evd_handle, &ia_handle);
tduffy>      DT_assert_dat (phead, rc == DAT_SUCCESS);
tduffy>  
tduffy> diff -Nurp -X /home/tduffy/dontdiff linux-kernel/test/dapltest/test/dapl_fft_hwconn.c linux-kernel2/test/dapltest/test/dapl_fft_hwconn.c
tduffy> --- linux-kernel/test/dapltest/test/dapl_fft_hwconn.c	2005-05-12 09:28:43.633078000 -0700
tduffy> +++ linux-kernel2/test/dapltest/test/dapl_fft_hwconn.c	2005-05-12 11:03:25.515001000 -0700
tduffy> @@ -45,7 +45,7 @@ int DT_hwconn_case0 ( Params_t *params_p
tduffy>      nic_handle = NULL;
tduffy>      evd_handle = DAT_HANDLE_NULL;
tduffy>  
tduffy> -    rc=dat_ia_open ((const DAT_NAME_PTR)dev_name, 10, &evd_handle, &nic_handle);
tduffy> +    rc=dat_ia_open ((const char *)dev_name, 10, &evd_handle, &nic_handle);
tduffy>      DT_assert_dat (phead, rc == DAT_SUCCESS);
tduffy>  
tduffy>      rc=dat_ia_close (nic_handle, DAT_CLOSE_ABRUPT_FLAG);
tduffy> @@ -95,7 +95,7 @@ int DT_hwconn_case1 ( Params_t *params_p
tduffy>  	}
tduffy>  
tduffy>  	evd_handle = DAT_HANDLE_NULL;
tduffy> -	rc=dat_ia_open ((const DAT_NAME_PTR)dev_name, 10, &evd_handle, &nic_handle);
tduffy> +	rc=dat_ia_open ((const char *)dev_name, 10, &evd_handle, &nic_handle);
tduffy>  	if (DAT_GET_TYPE (rc) != DAT_PROVIDER_NOT_FOUND)
tduffy>  	{
tduffy>  	    const char *major_msg, *minor_msg;
tduffy> diff -Nurp -X /home/tduffy/dontdiff linux-kernel/test/dapltest/test/dapl_fft_queryinfo.c linux-kernel2/test/dapltest/test/dapl_fft_queryinfo.c
tduffy> --- linux-kernel/test/dapltest/test/dapl_fft_queryinfo.c	2005-05-12 09:28:43.523022000 -0700
tduffy> +++ linux-kernel2/test/dapltest/test/dapl_fft_queryinfo.c	2005-05-12 11:03:25.523003000 -0700
tduffy> @@ -94,7 +94,7 @@ int DT_queryinfo_basic (Params_t *params
tduffy>      dev_name = cmd->device_name;
tduffy>  
tduffy>      /* All functions require an ia_handle to be created */
tduffy> -    rc = dat_ia_open ((const DAT_NAME_PTR)dev_name,
tduffy> +    rc = dat_ia_open ((const char *)dev_name,
tduffy>  		       DEFAULT_QUEUE_LEN,
tduffy>  		       &evd_handle,
tduffy>  		       &ia_handle);
tduffy> diff -Nurp -X /home/tduffy/dontdiff linux-kernel/test/dapltest/test/dapl_fft_util.c linux-kernel2/test/dapltest/test/dapl_fft_util.c
tduffy> --- linux-kernel/test/dapltest/test/dapl_fft_util.c	2005-05-12 09:28:43.375003000 -0700
tduffy> +++ linux-kernel2/test/dapltest/test/dapl_fft_util.c	2005-05-12 11:02:59.887005000 -0700
tduffy> @@ -55,7 +55,7 @@ void DT_assert_fail (DT_Tdep_Print_Head 
tduffy>  }
tduffy>  
tduffy>  /* helper function to open an IA */
tduffy> -int DT_ia_open (DAT_NAME_PTR dev_name, DAT_IA_HANDLE *ia_handle)
tduffy> +int DT_ia_open (char *dev_name, DAT_IA_HANDLE *ia_handle)
tduffy>  {
tduffy>      DAT_EVD_HANDLE evd_handle;
tduffy>      evd_handle = DAT_HANDLE_NULL;
tduffy> 



More information about the general mailing list