Changeset 1affcdf3 in mainline for uspace/srv/hw/irc/fhc/fhc.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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/irc/fhc/fhc.c (modified) (5 diffs)

uspace/srv/hw/irc/fhc/fhc.c

@@ -38 +38 @@
 #include <ipc/services.h>
 #include <ipc/irc.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <sysinfo.h>
 #include <as.h>
@@ -53 +53 @@
 #define NAME "fhc"
 
-#define FHC_UART_INR    0x39    
+#define FHC_UART_INR    0x39
 
 #define FHC_UART_IMAP   0x0
@@ -128 +128 @@
         
         if (retval < 0) {
-                printf(NAME ": Error mapping FHC UART registers\n");
+                printf("%s: Error mapping FHC UART registers\n", NAME);
                 return false;
         }
         
-        printf(NAME ": FHC UART registers at %p, %zu bytes\n", fhc_uart_phys,
-            fhc_uart_size);
+        printf("%s: FHC UART registers at %p, %zu bytes\n", NAME,
+            fhc_uart_phys, fhc_uart_size);
         
         async_set_client_connection(fhc_connection);
@@ -143 +143 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS FHC bus controller driver\n");
+        printf("%s: HelenOS FHC bus controller driver\n", NAME);
         
         if (!fhc_init())
                 return -1;
         
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
+        task_retval(0);
         async_manager();
-
+        
         /* Never reached */
         return 0;
@@ -157 +158 @@
 /**
  * @}
- */ 
+ */