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
This commit is contained in:
parent
54a71c95b7
commit
d4d9831990
|
@ -1,23 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2007, Travis Geiselbrecht. All rights reserved.
|
|
||||||
* Distributed under the terms of the MIT License.
|
|
||||||
*/
|
|
||||||
#ifndef __OS_KERNEL_ARCH_x86_COMMPAGE_H
|
|
||||||
#define __OS_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
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -5,8 +5,23 @@
|
||||||
#ifndef _KERNEL_ARCH_x86_COMMPAGE_H
|
#ifndef _KERNEL_ARCH_x86_COMMPAGE_H
|
||||||
#define _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);
|
status_t commpage_init(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,6 @@
|
||||||
#include <KernelExport.h>
|
#include <KernelExport.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <os/kernel/arch/x86/commpage.h>
|
|
||||||
|
|
||||||
static area_id comm_area;
|
static area_id comm_area;
|
||||||
static area_id user_comm_area;
|
static area_id user_comm_area;
|
||||||
static unsigned long *comm_ptr;
|
static unsigned long *comm_ptr;
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* branch to the syscall vector in the commpage
|
* branch to the syscall vector in the commpage
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <os/kernel/arch/x86/commpage.h>
|
#include <arch/x86/commpage.h>
|
||||||
|
|
||||||
#define _SYSCALL(name, n) \
|
#define _SYSCALL(name, n) \
|
||||||
.globl name; \
|
.globl name; \
|
||||||
|
|
Loading…
Reference in New Issue