Changeset 241f1985 in mainline for uspace/lib/c/include

Timestamp:

2019-08-31T10:45:17Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

Location:

uspace/lib/c/include

Files:

• adt/dyn_array.h (modified) (1 diff)
• async.h (modified) (1 diff)
• ipc/services.h (modified) (1 diff)
• task.h (modified) (1 diff)
• taskman.h (modified) (1 diff)

uspace/lib/c/include/adt/dyn_array.h

@@ -41 +41 @@
 typedef struct {
         /** Data buffer of array */
-        uint8_t *_data;
+        void *_data;
         /** Size on bytes of a single item */
         size_t _item_size;

uspace/lib/c/include/async.h

@@ -132 +132 @@
 extern void async_put_client_data_by_id(task_id_t);
 
-extern void async_set_implicit_connection(async_client_conn_t);
+extern void async_set_implicit_connection(async_port_handler_t);
 
 extern errno_t async_create_port(iface_t, async_port_handler_t, void *,

uspace/lib/c/include/ipc/services.h

@@ -55 +55 @@
 #define SERVICE_NAME_CLIPBOARD "clipboard"
 #define SERVICE_NAME_CORECFG  "corecfg"
+#define SERVICE_NAME_DEVMAN   "devman"
 #define SERVICE_NAME_DHCP     "net/dhcp"
 #define SERVICE_NAME_DNSR     "net/dnsr"

uspace/lib/c/include/task.h

@@ -76 +76 @@
 
 /* Implemented in task_event.c */
-extern int task_register_event_handler(task_event_handler_t, bool);
+extern errno_t task_register_event_handler(task_event_handler_t, bool);
 
 #endif

uspace/lib/c/include/taskman.h

@@ -40 +40 @@
 /* Internal functions to be used by loader only */
 extern async_sess_t *taskman_get_session(void);
-extern int taskman_intro_loader(void);
+extern errno_t taskman_intro_loader(void);
 
 /* Internal functions to be used by NS only */
-extern int taskman_intro_ns(void);
+extern errno_t taskman_intro_ns(void);
 
 #endif