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

msp430: spi: fixed setting of spi speed

Browse Source 
Signed-off-by: malo <malo@25cmsquare.io>
This commit is contained in:
malo 2016-03-24 09:40:28 +01:00
parent 5b5810ab7b
commit 1e00c2b4b7
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cpu/msp430fxyz/periph/spi.c
View File

@ -70,20 +70,26 @@ int spi_init_master(spi_t dev, spi_conf_t conf, spi_speed_t speed)
switch (speed) { switch (speed) {
case SPI_SPEED_100KHZ: case SPI_SPEED_100KHZ:
br /= 100000; br /= 100000;
break;
case SPI_SPEED_400KHZ: case SPI_SPEED_400KHZ:
br /= 400000; br /= 400000;
break;
case SPI_SPEED_1MHZ: case SPI_SPEED_1MHZ:
br /= 1000000; br /= 1000000;
break;
case SPI_SPEED_5MHZ: case SPI_SPEED_5MHZ:
br /= 5000000; br /= 5000000;
if (br < 2) { /* make sure the is not smaller then 2 */
br = 2;
}
break; break;
default: default:
/* other clock speeds are not supported */ /* other clock speeds are not supported */
return -1; return -1;
} }
/* make sure the is not smaller then 2 */
if (br < 2) {
br = 2;
}
SPI_DEV->BR0 = (uint8_t)br; SPI_DEV->BR0 = (uint8_t)br;
SPI_DEV->BR1 = (uint8_t)(br >> 8); SPI_DEV->BR1 = (uint8_t)(br >> 8);
SPI_DEV->MCTL = 0; SPI_DEV->MCTL = 0;
@ -136,20 +142,26 @@ int spi_init_master(spi_t dev, spi_conf_t conf, spi_speed_t speed)
switch (speed) { switch (speed) {
case SPI_SPEED_100KHZ: case SPI_SPEED_100KHZ:
br /= 100000; br /= 100000;
break;
case SPI_SPEED_400KHZ: case SPI_SPEED_400KHZ:
br /= 400000; br /= 400000;
break;
case SPI_SPEED_1MHZ: case SPI_SPEED_1MHZ:
br /= 1000000; br /= 1000000;
break;
case SPI_SPEED_5MHZ: case SPI_SPEED_5MHZ:
br /= 5000000; br /= 5000000;
if (br < 2) { /* make sure the is not smaller then 2 */
br = 2;
}
break; break;
default: default:
/* other clock speeds are not supported */ /* other clock speeds are not supported */
return -1; return -1;
} }
/* make sure the is not smaller then 2 */
if (br < 2) {
br = 2;
}
SPI_DEV->BR0 = (uint8_t)br; SPI_DEV->BR0 = (uint8_t)br;
SPI_DEV->BR1 = (uint8_t)(br >> 8); SPI_DEV->BR1 = (uint8_t)(br >> 8);
/* release from software reset */ /* release from software reset */