1.1 --- a/libipc/include/ipc/message.h Fri Mar 08 01:58:46 2024 +0100
1.2 +++ b/libipc/include/ipc/message.h Fri Mar 08 22:43:20 2024 +0100
1.3 @@ -21,7 +21,6 @@
1.4
1.5 #pragma once
1.6
1.7 -#include <l4/re/c/dataspace.h>
1.8 #include <l4/sys/ipc.h>
1.9 #include <l4/sys/utcb.h>
1.10 #include <l4/sys/types.h>
1.11 @@ -136,16 +135,16 @@
1.12 /* Supporting operations. */
1.13
1.14 void ipc_message_discard_capability(ipc_message_t *msg, l4_cap_idx_t cap);
1.15 -void ipc_message_discard_dataspace(ipc_message_t *msg, l4re_ds_t mem, l4_addr_t addr);
1.16 +void ipc_message_discard_dataspace(ipc_message_t *msg, l4_cap_idx_t mem, l4_addr_t addr);
1.17 long ipc_message_expect_capabilities(ipc_message_t *msg, int number);
1.18 long ipc_message_expect_capability(ipc_message_t *msg, int item);
1.19 void ipc_message_export_capability(ipc_message_t *msg, int item, l4_cap_idx_t ref);
1.20 void ipc_message_export_fpage(ipc_message_t *msg, int item, l4_snd_fpage_t fpage);
1.21 void ipc_message_export_page(ipc_message_t *msg, int item, l4_umword_t hot_spot, l4_fpage_t fpage);
1.22 long ipc_message_import_and_expect_capability(ipc_message_t *msg, int item, l4_cap_idx_t *ref);
1.23 -long ipc_message_import_and_expect_dataspace(ipc_message_t *msg, int item, l4re_ds_t *mem, l4_addr_t *addr);
1.24 +long ipc_message_import_and_expect_dataspace(ipc_message_t *msg, int item, l4_cap_idx_t *mem, l4_addr_t *addr);
1.25 long ipc_message_import_capability(ipc_message_t *msg, int item, l4_cap_idx_t *ref);
1.26 -long ipc_message_import_dataspace(ipc_message_t *msg, int item, l4re_ds_t *mem, l4_addr_t *addr);
1.27 +long ipc_message_import_dataspace(ipc_message_t *msg, int item, l4_cap_idx_t *mem, l4_addr_t *addr);
1.28 long ipc_message_import_fpage(ipc_message_t *msg, int item, l4_snd_fpage_t *fpage);
1.29 void ipc_message_propagate_capability(ipc_message_t *msg, int item, l4_cap_idx_t ref);
1.30 void ipc_message_receive_fpage(ipc_message_t *msg, int item, l4_snd_fpage_t fpage);
2.1 --- a/libipc/include/ipc/util_ipc.h Fri Mar 08 01:58:46 2024 +0100
2.2 +++ b/libipc/include/ipc/util_ipc.h Fri Mar 08 22:43:20 2024 +0100
2.3 @@ -21,7 +21,6 @@
2.4
2.5 #pragma once
2.6
2.7 -#include <l4/re/c/dataspace.h>
2.8 #include <l4/sys/ipc.h>
2.9 #include <l4/sys/utcb.h>
2.10 #include <l4/sys/types.h>
2.11 @@ -42,7 +41,7 @@
2.12 void _export_page(l4_msgtag_t tag, l4_msg_regs_t *mregs, int item, l4_umword_t hot_spot, l4_fpage_t fpage);
2.13 void _free_expected_capabilities(l4_buf_regs_t *bregs, int start, int limit);
2.14 long _import_capability(l4_msgtag_t tag, l4_buf_regs_t *bregs, l4_msg_regs_t *mregs, int item, int buf_item, l4_cap_idx_t *ref, int *local);
2.15 -long _import_dataspace(l4_msgtag_t tag, l4_buf_regs_t *bregs, l4_msg_regs_t *mregs, int item, int buf_item, l4re_ds_t *mem, l4_addr_t *addr, int *local);
2.16 +long _import_dataspace(l4_msgtag_t tag, l4_buf_regs_t *bregs, l4_msg_regs_t *mregs, int item, int buf_item, l4_cap_idx_t *mem, l4_addr_t *addr, int *local);
2.17 long _import_fpage(l4_msgtag_t tag, l4_buf_regs_t *bregs, l4_msg_regs_t *mregs, int item, l4_snd_fpage_t *fpage);
2.18
2.19 /* Convenience operations. */
3.1 --- a/libipc/lib/src/message.c Fri Mar 08 01:58:46 2024 +0100
3.2 +++ b/libipc/lib/src/message.c Fri Mar 08 22:43:20 2024 +0100
3.3 @@ -428,7 +428,7 @@
3.4
3.5 /* Discard a dataspace. */
3.6
3.7 -void ipc_message_discard_dataspace(ipc_message_t *msg, l4re_ds_t mem, l4_addr_t addr)
3.8 +void ipc_message_discard_dataspace(ipc_message_t *msg, l4_cap_idx_t mem, l4_addr_t addr)
3.9 {
3.10 ipc_message_discard_capability(msg, mem);
3.11 ipc_detach_dataspace((void *) addr);
3.12 @@ -518,7 +518,7 @@
3.13 /* Import from the message a dataspace, mapping it to an address, updating the
3.14 buffer registers for future capabilities. */
3.15
3.16 -long ipc_message_import_and_expect_dataspace(ipc_message_t *msg, int item, l4re_ds_t *mem, l4_addr_t *addr)
3.17 +long ipc_message_import_and_expect_dataspace(ipc_message_t *msg, int item, l4_cap_idx_t *mem, l4_addr_t *addr)
3.18 {
3.19 long err;
3.20 int local;
3.21 @@ -552,7 +552,7 @@
3.22
3.23 /* Import from the message a dataspace, mapping it to an address. */
3.24
3.25 -long ipc_message_import_dataspace(ipc_message_t *msg, int item, l4re_ds_t *mem, l4_addr_t *addr)
3.26 +long ipc_message_import_dataspace(ipc_message_t *msg, int item, l4_cap_idx_t *mem, l4_addr_t *addr)
3.27 {
3.28 int local;
3.29 long err;
4.1 --- a/libipc/lib/src/util_ipc.c Fri Mar 08 01:58:46 2024 +0100
4.2 +++ b/libipc/lib/src/util_ipc.c Fri Mar 08 22:43:20 2024 +0100
4.3 @@ -166,7 +166,7 @@
4.4
4.5 long _import_dataspace(l4_msgtag_t tag, l4_buf_regs_t *bregs,
4.6 l4_msg_regs_t *mregs, int item, int buf_item,
4.7 - l4re_ds_t *mem, l4_addr_t *addr, int *local)
4.8 + l4_cap_idx_t *mem, l4_addr_t *addr, int *local)
4.9 {
4.10 long err;
4.11 offset_t size;