Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/usbhid/kbddev.c

    rac8285d ra8def7d  
    3737#include <errno.h>
    3838#include <str_error.h>
    39 #include <fibril.h>
     39#include <stdio.h>
    4040
    4141#include <io/keycode.h>
    4242#include <ipc/kbd.h>
    4343#include <async.h>
     44#include <fibril.h>
     45#include <fibril_synch.h>
    4446
    4547#include <usb/usb.h>
     
    5557#include "layout.h"
    5658#include "conv.h"
    57 
    58 /*----------------------------------------------------------------------------*/
    59 
     59#include "kbdrepeat.h"
     60
     61/*----------------------------------------------------------------------------*/
     62/** Default modifiers when the keyboard is initialized. */
    6063static const unsigned DEFAULT_ACTIVE_MODS = KM_NUM_LOCK;
     64
     65/** Boot protocol report size (key part). */
    6166static const size_t BOOTP_REPORT_SIZE = 6;
     67
     68/** Boot protocol total report size. */
    6269static const size_t BOOTP_BUFFER_SIZE = 8;
     70
     71/** Boot protocol output report size. */
    6372static const size_t BOOTP_BUFFER_OUT_SIZE = 1;
     73
     74/** Boot protocol error key code. */
     75static const uint8_t BOOTP_ERROR_ROLLOVER = 1;
     76
     77/** Default idle rate for keyboards. */
     78static const uint8_t IDLE_RATE = 0;
     79
     80/** Delay before a pressed key starts auto-repeating. */
     81static const unsigned int DEFAULT_DELAY_BEFORE_FIRST_REPEAT = 500 * 1000;
     82
     83/** Delay between two repeats of a pressed key when auto-repeating. */
     84static const unsigned int DEFAULT_REPEAT_DELAY = 50 * 1000;
    6485
    6586/** Keyboard polling endpoint description for boot protocol class. */
     
    79100#define NUM_LAYOUTS 3
    80101
     102/** Keyboard layout map. */
    81103static layout_op_t *layout[NUM_LAYOUTS] = {
    82104        &us_qwerty_op,
     
    90112/* Modifier constants                                                         */
    91113/*----------------------------------------------------------------------------*/
    92 
     114/** Mapping of USB modifier key codes to generic modifier key codes. */
    93115static const keycode_t usbhid_modifiers_keycodes[USB_HID_MOD_COUNT] = {
    94116        KC_LCTRL,         /* USB_HID_MOD_LCTRL */
     
    111133};
    112134
    113 /** Default handler for IPC methods not handled by DDF.
    114  *
    115  * @param dev Device handling the call.
     135/**
     136 * Default handler for IPC methods not handled by DDF.
     137 *
     138 * Currently recognizes only one method (IPC_M_CONNECT_TO_ME), in which case it
     139 * assumes the caller is the console and thus it stores IPC phone to it for
     140 * later use by the driver to notify about key events.
     141 *
     142 * @param fun Device function handling the call.
    116143 * @param icallid Call id.
    117144 * @param icall Call data.
     
    144171/* Key processing functions                                                   */
    145172/*----------------------------------------------------------------------------*/
    146 
     173/**
     174 * Handles turning of LED lights on and off.
     175 *
     176 * In case of USB keyboards, the LEDs are handled in the driver, not in the
     177 * device. When there should be a change (lock key was pressed), the driver
     178 * uses a Set_Report request sent to the device to set the state of the LEDs.
     179 *
     180 * This functions sets the LED lights according to current settings of modifiers
     181 * kept in the keyboard device structure.
     182 *
     183 * @param kbd_dev Keyboard device structure.
     184 */
    147185static void usbhid_kbd_set_led(usbhid_kbd_t *kbd_dev)
    148186{
    149187        uint8_t buffer[BOOTP_BUFFER_OUT_SIZE];
    150188        int rc= 0;
    151         unsigned i;
    152189       
    153190        memset(buffer, 0, BOOTP_BUFFER_OUT_SIZE);
     
    177214        }
    178215       
    179         // TODO: REFACTOR!!!
    180        
    181         usb_log_debug("Output report buffer: ");
    182         for (i = 0; i < BOOTP_BUFFER_OUT_SIZE; ++i) {
    183                 usb_log_debug("0x%x ", buffer[i]);
    184         }
    185         usb_log_debug("\n");
    186        
    187         uint16_t value = 0;
    188         value |= (USB_HID_REPORT_TYPE_OUTPUT << 8);
    189 
     216        usb_log_debug("Output report buffer: %s\n",
     217            usb_debug_str_buffer(buffer, BOOTP_BUFFER_OUT_SIZE, 0));
     218       
    190219        assert(kbd_dev->hid_dev != NULL);
    191220        assert(kbd_dev->hid_dev->initialized);
    192         usbhid_req_set_report(kbd_dev->hid_dev, value, buffer,
    193             BOOTP_BUFFER_OUT_SIZE);
    194 }
    195 
    196 /*----------------------------------------------------------------------------*/
    197 
    198 static void usbhid_kbd_push_ev(usbhid_kbd_t *kbd_dev, int type,
    199     unsigned int key)
     221        usbhid_req_set_report(kbd_dev->hid_dev, USB_HID_REPORT_TYPE_OUTPUT,
     222            buffer, BOOTP_BUFFER_OUT_SIZE);
     223}
     224
     225/*----------------------------------------------------------------------------*/
     226/**
     227 * Processes key events.
     228 *
     229 * @note This function was copied from AT keyboard driver and modified to suit
     230 *       USB keyboard.
     231 *
     232 * @note Lock keys are not sent to the console, as they are completely handled
     233 *       in the driver. It may, however, be required later that the driver
     234 *       sends also these keys to application (otherwise it cannot use those
     235 *       keys at all).
     236 *
     237 * @param kbd_dev Keyboard device structure.
     238 * @param type Type of the event (press / release). Recognized values:
     239 *             KEY_PRESS, KEY_RELEASE
     240 * @param key Key code of the key according to HID Usage Tables.
     241 */
     242void usbhid_kbd_push_ev(usbhid_kbd_t *kbd_dev, int type, unsigned int key)
    200243{
    201244        console_event_t ev;
    202245        unsigned mod_mask;
    203246
    204         // TODO: replace by our own parsing?? or are the key codes identical??
     247        /*
     248         * These parts are copy-pasted from the AT keyboard driver.
     249         *
     250         * They definitely require some refactoring, but will keep it for later
     251         * when the console and keyboard system is changed in HelenOS.
     252         */
    205253        switch (key) {
    206254        case KC_LCTRL: mod_mask = KM_LCTRL; break;
     
    228276
    229277        if (mod_mask != 0) {
    230                 usb_log_debug2("\n\nChanging mods and lock keys\n");
    231                 usb_log_debug2("\nmods before: 0x%x\n", kbd_dev->mods);
    232                 usb_log_debug2("\nLock keys before:0x%x\n\n",
    233                     kbd_dev->lock_keys);
    234                
    235278                if (type == KEY_PRESS) {
    236                         usb_log_debug2("\nKey pressed.\n");
    237279                        /*
    238280                         * Only change lock state on transition from released
     
    240282                         * up the lock state.
    241283                         */
     284                        unsigned int locks_old = kbd_dev->lock_keys;
     285                       
    242286                        kbd_dev->mods =
    243287                            kbd_dev->mods ^ (mod_mask & ~kbd_dev->lock_keys);
     
    245289
    246290                        /* Update keyboard lock indicator lights. */
    247                         usbhid_kbd_set_led(kbd_dev);
     291                        if (kbd_dev->lock_keys != locks_old) {
     292                                usbhid_kbd_set_led(kbd_dev);
     293                        }
    248294                } else {
    249                         usb_log_debug2("\nKey released.\n");
    250295                        kbd_dev->lock_keys = kbd_dev->lock_keys & ~mod_mask;
    251296                }
    252297        }
    253298
    254         usb_log_debug2("\n\nmods after: 0x%x\n", kbd_dev->mods);
    255         usb_log_debug2("\nLock keys after: 0x%x\n\n", kbd_dev->lock_keys);
    256        
    257299        if (key == KC_CAPS_LOCK || key == KC_NUM_LOCK || key == KC_SCROLL_LOCK) {
    258300                // do not send anything to the console, this is our business
     
    281323        ev.key = key;
    282324        ev.mods = kbd_dev->mods;
    283        
    284         if (ev.mods & KM_NUM_LOCK) {
    285                 usb_log_debug("\n\nNum Lock turned on.\n\n");
    286         }
    287325
    288326        ev.c = layout[active_layout]->parse_ev(&ev);
    289327
    290328        usb_log_debug2("Sending key %d to the console\n", ev.key);
    291         assert(kbd_dev->console_phone != -1);
     329        if (kbd_dev->console_phone < 0) {
     330                usb_log_warning(
     331                    "Connection to console not ready, key discarded.\n");
     332                return;
     333        }
    292334       
    293335        async_msg_4(kbd_dev->console_phone, KBD_EVENT, ev.type, ev.key,
     
    296338
    297339/*----------------------------------------------------------------------------*/
    298 
     340/**
     341 * Checks if modifiers were pressed or released and generates key events.
     342 *
     343 * @param kbd_dev Keyboard device structure.
     344 * @param modifiers Bitmap of modifiers.
     345 *
     346 * @sa usbhid_kbd_push_ev()
     347 */
    299348static void usbhid_kbd_check_modifier_changes(usbhid_kbd_t *kbd_dev,
    300349    uint8_t modifiers)
     
    332381
    333382/*----------------------------------------------------------------------------*/
    334 
     383/**
     384 * Checks if some keys were pressed or released and generates key events.
     385 *
     386 * An event is created only when key is pressed or released. Besides handling
     387 * the events (usbhid_kbd_push_ev()), the auto-repeat fibril is notified about
     388 * key presses and releases (see usbhid_kbd_repeat_start() and
     389 * usbhid_kbd_repeat_stop()).
     390 *
     391 * @param kbd_dev Keyboard device structure.
     392 * @param key_codes Parsed keyboard report - codes of currently pressed keys
     393 *                  according to HID Usage Tables.
     394 * @param count Number of key codes in report (size of the report).
     395 *
     396 * @sa usbhid_kbd_push_ev(), usbhid_kbd_repeat_start(), usbhid_kbd_repeat_stop()
     397 */
    335398static void usbhid_kbd_check_key_changes(usbhid_kbd_t *kbd_dev,
    336     const uint8_t *key_codes)
    337 {
    338         // TODO: phantom state!!
    339        
     399    const uint8_t *key_codes, size_t count)
     400{
    340401        unsigned int key;
    341402        unsigned int i, j;
    342403       
    343         // TODO: quite dummy right now, think of better implementation
     404        /*
     405         * First of all, check if the kbd have reported phantom state.
     406         */
     407        i = 0;
     408        // all fields should report Error Rollover
     409        while (i < count &&
     410            key_codes[i] == BOOTP_ERROR_ROLLOVER) {
     411                ++i;
     412        }
     413        if (i == count) {
     414                usb_log_debug("Phantom state occured.\n");
     415                // phantom state, do nothing
     416                return;
     417        }
     418       
     419        /* TODO: quite dummy right now, think of better implementation */
     420        assert(count == kbd_dev->key_count);
    344421       
    345422        /*
    346423         * 1) Key releases
    347424         */
    348         for (j = 0; j < kbd_dev->keycode_count; ++j) {
     425        for (j = 0; j < count; ++j) {
    349426                // try to find the old key in the new key list
    350427                i = 0;
    351                 while (i < kbd_dev->keycode_count
    352                     && key_codes[i] != kbd_dev->keycodes[j]) {
     428                while (i < kbd_dev->key_count
     429                    && key_codes[i] != kbd_dev->keys[j]) {
    353430                        ++i;
    354431                }
    355432               
    356                 if (i == kbd_dev->keycode_count) {
     433                if (i == count) {
    357434                        // not found, i.e. the key was released
    358                         key = usbhid_parse_scancode(kbd_dev->keycodes[j]);
     435                        key = usbhid_parse_scancode(kbd_dev->keys[j]);
     436                        usbhid_kbd_repeat_stop(kbd_dev, key);
    359437                        usbhid_kbd_push_ev(kbd_dev, KEY_RELEASE, key);
    360                         usb_log_debug2("\nKey released: %d\n", key);
     438                        usb_log_debug2("Key released: %d\n", key);
    361439                } else {
    362440                        // found, nothing happens
     
    367445         * 1) Key presses
    368446         */
    369         for (i = 0; i < kbd_dev->keycode_count; ++i) {
     447        for (i = 0; i < kbd_dev->key_count; ++i) {
    370448                // try to find the new key in the old key list
    371449                j = 0;
    372                 while (j < kbd_dev->keycode_count
    373                     && kbd_dev->keycodes[j] != key_codes[i]) {
     450                while (j < count && kbd_dev->keys[j] != key_codes[i]) {
    374451                        ++j;
    375452                }
    376453               
    377                 if (j == kbd_dev->keycode_count) {
     454                if (j == count) {
    378455                        // not found, i.e. new key pressed
    379456                        key = usbhid_parse_scancode(key_codes[i]);
    380                         usb_log_debug2("\nKey pressed: %d (keycode: %d)\n", key,
     457                        usb_log_debug2("Key pressed: %d (keycode: %d)\n", key,
    381458                            key_codes[i]);
    382459                        usbhid_kbd_push_ev(kbd_dev, KEY_PRESS, key);
     460                        usbhid_kbd_repeat_start(kbd_dev, key);
    383461                } else {
    384462                        // found, nothing happens
     
    386464        }
    387465       
    388         memcpy(kbd_dev->keycodes, key_codes, kbd_dev->keycode_count);
    389        
    390         usb_log_debug2("\nNew stored keycodes: ");
    391         for (i = 0; i < kbd_dev->keycode_count; ++i) {
    392                 usb_log_debug2("%d ", kbd_dev->keycodes[i]);
    393         }
     466        memcpy(kbd_dev->keys, key_codes, count);
     467
     468        usb_log_debug("New stored keycodes: %s\n",
     469            usb_debug_str_buffer(kbd_dev->keys, kbd_dev->key_count, 0));
    394470}
    395471
     
    397473/* Callbacks for parser                                                       */
    398474/*----------------------------------------------------------------------------*/
    399 
     475/**
     476 * Callback function for the HID report parser.
     477 *
     478 * This function is called by the HID report parser with the parsed report.
     479 * The parsed report is used to check if any events occured (key was pressed or
     480 * released, modifier was pressed or released).
     481 *
     482 * @param key_codes Parsed keyboard report - codes of currently pressed keys
     483 *                  according to HID Usage Tables.
     484 * @param count Number of key codes in report (size of the report).
     485 * @param modifiers Bitmap of modifiers (Ctrl, Alt, Shift, GUI).
     486 * @param arg User-specified argument. Expects pointer to the keyboard device
     487 *            structure representing the keyboard.
     488 *
     489 * @sa usbhid_kbd_check_key_changes(), usbhid_kbd_check_modifier_changes()
     490 */
    400491static void usbhid_kbd_process_keycodes(const uint8_t *key_codes, size_t count,
    401492    uint8_t modifiers, void *arg)
     
    406497                return;
    407498        }
    408 
    409         usb_log_debug2("Got keys from parser: ");
    410         unsigned i;
    411         for (i = 0; i < count; ++i) {
    412                 usb_log_debug2("%d ", key_codes[i]);
    413         }
    414         usb_log_debug2("\n");
    415499       
    416500        usbhid_kbd_t *kbd_dev = (usbhid_kbd_t *)arg;
    417501        assert(kbd_dev != NULL);
    418        
    419         if (count != kbd_dev->keycode_count) {
     502
     503        usb_log_debug("Got keys from parser: %s\n",
     504            usb_debug_str_buffer(key_codes, count, 0));
     505       
     506        if (count != kbd_dev->key_count) {
    420507                usb_log_warning("Number of received keycodes (%d) differs from"
    421                     " expected number (%d).\n", count, kbd_dev->keycode_count);
     508                    " expected number (%d).\n", count, kbd_dev->key_count);
    422509                return;
    423510        }
    424511       
    425512        usbhid_kbd_check_modifier_changes(kbd_dev, modifiers);
    426         usbhid_kbd_check_key_changes(kbd_dev, key_codes);
     513        usbhid_kbd_check_key_changes(kbd_dev, key_codes, count);
    427514}
    428515
     
    430517/* General kbd functions                                                      */
    431518/*----------------------------------------------------------------------------*/
    432 
     519/**
     520 * Processes data received from the device in form of report.
     521 *
     522 * This function uses the HID report parser to translate the data received from
     523 * the device into generic USB HID key codes and into generic modifiers bitmap.
     524 * The parser then calls the given callback (usbhid_kbd_process_keycodes()).
     525 *
     526 * @note Currently, only the boot protocol is supported.
     527 *
     528 * @param kbd_dev Keyboard device structure (must be initialized).
     529 * @param buffer Data from the keyboard (i.e. the report).
     530 * @param actual_size Size of the data from keyboard (report size) in bytes.
     531 *
     532 * @sa usbhid_kbd_process_keycodes(), usb_hid_boot_keyboard_input_report().
     533 */
    433534static void usbhid_kbd_process_data(usbhid_kbd_t *kbd_dev,
    434535                                    uint8_t *buffer, size_t actual_size)
    435536{
     537        assert(kbd_dev->initialized);
     538        assert(kbd_dev->hid_dev->parser != NULL);
     539       
    436540        usb_hid_report_in_callbacks_t *callbacks =
    437541            (usb_hid_report_in_callbacks_t *)malloc(
     
    440544        callbacks->keyboard = usbhid_kbd_process_keycodes;
    441545
    442         //usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks,
    443         //    NULL);
    444         /*usb_log_debug2("Calling usb_hid_boot_keyboard_input_report() with size"
    445             " %zu\n", actual_size);*/
    446         //dump_buffer("bufffer: ", buffer, actual_size);
    447        
    448         int rc = usb_hid_boot_keyboard_input_report(buffer, actual_size,
    449             callbacks, kbd_dev);
     546        usb_log_debug("Calling usb_hid_parse_report() with "
     547            "buffer %s\n", usb_debug_str_buffer(buffer, actual_size, 0));
     548       
     549//      int rc = usb_hid_boot_keyboard_input_report(buffer, actual_size,
     550//          callbacks, kbd_dev);
     551        int rc = usb_hid_parse_report(kbd_dev->hid_dev->parser, buffer,
     552            actual_size, callbacks, kbd_dev);
    450553       
    451554        if (rc != EOK) {
     
    458561/* HID/KBD structure manipulation                                             */
    459562/*----------------------------------------------------------------------------*/
    460 
     563/**
     564 * Creates a new USB/HID keyboard structure.
     565 *
     566 * The structure returned by this function is not initialized. Use
     567 * usbhid_kbd_init() to initialize it prior to polling.
     568 *
     569 * @return New uninitialized structure for representing a USB/HID keyboard or
     570 *         NULL if not successful (memory error).
     571 */
    461572static usbhid_kbd_t *usbhid_kbd_new(void)
    462573{
     
    484595
    485596/*----------------------------------------------------------------------------*/
    486 
     597/**
     598 * Properly destroys the USB/HID keyboard structure.
     599 *
     600 * @param kbd_dev Pointer to the structure to be destroyed.
     601 */
    487602static void usbhid_kbd_free(usbhid_kbd_t **kbd_dev)
    488603{
     
    499614        }
    500615       
     616        if ((*kbd_dev)->repeat_mtx != NULL) {
     617                /* TODO: replace by some check and wait */
     618                assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
     619                free((*kbd_dev)->repeat_mtx);
     620        }
     621
    501622        free(*kbd_dev);
    502623        *kbd_dev = NULL;
     
    504625
    505626/*----------------------------------------------------------------------------*/
    506 
     627/**
     628 * Initialization of the USB/HID keyboard structure.
     629 *
     630 * This functions initializes required structures from the device's descriptors.
     631 *
     632 * During initialization, the keyboard is switched into boot protocol, the idle
     633 * rate is set to 0 (infinity), resulting in the keyboard only reporting event
     634 * when a key is pressed or released. Finally, the LED lights are turned on
     635 * according to the default setup of lock keys.
     636 *
     637 * @note By default, the keyboards is initialized with Num Lock turned on and
     638 *       other locks turned off.
     639 *
     640 * @param kbd_dev Keyboard device structure to be initialized.
     641 * @param dev DDF device structure of the keyboard.
     642 *
     643 * @retval EOK if successful.
     644 * @retval EINVAL if some parameter is not given.
     645 * @return Other value inherited from function usbhid_dev_init().
     646 */
    507647static int usbhid_kbd_init(usbhid_kbd_t *kbd_dev, ddf_dev_t *dev)
    508648{
     
    539679       
    540680        // save the size of the report (boot protocol report by default)
    541         kbd_dev->keycode_count = BOOTP_REPORT_SIZE;
    542         kbd_dev->keycodes = (uint8_t *)calloc(
    543             kbd_dev->keycode_count, sizeof(uint8_t));
    544        
    545         if (kbd_dev->keycodes == NULL) {
     681        kbd_dev->key_count = BOOTP_REPORT_SIZE;
     682        kbd_dev->keys = (uint8_t *)calloc(
     683            kbd_dev->key_count, sizeof(uint8_t));
     684       
     685        if (kbd_dev->keys == NULL) {
    546686                usb_log_fatal("No memory!\n");
    547                 return rc;
     687                return ENOMEM;
    548688        }
    549689       
     
    552692        kbd_dev->lock_keys = 0;
    553693       
     694        kbd_dev->repeat.key_new = 0;
     695        kbd_dev->repeat.key_repeated = 0;
     696        kbd_dev->repeat.delay_before = DEFAULT_DELAY_BEFORE_FIRST_REPEAT;
     697        kbd_dev->repeat.delay_between = DEFAULT_REPEAT_DELAY;
     698       
     699        kbd_dev->repeat_mtx = (fibril_mutex_t *)(
     700            malloc(sizeof(fibril_mutex_t)));
     701        if (kbd_dev->repeat_mtx == NULL) {
     702                usb_log_fatal("No memory!\n");
     703                free(kbd_dev->keys);
     704                return ENOMEM;
     705        }
     706       
     707        fibril_mutex_initialize(kbd_dev->repeat_mtx);
     708       
    554709        /*
    555710         * Set boot protocol.
    556711         * Set LEDs according to initial setup.
     712         * Set Idle rate
    557713         */
    558714        assert(kbd_dev->hid_dev != NULL);
    559715        assert(kbd_dev->hid_dev->initialized);
    560         usbhid_req_set_protocol(kbd_dev->hid_dev, USB_HID_PROTOCOL_BOOT);
     716        //usbhid_req_set_protocol(kbd_dev->hid_dev, USB_HID_PROTOCOL_BOOT);
    561717       
    562718        usbhid_kbd_set_led(kbd_dev);
     719       
     720        usbhid_req_set_idle(kbd_dev->hid_dev, IDLE_RATE);
    563721       
    564722        kbd_dev->initialized = 1;
     
    571729/* HID/KBD polling                                                            */
    572730/*----------------------------------------------------------------------------*/
    573 
     731/**
     732 * Main keyboard polling function.
     733 *
     734 * This function uses the Interrupt In pipe of the keyboard to poll for events.
     735 * The keyboard is initialized in a way that it reports only when a key is
     736 * pressed or released, so there is no actual need for any sleeping between
     737 * polls (see usbhid_kbd_try_add_device() or usbhid_kbd_init()).
     738 *
     739 * @param kbd_dev Initialized keyboard structure representing the device to
     740 *                poll.
     741 *
     742 * @sa usbhid_kbd_process_data()
     743 */
    574744static void usbhid_kbd_poll(usbhid_kbd_t *kbd_dev)
    575745{
     
    589759
    590760        while (true) {
    591                 async_usleep(1000 * 10);
    592 
    593761                sess_rc = usb_endpoint_pipe_start_session(
    594762                    &kbd_dev->hid_dev->poll_pipe);
     
    596764                        usb_log_warning("Failed to start a session: %s.\n",
    597765                            str_error(sess_rc));
    598                         continue;
     766                        break;
    599767                }
    600768
     
    608776                        usb_log_warning("Error polling the keyboard: %s.\n",
    609777                            str_error(rc));
    610                         continue;
     778                        break;
    611779                }
    612780
     
    614782                        usb_log_warning("Error closing session: %s.\n",
    615783                            str_error(sess_rc));
    616                         continue;
     784                        break;
    617785                }
    618786
     
    631799                usb_log_debug("Calling usbhid_kbd_process_data()\n");
    632800                usbhid_kbd_process_data(kbd_dev, buffer, actual_size);
    633         }
    634 
    635         // not reached
    636         assert(0);
    637 }
    638 
    639 /*----------------------------------------------------------------------------*/
    640 
     801               
     802                // disabled for now, no reason to sleep
     803                //async_usleep(kbd_dev->hid_dev->poll_interval);
     804        }
     805}
     806
     807/*----------------------------------------------------------------------------*/
     808/**
     809 * Function executed by the main driver fibril.
     810 *
     811 * Just starts polling the keyboard for events.
     812 *
     813 * @param arg Initialized keyboard device structure (of type usbhid_kbd_t)
     814 *            representing the device.
     815 *
     816 * @retval EOK if the fibril finished polling the device.
     817 * @retval EINVAL if no device was given in the argument.
     818 *
     819 * @sa usbhid_kbd_poll()
     820 *
     821 * @todo Change return value - only case when the fibril finishes is in case
     822 *       of some error, so the error should probably be propagated from function
     823 *       usbhid_kbd_poll() to here and up.
     824 */
    641825static int usbhid_kbd_fibril(void *arg)
    642826{
     
    660844/* API functions                                                              */
    661845/*----------------------------------------------------------------------------*/
    662 
     846/**
     847 * Function for adding a new device of type USB/HID/keyboard.
     848 *
     849 * This functions initializes required structures from the device's descriptors
     850 * and starts new fibril for polling the keyboard for events and another one for
     851 * handling auto-repeat of keys.
     852 *
     853 * During initialization, the keyboard is switched into boot protocol, the idle
     854 * rate is set to 0 (infinity), resulting in the keyboard only reporting event
     855 * when a key is pressed or released. Finally, the LED lights are turned on
     856 * according to the default setup of lock keys.
     857 *
     858 * @note By default, the keyboards is initialized with Num Lock turned on and
     859 *       other locks turned off.
     860 * @note Currently supports only boot-protocol keyboards.
     861 *
     862 * @param dev Device to add.
     863 *
     864 * @retval EOK if successful.
     865 * @retval ENOMEM if there
     866 * @return Other error code inherited from one of functions usbhid_kbd_init(),
     867 *         ddf_fun_bind() and ddf_fun_add_to_class().
     868 *
     869 * @sa usbhid_kbd_fibril(), usbhid_kbd_repeat_fibril()
     870 */
    663871int usbhid_kbd_try_add_device(ddf_dev_t *dev)
    664872{
     
    682890                    "structure.\n");
    683891                ddf_fun_destroy(kbd_fun);
    684                 return EINVAL;  // TODO: some other code??
     892                return ENOMEM;  // TODO: some other code??
    685893        }
    686894       
     
    731939        }
    732940        fibril_add_ready(fid);
     941       
     942        /*
     943         * Create new fibril for auto-repeat
     944         */
     945        fid = fibril_create(usbhid_kbd_repeat_fibril, kbd_dev);
     946        if (fid == 0) {
     947                usb_log_error("Failed to start fibril for KBD auto-repeat");
     948                return ENOMEM;
     949        }
     950        fibril_add_ready(fid);
    733951
    734952        (void)keyboard_ops;
Note: See TracChangeset for help on using the changeset viewer.