[I2C] Allow to enable HAL module only

Allow HAL I2C module usage without any usage by the core.

Fixes stm32duino#697

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

Author: fpistm

cores/arduino/board.h

@@ -17,7 +17,6 @@
 #include "spi_com.h"
 #include "stm32_eeprom.h"
 #include "timer.h"
-#include "twi.h"
 #include "uart.h"
 
 #ifdef __cplusplus

libraries/Wire/src/Wire.h

@@ -22,9 +22,11 @@
 #ifndef TwoWire_h
 #define TwoWire_h
 
-#include <inttypes.h>
 #include "Stream.h"
 #include "Arduino.h"
+extern "C" {
+#include "utility/twi.h"
+}
 
 #define BUFFER_LENGTH 32
 

libraries/Wire/src/utility/twi.c

@@ -36,13 +36,12 @@
   ******************************************************************************
   */
 #include "core_debug.h"
-#include "twi.h"
+#include "utility/twi.h"
 #include "PinAF_STM32F1.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-#if defined(HAL_I2C_MODULE_ENABLED)
 
 /* Private Defines */
 /// @brief I2C timout in tick unit
@@ -1150,7 +1149,6 @@ void I2C4_ER_IRQHandler(void)
   HAL_I2C_ER_IRQHandler(handle);
 }
 #endif // I2C4_BASE
-#endif /* HAL_I2C_MODULE_ENABLED */
 
 #ifdef __cplusplus
 }

libraries/Wire/src/utility/twi.h

@@ -47,7 +47,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#if defined(HAL_I2C_MODULE_ENABLED)
 
 /* Exported types ------------------------------------------------------------*/
 /* offsetof is a gcc built-in function, this is the manual implementation */
@@ -137,7 +136,6 @@ i2c_status_e i2c_IsDeviceReady(i2c_t *obj, uint8_t devAddr, uint32_t trials);
 
 void i2c_attachSlaveRxEvent(i2c_t *obj, void (*function)(uint8_t *, int));
 void i2c_attachSlaveTxEvent(i2c_t *obj, void (*function)(void));
-#endif /* HAL_I2C_MODULE_ENABLED */
 
 #ifdef __cplusplus
 }