Changeset 9b0a6b4 in mainline for kernel/generic

Timestamp:

2012-04-13T06:36:25Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

90f067d9

Parents:

e61aa80 (diff), d11a181 (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:

kernel/generic/src

Files:

• console/console.c (modified) (1 diff)
• lib/str.c (modified) (4 diffs)
• main/version.c (modified) (1 diff)

kernel/generic/src/console/console.c

@@ -57 +57 @@
 
 /** Kernel log cyclic buffer */
-static wchar_t klog[KLOG_LENGTH] __attribute__ ((aligned (PAGE_SIZE)));
+wchar_t klog[KLOG_LENGTH] __attribute__((aligned(PAGE_SIZE)));
 
 /** Kernel log initialized */

kernel/generic/src/lib/str.c

@@ -111 +111 @@
 #include <debug.h>
 #include <macros.h>
+
+/** Check the condition if wchar_t is signed */
+#ifdef WCHAR_IS_UNSIGNED
+        #define WCHAR_SIGNED_CHECK(cond)  (true)
+#else
+        #define WCHAR_SIGNED_CHECK(cond)  (cond)
+#endif
 
 /** Byte mask consisting of lowest @n bits (out of 8) */
@@ -206 +213 @@
  *
  * @return EOK if the character was encoded successfully, EOVERFLOW if there
- *         was not enough space in the output buffer or EINVAL if the character
- *         code was invalid.
- */
-int chr_encode(wchar_t ch, char *str, size_t *offset, size_t size)
+ *         was not enough space in the output buffer or EINVAL if the character
+ *         code was invalid.
+ */
+int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
 {
         if (*offset >= size)
@@ -427 +434 @@
 bool ascii_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 127))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127))
                 return true;
         
@@ -440 +447 @@
 bool chr_check(wchar_t ch)
 {
-        if ((ch >= 0) && (ch <= 1114111))
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111))
                 return true;
         

kernel/generic/src/main/version.c

@@ -38 +38 @@
 
 static const char *project = "SPARTAN kernel";
-static const char *copyright = "Copyright (c) 2001-2011 HelenOS project";
+static const char *copyright = STRING(COPYRIGHT);
 static const char *release = STRING(RELEASE);
 static const char *name = STRING(NAME);