1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 07:15:18 +03:00

Merge pull request #1353 from atomiclama/refactor_unused

Refactor to remove duplicate define of UNUSED macro.
This commit is contained in:
borisbstyle 2016-10-20 11:29:24 +02:00 committed by GitHub
commit 77fb81915e
17 changed files with 20 additions and 22 deletions

View file

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

View file

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

View file

@ -43,8 +43,6 @@ http://resnet.uoregon.edu/~gurney_j/jmpc/bitwise.html
#define BITCOUNT(x) (((BX_(x)+(BX_(x)>>4)) & 0x0F0F0F0F) % 255) #define BITCOUNT(x) (((BX_(x)+(BX_(x)>>4)) & 0x0F0F0F0F) % 255)
#define BX_(x) ((x) - (((x)>>1)&0x77777777) - (((x)>>2)&0x33333333) - (((x)>>3)&0x11111111)) #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 * 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]. * Return (v ? floor(log2(v)) : 0) when 0 <= v < 1<<[8, 16, 32, 64].

View file

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

View file

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

View file

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

View file

@ -21,7 +21,7 @@
#include <platform.h> #include <platform.h>
#include "build/build_config.h" #include "common/utils.h"
#include "drivers/gpio.h" #include "drivers/gpio.h"
#include "drivers/sound_beeper.h" #include "drivers/sound_beeper.h"
@ -392,7 +392,7 @@ int beeperTableEntryCount(void)
/* /*
* Returns true if the beeper is on, false otherwise * Returns true if the beeper is on, false otherwise
*/ */
bool isBeeperOn(void) bool isBeeperOn(void)
{ {
return beeperIsOn; return beeperIsOn;
} }

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -39,7 +39,7 @@
#include "drivers/system.h" #include "drivers/system.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "build/build_config.h" #include "common/utils.h"
/* Private typedef -----------------------------------------------------------*/ /* Private typedef -----------------------------------------------------------*/
@ -68,7 +68,7 @@ void Set_System(void)
{ {
#if !defined(STM32L1XX_MD) && !defined(STM32L1XX_HD) && !defined(STM32L1XX_MD_PLUS) #if !defined(STM32L1XX_MD) && !defined(STM32L1XX_HD) && !defined(STM32L1XX_MD_PLUS)
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
#endif /* STM32L1XX_MD && STM32L1XX_XD */ #endif /* STM32L1XX_MD && STM32L1XX_XD */
#if defined(USB_USE_EXTERNAL_PULLUP) #if defined(USB_USE_EXTERNAL_PULLUP)
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
@ -277,7 +277,7 @@ static void IntToUnicode(uint32_t value, uint8_t *pbuf, uint8_t len)
/******************************************************************************* /*******************************************************************************
* Function Name : Send DATA . * Function Name : Send DATA .
* Description : send the data received from the STM32 to the PC through USB * Description : send the data received from the STM32 to the PC through USB
* Input : None. * Input : None.
* Output : None. * Output : None.
* Return : None. * Return : None.