Changeset 46c20c8 in mainline for uspace/srv/hw/cir/fhc/fhc.c

Timestamp:

2010-11-26T20:08:10Z (14 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/cir/fhc/fhc.c (modified) (2 diffs)

uspace/srv/hw/cir/fhc/fhc.c

@@ -109 +109 @@
 static bool fhc_init(void)
 {
-        ipcarg_t phonead;
+        sysarg_t paddr;
 
-        fhc_uart_size = sysinfo_value("fhc.uart.size");
-        fhc_uart_phys = (void *) sysinfo_value("fhc.uart.physical");
-        
-        if (!fhc_uart_size) {
+        if ((sysinfo_get_value("fhc.uart.physical", &paddr) != EOK)
+            || (sysinfo_get_value("fhc.uart.size", &fhc_uart_size) != EOK)) {
                 printf(NAME ": no FHC UART registers found\n");
                 return false;
         }
-
+        
+        fhc_uart_phys = (void *) paddr;
         fhc_uart_virt = as_get_mappable_page(fhc_uart_size);
         
@@ -130 +129 @@
         }
         
-        printf(NAME ": FHC UART registers at %p, %d bytes\n", fhc_uart_phys,
+        printf(NAME ": FHC UART registers at %p, %zu bytes\n", fhc_uart_phys,
             fhc_uart_size);
-
+        
         async_set_client_connection(fhc_connection);
+        ipcarg_t phonead;
         ipc_connect_to_me(PHONE_NS, SERVICE_FHC, 0, 0, &phonead);