Changeset addbce4 in mainline for uspace/lib/c

Timestamp:

2017-12-05T16:03:20Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

40fd6f0

Parents:

9af1c61

git-author:

Jakub Jermar <jakub@…> (2017-12-05 11:59:18)

git-committer:

Jakub Jermar <jakub@…> (2017-12-05 16:03:20)

Message:

Remove IPC_CALLID_* macros

Location:

uspace/lib/c/generic

Files:

• async.c (modified) (2 diffs)
• ipc.c (modified) (3 diffs)

uspace/lib/c/generic/async.c

@@ -1338 +1338 @@
         
         /* Kernel notification */
-        if ((chandle == CAP_NIL) && (call->flags & IPC_CALLID_NOTIFICATION)) {
+        if ((chandle == CAP_NIL) && (call->flags & IPC_CALL_NOTIF)) {
                 fibril_t *fibril = (fibril_t *) __tcb_get()->fibril_data;
                 unsigned oldsw = fibril->switches;
@@ -1497 +1497 @@
                 }
 
-                if (call.flags & IPC_CALLID_ANSWERED)
+                if (call.flags & IPC_CALL_ANSWERED)
                         continue;
 

uspace/lib/c/generic/ipc.c

@@ -264 +264 @@
         
         /* Handle received answers */
-        if ((chandle == CAP_NIL) && (call->flags & IPC_CALLID_ANSWERED))
+        if ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED))
                 handle_answer(call);
         
@@ -295 +295 @@
         do {
                 chandle = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE);
-        } while ((chandle == CAP_NIL) && (call->flags & IPC_CALLID_ANSWERED));
+        } while ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
         
         return chandle;
@@ -317 +317 @@
                 chandle = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT,
                     SYNCH_FLAGS_NON_BLOCKING);
-        } while ((chandle == CAP_NIL) && (call->flags & IPC_CALLID_ANSWERED));
+        } while ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
         
         return chandle;