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

Merge pull request #1771 from PeterKietzmann/correct_stm32f4_spi_return_values

Browse Source 
cpu/stm32f4: Changed SPI return values to API definitions
This commit is contained in:
Hauke Petersen 2014-10-24 15:37:22 +02:00
commit 616ff64929
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cpu/stm32f4/periph/spi.c
View File

@ -64,7 +64,7 @@ int spi_init_master(spi_t dev, spi_conf_t conf, spi_speed_t speed)
speed_devider = 3; /* makes 10.5 MHz */ speed_devider = 3; /* makes 10.5 MHz */
break; break;
default: default:
return -2; return -1;
} }
switch (dev) { switch (dev) {
@ -99,7 +99,7 @@ int spi_init_master(spi_t dev, spi_conf_t conf, spi_speed_t speed)
break; break;
#endif /* SPI_2_EN */ #endif /* SPI_2_EN */
default: default:
return -1; return -2;
} }
/* configure SCK, MISO and MOSI pin */ /* configure SCK, MISO and MOSI pin */
@ -327,11 +327,11 @@ int spi_transfer_reg(spi_t dev, uint8_t reg, char out, char *in)
trans_ret = spi_transfer_byte(dev, reg, in); trans_ret = spi_transfer_byte(dev, reg, in);
if (trans_ret < 0) { if (trans_ret < 0) {
return -2; return -1;
} }
trans_ret = spi_transfer_byte(dev, out, in); trans_ret = spi_transfer_byte(dev, out, in);
if (trans_ret < 0) { if (trans_ret < 0) {
return -3; return -1;
} }
return 1; return 1;
@ -343,11 +343,11 @@ int spi_transfer_regs(spi_t dev, uint8_t reg, char *out, char *in, unsigned int
trans_ret = spi_transfer_byte(dev, reg, in); trans_ret = spi_transfer_byte(dev, reg, in);
if (trans_ret < 0) { if (trans_ret < 0) {
return -2; return -1;
} }
trans_ret = spi_transfer_bytes(dev, out, in, length); trans_ret = spi_transfer_bytes(dev, out, in, length);
if (trans_ret < 0) { if (trans_ret < 0) {
return -3; return -1;
} }
return trans_ret; return trans_ret;