NFC refactoring (#3050)
"A long time ago in a galaxy far, far away...." we started NFC subsystem refactoring.
Starring:
- @gornekich - NFC refactoring project lead, architect, senior developer
- @gsurkov - architect, senior developer
- @RebornedBrain - senior developer
Supporting roles:
- @skotopes, @DrZlo13, @hedger - general architecture advisors, code review
- @Astrrra, @doomwastaken, @Hellitron, @ImagineVagon333 - quality assurance
Special thanks:
@bettse, @pcunning, @nxv, @noproto, @AloneLiberty and everyone else who has been helping us all this time and contributing valuable knowledges, ideas and source code.
2023-10-24 07:08:09 +04:00
# include "iso14443_4_layer.h"
# include <furi.h>
# define ISO14443_4_BLOCK_PCB (1U << 1)
2024-01-29 23:12:17 +09:00
# define ISO14443_4_BLOCK_PCB_I (0U)
# define ISO14443_4_BLOCK_PCB_R (5U << 5)
NFC refactoring (#3050)
"A long time ago in a galaxy far, far away...." we started NFC subsystem refactoring.
Starring:
- @gornekich - NFC refactoring project lead, architect, senior developer
- @gsurkov - architect, senior developer
- @RebornedBrain - senior developer
Supporting roles:
- @skotopes, @DrZlo13, @hedger - general architecture advisors, code review
- @Astrrra, @doomwastaken, @Hellitron, @ImagineVagon333 - quality assurance
Special thanks:
@bettse, @pcunning, @nxv, @noproto, @AloneLiberty and everyone else who has been helping us all this time and contributing valuable knowledges, ideas and source code.
2023-10-24 07:08:09 +04:00
# define ISO14443_4_BLOCK_PCB_S (3U << 6)
2024-01-29 23:12:17 +09:00
# define ISO14443_4_BLOCK_PCB_I_ (0U << 6)
# define ISO14443_4_BLOCK_PCB_R_ (2U << 6)
2024-01-20 05:35:37 +09:00
# define ISO14443_4_BLOCK_PCB_TYPE_MASK (3U << 6)
2024-01-23 20:47:17 +00:00
2024-01-20 05:35:37 +09:00
# define ISO14443_4_BLOCK_PCB_S_DESELECT (0U << 4)
# define ISO14443_4_BLOCK_PCB_S_WTX (3U << 4)
# define ISO14443_4_BLOCK_PCB_BLOCK_NUMBER (1U << 0)
2024-01-29 23:12:17 +09:00
2024-01-20 05:35:37 +09:00
# define ISO14443_4_BLOCK_PCB_NAD (1U << 2)
# define ISO14443_4_BLOCK_PCB_CID (1U << 3)
# define ISO14443_4_BLOCK_PCB_CHAINING (1U << 4)
NFC refactoring (#3050)
"A long time ago in a galaxy far, far away...." we started NFC subsystem refactoring.
Starring:
- @gornekich - NFC refactoring project lead, architect, senior developer
- @gsurkov - architect, senior developer
- @RebornedBrain - senior developer
Supporting roles:
- @skotopes, @DrZlo13, @hedger - general architecture advisors, code review
- @Astrrra, @doomwastaken, @Hellitron, @ImagineVagon333 - quality assurance
Special thanks:
@bettse, @pcunning, @nxv, @noproto, @AloneLiberty and everyone else who has been helping us all this time and contributing valuable knowledges, ideas and source code.
2023-10-24 07:08:09 +04:00
struct Iso14443_4Layer {
uint8_t pcb ;
uint8_t pcb_prev ;
} ;
static inline void iso14443_4_layer_update_pcb ( Iso14443_4Layer * instance ) {
instance - > pcb_prev = instance - > pcb ;
instance - > pcb ^ = ( uint8_t ) 0x01 ;
}
2024-03-25 13:53:32 +03:00
Iso14443_4Layer * iso14443_4_layer_alloc ( void ) {
NFC refactoring (#3050)
"A long time ago in a galaxy far, far away...." we started NFC subsystem refactoring.
Starring:
- @gornekich - NFC refactoring project lead, architect, senior developer
- @gsurkov - architect, senior developer
- @RebornedBrain - senior developer
Supporting roles:
- @skotopes, @DrZlo13, @hedger - general architecture advisors, code review
- @Astrrra, @doomwastaken, @Hellitron, @ImagineVagon333 - quality assurance
Special thanks:
@bettse, @pcunning, @nxv, @noproto, @AloneLiberty and everyone else who has been helping us all this time and contributing valuable knowledges, ideas and source code.
2023-10-24 07:08:09 +04:00
Iso14443_4Layer * instance = malloc ( sizeof ( Iso14443_4Layer ) ) ;
iso14443_4_layer_reset ( instance ) ;
return instance ;
}
void iso14443_4_layer_free ( Iso14443_4Layer * instance ) {
furi_assert ( instance ) ;
free ( instance ) ;
}
void iso14443_4_layer_reset ( Iso14443_4Layer * instance ) {
furi_assert ( instance ) ;
instance - > pcb = ISO14443_4_BLOCK_PCB_I | ISO14443_4_BLOCK_PCB ;
}
void iso14443_4_layer_encode_block (
Iso14443_4Layer * instance ,
const BitBuffer * input_data ,
BitBuffer * block_data ) {
furi_assert ( instance ) ;
bit_buffer_append_byte ( block_data , instance - > pcb ) ;
bit_buffer_append ( block_data , input_data ) ;
iso14443_4_layer_update_pcb ( instance ) ;
}
bool iso14443_4_layer_decode_block (
Iso14443_4Layer * instance ,
BitBuffer * output_data ,
const BitBuffer * block_data ) {
furi_assert ( instance ) ;
bool ret = false ;
2024-05-01 16:59:37 +03:00
// TODO: Fix properly! this is a very big kostyl na velosipede
// (bit_buffer_copy_right are called to copy bigger buffer into smaller buffer causing crash on furi check) issue comes iso14443_4a_poller_send_block at line 109
if ( bit_buffer_get_size_bytes ( output_data ) < bit_buffer_get_size_bytes ( output_data ) - 1 )
return ret ;
NFC refactoring (#3050)
"A long time ago in a galaxy far, far away...." we started NFC subsystem refactoring.
Starring:
- @gornekich - NFC refactoring project lead, architect, senior developer
- @gsurkov - architect, senior developer
- @RebornedBrain - senior developer
Supporting roles:
- @skotopes, @DrZlo13, @hedger - general architecture advisors, code review
- @Astrrra, @doomwastaken, @Hellitron, @ImagineVagon333 - quality assurance
Special thanks:
@bettse, @pcunning, @nxv, @noproto, @AloneLiberty and everyone else who has been helping us all this time and contributing valuable knowledges, ideas and source code.
2023-10-24 07:08:09 +04:00
do {
if ( ! bit_buffer_starts_with_byte ( block_data , instance - > pcb_prev ) ) break ;
bit_buffer_copy_right ( output_data , block_data , 1 ) ;
ret = true ;
} while ( false ) ;
return ret ;
}
2024-01-20 05:35:37 +09:00
Iso14443_4aError iso14443_4_layer_decode_block_pwt_ext (
Iso14443_4Layer * instance ,
BitBuffer * output_data ,
const BitBuffer * block_data ) {
furi_assert ( instance ) ;
Iso14443_4aError ret = Iso14443_4aErrorProtocol ;
2024-01-28 20:18:17 +00:00
bit_buffer_reset ( output_data ) ;
2024-01-20 05:35:37 +09:00
do {
const uint8_t pcb_field = bit_buffer_get_byte ( block_data , 0 ) ;
const uint8_t block_type = pcb_field & ISO14443_4_BLOCK_PCB_TYPE_MASK ;
switch ( block_type ) {
2024-01-29 23:12:17 +09:00
case ISO14443_4_BLOCK_PCB_I_ :
2024-01-20 05:35:37 +09:00
if ( pcb_field = = instance - > pcb_prev ) {
bit_buffer_copy_right ( output_data , block_data , 1 ) ;
ret = Iso14443_4aErrorNone ;
} else {
2024-01-28 20:18:17 +00:00
// send original request again
ret = Iso14443_4aErrorSendExtra ;
2024-01-20 05:35:37 +09:00
}
break ;
2024-01-29 23:12:17 +09:00
case ISO14443_4_BLOCK_PCB_R_ :
2024-01-20 05:35:37 +09:00
// TODO
break ;
case ISO14443_4_BLOCK_PCB_S :
if ( ( pcb_field & ISO14443_4_BLOCK_PCB_S_WTX ) = = ISO14443_4_BLOCK_PCB_S_WTX ) {
const uint8_t inf_field = bit_buffer_get_byte ( block_data , 1 ) ;
//const uint8_t power_level = inf_field >> 6;
const uint8_t wtxm = inf_field & 0 b111111 ;
//uint32_t fwt_temp = MIN((fwt * wtxm), fwt_max);
bit_buffer_append_byte (
output_data ,
ISO14443_4_BLOCK_PCB_S | ISO14443_4_BLOCK_PCB_S_WTX | ISO14443_4_BLOCK_PCB ) ;
bit_buffer_append_byte ( output_data , wtxm ) ;
2024-01-28 20:18:17 +00:00
ret = Iso14443_4aErrorSendExtra ;
2024-01-20 05:35:37 +09:00
}
break ;
}
} while ( false ) ;
2024-01-23 20:47:17 +00:00
if ( ret ! = Iso14443_4aErrorNone ) {
FURI_LOG_RAW_T ( " RAW RX: " ) ;
for ( size_t x = 0 ; x < bit_buffer_get_size_bytes ( block_data ) ; x + + ) {
FURI_LOG_RAW_T ( " %02X " , bit_buffer_get_byte ( block_data , x ) ) ;
}
FURI_LOG_RAW_T ( " \r \n " ) ;
}
2024-01-20 05:35:37 +09:00
return ret ;
2024-01-23 20:47:17 +00:00
}