Changeset 0b81cad0 in mainline for uspace/srv/net/nil/nildummy/nildummy.c

Timestamp:

2010-11-06T00:19:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1712f87

Parents:

0485135 (diff), 0578271 (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 lp:~jakub/helenos/net.

File:

• uspace/srv/net/nil/nildummy/nildummy.c (modified) (11 diffs)

uspace/srv/net/nil/nildummy/nildummy.c

@@ -41 +41 @@
 #include <stdio.h>
 #include <str.h>
-#include <err.h>
 #include <ipc/ipc.h>
 #include <ipc/net.h>
@@ -82 +81 @@
 int nil_initialize(int net_phone)
 {
-        ERROR_DECLARE;
+        int rc;
         
         fibril_rwlock_initialize(&nildummy_globals.devices_lock);
@@ -91 +90 @@
         nildummy_globals.net_phone = net_phone;
         nildummy_globals.proto.phone = 0;
-        ERROR_CODE = nildummy_devices_initialize(&nildummy_globals.devices);
+        rc = nildummy_devices_initialize(&nildummy_globals.devices);
         
         fibril_rwlock_write_unlock(&nildummy_globals.protos_lock);
         fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
         
-        return ERROR_CODE;
+        return rc;
 }
 
@@ -107 +106 @@
 static void nildummy_receiver(ipc_callid_t iid, ipc_call_t *icall)
 {
-        ERROR_DECLARE;
-
         packet_t packet;
+        int rc;
 
         while (true) {
                 switch (IPC_GET_METHOD(*icall)) {
                 case NET_NIL_DEVICE_STATE:
-                        ERROR_CODE = nil_device_state_msg_local(0,
+                        rc = nil_device_state_msg_local(0,
                             IPC_GET_DEVICE(icall), IPC_GET_STATE(icall));
-                        ipc_answer_0(iid, (ipcarg_t) ERROR_CODE);
+                        ipc_answer_0(iid, (ipcarg_t) rc);
                         break;
                 
                 case NET_NIL_RECEIVED:
-                        if (ERROR_NONE(packet_translate_remote(
-                            nildummy_globals.net_phone, &packet,
-                            IPC_GET_PACKET(icall)))) {
-                                ERROR_CODE = nil_received_msg_local(0,
+                        rc = packet_translate_remote(nildummy_globals.net_phone,
+                            &packet, IPC_GET_PACKET(icall));
+                        if (rc == EOK) {
+                                rc = nil_received_msg_local(0,
                                     IPC_GET_DEVICE(icall), packet, 0);
                         }
-                        ipc_answer_0(iid, (ipcarg_t) ERROR_CODE);
+                        ipc_answer_0(iid, (ipcarg_t) rc);
                         break;
                 
@@ -155 +153 @@
 nildummy_device_message(device_id_t device_id, services_t service, size_t mtu)
 {
-        ERROR_DECLARE;
-
         nildummy_device_ref device;
         int index;
+        int rc;
 
         fibril_rwlock_write_lock(&nildummy_globals.devices_lock);
@@ -216 +213 @@
         
         // get hardware address
-        if (ERROR_OCCURRED(netif_get_addr_req(device->phone, device->device_id,
-            &device->addr, &device->addr_data))) {
+        rc = netif_get_addr_req(device->phone, device->device_id, &device->addr,
+            &device->addr_data);
+        if (rc != EOK) {
                 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
                 free(device);
-                return ERROR_CODE;
+                return rc;
         }
         
@@ -380 +378 @@
     ipc_call_t *answer, int *answer_count)
 {
-        ERROR_DECLARE;
-        
         measured_string_ref address;
         packet_t packet;
@@ -388 +384 @@
         size_t suffix;
         size_t content;
+        int rc;
         
         *answer_count = 0;
@@ -399 +396 @@
         
         case NET_NIL_SEND:
-                ERROR_PROPAGATE(packet_translate_remote(
-                    nildummy_globals.net_phone, &packet, IPC_GET_PACKET(call)));
+                rc = packet_translate_remote(nildummy_globals.net_phone,
+                    &packet, IPC_GET_PACKET(call));
+                if (rc != EOK)
+                        return rc;
                 return nildummy_send_message(IPC_GET_DEVICE(call), packet,
                     IPC_GET_SERVICE(call));
         
         case NET_NIL_PACKET_SPACE:
-                ERROR_PROPAGATE(nildummy_packet_space_message(
-                    IPC_GET_DEVICE(call), &addrlen, &prefix, &content,
-                    &suffix));
+                rc = nildummy_packet_space_message(IPC_GET_DEVICE(call),
+                    &addrlen, &prefix, &content, &suffix);
+                if (rc != EOK)
+                        return rc;
                 IPC_SET_ADDR(answer, addrlen);
                 IPC_SET_PREFIX(answer, prefix);
@@ -416 +416 @@
         
         case NET_NIL_ADDR:
-                ERROR_PROPAGATE(nildummy_addr_message(IPC_GET_DEVICE(call),
-                    &address));
+                rc = nildummy_addr_message(IPC_GET_DEVICE(call), &address);
+                if (rc != EOK)
+                        return rc;
                 return measured_strings_reply(address, 1);
         
         case NET_NIL_BROADCAST_ADDR:
-                ERROR_PROPAGATE(nildummy_addr_message(IPC_GET_DEVICE(call),
-                    &address));
+                rc = nildummy_addr_message(IPC_GET_DEVICE(call), &address);
+                if (rc != EOK)
+                        return rc;
                 return measured_strings_reply(address, 1);
         
@@ -476 +478 @@
 int main(int argc, char *argv[])
 {
-        ERROR_DECLARE;
+        int rc;
         
         /* Start the module */
-        ERROR_PROPAGATE(nil_module_start_standalone(nil_client_connection));
-        return EOK;
+        rc = nil_module_start_standalone(nil_client_connection);
+        return rc;
 }