Changeset 77a69ea in mainline for uspace/lib

Timestamp:

2012-01-21T15:06:51Z (14 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.

Location:

uspace/lib

Files:

• c/include/ipc/devman.h (modified) (1 diff)
• c/include/ipc/net.h (modified) (1 diff)
• c/include/ipc/net_net.h (modified) (1 diff)
• drv/generic/driver.c (modified) (2 diffs)
• drv/include/ddf/driver.h (modified) (1 diff)
• net/generic/net_remote.c (modified) (1 diff)
• net/include/net_interface.h (modified) (1 diff)
• net/include/nil_remote.h (modified) (1 diff)
• net/nil/nil_remote.c (modified) (2 diffs)
• nic/include/nic.h (modified) (1 diff)
• nic/src/nic_driver.c (modified) (2 diffs)
• nic/src/nic_impl.c (modified) (1 diff)

uspace/lib/c/include/ipc/devman.h

@@ -146 +146 @@
 typedef enum {
         DRIVER_DEV_ADD = IPC_FIRST_USER_METHOD,
-        DRIVER_DEV_ADDED,
         DRIVER_DEV_REMOVE,
         DRIVER_DEV_GONE,

uspace/lib/c/include/ipc/net.h

@@ -305 +305 @@
  *
  */
-#define IPC_GET_DEVICE_HANDLE(call)  ((devman_handle_t) IPC_GET_ARG2(call))
+#define IPC_GET_DEVICE_HANDLE(call)  ((service_id_t) IPC_GET_ARG2(call))
 
 /** Return the device driver service message argument.

uspace/lib/c/include/ipc/net_net.h

@@ -54 +54 @@
         NET_NET_GET_DEVICES_COUNT,
         /** Return names and device IDs of all devices */
-        NET_NET_GET_DEVICES,
-        /** Notify the networking service about a ready device */
-        NET_NET_DRIVER_READY
+        NET_NET_GET_DEVICES
 } net_messages;
 

uspace/lib/drv/generic/driver.c

@@ -303 +303 @@
 }
 
-static void driver_dev_added(ipc_callid_t iid, ipc_call_t *icall)
-{
-        fibril_mutex_lock(&devices_mutex);
-        ddf_dev_t *dev = driver_get_device(IPC_GET_ARG1(*icall));
-        fibril_mutex_unlock(&devices_mutex);
-        
-        if (dev != NULL && driver->driver_ops->device_added != NULL)
-                driver->driver_ops->device_added(dev);
-}
-
 static void driver_dev_remove(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -460 +450 @@
                 case DRIVER_DEV_ADD:
                         driver_dev_add(callid, &call);
-                        break;
-                case DRIVER_DEV_ADDED:
-                        async_answer_0(callid, EOK);
-                        driver_dev_added(callid, &call);
                         break;
                 case DRIVER_DEV_REMOVE:

uspace/lib/drv/include/ddf/driver.h

@@ -145 +145 @@
         /** Ask driver to offline a specific function */
         int (*fun_offline)(ddf_fun_t *);
-
-        /**
-         * Notification that the device was succesfully added.
-         * The driver can do any blocking operation without
-         * blocking the device manager.
-         *
-         * XXX REMOVE THIS
-         */
-        void (*device_added)(ddf_dev_t *dev);
 } driver_ops_t;
 

uspace/lib/net/generic/net_remote.c

@@ -167 +167 @@
 }
 
-int net_driver_ready(async_sess_t *sess, devman_handle_t handle)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        int rc = async_req_1_0(exch, NET_NET_DRIVER_READY, handle);
-        async_exchange_end(exch);
-        
-        return rc;
-}
-
 /** @}
  */

uspace/lib/net/include/net_interface.h

@@ -52 +52 @@
 extern int net_get_devices_req(async_sess_t *, measured_string_t **, size_t *,
     uint8_t **);
-extern int net_driver_ready(async_sess_t *, devman_handle_t);
 extern async_sess_t *net_connect_module(void);
 

uspace/lib/net/include/nil_remote.h

@@ -34 +34 @@
 #define __NET_NIL_REMOTE_H__
 
+#include <ipc/loc.h>
 #include <net/device.h>
 #include <net/packet.h>

uspace/lib/net/nil/nil_remote.c

@@ -36 +36 @@
  */
 
+#include <ipc/loc.h>
 #include <nil_remote.h>
 #include <generic.h>
@@ -123 +124 @@
 
 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;

uspace/lib/nic/include/nic.h

@@ -219 +219 @@
 extern void nic_set_poll_handlers(nic_t *,
         poll_mode_change_handler, poll_request_handler);
-
-/* Functions called in device_added */
-extern int nic_ready(nic_t *);
 
 /* General driver functions */

uspace/lib/nic/src/nic_driver.c

@@ -89 +89 @@
     nic_iface_t *iface)
 {
-        if (driver_ops) {
-                if (!driver_ops->device_added)
-                        driver_ops->device_added = nic_device_added_impl;
-        }
-
         if (dev_ops) {
                 if (!dev_ops->open)
@@ -464 +459 @@
 }
 
-/** Notify the NET service that the device is ready
- *
- * @param nic NICF structure
- *
- * @return EOK on success
- *
- */
-int nic_ready(nic_t *nic)
-{
-        fibril_rwlock_read_lock(&nic->main_lock);
-        
-        async_sess_t *session = nic->net_session;
-        devman_handle_t handle = nic->dev->handle;
-        
-        fibril_rwlock_read_unlock(&nic->main_lock);
-        
-        if (session == NULL)
-                return EINVAL;
-        
-        return net_driver_ready(session, handle);
-}
-
 /** Inform the NICF about poll mode
  *

uspace/lib/nic/src/nic_impl.c

@@ -805 +805 @@
 }
 
-/** Default implementation of the device_added method
- *
- * Just calls nic_ready.
- *
- * @param dev
- *
- */
-void nic_device_added_impl(ddf_dev_t *dev)
-{
-        nic_ready((nic_t *) dev->driver_data);
-}
-
 /**
  * Default handler for unknown methods (outside of the NIC interface).