Changeset eadaeae8 in mainline for uspace/lib/c/include


Ignore:
Timestamp:
2018-03-21T20:58:49Z (8 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3be9d10
Parents:
874381a
Message:

Make capability handles type-safe

Define distinct pointer types for the handles of the supported
capability types and use them instead of integer handles. This makes it
virtually impossible to pass a non-handle or a handle of different type
instead of the proper handle. Also turn cap_handle_t into an "untyped"
capability handle that can be assigned to and from the "typed" handles.

This commit also fixes a bug in msim-con driver, which wrongly used the
IRQ number instead of the IRQ capability handle to unregister the IRQ.

This commit also fixes the wrong use of the capability handle instead
of error code in libusbhost.

Location:
uspace/lib/c/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/async.h

    r874381a readaeae8  
    6666 *
    6767 */
    68 typedef void (*async_port_handler_t)(cap_handle_t, ipc_call_t *, void *);
     68typedef void (*async_port_handler_t)(cap_call_handle_t, ipc_call_t *, void *);
    6969
    7070/** Notification handler */
    … …  
    119119        async_get_call_timeout(data, 0)
    120120
    121 extern cap_handle_t async_get_call_timeout(ipc_call_t *, suseconds_t);
     121extern cap_call_handle_t async_get_call_timeout(ipc_call_t *, suseconds_t);
    122122
    123123/*
    … …  
    169169
    170170extern errno_t async_irq_subscribe(int, async_notification_handler_t, void *,
    171     const irq_code_t *, cap_handle_t *);
    172 extern errno_t async_irq_unsubscribe(cap_handle_t);
     171    const irq_code_t *, cap_irq_handle_t *);
     172extern errno_t async_irq_unsubscribe(cap_irq_handle_t);
    173173
    174174extern errno_t async_event_subscribe(event_type_t, async_notification_handler_t,
    … …  
    198198 */
    199199
    200 extern errno_t async_answer_0(cap_handle_t, errno_t);
    201 extern errno_t async_answer_1(cap_handle_t, errno_t, sysarg_t);
    202 extern errno_t async_answer_2(cap_handle_t, errno_t, sysarg_t, sysarg_t);
    203 extern errno_t async_answer_3(cap_handle_t, errno_t, sysarg_t, sysarg_t,
     200extern errno_t async_answer_0(cap_call_handle_t, errno_t);
     201extern errno_t async_answer_1(cap_call_handle_t, errno_t, sysarg_t);
     202extern errno_t async_answer_2(cap_call_handle_t, errno_t, sysarg_t, sysarg_t);
     203extern errno_t async_answer_3(cap_call_handle_t, errno_t, sysarg_t, sysarg_t,
    204204    sysarg_t);
    205 extern errno_t async_answer_4(cap_handle_t, errno_t, sysarg_t, sysarg_t,
     205extern errno_t async_answer_4(cap_call_handle_t, errno_t, sysarg_t, sysarg_t,
    206206    sysarg_t, sysarg_t);
    207 extern errno_t async_answer_5(cap_handle_t, errno_t, sysarg_t, sysarg_t,
     207extern errno_t async_answer_5(cap_call_handle_t, errno_t, sysarg_t, sysarg_t,
    208208    sysarg_t, sysarg_t, sysarg_t);
    209209
    … …  
    212212 */
    213213
    214 extern errno_t async_forward_fast(cap_handle_t, async_exch_t *, sysarg_t, sysarg_t,
    215     sysarg_t, unsigned int);
    216 extern errno_t async_forward_slow(cap_handle_t, async_exch_t *, sysarg_t, sysarg_t,
    217     sysarg_t, sysarg_t, sysarg_t, sysarg_t, unsigned int);
     214extern errno_t async_forward_fast(cap_call_handle_t, async_exch_t *, sysarg_t,
     215    sysarg_t, sysarg_t, unsigned int);
     216extern errno_t async_forward_slow(cap_call_handle_t, async_exch_t *, sysarg_t,
     217    sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, unsigned int);
    218218
    219219/*
    … …  
    384384extern errno_t async_share_in_start(async_exch_t *, size_t, sysarg_t,
    385385    unsigned int *, void **);
    386 extern bool async_share_in_receive(cap_handle_t *, size_t *);
    387 extern errno_t async_share_in_finalize(cap_handle_t, void *, unsigned int);
     386extern bool async_share_in_receive(cap_call_handle_t *, size_t *);
     387extern errno_t async_share_in_finalize(cap_call_handle_t, void *, unsigned int);
    388388
    389389extern errno_t async_share_out_start(async_exch_t *, void *, unsigned int);
    390 extern bool async_share_out_receive(cap_handle_t *, size_t *, unsigned int *);
    391 extern errno_t async_share_out_finalize(cap_handle_t, void **);
     390extern bool async_share_out_receive(cap_call_handle_t *, size_t *,
     391    unsigned int *);
     392extern errno_t async_share_out_finalize(cap_call_handle_t, void **);
    392393
    393394/*
    … …  
    423424extern aid_t async_data_read(async_exch_t *, void *, size_t, ipc_call_t *);
    424425extern errno_t async_data_read_start(async_exch_t *, void *, size_t);
    425 extern bool async_data_read_receive(cap_handle_t *, size_t *);
    426 extern bool async_data_read_receive_call(cap_handle_t *, ipc_call_t *, size_t *);
    427 extern errno_t async_data_read_finalize(cap_handle_t, const void *, size_t);
     426extern bool async_data_read_receive(cap_call_handle_t *, size_t *);
     427extern bool async_data_read_receive_call(cap_call_handle_t *, ipc_call_t *,
     428    size_t *);
     429extern errno_t async_data_read_finalize(cap_call_handle_t, const void *,
     430    size_t);
    428431
    429432extern errno_t async_data_read_forward_fast(async_exch_t *, sysarg_t, sysarg_t,
    … …  
    462465
    463466extern errno_t async_data_write_start(async_exch_t *, const void *, size_t);
    464 extern bool async_data_write_receive(cap_handle_t *, size_t *);
    465 extern bool async_data_write_receive_call(cap_handle_t *, ipc_call_t *, size_t *);
    466 extern errno_t async_data_write_finalize(cap_handle_t, void *, size_t);
     467extern bool async_data_write_receive(cap_call_handle_t *, size_t *);
     468extern bool async_data_write_receive_call(cap_call_handle_t *, ipc_call_t *,
     469    size_t *);
     470extern errno_t async_data_write_finalize(cap_call_handle_t, void *, size_t);
    467471
    468472extern errno_t async_data_write_accept(void **, const bool, const size_t,
    … …  
    478482extern errno_t async_state_change_start(async_exch_t *, sysarg_t, sysarg_t,
    479483    sysarg_t, async_exch_t *);
    480 extern bool async_state_change_receive(cap_handle_t *, sysarg_t *, sysarg_t *,
    481     sysarg_t *);
    482 extern errno_t async_state_change_finalize(cap_handle_t, async_exch_t *);
     484extern bool async_state_change_receive(cap_call_handle_t *, sysarg_t *,
     485    sysarg_t *, sysarg_t *);
     486extern errno_t async_state_change_finalize(cap_call_handle_t, async_exch_t *);
    483487
    484488extern void *async_remote_state_acquire(async_sess_t *);

  • uspace/lib/c/include/ipc/common.h

    r874381a readaeae8  
    5252        unsigned flags;
    5353        struct async_call *label;
    54         cap_handle_t cap_handle;
     54        cap_call_handle_t cap_handle;
    5555} ipc_call_t;
    5656
    57 typedef cap_handle_t ipc_callid_t;
     57typedef cap_call_handle_t ipc_callid_t;
    5858
    5959extern futex_t async_futex;

  • uspace/lib/c/include/ipc/ipc.h

    r874381a readaeae8  
    7878            (arg5))
    7979
    80 extern errno_t ipc_answer_fast(cap_handle_t, errno_t, sysarg_t, sysarg_t,
     80extern errno_t ipc_answer_fast(cap_call_handle_t, errno_t, sysarg_t, sysarg_t,
    8181    sysarg_t, sysarg_t);
    82 extern errno_t ipc_answer_slow(cap_handle_t, errno_t, sysarg_t, sysarg_t,
     82extern errno_t ipc_answer_slow(cap_call_handle_t, errno_t, sysarg_t, sysarg_t,
    8383    sysarg_t, sysarg_t, sysarg_t);
    8484
    … …  
    110110            (arg4), (arg5), (private), (callback))
    111111
    112 extern void ipc_call_async_fast(cap_handle_t, sysarg_t, sysarg_t, sysarg_t,
    113     sysarg_t, void *, ipc_async_callback_t);
    114 extern void ipc_call_async_slow(cap_handle_t, sysarg_t, sysarg_t, sysarg_t,
    115     sysarg_t, sysarg_t, sysarg_t, void *, ipc_async_callback_t);
     112extern void ipc_call_async_fast(cap_phone_handle_t, sysarg_t, sysarg_t,
     113    sysarg_t, sysarg_t, void *, ipc_async_callback_t);
     114extern void ipc_call_async_slow(cap_phone_handle_t, sysarg_t, sysarg_t,
     115    sysarg_t, sysarg_t, sysarg_t, sysarg_t, void *, ipc_async_callback_t);
    116116
    117 extern errno_t ipc_hangup(cap_handle_t);
     117extern errno_t ipc_hangup(cap_phone_handle_t);
    118118
    119 extern errno_t ipc_forward_fast(cap_handle_t, cap_handle_t, sysarg_t, sysarg_t,
    120     sysarg_t, unsigned int);
    121 extern errno_t ipc_forward_slow(cap_handle_t, cap_handle_t, sysarg_t, sysarg_t,
    122     sysarg_t, sysarg_t, sysarg_t, sysarg_t, unsigned int);
     119extern errno_t ipc_forward_fast(cap_call_handle_t, cap_phone_handle_t, sysarg_t,
     120    sysarg_t, sysarg_t, unsigned int);
     121extern errno_t ipc_forward_slow(cap_call_handle_t, cap_phone_handle_t, sysarg_t,
     122    sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, unsigned int);
    123123
    124 extern errno_t ipc_connect_kbox(task_id_t, cap_handle_t *);
     124extern errno_t ipc_connect_kbox(task_id_t, cap_phone_handle_t *);
    125125
    126126#endif

  • uspace/lib/c/include/ipc/irq.h

    r874381a readaeae8  
    4040#include <abi/cap.h>
    4141
    42 extern errno_t ipc_irq_subscribe(int, sysarg_t, const irq_code_t *, cap_handle_t *);
    43 extern errno_t ipc_irq_unsubscribe(cap_handle_t);
     42extern errno_t ipc_irq_subscribe(int, sysarg_t, const irq_code_t *,
     43    cap_irq_handle_t *);
     44extern errno_t ipc_irq_unsubscribe(cap_irq_handle_t);
    4445
    4546#endif
Note: See TracChangeset for help on using the changeset viewer.