Changeset 0993087 in mainline

Timestamp:

2008-09-24T16:11:35Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

119c335

Parents:

4470e26

Message:

Fix bugs in getting task ID from loader (was breaking ppc32).

Location:

uspace

Files:

• lib/libc/generic/loader.c (modified) (2 diffs)
• lib/libc/include/loader/loader.h (modified) (1 diff)
• srv/loader/main.c (modified) (1 diff)

uspace/lib/libc/generic/loader.c

@@ -36 +36 @@
 #include <ipc/loader.h>
 #include <libc.h>
+#include <task.h>
 #include <string.h>
 #include <stdlib.h>
@@ -94 +95 @@
         /* Get task ID. */
         req = async_send_0(ldr->phone_id, LOADER_GET_TASKID, &answer);
-        rc = ipc_data_read_start(ldr->phone_id, task_id, sizeof(task_id));
+        rc = ipc_data_read_start(ldr->phone_id, task_id, sizeof(task_id_t));
         if (rc != EOK) {
                 async_wait_for(req, NULL);

uspace/lib/libc/include/loader/loader.h

@@ -37 +37 @@
 #define LIBC_LOADER_H_
 
+#include <task.h>
+
 /** Abstraction of a loader connection */
 typedef struct {

uspace/srv/loader/main.c

@@ -101 +101 @@
         if (len > sizeof(task_id)) len = sizeof(task_id);
 
-        ipc_data_write_finalize(callid, &task_id, len);
+        ipc_data_read_finalize(callid, &task_id, len);
         ipc_answer_0(rid, EOK);
 }