[openib-general] [PATCH][16/19] kDAPL: Remove typedef DAT_EVENT_NUMBER
Tom Duffy
Tom.Duffy at Sun.COM
Sun May 15 11:27:19 PDT 2005
Signed-off-by: Tom Duffy <tduffy at sun.com>
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/dat/dat.h linux-kernel16/dat/dat.h
--- linux-kernel15/dat/dat.h 2005-05-13 15:34:14.306009000 -0700
+++ linux-kernel16/dat/dat.h 2005-05-13 15:37:17.695015000 -0700
@@ -867,7 +867,7 @@ struct dat_software_event_data {
void *pointer;
};
-typedef enum dat_event_number {
+enum dat_event_number {
DAT_DTO_COMPLETION_EVENT = 0x00001,
DAT_RMR_BIND_COMPLETION_EVENT = 0x01001,
DAT_CONNECTION_REQUEST_EVENT = 0x02001,
@@ -885,7 +885,7 @@ typedef enum dat_event_number {
DAT_ASYNC_ERROR_TIMED_OUT = 0x08004,
DAT_ASYNC_ERROR_PROVIDER_INTERNAL_ERROR = 0x08005,
DAT_SOFTWARE_EVENT = 0x10001
-} DAT_EVENT_NUMBER;
+};
/* Union for event Data */
@@ -901,7 +901,7 @@ typedef union dat_event_data {
/* Event struct that holds all event information */
struct dat_event {
- DAT_EVENT_NUMBER event_number;
+ enum dat_event_number event_number;
DAT_EVD_HANDLE evd_handle;
DAT_EVENT_DATA event_data;
};
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/dat-provider/dapl_adapter_util.h linux-kernel16/dat-provider/dapl_adapter_util.h
--- linux-kernel15/dat-provider/dapl_adapter_util.h 2005-05-13 15:29:23.105005000 -0700
+++ linux-kernel16/dat-provider/dapl_adapter_util.h 2005-05-13 15:36:57.956004000 -0700
@@ -145,12 +145,12 @@ void dapl_ib_disconnect_clean(DAPL_EP *
const ib_cm_events_t ib_cm_event);
u32 dapl_ib_get_async_event(ib_error_record_t *cause_ptr,
- DAT_EVENT_NUMBER *async_event);
+ enum dat_event_number *async_event);
-DAT_EVENT_NUMBER dapl_ib_get_dat_event(const ib_cm_events_t ib_cm_event,
+enum dat_event_number dapl_ib_get_dat_event(const ib_cm_events_t ib_cm_event,
boolean_t active);
-ib_cm_events_t dapl_ib_get_cm_event(DAT_EVENT_NUMBER dat_event_num);
+ib_cm_events_t dapl_ib_get_cm_event(enum dat_event_number dat_event_num);
u32 dapl_ib_cm_remote_addr(DAT_HANDLE dat_handle,
struct sockaddr_in6 *remote_ia_address);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/dat-provider/dapl_cr_callback.c linux-kernel16/dat-provider/dapl_cr_callback.c
--- linux-kernel15/dat-provider/dapl_cr_callback.c 2005-05-13 11:24:33.678004000 -0700
+++ linux-kernel16/dat-provider/dapl_cr_callback.c 2005-05-13 15:36:57.961006000 -0700
@@ -49,7 +49,7 @@ u32 dapl_connection_request(ib_cm_handle
const void *prd_ptr, DAPL_EVD *evd_ptr);
DAPL_EP *dapl_get_sp_ep(ib_cm_handle_t ib_cm_handle,
- DAPL_SP * sp_ptr, DAT_EVENT_NUMBER dat_event_num);
+ DAPL_SP * sp_ptr, enum dat_event_number dat_event_num);
/*
* The callback function registered with verbs for passive side of
@@ -63,7 +63,7 @@ void dapl_cr_callback(ib_cm_handle_t ib_
DAPL_EP *ep_ptr;
DAPL_EVD *evd_ptr;
DAPL_SP *sp_ptr;
- DAT_EVENT_NUMBER dat_event_num;
+ enum dat_event_number dat_event_num;
u32 dat_status;
dapl_dbg_log(DAPL_DBG_TYPE_CM | DAPL_DBG_TYPE_CALLBACK,
@@ -375,7 +375,7 @@ u32 dapl_connection_request(ib_cm_handle
* the SP.
*/
DAPL_EP *dapl_get_sp_ep(ib_cm_handle_t ib_cm_handle,
- DAPL_SP * sp_ptr, DAT_EVENT_NUMBER dat_event_num)
+ DAPL_SP * sp_ptr, enum dat_event_number dat_event_num)
{
DAPL_CR *cr_ptr;
DAPL_EP *ep_ptr;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/dat-provider/dapl_evd_connection_callb.c linux-kernel16/dat-provider/dapl_evd_connection_callb.c
--- linux-kernel15/dat-provider/dapl_evd_connection_callb.c 2005-05-12 09:28:47.275056000 -0700
+++ linux-kernel16/dat-provider/dapl_evd_connection_callb.c 2005-05-13 15:36:57.964000000 -0700
@@ -67,7 +67,7 @@ dapl_evd_connection_callback(ib_cm_handl
{
DAPL_EP *ep_ptr;
DAPL_EVD *evd_ptr;
- DAT_EVENT_NUMBER dat_event_num;
+ enum dat_event_number dat_event_num;
u32 dat_status;
int private_data_size;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/dat-provider/dapl_evd_qp_async_error_callb.c linux-kernel16/dat-provider/dapl_evd_qp_async_error_callb.c
--- linux-kernel15/dat-provider/dapl_evd_qp_async_error_callb.c 2005-05-12 09:28:48.181057000 -0700
+++ linux-kernel16/dat-provider/dapl_evd_qp_async_error_callb.c 2005-05-13 15:36:57.967011000 -0700
@@ -59,7 +59,7 @@ dapl_evd_qp_async_error_callback(ib_erro
{
DAPL_EP *ep_ptr;
DAPL_EVD *async_evd;
- DAT_EVENT_NUMBER async_event;
+ enum dat_event_number async_event;
u32 dat_status;
ep_ptr = (DAPL_EP *) context;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/dat-provider/dapl_evd_un_async_error_callb.c linux-kernel16/dat-provider/dapl_evd_un_async_error_callb.c
--- linux-kernel15/dat-provider/dapl_evd_un_async_error_callb.c 2005-05-12 09:28:48.254002000 -0700
+++ linux-kernel16/dat-provider/dapl_evd_un_async_error_callb.c 2005-05-13 15:36:57.969015000 -0700
@@ -58,7 +58,7 @@ void
dapl_evd_un_async_error_callback(ib_error_record_t * cause_ptr, void *context)
{
DAPL_EVD *async_evd;
- DAT_EVENT_NUMBER async_event;
+ enum dat_event_number async_event;
u32 dat_status;
dapl_dbg_log(DAPL_DBG_TYPE_CALLBACK | DAPL_DBG_TYPE_EXCEPTION,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/dat-provider/dapl_evd_util.c linux-kernel16/dat-provider/dapl_evd_util.c
--- linux-kernel15/dat-provider/dapl_evd_util.c 2005-05-13 14:47:24.445001000 -0700
+++ linux-kernel16/dat-provider/dapl_evd_util.c 2005-05-13 15:40:27.444000000 -0700
@@ -480,25 +480,25 @@ dapl_evd_post_overflow_event(DAPL_EVD *
return;
}
-static struct dat_event *dapl_evd_get_and_init_event(DAPL_EVD * evd_ptr,
- DAT_EVENT_NUMBER event_number)
+static struct dat_event *dapl_evd_get_and_init_event(DAPL_EVD *evd_ptr,
+ enum dat_event_number evno)
{
struct dat_event *event_ptr;
event_ptr = dapl_evd_get_event(evd_ptr);
- if (NULL == event_ptr) {
+ if (!event_ptr)
dapl_evd_post_overflow_event(evd_ptr->header.owner_ia->
async_error_evd, evd_ptr);
- } else {
+ else {
event_ptr->evd_handle = (DAT_EVD_HANDLE) evd_ptr;
- event_ptr->event_number = event_number;
+ event_ptr->event_number = evno;
}
return event_ptr;
}
u32 dapl_evd_post_cr_arrival_event(DAPL_EVD *evd_ptr,
- DAT_EVENT_NUMBER event_number,
+ enum dat_event_number event_number,
DAT_SP_HANDLE sp_handle,
struct sockaddr *ia_address_ptr,
DAT_CONN_QUAL conn_qual,
@@ -529,7 +529,7 @@ u32 dapl_evd_post_cr_arrival_event(DAPL_
}
u32 dapl_evd_post_connection_event(DAPL_EVD *evd_ptr,
- DAT_EVENT_NUMBER event_number,
+ enum dat_event_number event_number,
DAT_EP_HANDLE ep_handle,
int private_data_size,
void *private_data)
@@ -558,7 +558,7 @@ u32 dapl_evd_post_connection_event(DAPL_
}
u32 dapl_evd_post_async_error_event(DAPL_EVD *evd_ptr,
- DAT_EVENT_NUMBER event_number,
+ enum dat_event_number event_number,
DAT_IA_HANDLE ia_handle)
{
struct dat_event *event_ptr;
@@ -583,7 +583,7 @@ u32 dapl_evd_post_async_error_event(DAPL
}
u32 dapl_evd_post_software_event(DAPL_EVD *evd_ptr,
- DAT_EVENT_NUMBER event_number,
+ enum dat_event_number event_number,
void *pointer)
{
struct dat_event *event_ptr;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/dat-provider/dapl_evd_util.h linux-kernel16/dat-provider/dapl_evd_util.h
--- linux-kernel15/dat-provider/dapl_evd_util.h 2005-05-13 13:52:08.761013000 -0700
+++ linux-kernel16/dat-provider/dapl_evd_util.h 2005-05-13 15:36:57.980003000 -0700
@@ -63,24 +63,24 @@ u32 dapl_evd_event_realloc(DAPL_EVD *evd
*/
u32 dapl_evd_post_cr_arrival_event(DAPL_EVD *evd_ptr,
- DAT_EVENT_NUMBER event_number,
+ enum dat_event_number event_number,
DAT_SP_HANDLE sp_handle,
struct sockaddr *ia_address_ptr,
DAT_CONN_QUAL conn_qual,
DAT_CR_HANDLE cr_handle);
u32 dapl_evd_post_connection_event(DAPL_EVD *evd_ptr,
- DAT_EVENT_NUMBER event_number,
+ enum dat_event_number event_number,
DAT_EP_HANDLE ep_handle,
int private_data_size,
void *private_data);
u32 dapl_evd_post_async_error_event(DAPL_EVD *evd_ptr,
- DAT_EVENT_NUMBER event_number,
+ enum dat_event_number event_number,
DAT_IA_HANDLE ia_handle);
u32 dapl_evd_post_software_event(DAPL_EVD *evd_ptr,
- DAT_EVENT_NUMBER event_number,
+ enum dat_event_number event_number,
void *pointer);
/*************************************
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/dat-provider/dapl_openib_util.c linux-kernel16/dat-provider/dapl_openib_util.c
--- linux-kernel15/dat-provider/dapl_openib_util.c 2005-05-13 15:29:49.548012000 -0700
+++ linux-kernel16/dat-provider/dapl_openib_util.c 2005-05-13 15:50:36.083042000 -0700
@@ -859,7 +859,7 @@ enum dat_dto_completion_status dapl_ib_g
*/
u32 dapl_ib_get_async_event(ib_error_record_t *cause_ptr,
- DAT_EVENT_NUMBER *async_event)
+ enum dat_event_number *async_event)
{
ib_async_event_type event_id;
u32 dat_status = DAT_SUCCESS;
@@ -955,7 +955,7 @@ u32 dapl_ib_get_hca_ids(ib_hca_handle_t
static struct ib_cm_event_map {
const ib_cm_events_t ib_cm_event;
- DAT_EVENT_NUMBER dat_event_num;
+ enum dat_event_number dat_event_num;
} ib_cm_event_map[DAPL_IB_EVENT_CNT] = {
{IB_CME_CONNECTED, DAT_CONNECTION_EVENT_ESTABLISHED},
{IB_CME_DISCONNECTED, DAT_CONNECTION_EVENT_DISCONNECTED},
@@ -992,44 +992,41 @@ static struct ib_cm_event_map {
* none
*
* Returns:
- * DAT_EVENT_NUMBER of translated provider value
+ * enum dat_event_number of translated provider value
*/
-DAT_EVENT_NUMBER
-dapl_ib_get_dat_event(const ib_cm_events_t ib_cm_event, boolean_t active)
+enum dat_event_number dapl_ib_get_dat_event(const ib_cm_events_t ib_cm_event,
+ boolean_t active)
{
- DAT_EVENT_NUMBER dat_event_num;
- int index;
+ enum dat_event_number event = 0;
int i;
active = active; /* keep compiler happy */
if (ib_cm_event > IB_CME_BROKEN)
- return (DAT_EVENT_NUMBER) 0;
+ goto out;
- dat_event_num = 0;
- index = ib_cm_event - IB_CME_CONNECTED;
+ i = ib_cm_event - IB_CME_CONNECTED;
- if (ib_cm_event == ib_cm_event_map[index].ib_cm_event)
- dat_event_num = ib_cm_event_map[index].dat_event_num;
- else {
+ if (ib_cm_event == ib_cm_event_map[i].ib_cm_event)
+ event = ib_cm_event_map[i].dat_event_num;
+ else
/*
* Do a linear walk of the list, just in case the table has been
* messed up or someone changes the definitions; paranoia, but
* recoverable and robust.
*/
- for (i = 0; i < DAPL_IB_EVENT_CNT; i++) {
+ for (i = 0; i < DAPL_IB_EVENT_CNT; i++)
if (ib_cm_event == ib_cm_event_map[i].ib_cm_event)
- dat_event_num =
- ib_cm_event_map[i].dat_event_num;
- }
- }
+ event = ib_cm_event_map[i].dat_event_num;
dapl_dbg_log(DAPL_DBG_TYPE_CALLBACK,
- " dapl_ib_get_dat_event:ibapi event translation: (%s) ib_event 0x%x dat_event 0x%x\n",
- active ? "active" : "passive", ib_cm_event, dat_event_num);
+ " dapl_ib_get_dat_event:ibapi event translation: (%s) "
+ "ib_event 0x%x dat_event 0x%x\n",
+ active ? "active" : "passive", ib_cm_event, event);
- return dat_event_num;
+out:
+ return event;
}
/*
@@ -1051,7 +1048,7 @@ dapl_ib_get_dat_event(const ib_cm_events
* Returns:
* ib_cm_event of translated DAPL value
*/
-ib_cm_events_t dapl_ib_get_cm_event(DAT_EVENT_NUMBER dat_event_num)
+ib_cm_events_t dapl_ib_get_cm_event(enum dat_event_number dat_event_num)
{
ib_cm_events_t ib_cm_event;
int i;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/include/dapl_fft_util.h linux-kernel16/test/dapltest/include/dapl_fft_util.h
--- linux-kernel15/test/dapltest/include/dapl_fft_util.h 2005-05-13 11:10:25.818006000 -0700
+++ linux-kernel16/test/dapltest/include/dapl_fft_util.h 2005-05-13 15:36:58.001011000 -0700
@@ -65,7 +65,7 @@ typedef struct
DAT_CR_HANDLE cr_handle;
Bpool *bpool;
struct dat_cr_arrival_event_data cr_stat;
- DAT_EVENT_NUMBER event_num;
+ enum dat_event_number event_num;
struct sockaddr *remote_netaddr;
Per_Test_Data_t *pt_ptr;
boolean_t connected;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/include/dapl_proto.h linux-kernel16/test/dapltest/include/dapl_proto.h
--- linux-kernel15/test/dapltest/include/dapl_proto.h 2005-05-13 14:31:35.137014000 -0700
+++ linux-kernel16/test/dapltest/include/dapl_proto.h 2005-05-13 15:36:58.007005000 -0700
@@ -368,7 +368,7 @@ boolean_t DT_post_send_buffer (DT_Td
boolean_t DT_conn_event_wait (DT_Tdep_Print_Head* phead,
DAT_EP_HANDLE ep_handle,
DAT_EVD_HANDLE evd_handle,
- DAT_EVENT_NUMBER *event_number);
+ enum dat_event_number *event_number);
boolean_t DT_disco_event_wait ( DT_Tdep_Print_Head* phead,
DAT_EVD_HANDLE evd_handle,
@@ -527,9 +527,9 @@ const char *DT_RetToString (u32 ret
const char *DT_TransferTypeToString (DT_Transfer_Type type);
-const char *DT_AsyncErr2Str (DAT_EVENT_NUMBER error_code);
+const char *DT_AsyncErr2Str (enum dat_event_number error_code);
-const char *DT_EventToSTr (DAT_EVENT_NUMBER event_code);
+const char *DT_EventToSTr (enum dat_event_number event_code);
const char *DT_State2Str (enum dat_ep_state state_code);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/test/dapl_client.c linux-kernel16/test/dapltest/test/dapl_client.c
--- linux-kernel15/test/dapltest/test/dapl_client.c 2005-05-13 11:10:25.837002000 -0700
+++ linux-kernel16/test/dapltest/test/dapl_client.c 2005-05-13 15:36:58.012012000 -0700
@@ -61,7 +61,7 @@ DT_cs_Client (Params_t * params_ptr,
DAT_DTO_COOKIE dto_cookie;
struct dat_dto_completion_event_data dto_stat;
- DAT_EVENT_NUMBER event_num;
+ enum dat_event_number event_num;
unsigned char * buffp;
u32 ret;
DT_Tdep_Print_Head *phead;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/test/dapl_performance_client.c linux-kernel16/test/dapltest/test/dapl_performance_client.c
--- linux-kernel15/test/dapltest/test/dapl_performance_client.c 2005-05-13 11:37:44.366001000 -0700
+++ linux-kernel16/test/dapltest/test/dapl_performance_client.c 2005-05-13 15:36:58.016008000 -0700
@@ -92,7 +92,7 @@ DT_Performance_Test_Client_Connect (
Performance_Test_t *test_ptr)
{
u32 ret;
- DAT_EVENT_NUMBER event_num;
+ enum dat_event_number event_num;
unsigned int retry_cnt = 0;
/*
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/test/dapl_performance_server.c linux-kernel16/test/dapltest/test/dapl_performance_server.c
--- linux-kernel15/test/dapltest/test/dapl_performance_server.c 2005-05-13 11:37:44.370004000 -0700
+++ linux-kernel16/test/dapltest/test/dapl_performance_server.c 2005-05-13 15:36:58.020015000 -0700
@@ -106,7 +106,7 @@ DT_Performance_Test_Server_Connect (
struct dat_cr_arrival_event_data cr_stat;
DAT_CR_HANDLE cr_handle;
- DAT_EVENT_NUMBER event_num;
+ enum dat_event_number event_num;
rsp_handle = DAT_HANDLE_NULL;
psp_handle = DAT_HANDLE_NULL;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/test/dapl_server.c linux-kernel16/test/dapltest/test/dapl_server.c
--- linux-kernel15/test/dapltest/test/dapl_server.c 2005-05-12 09:28:43.311012000 -0700
+++ linux-kernel16/test/dapltest/test/dapl_server.c 2005-05-13 15:36:58.026007000 -0700
@@ -277,7 +277,7 @@ DT_cs_Server (Params_t * params_ptr)
{
DAT_CR_HANDLE cr_handle;
struct dat_cr_arrival_event_data cr_stat;
- DAT_EVENT_NUMBER event_num;
+ enum dat_event_number event_num;
/* Set up the Per_Test_Data */
pt_ptr = DT_Alloc_Per_Test_Data (phead);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/test/dapl_test_util.c linux-kernel16/test/dapltest/test/dapl_test_util.c
--- linux-kernel15/test/dapltest/test/dapl_test_util.c 2005-05-13 11:37:44.379003000 -0700
+++ linux-kernel16/test/dapltest/test/dapl_test_util.c 2005-05-13 15:36:58.032023000 -0700
@@ -308,7 +308,7 @@ boolean_t
DT_conn_event_wait (DT_Tdep_Print_Head *phead,
DAT_EP_HANDLE ep_handle,
DAT_EVD_HANDLE evd_handle,
- DAT_EVENT_NUMBER *event_number)
+ enum dat_event_number *event_number)
{
for (;;)
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/test/dapl_transaction_test.c linux-kernel16/test/dapltest/test/dapl_transaction_test.c
--- linux-kernel15/test/dapltest/test/dapl_transaction_test.c 2005-05-13 11:37:44.390001000 -0700
+++ linux-kernel16/test/dapltest/test/dapl_transaction_test.c 2005-05-13 15:36:58.041018000 -0700
@@ -236,7 +236,7 @@ DT_Transaction_Main (void *param)
Thread *thread;
DAT_DTO_COOKIE dto_cookie;
char *private_data_str;
- DAT_EVENT_NUMBER event_num;
+ enum dat_event_number event_num;
DT_Tdep_Print_Head *phead;
int status = 0;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/test/dapl_util.c linux-kernel16/test/dapltest/test/dapl_util.c
--- linux-kernel15/test/dapltest/test/dapl_util.c 2005-05-13 14:31:35.144002000 -0700
+++ linux-kernel16/test/dapltest/test/dapl_util.c 2005-05-13 15:36:58.046009000 -0700
@@ -55,7 +55,7 @@ DT_RetToString (u32 ret_value)
* Map DAT_ASYNC_ERROR_CODE values to readable strings
*/
const char *
-DT_AsyncErr2Str (DAT_EVENT_NUMBER error_code)
+DT_AsyncErr2Str (enum dat_event_number error_code)
{
unsigned int i;
static struct
@@ -93,14 +93,14 @@ DT_AsyncErr2Str (DAT_EVENT_NUMBER error_
}
}
- return ( "Invalid_DAT_EVENT_NUMBER" );
+ return ( "Invalid_enum dat_event_number" );
}
/*
* Map DAT_EVENT_CODE values to readable strings
*/
const char *
-DT_EventToSTr (DAT_EVENT_NUMBER event_code)
+DT_EventToSTr (enum dat_event_number event_code)
{
unsigned int i;
static struct
@@ -140,7 +140,7 @@ DT_EventToSTr (DAT_EVENT_NUMBER event_co
}
}
- return ( "Invalid_DAT_EVENT_NUMBER" );
+ return ( "Invalid_enum dat_event_number" );
}
More information about the general
mailing list