1.1 --- a/dstest_test_client.cc Thu Mar 11 23:51:02 2021 +0100
1.2 +++ b/dstest_test_client.cc Sat Mar 13 01:36:26 2021 +0100
1.3 @@ -160,10 +160,17 @@
1.4
1.5 int main(void)
1.6 {
1.7 + long err;
1.8 +
1.9 /* Introduce concurrency control. */
1.10
1.11 - ipc_cap_alloc_init();
1.12 - ipc_mem_init();
1.13 + err = ipc_thread_init();
1.14 +
1.15 + if (err)
1.16 + {
1.17 + printf("Initialisation error: %s\n", l4sys_errtostr(err));
1.18 + return 1;
1.19 + }
1.20
1.21 /* Retain activity and context details. */
1.22
1.23 @@ -180,7 +187,7 @@
1.24
1.25 for (fileid = 0; fileid < NUMBER_OF_FILES; fileid++)
1.26 {
1.27 - long err = context_for_file(fileid, &contexts[fileid], server);
1.28 + err = context_for_file(fileid, &contexts[fileid], server);
1.29
1.30 if (err)
1.31 {
2.1 --- a/dstest_test_server.cc Thu Mar 11 23:51:02 2021 +0100
2.2 +++ b/dstest_test_server.cc Sat Mar 13 01:36:26 2021 +0100
2.3 @@ -44,9 +44,17 @@
2.4
2.5 int main(int argc, char *argv[])
2.6 {
2.7 + long err;
2.8 +
2.9 /* Introduce concurrency control. */
2.10
2.11 - ipc_cap_alloc_init();
2.12 + err = ipc_thread_init();
2.13 +
2.14 + if (err)
2.15 + {
2.16 + printf("Initialisation error: %s\n", l4sys_errtostr(err));
2.17 + return 1;
2.18 + }
2.19
2.20 /* Configure the number of available pages using any argument. */
2.21
2.22 @@ -66,7 +74,7 @@
2.23 /* Register a server associating it with the given object. */
2.24
2.25 ResourceServer server(&opener);
2.26 - long err = server.bind("server");
2.27 + err = server.bind("server");
2.28
2.29 if (err)
2.30 {