Changeset 7715994 in mainline for uspace/srv/net/structures/module_map.h

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/srv/net/structures/module_map.h (modified) (5 diffs)

uspace/srv/net/structures/module_map.h

@@ -60 +60 @@
  *  @see generic_char_map.h
  */
-GENERIC_CHAR_MAP_DECLARE( modules, module_t )
+GENERIC_CHAR_MAP_DECLARE(modules, module_t)
 
 /** Module structure.
@@ -67 +67 @@
         /** Module task identifier if running.
          */
-        task_id_t       task_id;
+        task_id_t task_id;
         /** Module service identifier.
          */
-        services_t      service;
+        services_t service;
         /** Module phone if running and connected.
          */
-        int                     phone;
+        int phone;
         /** Usage counter.
          */
-        int                     usage;
+        int usage;
         /** Module name.
          */
-        char *          name;
+        const char * name;
         /** Module full path filename.
          */
-        char *          filename;
+        const char * filename;
         /** Connecting function.
          */
-        connect_module_t *      connect_module;
+        connect_module_t * connect_module;
 };
 
@@ -99 +99 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int     add_module( module_ref * module, modules_ref modules, char * name, char * filename, services_t service, task_id_t task_id, connect_module_t * connect_module );
+int add_module(module_ref * module, modules_ref modules, const char * name, const char * filename, services_t service, task_id_t task_id, connect_module_t * connect_module);
 
 /** Searches and returns the specified module.
@@ -109 +109 @@
  *  @returns NULL if there is no such module.
  */
-module_ref      get_running_module( modules_ref modules, char * name );
+module_ref get_running_module(modules_ref modules, char * name);
 
 /** Starts the given module.
@@ -116 +116 @@
  *  @returns 0 if there is no such module.
  */
-task_id_t       spawn( char * fname );
+task_id_t spawn(const char * fname);
 
 #endif