Changeset 064e0fd in mainline


Ignore:
Timestamp:
2018-03-26T11:53:12Z (7 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5a01f7d
Parents:
cbb37b6
git-author:
Jiri Svoboda <jiri@…> (2018-03-25 17:52:08)
git-committer:
Jiri Svoboda <jiri@…> (2018-03-26 11:53:12)
Message:

Ccheck requires declarations to be terminated by semicolon.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usbhid/include/usb/hid/usages/kbdgen.h

    rcbb37b6 r064e0fd  
    7272
    7373/* US alphabet letters */
    74 USB_HIDUT_KBD_KEY(A, 0x04, 'a', 'A', 0, 0)
    75 USB_HIDUT_KBD_KEY(B, 0x05, 'b', 'B', 0, 0)
    76 USB_HIDUT_KBD_KEY(C, 0x06, 'c', 'C', 0, 0)
    77 USB_HIDUT_KBD_KEY(D, 0x07, 'd', 'D', 0, 0)
    78 USB_HIDUT_KBD_KEY(E, 0x08, 'e', 'E', 0, 0)
    79 USB_HIDUT_KBD_KEY(F, 0x09, 'f', 'F', 0, 0)
    80 USB_HIDUT_KBD_KEY(G, 0x0A, 'g', 'G', 0, 0)
    81 USB_HIDUT_KBD_KEY(H, 0x0B, 'h', 'H', 0, 0)
    82 USB_HIDUT_KBD_KEY(I, 0x0C, 'i', 'I', 0, 0)
    83 USB_HIDUT_KBD_KEY(J, 0x0D, 'j', 'J', 0, 0)
    84 USB_HIDUT_KBD_KEY(K, 0x0E, 'k', 'K', 0, 0)
    85 USB_HIDUT_KBD_KEY(L, 0x0F, 'l', 'L', 0, 0)
    86 USB_HIDUT_KBD_KEY(M, 0x10, 'm', 'M', 0, 0)
    87 USB_HIDUT_KBD_KEY(N, 0x11, 'n', 'N', 0, 0)
    88 USB_HIDUT_KBD_KEY(O, 0x12, 'o', 'O', 0, 0)
    89 USB_HIDUT_KBD_KEY(P, 0x13, 'p', 'P', 0, 0)
    90 USB_HIDUT_KBD_KEY(Q, 0x14, 'q', 'Q', 0, 0)
    91 USB_HIDUT_KBD_KEY(R, 0x15, 'r', 'R', 0, 0)
    92 USB_HIDUT_KBD_KEY(S, 0x16, 's', 'S', 0, 0)
    93 USB_HIDUT_KBD_KEY(T, 0x17, 't', 'T', 0, 0)
    94 USB_HIDUT_KBD_KEY(U, 0x18, 'u', 'U', 0, 0)
    95 USB_HIDUT_KBD_KEY(V, 0x19, 'v', 'V', 0, 0)
    96 USB_HIDUT_KBD_KEY(W, 0x1A, 'w', 'W', 0, 0)
    97 USB_HIDUT_KBD_KEY(X, 0x1B, 'x', 'X', 0, 0)
    98 USB_HIDUT_KBD_KEY(Y, 0x1C, 'y', 'Y', 0, 0)
    99 USB_HIDUT_KBD_KEY(Z, 0x1D, 'z', 'Z', 0, 0)
     74USB_HIDUT_KBD_KEY(A, 0x04, 'a', 'A', 0, 0);
     75USB_HIDUT_KBD_KEY(B, 0x05, 'b', 'B', 0, 0);
     76USB_HIDUT_KBD_KEY(C, 0x06, 'c', 'C', 0, 0);
     77USB_HIDUT_KBD_KEY(D, 0x07, 'd', 'D', 0, 0);
     78USB_HIDUT_KBD_KEY(E, 0x08, 'e', 'E', 0, 0);
     79USB_HIDUT_KBD_KEY(F, 0x09, 'f', 'F', 0, 0);
     80USB_HIDUT_KBD_KEY(G, 0x0A, 'g', 'G', 0, 0);
     81USB_HIDUT_KBD_KEY(H, 0x0B, 'h', 'H', 0, 0);
     82USB_HIDUT_KBD_KEY(I, 0x0C, 'i', 'I', 0, 0);
     83USB_HIDUT_KBD_KEY(J, 0x0D, 'j', 'J', 0, 0);
     84USB_HIDUT_KBD_KEY(K, 0x0E, 'k', 'K', 0, 0);
     85USB_HIDUT_KBD_KEY(L, 0x0F, 'l', 'L', 0, 0);
     86USB_HIDUT_KBD_KEY(M, 0x10, 'm', 'M', 0, 0);
     87USB_HIDUT_KBD_KEY(N, 0x11, 'n', 'N', 0, 0);
     88USB_HIDUT_KBD_KEY(O, 0x12, 'o', 'O', 0, 0);
     89USB_HIDUT_KBD_KEY(P, 0x13, 'p', 'P', 0, 0);
     90USB_HIDUT_KBD_KEY(Q, 0x14, 'q', 'Q', 0, 0);
     91USB_HIDUT_KBD_KEY(R, 0x15, 'r', 'R', 0, 0);
     92USB_HIDUT_KBD_KEY(S, 0x16, 's', 'S', 0, 0);
     93USB_HIDUT_KBD_KEY(T, 0x17, 't', 'T', 0, 0);
     94USB_HIDUT_KBD_KEY(U, 0x18, 'u', 'U', 0, 0);
     95USB_HIDUT_KBD_KEY(V, 0x19, 'v', 'V', 0, 0);
     96USB_HIDUT_KBD_KEY(W, 0x1A, 'w', 'W', 0, 0);
     97USB_HIDUT_KBD_KEY(X, 0x1B, 'x', 'X', 0, 0);
     98USB_HIDUT_KBD_KEY(Y, 0x1C, 'y', 'Y', 0, 0);
     99USB_HIDUT_KBD_KEY(Z, 0x1D, 'z', 'Z', 0, 0);
    100100
    101101/* Keyboard digits */
    102 USB_HIDUT_KBD_KEY(1, 0x1E, '1', '!', 0, 0)
    103 USB_HIDUT_KBD_KEY(2, 0x1F, '2', '@', 0, 0)
    104 USB_HIDUT_KBD_KEY(3, 0x20, '3', '#', 0, 0)
    105 USB_HIDUT_KBD_KEY(4, 0x21, '4', '$', 0, 0)
    106 USB_HIDUT_KBD_KEY(5, 0x22, '5', '%', 0, 0)
    107 USB_HIDUT_KBD_KEY(6, 0x23, '6', '^', 0, 0)
    108 USB_HIDUT_KBD_KEY(7, 0x24, '7', '&', 0, 0)
    109 USB_HIDUT_KBD_KEY(8, 0x25, '8', '*', 0, 0)
    110 USB_HIDUT_KBD_KEY(9, 0x26, '9', '(', 0, 0)
    111 USB_HIDUT_KBD_KEY(0, 0x27, '0', ')', 0, 0)
     102USB_HIDUT_KBD_KEY(1, 0x1E, '1', '!', 0, 0);
     103USB_HIDUT_KBD_KEY(2, 0x1F, '2', '@', 0, 0);
     104USB_HIDUT_KBD_KEY(3, 0x20, '3', '#', 0, 0);
     105USB_HIDUT_KBD_KEY(4, 0x21, '4', '$', 0, 0);
     106USB_HIDUT_KBD_KEY(5, 0x22, '5', '%', 0, 0);
     107USB_HIDUT_KBD_KEY(6, 0x23, '6', '^', 0, 0);
     108USB_HIDUT_KBD_KEY(7, 0x24, '7', '&', 0, 0);
     109USB_HIDUT_KBD_KEY(8, 0x25, '8', '*', 0, 0);
     110USB_HIDUT_KBD_KEY(9, 0x26, '9', '(', 0, 0);
     111USB_HIDUT_KBD_KEY(0, 0x27, '0', ')', 0, 0);
    112112
    113113/* More-or-less typewriter command keys */
    114 USB_HIDUT_KBD_KEY(ENTER, 0x28, '\n', 0, 0, 0)
    115 USB_HIDUT_KBD_KEY(ESCAPE, 0x29, 0, 0, 0, 0)
    116 USB_HIDUT_KBD_KEY(BACKSPACE, 0x2A, '\b', 0, 0, 0)
    117 USB_HIDUT_KBD_KEY(TAB, 0x2B, '\t', 0, 0, 0)
    118 USB_HIDUT_KBD_KEY(SPACE, 0x2C, ' ', 0, 0, 0)
     114USB_HIDUT_KBD_KEY(ENTER, 0x28, '\n', 0, 0, 0);
     115USB_HIDUT_KBD_KEY(ESCAPE, 0x29, 0, 0, 0, 0);
     116USB_HIDUT_KBD_KEY(BACKSPACE, 0x2A, '\b', 0, 0, 0);
     117USB_HIDUT_KBD_KEY(TAB, 0x2B, '\t', 0, 0, 0);
     118USB_HIDUT_KBD_KEY(SPACE, 0x2C, ' ', 0, 0, 0);
    119119
    120120/* Special (printable) characters */
    121 USB_HIDUT_KBD_KEY(DASH, 0x2D, '-', '_', 0, 0)
    122 USB_HIDUT_KBD_KEY(EQUALS, 0x2E, '=', '+', 0, 0)
    123 USB_HIDUT_KBD_KEY(LEFT_BRACKET, 0x2F, '[', '{', 0, 0)
    124 USB_HIDUT_KBD_KEY(RIGHT_BRACKET, 0x30, ']', '}', 0, 0)
    125 USB_HIDUT_KBD_KEY(BACKSLASH, 0x31, '\\', '|', 0, 0)
    126 USB_HIDUT_KBD_KEY(HASH, 0x32, '#', '~', 0, 0)
    127 USB_HIDUT_KBD_KEY(SEMICOLON, 0x33, ';', ':', 0, 0)
    128 USB_HIDUT_KBD_KEY(APOSTROPHE, 0x34, '\'', '"', 0, 0)
    129 USB_HIDUT_KBD_KEY(GRAVE_ACCENT, 0x35, '`', '~', 0, 0)
    130 USB_HIDUT_KBD_KEY(COMMA, 0x36, ',', '<', 0, 0)
    131 USB_HIDUT_KBD_KEY(PERIOD, 0x37, '.', '>', 0, 0)
    132 USB_HIDUT_KBD_KEY(SLASH, 0x38, '/', '?', 0, 0)
     121USB_HIDUT_KBD_KEY(DASH, 0x2D, '-', '_', 0, 0);
     122USB_HIDUT_KBD_KEY(EQUALS, 0x2E, '=', '+', 0, 0);
     123USB_HIDUT_KBD_KEY(LEFT_BRACKET, 0x2F, '[', '{', 0, 0);
     124USB_HIDUT_KBD_KEY(RIGHT_BRACKET, 0x30, ']', '}', 0, 0);
     125USB_HIDUT_KBD_KEY(BACKSLASH, 0x31, '\\', '|', 0, 0);
     126USB_HIDUT_KBD_KEY(HASH, 0x32, '#', '~', 0, 0);
     127USB_HIDUT_KBD_KEY(SEMICOLON, 0x33, ';', ':', 0, 0);
     128USB_HIDUT_KBD_KEY(APOSTROPHE, 0x34, '\'', '"', 0, 0);
     129USB_HIDUT_KBD_KEY(GRAVE_ACCENT, 0x35, '`', '~', 0, 0);
     130USB_HIDUT_KBD_KEY(COMMA, 0x36, ',', '<', 0, 0);
     131USB_HIDUT_KBD_KEY(PERIOD, 0x37, '.', '>', 0, 0);
     132USB_HIDUT_KBD_KEY(SLASH, 0x38, '/', '?', 0, 0);
    133133
    134 USB_HIDUT_KBD_KEY(CAPS_LOCK, 0x39, 0, 0, 0, 0)
     134USB_HIDUT_KBD_KEY(CAPS_LOCK, 0x39, 0, 0, 0, 0);
    135135
    136136/* Function keys */
    137 __NONPRINT( F1, 0x3A)
    138 __NONPRINT( F2, 0x3B)
    139 __NONPRINT( F3, 0x3C)
    140 __NONPRINT( F4, 0x3D)
    141 __NONPRINT( F5, 0x3E)
    142 __NONPRINT( F6, 0x3F)
    143 __NONPRINT( F7, 0x40)
    144 __NONPRINT( F8, 0x41)
    145 __NONPRINT( F9, 0x42)
    146 __NONPRINT(F10, 0x43)
    147 __NONPRINT(F11, 0x44)
    148 __NONPRINT(F12, 0x45)
     137__NONPRINT( F1, 0x3A);
     138__NONPRINT( F2, 0x3B);
     139__NONPRINT( F3, 0x3C);
     140__NONPRINT( F4, 0x3D);
     141__NONPRINT( F5, 0x3E);
     142__NONPRINT( F6, 0x3F);
     143__NONPRINT( F7, 0x40);
     144__NONPRINT( F8, 0x41);
     145__NONPRINT( F9, 0x42);
     146__NONPRINT(F10, 0x43);
     147__NONPRINT(F11, 0x44);
     148__NONPRINT(F12, 0x45);
    149149
    150150/* Cursor movement keys & co. */
    151 __NONPRINT(PRINT_SCREEN, 0x46)
    152 __NONPRINT(SCROLL_LOCK, 0x47)
    153 __NONPRINT(PAUSE, 0x48)
    154 __NONPRINT(INSERT, 0x49)
    155 __NONPRINT(HOME, 0x4A)
    156 __NONPRINT(PAGE_UP, 0x4B)
    157 __NONPRINT(DELETE, 0x4C)
    158 __NONPRINT(END, 0x4D)
    159 __NONPRINT(PAGE_DOWN, 0x4E)
    160 __NONPRINT(RIGHT_ARROW, 0x4F)
    161 __NONPRINT(LEFT_ARROW, 0x50)
    162 __NONPRINT(DOWN_ARROW, 0x51)
    163 __NONPRINT(UP_ARROW, 0x52)
     151__NONPRINT(PRINT_SCREEN, 0x46);
     152__NONPRINT(SCROLL_LOCK, 0x47);
     153__NONPRINT(PAUSE, 0x48);
     154__NONPRINT(INSERT, 0x49);
     155__NONPRINT(HOME, 0x4A);
     156__NONPRINT(PAGE_UP, 0x4B);
     157__NONPRINT(DELETE, 0x4C);
     158__NONPRINT(END, 0x4D);
     159__NONPRINT(PAGE_DOWN, 0x4E);
     160__NONPRINT(RIGHT_ARROW, 0x4F);
     161__NONPRINT(LEFT_ARROW, 0x50);
     162__NONPRINT(DOWN_ARROW, 0x51);
     163__NONPRINT(UP_ARROW, 0x52);
    164164
    165165
Note: See TracChangeset for help on using the changeset viewer.