diff options
author | Fredric Silberberg <fred@silberberg.xyz> | 2017-08-07 22:05:59 -0700 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2017-08-08 10:02:53 -0400 |
commit | 114565fe811f0264acfa52c38f993b37b0add43d (patch) | |
tree | 50e078f3604063a10eea56ee9c61163ed3f3fa2f /quantum/process_keycode/process_key_lock.c | |
parent | e9d755b6f46d76f2697d59f1a56fd3536729a7e7 (diff) | |
download | qmk_firmware-114565fe811f0264acfa52c38f993b37b0add43d.tar.gz qmk_firmware-114565fe811f0264acfa52c38f993b37b0add43d.zip |
Rename SHIFT macro to BV_64
Diffstat (limited to 'quantum/process_keycode/process_key_lock.c')
-rw-r--r-- | quantum/process_keycode/process_key_lock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/quantum/process_keycode/process_key_lock.c b/quantum/process_keycode/process_key_lock.c index b1ba397a0..d7978f91c 100644 --- a/quantum/process_keycode/process_key_lock.c +++ b/quantum/process_keycode/process_key_lock.c | |||
@@ -18,14 +18,14 @@ | |||
18 | #include "stdint.h" | 18 | #include "stdint.h" |
19 | #include "process_key_lock.h" | 19 | #include "process_key_lock.h" |
20 | 20 | ||
21 | #define SHIFT(shift) (((uint64_t)1) << (shift)) | 21 | #define BV_64(shift) (((uint64_t)1) << (shift)) |
22 | #define GET_KEY_ARRAY(code) (((code) < 0x40) ? key_state[0] : \ | 22 | #define GET_KEY_ARRAY(code) (((code) < 0x40) ? key_state[0] : \ |
23 | ((code) < 0x80) ? key_state[1] : \ | 23 | ((code) < 0x80) ? key_state[1] : \ |
24 | ((code) < 0xC0) ? key_state[2] : key_state[3]) | 24 | ((code) < 0xC0) ? key_state[2] : key_state[3]) |
25 | #define GET_CODE_INDEX(code) (((code) < 0x40) ? (code) : \ | 25 | #define GET_CODE_INDEX(code) (((code) < 0x40) ? (code) : \ |
26 | ((code) < 0x80) ? (code) - 0x40 : \ | 26 | ((code) < 0x80) ? (code) - 0x40 : \ |
27 | ((code) < 0xC0) ? (code) - 0x80 : (code) - 0xC0) | 27 | ((code) < 0xC0) ? (code) - 0x80 : (code) - 0xC0) |
28 | #define KEY_STATE(code) (GET_KEY_ARRAY(code) & SHIFT(GET_CODE_INDEX(code))) == SHIFT(GET_CODE_INDEX(code)) | 28 | #define KEY_STATE(code) (GET_KEY_ARRAY(code) & BV_64(GET_CODE_INDEX(code))) == BV_64(GET_CODE_INDEX(code)) |
29 | #define SET_KEY_ARRAY_STATE(code, val) do { \ | 29 | #define SET_KEY_ARRAY_STATE(code, val) do { \ |
30 | switch (code) { \ | 30 | switch (code) { \ |
31 | case 0x00 ... 0x3F: \ | 31 | case 0x00 ... 0x3F: \ |
@@ -42,8 +42,8 @@ | |||
42 | break; \ | 42 | break; \ |
43 | } \ | 43 | } \ |
44 | } while(0) | 44 | } while(0) |
45 | #define SET_KEY_STATE(code) SET_KEY_ARRAY_STATE(code, (GET_KEY_ARRAY(code) | SHIFT(GET_CODE_INDEX(code)))) | 45 | #define SET_KEY_STATE(code) SET_KEY_ARRAY_STATE(code, (GET_KEY_ARRAY(code) | BV_64(GET_CODE_INDEX(code)))) |
46 | #define UNSET_KEY_STATE(code) SET_KEY_ARRAY_STATE(code, (GET_KEY_ARRAY(code)) & ~(SHIFT(GET_CODE_INDEX(code)))) | 46 | #define UNSET_KEY_STATE(code) SET_KEY_ARRAY_STATE(code, (GET_KEY_ARRAY(code)) & ~(BV_64(GET_CODE_INDEX(code)))) |
47 | #define IS_STANDARD_KEYCODE(code) ((code) <= 0xFF) | 47 | #define IS_STANDARD_KEYCODE(code) ((code) <= 0xFF) |
48 | 48 | ||
49 | // Locked key state. This is an array of 256 bits, one for each of the standard keys supported qmk. | 49 | // Locked key state. This is an array of 256 bits, one for each of the standard keys supported qmk. |