Changeset fdbc3ff in mainline for uspace/srv/net/netif/lo/lo.c

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/netif/lo/lo.c (modified) (7 diffs)

uspace/srv/net/netif/lo/lo.c

@@ -70 +70 @@
 }
 
-int netif_get_addr_message(device_id_t device_id, measured_string_ref address)
+int netif_get_addr_message(device_id_t device_id, measured_string_t *address)
 {
         if (!address)
@@ -81 +81 @@
 }
 
-int netif_get_device_stats(device_id_t device_id, device_stats_ref stats)
+int netif_get_device_stats(device_id_t device_id, device_stats_t *stats)
 {
         netif_device_t *device;
@@ -93 +93 @@
                 return rc;
 
-        memcpy(stats, (device_stats_ref) device->specific,
+        memcpy(stats, (device_stats_t *) device->specific,
             sizeof(device_stats_t));
 
@@ -103 +103 @@
  * @param[in] device    The device structure.
  * @param[in] state     The new device state.
- * @returns             The new state if changed.
- * @returns             EOK otherwise.
+ * @return              The new state if changed.
+ * @return              EOK otherwise.
  */
 static int change_state_message(netif_device_t *device, device_state_t state)
@@ -124 +124 @@
  * @param[in] device_id The new devce identifier.
  * @param[out] device   The device structure.
- * @returns             EOK on success.
- * @returns             EXDEV if one loopback network interface already exists.
- * @returns             ENOMEM if there is not enough memory left.
+ * @return              EOK on success.
+ * @return              EXDEV if one loopback network interface already exists.
+ * @return              ENOMEM if there is not enough memory left.
  */
 static int create(device_id_t device_id, netif_device_t **device)
@@ -145 +145 @@
         }
 
-        null_device_stats((device_stats_ref) (*device)->specific);
+        null_device_stats((device_stats_t *) (*device)->specific);
         (*device)->device_id = device_id;
         (*device)->nil_phone = -1;
@@ -204 +204 @@
         next = packet;
         do {
-                ((device_stats_ref) device->specific)->send_packets++;
-                ((device_stats_ref) device->specific)->receive_packets++;
+                ((device_stats_t *) device->specific)->send_packets++;
+                ((device_stats_t *) device->specific)->receive_packets++;
                 length = packet_get_data_length(next);
-                ((device_stats_ref) device->specific)->send_bytes += length;
-                ((device_stats_ref) device->specific)->receive_bytes += length;
+                ((device_stats_t *) device->specific)->send_bytes += length;
+                ((device_stats_t *) device->specific)->receive_bytes += length;
                 next = pq_next(next);
         } while(next);