Changeset 81f70b4 in mainline for kernel

Timestamp:

2012-03-31T18:14:08Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d5f99e6

Parents:

95c9158 (diff), 2f4fa79 (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:

Mainline changes and some usb fixes.

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• arch/ppc32/src/ppc32.c (modified) (1 diff)
• generic/include/str.h (modified) (1 diff)
• generic/src/console/cmd.c (modified) (1 diff)
• generic/src/console/kconsole.c (modified) (1 diff)
• generic/src/lib/str.c (modified) (1 diff)
• generic/src/main/version.c (modified) (1 diff)
• generic/src/sysinfo/stats.c (modified) (3 diffs)

kernel/Makefile

@@ -90 +90 @@
 endif
 
-DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
+DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
 
 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \

kernel/arch/ppc32/src/ppc32.c

@@ -130 +130 @@
                         visual = VISUAL_INDIRECT_8;
                         break;
+                case 15:
+                        visual = VISUAL_RGB_5_5_5_BE;
+                        break;
                 case 16:
-                        visual = VISUAL_RGB_5_5_5_BE;
+                        visual = VISUAL_RGB_5_6_5_BE;
                         break;
                 case 24:

kernel/generic/include/str.h

@@ -97 +97 @@
 extern bool wstr_remove(wchar_t *str, size_t pos);
 
-extern int str_uint64(const char *, char **, unsigned int, bool, uint64_t *);
+extern int str_uint64_t(const char *, char **, unsigned int, bool, uint64_t *);
 
 extern void order_suffix(const uint64_t, uint64_t *, char *);

kernel/generic/src/console/cmd.c

@@ -906 +906 @@
                    ((char *) argv->buffer)[0] <= '9') {
                 uint64_t value;
-                rc = str_uint64((char *) argv->buffer, NULL, 0, true, &value);
+                rc = str_uint64_t((char *) argv->buffer, NULL, 0, true, &value);
                 if (rc == EOK)
                         addr = (uintptr_t) value;

kernel/generic/src/console/kconsole.c

@@ -472 +472 @@
                 /* It's a number - convert it */
                 uint64_t value;
-                int rc = str_uint64(text, NULL, 0, true, &value);
+                int rc = str_uint64_t(text, NULL, 0, true, &value);
                 switch (rc) {
                 case EINVAL:

kernel/generic/src/lib/str.c

@@ -893 +893 @@
  *
  */
-int str_uint64(const char *nptr, char **endptr, unsigned int base,
+int str_uint64_t(const char *nptr, char **endptr, unsigned int base,
     bool strict, uint64_t *result)
 {

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);

kernel/generic/src/sysinfo/stats.c

@@ -474 +474 @@
         /* Parse the task ID */
         task_id_t task_id;
-        if (str_uint64(name, NULL, 0, true, &task_id) != EOK)
+        if (str_uint64_t(name, NULL, 0, true, &task_id) != EOK)
                 return ret;
         
@@ -545 +545 @@
         /* Parse the thread ID */
         thread_id_t thread_id;
-        if (str_uint64(name, NULL, 0, true, &thread_id) != EOK)
+        if (str_uint64_t(name, NULL, 0, true, &thread_id) != EOK)
                 return ret;
         
@@ -662 +662 @@
         /* Parse the exception number */
         uint64_t excn;
-        if (str_uint64(name, NULL, 0, true, &excn) != EOK)
+        if (str_uint64_t(name, NULL, 0, true, &excn) != EOK)
                 return ret;