Changeset 71b00dcc in mainline for uspace/srv/net/structures/packet/packet_header.h

Timestamp:

2010-03-07T22:51:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

60ab6c3

Parents:

b5cbff4 (diff), 31c80a5 (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 from lp:~lukasmejdrech/helenos/network.

File:

• uspace/srv/net/structures/packet/packet_header.h (modified) (3 diffs)

uspace/srv/net/structures/packet/packet_header.h

@@ -43 +43 @@
  *  @param[in] header The packet header.
  */
-#define PACKET_DATA_LENGTH( header )            (( header )->data_end - ( header )->data_start )
+#define PACKET_DATA_LENGTH(header)              ((header)->data_end - (header)->data_start)
 
 /** Returns the maximum packet address length.
  *  @param[in] header The packet header.
  */
-#define PACKET_MAX_ADDRESS_LENGTH( header )             (( header )->dest_addr - ( header )->src_addr )
+#define PACKET_MAX_ADDRESS_LENGTH(header)               ((header)->dest_addr - (header)->src_addr)
 
 /** Returns the minimum packet suffix.
  *  @param[in] header The packet header.
  */
-#define PACKET_MIN_SUFFIX( header )             (( header )->length - ( header )->data_start - ( header )->max_content )
+#define PACKET_MIN_SUFFIX(header)               ((header)->length - (header)->data_start - (header)->max_content)
 
 /** Packet integrity check magic value.
@@ -64 +64 @@
         /** Packet identifier.
          */
-        packet_id_t             packet_id;
+        packet_id_t packet_id;
         /** Packet queue sorting value.
          *  The packet queue is sorted the ascending order.
          */
-        size_t                  order;
+        size_t order;
         /** Packet metric.
          */
-        size_t                  metric;
+        size_t metric;
         /** Previous packet in the queue.
          */
-        packet_id_t             previous;
+        packet_id_t previous;
         /** Next packet in the queue.
          */
-        packet_id_t             next;
+        packet_id_t next;
         /** Total length of the packet.
          *  Contains the header, the addresses and the data of the packet.
          *  Corresponds to the mapped sharable memory block.
          */
-        size_t                  length;
+        size_t length;
         /** Stored source and destination addresses length.
          */
-        size_t                  addr_len;
+        size_t addr_len;
         /** Souce address offset in bytes from the beginning of the packet header.
          */
-        size_t                  src_addr;
+        size_t src_addr;
         /** Destination address offset in bytes from the beginning of the packet header.
          */
-        size_t                  dest_addr;
+        size_t dest_addr;
         /** Reserved data prefix length in bytes.
          */
-        size_t                  max_prefix;
+        size_t max_prefix;
         /** Reserved content length in bytes.
          */
-        size_t                  max_content;
+        size_t max_content;
         /** Actual data start offset in bytes from the beginning of the packet header.
          */
-        size_t                  data_start;
+        size_t data_start;
         /** Actual data end offset in bytes from the beginning of the packet header.
          */
-        size_t                  data_end;
+        size_t data_end;
         /** Integrity check magic value.
          */
-        int                             magic_value;
+        int magic_value;
 };
 
@@ -114 +114 @@
  *  @returns false otherwise.
  */
-static inline int       packet_is_valid( const packet_t packet ){
-        return packet && ( packet->magic_value == PACKET_MAGIC_VALUE );
+static inline int packet_is_valid(const packet_t packet){
+        return packet && (packet->magic_value == PACKET_MAGIC_VALUE);
 }