[openib-general] [PATCH][7/19] kDAPL: Remove typedef DAT_EVD_FLAGS
Tom Duffy
Tom.Duffy at Sun.COM
Sun May 15 11:27:17 PDT 2005
Signed-off-by: Tom Duffy <tduffy at sun.com>
diff -Nurp -X /home/tduffy/dontdiff linux-kernel6/dat/dat.h linux-kernel7/dat/dat.h
--- linux-kernel6/dat/dat.h 2005-05-13 13:49:33.324968000 -0700
+++ linux-kernel7/dat/dat.h 2005-05-13 13:53:31.679965000 -0700
@@ -438,7 +438,7 @@ enum dat_close_flags {
#define DAT_CLOSE_DEFAULT DAT_CLOSE_ABRUPT_FLAG
-typedef enum dat_evd_flags {
+enum dat_evd_flags {
DAT_EVD_SOFTWARE_FLAG = 0x001,
DAT_EVD_CR_FLAG = 0x010,
DAT_EVD_DTO_FLAG = 0x020,
@@ -448,7 +448,7 @@ typedef enum dat_evd_flags {
/* DAT events only, no software events */
DAT_EVD_DEFAULT_FLAG = 0x1F0
-} DAT_EVD_FLAGS;
+};
typedef enum dat_psp_flags {
DAT_PSP_CONSUMER_FLAG = 0x00, /* Consumer creates an Endpoint */
@@ -945,7 +945,7 @@ struct dat_evd_param {
int evd_qlen;
DAT_UPCALL_POLICY upcall_policy;
struct dat_upcall_object upcall;
- DAT_EVD_FLAGS evd_flags;
+ enum dat_evd_flags evd_flags;
};
/*
@@ -1048,7 +1048,7 @@ typedef enum dat_ep_creator_for_psp {
* and column represents an event stream type. An entry is a 1 if the event
* streams of its row and column can feed the same EVD, and 0 otherwise. The
* order of the event streams in each row and column is the same as in the
- * definition of DAT_EVD_FLAGS: index 0 - Software Event, 1- Connection Request,
+ * definition of dat_evd_flags: index 0 - Software Event, 1- Connection Request,
* 2 - DTO Completion, 3 - Connection event, 4 - RMR Bind Completion,
* 5 - Asynchronous event. By definition each diagonal entry is 1.
* Consumer allocates an array for it and passes it IN as a pointer
@@ -1260,7 +1260,7 @@ typedef u32 (*DAT_IA_MEMTYPE_HINT_FUNC)(
typedef u32 (*DAT_EVD_KCREATE_FUNC) (DAT_IA_HANDLE, int, DAT_UPCALL_POLICY,
const struct dat_upcall_object *,
- DAT_EVD_FLAGS, DAT_EVD_HANDLE *);
+ enum dat_evd_flags, DAT_EVD_HANDLE *);
typedef u32 (*DAT_EVD_MODIFY_UPCALL_FUNC)(DAT_EVD_HANDLE, DAT_UPCALL_POLICY,
const struct dat_upcall_object *);
@@ -1464,7 +1464,8 @@ static inline u32 dat_evd_free(DAT_EVD_H
static inline u32 dat_evd_kcreate(DAT_IA_HANDLE ia, int qlen,
DAT_UPCALL_POLICY policy,
const struct dat_upcall_object *upcall,
- DAT_EVD_FLAGS flags, DAT_EVD_HANDLE * evd)
+ enum dat_evd_flags flags,
+ DAT_EVD_HANDLE * evd)
{
return DAT_CALL_PROVIDER_FUNC(evd_kcreate_func, ia, qlen, policy,
upcall, flags, evd);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel6/dat-provider/dapl_evd_kcreate.c linux-kernel7/dat-provider/dapl_evd_kcreate.c
--- linux-kernel6/dat-provider/dapl_evd_kcreate.c 2005-05-13 10:10:33.768971000 -0700
+++ linux-kernel7/dat-provider/dapl_evd_kcreate.c 2005-05-13 13:52:08.753001000 -0700
@@ -51,7 +51,7 @@
u32 dapl_evd_kcreate(DAT_IA_HANDLE ia_handle, int evd_min_qlen,
DAT_UPCALL_POLICY upcall_policy, /* ignore */
const struct dat_upcall_object *upcall,
- DAT_EVD_FLAGS evd_flags, DAT_EVD_HANDLE *evd_handle)
+ enum dat_evd_flags evd_flags, DAT_EVD_HANDLE *evd_handle)
{
DAPL_IA *ia_ptr;
DAPL_EVD *evd_ptr;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel6/dat-provider/dapl_evd_util.c linux-kernel7/dat-provider/dapl_evd_util.c
--- linux-kernel6/dat-provider/dapl_evd_util.c 2005-05-13 11:10:25.793008000 -0700
+++ linux-kernel7/dat-provider/dapl_evd_util.c 2005-05-13 13:52:08.757991000 -0700
@@ -50,7 +50,7 @@ u32 dapl_evd_event_alloc(DAPL_EVD *evd_p
*/
u32 dapl_evd_internal_create(DAPL_IA *ia_ptr, DAPL_CNO *cno_ptr,
- int min_qlen, DAT_EVD_FLAGS evd_flags,
+ int min_qlen, enum dat_evd_flags evd_flags,
DAPL_EVD **evd_ptr_ptr)
{
DAPL_EVD *evd_ptr;
@@ -127,7 +127,7 @@ bail:
* alloc and initialize an EVD struct
*/
DAPL_EVD *dapl_evd_alloc(DAPL_IA * ia_ptr, DAPL_CNO * cno_ptr,
- DAT_EVD_FLAGS evd_flags, int qlen)
+ enum dat_evd_flags evd_flags, int qlen)
{
DAPL_EVD *evd_ptr;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel6/dat-provider/dapl_evd_util.h linux-kernel7/dat-provider/dapl_evd_util.h
--- linux-kernel6/dat-provider/dapl_evd_util.h 2005-05-13 11:10:25.796005000 -0700
+++ linux-kernel7/dat-provider/dapl_evd_util.h 2005-05-13 13:52:08.761013000 -0700
@@ -41,11 +41,11 @@
#include "dapl.h"
u32 dapl_evd_internal_create(DAPL_IA *ia_ptr, DAPL_CNO *cno_ptr,
- int min_qlen, DAT_EVD_FLAGS evd_flags,
+ int min_qlen, enum dat_evd_flags evd_flags,
DAPL_EVD **evd_ptr_ptr);
DAPL_EVD *dapl_evd_alloc(DAPL_IA * ia_ptr, DAPL_CNO * cno_ptr,
- DAT_EVD_FLAGS evd_flags, int qlen);
+ enum dat_evd_flags evd_flags, int qlen);
u32 dapl_evd_dealloc(DAPL_EVD *evd_ptr);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel6/dat-provider/dapl.h linux-kernel7/dat-provider/dapl.h
--- linux-kernel6/dat-provider/dapl.h 2005-05-13 13:48:10.174963000 -0700
+++ linux-kernel7/dat-provider/dapl.h 2005-05-13 13:54:33.483962000 -0700
@@ -260,7 +260,7 @@ struct dapl_cno {
struct dapl_evd {
DAPL_HEADER header;
DAPL_EVD_STATE evd_state;
- DAT_EVD_FLAGS evd_flags;
+ enum dat_evd_flags evd_flags;
/* Derived from evd_flags; see dapls_evd_internal_create. */
boolean_t evd_producer_locking_needed;
@@ -513,7 +513,7 @@ extern u32 dapl_ia_memtype_hint(DAT_IA_H
extern u32 dapl_evd_kcreate(DAT_IA_HANDLE ia_handle, int evd_min_qlen,
DAT_UPCALL_POLICY upcall_policy,
const struct dat_upcall_object * upcall,
- DAT_EVD_FLAGS evd_flags,
+ enum dat_evd_flags evd_flags,
DAT_EVD_HANDLE * evd_handle);
extern u32 dapl_evd_kquery(DAT_EVD_HANDLE evd_handle,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel6/dat-provider/dapl_ia_query.c linux-kernel7/dat-provider/dapl_ia_query.c
--- linux-kernel6/dat-provider/dapl_ia_query.c 2005-05-12 09:28:47.538012000 -0700
+++ linux-kernel7/dat-provider/dapl_ia_query.c 2005-05-13 13:52:08.763960000 -0700
@@ -128,7 +128,7 @@ u32 dapl_ia_query(DAT_IA_HANDLE ia_handl
/*
* Set up evd_stream_merging_supported options. Note there is
* one bit per allowable combination, using the ordinal
- * position of the DAT_EVD_FLAGS as positions in the
+ * position of the enum dat_evd_flags as positions in the
* array. e.g.
* [0][0] is DAT_EVD_SOFTWARE_FLAG | DAT_EVD_SOFTWARE_FLAG,
* [0][1] is DAT_EVD_SOFTWARE_FLAG | DAT_EVD_CR_FLAG, and
diff -Nurp -X /home/tduffy/dontdiff linux-kernel6/test/dapltest/include/dapl_tdep.h linux-kernel7/test/dapltest/include/dapl_tdep.h
--- linux-kernel6/test/dapltest/include/dapl_tdep.h 2005-05-12 09:34:59.325004000 -0700
+++ linux-kernel7/test/dapltest/include/dapl_tdep.h 2005-05-13 13:52:08.776963000 -0700
@@ -48,7 +48,7 @@ u32
DT_Tdep_evd_create (DAT_IA_HANDLE ia_handle,
int evd_min_qlen,
DAT_CNO_HANDLE cno_handle,
- DAT_EVD_FLAGS evd_flags,
+ enum dat_evd_flags evd_flags,
DAT_EVD_HANDLE *evd_handle_ptr);
u32
diff -Nurp -X /home/tduffy/dontdiff linux-kernel6/test/dapltest/kdapl/kdapl_tdep_evd.c linux-kernel7/test/dapltest/kdapl/kdapl_tdep_evd.c
--- linux-kernel6/test/dapltest/kdapl/kdapl_tdep_evd.c 2005-05-12 09:34:59.334001000 -0700
+++ linux-kernel7/test/dapltest/kdapl/kdapl_tdep_evd.c 2005-05-13 13:52:08.779966000 -0700
@@ -98,7 +98,7 @@ u32
DT_Tdep_evd_create (DAT_IA_HANDLE ia_handle,
int evd_min_qlen,
DAT_CNO_HANDLE cno_handle,
- DAT_EVD_FLAGS evd_flags,
+ enum dat_evd_flags evd_flags,
DAT_EVD_HANDLE *evd_handle_ptr)
{
diff -Nurp -X /home/tduffy/dontdiff linux-kernel6/test/dapltest/test/dapl_limit.c linux-kernel7/test/dapltest/test/dapl_limit.c
--- linux-kernel6/test/dapltest/test/dapl_limit.c 2005-05-13 11:38:08.203004000 -0700
+++ linux-kernel7/test/dapltest/test/dapl_limit.c 2005-05-13 13:52:08.788964000 -0700
@@ -433,7 +433,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
* The abuse is not for us this time, just prep Obj_Set.
*/
unsigned int w=0;
- DAT_EVD_FLAGS flags = ( DAT_EVD_DTO_FLAG
+ enum dat_evd_flags flags = ( DAT_EVD_DTO_FLAG
/* | DAT_EVD_SOFTWARE_FLAG */
| DAT_EVD_CR_FLAG
| DAT_EVD_RMR_BIND_FLAG ); /* not ASYNC */
@@ -484,7 +484,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
unsigned int count = START_COUNT;
DAT_EVD_HANDLE *hdlptr = (DAT_EVD_HANDLE *)
DT_Mdep_Malloc (count * sizeof (*hdlptr));
- DAT_EVD_FLAGS flags = ( DAT_EVD_DTO_FLAG
+ enum dat_evd_flags flags = ( DAT_EVD_DTO_FLAG
| DAT_EVD_RMR_BIND_FLAG
| DAT_EVD_CR_FLAG);
More information about the general
mailing list