Skip to content

Commit

Permalink
merge <jinue/shared/ipc.h> into types.h
Browse files Browse the repository at this point in the history
  • Loading branch information
phaubertin committed Oct 20, 2024
1 parent 52f972f commit 18834a6
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 63 deletions.
1 change: 0 additions & 1 deletion include/jinue/jinue.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include <jinue/shared/asm/memory.h>
#include <jinue/shared/asm/permissions.h>
#include <jinue/shared/asm/syscall.h>
#include <jinue/shared/ipc.h>
#include <jinue/shared/types.h>
#include <jinue/shared/vm.h>
#include <stddef.h>
Expand Down
60 changes: 0 additions & 60 deletions include/jinue/shared/ipc.h

This file was deleted.

20 changes: 20 additions & 0 deletions include/jinue/shared/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,26 @@ typedef struct {
uintptr_t arg3;
} jinue_syscall_args_t;

typedef struct {
void *addr;
size_t size;
} jinue_buffer_t;

typedef struct {
const void *addr;
size_t size;
} jinue_const_buffer_t;

typedef struct {
const jinue_const_buffer_t *send_buffers;
size_t send_buffers_length;
const jinue_buffer_t *recv_buffers;
size_t recv_buffers_length;
uintptr_t recv_function;
uintptr_t recv_cookie;
uintptr_t reply_max_size;
} jinue_message_t;

typedef struct {
uint64_t addr;
uint64_t size;
Expand Down
2 changes: 1 addition & 1 deletion include/kernel/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#ifndef JINUE_KERNEL_TYPES_H
#define JINUE_KERNEL_TYPES_H

#include <jinue/shared/ipc.h>
#include <jinue/shared/asm/ipc.h>
#include <jinue/shared/types.h>
#include <kernel/machine/types.h>
#include <kernel/utils/list.h>
Expand Down
3 changes: 2 additions & 1 deletion kernel/domain/services/ipc.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
*/

#include <jinue/shared/asm/errno.h>
#include <jinue/shared/ipc.h>
#include <jinue/shared/asm/ipc.h>
#include <jinue/shared/types.h>
#include <jinue/shared/vm.h>
#include <kernel/domain/entities/endpoint.h>
#include <kernel/domain/entities/object.h>
Expand Down

0 comments on commit 18834a6

Please sign in to comment.