[IBAL] sync flags bits between free and chk versions

git-svn-id: svn://openib.tc.cornell.edu/gen1@516 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/core/al/al_debug.h b/trunk/core/al/al_debug.h
index ae7e12e4431803c49cd55eec8b675135b8ccd9db..96d002fec6fac077eedbd89dcd6e88a701c99e24 100644 (file)
--- a/trunk/core/al/al_debug.h
+++ b/trunk/core/al/al_debug.h
@@ -33,9 +33,11 @@
 #if !defined(__AL_DEBUG_H__)\r
 #define __AL_DEBUG_H__\r
 \r
-#ifndef __MODULE__\r
-#define __MODULE__     "[AL]"\r
+#ifdef __MODULE__\r
+#undef __MODULE__\r
 #endif\r
+#define __MODULE__     "[AL]"\r
+\r
 \r
 #include <complib/cl_debug.h>\r
 #include <complib/cl_perf.h>\r
@@ -53,13 +55,15 @@ extern uint32_t                     g_al_dbg_flags;
 #define WPP_CONTROL_GUIDS \\r
        WPP_DEFINE_CONTROL_GUID(ALCtlGuid1,(B199CE55,F8BF,4147,B119,DACD1E5987A6),  \\r
        WPP_DEFINE_BIT( AL_DBG_ERROR) \\r
-       WPP_DEFINE_BIT( AL_DBG_AL_OBJ) \\r
+       WPP_DEFINE_BIT( AL_DBG_PNP) \\r
        WPP_DEFINE_BIT( AL_DBG_HDL) \\r
+       WPP_DEFINE_BIT( AL_DBG_AL_OBJ) \\r
        WPP_DEFINE_BIT( AL_DBG_SMI) \\r
        WPP_DEFINE_BIT( AL_DBG_SMI_CB) \\r
+       WPP_DEFINE_BIT( AL_DBG_RES1) \\r
        WPP_DEFINE_BIT( AL_DBG_MAD_POOL) \\r
        WPP_DEFINE_BIT( AL_DBG_MAD_SVC) \\r
-       WPP_DEFINE_BIT( AL_DBG_PNP) \\r
+       WPP_DEFINE_BIT( AL_DBG_RES2) \\r
        WPP_DEFINE_BIT( AL_DBG_CM) \\r
        WPP_DEFINE_BIT( AL_DBG_CA) \\r
        WPP_DEFINE_BIT( AL_DBG_MR) \\r
@@ -70,7 +74,9 @@ extern uint32_t                       g_al_dbg_flags;
        WPP_DEFINE_BIT( AL_DBG_AV)\\r
        WPP_DEFINE_BIT( AL_DBG_CQ)\\r
        WPP_DEFINE_BIT( AL_DBG_QP)\\r
+       WPP_DEFINE_BIT( AL_DBG_RES3) \\r
        WPP_DEFINE_BIT( AL_DBG_MW)\\r
+       WPP_DEFINE_BIT( AL_DBG_RES4) \\r
        WPP_DEFINE_BIT( AL_DBG_PROXY_CB)\\r
        WPP_DEFINE_BIT( AL_DBG_UAL)\\r
        WPP_DEFINE_BIT( AL_DBG_QUERY)\\r
@@ -84,13 +90,15 @@ extern uint32_t                     g_al_dbg_flags;
 #define WPP_CONTROL_GUIDS \\r
        WPP_DEFINE_CONTROL_GUID(ALCtlGuid2,(99DC84E3,B106,431e,88A6,4DD20C9BBDE3),  \\r
        WPP_DEFINE_BIT( AL_DBG_ERROR) \\r
-       WPP_DEFINE_BIT( AL_DBG_AL_OBJ) \\r
+       WPP_DEFINE_BIT( AL_DBG_PNP) \\r
        WPP_DEFINE_BIT( AL_DBG_HDL) \\r
+       WPP_DEFINE_BIT( AL_DBG_AL_OBJ) \\r
        WPP_DEFINE_BIT( AL_DBG_SMI) \\r
        WPP_DEFINE_BIT( AL_DBG_SMI_CB) \\r
+       WPP_DEFINE_BIT( AL_DBG_RES1) \\r
        WPP_DEFINE_BIT( AL_DBG_MAD_POOL) \\r
        WPP_DEFINE_BIT( AL_DBG_MAD_SVC) \\r
-       WPP_DEFINE_BIT( AL_DBG_PNP) \\r
+       WPP_DEFINE_BIT( AL_DBG_RES2) \\r
        WPP_DEFINE_BIT( AL_DBG_CM) \\r
        WPP_DEFINE_BIT( AL_DBG_CA) \\r
        WPP_DEFINE_BIT( AL_DBG_MR) \\r
@@ -101,7 +109,9 @@ extern uint32_t                     g_al_dbg_flags;
        WPP_DEFINE_BIT( AL_DBG_AV)\\r
        WPP_DEFINE_BIT( AL_DBG_CQ)\\r
        WPP_DEFINE_BIT( AL_DBG_QP)\\r
+       WPP_DEFINE_BIT( AL_DBG_RES3) \\r
        WPP_DEFINE_BIT( AL_DBG_MW)\\r
+       WPP_DEFINE_BIT( AL_DBG_RES4) \\r
        WPP_DEFINE_BIT( AL_DBG_PROXY_CB)\\r
        WPP_DEFINE_BIT( AL_DBG_UAL)\\r
        WPP_DEFINE_BIT( AL_DBG_QUERY)\\r
@@ -141,13 +151,13 @@ extern uint32_t                   g_al_dbg_flags;
 \r
 /* Debug message source */\r
 #define AL_DBG_ERR     (1 << 0)\r
-#define AL_DBG_AL_OBJ  (1 << 1)\r
+#define AL_DBG_PNP             (1 << 1)\r
 #define AL_DBG_HDL             (1 << 2)\r
+#define AL_DBG_AL_OBJ  (1 << 3)\r
 #define AL_DBG_SMI             (1 << 4)\r
 #define AL_DBG_SMI_CB  (1 << 5)\r
 #define AL_DBG_MAD_POOL        (1 << 7)\r
 #define AL_DBG_MAD_SVC (1 << 8)\r
-#define AL_DBG_PNP             (1 << 9)\r
 #define AL_DBG_CM              (1 << 10)\r
 #define AL_DBG_CA              (1 << 11)\r
 #define AL_DBG_MR              (1 << 12)\r

diff --git a/trunk/core/al/al_mgr_shared.c b/trunk/core/al/al_mgr_shared.c
index b9c8d23b9c83c60c55c3c75c3691b4ba2ff05b2b..39faefd77c362824a5d2792f02c0e14b32372d7e 100644 (file)
--- a/trunk/core/al/al_mgr_shared.c
+++ b/trunk/core/al/al_mgr_shared.c
@@ -41,7 +41,6 @@
 #endif\r
 #include "al_ci_ca.h"\r
 #include "ib_common.h"\r
-#include "al_debug.h"\r
 #include "al_mgr.h"\r
 #include "al_pnp.h"\r
 \r
@@ -672,3 +671,5 @@ ib_get_guid(
 \r
 \r
 \r
+\r
+\r