Changeset 069015f2 in mainline for uspace/srv/net/il/arp/arp_header.h

Timestamp:

2010-10-30T19:40:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5c088975

Parents:

f2d2c604 (diff), fd8e8e1 (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:~jakub/helenos/net.

File:

• uspace/srv/net/il/arp/arp_header.h (modified) (1 diff)

uspace/srv/net/il/arp/arp_header.h

@@ -32 +32 @@
 
 /** @file
- *  ARP protocol header.
- *  Based on the RFC~826.
+ * ARP protocol header.
+ * Based on the RFC 826.
  */
 
-#ifndef __NET_ARP_HEADER_H__
-#define __NET_ARP_HEADER_H__
+#ifndef NET_ARP_HEADER_H_
+#define NET_ARP_HEADER_H_
 
 #include <sys/types.h>
 
 /** Type definition of an ARP protocol header.
- *  @see arp_header
+ * @see arp_header
  */
-typedef struct arp_header       arp_header_t;
+typedef struct arp_header arp_header_t;
 
 /** Type definition of an ARP protocol header pointer.
- *  @see arp_header
+ * @see arp_header
  */
-typedef arp_header_t *          arp_header_ref;
+typedef arp_header_t *arp_header_ref;
 
-/** ARP protocol header.
- */
-struct arp_header{
-        /** Hardware type identifier.
-         *  @see hardware.h
+/** ARP protocol header. */
+struct arp_header {
+        /**
+         * Hardware type identifier.
+         * @see hardware.h
          */
         uint16_t hardware;
-        /** Protocol identifier.
-         */
+        
+        /** Protocol identifier. */
         uint16_t protocol;
-        /** Hardware address length in bytes.
-         */
+        /** Hardware address length in bytes. */
         uint8_t hardware_length;
-        /** Protocol address length in bytes.
-         */
+        /** Protocol address length in bytes. */
         uint8_t protocol_length;
-        /** ARP packet type.
-         *  @see arp_oc.h
+        
+        /**
+         * ARP packet type.
+         * @see arp_oc.h
          */
         uint16_t operation;