Changeset 25eec4e in mainline for uspace/srv/hid/input/input.c


Ignore:
Timestamp:
2013-04-19T18:38:18Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6d717a4
Parents:
a1e2df13 (diff), 289cb7dd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline chages.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/input/input.c

    ra1e2df13 r25eec4e  
    3838
    3939#include <adt/list.h>
    40 #include <bool.h>
     40#include <stdbool.h>
    4141#include <fibril_synch.h>
    4242#include <ipc/services.h>
     
    6262#include "input.h"
    6363
    64 #define NUM_LAYOUTS  3
     64#define NUM_LAYOUTS  4
    6565
    6666static layout_ops_t *layout[NUM_LAYOUTS] = {
    6767        &us_qwerty_ops,
    6868        &us_dvorak_ops,
    69         &cz_ops
     69        &cz_ops,
     70        &ar_ops
    7071};
    7172
     
    160161                layout_destroy(kdev->active_layout);
    161162                kdev->active_layout = layout_create(layout[2]);
     163                return;
     164        }
     165       
     166        if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
     167            key == KC_F4) {
     168                layout_destroy(kdev->active_layout);
     169                kdev->active_layout = layout_create(layout[3]);
    162170                return;
    163171        }
     
    423431        kbd_add_dev(&chardev_port, &stty_ctl);
    424432#endif
    425 #if defined(UARCH_arm32) && defined(MACHINE_testarm) && defined(CONFIG_FB)
    426         kbd_add_dev(&gxemul_port, &gxe_fb_ctl);
    427 #endif
    428 #if defined(UARCH_arm32) && defined(MACHINE_testarm) && !defined(CONFIG_FB)
    429         kbd_add_dev(&gxemul_port, &stty_ctl);
    430 #endif
    431433#if defined(UARCH_arm32) && defined(MACHINE_integratorcp)
    432434        kbd_add_dev(&pl050_port, &pc_ctl);
     
    437439#if defined(MACHINE_msim)
    438440        kbd_add_dev(&msim_port, &stty_ctl);
    439 #endif
    440 #if (defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)) && defined(CONFIG_FB)
    441         kbd_add_dev(&gxemul_port, &gxe_fb_ctl);
    442 #endif
    443 #if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul) && !defined(CONFIG_FB)
    444         kbd_add_dev(&gxemul_port, &stty_ctl);
    445441#endif
    446442#if defined(UARCH_ppc32)
Note: See TracChangeset for help on using the changeset viewer.