Changeset f51f193 in mainline for uspace/lib/net/adt/module_map.c

Timestamp:

2011-07-12T03:00:14Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

6817eba

Parents:

eca52a8 (diff), 026793d (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/adt/module_map.c (modified) (6 diffs)

uspace/lib/net/adt/module_map.c

@@ -39 +39 @@
 #include <unistd.h>
 #include <errno.h>
-
-#include <ipc/services.h>
-
 #include <net/modules.h>
-
 #include <adt/generic_char_map.h>
 #include <adt/module_map.h>
@@ -49 +45 @@
 GENERIC_CHAR_MAP_IMPLEMENT(modules, module_t)
 
-/** Adds module to the module map.
+/** Add module to the module map.
  *
- * @param[out] module   The module structure added.
- * @param[in] modules   The module map.
- * @param[in] name      The module name.
- * @param[in] filename  The full path filename.
- * @param[in] service   The module service.
- * @param[in] task_id   The module current task identifier. Zero means not
- *                      running.
- * @param[in] connect_module The module connecting function.
- * @return              EOK on success.
- * @return              ENOMEM if there is not enough memory left.
+ * @param[out] module         Module structure added.
+ * @param[in]  modules        Module map.
+ * @param[in]  name           Module name.
+ * @param[in]  filename       Full path filename.
+ * @param[in]  service        Module service.
+ * @param[in]  task_id        Module current task identifier.
+ *                            Zero means not running.
+ * @param[in]  connect_module Module connecting function.
+ *
+ * @return EOK on success.
+ * @return ENOMEM if there is not enough memory left.
+ *
  */
-int
-add_module(module_t **module, modules_t *modules, const uint8_t *name,
+int add_module(module_t **module, modules_t *modules, const uint8_t *name,
     const uint8_t *filename, services_t service, task_id_t task_id,
     connect_module_t connect_module)
@@ -69 +66 @@
         module_t *tmp_module;
         int rc;
-
+        
         tmp_module = (module_t *) malloc(sizeof(module_t));
         if (!tmp_module)
                 return ENOMEM;
-
+        
         tmp_module->task_id = task_id;
-        tmp_module->phone = 0;
+        tmp_module->sess = NULL;
         tmp_module->usage = 0;
         tmp_module->name = name;
@@ -81 +78 @@
         tmp_module->service = service;
         tmp_module->connect_module = connect_module;
-
+        
         rc = modules_add(modules, tmp_module->name, 0, tmp_module);
         if (rc != EOK) {
@@ -87 +84 @@
                 return rc;
         }
+        
         if (module)
                 *module = tmp_module;
-
+        
         return EOK;
 }
 
-/** Searches and returns the specified module.
+/** Search and return the specified module.
  *
  * If the module is not running, the module filaname is spawned.
  * If the module is not connected, the connect_function is called.
  *
- * @param[in] modules   The module map.
- * @param[in] name      The module name.
- * @return              The running module found. It does not have to be
- *                      connected.
- * @return              NULL if there is no such module.
+ * @param[in] modules Module map.
+ * @param[in] name    Module name.
+ *
+ * @return The running module found. It does not have to be
+ *         connected.
+ * @return NULL if there is no such module.
+ *
  */
 module_t *get_running_module(modules_t *modules, uint8_t *name)
 {
-        module_t *module;
-
-        module = modules_find(modules, name, 0);
+        module_t *module = modules_find(modules, name, 0);
         if (!module)
                 return NULL;
-
+        
         if (!module->task_id) {
                 module->task_id = net_spawn(module->filename);
@@ -117 +115 @@
                         return NULL;
         }
-        if (!module->phone)
-                module->phone = module->connect_module(module->service);
-
+        
+        if (!module->sess)
+                module->sess = module->connect_module(module->service);
+        
         return module;
 }