Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 7ffdcbd in mainline


Ignore:
Timestamp:
2019-10-06T19:47:36Z (13 months ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
ae004bc
Parents:
5be6361
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-10-06 19:43:50)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-10-06 19:47:36)
Message:

Correcting IPC calls introduced with taskman

The new PHONE_INITIAL has been corrected to make use of CAP_NIL.
Removing unneeded interfaces which were introduced during the
merging

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • abi/include/abi/ipc/interfaces.h

    r5be6361 r7ffdcbd  
    8282typedef enum {
    8383        INTERFACE_ANY = 0,
    84         INTERFACE_LOADER =
    85             FOURCC_COMPACT('l', 'o', 'a', 'd') | IFACE_EXCHANGE_SERIALIZE,
    8684        INTERFACE_PAGER =
    8785            FOURCC_COMPACT('p', 'a', 'g', 'e') | IFACE_EXCHANGE_ATOMIC,
     
    190188        INTERFACE_TASKMAN_CB =
    191189            FOURCC_COMPACT('t', 'a', 's', 'k') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
    192         INTERFACE_NS =
    193             FOURCC_COMPACT('n', 's', ' ', ' ') | IFACE_EXCHANGE_ATOMIC,
    194190        INTERFACE_SYSMAN =
    195191            FOURCC_COMPACT('s', 'y', 's', 'm') | IFACE_EXCHANGE_SERIALIZE
  • uspace/lib/c/generic/taskman.c

    r5be6361 r7ffdcbd  
    6969        async_exchange_end(exch);
    7070}
    71 
     71#include <stdio.h>
    7272/** Wrap PHONE_INITIAL with session and introduce to taskman
    7373 */
     
    101101        async_exch_t *exch = taskman_exchange_begin();
    102102
    103         async_sess_t *sess = async_connect_me_to(exch, INTERFACE_NS,
     103        async_sess_t *sess = async_connect_me_to(exch, INTERFACE_ANY,
    104104            TASKMAN_CONNECT_TO_NS, 0);
    105105        taskman_exchange_end(exch);
     
    112112{
    113113        async_exch_t *exch = taskman_exchange_begin();
    114         async_sess_t *sess = async_connect_me_to(exch, INTERFACE_LOADER,
     114        async_sess_t *sess = async_connect_me_to(exch, INTERFACE_ANY,
    115115            TASKMAN_CONNECT_TO_LOADER, 0);
    116116        taskman_exchange_end(exch);
     
    135135{
    136136        async_exch_t *exch = taskman_exchange_begin();
    137         errno_t rc = async_connect_to_me(exch, INTERFACE_LOADER, TASKMAN_LOADER_CALLBACK, 0);
     137        errno_t rc = async_connect_to_me(exch, INTERFACE_ANY, TASKMAN_LOADER_CALLBACK, 0);
    138138        taskman_exchange_end(exch);
    139139
     
    150150        aid_t req = async_send_0(exch, TASKMAN_I_AM_NS, NULL);
    151151
    152         errno_t rc = async_connect_to_me(exch, INTERFACE_NS, 0, 0);
     152        errno_t rc = async_connect_to_me(exch, INTERFACE_ANY, 0, 0);
    153153        taskman_exchange_end(exch);
    154154
    155155        if (rc != EOK) {
     156                async_forget(req);
    156157                return rc;
    157158        }
  • uspace/lib/c/include/ipc/common.h

    r5be6361 r7ffdcbd  
    4040
    4141/* Well known phone descriptors */
    42 #define PHONE_INITIAL  0
    43 
     42static cap_phone_handle_t const PHONE_INITIAL = (cap_phone_handle_t) (CAP_NIL + 1);
    4443#define IPC_FLAG_BLOCKING   0x01
    4544
Note: See TracChangeset for help on using the changeset viewer.