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

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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

@@ -73 +73 @@
  *  @see device.h
  */
-DEVICE_MAP_DECLARE( nildummy_devices, nildummy_device_t )
+DEVICE_MAP_DECLARE(nildummy_devices, nildummy_device_t)
 
 /** Dummy nil device specific data.
@@ -80 +80 @@
         /** Device identifier.
          */
-        device_id_t                     device_id;
+        device_id_t device_id;
         /** Device driver service.
          */
-        services_t                      service;
+        services_t service;
         /** Driver phone.
          */
-        int                                     phone;
+        int phone;
         /** Maximal transmission unit.
          */
-        size_t                          mtu;
+        size_t mtu;
         /** Actual device hardware address.
          */
-        measured_string_ref     addr;
+        measured_string_ref addr;
         /** Actual device hardware address data.
          */
-        char *                          addr_data;
+        char * addr_data;
 };
 
@@ -103 +103 @@
         /** Protocol service.
          */
-        services_t      service;
+        services_t service;
         /** Protocol module phone.
          */
-        int                     phone;
+        int phone;
 };
 
@@ -114 +114 @@
         /** Networking module phone.
          */
-        int                             net_phone;
+        int net_phone;
         /** Safety lock for devices.
          */
-        fibril_rwlock_t         devices_lock;
+        fibril_rwlock_t devices_lock;
         /** All known Ethernet devices.
          */
-        nildummy_devices_t      devices;
+        nildummy_devices_t devices;
         /** Safety lock for protocols.
          */
-        fibril_rwlock_t         protos_lock;
+        fibril_rwlock_t protos_lock;
         /** Default protocol.
          */
-        nildummy_proto_t        proto;
+        nildummy_proto_t proto;
 };