Changeset 9940ce0 in mainline

Timestamp:

2017-11-26T01:03:40Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5f4c41b2

Parents:

96258fc

Message:

Move sending side of Ski driver out of output server.

Location:

uspace

Files:

• drv/char/ski-con/ski-con.c (modified) (4 diffs)
• srv/hid/output/Makefile (modified) (1 diff)
• srv/hid/output/output.c (modified) (2 diffs)
• srv/hid/output/port/chardev.c (modified) (8 diffs)
• srv/hid/output/port/ski.c (deleted)
• srv/hid/output/port/ski.h (deleted)
• srv/locsrv/locsrv.c (modified) (1 diff)

uspace/drv/char/ski-con/ski-con.c

@@ -43 +43 @@
 
 #define SKI_GETCHAR             21
+#define SKI_PUTCHAR             31
 
 #define POLL_INTERVAL           10000
@@ -57 +58 @@
         .write = ski_con_write
 };
+
+static void ski_con_putchar(ski_con_t *con, char ch); /* XXX */
 
 /** Add ski console device. */
@@ -88 +91 @@
                 goto error;
         }
+
+        ddf_fun_add_to_category(fun, "console");
 
         bound = true;
@@ -177 +182 @@
 }
 
+
+/** Display character on ski debug console
+ *
+ * Use SSC (Simulator System Call) to
+ * display character on debug console.
+ *
+ * @param c Character to be printed.
+ *
+ */
 static void ski_con_putchar(ski_con_t *con, char ch)
 {
-        
+#ifdef UARCH_ia64
+        asm volatile (
+                "mov r15 = %0\n"
+                "mov r32 = %1\n"   /* r32 is in0 */
+                "break 0x80000\n"  /* modifies r8 */
+                :
+                : "i" (SKI_PUTCHAR), "r" (ch)
+                : "r15", "in0", "r8"
+        );
+#else
+        (void) ch;
+#endif
+        if (ch == '\n')
+                ski_con_putchar(con, '\r');
 }
 

uspace/srv/hid/output/Makefile

@@ -37 +37 @@
         port/kchar.c \
         port/niagara.c \
-        port/ski.c \
         port/chardev.c \
         proto/vt100.c \

uspace/srv/hid/output/output.c

@@ -38 +38 @@
 #include "port/kchar.h"
 #include "port/niagara.h"
-#include "port/ski.h"
 #include "port/chardev.h"
 #include "output.h"
@@ -481 +480 @@
                 kchar_init();
                 niagara_init();
-                ski_init();
-        } else {
-                chardev_init();
-        }
+        }
+        
+        chardev_init();
         
         printf("%s: Accepting connections\n", NAME);

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2016 Jakub Jermar
+ * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -50 +51 @@
 static chardev_t *chardev;
 static service_id_t serial_cat_id;
+static service_id_t console_cat_id;
 
 static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
@@ -68 +70 @@
         chardev_write(chardev, (void *) str, str_size(str), &nwr);
         /* XXX Handle error */
+}
+
+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;
 }
 
@@ -79 +135 @@
 {
         int rc;
+        bool found;
+        service_id_t sid;
 
         fibril_mutex_lock(&discovery_lock);
@@ -87 +145 @@
         }
 
-        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);
@@ -148 +174 @@
 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;
+#ifndef MACHINE_ski
                 return EOK;
+#endif
+        } else {
+                console = config_get_value("console");
+                if (!console)
+                        return EOK;
         }
 
@@ -162 +191 @@
         } 
 
+        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) {
@@ -168 +203 @@
                 return rc;
         }
+
+        check_for_dev();
 
         fibril_mutex_lock(&discovery_lock);

uspace/srv/locsrv/locsrv.c

@@ -1347 +1347 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("console");
+        categ_dir_add_cat(&cdir, cat);
+
         cat = category_new("clock");
         categ_dir_add_cat(&cdir, cat);