xnu-1699.32.7.tar.gz

[apple/xnu.git] / bsd / netat / debug.h

diff --git a/bsd/netat/debug.h b/bsd/netat/debug.h
index 631139b020dd7fae7c3ac2d49b63ab7c4fef4697..475fee7b8d9971bcfdcbd509f5e754f5e9e2c268 100644 (file)
--- a/bsd/netat/debug.h
+++ b/bsd/netat/debug.h
@@ -1,14 +1,19 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1988-2007 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -18,10 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *      Copyright (c) 1988, 1989, 1997 Apple Computer, Inc.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 
 /* netat/debug.h */
  */
 
 /* netat/debug.h */


@@ -97,10 +99,10 @@ typedef struct dbgBits {
 extern dbgBits_t       dbgBits;
 
        /* macros for debugging */
 extern dbgBits_t       dbgBits;
 
        /* macros for debugging */

-#ifdef DEBUG
+#if DEBUG

 #define dPrintf(mod, lev, p) \
        if (((mod) & dbgBits.dbgMod) && ((lev) & dbgBits.dbgLev)) {\
 #define dPrintf(mod, lev, p) \
        if (((mod) & dbgBits.dbgMod) && ((lev) & dbgBits.dbgLev)) {\

-                kprintf p;  \
+                printf p;  \

        }
 #else
 #define dPrintf(mod, lev, p)
        }
 #else
 #define dPrintf(mod, lev, p)


@@ -148,13 +150,13 @@ extern dbgBits_t  dbgBits;
 
 #define trace_mbufs(pri, str, start)\
 { if (start)\
 
 #define trace_mbufs(pri, str, start)\
 { if (start)\

-{   int i; gbuf_t *tmp;\
-    for (tmp=start, i=0; tmp && i < 10; tmp = gbuf_cont(tmp), i++) {\
-       dPrintf(pri, D_L_TRACE, ("%s=0x%x, len=%d %s\n",\
-                                 str, tmp, gbuf_len(tmp),\
-                                 (((struct mbuf *)tmp)->m_flags & M_EXT)?"CL":""));\
-       KERNEL_DEBUG(DBG_ADSP_MBUF,  0, tmp, gbuf_len(tmp), gbuf_next(tmp), \
-               ((struct mbuf *)tmp)->m_flags & M_EXT);\
+{   int _i; gbuf_t *_tmp;\
+    for (_tmp=start, _i=0; _tmp && _i < 10; _tmp = gbuf_cont(_tmp), _i++) {\
+       dPrintf(pri, D_L_TRACE, ("%s=0x%p, len=%ld %s\n",\
+                                 str, _tmp, gbuf_len(_tmp),\
+                                 (((struct mbuf *)_tmp)->m_flags & M_EXT)?"CL":""));\
+       KERNEL_DEBUG(DBG_ADSP_MBUF,  0, _tmp, gbuf_len(_tmp), gbuf_next(_tmp), \
+               ((struct mbuf *)_tmp)->m_flags & M_EXT);\

 }}}
 
 /* from h/atlog.h */
 }}}
 
 /* from h/atlog.h */