Changeset 6843a9c in mainline for uspace/srv/hw/bus/cuda_adb/cuda_adb.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (5 diffs)

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -104 +104 @@
 enum {
         ADB_MAX_ADDR    = 16
+};
+
+static irq_pio_range_t cuda_ranges[] = {
+        {
+                .base = 0,
+                .size = sizeof(cuda_t) 
+        }
 };
 
@@ -130 +137 @@
 
 static irq_code_t cuda_irq_code = {
+        sizeof(cuda_ranges) / sizeof(irq_pio_range_t),
+        cuda_ranges,
         sizeof(cuda_cmds) / sizeof(irq_cmd_t),
         cuda_cmds
@@ -154 +163 @@
         }
 
-        rc = loc_server_register(NAME, cuda_connection);
+        async_set_client_connection(cuda_connection);
+        rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf(NAME ": Unable to register server.\n");
@@ -254 +264 @@
                 return -1;
         
-        if (sysinfo_get_value("cuda.address.kernel", &(instance->cuda_kernel)) != EOK)
-                return -1;
-        
         void *vaddr;
         if (pio_enable((void *) instance->cuda_physical, sizeof(cuda_t), &vaddr) != 0)
@@ -273 +280 @@
         pio_write_8(&dev->ier, IER_CLR | ALL_INT);
 
-        cuda_irq_code.cmds[0].addr = (void *) &((cuda_t *) instance->cuda_kernel)->ifr;
+        cuda_irq_code.ranges[0].base = (uintptr_t) instance->cuda_physical;
+        cuda_irq_code.cmds[0].addr = (void *) &((cuda_t *) instance->cuda_physical)->ifr;
         async_set_interrupt_received(cuda_irq_handler);
-        register_irq(10, device_assign_devno(), 0, &cuda_irq_code);
+        irq_register(10, device_assign_devno(), 0, &cuda_irq_code);
 
         /* Enable SR interrupt. */