Merge pull request #1353 from atomiclama/refactor_unused

Refactor to remove duplicate define of UNUSED macro.

src/main/build/build_config.h

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#define UNUSED(x) (void)(x)
 #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 
 #ifdef UNIT_TEST

src/main/common/printf.c

@@ -38,6 +38,8 @@
 
 #include "build/build_config.h"
 
+#include "common/utils.h"
+
 #include "drivers/serial.h"
 #include "io/serial.h"
 

src/main/common/utils.h

@@ -43,8 +43,6 @@ http://resnet.uoregon.edu/~gurney_j/jmpc/bitwise.html
 #define BITCOUNT(x) (((BX_(x)+(BX_(x)>>4)) & 0x0F0F0F0F) % 255)
 #define BX_(x) ((x) - (((x)>>1)&0x77777777) - (((x)>>2)&0x33333333) - (((x)>>3)&0x11111111))
 
-#define UNUSED(x) (void)(x)
-
 /*
  * https://groups.google.com/forum/?hl=en#!msg/comp.lang.c/attFnqwhvGk/sGBKXvIkY3AJ
  * Return (v ? floor(log2(v)) : 0) when 0 <= v < 1<<[8, 16, 32, 64].

src/main/drivers/accgyro_mpu6050.c

@@ -21,10 +21,10 @@
 
 #include "platform.h"
 
-#include "build/build_config.h"
 #include "build/debug.h"
 
 #include "common/maths.h"
+#include "common/utils.h"
 
 #include "nvic.h"
 

src/main/drivers/compass_ak8963.c

@@ -22,11 +22,11 @@
 
 #include "platform.h"
 
-#include "build/build_config.h"
 #include "build/debug.h"
 
 #include "common/axis.h"
 #include "common/maths.h"
+#include "common/utils.h"
 
 #include "system.h"
 #include "bus_i2c.h"

src/main/drivers/compass_ak8975.c

@@ -24,10 +24,9 @@
 
 #ifdef USE_MAG_AK8975
 
-#include "build/build_config.h"
-
 #include "common/axis.h"
 #include "common/maths.h"
+#include "common/utils.h"
 
 #include "system.h"
 #include "gpio.h"

src/main/io/beeper.c

@@ -21,7 +21,7 @@
 
 #include <platform.h>
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/gpio.h"
 #include "drivers/sound_beeper.h"

src/main/rx/ibus.c

@@ -29,7 +29,7 @@
 
 #ifdef SERIAL_RX
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 

src/main/rx/msp.c

@@ -22,7 +22,7 @@
 
 #ifndef SKIP_RX_MSP
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 #include "drivers/serial.h"

src/main/rx/nrf24_h8_3d.c

@@ -26,8 +26,7 @@
 
 #ifdef USE_RX_H8_3D
 
-#include "build/build_config.h"
-
+#include "common/utils.h"
 
 #include "drivers/rx_nrf24l01.h"
 #include "drivers/rx_xn297.h"

src/main/rx/nrf24_inav.c

@@ -23,9 +23,10 @@
 
 #ifdef USE_RX_INAV
 
-#include "build/build_config.h"
 #include "build/debug.h"
 
+#include "common/utils.h"
+
 #include "drivers/rx_nrf24l01.h"
 #include "drivers/system.h"
 

src/main/rx/nrf24_v202.c

@@ -23,8 +23,8 @@
 #include <stdlib.h>
 
 #include <platform.h>
-#include "build/build_config.h"
 
+#include "common/utils.h"
 
 #ifdef USE_RX_V202
 

src/main/rx/sbus.c

@@ -23,7 +23,7 @@
 
 #ifdef SERIAL_RX
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 

src/main/rx/sumd.c

@@ -23,7 +23,7 @@
 
 #ifdef SERIAL_RX
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 #include "drivers/serial.h"

src/main/rx/sumh.c

@@ -29,7 +29,7 @@
 
 #ifdef SERIAL_RX
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 

src/main/scheduler/scheduler.c

@@ -23,12 +23,12 @@
 
 #include "platform.h"
 
-#include "build/build_config.h"
 #include "build/debug.h"
 
 #include "scheduler/scheduler.h"
 
 #include "common/maths.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 

src/main/vcp/hw_config.c

@@ -39,7 +39,7 @@
 #include "drivers/system.h"
 #include "drivers/nvic.h"
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 
 /* Private typedef -----------------------------------------------------------*/