revert redundant changes in LoRaMac.h and LoRaMacCrypto.c

ImperialSpaceSociety · Aug 5, 2022 · 81ad56b · 81ad56b
1 parent 7ad757e
commit 81ad56b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/src/mac/LoRaMac.h b/src/mac/LoRaMac.h
@@ -659,6 +659,16 @@ typedef struct sLoRaMacNvmDataGroup2
  */
 typedef struct sLoRaMacNvmData
 {
+    /*!
+     * Parameters related to the crypto layer. Change with every TX/RX
+     * procedure.
+     */
+    LoRaMacCryptoNvmData_t Crypto;
+    /*!
+     * Parameters related to the MAC which change with high probability after
+     * every TX/RX procedure.
+     */
+    LoRaMacNvmDataGroup1_t MacGroup1;
     /*!
      * Parameters related to the MAC which do not change very likely with every
      * TX/RX procedure.
@@ -668,7 +678,11 @@ typedef struct sLoRaMacNvmData
      * Parameters related to the secure-element.
      */
     SecureElementNvmData_t SecureElement;
-
+    /*!
+     * Parameters related to the regional implementation which change with high
+     * probability after every TX/RX procedure.
+     */
+    RegionNvmDataGroup1_t RegionGroup1;
     /*!
      * Parameters related to the regional implementation which do not change
      * very likely with every TX/RX procedure.
@@ -678,24 +692,6 @@ typedef struct sLoRaMacNvmData
      * Parameters related to class b.
      */
     LoRaMacClassBNvmData_t ClassB;
-
-    /*!
-     * Parameters related to the crypto layer. Change with every TX/RX
-     * procedure.
-     */
-    LoRaMacCryptoNvmData_t Crypto;
-    /*!
-     * Parameters related to the MAC which change with high probability after
-     * every TX/RX procedure.
-     */
-    LoRaMacNvmDataGroup1_t MacGroup1;
-
-    /*!
-     * Parameters related to the regional implementation which change with high
-     * probability after every TX/RX procedure.
-     */
-    RegionNvmDataGroup1_t RegionGroup1;
-
 }LoRaMacNvmData_t;
 
 /*!

diff --git a/src/mac/LoRaMacCrypto.c b/src/mac/LoRaMacCrypto.c
@@ -789,7 +789,6 @@ static void UpdateFCntDown( FCntIdentifier_t fCntID, uint32_t currentDown )
     }
 }
 
-
 /*!
  * Resets the frame counters
  */
-Original file line number
+Diff line change
@@ Expand Up @@
         }
     }
     /*!
      * Resets the frame counters
      */
@@ Expand Down @@