Changes in kernel/generic/src/ipc/ipc.c [b7fd2a0:82d515e9] in mainline

File:

• kernel/generic/src/ipc/ipc.c (modified) (10 diffs)

kernel/generic/src/ipc/ipc.c

@@ -205 +205 @@
  * @param request Call structure with request.
  *
- * @return EOK on success or an error code.
- *
- */
-errno_t ipc_call_sync(phone_t *phone, call_t *request)
+ * @return EOK on success or a negative error code.
+ *
+ */
+int ipc_call_sync(phone_t *phone, call_t *request)
 {
         answerbox_t *mybox = slab_alloc(answerbox_cache, 0);
@@ -216 +216 @@
         request->callerbox = mybox;
         
-        errno_t rc = ipc_call(phone, request);
+        int rc = ipc_call(phone, request);
         if (rc != EOK) {
                 slab_free(answerbox_cache, mybox);
@@ -371 +371 @@
  *
  */
-void ipc_backsend_err(phone_t *phone, call_t *call, errno_t err)
+void ipc_backsend_err(phone_t *phone, call_t *call, sysarg_t err)
 {
         _ipc_call_actions_internal(phone, call, false);
@@ -415 +415 @@
  *
  */
-errno_t ipc_call(phone_t *phone, call_t *call)
+int ipc_call(phone_t *phone, call_t *call)
 {
         mutex_lock(&phone->lock);
@@ -444 +444 @@
  * @param phone Phone structure to be hung up.
  *
- * @return EOK if the phone is disconnected.
- * @return EINVAL if the phone was already disconnected.
- *
- */
-errno_t ipc_phone_hangup(phone_t *phone)
+ * @return 0 if the phone is disconnected.
+ * @return -1 if the phone was already disconnected.
+ *
+ */
+int ipc_phone_hangup(phone_t *phone)
 {
         mutex_lock(&phone->lock);
@@ -455 +455 @@
             phone->state == IPC_PHONE_CONNECTING) {
                 mutex_unlock(&phone->lock);
-                return EINVAL;
+                return -1;
         }
         
@@ -478 +478 @@
         mutex_unlock(&phone->lock);
         
-        return EOK;
+        return 0;
 }
 
@@ -495 +495 @@
  *
  */
-errno_t ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox,
+int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox,
     unsigned int mode)
 {
@@ -535 +535 @@
         uint64_t answer_cnt = 0;
         uint64_t call_cnt = 0;
-        errno_t rc;
+        int rc;
         
 restart:
-        rc = waitq_sleep_timeout(&box->wq, usec, flags, NULL);
-        if (rc != EOK)
+        rc = waitq_sleep_timeout(&box->wq, usec, flags);
+        if (SYNCH_FAILED(rc))
                 return NULL;
         
@@ -638 +638 @@
                 phone = list_get_instance(list_first(&box->connected_phones),
                     phone_t, link);
-                if (mutex_trylock(&phone->lock) != EOK) {
+                if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
                         irq_spinlock_unlock(&box->lock, true);
                         DEADLOCK_PROBE(p_phonelck, DEADLOCK_THRESHOLD);