Changeset 7bdcc45 in mainline for uspace/lib/c/include


Ignore:
Timestamp:
2010-12-16T16:38:49Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7837101
Parents:
8e58f94 (diff), eb221e5 (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 changes.

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

Legend:

Unmodified
Added
Removed

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

    r8e58f94 r7bdcc45  
    5151
    5252#ifndef NDEBUG
    53 #       define assert(expr) \
    54                 do { \
    55                         if (!(expr)) { \
    56                                 printf("Assertion failed (%s) at file '%s', " \
    57                                     "line %d.\n", #expr, __FILE__, __LINE__); \
    58                                 abort(); \
    59                         } \
    60                 } while (0)
    61 #else
    62 #       define assert(expr)
    63 #endif
     53
     54#define assert(expr) \
     55        do { \
     56                if (!(expr)) { \
     57                        printf("Assertion failed (%s) at file '%s', " \
     58                            "line %d.\n", #expr, __FILE__, __LINE__); \
     59                        abort(); \
     60                } \
     61        } while (0)
     62
     63#else /* NDEBUG */
     64
     65#define assert(expr)
     66
     67#endif /* NDEBUG */
    6468
    6569#endif

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

    r8e58f94 r7bdcc45  
    8484            (arg5), (dataptr))
    8585
    86 extern aid_t async_send_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
    87     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr);
    88 extern aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
    89     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
     86extern aid_t async_send_fast(int phoneid, sysarg_t method, sysarg_t arg1,
     87    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr);
     88extern aid_t async_send_slow(int phoneid, sysarg_t method, sysarg_t arg1,
     89    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5,
    9090    ipc_call_t *dataptr);
    91 extern void async_wait_for(aid_t amsgid, ipcarg_t *result);
    92 extern int async_wait_timeout(aid_t amsgid, ipcarg_t *retval,
     91extern void async_wait_for(aid_t amsgid, sysarg_t *result);
     92extern int async_wait_timeout(aid_t amsgid, sysarg_t *retval,
    9393    suseconds_t timeout);
    9494
    95 extern fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid,
     95extern fid_t async_new_connection(sysarg_t in_phone_hash, ipc_callid_t callid,
    9696    ipc_call_t *call, void (*cthread)(ipc_callid_t, ipc_call_t *));
    9797extern void async_usleep(suseconds_t timeout);
    … …  
    242242            (arg5), (rc1), (rc2), (rc3), (rc4), (rc5))
    243243
    244 extern ipcarg_t async_req_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
    245     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t *r1, ipcarg_t *r2,
    246     ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5);
    247 extern ipcarg_t async_req_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
    248     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipcarg_t *r1,
    249     ipcarg_t *r2, ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5);
     244extern sysarg_t async_req_fast(int phoneid, sysarg_t method, sysarg_t arg1,
     245    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2,
     246    sysarg_t *r3, sysarg_t *r4, sysarg_t *r5);
     247extern sysarg_t async_req_slow(int phoneid, sysarg_t method, sysarg_t arg1,
     248    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1,
     249    sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5);
    250250
    251251static inline void async_serialize_start(void)
    … …  
    259259}
    260260
    261 extern int async_connect_me_to(int, ipcarg_t, ipcarg_t, ipcarg_t);
    262 extern int async_connect_me_to_blocking(int, ipcarg_t, ipcarg_t, ipcarg_t);
     261extern int async_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t);
     262extern int async_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t);
    263263
    264264/*
    … …  
    274274        async_share_in_start((phoneid), (dst), (size), (arg), (flags))
    275275
    276 extern int async_share_in_start(int, void *, size_t, ipcarg_t, int *);
     276extern int async_share_in_start(int, void *, size_t, sysarg_t, int *);
    277277extern int async_share_in_receive(ipc_callid_t *, size_t *);
    278278extern int async_share_in_finalize(ipc_callid_t, void *, int );
    … …  
    314314extern int async_data_read_finalize(ipc_callid_t, const void *, size_t);
    315315
    316 extern int async_data_read_forward_fast(int, ipcarg_t, ipcarg_t, ipcarg_t,
    317     ipcarg_t, ipcarg_t, ipc_call_t *);
     316extern int async_data_read_forward_fast(int, sysarg_t, sysarg_t, sysarg_t,
     317    sysarg_t, sysarg_t, ipc_call_t *);
    318318
    319319/*
    … …  
    356356extern void async_data_write_void(const int);
    357357
    358 extern int async_data_write_forward_fast(int, ipcarg_t, ipcarg_t, ipcarg_t,
    359     ipcarg_t, ipcarg_t, ipc_call_t *);
     358extern int async_data_write_forward_fast(int, sysarg_t, sysarg_t, sysarg_t,
     359    sysarg_t, sysarg_t, ipc_call_t *);
    360360
    361361#endif

  • uspace/lib/c/include/device/char.h

    r8e58f94 r7bdcc45  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28  
     28
    2929 /** @addtogroup libc
    3030 * @{
    … …  
    3232/** @file
    3333 */
    34  
     34
    3535#ifndef LIBC_DEVICE_HW_RES_H_
    3636#define LIBC_DEVICE_HW_RES_H_
    … …  
    3838typedef enum {
    3939        CHAR_READ_DEV = 0,
    40         CHAR_WRITE_DEV 
     40        CHAR_WRITE_DEV
    4141} hw_res_funcs_t;
    4242
    43 int read_dev(int dev_phone, void *buf, size_t len);
    44 int write_dev(int dev_phone, void *buf, size_t len);
     43ssize_t read_dev(int dev_phone, void *buf, size_t len);
     44ssize_t write_dev(int dev_phone, void *buf, size_t len);
    4545
    4646#endif

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

    r8e58f94 r7bdcc45  
    3838#include <stdio.h>
    3939
    40 #define errx(status, fmt, ...) { \
    41         printf((fmt), ##__VA_ARGS__); \
    42         _exit(status); \
    43 }
     40#define errx(status, fmt, ...) \
     41        { \
     42                printf((fmt), ##__VA_ARGS__); \
     43                _exit(status); \
     44        }
    4445
    4546#endif
    … …  
    4748/** @}
    4849 */
    49 

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

    r8e58f94 r7bdcc45  
    3939#include <ipc/ipc.h>
    4040
    41 extern int event_subscribe(event_type_t, ipcarg_t);
     41extern int event_subscribe(event_type_t, sysarg_t);
    4242
    4343#endif

  • uspace/lib/c/include/io/console.h

    r8e58f94 r7bdcc45  
    6868extern void console_clear(int phone);
    6969
    70 extern int console_get_size(int phone, ipcarg_t *cols, ipcarg_t *rows);
    71 extern int console_get_pos(int phone, ipcarg_t *col, ipcarg_t *row);
    72 extern void console_set_pos(int phone, ipcarg_t col, ipcarg_t row);
     70extern int console_get_size(int phone, sysarg_t *cols, sysarg_t *rows);
     71extern int console_get_pos(int phone, sysarg_t *col, sysarg_t *row);
     72extern void console_set_pos(int phone, sysarg_t col, sysarg_t row);
    7373
    7474extern void console_set_style(int phone, uint8_t style);
    … …  
    7878
    7979extern void console_cursor_visibility(int phone, bool show);
    80 extern int console_get_color_cap(int phone, ipcarg_t *ccap);
     80extern int console_get_color_cap(int phone, sysarg_t *ccap);
    8181extern void console_kcon_enable(int phone);
    8282

  • uspace/lib/c/include/io/screenbuffer.h

    r8e58f94 r7bdcc45  
    8484        keyfield_t *buffer;      /**< Screen content - characters and
    8585                                      their attributes (used as a circular buffer) */
    86         ipcarg_t size_x;         /**< Number of columns  */
    87         ipcarg_t size_y;         /**< Number of rows */
     86        sysarg_t size_x;         /**< Number of columns  */
     87        sysarg_t size_y;         /**< Number of rows */
    8888       
    8989        /** Coordinates of last printed character for determining cursor position */
    90         ipcarg_t position_x;
    91         ipcarg_t position_y;
     90        sysarg_t position_x;
     91        sysarg_t position_y;
    9292       
    9393        attrs_t attrs;           /**< Current attributes. */
    … …  
    109109 *
    110110 */
    111 static inline keyfield_t *get_field_at(screenbuffer_t *scr, ipcarg_t x, ipcarg_t y)
     111static inline keyfield_t *get_field_at(screenbuffer_t *scr, sysarg_t x, sysarg_t y)
    112112{
    113113        return scr->buffer + x + ((y + scr->top_line) % scr->size_y) * scr->size_x;
    … …  
    143143
    144144extern void screenbuffer_putchar(screenbuffer_t *, wchar_t);
    145 extern screenbuffer_t *screenbuffer_init(screenbuffer_t *, ipcarg_t, ipcarg_t);
     145extern screenbuffer_t *screenbuffer_init(screenbuffer_t *, sysarg_t, sysarg_t);
    146146
    147147extern void screenbuffer_clear(screenbuffer_t *);
    148 extern void screenbuffer_clear_line(screenbuffer_t *, ipcarg_t);
     148extern void screenbuffer_clear_line(screenbuffer_t *, sysarg_t);
    149149extern void screenbuffer_copy_buffer(screenbuffer_t *, keyfield_t *);
    150 extern void screenbuffer_goto(screenbuffer_t *, ipcarg_t, ipcarg_t);
     150extern void screenbuffer_goto(screenbuffer_t *, sysarg_t, sysarg_t);
    151151extern void screenbuffer_set_style(screenbuffer_t *, uint8_t);
    152152extern void screenbuffer_set_color(screenbuffer_t *, uint8_t, uint8_t, uint8_t);

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

    r8e58f94 r7bdcc45  
    4242#define DEVMAN_NAME_MAXLEN 256
    4343
    44 typedef ipcarg_t devman_handle_t;
     44typedef sysarg_t devman_handle_t;
    4545
    4646/** Ids of device models used for device-to-driver matching.

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

    r8e58f94 r7bdcc45  
    4040#define DEVMAP_NAME_MAXLEN  255
    4141
    42 typedef ipcarg_t devmap_handle_t;
     42typedef sysarg_t devmap_handle_t;
    4343
    4444typedef enum {

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

    r8e58f94 r7bdcc45  
    9393#define IP_SET_HEADERLEN(answer, value) \
    9494        do { \
    95                 ipcarg_t argument = (ipcarg_t) (value); \
     95                sysarg_t argument = (sysarg_t) (value); \
    9696                IPC_SET_ARG2(*answer, argument); \
    9797        } while (0)

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

    r8e58f94 r7bdcc45  
    4444#define IPC_FLAG_BLOCKING  0x01
    4545
    46 typedef sysarg_t ipcarg_t;
    47 
    4846typedef struct {
    49         ipcarg_t args[IPC_CALL_LEN];
    50         ipcarg_t in_phone_hash;
     47        sysarg_t args[IPC_CALL_LEN];
     48        sysarg_t in_phone_hash;
    5149} ipc_call_t;
    5250
    … …  
    183181            (arg4), (arg5), (res1), (res2), (res3), (res4), (res5))
    184182
    185 extern int ipc_call_sync_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
    186     ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *);
    187 
    188 extern int ipc_call_sync_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
    189     ipcarg_t, ipcarg_t, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *,
    190     ipcarg_t *);
     183extern int ipc_call_sync_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     184    sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *);
     185
     186extern int ipc_call_sync_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     187    sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *,
     188    sysarg_t *);
    191189
    192190extern ipc_callid_t ipc_wait_cycle(ipc_call_t *, uint32_t, int);
    … …  
    220218        ipc_answer_slow((callid), (retval), (arg1), (arg2), (arg3), (arg4), (arg5))
    221219
    222 extern ipcarg_t ipc_answer_fast(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
    223     ipcarg_t, ipcarg_t);
    224 extern ipcarg_t ipc_answer_slow(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
    225     ipcarg_t, ipcarg_t, ipcarg_t);
     220extern sysarg_t ipc_answer_fast(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t,
     221    sysarg_t, sysarg_t);
     222extern sysarg_t ipc_answer_slow(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t,
     223    sysarg_t, sysarg_t, sysarg_t);
    226224
    227225/*
    … …  
    255253            (arg4), (arg5), (private), (callback), (can_preempt))
    256254
    257 extern void ipc_call_async_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
    258     ipcarg_t, void *, ipc_async_callback_t, int);
    259 extern void ipc_call_async_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
    260     ipcarg_t, ipcarg_t, void *, ipc_async_callback_t, int);
    261 
    262 extern int ipc_connect_to_me(int, int, int, int, ipcarg_t *);
     255extern void ipc_call_async_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     256    sysarg_t, void *, ipc_async_callback_t, int);
     257extern void ipc_call_async_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     258    sysarg_t, sysarg_t, void *, ipc_async_callback_t, int);
     259
     260extern int ipc_connect_to_me(int, int, int, int, sysarg_t *);
    263261extern int ipc_connect_me_to(int, int, int, int);
    264262extern int ipc_connect_me_to_blocking(int, int, int, int);
    … …  
    266264extern int ipc_register_irq(int, int, int, irq_code_t *);
    267265extern int ipc_unregister_irq(int, int);
    268 extern int ipc_forward_fast(ipc_callid_t, int, int, ipcarg_t, ipcarg_t, int);
    269 extern int ipc_forward_slow(ipc_callid_t, int, int, ipcarg_t, ipcarg_t,
    270     ipcarg_t, ipcarg_t, ipcarg_t, int);
     266extern int ipc_forward_fast(ipc_callid_t, int, int, sysarg_t, sysarg_t, int);
     267extern int ipc_forward_slow(ipc_callid_t, int, int, sysarg_t, sysarg_t,
     268    sysarg_t, sysarg_t, sysarg_t, int);
    271269
    272270/*
    … …  
    282280        ipc_share_in_start((phoneid), (dst), (size), (arg), (flags))
    283281
    284 extern int ipc_share_in_start(int, void *, size_t, ipcarg_t, int *);
     282extern int ipc_share_in_start(int, void *, size_t, sysarg_t, int *);
    285283extern int ipc_share_in_finalize(ipc_callid_t, void *, int );
    286284extern int ipc_share_out_start(int, void *, int);

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

    r8e58f94 r7bdcc45  
    192192 */
    193193#define IS_NET_MESSAGE(call) \
    194         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_FIRST, NET_LAST)
     194        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_FIRST, NET_LAST)
    195195
    196196/** Returns a value indicating whether the IPC call is an ARP message.
    … …  
    198198 */
    199199#define IS_NET_ARP_MESSAGE(call) \
    200         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ARP_FIRST, NET_ARP_LAST)
     200        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_ARP_FIRST, NET_ARP_LAST)
    201201
    202202/** Returns a value indicating whether the IPC call is an Ethernet message.
    … …  
    204204 */
    205205#define IS_NET_ETH_MESSAGE(call) \
    206         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ETH_FIRST, NET_ETH_LAST)
     206        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_ETH_FIRST, NET_ETH_LAST)
    207207
    208208/** Returns a value indicating whether the IPC call is an ICMP message.
    … …  
    210210 */
    211211#define IS_NET_ICMP_MESSAGE(call) \
    212         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ICMP_FIRST, NET_ICMP_LAST)
     212        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_ICMP_FIRST, NET_ICMP_LAST)
    213213
    214214/** Returns a value indicating whether the IPC call is an inter-network layer
    … …  
    217217 */
    218218#define IS_NET_IL_MESSAGE(call) \
    219         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_IL_FIRST, NET_IL_LAST)
     219        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_IL_FIRST, NET_IL_LAST)
    220220
    221221/** Returns a value indicating whether the IPC call is an IP message.
    … …  
    223223 */
    224224#define IS_NET_IP_MESSAGE(call) \
    225         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_IP_FIRST, NET_IP_LAST)
     225        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_IP_FIRST, NET_IP_LAST)
    226226
    227227/** Returns a value indicating whether the IPC call is a generic networking
    … …  
    230230 */
    231231#define IS_NET_NET_MESSAGE(call) \
    232         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_NET_FIRST, NET_NET_LAST)
     232        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_NET_FIRST, NET_NET_LAST)
    233233
    234234/** Returns a value indicating whether the IPC call is a network interface layer
    … …  
    237237 */
    238238#define IS_NET_NIL_MESSAGE(call) \
    239         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_NIL_FIRST, NET_NIL_LAST)
     239        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_NIL_FIRST, NET_NIL_LAST)
    240240
    241241/** Returns a value indicating whether the IPC call is a packet manaagement
    … …  
    244244 */
    245245#define IS_NET_PACKET_MESSAGE(call) \
    246         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_PACKET_FIRST, NET_PACKET_LAST)
     246        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_PACKET_FIRST, NET_PACKET_LAST)
    247247
    248248/** Returns a value indicating whether the IPC call is a socket message.
    … …  
    250250 */
    251251#define IS_NET_SOCKET_MESSAGE(call) \
    252         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_SOCKET_FIRST, NET_SOCKET_LAST)
     252        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_SOCKET_FIRST, NET_SOCKET_LAST)
    253253
    254254/** Returns a value indicating whether the IPC call is a TCP message.
    … …  
    256256 */
    257257#define IS_NET_TCP_MESSAGE(call) \
    258         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_TCP_FIRST, NET_TCP_LAST)
     258        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_TCP_FIRST, NET_TCP_LAST)
    259259
    260260/** Returns a value indicating whether the IPC call is a transport layer message.
    … …  
    262262 */
    263263#define IS_NET_TL_MESSAGE(call) \
    264         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_TL_FIRST, NET_TL_LAST)
     264        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_TL_FIRST, NET_TL_LAST)
    265265
    266266/** Returns a value indicating whether the IPC call is a UDP message.
    … …  
    268268 */
    269269#define IS_NET_UDP_MESSAGE(call) \
    270         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_UDP_FIRST, NET_UDP_LAST)
     270        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_UDP_FIRST, NET_UDP_LAST)
    271271
    272272/*@}*/
    … …  
    370370#define IPC_SET_DEVICE(answer, value) \
    371371        do { \
    372                 ipcarg_t argument = (ipcarg_t) (value); \
     372                sysarg_t argument = (sysarg_t) (value); \
    373373                IPC_SET_ARG1(*answer, argument); \
    374374        } while (0)
    … …  
    379379#define IPC_SET_ADDR(answer, value) \
    380380        do { \
    381                 ipcarg_t argument = (ipcarg_t) (value); \
     381                sysarg_t argument = (sysarg_t) (value); \
    382382                IPC_SET_ARG1(*answer, argument); \
    383383        } while (0)
    … …  
    388388#define IPC_SET_PREFIX(answer, value) \
    389389        do { \
    390                 ipcarg_t argument = (ipcarg_t) (value); \
     390                sysarg_t argument = (sysarg_t) (value); \
    391391                IPC_SET_ARG2(*answer, argument); \
    392392        } while (0)
    … …  
    397397#define IPC_SET_CONTENT(answer, value) \
    398398        do { \
    399                 ipcarg_t argument = (ipcarg_t) (value); \
     399                sysarg_t argument = (sysarg_t) (value); \
    400400                IPC_SET_ARG3(*answer, argument); \
    401401        } while (0)
    … …  
    406406#define IPC_SET_SUFFIX(answer, value) \
    407407        do { \
    408                 ipcarg_t argument = (ipcarg_t) (value); \
     408                sysarg_t argument = (sysarg_t) (value); \
    409409                IPC_SET_ARG4(*answer, argument); \
    410410        } while (0)

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

    r8e58f94 r7bdcc45  
    8484#define SOCKET_SET_SOCKET_ID(answer, value) \
    8585        do { \
    86                 ipcarg_t argument = (ipcarg_t) (value); \
     86                sysarg_t argument = (sysarg_t) (value); \
    8787                IPC_SET_ARG1(answer, argument); \
    8888        } while (0)
    … …  
    102102#define SOCKET_SET_READ_DATA_LENGTH(answer, value) \
    103103        do { \
    104                 ipcarg_t argument = (ipcarg_t) (value); \
     104                sysarg_t argument = (sysarg_t) (value); \
    105105                IPC_SET_ARG1(answer, argument); \
    106106        } while (0)
    … …  
    147147#define SOCKET_SET_DATA_FRAGMENT_SIZE(answer, value) \
    148148        do { \
    149                 ipcarg_t argument = (ipcarg_t) (value); \
     149                sysarg_t argument = (sysarg_t) (value); \
    150150                IPC_SET_ARG2(answer, argument); \
    151151        } while (0)
    … …  
    156156#define SOCKET_SET_ADDRESS_LENGTH(answer, value) \
    157157        do { \
    158                 ipcarg_t argument = (ipcarg_t) (value); \
     158                sysarg_t argument = (sysarg_t) (value); \
    159159                IPC_SET_ARG3(answer, argument);\
    160160        } while (0)
    … …  
    174174#define SOCKET_SET_HEADER_SIZE(answer, value) \
    175175        do { \
    176                 ipcarg_t argument = (ipcarg_t) (value); \
     176                sysarg_t argument = (sysarg_t) (value); \
    177177                IPC_SET_ARG3(answer, argument); \
    178178        } while (0)

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

    r8e58f94 r7bdcc45  
    3636#define LIBC_IPC_VFS_H_
    3737
     38#include <ipc/ipc.h>
    3839#include <sys/types.h>
    39 #include <ipc/ipc.h>
     40#include <bool.h>
    4041
    4142#define FS_NAME_MAXLEN  20
    … …  
    5556        /** Unique identifier of the fs. */
    5657        char name[FS_NAME_MAXLEN + 1];
     58        bool concurrent_read_write;
     59        bool write_retains_size;
    5760} vfs_info_t;
    5861

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

    r8e58f94 r7bdcc45  
    4040#include <libarch/syscall.h>
    4141
     42#ifdef __32_BITS__
     43
     44/** Explicit 64-bit arguments passed to syscalls. */
     45typedef uint64_t sysarg64_t;
     46
     47#endif /* __32_BITS__ */
     48
    4249#define __SYSCALL0(id) \
    4350        __syscall0(0, 0, 0, 0, 0, 0, id)
    … …  
    5360        __syscall5(p1, p2, p3, p4, p5, 0, id)
    5461#define __SYSCALL6(id, p1, p2, p3, p4, p5, p6) \
    55     __syscall6(p1, p2, p3, p4, p5, p6, id)
     62        __syscall6(p1, p2, p3, p4, p5, p6, id)
    5663
    5764extern void __main(void *pcb_ptr);

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

    r8e58f94 r7bdcc45  
    4141extern uintptr_t get_max_heap_addr(void);
    4242
    43 extern void *malloc(const size_t size);
    44 extern void *calloc(const size_t nmemb, const size_t size);
    45 extern void *memalign(const size_t align, const size_t size);
     43extern void *malloc(const size_t size)
     44    __attribute__((malloc));
     45extern void *calloc(const size_t nmemb, const size_t size)
     46    __attribute__((malloc));
     47extern void *memalign(const size_t align, const size_t size)
     48    __attribute__((malloc));
    4649extern void *realloc(const void *addr, const size_t size);
    4750extern void free(const void *addr);

  • uspace/lib/c/include/net/modules.h

    r8e58f94 r7bdcc45  
    7474
    7575extern void answer_call(ipc_callid_t, int, ipc_call_t *, int);
    76 extern int bind_service(services_t, ipcarg_t, ipcarg_t, ipcarg_t,
     76extern int bind_service(services_t, sysarg_t, sysarg_t, sysarg_t,
    7777    async_client_conn_t);
    78 extern int bind_service_timeout(services_t, ipcarg_t, ipcarg_t, ipcarg_t,
     78extern int bind_service_timeout(services_t, sysarg_t, sysarg_t, sysarg_t,
    7979    async_client_conn_t, suseconds_t);
    8080extern int connect_to_service(services_t);

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

    r8e58f94 r7bdcc45  
    3636#define LIBC_STDINT_H_
    3737
    38 #define INT8_MIN  (0x80)
    39 #define INT8_MAX  (0x7F)
     38#define INT8_MIN  INT8_C(0x80)
     39#define INT8_MAX  INT8_C(0x7F)
    4040
    41 #define UINT8_MIN  (0u)
    42 #define UINT8_MAX  (0xFFu)
     41#define UINT8_MIN  UINT8_C(0)
     42#define UINT8_MAX  UINT8_C(0xFF)
    4343
    44 #define INT16_MIN  (0x8000)
    45 #define INT16_MAX  (0x7FFF)
     44#define INT16_MIN  INT16_C(0x8000)
     45#define INT16_MAX  INT16_C(0x7FFF)
    4646
    47 #define UINT16_MIN  (0u)
    48 #define UINT16_MAX  (0xFFFFu)
     47#define UINT16_MIN  UINT16_C(0)
     48#define UINT16_MAX  UINT16_C(0xFFFF)
    4949
    50 #define INT32_MIN  (0x80000000l)
    51 #define INT32_MAX  (0x7FFFFFFFl)
     50#define INT32_MIN  INT32_C(0x80000000)
     51#define INT32_MAX  INT32_C(0x7FFFFFFF)
    5252
    53 #define UINT32_MIN  (0ul)
    54 #define UINT32_MAX  (0xFFFFFFFFul)
     53#define UINT32_MIN  UINT32_C(0)
     54#define UINT32_MAX  UINT32_C(0xFFFFFFFF)
    5555
    56 #define INT64_MIN  (0x8000000000000000ll)
    57 #define INT64_MAX  (0x7FFFFFFFFFFFFFFFll)
     56#define INT64_MIN  INT64_C(0x8000000000000000)
     57#define INT64_MAX  INT64_C(0x7FFFFFFFFFFFFFFF)
    5858
    59 #define UINT64_MIN  (0ull)
    60 #define UINT64_MAX  (0xFFFFFFFFFFFFFFFFull)
     59#define UINT64_MIN  UINT64_C(0)
     60#define UINT64_MAX  UINT64_C(0xFFFFFFFFFFFFFFFF)
    6161
    6262#include <libarch/types.h>

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

    r8e58f94 r7bdcc45  
    4141#include <adt/list.h>
    4242
     43#ifndef NVERIFY_PRINTF
     44
     45#define PRINTF_ATTRIBUTE(start, end) \
     46        __attribute__((format(gnu_printf, start, end)))
     47
     48#else /* NVERIFY_PRINTF */
     49
     50#define PRINTF_ATTRIBUTE(start, end)
     51
     52#endif /* NVERIFY_PRINTF */
     53
    4354#define EOF  (-1)
    4455
    … …  
    149160
    150161/* Formatted string output functions */
    151 extern int fprintf(FILE *, const char*, ...);
     162extern int fprintf(FILE *, const char*, ...)
     163    PRINTF_ATTRIBUTE(2, 3);
    152164extern int vfprintf(FILE *, const char *, va_list);
    153165
    154 extern int printf(const char *, ...);
     166extern int printf(const char *, ...)
     167    PRINTF_ATTRIBUTE(1, 2);
    155168extern int vprintf(const char *, va_list);
    156169
    157 extern int snprintf(char *, size_t , const char *, ...);
    158 extern int asprintf(char **, const char *, ...);
     170extern int snprintf(char *, size_t , const char *, ...)
     171    PRINTF_ATTRIBUTE(3, 4);
     172extern int asprintf(char **, const char *, ...)
     173    PRINTF_ATTRIBUTE(2, 3);
    159174extern int vsnprintf(char *, size_t, const char *, va_list);
    160175

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

    r8e58f94 r7bdcc45  
    8686extern char *str_ndup(const char *, size_t max_size);
    8787
     88extern int str_uint64(const char *, char **, unsigned int, bool, uint64_t *);
     89extern int str_size_t(const char *, char **, unsigned int, bool, size_t *);
     90
    8891extern void order_suffix(const uint64_t val, uint64_t *rv, char *suffix);
    8992

  • uspace/lib/c/include/sys/typefmt.h

    r8e58f94 r7bdcc45  
    3939#include <inttypes.h>
    4040
    41 /* off64_t */
     41/* off64_t, aoff64_t */
    4242#define PRIdOFF64 PRId64
    4343#define PRIuOFF64 PRIu64
    … …  
    4545#define PRIXOFF64 PRIX64
    4646
    47 /* (s)size_t */
    48 #define PRIdSIZE PRIdPTR
    49 #define PRIuSIZE PRIuPTR
    50 #define PRIxSIZE PRIxPTR
    51 #define PRIXSIZE PRIXPTR
    52 
    53 /* sysarg_t */
    54 #define PRIdSYSARG PRIdPTR
    55 #define PRIuSYSARG PRIuPTR
    56 #define PRIxSYSARG PRIxPTR
    57 #define PRIXSYSARG PRIxPTR
    58 
    59 /* ipcarg_t */
    60 #define PRIdIPCARG PRIdPTR
    61 #define PRIuIPCARG PRIuPTR
    62 #define PRIxIPCARG PRIxPTR
    63 #define PRIXIPCARG PRIXPTR
    64 
    65 /* taskid_t */
    66 #define PRIdTASKID PRId64
    67 #define PRIuTASKID PRIu64
    68 #define PRIxTASKID PRIx64
    69 #define PRIXTASKID PRIx64
    70 
    7147#endif
    7248

  • uspace/lib/c/include/sys/types.h

    r8e58f94 r7bdcc45  
    4646typedef uint64_t aoff64_t;
    4747
    48 /** Unicode code point */
    49 typedef int32_t wchar_t;
    50 
    5148typedef volatile uint8_t ioport8_t;
    5249typedef volatile uint16_t ioport16_t;

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

    r8e58f94 r7bdcc45  
    4141
    4242#ifndef NULL
    43         #define NULL  0UL
     43        #define NULL    ((void *) 0)
    4444#endif
    4545
Note: See TracChangeset for help on using the changeset viewer.