Changeset be15256 in mainline for uspace/srv/hid/display/client.c

Timestamp:

2019-11-05T08:00:18Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b2d1df3

Parents:

b3c185b6

git-author:

Jiri Svoboda <jiri@…> (2019-10-04 19:00:15)

git-committer:

Jiri Svoboda <jiri@…> (2019-11-05 08:00:18)

Message:

ds_client should not have reverse dependency on libdisplay's display_srv

Breaks layering and hampers testability

File:

• uspace/srv/hid/display/client.c (modified) (4 diffs)

uspace/srv/hid/display/client.c

@@ -34 +34 @@
  */
 
-#include <disp_srv.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -44 +43 @@
  *
  * @param display Parent display
+ * @param cb Client callbacks
+ * @param cb_arg Callback argument
  * @param rclient Place to store pointer to new client.
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ds_client_create(ds_display_t *display, display_srv_t *srv,
-    ds_client_t **rclient)
+errno_t ds_client_create(ds_display_t *display, ds_client_cb_t *cb,
+    void *cb_arg, ds_client_t **rclient)
 {
         ds_client_t *client;
@@ -58 +59 @@
         list_initialize(&client->windows);
         prodcons_initialize(&client->events);
-        client->srv = srv;
+        client->cb = cb;
+        client->cb_arg = cb_arg;
 
         ds_display_add_client(display, client);
@@ -195 +197 @@
         /* Notify the client */
         // TODO Do not send more than once until client drains the queue
-        display_srv_ev_pending(client->srv);
+        client->cb->ev_pending(client->cb_arg);
 
         return EOK;