Changeset c188c62 in mainline for uspace/drv/bus/adb/cuda_adb/cuda_adb.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/cuda_adb.c (modified) (5 diffs)

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

@@ -148 +148 @@
 }
 
-int cuda_add(cuda_t *cuda)
+int cuda_add(cuda_t *cuda, cuda_res_t *res)
 {
         adb_dev_t *kbd = NULL;
@@ -154 +154 @@
         int rc;
 
+        cuda->phys_base = res->base;
+
         rc = cuda_dev_create(cuda, "kbd", &kbd);
         if (rc != EOK)
@@ -166 +168 @@
 
         cuda->addr_dev[9] = mouse;
-
 
         rc = cuda_init(cuda);
@@ -225 +226 @@
         int rc;
 
-        if (sysinfo_get_value("cuda.address.physical", &(cuda->cuda_physical)) != EOK)
-                return EIO;
-
         void *vaddr;
-        rc = pio_enable((void *) cuda->cuda_physical, sizeof(cuda_regs_t),
+        rc = pio_enable((void *) cuda->phys_base, sizeof(cuda_regs_t),
             &vaddr);
         if (rc != EOK)
@@ -244 +242 @@
         pio_write_8(&cuda->regs->ier, IER_CLR | ALL_INT);
 
-        cuda_irq_code.ranges[0].base = (uintptr_t) cuda->cuda_physical;
+        cuda_irq_code.ranges[0].base = (uintptr_t) cuda->phys_base;
         cuda_irq_code.cmds[0].addr = (void *) &((cuda_regs_t *)
-            cuda->cuda_physical)->ifr;
+            cuda->phys_base)->ifr;
         async_irq_subscribe(10, cuda_irq_handler, cuda, &cuda_irq_code);