Changeset f4f866c in mainline for uspace/srv/hw/cir/obio/obio.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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/cir/obio/obio.c (modified) (2 diffs)

uspace/srv/hw/cir/obio/obio.c

@@ -112 +112 @@
 static bool obio_init(void)
 {
-        ipcarg_t phonead;
-
-        base_phys = (void *) sysinfo_value("obio.base.physical");
+        sysarg_t paddr;
         
-        if (!base_phys) {
+        if (sysinfo_get_value("obio.base.physical", &paddr) != EOK) {
                 printf(NAME ": no OBIO registers found\n");
                 return false;
         }
-
+        
+        base_phys = (void *) paddr;
         base_virt = as_get_mappable_page(OBIO_SIZE);
         
@@ -133 +132 @@
         
         printf(NAME ": OBIO registers with base at %p\n", base_phys);
-
+        
         async_set_client_connection(obio_connection);
+        ipcarg_t phonead;
         ipc_connect_to_me(PHONE_NS, SERVICE_OBIO, 0, 0, &phonead);