| 48,25 → 48,25 |
|---|
| ipcarg_t phonead; |
| int phoneid; |
| char connected = 0; |
| |
| keybuffer_t keybuffer; |
| ipcarg_t retval, arg1, arg2; |
| |
| printf("Uspace kbd service started.\n"); |
| // printf("Uspace kbd service started.\n"); |
| |
| /* Initialize arch dependent parts */ |
| if (!(res = kbd_arch_init())) { |
| printf("Kbd registration failed with retval %d.\n", res); |
| // printf("Kbd registration failed with retval %d.\n", res); |
| return -1; |
| }; |
| |
| /* Initialize key buffer */ |
| key_buffer_init(); |
| keybuffer_init(&keybuffer); |
| |
| /* Register service at nameserver */ |
| printf("%s: Registering at naming service.\n", NAME); |
| // printf("%s: Registering at naming service.\n", NAME); |
| |
| if ((res = ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, &phonead)) != 0) { |
| printf("%s: Error: Registering at naming service failed.\n", NAME); |
| // printf("%s: Error: Registering at naming service failed.\n", NAME); |
| return -1; |
| }; |
| |
| 75,7 → 75,7 |
|---|
| // printf("%s:Call phone=%lX..", NAME, call.in_phone_hash); |
| switch (IPC_GET_METHOD(call)) { |
| case IPC_M_PHONE_HUNGUP: |
| printf("%s: Phone hung up.\n", NAME); |
| // printf("%s: Phone hung up.\n", NAME); |
| connected = 0; |
| retval = 0; |
| break; |
| 97,7 → 97,7 |
|---|
| case IPC_M_INTERRUPT: |
| if (connected) { |
| /* recode to ASCII - one interrupt can produce more than one code so result is stored in fifo */ |
| kbd_arch_process(IPC_GET_ARG2(call)); |
| kbd_arch_process(&keybuffer, IPC_GET_ARG2(call)); |
| |
| //printf("%s: GOT INTERRUPT: %c\n", NAME, key); |
| |
| 106,20 → 106,20 |
|---|
| |
| retval = 0; |
| |
| while (!key_buffer_empty()) { |
| if (!key_buffer_pop((char *)&arg1)) { |
| printf("%s: KeyBuffer is empty but it should not be.\n"); |
| while (!keybuffer_empty(&keybuffer)) { |
| if (!keybuffer_pop(&keybuffer, (char *)&arg1)) { |
| // printf("%s: KeyBuffer is empty but it should not be.\n"); |
| break; |
| } |
| /*FIXME: detection of closed connection */ |
| ipc_call_async(phoneid, KBD_PUSHCHAR, arg1, 0, NULL); |
| ipc_call_async(phoneid, KBD_PUSHCHAR, arg1, NULL, NULL); |
| } |
| |
| } |
| printf("%s: Interrupt processed.\n", NAME); |
| // printf("%s: Interrupt processed.\n", NAME); |
| break; |
| default: |
| printf("%s: Unknown method: %zd\n", NAME, IPC_GET_METHOD(call)); |
| // printf("%s: Unknown method: %zd\n", NAME, IPC_GET_METHOD(call)); |
| retval = ENOENT; |
| break; |
| } |