mirror of
https://github.com/DarkFlippers/unleashed-firmware.git
synced 2025-12-12 20:49:49 +04:00
after merge fix p1
This commit is contained in:
@@ -77,8 +77,6 @@ void text_input_set_validator(
|
|||||||
TextInputValidatorCallback callback,
|
TextInputValidatorCallback callback,
|
||||||
void* callback_context);
|
void* callback_context);
|
||||||
|
|
||||||
void text_input_set_minimum_length(TextInput* text_input, size_t minimum_length);
|
|
||||||
|
|
||||||
TextInputValidatorCallback text_input_get_validator_callback(TextInput* text_input);
|
TextInputValidatorCallback text_input_get_validator_callback(TextInput* text_input);
|
||||||
|
|
||||||
void* text_input_get_validator_callback_context(TextInput* text_input);
|
void* text_input_get_validator_callback_context(TextInput* text_input);
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
#define ISO14443_4_BLOCK_PCB_S_CID_MASK (1U << ISO14443_4_BLOCK_PCB_R_CID_OFFSET)
|
#define ISO14443_4_BLOCK_PCB_S_CID_MASK (1U << ISO14443_4_BLOCK_PCB_R_CID_OFFSET)
|
||||||
#define ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_MASK (3U << ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_OFFSET)
|
#define ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_MASK (3U << ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_OFFSET)
|
||||||
|
|
||||||
#define ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, mask) (((pcb) & mask) == mask)
|
#define ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, mask) (((pcb) & (mask)) == (mask))
|
||||||
|
|
||||||
#define ISO14443_4_BLOCK_PCB_IS_R_BLOCK(pcb) \
|
#define ISO14443_4_BLOCK_PCB_IS_R_BLOCK(pcb) \
|
||||||
ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, ISO14443_4_BLOCK_PCB_R_MASK)
|
ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, ISO14443_4_BLOCK_PCB_R_MASK)
|
||||||
|
|||||||
Reference in New Issue
Block a user