Changeset b5e68c8 in mainline for uspace/lib/net/include/adt/module_map.h

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/include/adt/module_map.h (modified) (2 diffs)

uspace/lib/net/include/adt/module_map.h

@@ -48 +48 @@
 typedef struct module_struct module_t;
 
-/** Type definition of the module structure pointer.
- * @see module_struct
- */
-typedef module_t *module_ref;
-
 /** Module map.
  * Sorted by module names.
@@ -70 +65 @@
         int usage;
         /** Module name. */
-        const char *name;
+        const uint8_t *name;
         /** Module full path filename. */
-        const char *filename;
+        const uint8_t *filename;
         /** Connecting function. */
         connect_module_t *connect_module;
 };
 
-extern int add_module(module_ref *, modules_ref, const char *, const char *,
-    services_t, task_id_t, connect_module_t *);
-extern module_ref get_running_module(modules_ref, char *);
-extern task_id_t spawn(const char *);
+extern int add_module(module_t **, modules_t *, const uint8_t *,
+    const uint8_t *, services_t, task_id_t, connect_module_t *);
+extern module_t *get_running_module(modules_t *, uint8_t *);
+extern task_id_t net_spawn(const uint8_t *);
 
 #endif