Ignore:
Timestamp:
2010-12-17T14:51:41Z (13 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1f383dde
Parents:
692f13e4 (diff), 11658b64 (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:

Merged development into lelian/hidd

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/tester/hw/serial/serial1.c

    r692f13e4 r82122f3  
    9393        }
    9494       
    95         ipcarg_t old_baud;
    96         ipcarg_t old_par;
    97         ipcarg_t old_stop;
    98         ipcarg_t old_word_size;
     95        sysarg_t old_baud;
     96        sysarg_t old_par;
     97        sysarg_t old_stop;
     98        sysarg_t old_word_size;
    9999       
    100100        res = ipc_call_sync_0_4(phone, SERIAL_GET_COM_PROPS, &old_baud,
Note: See TracChangeset for help on using the changeset viewer.