Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/messages.h

    r3db8889 r02d9fec  
    236236 *  @param[in] call The IPC call to be checked.
    237237 */
    238 #define IS_NET_MESSAGE(call) \
    239         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_FIRST, NET_LAST)
     238#define IS_NET_MESSAGE(call)                    IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_FIRST, NET_LAST)
    240239
    241240/** Returns a value indicating whether the IPC call is an ARP message.
    242241 *  @param[in] call The IPC call to be checked.
    243242 */
    244 #define IS_NET_ARP_MESSAGE(call) \
    245         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ARP_FIRST, NET_ARP_LAST)
     243#define IS_NET_ARP_MESSAGE(call)                IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ARP_FIRST, NET_ARP_LAST)
    246244
    247245/** Returns a value indicating whether the IPC call is an Ethernet message.
    248246 *  @param[in] call The IPC call to be checked.
    249247 */
    250 #define IS_NET_ETH_MESSAGE(call) \
    251         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ETH_FIRST, NET_ETH_LAST)
     248#define IS_NET_ETH_MESSAGE(call)                IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ETH_FIRST, NET_ETH_LAST)
    252249
    253250/** Returns a value indicating whether the IPC call is an ICMP message.
    254251 *  @param[in] call The IPC call to be checked.
    255252 */
    256 #define IS_NET_ICMP_MESSAGE(call) \
    257         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ICMP_FIRST, NET_ICMP_LAST)
     253#define IS_NET_ICMP_MESSAGE(call)               IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ICMP_FIRST, NET_ICMP_LAST)
    258254
    259255/** Returns a value indicating whether the IPC call is an inter-network layer message.
    260256 *  @param[in] call The IPC call to be checked.
    261257 */
    262 #define IS_NET_IL_MESSAGE(call) \
    263         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_IL_FIRST, NET_IL_LAST)
     258#define IS_NET_IL_MESSAGE(call)         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_IL_FIRST, NET_IL_LAST)
    264259
    265260/** Returns a value indicating whether the IPC call is an IP message.
    266261 *  @param[in] call The IPC call to be checked.
    267262 */
    268 #define IS_NET_IP_MESSAGE(call) \
    269         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_IP_FIRST, NET_IP_LAST)
     263#define IS_NET_IP_MESSAGE(call)         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_IP_FIRST, NET_IP_LAST)
    270264
    271265/** Returns a value indicating whether the IPC call is a generic networking message.
    272266 *  @param[in] call The IPC call to be checked.
    273267 */
    274 #define IS_NET_NET_MESSAGE(call) \
    275         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_NET_FIRST, NET_NET_LAST)
     268#define IS_NET_NET_MESSAGE(call)                IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_NET_FIRST, NET_NET_LAST)
    276269
    277270/** Returns a value indicating whether the IPC call is a network interface layer message.
    278271 *  @param[in] call The IPC call to be checked.
    279272 */
    280 #define IS_NET_NIL_MESSAGE(call) \
    281         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_NIL_FIRST, NET_NIL_LAST)
     273#define IS_NET_NIL_MESSAGE(call)                IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_NIL_FIRST, NET_NIL_LAST)
    282274
    283275/** Returns a value indicating whether the IPC call is a packet manaagement system message.
    284276 *  @param[in] call The IPC call to be checked.
    285277 */
    286 #define IS_NET_PACKET_MESSAGE(call) \
    287         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_PACKET_FIRST, NET_PACKET_LAST)
     278#define IS_NET_PACKET_MESSAGE(call)     IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_PACKET_FIRST, NET_PACKET_LAST)
    288279
    289280/** Returns a value indicating whether the IPC call is a socket message.
    290281 *  @param[in] call The IPC call to be checked.
    291282 */
    292 #define IS_NET_SOCKET_MESSAGE(call) \
    293         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_SOCKET_FIRST, NET_SOCKET_LAST)
     283#define IS_NET_SOCKET_MESSAGE(call)     IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_SOCKET_FIRST, NET_SOCKET_LAST)
    294284
    295285/** Returns a value indicating whether the IPC call is a TCP message.
    296286 *  @param[in] call The IPC call to be checked.
    297287 */
    298 #define IS_NET_TCP_MESSAGE(call) \
    299         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_TCP_FIRST, NET_TCP_LAST)
     288#define IS_NET_TCP_MESSAGE(call)                IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_TCP_FIRST, NET_TCP_LAST)
    300289
    301290/** Returns a value indicating whether the IPC call is a transport layer message.
    302291 *  @param[in] call The IPC call to be checked.
    303292 */
    304 #define IS_NET_TL_MESSAGE(call) \
    305         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_TL_FIRST, NET_TL_LAST)
     293#define IS_NET_TL_MESSAGE(call)         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_TL_FIRST, NET_TL_LAST)
    306294
    307295/** Returns a value indicating whether the IPC call is a UDP message.
    308296 *  @param[in] call The IPC call to be checked.
    309297 */
    310 #define IS_NET_UDP_MESSAGE(call) \
    311         IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_UDP_FIRST, NET_UDP_LAST)
     298#define IS_NET_UDP_MESSAGE(call)                IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_UDP_FIRST, NET_UDP_LAST)
    312299
    313300/*@}*/
    … …  
    324311 *  @param[in] call The message call structure.
    325312 */
    326 #define IPC_GET_DEVICE(call) \
    327         ({device_id_t device_id = (device_id_t) IPC_GET_ARG1(*call); device_id;})
    328 
    329 /*@;})*/
     313#define IPC_GET_DEVICE(call)            (device_id_t) IPC_GET_ARG1(*call)
     314
     315/*@}*/
    330316
    331317/** @name Second arguments
    332318 */
    333 /*@({*/
     319/*@{*/
    334320
    335321/** Returns the packet identifier message argument.
    336322 *  @param[in] call The message call structure.
    337323 */
    338 #define IPC_GET_PACKET(call) \
    339         ({packet_id_t packet_id = (packet_id_t) IPC_GET_ARG2(*call); packet_id;})
     324#define IPC_GET_PACKET(call)            (packet_id_t) IPC_GET_ARG2(*call)
    340325
    341326/** Returns the count message argument.
    342327 *  @param[in] call The message call structure.
    343328 */
    344 #define IPC_GET_COUNT(call) \
    345         ({size_t size = (size_t) IPC_GET_ARG2(*call); size;})
     329#define IPC_GET_COUNT(call)             (size_t) IPC_GET_ARG2(*call)
    346330
    347331/** Returns the device state message argument.
    348332 *  @param[in] call The message call structure.
    349333 */
    350 #define IPC_GET_STATE(call) \
    351         ({device_state_t device_state = (device_state_t) IPC_GET_ARG2(*call); device_state;})
     334#define IPC_GET_STATE(call)             (device_state_t) IPC_GET_ARG2(*call)
    352335
    353336/** Returns the maximum transmission unit message argument.
    354337 *  @param[in] call The message call structure.
    355338 */
    356 #define IPC_GET_MTU(call) \
    357         ({size_t size = (size_t) IPC_GET_ARG2(*call); size;})
    358 
    359 /*@;})*/
     339#define IPC_GET_MTU(call)                       (size_t) IPC_GET_ARG2(*call)
     340
     341/*@}*/
    360342
    361343/** @name Third arguments
    362344 */
    363 /*@({*/
     345/*@{*/
    364346
    365347/** Returns the device driver service message argument.
    366348 *  @param[in] call The message call structure.
    367349 */
    368  #define IPC_GET_SERVICE(call) \
    369         ({services_t service = (services_t) IPC_GET_ARG3(*call); service;})
     350#define IPC_GET_SERVICE(call)           (services_t) IPC_GET_ARG3(*call)
    370351
    371352/** Returns the target service message argument.
    372353 *  @param[in] call The message call structure.
    373354 */
    374 #define IPC_GET_TARGET(call) \
    375         ({services_t service = (services_t) IPC_GET_ARG3(*call); service;})
     355#define IPC_GET_TARGET(call)            (services_t) IPC_GET_ARG3(*call)
    376356
    377357/** Returns the sender service message argument.
    378358 *  @param[in] call The message call structure.
    379359 */
    380 #define IPC_GET_SENDER(call) \
    381         ({services_t service = (services_t) IPC_GET_ARG3(*call); service;})
    382 
    383 /*@;})*/
     360#define IPC_GET_SENDER(call)            (services_t) IPC_GET_ARG3(*call)
     361
     362/*@}*/
    384363
    385364/** @name Fourth arguments
    386365 */
    387 /*@({*/
     366/*@{*/
    388367
    389368/** Returns the error service message argument.
    390369 *  @param[in] call The message call structure.
    391370 */
    392 #define IPC_GET_ERROR(call) \
    393         ({services_t service = (services_t) IPC_GET_ARG4(*call); service;})
    394 
    395 /*@;})*/
     371#define IPC_GET_ERROR(call)             (services_t) IPC_GET_ARG4(*call)
     372
     373/*@}*/
    396374
    397375/** @name Fifth arguments
    398376 */
    399 /*@({*/
     377/*@{*/
    400378
    401379/** Returns the phone message argument.
    402380 *  @param[in] call The message call structure.
    403381 */
    404 #define IPC_GET_PHONE(call) \
    405         ({int phone = (int) IPC_GET_ARG5(*call); phone;})
     382#define IPC_GET_PHONE(call)             (int) IPC_GET_ARG5(*call)
    406383
    407384/*@}*/
    … …  
    414391 *  @param[out] answer The message answer structure.
    415392 */
    416 #define IPC_SET_DEVICE(answer, value) \
    417         {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG1(*answer, argument);}
     393#define IPC_SET_DEVICE(answer)  (&IPC_GET_ARG1(*answer))
    418394
    419395/** Sets the minimum address length in the message answer.
    420396 *  @param[out] answer The message answer structure.
    421397 */
    422 #define IPC_SET_ADDR(answer, value) \
    423         {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG1(*answer, argument);}
     398#define IPC_SET_ADDR(answer)            (&IPC_GET_ARG1(*answer))
    424399
    425400/*@}*/
    … …  
    432407 *  @param[out] answer The message answer structure.
    433408 */
    434 #define IPC_SET_PREFIX(answer, value) \
    435         {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG2(*answer, argument);}
     409#define IPC_SET_PREFIX(answer)  (&IPC_GET_ARG2(*answer))
    436410
    437411/*@}*/
    … …  
    444418 *  @param[out] answer The message answer structure.
    445419 */
    446 #define IPC_SET_CONTENT(answer, value) \
    447         {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG3(*answer, argument);}
     420#define IPC_SET_CONTENT(answer) (&IPC_GET_ARG3(*answer))
    448421
    449422/*@}*/
    … …  
    456429 *  @param[out] answer The message answer structure.
    457430 */
    458 #define IPC_SET_SUFFIX(answer, value) \
    459         {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG4(*answer, argument);}
     431#define IPC_SET_SUFFIX(answer)  (&IPC_GET_ARG4(*answer))
    460432
    461433/*@}*/
Note: See TracChangeset for help on using the changeset viewer.