Changeset 76f566d in mainline

Timestamp:

2018-07-05T09:32:27Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

984a9ba

Parents:

5e904dd

Message:

coding style improvements (no change in functionality)

Files:

• abi/include/abi/cap.h (modified) (2 diffs)
• uspace/app/trace/ipcp.h (modified) (1 diff)
• uspace/lib/usbhost/include/usb/host/ddf_helpers.h (modified) (1 diff)
• uspace/srv/fs/tmpfs/tmpfs.c (modified) (6 diffs)

abi/include/abi/cap.h

@@ -36 +36 @@
 #define ABI_CAP_H_
 
-#define CAP_NIL         0
+#define CAP_NIL  0
 
-#define CAP_HANDLE_VALID(handle)        ((handle) != CAP_NIL)
-#define CAP_HANDLE_RAW(handle)          ((intptr_t) (handle))
+#define CAP_HANDLE_VALID(handle)  ((handle) != CAP_NIL)
+#define CAP_HANDLE_RAW(handle)    ((intptr_t) (handle))
 
 typedef void *cap_handle_t;
@@ -45 +45 @@
 typedef struct {
 } *cap_call_handle_t;
+
 typedef struct {
 } *cap_phone_handle_t;
+
 typedef struct {
 } *cap_irq_handle_t;

uspace/app/trace/ipcp.h

@@ -38 +38 @@
 #include "proto.h"
 
-void ipcp_init(void);
-void ipcp_cleanup(void);
+extern void ipcp_init(void);
+extern void ipcp_cleanup(void);
 
-void ipcp_call_out(cap_phone_handle_t, ipc_call_t *, cap_call_handle_t);
-void ipcp_call_sync(cap_phone_handle_t, ipc_call_t *call, ipc_call_t *answer);
-void ipcp_call_in(ipc_call_t *call, cap_call_handle_t);
-void ipcp_hangup(cap_phone_handle_t, errno_t);
+extern void ipcp_call_out(cap_phone_handle_t, ipc_call_t *, cap_call_handle_t);
+extern void ipcp_call_sync(cap_phone_handle_t, ipc_call_t *, ipc_call_t *);
+extern void ipcp_call_in(ipc_call_t *, cap_call_handle_t);
+extern void ipcp_hangup(cap_phone_handle_t, errno_t);
 
-void ipcp_connection_set(cap_phone_handle_t, int server, proto_t *proto);
-void ipcp_connection_clear(cap_phone_handle_t);
+extern void ipcp_connection_set(cap_phone_handle_t, int, proto_t *);
+extern void ipcp_connection_clear(cap_phone_handle_t);
 
 #endif

uspace/lib/usbhost/include/usb/host/ddf_helpers.h

@@ -46 +46 @@
 
 
-errno_t hcd_ddf_setup_hc(ddf_dev_t *, size_t);
-void hcd_ddf_clean_hc(hc_device_t *);
+extern errno_t hcd_ddf_setup_hc(ddf_dev_t *, size_t);
+extern void hcd_ddf_clean_hc(hc_device_t *);
 
+extern device_t *hcd_ddf_fun_create(hc_device_t *, usb_speed_t);
+extern void hcd_ddf_fun_destroy(device_t *);
 
-device_t *hcd_ddf_fun_create(hc_device_t *, usb_speed_t);
-void hcd_ddf_fun_destroy(device_t *);
+extern errno_t hcd_ddf_setup_match_ids(device_t *,
+    usb_standard_device_descriptor_t *);
 
-errno_t hcd_ddf_setup_match_ids(device_t *, usb_standard_device_descriptor_t *);
-
-errno_t hcd_ddf_enable_interrupt(hc_device_t *hcd, int);
-errno_t hcd_ddf_get_registers(hc_device_t *hcd, hw_res_list_parsed_t *hw_res);
-
-void hcd_ddf_gen_irq_handler(cap_call_handle_t icall_handle, ipc_call_t *call, ddf_dev_t *dev);
+extern errno_t hcd_ddf_enable_interrupt(hc_device_t *, int);
+extern errno_t hcd_ddf_get_registers(hc_device_t *, hw_res_list_parsed_t *);
 
 #endif

uspace/srv/fs/tmpfs/tmpfs.c

@@ -53 +53 @@
 #include "../../vfs/vfs.h"
 
-#define NAME "tmpfs"
-
+#define NAME  "tmpfs"
 
 vfs_info_t tmpfs_vfs_info = {
@@ -65 +64 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS TMPFS file system server\n");
+        printf("%s: HelenOS TMPFS file system server\n", NAME);
 
         if (argc == 3) {
@@ -71 +70 @@
                         tmpfs_vfs_info.instance = strtol(argv[2], NULL, 10);
                 else {
-                        printf(NAME " Unrecognized parameters");
+                        printf("%s: Unrecognized parameters", NAME);
                         return -1;
                 }
@@ -77 +76 @@
 
         if (!tmpfs_init()) {
-                printf(NAME ": failed to initialize TMPFS\n");
+                printf("%s: Failed to initialize TMPFS\n", NAME);
                 return -1;
         }
@@ -84 +83 @@
             INTERFACE_VFS_DRIVER, 0);
         if (!vfs_sess) {
-                printf(NAME ": Unable to connect to VFS\n");
+                printf("%s: Unable to connect to VFS\n", NAME);
                 return -1;
         }
@@ -91 +90 @@
             &tmpfs_libfs_ops);
         if (rc != EOK) {
-                printf(NAME ": Failed to register file system: %s\n", str_error(rc));
+                printf("%s: Failed to register file system: %s\n", NAME,
+                    str_error(rc));
                 return rc;
         }
 
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
         task_retval(0);
         async_manager();