Changeset 97c7682 in mainline for uspace/srv/locsrv/locsrv.h

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/srv/locsrv/locsrv.h (moved) (moved from uspace/srv/loc/loc.h ) (2 diffs)

uspace/srv/locsrv/locsrv.h

@@ -33 +33 @@
  */
 
-#ifndef LOC_H_
-#define LOC_H_
+#ifndef LOCSRV_H_
+#define LOCSRV_H_
 
 #include <ipc/loc.h>
@@ -86 +86 @@
         /** Link to global list of services (services_list) */
         link_t services;
+        
         /** Link to server list of services (loc_server_t.services) */
         link_t server_services;
+        
         /** Link to list of services in category (category_t.services) */
         link_t cat_services;
+        
         /** List of category memberships (svc_categ_t) */
         list_t cat_memb;
+        
         /** Unique service identifier */
         service_id_t id;
+        
         /** Service namespace */
         loc_namespace_t *namespace;
+        
         /** Service name */
         char *name;
+        
         /** Supplier of this service */
         loc_server_t *server;
+        
         /** Use this interface when forwarding to server. */
         sysarg_t forward_interface;