From d51554c1013e949bc42ad6501c73e33f1868d76e Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 11 Dec 2017 15:04:51 -0600 Subject: [PATCH] arch/arm/src/lpc54xx: Costmetic. --- arch/arm/src/lpc54xx/lpc54_i2c_master.c | 26 ++++++++++++------------- arch/arm/src/lpc54xx/lpc54_spi_master.c | 21 ++++++++++++-------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/arch/arm/src/lpc54xx/lpc54_i2c_master.c b/arch/arm/src/lpc54xx/lpc54_i2c_master.c index eeee024c3df..582efd34ee5 100644 --- a/arch/arm/src/lpc54xx/lpc54_i2c_master.c +++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.c @@ -80,22 +80,22 @@ struct lpc54_i2cdev_s { - struct i2c_master_s dev; /* Generic I2C device */ - uintptr_t base; /* Base address of Flexcomm registers */ - uint16_t irq; /* Flexcomm IRQ number */ - uint32_t fclock; /* Flexcomm function clock frequency */ + struct i2c_master_s dev; /* Generic I2C device */ + uintptr_t base; /* Base address of Flexcomm registers */ - sem_t exclsem; /* Only one thread can access at a time */ - sem_t waitsem; /* Supports wait for state machine completion */ - volatile uint8_t state; /* State of state machine */ - WDOG_ID timeout; /* watchdog to timeout when bus hung */ - uint32_t frequency; /* Current I2C frequency */ + WDOG_ID timeout; /* Watchdog to timeout when bus hung */ + uint32_t frequency; /* Current I2C frequency */ + uint32_t fclock; /* Flexcomm function clock frequency */ - struct i2c_msg_s *msgs; /* remaining transfers - first one is in progress */ - unsigned int nmsg; /* number of transfer remaining */ + struct i2c_msg_s *msgs; /* Remaining transfers (first is in progress) */ + unsigned int nmsg; /* Number of transfer remaining */ - uint16_t wrcnt; /* number of bytes sent to tx fifo */ - uint16_t rdcnt; /* number of bytes read from rx fifo */ + sem_t exclsem; /* Only one thread can access at a time */ + sem_t waitsem; /* Supports wait for state machine completion */ + uint16_t irq; /* Flexcomm IRQ number */ + uint16_t wrcnt; /* Number of bytes sent to tx fifo */ + uint16_t rdcnt; /* Number of bytes read from rx fifo */ + volatile uint8_t state; /* State of state machine */ }; /**************************************************************************** diff --git a/arch/arm/src/lpc54xx/lpc54_spi_master.c b/arch/arm/src/lpc54xx/lpc54_spi_master.c index f59fece3fc8..a34f49da566 100644 --- a/arch/arm/src/lpc54xx/lpc54_spi_master.c +++ b/arch/arm/src/lpc54xx/lpc54_spi_master.c @@ -238,7 +238,8 @@ static int lpc54_spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -static uint32_t lpc54_spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) +static uint32_t lpc54_spi_setfrequency(FAR struct spi_dev_s *dev, + uint32_t frequency) { FAR struct lpc54_spidev_s *priv = (FAR struct lpc54_spidev_s *)dev; uint32_t actual; @@ -281,7 +282,8 @@ static uint32_t lpc54_spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequ * ****************************************************************************/ -static void lpc54_spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void lpc54_spi_setmode(FAR struct spi_dev_s *dev, + enum spi_mode_e mode) { FAR struct lpc54_spidev_s *priv = (FAR struct lpc54_spidev_s *)dev; uint32_t regval; @@ -407,7 +409,8 @@ static uint16_t lpc54_spi_send(FAR struct spi_dev_s *dev, uint16_t wd) * ****************************************************************************/ -static void lpc54_spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t nwords) +static void lpc54_spi_sndblock(FAR struct spi_dev_s *dev, + FAR const void *buffer, size_t nwords) { FAR uint8_t *ptr = (FAR uint8_t *)buffer; uint8_t data; @@ -444,7 +447,8 @@ static void lpc54_spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer * ****************************************************************************/ -static void lpc54_spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nwords) +static void lpc54_spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, + size_t nwords) { FAR uint8_t *ptr = (FAR uint8_t *)buffer; @@ -508,12 +512,13 @@ static void lpc54_spidev_initialize(FAR struct lpc54_spidev_s *priv) * * Description: * Initialize the selected SPI port - * 0 - SPI - * 1 - SSP0 - * 2 - SSP1 + * 0 - SPI0 + * 1 - SPI1 + * ... + * 9 - SSP9 * * Input Parameter: - * Port number (for hardware that has multiple SPI interfaces) + * port - SPI peripheral number. 0..9 * * Returned Value: * Valid SPI device structure reference on success; a NULL on failure