Changeset 948911d in mainline for uspace/lib/net/nil/nil_remote.c

Timestamp:

2012-01-24T02:27:43Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

230385c

Parents:

8afeb04 (diff), 2df6f6fe (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.

File:

• uspace/lib/net/nil/nil_remote.c (modified) (2 diffs)

uspace/lib/net/nil/nil_remote.c

@@ -36 +36 @@
  */
 
+#include <ipc/loc.h>
 #include <nil_remote.h>
 #include <generic.h>
@@ -43 +44 @@
 #include <ipc/nil.h>
 
-/** Notify the network interface layer about the device state change.
- *
- * @param[in] sess      Network interface layer session.
- * @param[in] device_id Device identifier.
- * @param[in] state     New device state.
- *
- * @return EOK on success.
- * @return Other error codes as defined for each specific module
- *         device state function.
- *
- */
-int nil_device_state_msg(async_sess_t *sess, nic_device_id_t device_id,
-    sysarg_t state)
-{
-        return generic_device_state_msg_remote(sess, NET_NIL_DEVICE_STATE,
-            device_id, state, 0);
-}
-
-/** Pass the packet queue to the network interface layer.
- *
- * Process and redistribute the received packet queue to the registered
- * upper layers.
- *
- * @param[in] sess      Network interface layer session.
- * @param[in] device_id Source device identifier.
- * @param[in] packet    Received packet or the received packet queue.
- * @param[in] target    Target service. Ignored parameter.
- *
- * @return EOK on success.
- * @return Other error codes as defined for each specific module
- *         received function.
- *
- */
-int nil_received_msg(async_sess_t *sess, nic_device_id_t device_id,
-    packet_id_t packet_id)
-{
-        return generic_received_msg_remote(sess, NET_NIL_RECEIVED,
-            device_id, packet_id, 0, 0);
-}
-
-/** Notify upper layers that device address has changed
- *
- */
-int nil_addr_changed_msg(async_sess_t *sess, nic_device_id_t device_id,
-    const nic_address_t *address)
-{
-        assert(sess);
-        
-        async_exch_t *exch = async_exchange_begin(sess);
-        
-        aid_t message_id = async_send_1(exch, NET_NIL_ADDR_CHANGED,
-            (sysarg_t) device_id, NULL);
-        int rc = async_data_write_start(exch, address, sizeof (nic_address_t));
-        
-        async_exchange_end(exch);
-        
-        sysarg_t res;
-    async_wait_for(message_id, &res);
-        
-    if (rc != EOK)
-                return rc;
-        
-    return (int) res;
-}
-
 int nil_device_req(async_sess_t *sess, nic_device_id_t device_id,
-    devman_handle_t handle, size_t mtu)
+    service_id_t sid, size_t mtu)
 {
         async_exch_t *exch = async_exchange_begin(sess);
         int rc = async_req_3_0(exch, NET_NIL_DEVICE, (sysarg_t) device_id,
-            (sysarg_t) handle, (sysarg_t) mtu);
+            (sysarg_t) sid, (sysarg_t) mtu);
         async_exchange_end(exch);
         return rc;