Changeset d7e245a in mainline

Timestamp:

2017-11-26T20:13:07Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b8f933

Parents:

474c68b

Message:

Use ordinary errors instead of IPC_CALLRET_FATAL

Files:

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

abi/include/abi/ipc/ipc.h

@@ -80 +80 @@
 #define IPC_CALLID_NOTIFICATION  2
 
-/* Return values from sys_ipc_call_async(). */
-#define IPC_CALLRET_FATAL      -1
-
 /* Macros for manipulating calling data */
 #define IPC_SET_RETVAL(data, retval)  ((data).args[0] = (retval))

kernel/generic/src/ipc/sysipc.c

@@ -358 +358 @@
  * @param label    User-defined label.
  *
- * @return Call hash on success.
- * @return IPC_CALLRET_FATAL in case of a fatal error.
+ * @return EOK on success.
+ * @return Negative error code on error.
  *
  */
@@ -367 +367 @@
         kobject_t *kobj = kobject_get(TASK, handle, KOBJECT_TYPE_PHONE);
         if (!kobj)
-                return IPC_CALLRET_FATAL;
+                return ENOENT;
         
         if (check_call_limit(kobj->phone)) {
                 kobject_put(kobj);
-                return IPC_CALLRET_FATAL;
+                return ELIMIT;
         }
         
@@ -414 +414 @@
         kobject_t *kobj = kobject_get(TASK, handle, KOBJECT_TYPE_PHONE);
         if (!kobj)
-                return IPC_CALLRET_FATAL;
+                return ENOENT;
 
         if (check_call_limit(kobj->phone)) {
                 kobject_put(kobj);
-                return IPC_CALLRET_FATAL;
+                return ELIMIT;
         }
 

uspace/app/trace/trace.c

@@ -284 +284 @@
         sysarg_t phoneid;
         
-        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL)
+        if (sc_rc == (sysarg_t) EOK)
                 return;
 
@@ -304 +304 @@
         int rc;
 
-        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL)
+        if (sc_rc == (sysarg_t) EOK)
                 return;
 

uspace/lib/c/generic/ipc.c

@@ -100 +100 @@
         }
         
-        if (rc == IPC_CALLRET_FATAL) {
+        if (rc != EOK) {
                 /* Call asynchronous handler with error code */
                 if (call->callback)