Changeset fdbc3ff in mainline for uspace/srv/net/nil/nildummy/nildummy.h

Timestamp:

2010-11-19T23:50:06Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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/nildummy/nildummy.h (modified) (2 diffs)

uspace/srv/net/nil/nildummy/nildummy.h

@@ -54 +54 @@
 typedef struct nildummy_device nildummy_device_t;
 
-/** Type definition of the dummy nil device specific data pointer.
- * @see nildummy_device
- */
-typedef nildummy_device_t *nildummy_device_ref;
-
 /** Type definition of the dummy nil protocol specific data.
  * @see nildummy_proto
  */
 typedef struct nildummy_proto nildummy_proto_t;
-
-/** Type definition of the dummy nil protocol specific data pointer.
- * @see nildummy_proto
- */
-typedef nildummy_proto_t *nildummy_proto_ref;
 
 /** Dummy nil device map.
@@ -86 +76 @@
         size_t mtu;
         /** Actual device hardware address. */
-        measured_string_ref addr;
+        measured_string_t *addr;
         /** Actual device hardware address data. */
         char *addr_data;