Changeset 4c53333 in mainline for uspace/app/usbinfo/list.c

Timestamp:

2013-07-11T08:21:10Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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/usbinfo/list.c (moved) (moved from uspace/app/lsusb/main.c ) (6 diffs)

uspace/app/usbinfo/list.c

@@ -40 +40 @@
 #include <errno.h>
 #include <str_error.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <getopt.h>
 #include <devman.h>
@@ -47 +47 @@
 #include <usb/hc.h>
 
-#define NAME "lsusb"
+#include "usbinfo.h"
 
 #define MAX_USB_ADDRESS USB11_ADDRESS_MAX
@@ -90 +90 @@
 }
 
-int main(int argc, char *argv[])
+void list(void)
 {
         category_id_t usbhc_cat;
@@ -102 +102 @@
                 printf(NAME ": Error resolving category '%s'",
                     USB_HC_CATEGORY);
-                return 1;
+                return;
         }
 
@@ -108 +108 @@
         if (rc != EOK) {
                 printf(NAME ": Error getting list of host controllers.\n");
-                return 1;
+                return;
         }
 
@@ -131 +131 @@
 
         free(svcs);
-
-        return 0;
 }