Changeset c028b22 in mainline for uspace/srv/hw/irc/obio/obio.c


Ignore:
Timestamp:
2011-07-08T17:01:01Z (13 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cc1a727
Parents:
4e36219 (diff), 026793d (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:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hw/irc/obio/obio.c

    r4e36219 rc028b22  
    4444#include <ipc/services.h>
    4545#include <ipc/irc.h>
    46 #include <ipc/ns.h>
     46#include <ns.h>
    4747#include <sysinfo.h>
    4848#include <as.h>
    … …  
    7676 * @param iid           Hash of the request that opened the connection.
    7777 * @param icall         Call data of the request that opened the connection.
     78 * @param arg           Local argument.
    7879 */
    79 static void obio_connection(ipc_callid_t iid, ipc_call_t *icall)
     80static void obio_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
    8081{
    8182        ipc_callid_t callid;
    … …  
    118119       
    119120        if (sysinfo_get_value("obio.base.physical", &paddr) != EOK) {
    120                 printf(NAME ": no OBIO registers found\n");
     121                printf("%s: No OBIO registers found\n", NAME);
    121122                return false;
    122123        }
    … …  
    130131       
    131132        if (retval < 0) {
    132                 printf(NAME ": Error mapping OBIO registers\n");
     133                printf("%s: Error mapping OBIO registers\n", NAME);
    133134                return false;
    134135        }
    135136       
    136         printf(NAME ": OBIO registers with base at %p\n", base_phys);
     137        printf("%s: OBIO registers with base at %p\n", NAME, base_phys);
    137138       
    138139        async_set_client_connection(obio_connection);
    … …  
    144145int main(int argc, char **argv)
    145146{
    146         printf(NAME ": HelenOS OBIO driver\n");
     147        printf("%s: HelenOS OBIO driver\n", NAME);
    147148       
    148149        if (!obio_init())
    149150                return -1;
    150151       
    151         printf(NAME ": Accepting connections\n");
     152        printf("%s: Accepting connections\n", NAME);
     153        task_retval(0);
    152154        async_manager();
    153 
     155       
    154156        /* Never reached */
    155157        return 0;
    … …  
    158160/**
    159161 * @}
    160  */ 
     162 */
Note: See TracChangeset for help on using the changeset viewer.