fix new warnings for new gcc, clang

apollo-lhc · Feb 16, 2024 · a41ff2d · a41ff2d
1 parent 703919e
commit a41ff2d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/common/log.h b/common/log.h
@@ -14,7 +14,6 @@
 #include "FreeRTOS.h"
 #include "printf.h"
 
-
 #define LOG_VERSION "0.1.0_pw"
 
 enum log_level_t { LOG_FATAL,

diff --git a/projects/cm_mcu/CommandLineTask.c b/projects/cm_mcu/CommandLineTask.c
@@ -45,13 +45,17 @@ static BaseType_t bl_ctl(int argc, char **argv, char *m)
   HWREG(NVIC_DIS2) = 0xffffffff;
   HWREG(NVIC_DIS3) = 0xffffffff;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+
   //
   // Return control to the boot loader.  This is a call to the SVC
   // handler in the boot loader.
   //
   (*((void (*)(void))(*(uint32_t *)0x2c)))();
 
   // the above points to a memory location in flash.
+#pragma GCC diagnostic pop
   // shut up compiler warning. This will never get called
   return pdFALSE;
 }

diff --git a/projects/cm_mcu/commands/I2CCommands.c b/projects/cm_mcu/commands/I2CCommands.c
@@ -170,12 +170,12 @@ BaseType_t i2c_scan(int argc, char **argv, char *m)
   copied += snprintf(m + copied, SCRATCH_SIZE - copied,
                      "     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f\r\n00:         ");
   for (uint8_t i = 0x3; i < 0x78; ++i) {
-    uint8_t data;
+    uint8_t data[4];
     if (i % 16 == 0) {
       copied += snprintf(m + copied, SCRATCH_SIZE - copied, "\r\n%2x:", i);
     }
     // try to read one byte from current address
-    int status = apollo_i2c_ctl_r(device, i, 1, &data);
+    int status = apollo_i2c_ctl_r(device, i, 1, data);
     if (status == 0)
       copied += snprintf(m + copied, SCRATCH_SIZE - copied, " %2x", i);
     else