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