Changeset 32eceb4f in mainline for uspace/srv/net/nil/nildummy/nildummy.c

Timestamp:

2010-11-20T22:30:36Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cb59f787

Parents:

1b22bd4 (diff), 7e1f9b7 (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/net/nil/nildummy/nildummy.c (modified) (9 diffs)

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

@@ -106 +106 @@
 static void nildummy_receiver(ipc_callid_t iid, ipc_call_t *icall)
 {
-        packet_t packet;
+        packet_t *packet;
         int rc;
 
@@ -142 +142 @@
  * @param[in] service   The device driver service.
  * @param[in] mtu       The device maximum transmission unit.
- * @returns             EOK on success.
- * @returns             EEXIST if the device with the different service exists.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             Other error codes as defined for the
+ * @return              EOK on success.
+ * @return              EEXIST if the device with the different service exists.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              Other error codes as defined for the
  *                      netif_bind_service() function.
- * @returns             Other error codes as defined for the
+ * @return              Other error codes as defined for the
  *                      netif_get_addr_req() function.
  */
@@ -153 +153 @@
     size_t mtu)
 {
-        nildummy_device_ref device;
+        nildummy_device_t *device;
         int index;
         int rc;
@@ -192 +192 @@
         
         /* Create a new device */
-        device = (nildummy_device_ref) malloc(sizeof(nildummy_device_t));
+        device = (nildummy_device_t *) malloc(sizeof(nildummy_device_t));
         if (!device)
                 return ENOMEM;
@@ -248 +248 @@
  */
 static int nildummy_addr_message(device_id_t device_id,
-    measured_string_ref *address)
-{
-        nildummy_device_ref device;
+    measured_string_t **address)
+{
+        nildummy_device_t *device;
 
         if (!address)
@@ -282 +282 @@
     size_t *prefix, size_t *content, size_t *suffix)
 {
-        nildummy_device_ref device;
+        nildummy_device_t *device;
 
         if (!addr_len || !prefix || !content || !suffix)
@@ -304 +304 @@
 
 int nil_received_msg_local(int nil_phone, device_id_t device_id,
-    packet_t packet, services_t target)
-{
-        packet_t next;
+    packet_t *packet, services_t target)
+{
+        packet_t *next;
 
         fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
@@ -354 +354 @@
  * @return              EINVAL if the service parameter is not known.
  */
-static int nildummy_send_message(device_id_t device_id, packet_t packet,
+static int nildummy_send_message(device_id_t device_id, packet_t *packet,
     services_t sender)
 {
-        nildummy_device_ref device;
+        nildummy_device_t *device;
 
         fibril_rwlock_read_lock(&nildummy_globals.devices_lock);
@@ -377 +377 @@
     ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
-        measured_string_ref address;
-        packet_t packet;
+        measured_string_t *address;
+        packet_t *packet;
         size_t addrlen;
         size_t prefix;