Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 3e1bc35 in mainline


Ignore:
Timestamp:
2019-05-12T15:03:14Z (17 months ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
8f16ede6
Parents:
cb9313e
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-05-12 13:37:28)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-05-12 15:03:14)
Message:

Adding makefiles which build the layouts as dynamic library. All *.c files addedd to the directory uspace/srv/hid/input/layout will be treated as such

Location:
uspace
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    rcb9313e r3e1bc35  
    220220endif
    221221
     222## build keyboard layouts
     223ifeq ($(CONFIG_RTLD),y)
     224        DIRS += srv/hid/input/layout
     225endif
     226
    222227## System libraries
    223228#
  • uspace/srv/hid/input/Makefile

    rcb9313e r3e1bc35  
    5353        stroke.c
    5454
    55 
    5655include $(USPACE_PREFIX)/Makefile.common
    57 
  • uspace/srv/hid/input/layout/ar.c

    rcb9313e r3e1bc35  
    5454};
    5555
     56#else
     57
     58layout_ops_t get_layout(void);
     59layout_ops_t get_layout(void) {
     60        layout_ops_t layout_default = {
     61                .create = ar_create,
     62                .destroy = ar_destroy,
     63                .parse_ev = ar_parse_ev
     64        };
     65        return layout_default;
     66}
     67
    5668#endif
    5769
  • uspace/srv/hid/input/layout/cz.c

    rcb9313e r3e1bc35  
    5757} layout_cz_t;
    5858
    59 #ifdef CONFIG_KB_LAYOUT_us_qwerty
     59#ifdef CONFIG_KB_LAYOUT_cz
    6060
    6161layout_ops_t layout_default = {
     
    6464        .parse_ev = cz_parse_ev
    6565};
     66
     67#else
     68
     69layout_ops_t get_layout(void);
     70layout_ops_t get_layout(void) {
     71        layout_ops_t layout_default = {
     72                .create = cz_create,
     73                .destroy = cz_destroy,
     74                .parse_ev = cz_parse_ev
     75        };
     76        return layout_default;
     77}
    6678
    6779#endif
  • uspace/srv/hid/input/layout/us_dvorak.c

    rcb9313e r3e1bc35  
    5353};
    5454
     55#else
     56
     57layout_ops_t get_layout(void);
     58layout_ops_t get_layout(void) {
     59        layout_ops_t layout_default = {
     60                .create = us_dvorak_create,
     61                .destroy = us_dvorak_destroy,
     62                .parse_ev = us_dvorak_parse_ev
     63        };
     64        return layout_default;
     65}
     66
    5567#endif
    5668
  • uspace/srv/hid/input/layout/us_qwerty.c

    rcb9313e r3e1bc35  
    5353};
    5454
     55#else
     56
     57layout_ops_t get_layout(void);
     58layout_ops_t get_layout(void) {
     59        layout_ops_t layout_default = {
     60                .create = us_qwerty_create,
     61                .destroy = us_qwerty_destroy,
     62                .parse_ev = us_qwerty_parse_ev
     63        };
     64        return layout_default;
     65}
     66
    5567#endif
    5668
Note: See TracChangeset for help on using the changeset viewer.