Changeset 46c20c8 in mainline for uspace/srv/hw/bus/cuda_adb/cuda_adb.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (10 diffs)

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

@@ -55 +55 @@
 static void cuda_connection(ipc_callid_t iid, ipc_call_t *icall);
 static int cuda_init(void);
-static int cuda_claim(void);
 static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 
@@ -144 +143 @@
 int main(int argc, char *argv[])
 {
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
         int rc;
         int i;
@@ -152 +151 @@
         for (i = 0; i < ADB_MAX_ADDR; ++i) {
                 adb_dev[i].client_phone = -1;
-                adb_dev[i].dev_handle = 0;
+                adb_dev[i].devmap_handle = 0;
         }
 
@@ -161 +160 @@
         }
 
-        rc = devmap_device_register("adb/kbd", &dev_handle);
+        rc = devmap_device_register("adb/kbd", &devmap_handle);
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
@@ -168 +167 @@
         }
 
-        adb_dev[2].dev_handle = dev_handle;
-        adb_dev[8].dev_handle = dev_handle;
-
-        rc = devmap_device_register("adb/mouse", &dev_handle);
+        adb_dev[2].devmap_handle = devmap_handle;
+        adb_dev[8].devmap_handle = devmap_handle;
+
+        rc = devmap_device_register("adb/mouse", &devmap_handle);
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
@@ -178 +177 @@
         }
 
-        adb_dev[9].dev_handle = dev_handle;
+        adb_dev[9].devmap_handle = devmap_handle;
 
         if (cuda_init() < 0) {
@@ -197 +196 @@
         ipc_call_t call;
         ipcarg_t method;
-        dev_handle_t dh;
+        devmap_handle_t dh;
         int retval;
         int dev_addr, i;
@@ -207 +206 @@
         dev_addr = -1;
         for (i = 0; i < ADB_MAX_ADDR; i++) {
-                if (adb_dev[i].dev_handle == dh)
+                if (adb_dev[i].devmap_handle == dh)
                         dev_addr = i;
         }
@@ -238 +237 @@
                          */
                         for (i = 0; i < ADB_MAX_ADDR; ++i) {
-                                if (adb_dev[i].dev_handle == dh) {
+                                if (adb_dev[i].devmap_handle == dh) {
                                         adb_dev[i].client_phone = IPC_GET_ARG5(call);
                                 }
@@ -255 +254 @@
 static int cuda_init(void)
 {
+        if (sysinfo_get_value("cuda.address.physical", &(instance->cuda_physical)) != EOK)
+                return -1;
+        
+        if (sysinfo_get_value("cuda.address.kernel", &(instance->cuda_kernel)) != EOK)
+                return -1;
+        
         void *vaddr;
-
-        instance->cuda_physical = sysinfo_value("cuda.address.physical");
-        instance->cuda_kernel = sysinfo_value("cuda.address.kernel");
-
         if (pio_enable((void *) instance->cuda_physical, sizeof(cuda_t), &vaddr) != 0)
                 return -1;
+        
         dev = vaddr;