Changeset 70922c2 in mainline for uspace/srv

Timestamp:

2012-02-01T00:09:22Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ffcc5776

Parents:

cb3dbb63 (diff), 3d4750f (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:

Mainline changes.

Location:

uspace/srv

Files:

• loc/loc.c (modified) (1 diff)
• net/net/net.h (modified) (1 diff)
• net/nil/eth/eth.c (modified) (8 diffs)
• net/nil/nildummy/nildummy.c (modified) (9 diffs)

uspace/srv/loc/loc.c

@@ -813 +813 @@
  * On success, answer will contain EOK int retval.
  * On failure, error code will be sent in retval.
+ *
  */
 static void loc_callback_create(ipc_callid_t iid, ipc_call_t *icall)
 {
-        cb_sess_t *cb_sess;
-        
-        cb_sess = calloc(1, sizeof(cb_sess_t));
+        cb_sess_t *cb_sess = calloc(1, sizeof(cb_sess_t));
         if (cb_sess == NULL) {
                 async_answer_0(iid, ENOMEM);

uspace/srv/net/net/net.h

@@ -96 +96 @@
         
         /** Serving network interface driver module index. */
-        service_id_t sid;  /**< Service ID */
-        async_sess_t *sess;      /**< Driver session. */
+        service_id_t sid;    /**< Service ID */
+        async_sess_t *sess;  /**< Driver session. */
         
         module_t *nil;  /**< Serving link layer module index. */

uspace/srv/net/nil/eth/eth.c

@@ -173 +173 @@
     void *arg);
 
-static int eth_device_state(nic_device_id_t device_id, sysarg_t state)
+static int eth_device_state(eth_device_t *device, sysarg_t state)
 {
         int index;
@@ -183 +183 @@
                 proto = eth_protos_get_index(&eth_globals.protos, index);
                 if ((proto) && (proto->sess)) {
-                        il_device_state_msg(proto->sess, device_id, state,
-                            proto->service);
+                        il_device_state_msg(proto->sess, device->device_id,
+                            state, proto->service);
                 }
         }
@@ -347 +347 @@
         }
         
-        rc = nic_callback_create(device->sess, device_id,
-            eth_nic_cb_connection, NULL);
+        rc = nic_callback_create(device->sess, eth_nic_cb_connection, device);
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&eth_globals.devices_lock);
@@ -825 +824 @@
 }
 
-static int eth_received(nic_device_id_t device_id)
+static int eth_received(eth_device_t *device)
 {
         void *data;
@@ -845 +844 @@
         free(data);
         
-        return nil_received_msg_local(device_id, packet);
-}
-
-static int eth_addr_changed(nic_device_id_t device_id)
+        return nil_received_msg_local(device->device_id, packet);
+}
+
+static int eth_addr_changed(eth_device_t *device)
 {
         nic_address_t address;
@@ -866 +865 @@
 
         fibril_rwlock_write_lock(&eth_globals.devices_lock);
-        /* An existing device? */
-        eth_device_t *device = eth_devices_find(&eth_globals.devices, device_id);
-        if (device) {
-                printf("Device %d changing address from " PRIMAC " to " PRIMAC "\n",
-                        device_id, ARGSMAC(device->addr.address), ARGSMAC(address.address));
-                memcpy(&device->addr, &address, sizeof (nic_address_t));
-                fibril_rwlock_write_unlock(&eth_globals.devices_lock);
-
-                /* Notify all upper layer modules */
-                fibril_rwlock_read_lock(&eth_globals.protos_lock);
-                int index;
-                for (index = 0; index < eth_protos_count(&eth_globals.protos); index++) {
-                        eth_proto_t *proto = eth_protos_get_index(&eth_globals.protos, index);
-                        if (proto->sess != NULL) {
-                                il_addr_changed_msg(proto->sess, device->device_id,
-                                                ETH_ADDR, address.address);
-                        }
-                }
-
-                fibril_rwlock_read_unlock(&eth_globals.protos_lock);
-                return EOK;
-        } else {
-                return ENOENT;
-        }
+
+        printf("Device %d changing address from " PRIMAC " to " PRIMAC "\n",
+                device->device_id, ARGSMAC(device->addr.address),
+                ARGSMAC(address.address));
+        memcpy(&device->addr, &address, sizeof (nic_address_t));
+        fibril_rwlock_write_unlock(&eth_globals.devices_lock);
+
+        /* Notify all upper layer modules */
+        fibril_rwlock_read_lock(&eth_globals.protos_lock);
+        int index;
+        for (index = 0; index < eth_protos_count(&eth_globals.protos); index++) {
+                eth_proto_t *proto = eth_protos_get_index(&eth_globals.protos, index);
+                if (proto->sess != NULL) {
+                        il_addr_changed_msg(proto->sess, device->device_id,
+                                        ETH_ADDR, address.address);
+                }
+        }
+
+        fibril_rwlock_read_unlock(&eth_globals.protos_lock);
+        return EOK;
 }
 
@@ -962 +957 @@
 static void eth_nic_cb_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+        eth_device_t *device = (eth_device_t *)arg;
         int rc;
         
@@ -975 +971 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case NIC_EV_DEVICE_STATE:
-                        rc = eth_device_state(IPC_GET_ARG1(call),
-                            IPC_GET_ARG2(call));
+                        rc = eth_device_state(device, IPC_GET_ARG1(call));
                         async_answer_0(callid, (sysarg_t) rc);
                         break;
                 case NIC_EV_RECEIVED:
-                        rc = eth_received(IPC_GET_ARG1(call));
+                        rc = eth_received(device);
                         async_answer_0(callid, (sysarg_t) rc);
                         break;
                 case NIC_EV_ADDR_CHANGED:
-                        rc = eth_addr_changed(IPC_GET_ARG1(call));
+                        rc = eth_addr_changed(device);
                         async_answer_0(callid, (sysarg_t) rc);
                         break;

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

@@ -73 +73 @@
     void *arg);
 
-static int nildummy_device_state(nic_device_id_t device_id, sysarg_t state)
+static int nildummy_device_state(nildummy_device_t *device, sysarg_t state)
 {
         fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
         if (nildummy_globals.proto.sess)
-                il_device_state_msg(nildummy_globals.proto.sess, device_id,
-                    state, nildummy_globals.proto.service);
+                il_device_state_msg(nildummy_globals.proto.sess,
+                    device->device_id, state, nildummy_globals.proto.service);
         fibril_rwlock_read_unlock(&nildummy_globals.protos_lock);
         
@@ -84 +84 @@
 }
 
-static int nildummy_addr_changed(nic_device_id_t device_id)
+static int nildummy_addr_changed(nildummy_device_t *device)
 {
         return ENOTSUP;
@@ -182 +182 @@
         }
         
-        int rc = nic_callback_create(device->sess, device_id,
-            nildummy_nic_cb_conn, NULL);
+        int rc = nic_callback_create(device->sess, nildummy_nic_cb_conn,
+            device);
         if (rc != EOK) {
                 async_hangup(device->sess);
@@ -360 +360 @@
     services_t sender)
 {
-        packet_t *p;
-        
         fibril_rwlock_read_lock(&nildummy_globals.devices_lock);
         
@@ -371 +369 @@
         }
         
-        p = packet;
+        packet_t *p = packet;
         do {
                 nic_send_frame(device->sess, packet_get_data(p),
@@ -385 +383 @@
 }
 
-static int nildummy_received(nic_device_id_t device_id)
+static int nildummy_received(nildummy_device_t *device)
 {
         void *data;
@@ -403 +401 @@
         free(pdata);
 
-        return nil_received_msg_local(device_id, packet);
+        return nil_received_msg_local(device->device_id, packet);
 }
 
@@ -467 +465 @@
 static void nildummy_nic_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+        nildummy_device_t *device = (nildummy_device_t *)arg;
         int rc;
         
@@ -480 +479 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case NIC_EV_DEVICE_STATE:
-                        rc = nildummy_device_state(IPC_GET_ARG1(call),
-                            IPC_GET_ARG2(call));
+                        rc = nildummy_device_state(device, IPC_GET_ARG1(call));
                         async_answer_0(callid, (sysarg_t) rc);
                         break;
                 case NIC_EV_RECEIVED:
-                        rc = nildummy_received(IPC_GET_ARG1(call));
+                        rc = nildummy_received(device);
                         async_answer_0(callid, (sysarg_t) rc);
                         break;
                 case NIC_EV_ADDR_CHANGED:
-                        rc = nildummy_addr_changed(IPC_GET_ARG1(call));
+                        rc = nildummy_addr_changed(device);
                         async_answer_0(callid, (sysarg_t) rc);
                         break;