Changeset b713ff80 in mainline

Timestamp:

2012-06-01T19:06:17Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d92c1ca

Parents:

77ad86c

Message:

cstyle (no change in functionality)

Location:

uspace/app

Files:

• tester/hw/misc/virtchar1.c (modified) (3 diffs)
• trace/proto.h (modified) (3 diffs)

uspace/app/tester/hw/misc/virtchar1.c

@@ -48 +48 @@
 #include "../../tester.h"
 
-#define DEVICE_PATH_NORMAL "/loc/devices/\\virt\\null\\a"
-#define BUFFER_SIZE 64
+#define DEVICE_PATH_NORMAL  "/loc/devices/\\virt\\null\\a"
+
+#define BUFFER_SIZE  64
 
 static const char *test_virtchar1_internal(const char *path)
@@ -65 +66 @@
         
         TPRINTF("   ...file handle %d\n", fd);
-
+        
         TPRINTF(" Asking for session...\n");
         async_sess_t *sess = fd_session(EXCHANGE_SERIALIZE, fd);
@@ -96 +97 @@
 
 const char *test_virtchar1(void)
-{;
-        const char *res;
-
-        res = test_virtchar1_internal(DEVICE_PATH_NORMAL);
-        if (res != NULL) {
+{
+        const char *res = test_virtchar1_internal(DEVICE_PATH_NORMAL);
+        if (res != NULL)
                 return res;
-        }
-
+        
         return NULL;
 }

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