Changeset 132ab5d1 in mainline for uspace/srv/hid/output/port/chardev.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/hid/output/port/chardev.c (modified) (9 diffs)

uspace/srv/hid/output/port/chardev.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2016 Jakub Jermar
+ * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -30 +31 @@
  */
 
+#include <async.h>
+#include <config.h>
+#include <errno.h>
+#include <fibril_synch.h>
+#include <io/chardev.h>
+#include <loc.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <char_dev_iface.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <async.h>
-#include <fibril_synch.h>
-#include <loc.h>
-#include <errno.h>
 #include <str.h>
-#include <config.h>
 #include "../ctl/serial.h"
 #include "../output.h"
 #include "chardev.h"
 
+enum {
+        chardev_buf_size = 4096
+};
+
 static char *console;
 
 static async_sess_t *sess;
+static chardev_t *chardev;
 static service_id_t serial_cat_id;
+static service_id_t console_cat_id;
+
+static uint8_t chardev_buf[chardev_buf_size];
+static size_t chardev_bused;
 
 static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
@@ -54 +64 @@
 static FIBRIL_CONDVAR_INITIALIZE(discovery_cv);
 
+static void chardev_flush(void)
+{
+        size_t nwr;
+
+        if (chardev_bused == 0)
+                return;
+
+        chardev_write(chardev, chardev_buf, chardev_bused, &nwr);
+        /* XXX Handle error */
+
+        chardev_bused = 0;
+}
+
 static void chardev_putchar(wchar_t ch)
 {
-        uint8_t byte = (uint8_t) ch;
-        char_dev_write(sess, &byte, 1); 
+        if (chardev_bused == chardev_buf_size)
+                chardev_flush();
+        if (!ascii_check(ch))
+                ch = '?';
+        chardev_buf[chardev_bused++] = (uint8_t) ch;
 }
 
 static void chardev_control_puts(const char *str)
 {
-        char_dev_write(sess, (void *) str, str_size(str));
+        const char *p;
+
+        p = str;
+        while (*p != '\0')
+                chardev_putchar(*p++);
+}
+
+static bool find_output_dev(service_id_t *svcid)
+{
+        service_id_t *svc;
+        size_t svcs;
+        int rc;
+
+        rc = loc_category_get_svcs(serial_cat_id, &svc, &svcs);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
+                printf("%s: Failed to get services\n", NAME);
+                return false;
+        }
+
+        for (size_t i = 0; i < svcs; i++) {
+                char *name;
+
+                rc = loc_service_get_name(svc[i], &name);
+                if (rc != EOK)
+                        continue;
+
+                if (!str_cmp(console, name)) {
+                        /*
+                         * This is the serial console service that the user
+                         * wanted to use.
+                         */
+                        *svcid = svc[i];
+                        free(svc);
+                        return true;
+                }
+
+                free(name);
+        }
+
+        free(svc);
+
+        /* Look for any service in the 'console' category */
+
+        rc = loc_category_get_svcs(console_cat_id, &svc, &svcs);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
+                printf("%s: Failed to get services\n", NAME);
+                return false;
+        }
+
+        if (svcs > 0) {
+                *svcid = svc[0];
+                free(svc);
+                return true;
+        }
+
+        free(svc);
+        return false;
 }
 
@@ -74 +158 @@
 {
         int rc;
+        bool found;
+        service_id_t sid;
 
         fibril_mutex_lock(&discovery_lock);
@@ -82 +168 @@
         }
 
-        service_id_t *svc;
-        size_t svcs;
-        rc = loc_category_get_svcs(serial_cat_id, &svc, &svcs);
-        if (rc != EOK) {
-                fibril_mutex_unlock(&discovery_lock);
-                printf("%s: Failed to get services\n", NAME);
-                return;
-        }
-
-        service_id_t sid;
-        bool found = false;
-
-        for (size_t i = 0; i < svcs && !found; i++) {
-                char *name;
-                
-                rc = loc_service_get_name(svc[i], &name);
-                if (rc != EOK)
-                        continue;
-
-                if (!str_cmp(console, name)) {
-                        /*
-                         * This is the serial console service that the user
-                         * wanted to use.
-                         */
-                        found = true;
-                        sid = svc[i];
-                }
-                        
-                free(name);
-        }
-
-        free(svc);
-
+        found = find_output_dev(&sid);
         if (!found) {
                 fibril_mutex_unlock(&discovery_lock);
                 return;
         }
+
+        printf("%s: Connecting service %zu\n", NAME, sid);
+        char *name;
+        rc = loc_service_get_name(sid, &name);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
+                return;
+        }
+        printf("%s: Service name is %s\n", NAME, name);
+        free(name);
 
         sess = loc_service_connect(sid, INTERFACE_DDF, IPC_FLAG_BLOCKING);
@@ -126 +190 @@
                 return;
         }
-        serial_init(chardev_putchar, chardev_control_puts);
+
+        rc = chardev_open(sess, &chardev);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
+                printf("%s: Failed opening character device\n", NAME);
+                return;
+        }
+
+        serial_init(chardev_putchar, chardev_control_puts, chardev_flush);
 
         discovery_finished = true;
@@ -135 +207 @@
 int chardev_init(void)
 {
-        console = config_get_value("console");
-        if (!console) {
-                /*
-                 * The system is not configured to use serial console.
-                 */
+        if (!config_key_exists("console")) {
+                console = NULL;
+#ifdef MACHINE_ski
+                /* OK */
+#elif defined(UARCH_sparc64) && defined(PROCESSOR_sun4v)
+                /* OK */
+#elif defined(MACHINE_msim)
+                /* OK */
+#else
                 return EOK;
+#endif
+        } else {
+                console = config_get_value("console");
+                if (!console)
+                        return EOK;
         }
 
@@ -149 +230 @@
         } 
 
+        rc = loc_category_get_id("console", &console_cat_id, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Failed to get \"console\" category ID.\n", NAME);
+                return rc;
+        } 
+
         rc = loc_register_cat_change_cb(check_for_dev);
         if (rc != EOK) {
@@ -155 +242 @@
                 return rc;
         }
+
+        check_for_dev();
 
         fibril_mutex_lock(&discovery_lock);