# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1709934200 -3600
# Node ID f59a3ff3150cac6adb23b16e7ff3decdd4e0ad19
# Parent  8c11e4bd8f3c82776055bf86f86791b981c7fc07
Eliminate dataspace-specific capability type usage.

diff -r 8c11e4bd8f3c -r f59a3ff3150c libipc/include/ipc/message.h
--- a/libipc/include/ipc/message.h	Fri Mar 08 01:58:46 2024 +0100
+++ b/libipc/include/ipc/message.h	Fri Mar 08 22:43:20 2024 +0100
@@ -21,7 +21,6 @@
 
 #pragma once
 
-#include <l4/re/c/dataspace.h>
 #include <l4/sys/ipc.h>
 #include <l4/sys/utcb.h>
 #include <l4/sys/types.h>
@@ -136,16 +135,16 @@
 /* Supporting operations. */
 
 void ipc_message_discard_capability(ipc_message_t *msg, l4_cap_idx_t cap);
-void ipc_message_discard_dataspace(ipc_message_t *msg, l4re_ds_t mem, l4_addr_t addr);
+void ipc_message_discard_dataspace(ipc_message_t *msg, l4_cap_idx_t mem, l4_addr_t addr);
 long ipc_message_expect_capabilities(ipc_message_t *msg, int number);
 long ipc_message_expect_capability(ipc_message_t *msg, int item);
 void ipc_message_export_capability(ipc_message_t *msg, int item, l4_cap_idx_t ref);
 void ipc_message_export_fpage(ipc_message_t *msg, int item, l4_snd_fpage_t fpage);
 void ipc_message_export_page(ipc_message_t *msg, int item, l4_umword_t hot_spot, l4_fpage_t fpage);
 long ipc_message_import_and_expect_capability(ipc_message_t *msg, int item, l4_cap_idx_t *ref);
-long ipc_message_import_and_expect_dataspace(ipc_message_t *msg, int item, l4re_ds_t *mem, l4_addr_t *addr);
+long ipc_message_import_and_expect_dataspace(ipc_message_t *msg, int item, l4_cap_idx_t *mem, l4_addr_t *addr);
 long ipc_message_import_capability(ipc_message_t *msg, int item, l4_cap_idx_t *ref);
-long ipc_message_import_dataspace(ipc_message_t *msg, int item, l4re_ds_t *mem, l4_addr_t *addr);
+long ipc_message_import_dataspace(ipc_message_t *msg, int item, l4_cap_idx_t *mem, l4_addr_t *addr);
 long ipc_message_import_fpage(ipc_message_t *msg, int item, l4_snd_fpage_t *fpage);
 void ipc_message_propagate_capability(ipc_message_t *msg, int item, l4_cap_idx_t ref);
 void ipc_message_receive_fpage(ipc_message_t *msg, int item, l4_snd_fpage_t fpage);
diff -r 8c11e4bd8f3c -r f59a3ff3150c libipc/include/ipc/util_ipc.h
--- a/libipc/include/ipc/util_ipc.h	Fri Mar 08 01:58:46 2024 +0100
+++ b/libipc/include/ipc/util_ipc.h	Fri Mar 08 22:43:20 2024 +0100
@@ -21,7 +21,6 @@
 
 #pragma once
 
-#include <l4/re/c/dataspace.h>
 #include <l4/sys/ipc.h>
 #include <l4/sys/utcb.h>
 #include <l4/sys/types.h>
@@ -42,7 +41,7 @@
 void _export_page(l4_msgtag_t tag, l4_msg_regs_t *mregs, int item, l4_umword_t hot_spot, l4_fpage_t fpage);
 void _free_expected_capabilities(l4_buf_regs_t *bregs, int start, int limit);
 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);
-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);
+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);
 long _import_fpage(l4_msgtag_t tag, l4_buf_regs_t *bregs, l4_msg_regs_t *mregs, int item, l4_snd_fpage_t *fpage);
 
 /* Convenience operations. */
diff -r 8c11e4bd8f3c -r f59a3ff3150c libipc/lib/src/message.c
--- a/libipc/lib/src/message.c	Fri Mar 08 01:58:46 2024 +0100
+++ b/libipc/lib/src/message.c	Fri Mar 08 22:43:20 2024 +0100
@@ -428,7 +428,7 @@
 
 /* Discard a dataspace. */
 
-void ipc_message_discard_dataspace(ipc_message_t *msg, l4re_ds_t mem, l4_addr_t addr)
+void ipc_message_discard_dataspace(ipc_message_t *msg, l4_cap_idx_t mem, l4_addr_t addr)
 {
   ipc_message_discard_capability(msg, mem);
   ipc_detach_dataspace((void *) addr);
@@ -518,7 +518,7 @@
 /* Import from the message a dataspace, mapping it to an address, updating the
    buffer registers for future capabilities. */
 
-long ipc_message_import_and_expect_dataspace(ipc_message_t *msg, int item, l4re_ds_t *mem, l4_addr_t *addr)
+long ipc_message_import_and_expect_dataspace(ipc_message_t *msg, int item, l4_cap_idx_t *mem, l4_addr_t *addr)
 {
   long err;
   int local;
@@ -552,7 +552,7 @@
 
 /* Import from the message a dataspace, mapping it to an address. */
 
-long ipc_message_import_dataspace(ipc_message_t *msg, int item, l4re_ds_t *mem, l4_addr_t *addr)
+long ipc_message_import_dataspace(ipc_message_t *msg, int item, l4_cap_idx_t *mem, l4_addr_t *addr)
 {
   int local;
   long err;
diff -r 8c11e4bd8f3c -r f59a3ff3150c libipc/lib/src/util_ipc.c
--- a/libipc/lib/src/util_ipc.c	Fri Mar 08 01:58:46 2024 +0100
+++ b/libipc/lib/src/util_ipc.c	Fri Mar 08 22:43:20 2024 +0100
@@ -166,7 +166,7 @@
 
 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)
+                       l4_cap_idx_t *mem, l4_addr_t *addr, int *local)
 {
   long err;
   offset_t size;