Subversion Repositories HelenOS

Rev

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

Rev 4343 Rev 4344
Line 35... Line 35...
35 
/** @file
 35 
/** @file
36 
 */
 36 
 */
37 
 
 37 
 
38 
#include <ipc/ipc.h>
 38 
#include <ipc/ipc.h>
39 
#include <ipc/services.h>
 39 
#include <ipc/services.h>
- 
 
 40 
#include <sysinfo.h>
40 
#include <stdio.h>
 41 
#include <stdio.h>
41 
#include <unistd.h>
 42 
#include <unistd.h>
42 
#include <stdlib.h>
 43 
#include <stdlib.h>
43 
#include <stdio.h>
 44 
#include <stdio.h>
44 
#include <ipc/ns.h>
 45 
#include <ipc/ns.h>
45 
#include <async.h>
 46 
#include <async.h>
46 
#include <errno.h>
 47 
#include <errno.h>
47 
#include <libadt/fifo.h>
 48 
#include <libadt/fifo.h>
48 
#include <kbd/kbd.h>
 49 
#include <kbd/kbd.h>
- 
 
 50 
#include <kbd/keycode.h>
49 
 
 51 
 
50 
#include <kbd.h>
 52 
#include <kbd.h>
51 
#include <key_buffer.h>
 53 
#include <key_buffer.h>
52 
#include <kbd_port.h>
 54 
#include <kbd_port.h>
53 
#include <kbd_ctl.h>
 55 
#include <kbd_ctl.h>
Line 55... Line 57...
55 
 
 57 
 
56 
#define NAME "kbd"
 58 
#define NAME "kbd"
57 
 
 59 
 
58 
int cons_connected = 0;
 60 
int cons_connected = 0;
59 
int phone2cons = -1;
 61 
int phone2cons = -1;
60 
keybuffer_t keybuffer; 
 62 
keybuffer_t keybuffer;
- 
 
 63 
 
- 
 
 64 
/** Currently active modifiers. */
- 
 
 65 
static unsigned mods = KM_NUM_LOCK;
- 
 
 66 
 
- 
 
 67 
/** Currently pressed lock keys. We track these to tackle autorepeat. */
- 
 
 68 
static unsigned lock_keys;
- 
 
 69 
 
- 
 
 70 
int cir_service = 0;
- 
 
 71 
int cir_phone = -1;
61 
 
 72 
 
62 
void kbd_push_scancode(int scancode)
 73 
void kbd_push_scancode(int scancode)
63 
{
 74 
{
64 
    printf("scancode: 0x%x\n", scancode);
 75 
/*  printf("scancode: 0x%x\n", scancode);*/
65 
    kbd_ctl_parse_scancode(scancode);
 76 
    kbd_ctl_parse_scancode(scancode);
66 
}
 77 
}
67 
 
 78 
 
68 
#include <kbd/keycode.h>
 - 
 
69 
void kbd_push_ev(int type, unsigned int key, unsigned int mods)
 79 
void kbd_push_ev(int type, unsigned int key)
70 
{
 80 
{
71 
    kbd_event_t ev;
 81 
    kbd_event_t ev;
- 
 
 82 
    unsigned mod_mask;
- 
 
 83 
 
- 
 
 84 
    switch (key) {
- 
 
 85 
    case KC_LCTRL: mod_mask = KM_LCTRL; break;
- 
 
 86 
    case KC_RCTRL: mod_mask = KM_RCTRL; break;
- 
 
 87 
    case KC_LSHIFT: mod_mask = KM_LSHIFT; break;
- 
 
 88 
    case KC_RSHIFT: mod_mask = KM_RSHIFT; break;
- 
 
 89 
    case KC_LALT: mod_mask = KM_LALT; break;
- 
 
 90 
    case KC_RALT: mod_mask = KM_RALT; break;
- 
 
 91 
    default: mod_mask = 0; break;
- 
 
 92 
    }
- 
 
 93 
 
- 
 
 94 
    if (mod_mask != 0) {
- 
 
 95 
        if (type == KE_PRESS)
- 
 
 96 
            mods = mods | mod_mask;
- 
 
 97 
        else
- 
 
 98 
            mods = mods & ~mod_mask;
- 
 
 99 
    }
- 
 
 100 
 
- 
 
 101 
    switch (key) {
- 
 
 102 
    case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; break;
- 
 
 103 
    case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; break;
- 
 
 104 
    case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; break;
- 
 
 105 
    default: mod_mask = 0; break;
- 
 
 106 
    }
72 
 
 107 
 
- 
 
 108 
    if (mod_mask != 0) {
- 
 
 109 
        if (type == KE_PRESS) {
- 
 
 110 
            /*
- 
 
 111 
             * Only change lock state on transition from released
- 
 
 112 
             * to pressed. This prevents autorepeat from messing
- 
 
 113 
             * up the lock state.
- 
 
 114 
             */
- 
 
 115 
            mods = mods ^ (mod_mask & ~lock_keys);
- 
 
 116 
            lock_keys = lock_keys | mod_mask;
- 
 
 117 
        } else {
- 
 
 118 
            lock_keys = lock_keys & ~mod_mask;
- 
 
 119 
        }
- 
 
 120 
    }
- 
 
 121 
/*
73 
    printf("type: %d\n", type);
 122 
    printf("type: %d\n", type);
74 
    printf("mods: 0x%x\n", mods);
 123 
    printf("mods: 0x%x\n", mods);
75 
    printf("keycode: %u\n", key);
 124 
    printf("keycode: %u\n", key);
76 
 
 125 
*/
77 
    ev.type = type;
 126 
    ev.type = type;
78 
    ev.key = key;
 127 
    ev.key = key;
79 
    ev.mods = mods;
 128 
    ev.mods = mods;
80 
 
 129 
 
81 
    ev.c = layout_parse_ev(&ev);
 130 
    ev.c = layout_parse_ev(&ev);
82 
 
 131 
 
83 
    async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
 132 
    async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
84 
}
 133 
}
85 
 
 134 
 
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 
 
 - 
 
107 
static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
 135 
static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
108 
{
 136 
{
109 
    ipc_callid_t callid;
 137 
    ipc_callid_t callid;
110 
    ipc_call_t call;
 138 
    ipc_call_t call;
111 
    int retval;
 139 
    int retval;
Line 140... Line 168...
140 
        ipc_answer_0(callid, retval);
 168 
        ipc_answer_0(callid, retval);
141 
    }  
 169 
    }  
142 
}
 170 
}
143 
 
 171 
 
144 
 
 172 
 
145 
 
 - 
 
146 
int main(int argc, char **argv)
 173 
int main(int argc, char **argv)
147 
{
 174 
{
148 
    printf(NAME ": HelenOS Keyboard service\n");
 175 
    printf(NAME ": HelenOS Keyboard service\n");
149 
   
 176 
   
150 
    ipcarg_t phonead;
 177 
    ipcarg_t phonead;
151 
   
 178 
   
- 
 
 179 
    if (sysinfo_value("kbd.cir.fhc") == 1)
- 
 
 180 
        cir_service = SERVICE_FHC;
- 
 
 181 
    else if (sysinfo_value("kbd.cir.obio") == 1)
- 
 
 182 
        cir_service = SERVICE_OBIO;
- 
 
 183 
   
- 
 
 184 
    if (cir_service) {
- 
 
 185 
        while (cir_phone < 0) {
- 
 
 186 
            cir_phone = ipc_connect_me_to(PHONE_NS, cir_service,
- 
 
 187 
                0, 0);
- 
 
 188 
        }
- 
 
 189 
    }
- 
 
 190 
   
152 
    /* Initialize port driver. */
 191 
    /* Initialize port driver. */
153 
    if (kbd_port_init())
 192 
    if (kbd_port_init())
154 
        return -1;
 193 
        return -1;
155 
   
 194 
   
156 
    /* Initialize key buffer */
 195 
    /* Initialize key buffer */