From 89739e8c0a67dfdf759007345bcf0b7adb34015c Mon Sep 17 00:00:00 2001 From: beveloper Date: Sun, 9 May 2004 20:22:28 +0000 Subject: [PATCH] Added ASSERT() macro to debug.h Cleanup of printf calls. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7476 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/network/ipro1000/debug.h | 2 ++ .../kernel/drivers/network/ipro1000/if_em_osdep.h | 9 ++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/ipro1000/debug.h b/src/add-ons/kernel/drivers/network/ipro1000/debug.h index 405f7e4b95..6fae6db8f9 100644 --- a/src/add-ons/kernel/drivers/network/ipro1000/debug.h +++ b/src/add-ons/kernel/drivers/network/ipro1000/debug.h @@ -24,6 +24,7 @@ #ifdef DEBUG #define TRACE(a...) dprintf("ipro1000: " a) + #define ASSERT(a) if (a) ; else panic("ipro1000: ASSERT failed, " #a) /* used by if_em.h */ #define DEBUG_INIT 1 @@ -34,6 +35,7 @@ #else #define TRACE(a...) + #define ASSERT(a) /* used by if_em.h */ #define DEBUG_INIT 0 diff --git a/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h b/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h index 7ddadb719b..1629f3797b 100644 --- a/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h +++ b/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h @@ -45,16 +45,13 @@ POSSIBILITY OF SUCH DAMAGE. #include "debug.h" #include "timer.h" -#define DBG 0 - -#define ASSERT(x) if(!(x)) panic("ipro1000: " #x) - #define usec_delay(x) snooze(x) #define msec_delay(x) snooze(1000*(x)) #define MSGOUT(S, A, B) dprintf("ipro1000: " S "\n", A, B) #define DEBUGFUNC(F) DEBUGOUT(F); -#if DBG + +#if DEBUG_HW #define DEBUGOUT(S) dprintf("ipro1000: " S "\n") #define DEBUGOUT1(S,A) dprintf("ipro1000: " S "\n",A) #define DEBUGOUT2(S,A,B) dprintf("ipro1000: " S "\n",A,B) @@ -68,8 +65,6 @@ POSSIBILITY OF SUCH DAMAGE. #define DEBUGOUT7(S,A,B,C,D,E,F,G) #endif -#define printf dprintf - // no longer used in FreeBSD #define splx(s) #define splimp() 0