Rename debug to core_debug to avoid issue

Several libraries provides debug.h or debug function

__DEBUG define has been renamed CORE_DEBUG

Signed-off-by: Frederic.Pillon <[email protected]>

Author: fpistm

cores/arduino/debug.h renamed to cores/arduino/core_debug.h

@@ -1,8 +1,9 @@
-#ifndef _DEBUG_H
-#ifdef __DEBUG
+#ifndef _CORE_DEBUG_H
+#define _CORE_DEBUG_H
+#ifdef CORE_DEBUG
 #include <stdio.h>
 #include <stdarg.h>
-#endif /* __DEBUG */
+#endif /* CORE_DEBUG */
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,19 +16,19 @@ extern "C" {
  * the code, use a lot of stack. An alternative, will be to implement a tiny
  * and limited functionality implementation of printf.
  */
-static inline void debug(const char *format, ...) {
-#ifdef __DEBUG
+static inline void core_debug(const char *format, ...) {
+#ifdef CORE_DEBUG
   va_list args;
   va_start(args, format);
   vfprintf(stderr, format, args);
   va_end(args);
 #else
 	(void)(format);
-#endif /* __DEBUG */
+#endif /* CORE_DEBUG */
 }
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _DEBUG_H */
+#endif /* _CORE_DEBUG_H */

cores/arduino/stm32/spi_com.c

@@ -46,7 +46,7 @@
 /** @addtogroup STM32F4xx_System_Private_Includes
   * @{
   */
-#include "debug.h"
+#include "core_debug.h"
 #include "stm32_def.h"
 #include "spi_com.h"
 #include "PinAF_STM32F1.h"
@@ -150,7 +150,7 @@ uint32_t spi_getClkFreqInst(SPI_TypeDef * spi_inst)
         break;
 #endif
       default:
-        debug("CLK: SPI instance not set");
+        core_debug("CLK: SPI instance not set");
         break;
     }
   }
@@ -204,7 +204,7 @@ void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb)
 
   /* Pins MOSI/MISO/SCLK must not be NP. ssel can be NP. */
   if(spi_mosi == NP || spi_miso == NP || spi_sclk == NP) {
-    debug("ERROR: at least one SPI pin has no peripheral\n");
+    core_debug("ERROR: at least one SPI pin has no peripheral\n");
     return;
   }
 
@@ -215,7 +215,7 @@ void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb)
 
   // Are all pins connected to the same SPI instance?
   if(obj->spi == NP) {
-    debug("ERROR: SPI pins mismatch\n");
+    core_debug("ERROR: SPI pins mismatch\n");
     return;
   }
 

cores/arduino/stm32/stm32_def.c

@@ -1,5 +1,5 @@
 #include "stm32_def.h"
-#include "debug.h"
+#include "core_debug.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,7 +12,7 @@ extern "C" {
   */
 WEAK void _Error_Handler(const char * msg, int val) {
   /* User can add his own implementation to report the HAL error return state */
-  debug("Error: %s (%i)\n", msg, val);
+  core_debug("Error: %s (%i)\n", msg, val);
   while(1) {
   }
 }

cores/arduino/stm32/timer.c

@@ -46,7 +46,7 @@
 /** @addtogroup STM32F4xx_System_Private_Includes
   * @{
   */
-#include "debug.h"
+#include "core_debug.h"
 #include "timer.h"
 #include "board.h"
 
@@ -545,7 +545,7 @@ uint32_t getTimerIrq(TIM_TypeDef* tim)
 #endif
          break;
      default:
-        debug("TIM: Unknown timer IRQn");
+        core_debug("TIM: Unknown timer IRQn");
         break;
     }
   }
@@ -653,7 +653,7 @@ uint8_t getTimerClkSrc(TIM_TypeDef* tim)
          clkSrc = 2;
          break;
      default:
-        debug("TIM: Unknown timer instance");
+        core_debug("TIM: Unknown timer instance");
         break;
     }
   }
@@ -687,7 +687,7 @@ uint32_t getTimerClkFreq(TIM_TypeDef* tim)
 #endif
     default:
     case 0:
-      debug("TIM: Unknown clock source");
+      core_debug("TIM: Unknown clock source");
       break;
   }
 /* When TIMPRE bit of the RCC_DCKCFGR register is reset,

cores/arduino/stm32/twi.c

@@ -47,7 +47,7 @@
 /** @addtogroup STM32F4xx_System_Private_Includes
   * @{
   */
-#include "debug.h"
+#include "core_debug.h"
 #include "stm32_def.h"
 #include "twi.h"
 #include "PinAF_STM32F1.h"
@@ -167,14 +167,14 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u
 
   //Pins SDA/SCL must not be NP
   if(i2c_sda == NP || i2c_scl == NP) {
-    debug("ERROR: at least one I2C pin has no peripheral\n");
+    core_debug("ERROR: at least one I2C pin has no peripheral\n");
     return;
   }
 
   obj->i2c = pinmap_merge_peripheral(i2c_sda, i2c_scl);
 
   if(obj->i2c == NP) {
-    debug("ERROR: I2C pins mismatch\n");
+    core_debug("ERROR: I2C pins mismatch\n");
     return;
   }
 
@@ -597,7 +597,7 @@ void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c)
   if(obj->slaveRxNbData < I2C_TXRX_BUFFER_SIZE) {
     obj->slaveRxNbData++;
   } else {
-    debug("ERROR: I2C Slave RX overflow\n");
+    core_debug("ERROR: I2C Slave RX overflow\n");
   }
   /* Restart interrupt mode for next Byte */
   if(obj->slaveMode == SLAVE_MODE_RECEIVE) {

cores/arduino/stm32/uart.c

@@ -33,7 +33,7 @@
   *
   ******************************************************************************
   */
-#include "debug.h"
+#include "core_debug.h"
 #include "uart.h"
 #include "Arduino.h"
 #include "PinAF_STM32F1.h"
@@ -102,7 +102,7 @@ void uart_init(serial_t *obj)
 
   /* Pins Rx/Tx must not be NP */
   if(uart_rx == NP || uart_tx == NP) {
-    debug("ERROR: at least one UART pin has no peripheral\n");
+    core_debug("ERROR: at least one UART pin has no peripheral\n");
     return;
   }
 
@@ -113,7 +113,7 @@ void uart_init(serial_t *obj)
   obj->uart = pinmap_merge_peripheral(uart_tx, uart_rx);
 
   if(obj->uart == NP) {
-    debug("ERROR: U(S)ART pins mismatch\n");
+    core_debug("ERROR: U(S)ART pins mismatch\n");
     return;
   }