Changeset 77a69ea in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2012-01-21T15:06:51Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ce7676c

Parents:

e86b8f0

Message:

Allow multiple tasks to register for loc category change events.
Open NIC devices via location service, discover using category change events.
Eliminate device_added driver entry point.
loc_service_get_name() should return fully qualified service name.

File:

• uspace/srv/net/nil/eth/eth.c (modified) (7 diffs)

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

@@ -48 +48 @@
 #include <ipc/net.h>
 #include <ipc/services.h>
+#include <loc.h>
 #include <net/modules.h>
 #include <net_checksum.h>
@@ -226 +227 @@
  *
  * @param[in] device_id New device identifier.
- * @param[in] handle    Device driver handle.
+ * @param[in] sid       NIC service ID.
  * @param[in] mtu       Device maximum transmission unit.
  *
@@ -234 +235 @@
  *
  */
-static int eth_device_message(nic_device_id_t device_id, devman_handle_t handle,
+static int eth_device_message(nic_device_id_t device_id, service_id_t sid,
     size_t mtu)
 {
@@ -259 +260 @@
         device = eth_devices_find(&eth_globals.devices, device_id);
         if (device) {
-                if (device->handle != handle) {
+                if (device->sid != sid) {
                         printf("Device %d already exists\n", device->device_id);
                         fibril_rwlock_write_unlock(&eth_globals.devices_lock);
@@ -298 +299 @@
 
         device->device_id = device_id;
-        device->handle = handle;
+        device->sid = sid;
         device->flags = 0;
         if ((mtu > 0) && (mtu <= ETH_MAX_TAGGED_CONTENT(device->flags)))
@@ -335 +336 @@
         
         /* Bind the device driver */
-        device->sess = devman_device_connect(EXCHANGE_SERIALIZE, handle,
+        device->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid,
             IPC_FLAG_BLOCKING);
         if (device->sess == NULL) {
@@ -362 +363 @@
         }
         
-        printf("%s: Device registered (id: %d, handle: %zu: mtu: %zu, "
+        printf("%s: Device registered (id: %d, sid: %zu: mtu: %zu, "
             "mac: " PRIMAC ", flags: 0x%x)\n", NAME,
-            device->device_id, device->handle, device->mtu,
+            device->device_id, device->sid, device->mtu,
             ARGSMAC(device->addr.address), device->flags);