Changeset a8723748 in mainline

Timestamp:

2017-12-15T10:55:09Z (7 years ago)

Author:

Petr Mánek <petr.manek@…>

Branches:

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

Children:

64d138b

Parents:

837d53d

Message:

usbdiag: add server, dummy stubs and skeletons

Location:

uspace

Files:

• app/tmon/main.c (modified) (1 diff)
• drv/bus/usb/usbdiag/Makefile (modified) (1 diff)
• drv/bus/usb/usbdiag/main.c (modified) (5 diffs)
• lib/usbdiag/Makefile (modified) (1 diff)
• lib/usbdiag/include/usb/diag/diag.h (modified) (1 diff)
• lib/usbdiag/src/test.c (modified) (1 diff)

uspace/app/tmon/main.c

@@ -52 +52 @@
         }
 
-        printf("The number is %d.\n", usb_diag_test(0));
+        int out;
+        const int rc = usb_diag_test(0, &out);
+        if (rc) {
+                printf("Error: %d\n", rc);
+        } else {
+                printf("The number is %d.\n", out);
+        }
 
         return 0;

uspace/drv/bus/usb/usbdiag/Makefile

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

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

@@ -32 +32 @@
 /**
  * @file
- * Main routines of USB debug device driver.
+ * Main routines of USB diagnostic device driver.
  */
 #include <errno.h>
 #include <usb/debug.h>
 #include <usb/dev/driver.h>
+#include <usb/diag/diag.h>
 
 #include "usbdiag.h"
@@ -42 +43 @@
 
 #define NAME "usbdiag"
+
+static void usb_diag_test_impl(ipc_callid_t rid, ipc_call_t *request)
+{
+        int x = IPC_GET_ARG1(*request);
+        int ret = 4200 + x;
+        async_answer_0(rid, ret);
+}
 
 static int device_add(usb_device_t *dev)
@@ -99 +107 @@
 }
 
-/** USB debug driver ops. */
+static void connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        bool cont = true;
+
+        async_answer_0(iid, EOK);
+
+        while (cont) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+
+                if (!IPC_GET_IMETHOD(call))
+                        break;
+
+                switch (IPC_GET_IMETHOD(call)) {
+                case USB_DIAG_IN_TEST:
+                        usb_diag_test_impl(callid, &call);
+                        break;
+                default:
+                        async_answer_0(callid, ENOTSUP);
+                        break;
+                }
+        }
+}
+
+static int server_fibril(void *arg)
+{
+        // async_set_client_data_constructor(NULL);
+        // async_set_client_data_destructor(NULL);
+        async_set_fallback_port_handler(connection, NULL);
+        // async_event_task_subscribe();
+        // service_register();
+        async_manager();
+
+        /* Never reached. */
+        return EOK;
+}
+
+/** USB diagnostic driver ops. */
 static const usb_driver_ops_t diag_driver_ops = {
         .device_add = device_add,
@@ -108 +153 @@
 };
 
-/** USB debug driver. */
+/** USB diagnostic driver. */
 static const usb_driver_t diag_driver = {
         .name = NAME,
@@ -117 +162 @@
 int main(int argc, char *argv[])
 {
-        printf(NAME ": USB debug device driver.\n");
+        printf(NAME ": USB diagnostic device driver.\n");
 
         log_init(NAME);
+
+        /* Start usbdiag service. */
+        fid_t srv = fibril_create(server_fibril, NULL);
+        if (!srv)
+                return ENOMEM;
+        fibril_add_ready(srv);
 
         return usb_driver_main(&diag_driver);

uspace/lib/usbdiag/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBRARY = libusbdiag
-LIBS = usb
+LIBS = drv usb
 
 SOURCES = \

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 usb_diag_test(int, int*);
 
 #endif

uspace/lib/usbdiag/src/test.c

@@ -34 +34 @@
  */
 
+#include <async.h>
 #include <usb/diag/diag.h>
 
-int usb_diag_test(int x)
+int usb_diag_test(int x, int *out)
 {
-        return x + 42;
+        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);
+
+        if (out)
+                *out = (int) _out;
+
+        return rc;
 }