# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1685969143 -7200
# Node ID 67a6da4b40ea2870008c34bfe613f8ec6a9be9c3
# Parent  bcbfa818472ce6d1d04980a4b7f620e621099ed2
Incorporated API changes made to the L4Re distribution since Subversion r83.

diff -r bcbfa818472c -r 67a6da4b40ea pkg/devices/input/src/keypad/input-keypad-client.cc
--- a/pkg/devices/input/src/keypad/input-keypad-client.cc	Wed May 31 16:41:49 2023 +0200
+++ b/pkg/devices/input/src/keypad/input-keypad-client.cc	Mon Jun 05 14:45:43 2023 +0200
@@ -70,7 +70,8 @@
   /* Attach the keypad data to a region in this task. */
 
   if (L4Re::Env::env()->rm()->attach(&_keymem, _mem->size(),
-                                     L4Re::Rm::F::Search_addr,
+                                     L4Re::Rm::F::Search_addr |
+                                     L4Re::Rm::F::R,
                                      L4::Ipc::make_cap_rw(_mem)))
     return;
 
diff -r bcbfa818472c -r 67a6da4b40ea pkg/devices/util/src/dataspace.cc
--- a/pkg/devices/util/src/dataspace.cc	Wed May 31 16:41:49 2023 +0200
+++ b/pkg/devices/util/src/dataspace.cc	Mon Jun 05 14:45:43 2023 +0200
@@ -52,7 +52,8 @@
 
   /* Map the memory to a virtual address. */
 
-  if (L4Re::Env::env()->rm()->attach(allocated, mem->size(), L4Re::Rm::F::Search_addr,
+  if (L4Re::Env::env()->rm()->attach(allocated, mem->size(),
+                                     L4Re::Rm::F::Search_addr | L4Re::Rm::F::RW,
                                      L4::Ipc::make_cap_rw(mem)))
   {
     L4Re::Util::cap_alloc.free(mem);
diff -r bcbfa818472c -r 67a6da4b40ea pkg/landfall-examples/input_event_client/input_event_client.cc
--- a/pkg/landfall-examples/input_event_client/input_event_client.cc	Wed May 31 16:41:49 2023 +0200
+++ b/pkg/landfall-examples/input_event_client/input_event_client.cc	Mon Jun 05 14:45:43 2023 +0200
@@ -273,7 +273,9 @@
 
   void *evmem = 0;
 
-  if (L4Re::Env::env()->rm()->attach(&evmem, mem->size(), L4Re::Rm::F::Search_addr,
+  if (L4Re::Env::env()->rm()->attach(&evmem, mem->size(),
+                                     L4Re::Rm::F::Search_addr |
+                                     L4Re::Rm::F::RW,
                                      L4::Ipc::make_cap_rw(mem)))
     return 1;
 
diff -r bcbfa818472c -r 67a6da4b40ea pkg/landfall-examples/keypad_ds_client/keypad_ds_client.cc
--- a/pkg/landfall-examples/keypad_ds_client/keypad_ds_client.cc	Wed May 31 16:41:49 2023 +0200
+++ b/pkg/landfall-examples/keypad_ds_client/keypad_ds_client.cc	Mon Jun 05 14:45:43 2023 +0200
@@ -156,7 +156,9 @@
 
   /* Attach the keypad data to a region in this task. */
 
-  if (L4Re::Env::env()->rm()->attach(&keymem, mem->size(), L4Re::Rm::F::Search_addr,
+  if (L4Re::Env::env()->rm()->attach(&keymem, mem->size(),
+                                     L4Re::Rm::F::Search_addr |
+                                     L4Re::Rm::F::R,
                                      L4::Ipc::make_cap_rw(mem)))
     return 1;
 
diff -r bcbfa818472c -r 67a6da4b40ea pkg/landfall-examples/keypad_ds_client/keypad_ds_client_c.c
--- a/pkg/landfall-examples/keypad_ds_client/keypad_ds_client_c.c	Wed May 31 16:41:49 2023 +0200
+++ b/pkg/landfall-examples/keypad_ds_client/keypad_ds_client_c.c	Mon Jun 05 14:45:43 2023 +0200
@@ -163,7 +163,9 @@
 
   /* Attach the keypad data to a region in this task. */
 
-  if (l4re_rm_attach(&keymem, l4re_ds_size(mem), L4RE_RM_F_SEARCH_ADDR, mem, 0,
+  if (l4re_rm_attach(&keymem, l4re_ds_size(mem),
+                     L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_R,
+                     mem, 0,
                      L4_PAGESHIFT))
     return 1;
 
diff -r bcbfa818472c -r 67a6da4b40ea pkg/landfall-examples/qi_lb60_keypad_physical/qi_lb60_keypad_physical.c
--- a/pkg/landfall-examples/qi_lb60_keypad_physical/qi_lb60_keypad_physical.c	Wed May 31 16:41:49 2023 +0200
+++ b/pkg/landfall-examples/qi_lb60_keypad_physical/qi_lb60_keypad_physical.c	Mon Jun 05 14:45:43 2023 +0200
@@ -294,7 +294,9 @@
 
   /* Attach the keypad data to a region in this task. */
 
-  if (l4re_rm_attach(&keymem, l4re_ds_size(mem), L4RE_RM_F_SEARCH_ADDR, mem, 0,
+  if (l4re_rm_attach(&keymem, l4re_ds_size(mem),
+                     L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_R,
+                     mem, 0,
                      L4_PAGESHIFT))
     return 1;