Changeset 241f1985 in mainline for abi

Timestamp:

2019-08-31T10:45:17Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

File:

• abi/include/abi/ipc/interfaces.h (modified) (1 diff)

abi/include/abi/ipc/interfaces.h

@@ -187 +187 @@
             FOURCC_COMPACT('i', 'p', 'c', 't') | IFACE_EXCHANGE_SERIALIZE,
         INTERFACE_PCI =
-            FOURCC_COMPACT('p', 'c', 'i', ' ') | IFACE_EXCHANGE_SERIALIZE
+            FOURCC_COMPACT('p', 'c', 'i', ' ') | IFACE_EXCHANGE_SERIALIZE,
+        INTERFACE_TASKMAN_CB =
+            FOURCC_COMPACT('t', 'a', 's', 'k') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
+        INTERFACE_NS =
+            FOURCC_COMPACT('n', 's', ' ', ' ') | IFACE_EXCHANGE_ATOMIC,
+        INTERFACE_SYSMAN =
+                FOURCC_COMPACT('s', 'y', 's', 'm') | IFACE_EXCHANGE_SERIALIZE
 } iface_t;