Changeset 3f0a7971 in mainline for uspace/srv/net/nil/nildummy/nildummy.c

Timestamp:

2010-11-18T22:34:23Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

63b4f90

Parents:

c7137738 (diff), 45f04f8 (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

Updated srv/hw/bus/usb/hcd/virtual to use new type names (devmap_handle_t).

File:

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

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

@@ -150 +150 @@
  *                      netif_get_addr_req() function.
  */
-static int
-nildummy_device_message(device_id_t device_id, services_t service, size_t mtu)
+static int nildummy_device_message(device_id_t device_id, services_t service,
+    size_t mtu)
 {
         nildummy_device_ref device;
@@ -159 +159 @@
         fibril_rwlock_write_lock(&nildummy_globals.devices_lock);
 
-        // an existing device?
+        /* An existing device? */
         device = nildummy_devices_find(&nildummy_globals.devices, device_id);
         if (device) {
@@ -169 +169 @@
                 }
                 
-                // update mtu
+                /* Update MTU */
                 if (mtu > 0)
                         device->mtu = mtu;
@@ -179 +179 @@
                 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
                 
-                // notify the upper layer module
+                /* Notify the upper layer module */
                 fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
                 if (nildummy_globals.proto.phone) {
@@ -191 +191 @@
         }
         
-        // create a new device
+        /* Create a new device */
         device = (nildummy_device_ref) malloc(sizeof(nildummy_device_t));
         if (!device)
@@ -203 +203 @@
                 device->mtu = NET_DEFAULT_MTU;
 
-        // bind the device driver
+        /* Bind the device driver */
         device->phone = netif_bind_service(device->service, device->device_id,
             SERVICE_ETHERNET, nildummy_receiver);
@@ -212 +212 @@
         }
         
-        // get hardware address
+        /* Get hardware address */
         rc = netif_get_addr_req(device->phone, device->device_id, &device->addr,
             &device->addr_data);
@@ -221 +221 @@
         }
         
-        // add to the cache
+        /* Add to the cache */
         index = nildummy_devices_add(&nildummy_globals.devices,
             device->device_id, device);
@@ -247 +247 @@
  *
  */
-static int
-nildummy_addr_message(device_id_t device_id, measured_string_ref *address)
+static int nildummy_addr_message(device_id_t device_id,
+    measured_string_ref *address)
 {
         nildummy_device_ref device;
@@ -279 +279 @@
  *
  */
-static int
-nildummy_packet_space_message(device_id_t device_id, size_t *addr_len,
+static int nildummy_packet_space_message(device_id_t device_id, size_t *addr_len,
     size_t *prefix, size_t *content, size_t *suffix)
 {
@@ -294 +293 @@
                 return ENOENT;
         }
+
         *content = device->mtu;
         fibril_rwlock_read_unlock(&nildummy_globals.devices_lock);
@@ -303 +303 @@
 }
 
-int
-nil_received_msg_local(int nil_phone, device_id_t device_id, packet_t packet,
-    services_t target)
+int nil_received_msg_local(int nil_phone, device_id_t device_id,
+    packet_t packet, services_t target)
 {
         packet_t next;
@@ -355 +354 @@
  * @return              EINVAL if the service parameter is not known.
  */
-static int
-nildummy_send_message(device_id_t device_id, packet_t packet, services_t sender)
+static int nildummy_send_message(device_id_t device_id, packet_t packet,
+    services_t sender)
 {
         nildummy_device_ref device;
@@ -366 +365 @@
                 return ENOENT;
         }
-        // send packet queue
+
+        /* Send packet queue */
         if (packet)
                 netif_send_msg(device->phone, device_id, packet,
@@ -374 +374 @@
 }
 
-int
-nil_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+int nil_message_standalone(const char *name, ipc_callid_t callid,
+    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
         measured_string_ref address;