Changeset 41ebc36 in mainline for uspace/drv

Timestamp:

2017-12-18T12:32:07Z (8 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

Location:

uspace/drv/bus/usb/usbdiag

Files:

• Makefile (modified) (1 diff)
• device.c (modified) (2 diffs)
• main.c (modified) (2 diffs)

uspace/drv/bus/usb/usbdiag/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../../../..
 
-LIBS = usbdiag usbdev usb drv
+LIBS = usbdev usb drv
 
 BINARY = usbdiag

uspace/drv/bus/usb/usbdiag/device.c

@@ -36 +36 @@
 #include <errno.h>
 #include <usb/debug.h>
-#include <usb/diag/iface.h>
+#include <usbdiag_iface.h>
 
 #include "device.h"
@@ -48 +48 @@
 }
 
-static usb_diag_iface_t diag_interface = {
+static usbdiag_iface_t diag_interface = {
         .test = some_test,
 };

uspace/drv/bus/usb/usbdiag/main.c

@@ -37 +37 @@
 #include <usb/debug.h>
 #include <usb/dev/driver.h>
-#include <usb/diag/diag.h>
+#include <usbdiag_iface.h>
 #include <str_error.h>
 
@@ -61 +61 @@
         }
 
-        if ((rc = ddf_fun_add_to_category(diag_dev->fun, USB_DIAG_CATEGORY))) {
+        if ((rc = ddf_fun_add_to_category(diag_dev->fun, USBDIAG_CATEGORY))) {
                 usb_log_error("Failed add DDF to category '"
-                    USB_DIAG_CATEGORY "': %s.\n", str_error(rc));
+                    USBDIAG_CATEGORY "': %s.\n", str_error(rc));
                 goto err_bind;
         }