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

nfc: Change furi_assert to furi_crash for default switch cases (#1662)

* nfc: Change furi_assert to furi_crash for default switch cases
* Nfc: change MiFare Ultralight crash message

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
Yukai Li 3 лет назад
Родитель
Сommit
ab4bb55d0f
2 измененных файлов с 5 добавлено и 8 удалено
  1. 1 1
      applications/nfc/helpers/nfc_generators.c
  2. 4 7
      lib/nfc/protocols/mifare_ultralight.c

+ 1 - 1
applications/nfc/helpers/nfc_generators.c

@@ -254,7 +254,7 @@ static void
         session_register_page = 234;
         session_register_page = 234;
         break;
         break;
     default:
     default:
-        furi_assert(false);
+        furi_crash("Unknown MFUL");
         break;
         break;
     }
     }
 
 

+ 4 - 7
lib/nfc/protocols/mifare_ultralight.c

@@ -940,7 +940,7 @@ static bool mf_ul_check_lock(MfUltralightEmulator* emulator, int16_t write_page)
         if(write_page >= 512) return true;
         if(write_page >= 512) return true;
         break;
         break;
     default:
     default:
-        furi_assert(false);
+        furi_crash("Unknown MFUL");
         return true;
         return true;
     }
     }
 
 
@@ -967,8 +967,7 @@ static bool mf_ul_check_lock(MfUltralightEmulator* emulator, int16_t write_page)
         else if(write_page == 41)
         else if(write_page == 41)
             shift = 12;
             shift = 12;
         else {
         else {
-            furi_assert(false);
-            shift = 0;
+            furi_crash("Unknown MFUL");
         }
         }
 
 
         break;
         break;
@@ -999,8 +998,7 @@ static bool mf_ul_check_lock(MfUltralightEmulator* emulator, int16_t write_page)
             shift = (write_page - 16) / 32;
             shift = (write_page - 16) / 32;
         break;
         break;
     default:
     default:
-        furi_assert(false);
-        shift = 0;
+        furi_crash("Unknown MFUL");
         break;
         break;
     }
     }
 
 
@@ -1177,8 +1175,7 @@ static void mf_ul_emulate_write(
                 block_lock_count = 8;
                 block_lock_count = 8;
                 break;
                 break;
             default:
             default:
-                furi_assert(false);
-                block_lock_count = 0;
+                furi_crash("Unknown MFUL");
                 break;
                 break;
             }
             }