Changeset 5f4c41b2 in mainline for uspace/srv

Timestamp:

2017-11-26T02:41:55Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f4cfd271

Parents:

9940ce0

Message:

Move sending side of Sun4v console out of output server.

Location:

uspace/srv/hid/output

Files:

• Makefile (modified) (1 diff)
• output.c (modified) (2 diffs)
• port/chardev.c (modified) (2 diffs)
• port/niagara.c (deleted)
• port/niagara.h (deleted)

uspace/srv/hid/output/Makefile

@@ -36 +36 @@
         port/ega.c \
         port/kchar.c \
-        port/niagara.c \
         port/chardev.c \
         proto/vt100.c \

uspace/srv/hid/output/output.c

@@ -37 +37 @@
 #include "port/ega.h"
 #include "port/kchar.h"
-#include "port/niagara.h"
 #include "port/chardev.h"
 #include "output.h"
@@ -479 +478 @@
                 ega_init();
                 kchar_init();
-                niagara_init();
         }
         

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

@@ -151 +151 @@
         }
 
+        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);
         if (!sess) {
@@ -176 +186 @@
         if (!config_key_exists("console")) {
                 console = NULL;
-#ifndef MACHINE_ski
+#ifdef MACHINE_ski
+                /* OK */
+#elif defined(UARCH_sparc64) && defined(PROCESSOR_sun4v)
+                /* OK */
+#else
                 return EOK;
 #endif