highperfocused/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2025-10-05 03:26:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ofw/dev' into mntm-dev

Browse Source
This commit is contained in:
Willy-JL
2024-07-15 22:18:35 +01:00
parent fa06d15612 ffa3996a5e
commit 02f7207d28
466 changed files with 3282 additions and 3168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nfc/helpers/crypto1.c
View File

@@ -8,7 +8,7 @@
#define SWAPENDIAN(x) \
((x) = ((x) >> 8 & 0xff00ff) | ((x) & 0xff00ff) << 8, (x) = (x) >> 16 | (x) << 16)
#define LF_POLY_ODD (0x29CE5C)
#define LF_POLY_ODD (0x29CE5C)
#define LF_POLY_EVEN (0x870804)
#define BEBIT(x, n) FURI_BIT(x, (n) ^ 24)

2
lib/nfc/helpers/felica_crc.c
View File

@@ -45,7 +45,7 @@ bool felica_crc_check(const BitBuffer* buf) {
const uint8_t* data = bit_buffer_get_data(buf);
const uint16_t crc_calc = felica_crc_calculate(data, data_size - FELICA_CRC_SIZE);
return (crc_calc == crc_received);
return crc_calc == crc_received;
}
void felica_crc_trim(BitBuffer* buf) {

6
lib/nfc/helpers/iso13239_crc.c
View File

@@ -2,9 +2,9 @@
#include <core/check.h>
#define ISO13239_CRC_INIT_DEFAULT (0xFFFFU)
#define ISO13239_CRC_INIT_DEFAULT (0xFFFFU)
#define ISO13239_CRC_INIT_PICOPASS (0xE012U)
#define ISO13239_CRC_POLY (0x8408U)
#define ISO13239_CRC_POLY (0x8408U)
static uint16_t
iso13239_crc_calculate(Iso13239CrcType type, const uint8_t* data, size_t data_size) {
@@ -55,7 +55,7 @@ bool iso13239_crc_check(Iso13239CrcType type, const BitBuffer* buf) {
const uint8_t* data = bit_buffer_get_data(buf);
const uint16_t crc_calc = iso13239_crc_calculate(type, data, data_size - ISO13239_CRC_SIZE);
return (crc_calc == crc_received);
return crc_calc == crc_received;
}
void iso13239_crc_trim(BitBuffer* buf) {

2
lib/nfc/helpers/iso14443_4_layer.c
View File

@@ -2,7 +2,7 @@
#include <furi.h>
#define ISO14443_4_BLOCK_PCB (1U << 1)
#define ISO14443_4_BLOCK_PCB (1U << 1)
#define ISO14443_4_BLOCK_PCB_I (0U)
#define ISO14443_4_BLOCK_PCB_R (5U << 5)
#define ISO14443_4_BLOCK_PCB_S (3U << 6)

2
lib/nfc/helpers/iso14443_crc.c
View File

@@ -50,7 +50,7 @@ bool iso14443_crc_check(Iso14443CrcType type, const BitBuffer* buf) {
const uint8_t* data = bit_buffer_get_data(buf);
const uint16_t crc_calc = iso14443_crc_calculate(type, data, data_size - ISO14443_CRC_SIZE);
return (crc_calc == crc_received);
return crc_calc == crc_received;
}
void iso14443_crc_trim(BitBuffer* buf) {

4
lib/nfc/helpers/nfc_util.c
View File

@@ -17,7 +17,7 @@ uint8_t nfc_util_even_parity32(uint32_t data) {
// data ^= data >> 16;
// data ^= data >> 8;
// return !nfc_util_odd_byte_parity[data];
return (__builtin_parity(data) & 0xFF);
return __builtin_parity(data) & 0xFF;
}
uint8_t nfc_util_odd_parity8(uint8_t data) {
@@ -45,4 +45,4 @@ void nfc_util_odd_parity(const uint8_t* src, uint8_t* dst, uint8_t len) {
if(bit) {
*dst = parity;
}
}
}