Changeset 84876aa4 in mainline for uspace/lib/c/include

Timestamp:

2019-11-15T13:46:34Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ecb7828

Parents:

b093a62 (diff), d548fc0 (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 master into gfx

Mainly to get XCW fixes

Location:

uspace/lib/c/include

Files:

• capa.h (moved) (moved from uspace/lib/c/include/cap.h ) (4 diffs)
• loader/loader.h (modified) (1 diff)
• task.h (modified) (2 diffs)

uspace/lib/c/include/capa.h

@@ -34 +34 @@
  */
 
-#ifndef _LIBC_CAP_H_
-#define _LIBC_CAP_H_
+#ifndef _LIBC_CAPA_H_
+#define _LIBC_CAPA_H_
 
 #include <adt/list.h>
@@ -55 +55 @@
         cu_zbyte,
         cu_ybyte
-} cap_unit_t;
+} capa_unit_t;
 
 /** Which of values within the precision of the capacity */
@@ -65 +65 @@
         /** The maximum value */
         cv_max
-} cap_vsel_t;
+} capa_vsel_t;
 
 #define CU_LIMIT (cu_ybyte + 1)
@@ -87 +87 @@
         unsigned dp;
         /** Capacity unit */
-        cap_unit_t cunit;
-} cap_spec_t;
+        capa_unit_t cunit;
+} capa_spec_t;
 
-extern errno_t cap_format(cap_spec_t *, char **);
-extern errno_t cap_parse(const char *, cap_spec_t *);
-extern void cap_simplify(cap_spec_t *);
-extern void cap_from_blocks(uint64_t, size_t, cap_spec_t *);
-extern errno_t cap_to_blocks(cap_spec_t *, cap_vsel_t, size_t, uint64_t *);
+extern errno_t capa_format(capa_spec_t *, char **);
+extern errno_t capa_parse(const char *, capa_spec_t *);
+extern void capa_simplify(capa_spec_t *);
+extern void capa_from_blocks(uint64_t, size_t, capa_spec_t *);
+extern errno_t capa_to_blocks(capa_spec_t *, capa_vsel_t, size_t, uint64_t *);
 
 #endif

uspace/lib/c/include/loader/loader.h

@@ -53 +53 @@
 extern errno_t loader_load_program(loader_t *);
 extern errno_t loader_run(loader_t *);
+extern void loader_run_nowait(loader_t *);
 extern void loader_abort(loader_t *);
 

uspace/lib/c/include/task.h

@@ -36 +36 @@
 #define _LIBC_TASK_H_
 
+#include <async.h>
 #include <stdint.h>
 #include <stdarg.h>
@@ -56 +57 @@
 extern errno_t task_spawnv(task_id_t *, task_wait_t *, const char *path,
     const char *const []);
+extern errno_t task_spawnv_debug(task_id_t *, task_wait_t *, const char *path,
+    const char *const [], async_sess_t **);
 extern errno_t task_spawnvf(task_id_t *, task_wait_t *, const char *path,
     const char *const [], int, int, int);
+extern errno_t task_spawnvf_debug(task_id_t *, task_wait_t *, const char *path,
+    const char *const [], int, int, int, async_sess_t **);
 extern errno_t task_spawn(task_id_t *, task_wait_t *, const char *path, int,
     va_list ap);