X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..4a3eedf9ecc9bbe3f3a5c6ce5e53ad199d639d32:/bsd/netat/debug.h

diff --git a/bsd/netat/debug.h b/bsd/netat/debug.h
index 84070755d..7228eb26d 100644
--- a/bsd/netat/debug.h
+++ b/bsd/netat/debug.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1988-2007 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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
- * 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
@@ -20,10 +23,7 @@
  * 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 */
@@ -31,7 +31,8 @@
 #ifndef _NETAT_DEBUG_H_
 #define _NETAT_DEBUG_H_
 #include <sys/appleapiopts.h>
-#ifdef __APPLE_API_PRIVATE
+#ifdef __APPLE_API_OBSOLETE
+#ifdef PRIVATE
 
 #define D_L_FATAL		0x00000001
 #define D_L_ERROR		0x00000002
@@ -101,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)
@@ -149,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 */
@@ -263,6 +264,7 @@ static char *at_mid_strings[] = {
 
 #endif
 
-#endif /* __APPLE_API_PRIVATE */
+#endif /* PRIVATE */
+#endif /* __APPLE_API_OBSOLETE */
 #endif /* _NETAT_DEBUG_H_ */