Changeset 89c57b6 in mainline for uspace/lib/c/include/ipc/packet.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/packet.h (moved) (moved from uspace/lib/socket/include/packet/packet_messages.h ) (2 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup packet
+/** @addtogroup libc
  *  @{
  */
@@ -35 +35 @@
  */
 
-#ifndef __NET_PACKET_MESSAGES__
-#define __NET_PACKET_MESSAGES__
+#ifndef LIBC_PACKET_MESSAGES_
+#define LIBC_PACKET_MESSAGES_
 
-#include <ipc/ipc.h>
+#include <ipc/net.h>
 
-#include <net_messages.h>
-
-/** Packet server module messages.
- */
+/** Packet server module messages. */
 typedef enum {
         /** Create packet message with specified content length.
-         *  @see packet_get_1()
+         * @see packet_get_1()
          */
         NET_PACKET_CREATE_1 = NET_PACKET_FIRST,
-        /** Create packet message with specified address length, prefix, content and suffix.
-         *  @see packet_get_4()
+        
+        /**
+         * Create packet message with specified address length, prefix, content
+         * and suffix.
+         * @see packet_get_4()
          */
         NET_PACKET_CREATE_4,
+        
         /** Get packet message.
-         *  @see packet_return()
-         */
+         * @see packet_return() */
         NET_PACKET_GET,
+        
         /** Get packet size message.
-         *  @see packet_translate()
+         * @see packet_translate()
          */
         NET_PACKET_GET_SIZE,
+        
         /** Release packet message.
-         *  @see pq_release()
+         * @see pq_release()
          */
         NET_PACKET_RELEASE
 } packet_messages;
 
-/** Returns the protocol service message parameter.
- */
-#define ARP_GET_PROTO(call)             (services_t) IPC_GET_ARG2(*call)
+/** Return the protocol service message parameter. */
+#define ARP_GET_PROTO(call)  ((services_t) IPC_GET_ARG2(call))
 
-/** Returns the packet identifier message parameter.
- */
-#define IPC_GET_ID(call)                        (packet_id_t) IPC_GET_ARG1(*call)
+/** Return the packet identifier message parameter. */
+#define IPC_GET_ID(call)  ((packet_id_t) IPC_GET_ARG1(call))
 
-/** Returns the maximal content length message parameter.
- */
-#define IPC_GET_CONTENT(call)           (size_t) IPC_GET_ARG1(*call)
+/** Return the maximal content length message parameter. */
+#define IPC_GET_CONTENT(call)  ((size_t) IPC_GET_ARG1(call))
 
-/** Returns the maximal address length message parameter.
- */
-#define IPC_GET_ADDR_LEN(call)  (size_t) IPC_GET_ARG2(*call)
+/** Return the maximal address length message parameter. */
+#define IPC_GET_ADDR_LEN(call)  ((size_t) IPC_GET_ARG2(call))
 
-/** Returns the maximal prefix length message parameter.
- */
-#define IPC_GET_PREFIX(call)            (size_t) IPC_GET_ARG3(*call)
+/** Return the maximal prefix length message parameter. */
+#define IPC_GET_PREFIX(call)  ((size_t) IPC_GET_ARG3(call))
 
-/** Returns the maximal suffix length message parameter.
- */
-#define IPC_GET_SUFFIX(call)            (size_t) IPC_GET_ARG4(*call)
+/** Return the maximal suffix length message parameter. */
+#define IPC_GET_SUFFIX(call)  ((size_t) IPC_GET_ARG4(call))
 
 #endif