Changeset 850235d in mainline for abi

Timestamp:

2013-03-10T14:56:21Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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 mainline changes

Location:

abi/include/abi

Files:

• bool.h (modified) (1 diff)
• klog.h (moved) (moved from uspace/lib/ext2/libext2.h ) (2 diffs)
• mm/as.h (modified) (1 diff)

abi/include/abi/bool.h

@@ -36 +36 @@
 #define ABI_BOOL_H_
 
-typedef uint8_t bool;
+#define bool _Bool
 
 #endif

abi/include/abi/klog.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Martin Sucha
+ * Copyright (c) 2012 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libext2
+/** @addtogroup generic
  * @{
  */
-/**
- * @file
+/** @file
  */
 
-#ifndef LIBEXT2_LIBEXT2_H_
-#define LIBEXT2_LIBEXT2_H_
+#ifndef ABI_KLOG_H_
+#define ABI_KLOG_H_
 
-#include "libext2_superblock.h"
-#include "libext2_block_group.h"
-#include "libext2_inode.h"
-#include "libext2_filesystem.h"
-#include "libext2_directory.h"
+enum {
+        KLOG_UNKNOW,
+        KLOG_WRITE,
+        KLOG_UPDATE,
+        KLOG_COMMAND
+};
 
 #endif

abi/include/abi/mm/as.h

@@ -37 +37 @@
 
 /** Address space area flags. */
-#define AS_AREA_READ       1
-#define AS_AREA_WRITE      2
-#define AS_AREA_EXEC       4
-#define AS_AREA_CACHEABLE  8
+#define AS_AREA_READ         0x01
+#define AS_AREA_WRITE        0x02
+#define AS_AREA_EXEC         0x04
+#define AS_AREA_CACHEABLE    0x08
+#define AS_AREA_GUARD        0x10
+#define AS_AREA_LATE_RESERVE 0x20
 
 /** Address space area info exported to uspace. */