Changeset 89c57b6 in mainline for uspace/lib/c/include/ipc/nil.h

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

88634420

Parents:

cefb126 (diff), 17279ead (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/include/ipc/nil.h (moved) (moved from uspace/lib/net/include/nil_messages.h ) (2 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup net_nil
+/** @addtogroup libc
  * @{
  */
@@ -35 +35 @@
  */
 
-#ifndef __NET_NIL_MESSAGES_H__
-#define __NET_NIL_MESSAGES_H__
+#ifndef LIBC_NIL_MESSAGES_H_
+#define LIBC_NIL_MESSAGES_H_
 
-#include <ipc/ipc.h>
+#include <ipc/net.h>
 
-#include <net_messages.h>
-
-/** Network interface layer module messages.
- */
+/** Network interface layer module messages. */
 typedef enum {
         /** New device or update MTU message.
-         *  @see nil_device_req()
+         * @see nil_device_req()
          */
         NET_NIL_DEVICE = NET_NIL_FIRST,
         /** New device state message.
-         *  @see nil_device_state_msg()
+         * @see nil_device_state_msg()
          */
         NET_NIL_DEVICE_STATE,
         /** Received packet queue message.
-         *  @see nil_received_msg()
+         * @see nil_received_msg()
          */
         NET_NIL_RECEIVED,
         /** Send packet queue message.
-         *  @see nil_send_msg()
+         * @see nil_send_msg()
          */
         NET_NIL_SEND,
         /** Packet size message.
-         *  @see nil_packet_size_req()
+         * @see nil_packet_size_req()
          */
         NET_NIL_PACKET_SPACE,
         /** Device local hardware address message.
-         *  @see nil_get_addr()
+         * @see nil_get_addr()
          */
         NET_NIL_ADDR,
         /** Device broadcast hardware address message.
-         *  @see nil_get_broadcast_addr()
+         * @see nil_get_broadcast_addr()
          */
         NET_NIL_BROADCAST_ADDR,
 } nil_messages;
 
-/** @name Network interface layer specific message parameters definitions
- */
+/** @name Network interface layer specific message parameters definitions */
 /*@{*/
 
-/** Return the protocol service message parameter.
- */
-#define NIL_GET_PROTO(call) \
-        ({services_t service = (services_t) IPC_GET_ARG2(*call); service;})
+/** Return the protocol service message parameter. */
+#define NIL_GET_PROTO(call)  ((services_t) IPC_GET_ARG2(call))
 
 /*@}*/