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

Timestamp:

2010-03-15T19:35:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6092b56e

Parents:

92307f1 (diff), 4684368 (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 from bzr://bzr.helenos.org/head.

File:

• uspace/srv/net/nil/eth/eth.h (modified) (5 diffs)

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

@@ -73 +73 @@
  *  @see device.h
  */
-DEVICE_MAP_DECLARE( eth_devices, eth_device_t )
+DEVICE_MAP_DECLARE(eth_devices, eth_device_t)
 
 /** Ethernet protocol map.
@@ -79 +79 @@
  *  @see int_map.h
  */
-INT_MAP_DECLARE( eth_protos, eth_proto_t )
+INT_MAP_DECLARE(eth_protos, eth_proto_t)
 
 /** Ethernet device specific data.
@@ -86 +86 @@
         /** 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;
         /** Various device flags.
          *  @see ETH_DUMMY
          *  @see ETH_MODE_MASK
          */
-        int                                     flags;
+        int flags;
         /** Actual device hardware address.
          */
-        measured_string_ref     addr;
+        measured_string_ref addr;
         /** Actual device hardware address data.
          */
-        char *                          addr_data;
+        char * addr_data;
 };
 
@@ -114 +114 @@
         /** Protocol service.
          */
-        services_t      service;
+        services_t service;
         /** Protocol identifier.
          */
-        int                     protocol;
+        int protocol;
         /** Protocol module phone.
          */
-        int                     phone;
+        int phone;
 };
 
@@ -128 +128 @@
         /** 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.
          */
-        eth_devices_t   devices;
+        eth_devices_t devices;
         /** Safety lock for protocols.
          */
-        fibril_rwlock_t         protos_lock;
+        fibril_rwlock_t protos_lock;
         /** Protocol map.
          *  Service phone map for each protocol.
          */
-        eth_protos_t    protos;
+        eth_protos_t protos;
         /** Broadcast device hardware address.
          */
-        measured_string_ref     broadcast_addr;
+        measured_string_ref broadcast_addr;
 };