Ignore:
Timestamp:
2011-06-10T10:14:26Z (14 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ab547063
Parents:
9536e6e (diff), 390d80d (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/bd/part/guid_part/guid_part.c

    r9536e6e r41811af  
    139139        }
    140140
    141         rc = block_init(indev_handle, 2048);
     141        rc = block_init(EXCHANGE_SERIALIZE, indev_handle, 2048);
    142142        if (rc != EOK)  {
    143143                printf(NAME ": could not init libblock.\n");
     
    356356        (void) async_share_out_finalize(callid, fs_va);
    357357
    358         while (1) {
     358        while (true) {
    359359                callid = async_get_call(&call);
    360360                method = IPC_GET_IMETHOD(call);
    361                 switch (method) {
    362                 case IPC_M_PHONE_HUNGUP:
     361               
     362                if (!method) {
    363363                        /* The other side has hung up. */
    364364                        async_answer_0(callid, EOK);
    365365                        return;
     366                }
     367               
     368                switch (method) {
    366369                case BD_READ_BLOCKS:
    367370                        ba = MERGE_LOUP32(IPC_GET_ARG1(call),
Note: See TracChangeset for help on using the changeset viewer.