Changeset 9fe1635 in mainline

Timestamp:

2019-05-16T08:00:04Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

4db37d1

Parents:

e89dc0b

Message:

Adding support for changing the layout through IPC

The service hid/input is now available for other
programs to access. The service accepts a new request
type for changing the keyboard layout (INPUT_CHANGE_LAYOUT)

Location:

uspace

Files:

• app/init/init.c (modified) (2 diffs)
• lib/c/include/ipc/services.h (modified) (1 diff)
• srv/hid/input/input.c (modified) (3 diffs)
• srv/hid/input/input.h (modified) (1 diff)

uspace/app/init/init.c

@@ -48 +48 @@
 #include <io/logctl.h>
 #include <vol.h>
+#include <ipc/services.h>
 #include "untar.h"
 #include "init.h"
@@ -65 +66 @@
 #define SRV_COMPOSITOR  "/srv/hid/compositor"
 
-#define HID_INPUT              "hid/input"
+#define HID_INPUT              SERVICE_NAME_HID_INPUT
 #define HID_OUTPUT             "hid/output"
 #define HID_COMPOSITOR_SERVER  ":0"

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

@@ -58 +58 @@
 #define SERVICE_NAME_INET     "net/inet"
 #define SERVICE_NAME_IPC_TEST "ipc-test"
+#define SERVICE_NAME_HID_INPUT    "hid/input"
 #define SERVICE_NAME_NETCONF  "net/netconf"
 #define SERVICE_NAME_UDP      "net/udp"

uspace/srv/hid/input/input.c

@@ -110 +110 @@
 }
 
-static void layout_load(const char *layout_name)
-{
-/*
-        async_get_call(ipc_call_t *);
-ipc_get_arg1(ipc_call_t *);
-*/      
-        const char *prefix = "/lib/layouts/";
+static errno_t layout_load(const char *layout_name)
+{
+#ifdef CONFIG_RTLD
+        const char *prefix = "layouts/";
         const char *suffix = ".so";
         size_t length = 1;
@@ -122 +119 @@
         length += str_size(suffix);
         length += str_size(layout_name);
-        char *path = malloc(sizeof(char) * length);
-
+        char *path = malloc(sizeof(char) * (length + 1));
+        
         if (path == NULL) {
                 printf("%s: Error allocating layout path. Out of memory.\n", NAME);
-                return;
-        }
-
+                return ENOMEM;
+        }
+
+        path[0] = '\0';
         str_append(path, length, prefix);
         str_append(path, length, layout_name);
         str_append(path, length, suffix);
+        printf("%s\n", path);
 
         void *handle = dlopen(path, 0);
         if (handle == NULL) {
                 printf("%s: Keyboard layout could not be found.\n", NAME);
-                return;
-        }
-
-        layout_ops_t (*get_layout)(void) = dlsym(handle, "dl_get_constant");
+                return ENOENT;
+        }
+
+        layout_ops_t (*get_layout)(void) = dlsym(handle, "get_layout");
 
         if (get_layout == NULL) {
                 printf("%s: Keyboard layout constructor could not be found.\n", NAME);
-                return;
+                return ENOENT;
         }
 
         layout_active = get_layout();
         layout_change(&layout_active);
+#endif
+
+        return EOK;
 }
 
@@ -379 +381 @@
                                 break;
                         case INPUT_CHANGE_LAYOUT: {
-                                char * layout_name = (char *)ipc_get_arg1(&call);
-                                layout_load(layout_name);
+                                void * layout_name;
+                                errno_t ret = async_data_write_accept(&layout_name, true, 0, 0, 0, 0);
+                                if (ret != EOK) {
+                                        async_answer_0(&call, ret);
+                                        break;
+                                }
+
+                                errno_t retval = layout_load((char *)layout_name);
                                 free(layout_name);
+                                async_answer_0(&call, retval);
                                 break;
                         }

uspace/srv/hid/input/input.h

@@ -41 +41 @@
 #include <stdbool.h>
 #include <async.h>
+#include <ipc/services.h>
 
-#define NAME  "input"
+#define NAME SERVICE_NAME_HID_INPUT
 
 extern bool irc_service;