Subversion Repositories HelenOS

Rev

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

Rev 3905 Rev 3923
Line 45... Line 45...
45 
#include <async.h>
 45 
#include <async.h>
46 
#include <errno.h>
 46 
#include <errno.h>
47 
#include <libadt/fifo.h>
 47 
#include <libadt/fifo.h>
48 
#include <kbd/kbd.h>
 48 
#include <kbd/kbd.h>
49 
 
 49 
 
50 
#include <arch/kbd.h>
 - 
 
51 
#include <kbd.h>
 50 
#include <kbd.h>
52 
#include <key_buffer.h>
 51 
#include <key_buffer.h>
- 
 
 52 
#include <kbd_port.h>
- 
 
 53 
#include <kbd_ctl.h>
53 
#include <keys.h>
 54 
#include <layout.h>
54 
 
 55 
 
55 
#define NAME "kbd"
 56 
#define NAME "kbd"
56 
 
 57 
 
57 
int cons_connected = 0;
 58 
int cons_connected = 0;
58 
int phone2cons = -1;
 59 
int phone2cons = -1;
59 
keybuffer_t keybuffer; 
 60 
keybuffer_t keybuffer; 
60 
 
 61 
 
- 
 
 62 
void kbd_push_scancode(int scancode)
- 
 
 63 
{
- 
 
 64 
    printf("scancode: 0x%x\n", scancode);
- 
 
 65 
    kbd_ctl_parse_scancode(scancode);
- 
 
 66 
}
- 
 
 67 
 
- 
 
 68 
#include <kbd/keycode.h>
61 
static void irq_handler(ipc_callid_t iid, ipc_call_t *call)
 69 
void kbd_push_ev(int type, unsigned int key, unsigned int mods)
62 
{
 70 
{
63 
    kbd_event_t ev;
 71 
    kbd_event_t ev;
64 
 
 72 
 
65 
#ifdef MOUSE_ENABLED
 73 
    printf("type: %d\n", type);
66 
    if (mouse_arch_process(phone2cons, call))
 74 
    printf("mods: 0x%x\n", mods);
67 
        return;
 - 
 
68 
#endif
 - 
 
69 
   
 - 
 
70 
    kbd_arch_process(&keybuffer, call);
 75 
    printf("keycode: %u\n", key);
71 
 
 76 
 
72 
    if (cons_connected && phone2cons != -1) {
 - 
 
73 
        /*
 - 
 
74 
         * One interrupt can produce more than one event so the result
 - 
 
75 
         * is stored in a FIFO.
 77 
    ev.type = type;
76 
         */
 78 
    ev.key = key;
77 
        while (!keybuffer_empty(&keybuffer)) {
 - 
 
78 
            if (!keybuffer_pop(&keybuffer, &ev))
 - 
 
79 
                break;
 79 
    ev.mods = mods;
80 
 
 80 
 
81 
            async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key,
 - 
 
82 
                ev.mods, ev.c);
 81 
    ev.c = layout_parse_ev(&ev);
83 
        }
 - 
 
84 
    }
 82 
 
- 
 
 83 
    async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
85 
}
 84 
}
86 
 
 85 
 
- 
 
 86 
//static void irq_handler(ipc_callid_t iid, ipc_call_t *call)
- 
 
 87 
//{
- 
 
 88 
//  kbd_event_t ev;
- 
 
 89 
//
- 
 
 90 
//  kbd_arch_process(&keybuffer, call);
- 
 
 91 
//
- 
 
 92 
//  if (cons_connected && phone2cons != -1) {
- 
 
 93 
//      /*
- 
 
 94 
//       * One interrupt can produce more than one event so the result
- 
 
 95 
//       * is stored in a FIFO.
- 
 
 96 
//       */
- 
 
 97 
//      while (!keybuffer_empty(&keybuffer)) {
- 
 
 98 
//          if (!keybuffer_pop(&keybuffer, &ev))
- 
 
 99 
//              break;
- 
 
 100 
//
- 
 
 101 
//          async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key,
- 
 
 102 
//              ev.mods, ev.c);
- 
 
 103 
//      }
- 
 
 104 
//  }
- 
 
 105 
//}
- 
 
 106 
 
87 
static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
 107 
static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
88 
{
 108 
{
89 
    ipc_callid_t callid;
 109 
    ipc_callid_t callid;
90 
    ipc_call_t call;
 110 
    ipc_call_t call;
91 
    int retval;
 111 
    int retval;
Line 120... Line 140...
120 
        ipc_answer_0(callid, retval);
 140 
        ipc_answer_0(callid, retval);
121 
    }  
 141 
    }  
122 
}
 142 
}
123 
 
 143 
 
124 
 
 144 
 
- 
 
 145 
 
125 
int main(int argc, char **argv)
 146 
int main(int argc, char **argv)
126 
{
 147 
{
127 
    printf(NAME ": HelenOS Keyboard service\n");
 148 
    printf(NAME ": HelenOS Keyboard service\n");
128 
   
 149 
   
129 
    ipcarg_t phonead;
 150 
    ipcarg_t phonead;
130 
   
 151 
   
131 
    /* Initialize arch dependent parts */
 152 
    /* Initialize port driver. */
132 
    if (kbd_arch_init())
 153 
    if (kbd_port_init())
133 
        return -1;
 154 
        return -1;
134 
   
 155 
   
135 
    /* Initialize key buffer */
 156 
    /* Initialize key buffer */
136 
    keybuffer_init(&keybuffer);
 157 
    keybuffer_init(&keybuffer);
137 
   
 158 
   
138 
    async_set_client_connection(console_connection);
 159 
    async_set_client_connection(console_connection);
139 
    async_set_interrupt_received(irq_handler);
 - 
 
- 
 
 160 
 
140 
    /* Register service at nameserver */
 161 
    /* Register service at nameserver. */
141 
    if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0)
 162 
    if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0)
142 
        return -1;
 163 
        return -1;
143 
   
 164 
   
144 
    printf(NAME ": Accepting connections\n");
 165 
    printf(NAME ": Accepting connections\n");
145 
    async_manager();
 166 
    async_manager();
146 
 
 167 
 
147 
    /* Never reached */
 168 
    /* Not reached. */
148 
    return 0;
 169 
    return 0;
149 
}
 170 
}
150 
 
 171 
 
151 
/**
 172 
/**
152 
 * @}
 173 
 * @}