Changeset 41ebc36 in mainline for uspace/app/tmon/test.c

Timestamp:

2017-12-18T12:32:07Z (6 years ago)

Author:

Petr Mánek <petr.manek@…>

Branches:

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

Children:

7faf0f0

Parents:

fc338e0

Message:

usbdiag: move contents of libusbdiag to libdrv, registered usbdiag interface into the master routing table, repaired broken references

File:

• uspace/app/tmon/test.c (modified) (4 diffs)

uspace/app/tmon/test.c

@@ -40 +40 @@
 #include <errno.h>
 #include <str_error.h>
-#include <usb/diag/diag.h>
-#include <usb/diag/iface.h>
+#include <usbdiag_iface.h>
 #include "commands.h"
 
@@ -53 +52 @@
         int rc;
 
-        if ((rc = loc_category_get_id(USB_DIAG_CATEGORY, &diag_cat, 0))) {
-                printf(NAME ": Error resolving category '%s'", USB_DIAG_CATEGORY);
+        if ((rc = loc_category_get_id(USBDIAG_CATEGORY, &diag_cat, 0))) {
+                printf(NAME ": Error resolving category '%s'", USBDIAG_CATEGORY);
                 return rc;
         }
@@ -116 +115 @@
 
 static int bulk_worker(devman_handle_t fun) {
-        async_sess_t *sess = usb_diag_connect(fun);
+        async_sess_t *sess = usbdiag_connect(fun);
         async_exch_t *exch = async_exchange_begin(sess);
 
         // TODO: do some testing
         int y;
-        int rc = usb_diag_test(exch, 4200, &y);
+        int rc = usbdiag_test(exch, 4200, &y);
 
         if (rc) {
@@ -130 +129 @@
 
         async_exchange_end(exch);
-        usb_diag_disconnect(sess);
+        usbdiag_disconnect(sess);
         return 0;
 }