Changeset 3e828ea in mainline for kernel/generic/src/main

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (1 diff)
• uinit.c (modified) (2 diffs)
• version.c (modified) (1 diff)

kernel/generic/src/main/kinit.c

@@ -291 +291 @@
                         log(LF_OTHER, LVL_ERROR,
                             "init[%zu]: Init binary load failed "
-                            "(error %s, loader status %u)", i,
-                            str_error_name(rc), programs[i].loader_status);
+                            "(error %s, loader status %s)", i,
+                            str_error_name(rc), str_error_name(programs[i].loader_status));
                 }
         }

kernel/generic/src/main/uinit.c

@@ -70 +70 @@
 #endif
 
-        uspace_arg_t *uarg = (uspace_arg_t *) arg;
+        uspace_arg_t *uarg = arg;
         uspace_arg_t local_uarg;
 
@@ -77 +77 @@
         local_uarg.uspace_stack_size = uarg->uspace_stack_size;
         local_uarg.uspace_uarg = uarg->uspace_uarg;
-        local_uarg.uspace_thread_function = NULL;
-        local_uarg.uspace_thread_arg = NULL;
+        local_uarg.uspace_thread_function = USPACE_NULL;
+        local_uarg.uspace_thread_arg = USPACE_NULL;
 
         free(uarg);

kernel/generic/src/main/version.c

@@ -38 +38 @@
 
 static const char *project = "SPARTAN kernel";
-static const char *copyright = STRING(COPYRIGHT);
-static const char *release = STRING(RELEASE);
-static const char *name = STRING(NAME);
+static const char *copyright = STRING(HELENOS_COPYRIGHT);
+static const char *release = STRING(HELENOS_RELEASE);
+static const char *name = STRING(HELENOS_CODENAME);
 static const char *arch = STRING(KARCH);