Changeset 89c57b6 in mainline for uspace/lib/net/nil/nil_remote.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/lib/net/nil/nil_remote.c (modified) (4 diffs)

uspace/lib/net/nil/nil_remote.c

@@ -27 +27 @@
  */
 
-/** @addtogroup net_nil
+/** @addtogroup libnet
  * @{
  */
@@ -33 +33 @@
 /** @file
  * Network interface layer interface implementation for remote modules.
- * @see nil_interface.h
+ * @see nil_remote.h
  */
 
-#include <net_messages.h>
-#include <net_device.h>
-#include <nil_interface.h>
-#include <packet/packet.h>
-#include <packet/packet_client.h>
-#include <nil_messages.h>
 #include <nil_remote.h>
+#include <generic.h>
+#include <net/device.h>
+#include <net/packet.h>
+#include <packet_client.h>
+#include <ipc/nil.h>
 
 /** Notify the network interface layer about the device state change.
  *
- * @param[in] nil_phone The network interface layer phone.
- * @param[in] device_id The device identifier.
- * @param[in] state     The new device state.
+ * @param[in] nil_phone Network interface layer phone.
+ * @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.
+ * @return Other error codes as defined for each specific module
+ *         device state function.
  *
  */
-int nil_device_state_msg_remote(int nil_phone, device_id_t device_id, int state)
+int nil_device_state_msg(int nil_phone, device_id_t device_id, int state)
 {
         return generic_device_state_msg_remote(nil_phone, NET_NIL_DEVICE_STATE,
@@ -66 +65 @@
  * upper layers.
  *
- * @param[in] nil_phone The network interface layer phone.
- * @param[in] device_id The source device identifier.
- * @param[in] packet    The received packet or the received packet queue.
- * @param     target    The target service. Ignored parameter.
+ * @param[in] nil_phone Network interface layer phone.
+ * @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.
@@ -76 +75 @@
  *
  */
-int nil_received_msg_remote(int nil_phone, device_id_t device_id,
-    packet_t packet, services_t target)
+int nil_received_msg(int nil_phone, device_id_t device_id,
+    packet_t *packet, services_t target)
 {
-        return generic_received_msg_remote(nil_phone, NET_NIL_RECEIVED, device_id,
-            packet_get_id(packet), target, 0);
+        return generic_received_msg_remote(nil_phone, NET_NIL_RECEIVED,
+            device_id, packet_get_id(packet), target, 0);
 }