Changeset 3be9d10 in mainline for uspace/srv/loader/main.c

Timestamp:

2018-03-21T21:29:31Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3e242d2

Parents:

eadaeae8

Message:

Get rid of ipc_callid_t

File:

• uspace/srv/loader/main.c (modified) (10 diffs)

uspace/srv/loader/main.c

@@ -90 +90 @@
 static bool connected = false;
 
-static void ldr_get_taskid(ipc_callid_t rid, ipc_call_t *request)
-{
-        ipc_callid_t callid;
+static void ldr_get_taskid(cap_call_handle_t rid, ipc_call_t *request)
+{
+        cap_call_handle_t callid;
         task_id_t task_id;
         size_t len;
@@ -116 +116 @@
  * @param request
  */
-static void ldr_set_cwd(ipc_callid_t rid, ipc_call_t *request)
+static void ldr_set_cwd(cap_call_handle_t rid, ipc_call_t *request)
 {
         char *buf;
@@ -136 +136 @@
  * @param request
  */
-static void ldr_set_program(ipc_callid_t rid, ipc_call_t *request)
-{
-        ipc_callid_t writeid;
+static void ldr_set_program(cap_call_handle_t rid, ipc_call_t *request)
+{
+        cap_call_handle_t writeid;
         size_t namesize;
         if (!async_data_write_receive(&writeid, &namesize)) {
@@ -169 +169 @@
  * @param request
  */
-static void ldr_set_args(ipc_callid_t rid, ipc_call_t *request)
+static void ldr_set_args(cap_call_handle_t rid, ipc_call_t *request)
 {
         char *buf;
@@ -234 +234 @@
  * @param request
  */
-static void ldr_add_inbox(ipc_callid_t rid, ipc_call_t *request)
+static void ldr_add_inbox(cap_call_handle_t rid, ipc_call_t *request)
 {
         if (inbox_entries == INBOX_MAX_ENTRIES) {
@@ -241 +241 @@
         }
 
-        ipc_callid_t writeid;
+        cap_call_handle_t writeid;
         size_t namesize;
         if (!async_data_write_receive(&writeid, &namesize)) {
@@ -281 +281 @@
  * @return 0 on success, !0 on error.
  */
-static int ldr_load(ipc_callid_t rid, ipc_call_t *request)
+static int ldr_load(cap_call_handle_t rid, ipc_call_t *request)
 {
         int rc = elf_load(program_fd, &prog_info);
@@ -310 +310 @@
  * @return 0 on success, !0 on error.
  */
-static __attribute__((noreturn)) void ldr_run(ipc_callid_t rid,
+static __attribute__((noreturn)) void ldr_run(cap_call_handle_t rid,
     ipc_call_t *request)
 {
@@ -332 +332 @@
  * to execute the loaded program).
  */
-static void ldr_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void ldr_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
         /* Already have a connection? */
@@ -351 +351 @@
                 errno_t retval;
                 ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
+                cap_call_handle_t callid = async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call))