xnu-1228.15.4.tar.gz

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

diff --git a/bsd/netat/debug.h b/bsd/netat/debug.h
index acf50d81bdd7965a2b20f6931152c31810b84f0b..7228eb26d637c20bfde7b751a66e08312309001f 100644 (file)
--- a/bsd/netat/debug.h
+++ b/bsd/netat/debug.h
@@ -1,34 +1,29 @@
 /*
- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 1988-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * @APPLE_LICENSE_OSREFERENCE_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
+ * 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.
  * 
- * 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.  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 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
- */
-/*
- *      Copyright (c) 1988, 1989, 1997 Apple Computer, Inc.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 /* netat/debug.h */
@@ -107,7 +102,7 @@ extern dbgBits_t    dbgBits;
 #ifdef DEBUG
 #define dPrintf(mod, lev, p) \
        if (((mod) & dbgBits.dbgMod) && ((lev) & dbgBits.dbgLev)) {\
-                kprintf p;  \
+                printf p;  \
        }
 #else
 #define dPrintf(mod, lev, p)
@@ -155,13 +150,13 @@ extern dbgBits_t  dbgBits;
 
 #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 */