Changeset b252e87 in mainline

Timestamp:

2020-02-11T11:17:22Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e1f2079

Parents:

b43edabe

git-author:

Jiri Svoboda <jiri@…> (2020-02-10 20:17:06)

git-committer:

Jiri Svoboda <jiri@…> (2020-02-11 11:17:22)

Message:

Add method for getting display device information

Location:

uspace/lib/ddev

Files:

• include/ddev.h (modified) (1 diff)
• include/ddev/info.h (added)
• include/ddev_srv.h (modified) (2 diffs)
• include/ipc/ddev.h (modified) (1 diff)
• include/types/ddev/info.h (added)
• meson.build (modified) (1 diff)
• src/ddev.c (modified) (1 diff)
• src/ddev_srv.c (modified) (2 diffs)
• src/info.c (added)
• test/ddev.c (modified) (4 diffs)

uspace/lib/ddev/include/ddev.h

@@ -36 +36 @@
 #define _LIBDDEV_DDEV_H_
 
+#include <ddev/info.h>
 #include <errno.h>
 #include <gfx/context.h>
 #include <stdbool.h>
 #include "types/ddev.h"
+#include "types/ddev/info.h"
 
 extern errno_t ddev_open(const char *, ddev_t **);
 extern void ddev_close(ddev_t *);
 extern errno_t ddev_get_gc(ddev_t *, gfx_context_t **);
+extern errno_t ddev_get_info(ddev_t *, ddev_info_t *);
 
 #endif

uspace/lib/ddev/include/ddev_srv.h

@@ -39 +39 @@
 #include <errno.h>
 #include <gfx/context.h>
+#include "types/ddev/info.h"
 
 typedef struct ddev_ops ddev_ops_t;
@@ -51 +52 @@
 struct ddev_ops {
         errno_t (*get_gc)(void *, sysarg_t *, sysarg_t *);
+        errno_t (*get_info)(void *, ddev_info_t *);
 };
 

uspace/lib/ddev/include/ipc/ddev.h

@@ -39 +39 @@
 
 typedef enum {
-        DDEV_GET_GC = IPC_FIRST_USER_METHOD
+        DDEV_GET_GC = IPC_FIRST_USER_METHOD,
+        DDEV_GET_INFO
 } ddev_request_t;
 

uspace/lib/ddev/meson.build

@@ -31 +31 @@
         'src/ddev.c',
         'src/ddev_srv.c',
+        'src/info.c',
 )
 

uspace/lib/ddev/src/ddev.c

@@ -111 +111 @@
 }
 
+/** Get display device information.
+ *
+ * @param ddev Display device
+ * @param info Place to store information
+ */
+errno_t ddev_get_info(ddev_t *ddev, ddev_info_t *info)
+{
+        async_exch_t *exch;
+        errno_t retval;
+        ipc_call_t answer;
+
+        exch = async_exchange_begin(ddev->sess);
+        aid_t req = async_send_0(exch, DDEV_GET_INFO, &answer);
+
+        errno_t rc = async_data_read_start(exch, info, sizeof(ddev_info_t));
+        async_exchange_end(exch);
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+
+        async_wait_for(req, &retval);
+        if (retval != EOK)
+                return rc;
+
+        return EOK;
+}
+
 /** @}
  */

uspace/lib/ddev/src/ddev_srv.c

@@ -70 +70 @@
 }
 
+/** Get display device information */
+static void ddev_get_info_srv(ddev_srv_t *srv, ipc_call_t *icall)
+{
+        ddev_info_t info;
+        errno_t rc;
+
+        printf("ddev_get_info_srv\n");
+
+        ipc_call_t call;
+        size_t size;
+        if (!async_data_read_receive(&call, &size)) {
+                async_answer_0(&call, EREFUSED);
+                async_answer_0(icall, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(ddev_info_t)) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        if (srv->ops->get_info == NULL) {
+                printf("get_info is NULL -> ENOTSUP\n");
+                async_answer_0(&call, ENOTSUP);
+                async_answer_0(icall, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->get_info(srv->arg, &info);
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        rc = async_data_read_finalize(&call, &info, sizeof(ddev_info_t));
+        if (rc != EOK) {
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        async_answer_0(icall, EOK);
+}
+
 void ddev_conn(ipc_call_t *icall, ddev_srv_t *srv)
 {
@@ -92 +137 @@
                 case DDEV_GET_GC:
                         ddev_get_gc_srv(srv, &call);
+                        break;
+                case DDEV_GET_INFO:
+                        ddev_get_info_srv(srv, &call);
                         break;
                 default:

uspace/lib/ddev/test/ddev.c

@@ -49 +49 @@
 
 static errno_t test_get_gc(void *, sysarg_t *, sysarg_t *);
+static errno_t test_get_info(void *, ddev_info_t *);
 static errno_t test_gc_set_color(void *, gfx_color_t *);
 
 static ddev_ops_t test_ddev_ops = {
-        .get_gc = test_get_gc
+        .get_gc = test_get_gc,
+        .get_info = test_get_info
 };
 
@@ -66 +68 @@
         bool set_color_called;
         ddev_srv_t *srv;
+        ddev_info_t info;
 } test_response_t;
 
@@ -172 +175 @@
 }
 
+/** ddev_get_info with server returning failure */
+PCUT_TEST(dev_get_info_failure)
+{
+        errno_t rc;
+        service_id_t sid;
+        ddev_t *ddev = NULL;
+        test_response_t resp;
+        ddev_info_t info;
+
+        async_set_fallback_port_handler(test_ddev_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_ddev_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_ddev_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ddev_open(test_ddev_svc, &ddev);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(ddev);
+
+        resp.rc = ENOMEM;
+        rc = ddev_get_info(ddev, &info);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
+
+        ddev_close(ddev);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** ddev_get_info with server returning success */
+PCUT_TEST(dev_get_info_success)
+{
+        errno_t rc;
+        service_id_t sid;
+        ddev_t *ddev = NULL;
+        test_response_t resp;
+        ddev_info_t info;
+
+        async_set_fallback_port_handler(test_ddev_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_ddev_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_ddev_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ddev_open(test_ddev_svc, &ddev);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(ddev);
+
+        resp.rc = EOK;
+
+        ddev_info_init(&resp.info);
+        resp.info.rect.p0.x = 1;
+        resp.info.rect.p0.y = 2;
+        resp.info.rect.p1.x = 3;
+        resp.info.rect.p1.y = 4;
+
+        rc = ddev_get_info(ddev, &info);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
+
+        PCUT_ASSERT_INT_EQUALS(resp.info.rect.p0.x, info.rect.p0.x);
+        PCUT_ASSERT_INT_EQUALS(resp.info.rect.p0.y, info.rect.p0.y);
+        PCUT_ASSERT_INT_EQUALS(resp.info.rect.p1.x, info.rect.p1.x);
+        PCUT_ASSERT_INT_EQUALS(resp.info.rect.p1.y, info.rect.p1.y);
+
+        ddev_close(ddev);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 /** Test display device connection.
  *
@@ -222 +299 @@
 }
 
+static errno_t test_get_info(void *arg, ddev_info_t *info)
+{
+        test_response_t *resp = (test_response_t *) arg;
+
+        if (resp->rc != EOK)
+                return resp->rc;
+
+        *info = resp->info;
+        return EOK;
+}
+
 static errno_t test_gc_set_color(void *arg, gfx_color_t *color)
 {