RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #4226 from DipSwitch/stm32f1_add_spi_12

Browse Source 
cpu/stm32f1/spi: add SPI peripheral 1 and 2
This commit is contained in:
Oleg Hahm 2015-11-07 18:06:09 +09:00
commit 4ef889f9ce
1 changed files with 73 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
cpu/stm32f1/periph/spi.c
View File

@ -32,7 +32,7 @@
#include "debug.h"
/* guard file in case no SPI device is defined */
#if SPI_0_EN
#if SPI_0_EN || SPI_1_EN || SPI_2_EN
/**
* @brief Array holding one pre-initialized mutex for each SPI device
@ -63,6 +63,22 @@ int spi_init_master(spi_t dev, spi_conf_t conf, spi_speed_t speed)
SPI_0_CLKEN();
break;
#endif
#ifdef SPI_1_EN
case SPI_1:
spi = SPI_1_DEV;
bus_div = SPI_1_BUS_DIV;
SPI_1_CLKEN();
break;
#endif
#ifdef SPI_2_EN
case SPI_2:
spi = SPI_2_DEV;
bus_div = SPI_2_BUS_DIV;
SPI_2_CLKEN();
break;
#endif
default:
return -1;
}
@ -119,6 +135,22 @@ int spi_conf_pins(spi_t dev)
miso = SPI_0_MISO_PIN;
break;
#endif
#ifdef SPI_1_EN
case SPI_1:
clk = SPI_1_CLK_PIN;
mosi = SPI_1_MOSI_PIN;
miso = SPI_1_MISO_PIN;
break;
#endif
#ifdef SPI_2_EN
case SPI_2:
clk = SPI_2_CLK_PIN;
mosi = SPI_2_MOSI_PIN;
miso = SPI_2_MISO_PIN;
break;
#endif
default:
return -1;
}
@ -159,6 +191,18 @@ int spi_transfer_byte(spi_t dev, char out, char *in)
spi = SPI_0_DEV;
break;
#endif
#ifdef SPI_1_EN
case SPI_1:
spi = SPI_1_DEV;
break;
#endif
#ifdef SPI_2_EN
case SPI_2:
spi = SPI_2_DEV;
break;
#endif
default:
return -1;
}
@ -204,6 +248,20 @@ void spi_poweron(spi_t dev)
SPI_0_DEV->CR1 |= SPI_CR1_SPE; /* turn SPI peripheral on */
break;
#endif
#ifdef SPI_1_EN
case SPI_1:
SPI_1_CLKEN();
SPI_1_DEV->CR1 |= SPI_CR1_SPE; /* turn SPI peripheral on */
break;
#endif
#ifdef SPI_2_EN
case SPI_2:
SPI_2_CLKEN();
SPI_2_DEV->CR1 |= SPI_CR1_SPE; /* turn SPI peripheral on */
break;
#endif
}
}
@ -216,6 +274,20 @@ void spi_poweroff(spi_t dev)
SPI_0_CLKDIS();
break;
#endif
#ifdef SPI_1_EN
case SPI_1:
SPI_1_DEV->CR1 &= ~(SPI_CR1_SPE); /* turn SPI peripheral off */
SPI_1_CLKDIS();
break;
#endif
#ifdef SPI_2_EN
case SPI_2:
SPI_2_DEV->CR1 &= ~(SPI_CR1_SPE); /* turn SPI peripheral off */
SPI_2_CLKDIS();
break;
#endif
}
}