Changeset 8fb1bf82 in mainline for uspace/srv/hw/netif/dp8390/dp8390_module.c

Timestamp:

2010-11-25T13:42:50Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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) (9 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){
-        ERROR_DECLARE;
-
+int netif_get_device_stats(device_id_t device_id, device_stats_t *stats)
+{
         netif_device_t * device;
         eth_stat_t * de_stat;
+        int rc;
 
         if(! stats){
                 return EBADMEM;
         }
-        ERROR_PROPAGATE(find_device(device_id, &device));
+        rc = find_device(device_id, &device);
+        if (rc != EOK)
+                return rc;
         de_stat = &((dpeth_t *) device->specific)->de_stat;
         null_device_stats(stats);
@@ -184 +186 @@
 }
 
-int netif_get_addr_message(device_id_t device_id, measured_string_ref address){
-        ERROR_DECLARE;
-
-        netif_device_t * device;
+int netif_get_addr_message(device_id_t device_id, measured_string_t *address){
+        netif_device_t * device;
+        int rc;
 
         if(! address){
                 return EBADMEM;
         }
-        ERROR_PROPAGATE(find_device(device_id, &device));
+        rc = find_device(device_id, &device);
+        if (rc != EOK)
+                return rc;
         address->value = (char *) (&((dpeth_t *) device->specific)->de_address);
         address->length = CONVERT_SIZE(ether_addr_t, char, 1);
@@ -201 +204 @@
 
 int netif_probe_message(device_id_t device_id, int irq, uintptr_t io){
-        ERROR_DECLARE;
-
-        netif_device_t * device;
-        dpeth_t * dep;
+        netif_device_t * device;
+        dpeth_t * dep;
+        int rc;
 
         device = (netif_device_t *) malloc(sizeof(netif_device_t));
@@ -224 +226 @@
         dep->de_mode = DEM_DISABLED;
         //TODO address?
-        if(ERROR_OCCURRED(pio_enable((void *) io, DP8390_IO_SIZE, (void **) &dep->de_base_port))
-                || ERROR_OCCURRED(do_probe(dep))){
+        rc = pio_enable((void *) io, DP8390_IO_SIZE, (void **) &dep->de_base_port);
+        if (rc != EOK) {
                 free(dep);
                 free(device);
-                return ERROR_CODE;
-        }
-        if(ERROR_OCCURRED(netif_device_map_add(&netif_globals.device_map, device->device_id, device))){
+                return rc;
+        }       
+        rc = do_probe(dep);
+        if (rc != EOK) {
                 free(dep);
                 free(device);
-                return ERROR_CODE;
-        }
-        return EOK;
-}
-
-int netif_send_message(device_id_t device_id, packet_t packet, services_t sender){
-        ERROR_DECLARE;
-
-        netif_device_t * device;
-        dpeth_t * dep;
-        packet_t next;
-
-        ERROR_PROPAGATE(find_device(device_id, &device));
+                return rc;
+        }
+        rc = netif_device_map_add(&netif_globals.device_map, device->device_id, device);
+        if (rc != EOK){
+                free(dep);
+                free(device);
+                return rc;
+        }
+        return EOK;
+}
+
+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;
+
+        rc = find_device(device_id, &device);
+        if (rc != EOK)
+                return rc;
         if(device->state != NETIF_ACTIVE){
                 netif_pq_release(packet_get_id(packet));
@@ -263 +273 @@
 
 int netif_start_message(netif_device_t * device){
-        ERROR_DECLARE;
-
-        dpeth_t * dep;
+        dpeth_t * dep;
+        int rc;
 
         if(device->state != NETIF_ACTIVE){
@@ -271 +280 @@
                 dp8390_cmds[0].addr = (void *) (uintptr_t) (dep->de_dp8390_port + DP_ISR);
                 dp8390_cmds[2].addr = dp8390_cmds[0].addr;
-                ERROR_PROPAGATE(ipc_register_irq(dep->de_irq, device->device_id, device->device_id, &dp8390_code));
-                if(ERROR_OCCURRED(do_init(dep, DL_BROAD_REQ))){
+                rc = ipc_register_irq(dep->de_irq, device->device_id, device->device_id, &dp8390_code);
+                if (rc != EOK)
+                        return rc;
+                rc = do_init(dep, DL_BROAD_REQ);
+                if (rc != EOK) {
                         ipc_unregister_irq(dep->de_irq, device->device_id);
-                        return ERROR_CODE;
+                        return rc;
                 }
                 return change_state(device, NETIF_ACTIVE);
@@ -350 +362 @@
 int main(int argc, char *argv[])
 {
-        ERROR_DECLARE;
+        int rc;
         
         /* Start the module */
-        if (ERROR_OCCURRED(netif_module_start(netif_client_connection)))
-                return ERROR_CODE;
-        
-        return EOK;
+        rc = netif_module_start(netif_client_connection);
+        return rc;
 }