Changes in kernel/generic/src/ipc/sysipc.c [eadaeae8:c25a39e] in mainline

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -271 +271 @@
  *
  */
-errno_t
-ipc_req_internal(cap_phone_handle_t handle, ipc_data_t *data, sysarg_t priv)
+errno_t ipc_req_internal(cap_handle_t handle, ipc_data_t *data, sysarg_t priv)
 {
         kobject_t *kobj = kobject_get(TASK, handle, KOBJECT_TYPE_PHONE);
@@ -363 +362 @@
  *
  */
-sys_errno_t sys_ipc_call_async_fast(cap_phone_handle_t handle, sysarg_t imethod,
+sys_errno_t sys_ipc_call_async_fast(sysarg_t handle, sysarg_t imethod,
     sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t label)
 {
@@ -410 +409 @@
  *
  */
-sys_errno_t sys_ipc_call_async_slow(cap_phone_handle_t handle, ipc_data_t *data,
+sys_errno_t sys_ipc_call_async_slow(sysarg_t handle, ipc_data_t *data,
     sysarg_t label)
 {
@@ -467 +466 @@
  *
  */
-static sys_errno_t sys_ipc_forward_common(cap_call_handle_t chandle,
-    cap_phone_handle_t phandle, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2,
-    sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, unsigned int mode, bool slow)
+static sys_errno_t sys_ipc_forward_common(sysarg_t chandle, sysarg_t phandle,
+    sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
+    sysarg_t arg4, sysarg_t arg5, unsigned int mode, bool slow)
 {
         kobject_t *ckobj = cap_unpublish(TASK, chandle, KOBJECT_TYPE_CALL);
@@ -507 +506 @@
                 if (method_is_system(IPC_GET_IMETHOD(call->data))) {
                         if (IPC_GET_IMETHOD(call->data) == IPC_M_CONNECT_TO_ME)
-                                phone_dealloc((cap_phone_handle_t)
-                                    IPC_GET_ARG5(call->data));
+                                phone_dealloc(IPC_GET_ARG5(call->data));
 
                         IPC_SET_ARG1(call->data, imethod);
@@ -579 +577 @@
  *
  */
-sys_errno_t sys_ipc_forward_fast(cap_call_handle_t chandle,
-    cap_phone_handle_t phandle, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2,
-    unsigned int mode)
+sys_errno_t sys_ipc_forward_fast(sysarg_t chandle, sysarg_t phandle,
+    sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, unsigned int mode)
 {
         return sys_ipc_forward_common(chandle, phandle, imethod, arg1, arg2, 0,
@@ -604 +601 @@
  *
  */
-sys_errno_t sys_ipc_forward_slow(cap_call_handle_t chandle,
-    cap_phone_handle_t phandle, ipc_data_t *data, unsigned int mode)
+sys_errno_t sys_ipc_forward_slow(sysarg_t chandle, sysarg_t phandle,
+    ipc_data_t *data, unsigned int mode)
 {
         ipc_data_t newdata;
@@ -634 +631 @@
  *
  */
-sys_errno_t sys_ipc_answer_fast(cap_call_handle_t chandle, sysarg_t retval,
-    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
+sys_errno_t sys_ipc_answer_fast(sysarg_t chandle, sysarg_t retval, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
         kobject_t *kobj = cap_unpublish(TASK, chandle, KOBJECT_TYPE_CALL);
@@ -681 +678 @@
  *
  */
-sys_errno_t sys_ipc_answer_slow(cap_call_handle_t chandle, ipc_data_t *data)
+sys_errno_t sys_ipc_answer_slow(sysarg_t chandle, ipc_data_t *data)
 {
         kobject_t *kobj = cap_unpublish(TASK, chandle, KOBJECT_TYPE_CALL);
@@ -725 +722 @@
  *
  */
-sys_errno_t sys_ipc_hangup(cap_phone_handle_t handle)
+sys_errno_t sys_ipc_hangup(sysarg_t handle)
 {
         kobject_t *kobj = cap_unpublish(TASK, handle, KOBJECT_TYPE_PHONE);
@@ -803 +800 @@
                 goto restart;
 
-        cap_handle_t handle = CAP_NIL;
+        cap_handle_t handle;
         errno_t rc = cap_alloc(TASK, &handle);
         if (rc != EOK) {
@@ -824 +821 @@
 
 error:
-        if (CAP_HANDLE_VALID(handle))
+        if (handle >= 0)
                 cap_free(TASK, handle);
 
@@ -864 +861 @@
  * @param ucode   Uspace pointer to the top-half pseudocode.
  *
- * @param[out] uspace_handle  Uspace pointer to IRQ capability handle
+ * @param[out] uspace_handle  Uspace pointer to IRQ kernel object capability
  *
  * @return EPERM
@@ -870 +867 @@
  *
  */
-sys_errno_t sys_ipc_irq_subscribe(inr_t inr, sysarg_t imethod,
-    irq_code_t *ucode, cap_irq_handle_t *uspace_handle)
+sys_errno_t sys_ipc_irq_subscribe(inr_t inr, sysarg_t imethod, irq_code_t *ucode,
+        cap_handle_t *uspace_handle)
 {
         if (!(perm_get(TASK) & PERM_IRQ_REG))
@@ -881 +878 @@
 /** Disconnect an IRQ handler from a task.
  *
- * @param handle  IRQ capability handle.
+ * @param inr   IRQ number.
+ * @param devno Device number.
  *
  * @return Zero on success or EPERM on error.
  *
  */
-sys_errno_t sys_ipc_irq_unsubscribe(cap_irq_handle_t handle)
+sys_errno_t sys_ipc_irq_unsubscribe(sysarg_t cap)
 {
         if (!(perm_get(TASK) & PERM_IRQ_REG))
                 return EPERM;
 
-        ipc_irq_unsubscribe(&TASK->answerbox, handle);
+        ipc_irq_unsubscribe(&TASK->answerbox, cap);
 
         return 0;
@@ -901 +899 @@
  *
  */
-sys_errno_t sys_ipc_connect_kbox(task_id_t *uspace_taskid,
-    cap_phone_handle_t *uspace_phone)
+sys_errno_t sys_ipc_connect_kbox(task_id_t *uspace_taskid, cap_handle_t *uspace_phone)
 {
 #ifdef CONFIG_UDEBUG
         task_id_t taskid;
-        cap_phone_handle_t phone;
+        cap_handle_t phone;
 
         errno_t rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(task_id_t));