oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use endpoint_t. New prototypes for related to grants and safecopy functions.

Browse Source
This commit is contained in:
Ben Gras 2006-06-20 09:57:00 +00:00
parent 2e89eb5270
commit b89c6634f5
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/glo.h
View File

@ -46,7 +46,9 @@ EXTERN int irq_use; /* map of all in-use irq's */
EXTERN reg_t mon_ss, mon_sp; /* boot monitor stack */ EXTERN reg_t mon_ss, mon_sp; /* boot monitor stack */
EXTERN int mon_return; /* true if we can return to monitor */ EXTERN int mon_return; /* true if we can return to monitor */
EXTERN int do_serial_debug; EXTERN int do_serial_debug;
EXTERN int who_e, who_p; /* message source endpoint and proc */ EXTERN endpoint_t who_e; /* message source endpoint */
EXTERN int who_p; /* message source proc */
EXTERN int sys_call_code; /* kernel call number in SYSTEM */
/* VM */ /* VM */
EXTERN phys_bytes vm_base; EXTERN phys_bytes vm_base;

3
kernel/proc.c
View File

@ -749,7 +749,8 @@ int line;
#else #else
PUBLIC int isokendpt_f(e, p, fatalflag) PUBLIC int isokendpt_f(e, p, fatalflag)
#endif #endif
int e, *p, fatalflag; endpoint_t e;
int *p, fatalflag;
{ {
int ok = 0; int ok = 0;
/* Convert an endpoint number into a process number. /* Convert an endpoint number into a process number.

16
kernel/proto.h
View File

@ -3,6 +3,8 @@
#ifndef PROTO_H #ifndef PROTO_H
#define PROTO_H #define PROTO_H
#include <minix/safecopies.h>
/* Struct declarations. */ /* Struct declarations. */
struct proc; struct proc;
struct timer; struct timer;
@ -32,10 +34,10 @@ _PROTOTYPE( void lock_enqueue, (struct proc *rp) );
_PROTOTYPE( void lock_dequeue, (struct proc *rp) ); _PROTOTYPE( void lock_dequeue, (struct proc *rp) );
_PROTOTYPE( void balance_queues, (struct timer *tp) ); _PROTOTYPE( void balance_queues, (struct timer *tp) );
#if DEBUG_ENABLE_IPC_WARNINGS #if DEBUG_ENABLE_IPC_WARNINGS
_PROTOTYPE( int isokendpt_f, (char *file, int line, int e, int *p, int f)); _PROTOTYPE( int isokendpt_f, (char *file, int line, endpoint_t e, int *p, int f));
#define isokendpt_d(e, p, f) isokendpt_f(__FILE__, __LINE__, (e), (p), (f)) #define isokendpt_d(e, p, f) isokendpt_f(__FILE__, __LINE__, (e), (p), (f))
#else #else
_PROTOTYPE( int isokendpt_f, (int e, int *p, int f) ); _PROTOTYPE( int isokendpt_f, (endpoint_t e, int *p, int f) );
#define isokendpt_d(e, p, f) isokendpt_f((e), (p), (f)) #define isokendpt_d(e, p, f) isokendpt_f((e), (p), (f))
#endif #endif
@ -50,7 +52,7 @@ _PROTOTYPE( void cause_sig, (int proc_nr, int sig_nr) );
_PROTOTYPE( void sys_task, (void) ); _PROTOTYPE( void sys_task, (void) );
_PROTOTYPE( void get_randomness, (int source) ); _PROTOTYPE( void get_randomness, (int source) );
_PROTOTYPE( int virtual_copy, (struct vir_addr *src, struct vir_addr *dst, _PROTOTYPE( int virtual_copy, (struct vir_addr *src, struct vir_addr *dst,
vir_bytes bytes) ); vir_bytes bytes) );
#define numap_local(proc_nr, vir_addr, bytes) \ #define numap_local(proc_nr, vir_addr, bytes) \
umap_local(proc_addr(proc_nr), D, (vir_addr), (bytes)) umap_local(proc_addr(proc_nr), D, (vir_addr), (bytes))
_PROTOTYPE( phys_bytes umap_local, (struct proc *rp, int seg, _PROTOTYPE( phys_bytes umap_local, (struct proc *rp, int seg,
@ -59,6 +61,10 @@ _PROTOTYPE( phys_bytes umap_remote, (struct proc *rp, int seg,
vir_bytes vir_addr, vir_bytes bytes) ); vir_bytes vir_addr, vir_bytes bytes) );
_PROTOTYPE( phys_bytes umap_bios, (struct proc *rp, vir_bytes vir_addr, _PROTOTYPE( phys_bytes umap_bios, (struct proc *rp, vir_bytes vir_addr,
vir_bytes bytes) ); vir_bytes bytes) );
_PROTOTYPE( phys_bytes umap_grant, (struct proc *, cp_grant_id_t,
vir_bytes));
_PROTOTYPE( phys_bytes umap_verify_grant, (struct proc *, endpoint_t,
cp_grant_id_t, vir_bytes, vir_bytes, int));
_PROTOTYPE( void clear_endpoint, (struct proc *rc) ); _PROTOTYPE( void clear_endpoint, (struct proc *rc) );
/* system/do_newmap.c */ /* system/do_newmap.c */
@ -161,6 +167,10 @@ _PROTOTYPE( void alloc_segments, (struct proc *rp) );
/* system/do_vm.c */ /* system/do_vm.c */
_PROTOTYPE( void vm_map_default, (struct proc *pp) ); _PROTOTYPE( void vm_map_default, (struct proc *pp) );
/* system/do_safecopy.c */
_PROTOTYPE( int verify_grant, (endpoint_t, endpoint_t, cp_grant_id_t, vir_bytes,
int, vir_bytes, vir_bytes *, endpoint_t *));
#endif /* (CHIP == INTEL) */ #endif /* (CHIP == INTEL) */
#if (CHIP == M68000) #if (CHIP == M68000)