Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adding ipc_ prefix to ipc primitives

Browse Source 
* Also change _orig to _intr for clarity
 * Cleaned up {IPC,KER}VEC
 * Renamed _minix_kernel_info_struct to get_minix_kerninfo
 * Merged _senda.S into _ipc.S
 * Moved into separate files get_minix_kerninfo and _do_kernel_call
 * Adapted do_kernel_call to follow same _ convention as ipc functions
 * Drop patches in libc/net/send.c and libc/include/namespace.h

Change-Id: If4ea21ecb65435170d7d87de6c826328e84c18d0
This commit is contained in:
Lionel Sambuc
2013-11-01 13:34:14 +01:00
parent a5f47c23d5
commit c3fc9df84a
118 changed files with 414 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/arch/earm/include/ipcconst.h
View File

@@ -1,8 +1,8 @@
#ifndef _ARM_IPCCONST_H_
#define _ARM_IPCCONST_H_
#define KERVEC 32 /* syscall trap to kernel */
#define IPCVEC 33 /* ipc trap to kernel */
#define KERVEC_INTR 32 /* syscall trap to kernel */
#define IPCVEC_INTR 33 /* ipc trap to kernel */
#define IPC_STATUS_REG r1

7
include/arch/i386/include/ipcconst.h
View File

@@ -1,8 +1,11 @@
#ifndef _I386_IPCCONST_H_
#define _I386_IPCCONST_H_
#define KERVEC 32 /* syscall trap to kernel */
#define IPCVEC 33 /* ipc trap to kernel */
#define KERVEC_INTR 32 /* syscall trap to kernel */
#define IPCVEC_INTR 33 /* ipc trap to kernel */
#define KERVEC_UM 34 /* syscall trap to kernel, user-mapped code */
#define IPCVEC_UM 35 /* ipc trap to kernel, user-mapped code */
#define IPC_STATUS_REG bx

47
include/minix/ipc.h
View File

@@ -192,24 +192,27 @@ typedef struct asynmsg
#define AMF_NOTIFY_ERR 020 /* Send a notification when AMF_DONE is set and
* delivery of the message failed */
int _send_orig(endpoint_t dest, message *m_ptr);
int _receive_orig(endpoint_t src, message *m_ptr, int *status_ptr);
int _sendrec_orig(endpoint_t src_dest, message *m_ptr);
int _sendnb_orig(endpoint_t dest, message *m_ptr);
int _notify_orig(endpoint_t dest);
int _senda_orig(asynmsg_t *table, size_t count);
int _do_kernel_call_orig(message *m_ptr);
int _ipc_send_intr(endpoint_t dest, message *m_ptr);
int _ipc_receive_intr(endpoint_t src, message *m_ptr, int *status_ptr);
int _ipc_sendrec_intr(endpoint_t src_dest, message *m_ptr);
int _ipc_sendnb_intr(endpoint_t dest, message *m_ptr);
int _ipc_notify_intr(endpoint_t dest);
int _ipc_senda_intr(asynmsg_t *table, size_t count);
int _minix_kernel_info_struct(struct minix_kerninfo **);
int _do_kernel_call_intr(message *m_ptr);
int get_minix_kerninfo(struct minix_kerninfo **);
/* Hide names to avoid name space pollution. */
#define notify _notify
#define sendrec _sendrec
#define receive _receive
#define receivenb _receivenb
#define send _send
#define sendnb _sendnb
#define senda _senda
#define ipc_notify _ipc_notify
#define ipc_sendrec _ipc_sendrec
#define ipc_receive _ipc_receive
#define ipc_receivenb _ipc_receivenb
#define ipc_send _ipc_send
#define ipc_sendnb _ipc_sendnb
#define ipc_senda _ipc_senda
#define do_kernel_call _do_kernel_call
struct minix_ipcvecs {
int (*send)(endpoint_t dest, message *m_ptr);
@@ -224,37 +227,37 @@ struct minix_ipcvecs {
/* kernel-set IPC vectors retrieved by a constructor in libc/sys-minix/init.c */
extern struct minix_ipcvecs _minix_ipcvecs;
static inline int _send(endpoint_t dest, message *m_ptr)
static inline int _ipc_send(endpoint_t dest, message *m_ptr)
{
return _minix_ipcvecs.send(dest, m_ptr);
}
static inline int _receive(endpoint_t src, message *m_ptr, int *st)
static inline int _ipc_receive(endpoint_t src, message *m_ptr, int *st)
{
return _minix_ipcvecs.receive(src, m_ptr, st);
}
static inline int _sendrec(endpoint_t src_dest, message *m_ptr)
static inline int _ipc_sendrec(endpoint_t src_dest, message *m_ptr)
{
return _minix_ipcvecs.sendrec(src_dest, m_ptr);
}
static inline int _sendnb(endpoint_t dest, message *m_ptr)
static inline int _ipc_sendnb(endpoint_t dest, message *m_ptr)
{
return _minix_ipcvecs.sendnb(dest, m_ptr);
}
static inline int _notify(endpoint_t dest)
static inline int _ipc_notify(endpoint_t dest)
{
return _minix_ipcvecs.notify(dest);
}
static inline int do_kernel_call(message *m_ptr)
static inline int _do_kernel_call(message *m_ptr)
{
return _minix_ipcvecs.do_kernel_call(m_ptr);
}
static inline int _senda(asynmsg_t *table, size_t count)
static inline int _ipc_senda(asynmsg_t *table, size_t count)
{
return _minix_ipcvecs.senda(table, count);
}