Changeset b5e68c8 in mainline for uspace/srv/net/nil/eth/eth.h

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/srv/net/nil/eth/eth.h (modified) (4 diffs)

uspace/srv/net/nil/eth/eth.h

@@ -44 +44 @@
 #include <adt/measured_strings.h>
 
+/** Ethernet address length. */
+#define ETH_ADDR  6
+
+/** Ethernet header preamble value. */
+#define ETH_PREAMBLE  0x55
+
+/** Ethernet header start of frame value. */
+#define ETH_SFD  0xD5
+
+/** IEEE 802.2 unordered information control field. */
+#define IEEE_8023_2_UI  0x03
+
+/** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions.
+ * @see eth_header_snap
+ */
+typedef struct eth_header_snap eth_header_snap_t;
+
+/** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions.
+ * @see eth_header_lsap
+ */
+typedef struct eth_header_lsap eth_header_lsap_t;
+
+/** Type definition of the Ethernet header LSAP extension.
+ * @see eth_ieee_lsap
+ */
+typedef struct eth_ieee_lsap eth_ieee_lsap_t;
+
+/** Type definition of the Ethernet header SNAP extension.
+ * @see eth_snap
+ */
+typedef struct eth_snap eth_snap_t;
+
+/** Type definition of the Ethernet header preamble.
+ * @see preamble
+ */
+typedef struct eth_preamble eth_preamble_t;
+
+/** Type definition of the Ethernet header.
+ * @see eth_header
+ */
+typedef struct eth_header eth_header_t;
+
+/** Ethernet header Link Service Access Point extension. */
+struct eth_ieee_lsap {
+        /**
+         * Destination Service Access Point identifier.
+         * The possible values are assigned by an IEEE committee.
+         */
+        uint8_t dsap;
+        
+        /**
+         * Source Service Access Point identifier.
+         * The possible values are assigned by an IEEE committee.
+         */
+        uint8_t ssap;
+        
+        /**
+         * Control parameter.
+         * The possible values are assigned by an IEEE committee.
+         */
+        uint8_t ctrl;
+} __attribute__ ((packed));
+
+/** Ethernet header SNAP extension. */
+struct eth_snap {
+        /** Protocol identifier or organization code. */
+        uint8_t protocol[3];
+        
+        /**
+         * Ethernet protocol identifier in the network byte order (big endian).
+         * @see ethernet_protocols.h
+         */
+        uint16_t ethertype;
+} __attribute__ ((packed));
+
+/** Ethernet header preamble.
+ *
+ * Used for dummy devices.
+ */
+struct eth_preamble {
+        /**
+         * Controlling preamble used for the frame transmission synchronization.
+         * All should be set to ETH_PREAMBLE.
+         */
+        uint8_t preamble[7];
+        
+        /**
+         * Start of Frame Delimiter used for the frame transmission
+         * synchronization.
+         * Should be set to ETH_SFD.
+         */
+        uint8_t sfd;
+} __attribute__ ((packed));
+
+/** Ethernet header. */
+struct eth_header {
+        /** Destination host Ethernet address (MAC address). */
+        uint8_t destination_address[ETH_ADDR];
+        /** Source host Ethernet address (MAC address). */
+        uint8_t source_address[ETH_ADDR];
+        
+        /**
+         * Ethernet protocol identifier in the network byte order (big endian).
+         * @see ethernet_protocols.h
+         */
+        uint16_t ethertype;
+} __attribute__ ((packed));
+
+/** Ethernet header IEEE 802.3 + 802.2 extension. */
+struct eth_header_lsap {
+        /** Ethernet header. */
+        eth_header_t header;
+        
+        /**
+         * LSAP extension.
+         * If DSAP and SSAP are set to ETH_LSAP_SNAP the SNAP extension is being
+         * used.
+         * If DSAP and SSAP fields are equal to ETH_RAW the raw Ethernet packet
+         * without any extensions is being used and the frame content starts
+         * rigth after the two fields.
+         */
+        eth_ieee_lsap_t lsap;
+} __attribute__ ((packed));
+
+/** Ethernet header IEEE 802.3 + 802.2 + SNAP extensions. */
+struct eth_header_snap {
+        /** Ethernet header. */
+        eth_header_t header;
+        
+        /**
+         * LSAP extension.
+         * If DSAP and SSAP are set to ETH_LSAP_SNAP the SNAP extension is being
+         * used.
+         * If DSAP and SSAP fields are equal to ETH_RAW the raw Ethernet packet
+         * without any extensions is being used and the frame content starts
+         * rigth after the two fields.
+         */
+        eth_ieee_lsap_t lsap;
+        
+        /** SNAP extension. */
+        eth_snap_t snap;
+} __attribute__ ((packed));
+
+/** Ethernet Frame Check Sequence. */
+typedef uint32_t eth_fcs_t;
+
 /** Type definition of the Ethernet global data.
  * @see eth_globals
@@ -54 +200 @@
 typedef struct eth_device eth_device_t;
 
-/** Type definition of the Ethernet device specific data pointer.
- * @see eth_device
- */
-typedef eth_device_t *eth_device_ref;
-
 /** Type definition of the Ethernet protocol specific data.
  * @see eth_proto
  */
 typedef struct eth_proto eth_proto_t;
-
-/** Type definition of the Ethernet protocol specific data pointer.
- * @see eth_proto
- */
-typedef eth_proto_t *eth_proto_ref;
 
 /** Ethernet device map.
@@ -100 +236 @@
         
         /** Actual device hardware address. */
-        measured_string_ref addr;
+        measured_string_t *addr;
+        
         /** Actual device hardware address data. */
-        char *addr_data;
+        uint8_t *addr_data;
 };
 
@@ -133 +270 @@
         
         /** Broadcast device hardware address. */
-        measured_string_ref broadcast_addr;
+        measured_string_t *broadcast_addr;
 };