Changeset ea28272 in mainline for uspace/srv/hid/kbd/port/chardev.c


Ignore:
Timestamp:
2010-12-30T13:43:27Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
Children:
d770deb
Parents:
d70d80ed (diff), f418e51 (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/hid/kbd/port/chardev.c

    rd70d80ed rea28272  
    9191
    9292        /* NB: The callback connection is slotted for removal */
    93         ipcarg_t phonehash;
     93        sysarg_t phonehash;
    9494        if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) {
    9595                printf(NAME ": Failed to create callback from device\n");
    … …  
    125125                int retval;
    126126
    127                 switch (IPC_GET_METHOD(call)) {
     127                switch (IPC_GET_IMETHOD(call)) {
    128128                case IPC_M_PHONE_HUNGUP:
    129129                        /* TODO: Handle hangup */
Note: See TracChangeset for help on using the changeset viewer.