forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Typedef'ed layer_state_t to uint32_t (#3637)

Browse Source 
* Typedef'ed layer_state_t to uint32_t.

This enables future work with layer_state_t to uint8_t for optimization purposes.

* Removed accidental xeal60 commit

* Revert to egyptian brackets, added sizeof(layer_state_t) so when layer_state_t is redefined it will automagically work.

* Add additional typedefs

* Add checks for setting layer state

* Update tmk_core/common/action_layer.h

Co-Authored-By: alex-ong <the.onga@gmail.com>

* Revert commit.
pull/6512/head
Alex Ong 7 years ago committed by Florian Didron
parent aa482e2e4f
commit 8253427f12
6 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File

4
quantum/quantum.h
Unescape View File

@ -61,10 +61,10 @@
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
extern uint32_t default_layer_state; extern layer_state_t default_layer_state;
#ifndef NO_ACTION_LAYER #ifndef NO_ACTION_LAYER
extern uint32_t layer_state; extern layer_state_t layer_state;
#endif #endif
#if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED) #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)

8
tmk_core/common/action.c
Unescape View File

@ -406,8 +406,8 @@ void process_action(keyrecord_t *record, action_t action)
/* Default Layer Bitwise Operation */ /* Default Layer Bitwise Operation */
if (!event.pressed) { if (!event.pressed) {
uint8_t shift = action.layer_bitop.part*4; uint8_t shift = action.layer_bitop.part*4;
uint32_t bits = ((uint32_t)action.layer_bitop.bits)<<shift; layer_state_t bits = ((layer_state_t)action.layer_bitop.bits)<<shift;
uint32_t mask = (action.layer_bitop.xbit) ? ~(((uint32_t)0xf)<<shift) : 0; layer_state_t mask = (action.layer_bitop.xbit) ? ~(((layer_state_t)0xf)<<shift) : 0;
switch (action.layer_bitop.op) { switch (action.layer_bitop.op) {
case OP_BIT_AND: default_layer_and(bits | mask); break; case OP_BIT_AND: default_layer_and(bits | mask); break;
case OP_BIT_OR: default_layer_or(bits | mask); break; case OP_BIT_OR: default_layer_or(bits | mask); break;
@ -420,8 +420,8 @@ void process_action(keyrecord_t *record, action_t action)
if (event.pressed ? (action.layer_bitop.on & ON_PRESS) : if (event.pressed ? (action.layer_bitop.on & ON_PRESS) :
(action.layer_bitop.on & ON_RELEASE)) { (action.layer_bitop.on & ON_RELEASE)) {
uint8_t shift = action.layer_bitop.part*4; uint8_t shift = action.layer_bitop.part*4;
uint32_t bits = ((uint32_t)action.layer_bitop.bits)<<shift; layer_state_t bits = ((layer_state_t)action.layer_bitop.bits)<<shift;
uint32_t mask = (action.layer_bitop.xbit) ? ~(((uint32_t)0xf)<<shift) : 0; layer_state_t mask = (action.layer_bitop.xbit) ? ~(((layer_state_t)0xf)<<shift) : 0;
switch (action.layer_bitop.op) { switch (action.layer_bitop.op) {
case OP_BIT_AND: layer_and(bits | mask); break; case OP_BIT_AND: layer_and(bits | mask); break;
case OP_BIT_OR: layer_or(bits | mask); break; case OP_BIT_OR: layer_or(bits | mask); break;

36
tmk_core/common/action_layer.c
Unescape View File

@ -13,14 +13,14 @@
/** \brief Default Layer State /** \brief Default Layer State
*/ */
uint32_t default_layer_state = 0; layer_state_t default_layer_state = 0;
/** \brief Default Layer State Set At user Level /** \brief Default Layer State Set At user Level
* *
* Run user code on default layer state change * Run user code on default layer state change
*/ */
__attribute__((weak)) __attribute__((weak))
uint32_t default_layer_state_set_user(uint32_t state) { layer_state_t default_layer_state_set_user(layer_state_t state) {
return state; return state;
} }
@ -29,7 +29,7 @@ uint32_t default_layer_state_set_user(uint32_t state) {
* Run keyboard code on default layer state change * Run keyboard code on default layer state change
*/ */
__attribute__((weak)) __attribute__((weak))
uint32_t default_layer_state_set_kb(uint32_t state) { layer_state_t default_layer_state_set_kb(layer_state_t state) {
return default_layer_state_set_user(state); return default_layer_state_set_user(state);
} }
@ -37,7 +37,7 @@ uint32_t default_layer_state_set_kb(uint32_t state) {
* *
* Static function to set the default layer state, prints debug info and clears keys * Static function to set the default layer state, prints debug info and clears keys
*/ */
static void default_layer_state_set(uint32_t state) { static void default_layer_state_set(layer_state_t state) {
state = default_layer_state_set_kb(state); state = default_layer_state_set_kb(state);
debug("default_layer_state: "); debug("default_layer_state: ");
default_layer_debug(); debug(" to "); default_layer_debug(); debug(" to ");
@ -62,7 +62,7 @@ void default_layer_debug(void) {
* *
* Sets the default layer state. * Sets the default layer state.
*/ */
void default_layer_set(uint32_t state) { void default_layer_set(layer_state_t state) {
default_layer_state_set(state); default_layer_state_set(state);
} }
@ -71,21 +71,21 @@ void default_layer_set(uint32_t state) {
* *
* Turns on the default layer based on matching bits between specifed layer and existing layer state * Turns on the default layer based on matching bits between specifed layer and existing layer state
*/ */
void default_layer_or(uint32_t state) { void default_layer_or(layer_state_t state) {
default_layer_state_set(default_layer_state | state); default_layer_state_set(default_layer_state | state);
} }
/** \brief Default Layer And /** \brief Default Layer And
* *
* Turns on default layer based on matching enabled bits between specifed layer and existing layer state * Turns on default layer based on matching enabled bits between specifed layer and existing layer state
*/ */
void default_layer_and(uint32_t state) { void default_layer_and(layer_state_t state) {
default_layer_state_set(default_layer_state & state); default_layer_state_set(default_layer_state & state);
} }
/** \brief Default Layer Xor /** \brief Default Layer Xor
* *
* Turns on default layer based on non-matching bits between specifed layer and existing layer state * Turns on default layer based on non-matching bits between specifed layer and existing layer state
*/ */
void default_layer_xor(uint32_t state) { void default_layer_xor(layer_state_t state) {
default_layer_state_set(default_layer_state ^ state); default_layer_state_set(default_layer_state ^ state);
} }
#endif #endif
@ -94,14 +94,14 @@ void default_layer_xor(uint32_t state) {
#ifndef NO_ACTION_LAYER #ifndef NO_ACTION_LAYER
/** \brief Keymap Layer State /** \brief Keymap Layer State
*/ */
uint32_t layer_state = 0; layer_state_t layer_state = 0;
/** \brief Layer state set user /** \brief Layer state set user
* *
* Runs user code on layer state change * Runs user code on layer state change
*/ */
__attribute__((weak)) __attribute__((weak))
uint32_t layer_state_set_user(uint32_t state) { layer_state_t layer_state_set_user(layer_state_t state) {
return state; return state;
} }
@ -110,7 +110,7 @@ uint32_t layer_state_set_user(uint32_t state) {
* Runs keyboard code on layer state change * Runs keyboard code on layer state change
*/ */
__attribute__((weak)) __attribute__((weak))
uint32_t layer_state_set_kb(uint32_t state) { layer_state_t layer_state_set_kb(layer_state_t state) {
return layer_state_set_user(state); return layer_state_set_user(state);
} }
@ -118,7 +118,7 @@ uint32_t layer_state_set_kb(uint32_t state) {
* *
* Sets the layer to match the specifed state (a bitmask) * Sets the layer to match the specifed state (a bitmask)
*/ */
void layer_state_set(uint32_t state) { void layer_state_set(layer_state_t state) {
state = layer_state_set_kb(state); state = layer_state_set_kb(state);
dprint("layer_state: "); dprint("layer_state: ");
layer_debug(); dprint(" to "); layer_debug(); dprint(" to ");
@ -151,7 +151,7 @@ bool layer_state_is(uint8_t layer) {
* *
* Used for comparing layers {mostly used for unit testing} * Used for comparing layers {mostly used for unit testing}
*/ */
bool layer_state_cmp(uint32_t cmp_layer_state, uint8_t layer) { bool layer_state_cmp(layer_state_t cmp_layer_state, uint8_t layer) {
if (!cmp_layer_state) { return layer == 0; } if (!cmp_layer_state) { return layer == 0; }
return (cmp_layer_state & (1UL<<layer)) != 0; return (cmp_layer_state & (1UL<<layer)) != 0;
} }
@ -192,21 +192,21 @@ void layer_invert(uint8_t layer) {
* *
* Turns on layers based on matching bits between specifed layer and existing layer state * Turns on layers based on matching bits between specifed layer and existing layer state
*/ */
void layer_or(uint32_t state) { void layer_or(layer_state_t state) {
layer_state_set(layer_state | state); layer_state_set(layer_state | state);
} }
/** \brief Layer and /** \brief Layer and
* *
* Turns on layers based on matching enabled bits between specifed layer and existing layer state * Turns on layers based on matching enabled bits between specifed layer and existing layer state
*/ */
void layer_and(uint32_t state) { void layer_and(layer_state_t state) {
layer_state_set(layer_state & state); layer_state_set(layer_state & state);
} }
/** \brief Layer xor /** \brief Layer xor
* *
* Turns on layers based on non-matching bits between specifed layer and existing layer state * Turns on layers based on non-matching bits between specifed layer and existing layer state
*/ */
void layer_xor(uint32_t state) { void layer_xor(layer_state_t state) {
layer_state_set(layer_state ^ state); layer_state_set(layer_state ^ state);
} }
@ -301,9 +301,9 @@ uint8_t layer_switch_get_layer(keypos_t key) {
action_t action; action_t action;
action.code = ACTION_TRANSPARENT; action.code = ACTION_TRANSPARENT;
uint32_t layers = layer_state | default_layer_state; layer_state_t layers = layer_state | default_layer_state;
/* check top layer first */ /* check top layer first */
for (int8_t i = 31; i >= 0; i--) { for (int8_t i = sizeof(layer_state_t)-1; i >= 0; i--) {
if (layers & (1UL << i)) { if (layers & (1UL << i)) {
action = action_for_key(i, key); action = action_for_key(i, key);
if (action.code != ACTION_TRANSPARENT) { if (action.code != ACTION_TRANSPARENT) {

38
tmk_core/common/action_layer.h
Unescape View File

@ -21,24 +21,32 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keyboard.h" #include "keyboard.h"
#include "action.h" #include "action.h"
#if defined(LAYER_STATE_8BIT) || ( defined(DYNAMIC_KEYMAP_ENABLE) && DYNAMIC_KEYMAP_LAYER_COUNT >= 8 )
typedef uint8_t layer_state_t;
#elif defined(LAYER_STATE_16BIT)
typedef uint16_t layer_state_t;
#else
typedef uint32_t layer_state_t;
#endif
/* /*
* Default Layer * Default Layer
*/ */
extern uint32_t default_layer_state; extern layer_state_t default_layer_state;
void default_layer_debug(void); void default_layer_debug(void);
void default_layer_set(uint32_t state); void default_layer_set(layer_state_t state);
__attribute__((weak)) __attribute__((weak))
uint32_t default_layer_state_set_kb(uint32_t state); layer_state_t default_layer_state_set_kb(layer_state_t state);
__attribute__((weak)) __attribute__((weak))
uint32_t default_layer_state_set_user(uint32_t state); layer_state_t default_layer_state_set_user(layer_state_t state);
#ifndef NO_ACTION_LAYER #ifndef NO_ACTION_LAYER
/* bitwise operation */ /* bitwise operation */
void default_layer_or(uint32_t state); void default_layer_or(layer_state_t state);
void default_layer_and(uint32_t state); void default_layer_and(layer_state_t state);
void default_layer_xor(uint32_t state); void default_layer_xor(layer_state_t state);
#else #else
#define default_layer_or(state) #define default_layer_or(state)
#define default_layer_and(state) #define default_layer_and(state)
@ -50,11 +58,11 @@ void default_layer_xor(uint32_t state);
* Keymap Layer * Keymap Layer
*/ */
#ifndef NO_ACTION_LAYER #ifndef NO_ACTION_LAYER
extern uint32_t layer_state; extern layer_state_t layer_state;
void layer_state_set(uint32_t state); void layer_state_set(layer_state_t state);
bool layer_state_is(uint8_t layer); bool layer_state_is(uint8_t layer);
bool layer_state_cmp(uint32_t layer1, uint8_t layer2); bool layer_state_cmp(layer_state_t layer1, uint8_t layer2);
void layer_debug(void); void layer_debug(void);
void layer_clear(void); void layer_clear(void);
@ -63,9 +71,9 @@ void layer_on(uint8_t layer);
void layer_off(uint8_t layer); void layer_off(uint8_t layer);
void layer_invert(uint8_t layer); void layer_invert(uint8_t layer);
/* bitwise operation */ /* bitwise operation */
void layer_or(uint32_t state); void layer_or(layer_state_t state);
void layer_and(uint32_t state); void layer_and(layer_state_t state);
void layer_xor(uint32_t state); void layer_xor(layer_state_t state);
#else #else
#define layer_state 0 #define layer_state 0
@ -84,8 +92,8 @@ void layer_xor(uint32_t state);
#define layer_xor(state) #define layer_xor(state)
#endif #endif
uint32_t layer_state_set_user(uint32_t state); layer_state_t layer_state_set_user(layer_state_t state);
uint32_t layer_state_set_kb(uint32_t state); layer_state_t layer_state_set_kb(layer_state_t state);
/* pressed actions cache */ /* pressed actions cache */
#if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE) #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE)

4
tmk_core/common/bootmagic.c
Unescape View File

@ -99,10 +99,10 @@ void bootmagic(void)
if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_7)) { default_layer |= (1<<7); } if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_7)) { default_layer |= (1<<7); }
if (default_layer) { if (default_layer) {
eeconfig_update_default_layer(default_layer); eeconfig_update_default_layer(default_layer);
default_layer_set((uint32_t)default_layer); default_layer_set((layer_state_t)default_layer);
} else { } else {
default_layer = eeconfig_read_default_layer(); default_layer = eeconfig_read_default_layer();
default_layer_set((uint32_t)default_layer); default_layer_set((layer_state_t)default_layer);
} }
} }

2
tmk_core/common/magic.c
Unescape View File

@ -33,6 +33,6 @@ void magic(void)
uint8_t default_layer = 0; uint8_t default_layer = 0;
default_layer = eeconfig_read_default_layer(); default_layer = eeconfig_read_default_layer();
default_layer_set((uint32_t)default_layer); default_layer_set((layer_state_t)default_layer);
} }

Write Preview
Loading…
Cancel
Save