Changeset e9073f2 in mainline for console/console.c

Timestamp:

2006-06-05T23:02:13Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

51dbadf3

Parents:

9996ed5

Message:

Added correct disconnect handling.

File:

• console/console.c (modified) (7 diffs)

console/console.c

@@ -334 +334 @@
         int consnum;
         ipcarg_t arg1, arg2;
+        connection_t *conn;
 
         if ((consnum = find_free_connection()) == -1) {
@@ -339 +340 @@
                 return;
         }
+        conn = &connections[consnum];
         
         gcons_notify_connect(consnum);
-        connections[consnum].used = 1;
-        connections[consnum].client_phone = IPC_GET_ARG3(call);
-        screenbuffer_clear(&(connections[consnum].screenbuffer));
+        conn->used = 1;
+        conn->client_phone = IPC_GET_ARG3(call);
+        screenbuffer_clear(&conn->screenbuffer);
         
         /* Accept the connection */
@@ -353 +355 @@
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        /* TODO */
+                        gcons_notify_disconnect(consnum);
+                        /* Answer all pending requests */
+                        while (conn->keyrequest_counter > 0) {          
+                                conn->keyrequest_counter--;
+                                ipc_answer_fast(fifo_pop(conn->keyrequests), ENOENT, 0, 0);
+                                break;
+                        }
+                        
+                        /* Commit hangup */
                         ipc_answer_fast(callid, 0,0,0);
                         return;
@@ -366 +376 @@
                         }
                         
-                        screenbuffer_clear(&(connections[consnum].screenbuffer));
+                        screenbuffer_clear(&conn->screenbuffer);
                         
                         break;
                 case CONSOLE_GOTO:
                         
-                        screenbuffer_goto(&(connections[consnum].screenbuffer), IPC_GET_ARG2(call), IPC_GET_ARG1(call));
+                        screenbuffer_goto(&conn->screenbuffer, IPC_GET_ARG2(call), IPC_GET_ARG1(call));
                         if (consnum == active_console)
                                 curs_goto(IPC_GET_ARG1(call),IPC_GET_ARG2(call));
@@ -388 +398 @@
                         arg1 = IPC_GET_ARG1(call);
                         arg2 = IPC_GET_ARG2(call);
-                        screenbuffer_set_style(&(connections[consnum].screenbuffer),arg1, arg2);
+                        screenbuffer_set_style(&conn->screenbuffer,arg1, arg2);
                         if (consnum == active_console)
                                 set_style_col(arg1, arg2);
@@ -395 +405 @@
                 case CONSOLE_CURSOR_VISIBILITY:
                         arg1 = IPC_GET_ARG1(call);
-                        connections[consnum].screenbuffer.is_cursor_visible = arg1;
+                        conn->screenbuffer.is_cursor_visible = arg1;
                         if (consnum == active_console)
                                 curs_visibility(arg1);
                         break;
                 case CONSOLE_GETCHAR:
-                        if (keybuffer_empty(&(connections[consnum].keybuffer))) {
+                        if (keybuffer_empty(&conn->keybuffer)) {
                                 /* buffer is empty -> store request */
-                                if (connections[consnum].keyrequest_counter < MAX_KEYREQUESTS_BUFFERED) {               
-                                        fifo_push(connections[consnum].keyrequests, callid);
-                                        connections[consnum].keyrequest_counter++;
+                                if (conn->keyrequest_counter < MAX_KEYREQUESTS_BUFFERED) {              
+                                        fifo_push(conn->keyrequests, callid);
+                                        conn->keyrequest_counter++;
                                 } else {
                                         /* no key available and too many requests => fail */
@@ -411 +421 @@
                                 continue;
                         };
-                        keybuffer_pop(&(connections[consnum].keybuffer), (int *)&arg1);
+                        keybuffer_pop(&conn->keybuffer, (int *)&arg1);
                         
                         break;