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

Timestamp:

2010-11-20T22:30:36Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cb59f787

Parents:

1b22bd4 (diff), 7e1f9b7 (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) (3 diffs)

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

@@ -54 +54 @@
 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 +90 @@
         
         /** Actual device hardware address. */
-        measured_string_ref addr;
+        measured_string_t *addr;
         /** Actual device hardware address data. */
         char *addr_data;
@@ -133 +123 @@
         
         /** Broadcast device hardware address. */
-        measured_string_ref broadcast_addr;
+        measured_string_t *broadcast_addr;
 };