Ignore:
Timestamp:
2018-01-31T12:02:00Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5595841
Parents:
a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/ipc/sysipc_ops.h

    ra0a9cc2 r2b3dd78  
    9090         * Invoked on:          all calls
    9191         */
    92         errno_t (* request_preprocess)(call_t *, phone_t *);
     92        errno_t (*request_preprocess)(call_t *, phone_t *);
    9393
    9494        /**
     
    101101         *                      _ipc_answer_free_call()
    102102         * Invoked on:          all forgotten calls
    103          */     
    104         errno_t (* request_forget)(call_t *);
     103         */
     104        errno_t (*request_forget)(call_t *);
    105105
    106106        /**
     
    111111         * Races with:          request_forget()
    112112         * Invoked on:          all calls delivered to the callee
    113          */     
    114         int (* request_process)(call_t *, answerbox_t *);
     113         */
     114        int (*request_process)(call_t *, answerbox_t *);
    115115
    116116        /**
     
    123123         * Invoked on:          all forgotten calls
    124124         */
    125         errno_t (* answer_cleanup)(call_t *, ipc_data_t *);
     125        errno_t (*answer_cleanup)(call_t *, ipc_data_t *);
    126126
    127127        /**
     
    134134         * Invoked on:          all answered calls
    135135         */
    136         errno_t (* answer_preprocess)(call_t *, ipc_data_t *);
     136        errno_t (*answer_preprocess)(call_t *, ipc_data_t *);
    137137
    138138        /**
     
    144144         * Invoked on:          all answered calls
    145145         */
    146         errno_t (* answer_process)(call_t *);
     146        errno_t (*answer_process)(call_t *);
    147147} sysipc_ops_t;
    148148
Note: See TracChangeset for help on using the changeset viewer.