Changeset 6fd365d in mainline

Timestamp:

2012-08-18T14:20:28Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1864948

Parents:

bc6762f

Message:

libc,libdrv: Add remaining bytes query to DMA(hw_res) interface.

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

@@ -115 +115 @@
 }
 
+/**
+ * Query remaining bytes in the buffer.
+ * @param channel DMA Channel 1,2,3 for 8 bit transfers, 5,6,7 for 16 bit.
+ * @return Number of bytes remaining in the buffer(>=0) or error code(<0).
+ */
+int hw_res_dma_channel_remain(async_sess_t *sess, unsigned channel)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        if (exch == NULL)
+                return ENOMEM;
+        sysarg_t remain;
+        const int ret = async_req_2_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+            HW_RES_DMA_CHANNEL_REMAIN, channel, &remain);
+        async_exchange_end(exch);
+        if (ret == EOK)
+                return remain;
+        return ret;
+}
+
 /** @}
  */

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

@@ -53 +53 @@
         HW_RES_ENABLE_INTERRUPT,
         HW_RES_DMA_CHANNEL_SETUP,
+        HW_RES_DMA_CHANNEL_REMAIN,
 } hw_res_method_t;
 
@@ -116 +117 @@
 extern int hw_res_dma_channel_setup(async_sess_t *, unsigned int, uint32_t,
     uint16_t, uint8_t);
+extern int hw_res_dma_channel_remain(async_sess_t *, unsigned);
 
 #endif

uspace/lib/drv/generic/remote_hw_res.c

@@ -46 +46 @@
 static void remote_hw_res_dma_channel_setup(ddf_fun_t *, void *, ipc_callid_t,
     ipc_call_t *);
+static void remote_hw_res_dma_channel_remain(ddf_fun_t *, void *, ipc_callid_t,
+    ipc_call_t *);
 
 static remote_iface_func_ptr_t remote_hw_res_iface_ops [] = {
@@ -51 +53 @@
         [HW_RES_ENABLE_INTERRUPT] = &remote_hw_res_enable_interrupt,
         [HW_RES_DMA_CHANNEL_SETUP] = &remote_hw_res_dma_channel_setup,
+        [HW_RES_DMA_CHANNEL_REMAIN] = &remote_hw_res_dma_channel_remain,
 };
 
@@ -117 +120 @@
 }
 
+static void remote_hw_res_dma_channel_remain(ddf_fun_t *fun, void *ops,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        hw_res_ops_t *hw_res_ops = ops;
+
+        if (hw_res_ops->dma_channel_setup == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+        const unsigned channel = DEV_IPC_GET_ARG1(*call);
+        uint16_t remain = 0;
+        const int ret = hw_res_ops->dma_channel_remain(fun, channel, &remain);
+        async_answer_1(callid, ret, remain);
+}
 /**
  * @}

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

@@ -45 +45 @@
         bool (*enable_interrupt)(ddf_fun_t *);
         int (*dma_channel_setup)(ddf_fun_t *, unsigned, uint32_t, uint16_t, uint8_t);
+        int (*dma_channel_remain)(ddf_fun_t *, unsigned, uint16_t *);
 } hw_res_ops_t;