Changeset 5828554 in mainline for uspace/lib/drv/generic/remote_pci.c

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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:

merge mainline changes

File:

• uspace/lib/drv/generic/remote_pci.c (modified) (2 diffs)

uspace/lib/drv/generic/remote_pci.c

@@ -36 +36 @@
 #include <async.h>
 #include <errno.h>
+#include <macros.h>
 
 #include "pci_dev_iface.h"
 #include "ddf/driver.h"
+
+typedef enum {
+        IPC_M_CONFIG_SPACE_READ_8,
+        IPC_M_CONFIG_SPACE_READ_16,
+        IPC_M_CONFIG_SPACE_READ_32,
+
+        IPC_M_CONFIG_SPACE_WRITE_8,
+        IPC_M_CONFIG_SPACE_WRITE_16,
+        IPC_M_CONFIG_SPACE_WRITE_32
+} pci_dev_iface_funcs_t;
+
+int pci_config_space_read_8(async_sess_t *sess, uint32_t address, uint8_t *val)
+{
+        sysarg_t res = 0;
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        int rc = async_req_2_1(exch, DEV_IFACE_ID(PCI_DEV_IFACE),
+            IPC_M_CONFIG_SPACE_READ_8, address, &res);
+        async_exchange_end(exch);
+        
+        *val = (uint8_t) res;
+        return rc;
+}
+
+int pci_config_space_read_16(async_sess_t *sess, uint32_t address,
+    uint16_t *val)
+{
+        sysarg_t res = 0;
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        int rc = async_req_2_1(exch, DEV_IFACE_ID(PCI_DEV_IFACE),
+            IPC_M_CONFIG_SPACE_READ_16, address, &res);
+        async_exchange_end(exch);
+        
+        *val = (uint16_t) res;
+        return rc;
+}
+
+int pci_config_space_read_32(async_sess_t *sess, uint32_t address,
+    uint32_t *val)
+{
+        sysarg_t res = 0;
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        int rc = async_req_2_1(exch, DEV_IFACE_ID(PCI_DEV_IFACE),
+            IPC_M_CONFIG_SPACE_READ_32, address, &res);
+        async_exchange_end(exch);
+        
+        *val = (uint32_t) res;
+        return rc;
+}
+
+int pci_config_space_write_8(async_sess_t *sess, uint32_t address, uint8_t val)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE),
+            IPC_M_CONFIG_SPACE_WRITE_8, address, val);
+        async_exchange_end(exch);
+        
+        return rc;
+}
+
+int pci_config_space_write_16(async_sess_t *sess, uint32_t address,
+    uint16_t val)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE),
+            IPC_M_CONFIG_SPACE_WRITE_16, address, val);
+        async_exchange_end(exch);
+        
+        return rc;
+}
+
+int pci_config_space_write_32(async_sess_t *sess, uint32_t address,
+    uint32_t val)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE),
+            IPC_M_CONFIG_SPACE_WRITE_32, address, val);
+        async_exchange_end(exch);
+        
+        return rc;
+}
 
 static void remote_config_space_read_8(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -49 +133 @@
 
 /** Remote USB interface operations. */
-static remote_iface_func_ptr_t remote_pci_iface_ops [] = {
-        remote_config_space_read_8,
-        remote_config_space_read_16,
-        remote_config_space_read_32,
-
-        remote_config_space_write_8,
-        remote_config_space_write_16,
-        remote_config_space_write_32
+static const remote_iface_func_ptr_t remote_pci_iface_ops [] = {
+        [IPC_M_CONFIG_SPACE_READ_8] = remote_config_space_read_8,
+        [IPC_M_CONFIG_SPACE_READ_16] = remote_config_space_read_16,
+        [IPC_M_CONFIG_SPACE_READ_32] = remote_config_space_read_32,
+
+        [IPC_M_CONFIG_SPACE_WRITE_8] = remote_config_space_write_8,
+        [IPC_M_CONFIG_SPACE_WRITE_16] = remote_config_space_write_16,
+        [IPC_M_CONFIG_SPACE_WRITE_32] = remote_config_space_write_32
 };
 
 /** Remote USB interface structure.
  */
-remote_iface_t remote_pci_iface = {
-        .method_count = sizeof(remote_pci_iface_ops) /
-            sizeof(remote_pci_iface_ops[0]),
+const remote_iface_t remote_pci_iface = {
+        .method_count = ARRAY_SIZE(remote_pci_iface_ops),
         .methods = remote_pci_iface_ops
 };