[ofw] [Patch 1/62] Reference implementation of NDv2

Fab Tillier ftillier at microsoft.com
Wed Feb 20 15:30:07 PST 2013


This one is pretty boring.  The build environment sets the preprocessor variable DBG for debug builds to 1.  It may be set, but zero.   Thus, the proper check for that variable is #if DBG, not #ifdef DBG.

Apply with svn patch.

Signed-off-by:Fab Tillier <ftillier at microsoft.com>

diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_common.c .\core\al\al_common.c
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_common.c	Thu May 31 11:22:16 2012
+++ .\core\al\al_common.c	Thu Jul 26 15:31:13 2012
@@ -165,7 +165,7 @@ construct_al_obj(
 	p_obj->type = obj_type;
 	p_obj->timeout_ms = AL_DEFAULT_TIMEOUT_MS;
 	p_obj->ref_cnt = 1;
-#ifdef DBG
+#if DBG
 	ref_trace_init(p_obj);
 #endif
 	cl_event_construct( &p_obj->event );
@@ -264,7 +264,7 @@ reset_al_obj(
 	p_obj->hdl = AL_INVALID_HANDLE;
 	cl_event_reset( &p_obj->event );
 	
-#ifdef DBG
+#if DBG
 	ref_trace_destroy(p_obj);
 	ref_trace_init(p_obj);
 #endif
@@ -389,6 +389,7 @@ detach_al_obj(
 	AL_EXIT( AL_DBG_AL_OBJ );
 }
 
+
 /*
  * Increment a reference count on an object.  This object should not be
  * an object's parent.
@@ -495,7 +496,7 @@ destroy_al_obj(
 	cl_event_destroy( &p_obj->event );
 	cl_spinlock_destroy( &p_obj->lock );
 	
-#ifdef DBG
+#if DBG
 	ref_trace_destroy(p_obj);
 #endif
 
@@ -617,7 +618,7 @@ sync_destroy_obj(
 					("IBAL stuck: AL object %s, ref_cnt: %d. Forcing object destruction.\n",
 					ib_get_obj_type( p_obj ), p_obj->ref_cnt));
 		}
-#ifdef DBG
+#if DBG
 
 		/* Print the ref count tracking */
 		if ( cl_status != CL_SUCCESS )
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_common.h .\core\al\al_common.h
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_common.h	Thu May 31 11:22:16 2012
+++ .\core\al\al_common.h	Thu Jul 26 15:31:13 2012
@@ -42,7 +42,7 @@
 #include <complib/cl_obj.h>
 #include <complib/cl_vector.h>
 
-#ifdef DBG
+#if DBG
 #include "al_ref_trace.h"
 #endif
 
@@ -238,6 +238,7 @@ typedef uint32_t	al_obj_type_t;
 const char* ib_obj_type_str[];
 #endif
 
+
 /*
  * Base object for AL resources.  This must be the first element of
  * AL resources.
@@ -268,7 +269,7 @@ typedef struct _al_obj
 	cl_spinlock_t				lock;
 	cl_qlist_t					obj_list;
 	atomic32_t					ref_cnt;
-#ifdef DBG
+#if DBG
 	obj_ref_trace_t				ref_trace;
 #endif
 	cl_list_item_t				list_item;
@@ -343,7 +344,7 @@ int32_t
 ref_al_obj_inner(
 	IN				al_obj_t * const			p_obj );
 
-#ifdef DBG
+#if DBG
 #define ref_ctx_al_obj(_p_obj_, ref_inx) 				\
 	ref_trace_insert(__FILE__, __LINE__,_p_obj_, AL_REF, ref_inx)
 #define ref_al_obj(_p_obj_) 	ref_ctx_al_obj(_p_obj_, 0)
@@ -367,7 +368,7 @@ AL_EXPORT int32_t AL_API
 deref_al_obj_inner(
 	IN				al_obj_t * const			p_obj );
 
-#ifdef DBG
+#if DBG
 #define deref_ctx_al_obj(_p_obj_, ref_inx)						\
 	ref_trace_insert(__FILE__, __LINE__,_p_obj_, AL_DEREF, ref_inx) 
 	
@@ -380,7 +381,6 @@ deref_al_obj_inner(
 AL_EXPORT int32_t AL_API
 deref_al_obj_cb(
 	IN				al_obj_t * const			p_obj );
-
 
 
 /*
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_init.c .\core\al\al_init.c
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_init.c	Thu May 31 11:22:16 2012
+++ .\core\al\al_init.c	Wed May 23 18:26:47 2012
@@ -44,7 +44,7 @@
 #include "ib_common.h"
 
 
-#ifdef DBG
+#if DBG
 #include "al_ref_trace.h"
 #endif
 
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_pd.c .\core\al\al_pd.c
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_pd.c	Thu May 31 11:22:16 2012
+++ .\core\al\al_pd.c	Wed May 23 18:26:47 2012
@@ -460,7 +460,6 @@ ib_create_av_ctx(
 
 
 
-
 ib_api_status_t
 ib_create_mw(
 	IN		const	ib_pd_handle_t				h_pd,
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_qp.c .\core\al\al_qp.c
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_qp.c	Thu May 31 11:22:16 2012
+++ .\core\al\al_qp.c	Thu Jul 26 15:38:29 2012
@@ -2066,7 +2066,6 @@ mad_qp_comp(
 
 	status = ib_rearm_cq( h_cq, FALSE );
 	CL_ASSERT( status == IB_SUCCESS );
-
 }
 
 
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_ref_trace.c .\core\al\al_ref_trace.c
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\al_ref_trace.c	Thu May 31 11:22:16 2012
+++ .\core\al\al_ref_trace.c	Thu May 31 12:54:12 2012
@@ -31,7 +31,7 @@
 
 #pragma warning(disable:4206) //nonstandard extension used : translation unit is empty
 
-#ifdef DBG
+#if DBG
 #include "al_ref_trace.h"
 #include "al_common.h"
 #include "al_debug.h"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\kernel\ibal.rc .\core\al\kernel\ibal.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\kernel\ibal.rc	Thu May 31 11:22:15 2012
+++ .\core\al\kernel\ibal.rc	Wed May 23 18:26:47 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_DRV
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"Kernel Mode InfiniBand Access Layer (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"Kernel Mode InfiniBand Access Layer"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\user\ibal.rc .\core\al\user\ibal.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\user\ibal.rc	Thu May 31 11:22:17 2012
+++ .\core\al\user\ibal.rc	Wed May 23 18:26:47 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_DLL
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"InfiniBand Access Layer (Debug)"
 #define VER_INTERNALNAME_STR		"ibald.dll"
 #define VER_ORIGINALFILENAME_STR	"ibald.dll"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\user\SOURCES .\core\al\user\SOURCES
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\al\user\SOURCES	Thu Mar 29 00:15:21 2012
+++ .\core\al\user\SOURCES	Thu Jul 26 21:30:41 2012
@@ -80,7 +80,7 @@ TARGETLIBS= \
 
 
 !if !$(FREEBUILD)
-C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
 !endif
 
 !IFDEF ENABLE_EVENT_TRACING
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\bus\kernel\ibbus.rc .\core\bus\kernel\ibbus.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\bus\kernel\ibbus.rc	Thu May 31 11:22:15 2012
+++ .\core\bus\kernel\ibbus.rc	Wed May 23 18:26:47 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_DRV
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"InfiniBand Fabric Bus Driver (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"InfiniBand Fabric Bus Driver"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\complib\user\cl_debug.c .\core\complib\user\cl_debug.c
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\complib\user\cl_debug.c	Thu May 31 11:22:15 2012
+++ .\core\complib\user\cl_debug.c	Wed May 23 18:26:47 2012
@@ -54,7 +54,9 @@ cl_msg_out( 
 		OutputDebugStringA( "WARNING: cl_msg_out() previous message truncated.\n" );
 	}
 	else
+	{
 		OutputDebugStringA( buffer );
+	}
 	va_end(args);
 }
 
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\complib\user\complib.rc .\core\complib\user\complib.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\complib\user\complib.rc	Thu May 31 11:22:15 2012
+++ .\core\complib\user\complib.rc	Thu Jul 26 15:31:14 2012
@@ -33,14 +33,12 @@
 #define VER_FILETYPE				VFT_DLL
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"Component Library (Debug)"
-#define VER_INTERNALNAME_STR		"complib.dll"
-#define VER_ORIGINALFILENAME_STR	"complib.dll"
 #else
 #define VER_FILEDESCRIPTION_STR		"Component Library"
+#endif
 #define VER_INTERNALNAME_STR		"complib.dll"
 #define VER_ORIGINALFILENAME_STR	"complib.dll"
-#endif
 
 #include <common.ver>
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\complib\user\SOURCES .\core\complib\user\SOURCES
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\complib\user\SOURCES	Thu Mar 29 00:15:19 2012
+++ .\core\complib\user\SOURCES	Thu Jul 26 21:31:36 2012
@@ -42,7 +42,7 @@ INCLUDES=..\..\..\inc;..\..\..\inc\user;
 USER_C_FLAGS=$(USER_C_FLAGS) -DEXPORT_CL_SYMBOLS
 
 !if !$(FREEBUILD)
-C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
 !endif
 
 TARGETLIBS=\
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\ibat\user\SOURCES .\core\ibat\user\SOURCES
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\ibat\user\SOURCES	Thu Mar 29 00:15:17 2012
+++ .\core\ibat\user\SOURCES	Wed May 23 15:14:36 2012
@@ -9,5 +9,5 @@
 MSC_WARNING_LEVEL= /W4
 
 !if !$(FREEBUILD)
-C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
 !endif
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\ibat_ex\user\ib_at.cpp .\core\ibat_ex\user\ib_at.cpp
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\ibat_ex\user\ib_at.cpp	Thu May 31 11:22:15 2012
+++ .\core\ibat_ex\user\ib_at.cpp	Wed May 23 18:26:47 2012
@@ -54,7 +54,6 @@ namespace IBAT_EX
 		__in HANDLE hIbatDev 
 		)
 	{
-
 		CloseHandle( hIbatDev );
 	}
 
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\ibat_ex\user\roce_at.h .\core\ibat_ex\user\roce_at.h
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\ibat_ex\user\roce_at.h	Thu May 31 11:22:15 2012
+++ .\core\ibat_ex\user\roce_at.h	Wed May 23 18:26:47 2012
@@ -62,7 +62,7 @@ extern "C"
 #endif // _PREFAST_
 
 #ifndef CL_ASSERT
-#ifdef DBG
+#if DBG
 #define CL_ASSERT( exp )	(void)(!(exp)?OutputDebugString("Assertion Failed:" #exp "\n"),DebugBreak(),FALSE:TRUE);CONDITION_ASSUMED(exp)
 #else
 #define CL_ASSERT( exp )
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\iou\kernel\ibiou.rc .\core\iou\kernel\ibiou.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\iou\kernel\ibiou.rc	Thu May 31 11:22:17 2012
+++ .\core\iou\kernel\ibiou.rc	Wed May 23 18:26:47 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_DRV
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"InfiniBand I/O Unit Driver (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"InfiniBand I/O Unit Driver"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\winmad\kernel\winmad.rc .\core\winmad\kernel\winmad.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\winmad\kernel\winmad.rc	Thu Mar 29 00:15:17 2012
+++ .\core\winmad\kernel\winmad.rc	Wed May 23 15:14:36 2012
@@ -32,7 +32,7 @@
 #define VER_FILETYPE				VFT_DRV
 #define VER_FILESUBTYPE				VFT2_DRV_SYSTEM
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"Kernel WinMad (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"Kernel WinMad"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\winmad\user\winmad.rc .\core\winmad\user\winmad.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\winmad\user\winmad.rc	Thu Mar 29 00:15:18 2012
+++ .\core\winmad\user\winmad.rc	Wed May 23 15:14:36 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE			VFT_DLL
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"WinMad (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"WinMad"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\winmad\user\wm_exports.src .\core\winmad\user\wm_exports.src
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\winmad\user\wm_exports.src	Thu Mar 29 00:15:18 2012
+++ .\core\winmad\user\wm_exports.src	Wed May 23 15:14:36 2012
@@ -1,6 +1,5 @@
 LIBRARY winmad.dll
 
-
 EXPORTS
 DllCanUnloadNow	PRIVATE
 
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\winverbs\kernel\winverbs.rc .\core\winverbs\kernel\winverbs.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\winverbs\kernel\winverbs.rc	Thu Mar 29 00:15:18 2012
+++ .\core\winverbs\kernel\winverbs.rc	Wed May 23 15:14:36 2012
@@ -32,7 +32,7 @@
 #define VER_FILETYPE				VFT_DRV
 #define VER_FILESUBTYPE				VFT2_DRV_SYSTEM
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"Kernel WinVerbs (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"Kernel WinVerbs"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\winverbs\user\winverbs.rc .\core\winverbs\user\winverbs.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\core\winverbs\user\winverbs.rc	Thu Mar 29 00:15:18 2012
+++ .\core\winverbs\user\winverbs.rc	Wed May 23 15:14:36 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE			VFT_DLL
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"WinVerbs (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"WinVerbs"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\bus\core\core.rc .\hw\mlx4\kernel\bus\core\core.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\bus\core\core.rc	Thu May 31 11:22:18 2012
+++ .\hw\mlx4\kernel\bus\core\core.rc	Wed May 23 18:26:47 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_DRV
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"MLX4 Upper Layer (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"MLX4 Upper Layer"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\bus\drv\bus.rc .\hw\mlx4\kernel\bus\drv\bus.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\bus\drv\bus.rc	Thu Mar 29 00:15:28 2012
+++ .\hw\mlx4\kernel\bus\drv\bus.rc	Wed May 23 15:14:36 2012
@@ -7,7 +7,7 @@
 
 #ifndef HP_PROD
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR     "MLX4 Bus Driver (checked)"
 #else
 #define VER_FILEDESCRIPTION_STR     "MLX4 Bus Driver"
@@ -25,7 +25,7 @@
 #endif
 #define VER_COMPANYNAME_STR		"Hewlett-Packard"
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR     "HP Bus Driver (checked)"
 #else
 #define VER_FILEDESCRIPTION_STR     "HP Bus Driver"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\bus\ib\ib.rc .\hw\mlx4\kernel\bus\ib\ib.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\bus\ib\ib.rc	Thu May 31 11:22:18 2012
+++ .\hw\mlx4\kernel\bus\ib\ib.rc	Wed May 23 18:26:47 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_DRV
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"MLX4 InfiniBand Specific Services (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"MLX4 InfiniBand Specific Services"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\bus\net\net.rc .\hw\mlx4\kernel\bus\net\net.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\bus\net\net.rc	Thu May 31 11:22:18 2012
+++ .\hw\mlx4\kernel\bus\net\net.rc	Wed May 23 18:26:47 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_DRV
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"MLX4 Common HW Services (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"MLX4 Common HW Services"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\genutils\gu_hash.h .\hw\mlx4\kernel\genutils\gu_hash.h
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\genutils\gu_hash.h	Thu Mar 29 00:15:29 2012
+++ .\hw\mlx4\kernel\genutils\gu_hash.h	Thu Jul 26 15:31:14 2012
@@ -52,7 +52,7 @@ template <class HashFunction, class Hash
          HashVal* hashVal = GetHashVal(Data);
          int index =  m_hashFunction(hashVal->m_keyType) % m_hashSize;
          
-#ifdef DBG
+#if DBG
          CEndPoint* p_TempEndPoint = (CEndPoint*)Get(hashVal);
          ASSERT(p_TempEndPoint == NULL);
 #endif
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\hca\data.h .\hw\mlx4\kernel\hca\data.h
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\kernel\hca\data.h	Thu May 31 11:22:19 2012
+++ .\hw\mlx4\kernel\hca\data.h	Wed May 23 18:26:47 2012
@@ -60,7 +60,7 @@ extern char				mlnx_uvp_lib_name[];
  */
 #define MLNX_COMP_MODEL		3
 
-#ifdef DBG
+#if DBG
 #define VALIDATE_INDEX(index, limit, error, label) \
 	{                  \
 		if (index >= limit) \
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\user\hca\mlx4u.rc .\hw\mlx4\user\hca\mlx4u.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\user\hca\mlx4u.rc	Thu May 31 11:22:19 2012
+++ .\hw\mlx4\user\hca\mlx4u.rc	Wed May 23 18:26:47 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_DLL
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"HCA User Mode Verb Provider (Debug)"
 #define VER_INTERNALNAME_STR		"mlx4u.dll"
 #define VER_ORIGINALFILENAME_STR	"mlx4u.dll"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\user\hca\SOURCES .\hw\mlx4\user\hca\SOURCES
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\user\hca\SOURCES	Thu Mar 29 00:15:30 2012
+++ .\hw\mlx4\user\hca\SOURCES	Thu Jul 26 21:29:20 2012
@@ -46,11 +64,10 @@ TARGETLIBS=\
 	$(SDK_LIB_PATH)\user32.lib \
 	$(SDK_LIB_PATH)\kernel32.lib \
 	$(SDK_LIB_PATH)\Advapi32.lib \
-        $(TARGETPATH)\*\complib.lib
-
+    $(TARGETPATH)\*\complib.lib \
 
 !if !$(FREEBUILD)
-C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
 !endif
 
 #LINKER_FLAGS=/MAP /MAPINFO:LINES
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mthca\kernel\hca.rc .\hw\mthca\kernel\hca.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mthca\kernel\hca.rc	Thu May 31 11:22:19 2012
+++ .\hw\mthca\kernel\hca.rc	Wed May 23 18:26:48 2012
@@ -32,7 +32,7 @@
 
 #define VER_FILETYPE				VFT_DRV
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR     "HCA Driver (checked)"
 #else
 #define VER_FILEDESCRIPTION_STR     "HCA Driver"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mthca\kernel\hca_data.h .\hw\mthca\kernel\hca_data.h
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mthca\kernel\hca_data.h	Thu May 31 11:22:19 2012
+++ .\hw\mthca\kernel\hca_data.h	Wed May 23 18:26:48 2012
@@ -73,7 +73,7 @@ extern uint32_t g_profile_rd_out;
  */
 #define MLNX_COMP_MODEL		3
 
-#ifdef DBG
+#if DBG
 #define VALIDATE_INDEX(index, limit, error, label) \
 	{                  \
 		if (index >= limit) \
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mthca\user\mlnx_uvp.rc .\hw\mthca\user\mlnx_uvp.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mthca\user\mlnx_uvp.rc	Thu May 31 11:22:20 2012
+++ .\hw\mthca\user\mlnx_uvp.rc	Wed May 23 18:26:48 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_DLL
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR     "HCA User Mode Verb Provider (checked)"
 #define VER_INTERNALNAME_STR		"mthcau.dll"
 #define VER_ORIGINALFILENAME_STR	"mthcau.dll"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mthca\user\SOURCES .\hw\mthca\user\SOURCES
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mthca\user\SOURCES	Thu Mar 29 00:15:31 2012
+++ .\hw\mthca\user\SOURCES	Wed May 23 15:14:37 2012
@@ -66,7 +62,7 @@ TARGETLIBS=\
 
 
 !if !$(FREEBUILD)
-C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
 !endif
 
 #LINKER_FLAGS=/MAP /MAPINFO:LINES
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\inc\kernel\rdma\verbs.h .\inc\kernel\rdma\verbs.h
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\inc\kernel\rdma\verbs.h	Thu Mar 29 00:15:24 2012
+++ .\inc\kernel\rdma\verbs.h	Thu Jul 26 15:31:14 2012
@@ -19,7 +19,7 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AWV
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
  * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\inc\user\linux\stdbool.h .\inc\user\linux\stdbool.h
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\inc\user\linux\stdbool.h	Thu May 31 11:22:18 2012
+++ .\inc\user\linux\stdbool.h	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 #ifndef __STD_BOOL_H__
 #define __STD_BOOL_H__ 1
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\inc\user\linux\stdint.h .\inc\user\linux\stdint.h
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\inc\user\linux\stdint.h	Thu May 31 11:22:18 2012
+++ .\inc\user\linux\stdint.h	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 #ifndef __STDINT_H__
 #define __STDINT_H__ 1
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibaddr\ibaddr.rc .\tools\infiniband-diags\src\ibaddr\ibaddr.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibaddr\ibaddr.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\ibaddr\ibaddr.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Address Information (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Address Information"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\iblinkinfo\iblinkinfo.rc .\tools\infiniband-diags\src\iblinkinfo\iblinkinfo.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\iblinkinfo\iblinkinfo.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\iblinkinfo\iblinkinfo.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Network Link Information (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Network Link Information"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibnetdiscover\ibnetdiscover.rc .\tools\infiniband-diags\src\ibnetdiscover\ibnetdiscover.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibnetdiscover\ibnetdiscover.rc	Thu May 31 11:22:11 2012
+++ .\tools\infiniband-diags\src\ibnetdiscover\ibnetdiscover.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Network Topology Discovery (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Network Topology Discovery"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibping\ibping.rc .\tools\infiniband-diags\src\ibping\ibping.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibping\ibping.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\ibping\ibping.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand MAD Ping (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand MAD Ping"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibportstate\ibportstate.rc .\tools\infiniband-diags\src\ibportstate\ibportstate.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibportstate\ibportstate.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\ibportstate\ibportstate.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Port State (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Port State"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibqueryerrors\ibqueryerrors.rc .\tools\infiniband-diags\src\ibqueryerrors\ibqueryerrors.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibqueryerrors\ibqueryerrors.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\ibqueryerrors\ibqueryerrors.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Error Reporting (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Error Reporting"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibroute\ibroute.rc .\tools\infiniband-diags\src\ibroute\ibroute.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibroute\ibroute.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\ibroute\ibroute.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"Query InfiniBand Switch Forwarding Tables (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"Query InfiniBand Switch Forwarding Tables"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibsendtrap\ibsendtrap.rc .\tools\infiniband-diags\src\ibsendtrap\ibsendtrap.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibsendtrap\ibsendtrap.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\ibsendtrap\ibsendtrap.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"Send InfiniBand Traps (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"Send InfiniBand Traps"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibstat\ibstat.rc .\tools\infiniband-diags\src\ibstat\ibstat.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibstat\ibstat.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\ibstat\ibstat.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Fabric Stats (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Fabric Stats"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibsysstat\ibsysstat.rc .\tools\infiniband-diags\src\ibsysstat\ibsysstat.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibsysstat\ibsysstat.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\ibsysstat\ibsysstat.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand SM Information (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand SM Information"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibtracert\ibtracert.rc .\tools\infiniband-diags\src\ibtracert\ibtracert.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\ibtracert\ibtracert.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\ibtracert\ibtracert.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"Trace InfiniBand Path (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"Trace InfiniBand Path"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\mcm_rereg_test\mcm_rereg_test.rc .\tools\infiniband-diags\src\mcm_rereg_test\mcm_rereg_test.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\mcm_rereg_test\mcm_rereg_test.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\mcm_rereg_test\mcm_rereg_test.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Multicase Registration Test (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Multicase Registration Test"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\perfquery\perfquery.rc .\tools\infiniband-diags\src\perfquery\perfquery.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\perfquery\perfquery.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\perfquery\perfquery.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Performance Stats Query (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Performance Stats Query"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\saquery\saquery.rc .\tools\infiniband-diags\src\saquery\saquery.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\saquery\saquery.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\saquery\saquery.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand SA Query Utility (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand SA Query Utility"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\sminfo\sminfo.rc .\tools\infiniband-diags\src\sminfo\sminfo.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\sminfo\sminfo.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\sminfo\sminfo.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand SM Information (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand SM Information"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\smpdump\smpdump.rc .\tools\infiniband-diags\src\smpdump\smpdump.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\smpdump\smpdump.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\smpdump\smpdump.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"Display IB SM Attributes (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"Display IB SM Attributes"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\smpquery\smpquery.rc .\tools\infiniband-diags\src\smpquery\smpquery.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\smpquery\smpquery.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\smpquery\smpquery.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"Query IB SM Attributes (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"Query IB SM Attributes"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\vendstat\vendstat.rc .\tools\infiniband-diags\src\vendstat\vendstat.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\infiniband-diags\src\vendstat\vendstat.rc	Thu May 31 11:22:10 2012
+++ .\tools\infiniband-diags\src\vendstat\vendstat.rc	Wed May 23 18:26:48 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Vendor HW Stats (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR	"InfiniBand Vendor HW Stats"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\ndinstall\user\installsp.rc .\tools\ndinstall\user\installsp.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\ndinstall\user\installsp.rc	Thu May 31 11:22:11 2012
+++ .\tools\ndinstall\user\installsp.rc	Wed May 23 18:26:48 2012
@@ -34,7 +34,7 @@
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"NetworkDirect for InfiniBand installer (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"NetworkDirect for InfiniBand installer"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\part_man\user\part_man.rc .\tools\part_man\user\part_man.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\part_man\user\part_man.rc	Thu Mar 29 00:15:00 2012
+++ .\tools\part_man\user\part_man.rc	Wed May 23 15:14:37 2012
@@ -3,7 +3,7 @@
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"Partition manager application(Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"Partition manager application"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\read_bw\read_bw.rc .\tools\perftests\user\read_bw\read_bw.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\read_bw\read_bw.rc	Thu May 31 11:22:10 2012
+++ .\tools\perftests\user\read_bw\read_bw.rc	Wed May 23 18:26:48 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"RDMA read Bandwidth Test (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"RDMA read Bandwidth Test "
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\read_lat\read_lat.rc .\tools\perftests\user\read_lat\read_lat.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\read_lat\read_lat.rc	Thu May 31 11:22:10 2012
+++ .\tools\perftests\user\read_lat\read_lat.rc	Wed May 23 18:26:48 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"RDMA read Latency Test (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"RDMA read Latency Test "
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\send_bw\send_bw.rc .\tools\perftests\user\send_bw\send_bw.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\send_bw\send_bw.rc	Thu May 31 11:22:09 2012
+++ .\tools\perftests\user\send_bw\send_bw.rc	Wed May 23 18:26:48 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"Send/Recv Bandwidth Test (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"Send/Recv Bandwidth Test "
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\send_lat\send_lat.rc .\tools\perftests\user\send_lat\send_lat.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\send_lat\send_lat.rc	Thu May 31 11:22:10 2012
+++ .\tools\perftests\user\send_lat\send_lat.rc	Wed May 23 18:26:48 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"Send/Recv Latency Test (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"Send/Recv Latency Test "
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\write_bw\write_bw.rc .\tools\perftests\user\write_bw\write_bw.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\write_bw\write_bw.rc	Thu May 31 11:22:09 2012
+++ .\tools\perftests\user\write_bw\write_bw.rc	Wed May 23 18:26:48 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"RDMA write Bandwidth Test (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"RDMA write Bandwidth Test "
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\write_lat\write_lat.rc .\tools\perftests\user\write_lat\write_lat.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\perftests\user\write_lat\write_lat.rc	Thu May 31 11:22:10 2012
+++ .\tools\perftests\user\write_lat\write_lat.rc	Wed May 23 18:26:48 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"RDMA write Latency Test (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"RDMA write Latency Test "
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\vstat\user\vstat.rc .\tools\vstat\user\vstat.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\vstat\user\vstat.rc	Thu May 31 11:22:11 2012
+++ .\tools\vstat\user\vstat.rc	Wed May 23 18:26:48 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"HCA Status Report Application (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"HCA Status Report Application"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\wsdinstall\user\installsp.rc .\tools\wsdinstall\user\installsp.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\tools\wsdinstall\user\installsp.rc	Thu May 31 11:22:10 2012
+++ .\tools\wsdinstall\user\installsp.rc	Wed May 23 18:26:48 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"Winsock Direct for InfiniBand installer (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"Winsock Direct for InfiniBand installer"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\ipoib\kernel\ipoib_port.cpp .\ulp\ipoib\kernel\ipoib_port.cpp
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\ipoib\kernel\ipoib_port.cpp	Thu May 31 11:22:12 2012
+++ .\ulp\ipoib\kernel\ipoib_port.cpp	Thu Jul 26 19:20:10 2012
@@ -6282,7 +6282,7 @@ CreateFragList(
     ASSERT(MmGetMdlByteCount(pMdl) >= CurrentMdlDataOffset);
 
     ASSERT(NetBuff != NULL);
-#ifdef DBG
+#if DBG
     ASSERT(PhysBufCount <= MAX_PHYS_BUF_FRAG_ELEMENTS);
 #else
 	UNREFERENCED_PARAMETER(PhysBufCount);
@@ -6410,7 +6410,7 @@ CreateFragList(
     ASSERT(i <= PhysBufCount);
     pFragList->NumberOfElements = i;
 
-#ifdef DBG
+#if DBG
 	{
     	ULONG size = 0;
     	for (i  = 0; i <  pFragList->NumberOfElements; ++i)
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibmad\src\ibmad.rc .\ulp\libibmad\src\ibmad.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibmad\src\ibmad.rc	Thu Mar 29 00:15:08 2012
+++ .\ulp\libibmad\src\ibmad.rc	Thu Jul 26 15:31:14 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE			VFT_DLL
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"LibIbMad (Debug)"
 #define VER_INTERNALNAME_STR		"LibIbMad.dll"
 #define VER_ORIGINALFILENAME_STR	"LibIbMad.dll"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibnetdisc\src\ibnetdisc_exports.src .\ulp\libibnetdisc\src\ibnetdisc_exports.src
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibnetdisc\src\ibnetdisc_exports.src	Thu Mar 29 00:15:12 2012
+++ .\ulp\libibnetdisc\src\ibnetdisc_exports.src	Wed May 23 15:14:38 2012
@@ -1,6 +1,5 @@
 LIBRARY libibnetdisc.dll
 
-
 #ifndef _WIN64
 EXPORTS
 		ibnd_discover_fabric;
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibumad\src\ibum_exports.src .\ulp\libibumad\src\ibum_exports.src
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibumad\src\ibum_exports.src	Thu Mar 29 00:15:11 2012
+++ .\ulp\libibumad\src\ibum_exports.src	Wed May 23 15:14:38 2012
@@ -1,6 +1,5 @@
 LIBRARY libibumad.dll
 
-
 #ifndef _WIN64
 EXPORTS
 	umad_init;
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibumad\src\ibumad.rc .\ulp\libibumad\src\ibumad.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibumad\src\ibumad.rc	Thu Mar 29 00:15:11 2012
+++ .\ulp\libibumad\src\ibumad.rc	Thu Jul 26 15:31:14 2012
@@ -33,14 +33,12 @@
 #define VER_FILETYPE			VFT_DLL
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"LibIbUmad (Debug)"
-#define VER_INTERNALNAME_STR		"LibIbUmad.dll"
-#define VER_ORIGINALFILENAME_STR	"LibIbUmad.dll"
 #else
 #define VER_FILEDESCRIPTION_STR		"LibIbUmad"
+#endif
 #define VER_INTERNALNAME_STR		"LibIbUmad.dll"
 #define VER_ORIGINALFILENAME_STR	"LibIbUmad.dll"
-#endif
 
 #include <common.ver>
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\asyncwatch\asyncwatch.rc .\ulp\libibverbs\examples\asyncwatch\asyncwatch.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\asyncwatch\asyncwatch.rc	Thu May 31 11:22:12 2012
+++ .\ulp\libibverbs\examples\asyncwatch\asyncwatch.rc	Wed May 23 18:26:49 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"winverbs - Async Event Watch (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"winverbs - Async Event Watch"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\devinfo\devinfo.rc .\ulp\libibverbs\examples\devinfo\devinfo.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\devinfo\devinfo.rc	Thu May 31 11:22:12 2012
+++ .\ulp\libibverbs\examples\devinfo\devinfo.rc	Wed May 23 18:26:49 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"winverbs - Device information (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"winverbs - Device information "
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\rc_pingpong\rc_pingpong.rc .\ulp\libibverbs\examples\rc_pingpong\rc_pingpong.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\rc_pingpong\rc_pingpong.rc	Thu May 31 11:22:12 2012
+++ .\ulp\libibverbs\examples\rc_pingpong\rc_pingpong.rc	Wed May 23 18:26:49 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"winverbs - Reliable Connection pingpong test (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"winverbs - Reliable Connection pingpong test"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\srq_pingpong\srq_pingpong.rc .\ulp\libibverbs\examples\srq_pingpong\srq_pingpong.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\srq_pingpong\srq_pingpong.rc	Thu May 31 11:22:12 2012
+++ .\ulp\libibverbs\examples\srq_pingpong\srq_pingpong.rc	Wed May 23 18:26:49 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"winverbs - Shared Recv Queue pingpong test (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"winverbs - Shared Recv Queue pingpong test"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\uc_pingpong\uc_pingpong.rc .\ulp\libibverbs\examples\uc_pingpong\uc_pingpong.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\uc_pingpong\uc_pingpong.rc	Thu May 31 11:22:12 2012
+++ .\ulp\libibverbs\examples\uc_pingpong\uc_pingpong.rc	Wed May 23 18:26:49 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"winverbs - UC pingpong test (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"winverbs - UC pingpong test"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\ud_pingpong\ud_pingpong.rc .\ulp\libibverbs\examples\ud_pingpong\ud_pingpong.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\examples\ud_pingpong\ud_pingpong.rc	Thu May 31 11:22:12 2012
+++ .\ulp\libibverbs\examples\ud_pingpong\ud_pingpong.rc	Wed May 23 18:26:49 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE			VFT_APP
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"winverbs - Unreliable Datagram pingpong test (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"winverbs - Unreliable Datagram pingpong test"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\src\ibverbs.rc .\ulp\libibverbs\src\ibverbs.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\libibverbs\src\ibverbs.rc	Thu Mar 29 00:15:09 2012
+++ .\ulp\libibverbs\src\ibverbs.rc	Thu Jul 26 15:31:14 2012
@@ -33,14 +33,12 @@
 #define VER_FILETYPE			VFT_DLL
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef DBG
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"LibIbVerbs (Debug)"
-#define VER_INTERNALNAME_STR		"libibverbs.dll"
-#define VER_ORIGINALFILENAME_STR	"libibverbs.dll"
 #else
 #define VER_FILEDESCRIPTION_STR		"LibIbVerbs"
+#endif
 #define VER_INTERNALNAME_STR		"libibverbs.dll"
 #define VER_ORIGINALFILENAME_STR	"libibverbs.dll"
-#endif
 
 #include <common.ver>
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\librdmacm\examples\mckey\mckey.c .\ulp\librdmacm\examples\mckey\mckey.c
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\librdmacm\examples\mckey\mckey.c	Thu May 31 11:22:13 2012
+++ .\ulp\librdmacm\examples\mckey\mckey.c	Wed May 23 18:26:49 2012
@@ -28,8 +28,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 #include <stdlib.h>
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\librdmacm\examples\udaddy\udaddy.c .\ulp\librdmacm\examples\udaddy\udaddy.c
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\librdmacm\examples\udaddy\udaddy.c	Thu May 31 11:22:13 2012
+++ .\ulp\librdmacm\examples\udaddy\udaddy.c	Wed May 23 18:26:49 2012
@@ -28,8 +28,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 #include <stdlib.h>
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\librdmacm\src\cma.rc .\ulp\librdmacm\src\cma.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\librdmacm\src\cma.rc	Thu Mar 29 00:15:12 2012
+++ .\ulp\librdmacm\src\cma.rc	Thu Jul 26 15:31:14 2012
@@ -33,14 +33,12 @@
 #define VER_FILETYPE			VFT_DLL
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"LibRdmaCm (Debug)"
-#define VER_INTERNALNAME_STR		"librdmacm.dll"
-#define VER_ORIGINALFILENAME_STR	"librdmacm.dll"
 #else
 #define VER_FILEDESCRIPTION_STR		"LibRdmaCm"
+#endif
 #define VER_INTERNALNAME_STR		"librdmacm.dll"
 #define VER_ORIGINALFILENAME_STR	"librdmacm.dll"
-#endif
 
 #include <common.ver>
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\nd\user\NdProv.rc .\ulp\nd\user\NdProv.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\nd\user\NdProv.rc	Thu May 31 11:22:11 2012
+++ .\ulp\nd\user\NdProv.rc	Wed May 23 18:26:49 2012
@@ -25,8 +25,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 
@@ -35,7 +33,7 @@
 #define VER_FILETYPE				VFT_DLL
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"OpenFabrics NetworkDirect Infiniband Provider (Debug)"
 #define VER_INTERNALNAME_STR		"ibndprov.dll"
 #define VER_ORIGINALFILENAME_STR	"ibndprov.dll"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\nd\user\SOURCES .\ulp\nd\user\SOURCES
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\nd\user\SOURCES	Thu Mar 29 00:15:02 2012
+++ .\ulp\nd\user\SOURCES	Thu Jul 26 21:26:41 2012
@@ -55,7 +55,7 @@ TARGETLIBS= \
                         $(SDK_LIB_PATH)\uuid.lib
 
 !if !$(FREEBUILD)
-C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
 !endif
 
 !IFDEF ENABLE_EVENT_TRACING
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\netdirect\user\netdirect.rc .\ulp\netdirect\user\netdirect.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\netdirect\user\netdirect.rc	Thu Mar 29 00:15:02 2012
+++ .\ulp\netdirect\user\netdirect.rc	Thu Jul 26 15:31:14 2012
@@ -33,14 +33,12 @@
 #define VER_FILETYPE			VFT_DLL
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"OpenFabrics Winverbs Network Direct Provider (Debug)"
-#define VER_INTERNALNAME_STR		"wvndprov.dll"
-#define VER_ORIGINALFILENAME_STR	"wvndprov.dll"
 #else
 #define VER_FILEDESCRIPTION_STR		"OpenFabrics Winverbs Network Direct Provider"
+#endif
 #define VER_INTERNALNAME_STR		"wvndprov.dll"
 #define VER_ORIGINALFILENAME_STR	"wvndprov.dll"
-#endif
 
 #include <common.ver>
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\netdirect\user\SOURCES .\ulp\netdirect\user\SOURCES
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\netdirect\user\SOURCES	Thu Mar 29 00:15:02 2012
+++ .\ulp\netdirect\user\SOURCES	Thu Jul 26 21:27:21 2012
@@ -44,5 +44,5 @@ SOURCES =			\
 
 
 !if !$(FREEBUILD)
-C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
 !endif
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\netdirect2\user\netdirect.rc .\ulp\netdirect2\user\netdirect.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\netdirect2\user\netdirect.rc	Thu Mar 29 00:15:11 2012
+++ .\ulp\netdirect2\user\netdirect.rc	Thu Jul 26 15:31:15 2012
@@ -33,14 +33,12 @@
 #define VER_FILETYPE			VFT_DLL
 #define VER_FILESUBTYPE			VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"OpenFabrics Winverbs Network Direct Provider (Debug)"
-#define VER_INTERNALNAME_STR		"wvndprov.dll"
-#define VER_ORIGINALFILENAME_STR	"wvndprov.dll"
 #else
 #define VER_FILEDESCRIPTION_STR		"OpenFabrics Winverbs Network Direct Provider"
+#endif
 #define VER_INTERNALNAME_STR		"wvndprov.dll"
 #define VER_ORIGINALFILENAME_STR	"wvndprov.dll"
-#endif
 
 #include <common.ver>
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\config.h .\ulp\opensm\user\config.h
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\config.h	Thu May 31 11:22:11 2012
+++ .\ulp\opensm\user\config.h	Wed May 23 18:26:49 2012
@@ -27,8 +27,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id$
  */
 
 /*
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\ibtrapgen\sources .\ulp\opensm\user\ibtrapgen\sources
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\ibtrapgen\sources	Thu Mar 29 00:15:08 2012
+++ .\ulp\opensm\user\ibtrapgen\sources	Wed May 23 15:14:38 2012
@@ -55,7 +51,7 @@ USER_C_FLAGS=$(USER_C_FLAGS) /MD
 C_DEFINES=$(C_DEFINES) -D__WIN__ -D$(VENDOR_IF) -DHAVE_CONFIG_H
 
 !if !$(FREEBUILD)
-#C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+#C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
 C_DEFINES=$(C_DEFINES) 
 !endif
 
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\libopensm\SOURCES .\ulp\opensm\user\libopensm\SOURCES
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\libopensm\SOURCES	Thu Mar 29 00:15:04 2012
+++ .\ulp\opensm\user\libopensm\SOURCES	Wed May 23 15:14:38 2012
@@ -42,7 +41,7 @@ USER_C_FLAGS=$(USER_C_FLAGS) /MD
 C_DEFINES=$(C_DEFINES) -DWIN32 -D__WIN__ -D__i386__ -Dinline=__inline -DMT_LITTLE_ENDIAN -DOSM_VENDOR_INTF_AL
 C_DEFINES=$(C_DEFINES) -I.. -DHAVE_CONFIG_H
 !if !$(FREEBUILD)
-#C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+#C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
 C_DEFINES=$(C_DEFINES) 
 !endif
 
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\libvendor\SOURCES .\ulp\opensm\user\libvendor\SOURCES
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\libvendor\SOURCES	Thu Mar 29 00:15:04 2012
+++ .\ulp\opensm\user\libvendor\SOURCES	Wed May 23 15:14:39 2012
@@ -48,7 +50,7 @@ USER_C_FLAGS=$(USER_C_FLAGS) 
 C_DEFINES=$(C_DEFINES) -D__WIN__ -DHAVE_CONFIG_H -D$(VENDOR_IF)
 
 !if !$(FREEBUILD)
-C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
 # in cl_types_osd.h '_DEBUG_' is defined by virture of '_DEBUG" being defined.
 !else
 # favor fast over default small; default is /Oxs.
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\opensm\opensm.rc .\ulp\opensm\user\opensm\opensm.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\opensm\opensm.rc	Thu May 31 11:22:12 2012
+++ .\ulp\opensm\user\opensm\opensm.rc	Wed May 23 18:26:49 2012
@@ -32,7 +32,7 @@
 
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR     "OpenSM InfiniBand Subnet Manager 3.3.11 (Debug)"
 #define VER_INTERNALNAME_STR        "opensm.exe"
 #define VER_ORIGINALFILENAME_STR    "opensm.exe"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\opensm\SOURCES .\ulp\opensm\user\opensm\SOURCES
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\opensm\SOURCES	Thu Mar 29 00:15:07 2012
+++ .\ulp\opensm\user\opensm\SOURCES	Wed May 23 15:14:39 2012
@@ -61,7 +60,7 @@ C_DEFINES=$(C_DEFINES) -D__WIN__ -DHAVE_
 C_DEFINES=$(C_DEFINES) -DWINVER=$(_NT_TARGET_VERSION) 
 
 !if !$(FREEBUILD)
-C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
 # If not specified, default is no optimization: /Od /Oi per WDK docs.
 !else
 # If not specified, default is /Oxs, favor fast code here.
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\osmtest\osmt_mtl_regular_qp.c .\ulp\opensm\user\osmtest\osmt_mtl_regular_qp.c
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\osmtest\osmt_mtl_regular_qp.c	Thu Mar 29 00:15:05 2012
+++ .\ulp\opensm\user\osmtest\osmt_mtl_regular_qp.c	Wed May 23 18:26:49 2012
@@ -53,8 +53,6 @@
  *
  *  Creation date:
  *
- *  Version: $Id: osmt_mtl_regular_qp.c 8935 2011-10-10 01:17:17Z leonid $
- *
  *  Authors:
  *    Eitan Zahavi
  *
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\osmtest\osmtest.rc .\ulp\opensm\user\osmtest\osmtest.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\opensm\user\osmtest\osmtest.rc	Thu Mar 29 00:15:05 2012
+++ .\ulp\opensm\user\osmtest\osmtest.rc	Wed May 23 15:14:39 2012
@@ -33,7 +33,7 @@
 
 #define VER_FILETYPE				VFT_APP
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR     "OpenSM Test Application 3.3.11 (Debug)"
 #define VER_INTERNALNAME_STR        "osmtest.exe"
 #define VER_ORIGINALFILENAME_STR    "osmtest.exe"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\wsd\user\ibspdll.rc .\ulp\wsd\user\ibspdll.rc
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\wsd\user\ibspdll.rc	Thu May 31 11:22:13 2012
+++ .\ulp\wsd\user\ibspdll.rc	Wed May 23 18:26:50 2012
@@ -33,7 +33,7 @@
 #define VER_FILETYPE				VFT_DLL
 #define VER_FILESUBTYPE				VFT2_UNKNOWN
 
-#ifdef _DEBUG_
+#if DBG
 #define VER_FILEDESCRIPTION_STR		"Winsock Direct for InfiniBand (Debug)"
 #else
 #define VER_FILEDESCRIPTION_STR		"Winsock Direct for InfiniBand"
diff -dwup3 -x *svn* -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\wsd\user\SOURCES .\ulp\wsd\user\SOURCES
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\ulp\wsd\user\SOURCES	Thu Mar 29 00:15:13 2012
+++ .\ulp\wsd\user\SOURCES	Thu Jul 26 21:27:49 2012
@@ -41,11 +64,6 @@ TARGETLIBS=\
             $(TARGETPATH)\*\complib.lib \
             $(TARGETPATH)\*\ibal.lib
 
-
-!if !$(FREEBUILD)
-C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
-!endif
-
 !IFDEF ENABLE_EVENT_TRACING
 
 C_DEFINES = $(C_DEFINES) -DEVENT_TRACING
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ndv2.1.patch
Type: application/octet-stream
Size: 62791 bytes
Desc: ndv2.1.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20130220/3b06888c/attachment.obj>


More information about the ofw mailing list