Changeset 0b749a3 in mainline for uspace/lib/c/include


Ignore:
Timestamp:
2010-11-22T15:39:53Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0eddb76, aae339e9
Parents:
9a1d8ab (diff), 8cd1aa5e (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 development/ changes

Location:
uspace/lib/c/include
Files:
22 added
15 edited
18 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/adt/dynamic_fifo.h

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup ip
    30  * @{
     29/** @addtogroup libc
     30 *  @{
    3131 */
    3232
    33 #ifndef __NET_IP_LOCAL_H__
    34 #define __NET_IP_LOCAL_H__
     33/** @file
     34 * Dynamic first in first out positive integer queue.
     35 * Possitive integer values only.
     36 */
    3537
    36 #include <async.h>
    37 #include <ipc/services.h>
     38#ifndef LIBC_DYNAMIC_FIFO_H_
     39#define LIBC_DYNAMIC_FIFO_H_
    3840
    39 #include <ip_codes.h>
    40 #include <inet.h>
    41 #include <in.h>
    42 #include <socket.h>
     41/** Type definition of the dynamic fifo queue.
     42 * @see dyn_fifo
     43 */
     44typedef struct dyn_fifo dyn_fifo_t;
    4345
    44 extern int ip_received_error_msg_local(int, device_id_t, packet_t, services_t,
    45     services_t);
    46 extern int ip_set_gateway_req_local(int, device_id_t, in_addr_t);
    47 extern int ip_packet_size_req_local(int, device_id_t, packet_dimension_ref);
    48 extern int ip_received_error_msg_local(int, device_id_t, packet_t, services_t,
    49     services_t);
    50 extern int ip_device_req_local(int, device_id_t, services_t);
    51 extern int ip_add_route_req_local(int, device_id_t, in_addr_t, in_addr_t,
    52     in_addr_t);
    53 extern int ip_send_msg_local(int, device_id_t, packet_t, services_t,
    54     services_t);
    55 extern int ip_get_route_req_local(int, ip_protocol_t, const struct sockaddr *,
    56     socklen_t, device_id_t *, void **, size_t *);
     46/** Dynamic first in first out positive integer queue.
     47 * Possitive integer values only.
     48 * The queue automatically resizes if needed.
     49 */
     50struct dyn_fifo {
     51        /** Stored item field. */
     52        int *items;
     53        /** Actual field size. */
     54        int size;
     55        /** First item in the queue index. */
     56        int head;
     57        /** Last item in the queue index. */
     58        int tail;
     59        /** Consistency check magic value. */
     60        int magic_value;
     61};
     62
     63extern int dyn_fifo_initialize(dyn_fifo_t *, int);
     64extern int dyn_fifo_destroy(dyn_fifo_t *);
     65extern int dyn_fifo_push(dyn_fifo_t *, int, int);
     66extern int dyn_fifo_pop(dyn_fifo_t *);
     67extern int dyn_fifo_value(dyn_fifo_t *);
    5768
    5869#endif

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

    r9a1d8ab r0b749a3  
    8080#endif
    8181
     82#define htons(n)        host2uint16_t_be((n))
     83#define htonl(n)        host2uint32_t_be((n))
     84#define ntohs(n)        uint16_t_be2host((n))
     85#define ntohl(n)        uint32_t_be2host((n))
     86
    8287static inline uint64_t uint64_t_byteorder_swap(uint64_t n)
    8388{

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

    r9a1d8ab r0b749a3  
    4141extern int physmem_map(void *, void *, unsigned long, int);
    4242extern int iospace_enable(task_id_t, void *, unsigned long);
    43 extern int preemption_control(int);
    4443extern int pio_enable(void *, size_t, void **);
     44extern int interrupt_enable(int);
     45extern int interrupt_disable(int);
    4546
    4647#endif

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

    r9a1d8ab r0b749a3  
    4444
    4545extern int devmap_driver_register(const char *, async_client_conn_t);
    46 extern int devmap_device_register(const char *, dev_handle_t *);
     46extern int devmap_device_register(const char *, devmap_handle_t *);
    4747
    48 extern int devmap_device_get_handle(const char *, dev_handle_t *, unsigned int);
    49 extern int devmap_namespace_get_handle(const char *, dev_handle_t *, unsigned int);
    50 extern devmap_handle_type_t devmap_handle_probe(dev_handle_t);
     48extern int devmap_device_get_handle(const char *, devmap_handle_t *, unsigned int);
     49extern int devmap_namespace_get_handle(const char *, devmap_handle_t *, unsigned int);
     50extern devmap_handle_type_t devmap_handle_probe(devmap_handle_t);
    5151
    52 extern int devmap_device_connect(dev_handle_t, unsigned int);
     52extern int devmap_device_connect(devmap_handle_t, unsigned int);
    5353
    5454extern int devmap_null_create(void);
    … …  
    5656
    5757extern size_t devmap_count_namespaces(void);
    58 extern size_t devmap_count_devices(dev_handle_t);
     58extern size_t devmap_count_devices(devmap_handle_t);
    5959
    6060extern size_t devmap_get_namespaces(dev_desc_t **);
    61 extern size_t devmap_get_devices(dev_handle_t, dev_desc_t **);
     61extern size_t devmap_get_devices(devmap_handle_t, dev_desc_t **);
    6262
    6363#endif

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

    r9a1d8ab r0b749a3  
    3636#define LIBC_ERR_H_
    3737
     38#include <stdio.h>
     39
    3840#define errx(status, fmt, ...) { \
    3941        printf((fmt), ##__VA_ARGS__); \
    … …  
    4547/** @}
    4648 */
     49

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

    r9a1d8ab r0b749a3  
    5656#define EMLINK        (-266)
    5757
     58/** An API function is called while another blocking function is in progress. */
     59#define EINPROGRESS     (-10036)
     60
     61/** The socket identifier is not valid. */
     62#define ENOTSOCK        (-10038)
     63
     64/** The destination address required. */
     65#define EDESTADDRREQ    (-10039)
     66
     67/** Protocol is not supported.  */
     68#define EPROTONOSUPPORT (-10043)
     69
     70/** Socket type is not supported. */
     71#define ESOCKTNOSUPPORT (-10044)
     72
     73/** Protocol family is not supported. */
     74#define EPFNOSUPPORT    (-10046)
     75
     76/** Address family is not supported. */
     77#define EAFNOSUPPORT    (-10047)
     78
     79/** Address is already in use. */
     80#define EADDRINUSE      (-10048)
     81
     82/** The socket is not connected or bound. */
     83#define ENOTCONN        (-10057)
     84
     85/** The requested operation was not performed.
     86 *  Try again later.
     87 */
     88#define TRY_AGAIN       (-11002)
     89
     90/** No data.
     91 */
     92#define NO_DATA         (-11004)
     93
    5894#endif
    5995

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

    r9a1d8ab r0b749a3  
    4848#define FIBRIL_WRITER      2
    4949
     50struct fibril;
     51
     52typedef struct {
     53        struct fibril *owned_by;
     54} fibril_owner_info_t;
     55
    5056typedef enum {
    5157        FIBRIL_PREEMPT,
    … …  
    6874        int retval;
    6975        int flags;
     76
     77        fibril_owner_info_t *waits_for;
    7078} fibril_t;
    7179

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

    r9a1d8ab r0b749a3  
    4343
    4444typedef struct {
     45        fibril_owner_info_t oi;         /* Keep this the first thing. */
    4546        int counter;
    4647        link_t waiters;
    4748} fibril_mutex_t;
    4849
    49 #define FIBRIL_MUTEX_INITIALIZE(name) \
    50         fibril_mutex_t name = { \
     50#define FIBRIL_MUTEX_INITIALIZER(name) \
     51        { \
     52                .oi = { \
     53                        .owned_by = NULL \
     54                }, \
    5155                .counter = 1, \
    5256                .waiters = { \
    … …  
    5559                } \
    5660        }
     61       
     62#define FIBRIL_MUTEX_INITIALIZE(name) \
     63        fibril_mutex_t name = FIBRIL_MUTEX_INITIALIZER(name)
    5764
    5865typedef struct {
     66        fibril_owner_info_t oi; /* Keep this the first thing. */
    5967        unsigned writers;
    6068        unsigned readers;
    … …  
    6270} fibril_rwlock_t;
    6371
    64 #define FIBRIL_RWLOCK_INITIALIZE(name) \
    65         fibril_rwlock_t name = { \
     72#define FIBRIL_RWLOCK_INITIALIZER(name) \
     73        { \
     74                .oi = { \
     75                        .owned_by = NULL \
     76                }, \
    6677                .readers = 0, \
    6778                .writers = 0, \
    … …  
    7283        }
    7384
     85#define FIBRIL_RWLOCK_INITIALIZE(name) \
     86        fibril_rwlock_t name = FIBRIL_RWLOCK_INITIALIZER(name)
     87
    7488typedef struct {
    7589        link_t waiters;
    7690} fibril_condvar_t;
    7791
    78 #define FIBRIL_CONDVAR_INITIALIZE(name) \
    79         fibril_condvar_t name = { \
     92#define FIBRIL_CONDVAR_INITIALIZER(name) \
     93        { \
    8094                .waiters = { \
    8195                        .next = &name.waiters, \
    … …  
    8397                } \
    8498        }
     99
     100#define FIBRIL_CONDVAR_INITIALIZE(name) \
     101        fibril_condvar_t name = FIBRIL_CONDVAR_INITIALIZER(name)
    85102
    86103extern void fibril_mutex_initialize(fibril_mutex_t *);

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup arp
    30  *  @{
     29/** @addtogroup libc
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  ARP module messages.
    35  *  @see arp_interface.h
     34 * ARP module messages.
     35 * @see arp_interface.h
    3636 */
    3737
    38 #ifndef __NET_ARP_MESSAGES__
    39 #define __NET_ARP_MESSAGES__
     38#ifndef LIBC_ARP_MESSAGES_
     39#define LIBC_ARP_MESSAGES_
    4040
    4141#include <ipc/ipc.h>
     42#include <ipc/net.h>
    4243
    43 #include <net_messages.h>
    44 
    45 /** ARP module messages.
    46  */
    47 typedef enum{
     44/** ARP module messages. */
     45typedef enum {
    4846        /** Clean cache message.
    49          *  @see arp_clean_cache()
     47         * @see arp_clean_cache()
    5048         */
    5149        NET_ARP_CLEAN_CACHE = NET_ARP_FIRST,
    5250        /** Clear address cache message.
    53          *  @see arp_clear_address_msg()
     51         * @see arp_clear_address_msg()
    5452         */
    5553        NET_ARP_CLEAR_ADDRESS,
    5654        /** Clear device cache message.
    57          *  @see arp_clear_device_req()
     55         * @see arp_clear_device_req()
    5856         */
    5957        NET_ARP_CLEAR_DEVICE,
    6058        /** New device message.
    61          *  @see arp_device_req()
     59         * @see arp_device_req()
    6260         */
    6361        NET_ARP_DEVICE,
    6462        /** Address translation message.
    65          *  @see arp_translate_req()
     63         * @see arp_translate_req()
    6664         */
    6765        NET_ARP_TRANSLATE
    6866} arp_messages;
    6967
    70 /** @name ARP specific message parameters definitions
    71  */
     68/** @name ARP specific message parameters definitions */
    7269/*@{*/
    7370
    7471/** Returns the protocol service message parameter.
    75  *  @param[in] call The message call structure.
     72 * @param[in] call The message call structure.
    7673 */
    7774#define ARP_GET_NETIF(call) \
    78         ({services_t service = (services_t) IPC_GET_ARG2(*call); service;})
     75        ({ \
     76                services_t service = (services_t) IPC_GET_ARG2(*call); \
     77                service; \
     78        })
    7979
    8080/*@}*/

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

    r9a1d8ab r0b749a3  
    4040#define DEVMAP_NAME_MAXLEN  255
    4141
    42 typedef ipcarg_t dev_handle_t;
     42typedef ipcarg_t devmap_handle_t;
    4343
    4444typedef enum {
    … …  
    8181
    8282typedef struct {
    83         dev_handle_t handle;
     83        devmap_handle_t handle;
    8484        char name[DEVMAP_NAME_MAXLEN + 1];
    8585} dev_desc_t;

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup icmp
    30  *  @{
     29/** @addtogroup libc
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  ICMP module messages.
    35  *  @see icmp_interface.h
     34 * ICMP module messages.
     35 * @see icmp_interface.h
    3636 */
    3737
    38 #ifndef __NET_ICMP_MESSAGES__
    39 #define __NET_ICMP_MESSAGES__
     38#ifndef LIBC_ICMP_MESSAGES_
     39#define LIBC_ICMP_MESSAGES_
    4040
    4141#include <ipc/ipc.h>
     42#include <ipc/net.h>
    4243#include <sys/types.h>
     44#include <sys/time.h>
    4345
    44 #include <icmp_codes.h>
    45 #include <net_messages.h>
     46#include <net/icmp_codes.h>
    4647
    47 /** ICMP module messages.
    48  */
    49 typedef enum{
    50         /** Sends echo request.
    51          *  @see icmp_echo()
    52          */
     48/** ICMP module messages. */
     49typedef enum {
     50        /** Sends echo request. @see icmp_echo() */
    5351        NET_ICMP_ECHO = NET_ICMP_FIRST,
    54         /** Sends destination unreachable error message.
    55          *  @see icmp_destination_unreachable_msg()
     52       
     53        /**
     54         * Sends destination unreachable error message.
     55         * @see icmp_destination_unreachable_msg()
    5656         */
    5757        NET_ICMP_DEST_UNREACH,
    58         /** Sends source quench error message.
    59          *  @see icmp_source_quench_msg()
     58       
     59        /**
     60         * Sends source quench error message.
     61         * @see icmp_source_quench_msg()
    6062         */
    6163        NET_ICMP_SOURCE_QUENCH,
    62         /** Sends time exceeded error message.
    63          *  @see icmp_time_exceeded_msg()
     64       
     65        /**
     66         * Sends time exceeded error message.
     67         * @see icmp_time_exceeded_msg()
    6468         */
    6569        NET_ICMP_TIME_EXCEEDED,
    66         /** Sends parameter problem error message.
    67          *  @see icmp_parameter_problem_msg()
     70       
     71        /**
     72         * Sends parameter problem error message.
     73         * @see icmp_parameter_problem_msg()
    6874         */
    6975        NET_ICMP_PARAMETERPROB,
    70         /** Initializes new connection.
    71         */
     76       
     77        /** Initializes new connection. */
    7278        NET_ICMP_INIT
    7379} icmp_messages;
    7480
    75 /** @name ICMP specific message parameters definitions
    76  */
     81/** @name ICMP specific message parameters definitions */
    7782/*@{*/
    7883
    7984/** Returns the ICMP code message parameter.
    80  *  @param[in] call The message call structure.
     85 *
     86 * @param[in] call      The message call structure.
    8187 */
    8288#define ICMP_GET_CODE(call) \
    83         ({icmp_code_t code = (icmp_code_t) IPC_GET_ARG1(*call); code;})
     89        ({ \
     90                icmp_code_t code = (icmp_code_t) IPC_GET_ARG1(*call); \
     91                code; \
     92        })
    8493
    8594/** Returns the ICMP link MTU message parameter.
    86  *  @param[in] call The message call structure.
     95 *
     96 * @param[in] call      The message call structure.
    8797 */
    8898#define ICMP_GET_MTU(call) \
    89         ({icmp_param_t mtu = (icmp_param_t) IPC_GET_ARG3(*call); mtu;})
     99        ({ \
     100                icmp_param_t mtu = (icmp_param_t) IPC_GET_ARG3(*call); \
     101                mtu; \
     102        })
    90103
    91104/** Returns the pointer message parameter.
    92  *  @param[in] call The message call structure.
     105 *
     106 * @param[in] call      The message call structure.
    93107 */
    94108#define ICMP_GET_POINTER(call) \
    95         ({icmp_param_t pointer = (icmp_param_t) IPC_GET_ARG3(*call); pointer;})
     109        ({ \
     110                icmp_param_t pointer = (icmp_param_t) IPC_GET_ARG3(*call); \
     111                pointer; \
     112        })
    96113
    97114/** Returns the size message parameter.
    98  *  @param[in] call The message call structure.
     115 *
     116 * @param[in] call      The message call structure.
    99117 */
    100118#define ICMP_GET_SIZE(call) \
    101         ({size_t size = (size_t) IPC_GET_ARG1(call); size;})
     119        ({ \
     120                size_t size = (size_t) IPC_GET_ARG1(call); \
     121                size; \
     122        })
    102123
    103124/** Returns the timeout message parameter.
    104  *  @param[in] call The message call structure.
     125 *
     126 * @param[in] call      The message call structure.
    105127 */
    106128#define ICMP_GET_TIMEOUT(call) \
    107         (({suseconds_t timeout = (suseconds_t) IPC_GET_ARG2(call); timeout;}))
     129        ({ \
     130                suseconds_t timeout = (suseconds_t) IPC_GET_ARG2(call); \
     131                timeout; \
     132        })
    108133
    109134/** Returns the time to live message parameter.
    110  *  @param[in] call The message call structure.
     135 *
     136 * @param[in] call      The message call structure.
    111137 */
    112138#define ICMP_GET_TTL(call) \
    113         ({ip_ttl_t ttl = (ip_ttl_t) IPC_GET_ARG3(call); ttl;})
     139        ({ \
     140                ip_ttl_t ttl = (ip_ttl_t) IPC_GET_ARG3(call); \
     141                ttl; \
     142        })
    114143
    115144/** Returns the type of service message parameter.
    116  *  @param[in] call The message call structure.
     145 *
     146 * @param[in] call      The message call structure.
    117147 */
    118148#define ICMP_GET_TOS(call) \
    119         ({ip_tos_t tos = (ip_tos_t) IPC_GET_ARG4(call); tos;})
     149        ({ \
     150                ip_tos_t tos = (ip_tos_t) IPC_GET_ARG4(call); \
     151                tos; \
     152        })
    120153
    121154/** Returns the dont fragment message parameter.
    122  *  @param[in] call The message call structure.
     155 *
     156 * @param[in] call      The message call structure.
    123157 */
    124158#define ICMP_GET_DONT_FRAGMENT(call) \
    125         ({int dont_fragment = (int) IPC_GET_ARG5(call); dont_fragment;})
     159        ({ \
     160                int dont_fragment = (int) IPC_GET_ARG5(call); \
     161                dont_fragment; \
     162        })
    126163
    127164/*@}*/

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup net_il
     29/** @addtogroup libc
    3030 * @{
    3131 */
    … …  
    3737 */
    3838
    39 #ifndef __NET_IL_MESSAGES_H__
    40 #define __NET_IL_MESSAGES_H__
     39#ifndef LIBC_IL_MESSAGES_H_
     40#define LIBC_IL_MESSAGES_H_
    4141
    4242#include <ipc/ipc.h>
     43#include <ipc/net.h>
    4344
    44 /** Internet layer modules messages.
    45  */
     45/** Internet layer modules messages. */
    4646typedef enum {
    4747        /** New device message.
    48          *  @see ip_device_req()
     48         * @see ip_device_req()
    4949         */
    5050        NET_IL_DEVICE = NET_IL_FIRST,
    5151        /** Device state changed message.
    52          *  @see il_device_state_msg()
     52         * @see il_device_state_msg()
    5353         */
    5454        NET_IL_DEVICE_STATE,
    5555        /** Device MTU changed message.
    56          *  @see il_mtu_changed_msg()
     56         * @see il_mtu_changed_msg()
    5757         */
    5858        NET_IL_MTU_CHANGED,
    5959        /** Packet size message.
    60          *  @see il_packet_size_req()
     60         * @see il_packet_size_req()
    6161         */
    6262        NET_IL_PACKET_SPACE,
    6363        /** Packet received message.
    64          *  @see il_received_msg()
     64         * @see il_received_msg()
    6565         */
    6666        NET_IL_RECEIVED,
    6767        /** Packet send message.
    68          *  @see il_send_msg()
     68         * @see il_send_msg()
    6969         */
    7070        NET_IL_SEND
    7171} il_messages;
    7272
    73 /** @name Internetwork layer specific message parameters definitions
    74  *
    75  */
     73/** @name Internetwork layer specific message parameters definitions */
    7674/*@{*/
    7775
    7876/** Return the protocol number message parameter.
    7977 * @param[in] call The message call structure.
    80  *
    8178 */
    82 #define IL_GET_PROTO(call)  (int) IPC_GET_ARG1(*call)
     79#define IL_GET_PROTO(call)      (int) IPC_GET_ARG1(*call)
    8380
    8481/** Return the registering service message parameter.
    8582 * @param[in] call The message call structure.
    86  *
    8783 */
    88 #define IL_GET_SERVICE(call)  (services_t) IPC_GET_ARG2(*call)
     84#define IL_GET_SERVICE(call)    (services_t) IPC_GET_ARG2(*call)
    8985
    9086/*@}*/

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup ip
    30  *  @{
     29/** @addtogroup libc
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  IP module messages.
    35  *  @see ip_interface.h
     34 * IP module messages.
     35 * @see ip_interface.h
    3636 */
    3737
    38 #ifndef __NET_IP_MESSAGES_H__
    39 #define __NET_IP_MESSAGES_H__
     38#ifndef LIBC_IP_MESSAGES_H_
     39#define LIBC_IP_MESSAGES_H_
    4040
    4141#include <ipc/ipc.h>
     42#include <ipc/net.h>
    4243
    43 #include <in.h>
    44 #include <ip_codes.h>
     44#include <net/in.h>
     45#include <net/ip_codes.h>
    4546
    46 /** IP module messages.
    47  */
    48 typedef enum{
     47/** IP module messages. */
     48typedef enum {
    4949        /** Adds the routing entry.
    50          *  @see ip_add_route()
     50         * @see ip_add_route()
    5151         */
    5252        NET_IP_ADD_ROUTE = NET_IP_FIRST,
    5353        /** Gets the actual route information.
    54          *  @see ip_get_route()
     54         * @see ip_get_route()
    5555         */
    5656        NET_IP_GET_ROUTE,
    5757        /** Processes the received error notification.
    58          *  @see ip_received_error_msg()
     58         * @see ip_received_error_msg()
    5959         */
    6060        NET_IP_RECEIVED_ERROR,
    6161        /** Sets the default gateway.
    62          *  @see ip_set_default_gateway()
     62         * @see ip_set_default_gateway()
    6363         */
    6464        NET_IP_SET_GATEWAY
    6565} ip_messages;
    6666
    67 /** @name IP specific message parameters definitions
    68  */
     67/** @name IP specific message parameters definitions */
    6968/*@{*/
    7069
    7170/** Returns the address message parameter.
    72  *  @param[in] call The message call structure.
     71 * @param[in] call The message call structure.
    7372 */
    7473#define IP_GET_ADDRESS(call) \
    75         ({in_addr_t addr; addr.s_addr = IPC_GET_ARG3(*call); addr;})
     74        ({ \
     75                in_addr_t addr; \
     76                addr.s_addr = IPC_GET_ARG3(*call); \
     77                addr; \
     78        })
    7679
    7780/** Returns the gateway message parameter.
    78  *  @param[in] call The message call structure.
     81 * @param[in] call The message call structure.
    7982 */
    8083#define IP_GET_GATEWAY(call) \
    81         ({in_addr_t addr; addr.s_addr = IPC_GET_ARG2(*call); addr;})
     84        ({ \
     85                in_addr_t addr; \
     86                addr.s_addr = IPC_GET_ARG2(*call); \
     87                addr; \
     88        })
    8289
    8390/** Sets the header length in the message answer.
    84  *  @param[out] answer The message answer structure.
     91 * @param[out] answer The message answer structure.
    8592 */
    8693#define IP_SET_HEADERLEN(answer, value) \
    87         {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG2(*answer, argument);}
     94        do { \
     95                ipcarg_t argument = (ipcarg_t) (value); \
     96                IPC_SET_ARG2(*answer, argument); \
     97        } while (0)
    8898
    8999/** Returns the network mask message parameter.
    90  *  @param[in] call The message call structure.
     100 * @param[in] call The message call structure.
    91101 */
    92102#define IP_GET_NETMASK(call) \
    93         ({in_addr_t addr; addr.s_addr = IPC_GET_ARG4(*call); addr;})
     103        ({ \
     104                in_addr_t addr; \
     105                addr.s_addr = IPC_GET_ARG4(*call); \
     106                addr; \
     107        })
    94108
    95109/** Returns the protocol message parameter.
    96  *  @param[in] call The message call structure.
     110 * @param[in] call The message call structure.
    97111 */
    98112#define IP_GET_PROTOCOL(call) \
    99         ({ip_protocol_t protocol = (ip_protocol_t) IPC_GET_ARG1(*call); protocol;})
     113        ({ \
     114                ip_protocol_t protocol = (ip_protocol_t) IPC_GET_ARG1(*call); \
     115                protocol; \
     116        })
    100117
    101118/*@}*/

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup net
    30  *  @{
     29/** @addtogroup libc
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Networking subsystem central module messages.
    35  *  @see net_interface.h
     34 * Networking subsystem central module messages.
     35 * @see net_interface.h
    3636 */
    3737
    38 #ifndef __NET_NET_MESSAGES_H__
    39 #define __NET_NET_MESSAGES_H__
     38#ifndef LIBC_NET_NET_MESSAGES_H_
     39#define LIBC_NET_NET_MESSAGES_H_
    4040
    4141#include <ipc/ipc.h>
     42#include <ipc/net.h>
    4243
    43 #include <net_messages.h>
    44 
    45 /** Networking subsystem central module messages.
    46  */
    47 typedef enum{
     44/** Networking subsystem central module messages. */
     45typedef enum {
    4846        /** Returns the general configuration
    49          *  @see net_get_conf_req()
     47         * @see net_get_conf_req()
    5048         */
    5149        NET_NET_GET_CONF = NET_FIRST,
    5250        /** Returns the device specific configuration
    53          *  @see net_get_device_conf_req()
     51         * @see net_get_device_conf_req()
    5452         */
    5553        NET_NET_GET_DEVICE_CONF,
    56         /** Starts the networking stack.
    57          */
     54        /** Starts the networking stack. */
    5855        NET_NET_STARTUP,
    5956} net_messages;

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup netif
     29/** @addtogroup libc
    3030 * @{
    3131 */
    … …  
    3535 */
    3636
    37 #ifndef __NET_NETIF_MESSAGES_H__
    38 #define __NET_NETIF_MESSAGES_H__
     37#ifndef LIBC_NETIF_MESSAGES_H_
     38#define LIBC_NETIF_MESSAGES_H_
    3939
    4040#include <ipc/ipc.h>
     41#include <ipc/net.h>
    4142
    42 #include <net_messages.h>
    43 
    44 /** Network interface common module messages.
    45  */
     43/** Network interface common module messages. */
    4644typedef enum {
    4745        /** Probe device message.
    48          *  @see netif_probe_req()
     46         * @see netif_probe_req()
    4947         */
    5048        NET_NETIF_PROBE = NET_NETIF_FIRST,
    5149        /** Send packet message.
    52          *  @see netif_send_msg()
     50         * @see netif_send_msg()
    5351         */
    5452        NET_NETIF_SEND,
    5553        /** Start device message.
    56          *  @see netif_start_req()
     54         * @see netif_start_req()
    5755         */
    5856        NET_NETIF_START,
    5957        /** Get device usage statistics message.
    60          *  @see netif_stats_req()
     58         * @see netif_stats_req()
    6159         */
    6260        NET_NETIF_STATS,
    6361        /** Stop device message.
    64          *  @see netif_stop_req()
     62         * @see netif_stop_req()
    6563         */
    6664        NET_NETIF_STOP,
    6765        /** Get device address message.
    68          *  @see netif_get_addr_req()
     66         * @see netif_get_addr_req()
    6967         */
    7068        NET_NETIF_GET_ADDR,
    7169} netif_messages;
    7270
    73 /** @name Network interface specific message parameters definitions
    74  */
     71/** @name Network interface specific message parameters definitions */
    7572/*@{*/
    7673
    … …  
    7976 */
    8077#define NETIF_GET_IRQ(call) \
    81         ({int irq = (int) IPC_GET_ARG2(*call); irq;})
     78        ({ \
     79                int irq = (int) IPC_GET_ARG2(*call); \
     80                irq; \
     81        })
    8282
    8383/** Return the input/output address message parameter.
    … …  
    8585 */
    8686#define NETIF_GET_IO(call) \
    87         ({int io = (int) IPC_GET_ARG3(*call); io;})
     87        ({ \
     88                int io = (int) IPC_GET_ARG3(*call); \
     89                io; \
     90        })
    8891
    8992/*@}*/

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup net_nil
     29/** @addtogroup libc
    3030 * @{
    3131 */
    … …  
    3535 */
    3636
    37 #ifndef __NET_NIL_MESSAGES_H__
    38 #define __NET_NIL_MESSAGES_H__
     37#ifndef LIBC_NIL_MESSAGES_H_
     38#define LIBC_NIL_MESSAGES_H_
    3939
    4040#include <ipc/ipc.h>
     41#include <ipc/net.h>
    4142
    42 #include <net_messages.h>
    43 
    44 /** Network interface layer module messages.
    45  */
     43/** Network interface layer module messages. */
    4644typedef enum {
    4745        /** New device or update MTU message.
    48          *  @see nil_device_req()
     46         * @see nil_device_req()
    4947         */
    5048        NET_NIL_DEVICE = NET_NIL_FIRST,
    5149        /** New device state message.
    52          *  @see nil_device_state_msg()
     50         * @see nil_device_state_msg()
    5351         */
    5452        NET_NIL_DEVICE_STATE,
    5553        /** Received packet queue message.
    56          *  @see nil_received_msg()
     54         * @see nil_received_msg()
    5755         */
    5856        NET_NIL_RECEIVED,
    5957        /** Send packet queue message.
    60          *  @see nil_send_msg()
     58         * @see nil_send_msg()
    6159         */
    6260        NET_NIL_SEND,
    6361        /** Packet size message.
    64          *  @see nil_packet_size_req()
     62         * @see nil_packet_size_req()
    6563         */
    6664        NET_NIL_PACKET_SPACE,
    6765        /** Device local hardware address message.
    68          *  @see nil_get_addr()
     66         * @see nil_get_addr()
    6967         */
    7068        NET_NIL_ADDR,
    7169        /** Device broadcast hardware address message.
    72          *  @see nil_get_broadcast_addr()
     70         * @see nil_get_broadcast_addr()
    7371         */
    7472        NET_NIL_BROADCAST_ADDR,
    7573} nil_messages;
    7674
    77 /** @name Network interface layer specific message parameters definitions
    78  */
     75/** @name Network interface layer specific message parameters definitions */
    7976/*@{*/
    8077
    81 /** Return the protocol service message parameter.
    82  */
     78/** Return the protocol service message parameter. */
    8379#define NIL_GET_PROTO(call) \
    84         ({services_t service = (services_t) IPC_GET_ARG2(*call); service;})
     80        ({ \
     81                services_t service = (services_t) IPC_GET_ARG2(*call); \
     82                service; \
     83        })
    8584
    8685/*@}*/

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup packet
     29/** @addtogroup libc
    3030 *  @{
    3131 */
    … …  
    3535 */
    3636
    37 #ifndef __NET_PACKET_MESSAGES__
    38 #define __NET_PACKET_MESSAGES__
     37#ifndef LIBC_PACKET_MESSAGES_
     38#define LIBC_PACKET_MESSAGES_
    3939
    4040#include <ipc/ipc.h>
     41#include <ipc/net.h>
    4142
    42 #include <net_messages.h>
    43 
    44 /** Packet server module messages.
    45  */
     43/** Packet server module messages. */
    4644typedef enum {
    4745        /** Create packet message with specified content length.
    48          *  @see packet_get_1()
     46         * @see packet_get_1()
    4947         */
    5048        NET_PACKET_CREATE_1 = NET_PACKET_FIRST,
    51         /** Create packet message with specified address length, prefix, content and suffix.
    52          *  @see packet_get_4()
     49       
     50        /**
     51         * Create packet message with specified address length, prefix, content
     52         * and suffix.
     53         * @see packet_get_4()
    5354         */
    5455        NET_PACKET_CREATE_4,
     56       
    5557        /** Get packet message.
    56          *  @see packet_return()
    57          */
     58         * @see packet_return() */
    5859        NET_PACKET_GET,
     60       
    5961        /** Get packet size message.
    60          *  @see packet_translate()
     62         * @see packet_translate()
    6163         */
    6264        NET_PACKET_GET_SIZE,
     65       
    6366        /** Release packet message.
    64          *  @see pq_release()
     67         * @see pq_release()
    6568         */
    6669        NET_PACKET_RELEASE
    6770} packet_messages;
    6871
    69 /** Returns the protocol service message parameter.
    70  */
    71 #define ARP_GET_PROTO(call)             (services_t) IPC_GET_ARG2(*call)
     72/** Returns the protocol service message parameter. */
     73#define ARP_GET_PROTO(call)     (services_t) IPC_GET_ARG2(*call)
    7274
    73 /** Returns the packet identifier message parameter.
    74  */
    75 #define IPC_GET_ID(call)                        (packet_id_t) IPC_GET_ARG1(*call)
     75/** Returns the packet identifier message parameter. */
     76#define IPC_GET_ID(call)        (packet_id_t) IPC_GET_ARG1(*call)
    7677
    77 /** Returns the maximal content length message parameter.
    78  */
    79 #define IPC_GET_CONTENT(call)           (size_t) IPC_GET_ARG1(*call)
     78/** Returns the maximal content length message parameter. */
     79#define IPC_GET_CONTENT(call)   (size_t) IPC_GET_ARG1(*call)
    8080
    81 /** Returns the maximal address length message parameter.
    82  */
     81/** Returns the maximal address length message parameter. */
    8382#define IPC_GET_ADDR_LEN(call)  (size_t) IPC_GET_ARG2(*call)
    8483
    85 /** Returns the maximal prefix length message parameter.
    86  */
    87 #define IPC_GET_PREFIX(call)            (size_t) IPC_GET_ARG3(*call)
     84/** Returns the maximal prefix length message parameter. */
     85#define IPC_GET_PREFIX(call)    (size_t) IPC_GET_ARG3(*call)
    8886
    89 /** Returns the maximal suffix length message parameter.
    90  */
    91 #define IPC_GET_SUFFIX(call)            (size_t) IPC_GET_ARG4(*call)
     87/** Returns the maximal suffix length message parameter. */
     88#define IPC_GET_SUFFIX(call)    (size_t) IPC_GET_ARG4(*call)
    9289
    9390#endif

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

    r9a1d8ab r0b749a3  
    3939
    4040typedef enum {
    41         SERVICE_LOAD = 1,
     41        SERVICE_NONE = 0,
     42        SERVICE_LOAD,
    4243        SERVICE_PCI,
    4344        SERVICE_VIDEO,
    … …  
    4546        SERVICE_VFS,
    4647        SERVICE_DEVMAP,
     48        SERVICE_DEVMAN,
    4749        SERVICE_FHC,
    4850        SERVICE_OBIO,

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup socket
    30  *  @{
     29/** @addtogroup libc
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Socket messages.
    35  *  @see socket.h
    36  */
    37 
    38 
    39 #ifndef __NET_SOCKET_MESSAGES_H__
    40 #define __NET_SOCKET_MESSAGES_H__
     34 * Socket messages.
     35 */
     36
     37#ifndef LIBC_SOCKET_MESSAGES_H_
     38#define LIBC_SOCKET_MESSAGES_H_
    4139
    4240#include <ipc/ipc.h>
    43 
    44 #include <net_messages.h>
    45 #include <socket_codes.h>
    46 
    47 /** Socket client messages.
    48  */
    49 typedef enum{
    50         /** Creates a new socket.
    51          *  @see socket()
    52          */
     41#include <ipc/net.h>
     42
     43/** Socket client messages. */
     44typedef enum {
     45        /** Creates a new socket. @see socket() */
    5346        NET_SOCKET = NET_SOCKET_FIRST,
    54         /** Binds the socket.
    55          *  @see bind()
    56          */
     47        /** Binds the socket. @see bind() */
    5748        NET_SOCKET_BIND,
    58         /** Creates a new socket.
    59          *  @see socket()
    60          */
     49        /** Creates a new socket. @see socket() */
    6150        NET_SOCKET_LISTEN,
    62         /** Accepts an incomming connection.
    63          *  @see accept()
    64          */
     51        /** Accepts an incomming connection. @see accept() */
    6552        NET_SOCKET_ACCEPT,
    66         /** Connects the socket.
    67          *  @see connect()
    68          */
     53        /** Connects the socket. @see connect() */
    6954        NET_SOCKET_CONNECT,
    70         /** Closes the socket.
    71          *  @see closesocket()
    72          */
     55        /** Closes the socket. @see closesocket() */
    7356        NET_SOCKET_CLOSE,
    74         /** Sends data via the stream socket.
    75          *  @see send()
    76          */
     57        /** Sends data via the stream socket. @see send() */
    7758        NET_SOCKET_SEND,
    78         /** Sends data via the datagram socket.
    79          *  @see sendto()
    80          */
     59        /** Sends data via the datagram socket. @see sendto() */
    8160        NET_SOCKET_SENDTO,
    82         /** Receives data from the stream socket.
    83          *  @see socket()
    84          */
     61        /** Receives data from the stream socket. @see socket() */
    8562        NET_SOCKET_RECV,
    86         /** Receives data from the datagram socket.
    87          *  @see socket()
    88          */
     63        /** Receives data from the datagram socket. @see socket() */
    8964        NET_SOCKET_RECVFROM,
    90         /** Gets the socket option.
    91          *  @see getsockopt()
    92          */
     65        /** Gets the socket option. @see getsockopt() */
    9366        NET_SOCKET_GETSOCKOPT,
    94         /** Sets the socket option.
    95          *  @see setsockopt()
    96          */
     67        /** Sets the socket option. @see setsockopt() */
    9768        NET_SOCKET_SETSOCKOPT,
    98         /** New socket for acceptence notification message.
    99          */
     69        /** New socket for acceptence notification message. */
    10070        NET_SOCKET_ACCEPTED,
    101         /** New data received notification message.
    102          */
     71        /** New data received notification message. */
    10372        NET_SOCKET_RECEIVED,
    104         /** New socket data fragment size notification message.
    105          */
     73        /** New socket data fragment size notification message. */
    10674        NET_SOCKET_DATA_FRAGMENT_SIZE
    10775} socket_messages;
    … …  
    11280
    11381/** Sets the socket identifier in the message answer.
    114  *  @param[out] answer The message answer structure.
     82 * @param[out] answer   The message answer structure.
    11583 */
    11684#define SOCKET_SET_SOCKET_ID(answer, value) \
    117         {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG1(answer, argument);}
     85        do { \
     86                ipcarg_t argument = (ipcarg_t) (value); \
     87                IPC_SET_ARG1(answer, argument); \
     88        } while (0)
    11889
    11990/** Returns the socket identifier message parameter.
    120  *  @param[in] call The message call structure.
     91 * @param[in] call      The message call structure.
    12192 */
    12293#define SOCKET_GET_SOCKET_ID(call) \
    123         ({int socket_id = (int) IPC_GET_ARG1(call); socket_id;})
     94        ({ \
     95                int socket_id = (int) IPC_GET_ARG1(call); \
     96                socket_id; \
     97        })
    12498
    12599/** Sets the read data length in the message answer.
    126  *  @param[out] answer The message answer structure.
     100 * @param[out] answer   The message answer structure.
    127101 */
    128102#define SOCKET_SET_READ_DATA_LENGTH(answer, value) \
    129         {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG1(answer, argument);}
     103        do { \
     104                ipcarg_t argument = (ipcarg_t) (value); \
     105                IPC_SET_ARG1(answer, argument); \
     106        } while (0)
    130107
    131108/** Returns the read data length message parameter.
    132  *  @param[in] call The message call structure.
     109 * @param[in] call      The message call structure.
    133110 */
    134111#define SOCKET_GET_READ_DATA_LENGTH(call) \
    135         ({int data_length = (int) IPC_GET_ARG1(call); data_length;})
     112        ({ \
     113                int data_length = (int) IPC_GET_ARG1(call); \
     114                data_length; \
     115        })
    136116
    137117/** Returns the backlog message parameter.
    138  *  @param[in] call The message call structure.
     118 * @param[in] call      The message call structure.
    139119 */
    140120#define SOCKET_GET_BACKLOG(call) \
    141         ({int backlog = (int) IPC_GET_ARG2(call); backlog;})
     121        ({ \
     122                int backlog = (int) IPC_GET_ARG2(call); \
     123                backlog; \
     124        })
    142125
    143126/** Returns the option level message parameter.
    144  *  @param[in] call The message call structure.
     127 * @param[in] call      The message call structure.
    145128 */
    146129#define SOCKET_GET_OPT_LEVEL(call) \
    147         ({int opt_level = (int) IPC_GET_ARG2(call); opt_level;})
     130        ({ \
     131                int opt_level = (int) IPC_GET_ARG2(call); \
     132                opt_level; \
     133        })
    148134
    149135/** Returns the data fragment size message parameter.
    150  *  @param[in] call The message call structure.
     136 * @param[in] call      The message call structure.
    151137 */
    152138#define SOCKET_GET_DATA_FRAGMENT_SIZE(call) \
    153         ({size_t size = (size_t) IPC_GET_ARG2(call); size;})
     139        ({ \
     140                size_t size = (size_t) IPC_GET_ARG2(call); \
     141                size; \
     142        })
    154143
    155144/** Sets the data fragment size in the message answer.
    156  *  @param[out] answer The message answer structure.
     145 * @param[out] answer   The message answer structure.
    157146 */
    158147#define SOCKET_SET_DATA_FRAGMENT_SIZE(answer, value) \
    159         {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG2(answer, argument);}
     148        do { \
     149                ipcarg_t argument = (ipcarg_t) (value); \
     150                IPC_SET_ARG2(answer, argument); \
     151        } while (0)
    160152
    161153/** Sets the address length in the message answer.
    162  *  @param[out] answer The message answer structure.
     154 * @param[out] answer   The message answer structure.
    163155 */
    164156#define SOCKET_SET_ADDRESS_LENGTH(answer, value) \
    165         {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG3(answer, argument);}
     157        do { \
     158                ipcarg_t argument = (ipcarg_t) (value); \
     159                IPC_SET_ARG3(answer, argument);\
     160        } while (0)
    166161
    167162/** Returns the address length message parameter.
    168  *  @param[in] call The message call structure.
     163 * @param[in] call      The message call structure.
    169164 */
    170165#define SOCKET_GET_ADDRESS_LENGTH(call) \
    171         ({socklen_t address_length = (socklen_t) IPC_GET_ARG3(call); address_length;})
     166        ({ \
     167                socklen_t address_length = (socklen_t) IPC_GET_ARG3(call); \
     168                address_length; \
     169        })
    172170
    173171/** Sets the header size in the message answer.
    174  *  @param[out] answer The message answer structure.
     172 * @param[out] answer   The message answer structure.
    175173 */
    176174#define SOCKET_SET_HEADER_SIZE(answer, value) \
    177         \
    178         {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG3(answer, argument);}
     175        do { \
     176                ipcarg_t argument = (ipcarg_t) (value); \
     177                IPC_SET_ARG3(answer, argument); \
     178        } while (0)
    179179
    180180/** Returns the header size message parameter.
    181  *  @param[in] call The message call structure.
     181 *  @param[in] call     The message call structure.
    182182 */
    183183#define SOCKET_GET_HEADER_SIZE(call) \
    184         ({size_t size = (size_t) IPC_GET_ARG3(call); size;})
     184        ({ \
     185                size_t size = (size_t) IPC_GET_ARG3(call); \
     186                size; \
     187        })
    185188
    186189/** Returns the flags message parameter.
    187  *  @param[in] call The message call structure.
     190 *  @param[in] call     The message call structure.
    188191 */
    189192#define SOCKET_GET_FLAGS(call) \
    190         ({int flags = (int) IPC_GET_ARG4(call); flags;})
     193        ({ \
     194                int flags = (int) IPC_GET_ARG4(call); \
     195                flags; \
     196        })
    191197
    192198/** Returns the option name message parameter.
    193  *  @param[in] call The message call structure.
     199 *  @param[in] call     The message call structure.
    194200 */
    195201#define SOCKET_GET_OPT_NAME(call) \
    196         ({int opt_name = (int) IPC_GET_ARG4(call); opt_name;})
     202        ({ \
     203                int opt_name = (int) IPC_GET_ARG4(call); \
     204                opt_name; \
     205        })
    197206
    198207/** Returns the data fragments message parameter.
    199  *  @param[in] call The message call structure.
     208 *  @param[in] call     The message call structure.
    200209 */
    201210#define SOCKET_GET_DATA_FRAGMENTS(call) \
    202         ({int fragments = (int) IPC_GET_ARG5(call); fragments;})
     211        ({ \
     212                int fragments = (int) IPC_GET_ARG5(call); \
     213                fragments; \
     214        })
    203215
    204216/** Returns the new socket identifier message parameter.
    205  *  @param[in] call The message call structure.
     217 *  @param[in] call     The message call structure.
    206218 */
    207219#define SOCKET_GET_NEW_SOCKET_ID(call) \
    208         ({int socket_id = (int) IPC_GET_ARG5(call); socket_id;})
     220        ({ \
     221                int socket_id = (int) IPC_GET_ARG5(call); \
     222                socket_id; \
     223        })
    209224
    210225/*@}*/

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup net_tl
    30  *  @{
     29/** @addtogroup libc
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Transport layer modules messages.
    35  *  @see tl_interface.h
     34 * Transport layer modules messages.
     35 * @see tl_interface.h
    3636 */
    3737
    38 #ifndef __NET_TL_MESSAGES_H__
    39 #define __NET_TL_MESSAGES_H__
     38#ifndef LIBC_TL_MESSAGES_H_
     39#define LIBC_TL_MESSAGES_H_
    4040
    4141#include <ipc/ipc.h>
     42#include <ipc/net.h>
    4243
    43 #include <net_messages.h>
    44 
    45 /** Transport layer modules messages.
    46  */
    47 typedef enum{
     44/** Transport layer modules messages. */
     45typedef enum {
    4846        /** Packet received message.
    49          *  @see tl_received_msg()
     47         * @see tl_received_msg()
    5048         */
    5149        NET_TL_RECEIVED = NET_TL_FIRST

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup netif
    30  *  @{
     29/** @addtogroup libc
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Device identifier, state and usage statistics.
     34 * Device identifier, state and usage statistics.
    3535 */
    3636
    37 #ifndef __NET_DEVICE_ID_TYPE_H__
    38 #define __NET_DEVICE_ID_TYPE_H__
     37#ifndef LIBC_DEVICE_ID_TYPE_H_
     38#define LIBC_DEVICE_ID_TYPE_H_
    3939
    4040#include <adt/int_map.h>
    4141
    42 /** Device identifier to generic type map declaration.
    43  */
    44 #define DEVICE_MAP_DECLARE              INT_MAP_DECLARE
     42/** Device identifier to generic type map declaration. */
     43#define DEVICE_MAP_DECLARE      INT_MAP_DECLARE
    4544
    46 /** Device identifier to generic type map implementation.
    47  */
     45/** Device identifier to generic type map implementation. */
    4846#define DEVICE_MAP_IMPLEMENT    INT_MAP_IMPLEMENT
    4947
    50 /** Invalid device identifier.
    51  */
    52 #define DEVICE_INVALID_ID               (-1)
     48/** Invalid device identifier. */
     49#define DEVICE_INVALID_ID       (-1)
    5350
    54 /** Device identifier type.
    55  */
    56 typedef int     device_id_t;
     51/** Device identifier type. */
     52typedef int device_id_t;
    5753
    58 /** Device state type.
    59  */
    60 typedef enum device_state       device_state_t;
     54/** Device state type. */
     55typedef enum device_state device_state_t;
    6156
    6257/** Type definition of the device usage statistics.
    63  *  @see device_stats
     58 * @see device_stats
    6459 */
    65 typedef struct device_stats     device_stats_t;
     60typedef struct device_stats device_stats_t;
    6661
    67 /** Type definition of the device usage statistics pointer.
    68  *  @see device_stats
    69  */
    70 typedef device_stats_t *        device_stats_ref;
    71 
    72 /** Device state.
    73  */
    74 enum    device_state{
    75         /** Device not present or not initialized.
    76          */
     62/** Device state. */
     63enum device_state {
     64        /** Device not present or not initialized. */
    7765        NETIF_NULL = 0,
    78         /** Device present and stopped.
    79          */
     66        /** Device present and stopped. */
    8067        NETIF_STOPPED,
    81         /** Device present and active.
    82          */
     68        /** Device present and active. */
    8369        NETIF_ACTIVE,
    84         /** Device present but unable to transmit.
    85          */
     70        /** Device present but unable to transmit. */
    8671        NETIF_CARRIER_LOST
    8772};
    8873
    89 /** Device usage statistics.
    90  */
    91 struct  device_stats{
    92         /** Total packets received.
    93          */
     74/** Device usage statistics. */
     75struct device_stats {
     76        /** Total packets received. */
    9477        unsigned long receive_packets;
    95         /** Total packets transmitted.
    96          */
     78        /** Total packets transmitted. */
    9779        unsigned long send_packets;
    98         /** Total bytes received.
    99          */
     80        /** Total bytes received. */
    10081        unsigned long receive_bytes;
    101         /** Total bytes transmitted.
    102          */
     82        /** Total bytes transmitted. */
    10383        unsigned long send_bytes;
    104         /** Bad packets received counter.
    105          */
     84        /** Bad packets received counter. */
    10685        unsigned long receive_errors;
    107         /** Packet transmition problems counter.
    108          */
     86        /** Packet transmition problems counter. */
    10987        unsigned long send_errors;
    110         /** No space in buffers counter.
    111          */
     88        /** No space in buffers counter. */
    11289        unsigned long receive_dropped;
    113         /** No space available counter.
    114          */
     90        /** No space available counter. */
    11591        unsigned long send_dropped;
    116         /** Total multicast packets received.
    117          */
     92        /** Total multicast packets received. */
    11893        unsigned long multicast;
    119         /** The number of collisions due to congestion on the medium.
    120          */
     94        /** The number of collisions due to congestion on the medium. */
    12195        unsigned long collisions;
    12296
    123         /* detailed receive_errors: */
    124         /** Received packet length error counter.
    125         */
     97        /* detailed receive_errors */
     98
     99        /** Received packet length error counter. */
    126100        unsigned long receive_length_errors;
    127         /** Receiver buffer overflow counter.
    128          */
     101        /** Receiver buffer overflow counter. */
    129102        unsigned long receive_over_errors;
    130         /** Received packet with crc error counter.
    131          */
     103        /** Received packet with crc error counter. */
    132104        unsigned long receive_crc_errors;
    133         /** Received frame alignment error counter.
    134          */
     105        /** Received frame alignment error counter. */
    135106        unsigned long receive_frame_errors;
    136         /** Receiver fifo overrun counter.
    137          */
     107        /** Receiver fifo overrun counter. */
    138108        unsigned long receive_fifo_errors;
    139         /** Receiver missed packet counter.
    140          */
     109        /** Receiver missed packet counter. */
    141110        unsigned long receive_missed_errors;
    142111
    143112        /* detailed send_errors */
    144         /** Transmitter aborted counter.
    145         */
     113
     114        /** Transmitter aborted counter. */
    146115        unsigned long send_aborted_errors;
    147         /** Transmitter carrier errors counter.
    148          */
     116        /** Transmitter carrier errors counter. */
    149117        unsigned long send_carrier_errors;
    150         /** Transmitter fifo overrun counter.
    151          */
     118        /** Transmitter fifo overrun counter. */
    152119        unsigned long send_fifo_errors;
    153         /** Transmitter carrier errors counter.
    154          */
     120        /** Transmitter carrier errors counter. */
    155121        unsigned long send_heartbeat_errors;
    156         /** Transmitter window errors counter.
    157          */
     122        /** Transmitter window errors counter. */
    158123        unsigned long send_window_errors;
    159124
    160125        /* for cslip etc */
    161         /** Total compressed packets received.
    162         */
     126       
     127        /** Total compressed packets received. */
    163128        unsigned long receive_compressed;
    164         /** Total compressed packet transmitted.
    165          */
     129        /** Total compressed packet transmitted. */
    166130        unsigned long send_compressed;
    167131};
    … …  
    171135/** @}
    172136 */
    173 

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup icmp
     29/** @addtogroup libc
    3030 *  @{
    3131 */
    3232
    3333/** @file
    34  *  ICMP types and codes according to the on-line IANA - ICMP Type Numbers - <http://http://www.iana.org/assignments/icmp-parameters>, cited September 14 2009.
    35  */
    36 
    37 #ifndef __NET_ICMP_CODES_H__
    38 #define __NET_ICMP_CODES_H__
    39 
    40 /** ICMP type type definition.
    41  */
    42 typedef uint8_t icmp_type_t;
    43 
    44 /** ICMP code type definition.
    45  */
    46 typedef uint8_t icmp_code_t;
    47 
    48 /** ICMP parameter type definition.
    49  */
    50 typedef uint16_t        icmp_param_t;
    51 
    52 /** @name ICMP types definitions
    53  */
    54 /*@{*/
    55 
    56 /** Echo Reply.
    57  */
     34 * ICMP types and codes according to the on-line IANA - ICMP Type Numbers
     35 *
     36 * http://www.iana.org/assignments/icmp-parameters>
     37 *
     38 * cited September 14 2009.
     39 */
     40
     41#ifndef LIBC_ICMP_CODES_H_
     42#define LIBC_ICMP_CODES_H_
     43
     44#include <sys/types.h>
     45
     46/** ICMP type type definition. */
     47typedef uint8_t icmp_type_t;
     48
     49/** ICMP code type definition. */
     50typedef uint8_t icmp_code_t;
     51
     52/** ICMP parameter type definition. */
     53typedef uint16_t icmp_param_t;
     54
     55/** @name ICMP types definitions */
     56/*@{*/
     57
     58/** Echo Reply. */
    5859#define ICMP_ECHOREPLY          0
    5960
    60 /** Destination Unreachable.
    61  */
     61/** Destination Unreachable. */
    6262#define ICMP_DEST_UNREACH       3
    6363
    64 /** Source Quench.
    65  */
     64/** Source Quench. */
    6665#define ICMP_SOURCE_QUENCH      4
    6766
    68 /** Redirect.
    69  */
     67/** Redirect. */
    7068#define ICMP_REDIRECT           5
    7169
    72 /** Alternate Host Address.
    73  */
     70/** Alternate Host Address. */
    7471#define ICMP_ALTERNATE_ADDR     6
    7572
    76 /** Echo Request.
    77  */
    78 #define ICMP_ECHO                       8
    79 
    80 /** Router Advertisement.
    81  */
     73/** Echo Request. */
     74#define ICMP_ECHO               8
     75
     76/** Router Advertisement. */
    8277#define ICMP_ROUTER_ADV         9
    8378
    84 /** Router solicitation.
    85  */
     79/** Router solicitation. */
    8680#define ICMP_ROUTER_SOL         10
    8781
    88 /** Time Exceeded.
    89  */
     82/** Time Exceeded. */
    9083#define ICMP_TIME_EXCEEDED      11
    9184
    92 /** Parameter Problem.
    93  */
     85/** Parameter Problem. */
    9486#define ICMP_PARAMETERPROB      12
    9587
    96 /** Timestamp Request.
    97  */
     88/** Timestamp Request. */
    9889#define ICMP_TIMESTAMP          13
    9990
    100 /** Timestamp Reply.
    101  */
     91/** Timestamp Reply. */
    10292#define ICMP_TIMESTAMPREPLY     14
    10393
    104 /** Information Request.
    105  */
     94/** Information Request. */
    10695#define ICMP_INFO_REQUEST       15
    10796
    108 /** Information Reply.
    109  */
     97/** Information Reply. */
    11098#define ICMP_INFO_REPLY         16
    11199
    112 /** Address Mask Request.
    113  */
     100/** Address Mask Request. */
    114101#define ICMP_ADDRESS            17
    115102
    116 /** Address Mask Reply.
    117  */
     103/** Address Mask Reply. */
    118104#define ICMP_ADDRESSREPLY       18
    119105
    120 /** Traceroute.
    121  */
     106/** Traceroute. */
    122107#define ICMP_TRACEROUTE         30
    123108
    124 /** Datagram Conversion Error.
    125  */
     109/** Datagram Conversion Error. */
    126110#define ICMP_CONVERSION_ERROR   31
    127111
    128 /** Mobile Host Redirect.
    129  */
     112/** Mobile Host Redirect. */
    130113#define ICMP_REDIRECT_MOBILE    32
    131114
    132 /** IPv6 Where-Are-You.
    133  */
     115/** IPv6 Where-Are-You. */
    134116#define ICMP_IPV6_WHERE_ARE_YOU 33
    135117
    136 /** IPv6 I-Am-Here.
    137  */
     118/** IPv6 I-Am-Here. */
    138119#define ICMP_IPV6_I_AM_HERE     34
    139120
    140 /** Mobile Registration Request.
    141  */
     121/** Mobile Registration Request. */
    142122#define ICMP_MOBILE_REQUEST     35
    143123
    144 /** Mobile Registration Reply.
    145  */
     124/** Mobile Registration Reply. */
    146125#define ICMP_MOBILE_REPLY       36
    147126
    148 /** Domain name request.
    149  */
     127/** Domain name request. */
    150128#define ICMP_DN_REQUEST         37
    151129
    152 /** Domain name reply.
    153  */
     130/** Domain name reply. */
    154131#define ICMP_DN_REPLY           38
    155132
    156 /** SKIP.
    157  */
    158 #define ICMP_SKIP                       39
    159 
    160 /** Photuris.
    161  */
     133/** SKIP. */
     134#define ICMP_SKIP               39
     135
     136/** Photuris. */
    162137#define ICMP_PHOTURIS           40
    163138
    … …  
    168143/*@{*/
    169144
    170 /** Network Unreachable.
    171  */
     145/** Network Unreachable. */
    172146#define ICMP_NET_UNREACH        0
    173147
    174 /** Host Unreachable.
    175  */
     148/** Host Unreachable. */
    176149#define ICMP_HOST_UNREACH       1
    177150
    178 /** Protocol Unreachable.
    179  */
     151/** Protocol Unreachable. */
    180152#define ICMP_PROT_UNREACH       2
    181153
    182 /** Port Unreachable.
    183  */
     154/** Port Unreachable. */
    184155#define ICMP_PORT_UNREACH       3
    185156
    186 /** Fragmentation needed but the Do Not Fragment bit was set.
    187  */
     157/** Fragmentation needed but the Do Not Fragment bit was set. */
    188158#define ICMP_FRAG_NEEDED        4
    189159
    190 /** Source Route failed.
    191  */
     160/** Source Route failed. */
    192161#define ICMP_SR_FAILED          5
    193162
    194 /** Destination network unknown.
    195  */
     163/** Destination network unknown. */
    196164#define ICMP_NET_UNKNOWN        6
    197165
    198 /** Destination host unknown.
    199  */
     166/** Destination host unknown. */
    200167#define ICMP_HOST_UNKNOWN       7
    201168
    202 /** Source host isolated (obsolete).
    203  */
     169/** Source host isolated (obsolete). */
    204170#define ICMP_HOST_ISOLATED      8
    205171
    206 /** Destination network administratively prohibited.
    207  */
     172/** Destination network administratively prohibited. */
    208173#define ICMP_NET_ANO            9
    209174
    210 /** Destination host administratively prohibited.
    211  */
     175/** Destination host administratively prohibited. */
    212176#define ICMP_HOST_ANO           10
    213177
    214 /** Network unreachable for this type of service.
    215  */
     178/** Network unreachable for this type of service. */
    216179#define ICMP_NET_UNR_TOS        11
    217180
    218 /** Host unreachable for this type of service.
    219  */
     181/** Host unreachable for this type of service. */
    220182#define ICMP_HOST_UNR_TOS       12
    221183
    222 /** Communication administratively prohibited by filtering.
    223  */
     184/** Communication administratively prohibited by filtering. */
    224185#define ICMP_PKT_FILTERED       13
    225186
    226 /** Host precedence violation.
    227  */
     187/** Host precedence violation. */
    228188#define ICMP_PREC_VIOLATION     14
    229189
    230 /** Precedence cutoff in effect.
    231  */
     190/** Precedence cutoff in effect. */
    232191#define ICMP_PREC_CUTOFF        15
    233192
    234193/*@}*/
    235194
    236 /** @name ICMP_REDIRECT codes definitions
    237  */
    238 /*@{*/
    239 
    240 /** Network redirect (or subnet).
    241  */
     195/** @name ICMP_REDIRECT codes definitions */
     196/*@{*/
     197
     198/** Network redirect (or subnet). */
    242199#define ICMP_REDIR_NET          0
    243200
    244 /** Host redirect.
    245  */
     201/** Host redirect. */
    246202#define ICMP_REDIR_HOST         1
    247203
    248 /** Network redirect for this type of service.
    249  */
     204/** Network redirect for this type of service. */
    250205#define ICMP_REDIR_NETTOS       2
    251206
    252 /** Host redirect for this type of service.
    253  */
     207/** Host redirect for this type of service. */
    254208#define ICMP_REDIR_HOSTTOS      3
    255209
    256210/*@}*/
    257211
    258 /** @name ICMP_ALTERNATE_ADDRESS codes definitions
    259  */
    260 /*@{*/
    261 
    262 /** Alternate address for host.
    263  */
     212/** @name ICMP_ALTERNATE_ADDRESS codes definitions */
     213/*@{*/
     214
     215/** Alternate address for host. */
    264216#define ICMP_ALTERNATE_HOST     0
    265217
    266218/*@}*/
    267219
    268 /** @name ICMP_ROUTER_ADV codes definitions
    269  */
    270 /*@{*/
    271 
    272 /** Normal router advertisement.
    273  */
     220/** @name ICMP_ROUTER_ADV codes definitions */
     221/*@{*/
     222
     223/** Normal router advertisement. */
    274224#define ICMP_ROUTER_NORMAL      0
    275225
    276 /** Does not route common traffic.
    277  */
     226/** Does not route common traffic. */
    278227#define ICMP_ROUTER_NO_NORMAL_TRAFFIC   16
    279228
    280229/*@}*/
    281230
    282 /** @name ICMP_TIME_EXCEEDED codes definitions
    283  */
    284 /*@{*/
    285 
    286 /** Transit TTL exceeded.
    287  */
     231/** @name ICMP_TIME_EXCEEDED codes definitions */
     232/*@{*/
     233
     234/** Transit TTL exceeded. */
    288235#define ICMP_EXC_TTL            0
    289236
    290 /** Reassembly TTL exceeded.
    291  */
     237/** Reassembly TTL exceeded. */
    292238#define ICMP_EXC_FRAGTIME       1
    293239
    294240/*@}*/
    295241
    296 /** @name ICMP_PARAMETERPROB codes definitions
    297  */
    298 /*@{*/
    299 
    300 /** Pointer indicates the error.
    301  */
     242/** @name ICMP_PARAMETERPROB codes definitions */
     243/*@{*/
     244
     245/** Pointer indicates the error. */
    302246#define ICMP_PARAM_POINTER      0
    303247
    304 /** Missing required option.
    305  */
     248/** Missing required option. */
    306249#define ICMP_PARAM_MISSING      1
    307250
    308 /** Bad length.
    309  */
     251/** Bad length. */
    310252#define ICMP_PARAM_LENGTH       2
    311253
    312254/*@}*/
    313255
    314 /** @name ICMP_PHOTURIS codes definitions
    315  */
    316 /*@{*/
    317 
    318 /** Bad SPI.
    319  */
    320 #define ICMP_PHOTURIS_BAD_SPI   0
    321 
    322 /** Authentication failed.
    323  */
    324 #define ICMP_PHOTURIS_AUTHENTICATION    1
    325 
    326 /** Decompression failed.
    327  */
     256/** @name ICMP_PHOTURIS codes definitions */
     257/*@{*/
     258
     259/** Bad SPI. */
     260#define ICMP_PHOTURIS_BAD_SPI                   0
     261
     262/** Authentication failed. */
     263#define ICMP_PHOTURIS_AUTHENTICATION            1
     264
     265/** Decompression failed. */
    328266#define ICMP_PHOTURIS_DECOMPRESSION             2
    329267
    330 /** Decryption failed.
    331  */
    332 #define ICMP_PHOTURIS_DECRYPTION        3
    333 
    334 /** Need authentication.
    335  */
     268/** Decryption failed. */
     269#define ICMP_PHOTURIS_DECRYPTION                3
     270
     271/** Need authentication. */
    336272#define ICMP_PHOTURIS_NEED_AUTHENTICATION       4
    337273
    338 /** Need authorization.
    339  */
     274/** Need authorization. */
    340275#define ICMP_PHOTURIS_NEED_AUTHORIZATION        5
    341276

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup net
     29/** @addtogroup libc
    3030 *  @{
    3131 */
    … …  
    3535 */
    3636
    37 #ifndef __NET_IN_H__
    38 #define __NET_IN_H__
     37#ifndef LIBC_IN_H_
     38#define LIBC_IN_H_
    3939
     40#include <net/inet.h>
     41#include <net/ip_protocols.h>
    4042#include <sys/types.h>
    4143
    42 #include <ip_protocols.h>
    43 #include <inet.h>
    44 
    45 /** INET string address maximum length.
    46  */
     44/** INET string address maximum length. */
    4745#define INET_ADDRSTRLEN         (4 * 3 + 3 + 1)
    4846
    4947/** Type definition of the INET address.
    50  *  @see in_addr
     48 * @see in_addr
    5149 */
    5250typedef struct in_addr          in_addr_t;
    5351
    5452/** Type definition of the INET socket address.
    55  *  @see sockaddr_in
     53 * @see sockaddr_in
    5654 */
    5755typedef struct sockaddr_in      sockaddr_in_t;
    5856
    59 /** INET address.
    60  */
    61 struct in_addr{
    62         /** 4 byte IP address.
    63          */
     57/** INET address. */
     58struct in_addr {
     59        /** 4 byte IP address. */
    6460        uint32_t s_addr;
    6561};
    6662
    6763/** INET socket address.
    68  *  @see sockaddr
     64 * @see sockaddr
    6965 */
    70 struct sockaddr_in{
    71         /** Address family.
    72          *  Should be AF_INET.
    73          */
     66struct sockaddr_in {
     67        /** Address family. Should be AF_INET. */
    7468        uint16_t sin_family;
    75         /** Port number.
    76          */
     69        /** Port number. */
    7770        uint16_t sin_port;
    78         /** Internet address.
    79          */
     71        /** Internet address. */
    8072        struct in_addr sin_addr;
    81         /** Padding to meet the sockaddr size.
    82          */
     73        /** Padding to meet the sockaddr size. */
    8374        uint8_t sin_zero[8];
    8475};

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup net
     29/** @addtogroup libc
    3030 *  @{
    3131 */
    … …  
    3535 */
    3636
    37 #ifndef __NET_IN6_H__
    38 #define __NET_IN6_H__
     37#ifndef LIBC_IN6_H_
     38#define LIBC_IN6_H_
    3939
     40#include <net/inet.h>
     41#include <net/ip_protocols.h>
    4042#include <sys/types.h>
    4143
    42 #include <ip_protocols.h>
    43 #include <inet.h>
    44 
    45 /** INET6 string address maximum length.
    46  */
     44/** INET6 string address maximum length. */
    4745#define INET6_ADDRSTRLEN        (8 * 4 + 7 + 1)
    4846
    4947/** Type definition of the INET6 address.
    50  *  @see in6_addr
     48 * @see in6_addr
    5149 */
    5250typedef struct in6_addr in6_addr_t;
    5351
    5452/** Type definition of the INET6 socket address.
    55  *  @see sockaddr_in6
     53 * @see sockaddr_in6
    5654 */
    5755typedef struct sockaddr_in6     sockaddr_in6_t;
    5856
    59 /** INET6 address.
    60  */
    61 struct in6_addr{
    62         /** 16 byte IPv6 address.
    63          */
     57/** INET6 address. */
     58struct in6_addr {
     59        /** 16 byte IPv6 address. */
    6460        unsigned char s6_addr[16];
    6561};
    6662
    6763/** INET6 socket address.
    68  *  @see sockaddr
     64 * @see sockaddr
    6965 */
    70 struct sockaddr_in6{
    71         /** Address family.
    72          *  Should be AF_INET6.
    73          */
     66struct sockaddr_in6 {
     67        /** Address family. Should be AF_INET6. */
    7468        uint16_t sin6_family;
    75         /** Port number.
    76          */
     69        /** Port number. */
    7770        uint16_t sin6_port;
    78         /** IPv6 flow information.
    79          */
     71        /** IPv6 flow information. */
    8072        uint32_t sin6_flowinfo;
    81         /** IPv6 address.
    82          */
     73        /** IPv6 address. */
    8374        struct in6_addr sin6_addr;
    84         /** Scope identifier.
    85          */
     75        /** Scope identifier. */
    8676        uint32_t sin6_scope_id;
    8777};

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup icmp
     29/** @addtogroup libc
    3030 *  @{
    3131 */
    3232
    3333/** @file
    34  *  ICMP module common interface.
     34 *  Internet common definitions.
    3535 */
    3636
    37 #ifndef __NET_ICMP_COMMON_H__
    38 #define __NET_ICMP_COMMON_H__
     37#ifndef LIBC_INET_H_
     38#define LIBC_INET_H_
    3939
    40 #include <ipc/services.h>
     40#include <sys/types.h>
     41#include <byteorder.h>
    4142
    42 #include <sys/time.h>
     43/** Type definition of the socket address.
     44 * @see sockaddr
     45 */
     46typedef struct sockaddr         sockaddr_t;
    4347
    44 /** Default timeout for incoming connections in microseconds.
     48/** Type definition of the address information.
     49 * @see addrinfo
    4550 */
    46 #define ICMP_CONNECT_TIMEOUT    (1 * 1000 * 1000)
     51typedef struct addrinfo         addrinfo_t;
    4752
    48 /** Connects to the ICMP module.
    49  *  @param service The ICMP module service. Ignored parameter.
    50  *  @param[in] timeout The connection timeout in microseconds. No timeout if set to zero (0).
    51  *  @returns The ICMP module phone on success.
    52  *  @returns The ICMP socket identifier if called by the bundle module.
    53  *  @returns ETIMEOUT if the connection timeouted.
    54  */
    55 extern int icmp_connect_module(services_t service, suseconds_t timeout);
     53/** Socket address. */
     54struct sockaddr {
     55        /** Address family. @see socket.h */
     56        uint16_t sa_family;
     57        /** 14 byte protocol address. */
     58        uint8_t sa_data[14];
     59};
     60
     61extern int inet_ntop(uint16_t, const uint8_t *, char *, size_t);
     62extern int inet_pton(uint16_t, const char *, uint8_t *);
    5663
    5764#endif

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup packet
     29/** @addtogroup libc
    3030 *  @{
    3131 */
    3232
    3333/** @file
    34  *  Packet header.
     34 * Packet header.
    3535 */
    3636
    37 #ifndef __NET_PACKET_HEADER_H__
    38 #define __NET_PACKET_HEADER_H__
     37#ifndef LIBC_PACKET_HEADER_H_
     38#define LIBC_PACKET_HEADER_H_
    3939
    40 #include <packet/packet.h>
     40#include <net/packet.h>
    4141
    4242/** Returns the actual packet data length.
    43  *  @param[in] header The packet header.
     43 * @param[in] header    The packet header.
    4444 */
    45 #define PACKET_DATA_LENGTH(header)              ((header)->data_end - (header)->data_start)
     45#define PACKET_DATA_LENGTH(header) \
     46        ((header)->data_end - (header)->data_start)
    4647
    4748/** Returns the maximum packet address length.
    48  *  @param[in] header The packet header.
     49 * @param[in] header    The packet header.
    4950 */
    50 #define PACKET_MAX_ADDRESS_LENGTH(header)               ((header)->dest_addr - (header)->src_addr)
     51#define PACKET_MAX_ADDRESS_LENGTH(header) \
     52        ((header)->dest_addr - (header)->src_addr)
    5153
    5254/** Returns the minimum packet suffix.
    53  *  @param[in] header The packet header.
     55 *  @param[in] header   The packet header.
    5456 */
    55 #define PACKET_MIN_SUFFIX(header)               ((header)->length - (header)->data_start - (header)->max_content)
     57#define PACKET_MIN_SUFFIX(header) \
     58        ((header)->length - (header)->data_start - (header)->max_content)
    5659
    57 /** Packet integrity check magic value.
    58  */
     60/** Packet integrity check magic value. */
    5961#define PACKET_MAGIC_VALUE      0x11227788
    6062
    61 /** Packet header.
    62  */
    63 struct packet{
    64         /** Packet identifier.
    65          */
     63/** Packet header. */
     64struct packet {
     65        /** Packet identifier. */
    6666        packet_id_t packet_id;
    67         /** Packet queue sorting value.
    68          *  The packet queue is sorted the ascending order.
     67
     68        /**
     69         * Packet queue sorting value.
     70         * The packet queue is sorted the ascending order.
    6971         */
    7072        size_t order;
    71         /** Packet metric.
    72         */
     73
     74        /** Packet metric. */
    7375        size_t metric;
    74         /** Previous packet in the queue.
    75          */
     76        /** Previous packet in the queue. */
    7677        packet_id_t previous;
    77         /** Next packet in the queue.
    78          */
     78        /** Next packet in the queue. */
    7979        packet_id_t next;
    80         /** Total length of the packet.
    81          *  Contains the header, the addresses and the data of the packet.
    82          *  Corresponds to the mapped sharable memory block.
     80
     81        /**
     82         * Total length of the packet.
     83         * Contains the header, the addresses and the data of the packet.
     84         * Corresponds to the mapped sharable memory block.
    8385         */
    8486        size_t length;
    85         /** Stored source and destination addresses length.
    86         */
     87
     88        /** Stored source and destination addresses length. */
    8789        size_t addr_len;
    88         /** Souce address offset in bytes from the beginning of the packet header.
     90
     91        /**
     92         * Souce address offset in bytes from the beginning of the packet
     93         * header.
    8994         */
    9095        size_t src_addr;
    91         /** Destination address offset in bytes from the beginning of the packet header.
     96
     97        /**
     98         * Destination address offset in bytes from the beginning of the packet
     99         * header.
    92100         */
    93101        size_t dest_addr;
    94         /** Reserved data prefix length in bytes.
    95         */
     102
     103        /** Reserved data prefix length in bytes. */
    96104        size_t max_prefix;
    97         /** Reserved content length in bytes.
    98          */
     105        /** Reserved content length in bytes. */
    99106        size_t max_content;
    100         /** Actual data start offset in bytes from the beginning of the packet header.
     107
     108        /**
     109         * Actual data start offset in bytes from the beginning of the packet
     110         * header.
    101111         */
    102112        size_t data_start;
    103         /** Actual data end offset in bytes from the beginning of the packet header.
     113
     114        /**
     115         * Actual data end offset in bytes from the beginning of the packet
     116         * header.
    104117         */
    105118        size_t data_end;
    106         /** Integrity check magic value.
    107         */
     119
     120        /** Integrity check magic value. */
    108121        int magic_value;
    109122};
    110123
    111124/** Returns whether the packet is valid.
    112  *  @param[in] packet The packet to be checked.
    113  *  @returns true if the packet is not NULL and the magic value is correct.
    114  *  @returns false otherwise.
     125 * @param[in] packet    The packet to be checked.
     126 * @return              True if the packet is not NULL and the magic value is
     127 *                      correct.
     128 * @return              False otherwise.
    115129 */
    116 static inline int packet_is_valid(const packet_t packet){
     130static inline int packet_is_valid(const packet_t *packet)
     131{
    117132        return packet && (packet->magic_value == PACKET_MAGIC_VALUE);
    118133}

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

    r9a1d8ab r0b749a3  
    4646#define BUFSIZ  4096
    4747
    48 #define DEBUG(fmt, ...)se\
     48#define DEBUG(fmt, ...) \
    4949        { \
    5050                char _buf[256]; \

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

    r9a1d8ab r0b749a3  
    4343struct stat {
    4444        fs_handle_t fs_handle;
    45         dev_handle_t dev_handle;
     45        devmap_handle_t devmap_handle;
    4646        fs_index_t index;
    4747        unsigned int lnkcnt;
    … …  
    4949        bool is_directory;
    5050        aoff64_t size;
    51         dev_handle_t device;
     51        devmap_handle_t device;
    5252};
    5353

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

    r9a1d8ab r0b749a3  
    4343typedef long suseconds_t;
    4444
     45typedef uint32_t useconds_t;
     46typedef uint32_t mseconds_t;
     47
    4548struct timeval {
    4649        time_t tv_sec;        /* seconds */

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

    r9a1d8ab r0b749a3  
    4848extern int task_set_name(const char *);
    4949extern task_id_t task_spawn(const char *, const char *const[], int *);
     50extern int task_spawnv(task_id_t *, const char *path, const char *const []);
     51extern int task_spawnl(task_id_t *, const char *path, ...);
     52
    5053extern int task_wait(task_id_t id, task_exit_t *, int *);
    5154extern int task_retval(int);

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

    r9a1d8ab r0b749a3  
    3737
    3838#include <sys/types.h>
     39#include <time.h>
    3940#include <libarch/config.h>
    4041
    4142#ifndef NULL
    42         #define NULL  0
     43        #define NULL    ((void *) 0)
    4344#endif
    4445
    … …  
    5657        #define SEEK_END  2
    5758#endif
    58 
    59 typedef uint32_t useconds_t;
    6059
    6160extern int dup2(int oldfd, int newfd);

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

    r9a1d8ab r0b749a3  
    4747typedef struct {
    4848        fs_handle_t fs_handle;
    49         dev_handle_t dev_handle;
     49        devmap_handle_t devmap_handle;
    5050        fs_index_t index;
    5151} fdi_node_t;
Note: See TracChangeset for help on using the changeset viewer.