Changes in uspace/srv/hid/console/console.c [b366a6f4:854eddd6] in mainline

File:

• uspace/srv/hid/console/console.c (modified) (20 diffs)

uspace/srv/hid/console/console.c

@@ -54 +54 @@
 #include <event.h>
 #include <devmap.h>
+#include <devmap_obsolete.h>
 #include <fcntl.h>
 #include <vfs/vfs.h>
@@ -67 +68 @@
 #define NAMESPACE  "term"
 
-/** Session with the input server. */
-static async_sess_t *input_sess;
+/** Phone to the input server. */
+static int input_phone;
 
 /** Information about framebuffer */
@@ -108 +109 @@
 static FIBRIL_CONDVAR_INITIALIZE(input_cv);
 
-static FIBRIL_MUTEX_INITIALIZE(big_console_lock);
-
-static void console_serialize_start(void)
-{
-        fibril_mutex_lock(&big_console_lock);
-}
-
-static void console_serialize_end(void)
-{
-        fibril_mutex_unlock(&big_console_lock);
-}
-
 static void curs_visibility(bool visible)
 {
@@ -152 +141 @@
 static void input_yield(void)
 {
-        async_exch_t *exch = async_exchange_begin(input_sess);
-        if (exch == NULL) {
-                printf("%s: Failed starting exchange with input device.\n",
-                    NAME);
-                return;
-        }
-        
-        async_req_0_0(exch, INPUT_YIELD);
-        async_exchange_end(exch);
+        async_obsolete_req_0_0(input_phone, INPUT_YIELD);
 }
 
 static void input_reclaim(void)
 {
-        async_exch_t *exch = async_exchange_begin(input_sess);
-        if (exch == NULL) {
-                printf("%s: Failed starting exchange with input device.\n",
-                    NAME);
-                return;
-        }
-        
-        async_req_0_0(exch, INPUT_RECLAIM);
-        async_exchange_end(exch);
+        async_obsolete_req_0_0(input_phone, INPUT_RECLAIM);
 }
 
@@ -350 +323 @@
         
         if (cons == kernel_console) {
-                console_serialize_start();
+                async_obsolete_serialize_start();
                 curs_hide_sync();
                 gcons_in_kernel();
                 screen_yield();
                 input_yield();
-                console_serialize_end();
-                
-                if (console_kcon()) {
+                async_obsolete_serialize_end();
+                
+                if (__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE)) {
                         prev_console = active_console;
                         active_console = kernel_console;
@@ -365 +338 @@
         
         if (cons != kernel_console) {
-                console_serialize_start();
+                async_obsolete_serialize_start();
                 
                 if (active_console == kernel_console) {
@@ -420 +393 @@
                 curs_visibility(cons->scr.is_cursor_visible);
                 
-                console_serialize_end();
+                async_obsolete_serialize_end();
         }
 }
@@ -437 +410 @@
                 if (!IPC_GET_IMETHOD(call)) {
                         /* TODO: Handle hangup */
-                        async_hangup(input_sess);
+                        async_obsolete_hangup(input_phone);
                         return;
                 }
@@ -482 +455 @@
                         retval = ENOENT;
                 }
-
                 async_answer_0(callid, retval);
         }
@@ -498 +470 @@
         }
         
-        console_serialize_start();
+        async_obsolete_serialize_start();
         
         size_t off = 0;
@@ -506 +478 @@
         }
         
-        console_serialize_end();
+        async_obsolete_serialize_end();
         
         gcons_notify_char(cons->index);
@@ -601 +573 @@
         int rc;
         
-        console_serialize_start();
+        async_obsolete_serialize_start();
         if (cons->refcount == 0)
                 gcons_notify_connect(cons->index);
@@ -611 +583 @@
         
         while (true) {
-                console_serialize_end();
+                async_obsolete_serialize_end();
                 callid = async_get_call(&call);
-                console_serialize_start();
+                async_obsolete_serialize_start();
                 
                 arg1 = 0;
@@ -623 +595 @@
                         if (cons->refcount == 0)
                                 gcons_notify_disconnect(cons->index);
-                        console_serialize_end();
                         return;
                 }
@@ -629 +600 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case VFS_OUT_READ:
-                        console_serialize_end();
+                        async_obsolete_serialize_end();
                         cons_read(cons, callid, &call);
-                        console_serialize_start();
+                        async_obsolete_serialize_start();
                         continue;
                 case VFS_OUT_WRITE:
-                        console_serialize_end();
+                        async_obsolete_serialize_end();
                         cons_write(cons, callid, &call);
-                        console_serialize_start();
+                        async_obsolete_serialize_start();
                         continue;
                 case VFS_OUT_SYNC:
@@ -707 +678 @@
                         break;
                 case CONSOLE_GET_EVENT:
-                        console_serialize_end();
+                        async_obsolete_serialize_end();
                         cons_get_event(cons, callid, &call);
-                        console_serialize_start();
+                        async_obsolete_serialize_start();
                         continue;
+                case CONSOLE_KCON_ENABLE:
+                        change_console(kernel_console);
+                        break;
                 }
                 async_answer_3(callid, EOK, arg1, arg2, arg3);
@@ -721 +695 @@
 }
 
-static async_sess_t *connect_input(const char *dev_path)
-{
-        async_sess_t *sess;
-        async_exch_t *exch;
+static int connect_input(const char *dev_path)
+{
+        int phone;
         devmap_handle_t handle;
         
         int rc = devmap_device_get_handle(dev_path, &handle, 0);
         if (rc == EOK) {
-                sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, 0);
-                if (sess == NULL) {
-                        printf("%s: Failed to connect to input server\n", NAME);
-                        return NULL;
+                phone = devmap_obsolete_device_connect(handle, 0);
+                if (phone < 0) {
+                        printf("%s: Failed to connect to input device\n", NAME);
+                        return phone;
                 }
         } else {
-                return NULL;
-        }
-        
-        exch = async_exchange_begin(sess);
-        if (exch == NULL) {
-                printf("%s: Failed to create callback from input server.\n", NAME);
-                return NULL;
+                return rc;
         }
         
         /* NB: The callback connection is slotted for removal */
-        rc = async_connect_to_me(exch, 0, 0, 0, input_events, NULL);
-
-        async_exchange_end(exch);
+        rc = async_obsolete_connect_to_me(phone, SERVICE_CONSOLE, 0, 0,
+            input_events, NULL);
 
         if (rc != EOK) {
-                async_hangup(sess);
-                printf("%s: Failed to create callback from input server (%s).\n",
+                async_obsolete_hangup(phone);
+                printf("%s: Failed to create callback from input device (%s).\n",
                     NAME, str_error(rc));
-                return NULL;
-        }
-        
-        return sess;
+                return rc;
+        }
+        
+        return phone;
 }
 
@@ -762 +728 @@
 {
         /* Connect to input server */
-        input_sess = connect_input(input_dev);
-        if (input_sess == NULL)
+        input_phone = connect_input(input_dev);
+        if (input_phone < 0)
                 return false;
         
@@ -830 +796 @@
         }
         
+        /* Disable kernel output to the console */
+        __SYSCALL0(SYS_DEBUG_DISABLE_CONSOLE);
+        
         /* Initialize the screen */
-        console_serialize_start();
+        async_obsolete_serialize_start();
         gcons_redraw_console();
         set_style(STYLE_NORMAL);
@@ -837 +806 @@
         curs_goto(0, 0);
         curs_visibility(active_console->scr.is_cursor_visible);
-        console_serialize_end();
+        async_obsolete_serialize_end();
         
         /* Receive kernel notifications */