sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

forgotten changes

Browse Source
This commit is contained in:
Lok Tep 2015-11-11 14:22:22 +01:00
parent 3e33d18cac
commit 485d317401
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/arm/src/lpc43xx/lpc43_ssp.c
View File

@ -131,9 +131,12 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency);
static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode);
static void ssp_setbits(FAR struct spi_dev_s *dev, int nbits); static void ssp_setbits(FAR struct spi_dev_s *dev, int nbits);
static uint16_t ssp_send(FAR struct spi_dev_s *dev, uint16_t ch); static uint16_t ssp_send(FAR struct spi_dev_s *dev, uint16_t ch);
static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
FAR void *rxbuffer, size_t nwords);
#ifndef CONFIG_SPI_EXCHANGE
static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t nwords); static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t nwords);
static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nwords); static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nwords);
#endif
/* Initialization */ /* Initialization */
#ifdef CONFIG_LPC43_SSP0 #ifdef CONFIG_LPC43_SSP0
@ -539,15 +542,15 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
FAR struct lpc43_sspdev_s *priv = (FAR struct lpc43_sspdev_s *)dev; FAR struct lpc43_sspdev_s *priv = (FAR struct lpc43_sspdev_s *)dev;
union union
{ {
FAR uint8_t *p8; FAR uint8_t *p8;
FAR uint16_t *p16; FAR uint16_t *p16;
FAR const void *pv; FAR void *pv;
} tx; } tx;
union union
{ {
FAR uint8_t *p8; FAR uint8_t *p8;
FAR uint16_t *p16; FAR uint16_t *p16;
FAR const void *pv; FAR void *pv;
} rx; } rx;
uint32_t data; uint32_t data;
uint32_t datadummy = (priv->nbits > 8)?0xffff:0xff; uint32_t datadummy = (priv->nbits > 8)?0xffff:0xff;
@ -622,7 +625,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
* None * None
* *
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_SPI_EXCHANGE
static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t nwords) static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t nwords)
{ {
return ssp_exchange(dev, buffer, NULL, nwords); return ssp_exchange(dev, buffer, NULL, nwords);
@ -652,6 +655,9 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
return ssp_exchange(dev, NULL, buffer, nwords); return ssp_exchange(dev, NULL, buffer, nwords);
} }
#endif
#ifdef CONFIG_LPC43_SSP0
/**************************************************************************** /****************************************************************************
* Name: lpc43_ssp0initialize * Name: lpc43_ssp0initialize
* *
@ -666,7 +672,6 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_LPC43_SSP0
static inline FAR struct lpc43_sspdev_s *lpc43_ssp0initialize(void) static inline FAR struct lpc43_sspdev_s *lpc43_ssp0initialize(void)
{ {
irqstate_t flags; irqstate_t flags;
@ -696,7 +701,6 @@ static inline FAR struct lpc43_sspdev_s *lpc43_ssp0initialize(void)
/* Pin configuration */ /* Pin configuration */
lpc43_pin_config(PINCONF_SSP0_SCK); lpc43_pin_config(PINCONF_SSP0_SCK);
lpc43_pin_config(PINCONF_SSP0_SSEL);
lpc43_pin_config(PINCONF_SSP0_MISO); lpc43_pin_config(PINCONF_SSP0_MISO);
lpc43_pin_config(PINCONF_SSP0_MOSI); lpc43_pin_config(PINCONF_SSP0_MOSI);
@ -750,7 +754,6 @@ static inline FAR struct lpc43_sspdev_s *lpc43_ssp1initialize(void)
/* Pins configuration */ /* Pins configuration */
lpc43_pin_config(PINCONF_SSP1_SCK); lpc43_pin_config(PINCONF_SSP1_SCK);
lpc43_pin_config(PINCONF_SSP1_SSEL);
lpc43_pin_config(PINCONF_SSP1_MISO); lpc43_pin_config(PINCONF_SSP1_MISO);
lpc43_pin_config(PINCONF_SSP1_MOSI); lpc43_pin_config(PINCONF_SSP1_MOSI);