Changeset e6a78b9 in mainline for uspace/app/trace/proto.h

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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/app/trace/proto.h (modified) (3 diffs)

uspace/app/trace/proto.h

@@ -44 +44 @@
 typedef struct {
         const char *name;
-
+        
         int argc;
         val_type_t arg_type[OPER_MAX_ARGS];
-
+        
         val_type_t rv_type;
-
+        
         int respc;
         val_type_t resp_type[OPER_MAX_ARGS];
@@ -57 +57 @@
         /** Protocol name */
         const char *name;
-
+        
         /** Maps method number to operation */
         hash_table_t method_oper;
@@ -65 +65 @@
 extern hash_table_t srv_proto;
 
-void proto_init(void);
-void proto_cleanup(void);
+extern void proto_init(void);
+extern void proto_cleanup(void);
 
-void proto_register(int srv, proto_t *proto);
-proto_t *proto_get_by_srv(int srv);
-proto_t *proto_new(const char *name);
-void proto_delete(proto_t *proto);
-void proto_add_oper(proto_t *proto, int method, oper_t *oper);
-oper_t *proto_get_oper(proto_t *proto, int method);
+extern void proto_register(int, proto_t *);
+extern proto_t *proto_get_by_srv(int);
+extern proto_t *proto_new(const char *);
+extern void proto_delete(proto_t *);
+extern void proto_add_oper(proto_t *, int, oper_t *);
+extern oper_t *proto_get_oper(proto_t *, int);
 
-oper_t *oper_new(const char *name, int argc, val_type_t *arg_types,
-    val_type_t rv_type, int respc, val_type_t *resp_types);
-
-
+extern oper_t *oper_new(const char *, int, val_type_t *, val_type_t, int,
+    val_type_t *);
 
 #endif