Changeset 46c20c8 in mainline for kernel/generic/include/typedefs.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

File:

• kernel/generic/include/typedefs.h (modified) (2 diffs)

kernel/generic/include/typedefs.h

@@ -36 +36 @@
 #define KERN_TYPEDEFS_H_
 
+#include <stdint.h>
+#include <arch/common.h>
 #include <arch/types.h>
 
-#define NULL 0
-#define false 0
-#define true 1
+#define NULL  ((void *) 0)
+
+#define false  0
+#define true   1
+
+typedef struct {
+        uint64_t lo;
+        int64_t hi;
+} int128_t;
+
+typedef struct {
+        uint64_t lo;
+        uint64_t hi;
+} uint128_t;
+
+typedef struct {
+        volatile atomic_count_t count;
+} atomic_t;
 
 typedef void (* function)();
@@ -52 +69 @@
 typedef int32_t devno_t;
 
-typedef int32_t wchar_t;
-
 typedef volatile uint8_t ioport8_t;
 typedef volatile uint16_t ioport16_t;