From f2da4d7062358606bc720e8d235a328e7ba8d6dc Mon Sep 17 00:00:00 2001
From: sleybo <sleybo@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Mon, 9 Oct 2006 12:20:51 +0000
Subject: [PATCH] [IBAL] sync flags bits between free and chk versions

git-svn-id: svn://openib.tc.cornell.edu/gen1@516 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 trunk/core/al/al_debug.h      | 26 ++++++++++++++++++--------
 trunk/core/al/al_mgr_shared.c |  3 ++-
 2 files changed, 20 insertions(+), 9 deletions(-)

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