Changeset 77a194c in mainline for abi

Timestamp:

2015-11-04T18:55:46Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

44183b98

Parents:

5265eea4 (diff), bfcde8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge new disk partitioning architecture.

Location:

abi/include/abi

Files:

• fourcc.h (modified) (1 diff)
• ipc/interfaces.h (modified) (1 diff)

abi/include/abi/fourcc.h

@@ -36 +36 @@
 #define ABI_FOURCC_H_
 
+#include "../../../common.h"
+
 #define FOURCC(a, b, c, d) \
         (((UINT32_T) (a)) | (((UINT32_T) (b)) << 8) | \

abi/include/abi/ipc/interfaces.h

@@ -174 +174 @@
             FOURCC_COMPACT('m', 'o', 'u', 's') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
         INTERFACE_KBD_CB =
-            FOURCC_COMPACT('k', 'b', 'd', ' ') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK
+            FOURCC_COMPACT('k', 'b', 'd', ' ') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
+        INTERFACE_VOL =
+            FOURCC_COMPACT('v', 'o', 'l', ' ') | IFACE_EXCHANGE_SERIALIZE,
+        INTERFACE_VBD =
+            FOURCC_COMPACT('v', 'b', 'd', ' ') | IFACE_EXCHANGE_SERIALIZE
 } iface_t;