Changeset e28175d in mainline for uspace/app/usbinfo

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

Location:

uspace/app/usbinfo

Files:

• Makefile (deleted)
• main.c (modified) (1 diff)
• meson.build (moved) (moved from uspace/drv/test/test1/Makefile ) (1 diff)

uspace/app/usbinfo/main.c

@@ -69 +69 @@
         _OPTION("-S --status", "Get status of the device.");
         _OPTION("-r --hid-report", "Dump HID report descriptor.");
-        _OPTION("-r --hid-report-usages", "Dump usages of HID report.");
+        _OPTION("-R --hid-report-usages", "Dump usages of HID report.");
 
         printf("\n");

uspace/app/usbinfo/meson.build

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../../..
-LIBS = drv
-BINARY = test1
-
-SOURCES = \
-        test1.c
-
-include $(USPACE_PREFIX)/Makefile.common
+deps = [ 'usbhid', 'usbdev', 'usb', 'drv' ]
+src = files(
+        'desctree.c',
+        'dump.c',
+        'hid.c',
+        'info.c',
+        'list.c',
+        'main.c',
+)