Changeset d51838f in mainline for uspace/lib

Timestamp:

2017-10-14T22:49:18Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

75911d24

Parents:

ce732e74

Message:

Let leaf drivers enable/disable/clear interrupts via hw_res instead of directly using irc.

Location:

uspace/lib

Files:

• c/generic/device/hw_res.c (modified) (1 diff)
• c/include/device/hw_res.h (modified) (2 diffs)
• drv/generic/remote_hw_res.c (modified) (3 diffs)
• drv/include/ops/hw_res.h (modified) (1 diff)

uspace/lib/c/generic/device/hw_res.c

@@ -86 +86 @@
 }
 
+int hw_res_disable_interrupt(async_sess_t *sess, int irq)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        
+        int rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+            HW_RES_DISABLE_INTERRUPT, irq);
+        async_exchange_end(exch);
+        
+        return rc;
+}
+
+int hw_res_clear_interrupt(async_sess_t *sess, int irq)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        
+        int rc = async_req_2_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+            HW_RES_CLEAR_INTERRUPT, irq);
+        async_exchange_end(exch);
+        
+        return rc;
+}
+
 /** Setup DMA channel to specified place and mode.
  *

uspace/lib/c/include/device/hw_res.h

@@ -52 +52 @@
         HW_RES_GET_RESOURCE_LIST = 0,
         HW_RES_ENABLE_INTERRUPT,
+        HW_RES_DISABLE_INTERRUPT,
+        HW_RES_CLEAR_INTERRUPT,
         HW_RES_DMA_CHANNEL_SETUP,
         HW_RES_DMA_CHANNEL_REMAIN,
@@ -116 +118 @@
 extern int hw_res_get_resource_list(async_sess_t *, hw_resource_list_t *);
 extern int hw_res_enable_interrupt(async_sess_t *, int);
+extern int hw_res_disable_interrupt(async_sess_t *, int);
+extern int hw_res_clear_interrupt(async_sess_t *, int);
 
 extern int hw_res_dma_channel_setup(async_sess_t *, unsigned int, uint32_t,

uspace/lib/drv/generic/remote_hw_res.c

@@ -45 +45 @@
 static void remote_hw_res_enable_interrupt(ddf_fun_t *, void *, ipc_callid_t,
     ipc_call_t *);
+static void remote_hw_res_disable_interrupt(ddf_fun_t *, void *, ipc_callid_t,
+    ipc_call_t *);
+static void remote_hw_res_clear_interrupt(ddf_fun_t *, void *, ipc_callid_t,
+    ipc_call_t *);
 static void remote_hw_res_dma_channel_setup(ddf_fun_t *, void *, ipc_callid_t,
     ipc_call_t *);
@@ -53 +57 @@
         [HW_RES_GET_RESOURCE_LIST] = &remote_hw_res_get_resource_list,
         [HW_RES_ENABLE_INTERRUPT] = &remote_hw_res_enable_interrupt,
+        [HW_RES_DISABLE_INTERRUPT] = &remote_hw_res_disable_interrupt,
+        [HW_RES_CLEAR_INTERRUPT] = &remote_hw_res_clear_interrupt,
         [HW_RES_DMA_CHANNEL_SETUP] = &remote_hw_res_dma_channel_setup,
         [HW_RES_DMA_CHANNEL_REMAIN] = &remote_hw_res_dma_channel_remain,
@@ -68 +74 @@
         
         if (hw_res_ops->enable_interrupt == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+        
+        const int irq = DEV_IPC_GET_ARG1(*call);
+        const int ret = hw_res_ops->enable_interrupt(fun, irq);
+        async_answer_0(callid, ret);
+}
+
+static void remote_hw_res_disable_interrupt(ddf_fun_t *fun, void *ops,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        hw_res_ops_t *hw_res_ops = (hw_res_ops_t *) ops;
+        
+        if (hw_res_ops->disable_interrupt == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+        
+        const int irq = DEV_IPC_GET_ARG1(*call);
+        const int ret = hw_res_ops->disable_interrupt(fun, irq);
+        async_answer_0(callid, ret);
+}
+
+static void remote_hw_res_clear_interrupt(ddf_fun_t *fun, void *ops,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        hw_res_ops_t *hw_res_ops = (hw_res_ops_t *) ops;
+        
+        if (hw_res_ops->clear_interrupt == NULL) {
                 async_answer_0(callid, ENOTSUP);
                 return;

uspace/lib/drv/include/ops/hw_res.h

@@ -45 +45 @@
         hw_resource_list_t *(*get_resource_list)(ddf_fun_t *);
         int (*enable_interrupt)(ddf_fun_t *, int);
+        int (*disable_interrupt)(ddf_fun_t *, int);
+        int (*clear_interrupt)(ddf_fun_t *, int);
         int (*dma_channel_setup)(ddf_fun_t *, unsigned, uint32_t, uint32_t, uint8_t);
         int (*dma_channel_remain)(ddf_fun_t *, unsigned, size_t *);