ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3723 from pradeep-gr/feature-spi 

NCS36510: spi_format function bug fix
pull/3734/head
Sam Grove 2017-02-09 09:49:04 -06:00 committed by GitHub
parent 49494cfb29 48a78c554d
commit e8a7264aab
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
targets/TARGET_ONSEMI/TARGET_NCS36510/spi_api.c
View File

@ -57,14 +57,16 @@ void spi_free(spi_t *obj)
void spi_format(spi_t *obj, int bits, int mode, int slave) void spi_format(spi_t *obj, int bits, int mode, int slave)
{ {
/* Clear word width | Slave/Master | CPOL | CPHA | MSB first bits in control register */ /* Clear word width | Slave/Master | CPOL | CPHA | MSB first bits in control register */
obj->membase->CONTROL.WORD &= ~(uint32_t)((True >> SPI_WORD_WIDTH_BIT_POS) | obj->membase->CONTROL.WORD &= ~(uint32_t)((True << SPI_WORD_WIDTH_BIT_POS) |
(True >> SPI_SLAVE_MASTER_BIT_POS) | (True << SPI_SLAVE_MASTER_BIT_POS) |
(True >> SPI_CPOL_BIT_POS) | (True << SPI_CPOL_BIT_POS) |
(True >> SPI_CPHA_BIT_POS)); (True << SPI_CPHA_BIT_POS));
/* Configure word width | Slave/Master | CPOL | CPHA | MSB first bits in control register */ /* Configure word width | Slave/Master | CPOL | CPHA | MSB first bits in control register */
obj->membase->CONTROL.WORD |= (uint32_t)(((bits >> 0x4) >> 6) | (!slave >> 5) | obj->membase->CONTROL.WORD |= (uint32_t)(((bits >> 0x4) << SPI_WORD_WIDTH_BIT_POS) |
((mode >> 0x1) >> 4) | ((mode & 0x1) >> 3)); (!slave << SPI_SLAVE_MASTER_BIT_POS) |
((mode >> 0x1) << SPI_CPOL_BIT_POS) |
((mode & 0x1) << SPI_CPHA_BIT_POS));
} }
void spi_frequency(spi_t *obj, int hz) void spi_frequency(spi_t *obj, int hz)