From 38ba334a1ab2358a9fed715185fbe5bb41cd2436 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Tue, 2 May 2023 14:41:24 +0100
Subject: [PATCH] Fix build

---
 lib/nfc/nfc_device.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/nfc/nfc_device.c b/lib/nfc/nfc_device.c
index 7f8518c7d..af0ef42ae 100644
--- a/lib/nfc/nfc_device.c
+++ b/lib/nfc/nfc_device.c
@@ -1401,17 +1401,18 @@ bool nfc_device_save(NfcDevice* dev, const char* dev_name) {
             break;
         nfc_device_prepare_format_string(dev, temp_str);
         if(!flipper_format_write_string(file, "Device type", temp_str)) break;
-        // Write UID
-        if(!flipper_format_write_comment_cstr(file, "UID is common for all formats")) break;
+        // Write UID, ATQA, SAK
+        if(!flipper_format_write_comment_cstr(file, "UID, ATQA and SAK are common for all formats"))
+            break;
         if(!flipper_format_write_hex(file, "UID", data->uid, data->uid_len)) break;
 
         if(dev->format != NfcDeviceSaveFormatNfcV) {
             // Write ATQA, SAK
             if(!flipper_format_write_comment_cstr(file, "ISO14443 specific fields")) break;
             // Save ATQA in MSB order for correct companion apps display
-            uint8_t atqa[2] = {data->atqa[1], data->atqa[0]};
+            uint8_t atqa[2] = {data->a_data.atqa[1], data->a_data.atqa[0]};
             if(!flipper_format_write_hex(file, "ATQA", atqa, 2)) break;
-            if(!flipper_format_write_hex(file, "SAK", &data->sak, 1)) break;
+            if(!flipper_format_write_hex(file, "SAK", &data->a_data.sak, 1)) break;
         }
 
         // Save more data if necessary
@@ -1502,14 +1503,14 @@ static bool nfc_device_load_data(NfcDevice* dev, FuriString* path, bool show_dia
         if(!flipper_format_read_hex(file, "UID", data->uid, data->uid_len)) break;
         if(dev->format != NfcDeviceSaveFormatNfcV) {
             if(version == version_with_lsb_atqa) {
-                if(!flipper_format_read_hex(file, "ATQA", data->atqa, 2)) break;
+                if(!flipper_format_read_hex(file, "ATQA", data->a_data.atqa, 2)) break;
             } else {
                 uint8_t atqa[2] = {};
                 if(!flipper_format_read_hex(file, "ATQA", atqa, 2)) break;
-                data->atqa[0] = atqa[1];
-                data->atqa[1] = atqa[0];
+                data->a_data.atqa[0] = atqa[1];
+                data->a_data.atqa[1] = atqa[0];
             }
-            if(!flipper_format_read_hex(file, "SAK", &data->sak, 1)) break;
+            if(!flipper_format_read_hex(file, "SAK", &data->a_data.sak, 1)) break;
         }
         // Load CUID
         uint8_t* cuid_start = data->uid;