merge both commpage.h into the private header

Travis, I hope this fits your needs :) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20173 a95241bf-73f2-0310-859d-f6bbb57e9c96
2007-02-20 00:21:45 +00:00
parent 54a71c95b7
commit d4d9831990
4 changed files with 16 additions and 26 deletions
@@ -5,8 +5,23 @@
 #ifndef _KERNEL_ARCH_x86_COMMPAGE_H
 #define _KERNEL_ARCH_x86_COMMPAGE_H

+/* some systemwide commpage constants, used in the kernel and libroot */

+/* be careful what you put here, this file is included from assembly */
+#define COMMPAGE_ENTRY_MAGIC   0
+#define COMMPAGE_ENTRY_VERSION 1
+#define COMMPAGE_ENTRY_SYSCALL 2
+
+#define USER_COMMPAGE_ADDR (0xffff0000)
+#define COMMPAGE_SIZE (0x8000)
+#define TABLE_ENTRIES 64
+
+#define COMMPAGE_SIGNATURE 'COMM'
+#define COMMPAGE_VERSION 1
+
+#ifndef _ASSEMBLER
 status_t commpage_init(void);
+#endif

 #endif