Changeset bfa4ffa in mainline for uspace/srv/hid/input/input.c

Timestamp:

2016-12-27T13:34:08Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9185e42

Parents:

0d9b4a8 (diff), 73d8600 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/sun4u

This merge brings support for serial console on the QEMU sun4u machine
and by extension on any system that provides at least one device driver
for a serial port device in the 'serial' location service category and
points the 'console' boot argument to it.

The 'console' boot argument is used to differentiate character devices
that are used as a console from other character devices that may be used
for other purposes (e.g. SLIP or keyboard).

Support for real-world sun4u machines is temporarily broken. The legacy
ns16550 input port driver has been discontinued. Real-world Ultra 5,
which is fairly close to the QEMU machine should be easy to revive. In
order to support the sun4u QEMU machine, a new sun4u platform driver was
added. The isa driver was modified to be usable also for the EBUS bus.

On sparc64 the boot argument is passed in the boot-args boot prom
environment variable. On ia32 and amd64, the boot argument can be set in
grub.cfg as an argument to the multiboot command. The backslashes need
to be properly escaped. Other platforms don't have support for boot
arguments yet.

Because the user input/output subsystem is apparently not ready to drive
the serial console next to the ordinary console or the GUI, the serial
console mode is mutually exclusive with the normal
keyboard/ega/fb/compositor mode.

File:

• uspace/srv/hid/input/input.c (modified) (14 diffs)

uspace/srv/hid/input/input.c

@@ -42 +42 @@
 #include <ipc/services.h>
 #include <ipc/input.h>
-#include <sysinfo.h>
+#include <config.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -54 +54 @@
 #include <loc.h>
 #include <str_error.h>
+#include <char_dev_iface.h>
+#include <fibril.h>
 #include "layout.h"
 #include "kbd.h"
@@ -60 +62 @@
 #include "mouse.h"
 #include "mouse_proto.h"
+#include "serial.h"
 #include "input.h"
-
-bool irc_service = false;
-async_sess_t *irc_sess = NULL;
 
 #define NUM_LAYOUTS  4
@@ -92 +92 @@
 static bool active = true;
 
+/** Serial console specified by the user */
+static char *serial_console;
+
 /** List of keyboard devices */
 static list_t kbd_devs;
@@ -97 +100 @@
 /** List of mouse devices */
 static list_t mouse_devs;
+
+/** List of serial devices */
+static list_t serial_devs;
 
 static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
@@ -395 +401 @@
         mouse_dev_t *mdev = calloc(1, sizeof(mouse_dev_t));
         if (mdev == NULL) {
-                printf("%s: Error allocating keyboard device. "
+                printf("%s: Error allocating mouse device. "
                     "Out of memory.\n", NAME);
                 return NULL;
@@ -403 +409 @@
         
         return mdev;
+}
+
+static serial_dev_t *serial_dev_new(void)
+{
+        serial_dev_t *sdev = calloc(1, sizeof(serial_dev_t));
+        if (sdev == NULL) {
+                printf("%s: Error allocating serial device. "
+                    "Out of memory.\n", NAME);
+                return NULL;
+        }
+        
+        sdev->kdev = kbd_dev_new();
+        if (sdev->kdev == NULL) {
+                free(sdev);
+                return NULL;
+        }
+
+        link_initialize(&sdev->link);
+        
+        return sdev;
 }
 
@@ -532 +558 @@
         return -1;
 }
+
+static int serial_consumer(void *arg)
+{
+        serial_dev_t *sdev = (serial_dev_t *) arg;
+
+        while (true) {
+                uint8_t data;
+
+                char_dev_read(sdev->sess, &data, sizeof(data));
+                kbd_push_data(sdev->kdev, data);
+        }
+
+        return EOK;
+}
+
+/** Add new serial console device.
+ *
+ * @param service_id Service ID of the chardev device
+ *
+ */
+static int serial_add_srldev(service_id_t service_id, serial_dev_t **sdevp)
+{
+        bool match = false;
+
+        serial_dev_t *sdev = serial_dev_new();
+        if (sdev == NULL)
+                return -1;
+        
+        sdev->kdev->svc_id = service_id;
+        
+        int rc = loc_service_get_name(service_id, &sdev->kdev->svc_name);
+        if (rc != EOK)
+                goto fail;
+
+        list_append(&sdev->link, &serial_devs);
+
+        /*
+         * Is this the device the user wants to use as a serial console?
+         */
+        match = (serial_console != NULL) &&
+            !str_cmp(serial_console, sdev->kdev->svc_name);
+
+        if (match) {
+                sdev->kdev->ctl_ops = &stty_ctl;
+
+                /* Initialize controller driver. */
+                if ((*sdev->kdev->ctl_ops->init)(sdev->kdev) != 0) {
+                        list_remove(&sdev->link);
+                        goto fail;
+                }
+
+                sdev->sess = loc_service_connect(service_id, INTERFACE_DDF,
+                    IPC_FLAG_BLOCKING);
+
+                fid_t fid = fibril_create(serial_consumer, sdev);
+                fibril_add_ready(fid);
+        }
+        
+        *sdevp = sdev;
+        return EOK;
+        
+fail:
+        if (sdev->kdev->svc_name != NULL)
+                free(sdev->kdev->svc_name);
+        free(sdev->kdev);
+        free(sdev);
+        return -1;
+}
+
 
 /** Add legacy drivers/devices. */
@@ -555 +650 @@
         kbd_add_dev(&niagara_port, &stty_ctl);
 #endif
-#if defined(UARCH_sparc64) && defined(MACHINE_generic)
-        kbd_add_dev(&ns16550_port, &sun_ctl);
-#endif
         /* Silence warning on abs32le about kbd_add_dev() being unused */
         (void) kbd_add_dev;
@@ -678 +770 @@
 }
 
+static int dev_check_new_serialdevs(void)
+{
+        category_id_t serial_cat;
+        service_id_t *svcs;
+        size_t count, i;
+        bool already_known;
+        int rc;
+        
+        rc = loc_category_get_id("serial", &serial_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Failed resolving category 'serial'.\n", NAME);
+                return ENOENT;
+        }
+        
+        /*
+         * Check for new serial devices
+         */
+        rc = loc_category_get_svcs(serial_cat, &svcs, &count);
+        if (rc != EOK) {
+                printf("%s: Failed getting list of serial devices.\n",
+                    NAME);
+                return EIO;
+        }
+
+        for (i = 0; i < count; i++) {
+                already_known = false;
+                
+                /* Determine whether we already know this device. */
+                list_foreach(serial_devs, link, serial_dev_t, sdev) {
+                        if (sdev->kdev->svc_id == svcs[i]) {
+                                already_known = true;
+                                break;
+                        }
+                }
+                
+                if (!already_known) {
+                        serial_dev_t *sdev;
+                        if (serial_add_srldev(svcs[i], &sdev) == EOK) {
+                                printf("%s: Connected serial device '%s'\n",
+                                    NAME, sdev->kdev->svc_name);
+                        }
+                }
+        }
+        
+        free(svcs);
+        
+        /* XXX Handle device removal */
+        
+        return EOK;
+}
+
 static int dev_check_new(void)
 {
@@ -684 +827 @@
         fibril_mutex_lock(&discovery_lock);
         
-        rc = dev_check_new_kbdevs();
-        if (rc != EOK) {
-                fibril_mutex_unlock(&discovery_lock);
-                return rc;
-        }
-        
-        rc = dev_check_new_mousedevs();
-        if (rc != EOK) {
-                fibril_mutex_unlock(&discovery_lock);
-                return rc;
+        if (!serial_console) {
+                rc = dev_check_new_kbdevs();
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&discovery_lock);
+                        return rc;
+                }
+        
+                rc = dev_check_new_mousedevs();
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&discovery_lock);
+                        return rc;
+                }
+        } else {
+                rc = dev_check_new_serialdevs();
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&discovery_lock);
+                        return rc;
+                }
         }
         
@@ -726 +877 @@
 int main(int argc, char **argv)
 {
+        int rc;
+
         if (argc < 2) {
                 usage(argv[0]);
@@ -733 +886 @@
         printf("%s: HelenOS input service\n", NAME);
         
-        sysarg_t obio;
-        
         list_initialize(&clients);
         list_initialize(&kbd_devs);
         list_initialize(&mouse_devs);
-        
-        if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
-                irc_service = true;
-        
-        if (irc_service) {
-                while (irc_sess == NULL)
-                        irc_sess = service_connect_blocking(SERVICE_IRC,
-                            INTERFACE_IRC, 0);
-        }
+        list_initialize(&serial_devs);
+        
+        serial_console = config_get_value("console");
         
         /* Add legacy keyboard devices. */
@@ -759 +904 @@
         async_set_fallback_port_handler(client_connection, NULL);
         
-        int rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf("%s: Unable to register server\n", NAME);