riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4398 from OlegHahm/stm_header_cleanup

Browse Source 
cpu: remove superfluous definitions in ST header
This commit is contained in:
Oleg Hahm 2015-12-08 08:52:23 +01:00
commit fcb5fbf7f6
3 changed files with 3 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/spark-core/system_stm32f1.c
View File

@ -41,7 +41,7 @@ static void set_system_clock(void)
}
while ((HSE_status == 0) && (startup_counter != HSE_STARTUP_TIMEOUT));
if ((RCC->CR & RCC_CR_HSERDY) != RESET) {
if (!(RCC->CR & RCC_CR_HSERDY)) {
HSE_status = (uint32_t)0x01;
}
else {

52
cpu/stm32f1/include/stm32f10x.h
View File

@ -488,58 +488,6 @@ typedef enum IRQn
extern "C" {
#endif
/** @addtogroup cpu_specific_Exported_types
* @{
*/
/*!< STM32F10x Standard Peripheral Library old types (maintained for legacy purpose) */
typedef int32_t s32;
typedef int16_t s16;
typedef int8_t s8;
typedef const int32_t sc32; /*!< Read Only */
typedef const int16_t sc16; /*!< Read Only */
typedef const int8_t sc8; /*!< Read Only */
typedef __IO int32_t vs32;
typedef __IO int16_t vs16;
typedef __IO int8_t vs8;
typedef __I int32_t vsc32; /*!< Read Only */
typedef __I int16_t vsc16; /*!< Read Only */
typedef __I int8_t vsc8; /*!< Read Only */
typedef uint32_t u32;
typedef uint16_t u16;
typedef uint8_t u8;
typedef const uint32_t uc32; /*!< Read Only */
typedef const uint16_t uc16; /*!< Read Only */
typedef const uint8_t uc8; /*!< Read Only */
typedef __IO uint32_t vu32;
typedef __IO uint16_t vu16;
typedef __IO uint8_t vu8;
typedef __I uint32_t vuc32; /*!< Read Only */
typedef __I uint16_t vuc16; /*!< Read Only */
typedef __I uint8_t vuc8; /*!< Read Only */
typedef enum {RESET = 0, SET = !RESET} FlagStatus, ITStatus;
typedef enum {DISABLE = 0, ENABLE = !DISABLE} FunctionalState;
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
typedef enum {ERROR = 0, SUCCESS = !ERROR} ErrorStatus;
/*!< STM32F10x Standard Peripheral Library old definitions (maintained for legacy purpose) */
#define HSEStartUp_TimeOut HSE_STARTUP_TIMEOUT
#define HSE_Value HSE_VALUE
#define HSI_Value HSI_VALUE
/**
* @}
*/
/** @addtogroup cpu_specific_Peripheral_registers_structures
* @{
*/

4
cpu/stm32f1/periph/spi.c
View File

@ -210,11 +210,11 @@ int spi_transfer_byte(spi_t dev, char out, char *in)
return -1;
}
while ((spi->SR & SPI_SR_TXE) == RESET);
while (!(spi->SR & SPI_SR_TXE));
spi->DR = out;
transferred++;
while ((spi->SR & SPI_SR_RXNE) == RESET);
while (!(spi->SR & SPI_SR_RXNE));
if (in != NULL) {
*in = spi->DR;
transferred++;