Просмотр исходного кода

NFC Magic: Incorrect total blocks usage fix from (#102)[https://github.com/flipperdevices/flipperzero-good-faps/pull/102]

Methodius 2 лет назад
Родитель
Сommit
d7ec901316

+ 2 - 6
lib/magic/protocols/gen4/gen4_poller.c

@@ -1,5 +1,3 @@
-#include "core/check.h"
-#include "core/log.h"
 #include "gen4_poller_i.h"
 #include "protocols/gen4/gen4_poller.h"
 #include <nfc/protocols/iso14443_3a/iso14443_3a.h>
@@ -7,8 +5,6 @@
 #include <nfc/helpers/nfc_util.h>
 #include <nfc/nfc_poller.h>
 
-#include <furi/furi.h>
-
 #define GEN4_POLLER_THREAD_FLAG_DETECTED (1U << 0)
 
 typedef NfcCommand (*Gen4PollerStateHandler)(Gen4Poller* instance);
@@ -280,7 +276,7 @@ static NfcCommand gen4_poller_write_mf_classic(Gen4Poller* instance) {
             instance->config[25] = iso3_data->atqa[1];
             instance->config[26] = iso3_data->sak;
             instance->config[27] = 0x00;
-            instance->config[28] = instance->total_blocks;
+            instance->config[28] = instance->total_blocks - 1;
             instance->config[29] = Gen4PollerDirectWriteBlock0ModeDisabled;
 
             Gen4PollerError error = gen4_poller_set_config(
@@ -359,7 +355,7 @@ static NfcCommand gen4_poller_write_mf_ultralight(Gen4Poller* instance) {
             instance->config[25] = iso3_data->atqa[1];
             instance->config[26] = iso3_data->sak;
             instance->config[27] = 0x00;
-            instance->config[28] = instance->total_blocks;
+            instance->config[28] = instance->total_blocks - 1;
             instance->config[29] = Gen4PollerDirectWriteBlock0ModeDisabled;
 
             Gen4PollerError error = gen4_poller_set_config(

+ 0 - 1
lib/magic/protocols/gen4/gen4_poller_i.h

@@ -3,7 +3,6 @@
 #include "gen4_poller.h"
 #include <nfc/nfc_poller.h>
 #include <nfc/protocols/iso14443_3a/iso14443_3a_poller.h>
-#include <stdint.h>
 
 #define TAG "Gen4Poller"