Changeset 58563585 in mainline for uspace/app

Timestamp:

2016-08-31T11:15:39Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

10cb47e

Parents:

7a67416

Message:

code review and cstyle cleanup (no change in functionality)

Location:

uspace/app/usbinfo

Files:

• info.c (modified) (4 diffs)
• list.c (modified) (1 diff)
• usbinfo.h (modified) (3 diffs)

uspace/app/usbinfo/info.c

@@ -93 +93 @@
         init_match_ids(&matches);
         usb_device_create_match_ids_from_device_descriptor(
-                &usb_device_descriptors(usb_dev)->device, &matches);
+            &usb_device_descriptors(usb_dev)->device, &matches);
         printf("%sDevice match ids (0x%04x by 0x%04x, %s)\n", get_indent(0),
             usb_device_descriptors(usb_dev)->device.product_id,
@@ -229 +229 @@
 {
         dump_descriptor_tree_callback(
-            (const uint8_t *)&usb_device_descriptors(usb_dev)->device,
+            (const uint8_t *) &usb_device_descriptors(usb_dev)->device,
             (size_t) -1, NULL);
 
@@ -242 +242 @@
 {
         dump_descriptor_tree_callback(
-            (const uint8_t *)&usb_device_descriptors(usb_dev)->device,
+            (const uint8_t *) &usb_device_descriptors(usb_dev)->device,
             (size_t) -1, usb_dev);
 
@@ -296 +296 @@
         uint64_t str_mask = 0;
         find_string_indexes_callback(
-            (const uint8_t *)&usb_device_descriptors(usb_dev)->device, 0,
+            (const uint8_t *) &usb_device_descriptors(usb_dev)->device, 0,
             &str_mask);
 

uspace/app/usbinfo/list.c

@@ -148 +148 @@
         }
 
-        for (unsigned i = 0; i < count; ++i) {
+        for (unsigned int i = 0; i < count; ++i) {
                 print_usb_bus(svcs[i]);
         }

uspace/app/usbinfo/usbinfo.h

@@ -44 +44 @@
 typedef struct {
         int opt;
-        void (*action)(usb_device_t *usb_dev);
+        void (*action)(usb_device_t *);
         bool active;
 } usbinfo_action_t;
@@ -51 +51 @@
 #define NAME "usbinfo"
 
-void dump_buffer(const char *, size_t, const uint8_t *, size_t);
-const char *get_indent(size_t);
-void dump_match_ids(match_id_list_t *, const char *);
-void dump_usb_descriptor(uint8_t *, size_t);
-void dump_descriptor_tree(uint8_t *, size_t);
+extern void dump_buffer(const char *, size_t, const uint8_t *, size_t);
+extern const char *get_indent(size_t);
+extern void dump_match_ids(match_id_list_t *, const char *);
+extern void dump_usb_descriptor(uint8_t *, size_t);
+extern void dump_descriptor_tree(uint8_t *, size_t);
 
 static inline void internal_error(int err)
@@ -63 +63 @@
 
 typedef void (*dump_descriptor_in_tree_t)(const uint8_t *, size_t, void *);
-void browse_descriptor_tree(uint8_t *, size_t, usb_dp_descriptor_nesting_t *,
-    dump_descriptor_in_tree_t, size_t, void *);
 
-void list(void);
+extern void browse_descriptor_tree(uint8_t *, size_t,
+    usb_dp_descriptor_nesting_t *, dump_descriptor_in_tree_t, size_t, void *);
 
-void dump_short_device_identification(usb_device_t *);
-void dump_device_match_ids(usb_device_t *);
-void dump_descriptor_tree_brief(usb_device_t *);
-void dump_descriptor_tree_full(usb_device_t *);
-void dump_strings(usb_device_t *);
-void dump_status(usb_device_t *);
-void dump_hidreport_raw(usb_device_t *);
-void dump_hidreport_usages(usb_device_t *);
+extern void list(void);
+
+extern void dump_short_device_identification(usb_device_t *);
+extern void dump_device_match_ids(usb_device_t *);
+extern void dump_descriptor_tree_brief(usb_device_t *);
+extern void dump_descriptor_tree_full(usb_device_t *);
+extern void dump_strings(usb_device_t *);
+extern void dump_status(usb_device_t *);
+extern void dump_hidreport_raw(usb_device_t *);
+extern void dump_hidreport_usages(usb_device_t *);
 
 #endif