Changeset 64d138b in mainline for uspace/lib

Timestamp:

2017-12-15T17:21:49Z (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:

73b0773

Parents:

a8723748

Message:

usbdiag: finalize IPC ops for tmon, simple demo waiting for test

Location:

uspace/lib

Files:

• c/include/ipc/dev_iface.h (modified) (2 diffs)
• usbdiag/Makefile (modified) (1 diff)
• usbdiag/include/usb/diag/diag.h (modified) (1 diff)
• usbdiag/include/usb/diag/iface.h (moved) (moved from uspace/lib/usbdiag/src/test.c ) (1 diff)
• usbdiag/src/remote_usbdiag.c (added)

uspace/lib/c/include/ipc/dev_iface.h

@@ -44 +44 @@
         /** Audio device pcm buffer interface */
         AUDIO_PCM_BUFFER_IFACE,
-        
+
         /** Network interface controller interface */
         NIC_DEV_IFACE,
-                
+
         /** IEEE 802.11 interface controller interface */
         IEEE80211_DEV_IFACE,
-        
+
         /** Interface provided by any PCI device. */
         PCI_DEV_IFACE,
@@ -56 +56 @@
         /** Interface provided by any USB device. */
         USB_DEV_IFACE,
+        /** Interface provided by USB diagnostic devices. */
+        USBDIAG_DEV_IFACE,
         /** Interface provided by USB host controller to USB device. */
         USBHC_DEV_IFACE,

uspace/lib/usbdiag/Makefile

@@ -32 +32 @@
 
 SOURCES = \
-        src/test.c
+        src/remote_usbdiag.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usbdiag/include/usb/diag/diag.h

@@ -36 +36 @@
 #define LIBUSBDIAG_DIAG_H_
 
-#include <ipc/common.h>
-
-typedef enum {
-  USB_DIAG_IN_TEST = IPC_FIRST_USER_METHOD,
-} usb_diag_in_request_t;
-
-/** Just a dummy symbol to make compiler happy. TODO: remove it */
-int usb_diag_test(int, int*);
+#define USB_DIAG_CATEGORY "usbdiag"
 
 #endif

uspace/lib/usbdiag/include/usb/diag/iface.h

@@ -31 +31 @@
  */
 /** @file
- * Testing stuff
+ * @brief USB diagnostic device communication interface.
  */
+#ifndef LIBUSBDIAG_IFACE_H_
+#define LIBUSBDIAG_IFACE_H_
 
 #include <async.h>
-#include <usb/diag/diag.h>
+#include <ddf/driver.h>
 
-int usb_diag_test(int x, int *out)
-{
-        sysarg_t _out;
-        async_sess_t *session = NULL;
-        async_exch_t *exch = async_exchange_begin(session);
-        const int rc = async_req_1_1(exch, USB_DIAG_IN_TEST, x, &_out);
-        async_exchange_end(exch);
+async_sess_t *usb_diag_connect(devman_handle_t);
+void usb_diag_disconnect(async_sess_t*);
+int usb_diag_test(async_exch_t*, int, int*);
 
-        if (out)
-                *out = (int) _out;
+/** USB diagnostic device communication interface. */
+typedef struct {
+        int (*test)(ddf_fun_t*, int, int*);
+} usb_diag_iface_t;
 
-        return rc;
-}
-
+#endif
 /**
  * @}