Changeset b5e68c8 in mainline for uspace/srv/net/nil/nildummy/nildummy.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/nildummy/nildummy.h (modified) (4 diffs)

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

@@ -45 +45 @@
 
 /** Type definition of the dummy nil global data.
+ *
  * @see nildummy_globals
+ *
  */
 typedef struct nildummy_globals nildummy_globals_t;
 
 /** Type definition of the dummy nil device specific data.
+ *
  * @see nildummy_device
+ *
  */
 typedef struct nildummy_device nildummy_device_t;
 
-/** Type definition of the dummy nil device specific data pointer.
- * @see nildummy_device
+/** Type definition of the dummy nil protocol specific data.
+ *
+ * @see nildummy_proto
+ *
  */
-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;
+typedef struct nildummy_proto nildummy_proto_t;
 
 /** Dummy nil device map.
- * Maps devices to the dummy nil device specific data.
+ *
+ * Map devices to the dummy nil device specific data.
  * @see device.h
+ *
  */
 DEVICE_MAP_DECLARE(nildummy_devices, nildummy_device_t);
@@ -79 +77 @@
         /** Device identifier. */
         device_id_t device_id;
+        
         /** Device driver service. */
         services_t service;
+        
         /** Driver phone. */
         int phone;
+        
         /** Maximal transmission unit. */
         size_t mtu;
+        
         /** Actual device hardware address. */
-        measured_string_ref addr;
+        measured_string_t *addr;
+        
         /** Actual device hardware address data. */
-        char *addr_data;
+        uint8_t *addr_data;
 };
 
@@ -95 +98 @@
         /** Protocol service. */
         services_t service;
+        
         /** Protocol module phone. */
         int phone;
@@ -100 +104 @@
 
 /** Dummy nil global data. */
-struct  nildummy_globals {
+struct nildummy_globals {
         /** Networking module phone. */
         int net_phone;
-        /** Safety lock for devices. */
+        
+        /** Lock for devices. */
         fibril_rwlock_t devices_lock;
+        
         /** All known Ethernet devices. */
         nildummy_devices_t devices;
+        
         /** Safety lock for protocols. */
         fibril_rwlock_t protos_lock;
+        
         /** Default protocol. */
         nildummy_proto_t proto;