From b696c498b7987d834cf3d45d8ddb7fa96a363306 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 14 May 2024 14:37:08 +0200
Subject: [PATCH] scope, const

---
 armsrc/Standalone/lf_prox2brute.c | 3 +--
 armsrc/felica.c                   | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/armsrc/Standalone/lf_prox2brute.c b/armsrc/Standalone/lf_prox2brute.c
index ecfaac9e3..851dd597a 100644
--- a/armsrc/Standalone/lf_prox2brute.c
+++ b/armsrc/Standalone/lf_prox2brute.c
@@ -48,7 +48,6 @@ void RunMod(void) {
     FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
     const uint32_t high = 0x20; // LF high value is always 0x20 here
-    uint32_t low = 0;
 
     uint32_t fac = FACILITY_CODE, cardnum = 0;
 
@@ -80,7 +79,7 @@ void RunMod(void) {
         if (BUTTON_HELD(1000) == BUTTON_HOLD) break; // long button press (>=1sec) exit
 
         // calculate the new LF low value including Card number, Facility code and checksum
-        low = (cardnum << 1) | (fac << 17);
+        uint32_t low = (cardnum << 1) | (fac << 17);
         low |= oddparity32((low >> 1) & 0xFFF);
         low |= evenparity32((low >> 13) & 0xFFF) << 25;
 
diff --git a/armsrc/felica.c b/armsrc/felica.c
index 4b913707e..084ca6eee 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -544,7 +544,6 @@ void felica_sendraw(const PacketCommandNG *c) {
 
     felica_command_t param = c->oldarg[0];
     size_t len = c->oldarg[1] & 0xffff;
-    const uint8_t *cmd = c->data.asBytes;
     uint32_t arg0;
 
     if ((param & FELICA_CONNECT) == FELICA_CONNECT) {
@@ -581,7 +580,7 @@ void felica_sendraw(const PacketCommandNG *c) {
         buf[2] = len;
 
         // copy command
-        memcpy(buf + 2, cmd, len);
+        memcpy(buf + 2, c->data.asBytes, len);
 
         if ((param & FELICA_APPEND_CRC) == FELICA_APPEND_CRC) {
             // Don't append crc on empty bytearray...
@@ -630,7 +629,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
     int remFrames = (samplesToSkip) ? samplesToSkip : 0;
     int trigger_cnt = 0;
     uint32_t timeout = iso18092_get_timeout();
-    bool isReaderFrame = true;
+    bool isReaderFrame;
 
     uint8_t flip = 0;
     uint16_t checker = 0;
@@ -733,7 +732,7 @@ void felica_sim_lite(const uint8_t *uid) {
 
     int retval = PM3_SUCCESS;
     int curlen = 0;
-    uint8_t *curresp = NULL;
+    const uint8_t *curresp = NULL;
     bool listenmode = true;
     // uint32_t frtm = GetCountSspClk();
 
@@ -883,7 +882,7 @@ void felica_dump_lite_s(void) {
 
                     dest[cnt++] = liteblks[blknum];
 
-                    uint8_t *fb = FelicaFrame.framebytes;
+                    const uint8_t *fb = FelicaFrame.framebytes;
                     dest[cnt++] = fb[12];
                     dest[cnt++] = fb[13];