xnu-6153.41.3.tar.gz

[apple/xnu.git] / bsd / sys / msgbuf.h

diff --git a/bsd/sys/msgbuf.h b/bsd/sys/msgbuf.h
index 5b2a5fd2d4d9bb1e797e783014e91561a62371f6..a4bfa51e0e8c42d22f853a0623c331ac8db47e73 100644 (file)
--- a/bsd/sys/msgbuf.h
+++ b/bsd/sys/msgbuf.h
@@ -1,8 +1,8 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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,
  * 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,


@@ -22,7 +22,7 @@
  * 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.
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */


@@ -60,27 +60,30 @@
  *
  *     @(#)msgbuf.h    8.1 (Berkeley) 6/2/93
  */
  *
  *     @(#)msgbuf.h    8.1 (Berkeley) 6/2/93
  */

-#ifndef        _SYS_MSGBUF_H_
+#ifndef _SYS_MSGBUF_H_

 #define _SYS_MSGBUF_H_
 
 #include <sys/cdefs.h>
 
 #define _SYS_MSGBUF_H_
 
 #include <sys/cdefs.h>
 

-#define        MSG_BSIZE       4096
-struct msgbuf {
-#define        MSG_MAGIC       0x063061
-       long    msg_magic;
-       long    msg_size;
-       long    msg_bufx;               /* write pointer */
-       long    msg_bufr;               /* read pointer */
-       char    *msg_bufc;      /* buffer */
+#define MAX_MSG_BSIZE   (1*1024*1024)
+struct  msgbuf {
+#define MSG_MAGIC       0x063061
+       int             msg_magic;
+       int             msg_size;
+       int             msg_bufx;               /* write pointer */
+       int             msg_bufr;               /* read pointer */
+       char    *msg_bufc;              /* buffer */

 };
 };

-#ifdef KERNEL
+
+#ifdef XNU_KERNEL_PRIVATE

 __BEGIN_DECLS
 __BEGIN_DECLS

-extern struct  msgbuf *msgbufp;
+extern struct   msgbuf *msgbufp;
+extern struct   msgbuf *aslbufp;

 extern void log_putc(char);
 extern void log_putc(char);

-extern void log_putc_locked(char);
-extern void log_setsize(long size);
-extern int log_dmesg(user_addr_t, uint32_t, register_t *);
+extern void log_putc_locked(struct msgbuf *, char);
+extern int log_setsize(int size);
+extern int log_dmesg(user_addr_t, uint32_t, int32_t *);

 __END_DECLS
 __END_DECLS

-#endif
-#endif /* !_SYS_MSGBUF_H_ */
+#endif /* XNU_KERNEL_PRIVATE */
+
+#endif  /* !_SYS_MSGBUF_H_ */