Changeset 5856b627 in mainline for uspace/lib/drv/generic

Timestamp:

2013-08-20T12:36:48Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

26e2de3

Parents:

0ee999d (diff), 4da8fdb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes.

Location:

uspace/lib/drv/generic

Files:

• dev_iface.c (modified) (1 diff)
• remote_audio_mixer.c (added)
• remote_audio_pcm.c (added)
• remote_hw_res.c (modified) (3 diffs)

uspace/lib/drv/generic/dev_iface.c

@@ -49 +49 @@
 #include "remote_usbhid.h"
 #include "remote_pci.h"
+#include "remote_audio_mixer.h"
+#include "remote_audio_pcm.h"
 #include "remote_ahci.h"
 
-static iface_dipatch_table_t remote_ifaces = {
+static const iface_dipatch_table_t remote_ifaces = {
         .ifaces = {
-                &remote_hw_res_iface,
-                &remote_char_dev_iface,
-                &remote_graph_dev_iface,
-                &remote_nic_iface,
-                &remote_pci_iface,
-                &remote_usb_iface,
-                &remote_usbhc_iface,
-                &remote_usbhid_iface,
-                &remote_clock_dev_iface,
-                &remote_battery_dev_iface,
-                &remote_ahci_iface
+                [AUDIO_MIXER_IFACE] = &remote_audio_mixer_iface,
+                [AUDIO_PCM_BUFFER_IFACE] = &remote_audio_pcm_iface,
+                [HW_RES_DEV_IFACE] = &remote_hw_res_iface,
+                [CHAR_DEV_IFACE] = &remote_char_dev_iface,
+                [GRAPH_DEV_IFACE] = &remote_graph_dev_iface,
+                [NIC_DEV_IFACE] = &remote_nic_iface,
+                [PCI_DEV_IFACE] = &remote_pci_iface,
+                [USB_DEV_IFACE] = &remote_usb_iface,
+                [USBHC_DEV_IFACE] = &remote_usbhc_iface,
+                [USBHID_DEV_IFACE] = &remote_usbhid_iface,
+                [CLOCK_DEV_IFACE] = &remote_clock_dev_iface,
+                [BATTERY_DEV_IFACE] = &remote_battery_dev_iface,
+                [AHCI_DEV_IFACE] = &remote_ahci_iface,
         }
 };

uspace/lib/drv/generic/remote_hw_res.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -43 +44 @@
 static void remote_hw_res_enable_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 *);
+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 [] = {
-        &remote_hw_res_get_resource_list,
-        &remote_hw_res_enable_interrupt
+        [HW_RES_GET_RESOURCE_LIST] = &remote_hw_res_get_resource_list,
+        [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,
 };
 
@@ -94 +101 @@
 }
 
+static void remote_hw_res_dma_channel_setup(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) & 0xffff;
+        const uint8_t  mode = DEV_IPC_GET_ARG1(*call) >> 16;
+        const uint32_t address = DEV_IPC_GET_ARG2(*call);
+        const uint32_t size = DEV_IPC_GET_ARG3(*call);
+
+        const int ret = hw_res_ops->dma_channel_setup(
+            fun, channel, address, size, mode);
+        async_answer_0(callid, ret);
+}
+
+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);
+        size_t remain = 0;
+        const int ret = hw_res_ops->dma_channel_remain(fun, channel, &remain);
+        async_answer_1(callid, ret, remain);
+}
 /**
  * @}