Changeset fdbc3ff in mainline for uspace/srv/hw/netif

Timestamp:

2010-11-19T23:50:06Z (15 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.

Location:

uspace/srv/hw/netif/dp8390

Files:

• dp8390.c (modified) (1 diff)
• dp8390_module.c (modified) (2 diffs)

uspace/srv/hw/netif/dp8390/dp8390.c

@@ -62 +62 @@
  *  @param[in] dep The network interface structure.
  *  @param[in] packet The outgoing packet.
- *  @returns EOK on success.
- *  @returns EINVAL 
+ *  @return EOK on success.
+ *  @return EINVAL 
  */
 int queue_packet(dpeth_t * dep, packet_t packet);

uspace/srv/hw/netif/dp8390/dp8390_module.c

@@ -157 +157 @@
 }
 
-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;
         eth_stat_t * de_stat;
@@ -185 +186 @@
 }
 
-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){
         netif_device_t * device;
         int rc;