Merge pull request #732 from mcci-catena/issue730

Fix #730: uninitialized variable
mcci-catena · May 14, 2021 · f35e6e3 · f35e6e3
2 parents 9a3792d + 43fedd5
commit f35e6e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/lmic/lmic_as923.c b/src/lmic/lmic_as923.c
@@ -395,6 +395,7 @@ ostime_t LMICas923_nextTx(ostime_t now) {
 
         // make a mask of candidates available for use
         availMap = 0;
+        feasibleMap = 0;
         for (u1_t chnl = 0; chnl < MAX_CHANNELS; ++chnl) {
                 u2_t chnlBit = 1 << chnl;
 
@@ -410,9 +411,10 @@ ostime_t LMICas923_nextTx(ostime_t now) {
                 if ((LMIC.channelDrMap[chnl] & (1 << (LMIC.datarate & 0xF))) == 0)
                         continue;
 
-                // not available yet?
+                // This channel is feasible. But might not be available.
                 feasibleMap |= chnlBit;
 
+                // not available yet?
                 u1_t const band = LMIC.channelFreq[chnl] & 0x3;
                 if ((s4_t)(LMIC.bands[band].avail - mintime) > 0)
                         continue;

diff --git a/src/lmic/lmic_eu868.c b/src/lmic/lmic_eu868.c
@@ -285,24 +285,26 @@ ostime_t LMICeu868_nextTx(ostime_t now) {
 
         // make a mask of candidates available for use
         availMap = 0;
+        feasibleMap = 0;
         for (u1_t chnl = 0; chnl < MAX_CHANNELS; ++chnl) {
                 u2_t chnlBit = 1 << chnl;
 
                 // none at any higher numbers?
                 if (LMIC.channelMap < chnlBit)
                         break;
 
-               // not enabled?
+                // not enabled?
                 if ((LMIC.channelMap & chnlBit) == 0)
                         continue;
 
                 // not feasible?
                 if ((LMIC.channelDrMap[chnl] & (1 << (LMIC.datarate & 0xF))) == 0)
                         continue;
 
-                // not available yet?
+                // This channel is feasible. But might not be available.
                 feasibleMap |= chnlBit;
 
+                // not available yet?
                 u1_t const band = LMIC.channelFreq[chnl] & 0x3;
                 if ((s4_t)(LMIC.bands[band].avail - mintime) > 0)
                         continue;