Changeset addbce4 in mainline

Timestamp:

2017-12-05T16:03:20Z (7 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

Files:

• abi/include/abi/ipc/ipc.h (modified) (4 diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (2 diffs)
• uspace/app/trace/ipcp.c (modified) (1 diff)
• uspace/lib/c/generic/async.c (modified) (2 diffs)
• uspace/lib/c/generic/ipc.c (modified) (3 diffs)

abi/include/abi/ipc/ipc.h

@@ -38 +38 @@
 /** Length of data being transfered with IPC call
  *
- * The uspace may not be able to utilize full length
+ * The uspace may not be able to utilize the full length
  *
  */
@@ -49 +49 @@
 
 /** This is answer to a call */
-#define IPC_CALL_ANSWERED  (1 << 0)
+#define IPC_CALL_ANSWERED        (1 << 0)
 
 /** Answer will not be passed to userspace, will be discarded */
@@ -55 +55 @@
 
 /** Call was forwarded */
-#define IPC_CALL_FORWARDED  (1 << 2)
+#define IPC_CALL_FORWARDED       (1 << 2)
 
 /** Interrupt notification */
-#define IPC_CALL_NOTIF  (1 << 3)
+#define IPC_CALL_NOTIF           (1 << 3)
 
 /**
@@ -65 +65 @@
  */
 #define DATA_XFER_LIMIT  (64 * 1024)
-
-
-/** Bits used in call hashes.
- *
- * The addresses are aligned at least to 4 that is why we can use the 2 least
- * significant bits of the call address.
- *
- */
-
-/** Type of this call is 'answer' */
-#define IPC_CALLID_ANSWERED  1
-
-/** Type of this call is 'notification' */
-#define IPC_CALLID_NOTIFICATION  2
 
 /* Macros for manipulating calling data */

kernel/generic/src/ipc/sysipc.c

@@ -775 +775 @@
                 call->data.phone = (void *) call->priv;
                 
-                call->data.flags = IPC_CALLID_NOTIFICATION;
+                call->data.flags = IPC_CALL_NOTIF;
 
                 STRUCT_TO_USPACE(calldata, &call->data);
@@ -791 +791 @@
                 }
 
-                call->data.flags = IPC_CALLID_ANSWERED;
+                call->data.flags = IPC_CALL_ANSWERED;
                 
                 STRUCT_TO_USPACE(calldata, &call->data);

uspace/app/trace/ipcp.c

@@ -323 +323 @@
         pending_call_t *pcall;
         
-        if ((call->flags & IPC_CALLID_ANSWERED) == 0 &&
+        if ((call->flags & IPC_CALL_ANSWERED) == 0 &&
             hash != IPCP_CALLID_SYNC) {
                 /* Not a response */

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;