From 431e8ff95d71757086201c25ed65bf2edd48e17c Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 26 Jan 2015 21:04:06 -0600 Subject: [PATCH] auto-sync --- firmware/hw_layer/hardware.h | 9 --------- firmware/hw_layer/stm32f4/mpu_util.h | 4 +--- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/firmware/hw_layer/hardware.h b/firmware/hw_layer/hardware.h index 450f15dd0b..dfcaa027d9 100644 --- a/firmware/hw_layer/hardware.h +++ b/firmware/hw_layer/hardware.h @@ -31,20 +31,11 @@ // 328.125 KHz 164.06 KHz #define SPI_BaudRatePrescaler_256 ((uint16_t)0x0038) -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - SPIDriver * getSpiDevice(spi_device_e spiDevice); void turnOnSpi(spi_device_e device); void lockSpi(spi_device_e device); void unlockSpi(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - #endif /* HAL_USE_SPI */ #define GET_BOARD_TEST_MODE_VALUE() (!palReadPad(getHwPort(boardConfiguration->boardTestModeJumperPin), getHwPin(boardConfiguration->boardTestModeJumperPin))) diff --git a/firmware/hw_layer/stm32f4/mpu_util.h b/firmware/hw_layer/stm32f4/mpu_util.h index eaa3b5c962..d8c9bd2ba0 100644 --- a/firmware/hw_layer/stm32f4/mpu_util.h +++ b/firmware/hw_layer/stm32f4/mpu_util.h @@ -43,8 +43,8 @@ #define ADC_CR2_SWSTART ((uint32_t)0x40000000) #endif - void baseHardwareInit(void); +void turnOnSpi(spi_device_e device); #ifdef __cplusplus extern "C" @@ -57,11 +57,9 @@ void DebugMonitorVector(void); void UsageFaultVector(void); void BusFaultVector(void); void HardFaultVector(void); -void turnOnSpi(spi_device_e device); void initSpiModule(SPIDriver *driver, brain_pin_e sck, brain_pin_e miso, brain_pin_e mosi); void initSpiCs(SPIConfig *spiConfig, brain_pin_e csPin); -void turnOnSpi(spi_device_e device); #ifdef __cplusplus }