[openib-general] [PATCH] kDAPL: remove typedef DAT_PVOID
Tom Duffy
tduffy at sun.com
Wed May 11 16:47:10 PDT 2005
Remove DAT_PVOID. Use void * instead.
Singed-off-by: Tom Duffy <tduffy at sun.com>
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/dat/dat.h linux-kernel3/dat/dat.h
--- linux-kernel2/dat/dat.h 2005-05-11 13:07:34.341014000 -0700
+++ linux-kernel3/dat/dat.h 2005-05-11 16:40:16.555002000 -0700
@@ -40,7 +40,6 @@
/* unsigned longest native to compiler */
typedef unsigned long long DAT_UVERYLONG;
-typedef void * DAT_PVOID;
typedef int DAT_COUNT;
typedef u64 DAT_PADDR;
@@ -370,7 +369,7 @@ typedef enum {
} boolean_t;
typedef union dat_context {
- DAT_PVOID as_ptr;
+ void *as_ptr;
u64 as_64;
DAT_UVERYLONG as_index;
} DAT_CONTEXT;
@@ -402,7 +401,7 @@ typedef u32 DAT_TIMEOUT; /* microseconds
#define DAT_TIMEOUT_INFINITE ((DAT_TIMEOUT) ~0)
/* dat handles */
-typedef DAT_PVOID DAT_HANDLE;
+typedef void *DAT_HANDLE;
typedef DAT_HANDLE DAT_CR_HANDLE;
typedef DAT_HANDLE DAT_EP_HANDLE;
typedef DAT_HANDLE DAT_EVD_HANDLE;
@@ -469,7 +468,7 @@ typedef enum dat_psp_flags {
* Memory Buffers
*
* Both LMR and RMR triplets specify 64-bit addresses in the local host's byte
- * order, even when that exceeds the size of a DAT_PVOID for the host
+ * order, even when that exceeds the size of a void *for the host
* architecture.
*/
@@ -729,7 +728,8 @@ struct dat_cr_param {
/* Pointer to the Private Data passed by remote side in the Connection
* Request.
*/
- DAT_PVOID private_data;
+ void *private_data;
+
/* The local Endpoint provided by the Service Point for the requested
* connection. It is the only Endpoint that can accept a Connection
* Request on this Service Point. The value DAT_HANDLE_NULL
@@ -821,7 +821,7 @@ struct dat_cr_arrival_event_data {
struct dat_connection_event_data {
DAT_EP_HANDLE ep_handle;
DAT_COUNT private_data_size;
- DAT_PVOID private_data;
+ void *private_data;
};
/* Async Error event data */
@@ -876,7 +876,7 @@ typedef enum pz_async_error_reason {
/* Software event data */
struct dat_software_event_data {
- DAT_PVOID pointer;
+ void *pointer;
};
typedef enum dat_event_number {
@@ -929,18 +929,17 @@ typedef enum dat_upcall_policy {
/* UpCalls return */
} DAT_UPCALL_POLICY;
-typedef void (*DAT_UPCALL_FUNC) (DAT_PVOID, const struct dat_event *,
- boolean_t);
+typedef void (*DAT_UPCALL_FUNC) (void *, const struct dat_event *, boolean_t);
struct dat_upcall_object {
- DAT_PVOID instance_data;
+ void *instance_data;
DAT_UPCALL_FUNC upcall_func;
};
/* Define NULL upcall */
#define DAT_UPCALL_NULL \
- ((struct dat_upcall_object) { (DAT_PVOID) NULL, (DAT_UPCALL_FUNC) NULL })
+ ((struct dat_upcall_object) { (void *) NULL, (DAT_UPCALL_FUNC) NULL })
#define DAT_UPCALL_SAME ((struct dat_upcall_object *) NULL)
@@ -981,7 +980,7 @@ typedef enum dat_mem_optimize_flags {
} DAT_MEM_OPTIMIZE_FLAGS;
typedef union dat_region_description {
- DAT_PVOID for_va;
+ void *for_va;
DAT_LMR_HANDLE for_lmr_handle;
void *for_pointer; /* For kdapl only */
void *for_array; /* For kdapl only */
@@ -1126,8 +1125,8 @@ typedef u32 (*DAT_GET_HANDLE_TYPE_FUNC)
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, DAT_COUNT, const DAT_PVOID);
+typedef u32 (*DAT_CR_ACCEPT_FUNC) (DAT_CR_HANDLE, DAT_EP_HANDLE, DAT_COUNT,
+ const void*);
typedef u32 (*DAT_CR_REJECT_FUNC) (DAT_CR_HANDLE);
@@ -1158,13 +1157,13 @@ typedef u32 (*DAT_EP_QUERY_FUNC) (DAT_EP
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, DAT_COUNT,
- const DAT_PVOID, DAT_QOS, DAT_CONNECT_FLAGS);
-
-typedef u32 (*DAT_EP_DUP_CONNECT_FUNC) (
- DAT_EP_HANDLE, DAT_EP_HANDLE, DAT_TIMEOUT, DAT_COUNT, const DAT_PVOID,
- DAT_QOS);
+typedef u32 (*DAT_EP_CONNECT_FUNC) (DAT_EP_HANDLE, DAT_IA_ADDRESS_PTR,
+ DAT_CONN_QUAL, DAT_TIMEOUT, DAT_COUNT,
+ const void *, DAT_QOS, DAT_CONNECT_FLAGS);
+
+typedef u32 (*DAT_EP_DUP_CONNECT_FUNC) (DAT_EP_HANDLE, DAT_EP_HANDLE,
+ DAT_TIMEOUT, DAT_COUNT, const void *,
+ DAT_QOS);
typedef u32 (*DAT_EP_DISCONNECT_FUNC) (DAT_EP_HANDLE, DAT_CLOSE_FLAGS);
@@ -1281,7 +1280,7 @@ typedef u32 (*DAT_EVD_MODIFY_UPCALL_FUNC
struct dat_provider {
const char *device_name;
- DAT_PVOID extension;
+ void *extension;
DAT_IA_OPEN_FUNC ia_open_func;
DAT_IA_QUERY_FUNC ia_query_func;
@@ -1447,7 +1446,7 @@ static inline u32 dat_ia_query(DAT_IA_HA
static inline u32 dat_cr_accept(DAT_CR_HANDLE cr,
DAT_EP_HANDLE ep,
DAT_COUNT private_data_size,
- const DAT_PVOID private_data)
+ const void *private_data)
{
return DAT_CALL_PROVIDER_FUNC(
cr_accept_func, cr, ep, private_data_size, private_data);
@@ -1522,7 +1521,7 @@ static inline u32 dat_ep_connect(DAT_EP_
DAT_CONN_QUAL conn_qual,
DAT_TIMEOUT timeout,
DAT_COUNT private_data_size,
- const DAT_PVOID private_data,
+ const void *private_data,
DAT_QOS qos,
DAT_CONNECT_FLAGS flags)
{
@@ -1567,7 +1566,7 @@ static inline u32 dat_ep_dup_connect(DAT
DAT_EP_HANDLE dup_ep,
DAT_TIMEOUT timeout,
DAT_COUNT private_data_size,
- const DAT_PVOID private_data,
+ const void *private_data,
DAT_QOS qos)
{
return DAT_CALL_PROVIDER_FUNC(ep_dup_connect_func, ep, dup_ep, timeout,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_adapter_util.h linux-kernel3/dat-provider/dapl_adapter_util.h
--- linux-kernel2/dat-provider/dapl_adapter_util.h 2005-05-11 11:37:05.389975000 -0700
+++ linux-kernel3/dat-provider/dapl_adapter_util.h 2005-05-11 16:11:16.507003000 -0700
@@ -69,7 +69,7 @@ u32 dapl_ib_qp_modify(DAPL_IA *ia_ptr, D
u32 dapl_ib_connect(DAT_EP_HANDLE ep_handle,
DAT_IA_ADDRESS_PTR remote_ia_address,
DAT_CONN_QUAL remote_conn_qual,
- DAT_COUNT private_data_size, DAT_PVOID private_data);
+ DAT_COUNT private_data_size, void *private_data);
u32 dapl_ib_disconnect(DAPL_EP *ep_ptr, DAT_CLOSE_FLAGS close_flags);
@@ -81,7 +81,7 @@ u32 dapl_ib_remove_conn_listener(DAPL_IA
u32 dapl_ib_accept_connection(DAT_CR_HANDLE cr_handle,
DAT_EP_HANDLE ep_handle,
DAT_COUNT private_data_size,
- const DAT_PVOID private_data);
+ const void *private_data);
u32 dapl_ib_reject_connection(ib_cm_handle_t cm_handle, int reject_reason);
@@ -102,11 +102,11 @@ u32 dapl_ib_pd_alloc(DAPL_IA *ia_ptr, DA
u32 dapl_ib_pd_free(DAPL_PZ *pz);
-u32 dapl_ib_mr_register(DAPL_IA *ia_ptr, DAPL_LMR *lmr, DAT_PVOID virt_addr,
+u32 dapl_ib_mr_register(DAPL_IA *ia_ptr, DAPL_LMR *lmr, void *virt_addr,
DAT_VLEN length, DAT_MEM_PRIV_FLAGS privileges);
u32 dapl_ib_mr_register_physical(DAPL_IA *ia_ptr, DAPL_LMR *lmr,
- DAT_PVOID phys_addr, DAT_VLEN length,
+ void *phys_addr, DAT_VLEN length,
DAT_MEM_PRIV_FLAGS privileges);
u32 dapl_ib_mr_deregister(DAPL_LMR *lmr);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_cr_accept.c linux-kernel3/dat-provider/dapl_cr_accept.c
--- linux-kernel2/dat-provider/dapl_cr_accept.c 2005-05-11 11:42:47.385963000 -0700
+++ linux-kernel3/dat-provider/dapl_cr_accept.c 2005-05-11 16:11:16.512006000 -0700
@@ -40,7 +40,7 @@
* and passive side (local endpoint).
*/
u32 dapl_cr_accept(DAT_CR_HANDLE cr_handle, DAT_EP_HANDLE ep_handle,
- DAT_COUNT private_data_size, const DAT_PVOID private_data)
+ DAT_COUNT private_data_size, const void *private_data)
{
DAPL_EP *ep_ptr;
u32 dat_status;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_ep_connect.c linux-kernel3/dat-provider/dapl_ep_connect.c
--- linux-kernel2/dat-provider/dapl_ep_connect.c 2005-05-11 11:58:33.206963000 -0700
+++ linux-kernel3/dat-provider/dapl_ep_connect.c 2005-05-11 16:11:16.516003000 -0700
@@ -45,7 +45,7 @@
u32 dapl_ep_connect(DAT_EP_HANDLE ep_handle,
DAT_IA_ADDRESS_PTR remote_ia_address,
DAT_CONN_QUAL remote_conn_qual, DAT_TIMEOUT timeout,
- DAT_COUNT private_data_size, const DAT_PVOID private_data,
+ DAT_COUNT private_data_size, const void *private_data,
DAT_QOS qos, DAT_CONNECT_FLAGS connect_flags)
{
DAPL_EP *ep_ptr;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_ep_dup_connect.c linux-kernel3/dat-provider/dapl_ep_dup_connect.c
--- linux-kernel2/dat-provider/dapl_ep_dup_connect.c 2005-05-11 12:00:47.734963000 -0700
+++ linux-kernel3/dat-provider/dapl_ep_dup_connect.c 2005-05-11 16:11:16.519006000 -0700
@@ -71,7 +71,7 @@
*/
u32 dapl_ep_dup_connect(DAT_EP_HANDLE ep_handle, DAT_EP_HANDLE ep_dup_handle,
DAT_TIMEOUT timeout, DAT_COUNT private_data_size,
- const DAT_PVOID private_data, DAT_QOS qos)
+ const void *private_data, DAT_QOS qos)
{
DAPL_EP *ep_dup_ptr;
u32 dat_status;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_evd_util.c linux-kernel3/dat-provider/dapl_evd_util.c
--- linux-kernel2/dat-provider/dapl_evd_util.c 2005-05-11 12:18:40.507003000 -0700
+++ linux-kernel3/dat-provider/dapl_evd_util.c 2005-05-11 16:11:16.526002000 -0700
@@ -540,7 +540,7 @@ u32 dapl_evd_post_connection_event(DAPL_
DAT_EVENT_NUMBER event_number,
DAT_EP_HANDLE ep_handle,
DAT_COUNT private_data_size,
- DAT_PVOID private_data)
+ void *private_data)
{
struct dat_event *event_ptr;
event_ptr = dapl_evd_get_and_init_event(evd_ptr, event_number);
@@ -592,7 +592,7 @@ u32 dapl_evd_post_async_error_event(DAPL
u32 dapl_evd_post_software_event(DAPL_EVD *evd_ptr,
DAT_EVENT_NUMBER event_number,
- DAT_PVOID pointer)
+ void *pointer)
{
struct dat_event *event_ptr;
event_ptr = dapl_evd_get_and_init_event(evd_ptr, event_number);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_evd_util.h linux-kernel3/dat-provider/dapl_evd_util.h
--- linux-kernel2/dat-provider/dapl_evd_util.h 2005-05-11 12:21:06.564007000 -0700
+++ linux-kernel3/dat-provider/dapl_evd_util.h 2005-05-11 16:11:16.530004000 -0700
@@ -73,7 +73,7 @@ u32 dapl_evd_post_connection_event(DAPL_
DAT_EVENT_NUMBER event_number,
DAT_EP_HANDLE ep_handle,
DAT_COUNT private_data_size,
- DAT_PVOID private_data);
+ void *private_data);
u32 dapl_evd_post_async_error_event(DAPL_EVD *evd_ptr,
DAT_EVENT_NUMBER event_number,
@@ -81,7 +81,7 @@ u32 dapl_evd_post_async_error_event(DAPL
u32 dapl_evd_post_software_event(DAPL_EVD *evd_ptr,
DAT_EVENT_NUMBER event_number,
- DAT_PVOID pointer);
+ void *pointer);
/*************************************
* dapl internal callbacks functions *
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl.h linux-kernel3/dat-provider/dapl.h
--- linux-kernel2/dat-provider/dapl.h 2005-05-11 13:23:31.584000000 -0700
+++ linux-kernel3/dat-provider/dapl.h 2005-05-11 16:11:16.504000000 -0700
@@ -497,7 +497,7 @@ extern u32 dapl_cr_query(DAT_CR_HANDLE,
extern u32 dapl_cr_accept(DAT_CR_HANDLE cr_handle, DAT_EP_HANDLE ep_handle,
DAT_COUNT private_data_size,
- const DAT_PVOID private_data);
+ const void *private_data);
extern u32 dapl_cr_reject(DAT_CR_HANDLE cr_handle);
@@ -559,14 +559,14 @@ extern u32 dapl_ep_connect(DAT_EP_HANDLE
DAT_CONN_QUAL remote_conn_qual,
DAT_TIMEOUT timeout,
DAT_COUNT private_data_size,
- const DAT_PVOID private_data,
+ const void *private_data,
DAT_QOS quality_of_service,
DAT_CONNECT_FLAGS connect_flags);
extern u32 dapl_ep_dup_connect(DAT_EP_HANDLE ep_handle,
DAT_EP_HANDLE ep_dup_handle, DAT_TIMEOUT timeout,
DAT_COUNT private_data_size,
- const DAT_PVOID private_data,
+ const void *private_data,
DAT_QOS quality_of_service);
extern u32 dapl_ep_disconnect(DAT_EP_HANDLE ep_handle,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_lmr_kcreate.c linux-kernel3/dat-provider/dapl_lmr_kcreate.c
--- linux-kernel2/dat-provider/dapl_lmr_kcreate.c 2005-05-11 13:37:00.876008000 -0700
+++ linux-kernel3/dat-provider/dapl_lmr_kcreate.c 2005-05-11 16:11:16.537002000 -0700
@@ -37,7 +37,7 @@
#include "dapl_lmr_util.h"
#include "dapl_adapter_util.h"
-static inline u32 dapl_lmr_create_virtual(DAPL_IA *ia, DAT_PVOID virt_addr,
+static inline u32 dapl_lmr_create_virtual(DAPL_IA *ia, void *virt_addr,
DAT_VLEN length, DAPL_PZ *pz,
DAT_MEM_PRIV_FLAGS privileges,
DAT_LMR_HANDLE *lmr_handle,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_openib_cm.c linux-kernel3/dat-provider/dapl_openib_cm.c
--- linux-kernel2/dat-provider/dapl_openib_cm.c 2005-05-11 13:40:22.442023000 -0700
+++ linux-kernel3/dat-provider/dapl_openib_cm.c 2005-05-11 16:11:16.545001000 -0700
@@ -400,7 +400,7 @@ error:
u32 dapl_ib_connect(DAT_EP_HANDLE ep_handle,
DAT_IA_ADDRESS_PTR remote_ia_address,
DAT_CONN_QUAL remote_conn_qual,
- DAT_COUNT private_data_size, DAT_PVOID private_data)
+ DAT_COUNT private_data_size, void *private_data)
{
DAPL_IA *ia_ptr;
DAPL_EP *ep_ptr;
@@ -737,7 +737,7 @@ u32 dapl_ib_reject_connection(struct dap
*/
u32 dapl_ib_accept_connection(DAT_CR_HANDLE cr_handle, DAT_EP_HANDLE ep_handle,
DAT_COUNT private_data_size,
- const DAT_PVOID prd_ptr)
+ const void *prd_ptr)
{
DAPL_CR *cr_ptr;
DAPL_EP *ep_ptr;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/dat-provider/dapl_openib_util.c linux-kernel3/dat-provider/dapl_openib_util.c
--- linux-kernel2/dat-provider/dapl_openib_util.c 2005-05-11 13:48:41.352007000 -0700
+++ linux-kernel3/dat-provider/dapl_openib_util.c 2005-05-11 16:11:16.552002000 -0700
@@ -390,7 +390,7 @@ u32 dapl_ib_pd_free(DAPL_PZ *pz)
* DAT_INSUFFICIENT_RESOURCES
*
*/
-u32 dapl_ib_mr_register(DAPL_IA *ia, DAPL_LMR *lmr, DAT_PVOID virt_addr,
+u32 dapl_ib_mr_register(DAPL_IA *ia, DAPL_LMR *lmr, void *virt_addr,
DAT_VLEN length, DAT_MEM_PRIV_FLAGS privileges)
{
/* ITBD virtual memory registration ??? */
@@ -398,7 +398,7 @@ u32 dapl_ib_mr_register(DAPL_IA *ia, DAP
}
u32 dapl_ib_mr_register_physical(DAPL_IA *ia_ptr, DAPL_LMR *lmr,
- DAT_PVOID phys_addr, DAT_VLEN length,
+ void *phys_addr, DAT_VLEN length,
DAT_MEM_PRIV_FLAGS privileges)
{
int ib_status;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/include/dapl_proto.h linux-kernel3/test/dapltest/include/dapl_proto.h
--- linux-kernel2/test/dapltest/include/dapl_proto.h 2005-05-11 11:16:06.658962000 -0700
+++ linux-kernel3/test/dapltest/include/dapl_proto.h 2005-05-11 16:11:16.569002000 -0700
@@ -405,7 +405,7 @@ boolean_t DT_dto_check ( DT_T
boolean_t DT_rmr_check ( DT_Tdep_Print_Head* phead,
struct dat_rmr_bind_completion_event_data *rmr_p,
DAT_RMR_HANDLE rmr_expected,
- DAT_PVOID cookie_expected,
+ void * cookie_expected,
char *message);
boolean_t DT_cr_check (DT_Tdep_Print_Head* phead,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/kdapl/kdapl_tdep_evd.c linux-kernel3/test/dapltest/kdapl/kdapl_tdep_evd.c
--- linux-kernel2/test/dapltest/kdapl/kdapl_tdep_evd.c 2005-05-11 11:16:06.670966000 -0700
+++ linux-kernel3/test/dapltest/kdapl/kdapl_tdep_evd.c 2005-05-11 16:23:15.972014000 -0700
@@ -45,7 +45,7 @@ typedef struct Tdep_Evd_Tag
/* static function prototypes */
static void DT_Tdep_Event_Callback (
- DAT_PVOID instance_data,
+ void *instance_data,
const struct dat_event *dat_event,
boolean_t bool_arg);
@@ -322,7 +322,7 @@ DT_Tdep_evd_free (DAT_EVD_HANDLE evd_han
}
static void DT_Tdep_Event_Callback (
- DAT_PVOID instance_data,
+ void *instance_data,
const struct dat_event * dat_event,
boolean_t bool_arg)
{
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_bpool.c linux-kernel3/test/dapltest/test/dapl_bpool.c
--- linux-kernel2/test/dapltest/test/dapl_bpool.c 2005-05-11 11:16:06.675963000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_bpool.c 2005-05-11 16:15:37.116001000 -0700
@@ -227,7 +227,7 @@ DT_BpoolAlloc (
iov.lmr_context = bpool_ptr->lmr_context;
cookie.as_64 = (u64)0UL;
- cookie.as_ptr = (DAT_PVOID) (uintptr_t) bpool_ptr->reg_addr;
+ cookie.as_ptr = (void *) (uintptr_t) bpool_ptr->reg_addr;
mflags = (enable_rdma_write && enable_rdma_read ? DAT_MEM_PRIV_ALL_FLAG
: (enable_rdma_write ? DAT_MEM_PRIV_WRITE_FLAG
: (enable_rdma_read ? DAT_MEM_PRIV_READ_FLAG : 0)));
@@ -258,7 +258,7 @@ DT_BpoolAlloc (
!DT_rmr_check (phead,
&rmr_stat,
bpool_ptr->rmr_handle,
- (DAT_PVOID) (uintptr_t) bpool_ptr->reg_addr,
+ (void *) (uintptr_t) bpool_ptr->reg_addr,
"Bpool"))
{
goto err;
@@ -334,7 +334,7 @@ DT_Bpool_Destroy (Per_Test_Data_t * pt_p
iov.segment_length = 0; /* un-bind */
iov.lmr_context = bpool_ptr->lmr_context;
cookie.as_64 = (u64)0UL;
- cookie.as_ptr = (DAT_PVOID) (uintptr_t)bpool_ptr->reg_addr;
+ cookie.as_ptr = (void *) (uintptr_t)bpool_ptr->reg_addr;
/*
* Do not attempt to unbind here. The remote node
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_client.c linux-kernel3/test/dapltest/test/dapl_client.c
--- linux-kernel2/test/dapltest/test/dapl_client.c 2005-05-11 11:16:06.680966000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_client.c 2005-05-11 16:15:37.124000000 -0700
@@ -226,13 +226,13 @@ DT_cs_Client (Params_t * params_ptr,
DT_Tdep_PT_Debug (3, (phead,
"RecvSrvInfo 0 %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (bpool, 0)));
+ (void *) DT_Bpool_GetBuffer (bpool, 0)));
DT_Tdep_PT_Debug (3, (phead,
"SndCliInfo 1 %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (bpool, 1)));
+ (void *) DT_Bpool_GetBuffer (bpool, 1)));
DT_Tdep_PT_Debug (3, (phead,
"SndCommand 2 %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (bpool, 2)));
+ (void *) DT_Bpool_GetBuffer (bpool, 2)));
/* Post recv buffer for Server_Info (1st buffer in pool) */
DT_Tdep_PT_Debug (1,(phead, "%s: Posting 1 recv buffer\n", module));
@@ -257,7 +257,7 @@ retry:
server_netaddr,
SERVER_PORT_NUMBER,
DAT_TIMEOUT_INFINITE,
- 0, (DAT_PVOID) 0, /* no private data */
+ 0, (void *) 0, /* no private data */
params_ptr->ReliabilityLevel,
DAT_CONNECT_DEFAULT_FLAG);
if (ret != DAT_SUCCESS)
@@ -336,7 +336,7 @@ retry:
goto client_exit;
}
/* reap the send and verify it */
- dto_cookie.as_ptr = (DAT_PVOID) (uintptr_t) DT_Bpool_GetBuffer ( bpool, 1);
+ dto_cookie.as_ptr = (void *) (uintptr_t) DT_Bpool_GetBuffer ( bpool, 1);
DT_Tdep_PT_Debug (1,(phead,
"%s: Sent Client_Info - awaiting completion\n",
module));
@@ -407,7 +407,7 @@ retry:
}
/* reap the send and verify it */
dto_cookie.as_64 = LZERO;
- dto_cookie.as_ptr = (DAT_PVOID) (uintptr_t) DT_Bpool_GetBuffer ( bpool, 2);
+ dto_cookie.as_ptr = (void *) (uintptr_t) DT_Bpool_GetBuffer ( bpool, 2);
DT_Tdep_PT_Debug (1,(phead,
"%s: Sent Command - awaiting completion\n",
module));
@@ -425,7 +425,7 @@ retry:
/************************************************************************/
dto_cookie.as_64 = LZERO;
- dto_cookie.as_ptr = (DAT_PVOID) (uintptr_t) DT_Bpool_GetBuffer ( bpool, 0);
+ dto_cookie.as_ptr = (void *) (uintptr_t) DT_Bpool_GetBuffer ( bpool, 0);
DT_Tdep_PT_Debug (1,(phead, "%s: Waiting for Server_Info\n", module));
if (!DT_dto_event_wait (phead, recv_evd_hdl, &dto_stat) ||
!DT_dto_check ( phead,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_fft_queryinfo.c linux-kernel3/test/dapltest/test/dapl_fft_queryinfo.c
--- linux-kernel2/test/dapltest/test/dapl_fft_queryinfo.c 2005-05-11 11:16:06.726963000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_fft_queryinfo.c 2005-05-11 16:12:51.454001000 -0700
@@ -31,13 +31,6 @@
#define BUFFSIZE 1024
#define DEFAULT_QUEUE_LEN 10
-#if defined(WIN32)
-static DAT_OS_WAIT_PROXY_AGENT NULLPROXY =
-{
- (DAT_PVOID) NULL, (DAT_AGENT_FUNC) NULL
-};
-#endif
-
int DT_queryinfo_basic (Params_t *params_ptr,
FFT_Cmd_t *cmd,
FFT_query_enum object_to_query,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_fft_util.c linux-kernel3/test/dapltest/test/dapl_fft_util.c
--- linux-kernel2/test/dapltest/test/dapl_fft_util.c 2005-05-11 11:16:06.731964000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_fft_util.c 2005-05-11 16:15:37.130004000 -0700
@@ -322,7 +322,7 @@ void DT_fft_listen (Params_t *params_ptr
"DT_fft_listen"));
/* accept the connection */
- rc =dat_cr_accept (conn->cr_handle, conn->ep_handle, 0, (DAT_PVOID)0);
+ rc =dat_cr_accept (conn->cr_handle, conn->ep_handle, 0, (void *)0);
DT_assert_dat (phead, rc == DAT_SUCCESS);
/* wait on a conn event via the conn EVD */
@@ -352,7 +352,7 @@ int DT_fft_connect (Params_t *params_ptr
/* attempt to connect, timeout = 10 secs */
rc = dat_ep_connect (conn->ep_handle, conn->remote_netaddr,
- SERVER_PORT_NUMBER, 10*1000, 0, (DAT_PVOID)0,
+ SERVER_PORT_NUMBER, 10*1000, 0, (void *)0,
DAT_QOS_BEST_EFFORT, DAT_CONNECT_DEFAULT_FLAG);
DT_assert_dat (phead, rc == DAT_SUCCESS);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_limit.c linux-kernel3/test/dapltest/test/dapl_limit.c
--- linux-kernel2/test/dapltest/test/dapl_limit.c 2005-05-11 11:16:06.742963000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_limit.c 2005-05-11 16:15:37.142002000 -0700
@@ -1050,7 +1050,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
iovp->segment_length = DFLT_BUFFSZ;
iovp->lmr_context = hdl_sets[i].lmr_context;
cookie.as_64 = (u64)0UL;
- cookie.as_ptr = (DAT_PVOID) hdl_sets[i].lmr_buffer;
+ cookie.as_ptr = (void *) hdl_sets[i].lmr_buffer;
DT_Tdep_PT_Printf (phead, "%s: dat_ep_post_recv #%d\n", module,
w * cmd->width + i + 1);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_performance_client.c linux-kernel3/test/dapltest/test/dapl_performance_client.c
--- linux-kernel2/test/dapltest/test/dapl_performance_client.c 2005-05-11 11:16:06.745962000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_performance_client.c 2005-05-11 16:15:37.148003000 -0700
@@ -107,7 +107,7 @@ retry:
test_ptr->ep_context.port,
DAT_TIMEOUT_INFINITE,
0,
- (DAT_PVOID) 0, /* no private data */
+ (void *) 0, /* no private data */
test_ptr->cmd->qos,
DAT_CONNECT_DEFAULT_FLAG);
if (ret != DAT_SUCCESS)
@@ -400,7 +400,7 @@ DT_Performance_Test_Client_Exchange (
dto_cookie.as_64 = LZERO;
dto_cookie.as_ptr =
- (DAT_PVOID) DT_Bpool_GetBuffer (
+ (void *) DT_Bpool_GetBuffer (
test_ptr->ep_context.bp,
DT_PERF_SYNC_RECV_BUFFER_ID);
if ( !DT_dto_event_wait (phead, test_ptr->recv_evd_hdl, &dto_stat) ||
@@ -472,7 +472,7 @@ DT_Performance_Test_Client_Exchange (
dto_cookie.as_64 = LZERO;
dto_cookie.as_ptr =
- (DAT_PVOID) DT_Bpool_GetBuffer (
+ (void *) DT_Bpool_GetBuffer (
test_ptr->ep_context.bp,
DT_PERF_SYNC_SEND_BUFFER_ID);
if (!DT_dto_event_wait (phead, test_ptr->reqt_evd_hdl, &dto_stat) ||
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_performance_server.c linux-kernel3/test/dapltest/test/dapl_performance_server.c
--- linux-kernel2/test/dapltest/test/dapl_performance_server.c 2005-05-11 11:16:06.751964000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_performance_server.c 2005-05-11 16:15:37.154000000 -0700
@@ -148,7 +148,7 @@ DT_Performance_Test_Server_Connect (
/* what, me query? just try to accept the connection */
ret = dat_cr_accept (cr_handle,
test_ptr->ep_context.ep_handle,
- 0, (DAT_PVOID)0 /* no private data */ );
+ 0, (void *)0 /* no private data */ );
if (ret != DAT_SUCCESS)
{
DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_cr_accept error: %s\n",
@@ -221,7 +221,7 @@ DT_Performance_Test_Server_Connect (
ret = dat_cr_accept (cr_handle,
test_ptr->ep_context.ep_handle,
0,
- (DAT_PVOID)0 /* no private data */ );
+ (void *)0 /* no private data */ );
if (ret != DAT_SUCCESS)
{
DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_cr_accept error: %s\n",
@@ -356,7 +356,7 @@ DT_Performance_Test_Server_Exchange (
/* reap the send and verify it */
dto_cookie.as_64 = LZERO;
dto_cookie.as_ptr =
- (DAT_PVOID) DT_Bpool_GetBuffer (
+ (void *) DT_Bpool_GetBuffer (
test_ptr->ep_context.bp,
DT_PERF_SYNC_SEND_BUFFER_ID);
if ( !DT_dto_event_wait (phead, test_ptr->reqt_evd_hdl, &dto_stat) ||
@@ -378,7 +378,7 @@ DT_Performance_Test_Server_Exchange (
dto_cookie.as_64 = LZERO;
dto_cookie.as_ptr =
- (DAT_PVOID) DT_Bpool_GetBuffer (
+ (void *) DT_Bpool_GetBuffer (
test_ptr->ep_context.bp,
DT_PERF_SYNC_RECV_BUFFER_ID);
if ( !DT_dto_event_wait (phead, test_ptr->recv_evd_hdl, &dto_stat) ||
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_performance_util.c linux-kernel3/test/dapltest/test/dapl_performance_util.c
--- linux-kernel2/test/dapltest/test/dapl_performance_util.c 2005-05-11 11:16:06.756962000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_performance_util.c 2005-05-11 16:15:37.162003000 -0700
@@ -215,11 +215,11 @@ DT_Performance_Test_Create (
DT_Tdep_PT_Debug (3, (phead,
"0: SYNC_SEND %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (test_ptr->ep_context.bp,
+ (void *) DT_Bpool_GetBuffer (test_ptr->ep_context.bp,
DT_PERF_SYNC_SEND_BUFFER_ID)));
DT_Tdep_PT_Debug (3, (phead,
"1: SYNC_RECV %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (test_ptr->ep_context.bp,
+ (void *) DT_Bpool_GetBuffer (test_ptr->ep_context.bp,
DT_PERF_SYNC_RECV_BUFFER_ID)));
/*
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_server.c linux-kernel3/test/dapltest/test/dapl_server.c
--- linux-kernel2/test/dapltest/test/dapl_server.c 2005-05-11 11:16:06.763960000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_server.c 2005-05-11 16:15:37.167002000 -0700
@@ -253,13 +253,13 @@ DT_cs_Server (Params_t * params_ptr)
DT_Tdep_PT_Debug (3, (phead,
"Recv 0 %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (ps_ptr->bpool, 0)));
+ (void *) DT_Bpool_GetBuffer (ps_ptr->bpool, 0)));
DT_Tdep_PT_Debug (3, (phead,
"Recv 1 %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (ps_ptr->bpool, 1)));
+ (void *) DT_Bpool_GetBuffer (ps_ptr->bpool, 1)));
DT_Tdep_PT_Debug (3, (phead,
"SrvInfo 2 %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (ps_ptr->bpool, 2)));
+ (void *) DT_Bpool_GetBuffer (ps_ptr->bpool, 2)));
/* Initialize the performance test lock in case an incoming test
* is a performance test, so we can allow only one at a time.
@@ -357,7 +357,7 @@ DT_cs_Server (Params_t * params_ptr)
}
DT_Tdep_PT_Debug (1,(phead,"%s: Accepting Connection Request\n", module));
- ret = dat_cr_accept (cr_handle, ps_ptr->ep_handle, 0, (DAT_PVOID)0);
+ ret = dat_cr_accept (cr_handle, ps_ptr->ep_handle, 0, (void *)0);
if (ret != DAT_SUCCESS)
{
DT_Tdep_PT_Printf (phead,
@@ -390,7 +390,7 @@ DT_cs_Server (Params_t * params_ptr)
/* Wait for Client_Info */
dto_cookie.as_64 = LZERO;
dto_cookie.as_ptr =
- (DAT_PVOID) (uintptr_t) DT_Bpool_GetBuffer ( ps_ptr->bpool, 0);
+ (void *) (uintptr_t) DT_Bpool_GetBuffer ( ps_ptr->bpool, 0);
DT_Tdep_PT_Debug (1,(phead,"%s: Waiting for Client_Info\n", module));
if (!DT_dto_event_wait (phead, ps_ptr->recv_evd_hdl, &dto_stat) ||
!DT_dto_check ( phead,
@@ -415,7 +415,7 @@ DT_cs_Server (Params_t * params_ptr)
/* Wait for client's command info */
dto_cookie.as_64 = LZERO;
dto_cookie.as_ptr =
- (DAT_PVOID) (uintptr_t) DT_Bpool_GetBuffer ( ps_ptr->bpool, 1);
+ (void *) (uintptr_t) DT_Bpool_GetBuffer ( ps_ptr->bpool, 1);
DT_Tdep_PT_Debug (1,(phead,"%s: Waiting for Client_Cmd_Info\n", module));
if (!DT_dto_event_wait (phead, ps_ptr->recv_evd_hdl, &dto_stat) ||
!DT_dto_check ( phead,
@@ -601,7 +601,7 @@ DT_cs_Server (Params_t * params_ptr)
/* reap the send and verify it */
dto_cookie.as_64 = LZERO;
dto_cookie.as_ptr =
- (DAT_PVOID) (uintptr_t) DT_Bpool_GetBuffer ( ps_ptr->bpool, 2);
+ (void *) (uintptr_t) DT_Bpool_GetBuffer ( ps_ptr->bpool, 2);
if (!DT_dto_event_wait (phead, ps_ptr->reqt_evd_hdl, &dto_stat) ||
!DT_dto_check ( phead,
&dto_stat,
@@ -889,7 +889,7 @@ send_control_data (
/* reap the send and verify it */
dto_cookie.as_64 = LZERO;
dto_cookie.as_ptr =
- (DAT_PVOID) (uintptr_t) DT_Bpool_GetBuffer ( ps_ptr->bpool, 2);
+ (void *) (uintptr_t) DT_Bpool_GetBuffer ( ps_ptr->bpool, 2);
if (!DT_dto_event_wait (phead, ps_ptr->reqt_evd_hdl, &dto_stat) ||
!DT_dto_check (phead,
&dto_stat,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_test_util.c linux-kernel3/test/dapltest/test/dapl_test_util.c
--- linux-kernel2/test/dapltest/test/dapl_test_util.c 2005-05-11 11:16:06.768963000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_test_util.c 2005-05-11 16:15:37.174000000 -0700
@@ -179,7 +179,7 @@ DT_post_recv_buffer (DT_Tdep_Print_Head
iov->segment_length = size;
iov->lmr_context = lmr_c;
cookie.as_64 = (u64)0UL;
- cookie.as_ptr = (DAT_PVOID) buff;
+ cookie.as_ptr = (void *) buff;
DT_Tdep_PT_Debug (3, (phead, "Post-Recv #%d [%p, %x]\n", index, buff, size));
@@ -224,7 +224,7 @@ DT_post_send_buffer (DT_Tdep_Print_Head
iov->segment_length = size;
iov->lmr_context = lmr_c;
cookie.as_64 = (u64)0UL;
- cookie.as_ptr = (DAT_PVOID) buff;
+ cookie.as_ptr = (void *) buff;
DT_Tdep_PT_Debug (3, (phead, "Post-Send #%d [%p, %x]\n", index, buff, size));
/* Post the recv buffer */
@@ -621,7 +621,7 @@ boolean_t
DT_rmr_check ( DT_Tdep_Print_Head *phead,
struct dat_rmr_bind_completion_event_data *rmr_p,
DAT_RMR_HANDLE rmr_expected,
- DAT_PVOID cookie_expected,
+ void * cookie_expected,
char *message)
{
if ( rmr_p->rmr_handle != rmr_expected
diff -Nurp -X /home/tduffy/dontdiff linux-kernel2/test/dapltest/test/dapl_transaction_test.c linux-kernel3/test/dapltest/test/dapl_transaction_test.c
--- linux-kernel2/test/dapltest/test/dapl_transaction_test.c 2005-05-11 11:16:06.783962000 -0700
+++ linux-kernel3/test/dapltest/test/dapl_transaction_test.c 2005-05-11 16:15:37.184002000 -0700
@@ -406,19 +406,19 @@ DT_Transaction_Main (void *param)
DT_Tdep_PT_Debug (3, (phead,
"0: RMI_SEND %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (
+ (void *) DT_Bpool_GetBuffer (
test_ptr->ep_context[i].bp, 0)));
DT_Tdep_PT_Debug (3, (phead,
"1: RMI_RECV %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (
+ (void *) DT_Bpool_GetBuffer (
test_ptr->ep_context[i].bp, 1)));
DT_Tdep_PT_Debug (3, (phead,
"2: SYNC_SEND %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (
+ (void *) DT_Bpool_GetBuffer (
test_ptr->ep_context[i].bp, 2)));
DT_Tdep_PT_Debug (3, (phead,
"3: SYNC_RECV %p\n",
- (DAT_PVOID) DT_Bpool_GetBuffer (
+ (void *) DT_Bpool_GetBuffer (
test_ptr->ep_context[i].bp, 3)));
/*
@@ -575,7 +575,7 @@ DT_Transaction_Main (void *param)
/* what, me query? just try to accept the connection */
ret = dat_cr_accept (cr_handle,
NULL, /* NULL for RSP */
- 0, (DAT_PVOID)0 /* no private data */ );
+ 0, (void *)0 /* no private data */ );
if (ret != DAT_SUCCESS)
{
DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_cr_accept #%d error: %s\n",
@@ -660,7 +660,7 @@ DT_Transaction_Main (void *param)
/* what, me query? just try to accept the connection */
ret = dat_cr_accept (cr_handle,
test_ptr->ep_context[i].ep_handle,
- 0, (DAT_PVOID)0 /* no private data */ );
+ 0, (void *)0 /* no private data */ );
if (ret != DAT_SUCCESS)
{
DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_cr_accept #%d error: %s\n",
@@ -926,7 +926,7 @@ retry:
}
DT_Tdep_PT_Debug (3, (phead,
- "%d: S/R [ va=%p ]\n", j, (DAT_PVOID)
+ "%d: S/R [ va=%p ]\n", j, (void *)
DT_Bpool_GetBuffer ( test_ptr->ep_context[i].op[j].bp, 0)));
break;
}
@@ -989,7 +989,7 @@ retry:
/* reap the send and verify it */
dto_cookie.as_64 = LZERO;
dto_cookie.as_ptr =
- (DAT_PVOID) DT_Bpool_GetBuffer (
+ (void *) DT_Bpool_GetBuffer (
test_ptr->ep_context[i].bp,
RMI_SEND_BUFFER_ID);
if (!DT_dto_event_wait (phead, test_ptr->reqt_evd_hdl, &dto_stat) ||
@@ -1013,7 +1013,7 @@ retry:
test_ptr->is_server ? "Client" : "Server"));
dto_cookie.as_64 = LZERO;
dto_cookie.as_ptr =
- (DAT_PVOID) DT_Bpool_GetBuffer (
+ (void *) DT_Bpool_GetBuffer (
test_ptr->ep_context[i].bp,
RMI_RECV_BUFFER_ID);
if (!DT_dto_event_wait (phead, test_ptr->recv_evd_hdl, &dto_stat) ||
More information about the general
mailing list