Changeset 32eceb4f in mainline for uspace/srv/hw/netif/dp8390/dp8390_module.c

Timestamp:

2010-11-20T22:30:36Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cb59f787

Parents:

1b22bd4 (diff), 7e1f9b7 (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/hw/netif/dp8390/dp8390_module.c (modified) (5 diffs)

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

@@ -103 +103 @@
         netif_device_t * device;
         dpeth_t * dep;
-        packet_t received;
+        packet_t *received;
         device_id_t device_id;
         int phone;
@@ -127 +127 @@
                 dep->received_count = 0;
                 fibril_rwlock_write_unlock(&netif_globals.lock);
-                nil_received_msg(phone, device_id, received, NULL);
+                nil_received_msg(phone, device_id, received, SERVICE_NONE);
         }else{
                 fibril_rwlock_write_unlock(&netif_globals.lock);
@@ -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;
@@ -246 +247 @@
 }
 
-int netif_send_message(device_id_t device_id, packet_t packet, services_t sender){
-        netif_device_t * device;
-        dpeth_t * dep;
-        packet_t next;
+int netif_send_message(device_id_t device_id, packet_t *packet, services_t sender){
+        netif_device_t * device;
+        dpeth_t * dep;
+        packet_t *next;
         int rc;