arch/stm32: Fix nxstyle errors

arch/arm/src/stm32/stm32_spi.h:

    * Fix nxstyle issues.
This commit is contained in:
Nathan Hartman
2020-12-30 10:39:10 -05:00
committed by Xiang Xiao
parent d9b1cb3d27
commit 81224cc596
+54 -46
View File
@@ -1,4 +1,4 @@
/************************************************************************************ /****************************************************************************
* arch/arm/src/stm32/stm32_spi.h * arch/arm/src/stm32/stm32_spi.h
* *
* Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved.
@@ -31,14 +31,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ****************************************************************************/
#ifndef __ARCH_ARM_STC_STM32_STM32_SPI_H #ifndef __ARCH_ARM_STC_STM32_STM32_SPI_H
#define __ARCH_ARM_STC_STM32_STM32_SPI_H #define __ARCH_ARM_STC_STM32_STM32_SPI_H
/************************************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@@ -47,9 +47,9 @@
#include "chip.h" #include "chip.h"
#include "hardware/stm32_spi.h" #include "hardware/stm32_spi.h"
/************************************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
@@ -62,17 +62,17 @@ extern "C"
#define EXTERN extern #define EXTERN extern
#endif #endif
/************************************************************************************ /****************************************************************************
* Public Data * Public Data
************************************************************************************/ ****************************************************************************/
struct spi_dev_s; struct spi_dev_s;
/************************************************************************************ /****************************************************************************
* Public Functions * Public Function Prototypes
************************************************************************************/ ****************************************************************************/
/************************************************************************************ /****************************************************************************
* Name: stm32_spibus_initialize * Name: stm32_spibus_initialize
* *
* Description: * Description:
@@ -84,84 +84,92 @@ struct spi_dev_s;
* Returned Value: * Returned Value:
* Valid SPI device structure reference on success; a NULL on failure * Valid SPI device structure reference on success; a NULL on failure
* *
************************************************************************************/ ****************************************************************************/
FAR struct spi_dev_s *stm32_spibus_initialize(int bus); FAR struct spi_dev_s *stm32_spibus_initialize(int bus);
/************************************************************************************ /****************************************************************************
* Name: stm32_spi1/2/...select and stm32_spi1/2/...status * Name: stm32_spi1/2/...select and stm32_spi1/2/...status
* *
* Description: * Description:
* The external functions, stm32_spi1/2/...select, stm32_spi1/2/...status, and * The external functions, stm32_spi1/2/...select, stm32_spi1/2/...status,
* stm32_spi1/2/...cmddata must be provided by board-specific logic. These are * and stm32_spi1/2/...cmddata must be provided by board-specific logic.
* implementations of the select, status, and cmddata methods of the SPI interface * These are implementations of the select, status, and cmddata methods of
* defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * the SPI interface defined by struct spi_ops_s (see
* (including stm32_spibus_initialize()) are provided by common STM32 logic. To use this * include/nuttx/spi/spi.h). All other methods (including
* common SPI logic on your board: * stm32_spibus_initialize()) are provided by common STM32 logic. To use
* this common SPI logic on your board:
* *
* 1. Provide logic in stm32_boardinitialize() to configure SPI chip select * 1. Provide logic in stm32_boardinitialize() to configure SPI chip
* pins. * select pins.
* 2. Provide stm32_spi1/2/...select() and stm32_spi1/2/...status() functions in your * 2. Provide stm32_spi1/2/...select() and stm32_spi1/2/...status()
* board-specific logic. These functions will perform chip selection and * functions in your board-specific logic. These functions will
* status operations using GPIOs in the way your board is configured. * perform chip selection and status operations using GPIOs in the way
* 3. If CONFIG_SPI_CMDDATA is defined in your NuttX configuration file, then * your board is configured.
* provide stm32_spi1/2/...cmddata() functions in your board-specific logic. * 3. If CONFIG_SPI_CMDDATA is defined in your NuttX configuration file,
* These functions will perform cmd/data selection operations using GPIOs in the * then provide stm32_spi1/2/...cmddata() functions in your board-
* way your board is configured. * specific logic. These functions will perform cmd/data selection
* 4. Add a calls to stm32_spibus_initialize() in your low level application * operations using GPIOs in the way your board is configured.
* initialization logic * 4. Add a calls to stm32_spibus_initialize() in your low level
* 5. The handle returned by stm32_spibus_initialize() may then be used to bind the * application initialization logic
* SPI driver to higher level logic (e.g., calling * 5. The handle returned by stm32_spibus_initialize() may then be used to
* bind the SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to * mmcsd_spislotinitialize(), for example, will bind the SPI driver to
* the SPI MMC/SD driver). * the SPI MMC/SD driver).
* *
************************************************************************************/ ****************************************************************************/
#ifdef CONFIG_STM32_SPI1 #ifdef CONFIG_STM32_SPI1
void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected); void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected);
uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid); uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32_SPI2 #ifdef CONFIG_STM32_SPI2
void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected); void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected);
uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid); uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32_SPI3 #ifdef CONFIG_STM32_SPI3
void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected); void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected);
uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid); uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32_SPI4 #ifdef CONFIG_STM32_SPI4
void stm32_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected); void stm32_spi4select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected);
uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, uint32_t devid); uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); int stm32_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32_SPI5 #ifdef CONFIG_STM32_SPI5
void stm32_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected); void stm32_spi5select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected);
uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid); uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32_SPI6 #ifdef CONFIG_STM32_SPI6
void stm32_spi6select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected); void stm32_spi6select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected);
uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid); uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi6cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); int stm32_spi6cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
/************************************************************************************ /****************************************************************************
* Name: stm32_spi1/2/...register * Name: stm32_spi1/2/...register
* *
* Description: * Description:
* If the board supports a card detect callback to inform the SPI-based MMC/SD * If the board supports a card detect callback to inform the SPI-based
* driver when an SD card is inserted or removed, then CONFIG_SPI_CALLBACK should * MMC/SD driver when an SD card is inserted or removed, then
* be defined and the following function(s) must be implemented. These functions * CONFIG_SPI_CALLBACK should be defined and the following function(s)
* implements the registercallback method of the SPI interface (see * must be implemented. These functions implements the registercallback
* include/nuttx/spi/spi.h for details) * method of the SPI interface (see include/nuttx/spi/spi.h for details)
* *
* Input Parameters: * Input Parameters:
* dev - Device-specific state data * dev - Device-specific state data