Subversion Repositories HelenOS-historic

Rev

Rev 1476 | Rev 1487 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1476 Rev 1481
Line 35... Line 35...
35 
#include <errno.h>
 35 
#include <errno.h>
36 
#include <key_buffer.h>
 36 
#include <key_buffer.h>
37 
#include <console.h>
 37 
#include <console.h>
38 
#include <unistd.h>
 38 
#include <unistd.h>
39 
#include <async.h>
 39 
#include <async.h>
- 
 
 40 
#include <libadt/fifo.h>
40 
 
 41 
 
41 
static void sysput(char c)
 42 
static void sysput(char c)
42 
{
 43 
{
43 
    __SYSCALL3(SYS_IO, 1, &c, 1);
 44 
    __SYSCALL3(SYS_IO, 1, &c, 1);
44 
 
 45 
 
45 
}
 46 
}
46 
//#define CONSOLE_COUNT VFB_CONNECTIONS
 47 
//#define CONSOLE_COUNT VFB_CONNECTIONS
47 
#define CONSOLE_COUNT 8
 48 
#define CONSOLE_COUNT 8
- 
 
 49 
#define MAX_KEYREQUESTS_BUFFERED 32
48 
 
 50 
 
49 
#define NAME "CONSOLE"
 51 
#define NAME "CONSOLE"
50 
 
 52 
 
51 
int active_console = 1;
 53 
int active_console = 1;
52 
 
 54 
 
53 
 
 - 
 
54 
typedef struct {
 55 
typedef struct {
55 
    keybuffer_t keybuffer;
 56 
    keybuffer_t keybuffer;
- 
 
 57 
    FIFO_CREATE_STATIC(keyrequests, ipc_callid_t , MAX_KEYREQUESTS_BUFFERED);
- 
 
 58 
    int keyrequest_counter;
56 
    int client_phone;
 59 
    int client_phone;
57 
    int vfb_number; /* Not used */
 - 
 
58 
    int vfb_phone;
 60 
    int vfb_phone;
59 
    int used;
 61 
    int used;
60 
} connection_t;
 62 
} connection_t;
61 
 
 63 
 
62 
connection_t connections[CONSOLE_COUNT];
 64 
connection_t connections[CONSOLE_COUNT];
Line 104... Line 106...
104 
            /* TODO: Handle hangup */
 106 
            /* TODO: Handle hangup */
105 
            return;
 107 
            return;
106 
        case KBD_PUSHCHAR:
 108 
        case KBD_PUSHCHAR:
107 
            /* got key from keyboard driver */
 109 
            /* got key from keyboard driver */
108 
           
 110 
           
109 
            /* find active console */
 - 
 
110 
           
 - 
 
111 
            /* if client is awaiting key, send it */
 - 
 
112 
           
 - 
 
113 
            /*FIXME: else store key to its buffer */
 - 
 
114 
            retval = 0;
 111 
            retval = 0;
115 
            c = IPC_GET_ARG1(call);
 112 
            c = IPC_GET_ARG1(call);
116 
//          ipc_call_sync_2(connections[3].vfb_phone, FB_PUTCHAR, 0, c,NULL,NULL);
 113 
//          ipc_call_sync_2(connections[3].vfb_phone, FB_PUTCHAR, 0, c,NULL,NULL);
- 
 
 114 
       
117 
            /* switch to another virtual console */
 115 
            /* switch to another virtual console */
- 
 
 116 
           
118 
            if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
 117 
            if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
119 
                active_console = c - KBD_KEY_F1;
 118 
                active_console = c - KBD_KEY_F1;
120 
                break;
 119 
                break;
121 
            }
 120 
            }
- 
 
 121 
           
- 
 
 122 
            /* if client is awaiting key, send it */
- 
 
 123 
            if (connections[active_console].keyrequest_counter > 0) {      
- 
 
 124 
                connections[active_console].keyrequest_counter--;
- 
 
 125 
                ipc_answer_fast(fifo_pop(connections[active_console].keyrequests), 0, c, 0);
- 
 
 126 
                break;
- 
 
 127 
            }
- 
 
 128 
           
- 
 
 129 
            /*FIXME: else store key to its buffer */
122 
            keybuffer_push(&(connections[active_console].keybuffer), c);
 130 
            keybuffer_push(&(connections[active_console].keybuffer), c);
123 
           
 131 
           
124 
            /* Send it to first FB, DEBUG */
 132 
            /* Send it to first FB, DEBUG */
125 
//          ipc_call_async_2(connections[0].vfb_phone, FB_PUTCHAR, 0, IPC_GET_ARG1(call),NULL,NULL);
 133 
//          ipc_call_async_2(connections[0].vfb_phone, FB_PUTCHAR, 0, IPC_GET_ARG1(call),NULL,NULL);
126 
//          ipc_call_sync_2(connections[4].vfb_phone, FB_PUTCHAR, 0, c,NULL,NULL);
 134 
//          ipc_call_sync_2(connections[4].vfb_phone, FB_PUTCHAR, 0, c,NULL,NULL);
Line 169... Line 177...
169 
            break;
 177 
            break;
170 
        case CONSOLE_GOTO:
 178 
        case CONSOLE_GOTO:
171 
            break;
 179 
            break;
172 
 
 180 
 
173 
        case CONSOLE_GETCHAR:
 181 
        case CONSOLE_GETCHAR:
174 
            /* FIXME: Only temporary solution until request storage will be created  */
 - 
 
175 
            while (keybuffer_empty(&(connections[consnum].keybuffer))) {
 182 
            if (keybuffer_empty(&(connections[consnum].keybuffer))) {
176 
                /* FIXME: buffer empty -> store request */
 183 
                /* buffer is empty -> store request */
- 
 
 184 
                if (connections[consnum].keyrequest_counter < MAX_KEYREQUESTS_BUFFERED) {      
- 
 
 185 
                    fifo_push(connections[consnum].keyrequests, callid);
- 
 
 186 
                    connections[consnum].keyrequest_counter++;
- 
 
 187 
                } else {
- 
 
 188 
                    /* no key available and too many requests => fail */
- 
 
 189 
                    ipc_answer_fast(callid, ELIMIT, 0, 0);
- 
 
 190 
                }
177 
                async_usleep(1000);
 191 
                continue;
178 
            };
 192 
            };
179 
            keybuffer_pop(&(connections[consnum].keybuffer), (char *)&arg1);
 193 
            keybuffer_pop(&(connections[consnum].keybuffer), (char *)&arg1);
180 
//          ipc_call_sync_2(connections[6].vfb_phone, FB_PUTCHAR, 0, arg1,NULL,NULL);
 194 
//          ipc_call_sync_2(connections[6].vfb_phone, FB_PUTCHAR, 0, arg1,NULL,NULL);
181 
           
 195 
           
182 
            break;
 196 
            break;
Line 206... Line 220...
206 
    /* Connect to framebuffer driver */
 220 
    /* Connect to framebuffer driver */
207 
   
 221 
   
208 
    for (i = 0; i < CONSOLE_COUNT; i++) {
 222 
    for (i = 0; i < CONSOLE_COUNT; i++) {
209 
        connections[i].used = 0;
 223 
        connections[i].used = 0;
210 
        keybuffer_init(&(connections[i].keybuffer));
 224 
        keybuffer_init(&(connections[i].keybuffer));
- 
 
 225 
       
211 
        /* TODO: init key_buffer */
 226 
        /* TODO: init key_buffer */
212 
        while ((connections[i].vfb_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) < 0) {
 227 
        while ((connections[i].vfb_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) < 0) {
213 
            usleep(10000);
 228 
            usleep(10000);
214 
            //ipc_call_async_2(connections[i].vfb_phone, FB_PUTCHAR, 'a', 'b', NULL, (void *)NULL);
- 
 
215 
        }
 229 
        }
- 
 
 230 
        connections[i].keyrequests.head = connections[i].keyrequests.tail = 0;
- 
 
 231 
        connections[i].keyrequests.items = MAX_KEYREQUESTS_BUFFERED;
- 
 
 232 
        connections[i].keyrequest_counter = 0;
216 
    }
 233 
    }
217 
   
 234 
   
218 
    if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) {
 235 
    if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) {
219 
        return -1;
 236 
        return -1;
220 
    };
 237 
    };