Changeset c188c62 in mainline for uspace/drv/bus/adb/cuda_adb/main.c

Timestamp:

2017-10-05T18:00:52Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

81b9d3e

Parents:

e27e36e

Message:

CUDA driver should use hw_res to obtain HW configuration.

File:

• uspace/drv/bus/adb/cuda_adb/main.c (modified) (3 diffs)

uspace/drv/bus/adb/cuda_adb/main.c

@@ -35 +35 @@
 #include <ddf/driver.h>
 #include <ddf/log.h>
+#include <device/hw_res_parsed.h>
 #include <errno.h>
 #include <stdio.h>
@@ -61 +62 @@
 };
 
+static int cuda_get_res(ddf_dev_t *dev, cuda_res_t *res)
+{
+        async_sess_t *parent_sess;
+        hw_res_list_parsed_t hw_res;
+        int rc;
+
+        parent_sess = ddf_dev_parent_sess_create(dev);
+        if (parent_sess == NULL)
+                return ENOMEM;
+
+        hw_res_list_parsed_init(&hw_res);
+        rc = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
+        if (rc != EOK)
+                return rc;
+
+        if (hw_res.io_ranges.count != 1) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        res->base = RNGABS(hw_res.io_ranges.ranges[0]);
+
+        if (hw_res.irqs.count != 1) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        res->irq = hw_res.irqs.irqs[0];
+
+        return EOK;
+error:
+        hw_res_list_parsed_clean(&hw_res);
+        return rc;
+}
+
 static int cuda_dev_add(ddf_dev_t *dev)
 {
         cuda_t *cuda;
+        cuda_res_t cuda_res;
+        int rc;
 
-        printf("cuda_dev_add\n");
         ddf_msg(LVL_DEBUG, "cuda_dev_add(%p)", dev);
         cuda = ddf_dev_data_alloc(dev, sizeof(cuda_t));
@@ -75 +112 @@
         cuda->dev = dev;
         list_initialize(&cuda->devs);
-        printf("call cuda_add\n");
-        int rc = cuda_add(cuda);
-        printf("cuda_add->%d\n", rc);
-        return rc;
+
+        rc = cuda_get_res(dev, &cuda_res);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed getting hardware resource list.\n");
+                return EIO;
+        }
+
+        return cuda_add(cuda, &cuda_res);
 }